Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

Kubernetes special agent extension for custom metrics

by Óscar Nájera

Module: check_mk Branch: master Commit: 7ba060d879c831ff55facb505a4bbdf1e5b066a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ba060d879c831… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Fri Jan 11 15:08:02 2019 +0100 Kubernetes special agent extension for custom metrics CMK-1475 Change-Id: I875d82889495f276f6c9f2258b200f9dbd6ef71a --- cmk/special_agents/agent_kubernetes.py | 87 ++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index 47124ee..5efe7a0 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -48,6 +48,7 @@ from typing import ( # pylint: disable=unused-import ) from kubernetes import client +from kubernetes.client.rest import ApiException import cmk.utils.profile import cmk.utils.password_store @@ -492,6 +493,31 @@ class RoleList(ListLike[Role]): } +class Metric(object): + def __init__(self, metric): + self.from_object = metric['describedObject'] + self.metrics = {metric['metricName']: metric.get('value')} + + def __add__(self, other): + assert self.from_object == other.from_object + self.metrics.update(other.metrics) + return self + + def __str__(self): + return str(self.__dict__) + + def __repr__(self): + return str(self.__dict__) + + +class MetricList(ListLike[Metric]): + def __add__(self, other): + return MetricList([a + b for a, b in zip(self, other)]) + + def list_metrics(self): + return [item.__dict__ for item in self] + + class Group(object): """ A group of elements where an element is e.g. a piggyback host. @@ -591,6 +617,8 @@ class ApiData(object): storage_api = client.StorageV1Api(api_client) rbac_authorization_api = client.RbacAuthorizationV1Api(api_client) + self.custom_api = client.CustomObjectsApi(api_client) + logging.debug('Retrieving data') storage_classes = storage_api.list_storage_class() namespaces = core_api.list_namespace() @@ -615,6 +643,56 @@ class ApiData(object): map(PersistentVolumeClaim, pvcs.items)) self.pods = PodList(map(Pod, pods.items)) + pods_custom_metrics = { + "memory": ['memory_rss', 'memory_swap', 'memory_usage_bytes', 'memory_max_usage_bytes'], + "fs": ['fs_inodes', 'fs_reads', 'fs_writes', 'fs_limit_bytes', 'fs_usage_bytes'], + "cpu": ['cpu_system', 'cpu_user', 'cpu_usage'] + } + + self.pods_Metrics = dict() # type: Dict[str, Dict[str, List]] + for metric_group, metrics in pods_custom_metrics.items(): + self.pods_Metrics[metric_group] = self.get_namespaced_group_metric(metrics) + + def get_namespaced_group_metric(self, metrics): + # type: (List[str]) -> Dict[str, List] + queries = [self.get_namespaced_custom_pod_metric(metric) for metric in metrics] + + grouped_metrics = {} # type: Dict[str, List] + for response in queries: + for namespace in response: + grouped_metrics.setdefault(namespace, []).append(response[namespace]) + + for namespace in grouped_metrics: + grouped_metrics[namespace] = reduce(operator.add, + grouped_metrics[namespace]).list_metrics() + + return grouped_metrics + + def get_namespaced_custom_pod_metric(self, metric): + # type: (str) -> Dict + + logging.debug('Query Custom Metrics Endpoint: %s', metric) + custom_metric = {} + for namespace in self.namespaces: + try: + data = map( + Metric, + self.custom_api.get_namespaced_custom_object( + 'custom.metrics.k8s.io', + 'v1beta1', + namespace.name, + 'pods/*', + metric, + )['items']) + custom_metric[namespace.name] = MetricList(data) + except ApiException as err: + if err.status == 404: + logging.info('Data unavailable. No pods in namespace %s', namespace.name) + else: + raise err + + return custom_metric + def cluster_sections(self): # type: () -> str logging.info('Output cluster sections') @@ -643,6 +721,14 @@ class ApiData(object): g.join('k8s_conditions', self.nodes.conditions()) return '\n'.join(g.output()) + def custom_metrics_section(self): + # type: () -> str + logging.info('Output pods custom metrics') + e = Element() + 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 get_api_client(arguments): # type: (argparse.Namespace) -> client.ApiClient @@ -682,6 +768,7 @@ def main(args=None): api_data = ApiData(api_client) print(api_data.cluster_sections()) print(api_data.node_sections()) + print(api_data.custom_metrics_section()) except Exception as e: if arguments.debug: raise

5 years, 8 months

7029 FIX Skip adding PING service to piggyback only hosts without IP

by Lars Michelsen

Module: check_mk Branch: master Commit: 96c7d5b4348873cc0d089dd01153abc276baecc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96c7d5b4348873… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 14 21:29:20 2019 +0100 7029 FIX Skip adding PING service to piggyback only hosts without IP When a host is configured as "No agent", "No SNMP" and "No IP address" host it is not useful to add a "PING" service to it in case there are other services on this host because there is no address to be pinged. This combination of tags e.g. is used by the Dynamic configuration to create container hosts or similar. Change-Id: I0b0ca9c78ef4d027e4129d7d1e929aceff888b9e --- .werks/7029 | 15 +++++++++++++++ cmk/gui/watolib/hosts_and_folders.py | 3 ++- cmk_base/default_config/base.py | 11 +++++++++-- tests/unit/cmk_base/test_config.py | 24 ++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/.werks/7029 b/.werks/7029 new file mode 100644 index 0000000..86e824a --- /dev/null +++ b/.werks/7029 @@ -0,0 +1,15 @@ +Title: Skip adding PING service to piggyback only hosts without IP +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1547497560 +Class: fix + +When a host is configured as "No agent", "No SNMP" and "No IP address" +host it is not useful to add a "PING" service to it in case there are +other services on this host because there is no address to be pinged. + +This combination of tags e.g. is used by the Dynamic configuration to +create hosts that represent container objects or similar. diff --git a/cmk/gui/watolib/hosts_and_folders.py b/cmk/gui/watolib/hosts_and_folders.py index c444125..cf2f6c2 100644 --- a/cmk/gui/watolib/hosts_and_folders.py +++ b/cmk/gui/watolib/hosts_and_folders.py @@ -1919,7 +1919,8 @@ class CREHost(WithPermissionsAndAttributes): # SNMP, it needs to get the ping tag assigned. # Because we need information from multiple attributes to get this # information, we need to add this decision here. - if "no-snmp" in tags and "no-agent" in tags: + # Skip this in case no-ip is configured: A ping check is useless in this case + if "no-snmp" in tags and "no-agent" in tags and not "no-ip" in tags: tags.add("ping") # The following code is needed to migrate host/rule matching from <1.5 diff --git a/cmk_base/default_config/base.py b/cmk_base/default_config/base.py index 99e11ce..8756d18 100644 --- a/cmk_base/default_config/base.py +++ b/cmk_base/default_config/base.py @@ -138,8 +138,15 @@ all_hosts = [] # TODO: This is a derived variable. Should be handled like others # (hosttags, service_service_levels, ...) host_paths = {} -snmp_hosts = [(['snmp'], _ALL_HOSTS)] -tcp_hosts = [(['tcp'], _ALL_HOSTS), (_NEGATE, ['snmp'], _ALL_HOSTS), (['!ping'], _ALL_HOSTS)] +snmp_hosts = [ + (['snmp'], _ALL_HOSTS), +] +tcp_hosts = [ + (['tcp'], _ALL_HOSTS), + (_NEGATE, ['snmp'], _ALL_HOSTS), + # Match all those that don't have ping and don't have no-agent set + (['!ping', '!no-agent'], _ALL_HOSTS), +] bulkwalk_hosts = [] snmpv2c_hosts = [] snmp_without_sys_descr = [] diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 86bb413..5ae82f6 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -84,6 +84,30 @@ def test_management_address_of(monkeypatch, attrs, result): @pytest.mark.parametrize("hostname,tags,result", [ + ("testhost", [], True), + ("testhost", ["cmk-agent"], True), + ("testhost", ["cmk-agent", "tcp"], True), + ("testhost", ["snmp", "tcp"], True), + ("testhost", ["ping"], False), + ("testhost", ["no-agent", "no-snmp"], False), +]) +def test_is_tcp_host(monkeypatch, hostname, tags, result): + monkeypatch.setattr(config, "tags_of_host", lambda h: {hostname: tags}[h]) + assert config.is_tcp_host(hostname) == result + + +(a)pytest.mark.parametrize("hostname,tags,result", [ + ("testhost", [], False), + ("testhost", ["cmk-agent"], False), + ("testhost", ["snmp", "tcp"], True), + ("testhost", ["snmp"], True), +]) +def test_is_snmp_host(monkeypatch, hostname, tags, result): + monkeypatch.setattr(config, "tags_of_host", lambda h: {hostname: tags}[h]) + assert config.is_snmp_host(hostname) == result + + +(a)pytest.mark.parametrize("hostname,tags,result", [ ("testhost", [], False), ("testhost", ["all-agents"], True), ("testhost", ["special-agents"], False),

5 years, 8 months

7028 LDAP sync: Visibility of Hosts/ Services can now be set via default user profile

by Lars Michelsen

Module: check_mk Branch: master Commit: 244a3d43f0a83f28d6f8ee1b4ead908553e72e01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=244a3d43f0a83f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 14 15:28:28 2019 +0100 7028 LDAP sync: Visibility of Hosts/Services can now be set via default user profile Change-Id: Ie812a4f43be9481ce4b046a14df61ed0fcea7a5c --- .werks/7028 | 10 ++++++++++ cmk/gui/plugins/config/base.py | 1 + cmk/gui/plugins/wato/check_mk_configuration.py | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/.werks/7028 b/.werks/7028 new file mode 100644 index 0000000..96486c7 --- /dev/null +++ b/.werks/7028 @@ -0,0 +1,10 @@ +Title: LDAP sync: Visibility of Hosts/Services can now be set via default user profile +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1547476075 +Class: feature + + diff --git a/cmk/gui/plugins/config/base.py b/cmk/gui/plugins/config/base.py index ce2826c..c553f64 100644 --- a/cmk/gui/plugins/config/base.py +++ b/cmk/gui/plugins/config/base.py @@ -299,6 +299,7 @@ user_connections = [] default_user_profile = { 'contactgroups': [], 'roles': ['user'], + 'force_authuser': False, } lock_on_logon_failures = False user_idle_timeout = None diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index d48c06e..d7361c7 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -1895,6 +1895,13 @@ class ConfigVariableDefaultUserProfile(ConfigVariable): default_value=[], choices=self._list_contactgroups, )), + ("force_authuser", + Checkbox( + title=_("Visibility of Hosts/Services"), + label=_("Only show hosts and services the user is a contact for"), + help=_("Specifiy the initial setting for an automatically created user."), + default_value=False, + )) ] def _list_roles(self):

5 years, 8 months

agent_aws: Add region 'EU (Stockholm)' (eu-north-1)

by Simon Betz

Module: check_mk Branch: master Commit: d28336c1effc775b430d851a910cdd00f7c29af1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d28336c1effc77… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 14 17:29:16 2019 +0100 agent_aws: Add region 'EU (Stockholm)' (eu-north-1) Change-Id: I936e1085e6ebb66f666d8efaf23e102609db9e42 --- agents/special/agent_aws | 4 ++++ cmk/gui/plugins/wato/datasource_programs.py | 1 + 2 files changed, 5 insertions(+) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index e1cf08c..006d4fa 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -1124,6 +1124,7 @@ AWSRegions = [ ("eu-west-1", "EU (Ireland)"), ("eu-west-2", "EU (London)"), ("eu-west-3", "EU (Paris)"), + ("eu-north-1", "EU (Stockholm)"), ("sa-east-1", "South America (Sao Paulo)"), ("us-east-2", "US East (Ohio)"), ("us-east-1", "US East (N. Virginia)"), @@ -1136,6 +1137,9 @@ AWSServices = [ ("ec2", "Elastic Compute Cloud (EC2)"), ("ebs", "Elastic Block Storage (EBS)"), ("s3", "Simple Storage Service (S3)"), + #("elb", "Elastic Load Balancing (ELB)"), + #("cloudtrail", ""), + #("glacier", ""), ] diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index e0df58a..7597de7 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -1483,6 +1483,7 @@ register_rule( ("eu-west-1", _("EU (Ireland)")), ("eu-west-2", _("EU (London)")), ("eu-west-3", _("EU (Paris)")), + ("eu-north-1", _("EU (Stockholm)")), ("sa-east-1", _("South America (Sao Paulo)")), ("us-east-2", _("US East (Ohio)")), ("us-east-1", _("US East (N. Virginia)")),

5 years, 8 months

agent_aws: Regions and services can be configured in rule set '

by Simon Betz

Amazon Web Services (AWS)' Message-ID: <5c3cb938.km9/GEgrzVgNHoDE%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: aedb1f3cd346720f0800559e281b3d076a4cfb37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aedb1f3cd34672… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 14 13:40:14 2019 +0100 agent_aws: Regions and services can be configured in rule set 'Amazon Web Services (AWS)' Change-Id: I772082d3af8571acfa4c98d207edce81c90e2ed1 --- agents/special/agent_aws | 124 ++++++++++++++++++++-------- checks/agent_aws | 12 ++- cmk/gui/plugins/wato/datasource_programs.py | 20 ++++- tests/unit/checks/test_agent_aws.py | 16 ++-- 4 files changed, 124 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=aedb1f3cd3…

5 years, 8 months

7005 FIX HW/SW inventory: Fixed API error 'Too many values to unpack'

by Simon Betz

Module: check_mk Branch: master Commit: 38c421a2cec78e85187d33d9b04ca1fd5623234b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38c421a2cec78e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 14 16:41:25 2019 +0100 7005 FIX HW/SW inventory: Fixed API error 'Too many values to unpack' Change-Id: I6c3fd30cba400c940653dc50a349c273ae7b1126 --- .werks/7005 | 11 +++++++++++ cmk/gui/inventory.py | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/7005 b/.werks/7005 new file mode 100644 index 0000000..5464092 --- /dev/null +++ b/.werks/7005 @@ -0,0 +1,11 @@ +Title: HW/SW inventory: Fixed API error 'Too many values to unpack' +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1547479895 + + diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index 0093731..0df4855 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -430,8 +430,7 @@ def _inventory_of_host(host_name, request): if "paths" in request: parsed_paths = [] for path in request["paths"]: - parsed_path, _key = parse_tree_path(path) - parsed_paths.append(parsed_path) + parsed_paths.append(parse_tree_path(path)) merged_tree = merged_tree.get_filtered_tree(parsed_paths) return merged_tree.get_raw_tree()

5 years, 8 months

cpu_queues: Fix missing consideration of PM in 12 hour timestamp format

by Florian Kromer

Module: check_mk Branch: master Commit: cf716e7952010bd9f3a082e383d425b36a867bf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf716e7952010b… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Fri Jan 11 15:55:05 2019 +0100 cpu_queues: Fix missing consideration of PM in 12 hour timestamp format FEED-3234 Change-Id: Ifc9efc97af805626f58905cc07aaf20c84e23efa --- checks/cups_queues | 2 +- .../checks/generictests/datasets/cups_queues.py | 9 ++--- .../checks/generictests/datasets/cups_queues_am.py | 38 ++++++++++++++++++++++ .../checks/generictests/datasets/cups_queues_pm.py | 38 ++++++++++++++++++++++ 4 files changed, 82 insertions(+), 5 deletions(-) diff --git a/checks/cups_queues b/checks/cups_queues index 98c6af6..98f68f8 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -85,7 +85,7 @@ def parse_cups_queues(info): '%a %b %d %H:%M:%S %Y')) except: # Thu 29 Aug 2013 12:41:42 AM CEST job_time = time.mktime(time.strptime(' '.join(line[-7:]), \ - '%a %d %b %Y %H:%M:%S %p %Z')) + '%a %d %b %Y %I:%M:%S %p %Z')) parsed[item]['jobs'].append(job_time) return parsed diff --git a/tests/unit/checks/generictests/datasets/cups_queues.py b/tests/unit/checks/generictests/datasets/cups_queues.py index 7eb0bbf..18eedf0 100644 --- a/tests/unit/checks/generictests/datasets/cups_queues.py +++ b/tests/unit/checks/generictests/datasets/cups_queues.py @@ -10,8 +10,9 @@ info = [[ [ 'Wiederherstellbar:', 'Der', 'Netzwerk-Host', 'lpr2', 'ist', 'beschaeftigt,', 'erneuter', 'Versuch', 'in', '30', 'Sekunden' - ], ['---'], ['lpr2-2', 'root', '1024', 'Tue', 'Jun', '29', '09:02:35', '2010'], - ['lpr2-3', 'root', '1024', 'Tue', 'Jun', '29', '09:05:54', '2010']] + ], ['---'], ['lpr2-2', 'root', '1024', 'Tue', 'Jun', '28', '09:05:56', '2010'], + ['lpr2-3', 'root', '1024', 'Tue', '28', 'Jun', '2010', '01:02:35', 'PM', 'CET'], + ['lpr2-4', 'root', '1024', 'Tue', '29', 'Jun', '2010', '09:05:54', 'AM', 'CET']] discovery = {'': [('lpr2', {}), ('spr1', {})]} @@ -25,8 +26,8 @@ checks = { }, [( 0, 'now printing lpr2-3. enabled since Tue Jun 29 09:22:04 2010 (Wiederherstellbar: Der Netzwerk-Host lpr2 ist beschaeftigt, erneuter Versuch in 30 Sekunden)', - []), (0, 'Jobs: 2', [('jobs', 2, 5, 10, 0, None)]), - (2, 'Oldest job is from Tue Jun 29 09:02:35 2010', [])]), + []), (0, 'Jobs: 3', [('jobs', 3, 5, 10, 0, None)]), + (2, 'Oldest job is from Mon Jun 28 09:05:56 2010', [])]), ('spr1', { 'disabled_since': 2, 'is_idle': 0, diff --git a/tests/unit/checks/generictests/datasets/cups_queues_am.py b/tests/unit/checks/generictests/datasets/cups_queues_am.py new file mode 100644 index 0000000..9c779ad --- /dev/null +++ b/tests/unit/checks/generictests/datasets/cups_queues_am.py @@ -0,0 +1,38 @@ +checkname = 'cups_queues' + +info = [[ + 'printer', 'spr1', 'is', 'idle.', 'enabled', 'since', 'Thu', 'Mar', '11', '14:28:23', '2010' +], + [ + 'printer', 'lpr2', 'now', 'printing', 'lpr2-3.', 'enabled', 'since', 'Tue', 'Jun', '29', + '09:22:04', '2010' + ], + [ + 'Wiederherstellbar:', 'Der', 'Netzwerk-Host', 'lpr2', 'ist', 'beschaeftigt,', + 'erneuter', 'Versuch', 'in', '30', 'Sekunden' + ], ['---'], ['lpr2-2', 'root', '1024', 'Tue', '28', 'Jun', '2010', '09:05:54', 'AM', 'CET'], + ['lpr2-3', 'root', '1024', 'Tue', '29', 'Jun', '2010', '01:02:35', 'PM', 'CET'], + ['lpr2-4', 'root', '1024', 'Tue', 'Jun', '29', '09:05:56', '2010']] + +discovery = {'': [('lpr2', {}), ('spr1', {})]} + +checks = { + '': [('lpr2', { + 'disabled_since': 2, + 'is_idle': 0, + 'job_age': (360, 720), + 'job_count': (5, 10), + 'now_printing': 0 + }, [( + 0, + 'now printing lpr2-3. enabled since Tue Jun 29 09:22:04 2010 (Wiederherstellbar: Der Netzwerk-Host lpr2 ist beschaeftigt, erneuter Versuch in 30 Sekunden)', + []), (0, 'Jobs: 3', [('jobs', 3, 5, 10, 0, None)]), + (2, 'Oldest job is from Mon Jun 28 10:05:54 2010', [])]), + ('spr1', { + 'disabled_since': 2, + 'is_idle': 0, + 'job_age': (360, 720), + 'job_count': (5, 10), + 'now_printing': 0 + }, [(0, 'is idle. enabled since Thu Mar 11 14:28:23 2010', [])])] +} diff --git a/tests/unit/checks/generictests/datasets/cups_queues_pm.py b/tests/unit/checks/generictests/datasets/cups_queues_pm.py new file mode 100644 index 0000000..3989e32 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/cups_queues_pm.py @@ -0,0 +1,38 @@ +checkname = 'cups_queues' + +info = [[ + 'printer', 'spr1', 'is', 'idle.', 'enabled', 'since', 'Thu', 'Mar', '11', '14:28:23', '2010' +], + [ + 'printer', 'lpr2', 'now', 'printing', 'lpr2-3.', 'enabled', 'since', 'Tue', 'Jun', '29', + '09:22:04', '2010' + ], + [ + 'Wiederherstellbar:', 'Der', 'Netzwerk-Host', 'lpr2', 'ist', 'beschaeftigt,', + 'erneuter', 'Versuch', 'in', '30', 'Sekunden' + ], ['---'], ['lpr2-2', 'root', '1024', 'Tue', '28', 'Jun', '2010', '01:02:35', 'PM', 'CET'], + ['lpr2-3', 'root', '1024', 'Tue', '29', 'Jun', '2010', '09:05:54', 'AM', 'CET'], + ['lpr2-4', 'root', '1024', 'Tue', 'Jun', '29', '09:05:56', '2010']] + +discovery = {'': [('lpr2', {}), ('spr1', {})]} + +checks = { + '': [('lpr2', { + 'disabled_since': 2, + 'is_idle': 0, + 'job_age': (360, 720), + 'job_count': (5, 10), + 'now_printing': 0 + }, [( + 0, + 'now printing lpr2-3. enabled since Tue Jun 29 09:22:04 2010 (Wiederherstellbar: Der Netzwerk-Host lpr2 ist beschaeftigt, erneuter Versuch in 30 Sekunden)', + []), (0, 'Jobs: 3', [('jobs', 3, 5, 10, 0, None)]), + (2, 'Oldest job is from Mon Jun 28 14:02:35 2010', [])]), + ('spr1', { + 'disabled_since': 2, + 'is_idle': 0, + 'job_age': (360, 720), + 'job_count': (5, 10), + 'now_printing': 0 + }, [(0, 'is idle. enabled since Thu Mar 11 14:28:23 2010', [])])] +}

5 years, 8 months

Unbreak web API... :-}

by Sven Panne

Module: check_mk Branch: master Commit: fed6243ed96d5689fe826ae65f7fea268cee257d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fed6243ed96d56… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jan 14 15:09:23 2019 +0100 Unbreak web API... :-} Change-Id: Ifd5b1c8adde09bfe1ca9fefd4e5a1a5927802724 --- cmk/gui/webapi.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/cmk/gui/webapi.py b/cmk/gui/webapi.py index ab100cf..37c688b 100644 --- a/cmk/gui/webapi.py +++ b/cmk/gui/webapi.py @@ -116,16 +116,7 @@ def page_api(): if not config.wato_enabled: raise MKUserError(None, _("WATO is disabled on this site.")) - config.user.need_permission("wato.use") - config.user.need_permission("wato.api_allowed") - - action = html.request.var('action') - api_call = api_call_collection_registry.get(action) - if not api_call: - raise MKUserError(None, "Unknown API action %s" % html.attrencode(action)) - - for permission in api_call.get("required_permissions", []): - config.user.need_permission(permission) + api_call = _get_api_call() # Initialize host and site attributes watolib.init_wato_datastructures() @@ -193,3 +184,15 @@ def page_api(): } html.write(_FORMATTERS[html.output_format][1 if pretty_print else 0](response)) + + +def _get_api_call(): + action = html.request.var('action') + for cls in api_call_collection_registry.values(): + api_call = cls().get_api_calls().get(action) + if api_call: + for permission in ["wato.use", "wato.api_allowed"] + \ + api_call.get("required_permissions", []): + config.user.need_permission(permission) + return api_call + raise MKUserError(None, "Unknown API action %s" % html.attrencode(action))

5 years, 8 months

Update persisted sections with existing (filtered) persisted sections before saving

by Simon Betz

Module: check_mk Branch: master Commit: 357170a1dde7ffff7371729e61af84482b80e731 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=357170a1dde7ff… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 14 13:10:25 2019 +0100 Update persisted sections with existing (filtered) persisted sections before saving Change-Id: I5dba7b5f4921d4acd0f49f01b3067e6ee08cab3c --- cmk_base/data_sources/abstract.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index ca783c1..4de01d5 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -122,7 +122,6 @@ class DataSource(object): try: cpu_tracking.push_phase(self._cpu_tracking_id()) - self._persisted_sections = self._load_persisted_sections() raw_data, is_cached_data = self._get_raw_data() self._host_sections = host_sections = self._convert_to_sections(raw_data) @@ -131,11 +130,9 @@ class DataSource(object): if get_raw_data: return raw_data - if host_sections.persisted_sections and not is_cached_data: - self._store_persisted_sections(host_sections.persisted_sections) - # Add information from previous persisted infos - host_sections = self._update_info_with_persisted_sections(host_sections) + host_sections = self._update_info_with_persisted_sections(host_sections, is_cached_data) + self._persisted_sections = host_sections.persisted_sections return host_sections @@ -428,24 +425,31 @@ class DataSource(object): store.save_data_to_file(file_path, persisted_sections, pretty=False) self._logger.debug("Stored persisted sections: %s" % (", ".join(persisted_sections.keys()))) - def _update_info_with_persisted_sections(self, host_sections): - if not self._persisted_sections: + def _update_info_with_persisted_sections(self, host_sections, is_cached_data): + persisted_sections_from_raw = host_sections.persisted_sections + persisted_sections = self._load_persisted_sections() + + if persisted_sections_from_raw and not is_cached_data: + persisted_sections.update(persisted_sections_from_raw) + self._store_persisted_sections(host_sections.persisted_sections) + + if not persisted_sections: return host_sections - for section_name, entry in self._persisted_sections.items(): + for section_name, entry in persisted_sections.items(): if len(entry) == 2: continue # Skip entries of "old" format persisted_from, persisted_until, section_info = entry # Don't overwrite sections that have been received from the source with this call - if section_name not in host_sections.sections: + if section_name in host_sections.sections: + self._logger.debug( + "Skipping persisted section %r, live data available" % (section_name)) + else: self._logger.debug("Using persisted section %r" % (section_name)) host_sections.add_cached_section(section_name, section_info, persisted_from, persisted_until) - else: - self._logger.debug("Skipping persisted section %r" % (section_name)) - return host_sections def _load_persisted_sections(self):

5 years, 8 months

6682 FIX SNMP Checks: Fixed randomly missing data, when using the rule ' Check intervals for SNMP checks'

by Simon Betz

Module: check_mk Branch: master Commit: f8ce3fe82669c9390713e0506819ca8d418b29dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8ce3fe82669c9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 14 13:04:06 2019 +0100 6682 FIX SNMP Checks: Fixed randomly missing data, when using the rule 'Check intervals for SNMP checks' Change-Id: I1fba992b416f15aecc84d06d0ac8abe938895d10 --- .werks/6682 | 11 +++++++++++ cmk_base/data_sources/abstract.py | 8 +++++--- cmk_base/data_sources/snmp.py | 8 +++----- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.werks/6682 b/.werks/6682 new file mode 100644 index 0000000..2cfe7ee --- /dev/null +++ b/.werks/6682 @@ -0,0 +1,11 @@ +Title: SNMP Checks: Fixed randomly missing data, when using the rule "Check intervals for SNMP checks" +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542114586 + +One outcome of this bug was that successive service discoveries reported different amounts of services found. diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 56e562d..ca783c1 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -86,6 +86,7 @@ class DataSource(object): self._exception = None self._host_sections = None self._exit_code_spec = config.exit_code_spec(hostname, data_source_id=self.id()) + self._persisted_sections = None def _setup_logger(self): """Add the source log prefix to the class logger""" @@ -116,10 +117,12 @@ class DataSource(object): self._exception = None self._host_sections = None + self._persisted_sections = None try: cpu_tracking.push_phase(self._cpu_tracking_id()) + self._persisted_sections = self._load_persisted_sections() raw_data, is_cached_data = self._get_raw_data() self._host_sections = host_sections = self._convert_to_sections(raw_data) @@ -426,11 +429,10 @@ class DataSource(object): self._logger.debug("Stored persisted sections: %s" % (", ".join(persisted_sections.keys()))) def _update_info_with_persisted_sections(self, host_sections): - persisted_sections = self._load_persisted_sections() - if not persisted_sections: + if not self._persisted_sections: return host_sections - for section_name, entry in persisted_sections.iteritems(): + for section_name, entry in self._persisted_sections.items(): if len(entry) == 2: continue # Skip entries of "old" format diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index e3580f6..a0ec428 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -168,8 +168,6 @@ class SNMPDataSource(DataSource): self._verify_ipaddress() - persisted_sections = self._load_persisted_sections() - check_plugin_names = self.get_check_plugin_names() access_data = self._get_access_data() @@ -197,7 +195,7 @@ class SNMPDataSource(DataSource): # This checks data is configured to be persisted (snmp_check_interval) and recent enough. # Skip gathering new data here. The persisted data will be added latera - if section_name in persisted_sections: + if section_name in self._persisted_sections: self._logger.debug( "%s: Skip fetching data (persisted info exists)" % (check_plugin_name)) continue @@ -248,8 +246,8 @@ class SNMPDataSource(DataSource): key=lambda x: (not ('cpu' in x or x in cpu_checks_without_cpu_in_check_name), x)) def _convert_to_sections(self, raw_data): - persisted_sections = self._extract_persisted_sections(raw_data) - return HostSections(raw_data, persisted_sections=persisted_sections) + sections_to_persist = self._extract_persisted_sections(raw_data) + return HostSections(raw_data, persisted_sections=sections_to_persist) def _extract_persisted_sections(self, raw_data): """Extract the sections to be persisted from the raw_data and return it

5 years, 8 months

← Newer
1
...
24
25
26
27
28
29
30
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019