Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64687 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 15d5074643033497110537cd2755fc441a238e67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15d50746430334… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 25 10:25:49 2014 +0100 Added todo note --- web/htdocs/valuespec.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e090a59..513687c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -867,6 +867,7 @@ class ListOf(ValueSpec): # Actual table of currently existing entries html.write('<table class="valuespec_listof" id="%s_table">' % varprefix) + # FIXME: Use plug/unplug mechanism instead of transform / then remove transform for nr, v in enumerate(value): html.push_transformation(lambda x: x.replace(self._magic, str(nr+1))) html.write('<tr><td class=vlof_buttons>')

9 years, 10 months

Check_MK Git: check_mk: #1532 FIX mk_sap: Cleaning up old state information from sap.state file

by Lars Michelsen

Module: check_mk Branch: master Commit: 110cd6b42743bc5470cb32f8fa2baf5ab6c40367 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=110cd6b42743bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 25 10:32:32 2014 +0100 #1532 FIX mk_sap: Cleaning up old state information from sap.state file The mk_sap agent plugin writes a state file which contains information for each SAP alert log file which is monitored. Old log files are now cleaned up from this file, when they are not monitored anymore. --- .werks/1532 | 11 +++++++++++ ChangeLog | 1 + agents/plugins/mk_sap | 46 +++++++++++++++++++++++++++++++++++++--------- 3 files changed, 49 insertions(+), 9 deletions(-) diff --git a/.werks/1532 b/.werks/1532 new file mode 100644 index 0000000..bf6feb4 --- /dev/null +++ b/.werks/1532 @@ -0,0 +1,11 @@ +Title: mk_sap: Cleaning up old state information from sap.state file +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1416907854 +Class: fix + +The mk_sap agent plugin writes a state file which contains information +for each SAP alert log file which is monitored. Old log files are now +cleaned up from this file, when they are not monitored anymore. diff --git a/ChangeLog b/ChangeLog index a5092a2..bc3f9df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * 1503 FIX: Fixed monitoring of multiple SAP instances with one mk_sap plugin... * 1515 FIX: cisco_secure: fix service description, fix OK state in case of no violation * 1449 FIX: nginx_status: agent plugin no longer honours "http(s)_proxy" env variables of root user + * 1532 FIX: mk_sap: Cleaning up old state information from sap.state file... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index 8f867df..747f9ae 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -109,6 +109,7 @@ SKIP_MTCLASSES = [ ] STATE_FILE = '/etc/check_mk/sap.state' +state_file_changed = False # ############################################################################# @@ -139,7 +140,6 @@ monitor_paths = [ # 'SAP CCMS Monitor Templates/Dialog Overview/*', ] monitor_types = [] -# henri config_file = os.getenv('MK_CONFDIR', '/etc/check_mk') + '/sap.cfg' cfg = {} @@ -156,6 +156,10 @@ try: except IOError: states = {} +# index of all logfiles which have been found in a run. This is used to +# remove logfiles which are not available anymore from the states dict. +logfiles = [] + # ############################################################################# # @@ -322,6 +326,8 @@ def alert_details(cfg, alert): return state, msg def process_alerts(cfg, logs, ms_name, mon_name, node, alerts): + global state_file_changed + sid = node["MTSYSID"].strip() or 'Other' context = node["MTMCNAME"].strip() or 'Other' path = node["PATH"] @@ -330,6 +336,8 @@ def process_alerts(cfg, logs, ms_name, mon_name, node, alerts): hostname = sid logfile = context + "/" + path + logfiles.append((hostname, logfile)) + logs.setdefault(sid, {}) logs[hostname][logfile] = [] newest_log_dt = None @@ -350,7 +358,7 @@ def process_alerts(cfg, logs, ms_name, mon_name, node, alerts): if newest_log_dt: # Write newest log age to cache to prevent double processing of logs states[(hostname, logfile)] = newest_log_dt - file(STATE_FILE, 'w').write(repr(states)) + state_file_changed = True return logs @@ -452,12 +460,32 @@ def check(cfg): # It is possible to configure multiple SAP instances to monitor. Loop them all, but # do not terminate when one connection failed -for entry in cfg: - try: - check(entry) - except sapnwrfc.RFCCommunicationError, e: - sys.stderr.write('ERROR: Unable to connect (%s)\n' % e) - except: - sys.stderr.write('ERROR: Unhandled exception (%s)\n' % e) +processed_all = True +try: + for entry in cfg: + try: + check(entry) + except sapnwrfc.RFCCommunicationError, e: + sys.stderr.write('ERROR: Unable to connect (%s)\n' % e) + processed_all = False + except Exception, e: + sys.stderr.write('ERROR: Unhandled exception (%s)\n' % e) + processed_all = False + + # Now check whether or not an old logfile needs to be removed. This can only + # be done this way, when all hosts have been reached. Otherwise the cleanup + # is skipped. + if processed_all: + for key in states.keys(): + if key not in logfiles: + state_file_changed = True + del states[key] + + # Only write the state file once per run. And only when it has been changed + if state_file_changed: + file(STATE_FILE, 'w').write(repr(states)) + +except Exception, e: + sys.stderr.write('ERROR: Unhandled exception (%s)\n' % e) sys.exit(0)

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #2206

