Checkmk git commits April 2014

checkmk-commits@lists.checkmk.com

6 participants
180 discussions

Check_MK Git: check_mk: FIX Multisite Views: Fixed bug where custom views could not get deleted

by Andreas Boesl

Module: check_mk Branch: master Commit: 42cff4abf8bfb4eacd95c34839ec1237469170d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42cff4abf8bfb4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 30 15:05:58 2014 +0200 FIX Multisite Views: Fixed bug where custom views could not get deleted --- .werks/912 | 9 +++++++++ ChangeLog | 1 + web/htdocs/views.py | 1 + 3 files changed, 11 insertions(+) diff --git a/.werks/912 b/.werks/912 new file mode 100644 index 0000000..f1aa852 --- /dev/null +++ b/.werks/912 @@ -0,0 +1,9 @@ +Title: Multisite Views: Fixed bug where custom views could not get deleted +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1398863104 + + diff --git a/ChangeLog b/ChangeLog index 0117e9b..f9761dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * 0906 FIX: Improved transaction handling in Web GUI... * 0909 FIX: Table checkboxes: Fixed bug where selected checkboxes got ignored... * 0811 FIX: Fixed handling of exceptions occuring before login in debug mode + * 0912 FIX: Multisite Views: Fixed bug where custom views could not get deleted WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e2389a1..a7abb19 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -418,6 +418,7 @@ def page_edit_views(msg=None): save_views(config.user_id) html.reload_sidebar() elif c == False: + html.footer() return if html.var('mode') == 'create':

10 years, 2 months

Check_MK Git: check_mk: esx_vsphere_hostsystem.multipath: now able to configure paths minimum count

by Andreas Boesl

Module: check_mk Branch: master Commit: c9c6ea730ec8330e10da3fdbb837cb7d7bbdbdcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9c6ea730ec833… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 30 13:47:08 2014 +0200 esx_vsphere_hostsystem.multipath: now able to configure paths minimum count You can now configure the minimum levels for the active, dead, disabled, standby and unknown paths via WATO. --- .werks/911 | 9 ++++++++ ChangeLog | 1 + checkman/esx_vsphere_hostsystem.multipath | 5 ++--- checks/esx_vsphere_hostsystem | 26 ++++++++++++++++----- web/plugins/wato/check_parameters.py | 35 ++++++++++++++++------------- 5 files changed, 52 insertions(+), 24 deletions(-) diff --git a/.werks/911 b/.werks/911 new file mode 100644 index 0000000..6adcbe4 --- /dev/null +++ b/.werks/911 @@ -0,0 +1,9 @@ +Title: esx_vsphere_hostsystem.multipath: now able to configure paths minimum count +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398858257 +Class: feature + +You can now configure the minimum levels for the active, dead, disabled, standby and +unknown paths via WATO. diff --git a/ChangeLog b/ChangeLog index e0393e1..7c4d359 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 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... * 0899 enterasys_temp: New Check for temperature sensor in Enterasys Switches + * 0911 esx_vsphere_hostsystem.multipath: now able to configure paths minimum count... * 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/esx_vsphere_hostsystem.multipath b/checkman/esx_vsphere_hostsystem.multipath index b3aa1e2..08b5c74 100644 --- a/checkman/esx_vsphere_hostsystem.multipath +++ b/checkman/esx_vsphere_hostsystem.multipath @@ -22,6 +22,5 @@ item: The unique id of the path [parameters] -parameters (dict): Each key represents a path state. It's values - are the warn / crit levels and of type (int,int). Available key types - are {active}, {dead}, {disabled}, {standby}, {unknown} +parameters (dict): Each key represents a path state. The value is a int tuple + with (crit_min, warn_min, warn_max, crit_max). Available key types are {active}, {dead}, {disabled}, {standby}, {unknown} diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 343d213..09c6160 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -260,14 +260,28 @@ def check_esx_vsphere_hostsystem_multipath(item, params, info): state = 0 for state_name, state_values in state_infos.items(): if params.get(state_name): - warn, crit = params.get(state_name) + limits = params.get(state_name) + if len(limits) == 2: + warn_max, crit_max = limits + crit_min, warn_min = 0, 0 + else: + crit_min, warn_min, warn_max, crit_max = limits + + extra_info = "" count = state_values[1] - if count > crit: - state = 2 - state_values[2] = "(!!)" - elif count > warn: + if count < crit_min: + state = max(state, 2) + state_values[2] = "(!!)(less than %d)" % crit_min + elif count > crit_max: + state = max(state, 2) + state_values[2] = "(!!)(more than %d)" % crit_max + elif count < warn_min: state = max(state, 1) - state_values[2] = "(!)" + state_values[2] = "(!)(less than %d)" % warn_min + elif count > warn_max: + state = max(state, 1) + state_values[2] = "(!)(more than %d)" % warn_max + # Output message message = "Type %s" % path_type for element in "active", "dead", "disabled", "standby", "unknown": diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7be3629..7f31150 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3454,21 +3454,26 @@ register_check_parameters( Dictionary( title = _("Custom settings"), elements = [ (element, - Tuple( - title = description, - elements = [ - Integer(title = _("Warning if more than")), - Integer(title = _("Critical if more than")), - ] - ) - ) for (element, description) in [ - ("active", _("Active paths")), - ("dead", _("Dead paths")), - ("disabled", _("Disabled paths")), - ("standby", _("Standby paths")), - ("unknown", _("Unknown paths")) - ] - ] + Transform( + Tuple( + title = description, + elements = [ + Integer(title = _("Critical if less than")), + Integer(title = _("Warning if less than")), + Integer(title = _("Warning if more than")), + Integer(title = _("Critical if more than")), + ] + ), + forth = lambda x: len(x) == 2 and (0, 0, x[0], x[1]) or x + ) + ) for (element, description) in [ + ("active", _("Active paths")), + ("dead", _("Dead paths")), + ("disabled", _("Disabled paths")), + ("standby", _("Standby paths")), + ("unknown", _("Unknown paths")) + ] + ] ), ] ),

10 years, 2 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 0677aa2b4e8992d21683c1ee9626b46e19213e38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0677aa2b4e8992… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Apr 30 12:39:27 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index be1c55a..754d8e0 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -952 +962

10 years, 2 months

Check_MK Git: check_mk: ibm_svc_array: New check for Status of RAID Arrays in IBM SVC / Storwize devices.

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 21406af93f1c1eb186ac97c9a101d4aa9a7f08b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21406af93f1c1e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Apr 30 12:40:20 2014 +0200 ibm_svc_array: New check for Status of RAID Arrays in IBM SVC / Storwize devices. --- .werks/952 | 8 ++++ ChangeLog | 1 + agents/special/agent_ibmsvc | 7 ++- checkman/ibm_svc_array | 26 +++++++++++ checks/ibm_svc_array | 71 +++++++++++++++++++++++++++++++ web/plugins/wato/datasource_programs.py | 5 ++- 6 files changed, 114 insertions(+), 4 deletions(-) diff --git a/.werks/952 b/.werks/952 new file mode 100644 index 0000000..2b51cf5 --- /dev/null +++ b/.werks/952 @@ -0,0 +1,8 @@ +Title: ibm_svc_array: New check for Status of RAID Arrays in IBM SVC / Storwize devices. +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398854374 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 3cc3a5b..5cf1b1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 0156 akcp_daisy_temp: New Check for akcp daisyTemp sensor chains... * 0899 enterasys_temp: New Check for temperature sensor in Enterasys Switches * 0901 ibm_svc_portfc: more devices recognized... + * 0952 ibm_svc_array: New check for Status of RAID Arrays in IBM SVC / Storwize devices. * 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/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc index 8be2635..ba51bba 100755 --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -62,8 +62,9 @@ OPTIONS: which may contain the keywords "lshost", "lslicense", "lsmdisk", "lsmdiskgrp", "lsnode", "lsnodestats", "lssystem", "lssystemstats", "lseventlog", "lsportfc" - "lsenclosure", "lsenclosurestats" or "all" to define - which information should be queried from the device. + "lsenclosure", "lsenclosurestats", "lsarray" or "all" + to define which information should be queried from + the device. You can define to use only view of them to optimize performance. The default is "all". @@ -117,6 +118,8 @@ command_options = { "command" : "lsenclosure -nohdr -delim :"}, "lsenclosurestats" : {"section_header" : "ibm_svc_enclosurestats", "active" : False, "command" : "lsenclosurestats -nohdr -delim :"}, + "lsarray" : {"section_header" : "ibm_svc_array", "active" : False, + "command" : "lsarray -nohdr -delim :"}, } for o,a in opts: diff --git a/checkman/ibm_svc_array b/checkman/ibm_svc_array new file mode 100644 index 0000000..0324051 --- /dev/null +++ b/checkman/ibm_svc_array @@ -0,0 +1,26 @@ +title: IBM SVC / Storwize V3700 / V7000: Status of RAID Arrays +agents: ibm_svc +catalog: hw/storagehw/ibm +license: GPL +distribution: check_mk +description: + Checks the status of RAID Arrays in an IBM SVC / Storwize V3700 / V7000 + device. + + Status {online} is {OK}, status {offline} and {degraded} are {CRIT} and + every other status is {WARN}. + + Other informations given in the check output is just informational and + does not trigger any state change. + + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + +item: + The ID of the RAID Array as delivered by lsarray command. + +inventory: + Creates one check for every RAID Array on the IBM SVC / Storwize V3700 / V7000 + device. diff --git a/checks/ibm_svc_array b/checks/ibm_svc_array new file mode 100644 index 0000000..19c114b --- /dev/null +++ b/checks/ibm_svc_array @@ -0,0 +1,71 @@ +#!/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. + +# Example output from agent: +# <<<ibm_svc_array:sep(58)>>> +# 27:SSD_mdisk27:online:1:POOL_0_V7000_RZ:372.1GB:online:raid1:1:256:generic_ssd +# 28:SSD_mdisk28:online:2:POOL_1_V7000_BRZ:372.1GB:online:raid1:1:256:generic_ssd +# 29:SSD_mdisk0:online:1:POOL_0_V7000_RZ:372.1GB:online:raid1:1:256:generic_ssd +# 30:SSD_mdisk1:online:2:POOL_1_V7000_BRZ:372.1GB:online:raid1:1:256:generic_ssd + + +def inventory_ibm_svc_array(info): + inventory = [] + for mdisk_id, mdisk_name, mdisk_status, mdisk_grp_id, mdisk_grp_name, capacity, \ + raid_status, raid_level, redundancy, strip_size, tier in info: + inventory.append( (mdisk_id, None) ) + return inventory + +def check_ibm_svc_array(item, _no_params, info): + status = 3 + for mdisk_id, mdisk_name, mdisk_status, mdisk_grp_id, mdisk_grp_name, capacity, \ + raid_status, raid_level, redundancy, strip_size, tier in info: + if mdisk_id == item: + + # Check raid_status + message = "RAID Array %s reports status %s" % (item, raid_status) + if raid_status == "online": + status = 0 + elif raid_status == "offline" or raid_status == "degraded": + status = 2 + message += "(!!)" + else: + status = 1 + message += "(!)" + + # add information + message += ", RAID Level: %s, Tier: %s" % (raid_level, tier) + + return status, message + return 3, "RAID Array %s not found in agent output" % item + +check_info["ibm_svc_array"] = { + "check_function" : check_ibm_svc_array, + "inventory_function" : inventory_ibm_svc_array, + "service_description" : "IBM SVC RAID Array %s", + "has_perfdata" : False, +} + diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index a69cec5..7cb00e5 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -40,7 +40,7 @@ register_rule(group, "via SSH. The command line may contain the placeholders <tt><IP></tt> and " "<tt><HOST></tt>."), label = _("Command line to execute"), - empty_text = _("Access Check_MK Agent via TCP"), + empty_text = _("Access Check_MK Agent via TCP"), size = 80, attrencode = True)) @@ -277,10 +277,11 @@ register_rule(group, ( "lsportfc", _("FC Ports") ), ( "lsenclosure", _("Enclosures") ), ( "lsenclosurestats", _("Enclosure Stats") ), + ( "lsarray", _("RAID Arrays") ), ], default_value = [ "lshost", "lslicense", "lsmdisk", "lsmdiskgrp", "lsnode", "lsnodestats", "lssystem", "lssystemstats", "lsportfc", - "lsenclosure", "lsenclosurestats" ], + "lsenclosure", "lsenclosurestats", "lsarray" ], allow_empty = False, ), title = _("Retrieve information about..."),

10 years, 2 months

Check_MK Git: check_mk: ibm_svc_portfc: more devices recognized

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 4ae7aeca29a48389811b4c7cfcefccde5ea9784f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ae7aeca29a483… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Apr 30 11:36:50 2014 +0200 ibm_svc_portfc: more devices recognized some devices provide more information if running the lsportfc command (especially: privide an additional field "cluster_use") The check now works with these devices too. --- .werks/901 | 10 ++++++++++ ChangeLog | 1 + checks/ibm_svc_portfc | 39 ++++++++++++++++++++++++++++----------- 3 files changed, 39 insertions(+), 11 deletions(-) diff --git a/.werks/901 b/.werks/901 new file mode 100644 index 0000000..8e9807f --- /dev/null +++ b/.werks/901 @@ -0,0 +1,10 @@ +Title: ibm_svc_portfc: more devices recognized +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398850437 +Class: feature + +some devices provide more information if running the lsportfc command +(especially: privide an additional field "cluster_use") +The check now works with these devices too. diff --git a/ChangeLog b/ChangeLog index c93bcb8..1545b37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 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... * 0899 enterasys_temp: New Check for temperature sensor in Enterasys Switches + * 0901 ibm_svc_portfc: more devices recognized... * 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/checks/ibm_svc_portfc b/checks/ibm_svc_portfc index 6b96782..50a4792 100644 --- a/checks/ibm_svc_portfc +++ b/checks/ibm_svc_portfc @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Output may have 11 fields: +# id:fc_io_port_id:port_id:type:port_speed:node_id:node_name:WWPN:nportid:status:attachment # Example output from agent: # <<<ibm_svc_portfc:sep(58)>>> # 0:1:1:fc:8Gb:1:node1:5005076803042126:030400:active:switch @@ -34,23 +36,38 @@ # 9:2:2:fc:8Gb:2:node2:5005076803082127:040500:active:switch # 10:3:3:fc:N/A:2:node2:50050768030C2127:000000:inactive_unconfigured:none # 11:4:4:fc:N/A:2:node2:5005076803102127:000000:inactive_unconfigured:none +# +# Output may have 12 fields: +# id:fc_io_port_id:port_id:type:port_speed:node_id:node_name:WWPN:nportid:status:attachment:cluster_use +# Example output from agent: +# <<<ibm_svc_portfc:sep(58)>>> +# 0:1:1:fc:8Gb:1:node1:5005076803042126:030400:active:switch:local_partner +# 1:2:2:fc:8Gb:1:node1:5005076803082126:040400:active:switch:local_partner +# 2:3:3:fc:N/A:1:node1:50050768030C2126:000000:inactive_unconfigured:none:local_partner +# 3:4:4:fc:N/A:1:node1:5005076803102126:000000:inactive_unconfigured:none:local_partner +# 8:1:1:fc:8Gb:2:node2:5005076803042127:030500:active:switch:local_partner +# 9:2:2:fc:8Gb:2:node2:5005076803082127:040500:active:switch:local_partner +# 10:3:3:fc:N/A:2:node2:50050768030C2127:000000:inactive_unconfigured:none:local_partner +# 11:4:4:fc:N/A:2:node2:5005076803102127:000000:inactive_unconfigured:none:local_partner + def inventory_ibm_svc_portfc(info): inventory = [] - for fc_port_id, fc_io_port_id, port_id, fc_port_type, port_speed, \ - node_id, node_name, WWPN, nportid, fc_port_status, attachment in info: - if fc_port_status == "active": - inventory.append( (fc_port_id, None) ) + for line in info: + if len(line) in (11, 12) and line[9] == "active": + inventory.append( (line[0], None) ) return inventory def check_ibm_svc_portfc(item, _no_params, info): - for fc_port_id, fc_io_port_id, port_id, fc_port_type, port_speed, \ - node_id, node_name, WWPN, nportid, fc_port_status, attachment in info: - if fc_port_id == item: - if fc_port_status == "active": - return 0, "FC Port %s is %s" % (fc_port_id, fc_port_status) - else: - return 2, "FC Port %s is %s" % (fc_port_id, fc_port_status) + for line in info: + if len(line) in (11, 12): + fc_port_id = line[0] + fc_port_status = line[9] + if fc_port_id == item: + if fc_port_status == "active": + return 0, "FC Port %s is %s" % (fc_port_id, fc_port_status) + else: + return 2, "FC Port %s is %s" % (fc_port_id, fc_port_status) return 3, "FC Port %s not found in agent output" % item

10 years, 2 months

Check_MK Git: check_mk: FIX dell_om_disks: Handle hotspares more correctly

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2380fc15d808433155b2fbc55a5ddf25736178a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2380fc15d80843… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Apr 30 10:58:52 2014 +0200 FIX dell_om_disks: Handle hotspares more correctly --- .werks/158 | 8 ++++++++ ChangeLog | 3 ++- checks/dell_om_disks | 9 +++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/158 b/.werks/158 new file mode 100644 index 0000000..e4bacde --- /dev/null +++ b/.werks/158 @@ -0,0 +1,8 @@ +Title: dell_om_disks: Handle hotspares more correctly +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398848314 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1273e28..3da90c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,10 +56,11 @@ * 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 - * 0157 FIX: apc_symmetra_test: Fixed case of unkown last test date * 0907 FIX: windows agent: register_service: fixed ImagePath registry entry... * 0608 FIX: oracle_asm_diskgroup: check now also handles older oracle version 11.1.0 + * 0157 FIX: apc_symmetra_test: Fixed case of unkown last test date * 0910 FIX: brocade.power: fixed an error where the check reports an UNKNOWN on power supply failure... + * 0158 FIX: dell_om_disks: Handle hotspares more correctly Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/dell_om_disks b/checks/dell_om_disks index c7b5727..7bf2349 100644 --- a/checks/dell_om_disks +++ b/checks/dell_om_disks @@ -93,14 +93,15 @@ def check_dell_om_disks(item, _no_params, info): elif dstate not in [ 3 ]: state = 2 label = "(!!)" - msg.append("state %s%s" % ( pdisk_state.get(dstate, 'ukn (%s)' % dstate ), label )) - msg.append("Bus Type: %s" % bus_type.get(btype,'unk (%s)' % btype) ) - # handle global hot spares as OK - if sstate == 3 and dstate == 1: + # handle hot spares as OK + if sstate in [ 3, 4 ] and dstate == 1: state = 0 label = "" + msg.append("state %s%s" % ( pdisk_state.get(dstate, 'ukn (%s)' % dstate ), + msg.append("Bus Type: %s" % bus_type.get(btype,'unk (%s)' % btype) ) + if sstate != 5: msg.append("Spare State: %s" % spare_state.get(sstate, 'ukn (%s)' %sstate )) if mt != 0:

10 years, 2 months

Check_MK Git: check_mk: notify_multitech.py: new treasures script for notifying via MultiTech SMS Gateway

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: b586c2bcd947b7eada35adf1a75879f4171f13d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b586c2bcd947b7… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Apr 30 08:22:42 2014 +0200 notify_multitech.py: new treasures script for notifying via MultiTech SMS Gateway donated by Stadt Regensburg --- .werks/900 | 8 +++++ ChangeLog | 3 +- doc/treasures/notify_multitech.py | 61 +++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/.werks/900 b/.werks/900 new file mode 100644 index 0000000..ce87c05 --- /dev/null +++ b/.werks/900 @@ -0,0 +1,8 @@ +Title: notify_multitech.py: new treasures script for notifying via MultiTech SMS Gateway +Level: 2 +Component: notifications +Version: 1.2.5i3 +Date: 1398838893 +Class: feature + +donated by Stadt Regensburg diff --git a/ChangeLog b/ChangeLog index 1273e28..c93bcb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,9 +56,9 @@ * 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 - * 0157 FIX: apc_symmetra_test: Fixed case of unkown last test date * 0907 FIX: windows agent: register_service: fixed ImagePath registry entry... * 0608 FIX: oracle_asm_diskgroup: check now also handles older oracle version 11.1.0 + * 0157 FIX: apc_symmetra_test: Fixed case of unkown last test date * 0910 FIX: brocade.power: fixed an error where the check reports an UNKNOWN on power supply failure... Multisite: @@ -81,6 +81,7 @@ * 0754 Allow users to disable their notifications completely... * 0755 Added variables LASTHOSTUP_REL and LASTSERVICEOK_REL to notification context... * 0883 Added Date / Time to HTML notification email + * 0900 notify_multitech.py: new treasures script for notifying via MultiTech SMS Gateway... * 0752 FIX: FIX: compute correct state transitions for notifications... * 0753 FIX: FIX: correctly show original state in HTML notification mails... * 0609 FIX: mail notification script now uses 6 digit hex codes for colors to be better compatible with web based mail browsers diff --git a/doc/treasures/notify_multitech.py b/doc/treasures/notify_multitech.py new file mode 100755 index 0000000..8c9c2c0 --- /dev/null +++ b/doc/treasures/notify_multitech.py @@ -0,0 +1,61 @@ +#!/usr/bin/python +# Send SMS via MultiTech SMS-Gateway # encoding: utf-8 +# +# This notification script can be put below share/check_mk/notifications. It sends +# SMS via a MultiTech SMS-Gateway. Please add your personal configuration directly in this +# script. The target phone number is take from the contact's pager address. +# You can override this by specifying it as a parameter +import sys, os, urllib + +# This does not need to be changed +to = os.environ.get("NOTIFY_CONTACTPAGER") +fromname = "Check_MK" +user = "nagios" +passwd = "test123" +url = "http://isms.example.com/sendmsg?" + + +if len(sys.argv) > 1: + to = sys.argv[1] + +if not to: + sys.stderr.write("NOTIFY_CONTACTPAGER is not set.\n") + sys.exit(1) + + +max_len = 160 +message = os.environ['NOTIFY_HOSTNAME'] + " " + +if os.environ['NOTIFY_WHAT'] == 'SERVICE': + message += os.environ['NOTIFY_SERVICESTATE'][:2] + " " + avail_len = max_len - len(message) + message += os.environ['NOTIFY_SERVICEDESC'][:avail_len] + " " + avail_len = max_len - len(message) + message += os.environ['NOTIFY_SERVICEOUTPUT'][:avail_len] + +else: + message += "is " + os.environ['NOTIFY_HOSTSTATE'] + +# constructing a url like +# http://isms.example.com/sendmsg?user=nagios&passwd=test123&cat=1&to=0170123…' +url += urllib.urlencode([ + ( "user", user ), + ( "passwd", passwd ), + ( "cat", "1" ), + ( "to", to ), + ( "text", message ) +]) + + +try: + handle = urllib.urlopen(url) + response = handle.read().strip() + print response + if response.startswith("ID:"): + sys.stdout.write("Successfully sent SMS to %s\n" % to) + else: + sys.stderr.write("Error sending SMS to %s: %s\n" % (to, response)) + sys.stderr.write("URL was %s\n" % url) +except Exception, e: + sys.stderr.write("Error sending SMS to %s. Exception: %s%s\n" % e) +

10 years, 2 months

Check_MK Git: check_mk: Added vimrc and screenrc to doc/treasures

by Bastian Kuhn

Module: check_mk Branch: master Commit: ab49a921307291e07793419b582c56a8c5bb7b6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab49a921307291… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Apr 29 23:08:31 2014 +0200 Added vimrc and screenrc to doc/treasures --- doc/treasures/workplace/screenrc | 14 ++++++++ doc/treasures/workplace/vimrc | 74 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/doc/treasures/workplace/screenrc b/doc/treasures/workplace/screenrc new file mode 100644 index 0000000..47a1b33 --- /dev/null +++ b/doc/treasures/workplace/screenrc @@ -0,0 +1,14 @@ +startup_message off # Keine Willkommensnachricht +vbell off # Kein visuelles Blinken +msgwait 1 # Nachrichten für 1 Sekunden anzeigen +defutf8 on # utf8 bei neuen fenstern +shelltitle 'bash' # Fenstertitel +hardcopydir $HOME # Screenshots ins Homeverzeichnis +defscrollback 10000 # Buffer +defmonitor off # Aktivitäten nicht in Fenstertitel schreiben + +screen -t bash +screen -t bash + +caption always "%{= wk} %-w%{= KW} [%n %t] %{-}%+w %= | @%H | %l | %Y-%m-%d %c " + diff --git a/doc/treasures/workplace/vimrc b/doc/treasures/workplace/vimrc new file mode 100644 index 0000000..2247f82 --- /dev/null +++ b/doc/treasures/workplace/vimrc @@ -0,0 +1,74 @@ +set ignorecase + +" Die just-one-space Funktion von Emacs, direkt auf der Leertaste :-) +nmap <space> :s/[[:space:]]\+\%#[[:space:]]\+/ /e<CR> + + +syntax on + + +" Einruecken von Python +" set cindent +set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class +inoremap # X<BS># + +set cino=g0 +map \ :wa<CR>:make -j 8 -z 2>/dev/null ; f12<CR> +map <F12> :wa<CR>:make -j 8 -z 2>/dev/null ; f12<CR> +imap <F12> <ESC>:wa<CR>:make -j 8 -z 2>/dev/null ; f12<CR> + +set fileencodings=ucs-bom,utf-8,latin1 +set ls=2 +set ruler +set showmode +set nocompatible +set sidescroll=1 +set sidescrolloff=10 +set nolinebreak +set nobackup + +set incsearch +set hlsearch +set tabstop=8 +set softtabstop=4 +set shiftwidth=4 +set expandtab +set autoindent +set ignorecase + +" Absatz auf ___ Spalten umbrechen +nmap <C-j> }!{fmt -80 -u<CR> + +map! <C-k> <C-o>d$ +map! <C-e> <C-o>dw + +" Check_MK-Dateien erkennen +autocmd BufRead *.mk set syntax=python filetype=python +autocmd BufRead *.wsgi set syntax=python filetype=python +autocmd BufRead *.lektion set syntax=tex filetype=tex + +" Statusbar +set laststatus=2 +set statusline= +set statusline+=%-3.3n\ " buffer number +set statusline+=%f\ " file name +set statusline+=%h%m%r%w " flags +set statusline+=\[%{strlen(&ft)?&ft:'none'}, " filetype +set statusline+=%{&encoding}, " encoding +set statusline+=%{&fileformat}] " file format +set statusline+=%= " right align +set statusline+=0x%-8B\ " current char +set statusline+=%-10.(%l,%c%V%)\ %<%P " offset + +" Faltung von wato.py +set foldenable +map <F7> :set foldlevel=0<CR> +map <F8> :set foldlevel=1<CR> +set foldmethod=marker +set foldmarker=#\ \ \ .,#. + +" Zeile vom letzten mal merken +autocmd BufReadPost * + \ if line("'\"") > 0 && line("'\"") <= line("$") | + \ exe "normal g`\"" | + \ endif

