Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64581 discussions

Check_MK Git: check_mk: Unitrends Backup

by Bastian Kuhn

Module: check_mk Branch: master Commit: 030e4f428882ad174d1386b7abc8cc1b45888af1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=030e4f428882ad… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 23 10:05:56 2014 +0100 Unitrends Backup Unitrends is a enterprise class backup solution. This check kann monitor the Backup schedules from unitrends. --- .werks/125 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/125 b/.werks/125 new file mode 100644 index 0000000..fffd5d6 --- /dev/null +++ b/.werks/125 @@ -0,0 +1,10 @@ +Title: Unitrends Backup +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1390467872 +Class: feature + +Unitrends is a enterprise class backup solution. +This check kann monitor the Backup schedules from unitrends. + diff --git a/ChangeLog b/ChangeLog index 25d3ce9..e5c4651 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ * 0463 emcvnx_raidgroups.capacity, emcvnx_raidgroups.capacity_contiguous: New Checks for EMC VNX Storage systems... * 0570 fileinfo.groups: file groups now allow exclude patterns as well * 0464 stulz_pump: new check for the status of pumps of Stulz clima units + * 0125 Unitrends Backup... * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs...

10 years, 8 months

Check_MK Git: check_mk: stulz_pump: new check for the status of pumps of Stulz clima units

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 5269bd44069544ffa000574e638d0a3f71dbf302 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5269bd44069544… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Jan 22 19:02:59 2014 +0100 stulz_pump: new check for the status of pumps of Stulz clima units --- .werks/464 | 8 ++++++++ ChangeLog | 1 + checkman/stulz_pump | 11 +++++++++++ checks/stulz_pump | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+) diff --git a/.werks/464 b/.werks/464 new file mode 100644 index 0000000..eb9e1f0 --- /dev/null +++ b/.werks/464 @@ -0,0 +1,8 @@ +Title: stulz_pump: new check for the status of pumps of Stulz clima units +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1390413752 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 4d496fd..25d3ce9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 0462 emcvnx_raidgroups.list_disks: New check for EMC VNX storage system... * 0463 emcvnx_raidgroups.capacity, emcvnx_raidgroups.capacity_contiguous: New Checks for EMC VNX Storage systems... * 0570 fileinfo.groups: file groups now allow exclude patterns as well + * 0464 stulz_pump: new check for the status of pumps of Stulz clima units * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/stulz_pump b/checkman/stulz_pump new file mode 100644 index 0000000..c1435b8 --- /dev/null +++ b/checkman/stulz_pump @@ -0,0 +1,11 @@ +title: Stulz clima unit pump status +agents: snmp +catalog: hw/environment +license: GPL +distribution: check_mk +description: + This plugin checks the status of pumps of Stulz clima units. Returns + {OK} if the pump is running and {CRIT} if it is not running. + +inventory: + The inventory will create exactly one service per pump. diff --git a/checks/stulz_pump b/checks/stulz_pump new file mode 100644 index 0000000..e3e6ec2 --- /dev/null +++ b/checks/stulz_pump @@ -0,0 +1,53 @@ +#!/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. + +def inventory_stulz_pump(info): + inventory = [] + for pump_id, pump_status in info: + pump_id = pump_id.replace('.1', '') + inventory.append( (pump_id, None) ) + return inventory + +def check_stulz_pump(item, _no_params, info): + for pump_id, pump_status in info: + pump_id = pump_id.replace('.1', '') + if pump_id == item: + if pump_status == '1': + return 0, "Pump is running" + elif pump_status == '0': + return 2, "Pump is not running" + else: + return 3, "Pump reports unidentified status " + pump_status + return 3, "Pump %s not found" % item + +check_info["stulz_pump"] = { + "check_function" : check_stulz_pump, + "inventory_function" : inventory_stulz_pump, + "service_description" : "Pump %s", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.29462.10", + "snmp_info" : ( ".1.3.6.1.4.1.29462.10.2.1.1.2.1.4.1.1.5802", [ OID_END, 2] ), +} +

10 years, 8 months

Check_MK Git: check_mk: FIX livestatus log table: fixed missing logentries of archived logfiles

by Andreas Boesl

Module: check_mk Branch: master Commit: 7552daef9ed887a032d4b85110a96bcd116ed2a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7552daef9ed887… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jan 22 16:59:42 2014 +0100 FIX livestatus log table: fixed missing logentries of archived logfiles In archived logfiles the line numbering of the logfile entries was incorrect. The incorrect number could collide with the configuration option max_lines_per_logfile, thus leading to an error where archive logfiles where not read completely. For example: More than 1000000 lines in ….. /live/var/archives/nagios-01-20-2014-00.log. Ignoring the rest! --- .werks/263 | 14 ++++++++++++++ ChangeLog | 3 +++ livestatus/src/Logfile.cc | 1 + 3 files changed, 18 insertions(+) diff --git a/.werks/263 b/.werks/263 new file mode 100644 index 0000000..34daa4f --- /dev/null +++ b/.werks/263 @@ -0,0 +1,14 @@ +Title: livestatus log table: fixed missing logentries of archived logfiles +Level: 1 +Component: liveproxy +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390406019 + +In archived logfiles the line numbering of the logfile entries was incorrect. +The incorrect number could collide with the configuration option max_lines_per_logfile, +thus leading to an error where archive logfiles where not read completely. +For example: +More than 1000000 lines in ….. /live/var/archives/nagios-01-20-2014-00.log. Ignoring the rest! + diff --git a/ChangeLog b/ChangeLog index 6c5af24..4d496fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -235,6 +235,9 @@ * 0336 FIX: Limit the number of lines read from a single logfile... * 0344 FIX: Fix semantics of columns num_services_hard_*... + Livestatus-Proxy: + * 0263 FIX: livestatus log table: fixed missing logentries of archived logfiles... + 1.2.3i7: Core & Setup: diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 3324554..919c424 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -138,6 +138,7 @@ void Logfile::load(LogCache *logcache, time_t since, time_t until, unsigned logc return; } + _lineno = 0; loadRange(file, missing_types, logcache, since, until, logclasses); fclose(file); _logclasses_read |= missing_types;

10 years, 8 months

Check_MK Git: check_mk: FIX ps: Now able to skip disabled "

by Andreas Boesl

Process Inventory" rules Message-ID: <52dfce32.JPbMLDgJ0peLW8q9%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: 74a08ee4d59f8fa3ae91ab7811b83b1f4f4c068f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74a08ee4d59f8f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jan 22 14:56:39 2014 +0100 FIX ps: Now able to skip disabled "Process Inventory" rules The ps check was unable to detect if a WATO rule "Process Inventory" was disabled. --- .werks/262 | 9 +++++++++ ChangeLog | 1 + checks/ps | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/.werks/262 b/.werks/262 new file mode 100644 index 0000000..a1ce4ac --- /dev/null +++ b/.werks/262 @@ -0,0 +1,9 @@ +Title: ps: Now able to skip disabled "Process Inventory" rules +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390398896 + +The ps check was unable to detect if a WATO rule "Process Inventory" was disabled. diff --git a/ChangeLog b/ChangeLog index 2cce527..6c5af24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,6 +127,7 @@ * 0460 FIX: endless waiting for printer queues fixed... * 0260 FIX: Fixed incorrect formatting of checks with long output... * 0261 FIX: df_netapp32 / df_netapp: Fixed bug with negative size in check output... + * 0262 FIX: ps: Now able to skip disabled "Process Inventory" rules... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/ps b/checks/ps index d02cdcb..6bea6eb 100644 --- a/checks/ps +++ b/checks/ps @@ -179,6 +179,11 @@ def inventory_ps_common(invdata, info, handle_perfdata = False): # Handle new wato style inventory_processes_rules for rule in inventory_processes_rules: taglist, hostlist = rule[1:3] + if len(rule) >= 4: + options = rule[3] + if options.get("disabled"): + continue + # Filter out entries with do not match our current host if not hosttags_match_taglist(tags_of_host(g_hostname), taglist) \ or not in_extraconf_hostlist(hostlist, g_hostname):

10 years, 8 months

Check_MK Git: check_mk: hitachi_hnas_fan: internal code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 403d0cdf8bc30e7f680c668aad86cca831ab14c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=403d0cdf8bc30e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 22 14:38:13 2014 +0100 hitachi_hnas_fan: internal code cleanup --- checks/hitachi_hnas_fan | 89 +++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 49 deletions(-) diff --git a/checks/hitachi_hnas_fan b/checks/hitachi_hnas_fan index ff766db..6d5e539 100644 --- a/checks/hitachi_hnas_fan +++ b/checks/hitachi_hnas_fan @@ -26,76 +26,67 @@ def inventory_hitachi_hnas_fan(info): inventory = [] - for clusternode, id, fitted_status, speed_status, speed in info: - inventory.append( (clusternode + "." + id, None) ) + for clusternode, fan_id, fitted_status, speed_status, speed in info: + inventory.append( (clusternode + "." + fan_id, None) ) return inventory + def check_hitachi_hnas_fan(item, _no_params, info): - rc = 0 - fan_fitted_status_map = ( ("", 3), # 0 - ("ok", 0), # 1 - ("okIdWrong", 1), # 2 - ("notFitted", 2), # 3 - ("unknown", 3), # 4 - ) + fitted_status_map = ( + ("ok", 0), # 1 + ("okIdWrong(!)", 1), # 2 + ("notFitted(!!)", 2), # 3 + ("unknown(!)", 1) # 4 + ) + + speed_status_map = ( + ("ok", 0), # 1 + ("warning(!)", 1), # 2 + ("severe(!!)", 2), # 3 + ("unknown(!)", 1), # 4 + ) - fan_speed_status_map = ( ("", 3), # 0 - ("ok", 0), # 1 - ("warning", 1), # 2 - ("severe", 2), # 3 - ("unknown", 3), # 4 - ) - errorstring = ( "", " (!)", " (!!)", "") + for clusternode, fan_id, fitted_status, speed_status, speed in info: + if clusternode + "." + fan_id == item: + fitted_status = int(fitted_status) + speed_status = int(speed_status) + speed = int(speed) + infotext = "PNode %s fan %s" % (clusternode, fan_id) - for clusternode, id, fitted_status, speed_status, speed in info: - if clusternode + "." + id == item: - fitted_status=int(fitted_status) - speed_status=int(speed_status) - speed=int(speed) - message = "PNode %s Fan %s" % (clusternode, id) + worststate = 0 # check fitted status - if fitted_status == 0 or fitted_status >= len(fan_fitted_status_map): - message += " fitted status unidentified %s" % fitted_status - rc = 3 - else: - message += " fitted status is %s%s" % ( fan_fitted_status_map[fitted_status][0], errorstring[fan_fitted_status_map[fitted_status][1]] ) - rc = fan_fitted_status_map[fitted_status][1] + name, state = fitted_status_map[fitted_status - 1] + infotext += ", fitted status is %s" % name + worststate = max(worststate, state) # check speed status - if speed_status == 0 or speed_status >= len(fan_speed_status_map): - message += ", speed status unidentified %s" % speed_status - if rc == 0: - rc = 3 - # if rc is already warning or critical, keep it - else: - message += ", speed status is %s%s" % ( fan_speed_status_map[speed_status][0], errorstring[fan_speed_status_map[speed_status][1]] ) - if fan_speed_status_map[speed_status][1] == 1: - if rc == 2: - rc = 2 - else: - rc = 1 - elif fan_speed_status_map[speed_status][1] == 2: - rc = 2 - elif fan_speed_status_map[speed_status][1] == 3: - if rc == 0: - rc = 3 + name, state = speed_status_map[speed_status - 1] + infotext += ", speed status is %s" % name + worststate = max(worststate, state) # report speed - message += ", speed is %s rpm" % speed + infotext += ", speed is %s rpm" % speed perfdata = [ ('fanspeed', str(speed) + 'rpm', '', '', 0, '') ] - return rc, message, perfdata + return worststate, infotext, perfdata return 3, "No fan %s found" % item + + check_info["hitachi_hnas_fan"] = { "check_function" : check_hitachi_hnas_fan, "inventory_function" : inventory_hitachi_hnas_fan, "service_description" : "Fan %s", "has_perfdata" : True, - "snmp_info" : (".1.3.6.1.4.1.11096.6.1.1.1.2.1.11.1", [1, 2, 3, 4, 5]), - # fanClusterNode, fanIndex, fanFittedStatus, fanSpeedStatus, fanSpeed + "snmp_info" : (".1.3.6.1.4.1.11096.6.1.1.1.2.1.11.1", [ + 1, # fanClusterNode + 2, # fanIndex + 3, # fanFittedStatus + 4, # fanSpeedStatus + 5, # fanSpeed + ]), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.11096.6"), }

10 years, 8 months

Check_MK Git: check_mk: Internal code cleanup of hitachi_hnas_fc_if

by Mathias Kettner

Module: check_mk Branch: master Commit: 40e5f042c3a1a80f16ba4ea8461672c68fed7db5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40e5f042c3a1a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 22 14:20:58 2014 +0100 Internal code cleanup of hitachi_hnas_fc_if --- checks/hitachi_hnas_fc_if | 68 +++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/checks/hitachi_hnas_fc_if b/checks/hitachi_hnas_fc_if index b8a1821..f30ac6f 100644 --- a/checks/hitachi_hnas_fc_if +++ b/checks/hitachi_hnas_fc_if @@ -24,42 +24,32 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + def hitachi_hnas_fc_if_convert_info(info): converted = [] for line in info: - convertedline = [] - convertedline.append("%d%03d" % (int(line[0]), int(line[1]))) # ifIndex - # use ClusterNode.InterfaceIndex as description too, because - # we have no explicit Descr - convertedline.append(line[0] + "." + line[1]) # ifDescr - # ifType 56 fibreChannel - convertedline.append("56") # ifType - convertedline.append(str(int(line[3]) * 1000000000)) # ifHighSpeed - if line[2] == "1": # ifOperStatus - convertedline.append("1") - else: - convertedline.append("2") - convertedline.append(line[4]) # ifHCInOctets - convertedline.append("0") # ifHCInUcastPkts - convertedline.append("0") # ifHCInMulticastPkts - convertedline.append("0") # ifHCInBroadcastPkts - convertedline.append(line[11]) # ifInDiscards - convertedline.append(str(int(line[6]) + int(line[7]) + int(line[8]) \ - + int(line[9]) + int(line[10]) + int(line[12]) + int(line[13]))) - # ifInErrors - convertedline.append(line[5]) # ifHCOutOctets - convertedline.append("0") # ifHCOutUcastPkts - convertedline.append("0") # ifHCOutMulticastPkts - convertedline.append("0") # ifHCOutBroadcastPkts - convertedline.append("0") # ifOutDiscards - convertedline.append("0") # ifOutErrors - convertedline.append("0") # ifOutQLen - # use ClusterNode.InterfaceIndex as alias too, because - # we have no explicit alias - convertedline.append(line[0] + "." + line[1]) # ifAlias - convertedline.append("") # ifPhysAddress - - converted.append(convertedline) + converted.append(map(str, [ + "%d%03d" % (int(line[0]), int(line[1])), # ifIndex + line[0] + "." + line[1], # ifDescr (use ClusterNode.InterfaceIndex) + 56, # ifType 56 (fibreChannel) + int(line[3]) * 1000000000, # ifHighSpeed + line[2] == "1" and 1 or 2, # ifOperStatus (map other states to down) + line[4], # ifHCInOctets + 0, # ifHCInUcastPkts + 0, # ifHCInMulticastPkts + 0, # ifHCInBroadcastPkts + line[13], # ifInDiscards + sum(map(int, line[6:13])), # ifInErrors + line[5], # ifHCOutOctets + 0, # ifHCOutUcastPkts + 0, # ifHCOutMulticastPkts + 0, # ifHCOutBroadcastPkts + 0, # ifOutDiscards + 0, # ifOutErrors + 0, # ifOutQLen + line[0] + "." + line[1], # ifAlias, same as description + "", # ifPhysAddress + ])) return converted def inventory_hitachi_hnas_fc_if(info): @@ -69,12 +59,11 @@ def inventory_hitachi_hnas_fc_if(info): def check_hitachi_hnas_fc_if(item, params, info): converted = hitachi_hnas_fc_if_convert_info(info) return check_if_common(item, params, converted) - + check_info["hitachi_hnas_fc_if"] = { "check_function" : check_hitachi_hnas_fc_if, "inventory_function" : inventory_hitachi_hnas_fc_if, - "includes": [ "if.include" ], "service_description" : "Interface FC %s", "has_perfdata" : True, "snmp_info" : (".1.3.6.1.4.1.11096.6.1.1.1.3.6.25.1", [ @@ -89,12 +78,13 @@ check_info["hitachi_hnas_fc_if"] = { 15, # fcStatsLossSyncErrors 8 16, # fcStatsLinkFailErrors 9 17, # fcStatsRXEOFErrors 10 - 18, # fcStatsDiscardedFrameErrors 11 - 19, # fcStatsBadCRCErrors 12 - 20, # fcStatsProtocolErrors 13 + 19, # fcStatsBadCRCErrors 11 + 20, # fcStatsProtocolErrors 12 + 18, # fcStatsDiscardedFrameErrors 13 ]), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.11096.6"), - "group": "if", + "group" : "if", "default_levels_variable": "if_default_levels", + "includes" : [ "if.include" ], }

10 years, 8 months

Check_MK Git: check_mk: FIX df_netapp32 / df_netapp: Fixed bug with negative size in check output

by Andreas Boesl

Module: check_mk Branch: master Commit: 59dd42a1716d390e47c02bccf1059bdee67eaf11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59dd42a1716d39… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jan 22 12:37:51 2014 +0100 FIX df_netapp32 / df_netapp: Fixed bug with negative size in check output The df_netapp and df_netapp32 checks tried to determine 64 bit counters by checking the existance of the oid .1.3.6.1.4.1.789.1.5.4.1.29.1 (df64TotalKBytes). Unfortunately not all netapp interfaces start at .1, so some netapp devices where wrongly inventorized as df_netapp32 checks. --- .werks/261 | 14 ++++++++++++++ ChangeLog | 1 + checks/df_netapp | 2 +- checks/df_netapp32 | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/261 b/.werks/261 new file mode 100644 index 0000000..ba33d8b --- /dev/null +++ b/.werks/261 @@ -0,0 +1,14 @@ +Title: df_netapp32 / df_netapp: Fixed bug with negative size in check output +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390390390 + +The df_netapp and df_netapp32 checks tried to determine 64 bit counters by checking +the existance of the oid .1.3.6.1.4.1.789.1.5.4.1.29.1 (df64TotalKBytes). +Depending on the 64 Bit counter a df_netapp check is created, otherwise df_netapp32 is used. +Unfortunately not all netapp interfaces start at .1, so some netapp devices where wrongly +inventorized as df_netapp32 checks. +Those checks reported negative volume sizes whenever the 32 bit counter overflowed. diff --git a/ChangeLog b/ChangeLog index e0257f1..939aafd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,7 @@ * 0120 FIX: stulz_humidity, apc_humidity: Fixed bug while processing check params... * 0460 FIX: endless waiting for printer queues fixed... * 0260 FIX: Fixed incorrect formatting of checks with long output... + * 0261 FIX: df_netapp32 / df_netapp: Fixed bug with negative size in check output... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/df_netapp b/checks/df_netapp index 29e1a63..055ed7c 100644 --- a/checks/df_netapp +++ b/checks/df_netapp @@ -36,7 +36,7 @@ check_info["df_netapp"] = { 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.789.1.5.4.1', [2, 29, 30]), 'snmp_scan_function': \ - lambda oid: is_netapp_filer(oid) and oid(".1.3.6.1.4.1.789.1.5.4.1.29.1"), + lambda oid: is_netapp_filer(oid) and oid(".1.3.6.1.4.1.789.1.5.4.1.29.*"), 'group': 'filesystem', 'default_levels_variable': 'filesystem_default_levels', } diff --git a/checks/df_netapp32 b/checks/df_netapp32 index 6d6da91..51c07f3 100644 --- a/checks/df_netapp32 +++ b/checks/df_netapp32 @@ -36,7 +36,7 @@ check_info["df_netapp32"] = { 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.789.1.5.4.1', [2, 3, 4]), 'snmp_scan_function': \ - lambda oid: is_netapp_filer(oid) and not oid(".1.3.6.1.4.1.789.1.5.4.1.29.1"), + lambda oid: is_netapp_filer(oid) and not oid(".1.3.6.1.4.1.789.1.5.4.1.29.*"), 'group': 'filesystem', 'default_levels_variable': 'filesystem_default_levels', }

