Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

6507 FIX Fixed 100% CPU usage of the CMC after writing to its command pipe

by Sven Panne

Module: check_mk Branch: master Commit: d7cdd6e0b6b041332f36bc52790673d81a8fedb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7cdd6e0b6b041… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Oct 23 16:39:46 2018 +0200 6507 FIX Fixed 100% CPU usage of the CMC after writing to its command pipe After writing to its command pipe tmp/run/nagios.cmd, the CMC's CPU usage went up to 100%. This has been fixed. Change-Id: I2f6b9330d348a3f5c0467303cd5a89d906e53860 --- .werks/6507 | 11 +++++++++++ livestatus/src/Poller.h | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/6507 b/.werks/6507 new file mode 100644 index 0000000..56925e9 --- /dev/null +++ b/.werks/6507 @@ -0,0 +1,11 @@ +Title: Fixed 100% CPU usage of the CMC after writing to its command pipe +Level: 2 +Component: core +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1540305466 +Class: fix + +After writing to its command pipe tmp/run/nagios.cmd, the CMC's CPU usage +went up to 100%. This has been fixed. diff --git a/livestatus/src/Poller.h b/livestatus/src/Poller.h index abebfe3..296113f 100644 --- a/livestatus/src/Poller.h +++ b/livestatus/src/Poller.h @@ -34,7 +34,7 @@ #include <vector> #include "BitMask.h" -enum class PollEvents { in = 1 << 0, out = 1 << 1 }; +enum class PollEvents { in = 1 << 0, out = 1 << 1, hup = 1 << 2 }; IS_BIT_MASK(PollEvents); class Poller { @@ -78,7 +78,8 @@ private: // guaranteed short value range. return static_cast<short>( (is_empty_bit_mask(e & PollEvents::in) ? 0 : POLLIN) | - (is_empty_bit_mask(e & PollEvents::out) ? 0 : POLLOUT)); + (is_empty_bit_mask(e & PollEvents::out) ? 0 : POLLOUT) | + (is_empty_bit_mask(e & PollEvents::hup) ? 0 : POLLHUP)); } };

5 years, 8 months

YAPF'd cmk.ec package.

by Sven Panne

Module: check_mk Branch: master Commit: 617985f19b167074d405f66625ad430ef9d9885c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=617985f19b1670… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 24 08:40:09 2018 +0200 YAPF'd cmk.ec package. CMK-1180 Change-Id: Iaea127865d4704ebe58e144d9841e74fc95b4619 --- cmk/ec/actions.py | 212 +++++++++++++------ cmk/ec/export.py | 2 +- cmk/ec/history.py | 93 ++++---- cmk/ec/main.py | 609 +++++++++++++++++++++++++++++++---------------------- cmk/ec/settings.py | 5 +- cmk/ec/snmp.py | 84 ++++---- 6 files changed, 587 insertions(+), 418 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=617985f19b…

5 years, 8 months

5516 FIX cmk-update-agent: Catch HTTPS redirect

by Andreas Umbreit

Module: check_mk Branch: master Commit: b664ea5608d2e53ac3f0d37eccd9551881faf823 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b664ea5608d2e5… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Oct 22 16:52:45 2018 +0200 5516 FIX cmk-update-agent: Catch HTTPS redirect A communication between the Agent Updater and the Check_MK-Server won't succeed if the communication protocol is configured to HTTP while the server enforces HTTPS. The reason is that the POST data sent by the Agent Updater will be lost on the redirect. So far, this is normal HTTP behavior. Nonetheless, the Agent Updater now handles this situation by detecting the redirect and directly sending its data via (unverified) HTTPS. A warning will therefore be displayed to the user respectively written to log. (Jira: FEED-3002) Change-Id: I0e43e5706cafcb4029c4d0e3bfe1c58fd8a7e70d --- .werks/5516 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.werks/5516 b/.werks/5516 new file mode 100644 index 0000000..4bcd19b --- /dev/null +++ b/.werks/5516 @@ -0,0 +1,21 @@ +Title: cmk-update-agent: Catch HTTPS redirect +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1540222280 + +A communication between the Agent Updater and the Check_MK-Server +won't succeed if the communication protocol is configured to HTTP +while the server enforces HTTPS. The reason is that the POST data +sent by the Agent Updater will be lost on the redirect. + +So far, this is normal HTTP behavior. Nonetheless, the Agent Updater +now handles this situation by detecting the redirect and directly +sending its data via (unverified) HTTPS. + +A warning will therefore be displayed to the user respectively written +to log.

