Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 09b1209d0a820b11ad4022c0514e8ff6379b7604 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09b1209d0a820b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 27 16:32:40 2019 +0100 Add tests for watolib.rules.Rule class Change-Id: Icedf166c486b01a57de9df5c122078e3194c0f46 --- cmk/gui/watolib/rulesets.py | 6 +- tests/unit/cmk/gui/watolib/test_gui_rulesets.py | 267 ++++++++++++++++++++++++ 2 files changed, 272 insertions(+), 1 deletion(-) diff --git a/cmk/gui/watolib/rulesets.py b/cmk/gui/watolib/rulesets.py index a782c9e..28834e0 100644 --- a/cmk/gui/watolib/rulesets.py +++ b/cmk/gui/watolib/rulesets.py @@ -595,8 +595,10 @@ class Rule(object): def _parse_rule(self, rule_config): if isinstance(rule_config, dict): self._parse_dict_rule(rule_config) - else: # tuple + elif isinstance(rule_config, tuple): self._parse_tuple_rule(rule_config) + else: + raise NotImplementedError() def _parse_dict_rule(self, rule_config): self.rule_options = rule_config.get("options", {}) @@ -618,6 +620,8 @@ class Rule(object): tag_specs = conditions.get("host_tags", []) self.tag_specs = [t for t in tag_specs if not t.startswith("/")] + # Parses the pre 1.6 tuple format. Since 1.6 Check_MK writes out the dict + # format handled by _parse_dict_rule(). Deprecate this one day. def _parse_tuple_rule(self, rule_config): if isinstance(rule_config[-1], dict): self.rule_options = rule_config[-1] diff --git a/tests/unit/cmk/gui/watolib/test_gui_rulesets.py b/tests/unit/cmk/gui/watolib/test_gui_rulesets.py new file mode 100644 index 0000000..8607401 --- /dev/null +++ b/tests/unit/cmk/gui/watolib/test_gui_rulesets.py @@ -0,0 +1,267 @@ +import pytest # type: ignore + +# Triggers plugin loading of plugins.wato which registers all the plugins +import cmk.gui.wato # pylint: disable=unused-import + +from cmk.gui.exceptions import MKGeneralException +import cmk.gui.watolib.rulesets as rulesets +import cmk.gui.watolib.hosts_and_folders as hosts_and_folders + + +def _rule(ruleset_name): + ruleset = rulesets.Ruleset(ruleset_name) + return rulesets.Rule(hosts_and_folders.Folder.root_folder(), ruleset) + + +(a)pytest.mark.parametrize( + "ruleset_name,default_value", + [ + # non-binary host ruleset + ("inventory_processes_rules", None), + # binary host ruleset + ("only_hosts", True), + # non-binary service ruleset + ("checkgroup_parameters:local", None), + # binary service ruleset + ("clustered_services", True), + ]) +def test_rule_initialize(register_builtin_html, ruleset_name, default_value): + rule = _rule(ruleset_name) + assert rule.tag_specs == [] + assert rule.host_list == [] + assert rule.item_list is None + assert rule.rule_options == {} + assert rule.value == default_value + + +def test_rule_from_config_unhandled_format(): + rule = _rule("inventory_processes_rules") + with pytest.raises(MKGeneralException, match="Invalid rule"): + rule.from_config([]) + + with pytest.raises(MKGeneralException, match="Invalid rule"): + rule.from_config((None,)) + + +(a)pytest.mark.parametrize( + "rule_options", + [ + { + "disabled": True + }, + None, + ], +) +(a)pytest.mark.parametrize( + "ruleset_name,rule_spec,expected_attributes", + [ + # non-binary host ruleset + ( + "inventory_processes_rules", + ("VAL", ["HOSTLIST"]), + { + "value": "VAL", + "item_list": None, + "host_list": ["HOSTLIST"], + "tag_specs": [], + }, + ), + ( + "inventory_processes_rules", + ("VAL", ["tag", "specs"], ["HOSTLIST"]), + { + "value": "VAL", + "item_list": None, + "host_list": ["HOSTLIST"], + "tag_specs": ["tag", "specs"], + }, + ), + # binary host ruleset + ("only_hosts", (["HOSTLIST"],), { + "value": True, + "item_list": None, + "host_list": ["HOSTLIST"], + "tag_specs": [], + }), + ("only_hosts", ( + rulesets.NEGATE, + ["HOSTLIST"], + ), { + "value": False, + "item_list": None, + "host_list": ["HOSTLIST"], + "tag_specs": [], + }), + # non-binary service ruleset + ("checkgroup_parameters:local", ("VAL", ["HOSTLIST"], ["SVC", "LIST"]), { + "value": "VAL", + "item_list": ["SVC", "LIST"], + "host_list": ["HOSTLIST"], + "tag_specs": [], + }), + # binary service ruleset + ("clustered_services", (["HOSTLIST"], ["SVC", "LIST"]), { + "value": True, + "item_list": ["SVC", "LIST"], + "host_list": ["HOSTLIST"], + "tag_specs": [], + }), + ("clustered_services", (rulesets.NEGATE, ["HOSTLIST"], ["SVC", "LIST"]), { + "value": False, + "item_list": ["SVC", "LIST"], + "host_list": ["HOSTLIST"], + "tag_specs": [], + }), + ]) +def test_rule_from_config_tuple(ruleset_name, rule_spec, expected_attributes, rule_options): + if rule_options is not None: + rule_spec = rule_spec + (rule_options,) + + rule = _rule(ruleset_name) + rule.from_config(rule_spec) + + for key, val in expected_attributes.items(): + assert getattr(rule, key) == val + + if rule_options is not None: + assert rule.rule_options == rule_options + else: + assert rule.rule_options == {} + + +(a)pytest.mark.parametrize( + "rule_options", + [ + { + "disabled": True + }, + None, + ], +) +(a)pytest.mark.parametrize( + "ruleset_name,rule_spec,expected_attributes", + [ + # non-binary host ruleset + ( + "inventory_processes_rules", + { + "value": "VAL", + "conditions": { + "host_specs": ["HOSTLIST"], + }, + }, + { + "value": "VAL", + "item_list": None, + "host_list": ["HOSTLIST"], + "tag_specs": [], + }, + ), + ( + "inventory_processes_rules", + { + "value": "VAL", + "conditions": { + "host_tags": ["tag", "specs"], + "host_specs": ["HOSTLIST"], + }, + }, + { + "value": "VAL", + "item_list": None, + "host_list": ["HOSTLIST"], + "tag_specs": ["tag", "specs"], + }, + ), + # binary host ruleset + ("only_hosts", { + "conditions": { + "host_specs": ["HOSTLIST"], + }, + }, { + "value": True, + "item_list": None, + "host_list": ["HOSTLIST"], + "tag_specs": [], + }), + ("only_hosts", { + "negate": True, + "conditions": { + "host_specs": ["HOSTLIST"], + }, + }, { + "value": False, + "item_list": None, + "host_list": ["HOSTLIST"], + "tag_specs": [], + }), + # non-binary service ruleset + ("checkgroup_parameters:local", { + "value": "VAL", + "conditions": { + "host_specs": ["HOSTLIST"], + "service_specs": ["SVC", "LIST"], + }, + }, { + "value": "VAL", + "item_list": ["SVC", "LIST"], + "host_list": ["HOSTLIST"], + "tag_specs": [], + }), + # binary service ruleset + ("clustered_services", { + "conditions": { + "host_specs": ["HOSTLIST"], + "service_specs": ["SVC", "LIST"], + }, + }, { + "value": True, + "item_list": ["SVC", "LIST"], + "host_list": ["HOSTLIST"], + "tag_specs": [], + }), + ("clustered_services", { + "negate": True, + "conditions": { + "host_specs": ["HOSTLIST"], + "service_specs": ["SVC", "LIST"], + }, + }, { + "value": False, + "item_list": ["SVC", "LIST"], + "host_list": ["HOSTLIST"], + "tag_specs": [], + }), + ]) +def test_rule_from_config_dict(ruleset_name, rule_spec, expected_attributes, rule_options): + rule_spec = rule_spec.copy() + if rule_options is not None: + rule_spec["options"] = rule_options + + rule = _rule(ruleset_name) + rule.from_config(rule_spec) + + for key, val in expected_attributes.items(): + assert getattr(rule, key) == val + + if rule_options is not None: + assert rule.rule_options == rule_options + else: + assert rule.rule_options == {} + + +def test_rule_clone(): + rule = _rule("clustered_services") + rule.from_config({ + "negate": True, + "conditions": { + "host_specs": ["HOSTLIST"], + "service_specs": ["SVC", "LIST"], + }, + }) + + cloned_rule = rule.clone() + + assert rule.to_dict_config() == cloned_rule.to_dict_config() + assert rule.folder == cloned_rule.folder + assert rule.ruleset == cloned_rule.ruleset

