Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

Moved TableDownComm's backing store to, well, Store...

by Sven Panne

Module: check_mk Branch: master Commit: 303389f41c1931316f4723a063eb2c5e0f4a1071 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=303389f41c1931… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 15 14:03:04 2016 +0200 Moved TableDownComm's backing store to, well, Store... This way the data lives where it belongs, and TableDownComm's interface is almost identical now in both check_mk and cmc. --- livestatus/src/DownCommColumn.cc | 19 ++++--- livestatus/src/DownCommColumn.h | 2 + livestatus/src/DowntimesOrComments.cc | 87 +++++++++++++++++++++++++++++++++ livestatus/src/DowntimesOrComments.h | 49 +++++++++++++++++++ livestatus/src/Makefile.am | 1 + livestatus/src/Store.cc | 16 +++--- livestatus/src/Store.h | 27 +++++----- livestatus/src/TableDownComm.cc | 66 ++----------------------- livestatus/src/TableDownComm.h | 18 ++----- 9 files changed, 182 insertions(+), 103 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=303389f41c…

8 years, 5 months

update for wk3022: changed name of logwatch statefile

by Andreas Boesl

Module: check_mk Branch: master Commit: 192a3b81e961db79a55d23710f19a0c09616877b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=192a3b81e961db… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 15 14:20:04 2016 +0200 update for wk3022: changed name of logwatch statefile --- agents/plugins/mk_logwatch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 6697358..24c758a 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -56,17 +56,25 @@ else: mk_confdir = os.getenv("MK_CONFDIR") or "." mk_vardir = os.getenv("MK_VARDIR") or "." -remote_hostname = os.getenv("REMOTE", "") print "<<<logwatch>>>" config_filename = mk_confdir + "/logwatch.cfg" config_dir = mk_confdir + "/logwatch.d/*.cfg" + +# Determine the name of the state file +# $REMOTE set -> logwatch.state.$REMOTE +# $REMOTE not set and a tty -> logwatch.state.local +# $REMOTE not set and not a tty -> logwatch.state +remote_hostname = os.getenv("REMOTE", "") if remote_hostname != "": - status_filename = "%s/mk_logwatch_%s.state" % (mk_vardir, remote_hostname) + status_filename = "%s/logwatch.state.%s" % (mk_vardir, remote_hostname) else: - status_filename = "%s/mk_logwatch.state" % mk_vardir + if sys.stdout.isatty(): + status_filename = "%s/logwatch.state.local" % mk_vardir + else: + status_filename = "%s/logwatch.state" % mk_vardir # Copy the last known state from the logwatch.state when there is no status_filename yet. if not os.path.exists(status_filename) and os.path.exists("%s/logwatch.state" % mk_vardir):

8 years, 5 months

Added sending host to SNMP trap parse errors

by Lars Michelsen

Module: check_mk Branch: master Commit: 7fa4335e87a242a78c8f53e8bef9f8154f529e2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fa4335e87a242… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 15 14:06:08 2016 +0200 Added sending host to SNMP trap parse errors --- bin/mkeventd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 3e41564..90bec36 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -1420,9 +1420,11 @@ class EventServer: # Read events from builtin snmptrap server if self._snmptrap != None and self._snmptrap.fileno() in readable: try: - self.process_raw_data(self.process_snmptrap, self._snmptrap.recvfrom(65535)) + data = self._snmptrap.recvfrom(65535) + self.process_raw_data(self.process_snmptrap, data) except Exception, e: - log('Exception handling a snmptrap (skipping this one): %s' % format_exception()) + log('Exception handling a SNMP trap from "%s". Skipping this one.\n%s' % + (data[1][0], format_exception())) # check wether or not spool files are available spool_dir = g_state_dir + "/spool"

8 years, 5 months

3380 FIX Fixed graphs in service notifications having spaces in service descriptions

by Lars Michelsen

