Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: f6c80c92330421d7d3f4b2b35d42817fb30a5884 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6c80c92330421… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 19:52:29 2019 +0100 Cleanup group config loading Use effective GUI config instead of using the WATO exclusive group loading logic to get the group configuration. Change-Id: If4e69ea9d9b83e13caf299dc54a75eb558343030 --- cmk/gui/inventory.py | 5 +++-- cmk/gui/plugins/config/base.py | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index 1efa612..6604f86 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -311,8 +311,9 @@ def _get_permitted_inventory_paths(): cache_varname = "permitted_inventory_paths" if cache_varname in current_app.g: return current_app.g[cache_varname] - contact_groups = userdb.load_group_information().get("contact", {}) + user_groups = userdb.contactgroups_of_user(config.user.id) + if not user_groups: current_app.g[cache_varname] = None return None @@ -320,7 +321,7 @@ def _get_permitted_inventory_paths(): forbid_whole_tree = False permitted_paths = [] for user_group in user_groups: - inventory_paths = contact_groups.get(user_group, {}).get('inventory_paths') + inventory_paths = config.multisite_contactgroups.get(user_group, {}).get('inventory_paths') if inventory_paths is None: # Old configuration: no paths configured means 'allow_all' current_app.g[cache_varname] = None diff --git a/cmk/gui/plugins/config/base.py b/cmk/gui/plugins/config/base.py index c553f64..741ac7a 100644 --- a/cmk/gui/plugins/config/base.py +++ b/cmk/gui/plugins/config/base.py @@ -56,8 +56,10 @@ log_levels = { "cmk.web.automations": 30, } -# New style, used by WATO multisite_users = {} +multisite_hostgroups = {} +multisite_servicegroups = {} +multisite_contactgroups = {} # ____ _ _ _ # / ___|(_) __| | ___| |__ __ _ _ __

5 years, 7 months

Group modes: Add abc metaclass

by Lars Michelsen

Module: check_mk Branch: master Commit: f098c709c52b02492096d83e3cb950be4592db95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f098c709c52b02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 15:19:20 2019 +0100 Group modes: Add abc metaclass Change-Id: I1b34650cc3a5f1d544de3e2ecf2246f2335e5545 --- cmk/gui/wato/pages/groups.py | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/cmk/gui/wato/pages/groups.py b/cmk/gui/wato/pages/groups.py index efb6d90..6b7cb73 100644 --- a/cmk/gui/wato/pages/groups.py +++ b/cmk/gui/wato/pages/groups.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. import os +import abc import cmk.utils.paths @@ -58,10 +59,13 @@ from cmk.gui.plugins.wato import ( ) -# TODO: abc.ABCMeta class ModeGroups(WatoMode): - # TODO: Refactore to abc.abstractmethod - type_name = None + __metaclass__ = abc.ABCMeta + + @abc.abstractproperty + def type_name(self): + # type: () -> str + raise NotImplementedError() def __init__(self): super(ModeGroups, self).__init__() @@ -136,10 +140,13 @@ class ModeGroups(WatoMode): self._show_row_cells(table, name, group) -# TODO: abc.ABCMeta class ModeEditGroup(WatoMode): - # TODO: Reimplement as abc.abstactmethod - type_name = None + __metaclass__ = abc.ABCMeta + + @abc.abstractproperty + def type_name(self): + # type: () -> str + raise NotImplementedError() def __init__(self): self._name = None @@ -237,7 +244,9 @@ class ModeEditGroup(WatoMode): @mode_registry.register class ModeHostgroups(ModeGroups): - type_name = "host" + @property + def type_name(self): + return "host" @classmethod def name(cls): @@ -278,7 +287,9 @@ class ModeHostgroups(ModeGroups): @mode_registry.register class ModeServicegroups(ModeGroups): - type_name = "service" + @property + def type_name(self): + return "service" @classmethod def name(cls): @@ -320,7 +331,9 @@ class ModeServicegroups(ModeGroups): @mode_registry.register class ModeContactgroups(ModeGroups): - type_name = "contact" + @property + def type_name(self): + return "contact" @classmethod def name(cls): @@ -379,7 +392,9 @@ class ModeContactgroups(ModeGroups): @mode_registry.register class ModeEditServicegroup(ModeEditGroup): - type_name = "service" + @property + def type_name(self): + return "service" @classmethod def name(cls): @@ -397,7 +412,9 @@ class ModeEditServicegroup(ModeEditGroup): @mode_registry.register class ModeEditHostgroup(ModeEditGroup): - type_name = "host" + @property + def type_name(self): + return "host" @classmethod def name(cls): @@ -415,7 +432,9 @@ class ModeEditHostgroup(ModeEditGroup): @mode_registry.register class ModeEditContactgroup(ModeEditGroup): - type_name = "contact" + @property + def type_name(self): + return "contact" @classmethod def name(cls):