5 years, 3 months

Cleanup: Synchronous Rule.to_dict_config and Rule.parse_dict_rule()

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ced77f86893ef547a02c3e9e092ef25527ed79a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ced77f86893ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 27 17:36:59 2019 +0100 Cleanup: Synchronous Rule.to_dict_config and Rule.parse_dict_rule() Both function now deal with optional and mandatory attributes in the same way. These dicts will be used as rule representation in the configuration files in the future. Therefore we need to skip the attributes that are at their default values to reduce the footprint of individual rule entries which can be many in larger installations. Change-Id: I866c79af9a5abe8719ead5b98e19a08c3cb7f647 --- cmk/gui/watolib/rulesets.py | 26 +++++++++++++++---------- tests/unit/cmk/gui/watolib/test_gui_rulesets.py | 3 +++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/cmk/gui/watolib/rulesets.py b/cmk/gui/watolib/rulesets.py index 1caa08f..264b05f 100644 --- a/cmk/gui/watolib/rulesets.py +++ b/cmk/gui/watolib/rulesets.py @@ -600,6 +600,8 @@ class Rule(object): else: raise NotImplementedError() + # TODO: Would make sense to implement independent parsing for the different + # ruleset types def _parse_dict_rule(self, rule_config): self.rule_options = rule_config.get("options", {}) @@ -612,9 +614,11 @@ class Rule(object): else: self.value = True - conditions = rule_config.get("conditions", {}) + conditions = rule_config["conditions"] self.host_list = conditions.get("host_specs", []) - self.item_list = conditions.get("service_specs") + + if self.ruleset.item_type(): + self.item_list = conditions.get("service_specs") # Remove folder tag from tag list tag_specs = conditions.get("host_tags", []) @@ -705,20 +709,22 @@ class Rule(object): return content def to_dict_config(self): - result = {"conditions": {}} + result = { + "conditions": {}, + } - result["options"] = self._rule_options_to_config() + rule_options = self._rule_options_to_config() + if rule_options: + result["options"] = rule_options if self.ruleset.valuespec(): result["value"] = self.value - else: - if self.value: - result["negate"] = False - else: - result["negate"] = True + elif self.value is False: + result["negate"] = True result["conditions"]["host_specs"] = self.host_list - result["conditions"]["host_tags"] = self.tag_specs + if self.tag_specs: + result["conditions"]["host_tags"] = self.tag_specs if self.ruleset.item_type(): result["conditions"]["service_specs"] = self.item_list diff --git a/tests/unit/cmk/gui/watolib/test_gui_rulesets.py b/tests/unit/cmk/gui/watolib/test_gui_rulesets.py index 8607401..37b42ef 100644 --- a/tests/unit/cmk/gui/watolib/test_gui_rulesets.py +++ b/tests/unit/cmk/gui/watolib/test_gui_rulesets.py @@ -249,6 +249,9 @@ def test_rule_from_config_dict(ruleset_name, rule_spec, expected_attributes, rul else: assert rule.rule_options == {} + # test for synchronous to_dict on the way + assert rule.to_dict_config() == rule_spec + def test_rule_clone(): rule = _rule("clustered_services")

