Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 219b4052a4c2e08035555c05b6498c7fc1d5b2df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=219b4052a4c2e0… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Sun Mar 31 19:53:59 2019 +0200 Reserved 20 Werk IDS Change-Id: Ifeddeb376512597bf1f192c4ea074e69671936b0 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index f00fb16..516f51d 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7414 +7434

5 years, 2 months

elasticsearch_nodes: make check independent of dict hash seed

by Tom Baerwinkel

Module: check_mk Branch: master Commit: d86511b75324798c00903fcc2bc7fa8b99b1edfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d86511b7532479… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Sun Mar 31 16:21:33 2019 +0200 elasticsearch_nodes: make check independent of dict hash seed Change-Id: I89c16fdd15f30949a7d40c56c4f79685a34baa69 --- checks/elasticsearch_nodes | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/checks/elasticsearch_nodes b/checks/elasticsearch_nodes index b9d40c2..37c774c 100644 --- a/checks/elasticsearch_nodes +++ b/checks/elasticsearch_nodes @@ -64,7 +64,14 @@ factory_settings["elasticsearch_nodes"] = {"cpu_levels": (75.0, 90.0)} @get_parsed_item_data def check_elasticsearch_nodes(item, params, parsed): - for desc, values in parsed.iteritems(): + for desc in ( + u'mem_total_virtual_in_bytes', + u'cpu_total_in_millis', + u'open_file_descriptors', + u'max_file_descriptors', + u'cpu_percent', + ): + values = parsed[desc] if desc == "cpu_percent": value = float(values[0]) else:

5 years, 2 months

Fix test_event_creator

by Tom Baerwinkel

Module: check_mk Branch: master Commit: eeddf6fd4726befbd983f8037046610066285fba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eeddf6fd4726be… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Sun Mar 31 19:03:24 2019 +0200 Fix test_event_creator Change-Id: Icc7c88ded01c30368870b76693c36bdf82f06e4c --- tests/unit/cmk/ec/test_event_creator.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/unit/cmk/ec/test_event_creator.py b/tests/unit/cmk/ec/test_event_creator.py index 16b82e2..0e3f3e1 100644 --- a/tests/unit/cmk/ec/test_event_creator.py +++ b/tests/unit/cmk/ec/test_event_creator.py @@ -1,3 +1,4 @@ +import os import time import pytest import cmk.utils.log @@ -149,7 +150,7 @@ def event_creator(): 'pid': 0, 'priority': 5, 'text': '[WLAN-1] Triggering Background Scan', - 'time': 10101010.0 + 'time': 1550000000.0 }, ), ( @@ -233,6 +234,16 @@ def event_creator(): ), ]) def test_create_event_from_line(event_creator, monkeypatch, line, expected): + monkeypatch.setattr( + time, + 'time', + lambda: 1550000000.0, + ) + monkeypatch.setattr( + time, + 'localtime', + lambda: time.struct_time((2019, 2, 12, 20, 33, 20, 1, 43, 0)), + ) + address = ("127.0.0.1", 1234) - monkeypatch.setattr(time, "time", lambda: 10101010.0) assert event_creator.create_event_from_line(line, address) == expected

5 years, 2 months

agent_kubernetes: give some classes more descriptive names

by Tom Baerwinkel

