summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/client.erb18
-rw-r--r--templates/defaultclient.erb15
-rw-r--r--templates/munin-node.conf.default24
-rw-r--r--templates/snmpclient.erb10
4 files changed, 37 insertions, 30 deletions
diff --git a/templates/client.erb b/templates/client.erb
new file mode 100644
index 0000000..e7c6730
--- /dev/null
+++ b/templates/client.erb
@@ -0,0 +1,18 @@
+<%
+ # Downcase all information
+ dom = domain.downcase
+ host = hostname.downcase
+%>
+
+### Munin client from Puppet template
+# Domain: <%= dom %>
+# Registered on: <%= host %>
+# Type: <%= client_type %>
+<% if description != 'absent' -%>
+# Description: <%= description.gsub!(/\n/, ' ') %>
+<% end -%>
+[<%= fhost.downcase %>]
+ address <%= munin_host_real -%>
+<% if config -%><% config.each do |val| -%>
+ <%= val -%>
+<% end -%><% end -%>
diff --git a/templates/defaultclient.erb b/templates/defaultclient.erb
deleted file mode 100644
index 5611bf4..0000000
--- a/templates/defaultclient.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<%
- # Downcase all information
- dom = domain.downcase
- host = hostname.downcase
- fhost = name.downcase
-%>
-### This syntax can be extended, it might get better ...
-#+<%= dom %>
-#-<%= host %>=<%= fhost %>:load.load
-[<%= fhost %>] # linux box
- address <%= munin_host_real %>
- port <%= munin_port_real %>
- use_node_name yes
- load.load.warning 5
- load.load.critical 10
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
diff --git a/templates/snmpclient.erb b/templates/snmpclient.erb
deleted file mode 100644
index 44ecc6d..0000000
--- a/templates/snmpclient.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<%
- # Downcase all information
- dom = domain.downcase
- host = hostname.downcase
- fhost = name.downcase
-%>
-### This syntax can be extended, it might get better ...
-#<%= dom %> snmp -> <%= fhost %>
-[<%= fhost %>] # snmp box
- address <%= munin_host_real %>