Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64455 discussions

Check_MK Git: check_mk: CMC: fix problem with broken_agent_hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: 453fa653930d512265acddebbf42628624e2bd13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=453fa653930d51… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 5 17:18:13 2013 +0200 CMC: fix problem with broken_agent_hosts --- modules/check_mk_base.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7702bc0..ff694f6 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -956,6 +956,11 @@ def cleanup_globals(): g_counters = {} global g_infocache g_infocache = {} + global g_broken_agent_hosts + g_broken_agent_hosts = set([]) + global g_broken_snmp_hosts + g_broken_snmp_hosts = set([]) + # Diagnostic function for detecting global variables that have

11 years, 4 months

Check_MK Git: check_mk: esx_vsphere_datastores: Fix incomplete performance data

by Mathias Kettner

Module: check_mk Branch: master Commit: c81d03fb40e12bb1f8521193b34518cb2c11ed94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c81d03fb40e12b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 5 15:19:46 2013 +0200 esx_vsphere_datastores: Fix incomplete performance data --- ChangeLog | 1 + checks/esx_vsphere_datastores | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2c676b..3192df3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * cached checks: no longer output cached data if the age of the cache file is twice the maximum cache age * windows agent: no longer tries to execute directories + * esx_vsphere_datastores: Fix incomplete performance data Notifications: * Flexible Notification can now filter service levels diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index 4d2c885..40c6900 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -89,10 +89,11 @@ def check_esx_vsphere_datastores(item, params, info): infotext += ", uncommitted: %.2f GB, provisioning: %.1f%%%s" % ( uncommitted_mb / 1024, overprov_percent, overprov_txt) - perfdata += [ - ('uncommitted', str(uncommitted_mb) + 'MB'), - ('overprovisioned', str(overprov_mb) + 'MB', overprov_warn_mb, overprov_crit_mb), - ] + if perfdata: + perfdata += [ + ('uncommitted', str(uncommitted_mb) + 'MB'), + ('overprovisioned', str(overprov_mb) + 'MB', overprov_warn_mb, overprov_crit_mb), + ] if not store["accessible"]: state = 2

11 years, 4 months

Check_MK Git: check_mk: Updated ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: 3ede7fcebcc56edcb4eaed8b4bb0e6b4368ad853 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ede7fcebcc56e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 5 15:04:05 2013 +0200 Updated ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 0849b19..f2c676b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ Event Console: * New global setting "force message archiving", converts the EC into a kind of syslog archive + * FIX: fix layout of filter for history action type 1.2.3i1: Core:

11 years, 4 months

Check_MK Git: check_mk: EC: Fix layout of history state filter

by Mathias Kettner

Module: check_mk Branch: master Commit: f1b1c4a5b6490c6ec47708fcddcb0124788b37ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1b1c4a5b6490c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 5 15:03:11 2013 +0200 EC: Fix layout of history state filter --- mkeventd/web/plugins/views/mkeventd.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index 9681c1d..4d63d8f 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -288,13 +288,14 @@ if mkeventd_enabled: def display(self): html.begin_checkbox_group() - c = 0 + chars = 0 for name, title in self._choices: - c += 1 + chars += len(title) + 2 html.checkbox(self._name + "_" + str(name), True, label=title) - if c == 4: + if (title[0].isupper() and chars > 24) or \ + (title[0].islower() and chars > 36): html.write("<br>") - c = 0 + chars = 0 html.end_checkbox_group() def filter(self, infoname):

11 years, 4 months

Check_MK Git: check_mk: EC: new global setting force message archiving

by Mathias Kettner

Module: check_mk Branch: master Commit: 13c9ad9e06081f1febb72409526854e9f44e2053 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13c9ad9e06081f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 5 14:50:07 2013 +0200 EC: new global setting force message archiving --- ChangeLog | 4 + mkeventd/bin/mkeventd | 15 ++- mkeventd/web/htdocs/mkeventd.py | 1 + mkeventd/web/plugins/wato/mkeventd.py | 216 ++++++++++++++++++--------------- 4 files changed, 135 insertions(+), 101 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=13c9ad9e06…

11 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0923

by Lars Michelsen

Module: check_mk Branch: master Commit: fe817b8732aee5f87e71dd97fa291a73cf389f2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe817b8732aee5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 29 12:41:52 2013 +0200 Updated bug entries #0923 --- .bugs/923 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.bugs/923 b/.bugs/923 new file mode 100644 index 0000000..6d98a5d --- /dev/null +++ b/.bugs/923 @@ -0,0 +1,18 @@ +Title: BI-Aggregation Checks as WATO rules +Component: wato +State: open +Date: 2013-05-29 12:38:01 +Targetversion: 1.2.3 +Class: feature + +At the moment bi aggregations are added as local checks to make nagios services +out of them to be able to create notifications for them. + +It would be nice to make those aggregations configurable via WATO. This could +be a ruleset which makes all or specific BI aggregations virtual hosts or services. + +This could maybe done using piggyback. + +As a result it would be nice to give users the option to which hosts these services +shal be added. For example a single host aggregation should be added directly to the +host and a multi host aggregation be added to a virtual host or a cluster host.

11 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 31bc7dacf92f7a4ef75fd1bb4bd2cd91f837d843 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31bc7dacf92f7a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 5 10:15:54 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 941bc74bc1fe690f31ed55f941600ea3178d9eb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=941bc74bc1fe69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 5 13:42:21 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 4 months

Check_MK Git: check_mk: cisco_temp_perf: convert to new check API

by Mathias Kettner

Module: check_mk Branch: master Commit: 8d4d51dbfffe7aab48c3cc2fc9a20e749aad9581 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d4d51dbfffe7a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 5 11:50:19 2013 +0200 cisco_temp_perf: convert to new check API --- checks/cisco_temp_perf | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index eea93ee..baa39ee 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -87,10 +87,17 @@ def check_cisco_temp_perf(item, _no_params, info): return (2, "state is %s%s" % (statename, temptext), perfdata) return (3, "Item %s not found in SNMP data" % item) -check_info['cisco_temp_perf'] = (check_cisco_temp_perf, "Temperature %s", 1, inventory_cisco_temp_perf) -snmp_info['cisco_temp_perf'] = ( ".1.3.6.1.4.1.9.9.13.1.3.1", [ 2, 3, 4, 6, OID_END ] ) # CISCO-SMI -snmp_scan_functions['cisco_temp_perf'] = \ - lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ - oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None and \ - oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") == None, -checkgroup_of["cisco_temp_perf"] = "temperature_auto" + +check_info['cisco_temp_perf'] = { + "check_function" : check_cisco_temp_perf, + "inventory_function" : inventory_cisco_temp_perf, + "service_description" : "Temperature %s", + "has_perfdata" : True, + "snmp_scan_function" : + lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ + oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None and \ + oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") == None, + "snmp_info" : ( ".1.3.6.1.4.1.9.9.13.1.3.1", + [2, 3, 4, 6, OID_END ] ), # CISCO-SMI + "group" : "temperature_auto" +}

11 years, 4 months

Check_MK Git: check_mk: Livestatus proxy seems to work

by Mathias Kettner

