From ed2de803e94bc85e4bb9505209211d5f0536b7c3 Mon Sep 17 00:00:00 2001 From: Ben Kero Date: Tue, 9 Mar 2010 11:24:19 -0800 Subject: [PATCH] Add apache support for munin --- cfengine/inputs/cf.munin | 17 +++++++++++++++++ files/etc/munin/plugin-conf.d/apache/apache | 2 ++ files/etc/munin/plugin-conf.d/apache/cached | 2 ++ 3 files changed, 21 insertions(+), 0 deletions(-) create mode 100644 files/etc/munin/plugin-conf.d/apache/apache create mode 100644 files/etc/munin/plugin-conf.d/apache/cached diff --git a/cfengine/inputs/cf.munin b/cfengine/inputs/cf.munin index 26c6898..1173ea4 100644 --- a/cfengine/inputs/cf.munin +++ b/cfengine/inputs/cf.munin @@ -105,6 +105,18 @@ copy: mode=755 server=$(gold) + service_munin_node.service_http.!service_squid.!service_varnish:: + $(masterfiles)/etc/munin/plugin-conf.d/apache/apache + dest=$(plugin_dir)/apache + mode=755 + server=$(gold) + + service_munin_node.(service_squid|service_varnish):: + $(masterfiles)/etc/munin/plugin-conf.d/apache/cached + dest=$(plugin_dir)/apache + mode=755 + server=$(gold) + packages: service_munin_host.centos:: @@ -184,3 +196,8 @@ links: /etc/munin/plugins/memcached_bytes -> $(plugin_dir)/memcached_ define=bounce_munin /etc/munin/plugins/memcached_rates -> $(plugin_dir)/memcached_ define=bounce_munin /etc/munin/plugins/memcached_counters -> $(plugin_dir)/memcached_ define=bounce_munin + + service_munin_node.service_http:: + /etc/munin/plugins/apache_accesses -> $(plugin_dir)/apache_ define=bounce_munin + /etc/munin/plugins/apache_processes -> $(plugin_dir)/apache_ define=bounce_munin + /etc/munin/plugins/apache_volume -> $(plugin_dir)/apache_ define=bounce_munin diff --git a/files/etc/munin/plugin-conf.d/apache/apache b/files/etc/munin/plugin-conf.d/apache/apache new file mode 100644 index 0000000..8312909 --- /dev/null +++ b/files/etc/munin/plugin-conf.d/apache/apache @@ -0,0 +1,2 @@ +[apache_*] + env.ports 80 diff --git a/files/etc/munin/plugin-conf.d/apache/cached b/files/etc/munin/plugin-conf.d/apache/cached new file mode 100644 index 0000000..c1eea98 --- /dev/null +++ b/files/etc/munin/plugin-conf.d/apache/cached @@ -0,0 +1,2 @@ +[apache_*] + env.ports 8080 -- 1.6.4.4