Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

Fixed issue with former distibuted sites in todays commit

by Lars Michelsen

Module: check_mk Branch: master Commit: c0197673f15c7ad251786faf3aace0f5f0122102 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0197673f15c7a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 3 16:56:56 2016 +0200 Fixed issue with former distibuted sites in todays commit --- web/htdocs/watolib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index d32e7df..639baf6 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3256,7 +3256,8 @@ def delete_distributed_wato_file(): def has_distributed_wato_file(): - return os.path.exists(defaults.check_mk_configdir + "/distributed_wato.mk") + return os.path.exists(defaults.check_mk_configdir + "/distributed_wato.mk") \ + and os.stat(defaults.check_mk_configdir + "/distributed_wato.mk").st_size != 0 # Makes sure, that in distributed mode we monitor only

8 years, 1 month

added missing group

by Simon Betz

Module: check_mk Branch: master Commit: 7f6507770bf1f376be760f850281d187eb058ae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f6507770bf1f3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Aug 3 13:54:20 2016 +0200 added missing group --- checks/ispro_sensors_digital | 7 ++----- checks/ispro_sensors_temp | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/checks/ispro_sensors_digital b/checks/ispro_sensors_digital index f7e6c72..afab12b 100644 --- a/checks/ispro_sensors_digital +++ b/checks/ispro_sensors_digital @@ -26,11 +26,8 @@ # .1.3.6.1.4.1.19011.1.3.2.1.3.1.3.1.2.1 "Water Sensor-R" --> ISPRO-MIB::isDeviceMonitorDigitalInName -# .1.3.6.1.4.1.19011.1.3.2.1.3.1.3.1.3.1 2 --> ISPRO-MIB::isDeviceMonitorDigitalIn # .1.3.6.1.4.1.19011.1.3.2.1.3.1.3.1.4.1 1 --> ISPRO-MIB::isDeviceMonitorDigitalInAlarm # .1.3.6.1.4.1.19011.1.3.2.1.3.2.4.1.3.1 2 --> ISPRO-MIB::isDeviceConfigDigitalInState -# .1.3.6.1.4.1.19011.1.3.2.1.3.2.4.1.4.1 10 --> ISPRO-MIB::isDeviceConfigDigitalInHysteresis -# .1.3.6.1.4.1.19011.1.3.2.1.3.2.4.1.5.1 1 --> ISPRO-MIB::isDeviceConfigDigitalInEventDO def inventory_ispro_sensors_digital(info): @@ -45,8 +42,8 @@ def check_ispro_sensors_digital(item, params, info): "3" : "normal close", }, "alarm" :{ - "1" : (2, "active"), - "2" : (0, "inactive"), + "1" : (0, "active"), + "2" : (2, "inactive"), } } diff --git a/checks/ispro_sensors_temp b/checks/ispro_sensors_temp index d609529..b210dc4 100644 --- a/checks/ispro_sensors_temp +++ b/checks/ispro_sensors_temp @@ -66,5 +66,6 @@ check_info['ispro_sensors_temp'] = { ]), 'snmp_scan_function' : ispro_scan_function, 'has_perfdata' : True, + 'group' : 'temperature', 'includes' : [ 'ispro.include', 'temperature.include' ], }

8 years, 1 month

new bugs

by Sven Rueß

Module: check_mk Branch: master Commit: 7d32fbeee7236897a374bace2e4e6b9eaede39ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d32fbeee72368… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Aug 3 13:35:52 2016 +0200 new bugs --- .bugs/2505 | 9 +++++++++ .bugs/2506 | 12 ++++++++++++ 2 files changed, 21 insertions(+) diff --git a/.bugs/2505 b/.bugs/2505 new file mode 100644 index 0000000..179c72c --- /dev/null +++ b/.bugs/2505 @@ -0,0 +1,9 @@ +Title: Wrong calculation of levels for remaining space in per cent on small filesystems +Component: checks +State: open +Date: 2016-08-03 13:14:29 +Targetversion: 1.2.8 +Class: bug + +On small filesystems like 4KB on routers or switches the calculation of remaining hard disk space at per cent is wrong. +The calculation calculates the wrong levels for it. diff --git a/.bugs/2506 b/.bugs/2506 new file mode 100644 index 0000000..d9b93e3 --- /dev/null +++ b/.bugs/2506 @@ -0,0 +1,12 @@ +Title: Rule Disabled Services only work with positive result +Component: wato +State: open +Date: 2016-08-03 13:19:26 +Targetversion: 1.2.8 +Class: bug + +You want to disable all Services like MSSQL.* and use one rule with a positive outcome. +All services will be disabled. +After that rule you add another one and try to get explizit services again like MSSQL Production$. +That shoudl work with a negative outcome. It will not work. All combinations do not get the result, +that was wished. Disable all services and include only some of them.

