Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

Tentative revert, trying to get CI back in shape.

by Sven Panne

Module: check_mk Branch: master Commit: bad5c6048ed3774e4bdc1d10a8277dac6781c5ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bad5c6048ed377… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 10 08:14:19 2017 +0100 Tentative revert, trying to get CI back in shape. Not sure if this is the real reason, but CI complained starting with the first of the 2 commits: Revert "df: Discovery test for the behaviour of the include volume name rule" This reverts commit a604ad9f22efce8695f40631dc6579f02731bb51. Revert "df: Rudimentary test for discovery" This reverts commit 7a2f088b80a20367bfae7a62ee9eb40dbe255b5c. If things are still broken after this revert, we can re-apply the patches. --- tests/checks/test_df.py | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/tests/checks/test_df.py b/tests/checks/test_df.py deleted file mode 100644 index 13bf982..0000000 --- a/tests/checks/test_df.py +++ /dev/null @@ -1,41 +0,0 @@ -import pytest -import pprint -import sys - -pytestmark = pytest.mark.check - -(a)pytest.mark.parametrize("info,result,include_volume_name", [ - ([], [], False), - ([[u'/dev/sda4', - u'ext4', - u'143786696', - u'101645524', - u'34814148', - u'75%', - u'/'], - [u'[df_inodes_start]'], - [u'/dev/sda4', u'ext4', u'9142272', u'1654272', u'7488000', u'19%', u'/'], - [u'[df_inodes_end]']], [(u'/', {})], False), - ([[u'/dev/sda4', - u'ext4', - u'143786696', - u'101645524', - u'34814148', - u'75%', - u'/'], - [u'[df_inodes_start]'], - [u'/dev/sda4', u'ext4', u'9142272', u'1654272', u'7488000', u'19%', u'/'], - [u'[df_inodes_end]']], [(u'/dev/sda4 /', {})], True), -]) -def test_df_discovery_with_parse(check_manager, monkeypatch, info, result, include_volume_name): - import cmk_base.checks - -# NOTE: This is the result of trying to mock the the ruleset variable itself instead of the -# host_extra_conf_merged function. It did not work. Maybe we can get it to work at a later stage. -# import cmk_base.rulesets -# monkeypatch.setitem(cmk_base.checks._check_contexts["df"], "inventory_df_rules", -# [({"include_volume_name": include_volume_name}, [], cmk_base.rulesets.ALL_HOSTS, {})]) - - check = check_manager.get_check("df") - monkeypatch.setitem(cmk_base.checks._check_contexts["df"], "host_extra_conf_merged", lambda _, __: {"include_volume_name": include_volume_name}) - assert check.run_discovery(check.run_parse(info)) == result

7 years

5241 FIX netapp_api_connection: removed some invalid warning messages, which appear on virtual netapp systems

by Andreas Boesl

Module: check_mk Branch: master Commit: db9243ebe8f92ac1ab8fa8822682d60a11112829 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db9243ebe8f92a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 9 13:31:43 2017 +0100 5241 FIX netapp_api_connection: removed some invalid warning messages, which appear on virtual netapp systems A virtual netapp system has no sensor information (temp, fan, etc.) available.. Change-Id: I5c9fe3ba6fb6f472c8440a871846fc5fc6d0d290 --- .werks/5241 | 11 +++++++++++ agents/special/agent_netapp | 17 ++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/.werks/5241 b/.werks/5241 new file mode 100644 index 0000000..b20167a --- /dev/null +++ b/.werks/5241 @@ -0,0 +1,11 @@ +Title: netapp_api_connection: removed some invalid warning messages, which appear on virtual netapp systems +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1510230603 + +A virtual netapp system has no sensor information (temp, fan, etc.) available.. diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 4a1d6c8..8829241 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -202,11 +202,19 @@ else: class ErrorMessages(): def __init__(self): - self.messages = set([]) + self.messages = set() def add_message(self, message): self.messages.add(message) + def remove_messages(self, infix_text): + new_messages = set() + for message in self.messages: + if infix_text in message: + continue + new_messages.add(message) + self.messages = new_messages + def format_messages(self): return "\n".join(self.messages) @@ -544,10 +552,13 @@ def debug_node(node): def output_error_section(): if opt_legacy: - import pprint - pprint.pprint(section_errors) + print "<<<netapp_api_connection>>>" + sys.stdout.write("\n".join(section_errors)) else: print "<<<netapp_api_connection>>>" + # Remove some messages which may appear on a Netapp Simulator + server.error_messages.remove_messages("storage-shelf-environment-list-info: Enclosure services scan not done") + server.error_messages.remove_messages("environment-sensors-get-iter: invalid operation") print server.error_messages.format_messages() nodes = []

