12 May
2016
12 May
'16
9:37 a.m.
Module: check_mk
Branch: master
Commit: 409e5e2d1f8e743a718c9166aaa483de27dfc91c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=409e5e2d1f8e74…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Thu May 12 12:19:25 2016 +0200
reverted werk
---
.werks/3411 | 9 -----
ChangeLog | 1 -
checks/mysql_slave | 73 +++++++++++-----------------------
web/plugins/wato/check_parameters.py | 13 ------
4 files changed, 24 insertions(+), 72 deletions(-)
diff --git a/.werks/3411 b/.werks/3411
deleted file mode 100644
index daefe79..0000000
--- a/.werks/3411
+++ /dev/null
@@ -1,9 +0,0 @@
-Title: mysql_slave: now max time and related state can be configured if slave-IO and
slave-SQL are not running
-Level: 1
-Component: checks
-Compatible: compat
-Version: 1.2.9i1
-Date: 1460713517
-Class: feature
-
-
diff --git a/ChangeLog b/ChangeLog
index 536324f..50dde81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,7 +64,6 @@
NOTE: Please refer to the migration notes!
* 3027 mtr (Matt's traceroute): New agent plugin...
* 3410 ipmi: now monitors compact/discrete sensors...
- * 3411 mysql_slave: now max time and related state can be configured if slave-IO and
slave-SQL are not running
* 3412 stulz_temp: now has readable sensor names and discovers all possible sensors
which are connected
NOTE: Please refer to the migration notes!
* 3414 New declarator BINARY(...) for OIDs - returning a list of byte values...
diff --git a/checks/mysql_slave b/checks/mysql_slave
index aa73d9f..6d89d6e 100644
--- a/checks/mysql_slave
+++ b/checks/mysql_slave
@@ -78,65 +78,40 @@ def inventory_mysql_slave(parsed):
def check_mysql_slave(item, params, parsed):
if item in parsed:
data = parsed[item]
+
state = 0
perfdata = []
+ output = []
- if data['Slave_IO_Running'] and data['Slave_SQL_Running']:
- infotext = 'Slave-IO: running, Slave-SQL: running'
- seconds_behind_master = data['Seconds_Behind_Master']
- warn, crit = params.get('seconds_behind_master', (None,
None))
- set_item_state("slave_running", time.time())
+ if data['Slave_IO_Running']:
+ output.append('Slave-IO: running')
+ else:
+ output.append('Slave-IO: not running(!!)')
+ state = 2
+
+ if data['Slave_SQL_Running']:
+ output.append('Slave-SQL: running')
# Makes only sense to monitor the age when the SQL slave is running
- if seconds_behind_master == 'NULL':
- infotext += ', Time behind master: NULL (Lost connection?)(!!)'
+ if data['Seconds_Behind_Master'] == 'NULL':
+ output.append('Time behind master: NULL (Lost connection?)(!!)')
state = 2
else:
- infotext += ', Time behind Master: %s' %
get_age_human_readable(seconds_behind_master)
- if crit != None and seconds_behind_master > crit:
+ out = 'Time behind Master: %s' %
get_age_human_readable(data['Seconds_Behind_Master'])
+ warn, crit = params.get('seconds_behind_master', (None, None))
+ if crit != None and data['Seconds_Behind_Master'] > crit:
state = 2
- elif warn != None and seconds_behind_master > warn:
- state = 1
-
- if state:
- infotext += " (warn crit at %s/%s)" % \
- (get_age_human_readable(warn),
- get_age_human_readable(crit))
-
- perfdata.append(('sync_latency', seconds_behind_master, warn,
crit))
-
- elif not data['Slave_IO_Running'] and not
data['Slave_SQL_Running']:
- old_value = get_item_state("slave_running")
- not_running_state, not_running_max_seconds = \
- params.get("slave_not_running", (None, None))
-
- if old_value != None and not_running_state != None and \
- not_running_max_seconds != None:
-
- not_running_age = time.time() - old_value
- infotext = 'Slave-IO: not running, Slave-SQL: not running, Age: %s
(crit at %s)' % \
- (get_age_human_readable(not_running_age),
- get_age_human_readable(not_running_max_seconds))
-
- if not_running_age < not_running_max_seconds:
- state = not_running_state
- else:
- state = 2
-
- else:
- infotext = "Slave-IO: not running(!!), Slave-SQL: not
running(!!)"
- state = 2
-
- elif not data['Slave_IO_Running'] and data['Slave_SQL_Running']:
- infotext = 'Slave-IO: not running(!!), Slave-SQL: running'
- state = 2
-
- elif data['Slave_IO_Running'] and not data['Slave_SQL_Running']:
- infotext = 'Slave-IO: running, Slave-SQL: not running(!!)'
+ out += '(!!)'
+ elif warn != None and data['Seconds_Behind_Master'] > warn:
+ state = max(state, 1)
+ out += '(!)'
+ output.append(out)
+ perfdata.append(('sync_latency',
data['Seconds_Behind_Master'], warn, crit))
+ else:
+ output.append('Slave-SQL: not running(!!)')
state = 2
- return state, infotext, perfdata
-
+ return state, ', '.join(output), perfdata
check_info['mysql_slave'] = {
"parse_function" : parse_mysql_slave,
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 1247a6b..4d92272 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -7136,19 +7136,6 @@ register_check_parameters(
]
)
),
- ( "slave_not_running",
- Tuple(
- title = _("State and max. time if slave is not running"),
- help = _("This rule allows you to configure the state which
will be "
- "reported until the configured time will be
exceeded."),
- elements = [
- MonitoringState(
- default_value = 2,
- ),
- Age(),
- ]
- ),
- ),
],
optional_keys = None),
TextAscii(