Module: check_mk
Branch: master
Commit: 6d7787cd15426c47770e7d522c9a50cdddca43ba
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d7787cd15426c…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Aug 3 11:23:31 2016 +0200
Fixed broken monitoring with nagios core
---
modules/check_mk.py | 9 ---------
modules/check_mk_base.py | 10 ++++++++++
modules/nagios.py | 6 ++++++
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/modules/check_mk.py b/modules/check_mk.py
index e095faa..8dff140 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -574,15 +574,6 @@ def active_check_arguments(hostname, description, args):
"string of the concatenated arguments (Host: %s,
Service: %s)." % (hostname, description))
-def is_snmp_check(check_name):
- return check_name.split(".")[0] in snmp_info
-
-
-def is_tcp_check(check_name):
- return check_name in check_info \
- and check_name.split(".")[0] not in snmp_info # snmp check basename
-
-
#.
# .--Hosts---------------------------------------------------------------.
# | _ _ _ |
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 81c89a3..95d36ed 100644
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -1582,6 +1582,16 @@ def is_manual_check(hostname, check_type, item):
return (check_type, item) in manual_checks
+def is_snmp_check(check_name):
+ return check_name.split(".")[0] in snmp_info
+
+
+def is_tcp_check(check_name):
+ return check_name in check_info \
+ and check_name.split(".")[0] not in snmp_info # snmp check basename
+
+
+
def create_crash_dump_info_file(crash_dir, hostname, check_type, item, params,
description, info, text):
crash_info = crash_reporting.create_crash_info("check", details={
"check_output" : text,
diff --git a/modules/nagios.py b/modules/nagios.py
index 7ebc92b..01ecda6 100644
--- a/modules/nagios.py
+++ b/modules/nagios.py
@@ -1114,6 +1114,12 @@ no_discovery_possible = None
output.write("def clusters_of(hostname):\n return %r\n\n" %
clusters_of(hostname))
+ has_board = has_management_board(hostname)
+ output.write("def has_management_board(hostname):\n return %r\n\n" %
has_board)
+ if has_board:
+ output.write("def management_address(hostname):\n return %r\n\n" %
management_address(hostname))
+ output.write("def management_protocol(hostname):\n return %r\n\n" %
management_protocol(hostname))
+
# snmp hosts
output.write("def is_snmp_host(hostname):\n return % r\n\n" %
is_snmp_host(hostname))
output.write("def is_snmpv3_host(hostname):\n return % r\n\n" %
is_snmpv3_host(hostname))