Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

by Ronny Bruska

Module: check_mk Branch: master Commit: 91cdc08feead6e56aedace5e49a6a62beb0c0fd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91cdc08feead6e… Author: Ronny Bruska <rb(a)mathias-kettner.de> Date: Thu Feb 28 21:27:26 2019 +0100 Reserved 10 Werk IDS Change-Id: Ide43655ba384d4ac967a2774ed740153c4690ac7 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 4bfde66..3502a49 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7194 +7204

5 years, 3 months

Yapf'd test_services_prediction.py

by Simon Betz

Module: check_mk Branch: master Commit: 4976390c6979a2d205eed187bfdfc069dfbb42c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4976390c6979a2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 28 18:29:46 2019 +0100 Yapf'd test_services_prediction.py Change-Id: I22087ef8e7c9c9da513828ebe02f8b2bf45fc4c1 --- tests/integration/cmk_base/test_services_prediction.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/integration/cmk_base/test_services_prediction.py b/tests/integration/cmk_base/test_services_prediction.py index e16b7e3..c7a7ff9 100644 --- a/tests/integration/cmk_base/test_services_prediction.py +++ b/tests/integration/cmk_base/test_services_prediction.py @@ -53,7 +53,11 @@ custom_checks = [ pytest.param("2018-11-28 12", "minute", (60, 60), id='1 min resolution in hour query'), pytest.param("2018-11-27 12", "minute", (300, 12), id='5 min resolution in hour query'), pytest.param("2018-11-15 12", "minute", (1800, 2), id='30 min resolution in hour query'), - pytest.param("2018-07-15 12", "minute", (21600, 0), id='hour query when resolution is 6hrs', marks=pytest.mark.xfail), + pytest.param( + "2018-07-15 12", + "minute", (21600, 0), + id='hour query when resolution is 6hrs', + marks=pytest.mark.xfail), pytest.param("2018-11-28 12", "wday", (240, 360), id='max 360 points of data response'), pytest.param("2018-11-27 12", "wday", (300, 288), id='5 min resolution in day query'), pytest.param("2018-11-10 12", "day", (1800, 48), id='30 min resolution in day query'),

5 years, 3 months

agent_ucs_bladecenter: Adapted section header

by Simon Betz

Module: check_mk Branch: master Commit: 9d72acb5cf8287dc2a8334483735f9bd594207ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d72acb5cf8287… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 28 18:22:40 2019 +0100 agent_ucs_bladecenter: Adapted section header Change-Id: Ie97d2074fc33c70970139a7fb6517dda7afb4958 --- agents/special/agent_ucs_bladecenter | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_ucs_bladecenter b/agents/special/agent_ucs_bladecenter index f8a7a25..6d82cf7 100755 --- a/agents/special/agent_ucs_bladecenter +++ b/agents/special/agent_ucs_bladecenter @@ -136,7 +136,7 @@ C_SERIES_ENTITIES = [ "voltage", ]), ]), - ("ucs_c_rack_server_motherboard_power", [ + ("ucs_c_rack_server_power", [ ("computeMbPowerStats", [ "dn", "consumedPower", @@ -144,7 +144,7 @@ C_SERIES_ENTITIES = [ "inputVoltage", ]), ]), - ("ucs_c_rack_server_motherboard_temp", [ + ("ucs_c_rack_server_temp", [ ("computeRackUnitMbTempStats", [ "dn", "ambientTemp", @@ -170,7 +170,7 @@ C_SERIES_ENTITIES = [ "temperature", ]), ]), - ("ucs_c_rack_server_storage_controller", [ + ("ucs_c_rack_server_health", [ ("storageControllerHealth", [ "dn", "id",

5 years, 3 months

Added test for missing catalog entries of man pages and fixed them

by Simon Betz

Module: check_mk Branch: master Commit: 0990bf60f872755d02b2eb11e09754ec2f297fe2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0990bf60f87275… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 28 11:25:36 2019 +0100 Added test for missing catalog entries of man pages and fixed them Change-Id: Iaed449caa2b8bfc38a16a26b1951f60f4a1e7afc --- checkman/entity_sensors | 2 +- checkman/entity_sensors.fan | 2 +- checkman/esx_vsphere_licenses | 2 +- checkman/esx_vsphere_sensors | 2 +- checkman/papouch_th2e_sensors | 2 +- checkman/papouch_th2e_sensors.dewpoint | 2 +- checkman/papouch_th2e_sensors.humidity | 2 +- checkman/rms200_temp | 2 +- checkman/salesforce_instances | 2 +- checkman/stormshield_cluster | 2 +- checkman/stormshield_cluster_node | 2 +- checkman/stormshield_cpu_temp | 2 +- checkman/stormshield_disk | 2 +- checkman/stormshield_info | 2 +- checkman/stormshield_packets | 2 +- checkman/stormshield_policy | 2 +- checkman/stormshield_route | 2 +- checkman/stormshield_services | 2 +- checkman/stormshield_updates | 2 +- checkman/suseconnect | 4 ++-- checkman/websphere_mq_channels | 2 +- checkman/websphere_mq_instance | 2 +- checkman/websphere_mq_instance.manager | 2 +- checkman/websphere_mq_queues | 2 +- cmk/utils/man_pages.py | 22 +++++++++++++++++++++- tests/unit/cmk/utils/test_man_pages.py | 11 +++++++++++ 26 files changed, 57 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0990bf60f8…

5 years, 3 months

mk_jolokia: fix respose validation

by Moritz Kiemer

Module: check_mk Branch: master Commit: d9283545ebb93b6301a67182444bef4ebfc0dad6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9283545ebb93b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 28 15:15:45 2019 +0100 mk_jolokia: fix respose validation turns out jolokia responses are regular dictionaries after all also drop the specs dictionary, we will be adding the new MBeans in a separate variable. Change-Id: Ib9bc4cb1ae8b9fe8cd4101a59e686dca7b00cbef --- agents/plugins/mk_jolokia.py | 127 +++++++++++++++++----------------- tests/unit/plugins/test_mk_jolokia.py | 28 +++----- 2 files changed, 72 insertions(+), 83 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d9283545eb…

5 years, 3 months

Try to make prediction tests more reliable

by Lars Michelsen

Module: check_mk Branch: master Commit: c497d50b2b181c34f81fae998a8db7df6a5963b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c497d50b2b181c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 28 16:12:20 2019 +0100 Try to make prediction tests more reliable Change-Id: I81eee4a4afd93ee1ba51bd4ac3d59db291fa695a --- .../cmk_base/test_services_prediction.py | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/tests/integration/cmk_base/test_services_prediction.py b/tests/integration/cmk_base/test_services_prediction.py index f8e4baa..fb787f5 100644 --- a/tests/integration/cmk_base/test_services_prediction.py +++ b/tests/integration/cmk_base/test_services_prediction.py @@ -16,13 +16,11 @@ from testlib import web, repo_path, create_linux_test_host # pylint: disable=un @pytest.fixture(scope="module") def cfg_setup(request, web, site): - create_linux_test_host(request, web, site, "test-prediction") - web.discover_services("test-prediction") - web.activate_changes() + hostname = "test-prediction" # Enforce use of the pre-created RRD file from the git. The restart of the core # is needed to make it renew it's internal RRD file cache - site.makedirs("var/check_mk/rrd/test-prediction/") + site.makedirs("var/check_mk/rrd/test-prediction") site.write_file( "var/check_mk/rrd/test-prediction/CPU_load.rrd", file("%s/tests/integration/cmk_base/test-files/CPU_load.rrd" % repo_path()).read()) @@ -31,10 +29,24 @@ def cfg_setup(request, web, site): file("%s/tests/integration/cmk_base/test-files/CPU_load.info" % repo_path()).read()) site.omd("restart", "cmc") + create_linux_test_host(request, web, site, "test-prediction") + + site.write_file( + "etc/check_mk/conf.d/linux_test_host_%s_cpu_load.mk" % hostname, """ +globals().setdefault('custom_checks', []) + +custom_checks = [ + ( {'service_description': u'CPU load', 'has_perfdata': True}, [], ALL_HOSTS, {} ), +] + custom_checks +""") + + web.activate_changes() + yield # Cleanup - site.delete_dir("var/check_mk/rrd/") + site.delete_file("etc/check_mk/conf.d/linux_test_host_%s_cpu_load.mk" % hostname) + site.delete_dir("var/check_mk/rrd") @pytest.mark.parametrize('date, period, result', [ @@ -115,7 +127,7 @@ def test_get_rrd_data_fails(cfg_setup): # Empty response, because non-existent perf_data variable step, data = cmk.utils.prediction.get_rrd_data( - 'test-prediction', 'CPU utilization', 'untracked_prefdata', 'MAX', from_time, until_time) + 'test-prediction', 'CPU load', 'untracked_prefdata', 'MAX', from_time, until_time) # The worst resolution in an rrd file is 6 hours, because query always # replies. step is a huge number which meaning I don't understand but

5 years, 3 months

Allow fail test on predictions rrd retrieval

by Óscar Nájera

Module: check_mk Branch: master Commit: b2b4c4e47527af2152c5383e7dd4b75baa44c448 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2b4c4e47527af… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Feb 28 16:16:36 2019 +0100 Allow fail test on predictions rrd retrieval Change-Id: I434c1833512dcf1e2e7c994079c0126a9839af1c --- tests/integration/cmk_base/test_services_prediction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/cmk_base/test_services_prediction.py b/tests/integration/cmk_base/test_services_prediction.py index fb787f5..e16b7e3 100644 --- a/tests/integration/cmk_base/test_services_prediction.py +++ b/tests/integration/cmk_base/test_services_prediction.py @@ -53,7 +53,7 @@ custom_checks = [ pytest.param("2018-11-28 12", "minute", (60, 60), id='1 min resolution in hour query'), pytest.param("2018-11-27 12", "minute", (300, 12), id='5 min resolution in hour query'), pytest.param("2018-11-15 12", "minute", (1800, 2), id='30 min resolution in hour query'), - pytest.param("2018-07-15 12", "minute", (21600, 0), id='hour query when resolution is 6hrs'), + pytest.param("2018-07-15 12", "minute", (21600, 0), id='hour query when resolution is 6hrs', marks=pytest.mark.xfail), pytest.param("2018-11-28 12", "wday", (240, 360), id='max 360 points of data response'), pytest.param("2018-11-27 12", "wday", (300, 288), id='5 min resolution in day query'), pytest.param("2018-11-10 12", "day", (1800, 48), id='30 min resolution in day query'),

5 years, 3 months

Remove more pnp templates and fix some issues

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 75e695ed0e58816b1b94b8e0c53f29a200f8221f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75e695ed0e5881… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Feb 28 09:13:22 2019 +0100 Remove more pnp templates and fix some issues Issues: * hwg_temp was always unknown because it used dev_status instead of dev_status_name * add a graph_info for write_cache_usage * use get_parsed_item_data in the check job * livestatus_status should not return performance data for ssl_cert_days * add a missing metric for the printer_supply check CMK-1739 Change-Id: I1afc1519e1cb1cc1fcf3a9105a55bf50fce097ac --- checks/hwg_temp | 9 +- checks/job | 8 +- checks/livestatus_status | 3 +- cmk/gui/plugins/metrics/check_mk.py | 11 +++ pnp-templates/check-mk.php | 65 ------------ pnp-templates/check_mk-akcp_daisy_temp.php | 1 - pnp-templates/check_mk-hwg_temp.php | 1 - .../check_mk-ibm_svc_enclosurestats.power.php | 35 ------- .../check_mk-ibm_svc_enclosurestats.temp.php | 1 - pnp-templates/check_mk-ibm_svc_host.php | 49 --------- pnp-templates/check_mk-ibm_svc_license.php | 37 ------- pnp-templates/check_mk-ibm_svc_nodestats.cache.php | 37 ------- .../check_mk-ibm_svc_nodestats.cpu_util.php | 70 ------------- pnp-templates/check_mk-ibm_svc_nodestats.iops.php | 82 ---------------- .../check_mk-ibm_svc_systemstats.cache.php | 1 - .../check_mk-ibm_svc_systemstats.cpu_util.php | 1 - .../check_mk-ibm_svc_systemstats.iops.php | 1 - pnp-templates/check_mk-ipmi.php | 46 --------- pnp-templates/check_mk-ipmi_sensors.php | 45 --------- pnp-templates/check_mk-jolokia_metrics.threads.php | 55 ----------- pnp-templates/check_mk-jolokia_metrics.tp.php | 63 ------------ pnp-templates/check_mk-juniper_screenos_cpu.php | 40 -------- pnp-templates/check_mk-juniper_screenos_temp.php | 1 - pnp-templates/check_mk-kernel.php | 77 --------------- pnp-templates/check_mk-knuerr_rms_humidity.php | 1 - pnp-templates/check_mk-knuerr_rms_temp.php | 1 - pnp-templates/check_mk-livestatus_status.php | 70 ------------- pnp-templates/check_mk-lparstat_aix.cpu_util.php | 1 - pnp-templates/check_mk-mem.vmalloc.php | 47 --------- pnp-templates/check_mk-mysql_slave.php | 34 ------- pnp-templates/check_mk-netapp_api_protocol.php | 50 ---------- pnp-templates/check_mk-netapp_api_temp.php | 1 - .../check_mk-netapp_api_vf_stats.traffic.php | 92 ----------------- pnp-templates/check_mk-netctr.combined.php | 67 ------------- pnp-templates/check_mk-netctr.php | 74 -------------- pnp-templates/check_mk-netscaler_health.temp.php | 1 - pnp-templates/check_mk-nginx_status.php | 109 --------------------- pnp-templates/check_mk-nvidia.temp.php | 1 - pnp-templates/check_mk-oracle_dataguard_stats.php | 37 ------- pnp-templates/check_mk-oracle_logswitches.php | 37 ------- pnp-templates/check_mk-oracle_processes.php | 38 ------- pnp-templates/check_mk-oracle_recovery_status.php | 34 ------- pnp-templates/check_mk-printer_supply.php | 51 ---------- pnp-templates/check_mk-statgrab_net.ctr.php | 1 - 44 files changed, 18 insertions(+), 1468 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=75e695ed0e…

5 years, 3 months

jolokia_metrics: move functions into include file

by Moritz Kiemer

Module: check_mk Branch: master Commit: 3f97dfa94db081e580871aa52be17202d60eeecb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f97dfa94db081… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 28 13:18:17 2019 +0100 jolokia_metrics: move functions into include file Change-Id: I383077eceb9012d2df18e8fad593efebf993cbf6 --- checks/jolokia.include | 152 +++++++++++++++++++++++++++++++++++++++++++++++++ checks/jolokia_metrics | 152 ------------------------------------------------- 2 files changed, 152 insertions(+), 152 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3f97dfa94d…

5 years, 3 months

mssql_databases: prepare error handling.

by Moritz Kiemer

Module: check_mk Branch: master Commit: d85272d77c31d77363d088356adfd8c8223462be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d85272d77c31d7… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Feb 28 12:18:03 2019 +0100 mssql_databases: prepare error handling. CMK-1570 Change-Id: Ic59dc85e753aae54154294e00550761eb8c59715 --- checks/mssql_databases | 30 ++++++++++------------ .../datasets/mssql_databases_regression.py | 14 +++++++--- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/checks/mssql_databases b/checks/mssql_databases index 3117c0f..a6d707b 100644 --- a/checks/mssql_databases +++ b/checks/mssql_databases @@ -57,32 +57,30 @@ def parse_mssql_databases(info): return parsed -def inventory_mssql_databases(parsed): - return [(db_name, {}) for db_name in parsed] - - -def check_mssql_databases(item, params, parsed): +@get_parsed_item_data +def check_mssql_databases(_no_item, params, data): map_states = { "1": (1, "on"), "0": (0, "off"), } - if item in parsed: - data = parsed[item] - db_state = data["Status"] - state = params.get("map_db_states", {}).get(db_state.replace(" ", "_").upper(), 0) - yield state, 'Status: %s' % db_state - yield 0, 'Recovery: %s' % data["Recovery"] + db_state = data["Status"] + if db_state.startswith("ERROR: "): + yield 2, db_state[7:] + return + state = params.get("map_db_states", {}).get(db_state.replace(" ", "_").upper(), 0) + yield state, 'Status: %s' % db_state + yield 0, 'Recovery: %s' % data["Recovery"] - for what in ["close", "shrink"]: - state, state_readable = map_states[data["auto_%s" % what]] - state = params.get("map_auto_%s_state" % what, {}).get(state_readable, state) - yield state, 'Auto %s: %s' % (what, state_readable) + for what in ["close", "shrink"]: + state, state_readable = map_states[data["auto_%s" % what]] + state = params.get("map_auto_%s_state" % what, {}).get(state_readable, state) + yield state, 'Auto %s: %s' % (what, state_readable) check_info['mssql_databases'] = { 'parse_function': parse_mssql_databases, - 'inventory_function': inventory_mssql_databases, + 'inventory_function': discover(), 'check_function': check_mssql_databases, 'service_description': 'MSSQL %s Database', 'group': 'mssql_databases', diff --git a/tests/unit/checks/generictests/datasets/mssql_databases_regression.py b/tests/unit/checks/generictests/datasets/mssql_databases_regression.py index 91ed286..0cc370a 100644 --- a/tests/unit/checks/generictests/datasets/mssql_databases_regression.py +++ b/tests/unit/checks/generictests/datasets/mssql_databases_regression.py @@ -8,14 +8,18 @@ info = [['MSSQL_MSSQL46', 'CorreLog_Report_T', 'ONLINE', 'FULL', '0', '0'], ['MSSQL_MSSQL46', 'msdb', 'ONLINE', 'SIMPLE', '0', '0'], ['MSSQL_MSSQL46', 'NOC_ALARM_T', 'ONLINE', 'FULL', '0', '1'], ['MSSQL_MSSQL46', 'test_autoclose', 'ONLINE', 'FULL', '1', '0'], - ['MSSQL_MSSQL46', 'test_autoclose', 'RECOVERY', 'PENDING', 'FULL', '1', '0']] + ['MSSQL_MSSQL46', 'test_autoclose', 'RECOVERY', 'PENDING', 'FULL', '1', '0'], + ['MSSQL_Mouse', '-', 'ERROR: We are out of cheese!', '-', '-', '-'] + ] discovery = {'': [('MSSQL_MSSQL46 CorreLog_Report_T', {}), ('MSSQL_MSSQL46 NOC_ALARM_T', {}), ('MSSQL_MSSQL46 master', {}), ('MSSQL_MSSQL46 msdb', {}), - ('MSSQL_MSSQL46 test_autoclose', {})]} + ('MSSQL_MSSQL46 test_autoclose', {}), + ('MSSQL_Mouse -', {}), + ]} checks = {'': [('MSSQL_MSSQL46 CorreLog_Report_T', @@ -47,4 +51,8 @@ checks = {'': [('MSSQL_MSSQL46 CorreLog_Report_T', [(0, 'Status: ONLINE', []), (0, 'Recovery: FULL', []), (1, 'Auto close: on', []), - (0, 'Auto shrink: off', [])])]} + (0, 'Auto shrink: off', [])]), + ('MSSQL_Mouse -', + {}, + [(2, 'We are out of cheese!')]) + ]}

5 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019