merge with lavamind

3 files changed, 18 insertions, 25 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/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 %>