Checkmk git commits November 2014

checkmk-commits@lists.checkmk.com

6 participants
232 discussions

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, 7 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, 7 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, 7 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, 7 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, 7 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by Konstantin Büttner

Module: check_mk Branch: master Commit: 32654af0d456eab51fb985c776506acbd73336d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32654af0d456ea… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 21 15:08:08 2014 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 7f8dea7..b4d8d49 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2252 +2262

9 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0845

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3e3c67d56b02ce76557ce2fdde73d68f0e48ec3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e3c67d56b02ce… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 21 14:52:02 2014 +0100 Updated bug entries #0845 --- .bugs/845 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.bugs/845 b/.bugs/845 new file mode 100644 index 0000000..086c492 --- /dev/null +++ b/.bugs/845 @@ -0,0 +1,36 @@ +Title: Interface Check: In some cases the check use information of the wrong interface +Component: checks +State: open +Date: 2014-11-21 14:45:22 +Targetversion: 1.2.5i1 +Class: bug + +In some cases the condition in check_if_common who trys to find the right item matchs to early if there two interfaces have the same +name, but in one case with a number an in the other without but with the same interace index. See the following agent output: + +<<<winperf_if>>> +1416471728.39 510 +6 instances: Intel[R]_82576_Gigabit_Dual_Port_Network_Connection Intel +[R]_82576_Gigabit_Dual_Port_Network_Connection__2 Intel[R]_PRO_ +1000_PT_Dual_Port_Server_Adapter Intel +[R]_PRO_1000_PT_Dual_Port_Server_Adapter__2 +isatap.{76FCB5A2-8B81-4EC1-A917-7BB6004938B9} 6TO4_ +Adapter +-122 3152470526 0 0 0 0 3209053651 bulk_count +-110 90473997 0 0 0 0 46660432 bulk_count +-244 72853543 0 0 0 0 35395085 bulk_count +-58 17620454 0 0 0 0 11265347 bulk_count +10 1000000000 0 0 0 100000 300000000 large_rawcount +-246 11486319 0 0 0 0 1648725994 bulk_count +14 51856476 0 0 0 0 35395085 bulk_count +16 20996309 0 0 0 0 0 bulk_count +18 379 0 0 0 0 0 large_rawcount +20 379 0 0 0 0 0 large_rawcount +22 0 0 0 0 0 0 large_rawcount +-4 3140984207 0 0 0 0 1560327657 bulk_count +26 17492003 0 0 0 0 11265347 bulk_count +28 128451 0 0 0 0 0 bulk_count +30 0 0 0 0 0 0 large_rawcount +32 0 0 0 0 0 0 large_rawcount +34 0 0 0 0 0 0 large_rawcount +1086 0 0 0 0 0 0 large_rawcount

9 years, 7 months

Check_MK Git: check_mk: Removed import statement

by Bastian Kuhn

Module: check_mk Branch: master Commit: 26e905253ebd2c4743407758ba82dd6396e819b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26e905253ebd2c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 21 13:36:16 2014 +0100 Removed import statement --- web/plugins/sidebar/shipped.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index f469044..fb498a4 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1128,7 +1128,6 @@ sidebar_snapins["custom_links"] = { # * [[link4]] def render_wiki(): - import re filename = defaults.omd_root + '/var/dokuwiki/data/pages/sidebar.txt' html.javascript(""" function wiki_search()

9 years, 7 months

Check_MK Git: check_mk: #1516 FIX win_disks: fix exception in case of empty signature

by Mathias Kettner

Module: check_mk Branch: master Commit: b619edac5057d7c7b571858b91d7064c3837d941 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b619edac5057d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 21 13:13:59 2014 +0100 #1516 FIX win_disks: fix exception in case of empty signature --- .werks/1516 | 9 +++++++++ ChangeLog | 3 +++ inventory/win_disks | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1516 b/.werks/1516 new file mode 100644 index 0000000..9469fc0 --- /dev/null +++ b/.werks/1516 @@ -0,0 +1,9 @@ +Title: win_disks: fix exception in case of empty signature +Level: 1 +Component: inventory +Compatible: compat +Version: 1.2.5i7 +Date: 1416572007 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 86433f9..841fb89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,9 @@ * 1479 liveproxyd: new function for collecting remote inventory data... NOTE: Please refer to the migration notes! + inventory: + * 1516 FIX: win_disks: fix exception in case of empty signature + 1.2.5i6: Core & Setup: diff --git a/inventory/win_disks b/inventory/win_disks index e056500..4970379 100644 --- a/inventory/win_disks +++ b/inventory/win_disks @@ -77,7 +77,7 @@ def inv_win_disks(info): array["size"] = int(value) elif varname == "MediaType": array["type"] = value - elif varname == "Signature": + elif varname == "Signature" and value != '': array["signature"] = int(value) array["local"] = True node.append(array)

9 years, 7 months

Check_MK Git: check_mk: Force option -f, --force force using outdated persisted files

by Mathias Kettner

Module: check_mk Branch: master Commit: 4b31e8e646c3572ab3816450ec12ddd811ef4b43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b31e8e646c357… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 21 13:13:06 2014 +0100 Force option -f, --force force using outdated persisted files --- modules/check_mk.py | 4 ++++ modules/check_mk_base.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 8b1b58a..16af22b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4874,6 +4874,10 @@ NOTES: of the RRDs has changed. The option --split will activate conversion from exising RRDs in PNP storage type SINGLE to MULTIPLE. + -i, --inventory does a HW/SW-Inventory for all, one or several + hosts. If you add the option -f, --force then persisted sections + will be used even if they are outdated. + """ % (check_mk_configfile, precompiled_hostchecks_dir, diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index d89e2a1..f03b192 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -478,7 +478,7 @@ def add_persisted_info(hostname, info): now = time.time() for section, (persisted_until, persisted_section) in persisted.items(): - if now < persisted_until: + if now < persisted_until or opt_force: if section not in info: info[section] = persisted_section if opt_debug:

9 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2014