8 years, 1 month

Reserved 2 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: ed834c50216d6c24d8a8b20d2be7af547470c67f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed834c50216d6c… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Aug 3 13:13:53 2016 +0200 Reserved 2 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index f59ab94..e7b49f6 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2505 +2507

8 years, 1 month

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: e24c71dfd6383e381f2a80571f764943da4881ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e24c71dfd6383e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 3 11:25:37 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/AttributelistColumn.cc | 47 +++---- livestatus/src/EmptyColumn.cc | 4 +- livestatus/src/Query.cc | 24 ++-- livestatus/src/Query.h | 5 +- livestatus/src/Renderer.cc | 247 ++++++++++++++++++++++----------- livestatus/src/Renderer.h | 23 ++- livestatus/src/RendererBrokenCSV.cc | 4 +- livestatus/src/RendererBrokenCSV.h | 3 +- livestatus/src/RendererCSV.cc | 20 ++- livestatus/src/RendererCSV.h | 5 +- livestatus/src/RendererJSON.cc | 19 +-- livestatus/src/RendererJSON.h | 2 +- livestatus/src/RendererPython.cc | 19 +-- livestatus/src/RendererPython.h | 2 +- livestatus/src/RendererPython3.cc | 19 +-- livestatus/src/RendererPython3.h | 2 +- livestatus/src/ServicelistColumn.cc | 2 +- livestatus/src/Store.cc | 3 +- 18 files changed, 262 insertions(+), 188 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e24c71dfd6…

8 years, 1 month

Fixed broken monitoring with nagios core

by Lars Michelsen

Module: check_mk Branch: master Commit: 6d7787cd15426c47770e7d522c9a50cdddca43ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d7787cd15426c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 3 11:23:31 2016 +0200 Fixed broken monitoring with nagios core --- modules/check_mk.py | 9 --------- modules/check_mk_base.py | 10 ++++++++++ modules/nagios.py | 6 ++++++ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index e095faa..8dff140 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -574,15 +574,6 @@ def active_check_arguments(hostname, description, args): "string of the concatenated arguments (Host: %s, Service: %s)." % (hostname, description)) -def is_snmp_check(check_name): - return check_name.split(".")[0] in snmp_info - - -def is_tcp_check(check_name): - return check_name in check_info \ - and check_name.split(".")[0] not in snmp_info # snmp check basename - - #. # .--Hosts---------------------------------------------------------------. # | _ _ _ | diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 81c89a3..95d36ed 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1582,6 +1582,16 @@ def is_manual_check(hostname, check_type, item): return (check_type, item) in manual_checks +def is_snmp_check(check_name): + return check_name.split(".")[0] in snmp_info + + +def is_tcp_check(check_name): + return check_name in check_info \ + and check_name.split(".")[0] not in snmp_info # snmp check basename + + + def create_crash_dump_info_file(crash_dir, hostname, check_type, item, params, description, info, text): crash_info = crash_reporting.create_crash_info("check", details={ "check_output" : text, diff --git a/modules/nagios.py b/modules/nagios.py index 7ebc92b..01ecda6 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -1114,6 +1114,12 @@ no_discovery_possible = None output.write("def clusters_of(hostname):\n return %r\n\n" % clusters_of(hostname)) + has_board = has_management_board(hostname) + output.write("def has_management_board(hostname):\n return %r\n\n" % has_board) + if has_board: + output.write("def management_address(hostname):\n return %r\n\n" % management_address(hostname)) + output.write("def management_protocol(hostname):\n return %r\n\n" % management_protocol(hostname)) + # snmp hosts output.write("def is_snmp_host(hostname):\n return % r\n\n" % is_snmp_host(hostname)) output.write("def is_snmpv3_host(hostname):\n return % r\n\n" % is_snmpv3_host(hostname))

8 years, 1 month

Updated bug entries #2464, #2463

by Lars Michelsen

