Checkmk git commits May 2014

checkmk-commits@lists.checkmk.com

5 participants
134 discussions

Check_MK Git: check_mk: Updated Werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: 055e378858f42750cd5f4c44b6d1508beee4f9f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=055e378858f427… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 8 12:18:31 2014 +0200 Updated Werk description --- .werks/968 | 29 +++++++++++++++++++---------- ChangeLog | 2 +- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.werks/968 b/.werks/968 index 6d24370..73ba143 100644 --- a/.werks/968 +++ b/.werks/968 @@ -1,18 +1,18 @@ -Title: Notification plugins now configurable via WATO +Title: Notification scripts are now configurable via WATO Level: 2 Component: notifications Version: 1.2.5i3 Date: 1399542362 Class: feature -Check_MK now has a new alternative API for notification script, which allows -them to be configured via WATO. The classical API provided the possibility of -a list of strings that was passed to the script as <tt>PARAMETER_1</tt>, -<tt>PARAMETER_2</tt>, etc. The new API passes arguments according -to keys in a configured dictionary, like <tt>PARAMETER_FROM</tt> and -<tt>PARAMETER_REPLY_TO</tt>. +Check_MK now has a new alternative API for notification scripts, which allows +them to be configured via WATO. The classical API provided the possibility +of a list of strings that was passed to the script in form of variables like +<tt>PARAMETER_1</tt>, <tt>PARAMETER_2</tt>, etc. The new API passes parameters +according to keys of a WATO-configured dictionary, like <tt>PARAMETER_FROM</tt> +and <tt>PARAMETER_REPLY_TO</tt>. -Two notification scripts have been converted to use the new API: <tt>mail</tt> +Two notification scripts have already been converted to use the new API: <tt>mail</tt> (sending HTML emails) and <tt>mkeventd</tt> (forwarding to the Event Console). The configuration of a notification script does only work with the new @@ -20,14 +20,23 @@ The configuration of a notification script does only work with the new <ul> <li>In new rulesets below Host & Service Parameters → Monitoring Configuration → Notifications</li> -<li>Right in a notification rule</li> +<li>In a notification rule</li> </ul> Both configurations are being merged on a per-key basis. That way you can e.g. setup a <tt>From:</tt> header for your outgoing emails via a global rule, but select various different <tt>Reply-To:</tt> addresses in different notification rules. - If a configuration key appears both in Host & Service Parameters and in a notification rule then the latter one has precedence. +Within that effort the HTML email script is now far more configurable. You +can now configure: + +<ul> +<li>The From- and Reply-To Address</li> +<li>The subjects for host and service notifications</li> +<li>An URL-Prefix for your Multisite interface (this makes hosts and services +in the notifications clickable<li> +<li>A choice of optional information to be displayed in the emails</li> +</ul> diff --git a/ChangeLog b/ChangeLog index b322429..17f4122 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,7 +93,7 @@ * 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... - * 0968 Notification plugins now configurable via WATO... + * 0968 Notification scripts are now configurable via WATO... * 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

10 years, 1 month

Check_MK Git: check_mk: Updated bug entries #2154

by Mathias Kettner

Module: check_mk Branch: master Commit: 3fb316d77958d8ff5ab72f0e4b3026f9a15de9e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fb316d77958d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 7 11:57:07 2014 +0200 Updated bug entries #2154 --- .bugs/2154 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.bugs/2154 b/.bugs/2154 new file mode 100644 index 0000000..e286e45 --- /dev/null +++ b/.bugs/2154 @@ -0,0 +1,20 @@ +Title: Online-Status of users not correct +Component: wato +State: open +Date: 2014-05-07 11:52:58 +Targetversion: 1.2.5i1 +Class: bug + +In the WATO users page there is a gray or green ball that indicates +wether a user is currently online. This is assumed to work as follows: + +- every time a user calls a page his file var/check_mk/web/USER/last_seen.mk + is being updated +- If the timestamp in that file is not older then config.user_online_maxage seconds + the user is assumed to be online + +In one larger customer site that feature didn't work. I've changed the value to 10 minutes. +At least 50 users where active, but just a couple being displayed as online. It could be +the case that some cache prohibits the correct update of the last_seen information in +WATO, so that the last_seen.mk files are not being loaded and an old state of them being +used.

10 years, 1 month

Check_MK Git: check_mk: Notification plugins now configurable via WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: 4347be5861356faabde4fb19bef3e133a54685a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4347be5861356f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 8 12:02:29 2014 +0200 Notification plugins now configurable via WATO Check_MK now has a new alternative API for notification script, which allows them to be configured via WATO. The classical API provided the possibility of a list of strings that was passed to the script as <tt>PARAMETER_1</tt>, <tt>PARAMETER_2</tt>, etc. The new API passes arguments according to keys in a configured dictionary, like <tt>PARAMETER_FROM</tt> and <tt>PARAMETER_REPLY_TO</tt>. Two notification scripts have been converted to use the new API: <tt>mail</tt> (sending HTML emails) and <tt>mkeventd</tt> (forwarding to the Event Console). The configuration of a notification script does only work with the new Rule Based Notifications can be done at two places: <ul> <li>In new rulesets below Host & Service Parameters → Monitoring Configuration → Notifications</li> <li>Right in a notification rule</li> </ul> Both configurations are being merged on a per-key basis. That way you can e.g. setup a <tt>From:</tt> header for your outgoing emails via a global rule, but select various different <tt>Reply-To:</tt> addresses in different notification rules. If a configuration key appears both in Host & Service Parameters and in a notification rule then the latter one has precedence. --- .werks/968 | 33 +++ ChangeLog | 1 + modules/check_mk.py | 1 + modules/notify.py | 74 +++++-- notifications/mail | 408 +++++++++++++++++++++---------------- notifications/mkeventd | 14 +- web/htdocs/wato.py | 137 ++++++++++--- web/plugins/wato/notifications.py | 119 +++++++++++ 8 files changed, 565 insertions(+), 222 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4347be5861…

10 years, 1 month

Check_MK Git: check_mk: FIX cisco_fru_power: Exluded not existing devices from the inventory

by Bastian Kuhn

Module: check_mk Branch: master Commit: ad63f66cc2b8c0285bbdf6843252a568e1a80e5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad63f66cc2b8c0… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 7 16:56:50 2014 +0200 FIX cisco_fru_power: Exluded not existing devices from the inventory --- .werks/161 | 8 ++++++++ ChangeLog | 1 + checks/cisco_fru_power | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/161 b/.werks/161 new file mode 100644 index 0000000..8fb57c7 --- /dev/null +++ b/.werks/161 @@ -0,0 +1,8 @@ +Title: cisco_fru_power: Exluded not existing devices from the inventory +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1399474575 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 425c8ad..d562631 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 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 + * 0161 FIX: cisco_fru_power: Exluded not existing devices from the inventory Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/cisco_fru_power b/checks/cisco_fru_power index aeab3ac..11f3167 100644 --- a/checks/cisco_fru_power +++ b/checks/cisco_fru_power @@ -57,7 +57,7 @@ def inventory_cisco_fru_power(info): # - in state 5:offEnvPower return [ (line[0], None) for line in info - if line[2] not in ('', '1', '5') ] + if line[2] not in ('', '0', '1', '5') ] def check_cisco_fru_power(item, _no_params, info):

10 years, 1 month

Check_MK Git: check_mk: brocade_vdx_status: improved scan function

by Bastian Kuhn

Module: check_mk Branch: master Commit: 9bf1d993ee8ffc35a5d670b91289a98ebc3e0c05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bf1d993ee8ffc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 7 16:56:04 2014 +0200 brocade_vdx_status: improved scan function --- checks/brocade_vdx_status | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/brocade_vdx_status b/checks/brocade_vdx_status index e4a5fc2..b46406d 100755 --- a/checks/brocade_vdx_status +++ b/checks/brocade_vdx_status @@ -51,7 +51,7 @@ check_info["brocade_vdx_status"] = { "check_function" : check_brocade_vdx_status, "inventory_function" : inventory_brocade_vdx_status, "service_description" : "Status", - "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.1588.2.2.1.1.1.4", + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith( ".1.3.6.1.4.1.1588.2.2.1"), "snmp_info" : ( ".1.3.6.1.4.1.1588.2.1.1.1.1", [ 6, # Firmware 7 # Status

10 years, 1 month

Check_MK Git: check_mk: Fixed service description

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7122c89387993dee7b594436353b9079790cd9bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7122c89387993d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 7 16:16:52 2014 +0200 Fixed service description --- checks/brocade_vdx_status | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/brocade_vdx_status b/checks/brocade_vdx_status index 9c303d6..e4a5fc2 100755 --- a/checks/brocade_vdx_status +++ b/checks/brocade_vdx_status @@ -50,8 +50,7 @@ def check_brocade_vdx_status(_no_item, _no_params, info): check_info["brocade_vdx_status"] = { "check_function" : check_brocade_vdx_status, "inventory_function" : inventory_brocade_vdx_status, - "service_description" : "brocade_vdx_status", - "has_perfdata" : False, + "service_description" : "Status", "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.1588.2.2.1.1.1.4", "snmp_info" : ( ".1.3.6.1.4.1.1588.2.1.1.1.1", [ 6, # Firmware

10 years, 1 month

Check_MK Git: check_mk: brocade_vdx_status: New check to monitor the operational state of vdx switches.

by Bastian Kuhn

Module: check_mk Branch: master Commit: e70f8e34dd6b444ad8664805af313d59882cd20d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e70f8e34dd6b44… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 7 16:11:39 2014 +0200 brocade_vdx_status: New check to monitor the operational state of vdx switches. --- .werks/160 | 8 ++++++ ChangeLog | 1 + checkman/brocade_vdx_status | 15 +++++++++++ checks/brocade_vdx_status | 61 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+) diff --git a/.werks/160 b/.werks/160 new file mode 100644 index 0000000..30117d1 --- /dev/null +++ b/.werks/160 @@ -0,0 +1,8 @@ +Title: brocade_vdx_status: New check to monitor the operational state of vdx switches. +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1399471871 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index fded987..425c8ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * 0952 ibm_svc_array: New check for Status of RAID Arrays in IBM SVC / Storwize devices. * 0911 esx_vsphere_hostsystem.multipath: now able to configure paths minimum count... * 0159 brocade: Added support for brocade fdx switches + * 0160 brocade_vdx_status: New check to monitor the operational state of vdx switches. * 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/brocade_vdx_status b/checkman/brocade_vdx_status new file mode 100644 index 0000000..892afd3 --- /dev/null +++ b/checkman/brocade_vdx_status @@ -0,0 +1,15 @@ +title: Brocade VDX Switches: Status +catalog: hw/network/brocade +agents: snmp +license: GPL +distribution: check_mk +description: + This checks monitors the operational state of the switch. Also the current firmware version + will be returned as information. + + + +inventory: + The inventory creates one service + + diff --git a/checks/brocade_vdx_status b/checks/brocade_vdx_status new file mode 100755 index 0000000..9c303d6 --- /dev/null +++ b/checks/brocade_vdx_status @@ -0,0 +1,61 @@ +#!/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. +# .1.3.6.1.4.1.1588.2.1.1.1.1.6.0 v4.0.1 Firmware +# .1.3.6.1.4.1.1588.2.1.1.1.1.7.0 1 Status + + +def inventory_brocade_vdx_status(info): + return [ ( None, None )] + +def check_brocade_vdx_status(_no_item, _no_params, info): + states = { + 1 : "online", + 2 : "offline", + 3 : "testing", + 4 : "faulty", + } + firmware = info[0][0] + state = saveint(info[0][1]) + message = "State: %s, Firmware: %s" % ( states[state], firmware) + if state == 1: + return 0, message + if state in [ 2, 4 ]: + return 2, message + if state == 3: + return 1, message + +check_info["brocade_vdx_status"] = { + "check_function" : check_brocade_vdx_status, + "inventory_function" : inventory_brocade_vdx_status, + "service_description" : "brocade_vdx_status", + "has_perfdata" : False, + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.1588.2.2.1.1.1.4", + "snmp_info" : ( ".1.3.6.1.4.1.1588.2.1.1.1.1", [ + 6, # Firmware + 7 # Status + ] ), +} +

10 years, 1 month

Check_MK Git: check_mk: brocade: Added support for brocade fdx switches

by Bastian Kuhn

Module: check_mk Branch: master Commit: f2c469919ed16f4140dd0e6c2bd6dc97cafeda71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2c469919ed16f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 7 15:48:37 2014 +0200 brocade: Added support for brocade fdx switches --- .werks/159 | 8 ++++++++ ChangeLog | 1 + checks/brocade | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/159 b/.werks/159 new file mode 100644 index 0000000..2357a35 --- /dev/null +++ b/.werks/159 @@ -0,0 +1,8 @@ +Title: brocade: Added support for brocade fdx switches +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1399470494 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f6d99a3..fded987 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * 0901 ibm_svc_portfc: more devices recognized... * 0952 ibm_svc_array: New check for Status of RAID Arrays in IBM SVC / Storwize devices. * 0911 esx_vsphere_hostsystem.multipath: now able to configure paths minimum count... + * 0159 brocade: Added support for brocade fdx switches * 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/brocade b/checks/brocade index eb4d659..50d8e1f 100644 --- a/checks/brocade +++ b/checks/brocade @@ -44,7 +44,8 @@ def brocade_sensor_convert(info, what): def brocade_scan(oid): return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") or \ - oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.24.1.1588.2.1.1") + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.24.1.1588.2.1.1") or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.2.1") brocade_info = ('.1.3.6.1.4.1.1588.2.1.1.1.1.22.1', [ 4, 5 ])

10 years, 1 month

Check_MK Git: check_mk: all occurences of corelation changed to correlation

by Goetz Golla

Module: check_mk Branch: master Commit: 5c3f651636b03bc9cbc7a90affa22a990e1560ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c3f651636b03b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed May 7 10:40:58 2014 +0200 all occurences of corelation changed to correlation --- mkeventd/web/plugins/wato/mkeventd.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index b8ca802..a591994 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -787,7 +787,7 @@ def save_mkeventd_rules(rules): def mode_mkeventd_rules(phase): if phase == "title": - return _("Rules for event corelation") + return _("Rules for event correlation") elif phase == "buttons": home_button() @@ -1100,9 +1100,9 @@ def mode_mkeventd_edit_rule(phase): save_mkeventd_rules(rules) if new: - log_mkeventd("new-rule", _("Created new event corelation rule with id %s" % rule["id"])) + log_mkeventd("new-rule", _("Created new event correlation rule with id %s" % rule["id"])) else: - log_mkeventd("edit-rule", _("Modified event corelation rule %s" % rule["id"])) + log_mkeventd("edit-rule", _("Modified event correlation rule %s" % rule["id"])) # Reset hit counters of this rule mkeventd.query("COMMAND RESETCOUNTERS;" + rule["id"]) return "mkeventd_rules" @@ -1413,7 +1413,7 @@ if mkeventd_enabled: config.declare_permission("mkeventd.edit", _("Configuration of event rules"), _("This permission allows the creation, modification and " - "deletion of event corelation rules."), + "deletion of event correlation rules."), ["admin"]) config.declare_permission("mkeventd.activate", @@ -1431,7 +1431,7 @@ if mkeventd_enabled: modules.append( ( "mkeventd_rules", _("Event Console"), "mkeventd", "mkeventd.edit", - _("Manage event classification and corelation rules for the " + _("Manage event classification and correlation rules for the " "event console")))

10 years, 1 month

Check_MK Git: check_mk: Added missing icons

by Mathias Kettner

Module: check_mk Branch: master Commit: dc244d62b091b90c09a7c4fd3902ce8b1be25ff3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc244d62b091b9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 6 18:06:00 2014 +0200 Added missing icons --- web/htdocs/images/icon_back_off.png | Bin 0 -> 2101 bytes web/htdocs/images/icon_forth_off.png | Bin 0 -> 2208 bytes web/htdocs/images/icon_timewarp_off.png | Bin 0 -> 4290 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_back_off.png b/web/htdocs/images/icon_back_off.png new file mode 100644 index 0000000..5ad0ec6 Binary files /dev/null and b/web/htdocs/images/icon_back_off.png differ diff --git a/web/htdocs/images/icon_forth_off.png b/web/htdocs/images/icon_forth_off.png new file mode 100644 index 0000000..7065f7e Binary files /dev/null and b/web/htdocs/images/icon_forth_off.png differ diff --git a/web/htdocs/images/icon_timewarp_off.png b/web/htdocs/images/icon_timewarp_off.png new file mode 100644 index 0000000..1f03cbc Binary files /dev/null and b/web/htdocs/images/icon_timewarp_off.png differ

10 years, 1 month

← Newer
1
...
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2014