5 years, 7 months

Cleanup group config loading in view editor

by Lars Michelsen

Module: check_mk Branch: master Commit: 9f7b853b6795fd8a9576438cb949777bb34c8eec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f7b853b6795fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 20:33:56 2019 +0100 Cleanup group config loading in view editor Use currently configured contact groups from livestatus instead the WATO exclusive group loading logic. Change-Id: I3f58a44b736cecbbb0cb16903fb0f8baaf1e11f4 --- cmk/gui/visuals.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/cmk/gui/visuals.py b/cmk/gui/visuals.py index f1aacc3..45647e5 100644 --- a/cmk/gui/visuals.py +++ b/cmk/gui/visuals.py @@ -47,9 +47,11 @@ from cmk.gui.valuespec import ( TextUnicode, TextAscii, TextAreaUnicode, + DualListChoice, ) import cmk.gui.config as config import cmk.gui.forms as forms +import cmk.gui.sites as sites from cmk.gui.table import table_element import cmk.gui.userdb as userdb import cmk.gui.pagetypes as pagetypes @@ -993,8 +995,7 @@ class PublishTo(CascadingDropdown): choices=[ (True, _("Publish to all users")), ("contact_groups", _("Publish to members of contact groups"), - userdb.GroupChoice( - "contact", + ContactGroupChoice( with_foreign_groups=with_foreign_groups, title=_("Publish to members of contact groups"), rows=5, @@ -1005,6 +1006,20 @@ class PublishTo(CascadingDropdown): **kwargs) +class ContactGroupChoice(DualListChoice): + """A multiple selection of contact groups that are part of the current active config""" + + def __init__(self, with_foreign_groups=True, **kwargs): + super(ContactGroupChoice, self).__init__(choices=self._load_groups, **kwargs) + self._with_foreign_groups = with_foreign_groups + + def _load_groups(self): + contact_group_choices = sites.all_groups("contact") + return [(group_id, alias) + for (group_id, alias) in contact_group_choices + if self._with_foreign_groups or group_id in config.user.contact_groups()] + + #. # .--Filters-------------------------------------------------------------. # | _____ _ _ _ |

5 years, 7 months

Add some help texts about needed permission

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ee25c5d9f994bb1232ffe7953696d9034e84a46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ee25c5d9f994b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 08:57:36 2019 +0100 Add some help texts about needed permission Change-Id: I5a1f47801d50c80a86d3189095011b4fec593647 --- cmk/gui/plugins/wato/active_checks.py | 4 +++- cmk/gui/plugins/wato/check_mk_configuration.py | 4 +++- cmk/gui/plugins/wato/datasource_programs.py | 4 +++- cmk/gui/wato/pages/host_diagnose.py | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cmk/gui/plugins/wato/active_checks.py b/cmk/gui/plugins/wato/active_checks.py index 42943d1..6cc087c 100644 --- a/cmk/gui/plugins/wato/active_checks.py +++ b/cmk/gui/plugins/wato/active_checks.py @@ -1691,7 +1691,9 @@ class RulespecCustomChecks(HostRulespec): "to be executed directly on your monitoring server. These checks " "will not use Check_MK. It is also possible to configure passive " "checks that are fed with data from external sources via the " - "command pipe of the monitoring core."), + "command pipe of the monitoring core.") + + _("This option can only be used with the permission \"Can add or modify executables\"." + ), elements=[ ("service_description", TextUnicode( diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index 1df3723..84071ba 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -2972,7 +2972,9 @@ class RulespecHostCheckCommands(HostRulespec): help=_( "Usually Check_MK uses a series of PING (ICMP echo request) in order to determine " "whether a host is up. In some cases this is not possible, however. With this rule " - "you can specify an alternative way of determining the host's state."), + "you can specify an alternative way of determining the host's state.") + _( + "The option to use a custom command can only be configured with the permission " + "\"Can add or modify executables\"."), choices=self._host_check_command_choices, default_value="ping", orientation="horizontal", diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index ddd5d44..881dc49 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -94,7 +94,9 @@ class RulespecDatasourcePrograms(HostRulespec): "program that should be called by Check_MK instead of connecting the agent " "via TCP. That program must output the agent's data on standard output in " "the same format the agent would do. This is for example useful for monitoring " - "via SSH.") + monitoring_macro_help(), + "via SSH.") + monitoring_macro_help() + + _("This option can only be used with the permission \"Can add or modify executables\"." + ), label=_("Command line to execute"), empty_text=_("Access Check_MK Agent via TCP"), size=80, diff --git a/cmk/gui/wato/pages/host_diagnose.py b/cmk/gui/wato/pages/host_diagnose.py index e2b9fd1..eb2c5b8 100644 --- a/cmk/gui/wato/pages/host_diagnose.py +++ b/cmk/gui/wato/pages/host_diagnose.py @@ -266,7 +266,8 @@ class ModeDiagHost(WatoMode): "program that should be called by Check_MK instead of connecting the agent " "via TCP. That program must output the agent's data on standard output in " "the same format the agent would do. This is for example useful for monitoring " - "via SSH.") + monitoring_macro_help(), + "via SSH.") + monitoring_macro_help() + " " + + _("This option can only be used with the permission \"Can add or modify executables\"."), )) ] else:

5 years, 7 months

mk_jolokia.py: Add a line of verbose output & avoid KeyError

by Moritz Kiemer

Module: check_mk Branch: master Commit: ebd1b67d562608a9c2b2300ff7d0328592bf635d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebd1b67d562608… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Feb 12 16:32:44 2019 +0100 mk_jolokia.py: Add a line of verbose output & avoid KeyError I needed it to see that CMK-1459 is already fixed Change-Id: I84d4a8e04650103550ff8c8940d1d00472dd4ef1 --- agents/plugins/mk_jolokia.py | 10 +++++++--- tests/unit/plugins/test_mk_jolokia.py | 10 ++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index 0153da1..74ab972 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -494,9 +494,10 @@ def generate_values(inst, var_list): yield item, title, value -def yield_configured_instances(): +def yield_configured_instances(custom_config=None): - custom_config = copy.deepcopy(DEFAULT_CONFIG) + if custom_config is None: + custom_config = copy.deepcopy(DEFAULT_CONFIG) conffile = os.path.join(os.getenv("MK_CONFDIR", "/etc/check_mk"), "jolokia.cfg") if os.path.exists(conffile): @@ -507,7 +508,10 @@ def yield_configured_instances(): individual_configs = custom_config.pop("instances", [{}]) for cfg in individual_configs: keys = set(cfg.keys() + custom_config.keys()) - yield {k: cfg.get(k, custom_config[k]) for k in keys} + conf_dict = {k: cfg.get(k, custom_config.get(k)) for k in keys} + if VERBOSE: + sys.stderr.write("DEBUG: configuration: %r\n" % conf_dict) + yield conf_dict def main(configs_iterable=None): diff --git a/tests/unit/plugins/test_mk_jolokia.py b/tests/unit/plugins/test_mk_jolokia.py index ebb8bf2..3170f98 100644 --- a/tests/unit/plugins/test_mk_jolokia.py +++ b/tests/unit/plugins/test_mk_jolokia.py @@ -86,3 +86,13 @@ def test_config_legacy_cert_path_to_verify(): def test_jolokia_instance_base_url(config, base_url): joloi = mk_jolokia.JolokiaInstance(config) assert joloi._get_base_url() == base_url + + +def test_jolokia_yield_configured_instances(): + yci = mk_jolokia.yield_configured_instances({ + "instances": [{"server": "s1"}, {"server": "s2"}], + "port": 1234, + }) + + assert next(yci) == {"server": "s1", "port": 1234} + assert next(yci) == {"server": "s2", "port": 1234}

