Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64655 discussions

Check_MK Git: check_mk: decru_datafort: minor cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 6df18597a1721efb5d55f2ec8d7841a613586d3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6df18597a1721e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 24 10:46:13 2014 +0200 decru_datafort: minor cleanup --- checks/decru_fans | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/checks/decru_fans b/checks/decru_fans index 9f14dd2..695fd8a 100644 --- a/checks/decru_fans +++ b/checks/decru_fans @@ -27,18 +27,18 @@ decru_fan_default_levels = (8000, 8400) def inventory_decru_fans(info): - return [ (l[0], l[1] + " RPM", "decru_fan_default_levels") for l in info ] + return [ (l[0], "decru_fan_default_levels") for l in info ] def check_decru_fans(item, params, info): - for fan in info: - if fan[0] == item: - rpm = int(fan[1]) + for fan_name, rpm in info: + if fan_name == item: + rpm = int(rpm) crit, warn = params - perfdata = [("rpm", rpm, 0, "", warn, crit)] + perfdata = [("rpm", rpm, 0, None, warn, crit)] infotxt = "%d RPM" % rpm - if rpm < crit: + if rpm <= crit: return (2, infotxt, perfdata) - elif rpm < warn: + elif rpm <= warn: return (1, infotxt, perfdata) else: return (0, infotxt, perfdata)

10 years

Check_MK Git: check_mk: Minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 653967167353b929855683898b4c048a547f1368 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=653967167353b9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 24 10:37:06 2014 +0200 Minor code cleanup --- checks/vxvm_enclosures | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/vxvm_enclosures b/checks/vxvm_enclosures index 236a87f..862a9fa 100644 --- a/checks/vxvm_enclosures +++ b/checks/vxvm_enclosures @@ -25,8 +25,8 @@ # Boston, MA 02110-1301 USA. # Example output: -#<<<vxvm_enclosures>>> -#LIO-Sechs aluadisk ALUAdisk CONNECTED ALUA 3 +# <<<vxvm_enclosures>>> +# LIO-Sechs aluadisk ALUAdisk CONNECTED ALUA 3 def check_vxvm_enclosures(item, params, info): for line in info:

10 years

Check_MK Git: check_mk: Minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 704ff30a05b24f92de62a50f147da163cb768c97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=704ff30a05b24f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 23 16:05:14 2014 +0200 Minor code cleanup --- checks/snmp_uptime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/snmp_uptime b/checks/snmp_uptime index 3396b56..8cc9ddb 100644 --- a/checks/snmp_uptime +++ b/checks/snmp_uptime @@ -24,12 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Author: Lars Michelsen <lm(a)mathias-kettner.de> def inventory_snmp_uptime(info): if len(info) > 0 and len(info[0]) >= 1: return [ (None, {}) ] + def check_snmp_uptime(checktype, params, info): ticks = info[0][0] try:

10 years

Check_MK Git: check_mk: Fix exception in comment-icon

by Mathias Kettner

Module: check_mk Branch: master Commit: 103f24482a07cc20dd12ebc429fb9feb8c756189 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=103f24482a07cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 23 15:58:34 2014 +0200 Fix exception in comment-icon --- web/htdocs/views.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 64be415..d264da8 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1327,10 +1327,12 @@ def view_options(viewname): # variables for each option. if config.may("general.painter_options"): for option_name, opt in multisite_painter_options.items(): - old_value = v.get(option_name) - var_prefix = 'po_' + option_name + have_old_value = option_name in v + if have_old_value: + old_value = v.get(option_name) # Are there settings for this painter option present? + var_prefix = 'po_' + option_name if html.has_var_prefix(var_prefix): # Get new value for the option from the value spec @@ -1340,11 +1342,13 @@ def view_options(viewname): v[option_name] = value opt['value'] = value # make globally present for painters - if v[option_name] != old_value: + if not have_old_value or v[option_name] != old_value: must_save = True - else: + elif have_old_value: opt['value'] = old_value # make globally present for painters + elif 'value' in opt: + del opt['value'] # If the user has no permission for changing painter options # (or has *lost* his permission) then we need to remove all @@ -2376,7 +2380,8 @@ def get_painter_option(name): opt = multisite_painter_options[name] if not config.may("general.painter_options"): return opt['valuespec'].default_value() - return opt.get("value", opt['valuespec'].default_value()) + else: + return opt.get("value", opt['valuespec'].default_value()) def get_host_tags(row): if type(row.get("host_custom_variables")) == dict:

10 years

Check_MK Git: check_mk: bluecat_dhcp: fixed invalid reference in check function

by Andreas Boesl

Module: check_mk Branch: master Commit: 6f0f4e5f5c51e9cf5f335a76b68f2184de03b536 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f0f4e5f5c51e9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 23 14:36:53 2014 +0200 bluecat_dhcp: fixed invalid reference in check function --- checks/bluecat_dhcp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/bluecat_dhcp b/checks/bluecat_dhcp index ff677d8..9093536 100644 --- a/checks/bluecat_dhcp +++ b/checks/bluecat_dhcp @@ -45,7 +45,7 @@ def check_bluecat_dhcp(item, params, info): state = 0 for line in info: - oper_state, leases_sec = map(int, info[0]) + oper_state, leases_sec = map(int, line[0]) if oper_state in params['oper_states']['warning']: state = 1 elif oper_state in params['oper_states']['critical']:

10 years

Check_MK Git: check_mk: esx_vsphere_licenses: fixed default parameters

by Andreas Boesl

Module: check_mk Branch: master Commit: e2cf84a9a24c50dfac751447eb4102d40cdbf787 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2cf84a9a24c50… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 23 13:32:10 2014 +0200 esx_vsphere_licenses: fixed default parameters --- checks/esx_vsphere_licenses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/esx_vsphere_licenses b/checks/esx_vsphere_licenses index 1f116dd..5fbb918 100644 --- a/checks/esx_vsphere_licenses +++ b/checks/esx_vsphere_licenses @@ -31,7 +31,7 @@ #vCenter Server 5 Standard 1 1 def inventory_esx_vsphere_licenses(info): - return [ (line[0], {}) for line in info ] + return [ (line[0], None) for line in info ] def check_esx_vsphere_licenses(item, params, info): if params == None:

10 years

Check_MK Git: check_mk: #1118 bluecat_dns, bluecat_dhcp: no able to run as clustered checks

by Andreas Boesl

Module: check_mk Branch: master Commit: 8fac15f4b8181ed864496dea712f20397a5bf5e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fac15f4b8181e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 23 13:25:00 2014 +0200 #1118 bluecat_dns, bluecat_dhcp: no able to run as clustered checks Both checks can now be configured as clustered services. If either of the cluster nodes is in OK state, the check will report OK. --- .werks/1118 | 11 +++++++++++ ChangeLog | 1 + checks/bluecat_dhcp | 18 ++++++++++++------ checks/bluecat_dns | 17 +++++++++++------ 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/.werks/1118 b/.werks/1118 new file mode 100644 index 0000000..9877b90 --- /dev/null +++ b/.werks/1118 @@ -0,0 +1,11 @@ +Title: bluecat_dns, bluecat_dhcp: no able to run as clustered checks +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1411471414 +Class: feature + +Both checks can now be configured as clustered services. +If either of the cluster nodes is in OK state, the check will report OK. + diff --git a/ChangeLog b/ChangeLog index 657b134..952de45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 1403 kernel.util: allow levels for the total CPU utilization... NOTE: Please refer to the migration notes! * 1117 agent_vsphere: now able to query license information from esx system... + * 1118 bluecat_dns, bluecat_dhcp: no able to run as clustered checks... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checks/bluecat_dhcp b/checks/bluecat_dhcp index e92a589..ff677d8 100644 --- a/checks/bluecat_dhcp +++ b/checks/bluecat_dhcp @@ -35,23 +35,29 @@ def inventory_bluecat_dhcp(info): return [(None, None)] def check_bluecat_dhcp(item, params, info): - oper_state, leases_sec = map(int, info[0]) oper_states = { 1 : "running normally", 2 : "not running", 3 : "currently starting", 4 : "currently stopping", 5 : "fault" - } + state = 0 - if oper_state in params['oper_states']['warning']: - state = 1 - elif oper_state in params['oper_states']['critical']: - state = 2 + for line in info: + oper_state, leases_sec = map(int, info[0]) + if oper_state in params['oper_states']['warning']: + state = 1 + elif oper_state in params['oper_states']['critical']: + state = 2 + else: + state = 0 + break + yield state, "DHCP is %s" % oper_states[oper_state] yield 0, '%s Leases per second' % leases_sec, [ ('leases', leases_sec ) ] + check_info["bluecat_dhcp"] = { "check_function" : check_bluecat_dhcp, "inventory_function" : inventory_bluecat_dhcp, diff --git a/checks/bluecat_dns b/checks/bluecat_dns index 4ec1948..4515454 100644 --- a/checks/bluecat_dns +++ b/checks/bluecat_dns @@ -35,20 +35,25 @@ def inventory_bluecat_dns(info): return [(None, None)] def check_bluecat_dns(item, params, info): - oper_state = int(info[0][0]) oper_states = { 1 : "running normally", 2 : "not running", 3 : "currently starting", 4 : "currently stopping", 5 : "fault" - } + state = 0 - if oper_state in params['oper_states']['warning']: - state = 1 - elif oper_state in params['oper_states']['critical']: - state = 2 + for line in info: + oper_state = int(line[0]) + if oper_state in params['oper_states']['warning']: + state = 1 + elif oper_state in params['oper_states']['critical']: + state = 2 + else: + state = 0 + break + yield state, "DNS is %s" % oper_states[oper_state] check_info["bluecat_dns"] = {

10 years

Check_MK Git: check_mk: Code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 30ea83eb9fe36e4acb87ef719f6eb3aed6bd5a1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30ea83eb9fe36e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 23 12:27:13 2014 +0200 Code cleanup --- checks/df.include | 2 +- checks/viprinet_temp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/df.include b/checks/df.include index 629b537..fe9eebf 100644 --- a/checks/df.include +++ b/checks/df.include @@ -483,7 +483,7 @@ def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, inodes_t problems.append("less than %0.2f%% inodes available(!!)" % inodes_crit) elif inodes_warn > inodes_avail_perc: status = max(1, status) - problems.append("less than %.02f%% inodes available(!!)" % inodes_warn) + problems.append("less than %.02f%% inodes available(!)" % inodes_warn) infotext += ", inodes available %dk/%0.2f %%" % (inodes_avail / 1000, inodes_avail_perc) if problems: diff --git a/checks/viprinet_temp b/checks/viprinet_temp index 85c380a..5042be5 100644 --- a/checks/viprinet_temp +++ b/checks/viprinet_temp @@ -34,10 +34,10 @@ def check_viprinet_temp(item, params, info): if params: warn, crit = params if value > crit: - state_info = "((!!) at %d°C)" % crit + state_info = "(crit at %d°C)" % crit state = 2 elif value > warn: - state_info = "((!) at %d°C)" % warn + state_info = "(warn at %d°C)" % warn state = 1 infotext = "%s: %s°C %s" % (item, value, state_info)

10 years

Check_MK Git: check_mk: Update livestat.py in API to newest version

by Mathias Kettner