Module: check_mk Branch: master Commit: 292dd47e2c03aff9106292d771197cdee531c8fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=292dd47e2c03af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 15 13:31:15 2016 +0200 3380 FIX Fixed graphs in service notifications having spaces in service descriptions --- .werks/3380 | 10 ++++++++++ ChangeLog | 1 + notifications/mail | 10 ++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/3380 b/.werks/3380 new file mode 100644 index 0000000..7caa0d7 --- /dev/null +++ b/.werks/3380 @@ -0,0 +1,10 @@ +Title: Fixed graphs in service notifications having spaces in service descriptions +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460719843 + + diff --git a/ChangeLog b/ChangeLog index 0aedf0c..2a9c447 100644 --- a/ChangeLog +++ b/ChangeLog @@ -274,6 +274,7 @@ * 3263 Notifications: allow users to restrict by their contact groups... * 3253 FIX: sms: notification script sms now handles single quotes in the message in the right way * 3346 FIX: Re-added envelope sender to asciimail/mail notification plugins + * 3380 FIX: Fixed graphs in service notifications having spaces in service descriptions BI: * 3271 New option in aggregation for tuning aggregation of downtimes... diff --git a/notifications/mail b/notifications/mail index 2fb5564..015902a 100755 --- a/notifications/mail +++ b/notifications/mail @@ -36,6 +36,7 @@ import os, re, sys, subprocess +import urllib import urllib2 import base64 @@ -504,14 +505,15 @@ def render_cmk_graphs(context): svc_desc = context["SERVICEDESC"] url = "http://localhost:%d/%s/check_mk/ajax_graph_images.py?host=%s&service=%s" % \ - (get_apache_port(), os.environ["OMD_SITE"], context["HOSTNAME"], svc_desc) + (get_apache_port(), os.environ["OMD_SITE"], + urllib.quote(context["HOSTNAME"]), urllib.quote(svc_desc)) try: json_data = urllib2.urlopen(url).read() except Exception, e: if opt_debug: raise - sys.stderr.write("ERROR: Failed to fetch graphs: %s\n" % e) + sys.stderr.write("ERROR: Failed to fetch graphs: %s\nURL: %s\n" % (e, url)) return [] try: @@ -519,8 +521,8 @@ def render_cmk_graphs(context): except Exception, e: if opt_debug: raise - sys.stderr.write("ERROR: Failed to decode graphs: %s\nData: %s\n" % - (e, json_data)) + sys.stderr.write("ERROR: Failed to decode graphs: %s\nURL: %s\nData: %r\n" % + (e, url, json_data)) return [] return map(base64.b64decode, base64_strings)

8 years, 5 months

mail: Improved error handling in case of graph fetching issues

by Lars Michelsen

Module: check_mk Branch: master Commit: 7b1419fb46ea13ca7100613fd000876d4edbaecc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b1419fb46ea13… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 15 13:20:23 2016 +0200 mail: Improved error handling in case of graph fetching issues --- notifications/mail | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/notifications/mail b/notifications/mail index a664ccf..2fb5564 100755 --- a/notifications/mail +++ b/notifications/mail @@ -511,10 +511,19 @@ def render_cmk_graphs(context): except Exception, e: if opt_debug: raise - sys.stderr.write("ERROR: %s\n" % e) + sys.stderr.write("ERROR: Failed to fetch graphs: %s\n" % e) return [] - return map(base64.b64decode, json.loads(json_data)) + try: + base64_strings = json.loads(json_data) + except Exception, e: + if opt_debug: + raise + sys.stderr.write("ERROR: Failed to decode graphs: %s\nData: %s\n" % + (e, json_data)) + return [] + + return map(base64.b64decode, base64_strings) def get_omd_config(key):

8 years, 5 months

3411 mysql_slave: now max time and related state can be configured if slave-IO and slave-SQL are not running

by Simon Betz

Module: check_mk Branch: master Commit: 3873a8291346e2c5a68909fe9808a0109f6c379e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3873a8291346e2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 15 11:46:57 2016 +0200 3411 mysql_slave: now max time and related state can be configured if slave-IO and slave-SQL are not running --- .werks/3411 | 9 +++++ ChangeLog | 1 + checks/mysql_slave | 73 +++++++++++++++++++++++----------- web/plugins/wato/check_parameters.py | 13 ++++++ 4 files changed, 72 insertions(+), 24 deletions(-) diff --git a/.werks/3411 b/.werks/3411 new file mode 100644 index 0000000..daefe79 --- /dev/null +++ b/.werks/3411 @@ -0,0 +1,9 @@ +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 a671347..0aedf0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ 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 * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/mysql_slave b/checks/mysql_slave index 6d89d6e..aa73d9f 100644 --- a/checks/mysql_slave +++ b/checks/mysql_slave @@ -78,40 +78,65 @@ 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']: - output.append('Slave-IO: running') - else: - output.append('Slave-IO: not running(!!)') - state = 2 - - if data['Slave_SQL_Running']: - output.append('Slave-SQL: running') + 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()) # Makes only sense to monitor the age when the SQL slave is running - if data['Seconds_Behind_Master'] == 'NULL': - output.append('Time behind master: NULL (Lost connection?)(!!)') + if seconds_behind_master == 'NULL': + infotext += ', Time behind master: NULL (Lost connection?)(!!)' state = 2 else: - 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: + infotext += ', Time behind Master: %s' % get_age_human_readable(seconds_behind_master) + if crit != None and seconds_behind_master > crit: state = 2 - 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(!!)') + 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(!!)' state = 2 - return state, ', '.join(output), perfdata + return state, infotext, 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 9d717e1..f2db844 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6695,6 +6695,19 @@ 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(