Module: check_mk Branch: master Commit: e5eaf5341d43a9905e518be72f11c16c37d3c7bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5eaf5341d43a9… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 29 13:21:37 2019 +0100 agent_kubernetes: give some classes more descriptive names Change-Id: I77dbec7aee15e2545e9d0a3ec7623750abfd5eff --- cmk/special_agents/agent_kubernetes.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index 410863d..7024920 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -766,24 +766,24 @@ class MetricList(K8sList[Metric]): return [item.__dict__ for item in self] -class Group(object): +class PiggybackGroup(object): """ A group of elements where an element is e.g. a piggyback host. """ def __init__(self): # type: () -> None - super(Group, self).__init__() - self._elements = OrderedDict() # type: OrderedDict[str, Element] + super(PiggybackGroup, self).__init__() + self._elements = OrderedDict() # type: OrderedDict[str, PiggybackHost] def get(self, element_name): - # type: (str) -> Element + # type: (str) -> PiggybackHost if element_name not in self._elements: - self._elements[element_name] = Element() + self._elements[element_name] = PiggybackHost() return self._elements[element_name] def join(self, section_name, pairs): - # type: (str, Mapping[str, Dict[str, Any]]) -> Group + # type: (str, Mapping[str, Dict[str, Any]]) -> PiggybackGroup for element_name, data in pairs.iteritems(): section = self.get(element_name).get(section_name) section.insert(data) @@ -806,14 +806,14 @@ class Group(object): return data -class Element(object): +class PiggybackHost(object): """ An element that bundles a collection of sections. """ def __init__(self): # type: () -> None - super(Element, self).__init__() + super(PiggybackHost, self).__init__() self._sections = OrderedDict() # type: OrderedDict[str, Section] def get(self, section_name): @@ -964,7 +964,7 @@ class ApiData(object): def cluster_sections(self): # type: () -> str logging.info('Output cluster sections') - e = Element() + e = PiggybackHost() e.get('k8s_nodes').insert(self.nodes.list_nodes()) e.get('k8s_namespaces').insert(self.namespaces.list_namespaces()) e.get('k8s_persistent_volumes').insert(self.persistent_volumes.list_volumes()) @@ -983,7 +983,7 @@ class ApiData(object): def node_sections(self): # type: () -> str logging.info('Output node sections') - g = Group() + g = PiggybackGroup() g.join('labels', self.nodes.labels()) g.join('k8s_resources', self.nodes.resources()) g.join('k8s_resources', self.pods.resources_per_node()) @@ -995,14 +995,14 @@ class ApiData(object): def custom_metrics_section(self): # type: () -> str logging.info('Output pods custom metrics') - e = Element() + e = PiggybackHost() for c_metric in self.pods_Metrics: e.get('k8s_pods_%s' % c_metric).insert(self.pods_Metrics[c_metric]) return '\n'.join(e.output()) def pod_sections(self): logging.info('Output pod sections') - g = Group() + g = PiggybackGroup() g.join('labels', self.pods.labels()) g.join('k8s_resources', self.pods.resources()) g.join('k8s_pod_container', self.pods.containers()) @@ -1011,7 +1011,7 @@ class ApiData(object): def service_sections(self): logging.info('Output service sections') - g = Group() + g = PiggybackGroup() g.join('labels', self.services.labels()) g.join('k8s_selector', self.services.selector()) g.join('k8s_service_info', self.services.infos()) @@ -1020,7 +1020,7 @@ class ApiData(object): def deployment_sections(self): logging.info('Output node sections') - g = Group() + g = PiggybackGroup() g.join('labels', self.deployments.labels()) g.join('k8s_replicas', self.deployments.replicas()) return '\n'.join(g.output(piggyback_prefix="deployment_"))

5 years, 2 months

agent_kubernetes: make K8sList a MutableSequence

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 13058a1eabb1e92c8caef32abf2114c25c5921b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13058a1eabb1e9… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 29 13:09:17 2019 +0100 agent_kubernetes: make K8sList a MutableSequence Change-Id: Ic6e37f2698e7f15024ac839c65d1bcf42e0b8b97 --- cmk/special_agents/agent_kubernetes.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index 122f601..e4d2d99 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -34,7 +34,7 @@ from __future__ import ( ) import argparse -from collections import OrderedDict, Sequence +from collections import OrderedDict, MutableSequence import functools import itertools import json @@ -550,7 +550,7 @@ class Role(Metadata): ListElem = TypeVar('ListElem', bound=Metadata) -class K8sList(Generic[ListElem], Sequence): +class K8sList(Generic[ListElem], MutableSequence): def __init__(self, elements): # type: (List[ListElem]) -> None super(K8sList, self).__init__() @@ -559,10 +559,19 @@ class K8sList(Generic[ListElem], Sequence): def __getitem__(self, index): return self.elements[index] + def __setitem__(self, index, value): + self.elements.__setitem__(index, value) + + def __delitem__(self, index): + self.elements.__delitem__(index) + def __len__(self): # type: () -> int return len(self.elements) + def insert(self, index, value): + self.elements.insert(index, value) + def labels(self): return {item.name: item.labels for item in self}

5 years, 2 months

agent_kubernetes: make attributes of some classes private

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1510aa663a5d183ece13e3ed0f84c4c4c8977c3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1510aa663a5d18… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 29 13:16:59 2019 +0100 agent_kubernetes: make attributes of some classes private Change-Id: Idd633b0352535005af360a64e56a0a6e119b5285 --- cmk/special_agents/agent_kubernetes.py | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index e4d2d99..410863d 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -554,23 +554,23 @@ class K8sList(Generic[ListElem], MutableSequence): def __init__(self, elements): # type: (List[ListElem]) -> None super(K8sList, self).__init__() - self.elements = elements + self._elements = elements def __getitem__(self, index): - return self.elements[index] + return self._elements[index] def __setitem__(self, index, value): - self.elements.__setitem__(index, value) + self._elements.__setitem__(index, value) def __delitem__(self, index): - self.elements.__delitem__(index) + self._elements.__delitem__(index) def __len__(self): # type: () -> int - return len(self.elements) + return len(self._elements) def insert(self, index, value): - self.elements.insert(index, value) + self._elements.insert(index, value) def labels(self): return {item.name: item.labels for item in self} @@ -774,13 +774,13 @@ class Group(object): def __init__(self): # type: () -> None super(Group, self).__init__() - self.elements = OrderedDict() # type: OrderedDict[str, Element] + self._elements = OrderedDict() # type: OrderedDict[str, Element] def get(self, element_name): # type: (str) -> Element - if element_name not in self.elements: - self.elements[element_name] = Element() - return self.elements[element_name] + if element_name not in self._elements: + self._elements[element_name] = Element() + return self._elements[element_name] def join(self, section_name, pairs): # type: (str, Mapping[str, Dict[str, Any]]) -> Group @@ -799,7 +799,7 @@ class Group(object): # specify a name prefix. # see: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#na… data = [] - for name, element in self.elements.iteritems(): + for name, element in self._elements.iteritems(): data.append('<<<<%s>>>>' % (piggyback_prefix + name)) data.extend(element.output()) data.append('<<<<>>>>') @@ -814,18 +814,18 @@ class Element(object): def __init__(self): # type: () -> None super(Element, self).__init__() - self.sections = OrderedDict() # type: OrderedDict[str, Section] + self._sections = OrderedDict() # type: OrderedDict[str, Section] def get(self, section_name): # type: (str) -> Section - if section_name not in self.sections: - self.sections[section_name] = Section() - return self.sections[section_name] + if section_name not in self._sections: + self._sections[section_name] = Section() + return self._sections[section_name] def output(self): # type: () -> List[str] data = [] - for name, section in self.sections.iteritems(): + for name, section in self._sections.iteritems(): data.append('<<<%s:sep(0)>>>' % name) data.append(section.output()) return data @@ -839,22 +839,22 @@ class Section(object): def __init__(self): # type: () -> None super(Section, self).__init__() - self.content = OrderedDict() # type: OrderedDict[str, Dict[str, Any]] + self._content = OrderedDict() # type: OrderedDict[str, Dict[str, Any]] def insert(self, data): # type: (Dict[str, Any]) -> None for key, value in data.iteritems(): - if key not in self.content: - self.content[key] = value + if key not in self._content: + self._content[key] = value else: if isinstance(value, dict): - self.content[key].update(value) + self._content[key].update(value) else: raise ValueError('Key %s is already present and cannot be merged' % key) def output(self): # type: () -> str - return json.dumps(self.content) + return json.dumps(self._content) class ApiData(object):

5 years, 2 months

agent_kubernetes: rename two methods

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 7826b8532140552b480b1a552468237cc33b6d83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7826b853214055… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 29 13:44:56 2019 +0100 agent_kubernetes: rename two methods Change-Id: I37384e8a0811fb1dc5d7a6c5cece0d70f0278480 --- cmk/special_agents/agent_kubernetes.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index 7024920..8168506 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -592,7 +592,7 @@ class NodeList(K8sList[Node]): def stats(self): return {node.name: node.stats for node in self if node.name} - def cluster_resources(self): + def total_resources(self): merge = functools.partial(left_join_dicts, operation=operator.add) return reduce(merge, self.resources().itervalues()) @@ -670,7 +670,7 @@ class PodList(K8sList[Pod]): if node is not None } - def cluster_resources(self): + def total_resources(self): merge = functools.partial(left_join_dicts, operation=operator.add) return reduce(merge, [p.resources for p in self], Pod.zero_resources()) @@ -974,8 +974,8 @@ class ApiData(object): e.get('k8s_storage_classes').insert(self.storage_classes.list_storage_classes()) e.get('k8s_roles').insert({'roles': self.roles.list_roles()}) e.get('k8s_roles').insert({'cluster_roles': self.cluster_roles.list_roles()}) - e.get('k8s_resources').insert(self.nodes.cluster_resources()) - e.get('k8s_resources').insert(self.pods.cluster_resources()) + e.get('k8s_resources').insert(self.nodes.total_resources()) + e.get('k8s_resources').insert(self.pods.total_resources()) e.get('k8s_resources').insert(self.pods.pods_in_cluster()) e.get('k8s_stats').insert(self.nodes.cluster_stats()) return '\n'.join(e.output())

5 years, 2 months

Revert "IWYU fixes."

by Sven Panne