Module: check_mk Branch: master Commit: 24aa11eb5401dce48a12e28f9cd5b70b41b3fd94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24aa11eb5401dc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 5 11:26:53 2013 +0200 Livestatus proxy seems to work --- doc/treasures/liveproxy/liveproxyd | 60 +++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index 4b2ac99..431debe 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -126,7 +126,7 @@ def initiate_connections(): def do_heartbeats(): now = time.time() for sitename, sitestate in g_sites.items(): - if sitestate["state"] != "starting": + if sitestate["channels"]: rate, timeout = sites[sitename]["heartbeat"] channel = sitestate["heartbeat"]["channel"] since = sitestate["heartbeat"]["since"] @@ -170,7 +170,7 @@ def send_heartbeat(sitename, sitestate): sitestate["heartbeat"]["channel"] = channel return True except Exception, e: - log("Cannot send heartbeat to channel %s/%d: %s" % (sitename, channel["socket"].filelo(), e)) + log("Cannot send heartbeat to channel %s/%d: %s" % (sitename, channel["socket"].fileno(), e)) channel["state"] = "error" @@ -197,7 +197,6 @@ def complete_connections(writable): channel["socket"].setblocking(1) # avoid signals from interrupting us log("Channel %s/%d successfully connected" % (sitename, channel["socket"].fileno())) channel["state"] = "ready" - sitestate["state"] = "ready" # at least one connection is up except Exception, e: log("Failed to connect channel %s/%d: %s" % (sitename, channel["socket"].fileno(), e)) channel["state"] = "error" @@ -254,20 +253,24 @@ def get_new_requests(readable): (client["socket"] in readable or client.get("nextrequest")): try: request = receive_request(sitename, client) - if request and not request.startswith("GET") and not request.startswith("COMMAND"): - log("Invalid request [%s] from client %s/%d" % ( - request.replace("\n", "\\n"), sitename, client["socket"].fileno())) + if not request: client["state"] = "closed" - elif request and not request.startswith("COMMAND") and "ResponseHeader: fixed16\n" not in request: - respond_client_with_error(client, "Invalid request, you must specify ResponseHeader: fixed16.") - elif request: - client["state"] = "wait_for_channel" - client["since"] = time.time() - client["request"] = request - # log("Get new request from %s/%d (%d bytes)" % - # (sitename, client["socket"].fileno(), len(request))) else: - client["state"] = "closed" + if sitestate["state"] == "starting": + respond_client_with_error(client, "Site is currently not reachable.") + elif not request.startswith("GET") and not request.startswith("COMMAND"): + log("Invalid request [%s] from client %s/%d" % ( + request.replace("\n", "\\n"), sitename, client["socket"].fileno())) + client["state"] = "closed" + elif not request.startswith("COMMAND") and "ResponseHeader: fixed16\n" not in request: + respond_client_with_error(client, + "Invalid request, you must specify ResponseHeader: fixed16.") + else: + client["state"] = "wait_for_channel" + client["since"] = time.time() + client["request"] = request + # log("Get new request from %s/%d (%d bytes)" % + # (sitename, client["socket"].fileno(), len(request))) except Exception, e: if opt_debug: raise @@ -276,7 +279,7 @@ def get_new_requests(readable): def distribute_requests(): for sitename, sitestate in g_sites.items(): - if sitestate["state"] == "busy": + if sitestate["state"] != "ready": continue waiting_clients = [ client for client in sitestate["clients"] if client["state"] == "wait_for_channel"] @@ -328,11 +331,13 @@ def respond_client_with_error(client, message): except socket.error, e: if e.errno == 4: continue # Interrupted system call + else: + raise except Exception, e: if opt_debug: raise - log("Cannot send error message to client %s/%d: %s" % ( - sitename, client["socket"].fileno(), e)) + log("Cannot send error message to client %d: %s" % ( + client["socket"].fileno(), e)) client["state"] = "closed" if client.get("channel"): @@ -474,8 +479,10 @@ def receive_heartbeat(sitename, channel): sitename, channel["socket"].fileno(), chunk)) disconnect_from_site(sitename) else: - # log("Channel %s/%d: received valid heartbeat" % ( - # sitename, channel["socket"].fileno())) + # Set site to ready if at least one other channel exists + if len(sitestate["channels"]) > 1: + sitestate["state"] = "ready" + sitestate["state"] = "ready" # at least one connection is up channel["state"] = "ready" sitestate["heartbeat"]["since"] = time.time() sitestate["heartbeat"]["channel"] = None @@ -542,7 +549,7 @@ def garbage_collect_sockets(): if channel["state"] not in [ "error", "closed" ]] def format_time(t): - return "%s (%d secs ago)" % ( + return "%s (%3d secs ago)" % ( time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(t)), time.time() - t) @@ -559,14 +566,16 @@ def dump_state(): sf.write(" Last failed connect: %s\n" % format_time(sitestate["last_failed_connect"])) sf.write(" Channels:\n") for channel in sitestate["channels"]: - sf.write(" %d - %s, client: %s\n" % + sf.write(" %3d - %-18s- client: %4s - since: %s\n" % (channel["socket"].fileno(), channel["state"], - channel.get("client") and channel["client"]["socket"].fileno() or "none")) + channel.get("client") and channel["client"]["socket"].fileno() or "none", + format_time(channel["since"]))) sf.write(" Clients:\n") for client in sitestate["clients"]: - sf.write(" %d - %s, channel: %s\n" % + sf.write(" %3d - %-18s- channel: %4s - since: %s\n" % (client["socket"].fileno(), client["state"], - client.get("channel") and client["channel"]["socket"].fileno() or "none")) + client.get("channel") and client["channel"]["socket"].fileno() or "none", + format_time(client["since"]))) sf.write(" Heartbeat:\n") hb = sitestate["heartbeat"] @@ -814,6 +823,7 @@ try: signal.signal(15, signal_handler) # TERM signal.signal(10, signal_handler) # USR1 signal.signal(12, signal_handler) # USR2 + signal.signal(13, signal.SIG_IGN) # PIPE # Now let's go... liveproxyd_run()

11 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits