[checkmk-commits] Check_MK Git: check_mk: FIX Parameters for clustered services can now be configured on the cluster host

Module: check_mk Branch: master Commit: d3c1a9f2abb4cbcb2143ed01fb5feace2218f951 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3c1a9f2abb4cb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 10 17:41:02 2013 +0100 FIX Parameters for clustered services can now be configured on the cluster host The check parameters of a clustered service were taken from one of the clusters node. Any parameters for the cluster got ignored. This fix allows to configure the parameters of a clustered service on the cluster itself. However, if the clustered service has no configured parameters, the parameters from the nodes are used instead. --- .werks/242 | 13 +++++++++++++ ChangeLog | 1 + modules/check_mk.py | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/242 b/.werks/242 new file mode 100644 index 0000000..3c4cdb1 --- /dev/null +++ b/.werks/242 @@ -0,0 +1,13 @@ +Title: Parameters for clustered services can now be configured on the cluster host +Level: 1 +Component: wato +Version: 1.2.3i8 +Date: 1386692048 +Class: fix + +The check parameters of a clustered service were taken from one of the clusters node. +Any parameters for the cluster got ignored. + +This fix allows to configure the parameters of a clustered service on the cluster itself. +However, if the clustered service has no configured parameters, the parameters from the nodes +are used instead. diff --git a/ChangeLog b/ChangeLog index 8a6d57f..afd7c77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... * 0241 FIX: Improved sorting of WATO folders in dropdown menu... * 0019 FIX: Fixed wording in WATO rule for MSSQL check + * 0242 FIX: Parameters for clustered services can now be configured on the cluster host... Reporting & Availability: * 0018 New option for displaying a legend for the colors used in the timeline... diff --git a/modules/check_mk.py b/modules/check_mk.py index 3d26e16..1b56352 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1041,7 +1041,8 @@ def get_check_table(hostname, remove_duplicates=False): for nodename, checkname, item, params in node_checks: descr = service_description(checkname, item) if hostname == host_of_clustered_service(node, descr): - handle_entry((hostname, checkname, item, params)) + cluster_params = compute_check_parameters(hostname, checkname, item, params) + handle_entry((hostname, checkname, item, cluster_params)) # Remove dependencies to non-existing services