Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/90867
Change subject: icinga pmp-check-mysql-innodb idle_blocker_duration
......................................................................
icinga pmp-check-mysql-innodb idle_blocker_duration
Change-Id: I76304c2696b1b2d0681397ca1feb5f2c9a656e3a
---
M manifests/mysql.pp
M templates/icinga/checkcommands.cfg.erb
M templates/icinga/nrpe_coredb_percona.cfg.erb
M templates/icinga/nrpe_percona.cfg.erb
4 files changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/90867/1
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index e97955d..5b6de4f 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -237,6 +237,11 @@
owner => root,
group => root,
mode => 0555;
+
"/usr/lib/nagios/plugins/percona/pmp-check-mysql-innodb":
+ source =>
"puppet:///files/icinga/percona/pmp-check-mysql-innodb",
+ owner => root,
+ group => root,
+ mode => 0555;
}
}
@@ -252,6 +257,7 @@
monitor_service { "mysql replication heartbeat": description =>
"MySQL Replication Heartbeat", check_command =>
"nrpe_check_mysql_slave_heartbeat", critical => false }
monitor_service { "mysql slave delay": description => "MySQL
Slave Delay", check_command => "nrpe_check_mysql_slave_delay", critical =>
false }
monitor_service { "mysql processlist": description => "MySQL
Processlist", check_command => "nrpe_pmp_check_mysql_processlist", critical =>
false }
+ monitor_service { "mysql innodb": description => "MySQL
InnoDB", check_command => "nrpe_pmp_check_mysql_innodb", critical => false }
}
class mysqluser {
@@ -469,6 +475,7 @@
monitor_service { "mysqld": description => "mysqld processes",
check_command => "nrpe_check_mysqld", critical => $crit }
monitor_service { "mysql recent restart": description => "MySQL Recent
Restart", check_command => "nrpe_check_mysql_recent_restart", critical => $crit
}
monitor_service { "mysql processlist": description => "MySQL
Processlist", check_command => "nrpe_pmp_check_mysql_processlist", critical =>
false }
+ monitor_service { "mysql innodb": description => "MySQL InnoDB",
check_command => "nrpe_pmp_check_mysql_innodb", critical => false }
if $no_slave == false {
monitor_service { "full lvs snapshot": description => "Full LVS
Snapshot", check_command => "nrpe_check_lvs", critical => false }
diff --git a/templates/icinga/checkcommands.cfg.erb
b/templates/icinga/checkcommands.cfg.erb
index defdd3f..f0f3608 100644
--- a/templates/icinga/checkcommands.cfg.erb
+++ b/templates/icinga/checkcommands.cfg.erb
@@ -546,6 +546,11 @@
command_line /usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c
pmp_check_mysql_processlist
}
+define command{
+ command_name nrpe_pmp_check_mysql_innodb
+ command_line /usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c
pmp_check_mysql_innodb
+}
+
# end percona mysql checks
define command{
command_name nrpe_check_ircecho
diff --git a/templates/icinga/nrpe_coredb_percona.cfg.erb
b/templates/icinga/nrpe_coredb_percona.cfg.erb
index 9b5edd3..f5ba17e 100644
--- a/templates/icinga/nrpe_coredb_percona.cfg.erb
+++ b/templates/icinga/nrpe_coredb_percona.cfg.erb
@@ -9,3 +9,5 @@
command[check_mysql_slave_heartbeat]=/usr/lib/nagios/plugins/percona/check_mysql_slave_delay
-H localhost -l nagios -p <%=
scope.lookupvar('mysql_wmf::coredb::monitoring::mysql_check_pass') %> -t
heartbeat.heartbeat -s `/usr/local/bin/master_id.py` -w 150 -c 300
command[pmp_check_mysql_processlist]=/usr/lib/nagios/plugins/percona/pmp-check-mysql-processlist
-H localhost -l nagios -p <%=
scope.lookupvar('mysql_wmf::coredb::monitoring::mysql_check_pass') %> -w 32 -c
64
+
+command[pmp_check_mysql_innodb]=/usr/lib/nagios/plugins/percona/pmp-check-mysql-innodb
-H localhost -l nagios -p <%=
scope.lookupvar('mysql_wmf::coredb::monitoring::mysql_check_pass') %> -C
idle_blocker_duration -w 60 -c 600
diff --git a/templates/icinga/nrpe_percona.cfg.erb
b/templates/icinga/nrpe_percona.cfg.erb
index 3f77ec8..97d1f0e 100644
--- a/templates/icinga/nrpe_percona.cfg.erb
+++ b/templates/icinga/nrpe_percona.cfg.erb
@@ -7,3 +7,7 @@
command[check_mysql_slave_delay]=/usr/lib/nagios/plugins/percona/check_mysql_slave_delay
-H localhost -l nagios -p <%=
scope.lookupvar('monitor::percona::files::mysql_check_pass') %> -w 150 -c 180
# slave check using heartbeat
command[check_mysql_slave_heartbeat]=/usr/lib/nagios/plugins/percona/check_mysql_slave_delay
-H localhost -l nagios -p <%=
scope.lookupvar('monitor::percona::files::mysql_check_pass') %> -t
heartbeat.heartbeat -s `/usr/local/bin/master_id.py` -w 150 -c 180
+
+command[pmp_check_mysql_processlist]=/usr/lib/nagios/plugins/percona/pmp-check-mysql-processlist
-H localhost -l nagios -p <%=
scope.lookupvar('monitor::percona::files::mysql_check_pass') %> -w 32 -c 64
+
+command[pmp_check_mysql_innodb]=/usr/lib/nagios/plugins/percona/pmp-check-mysql-innodb
-H localhost -l nagios -p <%=
scope.lookupvar('monitor::percona::files::mysql_check_pass') %> -C
idle_blocker_duration -w 60 -c 600
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/90867
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76304c2696b1b2d0681397ca1feb5f2c9a656e3a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