5 years, 8 months

agent_azure: make pylint happier && yapf

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8465b72968103ca2de6791b65c2b6426d3b5148d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8465b72968103c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Oct 23 14:17:31 2018 +0200 agent_azure: make pylint happier && yapf Change-Id: I7197e3fdbfd785f2bb8dc18e41c18e3d25d3125b --- agents/special/agent_azure | 95 +++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8465b72968…

5 years, 8 months

docker.include: Properly parse values with unescaped commas

by Moritz Kiemer

Module: check_mk Branch: master Commit: 74386d1e60e1d14032f48e10995055cfbeafe858 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74386d1e60e1d1… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Oct 23 09:09:18 2018 +0200 docker.include: Properly parse values with unescaped commas Change-Id: I47f3154a456b6ab16d24bdd87cb40182ab6909be --- checks/docker.include | 24 +++++++++++++++++----- tests/unit/checks/test_docker_parse_node_images.py | 3 ++- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/checks/docker.include b/checks/docker.include index 87eb4cd..3b23b69 100644 --- a/checks/docker.include +++ b/checks/docker.include @@ -200,7 +200,8 @@ def _get_json_list(info): json_list.append(json.loads(' '.join(row))) except ValueError: pass - return json_list + # some buggy docker commands produce empty output + return [element for element in json_list if element] def parse_docker_subsection_images(info): @@ -255,10 +256,24 @@ def _split_subsections(info): if row[0].startswith('[[[') and row[0].endswith(']]]'): subname = row[0].strip('[]') continue - subsections.setdefault(subname, []).append(row) + subsections.setdefault(subname, []).append(row) return subsections +def parse_docker_messed_up_labels(string): + '''yield key value pairs + + 'string' is in the format "key1=value1,key2=value2,...", but there + may be unescaped commas in the values. + ''' + def toggle_key_value(): + for chunk in string.split('='): + for item in chunk.rsplit(',', 1): + yield item + toggler = toggle_key_value() + return dict(zip(toggler, toggler)) + + def parse_docker_node_images(info): subsections = _split_subsections(info) images = parse_docker_subsection_images(subsections.get("images", [])) @@ -285,7 +300,7 @@ def parse_docker_node_images(info): for image_id, labels in image_labels.iteritems(): image = images.get(_docker_trunc_id(image_id)) if image is not None and labels is not None: - image["__labels__"].update(labels) + image["__labels__"].update(labels) mapping = {(i['Repository'], i['Tag']): i['ID'] for i in images.itervalues()} @@ -298,8 +313,7 @@ def parse_docker_node_images(info): labels = c.get("Labels") if isinstance(labels, (str, unicode)): - lab = (p.split("=", 1) for p in labels.split(",")) - c["Labels"] = dict(lab) + c["Labels"] = parse_docker_messed_up_labels(labels) return {"images": images, "containers": containers} diff --git a/tests/unit/checks/test_docker_parse_node_images.py b/tests/unit/checks/test_docker_parse_node_images.py index 5b5dd7b..4cd1318 100644 --- a/tests/unit/checks/test_docker_parse_node_images.py +++ b/tests/unit/checks/test_docker_parse_node_images.py @@ -264,7 +264,7 @@ INFO1 = [ '{"Command":"\\"/usr/sbin/init\\"","CreatedAt":"2018-10-12', '11:13:24', '+0200', 'CEST","ID":"f1641e401237","Image":"local/c7-systemd-httpd","Labels":"org.label-schema.build-date=20180804,org.label-schema.license=GPLv2,org.label-schema.name=CentOS', 'Base', - 'Image,org.label-schema.schema-version=1.0,org.label-schema.vendor=CentOS","LocalVolumes":"0","Mounts":"/sys/fs/cgroup","Names":"sad_stonebraker","Networks":"bridge","Ports":"0.0.0.0:8080-\u003e80/tcp","RunningFor":"5', + 'Image,org.label-schema.schema-version=1.0,funny.value.with.commas=This', 'is', 'really,', 'really', 'stupid.,org.label-schema.vendor=CentOS","LocalVolumes":"0","Mounts":"/sys/fs/cgroup","Names":"sad_stonebraker","Networks":"bridge","Ports":"0.0.0.0:8080-\u003e80/tcp","RunningFor":"5', 'hours', 'ago","Size":"0B","Status":"Up', '5', 'hours"}' ], [ @@ -1212,6 +1212,7 @@ EXPECTED_CONTAINERS1 = { u'org.label-schema.build-date': u'20180804', u'org.label-schema.license': u'GPLv2', u'org.label-schema.name': u'CentOS Base Image', + u'funny.value.with.commas': u'This is really, really stupid.', u'org.label-schema.schema-version': u'1.0', u'org.label-schema.vendor': u'CentOS' },

