Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

Fixed some no-else-return pylint findings

by Lars Michelsen

Module: check_mk Branch: master Commit: 91647363e76c8ef4604f816c38bf1f1614ef244a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91647363e76c8e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 15:47:29 2018 +0200 Fixed some no-else-return pylint findings Change-Id: I5834a6db5c6472ccb1357e52204898ab466d4dc0 --- cmk/__init__.py | 4 +- cmk/crash_reporting.py | 32 +++++++-------- cmk/notification_plugins/pushover.py | 8 ++-- cmk/render.py | 13 +++--- cmk/store.py | 8 ++-- cmk/tty.py | 4 +- cmk/utils.py | 3 +- cmk_base/agent_simulator.py | 8 ++-- cmk_base/automations/check_mk.py | 22 +++++----- cmk_base/check_api.py | 21 ++++------ cmk_base/check_table.py | 9 ++-- cmk_base/checking.py | 22 +++++----- cmk_base/classic_snmp.py | 22 +++++----- cmk_base/compress_history.py | 9 ++-- cmk_base/config.py | 80 +++++++++++++++++------------------- cmk_base/core_config.py | 22 +++++----- cmk_base/core_nagios.py | 3 +- cmk_base/data_sources/__init__.py | 6 +-- cmk_base/data_sources/abstract.py | 11 +++-- cmk_base/data_sources/tcp.py | 9 ++-- cmk_base/discovery.py | 11 ++--- cmk_base/events.py | 24 +++++------ cmk_base/ip_lookup.py | 4 +- cmk_base/nagios_utils.py | 8 ++-- cmk_base/notify.py | 67 +++++++++++++++--------------- cmk_base/prediction.py | 3 +- cmk_base/snmp.py | 12 +++--- cmk_base/utils.py | 6 +-- 28 files changed, 211 insertions(+), 240 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=91647363e7…

5 years, 11 months

6574 azure_databases: Monitor Azure databases

by Moritz Kiemer

Module: check_mk Branch: master Commit: 116fc50c3a290897de98f4d518711149e1e3f783 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=116fc50c3a2908… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Sep 24 10:56:06 2018 +0200 6574 azure_databases: Monitor Azure databases This werk adds a check reporting the state of monitored azure databases. You can configure levels for CPU utilization, Database throughput units, and used storage in percent. Additionally connections are displayed. CMK-901 Change-Id: I02c56113c79c84c4307ed62efb989595efea3937 --- .werks/6574 | 12 ++ checkman/azure_databases | 14 ++ checkman/azure_databases.connections | 15 ++ checkman/azure_databases.cpu | 15 ++ checkman/azure_databases.deadlock | 14 ++ checkman/azure_databases.dtu | 15 ++ checkman/azure_databases.storage | 15 ++ checks/azure_databases | 172 +++++++++++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 18 +++ cmk/gui/plugins/wato/check_parameters.py | 44 ++++++ .../generictests/datasets/azure_databases.py | 73 +++++++++ 11 files changed, 407 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=116fc50c3a…

5 years, 11 months

6478 FIX synology_raid: Fixed crash on devices with more possibles raid states

by Marcel Arentz

Module: check_mk Branch: master Commit: 648c935c3fcc8b9af12d8b0b38527f59934ea2a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=648c935c3fcc8b… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Sep 25 09:16:32 2018 +0200 6478 FIX synology_raid: Fixed crash on devices with more possibles raid states Newer devices can have more states than older one. This check does not crash anymore if such a state occurs. Change-Id: I8cd6c1a9376da452036b32eb192365f28b507432 --- .werks/6478 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/6478 b/.werks/6478 new file mode 100644 index 0000000..995bcdb --- /dev/null +++ b/.werks/6478 @@ -0,0 +1,11 @@ +Title: synology_raid: Fixed crash on devices with more possibles raid states +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1537859684 +Class: fix + +Newer devices can have more states than older one. This check does not crash +anymore if such a state occurs.

5 years, 11 months

FEED-980: Added more possible states to synology_raid

by Marcel Arentz

Module: check_mk Branch: master Commit: ac9c1b2990a40b59361a1603f2397de22ebe653e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac9c1b2990a40b… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Sep 7 13:21:56 2018 +0200 FEED-980: Added more possible states to synology_raid Change-Id: I87a85978526eaa10a177e7631ff5aa425d689c7e --- checks/synology_raid | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/checks/synology_raid b/checks/synology_raid index 6ccf514..072e26c 100644 --- a/checks/synology_raid +++ b/checks/synology_raid @@ -30,22 +30,30 @@ def inventory_synology_raid(info): def check_synology_raid(item, _no_params, info): states = { - 1 : ("OK" ,0), - 2 : ("repairing" ,1), - 3 : ("migrating" ,1), - 4 : ("expanding" ,1), - 5 : ("deleting" ,1), - 6 : ("creating" ,1), - 7 : ("RAID syncing" ,0), - 8 : ("RAID parity checking" ,0), - 9 : ("RAID assembling" ,1), - 10 : ("cancelling" ,1), - 11 : ("degraded" ,2), - 12 : ("crashed" ,2), + "1" : ("OK" ,0), + "2" : ("repairing" ,1), + "3" : ("migrating" ,1), + "4" : ("expanding" ,1), + "5" : ("deleting" ,1), + "6" : ("creating" ,1), + "7" : ("RAID syncing" ,0), + "8" : ("RAID parity checking" ,0), + "9" : ("RAID assembling" ,1), + "10" : ("cancelling" ,1), + "11" : ("degraded" ,2), + "12" : ("crashed" ,2), + "13" : ("scrubbing" ,0), + "14" : ("RAID deploying" ,0), + "15" : ("RAID undeploying" ,0), + "16" : ("RAID mounting cache" ,0), + "17" : ("RAID unmounting cache" ,0), + "18" : ("RAID continue expanding" ,1), + "19" : ("RAID converting" ,0), + "20" : ("RAID migrating" ,0), + "21" : ("RAID status unknown" ,3), } - for raid, status in info: + for raid, state in info: if raid == item: - state = int(status) message = "Status: " + states[state][0] return states[state][1], message

5 years, 11 months

Fix unit tests when running offline

by Lars Michelsen

Module: check_mk Branch: master Commit: 89f996e0ce9303565f48b88cac9e65e2b2d6aa8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89f996e0ce9303… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 24 16:36:39 2018 +0200 Fix unit tests when running offline The docker test file was initializing the Check_MK version object in global context which may need an internet connection for testing the available versions. This has now been moved out of global scope to make the tests work again in offline mode. Change-Id: Ie6a9cc918a5036e6ceb7c5c2f973b4d3a40bd1b6 --- tests/docker/test_docker.py | 50 +++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index 91061a9..6d229a5 100644 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -36,11 +36,18 @@ build_path = os.path.join(testlib.repo_path(), "docker") image_prefix = "docker-tests" branch_name = os.environ.get("BRANCH", "master") -build_version = testlib.CMKVersion( - version=testlib.CMKVersion.DAILY, - edition=testlib.CMKVersion.CEE, - branch=branch_name -) +def build_version(): + return testlib.CMKVersion( + version=testlib.CMKVersion.DAILY, + edition=testlib.CMKVersion.CEE, + branch=branch_name + ) + + +(a)pytest.fixture(scope="session") +def version(): + return build_version() + @pytest.fixture() def client(): @@ -105,7 +112,10 @@ def _build(request, client, edition, version, add_args=None): return image, build_logs -def _start(request, client, edition="enterprise", version=build_version, is_update=False, **kwargs): +def _start(request, client, edition="enterprise", version=None, is_update=False, **kwargs): + if version is None: + version = build_version() + _image, _build_logs = _build(request, client, edition, version) c = client.containers.run( @@ -211,11 +221,11 @@ def test_start_execute_custom_command(request, client): assert output == "1\n" -def test_start_with_custom_command(request, client): +def test_start_with_custom_command(request, client, version): edition = "enterprise" - _build(request, client, edition, build_version) + _build(request, client, edition, version) output = client.containers.run( - image=_image_name(edition, build_version), + image=_image_name(edition, version), detach=False, command=["bash", "-c", "echo 1"] ) @@ -225,27 +235,27 @@ def test_start_with_custom_command(request, client): # Test that the local deb package is used by making the build fail because of an empty file -def test_build_using_local_deb(request, client): - pkg_path = os.path.join(build_path, build_version.package_name_of_distro("stretch")) +def test_build_using_local_deb(request, client, version): + pkg_path = os.path.join(build_path, version.package_name_of_distro("stretch")) try: with open(pkg_path, "w") as f: f.write("") with pytest.raises(docker.errors.BuildError): - _build(request, client, "enterprise", build_version) + _build(request, client, "enterprise", version) finally: os.unlink(pkg_path) # Test that the local GPG file is used by making the build fail because of an empty file -def test_build_using_local_gpg_pubkey(request, client): +def test_build_using_local_gpg_pubkey(request, client, version): pkg_path = os.path.join(build_path, "Check_MK-pubkey.gpg") try: with open(pkg_path, "w") as f: f.write("") with pytest.raises(docker.errors.BuildError): - _build(request, client, "enterprise", build_version) + _build(request, client, "enterprise", version) finally: os.unlink(pkg_path) @@ -266,7 +276,7 @@ def test_start_enable_mail(request, client): assert c.exec_run(["postconf", "relayhost"])[1].rstrip() == "relayhost = mailrelay.mydomain.com" -def test_update(request, client): +def test_update(request, client, version): container_name="%s-monitoring" % branch_name # Pick a random old version that we can use to the setup the initial site with @@ -290,10 +300,10 @@ def test_update(request, client): # Don't use the regular startup procedure (which would start the site). Use # read to wait for termination of the container edition = "enterprise" - _build(request, client, edition, build_version) + _build(request, client, edition, version) c_tmp = client.containers.run( name="%s-update" % container_name, - image=_image_name(edition, build_version), + image=_image_name(edition, version), detach=True, command=["bash", "-c", "echo HI ; read"], stdin_open=True, @@ -312,17 +322,17 @@ def test_update(request, client): assert exit_code == 0 # Verify result and stop the temporary container - c_tmp.exec_run(["omd", "version"], user="cmk")[1].endswith("%s\n" % build_version.omd_version()) + c_tmp.exec_run(["omd", "version"], user="cmk")[1].endswith("%s\n" % version.omd_version()) c_tmp.stop() # 6. rename old container c_orig.rename("%s-old" % container_name) # 7. create new container - c_new = _start(request, client, version=build_version, is_update=True, + c_new = _start(request, client, version=version, is_update=True, name=container_name, volumes_from=c_orig.id) # 8. verify result - c_new.exec_run(["omd", "version"], user="cmk")[1].endswith("%s\n" % build_version.omd_version()) + c_new.exec_run(["omd", "version"], user="cmk")[1].endswith("%s\n" % version.omd_version()) assert c_new.exec_run(["test", "-f", "pre-update-marker"], user="cmk", workdir="/omd/sites/cmk")[0] == 0

5 years, 11 months

Fixed werk text of werk 5845 regarding incompatibility.

by Marcel Schulte

Module: check_mk Branch: master Commit: 47a2bd92bc5a174d2f34259ee773b06b0b203ae2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47a2bd92bc5a17… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Tue Sep 25 06:56:48 2018 +0200 Fixed werk text of werk 5845 regarding incompatibility. Change-Id: Iff8780e192592ffcb3fc5b78a91d00a8da7ac633 --- .werks/5845 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.werks/5845 b/.werks/5845 index dba4b69..ae7b89f 100644 --- a/.werks/5845 +++ b/.werks/5845 @@ -9,3 +9,5 @@ Class: fix * fsc_fans and fsc_temp do not discover services anymore, if corresponding fsc_sc2_* data is available. * snmp_scan_functions were made more readable using functions in fsc.include + +Incompatible, because you may have to rediscover hosts formerly discovering both, either fsc_fans or fsc_temp AND their corresponding fsc_sc2_* checks.

5 years, 11 months

BI configuration: WATO slave sites without user login now also receive BI configuration changes

by Andreas Boesl

Module: check_mk Branch: master Commit: e1c005df5bf414f328f75c9264086b79ce667536 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1c005df5bf414… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 24 14:45:29 2018 +0200 BI configuration: WATO slave sites without user login now also receive BI configuration changes Change-Id: I4b2f0829279f7f75777200fa432ac6d6242d751f --- .werks/6663 | 14 ++++++++++++++ cmk/gui/plugins/wato/bi.py | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/6663 b/.werks/6663 new file mode 100644 index 0000000..35d4982 --- /dev/null +++ b/.werks/6663 @@ -0,0 +1,14 @@ +Title: BI configuration: WATO slave sites without user login now also receive BI configuration changes +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537792351 + +If a WATO slave site had no direct login access configured, it also did not receive any changes +within the BI configuration. As a result, BI checks running on the slave site never received +configuration updates in time. This has been fixed. + diff --git a/cmk/gui/plugins/wato/bi.py b/cmk/gui/plugins/wato/bi.py index f5007fb..acd3a9f 100644 --- a/cmk/gui/plugins/wato/bi.py +++ b/cmk/gui/plugins/wato/bi.py @@ -511,7 +511,8 @@ class ModeBI(WatoMode, BIManagement): def _add_change(self, action_name, text): - add_change(action_name, text, domains=[watolib.ConfigDomainGUI], sites=config.get_login_sites()) + site_ids = [site[0] for site in config.wato_slave_sites()] + [config.omd_site()] + add_change(action_name, text, domains=[watolib.ConfigDomainGUI], sites=site_ids) # .--------------------------------------------------------------------.

5 years, 12 months

6572 azure_agent_info: General state of Azure agent

by Moritz Kiemer

Module: check_mk Branch: master Commit: f213e6f25d9b72aa9a712aa4a87a435b5d3f57d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f213e6f25d9b72… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Sep 21 13:20:31 2018 +0200 6572 azure_agent_info: General state of Azure agent Add a check reporting on the general state of the azure special agent. It reports the remaining API calls (which are limited to 15.000 per hour), the monitored groups and encountered issues. Change-Id: I588e475d8440225d22d91b85630feb7920cbbb39 --- .werks/6572 | 12 ++++ checkman/azure_agent_info | 17 +++++ checks/azure_agent_info | 115 +++++++++++++++++++++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 8 ++- cmk/gui/plugins/wato/check_parameters.py | 39 +++++++++++ 5 files changed, 190 insertions(+), 1 deletion(-) diff --git a/.werks/6572 b/.werks/6572 new file mode 100644 index 0000000..a827b43 --- /dev/null +++ b/.werks/6572 @@ -0,0 +1,12 @@ +Title: azure_agent_info: General state of Azure agent +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1537528740 +Class: feature + +Add a check reporting on the general state of the azure special agent. +It reports the remaining API calls (which are limited to 15.000 per hour), +the monitored groups and encountered issues. diff --git a/checkman/azure_agent_info b/checkman/azure_agent_info new file mode 100644 index 0000000..42d0830 --- /dev/null +++ b/checkman/azure_agent_info @@ -0,0 +1,17 @@ +title: Azure Agent Info +agents: linux +catalog: app/Azure +license: GPL +distribution: check_mk +description: + This check reports the general state of the azure special agent. + It reports the remaining API calls (which are limited to 15.000 per hour), + the monitored groups and encountered issues. + +item: + "Azure Agent Info". + +inventory: + One service is created per monitored resource group and one for the + host that runs the agent. + diff --git a/checks/azure_agent_info b/checks/azure_agent_info new file mode 100644 index 0000000..7972c1f --- /dev/null +++ b/checks/azure_agent_info @@ -0,0 +1,115 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. +import json + + +factory_settings['azure_agent_info_levels'] = { + 'warning_levels': (1, 10), + 'exception_levels': (1, 1), + 'remaining_reads_levels_lower': (1000, 100), + 'remaining_reads_unknown_state': 1, +} + + +def parse_azure_agent_info(info): + + parsed = {} + for row in info: + k, v = row[0], json.loads(' '.join(row[1:])) + + if k == 'remaining-reads': + try: + v = int(v) + v = min(int(parsed.get(k, 'fail')), v) + except ValueError: + pass + parsed[k] = v + continue + + elif k == 'issue': + issues = parsed.setdefault('issues', {}) + issues.setdefault(v['type'], []).append(v) + continue + + parsed.setdefault(k, []).append(v) + + return parsed + + +def discovery_azure_agent_info(parsed): + yield "Azure Agent Info", {} + + +def check_azure_agent_info(item, params, parsed): + + reads = parsed.get('remaining-reads') + # this is only reported for the Datasource Host, so None + # is ignored. + if reads is not None: + state, txt = 0, "Remaining API reads: %s" % reads + if not isinstance(reads, int): + yield params['remaining_reads_unknown_state'], txt + else: + warn, crit = params.get('remaining_reads_levels_lower', (None, None)) + if crit is not None and reads <= crit: + state = 2 + elif warn is not None and reads <= warn: + state = 1 + yield state, txt, [('remaining_reads', reads, warn, crit, 0, 15000)] + + groups = parsed.get('monitored-groups') + if groups is not None: + yield 0, "Monitored groups: %s" % ', '.join(groups[0]) + + issues = parsed.get('issues', {}) + for t in ('warning', 'exception'): + count = len(issues.get(t, ())) + state, txt = 0, "%d %ss" % (count, t) + warn, crit = params.get('%s_levels' % t, (None, None)) + if crit is not None and count >= crit: + state = 2 + elif warn is not None and count >= warn: + state = 1 + yield state, txt + + for i in sorted(issues.get('exception', []), key=lambda x: x["msg"]): + yield 0, "\nIssue in %s: Exception: %s (!!)" % (i["issued_by"], i["msg"]) + for i in sorted(issues.get('warning', []), key=lambda x: x["msg"]): + yield 0, "\nIssue in %s: Warning: %s (!)" % (i["issued_by"], i["msg"]) + for i in sorted(issues.get('info', []), key=lambda x: x["msg"]): + yield 0, "\nIssue in %s: Info: %s" % (i["issued_by"], i["msg"]) + + +check_info['azure_agent_info'] = { + 'parse_function' : parse_azure_agent_info, + 'inventory_function' : discovery_azure_agent_info, + 'check_function' : check_azure_agent_info, + 'service_description' : "%s", + 'default_levels_variable': "azure_agent_info_levels", + 'has_perfdata' : True, + 'group' : "azure_agent_info", +} + diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index d0a126a..0e1fee0 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -4409,7 +4409,13 @@ metric_info["queue"] = { metric_info["avg_response_time"] = { "title" : _("Average response time"), "unit" : "s", - "color" : "#4040ff" + "color" : "#4040ff", +} + +metric_info["remaining_reads"] = { + "title" : _("Remaining Reads"), + "unit" : "count", + "color" : "42/a", } #. diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 6092885..b7120d7 100755 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -4851,6 +4851,44 @@ register_check_parameters( ) +register_check_parameters( + subgroup_applications, + "azure_agent_info", + ("Azure Agent Info"), + Dictionary( + elements = [ + ("warning_levels", Tuple( + title = _("Upper levels for encountered warnings"), + elements = [ + Integer(title = _("Warning at"), default_value=1), + Integer(title = _("Critical at"), default_value=10), + ], + )), + ("exception_levels", Tuple( + title = _("Upper levels for encountered exceptions"), + elements = [ + Integer(title = _("Warning at"), default_value=1), + Integer(title = _("Critical at"), default_value=1), + ], + )), + ("remaining_reads_levels_lower", Tuple( + title = _("Lower levels for remaining API reads"), + elements = [ + Integer(title = _("Warning below"), default_value=1000), + Integer(title = _("Critical below"), default_value=100), + ], + )), + ("remaining_reads_unknown_state", MonitoringState( + title = _("State if remaining API reads are unknown"), + default_value = 1 + )), + ] + ), + TextAscii(title = _("Azure Agent Info")), + match_type = "dict", +) + + #. # .--Environment---------------------------------------------------------. # | _____ _ _ | @@ -16376,6 +16414,7 @@ register_check_parameters( TextAscii( title = _("Node ID")), "first" ) + register_check_parameters( subgroup_environment, "carbon_monoxide",

5 years, 12 months

5845 FIX fsc checks: prevent fsc_fans and fsc_temp if corresponding fsc_sc2-* data is available , made snmp_scan_functions more readable

by Marcel Schulte

Module: check_mk Branch: master Commit: 872d5e928f45edfa413d4242e2c299f414ebd08c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=872d5e928f45ed… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Fri Sep 21 12:59:22 2018 +0200 5845 FIX fsc checks: prevent fsc_fans and fsc_temp if corresponding fsc_sc2-* data is available, made snmp_scan_functions more readable * fsc_fans and fsc_temp do not discover services anymore, if corresponding fsc_sc2_* data is available. * snmp_scan_functions were made more readable using functions in fsc.include Change-Id: Icd54931060d33fc4fd97af826c1e2beebb7ad1b2 --- .werks/5845 | 11 ++++++++++ checks/fsc.include | 47 ++++++++++++++++++++++++++++++++++++++++ checks/fsc_fans | 16 +++++++------- checks/fsc_sc2_cpu_status | 23 ++++++++++---------- checks/fsc_sc2_fans | 28 ++++++++++++------------ checks/fsc_sc2_info | 13 ++++++----- checks/fsc_sc2_mem_status | 19 ++++++++-------- checks/fsc_sc2_power_consumption | 24 ++++++++++---------- checks/fsc_sc2_psu | 23 ++++++++++---------- checks/fsc_sc2_temp | 28 ++++++++++++------------ checks/fsc_sc2_voltage | 28 ++++++++++++------------ checks/fsc_subsystems | 12 +++++----- checks/fsc_temp | 16 +++++++------- 13 files changed, 175 insertions(+), 113 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=872d5e928f…

5 years, 12 months

agent_azure: fix API call, azure.include: fix tag formatting

by Moritz Kiemer

Module: check_mk Branch: master Commit: b2ad01a6d21f24206093581c6bd6dd9e549447c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2ad01a6d21f24… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Sep 24 10:31:36 2018 +0200 agent_azure: fix API call, azure.include: fix tag formatting Change-Id: I86665dd89186a35a7c8e5420c4cc01773f5b8b13 --- agents/special/agent_azure | 26 ++++++++++++++++++-------- checks/azure.include | 11 ++++++----- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index 7cae8eb..6c44d11 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -336,11 +336,14 @@ class AzureClient(object): self._resource_client = ResourceManagementClient(self._creds, args.subscription_id) # compute timespan once, and keep it fixed - time_end = datetime.datetime.utcnow() - time_min = datetime.timedelta(minutes=5) - time_hrs = datetime.timedelta(hours=2) - self.timespan_min = "%s/%s" % (time_end - time_min, time_end) - self.timespan_hrs = "%s/%s" % (time_end - time_hrs, time_end) + t_end = datetime.datetime.utcnow() + t_min = t_end - datetime.timedelta(minutes=5) + t_hrs = t_end - datetime.timedelta(hours=2) + self.timespan_min = "/".join((t_min.strftime("%Y-%m-%dT%H:%M:%SZ"), + t_end.strftime("%Y-%m-%dT%H:%M:%SZ"))) + self.timespan_hrs = "/".join((t_hrs.strftime("%Y-%m-%dT%H:%M:%SZ"), + t_end.strftime("%Y-%m-%dT%H:%M:%SZ"))) + self.resources_cache = None self.metrics_cache = {} @@ -353,8 +356,14 @@ class AzureClient(object): def discover_metrics(self, rid): if rid not in self.metrics_cache: - # azure-api-call - md_list = list(self._monitor_client.metric_definitions.list(rid)) + try: + # azure-api-call + md_list = list(self._monitor_client.metric_definitions.list(rid)) + except ErrorResponseException, exc: + if "is not a supported platform metric namespace" in exc.message: + md_list = [] + else: + raise exc self.metrics_cache[rid] = md_list log.debug("%d discovered metrics: %r", len(md_list), [md.name.value for md in md_list]) return self.metrics_cache[rid] @@ -382,6 +391,7 @@ class AzureClient(object): for m_def in self.discover_metrics(rid): # sort into categories cat = self._categorize_metric(m_def) categorized_metrics.setdefault(cat, []).append(m_def) + log.debug("categorized_metrics = %r", categorized_metrics) for time_grain in ('PT1M', 'PT1H'): metrics_no_dim = categorized_metrics.get('%s_no_dim' % time_grain) @@ -427,7 +437,7 @@ class AzureClient(object): rid, timespan=timespan, interval=time_grain, - metric=metricnames, + metricnames=metricnames, aggregation=aggregations, filter=filters, raw=True, diff --git a/checks/azure.include b/checks/azure.include index 4cc4059..4a68d3d 100644 --- a/checks/azure.include +++ b/checks/azure.include @@ -36,13 +36,14 @@ def get_resource(check_function): def azure_iter_informative_attrs(resource): - loc = resource.get('location', None) - if loc: + + loc = resource.get('location') + if loc is not None: yield 'Location', loc - tags = resource.get('tags', {}) - for k, v in tags.iteritems(): + + for k, v in resource.get('tags', {}).iteritems(): if not k.startswith("hidden-"): - yield k, v + yield k[0].upper() + k[1:], v def check_azure_metric(resource, metric_key, cmk_key, display_name, levels=None,

5 years, 12 months

← Newer
1
...
8
9
10
11
12
13
14
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018