7 years

5354 FIX cmctc_lcp: Fixes an error leading to wrong inventory and check output

by Tom Baerwinkel

Module: check_mk Branch: master Commit: dad4190d391bb41f7880aebca3d71d62a9f465b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dad4190d391bb4… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Nov 9 10:09:48 2017 +0100 5354 FIX cmctc_lcp: Fixes an error leading to wrong inventory and check output This werk fixes an error which caused that the inventory for some sensors was not performed correctly. This resulted in a wrong amount of discovered services and a wrong output (numbers and units) for these services . Therefore, the services of the corresponding hosts have to be rediscovered. Temperature sensors are not affected by this error. One other type of sensor is not affected as well. Which sensor type it is might depend on the used Python version. In tests using Python version 2.7.14 Blower sensors were not affected. Change-Id: I4c4d941006a2ea19acd42582359fd3f035b15a9c --- .werks/5354 | 17 +++++++++++++++++ checks/cmctc_lcp | 34 ++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/.werks/5354 b/.werks/5354 new file mode 100644 index 0000000..d52de1c --- /dev/null +++ b/.werks/5354 @@ -0,0 +1,17 @@ +Title: cmctc_lcp: Fixes an error leading to wrong inventory and check output +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.5.0i1 +Date: 1510217496 +Class: fix + +This werk fixes an error which caused that the inventory for some sensors +was not performed correctly. This resulted in a wrong amount of discovered +services and a wrong output (numbers and units) for these services . +Therefore, the services of the corresponding hosts have to be rediscovered. +Temperature sensors are not affected by this error. One other type of +sensor is not affected as well. Which sensor type it is might depend on the +used Python version. In tests using Python version 2.7.14 Blower sensors +were not affected. diff --git a/checks/cmctc_lcp b/checks/cmctc_lcp index 0637aeb..a16d8f3 100644 --- a/checks/cmctc_lcp +++ b/checks/cmctc_lcp @@ -174,15 +174,33 @@ snmp_info["cmctc_lcp"] = ( ] ) +check_info['cmctc_lcp.blower'] = { + "check_function" : lambda item,params,info: check_cmctc_lcp(item, params, info, 'blower'), + "inventory_function" : lambda info: inventory_cmctc_lcp(info, 'blower'), + "has_perfdata" : True, + "service_description" : "Blower %s", +} + +check_info['cmctc_lcp.blowergrade'] = { + "check_function" : lambda item,params,info: check_cmctc_lcp(item, params, info, 'blowergrade'), + "inventory_function" : lambda info: inventory_cmctc_lcp(info, 'blowergrade'), + "has_perfdata" : True, + "service_description" : "Blower Grade %s", +} -for _s, _i in cmctc_lcp_sensortypes.items(): - if _s != "temp": - check_info['cmctc_lcp.' + _s] = { - "check_function" : lambda item,params,info: check_cmctc_lcp(item, params, info, _s), - "inventory_function" : lambda info: inventory_cmctc_lcp(info, _s), - "has_perfdata" : True, - "service_description" : _i[1] + " %s", - } +check_info['cmctc_lcp.flow'] = { + "check_function" : lambda item,params,info: check_cmctc_lcp(item, params, info, 'flow'), + "inventory_function" : lambda info: inventory_cmctc_lcp(info, 'flow'), + "has_perfdata" : True, + "service_description" : "Waterflow %s", +} + +check_info['cmctc_lcp.regulator'] = { + "check_function" : lambda item,params,info: check_cmctc_lcp(item, params, info, 'regulator'), + "inventory_function" : lambda info: inventory_cmctc_lcp(info, 'regulator'), + "has_perfdata" : True, + "service_description" : "Regulator %s", +} # temperature check is standardised check_info['cmctc_lcp.temp'] = {

7 years

Tiny simplification.

by Sven Panne

