Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64688 discussions

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

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

Check_MK Git: check_mk: #1449 FIX nginx_status: agent plugin no longer honours "http(s)_proxy" env variables of root user

by Goetz Golla

Module: check_mk Branch: master Commit: 46bc6efd84cdc3e879150e91b262f6ea983c777b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46bc6efd84cdc3… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Nov 20 18:47:31 2014 +0100 #1449 FIX nginx_status: agent plugin no longer honours "http(s)_proxy" env variables of root user --- .werks/1449 | 9 +++++++++ ChangeLog | 1 + agents/plugins/nginx_status | 3 +++ 3 files changed, 13 insertions(+) diff --git a/.werks/1449 b/.werks/1449 new file mode 100644 index 0000000..3fe1a9d --- /dev/null +++ b/.werks/1449 @@ -0,0 +1,9 @@ +Title: nginx_status: agent plugin no longer honours "http(s)_proxy" env variables of root user +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1416505550 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index b43a02d..6a24e19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * 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 Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/plugins/nginx_status b/agents/plugins/nginx_status index 42eb9a1..fe0ec00 100755 --- a/agents/plugins/nginx_status +++ b/agents/plugins/nginx_status @@ -39,6 +39,9 @@ import os, sys, urllib2, re +# tell urllib2 not to honour "http(s)_proxy" env variables +urllib2.getproxies = lambda: {} + config_dir = os.getenv("MK_CONFDIR", "/etc/check_mk") config_file = config_dir + "/nginx_status.cfg"

9 years, 10 months

Check_MK Git: check_mk: Filters can now really be used for dashlets

by Lars Michelsen

Module: check_mk Branch: master Commit: bd60f3425857b8412dd6b0b590b823261596be82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd60f3425857b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 21 08:18:36 2014 +0100 Filters can now really be used for dashlets --- web/htdocs/dashboard.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 2537915..4967b13 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -479,12 +479,18 @@ dashboard_scheduler(1); html.body_end() # omit regular footer with status icons, etc. def render_dashlet_content(nr, the_dashlet): + html.stash_vars() + html.del_all_vars() + visuals.add_context_to_uri_vars(the_dashlet) + dashlet_type = dashlet_types[the_dashlet['type']] if 'iframe_render' in dashlet_type: dashlet_type['iframe_render'](nr, the_dashlet) else: dashlet_type['render'](nr, the_dashlet) + html.unstash_vars() + # Create the HTML code for one dashlet. Each dashlet has an id "dashlet_%d", # where %d is its index (in board["dashlets"]). Javascript uses that id # for the resizing. Within that div there is an inner div containing the

9 years, 10 months

Check_MK Git: check_mk: Inventory of AIX: add OS name

by Mathias Kettner

Module: check_mk Branch: master Commit: 358bd491800b05e046abdd9b4a4fb07840b98c21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=358bd491800b05… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 20 17:22:35 2014 +0100 Inventory of AIX: add OS name --- inventory/aix_baselevel | 1 + 1 file changed, 1 insertion(+) diff --git a/inventory/aix_baselevel b/inventory/aix_baselevel index 870ec87..1b91fe5 100644 --- a/inventory/aix_baselevel +++ b/inventory/aix_baselevel @@ -31,6 +31,7 @@ def inv_aix_baselevel(info): "version" : version, "vendor" : "IBM", "type" : "aix", + "name" : "IBM AIX %s" %version, }) inv_info['aix_baselevel'] = {

9 years, 10 months

Check_MK Git: check_mk: #1515 FIX cisco_secure: fix service description, fix OK state in case of no violation

by Mathias Kettner

Module: check_mk Branch: master Commit: ab3e02ea981247bf11c940d4b44ac312e79b9d23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab3e02ea981247… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 20 16:54:40 2014 +0100 #1515 FIX cisco_secure: fix service description, fix OK state in case of no violation --- .werks/1515 | 9 +++++++++ ChangeLog | 1 + checks/cisco_secure | 36 ++++++++++++++++++++++-------------- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/.werks/1515 b/.werks/1515 new file mode 100644 index 0000000..e9caca3 --- /dev/null +++ b/.werks/1515 @@ -0,0 +1,9 @@ +Title: cisco_secure: fix service description, fix OK state in case of no violation +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1416498840 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 74f6c3f..86433f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * 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... + * 1515 FIX: cisco_secure: fix service description, fix OK state in case of no violation Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/cisco_secure b/checks/cisco_secure index e333f7e..898082d 100644 --- a/checks/cisco_secure +++ b/checks/cisco_secure @@ -24,48 +24,56 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def cisco_secure_convert(info): - data = [] + +def parse_cisco_secure(info): + parsed = [] # l[1] = Name, l[2] = Portstate names = dict([ (l[0], ( l[1], l[2] )) for l in info[0]] ) for num, enabled, status, violationCount, lastmac in info[1]: mac = ":".join(["%02s" % hex(ord(m))[2:] for m in lastmac]).replace(' ', '0') - data.append(( names[num][0], int(names[num][1]), int(enabled), int(status), int(violationCount), mac )) - return data + parsed.append(( names[num][0], int(names[num][1]), int(enabled), int(status), int(violationCount), mac )) + return parsed + -def inventory_cisco_secure(info): - info = cisco_secure_convert(info) +def inventory_cisco_secure(parsed): # search for at least one port with security - for name, op_state, enabled, status, violationCount, lastmac in info: - #if portsecurity enabled and port up OR currently there is sercurity issue` + for name, op_state, enabled, status, violationCount, lastmac in parsed: + # if portsecurity enabled and port up OR currently there is sercurity issue` if ( enabled == 1 and op_state == 1) or status == 3: return [ (None, None) ] - return [] -def check_cisco_secure(item, params, info): + +def check_cisco_secure(item, params, parsed): secure_states = { 1 : "full Operational", 2 : "could not be enabled due to certain reasons", 3 : "shutdown due to security violation" - } + } - info = cisco_secure_convert(info) failed = [] - for name, op_state, enabled, status, violationCount, lastmac in info: + at_least_one_problem = False + for name, op_state, enabled, status, violationCount, lastmac in parsed: message = "Port %s: %s (Violation Count: %s, Last Mac: %s)" % \ ( name, secure_states[status], violationCount, lastmac ) # If port cant be enabled and is up if status == 2 and op_state == 1: yield 1, message + at_least_one_problem = True # Security issue elif status == 3: yield 2, message + at_least_one_problem = True + + if not at_least_one_problem: + yield 0, "No port security violation" + check_info["cisco_secure"] = { + "parse_function" : parse_cisco_secure, "check_function" : check_cisco_secure, "inventory_function" : inventory_cisco_secure, - "service_description" : "Security Port %s", + "service_description" : "Port Security", "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.315.1.2.1.1.1.*"), "snmp_info" : [ (".1.3.6.1.2.1.2.2.1", [OID_END, 2, 8 ] ),

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