From 150ad07e99e8450ef22b707ef610559493567a9f Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 9 Mar 2015 07:23:44 -0300 Subject: Fix munin mysql plugin configuration. --- manifests/role/mail.pp | 2 +- manifests/role/web.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp index 8f496df..93f7ff7 100644 --- a/manifests/role/mail.pp +++ b/manifests/role/mail.pp @@ -19,7 +19,7 @@ class nodo::role::mail { ensure => present, } munin::plugin { [ '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", + config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf", ensure => $virtual ? { true => present, default => absent, diff --git a/manifests/role/web.pp b/manifests/role/web.pp index 0273571..9d3db39 100644 --- a/manifests/role/web.pp +++ b/manifests/role/web.pp @@ -15,7 +15,7 @@ class nodo::role::web inherits nodo::base::vserver { } munin::plugin { [ '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", + config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf", } # Classes for web nodes -- cgit v1.2.3