by Lars Michelsen

Module: check_mk Branch: master Commit: 1cf1c6ae1d62c5a9ae227f405916399805e7e8d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cf1c6ae1d62c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 25 10:14:43 2014 +0100 Updated bug entries #2206 --- .bugs/2206 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.bugs/2206 b/.bugs/2206 new file mode 100644 index 0000000..318df69 --- /dev/null +++ b/.bugs/2206 @@ -0,0 +1,22 @@ +Title: Rework "crashed checks" mechanism +Component: core +State: open +Date: 2014-11-25 10:11:51 +Targetversion: 1.2.5i1 +Class: todo + +The optional crashed checks log should be replaced by a new mechanism +where each exception is written to a dedicated folder hierarchy like +HOST/SERVICE, where only the last exception is stored per service. +It is written as text file where all needed information like + +a) the raw agent output +b) the raw SNMP data +c) the traceback + +are written to. + +This file can be downloaded from the Web-GUI by clicking on an icon +which is shown when there is some file for a service available. + +The files are removed using the diskspace cleanup mechanism regularly.

9 years, 10 months

Check_MK Git: check_mk: #1531 FIX Fixed exception in event history view when displaying CHANGESTATE events

by Lars Michelsen

Module: check_mk Branch: master Commit: 524c7fc406e2833895c2c716a45d875cf4e162a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=524c7fc406e283… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 25 08:57:40 2014 +0100 #1531 FIX Fixed exception in event history view when displaying CHANGESTATE events --- .werks/1531 | 10 ++++++++++ ChangeLog | 1 + mkeventd/web/htdocs/mkeventd.py | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1531 b/.werks/1531 new file mode 100644 index 0000000..846f053 --- /dev/null +++ b/.werks/1531 @@ -0,0 +1,10 @@ +Title: Fixed exception in event history view when displaying CHANGESTATE events +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416902234 + + diff --git a/ChangeLog b/ChangeLog index f3eed41..a5092a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ Event Console: * 1169 Added host state type filter to "recent event history" view + * 1531 FIX: Fixed exception in event history view when displaying CHANGESTATE events HW/SW-Inventory: * 1479 liveproxyd: new function for collecting remote inventory data... diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index 4e8526c..bd2fb95 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -93,12 +93,13 @@ action_whats = { "COUNTFAILED" : _("Event created by required count was not reached in time"), "UPDATE" : _("Event information updated by user"), "NEW" : _("New event created"), - "DELETE" : _("Event deleted manually bu user"), + "DELETE" : _("Event deleted manually by user"), "EMAIL" : _("Email sent"), "SCRIPT" : _("Script executed"), "CANCELLED" : _("The event was cancelled because the corresponding OK message was received"), "ARCHIVED" : _("Event was archived because no rule matched and archiving is activated in global settings."), "AUTODELETE" : _("Event was deleted automatically"), + "CHANGESTATE" : _("State of event changed by user"), } def service_levels():

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #2205

