From c2565e972ccd7159001984e6cb351bc30a81eb51 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 11 May 2008 13:22:49 +0000 Subject: fixed absent pluginsource git-svn-id: https://svn/ipuppet/trunk/modules/munin@1426 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/plugin.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 6a92c56..91b0178 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -93,7 +93,11 @@ define munin::remoteplugin($ensure = "present", $source, $config = '') { } } define munin::plugin::deploy ($source = '', $ensure = 'present', $config = '') { - $plugin_src = $ensure ? { "present" => $name, default => $ensure } + $plugin_src = $ensure ? { + 'present' => $name, + 'absent' => $name, + default => $ensure + } $real_source = $source ? { '' => "munin/plugins/$plugin_src", default => $source -- cgit v1.2.3 From d7048f01be3cfdb8e588361c6987283de45a57ef Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 11 May 2008 13:33:08 +0000 Subject: ensure is present, absent or source git-svn-id: https://svn/ipuppet/trunk/modules/munin@1427 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/plugin.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests') diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 91b0178..e2827cd 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -247,8 +247,8 @@ class munin::plugins::selinux inherits munin::plugins::base { class munin::plugins::postgres inherits munin::plugins::base { munin::plugin::deploy { "pg_conn": } - munin::plugin::deploy { "pg__connections": ensure => false } - munin::plugin::deploy { "pg__locks": ensure => false } + munin::plugin::deploy { "pg__connections": ensure => 'absent' } + munin::plugin::deploy { "pg__locks": ensure => 'absent' } } class munin::plugins::nagios inherits munin::plugins::base { munin::plugin::deploy { -- cgit v1.2.3 From 0449faea92a65380646c5591ee0509fcdc67ab0b Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 11 May 2008 14:02:11 +0000 Subject: added squid plugins git-svn-id: https://svn/ipuppet/trunk/modules/munin@1428 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/plugin.pp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'manifests') diff --git a/manifests/plugin.pp b/manifests/plugin.pp index e2827cd..d24b580 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -245,6 +245,13 @@ class munin::plugins::selinux inherits munin::plugins::base { munin::plugin::deploy { "selinux_avcstats": } } +class munin::plugins::squid inherits munin::plugins::base { + munin::plugin{ 'squid_cache': config => "user root\nenv.squidhost localhost\nenv.squidport 80"} + munin::plugin{ 'squid_icp': } + munin::plugin{ 'squid_requests': } + munin::plugin{ 'squid_traffic': } +} + class munin::plugins::postgres inherits munin::plugins::base { munin::plugin::deploy { "pg_conn": } munin::plugin::deploy { "pg__connections": ensure => 'absent' } -- cgit v1.2.3