10 years, 8 months

Check_MK Git: check_mk: Fixed help text in EC actions

by Mathias Kettner

Module: check_mk Branch: master Commit: 981bea6535571ffecd19c13f8b26e4f4f623be03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=981bea6535571f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 22 09:46:24 2014 +0100 Fixed help text in EC actions --- mkeventd/web/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 2038676..dd7b71b 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -70,7 +70,7 @@ The following placeholdes will be substituted by value from the actual event: <tr><td class=tt>$STATE$</td><td>State of the event (0/1/2/3)</td></tr> <tr><td class=tt>$PHASE$</td><td>Phase of the event (always open)</td></tr> <tr><td class=tt>$OWNER$</td><td>Owner of the event</td></tr> -<tr><td class=tt>$MATCH_GROUPS$</td><td>Text groups from regular expression match, separated by spaces/td></tr> +<tr><td class=tt>$MATCH_GROUPS$</td><td>Text groups from regular expression match, separated by spaces</td></tr> <tr><td class=tt>$MATCH_GROUP_1$</td><td>Text of the first match group from expression match</td></tr> <tr><td class=tt>$MATCH_GROUP_2$</td><td>Text of the second match group from expression match</td></tr> <tr><td class=tt>$MATCH_GROUP_3$</td><td>Text of the third match group from expression match (and so on...)</td></tr>