10 years, 2 months

Check_MK Git: check_mk: FIX apc_symmetra_test: Fixed case of unkown last test date

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2c7a57c36cebbec813b0fae29b050054246f3254 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c7a57c36cebbe… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Apr 29 16:29:18 2014 +0200 FIX apc_symmetra_test: Fixed case of unkown last test date --- .werks/157 | 8 ++++++++ ChangeLog | 1 + checks/apc_symmetra_test | 3 +++ 3 files changed, 12 insertions(+) diff --git a/.werks/157 b/.werks/157 new file mode 100644 index 0000000..33d7c1d --- /dev/null +++ b/.werks/157 @@ -0,0 +1,8 @@ +Title: apc_symmetra_test: Fixed case of unkown last test date +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398781737 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c88bed1..f56258c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * 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 + * 0157 FIX: apc_symmetra_test: Fixed case of unkown last test date Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/apc_symmetra_test b/checks/apc_symmetra_test index 3b18dca..7392ed6 100644 --- a/checks/apc_symmetra_test +++ b/checks/apc_symmetra_test @@ -64,6 +64,9 @@ def check_apc_test(item, params, info): DiagnosticsResults = saveint(line[0]) LastDiagnosticsDate = line[1] + if LastDiagnosticsDate == 'Unkown': + return 3, "Date of last self test is unkown" + month, day, year = map(saveint, LastDiagnosticsDate.split('/')) last_diag_date = datetime.date( year, month, day) today = datetime.date.today()

10 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0844

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1e92570b55126498d3cae8ae737e751cd5429340 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e92570b551264… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Apr 29 14:12:32 2014 +0200 Updated bug entries #0844 --- .bugs/844 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/844 b/.bugs/844 new file mode 100644 index 0000000..8e93610 --- /dev/null +++ b/.bugs/844 @@ -0,0 +1,8 @@ +Title: apc_rackpdu_power does not work with inline snmp +Component: checks +State: open +Date: 2014-04-29 14:11:04 +Targetversion: 1.2.5i1 +Class: bug + +The check apc_rackpdu_power does not work with inline snmp, the first value in the snmp_info list (1.1.0) is missing, only the other 3 are queried.

10 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2014