update templates to the new way
authorMarcel Haerry <haerry@puzzle.ch>
Mon, 27 Sep 2010 10:19:21 +0000 (12:19 +0200)
committerMarcel Haerry <haerry@puzzle.ch>
Mon, 27 Sep 2010 10:19:21 +0000 (12:19 +0200)
manifests/register.pp
templates/client.erb [new file with mode: 0644]
templates/defaultclient.erb [deleted file]
templates/snmpclient.erb [deleted file]

index e1271e1..21f1d35 100644 (file)
@@ -1,17 +1,34 @@
-define munin::register()
+define munin::register (
+  $host = 'absent',
+  $port = 'absent',
+  $description = 'absent',
+  $config = []
+)
 {
-       $munin_port_real = $munin_port ? { '' => 4949, default => $munin_port } 
-       $munin_host_real = $munin_host ? {
-               '' => $fqdn,
-               'fqdn' => $fqdn,
-               default => $munin_host
-       }
+    $fhost = $name
+    $client_type = 'client'
 
-       @@file { "/var/lib/puppet/modules/munin/nodes/${name}_${munin_port_real}":
-               ensure => present,
-               content => template("munin/defaultclient.erb"),
-               tag => 'munin',
-       }
-}
+    $munin_port_real = $port ? {
+        'absent' => $munin_port ? {
+                        '' => 4949,
+                        default => $munin_port
+                    },
+        default => $port
+    }
 
+    $munin_host_real = $host ? {
+        'absent' => $munin_host ? {
+                        '' => $fqdn,
+                        'fqdn' => $fqdn,
+                        default => $munin_host
+                    },
+        default => $host
+    }
 
+    @@file { "munin_client_${fhost}_${munin_port_real}":
+        ensure => present,
+        path => "/var/lib/puppet/modules/munin/nodes/${fhost}_${munin_port_real}",
+        content => template("munin/client.erb"),
+        tag => 'munin',
+    }
+}
diff --git a/templates/client.erb b/templates/client.erb
new file mode 100644 (file)
index 0000000..286631f
--- /dev/null
@@ -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 (file)
index 5611bf4..0000000
+++ /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/snmpclient.erb b/templates/snmpclient.erb
deleted file mode 100644 (file)
index 44ecc6d..0000000
+++ /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 %>