5 years, 8 months

6645 FIX Solaris Agent: Correctly separate cputime and elapsed time

by Óscar Nájera

Module: check_mk Branch: master Commit: c1e00bd6c81cb7101bf74ec7baa1e7e34e87974d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1e00bd6c81cb7… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Oct 22 12:53:21 2018 +0200 6645 FIX Solaris Agent: Correctly separate cputime and elapsed time The process information delivered by the agent has been upgrated multiple times by requirements of users or information available from the OS. The ps agent tracked the memory outilization of a process by its name, but could not access information of process id and the time of life(elapsed time) of a running process, as such information was misplaced by the agent and thus ignored by the check. This fix brings this data into consideration by the check. Change-Id: Ia6f2df3ee5c074c258ed9a301716c923a3a11451 --- .werks/6645 | 11 +++++++++++ agents/check_mk_agent.solaris | 2 +- checks/ps.include | 27 ++++++++++++++++----------- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/.werks/6645 b/.werks/6645 new file mode 100644 index 0000000..b85a4a1 --- /dev/null +++ b/.werks/6645 @@ -0,0 +1,11 @@ +Title: Solaris Agent: Correctly separate cputime and elapsed time in agent info +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1540280877 +Class: fix + +The process information delivered by the agent has been upgrated multiple times by requirements of users or information available from the OS. The ps agent tracked the memory outilization of a process by its name, but could not access information of process id and the time of life(elapsed time) of a running process, as such information was misplaced by the agent and thus ignored by the check. This fix brings this data into consideration by the check. + diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 5810ee2..fbab57b 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -228,7 +228,7 @@ echo '<<<ps>>>' if [ -x /usr/ucb/ps ]; then UCB_PS=$(/usr/ucb/ps -agwwwx) PS=$(ps -o user,vsz,rss,pcpu,etime,pid,args $pszone | \ - sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4,\5,\6) /') + sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4\/\5,\6) /') while read -r LINE; do STATS=${LINE%) *} PID=${STATS##*,} diff --git a/checks/ps.include b/checks/ps.include index 9ca4c99..c3a11a0 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -418,18 +418,21 @@ def check_ps_common(item, params, parsed, cpu_cores = 1, info_name = "processes" else: # process_info[3] contains the used CPU time and possibly, separated by /, also # the total elapsed time since the birth of the process. - if ":" in process_info[3]: - if '/' in process_info[3]: - pcpu_text, elapsed_text = process_info[3].split('/') - elapsed = parse_ps_time(elapsed_text) - max_elapsed = max(max_elapsed, elapsed) - if min_elapsed is None: - min_elapsed = elapsed - else: - min_elapsed = min(min_elapsed, elapsed) + if '/' in process_info[3]: + pcpu_text, elapsed_text = process_info[3].split('/') + else: + pcpu_text = process_info[3] + elapsed_text = None + + if elapsed_text: + elapsed = parse_ps_time(elapsed_text) + max_elapsed = max(max_elapsed, elapsed) + if min_elapsed is None: + min_elapsed = elapsed else: - pcpu_text = process_info[3] + min_elapsed = min(min_elapsed, elapsed) + if ":" in pcpu_text: total_seconds = parse_ps_time(pcpu_text) pid = process_info[4] try: @@ -440,10 +443,12 @@ def check_ps_common(item, params, parsed, cpu_cores = 1, info_name = "processes" pcpu = cputime * 100 process.append(("pid", (pid, ""))) else: - pcpu = savefloat(process_info[3]) + pcpu = float(pcpu_text) + percent_cpu += pcpu process.append(("cpu usage", (pcpu, "%"))) + elif command_line: # otherwise we have only two fields, one of which is the node. if the remaining # field is not the process name, that ps makes no sense at all

5 years, 8 months

Cleaned up config domain registration

by Lars Michelsen

Module: check_mk Branch: master Commit: 02d5faa2b9351e4984ecef45e94c79bea2680a74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02d5faa2b9351e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 22 16:12:26 2018 +0200 Cleaned up config domain registration * The config domain plugins are now registered using our standard plugin registry * Add test for correct registration of the domains Change-Id: I6883e12c626f377cf4a7131acf3c358fcf75851c --- cmk/gui/plugins/wato/__init__.py | 1 + cmk/gui/plugins/wato/omd_configuration.py | 6 ++++- cmk/gui/plugins/wato/utils/__init__.py | 1 + cmk/gui/watolib.py | 44 +++++++++++++++---------------- tests/unit/cmk/gui/test_watolib.py | 16 +++++++++++ 5 files changed, 45 insertions(+), 23 deletions(-) diff --git a/cmk/gui/plugins/wato/__init__.py b/cmk/gui/plugins/wato/__init__.py index 556cdb2..054bf6b 100644 --- a/cmk/gui/plugins/wato/__init__.py +++ b/cmk/gui/plugins/wato/__init__.py @@ -47,6 +47,7 @@ from cmk.gui.plugins.wato.utils import ( add_replication_paths, changelog_button, CheckTypeSelection, + config_domain_registry, ConfigDomain, ConfigDomainCore, ConfigDomainEventConsole, diff --git a/cmk/gui/plugins/wato/omd_configuration.py b/cmk/gui/plugins/wato/omd_configuration.py index 9dbe235..80b4a42 100644 --- a/cmk/gui/plugins/wato/omd_configuration.py +++ b/cmk/gui/plugins/wato/omd_configuration.py @@ -36,7 +36,8 @@ from cmk.gui.valuespec import * from cmk.gui.i18n import _ from cmk.gui.globals import html -from . import ( +from cmk.gui.plugins.wato import ( + config_domain_registry, ConfigDomain, ConfigDomainOMD, LivestatusViaTCP, @@ -171,6 +172,7 @@ register_configvar(group, # '----------------------------------------------------------------------' # TODO: Diskspace cleanup does not support site specific globals! +(a)config_domain_registry.register class ConfigDomainDiskspace(ConfigDomain): needs_sync = True needs_activation = False @@ -324,6 +326,7 @@ add_replication_paths([ # | Manage settings of the site apache | # '----------------------------------------------------------------------' +(a)config_domain_registry.register class ConfigDomainApache(ConfigDomain): needs_sync = True needs_activation = True @@ -428,6 +431,7 @@ register_configvar(group, # | Use these options to tune the performance of the rrdcached | # '----------------------------------------------------------------------' +(a)config_domain_registry.register class ConfigDomainRRDCached(ConfigDomain): needs_sync = True needs_activation = True diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index 5b7bc52..5736d99 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -93,6 +93,7 @@ from cmk.gui.watolib import ( ACResultCRIT, ACResultWARN, ACResultOK, + config_domain_registry, ConfigDomain, ConfigDomainCore, ConfigDomainOMD, diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 8aaa067..49c09f2 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -515,37 +515,18 @@ class ConfigDomain(object): in_global_settings = True @classmethod - def all_classes(cls): - # Classes may be registered twice, only store one of the occurances. - # TODO(lm): Find the reason for this and solve this issue in the plugin mechanism. - # NOTE: One reason is the rampant execfile usage in the plugin folders - # each language change creates additional class definitions - - # The latest "fix" changes the behaviour to return the last declared class with the - # same class name. This is usually a better idea, than returning outdated classes - classes = {} - for subclass in cls.__subclasses__(): # pylint: disable=no-member - classes[subclass.__name__] = subclass - - return classes.values() - - - @classmethod def enabled_domains(cls): - return [ d for d in cls.all_classes() if d.enabled() ] + return [ d for d in config_domain_registry.values() if d.enabled() ] @classmethod def get_always_activate_domain_idents(cls): - return [ d.ident for d in cls.all_classes() if d.always_activate ] + return [ d.ident for d in config_domain_registry.values() if d.always_activate ] @classmethod def get_class(cls, ident): - for domain_class in cls.all_classes(): - if domain_class.ident == ident: - return domain_class - raise NotImplementedError(_("The domain \"%s\" does not exist") % ident) + return config_domain_registry[ident] @classmethod @@ -628,6 +609,20 @@ class ConfigDomain(object): +class ConfigDomainRegistry(cmk.gui.plugin_registry.ClassRegistry): + def plugin_base_class(self): + return ConfigDomain + + + def _register(self, plugin_class): + self._entries[plugin_class.ident] = plugin_class + + +config_domain_registry = ConfigDomainRegistry() + + + +(a)config_domain_registry.register class ConfigDomainCore(ConfigDomain): needs_sync = True needs_activation = True @@ -646,6 +641,7 @@ class ConfigDomainCore(ConfigDomain): +(a)config_domain_registry.register class ConfigDomainGUI(ConfigDomain): needs_sync = True needs_activation = False @@ -664,6 +660,7 @@ class ConfigDomainGUI(ConfigDomain): +(a)config_domain_registry.register class ConfigDomainEventConsole(ConfigDomain): needs_sync = True needs_activation = True @@ -693,6 +690,7 @@ class ConfigDomainEventConsole(ConfigDomain): +(a)config_domain_registry.register class ConfigDomainCACertificates(ConfigDomain): needs_sync = True needs_activation = True @@ -818,6 +816,7 @@ class ConfigDomainCACertificates(ConfigDomain): +(a)config_domain_registry.register class ConfigDomainOMD(ConfigDomain): needs_sync = True needs_activation = True @@ -4356,6 +4355,7 @@ class CRESiteManagement(SiteManagement): # to extract SiteManagement() to a separate module (depends on Folder, add_change, ...). # As soon as we have untied this we should re-establish a watolib plugin hierarchy and # move this to a CEE/CME specific watolib plugin +(a)config_domain_registry.register class ConfigDomainLiveproxy(ConfigDomain): needs_sync = False needs_activation = False diff --git a/tests/unit/cmk/gui/test_watolib.py b/tests/unit/cmk/gui/test_watolib.py index 58f45d2..da238a4 100644 --- a/tests/unit/cmk/gui/test_watolib.py +++ b/tests/unit/cmk/gui/test_watolib.py @@ -25,3 +25,19 @@ def test_registered_ac_tests(): 'ACTestSizeOfExtensions', 'ACTestTmpfs' ] + + +def test_registered_config_domains(): + registered = sorted(watolib.config_domain_registry.keys()) + assert registered == [ + 'apache', + 'ca-certificates', + 'check_mk', + 'diskspace', + 'ec', + 'liveproxyd', + 'mknotifyd', + 'multisite', + 'omd', + 'rrdcached', + ]

5 years, 8 months

Cleaned up metricometer renderer registration

by Lars Michelsen

Module: check_mk Branch: master Commit: b062546aa4df778a60b35e8a422b02309f72a588 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b062546aa4df77… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 23 09:21:43 2018 +0200 Cleaned up metricometer renderer registration * Metricometer renderer are now registered using our standard plugin registry * Made MetricometerRenderer an ABC Change-Id: I9b6154ade026ab631138b6853d7275d09fdd6de2 --- cmk/gui/metrics.py | 53 +++++++++++++++++++++++++------------ cmk/gui/plugins/views/perfometer.py | 4 +-- tests/unit/cmk/gui/test_metrics.py | 11 ++++++++ 3 files changed, 49 insertions(+), 19 deletions(-) diff --git a/cmk/gui/metrics.py b/cmk/gui/metrics.py index 5641da1..909f350 100644 --- a/cmk/gui/metrics.py +++ b/cmk/gui/metrics.py @@ -33,6 +33,8 @@ # unit_name: The ID of a unit, e.g. "%" # unit: The definition-dict of a unit like in unit_info # graph_template: Template for a graph. Essentially a dict with the key "metrics" + +import abc import math import string import json @@ -47,6 +49,7 @@ import cmk.gui.config as config import cmk.gui.sites as sites import cmk.gui.i18n import cmk.gui.pages +import cmk.gui.plugin_registry from cmk.gui.i18n import _ from cmk.gui.globals import html @@ -338,29 +341,21 @@ class Perfometers(object): class MetricometerRenderer(object): + __metaclass__ = abc.ABCMeta + """Abstract base class for all metricometer renderers""" @classmethod def type_name(cls): raise NotImplementedError() - @classmethod - def get_renderer(cls, perfometer, translated_metrics): - subclasses = cls.__subclasses__() # pylint: disable=no-member - - for subclass in subclasses: - if subclass.type_name() == perfometer["type"]: - return subclass(perfometer, translated_metrics) - - raise NotImplementedError(_("Invalid perfometer type: %s") % perfometer["type"]) - - def __init__(self, perfometer, translated_metrics): super(MetricometerRenderer, self).__init__() self._perfometer = perfometer self._translated_metrics = translated_metrics + @abc.abstractmethod def get_stack(self): """Return a list of perfometer elements @@ -391,11 +386,13 @@ class MetricometerRenderer(object): return self._get_type_label() + @abc.abstractmethod def _get_type_label(self): """Returns the label for this perfometer type""" raise NotImplementedError() + @abc.abstractmethod def get_sort_number(self): """Returns the number to sort this perfometer with compared to the other performeters in the current performeter sort group""" @@ -403,6 +400,25 @@ class MetricometerRenderer(object): +class MetricometerRendererRegistry(cmk.gui.plugin_registry.ClassRegistry): + def plugin_base_class(self): + return MetricometerRenderer + + + def _register(self, plugin_class): + self._entries[plugin_class.type_name()] = plugin_class + + + def get_renderer(self, perfometer, translated_metrics): + subclass = self[perfometer["type"]] + return subclass(perfometer, translated_metrics) + + + +renderer_registry = MetricometerRendererRegistry() + + +(a)renderer_registry.register class MetricometerRendererLogarithmic(MetricometerRenderer): @classmethod def type_name(cls): @@ -451,6 +467,7 @@ class MetricometerRendererLogarithmic(MetricometerRenderer): +(a)renderer_registry.register class MetricometerRendererLinear(MetricometerRenderer): @classmethod def type_name(cls): @@ -503,6 +520,7 @@ class MetricometerRendererLinear(MetricometerRenderer): +(a)renderer_registry.register class MetricometerRendererStacked(MetricometerRenderer): @classmethod def type_name(cls): @@ -512,7 +530,7 @@ class MetricometerRendererStacked(MetricometerRenderer): def get_stack(self): stack = [] for sub_perfometer in self._perfometer["perfometers"]: - renderer = MetricometerRenderer.get_renderer(sub_perfometer, self._translated_metrics) + renderer = renderer_registry.get_renderer(sub_perfometer, self._translated_metrics) sub_stack = renderer.get_stack() stack.append(sub_stack[0]) @@ -523,7 +541,7 @@ class MetricometerRendererStacked(MetricometerRenderer): def _get_type_label(self): sub_labels = [] for sub_perfometer in self._perfometer["perfometers"]: - renderer = MetricometerRenderer.get_renderer(sub_perfometer, self._translated_metrics) + renderer = renderer_registry.get_renderer(sub_perfometer, self._translated_metrics) sub_label = renderer.get_label() if sub_label: @@ -538,11 +556,12 @@ class MetricometerRendererStacked(MetricometerRenderer): def get_sort_number(self): """Use the number of the first stack element.""" sub_perfometer = self._perfometer["perfometers"][0] - renderer = MetricometerRenderer.get_renderer(sub_perfometer, self._translated_metrics) + renderer = renderer_registry.get_renderer(sub_perfometer, self._translated_metrics) return renderer.get_sort_number() +(a)renderer_registry.register class MetricometerRendererDual(MetricometerRenderer): @classmethod def type_name(cls): @@ -560,7 +579,7 @@ class MetricometerRendererDual(MetricometerRenderer): def get_stack(self): content = [] for nr, sub_perfometer in enumerate(self._perfometer["perfometers"]): - renderer = MetricometerRenderer.get_renderer(sub_perfometer, self._translated_metrics) + renderer = renderer_registry.get_renderer(sub_perfometer, self._translated_metrics) sub_stack = renderer.get_stack() if len(sub_stack) != 1: @@ -577,7 +596,7 @@ class MetricometerRendererDual(MetricometerRenderer): def _get_type_label(self): sub_labels = [] for sub_perfometer in self._perfometer["perfometers"]: - renderer = MetricometerRenderer.get_renderer(sub_perfometer, self._translated_metrics) + renderer = renderer_registry.get_renderer(sub_perfometer, self._translated_metrics) sub_label = renderer.get_label() if sub_label: @@ -597,7 +616,7 @@ class MetricometerRendererDual(MetricometerRenderer): """ sub_sort_numbers = [] for sub_perfometer in self._perfometer["perfometers"]: - renderer = MetricometerRenderer.get_renderer(sub_perfometer, self._translated_metrics) + renderer = renderer_registry.get_renderer(sub_perfometer, self._translated_metrics) sub_sort_numbers.append(renderer.get_sort_number()) return max(*sub_sort_numbers) diff --git a/cmk/gui/plugins/views/perfometer.py b/cmk/gui/plugins/views/perfometer.py index 7342b76..f6adc56 100644 --- a/cmk/gui/plugins/views/perfometer.py +++ b/cmk/gui/plugins/views/perfometer.py @@ -98,7 +98,7 @@ class Perfometer(object): if not perfometer_definition: return None, None - renderer = metrics.MetricometerRenderer.get_renderer(perfometer_definition, self._translated_metrics) + renderer = metrics.renderer_registry.get_renderer(perfometer_definition, self._translated_metrics) return renderer.get_label(), render_metricometer(renderer.get_stack()) @@ -179,7 +179,7 @@ class Perfometer(object): if not perfometer_definition: return None - renderer = metrics.MetricometerRenderer.get_renderer(perfometer_definition, self._translated_metrics) + renderer = metrics.renderer_registry.get_renderer(perfometer_definition, self._translated_metrics) return renderer.get_sort_number() diff --git a/tests/unit/cmk/gui/test_metrics.py b/tests/unit/cmk/gui/test_metrics.py new file mode 100644 index 0000000..6b1ca45 --- /dev/null +++ b/tests/unit/cmk/gui/test_metrics.py @@ -0,0 +1,11 @@ + +import cmk.gui.metrics as metrics + +def test_registered_renderers(): + registered_plugins = sorted(metrics.renderer_registry.keys()) + assert registered_plugins == [ + 'dual', + 'linear', + 'logarithmic', + 'stacked' + ]

5 years, 8 months

Fixed loading of inline images (data:image/png; base64,...)

by Lars Michelsen

Module: check_mk Branch: master Commit: 9a04e136e523dcc9027e869d107f63ccb0c30d85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a04e136e523dc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 22 20:02:25 2018 +0200 Fixed loading of inline images (data:image/png;base64,...) The recently introduced content security policy denied loading this kind of images. We use them in some places, for example in the modern theme or in the icon manager. Change-Id: Ida5c355094a01d16ee8f7118e8d9a739e37bd16f --- omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf b/omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf index 7122129..01e185a 100644 --- a/omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf +++ b/omd/packages/apache-omd/skel/etc/apache/conf.d/security.conf @@ -16,6 +16,9 @@ # Default policy for all not configured ones Header always set Content-Security-Policy "default-src 'self' 'unsafe-inline' 'unsafe-eval'" + # Allow local images and data URLs e.g. from CSS files + Header always set Content-Security-Policy "img-src 'self' data:" + # Allow AJAX calls to current scheme/url/port and the crash report API Header always append Content-Security-Policy "connect-src 'self' https://mathias-kettner.de/crash_report.php"

5 years, 8 months

6834 df: Optionally produce metrics compatible to unix df command

by Moritz Kiemer

Module: check_mk Branch: master Commit: 35925ccc998a23d9a843472955b81336ab20017a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35925ccc998a23… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Oct 19 16:09:47 2018 +0200 6834 df: Optionally produce metrics compatible to unix df command Exclude space reserved for the <tt>root</tt> user from calculation of used space. By default Check_MK treats space that is reserved for the <tt>root</tt> user on Linux and Unix as used space. Usually, 5% are being reserved for root when a new filesystem is being created. With this new option in the ruleset "Filesystem (used space and growth)" you can have Check_MK exclude the current amount of reserved but yet unused space from the calculations regarding the used space (absolute and percentage). CMK-1181 Change-Id: I5fef83d8edbf965257815c06ed3e5bfb99705680 --- .werks/6834 | 18 ++++++++ checks/df.include | 52 ++++++++++++++-------- cmk/gui/plugins/metrics/check_mk.py | 34 +++++++++++++- cmk/gui/plugins/wato/check_parameters.py | 14 +++++- .../generictests/datasets/df_lnx_regression.py | 14 ++++++ .../datasets/netapp_api_qtree_quota_regression.py | 2 +- 6 files changed, 112 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=35925ccc99…

5 years, 8 months

← Newer
1
...
4
5
6
7
8
9
10
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018