Module: check_mk Branch: master Commit: 013119907d5304c56d252b2351078678149ce2e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=013119907d5304… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 29 16:05:29 2019 +0100 Revert "IWYU fixes." This reverts commit 42ba137b06e597fa195296fce0ef1066552dcac2. --- livestatus/src/CustomVarsDictColumn.cc | 1 + livestatus/src/CustomVarsDictColumn.h | 1 - livestatus/src/CustomVarsDictFilter.h | 1 - livestatus/src/TableStateHistory.cc | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/livestatus/src/CustomVarsDictColumn.cc b/livestatus/src/CustomVarsDictColumn.cc index 86fa8fe..07d4e3f 100644 --- a/livestatus/src/CustomVarsDictColumn.cc +++ b/livestatus/src/CustomVarsDictColumn.cc @@ -32,6 +32,7 @@ class Aggregator; #ifdef CMC +#include "Entity.h" #include "cmc.h" #else #include "nagios.h" diff --git a/livestatus/src/CustomVarsDictColumn.h b/livestatus/src/CustomVarsDictColumn.h index 8b63cda..13e852e 100644 --- a/livestatus/src/CustomVarsDictColumn.h +++ b/livestatus/src/CustomVarsDictColumn.h @@ -39,7 +39,6 @@ class Row; class RowRenderer; #ifndef CMC -#include "contact_fwd.h" // TODO(sp) Why on earth is "contact_fwd.h" not enough??? #include "nagios.h" #endif diff --git a/livestatus/src/CustomVarsDictFilter.h b/livestatus/src/CustomVarsDictFilter.h index 8f24045..df7ea03 100644 --- a/livestatus/src/CustomVarsDictFilter.h +++ b/livestatus/src/CustomVarsDictFilter.h @@ -37,7 +37,6 @@ class RegExp; class Row; #ifndef CMC -#include "contact_fwd.h" // TODO(sp) Why on earth is "contact_fwd.h" not enough??? #include "nagios.h" #endif diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index ee6ab07..6a8572f 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -31,6 +31,7 @@ #include <ostream> #include <set> #include <stdexcept> +#include <unordered_map> #include <utility> #include <vector> #include "Column.h" @@ -63,7 +64,6 @@ #define STATE_CRITICAL 2 #define STATE_UNKNOWN 3 #else -#include <unordered_map> #include "auth.h" #include "nagios.h" #endif

5 years, 2 months

IWYU fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 42ba137b06e597fa195296fce0ef1066552dcac2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42ba137b06e597… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 29 15:50:17 2019 +0100 IWYU fixes. No idea why our CI didn't complain earlier... Change-Id: Id63b94fcdf59655054c43cb026cf020e4c1112bd --- livestatus/src/CustomVarsDictColumn.cc | 1 - livestatus/src/CustomVarsDictColumn.h | 1 + livestatus/src/CustomVarsDictFilter.h | 1 + livestatus/src/TableStateHistory.cc | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/livestatus/src/CustomVarsDictColumn.cc b/livestatus/src/CustomVarsDictColumn.cc index 07d4e3f..86fa8fe 100644 --- a/livestatus/src/CustomVarsDictColumn.cc +++ b/livestatus/src/CustomVarsDictColumn.cc @@ -32,7 +32,6 @@ class Aggregator; #ifdef CMC -#include "Entity.h" #include "cmc.h" #else #include "nagios.h" diff --git a/livestatus/src/CustomVarsDictColumn.h b/livestatus/src/CustomVarsDictColumn.h index 13e852e..8b63cda 100644 --- a/livestatus/src/CustomVarsDictColumn.h +++ b/livestatus/src/CustomVarsDictColumn.h @@ -39,6 +39,7 @@ class Row; class RowRenderer; #ifndef CMC +#include "contact_fwd.h" // TODO(sp) Why on earth is "contact_fwd.h" not enough??? #include "nagios.h" #endif diff --git a/livestatus/src/CustomVarsDictFilter.h b/livestatus/src/CustomVarsDictFilter.h index df7ea03..8f24045 100644 --- a/livestatus/src/CustomVarsDictFilter.h +++ b/livestatus/src/CustomVarsDictFilter.h @@ -37,6 +37,7 @@ class RegExp; class Row; #ifndef CMC +#include "contact_fwd.h" // TODO(sp) Why on earth is "contact_fwd.h" not enough??? #include "nagios.h" #endif diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 6a8572f..ee6ab07 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -31,7 +31,6 @@ #include <ostream> #include <set> #include <stdexcept> -#include <unordered_map> #include <utility> #include <vector> #include "Column.h" @@ -64,6 +63,7 @@ #define STATE_CRITICAL 2 #define STATE_UNKNOWN 3 #else +#include <unordered_map> #include "auth.h" #include "nagios.h" #endif

5 years, 2 months

Fix test file name conflict between unit and integration tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 05a1eadf666fab160b1b7bab85af3cdf75a8bd09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05a1eadf666fab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 29 15:49:56 2019 +0100 Fix test file name conflict between unit and integration tests Change-Id: Iab09eaf4927964f5fc01b6f94071a9f54bee4ba7 --- tests/unit/cmk_base/{test_automations.py => test_unit_automations.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/unit/cmk_base/test_automations.py b/tests/unit/cmk_base/test_unit_automations.py similarity index 100% rename from tests/unit/cmk_base/test_automations.py rename to tests/unit/cmk_base/test_unit_automations.py

5 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019