5 years, 3 months

Cleanup unused "path" key in rule dict representation

by Lars Michelsen

Module: check_mk Branch: master Commit: b847a256d01667bf98cb8bf1b55681df46ad8ea4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b847a256d01667… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 27 16:57:04 2019 +0100 Cleanup unused "path" key in rule dict representation Change-Id: I07a9444535b900eed18874bbe950eaed9fef9a07 --- cmk/gui/plugins/webapi/webapi.py | 6 +----- cmk/gui/watolib/rulesets.py | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cmk/gui/plugins/webapi/webapi.py b/cmk/gui/plugins/webapi/webapi.py index fcb478e..c64cdfc 100644 --- a/cmk/gui/plugins/webapi/webapi.py +++ b/cmk/gui/plugins/webapi/webapi.py @@ -634,11 +634,7 @@ class APICallRules(APICallCollection): ruleset_dict = {} for folder, _rule_index, rule in ruleset.get_rules(): - ruleset_dict.setdefault(folder.path(), []) - # The path is already set in the folder hierarchy - rule_config = rule.to_dict_config() - del rule_config["path"] - ruleset_dict[folder.path()].append(rule_config) + ruleset_dict.setdefault(folder.path(), []).append(rule.to_dict_config()) return ruleset_dict diff --git a/cmk/gui/watolib/rulesets.py b/cmk/gui/watolib/rulesets.py index 68a2a2e..a782c9e 100644 --- a/cmk/gui/watolib/rulesets.py +++ b/cmk/gui/watolib/rulesets.py @@ -703,7 +703,6 @@ class Rule(object): def to_dict_config(self): result = {"conditions": {}} - result["path"] = self.folder.path() result["options"] = self._rule_options_to_config() if self.ruleset.valuespec():

