Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

EC: rename internal function for more clearness

by Mathias Kettner

Module: check_mk Branch: master Commit: bad0e389892fd3cf2c54c2c27fef2e1c6f8d562a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bad0e389892fd3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 15:17:06 2016 +0100 EC: rename internal function for more clearness open is just one phase, but the counting is done independently of the phase Change-Id: I8a1aad2ba568357639ecaa844c013c9cae783fbc --- bin/mkeventd | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 8e94a9d..2106684 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2681,22 +2681,22 @@ class EventServer: def get_hosts_with_active_event_limit(self): hosts = [] - for hostname, num_open_events in g_event_status.num_open_events_by_host.items(): - if num_open_events >= g_config["event_limit"]["by_host"]["limit"]: + for hostname, num_existing_events in g_event_status.num_existing_events_by_host.items(): + if num_existing_events >= g_config["event_limit"]["by_host"]["limit"]: hosts.append(hostname) return hosts def get_rules_with_active_event_limit(self): rule_ids = [] - for rule_id, num_open_events in g_event_status.num_open_events_by_rule.items(): - if num_open_events >= g_config["event_limit"]["by_rule"]["limit"]: + for rule_id, num_existing_events in g_event_status.num_existing_events_by_rule.items(): + if num_existing_events >= g_config["event_limit"]["by_rule"]["limit"]: rule_ids.append(rule_id) return rule_ids def is_overall_event_limit_active(self): - return g_event_status.num_open_events \ + return g_event_status.num_existing_events \ >= g_config["event_limit"]["overall"]["limit"] @@ -2731,7 +2731,7 @@ class EventServer: def _handle_event_limit(self, ty, event): assert ty in [ "overall", "by_rule", "by_host" ] - num_already_open = g_event_status.get_num_open_events_by(ty, event) + num_already_open = g_event_status.get_num_existing_events_by(ty, event) limit = g_config["event_limit"][ty]["limit"] action = g_config["event_limit"][ty]["action"] verbose(" Type: %s, already open events: %d, Limit: %d" % (ty, num_already_open, limit)) @@ -3498,30 +3498,30 @@ class EventStatus(): # the current event limit state -> Sets internal counters which are # updated during runtime. def _initialize_event_limit_status(self): - self.num_open_events = len(self._events) + self.num_existing_events = len(self._events) - self.num_open_events_by_host = {} - self.num_open_events_by_rule = {} + self.num_existing_events_by_host = {} + self.num_existing_events_by_rule = {} for event in self._events: self._count_event_add(event) def _count_event_add(self, event): - if event["host"] not in self.num_open_events_by_host: - self.num_open_events_by_host[event["host"]] = 1 + if event["host"] not in self.num_existing_events_by_host: + self.num_existing_events_by_host[event["host"]] = 1 else: - self.num_open_events_by_host[event["host"]] += 1 + self.num_existing_events_by_host[event["host"]] += 1 - if event["rule_id"] not in self.num_open_events_by_rule: - self.num_open_events_by_rule[event["rule_id"]] = 1 + if event["rule_id"] not in self.num_existing_events_by_rule: + self.num_existing_events_by_rule[event["rule_id"]] = 1 else: - self.num_open_events_by_rule[event["rule_id"]] += 1 + self.num_existing_events_by_rule[event["rule_id"]] += 1 def _count_event_remove(self, event): - self.num_open_events -= 1 - self.num_open_events_by_host[event["host"]] -= 1 - self.num_open_events_by_rule[event["rule_id"]] -= 1 + self.num_existing_events -= 1 + self.num_existing_events_by_host[event["host"]] -= 1 + self.num_existing_events_by_rule[event["rule_id"]] -= 1 def new_event(self, event): @@ -3529,7 +3529,7 @@ class EventStatus(): event["id"] = self._next_event_id self._next_event_id += 1 self._events.append(event) - self.num_open_events += 1 + self.num_existing_events += 1 self._count_event_add(event) log_event_history(event, "NEW") @@ -3586,13 +3586,13 @@ class EventStatus(): # protected by lock_eventstatus - def get_num_open_events_by(self, ty, event): + def get_num_existing_events_by(self, ty, event): if ty == "overall": - return self.num_open_events + return self.num_existing_events elif ty == "by_rule": - return self.num_open_events_by_rule.get(event["rule_id"], 0) + return self.num_existing_events_by_rule.get(event["rule_id"], 0) elif ty == "by_host": - return self.num_open_events_by_host.get(event["host"], 0) + return self.num_existing_events_by_host.get(event["host"], 0) else: raise NotImplementedError()

