summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/config/host/munin.conf.header.CentOS46
-rw-r--r--manifests/init.pp1
-rw-r--r--templates/munin-node.conf.default24
3 files changed, 58 insertions, 13 deletions
diff --git a/files/config/host/munin.conf.header.CentOS b/files/config/host/munin.conf.header.CentOS
index dcadd6b..413cd84 100644
--- a/files/config/host/munin.conf.header.CentOS
+++ b/files/config/host/munin.conf.header.CentOS
@@ -1,21 +1,51 @@
# Example configuration file for Munin, generated by 'make build'
# The next three variables specifies where the location of the RRD
-# databases, the HTML output, and the logs, severally. They all
-# must be writable by the user running munin-cron.
-dbdir /var/lib/munin
-htmldir /var/www/html/munin/
-logdir /var/log/munin
-rundir /var/run/munin
+# databases, the HTML output, logs and the lock/pid files. They all
+# must be writable by the user running munin-cron. They are all
+# defaulted to the values you see here.
+#
+# dbdir /var/lib/munin
+# htmldir /var/www/html/munin
+# logdir /var/log/munin
+# rundir /var/run/munin
+#
+# tmpldir /etc/munin/templates
-# Where to look for the HTML templates
-tmpldir /etc/munin/templates
+# (Exactly one) directory to include all files from.
+#
+# includedir /etc/munin/munin-conf.d
# Make graphs show values per minute instead of per second
#graph_period minute
+# Graphics files are normaly generated by munin-graph, no matter if
+# the graphs are used or not. You can change this to
+# on-demand-graphing by following the instructions in
+# http://munin.projects.linpro.no/wiki/CgiHowto
+#
graph_strategy cgi
+# munin-cgi-graph is invoked by the web server up to very many times at the
+# same time. This is not optimal since it results in high CPU and memory
+# consumption to the degree that the system can thrash. Again the default is
+# 6. Most likely the optimal number for max_cgi_graph_jobs is the same as
+# max_graph_jobs.
+#
+#munin_cgi_graph_jobs 6
+
+# If the automatic CGI url is wrong for your system override it here:
+#
+#cgiurl_graph /cgi-bin/munin-cgi-graph
+
+# munin-graph runs in parallel, the number of concurrent processes is
+# 6. If you want munin-graph to not be parallel set to 0. If set too
+# high it will slow down munin-graph. Some experiments are needed to
+# determine how many are optimal on your system. On a multi-core
+# system with good SCSI disks the number can probably be quite high.
+#
+#max_graph_jobs 6
+
# Drop somejuser@fnord.comm and anotheruser@blibb.comm an email everytime
# something changes (OK -> WARNING, CRITICAL -> OK, etc)
#contact.someuser.command mail -s "Munin notification" somejuser@fnord.comm
diff --git a/manifests/init.pp b/manifests/init.pp
index 578c4bb..5c4feeb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,5 +16,6 @@
# IP addresses and still be happy
class munin {
+ include common::moduledir
module_dir { [ "munin", "munin/nodes", "munin/plugins" ]: }
}
diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default
index befcae4..e584df1 100644
--- a/templates/munin-node.conf.default
+++ b/templates/munin-node.conf.default
@@ -1,21 +1,25 @@
##########
########## Managed by puppet
##########
+#
+# Example config-file for munin-node
+#
log_level 4
log_file /var/log/munin/munin-node.log
pid_file /var/run/munin/munin-node.pid
background 1
-setseid 1
+setsid 1
user root
group 0
-setsid yes
# Regexps for files to ignore
ignore_file ~$
+#ignore_file [#~]$ # FIX doesn't work. '#' starts a comment
+ignore_file DEADJOE$
ignore_file \.bak$
ignore_file %$
ignore_file \.dpkg-(tmp|new|old|dist)$
@@ -29,14 +33,24 @@ ignore_file \.pod$
host_name <%= fqdn %>
# A list of addresses that are allowed to connect. This must be a
-# regular expression, due to brain damage in Net::Server, which
-# doesn't understand CIDR-style network notation. You may repeat
-# the allow line as many times as you'd like
+# regular expression, since Net::Server does not understand CIDR-style
+# network notation unless the perl module Net::CIDR is installed. You
+# may repeat the allow line as many times as you'd like
<% real_munin_allow.split(':').each do |val| -%>
allow <%= '^'+val.gsub(/\./, '\.')+'$' %>
<% end -%>
+# If you have installed the Net::CIDR perl module, you can use
+# multiple cidr_allow and cidr_deny address/mask patterns. A
+# connecting client must match any cidr_allow, and not match any
+# cidr_deny. Example:
+
+# cidr_allow 127.0.0.1/32
+# cidr_allow 192.0.2.0/24
+# cidr_deny 192.0.2.42/32
+
+
# Which address to bind to;
host <%= munin_host_real %>
# host 127.0.0.1