Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64655 discussions

Check_MK Git: check_mk: enterasys_temp: avoid exception on empty info

by Mathias Kettner

Module: check_mk Branch: master Commit: bae038fb77fd4fe171369a1af0c5aef2c25d908e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bae038fb77fd4f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 30 08:14:54 2014 +0200 enterasys_temp: avoid exception on empty info --- checks/enterasys_temp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/checks/enterasys_temp b/checks/enterasys_temp index c25d9eb..32e787d 100644 --- a/checks/enterasys_temp +++ b/checks/enterasys_temp @@ -27,9 +27,7 @@ enterasys_temp_default_levels = (30, 35) def inventory_enterasys_temp(info): - if info[0][0] == "0": - return [] - else: + if info and info[0][0] != "0": return [ (None, "enterasys_temp_default_levels") ] def check_enterasys_temp(item, params, info):

10 years

Check_MK Git: check_mk: #1120 FIX Multisite filters Host/

by Andreas Boesl

Service Contactgroup: Fixed livestatus exception Message-ID: <54295647.NzOXiRQ7YENjocpn%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 2df93d322ed472713031813e9ebb3931741d8bf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2df93d322ed472… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 29 14:53:13 2014 +0200 #1120 FIX Multisite filters Host/Service Contactgroup: Fixed livestatus exception The multisite filters <tt>Host Contactgroups</tt> and <tt>Service Contactgroups</tt> were not working because of an incorrect livestatus filter formatting. This resulted in an livestatus exception every time any of these filters were actively used. --- .werks/1120 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/views/filters.py | 6 ++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/1120 b/.werks/1120 new file mode 100644 index 0000000..eac58f7 --- /dev/null +++ b/.werks/1120 @@ -0,0 +1,12 @@ +Title: Multisite filters Host/Service Contactgroup: Fixed livestatus exception +Level: 2 +Component: multisite +Compatible: compat +Version: 1.2.5i6 +Date: 1411994905 +Class: fix + +The multisite filters <tt>Host Contactgroups</tt> and <tt>Service Contactgroups</tt> were +not working because of an incorrect livestatus filter formatting. +This resulted in an livestatus exception every time any of these filters were actively used. + diff --git a/ChangeLog b/ChangeLog index 4795829..60164b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,7 @@ * 1094 FIX: sidebar snaping 'Tree of folders': fixed exception * 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after editing availability options... * 1401 FIX: Display options in views are now again persistent... + * 1120 FIX: Multisite filters Host/Service Contactgroup: Fixed livestatus exception... WATO: * 1096 New WATO webservices: manage hosts via webinterface... diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 40cc08b..d764df4 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -214,7 +214,8 @@ class FilterGroupCombo(Filter): if not self.enforce: return "" # Take first group with the name we search - current_value = html.live.query_value("GET %sgroups\nCache: reload\nColumns: name\nLimit: 1\n" % self.what, None) + table = self.what.replace("host_contact", "contact").replace("service_contact", "contact") + current_value = html.live.query_value("GET %sgroups\nCache: reload\nColumns: name\nLimit: 1\n" % table, None) if current_value == None: return "" # no {what}group exists! @@ -242,8 +243,9 @@ class FilterGroupCombo(Filter): def heading_info(self, infoname): current_value = self.current_value(infoname) if current_value: + table = self.what.replace("host_contact", "contact").replace("service_contact", "contact") alias = html.live.query_value("GET %sgroups\nCache: reload\nColumns: alias\nFilter: name = %s\n" % - (self.what, current_value), current_value) + (table, current_value), current_value) return alias

10 years

Check_MK Git: check_mk: check groups citrix_licenses, esx_licenses: changed match type to first

by Andreas Boesl

