summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Haerry <haerry@puzzle.ch>2010-09-27 12:19:21 +0200
committerMarcel Haerry <haerry@puzzle.ch>2010-09-27 12:19:21 +0200
commit88fec38166f51bf8edabba6769a198016b799f1e (patch)
tree301cb85c9238c834c58733700774932b413b4299
parente27e74f81274d35d3873c6b5b5fa8816138212ed (diff)
update templates to the new way
-rw-r--r--manifests/register.pp43
-rw-r--r--templates/client.erb18
-rw-r--r--templates/defaultclient.erb15
-rw-r--r--templates/snmpclient.erb10
4 files changed, 48 insertions, 38 deletions
diff --git a/manifests/register.pp b/manifests/register.pp
index e1271e1..21f1d35 100644
--- a/manifests/register.pp
+++ b/manifests/register.pp
@@ -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
index 0000000..286631f
--- /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 %>