Checkmk git commits April 2014

checkmk-commits@lists.checkmk.com

6 participants
180 discussions

Check_MK Git: check_mk: akcp_daisy_temp: New Check for akcp daisyTemp sensor chains

by Bastian Kuhn

Module: check_mk Branch: master Commit: 971cd2c67e75e67c6361b7526bb344312b6772a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=971cd2c67e75e6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Apr 25 10:07:16 2014 +0200 akcp_daisy_temp: New Check for akcp daisyTemp sensor chains Further information about the sensor type can be found here: http://www.akcp.com/wp-content/uploads/2010/03/daisyTemp-sensor.pdf --- .werks/156 | 8 +++++ ChangeLog | 1 + checkman/akcp_daisy_temp | 30 ++++++++++++++++++ checks/akcp_daisy_temp | 74 +++++++++++++++++++++++++++++++++++++++++++ checks/akcp_sensor_humidity | 21 ++++++------ 5 files changed, 122 insertions(+), 12 deletions(-) diff --git a/.werks/156 b/.werks/156 new file mode 100644 index 0000000..8053af7 --- /dev/null +++ b/.werks/156 @@ -0,0 +1,8 @@ +Title: akcp_daisy_temp: New Check for akcp daisyTemp sensor chains +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398413136 +Class: feature + +Further information about the sensor type can be found here: http://www.akcp.com/wp-content/uploads/2010/03/daisyTemp-sensor.pdf diff --git a/ChangeLog b/ChangeLog index 406284d..497efe2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * 0896 wagner_titanus_topsense.airflow_deviation: New Check for Airflow Deviation in Wagner Titanus Top Sens devices * 0897 wagner_titanus_topsense.temp: New Check for Temperature measured by Wagner Titanus Top Sens devices * 0898 ibm_svc_nodestats.disk_latency, ibm_svc_systemstats.disk_latency: New Checks for Disk Latency in IBM SVC / Storwize V3700 / V7000 devices + * 0156 akcp_daisy_temp: New Check for akcp daisyTemp sensor chains... * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/akcp_daisy_temp b/checkman/akcp_daisy_temp new file mode 100644 index 0000000..8e5d782 --- /dev/null +++ b/checkman/akcp_daisy_temp @@ -0,0 +1,30 @@ +title: AKCP daisyTemp Sensor +agents: snmp +catalog: hw/environment/akcp +license: GPL +distribution: +description: + This check monitors the temperature of sensors attached + to AKCP daisyTemp sensor chain. The first attached sensor will be irgnored, + because this sensor is already represented by the the check akc_sensor_temp. + +item: + The item is the sensor description of the sensor as string. + +perfdata: + the current temperature in degree celsius + +inventory: + All available (without the first, see description) temperature sensors are automatically inventorized. + +examples: + # set default levels for all akcp temperature sensors + akcp_daisy_temp_defaultlevels = (28, 34) + +[parameters] +warning (int): temperature in degrees at which the check goes warning +critical (int): level for critical temperature + +[configuration] +akcp_daisy_temp_defaultlevels (int, int): Default levels. This is + preset to {(28, 32)}. diff --git a/checks/akcp_daisy_temp b/checks/akcp_daisy_temp new file mode 100644 index 0000000..9f5c54b --- /dev/null +++ b/checks/akcp_daisy_temp @@ -0,0 +1,74 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. +akcp_daisy_temp_defaultlevels = (28, 32) + +def inventory_akcp_daisy_temp(info): + inventory = [] + pass_first = True + for port, subport, name, temp in info: + if subport != '-1': + # We have to ignore the first item, because it will be also reported + # by akcp_sensor_temp on the port were this sensor chain are connected + if pass_first: + pass_first = False + continue + inventory.append((name, 'akcp_daisy_temp_defaultlevels' )) + return inventory + +def check_akcp_daisy_temp(item, params, info): + for port, subport, name, temp in info: + if name == item: + warn, crit = params + temp = savefloat(temp) / 10 + infotext = "%.1f °C " % temp + levels = " (warn/crit at %.1f/%.1f °C)" % (warn, crit) + perfdata = [ ( "temperature", temp, warn, crit ) ] + if temp > crit: + return 2, infotext + levels, perfdata + if temp > warn: + return 1, infotext + levels, perfdata + return 0, infotext + return 3, "Sensor not found" + +check_info["akcp_daisy_temp"] = { + 'check_function': check_akcp_daisy_temp, + 'inventory_function': inventory_akcp_daisy_temp, + 'service_description': 'Temperature %s', + 'has_perfdata': True, + 'snmp_info': ( + ".1.3.6.1.4.1.3854.1.2.2.1.19.33", + [ 1, 2, 3, 4, 5, 6, 7 ], + [ + OID_END, # Port/Subport + "2.1.1", # subport + "2.1.2", # Sensor Name + "2.1.14", # Degree Celsius + ] + ), + 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0") in\ + [ ".1.3.6.1.4.1.3854.1.2.2.1.1", ".1.3.6.1.4.1.3854.1" ], + 'group' : 'room_temperature', +} diff --git a/checks/akcp_sensor_humidity b/checks/akcp_sensor_humidity index 085805e..dd817b9 100644 --- a/checks/akcp_sensor_humidity +++ b/checks/akcp_sensor_humidity @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. # +------------------------------------------------------------------+ -# | This file has been contributed by: | +# | The initial version of this file has been contributed by: | # | | # | Michael Nieporte <Michael.Nieporte(a)uk-essen.de> | # +------------------------------------------------------------------+ @@ -36,7 +36,7 @@ def inventory_akcp_sensor_humidity(info): inventory = [] for desc, humidity, status, online in info: if online == "1": - inventory.append( (desc, "", "akcp_sensor_humidity_defaultlevels") ) + inventory.append( (desc, "akcp_sensor_humidity_defaultlevels") ) return inventory def check_akcp_sensor_humidity(item, params, info): @@ -52,14 +52,14 @@ def check_akcp_sensor_humidity(item, params, info): ( humidity, warnlow, critlow, warnhigh, crithigh) perfdata = [ ( "humidity", humidity, critlow, warnlow, warnhigh, crithigh ) ] if inthumidity <= critlow or inthumidity >= crithigh: - return (2, "Humidity is: " + infotext, perfdata ) + return 2, "Humidity is: " + infotext, perfdata elif inthumidity <= warnlow or inthumidity >= warnhigh: - return (1, "Humidity is: " + infotext, perfdata ) + return 1, "Humidity is: " + infotext, perfdata else: - return (0, "Humidity is: " + infotext, perfdata ) + return 0, "Humidity is: " + infotext, perfdata else: - return (3, "Sensor is offline") - return (3, "Sensor not found") + return 3, "Sensor is offline" + return 3, "Sensor not found" @@ -68,9 +68,6 @@ def check_akcp_sensor_humidity(item, params, info): # noStatus(1), normal(2), highWarning(3), highCritical(4), # lowWarning(5), lowCritical(6), sensorError(7) - - - check_info["akcp_sensor_humidity"] = { 'check_function': check_akcp_sensor_humidity, 'inventory_function': inventory_akcp_sensor_humidity, @@ -84,7 +81,7 @@ check_info["akcp_sensor_humidity"] = { 5, #sensorProbeHumidityOnline - online(1), offline(2) ], ), - 'snmp_scan_function': \ - lambda oid: "AKCP" in oid(".1.3.6.1.4.1.3854.1.1.6.0") and "sensorProbe" in oid(".1.3.6.1.4.1.3854.1.1.8.0"), + 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0") in\ + [ ".1.3.6.1.4.1.3854.1.2.2.1.1", ".1.3.6.1.4.1.3854.1" ], 'group': 'humidity', }

10 years, 5 months

Check_MK Git: check_mk: brocade_mlx_temp: BigIron RX devices have problems when queried by SNMPv2c bulk walk and do not deliver values

by Bernd Stroessenreuther

. So in this case we do not inventorize them to avoid the check to break Message-ID: <53593c79.R75gwvJ1TjBy5Rne%bs(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: 541c74f7c85e9c8224589eaebecc12c1a5cd546e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=541c74f7c85e9c… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Apr 24 18:31:04 2014 +0200 brocade_mlx_temp: BigIron RX devices have problems when queried by SNMPv2c bulk walk and do not deliver values. So in this case we do not inventorize them to avoid the check to break --- checks/brocade_mlx_temp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/checks/brocade_mlx_temp b/checks/brocade_mlx_temp index 306dff5..406f6c4 100644 --- a/checks/brocade_mlx_temp +++ b/checks/brocade_mlx_temp @@ -37,7 +37,11 @@ def inventory_brocade_mlx_temp(info): inventory = [] for temp_descr, temp_id, temp_value in info: temp_descr = compose_item(temp_id, temp_descr) - if ((temp_descr, "brocade_mlx_temperature_default_levels") not in inventory): + # BigIron RX devices have problems when queried by SNMPv2c bulk walk and + # do not deliver values. So in this case we do not inventorize them to + # avoid the check to break + if ((temp_descr, "brocade_mlx_temperature_default_levels") not in inventory and \ + temp_value != ""): inventory.append( (temp_descr, "brocade_mlx_temperature_default_levels") ) return inventory

10 years, 5 months

Check_MK Git: check_mk: FIX Improved transaction handling in Web GUI

by Andreas Boesl

Module: check_mk Branch: master Commit: b00183ec0c54437d56000c716e4209aa9166ca38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b00183ec0c5443… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 24 15:39:05 2014 +0200 FIX Improved transaction handling in Web GUI All transactions within the GUI are handled via transaction ids. In some instances these transaction ids were not stored correctly. This could lead to odd results, e.g. that entered data within formulars got discarded. --- .werks/906 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/config.py | 12 ++++++++++-- web/htdocs/html_mod_python.py | 8 ++++---- web/htdocs/htmllib.py | 10 ++++------ 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.werks/906 b/.werks/906 new file mode 100644 index 0000000..b075194 --- /dev/null +++ b/.werks/906 @@ -0,0 +1,10 @@ +Title: Improved transaction handling in Web GUI +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1398346478 +Class: fix + +All transactions within the GUI are handled via transaction ids. +In some instances these transaction ids were not stored correctly. +This could lead to odd results, e.g. that entered data within formulars got discarded. diff --git a/ChangeLog b/ChangeLog index eeb39e7..406284d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) * 0887 Add new column painter "Host Notifications Enabled"... * 0905 FIX: Multisite context buttons: links in context buttons are no longer called twice... + * 0906 FIX: Improved transaction handling in Web GUI... WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/htdocs/config.py b/web/htdocs/config.py index bb8ea35..dadcffe 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -373,18 +373,26 @@ def get_role_permissions(): return role_permissions # Helper functions -def load_user_file(name, deflt): +def load_user_file(name, deflt, lock = False): path = user_confdir + "/" + name + ".mk" try: + if lock: + aquire_lock(path) + return eval(file(path).read()) except: return deflt -def save_user_file(name, content): +def save_user_file(name, content, unlock = False): path = user_confdir + "/" + name + ".mk" try: write_settings_file(path, content) + + if unlock: + release_lock(path) except Exception, e: + # Error while writing file -> release lock + release_lock(path) raise MKConfigError(_("Cannot save %s options for user <b>%s</b> into <b>%s</b>: %s") % \ (name, user_id, path, e)) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index b164ad4..9b659bb 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -147,12 +147,12 @@ class html_mod_python(htmllib.html): return True - def load_transids(self): - return config.load_user_file("transids", []) + def load_transids(self, lock = False): + return config.load_user_file("transids", [], lock) - def save_transids(self, used_ids): + def save_transids(self, used_ids, unlock = False): if config.user_id: - config.save_user_file("transids", used_ids) + config.save_user_file("transids", used_ids, unlock) def save_tree_states(self): config.save_user_file("treestates", self.treestates) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 8957a97..8e02348 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -969,25 +969,23 @@ class html: # than one week. def store_new_transids(self): if self.new_transids: - valid_ids = self.load_transids() - + valid_ids = self.load_transids(lock = True) cleared_ids = [] now = time.time() for valid_id in valid_ids: timestamp, rand = valid_id.split("/") if now - int(timestamp) < 604800: # 7 * 24 hours cleared_ids.append(valid_id) - - self.save_transids(cleared_ids + self.new_transids) + self.save_transids(cleared_ids + self.new_transids, unlock = True) # Remove the used transid from the list of valid ones def invalidate_transid(self, used_id): - valid_ids = self.load_transids() + valid_ids = self.load_transids(lock = True) try: valid_ids.remove(used_id) except ValueError: return - self.save_transids(valid_ids) + self.save_transids(valid_ids, unlock = True) # Checks, if the current transaction is valid, i.e. in case of # browser reload a browser reload, the form submit should not

10 years, 5 months

Check_MK Git: check_mk: FIX Multisite context buttons: links in context buttons are no longer called twice

by Andreas Boesl

Module: check_mk Branch: master Commit: dde31d9ee70e08e5426988a4b6f940ac4305b675 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dde31d9ee70e08… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 24 14:52:19 2014 +0200 FIX Multisite context buttons: links in context buttons are no longer called twice The "onclick" attribute in the context button (buttons at the top of a page) additionally called the href link, which was already specified in the "href" attribute. This could lead to raise conditions where transactions (saving a formular) were not handled correctly. --- .werks/905 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/905 b/.werks/905 new file mode 100644 index 0000000..0e0d7e0 --- /dev/null +++ b/.werks/905 @@ -0,0 +1,10 @@ +Title: Multisite context buttons: links in context buttons are no longer called twice +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1398343626 +Class: fix + +The "onclick" attribute in the context button (buttons at the top of a page) additionally +called the href link, which was already specified in the "href" attribute. +This could lead to raise conditions where transactions (saving a formular) were not handled correctly. diff --git a/ChangeLog b/ChangeLog index 61b25d0..eeb39e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) * 0887 Add new column painter "Host Notifications Enabled"... + * 0905 FIX: Multisite context buttons: links in context buttons are no longer called twice... WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 488852f..8957a97 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -382,7 +382,7 @@ class html: if hover_title: self.write(' title="%s"' % self.attrencode(hover_title)) if bestof: - self.write(' onclick="count_context_button(this); document.location=this.href; " ') + self.write(' onclick="count_context_button(this); " ') if fkey and self.keybindings_enabled: title += '<div class=keysym>F%d</div>' % fkey self.add_keybinding([html.F1 + (fkey - 1)], "document.location='%s';" % self.attrencode(url))

10 years, 5 months

Check_MK Git: check_mk: fixed exception when using the table search function

by Andreas Boesl

Module: check_mk Branch: master Commit: 12e870f9aaa178521b3f18cb81bcdacc83763afa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12e870f9aaa178… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 24 13:15:20 2014 +0200 fixed exception when using the table search function --- web/htdocs/table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 2bb03c4..7a4cef0 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -177,7 +177,7 @@ def end(): for row, css, state in rows: if state == "header": continue - for cell_content, css_classes in row: + for cell_content, css_classes, colspan in row: if search_term in cell_content.lower(): filtered_rows.append((row, css, state)) break # skip other cells when matched

10 years, 5 months

Check_MK Git: check_mk: FIX Fix SNMP inventory check in simulation mode

by Mathias Kettner

Module: check_mk Branch: master Commit: e7fd150ac637ce3cbf10512c73a01d6cf73ec77f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7fd150ac637ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 24 11:15:23 2014 +0200 FIX Fix SNMP inventory check in simulation mode --- .werks/888 | 9 +++++++++ ChangeLog | 1 + modules/check_mk_base.py | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/888 b/.werks/888 new file mode 100644 index 0000000..7890767 --- /dev/null +++ b/.werks/888 @@ -0,0 +1,9 @@ +Title: Fix SNMP inventory check in simulation mode +Level: 1 +Component: core +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1398330909 + + diff --git a/ChangeLog b/ChangeLog index c839d17..61b25d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 0884 New options --oid and --extraoid for cmk --snmpwalk... * 0785 FIX: Availability: fixed memory leak in table statehist... * 0903 FIX: availability: fixed bug causing the availability feature not considering timeperiod transitions + * 0888 FIX: Fix SNMP inventory check in simulation mode Checks & Agents: * 0149 cisco_secure: New check for Port Security on Cisco swichtes diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 90e839d..e57a3e7 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -351,7 +351,13 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, ignore_che # cache file is newer than check_interval, skip this check raise MKSkipCheck() - content = read_cache_file(cache_relpath, max_cache_age) + try: + content = read_cache_file(cache_relpath, max_cache_age) + except: + if simulation_mode and not opt_no_cache: + return # Simply ignore missing SNMP cache files + raise + if content: return eval(content) # Not cached -> need to get info via SNMP