5 years, 3 months

allow container to spawn it's own gpg-agent

by Alex Zurhake

Module: check_mk Branch: master Commit: 34c0e7f5da78c2ab6fa0f94b886c9f29453e781d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34c0e7f5da78c2… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Mar 28 12:59:54 2019 +0100 allow container to spawn it's own gpg-agent Change-Id: Ib8e80ea2a794ff59cc6fe0086ef9859c5d022614 --- buildscripts/scripts/nightly-cmk-container.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/scripts/nightly-cmk-container.jenkins b/buildscripts/scripts/nightly-cmk-container.jenkins index 22f162b..141409e 100644 --- a/buildscripts/scripts/nightly-cmk-container.jenkins +++ b/buildscripts/scripts/nightly-cmk-container.jenkins @@ -21,7 +21,7 @@ node { docker.withRegistry(DOCKER_REGISTRY, 'nexus') { IMAGE = 'ubuntu-18.04-common' docker.image(IMAGE).pull() - docker.image(IMAGE).inside("-u 0:0 -v ${PACKAGE_DIR}/${CMK_VERS}:${PACKAGE_DIR}/${CMK_VERS} -v ${DAILY_DATA}:${DAILY_DATA} -v /var/run/docker.sock:/var/run/docker.sock -v ${GPG_KEY_DIR}:${GPG_KEY_DIR}:ro -v ${RELEASE_KEY_DIR}:${RELEASE_KEY_DIR}:ro -v /root/.cmk-credentials:/root/.cmk-credentials --network ci_local-infra") { + docker.image(IMAGE).inside("-u 0:0 -v ${PACKAGE_DIR}/${CMK_VERS}:${PACKAGE_DIR}/${CMK_VERS} -v ${DAILY_DATA}:${DAILY_DATA} -v /var/run/docker.sock:/var/run/docker.sock -v ${GPG_KEY_DIR}:${GPG_KEY_DIR}:ro -v ${RELEASE_KEY_DIR}:${RELEASE_KEY_DIR} -v /root/.cmk-credentials:/root/.cmk-credentials --network ci_local-infra") { stage('Build Container') { sh """ cd ${DAILY_DATA}/git/

5 years, 3 months

agent_kubernetes: rename ListLike to K8sList

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1f2a81f4d622729285dfde2802a5f6b3c4932bb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f2a81f4d62272… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Mar 27 18:06:26 2019 +0100 agent_kubernetes: rename ListLike to K8sList Change-Id: Ib04f088f236d395be6c2277cdfc6e2d7b125e637 --- cmk/special_agents/agent_kubernetes.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index b81039b..385a075 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -488,10 +488,10 @@ class Role(Metadata): ListElem = TypeVar('ListElem') -class ListLike(Generic[ListElem], Sequence): +class K8sList(Generic[ListElem], Sequence): def __init__(self, elements): # type: (List[ListElem]) -> None - super(ListLike, self).__init__() + super(K8sList, self).__init__() self.elements = elements def __getitem__(self, index): @@ -502,7 +502,7 @@ class ListLike(Generic[ListElem], Sequence): return len(self.elements) -class NodeList(ListLike[Node]): +class NodeList(K8sList[Node]): def list_nodes(self): # type: () -> Dict[str, List[str]] return {'nodes': [node.name for node in self if node.name]} @@ -532,18 +532,18 @@ class NodeList(ListLike[Node]): return result -class ComponentStatusList(ListLike[ComponentStatus]): +class ComponentStatusList(K8sList[ComponentStatus]): def list_statuses(self): # type: () -> Dict[str, List[Dict[str, str]]] return {status.name: status.conditions for status in self if status.name} -class DeploymentList(ListLike[Deployment]): +class DeploymentList(K8sList[Deployment]): def replicas(self): return {deployment.name: deployment.replicas for deployment in self} -class PodList(ListLike[Pod]): +class PodList(K8sList[Pod]): def pods_per_node(self): # type: () -> Dict[str, Dict[str, Dict[str, int]]] pods_sorted = sorted(self, key=lambda pod: pod.node) @@ -590,7 +590,7 @@ class PodList(ListLike[Pod]): return reduce(merge, [p.resources for p in self], Pod.zero_resources()) -class NamespaceList(ListLike[Namespace]): +class NamespaceList(K8sList[Namespace]): def list_namespaces(self): # type: () -> Dict[str, Dict[str, Dict[str, Optional[str]]]] return { @@ -602,7 +602,7 @@ class NamespaceList(ListLike[Namespace]): } -class PersistentVolumeList(ListLike[PersistentVolume]): +class PersistentVolumeList(K8sList[PersistentVolume]): def list_volumes(self): # type: () -> Dict[str, Dict[str, Union[Optional[List[str]], Optional[float], Dict[str, Optional[str]]]]] # TODO: Output details of the different types of volumes @@ -617,7 +617,7 @@ class PersistentVolumeList(ListLike[PersistentVolume]): } -class PersistentVolumeClaimList(ListLike[PersistentVolumeClaim]): +class PersistentVolumeClaimList(K8sList[PersistentVolumeClaim]): def list_volume_claims(self): # type: () -> Dict[str, Dict[str, Any]] # TODO: Fix "Any" @@ -631,7 +631,7 @@ class PersistentVolumeClaimList(ListLike[PersistentVolumeClaim]): } -class StorageClassList(ListLike[StorageClass]): +class StorageClassList(K8sList[StorageClass]): def list_storage_classes(self): # type: () -> Dict[Any, Dict[str, Any]] # TODO: should be Dict[str, Dict[str, Optional[str]]] @@ -643,7 +643,7 @@ class StorageClassList(ListLike[StorageClass]): } -class RoleList(ListLike[Role]): +class RoleList(K8sList[Role]): def list_roles(self): return [{ 'name': role.name, @@ -669,7 +669,7 @@ class Metric(object): return str(self.__dict__) -class MetricList(ListLike[Metric]): +class MetricList(K8sList[Metric]): def __add__(self, other): return MetricList([a + b for a, b in zip(self, other)])

5 years, 3 months

7330 FIX Fix confusions when working with localized shell environments

by Lars Michelsen

Module: check_mk Branch: master Commit: f21a576590f131e80848767a115d635982e3b8ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f21a576590f131… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 28 11:59:24 2019 +0100 7330 FIX Fix confusions when working with localized shell environments When switching to the site user context we now enforce a non localized environment. The reason for this configuration is that the parameters and outputs of the monitoring plug-ins are localized. If they are called from the core, they are always language-neutral. During manual testing, the plugins may behave differently depending on the localization of the user's environment variables. This can lead to confusion during tests. CMK-1832 Change-Id: Ia7b677b0daa5f7945db64b835e6a58cc70c36ee4 --- .werks/7330 | 15 +++++++++++++++ omd/packages/omd/skel/.profile | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/.werks/7330 b/.werks/7330 new file mode 100644 index 0000000..389efb5 --- /dev/null +++ b/.werks/7330 @@ -0,0 +1,15 @@ +Title: Fix confusions when working with localized shell environments +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1553770690 +Class: fix + +When switching to the site user context we now enforce a non localized +environment. The reason for this configuration is that the parameters and +outputs of the monitoring plug-ins are localized. If they are called from the +core, they are always language-neutral. During manual testing, the plugins may +behave differently depending on the localization of the user's environment +variables. This can lead to confusion during tests. diff --git a/omd/packages/omd/skel/.profile b/omd/packages/omd/skel/.profile index 18204c1..2af7294 100644 --- a/omd/packages/omd/skel/.profile +++ b/omd/packages/omd/skel/.profile @@ -19,6 +19,14 @@ export MAILRC="$OMD_ROOT/etc/mail.rc" # Make the python requests module trust the CAs configured in Check_MK export REQUESTS_CA_BUNDLE=$OMD_ROOT/var/ssl/ca-certificates.crt +# Enforce a non localized environment. The reason for this configuration is +# that the parameters and outputs of the monitoring plug-ins are localized. If +# they are called from the core, they are always language-neutral. During +# manual testing, the plugins may behave differently depending on the +# localization of the user's environment variables. This can lead to confusion +# during tests. +export LANG=C LC_ALL=C + # Set environment for the monitoring plugins that use state retention (like check_snmp). export NAGIOS_PLUGIN_STATE_DIRECTORY="$OMD_ROOT/var/monitoring-plugins" export MP_STATE_DIRECTORY=$NAGIOS_PLUGIN_STATE_DIRECTORY

