Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

mssql_transactionlogs: fixed display of allocated size graph and default limits

by Sebastian Herbord

Module: check_mk Branch: master Commit: 53e92f0b58de88e7291b7ecb33f8ae56030886c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53e92f0b58de88… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Feb 23 08:59:53 2016 +0100 mssql_transactionlogs: fixed display of allocated size graph and default limits --- checks/mssql_transactionlogs | 2 +- web/plugins/metrics/check_mk.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/checks/mssql_transactionlogs b/checks/mssql_transactionlogs index 62c7469..7684e71 100644 --- a/checks/mssql_transactionlogs +++ b/checks/mssql_transactionlogs @@ -30,7 +30,7 @@ factory_settings['mssql_transactionlogs_default_levels'] = { - 'used_levels' : (80, 90), + 'used_levels' : (80.0, 90.0), } diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index d4876f4..cf60440 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -413,6 +413,12 @@ metric_info["unused_size"] = { "color" : "46/a", } +metric_info["allocated_size"] = { + "title" : _("Allocated space"), + "unit" : "bytes", + "color" : "42/a" +} + metric_info["tablespace_size"] = { "title" : _("Tablespace size"), "unit" : "bytes",

8 years, 4 months

Fixed spelling of HTTP in Graphing

by Mathias Kettner

Module: check_mk Branch: master Commit: a27dc5dfaad2680b3eb83f3c55d263b860de5b0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a27dc5dfaad268… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 22 15:27:18 2016 +0100 Fixed spelling of HTTP in Graphing --- web/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 762bc78..d4876f4 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2596,7 +2596,7 @@ metric_info["apache_state_keep_alive"] = { } metric_info["http_bandwidth"] = { - "title" : _("Http bandwidth"), + "title" : _("HTTP bandwidth"), "unit" : "bytes/s", "color" : "53/b", }

8 years, 4 months

#3080 FIX windows_updates: non-ascii characters are now handled correctly

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8bec27086d8961097655ecc8ce0e71aa98237308 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bec27086d8961… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Feb 19 15:58:06 2016 +0100 #3080 FIX windows_updates: non-ascii characters are now handled correctly --- .werks/3080 | 10 ++++++++++ ChangeLog | 1 + agents/windows/plugins/windows_updates.vbs | 26 +++++++++++++++++--------- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.werks/3080 b/.werks/3080 new file mode 100644 index 0000000..941ea77 --- /dev/null +++ b/.werks/3080 @@ -0,0 +1,10 @@ +Title: windows_updates: non-ascii characters are now handled correctly +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455893821 + + diff --git a/ChangeLog b/ChangeLog index cf484f9..25e6ecc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * 3226 FIX: isc_dhcpd: Fixed exception during discovery when pools can not be gathered by agent * 3189 FIX: mem.vmalloc: newer kernel versions (64bit) report wrong data, i.d. both VmallocUsed and Chunk equal zero, thus this check is obsolete * 3079 FIX: win_printers: fixed typo that kept default parameters from being used... + * 3080 FIX: windows_updates: non-ascii characters are now handled correctly * 3227 FIX: Automatic service adding: Fixed exception when using time range to skip automatic configuration... * 3178 FIX: docsis_channels_upstream: Fixed crash in graphs * 3082 FIX: windows agent: with realtime updates active, shutting down the agent could take very long diff --git a/agents/windows/plugins/windows_updates.vbs b/agents/windows/plugins/windows_updates.vbs index 61fc354..c570b7a 100644 --- a/agents/windows/plugins/windows_updates.vbs +++ b/agents/windows/plugins/windows_updates.vbs @@ -22,6 +22,13 @@ Option Explicit +Dim fso +Dim objStdout +Set fso = CreateObject("Scripting.FileSystemObject") +' request unicode stdout and add a bom so the agent knows we send utf-16 +Set objStdout = fso.GetStandardStream(1, True) +objStdout.Write(chrW(&HFEFF)) + function readFromRegistry (strRegistryKey, strDefault ) Dim WSHShell, value @@ -48,8 +55,9 @@ Set WSHShell = CreateObject("WScript.Shell") Dim RebootTime Dim RegPath + If CreateObject("Microsoft.Update.AutoUpdate").DetectNow <> 0 Then - WScript.Echo "<<<windows_updates>>>" + objStdout.WriteLine "<<<windows_updates>>>" WScript.Quit() End If @@ -71,9 +79,9 @@ On Error Resume Next Set result = updtSearcher.Search("IsInstalled = 0 and IsHidden = 0") If Err.Number <> 0 then - WScript.Echo "<<<windows_updates>>>" - Wscript.Echo "x x x" - Wscript.Echo "There was an error getting update information. Maybe Windows update is not activated. Error Number: " & Err.Number + objStdout.WriteLine "<<<windows_updates>>>" + objStdout.WriteLine "x x x" + objStdout.WriteLine "There was an error getting update information. Maybe Windows update is not activated. Error Number: " & Err.Number WScript.Quit() End If @@ -99,9 +107,9 @@ For Each objEntry in colDownloads Next -WScript.Echo "<<<windows_updates>>>" -WScript.Echo reboot & " " & numImp & " " & numOpt -WScript.Echo important -WScript.Echo opti -WScript.Echo RebootTime +objStdout.WriteLine "<<<windows_updates>>>" +objStdout.WriteLine reboot & " " & numImp & " " & numOpt +objStdout.WriteLine important +objStdout.WriteLine opti +objStdout.WriteLine RebootTime WScript.Quit()

8 years, 4 months

#3082 FIX windows agent: with realtime updates active, shutting down the agent could take very long

by Sebastian Herbord

Module: check_mk Branch: master Commit: 9c29149661d59b491d97d7f7d539b0f6108bc33e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c29149661d59b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 22 13:46:35 2016 +0100 #3082 FIX windows agent: with realtime updates active, shutting down the agent could take very long --- .werks/3082 | 10 ++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 909824 -> 909824 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 909824 -> 909824 bytes agents/windows/check_mk_agent.cc | 7 +++++-- agents/windows/check_mk_agent.exe | Bin 835584 -> 835584 bytes agents/windows/check_mk_agent.msi | Bin 2006016 -> 2006016 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 835584 -> 835584 bytes agents/windows/install_agent-64.exe | Bin 418357 -> 418319 bytes agents/windows/install_agent.exe | Bin 408679 -> 408689 bytes 11 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/3082 b/.werks/3082 new file mode 100644 index 0000000..b8f7880 --- /dev/null +++ b/.werks/3082 @@ -0,0 +1,10 @@ +Title: windows agent: with realtime updates active, shutting down the agent could take very long +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456145003 + + diff --git a/ChangeLog b/ChangeLog index 5fcc6ee..cf484f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 3079 FIX: win_printers: fixed typo that kept default parameters from being used... * 3227 FIX: Automatic service adding: Fixed exception when using time range to skip automatic configuration... * 3178 FIX: docsis_channels_upstream: Fixed crash in graphs + * 3082 FIX: windows agent: with realtime updates active, shutting down the agent could take very long Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/build_version b/agents/windows/build_version index b0077c6..7776e09 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1351 +1358 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index b2c0c4a..100123c 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 411cd10..1a8714e 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 4384615..c654791 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3141,7 +3141,7 @@ DWORD WINAPI realtime_check_func(void *data_in) { MutexLock guard(data->mutex); // adhere to the configured timeout - if (time(NULL) < data->push_until) { + if ((time(NULL) < data->push_until) && !data->terminate) { // if a new request was made, reestablish the connection if (data->new_request) { data->new_request = false; @@ -3325,12 +3325,15 @@ void do_adhoc(const Environment &env) { if (realtime_checker.wasStarted()) { thread_data.terminate = true; + } + + stop_threads(); + if (realtime_checker.wasStarted()) { int res = realtime_checker.join(); crash_log("realtime check thread ended with errror code %d.", res); } - stop_threads(); WSACleanup(); close_crash_log(); } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 70e33d6..77800b6 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 89b8f9d..994de6b 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index f13645f..e1f7237 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 6fc9446..cc4cff8 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 932cdfb..af99acc 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 4 months

#3178 FIX docsis_channels_upstream: Fixed crash in graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: bd9be0e6aab037027f0e6e789168e28183dd507c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd9be0e6aab037… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 22 12:19:43 2016 +0100 #3178 FIX docsis_channels_upstream: Fixed crash in graphs --- .werks/3178 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3178 b/.werks/3178 new file mode 100644 index 0000000..4027328 --- /dev/null +++ b/.werks/3178 @@ -0,0 +1,10 @@ +Title: docsis_channels_upstream: Fixed crash in graphs +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456139925 + + diff --git a/ChangeLog b/ChangeLog index 438bda7..5fcc6ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * 3189 FIX: mem.vmalloc: newer kernel versions (64bit) report wrong data, i.d. both VmallocUsed and Chunk equal zero, thus this check is obsolete * 3079 FIX: win_printers: fixed typo that kept default parameters from being used... * 3227 FIX: Automatic service adding: Fixed exception when using time range to skip automatic configuration... + * 3178 FIX: docsis_channels_upstream: Fixed crash in graphs Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 2d6175d..762bc78 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1317,13 +1317,13 @@ metric_info["noise_floor"] = { metric_info["codewords_corrected"] = { "title" : _("Corrected codewords"), - "unit" : "ratio", + "unit" : "%", "color" : "#ff8040", } metric_info["codewords_uncorrectable"] = { "title" : _("Uncorrectable codewords"), - "unit" : "ratio", + "unit" : "%", "color" : "#ff4020", }

8 years, 4 months

brought jolokia special agent in sync with features of plugin

by Sebastian Herbord

Module: check_mk Branch: master Commit: 4da25e5ad433651f8f3f485c06fd76f23500efa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4da25e5ad43365… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 22 11:51:55 2016 +0100 brought jolokia special agent in sync with features of plugin unfortunately, due to our policy to not allow files to be referenced from wato, the options to set a CA-file or client certificates can't be used with the special agent at this time. --- agents/special/agent_jolokia | 156 ++++++++++++++++++++++--------- checks/agent_jolokia | 2 +- web/plugins/wato/datasource_programs.py | 9 ++ 3 files changed, 124 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4da25e5ad4…

8 years, 4 months

#3081 mk_jolokia: plugin now supports setting custom CAs for verifying server certificate as well as sending a client certificate

by Sebastian Herbord

Module: check_mk Branch: master Commit: 00af5a219e7136f38b3b765cd5f6387e1cca58bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00af5a219e7136… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 22 11:44:44 2016 +0100 #3081 mk_jolokia: plugin now supports setting custom CAs for verifying server certificate as well as sending a client certificate The CA can be set through the new configuration parameter "cert_path". This can also be set to None, in which case the server certificate is not verified. If cert_path is not set, the behaviour is identical to the old behaviour which is dependent on the python version. Old python versions (not sure exactly, probably up to at least 2.5) ignored server certificates, later versions checked against system-wide trusted CAs. To send a client certificate, set "client_cert" and "client_key". The key can't be password protected. "mode" also supports a new option called "https". If this is set, the client certificate parameters need to be set and no further authentication should be expected by the server. --- .werks/3081 | 19 +++++++ ChangeLog | 1 + agents/plugins/mk_jolokia | 124 ++++++++++++++++++++++++++++++++++----------- 3 files changed, 115 insertions(+), 29 deletions(-) diff --git a/.werks/3081 b/.werks/3081 new file mode 100644 index 0000000..6a7cd61 --- /dev/null +++ b/.werks/3081 @@ -0,0 +1,19 @@ +Title: mk_jolokia: plugin now supports setting custom CAs for verifying server certificate as well as sending a client certificate +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1456137267 +Class: feature + +The CA can be set through the new configuration parameter "cert_path". This can also be set to None, +in which case the server certificate is not verified. +If cert_path is not set, the behaviour is identical to the old behaviour which is dependent on the +python version. Old python versions (not sure exactly, probably up to at least 2.5) ignored server +certificates, later versions checked against system-wide trusted CAs. + +To send a client certificate, set "client_cert" and "client_key". The key can't be password +protected. + +"mode" also supports a new option called "https". If this is set, the client certificate parameters +need to be set and no further authentication should be expected by the server. diff --git a/ChangeLog b/ChangeLog index f2aa51c..438bda7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 2995 esx_vsphere_licenses: now compatible with esx 6.0... * 2996 websphere_mq_queues: now able to configure levels for used percentage of total queues * 3190 entity_sensors, entity_sensors.fan: new checks monitoring temperature and fan sensors of devices such as Palo Alto Networks which support the ENTITY-SENSORS-MIB + * 3081 mk_jolokia: plugin now supports setting custom CAs for verifying server certificate as well as sending a client certificate... * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index d90a7f0..451f588 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -24,7 +24,16 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import urllib2, sys, os, socket, pprint, base64 +import urllib2, sys, os, socket, pprint, base64, ssl +from httplib import HTTPConnection, HTTPSConnection + +try: + from simplejson import json +except ImportError: + try: + import json + except ImportError: + json = None opt_verbose = '--verbose' in sys.argv opt_debug = '--debug' in sys.argv @@ -48,34 +57,72 @@ class PreemptiveBasicAuthHandler(urllib2.HTTPBasicAuthHandler): https_request = http_request -def fetch_var(protocol, server, port, path, suburi, itemspec): +class HTTPSValidatingConnection(HTTPSConnection): + def __init__(self, host, ca_file, key_file, cert_file): + HTTPSConnection.__init__(self, host, key_file=key_file, cert_file=cert_file) + self.__ca_file = ca_file + self.__key_file = key_file + self.__cert_file = cert_file + + def connect(self): + HTTPConnection.connect(self) + if self.__ca_file: + self.sock = ssl.wrap_socket(self.sock, keyfile=self.key_file, certfile=self.cert_file, + ca_certs=self.__ca_file, cert_reqs=ssl.CERT_REQUIRED) + else: + self.sock = ssl.wrap_socket(self.sock, keyfile=self.key_file, certfile=self.cert_file, + ca_certs=self.__ca_file, cert_reqs=ssl.CERT_NONE) + + +class HTTPSAuthHandler(urllib2.HTTPSHandler): + def __init__(self, ca_file, key, cert): + urllib2.HTTPSHandler.__init__(self) + self.__ca_file = ca_file + self.__key = key + self.__cert = cert + + def https_open(self, req): + # do_open expects a class as the first parameter but getConnection will act + # as a facotry function + return self.do_open(self.getConnection, req) + + def getConnection(self, host, timeout): + return HTTPSValidatingConnection(host, ca_file=self.__ca_file, + key_file=self.__key, cert_file=self.__cert) + + +def fetch_var(protocol, server, port, path, suburi, cert_path, itemspec): url = "%s://%s:%d/%s/%s" % (protocol, server, port, suburi, path) if opt_verbose: sys.stderr.write("DEBUG: Fetching: %s\n" % url) try: - json = urllib2.urlopen(url).read() + conn = urllib2.urlopen(url) + data = conn.read() + if opt_verbose: - sys.stderr.write("DEBUG: Result: %s\n\n" % json) + sys.stderr.write("DEBUG: Result: %s\n\n" % data) except Exception, e: if opt_debug: raise sys.stderr.write("ERROR: %s\n" % e) return [] - try: true = True false = False null = None - obj = eval(json) + if json: + obj = json.loads(data) + else: + obj = eval(data) except Exception, e: sys.stderr.write('ERROR: Invalid json code (%s)\n' % e) - sys.stderr.write(' Response %s\n' % json) + sys.stderr.write(' Response %s\n' % data) return [] if obj.get('status', 200) != 200: sys.stderr.write('ERROR: Invalid response when fetching url %s\n' % url) - sys.stderr.write(' Response: %s\n' % json) + sys.stderr.write(' Response: %s\n' % data) return [] # Only take the value of the object. If the value is an object @@ -140,24 +187,35 @@ def extract_item(key, itemspec): def query_instance(inst): # Prepare user/password authentication via HTTP Auth + password_mngr = urllib2.HTTPPasswordMgrWithDefaultRealm() if inst.get("password"): - password_mngr = urllib2.HTTPPasswordMgrWithDefaultRealm() password_mngr.add_password(None, "%s://%s:%d/" % (inst["protocol"], inst["server"], inst["port"]), inst["user"], inst["password"]) - if inst["mode"] == 'digest': - authhandler = urllib2.HTTPDigestAuthHandler(password_mngr) - elif inst["mode"] == "basic_preemptive": - authhandler = PreemptiveBasicAuthHandler(password_mngr) - elif inst["mode"] == "basic" and inst["protocol"] != "https": - authhandler = urllib2.HTTPBasicAuthHandler(password_mngr) - - opener = urllib2.build_opener(authhandler) + handlers = [] + if inst["protocol"] == "https": + if inst["mode"] == 'https' and (inst["client_key"] is None or + inst["client_cert"] is None): + sys.stdout.write('<<<jolokia_info>>>\n') + sys.stderr.write("ERROR: https set up as authentication method but certificate " + "wasn't provided\n") + return + handlers.append(HTTPSAuthHandler(inst["cert_path"], + inst["client_key"], inst["client_cert"])) + if inst["mode"] == 'digest': + handlers.append(urllib2.HTTPDigestAuthHandler(password_mngr)) + elif inst["mode"] == "basic_preemptive": + handlers.append(PreemptiveBasicAuthHandler(password_mngr)) + elif inst["mode"] == "basic" and inst["protocol"] != "https": + handlers.append(urllib2.HTTPBasicAuthHandler(password_mngr)) + + if handlers: + opener = urllib2.build_opener(*handlers) urllib2.install_opener(opener) # Determine type of server - server_info = fetch_var(inst["protocol"], inst["server"], inst["port"], "", inst["suburi"], "") - + server_info = fetch_var(inst["protocol"], inst["server"], inst["port"], "", inst["suburi"], + inst["cert_path"], "") sys.stdout.write('<<<jolokia_info>>>\n') if server_info: d = dict(server_info) @@ -177,7 +235,8 @@ def query_instance(inst): # Fetch the general information first for path, title, itemspec in global_vars + specific_vars.get(product, []): try: - values = fetch_var(inst["protocol"], inst["server"], inst["port"], "read/" + path, inst["suburi"], itemspec) + values = fetch_var(inst["protocol"], inst["server"], inst["port"], "read/" + path, + inst["suburi"], inst["cert_path"], itemspec) # In case of network errors skip this server except IOError: @@ -214,14 +273,17 @@ def query_instance(inst): # Default configuration for all instances -protocol = "http" -server = "localhost" -port = 8080 -user = "monitoring" -password = None -mode = "digest" -suburi = "jolokia" -instance = None +protocol = "http" +server = "localhost" +port = 8080 +user = "monitoring" +password = None +mode = "digest" +suburi = "jolokia" +instance = None +cert_path = "_default" +client_cert = None +client_key = None global_vars = [ ( "java.lang:type=Memory/NonHeapMemoryUsage/used", "NonHeapMemoryUsage", [] ), @@ -304,7 +366,11 @@ for inst in instances: ( "password", password ), ( "mode", mode ), ( "suburi", suburi ), - ( "instance", instance )]: + ( "instance", instance ), + ( "cert_path", cert_path ), + ( "client_cert", client_cert ), + ( "client_key", client_key ), + ]: if varname not in inst: inst[varname] = value if not inst["instance"]:

8 years, 4 months

Check_MK Metrics: omit child times if they are zero

by Mathias Kettner

Module: check_mk Branch: master Commit: a251a34e59e08141b0ba7060e1a893e8e1876c0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a251a34e59e081… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 22 11:37:20 2016 +0100 Check_MK Metrics: omit child times if they are zero --- web/plugins/metrics/check_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 48fc8c8..2d6175d 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4992,6 +4992,7 @@ graph_info.append({ ( "children_system_time", "stack" ), ( "user_time,children_user_time,system_time,children_system_time,+,+,+#888888", "line", _("Total") ), ], + "omit_zero_metrics" : True, }) graph_info.append({

8 years, 4 months

#3190 entity_sensors, entity_sensors.fan: new checks monitoring temperature and fan sensors of devices such as Palo Alto Networks which support the ENTITY-SENSORS-MIB

by Simon Betz

Module: check_mk Branch: master Commit: 3a35d24b7d2a94bad7f66043f615b7616c5851cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a35d24b7d2a94… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 22 10:06:03 2016 +0100 #3190 entity_sensors, entity_sensors.fan: new checks monitoring temperature and fan sensors of devices such as Palo Alto Networks which support the ENTITY-SENSORS-MIB --- .werks/3190 | 9 ++ ChangeLog | 1 + checkman/entity_sensors | 21 ++++ checkman/entity_sensors.fan | 18 ++++ checks/entity_sensors | 244 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 293 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3a35d24b7d…

8 years, 4 months

#3227 FIX Automatic service adding: Fixed exception when using time range to skip automatic configuration

by Lars Michelsen

Module: check_mk Branch: master Commit: 3816ba3c25918af652bd39619aff565ba328de5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3816ba3c25918a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 22 09:22:16 2016 +0100 #3227 FIX Automatic service adding: Fixed exception when using time range to skip automatic configuration This fixes the exception: Traceback (most recent call last): File "/omd/sites/stable/share/check_mk/modules/check_mk.py", line 5065, in <module> discover_marked_hosts() File "/omd/sites/stable/share/check_mk/modules/discovery.py", line 441, in discover_marked_hosts why_not = may_rediscover(params) File "/omd/sites/stable/share/check_mk/modules/discovery.py", line 389, in may_rediscover now = datetime.datetime.utcfromtimestamp(now_ts) NameError: global name 'datetime' is not defined --- .werks/3227 | 20 ++++++++++++++++++++ ChangeLog | 1 + modules/discovery.py | 12 +++++++++--- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.werks/3227 b/.werks/3227 new file mode 100644 index 0000000..b79e833 --- /dev/null +++ b/.werks/3227 @@ -0,0 +1,20 @@ +Title: Automatic service adding: Fixed exception when using time range to skip automatic configuration +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456129237 + +This fixes the exception: + +Traceback (most recent call last): + File "/omd/sites/stable/share/check_mk/modules/check_mk.py", line 5065, in <module> + discover_marked_hosts() + File "/omd/sites/stable/share/check_mk/modules/discovery.py", line 441, in discover_marked_hosts + why_not = may_rediscover(params) + File "/omd/sites/stable/share/check_mk/modules/discovery.py", line 389, in may_rediscover + now = datetime.datetime.utcfromtimestamp(now_ts) +NameError: global name 'datetime' is not defined + diff --git a/ChangeLog b/ChangeLog index 7b969e3..68061ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * 3226 FIX: isc_dhcpd: Fixed exception during discovery when pools can not be gathered by agent * 3189 FIX: mem.vmalloc: newer kernel versions (64bit) report wrong data, i.d. both VmallocUsed and Chunk equal zero, thus this check is obsolete * 3079 FIX: win_printers: fixed typo that kept default parameters from being used... + * 3227 FIX: Automatic service adding: Fixed exception when using time range to skip automatic configuration... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/discovery.py b/modules/discovery.py index 4fc1c57..95300f3 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -386,10 +386,16 @@ def discover_marked_hosts(): if "inventory_rediscovery" not in params: return "automatic discovery disabled for this host" - now = datetime.datetime.utcfromtimestamp(now_ts) + now = time.gmtime(now_ts) for start_hours_mins, end_hours_mins in params["inventory_rediscovery"]["excluded_time"]: - start_time = datetime.datetime(now.year, now.month, now.day, start_hours_mins[0], start_hours_mins[1]) - end_time = datetime.datetime(now.year, now.month, now.day, end_hours_mins[0], end_hours_mins[1]) + start_time = time.struct_time((now.tm_year, now.tm_mon, now.tm_mday, + start_hours_mins[0], start_hours_mins[1], 0, + now.tm_wday, now.tm_yday, now.tm_isdst)) + + end_time = time.struct_time((now.tm_year, now.tm_mon, now.tm_mday, + end_hours_mins[0], end_hours_mins[1], 0, + now.tm_wday, now.tm_yday, now.tm_isdst)) + if start_time <= now <= end_time: return "we are currently in a disallowed time of day"

8 years, 4 months

← Newer
1
2
3
4
5
6
7
8
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016