Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 1696df584a2b09638b64d3e95caaec07233d3830 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1696df584a2b09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 27 10:50:10 2015 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index a9c7a68..a0a31bc 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2078 +2098

9 years, 4 months

Check_MK Git: check_mk: #2027 FIX fc_port: Fixed exception when wirespeed is reported as 0 by the device

by Lars Michelsen

Module: check_mk Branch: master Commit: b0eb713ed60c630682bad12f7d1e9cbfcca88c35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0eb713ed60c63… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 27 09:59:49 2015 +0100 #2027 FIX fc_port: Fixed exception when wirespeed is reported as 0 by the device --- .werks/2027 | 10 ++++++++++ ChangeLog | 1 + checks/fc_port | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2027 b/.werks/2027 new file mode 100644 index 0000000..1be5979 --- /dev/null +++ b/.werks/2027 @@ -0,0 +1,10 @@ +Title: fc_port: Fixed exception when wirespeed is reported as 0 by the device +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425027561 + + diff --git a/ChangeLog b/ChangeLog index aa19dc4..ce063b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -206,6 +206,7 @@ * 1863 FIX: cisco_power: fix for cases with a slash in the device description of a power supply... NOTE: Please refer to the migration notes! * 2023 FIX: if_lancom: Handle point-2-point interfaces of newer firmwares correctly + * 2027 FIX: fc_port: Fixed exception when wirespeed is reported as 0 by the device Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/fc_port b/checks/fc_port index b265cc3..6ecec75 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -144,7 +144,7 @@ def check_fc_port(item, params, info): if wirespeed == 0: # let user specify assumed speed via check parameter, default is 16.0 GBit/sec gbit = params.get("assumed_speed", 16.0) - wirespeed = gb * 1000.0 * 1000.0 * 1000.0 / 8.0 # in Bytes/sec + wirespeed = gbit * 1000.0 * 1000.0 * 1000.0 / 8.0 # in Bytes/sec speedmsg = "assuming %g GBit/s" % gbit else: gbit = wirespeed * 8.0 / ( 1000.0 * 1000.0 * 1000.0 ) # in GBit/sec

9 years, 4 months

Check_MK Git: check_mk: #2026 FIX Fixed exception when using umlauts in notification plugin descriptions

by Lars Michelsen

Module: check_mk Branch: master Commit: 0cab19c09a677ee9e3bc9cca4dd7d3ab1d1f8fa4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cab19c09a677e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 27 09:56:27 2015 +0100 #2026 FIX Fixed exception when using umlauts in notification plugin descriptions This happened only when using an umlaut in notification plugin descriptions together with a localized Multisite GUI. Again, fixed with super encoding power! --- .werks/2026 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2026 b/.werks/2026 new file mode 100644 index 0000000..9b2ec23 --- /dev/null +++ b/.werks/2026 @@ -0,0 +1,12 @@ +Title: Fixed exception when using umlauts in notification plugin descriptions +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i1 +Date: 1425027302 +Class: fix + +This happened only when using an umlaut in notification plugin descriptions +together with a localized Multisite GUI. + +Again, fixed with super encoding power! diff --git a/ChangeLog b/ChangeLog index 2826f2e..aa19dc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -291,6 +291,7 @@ * 1946 FIX: WATO Web-API: edit host action does no longer unset all unspecified attributes... * 1223 FIX: Fixed manual configuration of ntp peer check... * 2025 FIX: Fixed exception when synchronising custom ldap attributes in distributed WATO setup + * 2026 FIX: Fixed exception when using umlauts in notification plugin descriptions... Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9f2deb9..a7e35e7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11474,7 +11474,7 @@ def load_notification_scripts(): def notification_script_choices(): scripts = load_notification_scripts() - choices = [ (name, info["title"]) for (name, info) in scripts.items() ] + choices = [ (name, info["title"].decode('utf-8')) for (name, info) in scripts.items() ] choices.append((None, _("ASCII Email (legacy)"))) choices.sort(cmp = lambda a,b: cmp(a[1], b[1])) # Make choices localizable

9 years, 4 months

Check_MK Git: check_mk: Conflicts:

by Lars Michelsen

Module: check_mk Branch: master Commit: 4478698d8059716f20e66d59a80f25924a5dbbe5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4478698d805971… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 27 09:27:50 2015 +0100 Conflicts: ChangeLog web/htdocs/index.py --- .werks/2025 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/index.py | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/2025 b/.werks/2025 new file mode 100644 index 0000000..f3365a5 --- /dev/null +++ b/.werks/2025 @@ -0,0 +1,10 @@ +Title: Fixed exception when synchronising custom ldap attributes in distributed WATO setup +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425025584 + + diff --git a/ChangeLog b/ChangeLog index ac71913..2826f2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -290,6 +290,7 @@ * 2010 FIX: Improved error message when trying to add group assignment rule without having a group configured * 1946 FIX: WATO Web-API: edit host action does no longer unset all unspecified attributes... * 1223 FIX: Fixed manual configuration of ntp peer check... + * 2025 FIX: Fixed exception when synchronising custom ldap attributes in distributed WATO setup Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 7d1e857..ac4de43 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -164,6 +164,10 @@ def handler(req, fields = None, profiling = True): handler = pagehandlers.get("noauth:" + html.myfile, page_not_found) if handler != page_not_found: try: + # Call userdb page hooks which are executed on a regular base to e.g. syncronize + # information withough explicit user triggered actions + userdb.hook_page() + handler() except Exception, e: html.write(str(e))

9 years, 4 months

Check_MK Git: check_mk: When filtering for example a host view by host aliases with a search term which

by Lars Michelsen

