diff options
author | Sven Nierlein <sven@nierlein.org> | 2013-01-24 00:28:14 -0800 |
---|---|---|
committer | Sven Nierlein <sven@nierlein.org> | 2013-01-24 00:28:14 -0800 |
commit | f4bbd88a9f91bfbfbe590b3252043392e7248988 (patch) | |
tree | 933ddc798184ebbc5d98c0e4b801bfd5f6d45610 /plugins | |
parent | 38ad00c191964319d7ed9c003b1afac9cbfd6fe7 (diff) | |
parent | e396a54274b48d91e708be95ed9bce7316a0a595 (diff) | |
download | monitoring-plugins-f4bbd88a9f91bfbfbe590b3252043392e7248988.tar.gz |
Merge pull request #34 from dveeden/master
MySQL Requirements and Comments fix
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/check_mysql.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c index 4fbdc2b9..51579c2a 100644 --- a/plugins/check_mysql.c +++ b/plugins/check_mysql.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * License: GPL | 5 | * License: GPL |
6 | * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at) | 6 | * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at) |
7 | * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) | 7 | * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) |
8 | * Copyright (c) 1999-2009 Nagios Plugins Development Team | 8 | * Copyright (c) 1999-2011 Nagios Plugins Development Team |
9 | * | 9 | * |
10 | * Description: | 10 | * Description: |
11 | * | 11 | * |
@@ -31,7 +31,7 @@ | |||
31 | *****************************************************************************/ | 31 | *****************************************************************************/ |
32 | 32 | ||
33 | const char *progname = "check_mysql"; | 33 | const char *progname = "check_mysql"; |
34 | const char *copyright = "1999-2007"; | 34 | const char *copyright = "1999-2011"; |
35 | const char *email = "nagiosplug-devel@lists.sourceforge.net"; | 35 | const char *email = "nagiosplug-devel@lists.sourceforge.net"; |
36 | 36 | ||
37 | #define SLAVERESULTSIZE 70 | 37 | #define SLAVERESULTSIZE 70 |
@@ -157,7 +157,7 @@ main (int argc, char **argv) | |||
157 | } | 157 | } |
158 | 158 | ||
159 | } else { | 159 | } else { |
160 | /* mysql 4.x.x */ | 160 | /* mysql 4.x.x and mysql 5.x.x */ |
161 | int slave_io_field = -1 , slave_sql_field = -1, seconds_behind_field = -1, i, num_fields; | 161 | int slave_io_field = -1 , slave_sql_field = -1, seconds_behind_field = -1, i, num_fields; |
162 | MYSQL_FIELD* fields; | 162 | MYSQL_FIELD* fields; |
163 | 163 | ||
@@ -178,13 +178,17 @@ main (int argc, char **argv) | |||
178 | } | 178 | } |
179 | } | 179 | } |
180 | 180 | ||
181 | /* Check if slave status is available */ | ||
181 | if ((slave_io_field < 0) || (slave_sql_field < 0) || (num_fields == 0)) { | 182 | if ((slave_io_field < 0) || (slave_sql_field < 0) || (num_fields == 0)) { |
182 | mysql_free_result (res); | 183 | mysql_free_result (res); |
183 | mysql_close (&mysql); | 184 | mysql_close (&mysql); |
184 | die (STATE_CRITICAL, "Slave status unavailable\n"); | 185 | die (STATE_CRITICAL, "Slave status unavailable\n"); |
185 | } | 186 | } |
186 | 187 | ||
188 | /* Save slave status in slaveresult */ | ||
187 | snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s Seconds Behind Master: %s", row[slave_io_field], row[slave_sql_field], seconds_behind_field!=-1?row[seconds_behind_field]:"Unknown"); | 189 | snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s Seconds Behind Master: %s", row[slave_io_field], row[slave_sql_field], seconds_behind_field!=-1?row[seconds_behind_field]:"Unknown"); |
190 | |||
191 | /* Raise critical error if SQL THREAD or IO THREAD are stopped */ | ||
188 | if (strcmp (row[slave_io_field], "Yes") != 0 || strcmp (row[slave_sql_field], "Yes") != 0) { | 192 | if (strcmp (row[slave_io_field], "Yes") != 0 || strcmp (row[slave_sql_field], "Yes") != 0) { |
189 | mysql_free_result (res); | 193 | mysql_free_result (res); |
190 | mysql_close (&mysql); | 194 | mysql_close (&mysql); |
@@ -199,6 +203,7 @@ main (int argc, char **argv) | |||
199 | } | 203 | } |
200 | } | 204 | } |
201 | 205 | ||
206 | /* Check Seconds Behind against threshold */ | ||
202 | if ((seconds_behind_field != -1) && (strcmp (row[seconds_behind_field], "NULL") != 0)) { | 207 | if ((seconds_behind_field != -1) && (strcmp (row[seconds_behind_field], "NULL") != 0)) { |
203 | double value = atof(row[seconds_behind_field]); | 208 | double value = atof(row[seconds_behind_field]); |
204 | int status; | 209 | int status; |