7 years, 9 months

Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 9e864db2d43f23769c69ee8bd4f42a329b2584bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e864db2d43f23… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 15:11:10 2016 +0100 Reserved 10 Werk IDS Change-Id: Ic2cb19308d494cf33a7f51918564488d6357649f --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 26de2ed..1f0592c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4197 +4207

7 years, 9 months

Another addon for werk 4156

by Mathias Kettner

Module: check_mk Branch: master Commit: fa4968a07aee9be6d74142eb10d9b7eb0d14a093 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa4968a07aee9b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 15:12:30 2016 +0100 Another addon for werk 4156 Change-Id: Ib8bab97052a28188c0bfb12efcc50bad479a4c6c --- bin/mkeventd | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 978169a..8e94a9d 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2725,26 +2725,35 @@ class EventServer: # stop_overflow_notify Stop creating new events, create overflow event, notfy # delete_oldest Delete oldest event, create new event # protected by lock_eventstatus + + # Returns False if the event has been created and actions should be + # performed on that event def _handle_event_limit(self, ty, event): assert ty in [ "overall", "by_rule", "by_host" ] - num = g_event_status.get_num_open_events_by(ty, event) + num_already_open = g_event_status.get_num_open_events_by(ty, event) limit = g_config["event_limit"][ty]["limit"] action = g_config["event_limit"][ty]["action"] - verbose(" Type: %s, Open events: %d, Limit: %d" % (ty, num, limit)) + verbose(" Type: %s, already open events: %d, Limit: %d" % (ty, num_already_open, limit)) - # Check limit under assumption that one more event would be opened - below_limit = num < (limit-1) - above_limit = num >= limit + # Limit not reached: add new event + if num_already_open < limit: + num_already_open += 1 # after adding this event - if below_limit: - return False # Fine. Hand over to next check. + # Limit even then still not reached: we are fine + if num_already_open < limit: + return False + # Delete oldest messages if that is the configure method of keeping the limit if action == "delete_oldest": - g_event_status.remove_oldest_event(ty, event) - return False # Should have solved the issue. Hand over to next check. + while num_already_open > limit: + g_perfcounters.count("overflows") + g_event_status.remove_oldest_event(ty, event) + num_already_open -= 1 + return False - if above_limit: + # Limit reached already in the past: Simply drop silently + if num_already_open > limit: # Just log in verbose mode! Otherwise log file will be flooded verbose(" Skip processing because limit is already in effect") g_perfcounters.count("overflows") @@ -2754,7 +2763,6 @@ class EventServer: # This is the event which reached the limit, allow creation of it. Further # events will be stopped. - g_event_status.new_event(event) # Perform one time actions overflow_event = self._create_overflow_event(ty, event) @@ -2767,7 +2775,7 @@ class EventServer: log(" Creating overflow notification") do_notify(overflow_event) - return True # Just reached limit. Created this last event. Stop processing. + return False def _create_overflow_event(self, ty, event):

7 years, 9 months

4197 FIX Fix sending notification to global fallback email address

by Mathias Kettner

