diff options
| author | mh <mh@immerda.ch> | 2013-01-25 10:59:18 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2013-01-25 10:59:18 +0100 |
| commit | d17d75fa093bbb9c38eb402ee842fb00c8e54cd3 (patch) | |
| tree | 518d9d1b2a93bbaf9577b93fe31ab3eae6717717 | |
| parent | 9951a642a0393b95e73acb89162d233b6a00317a (diff) | |
| parent | deddf58be90f76cd5ecc52808455e78d72d859d1 (diff) | |
Merge remote-tracking branch 'githubmirror/master'
| -rw-r--r-- | manifests/client.pp | 1 | ||||
| -rw-r--r-- | manifests/client/base.pp | 1 | ||||
| -rw-r--r-- | manifests/register.pp | 1 | ||||
| -rw-r--r-- | templates/client.erb | 4 | ||||
| l--------- | templates/munin-node.conf.Ubuntu.quantal | 1 |
5 files changed, 8 insertions, 0 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 934d23a..6726836 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -7,6 +7,7 @@ class munin::client( $allow = [ '127.0.0.1' ], $host = '*', $port = '4949', + $use_ssh = false, $manage_shorewall = false, $shorewall_collector_source = 'net' ) { diff --git a/manifests/client/base.pp b/manifests/client/base.pp index 84ba9b2..441198e 100644 --- a/manifests/client/base.pp +++ b/manifests/client/base.pp @@ -20,6 +20,7 @@ class munin::client::base { default => $munin::client::host }, port => $munin::client::port, + use_ssh => $munin::client::use_ssh, config => [ 'use_node_name yes', 'load.load.warning 5', 'load.load.critical 10'], } include munin::plugins::base diff --git a/manifests/register.pp b/manifests/register.pp index 9257ca1..6c154e5 100644 --- a/manifests/register.pp +++ b/manifests/register.pp @@ -1,6 +1,7 @@ define munin::register ( $host = $::fqdn, $port = '4949', + $use_ssh = false, $description = 'absent', $config = [] ) diff --git a/templates/client.erb b/templates/client.erb index 7131ade..ba03da5 100644 --- a/templates/client.erb +++ b/templates/client.erb @@ -12,8 +12,12 @@ # Description: <%= description.gsub!(/\n/, ' ') %> <% end -%> [<%= fhost.downcase %>] +<% if use_ssh -%> + address ssh://<%= host %>/bin/nc localhost <%= port %> +<% else -%> address <%= host %> port <%= port %> +<% end -%> <% if config -%><% config.each do |val| -%> <%= val -%> <% end -%><% end -%> diff --git a/templates/munin-node.conf.Ubuntu.quantal b/templates/munin-node.conf.Ubuntu.quantal new file mode 120000 index 0000000..d8fcb24 --- /dev/null +++ b/templates/munin-node.conf.Ubuntu.quantal @@ -0,0 +1 @@ +munin-node.conf.Ubuntu
\ No newline at end of file |