Module: check_mk
Branch: master
Commit: 0d953421e3ae4deb4f479ec0d87e0f686757f263
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d953421e3ae4d…
Author: Sebastian Herbord <sh(a)mathias-kettner.de>
Date: Tue Sep 29 10:03:31 2015 +0200
clarified how the ec handles cancel texts with fewer match groups than the initial message
---
mkeventd/web/plugins/wato/mkeventd.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py
index 1a94b35..aa710cd 100644
--- a/mkeventd/web/plugins/wato/mkeventd.py
+++ b/mkeventd/web/plugins/wato/mkeventd.py
@@ -640,9 +640,12 @@ vs_mkeventd_rule = Dictionary(
),
( "match_ok",
RegExpUnicode(
- title = _("Text to cancel event"),
- help = _("If a matching message appears with this text, then an event created "
- "by this rule will automatically be cancelled (if host, application and match groups match). "),
+ title = _("Text to cancel event(s)"),
+ help = _("If a matching message appears with this text, then events created "
+ "by this rule will automatically be cancelled if host, application and match groups match. "
+ "If this expression has fewer match groups than \"Text to match\", "
+ "it will cancel all events where the specified groups match the same number "
+ "of groups in the initial text, starting from the left."),
size = 64,
)
),
Module: check_mk
Branch: master
Commit: cad1ea9869259b4929f6d85db38383929fdf0ed1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cad1ea9869259b…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Sep 28 16:10:21 2015 +0200
#2432 Forwarded notifications are now visible within the rule based notifications analysis
The context of forwarded notifications was not stored for debug purposes on the notification receiver.
Therefore forwarded notifications were never shown in the analysis page of the master site.
---
.werks/2432 | 10 ++++++++++
ChangeLog | 1 +
modules/notify.py | 2 ++
3 files changed, 13 insertions(+)
diff --git a/.werks/2432 b/.werks/2432
new file mode 100644
index 0000000..8999acf
--- /dev/null
+++ b/.werks/2432
@@ -0,0 +1,10 @@
+Title: Forwarded notifications are now visible within the rule based notifications analysis
+Level: 1
+Component: notifications
+Compatible: compat
+Version: 1.2.7i3
+Date: 1443449084
+Class: feature
+
+The context of forwarded notifications was not stored for debug purposes on the notification receiver.
+Therefore forwarded notifications were never shown in the analysis page of the master site.
diff --git a/ChangeLog b/ChangeLog
index 4843dc4..7df83b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -291,6 +291,7 @@
Notifications:
* 2478 Integrated notification plugin for mobile phone push messages via Pushover...
* 1295 RBN Rules can now also match service event type OK to OK...
+ * 2432 Forwarded notifications are now visible within the rule based notifications analysis...
* 2313 FIX: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms
* 2347 FIX: Improved error message in notify.log when sendmail is missing
* 2348 FIX: HTML-Mails: Added missing link to service descriptions
diff --git a/modules/notify.py b/modules/notify.py
index 4a4071f..5be18a5 100644
--- a/modules/notify.py
+++ b/modules/notify.py
@@ -1191,6 +1191,8 @@ def handle_spoolfile(spoolfile):
raw_context = data["context"]
notify_log("Got spool file %s (%s) from remote host for local delivery." % (
notif_uuid[:8], find_host_service_in_context(raw_context)))
+
+ store_notification_backlog(data["context"])
locally_deliver_raw_context(data["context"])
return 0 # No error handling for async delivery
Module: check_mk
Branch: master
Commit: 51acf6cc09e73a696e696615e5dd54e03cfda93d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51acf6cc09e73a…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Sep 28 13:55:09 2015 +0200
added missing manpages
---
checkman/fortigate_sessions_base | 19 +++++++++++++++++++
.../{netapp_api_cpu => netapp_api_cpu.utilization} | 0
checkman/postgres_version | 13 +++++++++++++
..._psu.switch => ucs_bladecenter_psu.switch_power} | 0
4 files changed, 32 insertions(+)
diff --git a/checkman/fortigate_sessions_base b/checkman/fortigate_sessions_base
new file mode 100644
index 0000000..59c0d34
--- /dev/null
+++ b/checkman/fortigate_sessions_base
@@ -0,0 +1,19 @@
+title: FortiGate firewalls with FORTINERT-FORTIGATE_MIB: Current Number of Sessions
+agents: snmp
+catalog: hw/network/fortinet
+license: GPL
+distribution: check_mk
+description:
+ This check monitors the current number of sessions on an Fortigate Firewall device
+inventory:
+ One service will be created
+
+[parameters]
+warning (int): Minimum seesion count for warning level
+crit (int): Minimum session count for critical level
+
+[configuration]
+fortigate_sessions_base_default_levels = (int, int): The default levels for all checks of this kind.
+
+perfdata:
+ current amount of sessions on the device
diff --git a/checkman/netapp_api_cpu b/checkman/netapp_api_cpu.utilization
similarity index 100%
rename from checkman/netapp_api_cpu
rename to checkman/netapp_api_cpu.utilization
diff --git a/checkman/postgres_version b/checkman/postgres_version
new file mode 100644
index 0000000..7207ef8
--- /dev/null
+++ b/checkman/postgres_version
@@ -0,0 +1,13 @@
+title: Postgres Version
+agents: windows
+catalog: app/mssql
+license: GPL
+distribution: check_mk
+description:
+ This check monitors the version of the postgres server
+
+ This check needs the Check_MK mk_postgres plugin installed in
+ the agent.
+
+inventory:
+ One check
diff --git a/checkman/ucs_bladecenter_psu.switch b/checkman/ucs_bladecenter_psu.switch_power
similarity index 100%
rename from checkman/ucs_bladecenter_psu.switch
rename to checkman/ucs_bladecenter_psu.switch_power
Module: check_mk
Branch: master
Commit: 7870b1f6f45b575d6a2cacba854c584c7603b8ae
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7870b1f6f45b57…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Sep 28 13:08:22 2015 +0200
Added two missing man pages
---
checkman/bluecat_threads | 11 +++++++++++
checkman/ibm_svc_disks | 16 ++++++++++++++++
checkman/{netapp_api_disk => netapp_api_disk.summary} | 7 -------
web/plugins/wato/check_parameters.py | 2 +-
4 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/checkman/bluecat_threads b/checkman/bluecat_threads
new file mode 100644
index 0000000..de521bc
--- /dev/null
+++ b/checkman/bluecat_threads
@@ -0,0 +1,11 @@
+title: Bluecat Adonis: Number of Threads
+agents: snmp
+catalog: hw/network/bluecat
+license: GPL
+distribution: check_mk
+description:
+ This Check monitors the number of currently running threads on a Blucat Adonis
+ device. Per default the levels for warning and critical are 2000 and 4000 threads.
+
+inventory:
+ One service will be created
diff --git a/checkman/ibm_svc_disks b/checkman/ibm_svc_disks
new file mode 100644
index 0000000..4e748e9
--- /dev/null
+++ b/checkman/ibm_svc_disks
@@ -0,0 +1,16 @@
+title: IBM SVC / Storwize V3700 / V7000: Summary of Disks
+agents: netapp
+catalog: hw/storagehw/netapp
+license: GPL
+distribution: check_mk
+description:
+ This check counts the number of disks which are owned by an IBM SVC storage device.
+
+ Additionally the check monitors the number of broken and spare disks.
+ You can define {WARN}/{CRIT} levels for the ratio of {broken / (broken + spare)} disks.
+
+perfdata:
+ The total raw capacity and the number of total, spare and broken disks.
+
+inventory:
+ Configures one check on each device.
diff --git a/checkman/netapp_api_disk b/checkman/netapp_api_disk.summary
similarity index 64%
rename from checkman/netapp_api_disk
rename to checkman/netapp_api_disk.summary
index 0f91d79..878a654 100644
--- a/checkman/netapp_api_disk
+++ b/checkman/netapp_api_disk.summary
@@ -15,10 +15,3 @@ perfdata:
inventory:
Configures one check on each filer.
-
-[parameters]
-parameters (dict): The following keys are available
-
- {"broken_spare_ratio"}: Warning and critical levels of {broken / (broken + spare)} ratio.
- For example: If you have 6 broken and 9 spare disks (15 total) the ratio would be 40%.
- A {WARN}/{CRIT} at this limit is configured with (40.0, 60.0)
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index a9872fc..250a608 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -6457,7 +6457,7 @@ register_check_parameters(
register_check_parameters(
subgroup_storage,
"netapp_disks",
- _("Filer Disk Levels (netapp, ibm svc)"),
+ _("Filer Disk Levels (NetApp, IBM SVC)"),
Transform(
Dictionary(
elements = [
Module: check_mk
Branch: master
Commit: 15856b17fb7a61e559e2d0212801ff0ad5a52547
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15856b17fb7a61…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Sep 28 12:01:10 2015 +0200
Added four missing ORACLE man pages
---
checkman/oracle_locks | 9 +++++++++
checkman/oracle_longactivesessions | 8 ++++++++
checkman/oracle_processes | 9 +++++++++
checkman/oracle_recovery_area | 9 +++++++++
4 files changed, 35 insertions(+)
diff --git a/checkman/oracle_locks b/checkman/oracle_locks
new file mode 100644
index 0000000..7704796
--- /dev/null
+++ b/checkman/oracle_locks
@@ -0,0 +1,9 @@
+title: ORACLE Database Locks
+agents: linux, solaris, hpux
+catalog: app/oracle
+license: GPL
+distribution: check_mk
+description:
+ The check monitors the wait time for locks in ORACLE. Per default the checks
+ warns if the wait time for a lock is more than half an hour and goes crit
+ at one hour.
diff --git a/checkman/oracle_longactivesessions b/checkman/oracle_longactivesessions
new file mode 100644
index 0000000..23bdc1e
--- /dev/null
+++ b/checkman/oracle_longactivesessions
@@ -0,0 +1,8 @@
+title: ORACLE Database Long Active Sessions
+agents: linux, solaris, hpux
+catalog: app/oracle
+license: GPL
+distribution: check_mk
+description:
+ Looks for the current number of long active sessions and warns if (per default) these
+ exceed 500. Goes critical at 1000.
diff --git a/checkman/oracle_processes b/checkman/oracle_processes
new file mode 100644
index 0000000..5299bb3
--- /dev/null
+++ b/checkman/oracle_processes
@@ -0,0 +1,9 @@
+title: ORACLE Database Processes
+agents: linux, solaris, hpux
+catalog: app/oracle
+license: GPL
+distribution: check_mk
+description:
+ This check monitors the current percentual usage of the processes and alarms
+ if too many processes are in use. The default is to warn at a usage of 70%
+ and go critical at 90%.
diff --git a/checkman/oracle_recovery_area b/checkman/oracle_recovery_area
new file mode 100644
index 0000000..1e10650
--- /dev/null
+++ b/checkman/oracle_recovery_area
@@ -0,0 +1,9 @@
+title: ORACLE Database Recovery Area
+agents: linux, solaris, hpux
+catalog: app/oracle
+license: GPL
+distribution: check_mk
+description:
+ Checks the used space in the recovery area of an ORACLE database. Reclaimable
+ space is considered as free hereby. The default levels for warn/crit are at
+ 70% and 90% of used space.