8 years, 5 months

Internal cleanups: cleaned up some dynamic function declarations

by Lars Michelsen

Module: check_mk Branch: master Commit: 75170cdc44fa4303562acfcd424ce248698446b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75170cdc44fa43… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 14 17:40:36 2016 +0200 Internal cleanups: cleaned up some dynamic function declarations --- web/plugins/icons/wato.py | 14 +++++++++++--- web/plugins/views/layouts.py | 6 +++++- web/plugins/views/mkeventd.py | 14 +++++++++++--- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py index 02aaa89..ffc154c 100644 --- a/web/plugins/icons/wato.py +++ b/web/plugins/icons/wato.py @@ -80,7 +80,15 @@ multisite_icons_and_actions['wato'] = { # | Action for downloading the current agent output | # '----------------------------------------------------------------------' -def paint_download_agent_output(what, row, tags, host_custom_vars, ty): +def paint_download_agent_output(*args): + return paint_download_host_info(*args, ty="agent") + + +def paint_download_snmp_walk(*args): + return paint_download_host_info(*args, ty="walk") + + +def paint_download_host_info(what, row, tags, host_custom_vars, ty): if (what == "host" or (what == "service" and row["service_description"] == "Check_MK")) \ and config.may("wato.download_agent_output") \ and not row["host_check_type"] == 2: # Not for shadow hosts @@ -109,14 +117,14 @@ def paint_download_agent_output(what, row, tags, host_custom_vars, ty): multisite_icons_and_actions['download_agent_output'] = { 'host_columns' : [ "filename", "check_type" ], - 'paint' : lambda *args: paint_download_agent_output(*args, ty="agent"), + 'paint' : paint_download_agent_output, 'toplevel' : False, 'sort_index' : 50, } multisite_icons_and_actions['download_snmp_walk'] = { 'host_columns' : [ "filename" ], - 'paint' : lambda *args: paint_download_agent_output(*args, ty="walk"), + 'paint' : paint_download_snmp_walk, 'toplevel' : False, 'sort_index' : 50, } diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 5640a3c..e2e248d 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -350,9 +350,13 @@ multisite_layouts["boxed"] = { # '----------------------------------------------------------------------' +def render_grouped_boxed_graphs(*args): + return render_grouped_boxes(*args, css_class="graph") + + multisite_layouts["boxed_graph"] = { "title" : _("Balanced graph boxes"), - "render" : lambda *args: render_grouped_boxes(*args + ("graph",)), + "render" : render_grouped_boxed_graphs, "group" : True, "checkboxes" : True, } diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index 19039bd..135829b 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -42,7 +42,15 @@ except: # | | # '----------------------------------------------------------------------' -def table_events(what, columns, add_headers, only_sites, limit, filters): +def table_event_history(*args): + return table_event_table("history", *args) + + +def table_events(*args): + return table_event_table("events", *args) + + +def table_event_table(what, columns, add_headers, only_sites, limit, filters): # First we fetch the list of all events from mkeventd - either current # or historic ones. We ignore any filters for host_ here. Note: # event_host and host_name needn't be compatible. They might differ @@ -299,7 +307,7 @@ if mkeventd_enabled: multisite_datasources["mkeventd_events"] = { "title" : _("Event Console: Current Events"), - "table" : lambda *args: table_events('events', *args), + "table" : table_events, "infos" : [ "event", "host" ], "keys" : [], "idkeys" : [ 'site', 'host_name', 'event_id' ], @@ -308,7 +316,7 @@ if mkeventd_enabled: multisite_datasources["mkeventd_history"] = { "title" : _("Event Console: Event History"), - "table" : lambda *args: table_events('history', *args), + "table" : table_event_history, "infos" : [ "history", "event", "host" ], "keys" : [], "idkeys" : [ 'site', 'host_name', 'event_id', 'history_line' ],

8 years, 5 months

3379 FIX Fixed error resotring WATO snapshot without Check_MK configuration

by Lars Michelsen

Module: check_mk Branch: master Commit: f232bbaeb6beebdf8405409f5d70571305af4b04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f232bbaeb6beeb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 15 08:49:41 2016 +0200 3379 FIX Fixed error resotring WATO snapshot without Check_MK configuration --- .werks/3379 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/3379 b/.werks/3379 new file mode 100644 index 0000000..77fb27b --- /dev/null +++ b/.werks/3379 @@ -0,0 +1,10 @@ +Title: Fixed error resotring WATO snapshot without Check_MK configuration +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460702940 + + diff --git a/ChangeLog b/ChangeLog index ebea404..a671347 100644 --- a/ChangeLog +++ b/ChangeLog @@ -267,6 +267,7 @@ * 3024 FIX: Fixed WATO GIT version control for older (<2.0) GIT versions * 3377 FIX: Network scan: The scan was broken when having no regex exclude patterns since 1.2.8b9 * 3378 FIX: Fixed too long contact group names overflowing WATO folders + * 3379 FIX: Fixed error resotring WATO snapshot without Check_MK configuration Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e9598d7..ca022e9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4920,6 +4920,10 @@ def get_snapshot_status(snapshot, validate_checksums = False): def check_core(): if not defaults.omd_root: return # Do not perform this check in non OMD environments + + if "check_mk.tar.gz" not in status["files"]: + return + cmk_tar = cStringIO.StringIO(access_snapshot(lambda x: multitar.get_file_content(x, 'check_mk.tar.gz'))) files = multitar.list_tar_content(cmk_tar) using_cmc = os.path.exists(defaults.omd_root + '/etc/check_mk/conf.d/microcore.mk')

8 years, 5 months

added configuration example for recently introduced mtr

by Andreas Boesl

Module: check_mk Branch: master Commit: 2d137680db550ae96f6cf0b2d6a977d8dcc960ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d137680db550a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 14 16:44:29 2016 +0200 added configuration example for recently introduced mtr --- agents/cfg_examples/mtr.cfg | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/agents/cfg_examples/mtr.cfg b/agents/cfg_examples/mtr.cfg new file mode 100755 index 0000000..7fb6fa0 --- /dev/null +++ b/agents/cfg_examples/mtr.cfg @@ -0,0 +1,30 @@ +# Mtr Check_MK configuration + +# NOTE: your MTR report shouldn't take longer than 15 minutes + +# [DEFAULTS] +# type=icmp # icmp, tcp or udp +# count=10 # number of pings per mtr report +# force_ipv4=0 # force ipv4, exclusive with force_ipv6 +# force_ipv6=0 # force ipv6, exclusive with force_ipv4 +# size=64 # packet size +# time=0 # minimum time between runs, 0 / default means run if mtr doesn't run anymore +# port=80 # UDP/TCP port to connect to +# dns=0 # Use DNS resolution to lookup addresses +# address= # Bind to source address +# interval= # time MTR waits between sending pings +# timeout= # ping Timeout, see mtr man page + +[www.google.com] +type = icmp +force_ipv4 = true +dns = 1 + +[ipv6.google.com] +type = icmp +force_ipv6 = true + +[mathias-kettner.de] +type = tcp +force_ipv4 = true +

8 years, 5 months

fixed mk_apt output

by Simon Betz

Module: check_mk Branch: master Commit: a4b54d6c1d54c677239c7aae602499e8ba0c6832 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4b54d6c1d54c6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 14 16:30:26 2016 +0200 fixed mk_apt output --- agents/plugins/mk_apt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_apt b/agents/plugins/mk_apt index 5abcf4f..19369de 100755 --- a/agents/plugins/mk_apt +++ b/agents/plugins/mk_apt @@ -55,6 +55,6 @@ if type apt-get > /dev/null ; then if [ -z $out ]; then echo "No updates pending for installation" else - echo $out + echo "$out" fi fi

8 years, 5 months

← Newer
1
...
16
17
18
19
20
21
22
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016