Skip to content

Please pull my fixes to the module. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Please pull my fixes to the module. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96ec278
Fix wrong "user (postfix)" config.
blueyed Mar 18, 2011
2d537ed
Remove duplicated "setsid" config line.
blueyed Mar 18, 2011
5a5fd1b
Add support for OpenVZ, similar to vserver.
blueyed Mar 18, 2011
65f5690
Fix df plugin: user root, include "simfs".
blueyed Mar 18, 2011
dbdda91
Use user munin for munin_stats.
blueyed Mar 18, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion files/munin-node
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion files/munin-node.lenny
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 10 additions & 1 deletion files/munin-node.squeeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ env.mysqlopts --defaults-file=/etc/mysql/debian.cnf


[postfix_mailqueue]
user (postfix)
user postfix

[postfix_mailstats]
group adm
Expand All @@ -83,3 +83,12 @@ 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

[munin_stats]
user munin
2 changes: 1 addition & 1 deletion files/munin-node.squeeze.1.2.6-17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ env.mysqlopts --defaults-file=/etc/mysql/debian.cnf


[postfix_mailqueue]
user (postfix)
user postfix

[postfix_mailstats]
group adm
Expand Down
9 changes: 7 additions & 2 deletions manifests/client.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
}
}
}
}
Expand Down
10 changes: 10 additions & 0 deletions manifests/plugin.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
1 change: 0 additions & 1 deletion templates/munin-node.conf.Debian.squeeze
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ host <%= munin_host_real %>
port <%= munin_port_real %>
user root
group root
setsid yes

# Regexps for files to ignore

Expand Down