5 years, 7 months

added WK6705: agent_netapp: fixed typo in agent which caused the agent to fail on bigger netapp server responses

by Andreas Boesl

Module: check_mk Branch: master Commit: ceb07887fd18bb2fa2983fcaadd27ed1bc65e3f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ceb07887fd18bb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 14 10:06:39 2019 +0100 added WK6705: agent_netapp: fixed typo in agent which caused the agent to fail on bigger netapp server responses Change-Id: I53509826ec5edaba678c14a87a384803c3ac6b49 --- .werks/6705 | 11 +++++++++++ agents/special/agent_netapp | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/6705 b/.werks/6705 new file mode 100644 index 0000000..f633168 --- /dev/null +++ b/.werks/6705 @@ -0,0 +1,11 @@ +Title: agent_netapp: fixed typo in agent which caused the agent to fail on bigger netapp server responses +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1550056924 + + diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 6fc10b5..4190882 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -683,7 +683,7 @@ def query(what, return_toplevel_node=False): # We need to start additinal query until all data is fetched tag_response = server.get_response( [what, [["max-records", max_records], ["tag", tag_string]]]) - if tag_response.result_status() != "passed": + if tag_response.results_status() != "passed": return if tag_response.get_results().child_get_string("num-records") == "0": break @@ -751,7 +751,7 @@ def query_counters(what): "perf-object-instance-list-info-iter", [["objectname", what], ["max-records", max_records], ["tag", tag_string]] ]) - if tag_response.result_status() != "passed": + if tag_response.results_status() != "passed": return if tag_response.get_results().child_get_string("num-records") == "0": break

5 years, 7 months

downgrade pyghmi on old systems to 1.1.0

by Alex Zurhake

