Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

jolokia_metrics{gc, tp}: Remove useless (None, None) default parameters

by Konstantin Büttner

Module: check_mk Branch: master Commit: 504cd98de46e784682a274b3eecf0658f84d7ffa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=504cd98de46e78… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 25 14:41:06 2017 +0100 jolokia_metrics{gc,tp}: Remove useless (None, None) default parameters Change-Id: Icba3627cac2d868a724259c14cbeebc6a448ea8a --- checks/jolokia_metrics | 8 -------- 1 file changed, 8 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index d151ea8..4c2e23d 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -52,16 +52,9 @@ jolokia_metrics_serv_req_default_levels = (-1, -1, 5000, 6000) jolokia_metrics_queue_default_levels = ( 20, 50 ) -# Garbage collections count and time per minute -factory_settings["jolokia_metrics_gc_default_levels"] = { - 'CollectionTime': (None, None), - 'CollectionCount': (None, None) -} - # Tomcat ThreadPools Count/Busy in relation to max value factory_settings["jolokia_metrics_tp_default_levels"] = { 'currentThreadsBusy': (80, 90), - 'currentThreadsCount': (None, None) } @@ -439,7 +432,6 @@ def check_jolokia_metrics_gc(item, params, info): check_info["jolokia_metrics.gc"] = { - "default_levels_variable" : "jolokia_metrics_gc_default_levels", "service_description" : "JVM %s", "check_function" : check_jolokia_metrics_gc, "inventory_function" : inventory_jolokia_metrics_gc,

7 years, 10 months

jolokia_metrics.{gc, tp}: Store dict-based default params in factory_settings

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5786e0f29155e5d6fafba4822064d36cb9f0bdce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5786e0f29155e5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 25 14:34:42 2017 +0100 jolokia_metrics.{gc,tp}: Store dict-based default params in factory_settings Change-Id: I5cc34d6c70a0b4b4c0ccdc0dc4a0db82450bb650 --- checks/jolokia_metrics | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 8af0feb..d151ea8 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -53,13 +53,13 @@ jolokia_metrics_serv_req_default_levels = (-1, -1, 5000, 6000) jolokia_metrics_queue_default_levels = ( 20, 50 ) # Garbage collections count and time per minute -jolokia_metrics_gc_default_levels = { +factory_settings["jolokia_metrics_gc_default_levels"] = { 'CollectionTime': (None, None), 'CollectionCount': (None, None) } # Tomcat ThreadPools Count/Busy in relation to max value -jolokia_metrics_tp_default_levels = { +factory_settings["jolokia_metrics_tp_default_levels"] = { 'currentThreadsBusy': (80, 90), 'currentThreadsCount': (None, None) } @@ -383,12 +383,11 @@ check_info["jolokia_metrics.serv_req"] = { def inventory_jolokia_metrics_gc(info): inv = [] parsed = jolokia_metrics_parse(info) - levels = None for inst, vals in parsed.iteritems(): if vals == None: continue # no data from agent for gc, val in vals.get('gc', {}).iteritems(): - inv.append(("%s GC %s" % (inst ,gc) , levels)) + inv.append(("%s GC %s" % (inst ,gc) , {})) return inv @@ -440,11 +439,12 @@ def check_jolokia_metrics_gc(item, params, info): check_info["jolokia_metrics.gc"] = { - "service_description" : "JVM %s", - "check_function" : check_jolokia_metrics_gc, - "inventory_function" : inventory_jolokia_metrics_gc, - "group" : "jvm_gc", - "has_perfdata" : True, + "default_levels_variable" : "jolokia_metrics_gc_default_levels", + "service_description" : "JVM %s", + "check_function" : check_jolokia_metrics_gc, + "inventory_function" : inventory_jolokia_metrics_gc, + "group" : "jvm_gc", + "has_perfdata" : True, } #. @@ -466,12 +466,11 @@ check_info["jolokia_metrics.gc"] = { def inventory_jolokia_metrics_tp(info): inv = [] parsed = jolokia_metrics_parse(info) - levels = 'jolokia_metrics_tp_default_levels' for inst, vals in parsed.iteritems(): if vals == None: continue # no data from agent for tp, val in vals.get('tp', {}).iteritems(): - inv.append(("%s ThreadPool %s" % (inst ,tp) , levels)) + inv.append(("%s ThreadPool %s" % (inst ,tp) , {})) return inv @@ -544,11 +543,12 @@ def check_jolokia_metrics_tp(item, params, info): check_info["jolokia_metrics.tp"] = { - "service_description" : "JVM %s", - "check_function" : check_jolokia_metrics_tp, - "inventory_function" : inventory_jolokia_metrics_tp, - "group" : "jvm_tp", - "has_perfdata" : True, + "default_levels_variable" : "jolokia_metrics_tp_default_levels", + "service_description" : "JVM %s", + "check_function" : check_jolokia_metrics_tp, + "inventory_function" : inventory_jolokia_metrics_tp, + "group" : "jvm_tp", + "has_perfdata" : True, } #.

7 years, 10 months

Git-Tests von Integrationstests separiert

by Lars Michelsen

Module: check_mk Branch: master Commit: 8666dd98dec9ca8d3fb41766f6c455f253acabe4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8666dd98dec9ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 14:33:14 2017 +0100 Git-Tests von Integrationstests separiert Change-Id: I125dfd5bc27d1c84e33785305824ba80e806a9ab --- pytest.ini | 1 + tests/agents/windows/test_precompiled_age.py | 4 ++++ tests/agents/windows/test_precompiled_cmk_update_agent.py | 4 ++++ tests/general/test_find_debug_print.py | 4 ++++ tests/general/test_permissions.py | 4 ++++ tests/packaging/test_files.py | 1 + 6 files changed, 18 insertions(+) diff --git a/pytest.ini b/pytest.ini index b4e450f..1282ff3 100644 --- a/pytest.ini +++ b/pytest.ini @@ -7,4 +7,5 @@ addopts = -rs -v --maxfail=1 -m "not packaging" # Register some markers to classify the tests markers = pylint: Mark a test as pylint test. + git: Mark a test to be executed in the Git repository context packaging: This is a test to execute to verify the packaging of the testbuilds. diff --git a/tests/agents/windows/test_precompiled_age.py b/tests/agents/windows/test_precompiled_age.py index 04ac4ba..ccc303a 100644 --- a/tests/agents/windows/test_precompiled_age.py +++ b/tests/agents/windows/test_precompiled_age.py @@ -4,6 +4,10 @@ import os import glob from testlib import cmk_path +import pytest + +# Mark all tests in this file to be executed in the git context +pytestmark = pytest.mark.git precompiled_files = [ 'check_mk_agent.exe', diff --git a/tests/agents/windows/test_precompiled_cmk_update_agent.py b/tests/agents/windows/test_precompiled_cmk_update_agent.py index b3a2b5d..5d91e58 100644 --- a/tests/agents/windows/test_precompiled_cmk_update_agent.py +++ b/tests/agents/windows/test_precompiled_cmk_update_agent.py @@ -4,6 +4,10 @@ import os import glob from testlib import cmc_path +import pytest + +# Mark all tests in this file to be executed in the git context +pytestmark = pytest.mark.git precompiled_files = [ 'plugins/cmk-update-agent.exe' diff --git a/tests/general/test_find_debug_print.py b/tests/general/test_find_debug_print.py index 293bc94..2f751a7 100644 --- a/tests/general/test_find_debug_print.py +++ b/tests/general/test_find_debug_print.py @@ -4,6 +4,10 @@ import os import glob from testlib import cmk_path, cmc_path +import pytest + +# Mark all tests in this file to be executed in the git context +pytestmark = pytest.mark.git check_paths = [ "bin", diff --git a/tests/general/test_permissions.py b/tests/general/test_permissions.py index 0d54475..7cfa766 100644 --- a/tests/general/test_permissions.py +++ b/tests/general/test_permissions.py @@ -4,6 +4,10 @@ import os import glob from testlib import cmk_path +import pytest + +# Mark all tests in this file to be executed in the git context +pytestmark = pytest.mark.git def is_executable(path): return os.path.isfile(path) and os.access(path, os.X_OK) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index 549d239..1b6bc83 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -3,6 +3,7 @@ import os import subprocess import re +# Mark all tests in this file to be tests verifying build packages pytestmark = pytest.mark.packaging @pytest.mark.parametrize("what", [

7 years, 10 months

4303 FIX sap_state: fixed error handling

by Simon Betz

Module: check_mk Branch: master Commit: 652634bca5a1697c799beab75685f747c9eebd6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=652634bca5a169… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 25 14:16:45 2017 +0100 4303 FIX sap_state: fixed error handling Change-Id: Icc1ac3cbb3f65cb485058c324873877d4d83d1ca --- .werks/4303 | 10 ++++++++++ ChangeLog | 1 + checks/sap_state | 12 +++++++----- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.werks/4303 b/.werks/4303 new file mode 100644 index 0000000..7eb31bf --- /dev/null +++ b/.werks/4303 @@ -0,0 +1,10 @@ +Title: sap_state: fixed error handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485349970 + + diff --git a/ChangeLog b/ChangeLog index f3d732a..164d337 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * 4301 FIX: winperf_tcp_conn: fixed missing data handling * 4302 FIX: win_wmi_software: fixed invalid data handling * 4213 FIX: fjdarye101_syscaps: Fix failing check when using Nagios core + * 4303 FIX: sap_state: fixed error handling Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/sap_state b/checks/sap_state index 2afacc8..1b875c1 100644 --- a/checks/sap_state +++ b/checks/sap_state @@ -26,8 +26,9 @@ def inventory_sap_state(info): - for node, value in info: - yield node, None + for line in info: + if len(line) == 2: + yield line[0], None def check_sap_state(item, _no_parameters, info): @@ -37,9 +38,10 @@ def check_sap_state(item, _no_parameters, info): else: return 2 - for node, value in info: - if node == item: - return value_to_status(value), value + for line in info: + if line[0] == item: + value = line[1] + return value_to_status(value), "Status: %s" % value check_info['sap_state'] = {

7 years, 10 months

Updated bug entries #2553

by Mathias Kettner

Module: check_mk Branch: master Commit: da9b3d2296e4fc4d1c3d0d0cac606db7d87ebf67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da9b3d2296e4fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 25 14:15:11 2017 +0100 Updated bug entries #2553 Change-Id: I5b9f089bca01730aec61f58857a508062a778f3a --- .bugs/2553 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.bugs/2553 b/.bugs/2553 new file mode 100644 index 0000000..d83461e --- /dev/null +++ b/.bugs/2553 @@ -0,0 +1,15 @@ +Title: Matching of Texts in EC inconsistent if no regexes are used +Component: ec +State: open +Date: 2017-01-25 14:13:01 +Targetversion: 1.2.8 +Class: bug + +The matching if "app" and "ap[p]" differ - but shouldn't. The EC uses +if different semantic for regexes and fixed strings. This can lead +to strange behaviours. Also a prefix of .* seems to be removed before +the distinction is made. So a match of .*foo seems to be treated jus +like foo. + +Investigate this. Maybe we need to migrate existing match strings +in order to stay compabible and fix the problem anyway.

7 years, 10 months

4312 FIX Counting events are now also respecting the EC limits

by Lars Michelsen

Module: check_mk Branch: master Commit: a321310f376acadd287cf84c32a69ef8a1b72684 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a321310f376aca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 13:44:05 2017 +0100 4312 FIX Counting events are now also respecting the EC limits Change-Id: I0026b8836687fd641ac55e9388be5d7866f52554 --- .werks/4312 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/4312 b/.werks/4312 new file mode 100644 index 0000000..90c44ac --- /dev/null +++ b/.werks/4312 @@ -0,0 +1,9 @@ +Title: Counting events are now also respecting the EC limits +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i4 +Date: 1485348231 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 2641ac8..f3d732a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,7 @@ * 4200 FIX: Fix computation of Event Console performance snapin in distributed mode... * 4219 FIX: Trap processing with community "public" is now only default and not accepted in all cases anymore... NOTE: Please refer to the migration notes! + * 4312 FIX: Counting events are now also respecting the EC limits HW/SW-Inventory: * 4258 FIX: snmp_extended_info: fixed undefined variable

7 years, 10 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 3cb7b763c1c1338a953b2db74de4b4b2d3baf545 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cb7b763c1c133… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 13:43:45 2017 +0100 Reserved 20 Werk IDS Change-Id: I05fc9349a933f86f22c986873af34a6bad12ba8f --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index a21bed9..6327683 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4312 +4332

7 years, 10 months

Fixed overflow events showing up in status_event_limit_active_rules list

by Lars Michelsen

Module: check_mk Branch: master Commit: bbbfb88706cade78122c348001df6aefdc057a61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbbfb88706cade… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 13:43:32 2017 +0100 Fixed overflow events showing up in status_event_limit_active_rules list Change-Id: I8a0a39e0b18e70430034fa08e9738a2143f649ee --- bin/mkeventd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/mkeventd b/bin/mkeventd index c3700d5..099cac6 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2694,6 +2694,8 @@ class EventServer: def get_rules_with_active_event_limit(self): rule_ids = [] for rule_id, num_existing_events in g_event_status.num_existing_events_by_rule.items(): + if rule_id == None: + continue # Ignore rule unrelated overflow events. They have no rule id associated. if num_existing_events >= g_config["event_limit"]["by_rule"]["limit"]: rule_ids.append(rule_id) return rule_ids

7 years, 10 months

EC: Fixed possible exception when having none values in lq query responses

by Lars Michelsen

Module: check_mk Branch: master Commit: 50b43c9804ec54dcbd4b41916154239f05e83387 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50b43c9804ec54… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 13:37:32 2017 +0100 EC: Fixed possible exception when having none values in lq query responses Change-Id: Ie3d6f51c676d9c3daa610b402f7336998abce386 --- bin/mkeventd | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 40a364b..c3700d5 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -797,7 +797,7 @@ def quote_tab(col): elif type(col) == bool: return col and "1" or "0" elif type(col) in [ tuple, list ]: - col = "\1" + "\1".join(map(to_utf8, col)) + col = "\1" + "\1".join([ quote_tab(e) for e in col ]) elif col == None: col = "\2" @@ -3735,8 +3735,7 @@ class EventStatus(): # None found, create one event["count"] = 1 event["phase"] = "counting" - with lock_eventstatus: - self.new_event(event) + g_event_server.new_event_respecting_limits(event) def count_event(self, event, rule, count): @@ -3769,8 +3768,7 @@ class EventStatus(): else: event["count"] = 1 event["phase"] = "counting" - with lock_eventstatus: - self.new_event(event) + g_event_server.new_event_respecting_limits(event) found = event # Did we just count the event that was just one too much?

7 years, 10 months

4213 FIX fjdarye101_syscaps: Fix failing check when using Nagios core

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5dfd1196d32a451571361e6c6351afa705ea6d76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dfd1196d32a45… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 25 13:33:42 2017 +0100 4213 FIX fjdarye101_syscaps: Fix failing check when using Nagios core Change-Id: Ib606f951b802e08359bf6df9450913e850aff0bd --- .werks/4213 | 10 ++++++++++ ChangeLog | 1 + checks/fjdarye101_syscaps | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4213 b/.werks/4213 new file mode 100644 index 0000000..04087ad --- /dev/null +++ b/.werks/4213 @@ -0,0 +1,10 @@ +Title: fjdarye101_syscaps: Fix failing check when using Nagios core +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485347460 + + diff --git a/ChangeLog b/ChangeLog index fc07451..2641ac8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 4300 FIX: job: fixed missing information handling * 4301 FIX: winperf_tcp_conn: fixed missing data handling * 4302 FIX: win_wmi_software: fixed invalid data handling + * 4213 FIX: fjdarye101_syscaps: Fix failing check when using Nagios core Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/fjdarye101_syscaps b/checks/fjdarye101_syscaps index 8d7514d..f7f694b 100644 --- a/checks/fjdarye101_syscaps +++ b/checks/fjdarye101_syscaps @@ -27,7 +27,7 @@ check_info["fjdarye101_syscaps"] = { 'check_function' : check_fjdarye_item, - 'includes' : [ "fjdarye.include" ], + 'includes' : [ "fjdarye.include", ], 'inventory_function' : inventory_fjdarye_item, 'service_description' : 'System Capacitor Unit %s', # 1: fjdaryScuIndex, 3: fjdaryScuStatus

7 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017