10 years, 5 months

Check_MK Git: check_mk: FIX mssql_counters: harded check agains odd agent output

by Bastian Kuhn

Module: check_mk Branch: master Commit: 5cf1a754f89a1145bc2179ff4b34a601d9591e02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cf1a754f89a11… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Apr 24 09:21:30 2014 +0200 FIX mssql_counters: harded check agains odd agent output --- .werks/155 | 9 +++++++++ ChangeLog | 1 + checks/mssql_counters | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/155 b/.werks/155 new file mode 100644 index 0000000..f66b5ac --- /dev/null +++ b/.werks/155 @@ -0,0 +1,9 @@ +Title: mssql_counters: harded check agains odd agent output +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1398323787 + + diff --git a/ChangeLog b/ChangeLog index 96b0db0..c839d17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ * 0832 FIX: solaris_mem: fixed invalid calculation of total swap... * 0810 FIX: fritz.link: Not inventorizing "unconfigured" interfaces anymore * 0154 FIX: zfsget: Fixed inventory of filesystems + * 0155 FIX: mssql_counters: harded check agains odd agent output Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/mssql_counters b/checks/mssql_counters index ad672d4..30203e4 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -39,7 +39,7 @@ # MSSQL_SQLEXPRESS:Databases master Log_File(s)_Size_(KB) def mssql_counters_item(line, add_counter_name): - obj, counter, instance, value = line + obj, counter, instance = line[:3] if obj.endswith(':Databases'): obj = obj[:-10]

10 years, 5 months

Check_MK Git: check_mk: optimizing/unifying outputs

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 90be5c7de87d5b93e104b5eee5f58115f307438e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90be5c7de87d5b… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Apr 23 17:53:43 2014 +0200 optimizing/unifying outputs --- checks/df.include | 9 +++++++-- pnp-templates/check_mk-ibm_svc_nodestats.iops.php | 22 ++++++++++----------- web/plugins/perfometer/check_mk.py | 4 ++-- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/checks/df.include b/checks/df.include index d4f804b..91b5093 100644 --- a/checks/df.include +++ b/checks/df.include @@ -304,8 +304,13 @@ def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, inodes_t # TODO: In some future version use a fixed name as perf variable perf_var = mountpoint.replace(" ", "_") perfdata = [(perf_var, str(used_mb) + 'MB', warn_mb, crit_mb, 0, size_mb)] - infotext = "%.1f %% used (%.2f of %.1f GB), %s" % \ - (used_perc, used_mb / 1024.0, size_gb, levels["levels_text"]) + + if size_gb < 10240: + infotext = "%.1f %% used (%.2f of %.2f GB), %s" % \ + (used_perc, used_mb / 1024.0, size_gb, levels["levels_text"]) + else: + infotext = "%.1f %% used (%.2f of %.2f TB), %s" % \ + (used_perc, used_mb / 1024.0 / 1024.0, size_gb / 1024.0, levels["levels_text"]) # Trends. The trends are computed in two steps. In the first step we # compute the delta to the last check, using a normal check_mk counter. diff --git a/pnp-templates/check_mk-ibm_svc_nodestats.iops.php b/pnp-templates/check_mk-ibm_svc_nodestats.iops.php index 2a39a76..7c35b2b 100644 --- a/pnp-templates/check_mk-ibm_svc_nodestats.iops.php +++ b/pnp-templates/check_mk-ibm_svc_nodestats.iops.php @@ -38,16 +38,16 @@ if (isset($DS[2])) { $parts = explode("_", $servicedesc); $disk = $parts[2]; - $opt[1] = "--vertical-label 'IOs/sec' -X0 --title \"$hostname / $servicedesc\" "; + $opt[1] = "--vertical-label 'IO/s' -X0 --title \"$hostname / $servicedesc\" "; $def[1] = "HRULE:0#a0a0a0 ". # read "DEF:read=$RRD[read] ". "AREA:read#40c080:\"Read \" ". - "GPRINT:read:LAST:\"%8.0lf IOs/sec last\" ". - "GPRINT:read:AVERAGE:\"%6.0lf IOs/sec avg\" ". - "GPRINT:read:MAX:\"%6.0lf IOs/sec max\\n\" "; + "GPRINT:read:LAST:\"%8.0lf IO/s last\" ". + "GPRINT:read:AVERAGE:\"%6.0lf IO/s avg\" ". + "GPRINT:read:MAX:\"%6.0lf IO/s max\\n\" "; # read average as line in the same graph if (isset($RRD["read.avg"])) { @@ -61,21 +61,21 @@ if (isset($DS[2])) { "DEF:write=$RRD[write] ". "CDEF:write_neg=write,-1,* ". "AREA:write_neg#4080c0:\"Write \" ". - "GPRINT:write:LAST:\"%6.0lf IOs/sec last\" ". - "GPRINT:write:AVERAGE:\"%6.0lf IOs/sec avg\" ". - "GPRINT:write:MAX:\"%6.0lf IOs/sec max\\n\" ". + "GPRINT:write:LAST:\"%6.0lf IO/s last\" ". + "GPRINT:write:AVERAGE:\"%6.0lf IO/s avg\" ". + "GPRINT:write:MAX:\"%6.0lf IO/s max\\n\" ". ""; # show levels for read if ($WARN['read']) { - $def[1] .= "HRULE:$WARN[read]#ffd000:\"Warning for read at " . sprintf("%6.1f", $WARN[1]) . " IOs/sec \" "; - $def[1] .= "HRULE:$CRIT[read]#ff0000:\"Critical for read at " . sprintf("%6.1f", $CRIT[1]) . " IOs/sec\\n\" "; + $def[1] .= "HRULE:$WARN[read]#ffd000:\"Warning for read at " . sprintf("%6.1f", $WARN[1]) . " IO/s \" "; + $def[1] .= "HRULE:$CRIT[read]#ff0000:\"Critical for read at " . sprintf("%6.1f", $CRIT[1]) . " IO/s\\n\" "; } # show levels for write if ($WARN['write']) { - $def[1] .= "HRULE:-$WARN[write]#ffd000:\"Warning for write at " . sprintf("%6.1f", $WARN[2]) . " IOs/sec \" "; - $def[1] .= "HRULE:-$CRIT[write]#ff0000:\"Critical for write at " . sprintf("%6.1f", $CRIT[2]) . " IOs/sec\\n\" "; + $def[1] .= "HRULE:-$WARN[write]#ffd000:\"Warning for write at " . sprintf("%6.1f", $WARN[2]) . " IO/s \" "; + $def[1] .= "HRULE:-$CRIT[write]#ff0000:\"Critical for write at " . sprintf("%6.1f", $CRIT[2]) . " IO/s\\n\" "; } } diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 4b42e35..9e77b8c 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -543,7 +543,7 @@ perfometers["check_mk-ibm_svc_systemstats.diskio"] = perfometer_check_mk_disksta def perfometer_check_mk_iops_r_w(row, check_command, perf_data): iops_r = int(perf_data[0][1]) iops_w = int(perf_data[1][1]) - text = "%d IO/s / %s IO/s" % (iops_r, iops_w) + text = "%d IO/s %s IO/s" % (iops_r, iops_w) return text, perfometer_logarithmic_dual( iops_r, "#60e0a0", iops_w, "#60a0e0", 100000, 10) @@ -553,7 +553,7 @@ perfometers["check_mk-ibm_svc_systemstats.iops"] = perfometer_check_mk_iops_r_w def perfometer_check_mk_disk_latency_r_w(row, check_command, perf_data): latency_r = int(perf_data[0][1]) latency_w = int(perf_data[1][1]) - text = "%d ms / %s ms" % (latency_r, latency_w) + text = "%d ms %s ms" % (latency_r, latency_w) return text, perfometer_logarithmic_dual( latency_r, "#60e0a0", latency_w, "#60a0e0", 20, 10)

10 years, 5 months

Check_MK Git: check_mk: fixed merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 078b459f188bcb917b7d16b8898646e5d4acffd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=078b459f188bcb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Apr 23 17:07:10 2014 +0200 fixed merge conflict --- .werks/154 | 9 +++++++++ ChangeLog | 1 + checks/zfsget | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/154 b/.werks/154 new file mode 100644 index 0000000..cae564b --- /dev/null +++ b/.werks/154 @@ -0,0 +1,9 @@ +Title: zfsget: Fixed inventory of filesystems +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1398265418 + + diff --git a/ChangeLog b/ChangeLog index f58de74..96b0db0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 0606 FIX: apache_status: now also sends an accept header to make it work with mod_security enables servers * 0832 FIX: solaris_mem: fixed invalid calculation of total swap... * 0810 FIX: fritz.link: Not inventorizing "unconfigured" interfaces anymore + * 0154 FIX: zfsget: Fixed inventory of filesystems Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/zfsget b/checks/zfsget index 5ec0d93..386e08f 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -95,7 +95,8 @@ def parse_zfsget(info): for entry in entries: if entry["mountpoint"].startswith("/"): entry["is_pool"] = '/' not in entry["name"] - parsed[entry["mountpoint"]] = entry + if entry['available'] != 0: + parsed[entry["mountpoint"]] = entry if start_of_df != None: zfsget_parse_df_info(parsed, info[start_of_df:]) @@ -146,8 +147,7 @@ def inventory_zfsget(info): parsed = parse_zfsget(info) for mountpoint, properties in parsed.items(): if mountpoint not in inventory_df_exclude_mountpoints: - if properties["available"] != 0: - mplist.append(mountpoint) + mplist.append(mountpoint) return df_inventory(mplist)

10 years, 5 months

Check_MK Git: check_mk: werk 902, another displaybug fix

by Andreas Boesl

Module: check_mk Branch: master Commit: d306a7190d2e79be22841591e990abea39c5a670 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d306a7190d2e79… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 23 16:32:39 2014 +0200 werk 902, another displaybug fix --- web/htdocs/views.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 6029ff1..e2389a1 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2738,6 +2738,9 @@ def get_host_tags(row): if type(row.get("host_custom_variables")) == dict: return row["host_custom_variables"].get("TAGS", "") + if type(row.get("host_custom_variable_names")) != list: + return "" + for name, val in zip(row["host_custom_variable_names"], row["host_custom_variable_values"]): if name == "TAGS":

10 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2014