From 9b0b698523987b7631478bcf7dc84acf5e0e719c Mon Sep 17 00:00:00 2001 From: Marcel Haerry Date: Thu, 4 Aug 2011 10:48:57 +0200 Subject: move from concatenated_file to concat --- manifests/client.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/client.pp') diff --git a/manifests/client.pp b/manifests/client.pp index 273070d..141c916 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -3,7 +3,7 @@ # See LICENSE for the full license granted to you. # Adapted and improved by admin(at)immerda.ch -class munin::client inherits munin { +class munin::client { $munin_port_real = $munin_port ? { '' => 4949, default => $munin_port } $munin_host_real = $munin_host ? { -- cgit v1.2.3 From 9b161f0c61bbd30960e663eceef8f1b35f633507 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 5 Nov 2011 14:14:32 +0100 Subject: use hiera to configure munin node specific things --- manifests/client.pp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'manifests/client.pp') diff --git a/manifests/client.pp b/manifests/client.pp index 141c916..99480f1 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -5,13 +5,6 @@ class munin::client { - $munin_port_real = $munin_port ? { '' => 4949, default => $munin_port } - $munin_host_real = $munin_host ? { - '' => '*', - 'fqdn' => '*', - default => $munin_host - } - case $operatingsystem { openbsd: { include munin::client::openbsd } darwin: { include munin::client::darwin } -- cgit v1.2.3 From e2dfae5852ecdf3695a6af8ec48092ea24698390 Mon Sep 17 00:00:00 2001 From: "Christian G. Warden" Date: Thu, 2 Feb 2012 18:10:14 -0800 Subject: Fully qualify facter variables --- manifests/client.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/client.pp') diff --git a/manifests/client.pp b/manifests/client.pp index 99480f1..0ff5b79 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -5,7 +5,7 @@ class munin::client { - case $operatingsystem { + case $::operatingsystem { openbsd: { include munin::client::openbsd } darwin: { include munin::client::darwin } debian,ubuntu: { include munin::client::debian } -- cgit v1.2.3 From 9fd1de5acd9064a0d67ca9d2c13a829a3f628f39 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 5 Jun 2012 19:39:49 -0300 Subject: new style for 2.7 --- manifests/client.pp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'manifests/client.pp') diff --git a/manifests/client.pp b/manifests/client.pp index 0ff5b79..5080f99 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -4,16 +4,15 @@ # Adapted and improved by admin(at)immerda.ch class munin::client { - - case $::operatingsystem { - openbsd: { include munin::client::openbsd } - darwin: { include munin::client::darwin } - debian,ubuntu: { include munin::client::debian } - gentoo: { include munin::client::gentoo } - centos: { include munin::client::package } - default: { include munin::client::base } - } - if $use_shorewall { - include shorewall::rules::munin - } + case $::operatingsystem { + openbsd: { include munin::client::openbsd } + darwin: { include munin::client::darwin } + debian,ubuntu: { include munin::client::debian } + gentoo: { include munin::client::gentoo } + centos: { include munin::client::package } + default: { include munin::client::base } + } + if hiera('use_shorewall',false) { + include shorewall::rules::munin + } } -- cgit v1.2.3 From 64a6aa3cf73bdc9d75d34b6fbcd04f5e7f34e923 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 9 Jun 2012 21:17:47 -0300 Subject: use class parameters --- manifests/client.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'manifests/client.pp') diff --git a/manifests/client.pp b/manifests/client.pp index 5080f99..79d275e 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -3,7 +3,11 @@ # See LICENSE for the full license granted to you. # Adapted and improved by admin(at)immerda.ch -class munin::client { +class munin::client( + $allow = hiera('munin_client_allow',['127.0.0.1']), + $host = hiera('munin_host','*'), + $port = hiera('munin_port','4949') +) { case $::operatingsystem { openbsd: { include munin::client::openbsd } darwin: { include munin::client::darwin } -- cgit v1.2.3 From c95f0b2fcf4f35b1a7ae3ad9c04600a32ab2bb43 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 13 Jun 2012 20:40:57 -0300 Subject: migrate away from hiera stuff --- manifests/client.pp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'manifests/client.pp') diff --git a/manifests/client.pp b/manifests/client.pp index 79d275e..934d23a 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -4,9 +4,11 @@ # Adapted and improved by admin(at)immerda.ch class munin::client( - $allow = hiera('munin_client_allow',['127.0.0.1']), - $host = hiera('munin_host','*'), - $port = hiera('munin_port','4949') + $allow = [ '127.0.0.1' ], + $host = '*', + $port = '4949', + $manage_shorewall = false, + $shorewall_collector_source = 'net' ) { case $::operatingsystem { openbsd: { include munin::client::openbsd } @@ -16,7 +18,11 @@ class munin::client( centos: { include munin::client::package } default: { include munin::client::base } } - if hiera('use_shorewall',false) { - include shorewall::rules::munin + if $munin::client::manage_shorewall { + class{'shorewall::rules::munin': + munin_port => $port, + munin_collector => delete($allow,'127.0.0.1'), + collector_source => $shorewall_collector_source, + } } } -- cgit v1.2.3 From a2004f577c2e15d9b6cf482f0693601f43c43fad Mon Sep 17 00:00:00 2001 From: Markus Heberling Date: Wed, 23 Jan 2013 20:15:52 +0100 Subject: added support for use_ssh for munin 2.0 --- manifests/client.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'manifests/client.pp') 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' ) { -- cgit v1.2.3 From 3b10e0eb3fabb19cc0fa9d66f5a8379ae96aeb6f Mon Sep 17 00:00:00 2001 From: Sander Hoentjen Date: Mon, 18 Mar 2013 14:56:44 +0100 Subject: Add support for specifying tags for exported resources This enables you to specify different servers for different clients. --- manifests/client.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'manifests/client.pp') diff --git a/manifests/client.pp b/manifests/client.pp index 6726836..2316bc9 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -9,7 +9,8 @@ class munin::client( $port = '4949', $use_ssh = false, $manage_shorewall = false, - $shorewall_collector_source = 'net' + $shorewall_collector_source = 'net', + $export_tag = 'munin' ) { case $::operatingsystem { openbsd: { include munin::client::openbsd } -- cgit v1.2.3