5 years, 3 months

agent_kubernetes: output labels section

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 7520c4b97f9838f38cb94f2015b56d78c59c5a78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7520c4b97f9838… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Mar 27 18:33:31 2019 +0100 agent_kubernetes: output labels section Return a labels section for nodes, pods and deployments. This will allow the automatic generation of host tags later on. CMK-1907 Change-Id: Ie3863543d223b6d36967626d0ab277026a4dc188 --- cmk/special_agents/agent_kubernetes.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index 385a075..c40ffb5 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -174,10 +174,12 @@ class Metadata(object): self.namespace = metadata.namespace self.creation_timestamp = (time.mktime(metadata.creation_timestamp.utctimetuple()) if metadata.creation_timestamp else None) + self.labels = metadata.labels if metadata.labels else {} else: self.name = None self.namespace = None self.creation_timestamp = None + self.labels = {} class Node(Metadata): @@ -485,7 +487,7 @@ class Role(Metadata): super(Role, self).__init__(role.metadata) -ListElem = TypeVar('ListElem') +ListElem = TypeVar('ListElem', bound=Metadata) class K8sList(Generic[ListElem], Sequence): @@ -501,6 +503,9 @@ class K8sList(Generic[ListElem], Sequence): # type: () -> int return len(self.elements) + def labels(self): + return {item.name: item.labels for item in self} + class NodeList(K8sList[Node]): def list_nodes(self): @@ -652,8 +657,12 @@ class RoleList(K8sList[Role]): } for role in self if role.name] -class Metric(object): +class Metric(Metadata): def __init__(self, metric): + # Initialize Metric objects without metadata for now, because + # the provided metadata only contains a selfLink and no other + # valuable information. + super(Metric, self).__init__(metadata=None) self.from_object = metric['describedObject'] self.metrics = {metric['metricName']: metric.get('value')} @@ -886,6 +895,7 @@ class ApiData(object): # type: () -> str logging.info('Output node sections') g = Group() + g.join('labels', self.nodes.labels()) g.join('k8s_resources', self.nodes.resources()) g.join('k8s_resources', self.pods.resources_per_node()) g.join('k8s_resources', self.pods.pods_per_node()) @@ -904,6 +914,7 @@ class ApiData(object): def pod_sections(self): logging.info('Output pod sections') g = Group() + g.join('labels', self.pods.labels()) g.join('k8s_resources', self.pods.resources()) g.join('k8s_pod_container', self.pods.containers()) g.join('k8s_pod_info', self.pods.info()) @@ -912,6 +923,7 @@ class ApiData(object): def deployment_sections(self): logging.info('Output node sections') g = Group() + g.join('labels', self.deployments.labels()) g.join('k8s_replicas', self.deployments.replicas()) return '\n'.join(g.output())

5 years, 3 months

[CMK-1791] - handle leak preparation

by Sergey Kipnis

