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 <i>Host & Service Parameters</i> → <i>Monitoring Configuration</i> → <i>Notifications</i></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 <i>Host & Service Parameters</i> 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
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.
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
<i>Rule Based Notifications</i> can be done at two places:
<ul>
<li>In new rulesets below <i>Host & Service Parameters</i> → <i>Monitoring Configuration</i> → <i>Notifications</i></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 <i>Host & Service Parameters</i> 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…
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
+ ] ),
+}
+