Module: check_mk Branch: master Commit: 3f56744239781fbd7c9271a89f5fbb65307b117b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f56744239781f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 29 11:39:49 2014 +0200 check groups citrix_licenses, esx_licenses: changed match type to first --- web/plugins/wato/check_parameters.py | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index da1c3dd..235e893 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1849,7 +1849,7 @@ register_check_parameters( "first" ) -def get_filesystem_valuespec(what): +def get_free_used_dynamic_valuespec(what, name, default_value = (80.0, 90.0)): if what == "used": title = _("used space") course = _("above") @@ -1874,17 +1874,16 @@ def get_filesystem_valuespec(what): ] return Alternative( - title = _("Levels for filesystem %s") % title, + title = _("Levels for %s %s") % (name, title), show_alternative_title = True, - default_value = (80.0, 90.0), + default_value = default_value, elements = vs_subgroup + [ ListOf( Tuple( orientation = "horizontal", elements = [ - Filesize(title = _("Filesystem larger than")), + Filesize(title = _("%s larger than") % name.title()), Alternative( - title = _("Levels for %s") % title, elements = vs_subgroup ) ] @@ -1933,9 +1932,9 @@ filesystem_elements = [ default_value = (80.0, 90.0), match = match_dual_level_type, elements = [ - get_filesystem_valuespec("used"), + get_free_used_dynamic_valuespec("used", "filesystem"), Transform( - get_filesystem_valuespec("free"), + get_free_used_dynamic_valuespec("free", "filesystem", default_value = (20.0, 10.0)), title = _("Levels for filesystem free space"), allow_empty = False, forth = transform_filesystem_free, @@ -3085,6 +3084,7 @@ register_check_parameters( None ) + register_check_parameters( subgroup_applications, "oracle_tablespaces", @@ -5592,6 +5592,18 @@ register_check_parameters( "dict", ) + +register_check_parameters( + subgroup_applications, + "db2_logsizes", + _("Size of DB2 logfiles"), + get_free_used_dynamic_valuespec("free", "logfile", default_value = (20.0, 10.0)), + TextAscii( + title = _("Logfile name"), + allow_empty = True), + "first" +) + register_check_parameters( subgroup_applications, "db2_mem", @@ -6027,7 +6039,7 @@ register_check_parameters( help = _("For example <tt>VMware vSphere 5 Standard</tt>"), allow_empty = False, ), - "dict" + "first" ) register_check_parameters( @@ -6039,7 +6051,7 @@ register_check_parameters( title = _("ID of the license, e.g. <tt>PVSD_STD_CCS</tt>"), allow_empty = False, ), - "dict" + "first" ) register_check_parameters(

10 years

Check_MK Git: check_mk: esx_vsphere_licenses: fixed exception when no params were set

by Andreas Boesl

Module: check_mk Branch: master Commit: 5accfd59a783d7e4233112a762d6fe141ae42565 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5accfd59a783d7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 29 11:20:01 2014 +0200 esx_vsphere_licenses: fixed exception when no params were set --- checks/esx_vsphere_licenses | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/esx_vsphere_licenses b/checks/esx_vsphere_licenses index 5fbb918..5006922 100644 --- a/checks/esx_vsphere_licenses +++ b/checks/esx_vsphere_licenses @@ -34,8 +34,6 @@ def inventory_esx_vsphere_licenses(info): return [ (line[0], None) for line in info ] def check_esx_vsphere_licenses(item, params, info): - if params == None: - params = {} # Transform: VMware vSphere 5 Standard 100 13 # Into dict: 'VMware vSphere 5 Standard': (100, 130) licenses = dict(map(

10 years

Check_MK Git: check_mk: Check no longer memorizes port states in inventory

by Goetz Golla

Module: check_mk Branch: master Commit: 6993a84222908f29038e1ed09266248cbec1a4ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6993a84222908f… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 29 09:33:41 2014 +0200 Check no longer memorizes port states in inventory The scan function has been enabled again. The check does not inventorize when a brocade mib is also present --- checks/fc_port | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/checks/fc_port b/checks/fc_port index 8c84158..93b02c6 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -119,9 +119,8 @@ def inventory_fc_port(info): opstate not in fc_port_no_inventory_opstates and \ phystate not in fc_port_no_inventory_phystates: - inventory.append( (fc_port_getitem(len(info), index, portname), - '{ "admstate": [%d], "opstate": [%d], "phystate": [%d] }' - % (admstate, opstate, phystate) )) + inventory.append( (fc_port_getitem(len(info), index, portname), \ + 'fc_port_default_levels') ) return inventory @@ -317,9 +316,9 @@ check_info["fc_port"] = { 'has_perfdata' : True, 'group' : 'fc_port', 'default_levels_variable': 'fc_port_default_levels', - #'snmp_scan_function' : lambda oid: - # oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") \ - # and not oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.1"), + 'snmp_scan_function' : lambda oid: + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") \ + and oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.*") == None, 'snmp_scan_function' : lambda oid: False, 'snmp_info' : ( ".1.3.6.1.3.94", [ "1.10.1.2", # connUnitPortIndex # 0

10 years

Check_MK Git: check_mk: #1408 FIX mknotifyd now really reads all configuration files below mknotifyd .d

by Mathias Kettner

Module: check_mk Branch: master Commit: 7f25de14d9033617416211dd489f760eab9162e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f25de14d90336… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 29 09:15:33 2014 +0200 #1408 FIX mknotifyd now really reads all configuration files below mknotifyd.d Previously the notification spooler daemon <tt>mknotifyd</tt> just read the single file <tt>etc/check_mk/mknotifyd.d/wato/global.mk</tt>. Now it reads all files below <tt>etc/check_mk/mknotifyd.d</tt> - just as one would expect. Note: there is still no <tt>etc/check_mk/mknotifyd.mk</tt> file. --- .werks/1408 | 12 ++++++++++++ ChangeLog | 1 + doc/treasures/mknotifyd | 26 ++++++++++++++++++++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/.werks/1408 b/.werks/1408 new file mode 100644 index 0000000..fa7fc02 --- /dev/null +++ b/.werks/1408 @@ -0,0 +1,12 @@ +Title: mknotifyd now really reads all configuration files below mknotifyd.d +Level: 2 +Component: notifications +Compatible: compat +Version: 1.2.5i6 +Date: 1411974839 +Class: fix + +Previously the notification spooler daemon <tt>mknotifyd</tt> just read the +single file <tt>etc/check_mk/mknotifyd.d/wato/global.mk</tt>. Now it reads +all files below <tt>etc/check_mk/mknotifyd.d</tt> - just as one would +expect. Note: there is still no <tt>etc/check_mk/mknotifyd.mk</tt> file. diff --git a/ChangeLog b/ChangeLog index 1ab5d69..4795829 100644 --- a/ChangeLog +++ b/ChangeLog @@ -136,6 +136,7 @@ * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... * 1157 FIX: Fixed SMS plugin on at least debian (distrs which have no sendsms/smssend)... * 1407 FIX: Fix exception in rule based notification on non-Ascii characters in log message + * 1408 FIX: mknotifyd now really reads all configuration files below mknotifyd.d... BI: * 1406 Assume PEND in count_ok aggregations if all nodes are PEND... diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 44cca4c..0a793d8 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -352,9 +352,16 @@ def daemonize(user=0, group=0): def load_configuration(): global g_config, g_config_changed last_config = g_config.copy() - config_file = "%s/mknotifyd.d/wato/global.mk" % g_config_dir + config_dir = "%s/mknotifyd.d" % g_config_dir + try: - execfile(config_file, {}, g_config) + list_of_files = reduce(lambda a,b: a+b, + [ [ "%s/%s" % (d, f) for f in fs if f.endswith(".mk")] + for d, sb, fs in os.walk(config_dir) ], []) + list_of_files.sort(cmp = cmp_config_paths) + for path in list_of_files: + verbose("Reading configuration file %s" % path) + execfile(path, {}, g_config) except: g_config = last_config @@ -362,6 +369,21 @@ def load_configuration(): log("Configuration has changed") g_config_changed = True +# This function has been stolen from check_mk.py. +# Helper function that determines the sort order of the +# configuration files. The following two rules are implemented: +# 1. *.mk files in the same directory will be read +# according to their lexical order. +# 2. subdirectories in the same directory will be +# scanned according to their lexical order. +# 3. subdirectories of a directory will always be read *after* +# the *.mk files in that directory. +def cmp_config_paths(a, b): + pa = a.split('/') + pb = b.split('/') + return cmp(pa[:-1], pb[:-1]) or \ + cmp(len(pa), len(pb)) or \ + cmp(pa, pb) def usage(): sys.stdout.write("""Usage: mknotifyd [OPTIONS]

10 years

Check_MK Git: check_mk: Fixed .f12 compile helper of doc directory

by Mathias Kettner

Module: check_mk Branch: master Commit: d7d09975581e46ff45cd3c85cc994dc2f0a472fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7d09975581e46… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 29 09:06:04 2014 +0200 Fixed .f12 compile helper of doc directory --- doc/.f12 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/.f12 b/doc/.f12 index 85605be..4a98040 100644 --- a/doc/.f12 +++ b/doc/.f12 @@ -1 +1,10 @@ -sudo cp -vpr * /omd/versions/default/share/doc/check_mk +#!/bin/bash +SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} +SITE=${SITE:-$(omd sites --bare | head -n 1)} +echo "TARGET: /omd/sites/$SITE/share/check_mk/checks" +sudo rsync -ar --delete-after ./ /omd/sites/$SITE/share/doc/check_mk/ +sudo install -m 755 treasures/mknotifyd /omd/sites/$SITE/bin +. /omd/sites/$SITE/etc/omd/site.conf +if [ "$CONFIG_MKNOTIFYD" = on ] ; then + sudo su - $SITE -c "omd restart mknotifyd" +fi

10 years

Check_MK Git: check_mk: #1407 FIX Fix exception in rule based notification on non-Ascii characters in log message

by Mathias Kettner

Module: check_mk Branch: master Commit: e1570af4e0e82cdcefb4c7356c62f09527baab57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1570af4e0e82c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 26 12:23:56 2014 +0200 #1407 FIX Fix exception in rule based notification on non-Ascii characters in log message --- .werks/1407 | 9 +++++++++ ChangeLog | 1 + modules/notify.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1407 b/.werks/1407 new file mode 100644 index 0000000..90bf678 --- /dev/null +++ b/.werks/1407 @@ -0,0 +1,9 @@ +Title: Fix exception in rule based notification on non-Ascii characters in log message +Level: 2 +Component: notifications +Compatible: compat +Version: 1.2.5i6 +Date: 1411727016 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ebf9490..1ab5d69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,7 @@ * 1400 Added example notification script for Pushover to doc/treasures/notifications... * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... * 1157 FIX: Fixed SMS plugin on at least debian (distrs which have no sendsms/smssend)... + * 1407 FIX: Fix exception in rule based notification on non-Ascii characters in log message BI: * 1406 Assume PEND in count_ok aggregations if all nodes are PEND... diff --git a/modules/notify.py b/modules/notify.py index 24e4c35..57b90d9 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1874,12 +1874,12 @@ def core_notification_log(plugin, plugin_context): log_message = "%s NOTIFICATION: %s;%s;%s;%s;%s" % ( what, contact, spec, state, plugin or "plain email", output) if monitoring_core == "cmc": - livestatus_send_command("LOG;" + log_message) + livestatus_send_command("LOG;" + log_message.encode("utf-8")) else: # Nagios and friends do not support logging via an # external command. We write the files into a help file # in var/check_mk/notify. If the users likes he can # replace that file with a symbolic link to the nagios # log file. But note: Nagios logging might not atomic. - file(notification_core_log, "a").write("[%d] %s\n" % (time.time(), log_message)) + file(notification_core_log, "a").write("[%d] %s\n" % (time.time(), log_message.encode("utf-8")))

10 years

Check_MK Git: check_mk: #1406 Assume PEND in count_ok aggregations if all nodes are PEND

by Mathias Kettner

Module: check_mk Branch: master Commit: 32ed15a3cc2237bde6fb7cbcc203890e76e8aa0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32ed15a3cc2237… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 26 11:04:30 2014 +0200 #1406 Assume PEND in count_ok aggregations if all nodes are PEND If you are using the BI aggregation function <tt>count_ok</tt> then nodes with the state <tt>PEND</tt> (which essentially means unmonitored or not present) are handled differently from now. If <b>all</b> nodes are pending then the total state will also be pending. If just some of the nodes are pending then they will not taken into account. This is especially imported when doing availability computations on BI aggregates. --- .werks/1406 | 16 ++++++++++++++++ ChangeLog | 3 +++ web/htdocs/bi.py | 29 +++++++++++++++++++++++------ 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/.werks/1406 b/.werks/1406 new file mode 100644 index 0000000..b645eb0 --- /dev/null +++ b/.werks/1406 @@ -0,0 +1,16 @@ +Title: Assume PEND in count_ok aggregations if all nodes are PEND +Level: 2 +Component: bi +Compatible: compat +Version: 1.2.5i6 +Date: 1411721844 +Class: feature + +If you are using the BI aggregation function <tt>count_ok</tt> then nodes +with the state <tt>PEND</tt> (which essentially means unmonitored or not +present) are handled differently from now. + +If <b>all</b> nodes are pending then the total state will also be pending. +If just some of the nodes are pending then they will not taken into account. +This is especially imported when doing availability computations on +BI aggregates. diff --git a/ChangeLog b/ChangeLog index e7fe90d..ebf9490 100644 --- a/ChangeLog +++ b/ChangeLog @@ -136,6 +136,9 @@ * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... * 1157 FIX: Fixed SMS plugin on at least debian (distrs which have no sendsms/smssend)... + BI: + * 1406 Assume PEND in count_ok aggregations if all nodes are PEND... + Event Console: * 1148 Allow execution of actions when cancelling events... * 1395 Event Console can now create notifications via Check_MK RBN... diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index a133aaf..9fcbac7 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1301,16 +1301,33 @@ def aggr_countok_convert(num, count): def aggr_countok(nodes, needed_for_ok=2, needed_for_warn=1): states = [ i[0]["state"] for i in nodes ] - num_ok = len([s for s in states if s == 0 ]) + num_ok = len([s for s in states if s == 0 ]) + num_nonok = len([s for s in states if s > 0 ]) + num_pending = len(states) - num_ok - num_nonok + num_nodes = num_ok + num_nonok + + # We need to handle the special case "PENDING" separately. + # Example: count is set to 50%. You have 10 nodes, all of + # which are PENDING, then the outcome must be PENDING, not + # CRIT. + if num_nodes == 0: # All are pending + return { "state": -1, "output": "" } # counts can be specified as integer (e.g. '2') or # as percentages (e.g. '70%'). - if num_ok >= aggr_countok_convert(needed_for_ok, len(states)): - return { "state" : 0, "output" : "" } - elif num_ok >= aggr_countok_convert(needed_for_warn, len(states)): - return { "state" : 1, "output" : "" } + ok_count = aggr_countok_convert(needed_for_ok, num_nodes) + warn_count = aggr_countok_convert(needed_for_warn, num_nodes) + + # Enough nodes are OK -> state is OK + if num_ok >= ok_count: + return { "state": 0, "output": "" } + + # Enough nodes OK in order to trigger warn level -> WARN + elif num_ok >= warn_count: + return { "state": 1, "output": "" } + else: - return { "state" : 2, "output" : "" } + return { "state": 2, "output": "" } config.aggregation_functions["count_ok"] = aggr_countok

10 years

Check_MK Git: check_mk: Updated bug entries #2185

by Mathias Kettner

Module: check_mk Branch: master Commit: 9bd31ebcce493b110ec575e3d41a93a8ee07c164 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bd31ebcce493b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 25 16:32:42 2014 +0200 Updated bug entries #2185 --- .bugs/2185 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2185 b/.bugs/2185 new file mode 100644 index 0000000..74270aa --- /dev/null +++ b/.bugs/2185 @@ -0,0 +1,10 @@ +Title: Page reload with click on page title loads *.css files new +Component: multisite +State: open +Date: 2014-09-25 16:31:49 +Targetversion: future +Class: nastiness + +If you initiate a page reload on a view by clicking on the page title, +then all static web files are being reloaded. This is not neccessary +and create extensive page requests.

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits