opuppet/module-mysql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge commit '356fdab8147f8a32a3f14514f2bb77f4f312c734' into shared

Browse source 
Conflicts:
	files/munin/mysql_connections
	manifests/server/base.pp
	manifests/server/munin/default.pp
This commit is contained in:
Micah Anderson 2012-03-07 11:49:28 -05:00
commit d66e58c325
3 changed files with 46 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
files/munin/mysql_connections
View file

@ -1,5 +1,21 @@
#!/usr/bin/perl
#
# Copyright (C) 2008 Rackspace US, Inc. <http://www.rackspace.com>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; version 2 dated June,
# 1991.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see http://www.gnu.org/licenses/gpl.txt
#
#
# This plugin is based off of the Connection Usage
# section of the MySQL Connection Health Page
#
@ -83,7 +99,7 @@ sub poll_variables {
sub print_graph_information {
print <<EOM;
graph_title MySQL Connections
graph_args --base 1000 -l 0
graph_args --base 1000 --lower-limit 0
graph_vlabel Connections
graph_info The number of current connections with respect to the max_connections setting.
graph_category mysql
@ -106,20 +122,20 @@ sub test_service {
system ("$MYSQLADMIN --version >/dev/null 2>/dev/null");
if ($? == 0)
{
system ("$TEST_COMMAND >/dev/null 2>/dev/null");
if ($? == 0)
{
print "yes\n";
$return = 0;
}
else
{
print "no (could not connect to mysql)\n";
}
system ("$TEST_COMMAND >/dev/null 2>/dev/null");
if ($? == 0)
{
print "yes\n";
$return = 0;
}
else
{
print "no (could not connect to mysql)\n";
}
}
else
{
print "no (mysqladmin not found)\n";
print "no (mysqladmin not found)\n";
}
exit $return;
}

4
manifests/server/base.pp
View file

@ -55,8 +55,8 @@ class mysql::server::base {
}
exec { 'mysql_set_rootpw':
command => "/usr/local/sbin/setmysqlpass.sh",
unless => "/usr/bin/mysqladmin -uroot status > /dev/null",
command => '/usr/local/sbin/setmysqlpass.sh',
unless => '/usr/bin/mysqladmin -uroot status > /dev/null',
require => [ File['mysql_setmysqlpass.sh'], Package['mysql-server'] ],
refreshonly => true,
}

16
manifests/server/munin/default.pp
View file

@ -25,4 +25,20 @@ class mysql::server::munin::default inherits mysql::server::munin::base {
config => "env.mysqlopts --user=munin --password=${munin_mysql_password} -h localhost",
require => [ Mysql_grant['munin@localhost'], Mysql_user['munin@localhost'], Package['mysql'] ];
}
Munin::Plugin::Deploy {
config => "env.mysqlopts --user=munin --password=$munin_mysql_password -h localhost",
require =>
[ Mysql_grant['munin@localhost'],
Mysql_user['munin@localhost'],
Package['mysql'] ]
}
munin::plugin::deploy{
'mysql_connections':
source => 'mysql/munin/mysql_connections';
'mysql_qcache':
source => 'mysql/munin/mysql_qcache';
'mysql_qcache_mem':
source => 'mysql/munin/mysql_qcache_mem';
}
}