Module: check_mk Branch: master Commit: f7b544471e4b854dfde9792ffe233c541162d546 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7b544471e4b85… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Feb 14 09:30:54 2019 +0100 downgrade pyghmi on old systems to 1.1.0 Change-Id: Ia71477b07c78ae96479ccb3602a1d9e05762da83 --- omd/packages/python-modules/python-modules.make | 6 +++--- omd/packages/python-modules/src/pyghmi-1.1.0.tar.gz | Bin 0 -> 146145 bytes omd/packages/python-modules/src/pyghmi-1.2.4.tar.gz | Bin 139198 -> 0 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/omd/packages/python-modules/python-modules.make b/omd/packages/python-modules/python-modules.make index 2f11869..9fb649b 100644 --- a/omd/packages/python-modules/python-modules.make +++ b/omd/packages/python-modules/python-modules.make @@ -113,13 +113,15 @@ PYTHON_MODULES_LIST += python-ad-0.9.tar.gz # needed for LDAP (nearest DC detect PYTHON_MODULES_LIST += idna-2.7.tar.gz # Added for NetApp special agent, but may be used in other components too in future PYTHON_MODULES_LIST += requests-2.20.1.tar.gz +# Added for IPMI monitoring of management interface +PYTHON_MODULES_LIST += pbr-5.1.0.tar.gz ifneq ($(filter $(DISTRO_CODE),el5 lucid sles11sp1 sles11sp2 sles11sp3 sles11sp4 squeeze),) PYTHON_MODULES_LIST += cryptography-1.4.tar.gz # Has requests as dependency -> must be built after PYTHON_MODULES_LIST += pyOpenSSL-16.2.0.tar.gz PYTHON_MODULES_LIST += paramiko-2.1.2.tar.gz - PYTHON_MODULES_LIST += pyghmi-1.2.4.tar.gz + PYTHON_MODULES_LIST += pyghmi-1.1.0.tar.gz PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0005-NID_ecdsa_with_SHA-fix.patch PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0009-cryptography-1.4-disable-version-warning.patch else @@ -143,8 +145,6 @@ PYTHON_MODULES_LIST += tinkerforge-2.1.19.tar.gz # Added for check_sftp PYTHON_MODULES_LIST += bcrypt-3.1.4.tar.gz PYTHON_MODULES_LIST += PyNaCl-1.3.0.tar.gz -# Added for IPMI monitoring of management interface -PYTHON_MODULES_LIST += pbr-5.1.0.tar.gz PYTHON_MODULES_LIST += typing-3.6.6.tar.gz PYTHON_MODULES_LIST += scandir-1.9.0.tar.gz diff --git a/omd/packages/python-modules/src/pyghmi-1.1.0.tar.gz b/omd/packages/python-modules/src/pyghmi-1.1.0.tar.gz new file mode 100644 index 0000000..cea5bd9 Binary files /dev/null and b/omd/packages/python-modules/src/pyghmi-1.1.0.tar.gz differ diff --git a/omd/packages/python-modules/src/pyghmi-1.2.4.tar.gz b/omd/packages/python-modules/src/pyghmi-1.2.4.tar.gz deleted file mode 100644 index 73ec860..0000000 Binary files a/omd/packages/python-modules/src/pyghmi-1.2.4.tar.gz and /dev/null differ

5 years, 7 months

mk_docker.py: Update manpages

by Moritz Kiemer

Module: check_mk Branch: master Commit: eec7b36192cc78fcfe76a8aa1a8016ecd8bbfc5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eec7b36192cc78… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Feb 13 11:42:39 2019 +0100 mk_docker.py: Update manpages CMK-1660 Change-Id: Ie27456e429a314d6fb406f228746a4a2941768ea --- checkman/docker_container_status | 6 ++++-- checkman/docker_container_status.health | 6 ++++-- checkman/docker_node_disk_usage | 6 ++++++ checkman/docker_node_info | 4 +++- checkman/docker_node_info.containers | 2 ++ 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/checkman/docker_container_status b/checkman/docker_container_status index 154ad23..acc70e6 100644 --- a/checkman/docker_container_status +++ b/checkman/docker_container_status @@ -7,8 +7,10 @@ description: Monitors the status of docker containers. A status of "running" is treated as OK, any other status is treated as CRIT. - To make this check work the agent plugin - {{mk_docker_container_piggybacked}} have to be installed. + To make this check work the agent plugin {{mk_docker.py}} has to be installed. + If you are using agent bakery rules, you must enable "Piggybacked docker containers". + If you are configuring the plugin via the configuration file, make sure you do not skip the + section "docker_containers_client" (the default setting is fine). item: None diff --git a/checkman/docker_container_status.health b/checkman/docker_container_status.health index 83d861b..42bd809 100644 --- a/checkman/docker_container_status.health +++ b/checkman/docker_container_status.health @@ -8,8 +8,10 @@ description: the HEALTHCHECK API. A Status of "healthy" is treated as OK, "starting" as WARN, "unhealthy" as CRIT. - To make this check work the agent plugin - {{mk_docker_container_piggybacked}} have to be installed. + To make this check work the agent plugin {{mk_docker.py}} has to be installed. + If you are using agent bakery rules, you must enable "Piggybacked docker containers". + If you are configuring the plugin via the configuration file, make sure you do not skip th + section "docker_containers_client" (the default setting is fine). item: None diff --git a/checkman/docker_node_disk_usage b/checkman/docker_node_disk_usage index fcfe6ad..2d011b8 100644 --- a/checkman/docker_node_disk_usage +++ b/checkman/docker_node_disk_usage @@ -7,5 +7,11 @@ description: This check monitors the total and active number as well as the size and reclaimable size of containers, images, local volumes, and build cache. + To make this check work the agent plugin {{mk_docker.py}} has to be installed. + If you are using agent bakery rules, you must enable "Fully monitor the docker node" + in the section "Docker node" (which is the default). + If you are configuring the plugin via the configuration file, make sure you + do not skip the section "docker_node_disk_usage" (again the default setting is fine). + inventory: One service per type (i.e. containers, images, volumen, build cache) is created. diff --git a/checkman/docker_node_info b/checkman/docker_node_info index cd1f8c6..11addd1 100644 --- a/checkman/docker_node_info +++ b/checkman/docker_node_info @@ -6,7 +6,9 @@ distribution: check_mk description: This check monitors the status of the docker application. If the daemon is running, the check is OK, otherwise it is - CRIT and displays the error message. + CRIT and displays an error message. + + To make this check work the agent plugin {{mk_docker.py}} has to be installed. inventory: One service is created. diff --git a/checkman/docker_node_info.containers b/checkman/docker_node_info.containers index 67c7dfd..46144de 100644 --- a/checkman/docker_node_info.containers +++ b/checkman/docker_node_info.containers @@ -8,5 +8,7 @@ description: of running, paused, and stopped containers. Absolute levels can be defined for each of these values. + To make this check work the agent plugin {{mk_docker.py}} has to be installed. + inventory: One service is created.

