From 96ec278405076fdba9b4972e15870677d9a6ceae Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 18 Mar 2011 19:20:28 +0100 Subject: [PATCH 1/5] Fix wrong "user (postfix)" config. "(foo)" appears to be valid only for groups IIRC - I had fixed this a long time ago already. --- files/munin-node | 2 +- files/munin-node.lenny | 2 +- files/munin-node.squeeze | 2 +- files/munin-node.squeeze.1.2.6-17 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/files/munin-node b/files/munin-node index 0e07575..fb9d484 100644 --- a/files/munin-node +++ b/files/munin-node @@ -56,7 +56,7 @@ user root env.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf [postfix_mailqueue] -user (postfix) +user postfix [postfix_mailstats] group adm diff --git a/files/munin-node.lenny b/files/munin-node.lenny index 0e07575..fb9d484 100644 --- a/files/munin-node.lenny +++ b/files/munin-node.lenny @@ -56,7 +56,7 @@ user root env.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf [postfix_mailqueue] -user (postfix) +user postfix [postfix_mailstats] group adm diff --git a/files/munin-node.squeeze b/files/munin-node.squeeze index 7f70042..3595c7f 100644 --- a/files/munin-node.squeeze +++ b/files/munin-node.squeeze @@ -64,7 +64,7 @@ env.mysqlopts --defaults-file=/etc/mysql/debian.cnf [postfix_mailqueue] -user (postfix) +user postfix [postfix_mailstats] group adm diff --git a/files/munin-node.squeeze.1.2.6-17 b/files/munin-node.squeeze.1.2.6-17 index 7f70042..3595c7f 100644 --- a/files/munin-node.squeeze.1.2.6-17 +++ b/files/munin-node.squeeze.1.2.6-17 @@ -64,7 +64,7 @@ env.mysqlopts --defaults-file=/etc/mysql/debian.cnf [postfix_mailqueue] -user (postfix) +user postfix [postfix_mailstats] group adm From 2d537ed111008c7be03b6b1b7d948290d022b5a2 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 18 Mar 2011 19:21:56 +0100 Subject: [PATCH 2/5] Remove duplicated "setsid" config line. --- templates/munin-node.conf.Debian.squeeze | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/munin-node.conf.Debian.squeeze b/templates/munin-node.conf.Debian.squeeze index da4cd7e..4565020 100644 --- a/templates/munin-node.conf.Debian.squeeze +++ b/templates/munin-node.conf.Debian.squeeze @@ -14,7 +14,6 @@ host <%= munin_host_real %> port <%= munin_port_real %> user root group root -setsid yes # Regexps for files to ignore From 5a5fd1bf2496510a49bab019b221afcc266bf204 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 18 Mar 2011 19:24:28 +0100 Subject: [PATCH 3/5] Add support for OpenVZ, similar to vserver. This adds munin::plugins::openvz, derived from vserver, and uses it in the munin::client class. --- manifests/client.pp | 9 +++++++-- manifests/plugin.pp | 10 ++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/manifests/client.pp b/manifests/client.pp index 837f3ac..bf53b2a 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -32,9 +32,14 @@ case $vserver { guest: { include munin::plugins::vserver } default: { - include munin::plugins::linux case $virtual { - xen0: { include munin::plugins::xen } + openvzve: { include munin::plugins::openvz } + default: { + include munin::plugins::linux + case $virtual { + xen0: { include munin::plugins::xen } + } + } } } } diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 04a54f9..12cc0ca 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -127,3 +127,13 @@ } } + +class munin::plugins::openvz inherits munin::plugins::vserver { + + plugin { + [ df, df_inode, fw_packets, load, memory, threads, uptime, cpu, users, vmstat ]: + ensure => present; + } + + include munin::plugins::interfaces +} From 65f5690b2e7f85707f504dcaf88f55310206a1ea Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 18 Mar 2011 19:28:00 +0100 Subject: [PATCH 4/5] Fix df plugin: user root, include "simfs". "user root" is required if you have some mounts in /root, so that only root can read them. Related munin bug report are at: http://munin-monitoring.org/ticket/983 and http://munin-monitoring.org/ticket/940. Re-define env.exlude to not exclude "simfs", which is the OpenVZ file system. --- files/munin-node.squeeze | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/files/munin-node.squeeze b/files/munin-node.squeeze index 3595c7f..1666f2d 100644 --- a/files/munin-node.squeeze +++ b/files/munin-node.squeeze @@ -83,3 +83,9 @@ user root user ejabberd env.statuses available away chat xa env.days 1 7 30 + +# required for mounts in /root ("df: `/root/.dotfiles': Permission denied") +[df*] +user root +# do not exclude "simfs" (OpenVZ) +env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs From dbdda9115c0c8cfe0a33025e9be92da984f2b8a6 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 18 Mar 2011 19:31:52 +0100 Subject: [PATCH 5/5] Use user munin for munin_stats. This apparently was/is required, although I do not know any details anymore unfortunately. --- files/munin-node.squeeze | 3 +++ 1 file changed, 3 insertions(+) diff --git a/files/munin-node.squeeze b/files/munin-node.squeeze index 1666f2d..22b5dec 100644 --- a/files/munin-node.squeeze +++ b/files/munin-node.squeeze @@ -89,3 +89,6 @@ env.days 1 7 30 user root # do not exclude "simfs" (OpenVZ) env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs + +[munin_stats] +user munin