10 years, 8 months

Check_MK Git: check_mk: Omit comments after # from notification plugin name

by Mathias Kettner

Module: check_mk Branch: master Commit: 530508af21655bdc882174342af939d5f766c975 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=530508af21655b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 22 09:42:40 2014 +0100 Omit comments after # from notification plugin name --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d1a9bcc..e787a0a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8856,7 +8856,7 @@ def load_notification_scripts_from(adir): lines.next() line = lines.next().strip() if line.startswith("#"): - title = line.lstrip("#").strip() + title = line.lstrip("#").strip().split("#", 1)[0] except: pass scripts[entry] = title

10 years, 8 months

Check_MK Git: check_mk: FIX Move view "Stale services" to Problems folder

by Mathias Kettner

Module: check_mk Branch: master Commit: 4aa8c1b85fec610deea26a274c8ad223c514f8a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4aa8c1b85fec61… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 22 09:40:04 2014 +0100 FIX Move view "Stale services" to Problems folder --- .werks/676 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/builtin.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/676 b/.werks/676 new file mode 100644 index 0000000..0f0e9ee --- /dev/null +++ b/.werks/676 @@ -0,0 +1,9 @@ +Title: Move view "Stale services" to Problems folder +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390379986 + + diff --git a/ChangeLog b/ChangeLog index 1197778..bb456e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -162,6 +162,7 @@ * 0431 FIX: LDAP: Fixed group syncrhonisation when nested group sync is enabled * 0122 FIX: Multisite view editor not longer throwing a exception when loading views from other users * 0569 FIX: recurring updates of serial numbers of disabled ldap users fixed... + * 0676 FIX: Move view "Stale services" to Problems folder WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index f21f2e4..c4cdfa8 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1764,7 +1764,6 @@ multisite_builtin_views.update({ 'mustsearch': False, 'name': 'uncheckedsvc', 'num_columns': 1, - 'owner': 'omdadmin', 'painters': [('service_state', None, ''), ('service_description', 'service', ''), ('svc_plugin_output', None, ''), @@ -1776,6 +1775,7 @@ multisite_builtin_views.update({ 'show_filters': [], 'sorters': [('site_host', False), ('svcdescr', False)], 'title': u'Stale services', + 'topic': _('Problems'), 'user_sortable': 'on'}, 'events': {'browser_reload': 0, 'column_headers': 'pergroup',

10 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits