diff options
author | duritong <peter.meier+github@immerda.ch> | 2013-01-25 01:43:48 -0800 |
---|---|---|
committer | duritong <peter.meier+github@immerda.ch> | 2013-01-25 01:43:48 -0800 |
commit | f110eca84d3bf83eb420bd5a850e605d489a157e (patch) | |
tree | 617eb4591d13598b6ee805c7fbf5d038a426a3f3 | |
parent | 06983bff6ae91dc576e06e7d467ce248abb9ca23 (diff) | |
parent | a2004f577c2e15d9b6cf482f0693601f43c43fad (diff) |
Merge pull request #7 from tisoft/use_ssh
added support for use_ssh for munin 2.0
-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 |
4 files changed, 7 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 -%> |