[checkmk-commits] Check_MK Git: check_mk: EC: FIX: fix exception in rules that use facility local7

Mathias Kettner mk at mathias-kettner.de
Fri Nov 30 09:37:32 CET 2012


Module: check_mk
Branch: master
Commit: 5c866b83ccd119f072f62d38e318039f67a66431
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c866b83ccd119f072f62d38e318039f67a66431

Author: Mathias Kettner <mk at mathias-kettner.de>
Date:   Fri Nov 30 09:37:27 2012 +0100

EC: FIX: fix exception in rules that use facility local7

---

 ChangeLog                       |    5 ++++-
 mkeventd/.f12                   |    2 +-
 mkeventd/web/htdocs/mkeventd.py |    4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8a57320..e3ea948 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,4 @@
 1.2.1i4:
-    * FIX: postgres_sessions: handle case of no active/no idle sessions
     Core:
     * Better exception handling when executing "Check_MK"-Check. Printing python
       exception to status output and traceback to long output now.
@@ -16,6 +15,7 @@
     * FIX: correct backslash representation of windows logwatch files
     * Add: New Check for Rittal CMC PSM-M devices
     * Smart plugin: Only use relevant numbers of serial
+    * FIX: postgres_sessions: handle case of no active/no idle sessions
 
     Multisite:
     * Implemented LDAP integration of Multisite. You can now authenticate your
@@ -35,6 +35,9 @@
     * FIX: Fixed generated manual check definitions for checks without items
       like ntp_time and tcp_conn_stats
 
+    Event Console:
+    * FIX: fix exception in rules that use facility local7
+
 1.2.1i3:
     Core:
     * added HOST/SERVICEPROBLEMID to notification macros
diff --git a/mkeventd/.f12 b/mkeventd/.f12
index 18c6237..79af0b0 100644
--- a/mkeventd/.f12
+++ b/mkeventd/.f12
@@ -1,4 +1,4 @@
-SITE=${SITE:-ev}
+SITE=${SITE:-$(omd sites --bare | sort | head -n 1)}
 OMD_ROOT=/omd/sites/${SITE}
 
 for dir in web checks pnp-templates
diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py
index 7842757..45aa354 100644
--- a/mkeventd/web/htdocs/mkeventd.py
+++ b/mkeventd/web/htdocs/mkeventd.py
@@ -38,6 +38,10 @@ syslog_facilities = [
     (9, "cron"),
     (10, "authpriv"),
     (11, "ftp"),
+    (12, "(12: unused)"),
+    (13, "(13: unused)"),
+    (14, "(14: unused)"),
+    (15, "(15: unused)"),
     (16, "local0"),
     (17, "local1"),
     (18, "local2"),



More information about the checkmk-commits mailing list