3 Feb
2017
3 Feb
'17
4:15 p.m.
Module: check_mk
Branch: master
Commit: 7b514e7a49795ca48585ec86e0631e276be2e3ad
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b514e7a49795c…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Jan 23 14:32:45 2017 +0100
Removed obsolete obsolete discovered services state
Change-Id: I84e1804545f2820ec9a23a97046a4011b07f383b
---
modules/discovery.py | 10 +++-------
web/htdocs/wato.py | 7 +++----
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/modules/discovery.py b/modules/discovery.py
index a825401..9bad839 100644
--- a/modules/discovery.py
+++ b/modules/discovery.py
@@ -196,7 +196,7 @@ def discover_on_host(mode, hostname, do_snmp_scan, use_caches,
on_error="ignore"
new_items[(check_type, item)] = paramstring
counts["kept"] += 1
- elif check_source in ("obsolete", "vanished"):
+ elif check_source == "vanished":
# keep item, if we are currently only looking for new services
# otherwise fix it: remove ignored and non-longer existing services
if mode not in ("fixall", "remove") or not
service_filter(hostname, check_type, item):
@@ -960,7 +960,6 @@ def discoverable_check_types(what): # snmp, tcp, all
# "custom" : Check is defined via custom_checks
# "manual" : Check is a manual Check_MK check without service
discovery
# "ignored" : discovered or static, but disabled via ignored_services
-# "obsolete" : Discovered by vanished check is meanwhile ignored via
ignored_services
# "clustered_new" : New service found on a node that belongs to a cluster
# "clustered_old" : Old service found on a node that belongs to a cluster
# This function is cluster-aware
@@ -1042,7 +1041,7 @@ def merge_manual_services(services, hostname, on_error):
descr = act_info["service_description"](params)
services[(acttype, descr)] = ('active', repr(params))
- # Handle disabled services -> "obsolete" and "ignored"
+ # Handle disabled services -> "ignored"
for (check_type, item), (check_source, paramstring) in services.items():
try:
descr = service_description(hostname, check_type, item)
@@ -1055,10 +1054,7 @@ def merge_manual_services(services, hostname, on_error):
continue # ignore
if service_ignored(hostname, check_type, descr):
- if check_source == "vanished":
- new_source = "obsolete"
- else:
- new_source = "ignored"
+ new_source = "ignored"
services[(check_type, item)] = (new_source, paramstring)
return services
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 24ff861..cd8486e 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -2791,7 +2791,7 @@ class ModeDiscovery(WatoMode):
active_checks = {}
for st, ct, checkgroup, item, paramstring, params, descr, state, output,
perfdata in table:
if (html.has_var("_cleanup") or
html.has_var("_fixall")) \
- and st in [ "vanished", "obsolete" ]:
+ and st == "vanished":
pass
elif (html.has_var("_activate_all") or
html.has_var("_fixall")) \
and st == "new":
@@ -2872,12 +2872,11 @@ class ModeDiscovery(WatoMode):
return [
# check_source, title, initial checkbox value
("new", _("Available (missing) services"),
isinstance(self, ModeFirstDiscovery)),
- ("obsolete", _("Obsolete services (being checked, but
should be ignored)"), True ), # Cannot happen anymore
("vanished", _("Vanished services (checked, but no longer
exist)"), True ),
("old", _("Already configured services"),
True),
("ignored", _("Disabled services (configured away by
admin)"), None),
("active", _("Active checks"), None),
- ("manual", _("Manual services (defined in
main.mk)"), None ),
+ ("manual", _("Manual services"), None ),
("legacy", _("Legacy services (defined in
main.mk)"), None ),
("custom", _("Custom checks (defined via rule)"),
None ),
("clustered_old", _("Already configured clustered services
(located on cluster host)"), None ),
@@ -3049,7 +3048,7 @@ class ModeDiscovery(WatoMode):
break
for entry in check_table:
- if entry[0] in [ 'obsolete', 'vanished', ]:
+ if entry[0] == 'vanished':
html.button("_cleanup", _("Remove vanished"))
fixall += 1
break