Module: check_mk Branch: master Commit: 394b01c0208657bd87233220dfcb0c56667d9e47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=394b01c0208657… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Wed Mar 27 16:15:12 2019 +0100 [CMK-1791] - handle leak preparation - code clean and refactor Change-Id: I22e2d6ec803723594ed4e275cdbeec257a2acaf3 --- agents/wnx/include/tools/_misc.h | 3 +-- agents/wnx/include/tools/_raii.h | 9 +++++++++ agents/wnx/src/common/cfg_info.h | 13 +++++++------ agents/wnx/src/common/cmdline_info.h | 1 - agents/wnx/src/engine/cma_core.h | 15 ++++----------- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/agents/wnx/include/tools/_misc.h b/agents/wnx/include/tools/_misc.h index fa7c762..26e3504 100644 --- a/agents/wnx/include/tools/_misc.h +++ b/agents/wnx/include/tools/_misc.h @@ -96,8 +96,7 @@ inline void WideLower(std::wstring& WideStr) { // auto vector_of string template <typename... Args> std::vector<std::wstring> ConstructVectorWstring(Args&&... args) { - using namespace std; - vector<wstring> cfg_files; + std::vector<std::wstring> cfg_files; static_assert((std::is_constructible_v<std::wstring, Args&> && ...)); (cfg_files.emplace_back(args), ...); return cfg_files; diff --git a/agents/wnx/include/tools/_raii.h b/agents/wnx/include/tools/_raii.h index 6603484..e7e671e 100644 --- a/agents/wnx/include/tools/_raii.h +++ b/agents/wnx/include/tools/_raii.h @@ -67,4 +67,13 @@ struct InternalScopeGuard { std::lock_guard<decltype(Mutex)> Mutex##CmkAutoLock(Mutex); #endif +// For Ranging experimental +namespace cma { +template <typename I, typename F> +void for_each(I IterObject, F Fn) { + ::std::for_each(std::begin(IterObject), std::end(IterObject), Fn); +} + +} // namespace cma + #endif // ___RAAI_H diff --git a/agents/wnx/src/common/cfg_info.h b/agents/wnx/src/common/cfg_info.h index de0828b..1533f1e 100644 --- a/agents/wnx/src/common/cfg_info.h +++ b/agents/wnx/src/common/cfg_info.h @@ -115,15 +115,15 @@ inline const std::wstring kSolutionUnitTestsFolderName(L"unit_test"); inline const std::wstring kSolutionConfigTestFilesFolderName(L"config"); inline std::filesystem::path MakePathToUnitTestFiles(std::wstring Root) { - using namespace std::filesystem; - path r = Root; + namespace fs = std::filesystem; + fs::path r = Root; r = r / kSolutionTestFilesFolderName / kSolutionUnitTestsFolderName; return r.lexically_normal(); } inline std::filesystem::path MakePathToConfigTestFiles(std::wstring Root) { - using namespace std::filesystem; - path r = Root; + namespace fs = std::filesystem; + fs::path r = Root; r = r / kSolutionTestFilesFolderName / kSolutionConfigTestFilesFolderName; return r.lexically_normal(); } @@ -146,8 +146,9 @@ constexpr const wchar_t* kBakery = L"bakery"; // owned by site constexpr const wchar_t* kState = L"state"; // owned by plugins constexpr const wchar_t* kPluginConfig = L"config"; // owned by plugins -constexpr const wchar_t* kSpool = L"spool"; // owned by user/sys plugins -constexpr const wchar_t* kTemp = L"temp"; // owned by user plugins +constexpr const wchar_t* kSpool = L"spool"; // owned by user/sys plugins +constexpr const wchar_t* kTemp = L"temp"; // owned by user plugins +constexpr const wchar_t* kUpdate = L"update"; // owned by agent }; // namespace dirs namespace envs { diff --git a/agents/wnx/src/common/cmdline_info.h b/agents/wnx/src/common/cmdline_info.h index 209dea0..a83ab09 100644 --- a/agents/wnx/src/common/cmdline_info.h +++ b/agents/wnx/src/common/cmdline_info.h @@ -26,7 +26,6 @@ constexpr const wchar_t* kTimeout = L"timeout"; constexpr wchar_t kSplitter = L':'; inline auto ParseExeCommandLine(int argc, wchar_t const* argv[]) { - using namespace std; auto make_error_answer = [](int ErrorCode) -> auto { return make_tuple(ErrorCode, std::wstring(), std::wstring(), std::wstring()); diff --git a/agents/wnx/src/engine/cma_core.h b/agents/wnx/src/engine/cma_core.h index 490c556..3f1b504 100644 --- a/agents/wnx/src/engine/cma_core.h +++ b/agents/wnx/src/engine/cma_core.h @@ -212,10 +212,9 @@ public: uint32_t startedProcId() const { return proc_id_; } bool appendResult(HANDLE Handle, std::vector<char>& Buf) { - using namespace std; if (Buf.size() == 0) return true; - lock_guard lk(lock_); + std::lock_guard lk(lock_); { auto h = process_->getStdioRead(); if (h && h == Handle) { @@ -227,8 +226,7 @@ public: } bool storeExitCode(uint32_t Pid, uint32_t Code) { - using namespace std; - lock_guard lk(lock_); + std::lock_guard lk(lock_); if (process_->trySetExitCode(Pid, Code)) return true; return false; } @@ -263,8 +261,8 @@ public: // returns true if all processes ended // returns false on timeout or break; bool waitForEnd(std::chrono::milliseconds Timeout, bool KillWhatLeft) { + using namespace std::chrono; if (stop_set_) return false; - using namespace std; ON_OUT_OF_SCOPE(readWhatLeft()); constexpr std::chrono::milliseconds kGrane = 250ms; @@ -273,7 +271,7 @@ public: for (;;) { auto ready = checkProcessExit(waiting_processes); { - auto buf = readFromHandle<vector<char>>(read_handle); + auto buf = readFromHandle<std::vector<char>>(read_handle); if (buf.size()) appendResult(read_handle, buf); } @@ -374,8 +372,6 @@ private: // updates object // returns list of active processes bool checkProcessExit(const uint32_t Process) { - using namespace std; - auto h = OpenProcess( PROCESS_QUERY_LIMITED_INFORMATION, // not supported on XP FALSE, Process); @@ -416,9 +412,6 @@ private: } bool isExecIn(const std::filesystem::path& FileExec) { - using namespace std::filesystem; - using namespace std; - // now check for duplicates: auto cmd_line = BuildCommand(FileExec); return exec_ == cmd_line;

5 years, 3 months

Cleanup: Use Rule dict representation for cloning

by Lars Michelsen

Module: check_mk Branch: master Commit: 69c7110c382384d4b2f5cb4d25d1045563fbc171 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69c7110c382384… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 27 17:04:57 2019 +0100 Cleanup: Use Rule dict representation for cloning Change-Id: Id6b49641b98107a024c8782925a288cb6c9d90d0 --- cmk/gui/watolib/rulesets.py | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/cmk/gui/watolib/rulesets.py b/cmk/gui/watolib/rulesets.py index 28834e0..1caa08f 100644 --- a/cmk/gui/watolib/rulesets.py +++ b/cmk/gui/watolib/rulesets.py @@ -571,7 +571,7 @@ class Rule(object): def clone(self): cloned = Rule(self.folder, self.ruleset) - cloned.from_config(self._format_rule()) + cloned.from_config(self.to_dict_config()) return cloned def _initialize(self): @@ -725,28 +725,6 @@ class Rule(object): return result - def _format_rule(self): - if self.ruleset.valuespec(): - rule = [self.value] - elif not self.value: - rule = [NEGATE] - else: - rule = [] - - if self.tag_specs != []: - rule.append(self.tag_specs) - - rule.append(self.host_list) - if self.item_list is not None: - rule.append(self.item_list) - - ro = self._rule_options_to_config() - - if ro: - rule.append(ro) - - return tuple(rule) - # Append rule options, but only if they are not trivial. That way we # keep as close as possible to the original Check_MK in rules.mk so that # command line users will feel at home...

5 years, 3 months

Fixed type, things worked only by accident.

by Sven Panne

Module: check_mk Branch: master Commit: 5c1a589e2af7eb585261298cae27e31a2a0ff6a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c1a589e2af7eb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Mar 28 12:18:05 2019 +0100 Fixed type, things worked only by accident. Change-Id: I45149b69d3746575de501af3776c139024b22c4c --- livestatus/src/CustomVarsDictColumn.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/livestatus/src/CustomVarsDictColumn.cc b/livestatus/src/CustomVarsDictColumn.cc index 3a7a998..eb688af 100644 --- a/livestatus/src/CustomVarsDictColumn.cc +++ b/livestatus/src/CustomVarsDictColumn.cc @@ -32,7 +32,7 @@ class Aggregator; #ifdef CMC -#include "Object.h" +#include "Entity.h" #include "cmc.h" #else #include "nagios.h" @@ -63,8 +63,8 @@ std::unordered_map<std::string, std::string> CustomVarsDictColumn::getValue( Row row) const { std::unordered_map<std::string, std::string> dict; #ifdef CMC - if (auto *object = columnData<Object>(row)) { - return object->customAttributes(); + if (auto *entity = columnData<Entity>(row)) { + return entity->customAttributes(); } #else if (auto p = columnData<customvariablesmember *>(row)) {

5 years, 3 months

← Newer
1
2
3
4
5
6
7
8
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019