Module: check_mk
Branch: master
Commit: 0cec880dd0a154c2a0ea26f531787e1beaea4641
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cec880dd0a154…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed Apr 18 13:51:56 2018 +0200
Fixed handling of old-skool service levels in EC rules.
Change-Id: Ica9dff01587fde0c0f497e2a6b8ffe39896e523c
---
cmk/ec/export.py | 5 ++++-
web/plugins/wato/mkeventd.py | 3 +--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/cmk/ec/export.py b/cmk/ec/export.py
index 2960367..b9e0a7d 100644
--- a/cmk/ec/export.py
+++ b/cmk/ec/export.py
@@ -228,15 +228,18 @@ def load_config(settings):
cmk.ec.defaults.default_rule_pack(config["rules"])]
config["rules"] = []
- # Convert old contact_groups config
for rule_pack in config["rule_packs"]:
for rule in rule_pack["rules"]:
+ # Convert old contact_groups config
if isinstance(rule.get("contact_groups"), list):
rule["contact_groups"] = {
"groups": rule["contact_groups"],
"notify": False,
"precedence": "host",
}
+ # Old configs only have a naked service level without a precedence.
+ if isinstance(rule["sl"], int):
+ rule["sl"] = {"value": rule["sl"],
"precedence": "message"}
# Convert old logging configurations
levels = config["log_level"]
diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py
index 9fa5091..67c7cc3 100644
--- a/web/plugins/wato/mkeventd.py
+++ b/web/plugins/wato/mkeventd.py
@@ -373,8 +373,7 @@ def vs_mkeventd_rule(customer=None):
default_value = "message",
)),
]
- ),
- forth = lambda x: {"value": x, "precedence":
"message"} if isinstance(x, int) else x
+ )
)),
( "contact_groups", Dictionary(
title = _("Contact Groups"),