Module: check_mk Branch: master Commit: 7a0cb3db9cdea344a08956912763d1cf6d068e0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a0cb3db9cdea3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 15:11:42 2016 +0100 4197 FIX Fix sending notification to global fallback email address Change-Id: Ia0a0f38f9d63e87e7161f371c3c35a12403825cb --- .werks/4197 | 9 +++++++++ ChangeLog | 4 ++++ modules/notify.py | 12 ++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/4197 b/.werks/4197 new file mode 100644 index 0000000..3b94294 --- /dev/null +++ b/.werks/4197 @@ -0,0 +1,9 @@ +Title: Fix sending notification to global fallback email address +Level: 2 +Component: notifications +Compatible: compat +Version: 1.4.0i4 +Date: 1482156687 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 122a8dd..bc6ac3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.4.0i4: Checks & Agents: * 4104 veeam_tapejobs: New check to monitor Veeam tape jobs + * 4170 local: local check is now clusteraware. Best or worst state in cluster mode can be configured... * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... @@ -11,6 +12,9 @@ * 4142 New extended search dialog for rulesets and rules... * 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery + Notifications: + * 4197 FIX: Fix sending notification to global fallback email address + Event Console: * 4154 Do not send notifications if host found and currently in downtime... NOTE: Please refer to the migration notes! diff --git a/modules/notify.py b/modules/notify.py index 06c8d11..a8f2f38 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -537,7 +537,7 @@ def user_notification_rules(): def rbn_fake_email_contact(email): return { - "name" : email, + "name" : "mailto:" + email, "alias" : "Explicit email adress " + email, "email" : email, "pager" : "", @@ -666,7 +666,7 @@ def rbn_match_event(context, state, last_state, events, allowed_events): def rbn_rule_contacts(rule, context): the_contacts = set([]) if rule.get("contact_object"): - the_contacts.update(rbn_object_contacts(context)) + the_contacts.update(rbn_object_contact_names(context)) if rule.get("contact_all"): the_contacts.update(rbn_all_contacts()) if rule.get("contact_all_with_email"): @@ -680,7 +680,11 @@ def rbn_rule_contacts(rule, context): all_enabled = [] for contactname in the_contacts: - contact = contacts.get(contactname) + if contactname == notification_fallback_email: + contact = rbn_fake_email_contact(notification_fallback_email) + else: + contact = contacts.get(contactname) + if contact: if contact.get("disable_notifications", False): notify_log(" - skipping contact %s: he/she has disabled notifications" % contactname) @@ -776,7 +780,7 @@ def rbn_match_event_console(rule, context): context["EC_COMMENT"], match_ec["match_comment"]) -def rbn_object_contacts(context): +def rbn_object_contact_names(context): commasepped = context.get("CONTACTS") if commasepped == "?": notify_log("Warning: Contacts of %s cannot be determined. Using fallback contacts" %

7 years, 9 months

EC: small logging improvement in EC limit handling

by Mathias Kettner

Module: check_mk Branch: master Commit: 998ac872458d92aeaf38c4f2d2bfdf5cd5ae2797 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=998ac872458d92… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 14:12:47 2016 +0100 EC: small logging improvement in EC limit handling Change-Id: I4110315cdb7f4db29c39d1406225fb768eb89f8c --- bin/mkeventd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index e6f7358..978169a 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2746,11 +2746,11 @@ class EventServer: if above_limit: # Just log in verbose mode! Otherwise log file will be flooded - verbose(" Skip processing because limit is in effect") + verbose(" Skip processing because limit is already in effect") g_perfcounters.count("overflows") return True # Prevent creation and prevent one time actions (below) - log(" The limit has been reached") + log(" The %s limit has been reached" % ty) # This is the event which reached the limit, allow creation of it. Further # events will be stopped.

7 years, 9 months

werk now uses git index instead of auto commit if that is not empty

by Mathias Kettner

Module: check_mk Branch: master Commit: c08ca2556eb18f355558100055744127339de8e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c08ca2556eb18f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 14:13:59 2016 +0100 werk now uses git index instead of auto commit if that is not empty Change-Id: I5d6be05408b4b32017edbae7672471f6e232bbe4 --- werk | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/werk b/werk index db40952..215b289 100755 --- a/werk +++ b/werk @@ -255,18 +255,34 @@ def git_commit(werk, custom_files): if custom_files: files_to_commit = custom_files default_files = [ ".werks", "ChangeLog" ] - # Get top level - info = subprocess.Popen(["git", "rev-parse", "--show-toplevel"], stdout=subprocess.PIPE) - git_top_level = info.communicate()[0].split()[0] for entry in default_files: - files_to_commit.append("%s/%s" % (git_top_level, entry)) + files_to_commit.append("%s/%s" % (git_top_level(), entry)) os.chdir(g_base_dir) os.system("git commit %s -m %s" % (" ".join(files_to_commit), quote_shell_string(title + "\n\n" + werk["description"]))) else: - os.system("git commit -a -m %s" % quote_shell_string(title + "\n\n" + werk["description"])) + if something_in_git_index(): + dash_a = '' + os.system("cd '%s' ; git add .werks ChangeLog" % git_top_level()) + else: + dash_a = '-a' + + os.system("git commit %s -m %s" % (dash_a, quote_shell_string(title + "\n\n" + werk["description"]))) + +def git_top_level(): + info = subprocess.Popen(["git", "rev-parse", "--show-toplevel"], stdout=subprocess.PIPE) + git_top_level = info.communicate()[0].split()[0] + return git_top_level + + +def something_in_git_index(): + for line in os.popen("git status --porcelain"): + if line[0] == 'M': + return True + return False + def quote_shell_string(s): return "'" + s.replace("'", "'\"'\"'") + "'"

7 years, 9 months

4156 FIX Fix off-by-one error in EC limit handling

by Mathias Kettner

Module: check_mk Branch: master Commit: 4aeb412d483bfad1a96ee76ae135fb63b8ca69c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4aeb412d483bfa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 14:09:17 2016 +0100 4156 FIX Fix off-by-one error in EC limit handling If the limit was e.g. 10 in fact 11 message would have been allowed (<b>plus</b> the overflow event). This has been fixed. Change-Id: I0890b7899dd29056f717c115c889d74e17511421 --- .werks/4156 | 10 ++++++++++ ChangeLog | 1 + bin/mkeventd | 5 +++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4156 b/.werks/4156 new file mode 100644 index 0000000..eb02a8b --- /dev/null +++ b/.werks/4156 @@ -0,0 +1,10 @@ +Title: Fix off-by-one error in EC limit handling +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i4 +Date: 1482152918 +Class: fix + +If the limit was e.g. 10 in fact 11 message would have been +allowed (<b>plus</b> the overflow event). This has been fixed. diff --git a/ChangeLog b/ChangeLog index 23d9953..122a8dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 4154 Do not send notifications if host found and currently in downtime... NOTE: Please refer to the migration notes! * 4155 FIX: Do not perform actions on events if overflow limit is active... + * 4156 FIX: Fix off-by-one error in EC limit handling... 1.4.0i3: diff --git a/bin/mkeventd b/bin/mkeventd index 4ee5a5d..e6f7358 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2733,8 +2733,9 @@ class EventServer: action = g_config["event_limit"][ty]["action"] verbose(" Type: %s, Open events: %d, Limit: %d" % (ty, num, limit)) - below_limit = num < limit - above_limit = num > limit + # Check limit under assumption that one more event would be opened + below_limit = num < (limit-1) + above_limit = num >= limit if below_limit: return False # Fine. Hand over to next check.

7 years, 9 months

4155 FIX Do not perform actions on events if overflow limit is active

by Mathias Kettner

Module: check_mk Branch: master Commit: f7808527d309eafeb9da8be284cd0184a0fe6184 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7808527d309ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 14:06:49 2016 +0100 4155 FIX Do not perform actions on events if overflow limit is active If the EC blocks a new event because of an active overflow limit then it now correctly also omit any configured actions (i.e. a notification) on that event. Previously actions would be executed anyway - that way undermining the overflow protection. Furthermore the action "Send notifiction" would run into an exception because of a missing event ID. Change-Id: I5f4f3902a336f9c635544027933f0d53e51fb359 --- .werks/4155 | 15 +++++++++++++++ ChangeLog | 1 + bin/mkeventd | 37 +++++++++++++++++++------------------ 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/.werks/4155 b/.werks/4155 new file mode 100644 index 0000000..1d61aa7 --- /dev/null +++ b/.werks/4155 @@ -0,0 +1,15 @@ +Title: Do not perform actions on events if overflow limit is active +Level: 2 +Component: ec +Compatible: compat +Version: 1.4.0i4 +Date: 1482152679 +Class: fix + +If the EC blocks a new event because of an active overflow limit +then it now correctly also omit any configured actions (i.e. +a notification) on that event. + +Previously actions would be executed anyway - that way undermining +the overflow protection. Furthermore the action "Send notifiction" +would run into an exception because of a missing event ID. diff --git a/ChangeLog b/ChangeLog index eb242a5..23d9953 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ Event Console: * 4154 Do not send notifications if host found and currently in downtime... NOTE: Please refer to the migration notes! + * 4155 FIX: Do not perform actions on events if overflow limit is active... 1.4.0i3: diff --git a/bin/mkeventd b/bin/mkeventd index ae6bb11..4ee5a5d 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2177,16 +2177,14 @@ class EventServer: else: event["phase"] = "open" - with lock_eventstatus: - self.new_event_respecting_limits(event) - - if event["phase"] == "open": - event_has_opened(rule, event) - if rule.get("autodelete"): - event["phase"] = "closed" - log_event_history(event, "AUTODELETE") - with lock_eventstatus: - g_event_status.remove_event(event) + if self.new_event_respecting_limits(event): + if event["phase"] == "open": + event_has_opened(rule, event) + if rule.get("autodelete"): + event["phase"] = "closed" + log_event_history(event, "AUTODELETE") + with lock_eventstatus: + g_event_status.remove_event(event) return # End of loop over rules. @@ -2704,18 +2702,21 @@ class EventServer: # protected by lock_eventstatus def new_event_respecting_limits(self, event): - verbose("Checking for event limits") + verbose("Checking limit for message from %s (rule '%s')" % ( + event["host"], event["rule_id"])) - if self._handle_event_limit("overall", event): - return + with lock_eventstatus: + if self._handle_event_limit("overall", event): + return False - if self._handle_event_limit("by_host", event): - return + if self._handle_event_limit("by_host", event): + return False - if self._handle_event_limit("by_rule", event): - return + if self._handle_event_limit("by_rule", event): + return False - g_event_status.new_event(event) + g_event_status.new_event(event) + return True # The following actions can be configured:

7 years, 9 months

updated some manpages

by Simon Betz

Module: check_mk Branch: master Commit: cc3d4a4d94d8d973c6c8f50a815d74edba0f656b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc3d4a4d94d8d9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 19 13:43:49 2016 +0100 updated some manpages Change-Id: I1f1c4645292a5876b40ed22329b19420793ddaa5 --- checkman/raritan_emx | 2 +- checkman/raritan_emx.binary | 2 +- checkman/raritan_emx.fan | 2 +- checkman/raritan_emx_sensors | 2 +- checkman/raritan_emx_sensors.airflow | 2 +- checkman/raritan_emx_sensors.humidity | 2 +- checkman/raritan_emx_sensors.pressure | 2 +- checkman/raritan_emx_sensors.temp | 2 +- checkman/raritan_pdu_inlet | 2 +- checkman/raritan_pdu_inlet_summary | 2 +- checkman/raritan_pdu_ocprot | 2 +- checkman/raritan_pdu_outletcount | 2 +- checkman/raritan_pdu_plugs | 2 +- checkman/raritan_px2_sensors | 2 +- checkman/raritan_px2_sensors.airflow | 2 +- checkman/raritan_px2_sensors.humidity | 2 +- checkman/raritan_px2_sensors.pressure | 2 +- checkman/raritan_px_outlets | 2 +- checkman/raritan_px_sensors | 2 +- checkman/raritan_px_sensors.binary | 2 +- checkman/raritan_px_sensors.humidity | 2 +- lib/man_pages.py | 3 ++- 22 files changed, 23 insertions(+), 22 deletions(-) diff --git a/checkman/raritan_emx b/checkman/raritan_emx index fd30893..a7bc3be 100644 --- a/checkman/raritan_emx +++ b/checkman/raritan_emx @@ -1,6 +1,6 @@ title: Raritan EMX devices: Temperature agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_emx.binary b/checkman/raritan_emx.binary index 5b8a28a..c8cf6c3 100644 --- a/checkman/raritan_emx.binary +++ b/checkman/raritan_emx.binary @@ -1,6 +1,6 @@ title: Raritan EMX devices: Door States agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_emx.fan b/checkman/raritan_emx.fan index 706205b..d57696a 100644 --- a/checkman/raritan_emx.fan +++ b/checkman/raritan_emx.fan @@ -1,6 +1,6 @@ title: Raritan EMX devices: Fan State and Speed agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_emx_sensors b/checkman/raritan_emx_sensors index ee2b1f1..cbbbbe7 100644 --- a/checkman/raritan_emx_sensors +++ b/checkman/raritan_emx_sensors @@ -1,6 +1,6 @@ title: Raritan EMX Devices External Sensors: Contact agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_emx_sensors.airflow b/checkman/raritan_emx_sensors.airflow index bca6dcb..baa0fb2 100644 --- a/checkman/raritan_emx_sensors.airflow +++ b/checkman/raritan_emx_sensors.airflow @@ -1,6 +1,6 @@ title: Raritan EMX Devices External Sensors: Air flow agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_emx_sensors.humidity b/checkman/raritan_emx_sensors.humidity index 79be967..de8740c 100644 --- a/checkman/raritan_emx_sensors.humidity +++ b/checkman/raritan_emx_sensors.humidity @@ -1,6 +1,6 @@ title: Raritan EMX Devices External Sensors: Humidity agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_emx_sensors.pressure b/checkman/raritan_emx_sensors.pressure index b7506eb..a4cc009 100644 --- a/checkman/raritan_emx_sensors.pressure +++ b/checkman/raritan_emx_sensors.pressure @@ -1,6 +1,6 @@ title: Raritan EMX Devices External Sensors: Pressure agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_emx_sensors.temp b/checkman/raritan_emx_sensors.temp index c0b627a..e67ff29 100644 --- a/checkman/raritan_emx_sensors.temp +++ b/checkman/raritan_emx_sensors.temp @@ -1,6 +1,6 @@ title: Raritan EMX Devices External Sensors: Temperature agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_pdu_inlet b/checkman/raritan_pdu_inlet index a4399e1..99fc61a 100644 --- a/checkman/raritan_pdu_inlet +++ b/checkman/raritan_pdu_inlet @@ -1,6 +1,6 @@ title: Raritan PX-2000 family PDU inlet sensor state agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_pdu_inlet_summary b/checkman/raritan_pdu_inlet_summary index 24acf36..c9bc920 100644 --- a/checkman/raritan_pdu_inlet_summary +++ b/checkman/raritan_pdu_inlet_summary @@ -1,6 +1,6 @@ title: Raritan PX-2000 family PDU inlet sensor state agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_pdu_ocprot b/checkman/raritan_pdu_ocprot index b733d07..c5d0031 100644 --- a/checkman/raritan_pdu_ocprot +++ b/checkman/raritan_pdu_ocprot @@ -1,6 +1,6 @@ title: Raritan PX-2000 family PDU overcurrent protector agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_pdu_outletcount b/checkman/raritan_pdu_outletcount index a6b2109..fce23e9 100644 --- a/checkman/raritan_pdu_outletcount +++ b/checkman/raritan_pdu_outletcount @@ -1,6 +1,6 @@ title: Raritan PX-2000 family PDU outlet count agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_pdu_plugs b/checkman/raritan_pdu_plugs index 0afa47e..e8a9fd4 100644 --- a/checkman/raritan_pdu_plugs +++ b/checkman/raritan_pdu_plugs @@ -1,6 +1,6 @@ title: Raritan PX-2000 family PDU plug state agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_px2_sensors b/checkman/raritan_px2_sensors index 46f6c64..7bff520 100644 --- a/checkman/raritan_px2_sensors +++ b/checkman/raritan_px2_sensors @@ -1,6 +1,6 @@ title: Raritan PX2 Devices External Sensors: Temperature agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_px2_sensors.airflow b/checkman/raritan_px2_sensors.airflow index c9b9984..fff4bbf 100644 --- a/checkman/raritan_px2_sensors.airflow +++ b/checkman/raritan_px2_sensors.airflow @@ -1,6 +1,6 @@ title: Raritan PX2 Devices External Sensors: Air Flow agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_px2_sensors.humidity b/checkman/raritan_px2_sensors.humidity index 74e7fc8..18e417d 100644 --- a/checkman/raritan_px2_sensors.humidity +++ b/checkman/raritan_px2_sensors.humidity @@ -1,6 +1,6 @@ title: Raritan PX2 Devices External Sensors: Humidity agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_px2_sensors.pressure b/checkman/raritan_px2_sensors.pressure index 91fee63..a7cd994 100644 --- a/checkman/raritan_px2_sensors.pressure +++ b/checkman/raritan_px2_sensors.pressure @@ -1,6 +1,6 @@ title: Raritan PX2 Devices External Sensors: Pressure agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_px_outlets b/checkman/raritan_px_outlets index bc90ebf..2bbe8f3 100644 --- a/checkman/raritan_px_outlets +++ b/checkman/raritan_px_outlets @@ -1,6 +1,6 @@ title: Raritan PX Devices Outlets: Voltage, Current, Power, Apparent Power, Energy agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_px_sensors b/checkman/raritan_px_sensors index fed1bdf..beffaf4 100644 --- a/checkman/raritan_px_sensors +++ b/checkman/raritan_px_sensors @@ -1,6 +1,6 @@ title: Raritan PX Devices Sensors: Temperature agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_px_sensors.binary b/checkman/raritan_px_sensors.binary index 69fcc8b..408b5d3 100644 --- a/checkman/raritan_px_sensors.binary +++ b/checkman/raritan_px_sensors.binary @@ -1,6 +1,6 @@ title: Raritan PX Devices Sensors: Contact agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/checkman/raritan_px_sensors.humidity b/checkman/raritan_px_sensors.humidity index cb18624..2096b45 100644 --- a/checkman/raritan_px_sensors.humidity +++ b/checkman/raritan_px_sensors.humidity @@ -1,6 +1,6 @@ title: Raritan PX Devices Sensors: Humidity agents: snmp -catalog: hw/other +catalog: hw/environment/raritan license: GPL distribution: check_mk description: diff --git a/lib/man_pages.py b/lib/man_pages.py index bfa7ac0..aafddb2 100644 --- a/lib/man_pages.py +++ b/lib/man_pages.py @@ -63,19 +63,20 @@ catalog_titles = { "bosch" : "Bosch", "carel" : "CAREL", "climaveneta" : "Climaveneta", + "didactum" : "Didactum", "eaton" : "Eaton", "emerson" : "EMERSON", "epson" : "Epson", "hwg" : "HW group", "kentix" : "Kentix", "knuerr" : "Knuerr", + "raritan" : "Raritan", "rittal" : "Rittal", "sensatronics" : "Sensatronics", "socomec" : "Socomec", "stulz" : "STULZ", "wagner" : "WAGNER Group", "wut" : "Wiesemann & Theis", - "didactum" : "Didactum", "other" : "Other devices", "time" : "Clock Devices", "meinberg" : "Meinberg",

7 years, 9 months

4170 local: local check is now clusteraware. Best or worst state in cluster mode can be configured

by Simon Betz

Module: check_mk Branch: master Commit: 98968cdbbde6ba8f3a4cdc3f5373e47f844ab0b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98968cdbbde6ba… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 19 08:05:34 2016 +0100 4170 local: local check is now clusteraware. Best or worst state in cluster mode can be configured Change-Id: Iea613ba04877ed54fab98f4846c1015b5bf51142 --- .werks/4170 | 11 +++ ChangeLog | 1 + checks/local | 138 +++++++++++++++++++++++------------ web/plugins/wato/check_parameters.py | 20 +++++ 4 files changed, 125 insertions(+), 45 deletions(-) diff --git a/.werks/4170 b/.werks/4170 new file mode 100644 index 0000000..1f0eb6d --- /dev/null +++ b/.werks/4170 @@ -0,0 +1,11 @@ +Title: local: local check is now clusteraware. Best or worst state in cluster mode can be configured +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1482131073 +Class: feature + +Now your're able to determine the state of local checks on clusters via {{Settings for local checks}} +in {{Host & Service parameters}}. Within these settings you can choose between best or worst state. +Default setting is worst state. diff --git a/ChangeLog b/ChangeLog index 598017a..eb242a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 4098 ups_cps_battery, ups_cps_battery.temp, ups_cps_inphase, ups_cps_outphase: Several checks to monitor CPS UPS devices * 4118 check_bi_aggr: changed check and WATO rule to support Kerberos auth... * 4104 veeam_tapejobs: New check to monitor Veeam tape jobs + * 4170 local: local check is now clusteraware. Best or worst state in cluster mode can be configured * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... * 3939 FIX: f5_bigip_conns: readded performance data and graphs... diff --git a/checks/local b/checks/local index db71272..a73f548 100644 --- a/checks/local +++ b/checks/local @@ -99,61 +99,109 @@ def inventory_local(info): inventory = [] # Lines with P do not need to supply a text for line in info: - if len(line) >= 4 or len(line) == 3 and line[0] == 'P': - inventory.append( (line[1], None) ) + nodename = line[0] + stripped_line = line[1:] + if len(stripped_line) >= 4 or len(stripped_line) == 3 and stripped_line[0] == 'P': + inventory.append( (stripped_line[1], None) ) else: - raise MKGeneralException("Invalid line in agent section <<<local>>>: %s" % " ".join(line)) + raise MKGeneralException("Invalid line in agent section <<<local>>>: %s" % " ".join(stripped_line)) return inventory +# Some helper functions +def _parse_local_line(line): + if not (len(line) >= 4 or (len(line) == 3 and line[0] == 'P')): + return 3, "Incomplete line in local check output: %s" % " ".join(line), [] + + statechar = line[0] + perftxt = line[2] + + # convert eventually escaped newinfo_line chars to real newinfo_lines + # (will be converted back later individually for the different cores) + output = " ".join(line[3:]).replace("\\n", "\n") + + perfdata = [] + if perftxt != "-": + for entry in perftxt.split('|'): + try: + varname, valuetxt = entry.split('=') + values = valuetxt.split(';') + perfdata.append( tuple([varname] + values) ) + + except ValueError: + return 3, "Invalid performance data %s in local check output %s" % \ + (perftxt, " ".join(line)), [] + + if statechar == 'P': + state, texts = local_compute_state(perfdata) + if output: + texts = [output] + texts + output = ", ".join(texts) + + else: + try: + state = int(statechar) + except: + return 3, "Invalid state %s in local check output %s: must be P, 0, 1, 2 or 3" % \ + (statechar, " ".join(line)), [] + + if state not in range(0, 4): + output += ", local check has sent invalid state %d" % state + state = 3 + + return state, output, perfdata + + +def _calculate_local_best_state(collected_stats): + states = [] + infotexts = [] + perfdatas = [] + for nodename, attrs in collected_stats.items(): + for itemname, (state, output, perfdata) in attrs.items(): + if nodename is not None: + output = "On node %s: %s" % (nodename, output) + states.append(state) + infotexts.append(output) + perfdatas += perfdata + return min(states), ", ".join(infotexts), perfdatas + + +def _calculate_local_worst_state(collected_stats): + for nodename, attrs in collected_stats.items(): + for itemname, (state, output, perfdata) in attrs.items(): + if nodename is not None: + output = "On node %s: %s" % (nodename, output) + yield state, output, perfdata + + def check_local(item, params, info): + collected_stats = {} for line in info: + nodename = line[0] + stripped_line = line[1:] # Ignore invalid lines, tolerate bugs in local checks # of unexperienced users - if len(line) >= 2 and line[1] == item: - if not (len(line) >= 4 or (len(line) == 3 and line[0] == 'P')): - return 3, "Incomplete line in local check output: %s" % " ".join(line) - - statechar = line[0] - perftxt = line[2] - - output = " ".join(line[3:]) - # convert eventually escaped newline chars to real newlines - # (will be converted back later individually for the different cores) - output = output.replace("\\n", "\n") - - perfdata = [] - if perftxt != "-": - # new: allow multiple perfdata by using | as separator - for entry in perftxt.split('|'): - try: - varname, valuetxt = entry.split('=') - values = valuetxt.split(';') - perfdata.append(tuple( [varname] + values )) - except ValueError: - return 3, "Invalid performance data %s in local check output %s" % \ - (perftxt, " ".join(line)) - if statechar == 'P': - state, texts = local_compute_state(perfdata) - if output: - texts = [output] + texts - output = ", ".join(texts) - else: - try: - state = int(statechar) - except: - return 3, "Invalid state %s in local check output %s: must be P, 0, 1, 2 or 3" % \ - (statechar, " ".join(line)) + if len(stripped_line) >= 2 and stripped_line[1] == item: + collected_stats.setdefault(nodename, {}) + collected_stats[nodename].setdefault(item, _parse_local_line(stripped_line)) + + if collected_stats == {}: + yield 3, "No data found in agent output" + return - if state not in range(0, 4): - output += ", local check has sent invalid state %d" % state - state = 3 - return (state, output, perfdata) + if params is not None and params.get("outcome_on_cluster", "worst") == "best": + yield _calculate_local_best_state(collected_stats) + return + else: + for res in _calculate_local_worst_state(collected_stats): + yield res check_info["local"] = { - 'inventory_function' : inventory_local, - 'check_function' : check_local, - 'service_description' : '%s', - 'has_perfdata' : True, + 'check_function' : check_local, + 'inventory_function' : inventory_local, + 'service_description' : '%s', + 'has_perfdata' : True, + 'node_info' : True, + 'group' : 'local', } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6cb567c..92a622e 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1423,6 +1423,26 @@ register_rule(group + '/' + subgroup_applications, ) +register_check_parameters( + subgroup_applications, + "local", + _("Settings for local checks"), + Dictionary( + elements = [ + ("outcome_on_cluster", DropdownChoice(choices = [ + ("worst", _("Worst state")), + ("best", _("Best state")), + ], + title = _("Clusters: Prefered check result of local checks"), + help = _("If you're running local checks on clusters via clustered services rule " + "you can influence the check result with this rule. You can choose between " + "best or worst state. Default setting is worst state."), + default_value = "worst")) + ] + ), + TextAscii(title = _("Name of local item")), + "dict" +) register_check_parameters(

7 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016