Module: check_mk
Branch: master
Commit: 944f44069226041aac4562156e6685682ca7e368
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=944f4406922604…
Author: Moritz Kiemer <mo(a)mathias-kettner.de>
Date: Fri Nov 9 07:57:04 2018 +0100
6838 FIX skype.data_proxy, wmi_webservices: Fix failing inventory for missing items
No longer report fail in service discovery if no items are
listed in wmi tables.
Change-Id: Ie9b0486843de2b7d91d8e071c33b7f174f73ad97
---
.werks/6838 | 12 ++++++++++++
checks/skype | 2 +-
checks/wmi_webservices | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.werks/6838 b/.werks/6838
new file mode 100644
index 0000000..3c3982d
--- /dev/null
+++ b/.werks/6838
@@ -0,0 +1,12 @@
+Title: skype.data_proxy, wmi_webservices: Fix failing inventory for missing items
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.6.0i1
+Date: 1541746494
+
+No longer report fail in service discovery if no items are
+listed in wmi tables.
diff --git a/checks/skype b/checks/skype
index 6bae956..ee8bd83 100644
--- a/checks/skype
+++ b/checks/skype
@@ -506,7 +506,7 @@ def check_skype_data_proxy(item, params, parsed):
check_info['skype.data_proxy'] = {
- 'inventory_function' : lambda parsed: inventory_wmi_table(parsed,
required_tables=[
+ 'inventory_function' : lambda parsed:
inventory_wmi_table_instances(parsed, required_tables=[
"LS:DATAPROXY - Server Connections"]),
'check_function' : check_skype_data_proxy,
'has_perfdata' : True,
diff --git a/checks/wmi_webservices b/checks/wmi_webservices
index 16d986a..dbc51e5 100644
--- a/checks/wmi_webservices
+++ b/checks/wmi_webservices
@@ -32,7 +32,7 @@ def check_wmi_webservices(item, params, parsed):
check_info['wmi_webservices'] = {
- 'inventory_function' : inventory_wmi_table,
+ 'inventory_function' : inventory_wmi_table_instances,
'check_function' : check_wmi_webservices,
'parse_function' : parse_wmi_table,
'has_perfdata' : True,