Module: check_mk Branch: master Commit: 4dfa63dbaa17b2701f4cf59867313717457b3e62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dfa63dbaa17b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 3 11:13:33 2016 +0200 Updated bug entries #2464, #2463 --- .bugs/2463 | 11 +++++++++++ .bugs/2464 | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/.bugs/2463 b/.bugs/2463 new file mode 100644 index 0000000..26afb67 --- /dev/null +++ b/.bugs/2463 @@ -0,0 +1,11 @@ +Title: Hosts without site attribute are monitored by all sites +Component: core +State: open +Date: 2016-08-03 11:10:47 +Targetversion: 1.2.8 +Class: bug + +When creating a host manually or with "hole" script, these hosts have no site attribute set. When this is synced +to a slave site, the host is monitored by both sites. + +We should detect that and only monitor those hosts on standalone sites or WATO master sites. diff --git a/.bugs/2464 b/.bugs/2464 new file mode 100644 index 0000000..4d89954 --- /dev/null +++ b/.bugs/2464 @@ -0,0 +1,10 @@ +Title: Hosts configured for a multisite only site are monitored on master +Component: wato +State: open +Date: 2016-08-03 11:12:16 +Targetversion: 1.2.8 +Class: bug + +When having the master site connected with another site only in the status world, without +distributed WATO and assigning a host to that site, the host is still monitored by the +master site. The host should simply not be monitored instead.

8 years, 1 month

3753 FIX Fixed graph hover popup of services having special characters in their names

by Lars Michelsen

Module: check_mk Branch: master Commit: f885b55670511db435f1ccba2aa16bf30d1bc07e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f885b55670511d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 3 11:08:35 2016 +0200 3753 FIX Fixed graph hover popup of services having special characters in their names --- .werks/3753 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/metrics.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3753 b/.werks/3753 new file mode 100644 index 0000000..beea07c --- /dev/null +++ b/.werks/3753 @@ -0,0 +1,10 @@ +Title: Fixed graph hover popup of services having special characters in their names +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1470215289 + + diff --git a/ChangeLog b/ChangeLog index dfeca84..f8e56d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -419,6 +419,7 @@ * 3645 FIX: Fixed filesystem growth/shrinkage graph by splitting it up into 2 graphs. * 3729 FIX: Disabling password field completion for most forms, even in current Chrome * 3730 FIX: Improved GUI performance in case of different languages used by users... + * 3753 FIX: Fixed graph hover popup of services having special characters in their names WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 3528a09..5e20973 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1373,7 +1373,7 @@ def get_graph_template_by_source(graph_templates, source): def page_host_service_graph_popup(): site_id = html.var('site') host_name = html.var('host_name') - service_description = html.var('service') + service_description = html.var_utf8('service') if cmk_graphs_possible(site_id): host_service_graph_popup_cmk(site_id, host_name, service_description)

8 years, 1 month

Fixed broken default graphs having negative values

by Lars Michelsen

Module: check_mk Branch: master Commit: 52dc4e93f1c48895861951ebe20735bee44ee64b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52dc4e93f1c488… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 3 10:56:41 2016 +0200 Fixed broken default graphs having negative values --- web/htdocs/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 42d0e4d..4fc7edd 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -446,7 +446,7 @@ def render_scientific(v, precision=3): if v == 0: return "0" elif v < 0: - return "-" + render_scientific(v, precision) + return "-" + render_scientific(v*-1, precision) mantissa, exponent = frexp10(float(v)) # Render small numbers without exponent

8 years, 1 month

3752 FIX Fixed loosing site configuration when editing hosts in WATO slave sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 60e94e65a1b629c968e8e187b921ca9a1c3f62a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60e94e65a1b629… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 3 10:49:58 2016 +0200 3752 FIX Fixed loosing site configuration when editing hosts in WATO slave sites When having a distributed setup where WATO is enabled on slaves and hosts were editied, the hosts in the folder of that host were resetting the site attribute so that they are being monitored by the remote site, even when they were configured to be monitored on another site. The slave sites are now checking for the configured unknown sites and warning you about that fact. To override the configured site attributes, you have to explicitly change the value of the site attribute. --- .werks/3752 | 16 +++++++++++++ web/htdocs/config.py | 1 + web/htdocs/valuespec.py | 13 ++++++++-- web/htdocs/watolib.py | 61 ++++++++++++++++++++++++++++++----------------- 4 files changed, 67 insertions(+), 24 deletions(-) diff --git a/.werks/3752 b/.werks/3752 new file mode 100644 index 0000000..015dd13 --- /dev/null +++ b/.werks/3752 @@ -0,0 +1,16 @@ +Title: Fixed loosing site configuration when editing hosts in WATO slave sites +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.8p9 +Date: 1470213362 +Class: fix + +When having a distributed setup where WATO is enabled on slaves and hosts were +editied, the hosts in the folder of that host were resetting the site attribute +so that they are being monitored by the remote site, even when they were configured +to be monitored on another site. + +The slave sites are now checking for the configured unknown sites and warning you +about that fact. To override the configured site attributes, you have to explicitly +change the value of the site attribute. diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 0335e2c..90fb6f6 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -578,6 +578,7 @@ def default_site(): return None + def is_multisite(): # TODO: Remove all calls of this function return True diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8181c8b..6440e81 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1282,7 +1282,7 @@ class DropdownChoice(ValueSpec): # In complain mode: Use the value received from the HTML variable if self._invalid_choice == "complain" and value != None and self._value_is_invalid(value): defval = value - options.append((value, "%s (%s)" % (value, self._invalid_choice_title))) + options.append((defval, self._get_invalid_choice_title(value))) if value == None and not options: html.write(self._empty_text) @@ -1298,6 +1298,14 @@ class DropdownChoice(ValueSpec): else: html.sorted_select(varprefix, options, defval, onchange=self._on_change) + + def _get_invalid_choice_title(self, value): + if "%s" in self._invalid_choice_title: + return self._invalid_choice_title % value + else: + return self._invalid_choice_title + + def value_to_text(self, value): for entry in self.choices(): val, title = entry[:2] @@ -1306,7 +1314,8 @@ class DropdownChoice(ValueSpec): return title.split(self._help_separator, 1)[0].strip() else: return title - return _("(other: %s)" % html.attrencode(value)) + return html.attrencode(self._get_invalid_choice_title(value)) + def from_html_vars(self, varprefix): sel = html.var(varprefix) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 80364b8..d32e7df 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1246,7 +1246,7 @@ class Folder(BaseFolder): elif self.has_parent(): return self.parent().site_id() else: - return config.default_site() + return default_site() def all_site_ids(self): @@ -3429,6 +3429,20 @@ def is_distributed(sites = None): return False +# Returns the ID of the default site. This is the site the main folder has +# configured by default. It inherits to all folders and hosts which don't have +# a site set on their own. +# In standalone and master sites this defaults to the local site. In distributed +# slave sites, we don't know the site ID of the master site. We set this explicit +# to false to configure that this host is monitored by another site (that we don't +# know about). +def default_site(): + if is_wato_slave_site(): + return False + else: + return config.default_site() + + def is_wato_slave_site(): return has_distributed_wato_file() and not has_wato_slave_sites() @@ -3443,38 +3457,41 @@ def wato_slave_sites(): def declare_site_attribute(): undeclare_host_attribute("site") - if is_distributed(): - declare_host_attribute(SiteAttribute(), show_in_table = True, show_in_folder = True) + declare_host_attribute(SiteAttribute(), show_in_table = True, show_in_folder = True) -class SiteAttribute(Attribute): +class SiteAttribute(ValueSpecAttribute): def __init__(self): # Default is is the local one, if one exists or # no one if there is no local site - self._choices = [] + choices = [] for id, site in config.sites.items(): title = id if site.get("alias"): title += " - " + site["alias"] - self._choices.append((id, title)) - - self._choices.sort(cmp=lambda a,b: cmp(a[1], b[1])) - self._choices_dict = dict(self._choices) - Attribute.__init__(self, "site", _("Monitored on site"), - _("Specify the site that should monitor this host."), - default_value = config.default_site()) - - def paint(self, value, hostname): - return "", self._choices_dict.get(value, value) - - def render_input(self, varprefix, value): - html.select(varprefix + "site", self._choices, value) - - def from_html_vars(self, varprefix): - return html.var(varprefix + "site") + choices.append((id, title)) + + choices.sort(cmp=lambda a,b: cmp(a[1], b[1])) + + ValueSpecAttribute.__init__(self, "site", DropdownChoice( + title=_("Monitored on site"), + help=_("Specify the site that should monitor this host."), + default_value = default_site(), + choices = choices, + invalid_choice = "complain", + invalid_choice_title = _("Unknown site (%s)"), + invalid_choice_error = _("The configured site is not known to this site. In case you " + "are configuring in a distributed slave, this may be a host " + "monitored by another site. If you want to modify this " + "host, you will have to change the site attribute to the " + "local site. But this may make the host be monitored from " + "multiple sites.") + )) def get_tag_list(self, value): - if value != None: + if value == False: + return [ "site:" ] + elif value != None: return [ "site:" + value ] else: return []

8 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016