5 years, 7 months

Fixed systemd parse function without systemd installed

by Lars Michelsen

Module: check_mk Branch: master Commit: c0a0b0adc1313c71545f801932747584a5948654 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0a0b0adc1313c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 16:04:21 2019 +0100 Fixed systemd parse function without systemd installed Change-Id: I895ff4b6708300b1cbb27a2b9032b113a0bc0d7d --- checks/systemd_units | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/checks/systemd_units b/checks/systemd_units index 8a9bf10..409117e 100644 --- a/checks/systemd_units +++ b/checks/systemd_units @@ -63,8 +63,11 @@ _SYSTEMD_UNITS = [ def parse_systemd_units(info): - parsed = {} + + if not info: + return {} + # second to last line (see above): "X loaded units listed." count = int(info[-2][0]) if count == 0:

5 years, 7 months

systemd_units.services_summary: Only discover when systemd infos are available

by Lars Michelsen

Module: check_mk Branch: master Commit: a8b378bd54cb775b0661f41e0688d2c84bbdbd60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8b378bd54cb77… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 16:07:16 2019 +0100 systemd_units.services_summary: Only discover when systemd infos are available Change-Id: I16c78351268ac648235f415bd82c6a23014c2aa1 --- checks/systemd_units | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/checks/systemd_units b/checks/systemd_units index 409117e..4def27f 100644 --- a/checks/systemd_units +++ b/checks/systemd_units @@ -120,7 +120,6 @@ discovery_systemd_units_services_rules = [] def discovery_systemd_units_services(parsed): - services = parsed.get('service', {}) def regex_match(what, name): @@ -151,7 +150,6 @@ def discovery_systemd_units_services(parsed): def check_systemd_units_services(item, params, parsed): - services = parsed.get('service', {}) service = services.get(item, None) if service is None: @@ -172,8 +170,9 @@ check_info['systemd_units.services'] = { } -def discovery_systemd_units_services_summary(_no_parsed): - yield 'Summary', {} +def discovery_systemd_units_services_summary(parsed): + if parsed: + yield 'Summary', {} def check_systemd_units_services_summary(_no_item, params, parsed):

5 years, 7 months

← Newer
1
...
23
24
25
26
27
28
29
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019