aboutsummaryrefslogtreecommitdiff
path: root/manifests/role
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2014-09-26 17:28:38 -0300
committerdrebs <drebs@riseup.net>2014-09-26 17:28:38 -0300
commit57e007f6826cba775f98a53596bdbcea51a78376 (patch)
tree113c6da509f31f7a1d5a9498f8ddf7a323efc88f /manifests/role
parent78c6013ade59478c3f4bdf40b3a7a32d9a354b4c (diff)
downloadpuppet-nodo-57e007f6826cba775f98a53596bdbcea51a78376.tar.gz
puppet-nodo-57e007f6826cba775f98a53596bdbcea51a78376.tar.bz2
Fix munin mysql graph.
Diffstat (limited to 'manifests/role')
-rw-r--r--manifests/role/mail.pp7
-rw-r--r--manifests/role/web.pp7
2 files changed, 10 insertions, 4 deletions
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 7264c29..f12bbcf 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -15,8 +15,11 @@ class nodo::role::mail {
}
# Graph mysql
- munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]:
- config => "user root",
+ package { 'libcache-cache-perl': # needed by munin mysql plugin
+ ensure => present,
+ }
+ munin::plugin { [ 'mysql_', 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]:
+ config => 'user root\nenv.mysqluser debian-sys-maint\nenv.mysqlconnection DBI:mysql:mysql;mysql_read_default_file=/etc/mysql/debian.cnf',
ensure => $virtual ? {
true => present,
default => absent,
diff --git a/manifests/role/web.pp b/manifests/role/web.pp
index c4aa890..b01cb00 100644
--- a/manifests/role/web.pp
+++ b/manifests/role/web.pp
@@ -10,9 +10,12 @@ class nodo::role::web inherits nodo::base::vserver {
ensure => present,
}
- munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]:
+ package { 'libcache-cache-perl': # needed by munin mysql plugin
ensure => present,
- config => "user root",
+ }
+ munin::plugin { [ 'mysql_', 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]:
+ ensure => present,
+ config => 'user root\nenv.mysqluser debian-sys-maint\nenv.mysqlconnection DBI:mysql:mysql;mysql_read_default_file=/etc/mysql/debian.cnf',
}
# Classes for web nodes