Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 57423dff94deb0e3e264460caae88c9786a28a7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57423dff94deb0… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 1 10:01:11 2019 +0200 check_http: fix ambiguous title CMK-1873 Change-Id: Ibe064ec934fe45652c078879a9aede2551d9b4d3 --- cmk/gui/plugins/wato/active_checks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/wato/active_checks.py b/cmk/gui/plugins/wato/active_checks.py index c5cc2c4..6ac5d8f 100644 --- a/cmk/gui/plugins/wato/active_checks.py +++ b/cmk/gui/plugins/wato/active_checks.py @@ -1013,7 +1013,7 @@ class RulespecActiveChecksHttp(HostRulespec): elements=[ ("name", TextUnicode( - title=_("Name"), + title=_("Service name"), help=_( "Will be used in the service description. If the name starts with " "a caret (<tt>^</tt>), the service description will not be prefixed with either "

5 years, 3 months

fireeye.include, fireeye_mail: Fixed file formatting

by Simon Betz

Module: check_mk Branch: master Commit: af5ddd584203b47aafe5843af2b204043f84ca07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af5ddd584203b4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 1 12:15:32 2019 +0200 fireeye.include, fireeye_mail: Fixed file formatting Change-Id: I55afffb07d3a32cb084cde03cbe17fe52b81cc06 --- checks/fireeye.include | 4 ++-- checks/fireeye_mail | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/fireeye.include b/checks/fireeye.include index a69f8b6..5efa590 100644 --- a/checks/fireeye.include +++ b/checks/fireeye.include @@ -68,7 +68,7 @@ def check_fireeye_states(states): def fireeye_check_generic(infotext, counter, value, warn=None, crit=None): perfdata = [(counter, value, warn, crit)] if crit is not None and value >= crit: - return (2, infotext + ' (warn/crit at %d/%d)' % (warn,crit), perfdata) + return (2, infotext + ' (warn/crit at %d/%d)' % (warn, crit), perfdata) elif warn is not None and value >= warn: - return (1, infotext + ' (warn/crit at %d/%d)' % (warn,crit), perfdata) + return (1, infotext + ' (warn/crit at %d/%d)' % (warn, crit), perfdata) return (0, infotext, perfdata) diff --git a/checks/fireeye_mail b/checks/fireeye_mail index bef7295..4193683 100644 --- a/checks/fireeye_mail +++ b/checks/fireeye_mail @@ -43,7 +43,7 @@ def fireeye_counter_generic(value, what, average): avg = get_average(' %s avg' % counter, this_time, rate, average) return (state, '%s: %.2f mails/%d seconds' % \ (what, avg * average, average), perfdata) - return (state, '%s: %.2f mails/s' % (what, rate ), perfdata) + return (state, '%s: %.2f mails/s' % (what, rate), perfdata) # .--mail----------------------------------------------------------------.

5 years, 3 months

7386 FIX docker_node_disk_usage: Handle busy docker daemon

by Moritz Kiemer

Module: check_mk Branch: master Commit: f3eec1e2acfba3faa8ba966c5dfb4196454bee87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3eec1e2acfba3… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 1 10:59:30 2019 +0200 7386 FIX docker_node_disk_usage: Handle busy docker daemon If the docker daemon cannot get the disk usage info, the corresponding services will become stale without the Check_MK Discovery service going into a WARNING state. This can happen if you are calling the mk_docker plugin from different Sites. Consider configuring asynchronous plugin execution in this case. CMK-1786 Change-Id: Ic869f486e1a3a63efd607d8dc4254638596128b3 --- .werks/7386 | 14 ++++++++++++++ agents/plugins/mk_docker.py | 9 +++++++-- tests/unit/plugins/test_mk_docker.py | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.werks/7386 b/.werks/7386 new file mode 100644 index 0000000..6fa4e7e --- /dev/null +++ b/.werks/7386 @@ -0,0 +1,14 @@ +Title: docker_node_disk_usage: Handle busy docker daemon +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554108850 +Class: fix + +If the docker daemon cannot get the disk usage info, the corresponding services +will become stale without the Check_MK Discovery service going into a WARNING +state. +This can happen if you are calling the mk_docker plugin from different Sites. +Consider configuring asynchronous plugin execution in this case. diff --git a/agents/plugins/mk_docker.py b/agents/plugins/mk_docker.py index d533420..dbe424e 100755 --- a/agents/plugins/mk_docker.py +++ b/agents/plugins/mk_docker.py @@ -327,9 +327,14 @@ def section_node_info(client, _config): @skippable def section_node_disk_usage(client, _config): '''docker system df''' - data = client.df() - LOGGER.debug(data) section = Section('node_disk_usage') + try: + data = client.df() + except () if DEBUG else docker.errors.APIError as exc: + section.write() + LOGGER.exception(exc) + return + LOGGER.debug(data) def get_row(type_, instances, is_inactive, key='Size'): inactive = [i for i in instances if is_inactive(i)] diff --git a/tests/unit/plugins/test_mk_docker.py b/tests/unit/plugins/test_mk_docker.py index e53371a..f281791 100644 --- a/tests/unit/plugins/test_mk_docker.py +++ b/tests/unit/plugins/test_mk_docker.py @@ -11,7 +11,7 @@ sys.path.insert(0, os.path.join(cmk_path(), 'agents', 'plugins')) import mk_docker # pylint: disable=import-error,wrong-import-position PLUGIN_CHECKSUMS = { - '0.1': 'f43bbe8ce8f19763d53ffa116988fa2d', + '0.1': 'c00f1771660172e8b1b9cc225c2930ab', }

5 years, 3 months

Fix linker hack to build rrdtool

by Óscar Nájera

Module: check_mk Branch: master Commit: 0eb749f01a5d504829b8c820da6f27cdd5a225bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0eb749f01a5d50… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Apr 1 11:15:04 2019 +0200 Fix linker hack to build rrdtool Change-Id: I23e0421187f43a093b082b4c269991edf39a1d5a --- Makefile | 4 ++-- omd/Licenses.csv | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 77ff279..5a154c9 100644 --- a/Makefile +++ b/Makefile @@ -399,8 +399,8 @@ config.status: $(CONFIG_DEPS) else \ BOOST_OPT="DUMMY1=" ; \ fi ; \ - if test -d "omd/rrdtool-1.7.0/src/.libs"; then \ - RRD_OPT="LDFLAGS=-L$(realpath omd/rrdtool-1.7.0/src/.libs)" ; \ + if test -d "omd/rrdtool-1.7.1/src/.libs"; then \ + RRD_OPT="LDFLAGS=-L$(realpath omd/rrdtool-1.7.1/src/.libs)" ; \ else \ RRD_OPT="DUMMY2=" ; \ fi ; \ diff --git a/omd/Licenses.csv b/omd/Licenses.csv index 5fa1b96..49005c6 100644 --- a/omd/Licenses.csv +++ b/omd/Licenses.csv @@ -20,11 +20,11 @@ net-snmp,5.8.dev,MIT - CMU style,https://fedoraproject.org/wiki/Licensing:MIT?rd NRPE,3.2.1,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/nrp…,,,, nsca,2.7.2,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/nsc…,"All source code, binaries, documentation, and information contained in this distribution are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE. Nagios and the Nagios logo are registered trademarks of Ethan Galstad. All other trademarks, servicemarks, registered trademarks, and registered servicemarks are the property of their respective owner(s). ",,, nsca,2.9.1,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/nsc…,"All source code, binaries, documentation, and information contained in this distribution are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE. Nagios and the Nagios logo are registered trademarks of Ethan Galstad. All other trademarks, servicemarks, registered trademarks, and registered servicemarks are the property of their respective owner(s).",,, -Open Hardware Monitor,0.8.0,MPL-2.0,https://opensource.org/licenses/MPL-2.0,omd/packages/…, The remainder of the software which is not under the Mozilla Public License 2.0 (MPL) is available under one of a variety of other licenses which are given below. Aga.Controls License WinRing0 License jQuery License Knockout License ,,, +Open Hardware Monitor,0.8.0,MPL-2.0,https://opensource.org/licenses/MPL-2.0,omd/packages/…, The remainder of the software which is not under the Mozilla Public License 2.0 (MPL) is available under one of a variety of other licenses which are given below. Aga.Controls License WinRing0 License jQuery License Knockout License ,,, pnp4nagios,0.6.26,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packa…,,,, Python-snap7,0.2.1,MIT,https://opensource.org/licenses/MIT,omd/packages/sna…,,,, re2,2018-02-01,BSD-3-Clause,https://opensource.org/licenses/BSD-3-Clause,om…,,, -rrdtool,1.7.0,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/rrdtool/rrdtool-1.7.0.tar.gz,,,, +rrdtool,1.7.1,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/rrdtool/rrdtool-1.7.1.tar.gz,,,, sapnwrfc,0.19,LGPL-2.1,https://opensource.org/licenses/LGPL-2.1,agents/sap/…,,,, SimpleIni,4.17,MIT,https://opensource.org/licenses/MIT,omd/packages/simplei…,,,, Snap7,1.3.0,LGPL-3.0,https://opensource.org/licenses/LGPL-3.0,omd/packages/…,,,,

5 years, 3 months

Add tag columns, part 1.

by Sven Panne

Module: check_mk Branch: master Commit: 2c88bca4c24beca73df0c4a707ea110f3e2a4c2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c88bca4c24bec… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 1 11:21:05 2019 +0200 Add tag columns, part 1. Not fully functional for the NEB yet... Change-Id: I9cce22baac9d42170cd1ee233e71ca6eeb7fe117 --- livestatus/src/TableContacts.cc | 15 +++++++++++++++ livestatus/src/TableHosts.cc | 15 +++++++++++++++ livestatus/src/TableServices.cc | 14 ++++++++++++++ livestatus/src/module.cc | 14 +++++++++----- 4 files changed, 53 insertions(+), 5 deletions(-) diff --git a/livestatus/src/TableContacts.cc b/livestatus/src/TableContacts.cc index ece5f45..dff96b4 100644 --- a/livestatus/src/TableContacts.cc +++ b/livestatus/src/TableContacts.cc @@ -120,6 +120,21 @@ void TableContacts::addColumns(Table *table, const std::string &prefix, prefix + "custom_variables", "A dictionary of the custom variables", indirect_offset, -1, -1, DANGEROUS_OFFSETOF(contact, custom_variables), table->core(), AttributeKind::custom_variables)); + + table->addColumn(std::make_unique<CustomVarsNamesColumn>( + prefix + "tag_names", "A list of all tags of the contact", + indirect_offset, -1, -1, DANGEROUS_OFFSETOF(contact, custom_variables), + table->core(), AttributeKind::tags)); + table->addColumn(std::make_unique<CustomVarsValuesColumn>( + prefix + "tag_values", + "A list of the values of all tags of the contact", indirect_offset, -1, + -1, DANGEROUS_OFFSETOF(contact, custom_variables), table->core(), + AttributeKind::tags)); + table->addColumn(std::make_unique<CustomVarsDictColumn>( + prefix + "tags", "A dictionary of the tags", indirect_offset, -1, -1, + DANGEROUS_OFFSETOF(contact, custom_variables), table->core(), + AttributeKind::tags)); + table->addColumn(std::make_unique<AttributeListAsIntColumn>( prefix + "modified_attributes", "A bitmask specifying which attributes have been modified", diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index d6113c7..a135e24 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -502,6 +502,21 @@ void TableHosts::addColumns(Table *table, const std::string &prefix, DANGEROUS_OFFSETOF(host, custom_variables), table->core(), AttributeKind::custom_variables)); + table->addColumn(std::make_unique<CustomVarsNamesColumn>( + prefix + "tag_names", "A list of the names of all tags", + indirect_offset, extra_offset, -1, + DANGEROUS_OFFSETOF(host, custom_variables), table->core(), + AttributeKind::tags)); + table->addColumn(std::make_unique<CustomVarsValuesColumn>( + prefix + "tag_values", "A list of the values of the tags", + indirect_offset, extra_offset, -1, + DANGEROUS_OFFSETOF(host, custom_variables), table->core(), + AttributeKind::tags)); + table->addColumn(std::make_unique<CustomVarsDictColumn>( + prefix + "tags", "A dictionary of the tags", indirect_offset, + extra_offset, -1, DANGEROUS_OFFSETOF(host, custom_variables), + table->core(), AttributeKind::tags)); + // Add direct access to the custom macro _FILENAME. In a future version of // Livestatus this will probably be configurable so access to further custom // variable can be added, such that those variables are presented like diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index a3da9dc..c7cfd87 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -459,6 +459,20 @@ void TableServices::addColumns(Table *table, const std::string &prefix, indirect_offset, -1, -1, DANGEROUS_OFFSETOF(service, custom_variables), table->core(), AttributeKind::custom_variables)); + table->addColumn(std::make_unique<CustomVarsNamesColumn>( + prefix + "tag_names", "A list of the names of all tags of the service", + indirect_offset, -1, -1, DANGEROUS_OFFSETOF(service, custom_variables), + table->core(), AttributeKind::tags)); + table->addColumn(std::make_unique<CustomVarsValuesColumn>( + prefix + "tag_values", + "A list of the values of all tags of the service", indirect_offset, -1, + -1, DANGEROUS_OFFSETOF(service, custom_variables), table->core(), + AttributeKind::tags)); + table->addColumn(std::make_unique<CustomVarsDictColumn>( + prefix + "tags", "A dictionary of the tags", indirect_offset, -1, -1, + DANGEROUS_OFFSETOF(service, custom_variables), table->core(), + AttributeKind::tags)); + table->addColumn(std::make_unique<ServiceGroupsColumn>( prefix + "groups", "A list of all service groups the service is in", indirect_offset, -1, -1, DANGEROUS_OFFSETOF(service, servicegroups_ptr), diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index f4bbc1d..f7189cd 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -706,18 +706,22 @@ public: Attributes customAttributes(const void *holder, AttributeKind kind) const override { + auto h = *static_cast<const customvariablesmember *const *>(holder); Attributes attrs; - for (auto cvm = - *static_cast<const customvariablesmember *const *>(holder); - cvm != nullptr; cvm = cvm->next) { - // TODO(sp) Handle (non-)tag case! + for (auto cvm = h; cvm != nullptr; cvm = cvm->next) { + bool is_tag = mk::starts_with(cvm->variable_name, "_TAG_"); + bool part_of_result = false; switch (kind) { case AttributeKind::custom_variables: - attrs.emplace(cvm->variable_name, cvm->variable_value); + part_of_result = !is_tag; break; case AttributeKind::tags: + part_of_result = is_tag; break; } + if (part_of_result) { + attrs.emplace(cvm->variable_name, cvm->variable_value); + } } return attrs; }

5 years, 3 months

Add custom variables <=> tags distinction.

by Sven Panne

Module: check_mk Branch: master Commit: 8c8a4512a568c4c856adebb92c5d297341918d2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c8a4512a568c4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 1 10:06:14 2019 +0200 Add custom variables <=> tags distinction. Currently this is still a no-op, but this will change soon. Note that this is a candidate for "Replace Conditional with Polymorphism": https://refactoring.com/catalog/replaceConditionalWithPolymorphism.html Nevertheless, this is a quick hack to get the tag feature into our SW. Change-Id: I0ca3e01d375ebd21e28142e7c867811c5cb828ac --- livestatus/src/CustomTimeperiodColumn.cc | 2 +- livestatus/src/CustomVarsDictColumn.cc | 2 +- livestatus/src/CustomVarsDictColumn.h | 7 +++++-- livestatus/src/CustomVarsExplicitColumn.cc | 2 +- livestatus/src/CustomVarsNamesColumn.cc | 2 +- livestatus/src/CustomVarsNamesColumn.h | 7 +++++-- livestatus/src/CustomVarsValuesColumn.cc | 2 +- livestatus/src/CustomVarsValuesColumn.h | 7 +++++-- livestatus/src/MonitoringCore.h | 6 ++++-- livestatus/src/ServiceListColumn.cc | 3 ++- livestatus/src/TableContacts.cc | 7 ++++--- livestatus/src/TableHosts.cc | 7 ++++--- livestatus/src/TableServices.cc | 6 +++--- livestatus/src/TableStateHistory.cc | 2 +- livestatus/src/module.cc | 12 ++++++++++-- 15 files changed, 48 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8c8a4512a5…

5 years, 3 months

7356 FIX fireeye_mail: Fixed wrong scaling of total, infected and analyzed mail rate

by Simon Betz

Module: check_mk Branch: master Commit: 6f5f2e6d2c368fd5b39a23ae80a2a51d95c013a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f5f2e6d2c368f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 1 11:50:11 2019 +0200 7356 FIX fireeye_mail: Fixed wrong scaling of total, infected and analyzed mail rate Change-Id: Ib2f14330e5d6d5967a23fdead6b96b18d54efa65 --- .werks/7356 | 11 +++++++++++ checks/fireeye.include | 11 ++++++----- checks/fireeye_mail | 11 +++++------ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/.werks/7356 b/.werks/7356 new file mode 100644 index 0000000..023b3e6 --- /dev/null +++ b/.werks/7356 @@ -0,0 +1,11 @@ +Title: fireeye_mail: Fixed wrong scaling of total, infected and analyzed mail rates +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1554103411 + + diff --git a/checks/fireeye.include b/checks/fireeye.include index f10cdd0..509ebf3 100644 --- a/checks/fireeye.include +++ b/checks/fireeye.include @@ -67,8 +67,9 @@ def check_fireeye_states(states): def fireeye_check_generic(infotext, counter, value, warn=None, crit=None): perfdata = [(counter, value, warn, crit)] - if crit and value >= crit: - return (2, infotext + ' (warn/crit at %d/%d)' % (warn, crit), perfdata) - elif warn and value >= warn: - return (1, infotext + ' (warn/crit at %d/%d)' % (warn, crit), perfdata) - return (0, infotext, perfdata) + if crit is not None and value >= crit: + return (2, infotext + ' (warn/crit at %d/%d)' % (warn,crit), perfdata) + elif warn is not None and value >= warn: + return (1, infotext + ' (warn/crit at %d/%d)' % (warn,crit), perfdata) + else: + return (0, infotext, perfdata) diff --git a/checks/fireeye_mail b/checks/fireeye_mail index 8f713e5..bef7295 100644 --- a/checks/fireeye_mail +++ b/checks/fireeye_mail @@ -31,7 +31,7 @@ def fireeye_counter_generic(value, what, average): # (e.g. 'Infected URL') # For the counter variable name, we remove all spaces # (e.g. 'fireeye.infected.url') - counter = 'fireeye.%s' % what.replace(' ', '.').lower() + counter = 'fireeye_mail.%s' % what.replace(' ', '.').lower() rate = get_rate(counter, this_time, value) state = 0 if what == 'Bypass' and rate > 0: @@ -41,9 +41,9 @@ def fireeye_counter_generic(value, what, average): perfdata = [('%s_rate' % what.split(' ')[0].lower(), rate)] if average: avg = get_average(' %s avg' % counter, this_time, rate, average) - return (state, '%s rate: %.2f mails per %d second' % \ + return (state, '%s: %.2f mails/%d seconds' % \ (what, avg * average, average), perfdata) - return (state, '%s rate: %.2f mails per second' % (what, rate), perfdata) + return (state, '%s: %.2f mails/s' % (what, rate ), perfdata) # .--mail----------------------------------------------------------------. @@ -71,8 +71,8 @@ def fireeye_counter_generic(value, what, average): def check_fireeye_mail(_no_item, params, info): mail_info = info[0][0:3] average = params.get('interval', 0) - for index, mail_type in enumerate(['Total Email', 'Infected Email', 'Analyzed Email']): - yield fireeye_counter_generic(int(mail_info[index]) * 60, mail_type, average) + for index, mail_type in enumerate(['Total', 'Infected', 'Analyzed']): + yield fireeye_counter_generic(int(mail_info[index]), mail_type, average) check_info['fireeye_mail'] = { @@ -261,6 +261,5 @@ check_info['fireeye_mail.received'] = { 'check_function': check_fireeye_mail_received, 'service_description': 'Mails Received', 'default_levels_variable': 'received_levels', - 'group': 'fireeye_mail_received', 'has_perfdata': True, }

5 years, 3 months

fireeye.include: Fixed unnecessary else after return

by Simon Betz

Module: check_mk Branch: master Commit: b8d0dbd0b8760775266c4abcdd2145c94e916bf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8d0dbd0b87607… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 1 11:56:43 2019 +0200 fireeye.include: Fixed unnecessary else after return Change-Id: I6fa677082b8630e2c6bb7ef13ea06939bfbf6961 --- checks/fireeye.include | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/fireeye.include b/checks/fireeye.include index 509ebf3..a69f8b6 100644 --- a/checks/fireeye.include +++ b/checks/fireeye.include @@ -71,5 +71,4 @@ def fireeye_check_generic(infotext, counter, value, warn=None, crit=None): return (2, infotext + ' (warn/crit at %d/%d)' % (warn,crit), perfdata) elif warn is not None and value >= warn: return (1, infotext + ' (warn/crit at %d/%d)' % (warn,crit), perfdata) - else: - return (0, infotext, perfdata) + return (0, infotext, perfdata)

5 years, 3 months

agent_kubernetes: add logic to match and group by selectors

by Tom Baerwinkel

Module: check_mk Branch: master Commit: e21408ed669f62d7742341c5004e875b8c324cd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e21408ed669f62… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 29 13:56:49 2019 +0100 agent_kubernetes: add logic to match and group by selectors Change-Id: Iff7c83f01cfa65fa8c6980c87edc3277db08f909 --- cmk/special_agents/agent_kubernetes.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index 8168506..01b995b 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -181,6 +181,15 @@ class Metadata(object): self.creation_timestamp = None self.labels = {} + def matches(self, selectors): + if not selectors: + return False + + for name, value in selectors.iteritems(): + if name not in self.labels or self.labels[name] != value: + return False + return True + class Node(Metadata): def __init__(self, node, stats): @@ -575,6 +584,14 @@ class K8sList(Generic[ListElem], MutableSequence): def labels(self): return {item.name: item.labels for item in self} + def group_by(self, selectors): + grouped = {} + for element in self: + for name, selector in selectors.iteritems(): + if element.matches(selector): + grouped.setdefault(name, self.__class__(elements=[])).append(element) + return grouped + class NodeList(K8sList[Node]): def list_nodes(self):

5 years, 3 months

k8s_assigned_pods: show pods of services in the HW/SW inventory

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 95067fbc512018595dfba6b1d812464949e90aac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95067fbc512018… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 29 14:18:19 2019 +0100 k8s_assigned_pods: show pods of services in the HW/SW inventory Change-Id: I873a5127afb7f5228b43d8b098de7a772bb582f1 --- cmk/gui/plugins/views/inventory.py | 4 ++++ cmk/special_agents/agent_kubernetes.py | 6 +++++ inventory/k8s_assigned_pods | 42 ++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 100ed0d..4165f92 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -1124,6 +1124,10 @@ inventory_displayhints.update({ ".software.applications.kubernetes.selector.": { "title": _("Selectors"), }, + ".software.applications.kubernetes.assigned_pods:": { + "title": _("Pods"), + }, + ".software.applications.kubernetes.assigned_pods:*.name": {"title": _("Name")}, ".software.applications.citrix.": {"title": _("Citrix")}, ".software.applications.citrix.controller.": {"title": _("Controller")}, ".software.applications.citrix.controller.controller_version": { diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index 01b995b..036c08d 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -1033,6 +1033,12 @@ class ApiData(object): g.join('k8s_selector', self.services.selector()) g.join('k8s_service_info', self.services.infos()) g.join('k8s_service_ports', self.services.ports()) + pod_names = { + service_name: { + 'names': [pod.name for pod in pods] + } for service_name, pods in self.pods.group_by(self.services.selector()).iteritems() + } + g.join('k8s_assigned_pods', pod_names) return '\n'.join(g.output(piggyback_prefix="service_")) def deployment_sections(self): diff --git a/inventory/k8s_assigned_pods b/inventory/k8s_assigned_pods new file mode 100644 index 0000000..3d9cdc0 --- /dev/null +++ b/inventory/k8s_assigned_pods @@ -0,0 +1,42 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2019 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. + + +def inv_k8s_assigned_pods(info, _inventory_tree, status_data_tree): + parsed = parse_k8s(info) + path = "software.applications.kubernetes.assigned_pods:" + status_node = status_data_tree.get_list(path) + + for pod_name in sorted(parsed['names']): + status_node.append({ + 'name': pod_name, + }) + + +inv_info['k8s_assigned_pods'] = { + 'inv_function': inv_k8s_assigned_pods, + 'includes': ['k8s.include'], +} \ No newline at end of file

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 April 2019