Module: check_mk Branch: master Commit: e51f271d383b86bc2e13acd367f8e93bb5d18421 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e51f271d383b86… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 27 08:59:46 2015 +0100 When filtering for example a host view by host aliases with a search term which contains at least one umlaut, this might have lead into an exception in some cases. These days we have super encoding power, so we fixed it. Conflicts: ChangeLog web/plugins/visuals/filters.py --- .werks/2024 | 14 ++++++++++++++ ChangeLog | 1 + web/plugins/visuals/filters.py | 39 +++++++++++++++++++++++++++------------ 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/.werks/2024 b/.werks/2024 new file mode 100644 index 0000000..895d9a4 --- /dev/null +++ b/.werks/2024 @@ -0,0 +1,14 @@ +Title: Views: Fixed problem when filtering views by strings containing umlauts +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425023576 + +When filtering for example a host view by host aliases with a search term which +contains at least one umlaut, this might have lead into an exception in some +cases. + +These days we have super encoding power, so we fixed it. diff --git a/ChangeLog b/ChangeLog index a682d28..ac71913 100644 --- a/ChangeLog +++ b/ChangeLog @@ -252,6 +252,7 @@ * 1945 FIX: doc/treasures/downtime script: was no longer working because of latest changes in the GUI... * 2008 FIX: Users created during basic auth login get the role assigned configured in "default user profile"... * 2011 FIX: "Service Group" view sorts/groups the services now correctly by host + * 2024 FIX: Views: Fixed problem when filtering views by strings containing umlauts... WATO: * 1760 Added search form to manual checks page diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 2438b67..999074b 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -37,22 +37,26 @@ class FilterText(Filter): self.column = column self.negateable = negateable - def display(self): + def _current_value(self): htmlvar = self.htmlvars[0] - current_value = html.var(htmlvar, "") - html.text_input(htmlvar, current_value, self.negateable and 'neg' or '') + return html.var(htmlvar, "") + + def display(self): + current_value = self._current_value() + html.text_input(self.htmlvars[0], current_value, self.negateable and 'neg' or '') if self.negateable: html.write(" <nobr>") html.checkbox(self.htmlvars[1], label=_("negate")) html.write("</nobr>") def filter(self, infoname): - htmlvar = self.htmlvars[0] - current_value = html.var(htmlvar) + current_value = self._current_value() + if self.negateable and html.get_checkbox(self.htmlvars[1]): negate = "!" else: negate = "" + if current_value: return "Filter: %s %s%s %s\n" % (self.column, negate, self.op, lqencode(current_value)) else: @@ -62,9 +66,20 @@ class FilterText(Filter): return [ (self.htmlvars[0], row[self.column]) ] def heading_info(self): - return html.var(self.htmlvars[0]) + return self._current_value() +class FilterUnicode(FilterText): + def _current_value(self): + htmlvar = self.htmlvars[0] + return html.var_utf8(htmlvar, "") + + def filter(self, infoname): + current_value = self._current_value() + if current_value: + return "Filter: %s %s %s\n" % (self.column, self.op, lqencode(current_value.encode('utf-8'))) + else: + return "" # filter title info column htmlvar declare_filter(100, FilterText("hostregex", _("Hostname"), "host", "host_name", "host_regex", "~~"), @@ -73,19 +88,19 @@ declare_filter(100, FilterText("hostregex", _("Hostname"), "host", declare_filter(101, FilterText("host", _("Hostname (exact match)"), "host", "host_name", "host", "="), _("Exact match, used for linking")) -declare_filter(102, FilterText("hostalias", _("Hostalias"), "host", "host_alias", "hostalias", "~~"), +declare_filter(102, FilterUnicode("hostalias", _("Hostalias"), "host", "host_alias", "hostalias", "~~"), _("Search field allowing regular expressions and partial matches")) -declare_filter(200, FilterText("serviceregex", _("Service"), "service", "service_description", "service_regex", "~~"), +declare_filter(200, FilterUnicode("serviceregex", _("Service"), "service", "service_description", "service_regex", "~~"), _("Search field allowing regular expressions and partial matches")) -declare_filter(201, FilterText("service", _("Service (exact match)"), "service", "service_description", "service", "="), +declare_filter(201, FilterUnicode("service", _("Service (exact match)"), "service", "service_description", "service", "="), _("Exact match, used for linking")) -declare_filter(202, FilterText("service_display_name", _("Service alternative display name"), "service", "service_display_name", "service_display_name", "~~"), +declare_filter(202, FilterUnicode("service_display_name", _("Service alternative display name"), "service", "service_display_name", "service_display_name", "~~"), _("Alternative display name of the service, regex match")) -declare_filter(202, FilterText("output", _("Status detail"), "service", "service_plugin_output", "service_output", "~~")) +declare_filter(202, FilterUnicode("output", _("Status detail"), "service", "service_plugin_output", "service_output", "~~")) class FilterIPAddress(Filter): def __init__(self): @@ -747,7 +762,7 @@ class FilterLogClass(Filter): declare_filter(255, FilterLogClass()) # filter title info column htmlvar -declare_filter(202, FilterText("log_plugin_output", _("Log: plugin output"), "log", "log_plugin_output", "log_plugin_output", "~~")) +declare_filter(202, FilterUnicode("log_plugin_output", _("Log: plugin output"), "log", "log_plugin_output", "log_plugin_output", "~~")) declare_filter(203, FilterText("log_type", _("Log: message type"), "log", "log_type", "log_type", "~~")) declare_filter(204, FilterText("log_state_type", _("Log: state type"), "log", "log_state_type", "log_state_type", "~~")) declare_filter(260, FilterText("log_contact_name", _("Log: contact name (exact match)"), "log", "log_contact_name", "log_contact_name", "="),

9 years, 4 months

Check_MK Git: check_mk: Added help text for BI child/host refering

by Lars Michelsen

Module: check_mk Branch: master Commit: c39dfe6d0e0e3e47072f9638419c622230138112 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c39dfe6d0e0e3e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 27 08:23:38 2015 +0100 Added help text for BI child/host refering --- web/htdocs/wato.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a723f5c..9f2deb9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16899,7 +16899,16 @@ def declare_bi_valuespecs(aggregation_rules): ( 'host', _("The found hosts themselves") ), ( 'child', _("The found hosts' childs") ), ( 'parent', _("The found hosts' parents") ), - ] + ], + help = _('When refering to the found hosts childs, this means you ' + 'configure the conditions (tags and host name) below to match ' + 'a host, but you will get one node created for each child host. The' + 'place holder <tt>$1$</tt> contains the name of the found child.<br><br>' + 'When refering to the found hosts parents, you use the conditions ' + 'to match a host, but you will get one node created for each of the ' + 'parent hosts of this found host. The conditions are used to match ' + 'the child hosts. The place holder <tt>$1$</tt> contains the name ' + 'of the child host and <tt>$2$</tt> the name of the parent host.'), ), HostTagCondition( title = _("Host Tags:")

9 years, 4 months

Check_MK Git: check_mk: #1951 check_http: now able to configure warning and critical limit for certificate age

by Sven Rueß

Module: check_mk Branch: master Commit: c236b1d6c0182b9d169d30015340c170ac5d58f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c236b1d6c0182b… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Thu Feb 26 20:06:27 2015 +0100 #1951 check_http: now able to configure warning and critical limit for certificate age The check check_http has now configurable limits for warning and critical limits of SSL certificate age. --- .werks/1951 | 10 + ChangeLog | 1 + checks/check_http | 3 +- web/plugins/wato/active_checks.py | 442 ++++++++++++++++++++----------------- 4 files changed, 249 insertions(+), 207 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c236b1d6c0…

9 years, 4 months

Check_MK Git: check_mk: New WATO rule for simple memory checks

by Konstantin Büttner

Module: check_mk Branch: master Commit: 96624bd851c3b540bdbf93354e448d4044a3189e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96624bd851c3b5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Feb 26 16:58:11 2015 +0100 New WATO rule for simple memory checks --- web/plugins/wato/check_parameters.py | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index f3e5f49..1ed7014 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2987,6 +2987,44 @@ register_check_parameters( ) register_check_parameters( + subgroup_networking, + "memory_simple", + _("Main memory usage of simple devices"), + Transform( + Dictionary( + help = _("Memory levels for simple devices not running more complex OSs"), + elements = [ + ("levels", CascadingDropdown( + title = _("Levels for memory usage"), + choices = [ + ( "perc_used", + _("Percentual levels for used memory"), + Tuple( + elements = [ + Percentage(title = _("Warning at a memory usage of"), default_value = 80.0, maxvalue = None), + Percentage(title = _("Critical at a memory usage of"), default_value = 90.0, maxvalue = None) + ] + )), + ( "abs_free", + _("Absolute levels for free memory"), + Tuple( + elements = [ + Filesize(title = _("Warning below")), + Filesize(title = _("Critical below")) + ] + )), + ( "ignore", _("Do not impose levels")), + ]) + ), + ], + optional_keys = [], + ), + forth = lambda old: type(old) != dict and { "levels" : ( "perc_used", old) }, + ), + None, None +) + +register_check_parameters( subgroup_os, "memory_multiitem", _("Main memory usage of devices with modules"),

9 years, 4 months

Check_MK Git: check_mk: #1863 FIX cisco_power: fix for cases with a slash in the device description of a power supply

by Goetz Golla

Module: check_mk Branch: master Commit: a3b5a627ae65ce44bd6cac5d8d0a62ad83e3d645 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3b5a627ae65ce… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Feb 26 16:41:06 2015 +0100 #1863 FIX cisco_power: fix for cases with a slash in the device description of a power supply Power Supplies with a slash in the device description were added in service discovery, but could not be found when carrying out the check. This problem has been fixed. In addition, when you have power supplies which have a service description containing the ID of the power supply at the end like "<power supply name>/<ID>", i.e. with a SLASH, you have to redo the service discovery and the service description will then contain the ID added with a blank instead, i.e. "<power supply name> <ID>". This is a rare case only relevant for versions of cisco_power younger than 2015/01/30, and only if you have non-unique power supply names with trailing digits in the name. --- .werks/1863 | 18 ++++++++++++++++++ ChangeLog | 2 ++ checks/cisco_power | 6 ++---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.werks/1863 b/.werks/1863 new file mode 100644 index 0000000..1c82d18 --- /dev/null +++ b/.werks/1863 @@ -0,0 +1,18 @@ +Title: cisco_power: fix for cases with a slash in the device description of a power supply +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1424964446 +Class: fix + +Power Supplies with a slash in the device description were added in service discovery, +but could not be found when carrying out the check. This problem has been fixed. + +In addition, when you have power supplies which have a service description +containing the ID of the power supply at the end like "<power supply +name>/<ID>", i.e. with a SLASH, you have to redo the service discovery +and the service description will then contain the ID added with a blank +instead, i.e. "<power supply name> <ID>". This is a rare case only relevant +for versions of cisco_power younger than 2015/01/30, and only if you have +non-unique power supply names with trailing digits in the name. diff --git a/ChangeLog b/ChangeLog index fd7f335..164f360 100644 --- a/ChangeLog +++ b/ChangeLog @@ -203,6 +203,8 @@ * 2021 FIX: if_lancom: Also used for checking ELSA/T-Systems branded devices * 2022 FIX: SNMP: Fixed handling of backslashes in SNMP data... NOTE: Please refer to the migration notes! + * 1863 FIX: cisco_power: fix for cases with a slash in the device description of a power supply... + NOTE: Please refer to the migration notes! Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/cisco_power b/checks/cisco_power index 8d67efc..7dc3e81 100644 --- a/checks/cisco_power +++ b/checks/cisco_power @@ -65,14 +65,12 @@ def inventory_cisco_power(info): yield name, None else: for entry in entries: - yield ("%s/%s" % (name, entry)), None + yield ("%s %s" % (name, entry)), None def check_cisco_power(item, no_params, info): - if "/" in item: - item = item.split("/")[1] for sid, textinfo, state, source in info: - if sid == item or cisco_sensor_item(textinfo, sid) == item: + if cisco_sensor_item(textinfo, sid) == item or cisco_sensor_item(textinfo, sid)+" "+sid == item: state = int(state) source = int(source) output = 'state: %s, source: %s' % \

9 years, 4 months

Check_MK Git: check_mk: #2023 FIX if_lancom: Handle point-2-point interfaces of newer firmwares correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 51086c61c8aa02c18746ff9a94bca084b57e7cb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51086c61c8aa02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 26 16:36:13 2015 +0100 #2023 FIX if_lancom: Handle point-2-point interfaces of newer firmwares correctly --- .werks/2023 | 10 ++++++++++ ChangeLog | 1 + checks/if_lancom | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2023 b/.werks/2023 new file mode 100644 index 0000000..0e2803a --- /dev/null +++ b/.werks/2023 @@ -0,0 +1,10 @@ +Title: if_lancom: Handle point-2-point interfaces of newer firmwares correctly +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424964951 + + diff --git a/ChangeLog b/ChangeLog index 9ed9f5f..dfc67f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -203,6 +203,7 @@ * 2021 FIX: if_lancom: Also used for checking ELSA/T-Systems branded devices * 2022 FIX: SNMP: Fixed handling of backslashes in SNMP data... NOTE: Please refer to the migration notes! + * 2023 FIX: if_lancom: Handle point-2-point interfaces of newer firmwares correctly Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/if_lancom b/checks/if_lancom index 97dc890..3ebca9e 100644 --- a/checks/if_lancom +++ b/checks/if_lancom @@ -34,7 +34,7 @@ def if_lancom_convert(info): ssid_dict = dict(ssidtab) new_info = [] for line in iftab: - if line[20].startswith("Point-2-Point"): + if line[20].startswith("P2P") or line[20].startswith("Point-2-Point"): continue else: ifName = line[1]

9 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015