Module: check_mk
Branch: master
Commit: 7df41ca49e14f53761800eb4642f260e97d0de0b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7df41ca49e14f5…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Feb 19 09:25:24 2014 +0100
event state in ec: Fixed class of new attribute
---
mkeventd/web/plugins/wato/mkeventd.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py
index 2011a7a..e46a025 100644
--- a/mkeventd/web/plugins/wato/mkeventd.py
+++ b/mkeventd/web/plugins/wato/mkeventd.py
@@ -1876,7 +1876,7 @@ register_rule(
)
),
( "item",
- RegExp(
+ TextAscii(
title = _("Item (Used in service description)"),
help = _("If you enter an item name here, this will be used as "
"part of the service description after the prefix \"Events \". "
Module: check_mk
Branch: master
Commit: f4a57f158891f5b68aacba737561033a8b49cc5d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4a57f158891f5…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Feb 19 09:22:30 2014 +0100
FIX Service item of "Check event state in event console" checks can now be configured
In the past the application regex was used as part of the service descriptin, which
resulted in nagios validation errors in case of regexes, where e.g. "$" signs were
used. Now you can use such regexes and define the item option to create a custom
item for the service description.
---
.werks/672 | 12 ++++++++++++
ChangeLog | 1 +
mkeventd/checks/check_mkevents | 5 +++--
mkeventd/web/plugins/wato/mkeventd.py | 14 +++++++++++++-
4 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/.werks/672 b/.werks/672
new file mode 100644
index 0000000..27249a9
--- /dev/null
+++ b/.werks/672
@@ -0,0 +1,12 @@
+Title: Service item of "Check event state in event console" checks can now be configured
+Level: 1
+Component: ec
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1392798026
+
+In the past the application regex was used as part of the service descriptin, which
+ resulted in nagios validation errors in case of regexes, where e.g. "$" signs were
+used. Now you can use such regexes and define the item option to create a custom
+item for the service description.
diff --git a/ChangeLog b/ChangeLog
index 03b0ba7..f9afdc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -306,6 +306,7 @@
* 0427 FIX: Fixed exception when handling connections from event unix socket...
* 0679 FIX: Allow non-Ascii characters in generated events
* 0680 FIX: Do not allow spaces in host names in event simulator...
+ * 0672 FIX: Service item of "Check event state in event console" checks can now be configured...
Livestatus:
* 0337 New header for limiting the execution time of a query...
diff --git a/mkeventd/checks/check_mkevents b/mkeventd/checks/check_mkevents
index 1f322ca..aa9a3f3 100644
--- a/mkeventd/checks/check_mkevents
+++ b/mkeventd/checks/check_mkevents
@@ -17,8 +17,9 @@ def check_mkevents_arguments(params):
return args
def check_mkevents_description(params):
- if "application" in params:
- return "Events %s" % params["application"]
+ item = params.get('item', params.get('application'))
+ if item:
+ return "Events %s" % item
else:
return "Events"
diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py
index 5250f5b..2011a7a 100644
--- a/mkeventd/web/plugins/wato/mkeventd.py
+++ b/mkeventd/web/plugins/wato/mkeventd.py
@@ -1875,6 +1875,18 @@ register_rule(
default_value = '$HOSTNAME$',
)
),
+ ( "item",
+ RegExp(
+ title = _("Item (Used in service description)"),
+ help = _("If you enter an item name here, this will be used as "
+ "part of the service description after the prefix \"Events \". "
+ "The prefix plus the configured item must result in an unique "
+ "service description per host. If you leave this empty either the "
+ "string provided in \"Application\" is used as item or the service "
+ "gets no item when the \"Application\" field is also not configured."),
+ allow_empty = False,
+ )
+ ),
( "application",
RegExp(
title = _("Application (regular expression)"),
@@ -1934,7 +1946,7 @@ register_rule(
)
),
],
- optional_keys = [ "application", "remote", "ignore_acknowledged" ],
+ optional_keys = [ "application", "remote", "ignore_acknowledged", "item" ],
),
match = 'all',
)
Module: check_mk
Branch: master
Commit: b6c2178fb05af355efa7c63fa311b0221367556e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6c2178fb05af3…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Feb 18 14:56:57 2014 +0100
FIX availability: fixed exception on specific filter settings
The generation of the availability data could raise an exception
if the "Scheduled Downtimes" filter were set to "Exclude scheduled downtimes"
---
.werks/558 | 10 ++++++++++
ChangeLog | 1 +
web/plugins/views/availability.py | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/558 b/.werks/558
new file mode 100644
index 0000000..bb71be3
--- /dev/null
+++ b/.werks/558
@@ -0,0 +1,10 @@
+Title: availability: fixed exception on specific filter settings
+Level: 1
+Component: multisite
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1392731502
+
+The generation of the availability data could raise an exception
+if the "Scheduled Downtimes" filter were set to "Exclude scheduled downtimes"
diff --git a/ChangeLog b/ChangeLog
index a189a00..9a3f495 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -223,6 +223,7 @@
* 0278 FIX: Fixed bookmark icon images for non-english user languages...
* 0670 FIX: LDAP: Fixed sync when non lower case attributes are configured...
* 0671 FIX: LDAP: Disable logging of password changes received from LDAP
+ * 0558 FIX: availability: fixed exception on specific filter settings...
WATO:
* 0308 Multisite can now set rotation view permissions for NagVis...
diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py
index 93d2590..eb57cdc 100644
--- a/web/plugins/views/availability.py
+++ b/web/plugins/views/availability.py
@@ -645,7 +645,7 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode):
(avoptions["downtimes"]["exclude_ok"] and state == 0) and not \
avoptions["downtimes"]["include"] == "ignore":
if avoptions["downtimes"]["include"] == "exclude":
- consider = false
+ consider = False
else:
s = "in_downtime"
elif span["host_down"] and avoptions["consider"]["host_down"]:
Module: check_mk
Branch: master
Commit: 1af33d4ea72c27e164781387046c5bc47230cbd1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1af33d4ea72c27…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Tue Feb 18 12:43:16 2014 +0100
fixed syntax errors in check manpages f5_bigip_conns and genua_pfstate
---
checkman/f5_bigip_conns | 4 ++--
checkman/genua_pfstate | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/checkman/f5_bigip_conns b/checkman/f5_bigip_conns
index 66688e1..1c5003d 100644
--- a/checkman/f5_bigip_conns
+++ b/checkman/f5_bigip_conns
@@ -19,8 +19,8 @@ perfdata:
[parameters]
parameters(dict): parameters is a dictionary with two keys {"conns"} and {"ssl_conns"}.
-The keys may be a tuple of warning and critical levels. However, when using predictive levels
-via WATO, the keys are dictionaries themselves with several keys and values.
+ The keys may be a tuple of warning and critical levels. However, when using predictive levels
+ via WATO, the keys are dictionaries themselves with several keys and values.
[configuration]
f5_bigip_conns_default_levels(dict): This variable is preset to {{ "conns": ( 25000, 30000 ) }, "ssl_conns": ( 25000, 30000 )}
diff --git a/checkman/genua_pfstate b/checkman/genua_pfstate
index ecbacbc..80b5c3d 100644
--- a/checkman/genua_pfstate
+++ b/checkman/genua_pfstate
@@ -28,7 +28,7 @@ inventory:
parameters(dict): parameters is a dictionary with one key
{"used"}: a tuple of lower warning and critical values for the number
-of used PF states
+ of used PF states
[configuration]
genua_pfstate_default_levels(dict): This variable is preset to
Module: check_mk
Branch: master
Commit: 1af68919e2987ac0255912c6488338ef252f570e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1af68919e2987a…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Tue Feb 18 12:15:21 2014 +0100
fixed syntax error in mikrotik_signal check manpage
---
checkman/mikrotik_signal | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/checkman/mikrotik_signal b/checkman/mikrotik_signal
index 65462d3..695303d 100644
--- a/checkman/mikrotik_signal
+++ b/checkman/mikrotik_signal
@@ -9,9 +9,8 @@ description:
It reads the current singnal strenght in decibel and calculates
the quality in a scale up to 100. 100 means optimal signal quality.
-
inventory:
One service for each network will be created.
[parameters]
- Tuple, levels for warn/ crit
+parameters(tuple): levels for warn/crit