Module: check_mk Branch: master Commit: 35b4945747c16d34ac68b8362dc17719198ce755 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35b4945747c16d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 23 11:09:35 2014 +0200 Update livestat.py in API to newest version --- livestatus/api/python/example.py | 2 +- livestatus/api/python/livestatus.py | 102 +++++++++++++++++++++++++---------- 2 files changed, 74 insertions(+), 30 deletions(-) diff --git a/livestatus/api/python/example.py b/livestatus/api/python/example.py index bfd8f30..5982f88 100755 --- a/livestatus/api/python/example.py +++ b/livestatus/api/python/example.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import os +import os, sys import livestatus try: diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index d73f584..cc67c40 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import socket, time +import socket, time, re # Python 2.3 does not have 'set' in normal namespace. # But it can be imported from 'sets' @@ -52,6 +52,9 @@ r2 = conn.query_row("GET status") # Keep a global array of persistant connections persistent_connections = {} +# Regular expression for removing Cache: headers if caching is not allowed +remove_cache_regex = re.compile("\nCache:[^\n]*") + # DEBUGGING PERSISTENT CONNECTIONS # import os # hirn_debug = file("/tmp/live.log", "a") @@ -160,10 +163,11 @@ class Helpers: class BaseConnection: - def __init__(self, socketurl, persist = False): + def __init__(self, socketurl, persist = False, allow_cache = False): """Create a new connection to a MK Livestatus socket""" self.add_headers = "" self.persist = persist + self.allow_cache = allow_cache self.socketurl = socketurl self.socket = None self.timeout = None @@ -185,7 +189,7 @@ class BaseConnection: self.socket = persistent_connections[self.socketurl] self.successful_persistence = True return - + self.successful_persistence = False # Create new socket @@ -194,7 +198,7 @@ class BaseConnection: parts = url.split(":") if parts[0] == "unix": if len(parts) != 2: - raise MKLivestatusConfigError("Invalid livestatus unix url: %s. " + raise MKLivestatusConfigError("Invalid livestatus unix URL: %s. " "Correct example is 'unix:/var/run/nagios/rw/live'" % url) self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) target = parts[1] @@ -204,21 +208,37 @@ class BaseConnection: host = parts[1] port = int(parts[2]) except: - raise MKLivestatusConfigError("Invalid livestatus tcp url '%s'. " + raise MKLivestatusConfigError("Invalid livestatus tcp URL '%s'. " "Correct example is 'tcp:somehost:6557'" % url) self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) target = (host, port) else: - raise MKLivestatusConfigError("Invalid livestatus url '%s'. " + raise MKLivestatusConfigError("Invalid livestatus URL '%s'. " "Must begin with 'tcp:' or 'unix:'" % url) - try: - if self.timeout: - self.socket.settimeout(float(self.timeout)) - self.socket.connect(target) - except Exception, e: - self.socket = None - raise MKLivestatusSocketError("Cannot connect to '%s': %s" % (self.socketurl, e)) + # If a timeout is set, then we retry after a failure with mild + # a binary backoff. + if self.timeout: + before = time.time() + sleep_interval = 0.1 + + while True: + try: + if self.timeout: + self.socket.settimeout(float(sleep_interval)) + self.socket.connect(target) + break + except Exception, e: + if self.timeout: + time_left = self.timeout - (time.time() - before) + # only try again, if there is substantial time left + if time_left > sleep_interval: + time.sleep(sleep_interval) + sleep_interval *= 1.5 + continue + + self.socket = None + raise MKLivestatusSocketError("Cannot connect to '%s': %s" % (self.socketurl, e)) if self.persist: persistent_connections[self.socketurl] = self.socket @@ -230,6 +250,8 @@ class BaseConnection: def receive_data(self, size): result = "" + # Timeout is only honored when connecting + self.socket.settimeout(None) while size > 0: packet = self.socket.recv(size) if len(packet) == 0: @@ -242,7 +264,10 @@ class BaseConnection: self.send_query(query, add_headers) return self.recv_response(query, add_headers) - def send_query(self, query, add_headers = ""): + def send_query(self, query, add_headers = "", do_reconnect=True): + if not self.allow_cache: + query = remove_cache_regex.sub("", query) + orig_query = query if self.socket == None: self.connect() if not query.endswith("\n"): @@ -250,23 +275,36 @@ class BaseConnection: query += self.auth_header + self.add_headers query += "Localtime: %d\nOutputFormat: python\nKeepAlive: on\nResponseHeader: fixed16\n" % int(time.time()) query += add_headers + if not query.endswith("\n"): query += "\n" query += "\n" try: + # socket.send() will implicitely cast to str(), we need ot + # convert to UTF-8 in order to avoid exceptions + if type(query) == unicode: + query = query.encode("utf-8") self.socket.send(query) except IOError, e: if self.persist: del persistent_connections[self.socketurl] self.successful_persistence = False self.socket = None - raise MKLivestatusSocketError(str(e)) + + if do_reconnect: + # Automatically try to reconnect in case of an error, but + # only once. + self.connect() + self.send_query(orig_query, add_headers, False) + return + + raise MKLivestatusSocketError("RC1:" + str(e)) # Reads a response from the livestatus socket. If the socket is closed # by the livestatus server, we automatically make a reconnect and send # the query again (once). This is due to timeouts during keepalive. - def recv_response(self, query = None, add_headers = ""): + def recv_response(self, query = None, add_headers = "", timeout_at = None): try: resp = self.receive_data(16) code = resp[0:3] @@ -282,20 +320,26 @@ class BaseConnection: raise MKLivestatusSocketError("Malformed output") else: raise MKLivestatusQueryError(code, data.strip()) - except MKLivestatusSocketClosed: + + # In case of an IO error or the other side having + # closed the socket do a reconnect and try again, but + # only once + except (MKLivestatusSocketClosed, IOError), e: self.disconnect() - if query: + now = time.time() + if query and (not timeout_at or timeout_at > now): + if timeout_at == None: + timeout_at = now + self.timeout + time.sleep(0.1) self.connect() self.send_query(query, add_headers) - return self.recv_response() # do not send query again -> danger of infinite loop + return self.recv_response(query, add_headers, timeout_at) # do not send query again -> danger of infinite loop else: - raise + raise MKLivestatusSocketError(str(e)) + + except Exception, e: + raise MKLivestatusSocketError("Unhandled exception: %s" % e) - except IOError, e: - self.socket = None - if self.persist: - del persistent_connections[self.socketurl] - raise MKLivestatusSocketError(str(e)) def do_command(self, command): if self.socket == None: @@ -312,8 +356,8 @@ class BaseConnection: class SingleSiteConnection(BaseConnection, Helpers): - def __init__(self, socketurl, persist = False): - BaseConnection.__init__(self, socketurl, persist) + def __init__(self, socketurl, persist = False, allow_cache = False): + BaseConnection.__init__(self, socketurl, persist, allow_cache) self.prepend_site = False self.auth_users = {} self.deadsites = {} # never filled, just for compatibility @@ -377,7 +421,7 @@ class MultiSiteConnection(Helpers): try: url = site["socket"] persist = not temporary and site.get("persist", False) - connection = SingleSiteConnection(url, persist) + connection = SingleSiteConnection(url, persist, allow_cache=site.get("cache", False)) if "timeout" in site: connection.set_timeout(int(site["timeout"])) connection.connect() @@ -628,7 +672,7 @@ class MultiSiteConnection(Helpers): # Return connection to localhost (UNIX), if available def local_connection(self): for sitename, site, connection in self.connections: - if site["socket"].startswith("unix:"): + if site["socket"].startswith("unix:") and "liveproxy" not in site["socket"]: return connection raise MKLivestatusConfigError("No livestatus connection to local host")

10 years

Check_MK Git: check_mk: userdb: avoid warning in Apache log about globals

by Mathias Kettner

Module: check_mk Branch: master Commit: 6be42230daaa560e21545515a5d4d5df4daf7002 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6be42230daaa56… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 23 11:05:06 2014 +0200 userdb: avoid warning in Apache log about globals --- web/htdocs/userdb.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 80c8d3f..9ab3306 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -38,6 +38,9 @@ builtin_user_attribute_names = [] # Load all userdb plugins def load_plugins(): + global user_attributes + global multisite_user_connectors + # Do not cache the custom user attributes. They can be created by the user # during runtime, means they need to be loaded during each page request. # But delete the old definitions before to also apply removals of attributes @@ -52,8 +55,8 @@ def load_plugins(): return # declare & initialize global vars - global user_attributes ; user_attributes = {} - global multisite_user_connectors ; multisite_user_connectors = [] + user_attributes = {} + multisite_user_connectors = [] load_web_plugins("userdb", globals())

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits