Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

Fixed possible wrong catching of helper timeouts

by Lars Michelsen

Module: check_mk Branch: master Commit: 4bfe28fb6342ae0af14a04a959cc2a355f48cfdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bfe28fb6342ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 13 10:29:45 2016 +0200 Fixed possible wrong catching of helper timeouts --- modules/check_mk_base.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 5d7f15b..564f0af 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -2401,6 +2401,9 @@ def check_timeperiod(timeperiod): try: response = simple_livestatus_query("GET timeperiods\nColumns: name\nFilter: in = 0\n") g_inactive_timerperiods = response.splitlines() + except MKTimeout: + raise + except Exception, e: if opt_debug: raise

8 years, 1 month

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 972d9adc33b33609c33dc0e132f11fe452bc7af3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=972d9adc33b336… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 13 09:29:38 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/AttributelistColumn.cc | 6 +++--- livestatus/src/HostFileColumn.cc | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/livestatus/src/AttributelistColumn.cc b/livestatus/src/AttributelistColumn.cc index 937d1d7..c98782f 100644 --- a/livestatus/src/AttributelistColumn.cc +++ b/livestatus/src/AttributelistColumn.cc @@ -75,11 +75,11 @@ void AttributelistColumn::output(void *data, Query *query) { if (_show_list) { unsigned i = 0; bool first = true; - query->outputBeginSublist(); + query->outputBeginList(); while (al_entries[i].name != nullptr) { if ((mask & al_entries[i].bitvalue) != 0u) { if (!first) { - query->outputSublistSeparator(); + query->outputListSeparator(); } else { first = false; } @@ -87,7 +87,7 @@ void AttributelistColumn::output(void *data, Query *query) { } i++; } - query->outputEndSublist(); + query->outputEndList(); } else { query->outputUnsignedLong(mask); } diff --git a/livestatus/src/HostFileColumn.cc b/livestatus/src/HostFileColumn.cc index ff92349..feb5be0 100644 --- a/livestatus/src/HostFileColumn.cc +++ b/livestatus/src/HostFileColumn.cc @@ -66,7 +66,11 @@ unique_ptr<vector<char>> HostFileColumn::getBlob(void *data) { string path = _base_dir + "/" + host_name + _suffix; int fd = open(path.c_str(), O_RDONLY); if (fd < 0) { - logger(LG_WARN, "Cannot open %s: %s", path.c_str(), strerror(errno)); + // It is OK when inventory/logwatch files do not exist. + if (errno != ENOENT) { + logger(LG_WARN, "Cannot open %s: %s", path.c_str(), + strerror(errno)); + } return nullptr; }

8 years, 1 month

3472 Service list of a host: Move section of vanished services to top of the page

by Mathias Kettner

Module: check_mk Branch: master Commit: a8cf313facf1520c9d2d991071b65c24ebbaaa8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8cf313facf152… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 13 08:22:48 2016 +0200 3472 Service list of a host: Move section of vanished services to top of the page The vanished services usually indicate a problem or invalid service configuration and should be shown rather on the top of the page then after the long list of services. --- .werks/3472 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/3472 b/.werks/3472 new file mode 100644 index 0000000..5e7f55e --- /dev/null +++ b/.werks/3472 @@ -0,0 +1,11 @@ +Title: Service list of a host: Move section of vanished services to top of the page +Level: 2 +Component: wato +Class: feature +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1463120501 + +The vanished services usually indicate a problem or invalid service configuration and +should be shown rather on the top of the page then after the long list of services. diff --git a/ChangeLog b/ChangeLog index 50dde81..0f1cbcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -298,6 +298,7 @@ * 3116 Timerange buttons for downtimes can now be configured... * 3469 Show type of rule match of a rule (first, per-parameter, all) in WATO... * 3130 periodic service discovery can now be configured to not activate specific service changes... + * 3472 Service list of a host: Move section of vanished services to top of the page... * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 881fd35..4e7518c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2771,10 +2771,10 @@ def show_service_table(host, firsttime): divid = 0 for state_name, check_source, checkbox in [ ( _("Available (missing) services"), "new", firsttime ), - ( _("Already configured services"), "old", True, ), ( _("Obsolete services (being checked, but should be ignored)"), "obsolete", True ), # Cannot happen anymore - ( _("Disabled services (configured away by admin)"), "ignored", None), ( _("Vanished services (checked, but no longer exist)"), "vanished", True ), + ( _("Already configured services"), "old", True, ), + ( _("Disabled services (configured away by admin)"), "ignored", None), ( _("Active checks"), "active", None ), ( _("Manual services (defined in main.mk)"), "manual", None ), ( _("Legacy services (defined in main.mk)"), "legacy", None ),

8 years, 1 month

reverted werk

by Simon Betz

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(

8 years, 1 month

Revert "Testcommit"

by Lars Michelsen

Module: check_mk Branch: master Commit: 39a0500fb1a54ed73157f4451d7d28ff4fcfdf1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39a0500fb1a54e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 12 16:33:57 2016 +0200 Revert "Testcommit" This reverts commit 92a8302d91a1b9ef65097cdb9bf013e6f652ffb8. --- modules/check_mk.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index f47f2ec..2bfae88 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -45,8 +45,6 @@ import fcntl import py_compile import inspect -IPHQQ@RQAR@AR@rq2tt23t6532 - import cmk.tty as tty # These variable will be substituted at 'make dist' time

8 years, 1 month

3530 FIX agent_vsphere: improved performance, too much perfcounters were queried

by Andreas Boesl

Module: check_mk Branch: master Commit: c547f7472f5e5845c7cbdca3c8229bd9ac1d997a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c547f7472f5e58… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu May 12 14:50:08 2016 +0200 3530 FIX agent_vsphere: improved performance, too much perfcounters were queried --- .werks/3530 | 9 +++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3530 b/.werks/3530 new file mode 100644 index 0000000..6fb3fc3 --- /dev/null +++ b/.werks/3530 @@ -0,0 +1,9 @@ +Title: agent_vsphere: improved performance, too much perfcounters were queried +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1463057382 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 3986c6c..536324f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -215,6 +215,7 @@ * 3573 FIX: ps: Fixed possible wrong matching of ps and ucb ps commands * 3131 FIX: if64, if64adm: These checks now display the speed of interfaces slower than 1Mbit correctly... * 3470 FIX: mounts: Fix exception when displaying check parameters in WATO services list... + * 3530 FIX: agent_vsphere: improved performance, too much perfcounters were queried Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index f70284f..eb23c67 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1312,7 +1312,7 @@ if not error: max_samples = 3 if last_cookie_access_time: timedelta = time.time() - last_cookie_access_time - max_samples = min(180, max(1, int(timedelta) / 2)) + max_samples = min(180, max(1, int(timedelta) / 20)) hostnames = hostsystems.keys() counter_data_payload = telegram_list["perfcounterdata"]

8 years, 1 month

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 92a8302d91a1b9ef65097cdb9bf013e6f652ffb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92a8302d91a1b9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 12 13:55:39 2016 +0200 Testcommit --- modules/check_mk.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 2bfae88..f47f2ec 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -45,6 +45,8 @@ import fcntl import py_compile import inspect +IPHQQ@RQAR@AR@rq2tt23t6532 + import cmk.tty as tty # These variable will be substituted at 'make dist' time

8 years, 1 month

Fix recent bug in error handler in logwatch

by Mathias Kettner

Module: check_mk Branch: master Commit: 1272a35dd894d924ef6665d27d2708483143e85c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1272a35dd894d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 12 13:10:05 2016 +0200 Fix recent bug in error handler in logwatch --- web/htdocs/logwatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index cec2ff0..88a2642 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -310,7 +310,7 @@ def do_log_ack(site, host_name, file_name): except Exception, e: html.show_error(_('The log file <tt>%s</tt> of host <tt>%s</tt> could not be deleted: %s.') % \ (html.attrencode(display_name), html.attrencode(this_host), e)) - htmt.footer() + html.footer() return html.message('%s%s' % (

8 years, 1 month

fixed error message referring to missing host_in_passive_check_period column

by Sebastian Herbord

Module: check_mk Branch: master Commit: d5591bb757d5b7b302bed7a4e90dff86c96d04f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5591bb757d5b7… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu May 12 08:55:52 2016 +0200 fixed error message referring to missing host_in_passive_check_period column --- web/plugins/icons/builtin.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 3d58868..5a3445b 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -865,13 +865,14 @@ multisite_icons_and_actions['crashed_check'] = { def paint_icon_check_period(what, row, tags, host_custom_vars): - if row['%s_in_passive_check_period' % what] == 0\ - or row['%s_in_check_period' % what] == 0: - return 'pause', _("This %s is currently not being checked") % _(what) + if what == "service": + if row['%s_in_passive_check_period' % what] == 0\ + or row['%s_in_check_period' % what] == 0: + return 'pause', _("This %s is currently not being checked") % _(what) multisite_icons_and_actions['check_period'] = { - 'columns' : ['in_passive_check_period', 'in_check_period'], + 'service_columns' : ['in_passive_check_period', 'in_check_period'], 'paint' : paint_icon_check_period, 'toplevel' : True, }

8 years, 1 month

Fixed acknowledging mk_logwatch logfiles on remote hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: 2ae178516853b9f2b94e6d7adab56b957decfcc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ae178516853b9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 12 08:50:27 2016 +0200 Fixed acknowledging mk_logwatch logfiles on remote hosts --- web/htdocs/logwatch.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 822620d..cec2ff0 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -307,21 +307,25 @@ def do_log_ack(site, host_name, file_name): for this_site, this_host, int_filename, display_name in logs_to_ack: try: acknowledge_logfile(this_site, this_host, int_filename, display_name) - html.message('%s%s' % ( - _('Acknowledged %s') % ack_msg, - _('Acknowledged all messages in %s.') % ack_msg - )) except Exception, e: html.show_error(_('The log file <tt>%s</tt> of host <tt>%s</tt> could not be deleted: %s.') % \ (html.attrencode(display_name), html.attrencode(this_host), e)) + htmt.footer() + return + html.message('%s%s' % ( + _('Acknowledged %s') % ack_msg, + _('Acknowledged all messages in %s.') % ack_msg + )) html.footer() def acknowledge_logfile(site, host_name, int_filename, display_name): if not may_see(site, host_name): raise MKAuthException(_('Permission denied.')) - os.remove(defaults.logwatch_dir + '/' + host_name + '/' + int_filename) + + command = "MK_LOGWATCH_ACKNOWLEDGE;%s;%s" % (host_name, int_filename) + sites.live().command("[%d] %s" % (int(time.time()), command), site) #.

8 years, 1 month

← Newer
1
...
10
11
12
13
14
15
16
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016