by Lars Michelsen

Module: check_mk Branch: master Commit: 51209db66fd5529e420f3f78a2716f6bb4b89112 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51209db66fd552… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 24 15:13:46 2014 +0100 Updated bug entries #2205 --- .bugs/2205 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2205 b/.bugs/2205 new file mode 100644 index 0000000..d9ac414 --- /dev/null +++ b/.bugs/2205 @@ -0,0 +1,10 @@ +Title: Path in debug_log is wrong in distributed WATO setups +Component: wato +State: open +Date: 2014-11-24 15:07:07 +Targetversion: 1.2.5i1 +Class: bug + +The shown path always shows the path on the centeral site. It should either +show the path to the correct site, or better, just a spacer which indicates +that the site id needs to be put into the path.

9 years, 10 months

Check_MK Git: check_mk: Remove stray binary zeroes in Windows software list in vendor field

by Mathias Kettner

Module: check_mk Branch: master Commit: bec1ea04859966ebbb457967f47ebca30736374a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bec1ea04859966… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 24 11:36:05 2014 +0100 Remove stray binary zeroes in Windows software list in vendor field --- inventory/win_wmi_software | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/win_wmi_software b/inventory/win_wmi_software index 496321f..66382b5 100644 --- a/inventory/win_wmi_software +++ b/inventory/win_wmi_software @@ -46,7 +46,7 @@ def inv_win_wmi_software(info): entry = { "name" : pacname, "version" : version, - "vendor" : vendor, + "vendor" : vendor.replace('\x00', ''), # Can happen, reason unclear "install_date" : install_date, "package_type" : "wmi", }

9 years, 10 months

Check_MK Git: check_mk: #1547 FIX win_cpuinfo: fix case where NumberOfCores is missing (Windows 2003)

by Mathias Kettner

Module: check_mk Branch: master Commit: cb2e3ed2e90ec7b714bd472928d686b4e3732f07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb2e3ed2e90ec7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 24 11:27:41 2014 +0100 #1547 FIX win_cpuinfo: fix case where NumberOfCores is missing (Windows 2003) Assume 1 Core or 1 Core per CPU in that case. --- .werks/1547 | 10 ++++++++++ ChangeLog | 3 ++- inventory/win_cpuinfo | 16 +++++++++++++--- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.werks/1547 b/.werks/1547 new file mode 100644 index 0000000..b93e405 --- /dev/null +++ b/.werks/1547 @@ -0,0 +1,10 @@ +Title: win_cpuinfo: fix case where NumberOfCores is missing (Windows 2003) +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.5i7 +Date: 1416824823 +Class: fix + +Assume 1 Core or 1 Core per CPU in that case. + diff --git a/ChangeLog b/ChangeLog index e319351..f3eed41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,8 +36,8 @@ * 1511 FIX: oracle_jobs: avoid broken checks, make compatible with old version... * 1513 FIX: Handle broken SNMP bulk walk implementation of Mikrotik Router firmware RouterOS v6.22... * 1503 FIX: Fixed monitoring of multiple SAP instances with one mk_sap plugin... - * 1449 FIX: nginx_status: agent plugin no longer honours "http(s)_proxy" env variables of root user * 1515 FIX: cisco_secure: fix service description, fix OK state in case of no violation + * 1449 FIX: nginx_status: agent plugin no longer honours "http(s)_proxy" env variables of root user Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... @@ -92,6 +92,7 @@ HW/SW-Inventory: * 1479 liveproxyd: new function for collecting remote inventory data... NOTE: Please refer to the migration notes! + * 1547 FIX: win_cpuinfo: fix case where NumberOfCores is missing (Windows 2003)... inventory: * 1516 FIX: win_disks: fix exception in case of empty signature diff --git a/inventory/win_cpuinfo b/inventory/win_cpuinfo index 96600ab..7a614cf 100644 --- a/inventory/win_cpuinfo +++ b/inventory/win_cpuinfo @@ -67,15 +67,25 @@ def inv_win_cpuinfo(info): for varname, value in info: varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) - if varname == "NumberOfCores": - node["cores_per_cpu"] = int(value) + + if varname == "NumberOfCores" and value != "": + if value != "": + node["cores_per_cpu"] = int(value) + else: + node["cores_per_cpu"] = 1 # missing on Windows 2003 + elif varname == "NumberOfLogicalProcessors": - node["threads_per_cpu"] = int(value) + if value != "": + node["threads_per_cpu"] = int(value) + else: + node["threads_per_cpu"] = 1 # missing on Windows 2003 + elif varname == "Manufacturer": node["vendor"] = { "GenuineIntel" : "intel", "AuthenticAMD" : "amd", }.get(value, value) + # there is also the L3CacheSize elif varname == "L2CacheSize" and value != "": # normalized to bytes!

9 years, 10 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 311735ba7c0803c26687207c7cced53b5670f36e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=311735ba7c0803… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 24 11:26:53 2014 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index d8e2d5c..1fa85e6 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1547 +1557

9 years, 10 months

Check_MK Git: check_mk: Fix a few comments

by Mathias Kettner

Module: check_mk Branch: master Commit: 0256bdc7711ecca4d5bccbb95ce0bdffa3dcae01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0256bdc7711ecc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 23 14:57:39 2014 +0100 Fix a few comments --- web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 1 - web/plugins/views/inventory.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 5b62e2d..e090a59 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1301,7 +1301,7 @@ class CascadingDropdown(ValueSpec): options.append((str(nr), title)) # Determine the default value for the select, so the # the dropdown pre-selects the line corresponding with value. - # Note: the html.select with automatically show the modified + # Note: the html.select() with automatically show the modified # selection, if the HTML variable varprefix_sel aleady # exists. if value == val or ( diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fa121bf..5305e9d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10968,7 +10968,6 @@ def ajax_activation(): log_commit_pending() # flush logfile with pending actions log_audit(None, "activate-config", _("Configuration activated, monitoring server restarted")) - # html.message html.write('OK: ') html.write('<div class=act_success><img src="images/icon_apply.png" /> %s</div>' % _("Configuration successfully activated.")) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index bacfd1d..96c02c1 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -243,7 +243,7 @@ def render_inv_dicttable(hostname, invpath, node): extratitles.sort() titles += extratitles - # We cannot use table here, since html.plug does not work recursively + # We cannot use table here, since html.plug() does not work recursively html.write('<table class=data>') html.write('<tr>') for title, key in titles:

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #2252

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8eec4de58e8cf1fdfd3b7550d8ef7b00b250ed68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8eec4de58e8cf1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 21 15:13:03 2014 +0100 Updated bug entries #2252 --- .bugs/2252 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.bugs/2252 b/.bugs/2252 new file mode 100644 index 0000000..c4bb324 --- /dev/null +++ b/.bugs/2252 @@ -0,0 +1,20 @@ +Title: HTTP check output is parsed incorrectly +Component: multisite +State: open +Date: 2014-11-21 15:08:21 +Targetversion: future +Class: nastiness + +The URL parser appears to have problems with single quotes. +Excerpt from HTML-code generated by multisite: +ost=Netscaler&srv=HTTP_Check_HTTPS_OWA'))" onmouseout="hoverHide()"><img +class=icon src="images/icon_pnp.png"></a><a +href="view.py?view_name=comments_of_service&site=&host=Netscaler&service=HTTP%20Check%20HTTPS%20OWA"><img class=icon title='2014-11-20 09:18:56 ajung: "Der Check funktioniert aus der Shell, jedoch nicht wenn Check-MK ihn anlegt..." +' src="images/icon_comment.gif"></a></td> +<td >HTTP CRITICAL: HTTP/1.1 200 OK - string 'Datei' not found on '<a +href="https://mail.mwh.de/'"><img class=pluginurl align=absmiddle +title="https://62.153.217.28:443/'" src="images/pluginurl.png"></a> - 21600 +bytes in 0.091 second response time</td><td class="age">45 hrs</td> +<td class="age">1 sec</td> + +Note the single quote after mail.mwh.de/

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits