1 files changed, 122 insertions, 0 deletions
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 1fa4651..75c4423 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -10,6 +10,127 @@ define munin::plugin (
     $script_path_in = '',
     $config = '')
 {
+<<<<<<< HEAD
+	debug ( "munin_plugin: name=$name, ensure=$ensure, script_path=$script_path" )
+	$plugin = "/etc/munin/plugins/$name"
+	$plugin_conf = "/etc/munin/plugin-conf.d/$name.conf"
+	case $ensure {
+		"absent": {
+			debug ( "munin_plugin: suppressing $plugin" )
+			file { $plugin: ensure => absent, } 
+		}
+		default: {
+			$plugin_src = $ensure ? { "present" => $name, default => $ensure }
+			debug ( "munin_plugin: making $plugin using src: $plugin_src" )
+			file { $plugin:
+				ensure => "$script_path/${plugin_src}",
+				require => Package["munin-node"],
+				notify => Service["munin-node"],
+			}
+		}
+	}
+	case $config {
+		'': {
+			debug("no config for $name")
+			file { $plugin_conf: ensure => absent }
+		}
+		default: {
+			case $ensure {
+				absent: {
+					debug("removing config for $name")
+					file { $plugin_conf: ensure => absent }
+				}
+				default: {
+					debug("creating $plugin_conf")
+					file { $plugin_conf:
+						content => "[${name}]\n$config\n",
+						mode => 0644, owner => root, group => root,
+					}
+				}
+			}
+		}
+	}
+}
+
+define munin::remoteplugin($ensure = "present", $source, $config = '') {
+	case $ensure {
+		"absent": { munin::plugin{ $name: ensure => absent } }
+		default: {
+			file {
+				"${module_dir_path}/munin/plugins/${name}":
+					source => $source,
+					mode => 0755, owner => root, group => root;
+			}
+			munin::plugin { $name:
+				ensure => $ensure,
+				config => $config,
+				script_path => "${module_dir_path}/munin/plugins",
+			}
+		}
+	}
+}
+
+class munin::plugins::base {
+
+	file {
+		[ "/etc/munin/plugins", "/etc/munin/plugin-conf.d" ]:
+			source => "puppet://$server/modules/common/empty",
+			ensure => directory, checksum => mtime,
+			ignore => '.ignore',
+			recurse => true, purge => true, force => true, 
+			mode => 0755, owner => root, group => root,
+			notify => Service[munin-node];
+		"/etc/munin/plugin-conf.d/munin-node":
+			ensure => present, 
+			mode => 0644, owner => root, group => root,
+			notify => Service[munin-node],
+			before => Package[munin-node];
+	}
+
+}
+
+# handle if_ and if_err_ plugins
+class munin::plugins::interfaces inherits munin::plugins::base {
+
+	$ifs = gsub(split($munin_interfaces, " "), "(.+)", "if_\\1")
+	$if_errs = gsub(split($munin_interfaces, " "), "(.+)", "if_err_\\1")
+	plugin {
+		$ifs: ensure => "if_";
+		$if_errs: ensure => "if_err_";
+	}
+
+
+}
+
+class munin::plugins::linux inherits munin::plugins::base {
+
+	plugin {
+		[ df_abs, forks, iostat, memory, processes, cpu, df_inode, irqstats,
+		  netstat, open_files, swap, df, entropy, interrupts, load, open_inodes,
+		  vmstat
+		]:
+			ensure => present;
+		acpi: 
+			ensure => $acpi_available;
+	}
+
+	include munin::plugins::interfaces
+}
+
+class munin::plugins::debian inherits munin::plugins::base {
+
+	plugin { apt_all: ensure => present; }
+
+}
+
+class munin::plugins::vserver inherits munin::plugins::base {
+
+	plugin {
+		[ netstat, processes ]:
+			ensure => present;
+	}
+
+=======
     include munin::plugin::scriptpaths
     $real_script_path = $script_path_in ? { '' => $munin::plugin::scriptpaths::script_path, default => $script_path_in }
 
@@ -61,4 +182,5 @@ define munin::plugin (
     		}
     	}
     }
+>>>>>>> 76352415fec5c2ab6975e3a8843dd4983f7cae6a
 }