Module: check_mk Branch: master Commit: eff2a06a491176e89493de6ab39a17a97074b4b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eff2a06a491176… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 9 09:56:32 2017 +0100 Tiny simplification. Change-Id: I1790c3d879e70153198b41a192e0fe3cb44b6e98 --- livestatus/src/OffsetStringHostMacroColumn.h | 8 ++++---- livestatus/src/OffsetStringMacroColumn.h | 6 +++--- livestatus/src/OffsetStringServiceMacroColumn.h | 8 ++++---- livestatus/src/TableHosts.cc | 12 ++++++------ livestatus/src/TableServices.cc | 13 ++++++------- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/livestatus/src/OffsetStringHostMacroColumn.h b/livestatus/src/OffsetStringHostMacroColumn.h index 161419a..d74e0f9 100644 --- a/livestatus/src/OffsetStringHostMacroColumn.h +++ b/livestatus/src/OffsetStringHostMacroColumn.h @@ -36,11 +36,11 @@ public: OffsetStringHostMacroColumn(const std::string &name, const std::string &description, int indirect_offset, int extra_offset, - int extra_extra_offset, int offset, - int string_offset) + int extra_extra_offset, int offset) : OffsetStringMacroColumn(name, description, indirect_offset, - extra_offset, extra_extra_offset, offset, - string_offset) {} + extra_offset, extra_extra_offset, offset) {} + +private: const host *getHost(Row row) const override; const service *getService(Row row) const override; }; diff --git a/livestatus/src/OffsetStringMacroColumn.h b/livestatus/src/OffsetStringMacroColumn.h index a4b73d5..5421b8a 100644 --- a/livestatus/src/OffsetStringMacroColumn.h +++ b/livestatus/src/OffsetStringMacroColumn.h @@ -41,10 +41,10 @@ public: OffsetStringMacroColumn(const std::string &name, const std::string &description, int indirect_offset, int extra_offset, int extra_extra_offset, - int offset, int string_offset) + int offset) : StringColumn(name, description, indirect_offset, extra_offset, - extra_extra_offset, offset) - , _string_offset(string_offset) {} + extra_extra_offset, 0) + , _string_offset(offset) {} std::string getValue(Row row) const override; diff --git a/livestatus/src/OffsetStringServiceMacroColumn.h b/livestatus/src/OffsetStringServiceMacroColumn.h index 969219b..2330c37 100644 --- a/livestatus/src/OffsetStringServiceMacroColumn.h +++ b/livestatus/src/OffsetStringServiceMacroColumn.h @@ -36,11 +36,11 @@ public: OffsetStringServiceMacroColumn(const std::string &name, const std::string &description, int indirect_offset, int extra_offset, - int extra_extra_offset, int offset, - int string_offset) + int extra_extra_offset, int offset) : OffsetStringMacroColumn(name, description, indirect_offset, - extra_offset, extra_extra_offset, offset, - string_offset) {} + extra_offset, extra_extra_offset, offset) {} + +private: const host *getHost(Row row) const override; const service *getService(Row row) const override; }; diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 66d7d3c..ec8544c 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -94,7 +94,7 @@ void TableHosts::addColumns(Table *table, const std::string &prefix, table->addColumn(std::make_unique<OffsetStringHostMacroColumn>( prefix + "check_command_expanded", "Nagios command for active host check of this host with the macros expanded", - indirect_offset, extra_offset, -1, 0, + indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, check_command))); #else table->addColumn(std::make_unique<OffsetStringColumn>( @@ -104,7 +104,7 @@ void TableHosts::addColumns(Table *table, const std::string &prefix, table->addColumn(std::make_unique<OffsetStringHostMacroColumn>( prefix + "check_command_expanded", "Nagios command for active host check of this host with the macros expanded", - indirect_offset, extra_offset, -1, 0, + indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, host_check_command))); #endif table->addColumn(std::make_unique<OffsetStringColumn>( @@ -131,7 +131,7 @@ void TableHosts::addColumns(Table *table, const std::string &prefix, table->addColumn(std::make_unique<OffsetStringHostMacroColumn>( prefix + "notes_expanded", "The same as notes, but with the most important macros expanded", - indirect_offset, extra_offset, -1, 0, DANGEROUS_OFFSETOF(host, notes))); + indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, notes))); table->addColumn(std::make_unique<OffsetStringColumn>( prefix + "notes_url", "An optional URL with further information about the host", @@ -140,7 +140,7 @@ void TableHosts::addColumns(Table *table, const std::string &prefix, table->addColumn(std::make_unique<OffsetStringHostMacroColumn>( prefix + "notes_url_expanded", "Same es notes_url, but with the most important macros expanded", - indirect_offset, extra_offset, -1, 0, + indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, notes_url))); table->addColumn(std::make_unique<OffsetStringColumn>( prefix + "action_url", @@ -150,7 +150,7 @@ void TableHosts::addColumns(Table *table, const std::string &prefix, table->addColumn(std::make_unique<OffsetStringHostMacroColumn>( prefix + "action_url_expanded", "The same as action_url, but with the most important macros expanded", - indirect_offset, extra_offset, -1, 0, + indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, action_url))); table->addColumn(std::make_unique<OffsetStringColumn>( prefix + "plugin_output", "Output of the last host check", @@ -168,7 +168,7 @@ void TableHosts::addColumns(Table *table, const std::string &prefix, table->addColumn(std::make_unique<OffsetStringHostMacroColumn>( prefix + "icon_image_expanded", "The same as icon_image, but with the most important macros expanded", - indirect_offset, extra_offset, -1, 0, + indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, icon_image))); table->addColumn(std::make_unique<OffsetStringColumn>( prefix + "icon_image_alt", "Alternative text for the icon_image", diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index f0fdc83..ed1c27c 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -84,7 +84,7 @@ void TableServices::addColumns(Table *table, const std::string &prefix, table->addColumn(std::make_unique<OffsetStringServiceMacroColumn>( prefix + "check_command_expanded", "Nagios command used for active checks with the macros expanded", - indirect_offset, -1, -1, 0, + indirect_offset, -1, -1, DANGEROUS_OFFSETOF(service, service_check_command))); #else table->addColumn(std::make_unique<OffsetStringColumn>( @@ -93,8 +93,7 @@ void TableServices::addColumns(Table *table, const std::string &prefix, table->addColumn(std::make_unique<OffsetStringServiceMacroColumn>( prefix + "check_command_expanded", "Nagios command used for active checks with the macros expanded", - indirect_offset, -1, -1, 0, - DANGEROUS_OFFSETOF(service, check_command))); + indirect_offset, -1, -1, DANGEROUS_OFFSETOF(service, check_command))); #endif table->addColumn(std::make_unique<OffsetStringColumn>( prefix + "event_handler", "Nagios command used as event handler", @@ -128,7 +127,7 @@ void TableServices::addColumns(Table *table, const std::string &prefix, table->addColumn(std::make_unique<OffsetStringServiceMacroColumn>( prefix + "notes_expanded", "The notes with (the most important) macros expanded", indirect_offset, - -1, -1, 0, DANGEROUS_OFFSETOF(service, notes))); + -1, -1, DANGEROUS_OFFSETOF(service, notes))); table->addColumn(std::make_unique<OffsetStringColumn>( prefix + "notes_url", "An optional URL for additional notes about the service", @@ -136,7 +135,7 @@ void TableServices::addColumns(Table *table, const std::string &prefix, table->addColumn(std::make_unique<OffsetStringServiceMacroColumn>( prefix + "notes_url_expanded", "The notes_url with (the most important) macros expanded", - indirect_offset, -1, -1, 0, DANGEROUS_OFFSETOF(service, notes_url))); + indirect_offset, -1, -1, DANGEROUS_OFFSETOF(service, notes_url))); table->addColumn(std::make_unique<OffsetStringColumn>( prefix + "action_url", "An optional URL for actions or custom information about the service", @@ -144,7 +143,7 @@ void TableServices::addColumns(Table *table, const std::string &prefix, table->addColumn(std::make_unique<OffsetStringServiceMacroColumn>( prefix + "action_url_expanded", "The action_url with (the most important) macros expanded", - indirect_offset, -1, -1, 0, DANGEROUS_OFFSETOF(service, action_url))); + indirect_offset, -1, -1, DANGEROUS_OFFSETOF(service, action_url))); table->addColumn(std::make_unique<OffsetStringColumn>( prefix + "icon_image", "The name of an image to be used as icon in the web interface", @@ -152,7 +151,7 @@ void TableServices::addColumns(Table *table, const std::string &prefix, table->addColumn(std::make_unique<OffsetStringServiceMacroColumn>( prefix + "icon_image_expanded", "The icon_image with (the most important) macros expanded", - indirect_offset, -1, -1, 0, DANGEROUS_OFFSETOF(service, icon_image))); + indirect_offset, -1, -1, DANGEROUS_OFFSETOF(service, icon_image))); table->addColumn(std::make_unique<OffsetStringColumn>( prefix + "icon_image_alt", "An alternative text for the icon_image for browsers not displaying icons",

7 years

df: Discovery test for the behaviour of the include volume name rule

by Konstantin Büttner

Module: check_mk Branch: master Commit: a604ad9f22efce8695f40631dc6579f02731bb51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a604ad9f22efce… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 8 17:05:01 2017 +0100 df: Discovery test for the behaviour of the include volume name rule Change-Id: I4cf914a938903be0c101ac2f31352348f15cefa1 --- tests/checks/test_df.py | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/tests/checks/test_df.py b/tests/checks/test_df.py index 10386e5..13bf982 100644 --- a/tests/checks/test_df.py +++ b/tests/checks/test_df.py @@ -1,11 +1,41 @@ import pytest +import pprint +import sys pytestmark = pytest.mark.check -(a)pytest.mark.parametrize("info,result", [ - ([], []) +(a)pytest.mark.parametrize("info,result,include_volume_name", [ + ([], [], False), + ([[u'/dev/sda4', + u'ext4', + u'143786696', + u'101645524', + u'34814148', + u'75%', + u'/'], + [u'[df_inodes_start]'], + [u'/dev/sda4', u'ext4', u'9142272', u'1654272', u'7488000', u'19%', u'/'], + [u'[df_inodes_end]']], [(u'/', {})], False), + ([[u'/dev/sda4', + u'ext4', + u'143786696', + u'101645524', + u'34814148', + u'75%', + u'/'], + [u'[df_inodes_start]'], + [u'/dev/sda4', u'ext4', u'9142272', u'1654272', u'7488000', u'19%', u'/'], + [u'[df_inodes_end]']], [(u'/dev/sda4 /', {})], True), ]) -def test_df_discovery_with_parse(check_manager, info, result): +def test_df_discovery_with_parse(check_manager, monkeypatch, info, result, include_volume_name): + import cmk_base.checks + +# NOTE: This is the result of trying to mock the the ruleset variable itself instead of the +# host_extra_conf_merged function. It did not work. Maybe we can get it to work at a later stage. +# import cmk_base.rulesets +# monkeypatch.setitem(cmk_base.checks._check_contexts["df"], "inventory_df_rules", +# [({"include_volume_name": include_volume_name}, [], cmk_base.rulesets.ALL_HOSTS, {})]) + check = check_manager.get_check("df") + monkeypatch.setitem(cmk_base.checks._check_contexts["df"], "host_extra_conf_merged", lambda _, __: {"include_volume_name": include_volume_name}) assert check.run_discovery(check.run_parse(info)) == result -

7 years

agent_netapp: Make executable

by Konstantin Büttner

Module: check_mk Branch: master Commit: ca3f2b0e44ae0dd46cd1ea6e74d0d25a8bc133c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca3f2b0e44ae0d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 8 17:06:35 2017 +0100 agent_netapp: Make executable Change-Id: I22c4341d0db09fd5ba495f01f92a414febb1b670 --- agents/special/agent_netapp | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp old mode 100644 new mode 100755

7 years

df: Reduce return points of inventory function to one

by Konstantin Büttner

Module: check_mk Branch: master Commit: 93fdc236b3769a5b10f375bc3451043c778e6bcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93fdc236b3769a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 8 15:05:18 2017 +0100 df: Reduce return points of inventory function to one Change-Id: I9eefbb2c61a5626817a73c9f5877252a80491d9c --- checks/df | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/df b/checks/df index cd6fabe..e3384bc 100644 --- a/checks/df +++ b/checks/df @@ -211,9 +211,9 @@ def inventory_df(parsed): inventory.append((item, params)) else: inventory.append(entry) - return inventory else: - return df_inventory(mplist) + inventory = df_inventory(mplist) + return inventory def check_df(item, params, parsed):

7 years

5197 FIX Improved Event Console history performance

by Sven Panne

Module: check_mk Branch: master Commit: 616554fe8a4ef86a900ac6405596e6bd21137431 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=616554fe8a4ef8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 8 14:52:07 2017 +0100 5197 FIX Improved Event Console history performance Due to architectural changes in Check_MK 1.4.0, the performance of querying the event console history had suffered. This has been fixed, now time ranges are used again to speed up common queries. Change-Id: I676a91a6daa55c29d5980a14923572d20ca0e449 --- .werks/5197 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5197 b/.werks/5197 new file mode 100644 index 0000000..7e57ead --- /dev/null +++ b/.werks/5197 @@ -0,0 +1,12 @@ +Title: Improved Event Console history performance +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1510148949 +Class: fix + +Due to architectural changes in Check_MK 1.4.0, the performance of querying +the event console history had suffered. This has been fixed, now time +ranges are used again to speed up common queries.

7 years

Hackily reconstruct time range filter for EC.

by Sven Panne

Module: check_mk Branch: master Commit: 608b4e143dc92597075748df964079f6a0f53450 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=608b4e143dc925… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 8 14:42:58 2017 +0100 Hackily reconstruct time range filter for EC. Change-Id: I00c8dcc9537e36375f59580745a73b0893acd76e --- livestatus/src/TableEventConsole.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index 107f31a..afec50b 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -24,6 +24,7 @@ #include "TableEventConsole.h" #include <algorithm> +#include <ctime> #include <iosfwd> #include <iostream> #include <memory> @@ -54,6 +55,17 @@ private: os << " " << c->name(); } } + // HACK: Reconstruct time range filter + auto end = time(nullptr) + 1; + int since = 0; + int until = end; + _query->findIntLimits("history_time", &since, &until); + if (since != 0) { + os << "\nFilter: history_time >= " << since; + } + if (until != end) { + os << "\nFilter: history_time <= " << until - 1; + } os << std::endl; }

7 years

5240 FIX agent_netapp, environmental sensors monitoring. No longer fails if a node has no configured shelfes

by Andreas Boesl

Module: check_mk Branch: master Commit: a57816c0f866eec3baaca9bcf878cfa510a9459c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a57816c0f866ee… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 8 14:42:56 2017 +0100 5240 FIX agent_netapp, environmental sensors monitoring. No longer fails if a node has no configured shelfes This fixes the error message <tt>"NoneType" object has no attribute 'children_get'</tt>, reported by the check <tt>NetApp filer connection</tt>. Change-Id: I5d27c07cf801012e14fef15326d1519a2e08d6d1 --- .werks/5240 | 13 +++++++++++++ agents/special/agent_netapp | 20 ++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.werks/5240 b/.werks/5240 new file mode 100644 index 0000000..24ae476 --- /dev/null +++ b/.werks/5240 @@ -0,0 +1,13 @@ +Title: agent_netapp, environmental sensors monitoring. No longer fails if a node has no configured shelfes +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1510148440 + +This fixes the error message <tt>"NoneType" object has no attribute 'children_get'</tt>, reported by the check <tt>NetApp filer connection</tt>. + + diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp old mode 100755 new mode 100644 index 77f2654..4a1d6c8 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -985,9 +985,9 @@ try: # Cluster info # TODO: check is missing + ha_partners = {} # Used later on by environmental sensors if "cf" not in licenses["v1_disabled"]: cluster_status = query_nodes("cf-status", node_attribute = "node") - ha_partners = {} # Used later on by environmental sensors if cluster_status: print "<<<netapp_api_cm_cluster:sep(9)>>>" for node, entry in cluster_status.items(): @@ -1137,9 +1137,19 @@ try: for node, values in environment_info.items(): if node in processed_nodes: continue + + # HA partners always report redundant environmental data. + # (Node1/Node2) <--Cluster--> (Node3/Node4) + # We skip data from Node2 and Node4. + processed_nodes.append(node) + if node in ha_partners: + processed_nodes.append(ha_partners[node]) + channel_list = values.child_get("shelf-environ-channel-list") + if not channel_list: + continue + for channel in channel_list.children_get(): # cycle channel list - shelf_list = channel.child_get("shelf-environ-shelf-list") for shelf in channel.child_get("shelf-environ-shelf-list").children_get(): # cycle shelf list shelf_id = shelf.child_get_string("shelf-id") for what, section in [ ("power-supply-list", "netapp_api_psu"), @@ -1148,12 +1158,6 @@ try: print "<<<%s:sep(9)>>>" % section node = shelf.child_get(what) print format_config(node, what, shelf_id) - # HA partners always report redundant environmental data. - # (Node1/Node2) <--Cluster--> (Node3/Node4) - # We skip data from Node2 and Node4. - processed_nodes.append(node) - if node in ha_partners: - processed_nodes.append(ha_partners[node]) # Controller Status

7 years

← Newer
1
...
23
24
25
26
27
28
29
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017