Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

6616 Add --no-tmpfs option to "omd create"

by Lars Michelsen

Module: check_mk Branch: master Commit: b877d818fea0f71acfb79b0582c8421b35e8028b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b877d818fea0f7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 14 14:46:37 2018 +0200 6616 Add --no-tmpfs option to "omd create" It's now possible to disable the temporary filesystem usage during site creation. Change-Id: I9588598560c9772ae7b88f55f5a45b1dfd131d4a --- .werks/6616 | 11 +++++++++++ omd/packages/omd/omd | 5 +++++ omd/packages/omd/omd.8 | 5 +++++ 3 files changed, 21 insertions(+) diff --git a/.werks/6616 b/.werks/6616 new file mode 100644 index 0000000..9143f84 --- /dev/null +++ b/.werks/6616 @@ -0,0 +1,11 @@ +Title: Add --no-tmpfs option to "omd create" +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536929140 +Class: feature + +It's now possible to disable the temporary filesystem usage during +site creation. diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index e88118e..a4daa44 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -2705,6 +2705,10 @@ def main_create(args, options=None): config_settings["AUTOSTART"] = "off" sys.stdout.write("Going to set AUTOSTART to off.\n") + if "no-tmpfs" in options: + config_settings["TMPFS"] = "off" + sys.stdout.write("Going to set TMPFS to off.\n") + if "no-init" not in options: admin_password = init_site(config_settings, options) welcome_message(admin_password) @@ -4208,6 +4212,7 @@ commands = [ ( "no-init", "n", False, "leave new site directory empty (a later omd init does this"), ( "no-autostart", "A", False, "set AUTOSTART to off (useful for test sites)"), ( "apache-reload", False, False, "Issue a reload of the system apache instead of a restart"), + ( "no-tmpfs", None, False, "set TMPFS to off"), ( "tmpfs-size", "t", True, "specify the maximum size of the tmpfs (defaults to 50% of RAM), examples: 500M, 20G, 60%"), ], "Create a new site (-u UID, -g GID)", diff --git a/omd/packages/omd/omd.8 b/omd/packages/omd/omd.8 index c3b6d6d..dd9e28a 100644 --- a/omd/packages/omd/omd.8 +++ b/omd/packages/omd/omd.8 @@ -102,6 +102,11 @@ the system Apache (/omd/apache/SITE.conf will be empty). \fB--apache-reload\fP Issue a reaload of the apache process instead of the default restart +\fB--no-tmpfs\fP Use this to set the omd config option TMPFS to off during site creation. +This may be useful when sites are set-up where the use of temporary filesystems is not +possible. However, it is still highly recommended to use a tmpfs for the sites \fBtmp\fP +directory for best performance. + \fB-t SIZE\fP By default the tmpfs of the site is created to allocate 50% of the available RAM at max. When providing the \fB-t\fP option together with the SIZE given as absolute value of e.g. \fB500M\fP or percentage value like \fB10%\fP the

6 years

Docker image: Add support for building using local CMK files

by Lars Michelsen

Module: check_mk Branch: master Commit: 15996bd1697992c5450878718eb821d21d34a4ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15996bd1697992… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 14 14:33:25 2018 +0200 Docker image: Add support for building using local CMK files Change-Id: Id9828aeba54b7be128fce110d81e1dbefa576995 --- docker/Dockerfile | 23 ++++++++++++++++++----- docker/Makefile | 1 - docker/README.asciidoc | 7 +++++++ tests/docker/test_docker.py | 28 +++++++++++++++++++++++++++- tests/testlib/__init__.py | 6 +++++- 5 files changed, 57 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index db1684d..3af9145 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -49,6 +49,11 @@ RUN set -e \ && rm -rf /var/lib/apt/lists/* \ && rm needed-packages +# +# Optionally copy an existing Check_MK debian package to the container. In case the file is +# available that is later used by the build procedure the file will not be downloaded. +COPY check-mk-${CMK_EDITION}-${CMK_VERSION}_0.stretch_*.deb Check_MK-pubkey*gpg needed-packages / + # Now install the Check_MK version specific things # hadolint ignore=DL3003,DL3008,DL4006 RUN set -e \ @@ -58,13 +63,21 @@ RUN set -e \ && export DEBIAN_FRONTEND=noninteractive \ && PKG_NAME="check-mk-${CMK_EDITION}-${CMK_VERSION}" \ && PKG_FILE="${PKG_NAME}_0.stretch_$(dpkg --print-architecture).deb" \ - && echo "--user \"${CMK_DL_CREDENTIALS}\"" \ - | curl -o "${PKG_FILE}" -K - "${CMK_DL_URL}/${CMK_VERSION}/${PKG_FILE}" \ - && curl -sS "${CMK_DL_URL}/Check_MK-pubkey.gpg" \ - | gpg -q --import \ + && if [ ! -e "/${PKG_FILE}" ]; then \ + echo "Downloading ${PKG_FILE}..." && \ + echo "--user \"${CMK_DL_CREDENTIALS}\"" \ + | curl -o "${PKG_FILE}" -K - "${CMK_DL_URL}/${CMK_VERSION}/${PKG_FILE}" ; \ + fi \ + && if [ ! -e "/Check_MK-pubkey.gpg" ]; then \ + echo "Downloading Check_MK-pubkey.gpg..." && \ + curl -sS "${CMK_DL_URL}/Check_MK-pubkey.gpg" \ + | gpg -q --import ; \ + else \ + gpg -q --import "/Check_MK-pubkey.gpg" ; \ + fi \ && dpkg-sig --verify "${PKG_FILE}" \ && dpkg -i "${PKG_FILE}" \ - && rm -f "${PKG_FILE}" \ + && rm -f *.deb *.gpg needed-packages \ && apt-get clean \ && rm /usr/sbin/policy-rc.d \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/Makefile b/docker/Makefile index 39df048..b25632f 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -67,7 +67,6 @@ image-daily: needed-packages else \ BRANCH_PREFIX="$${BRANCH_PREFIX}-" ; \ fi ; \ - BRANCH_PREFIX="1.5.0-" ; \ VERSION="$$(date +%F)" ; \ VERSION="$${BRANCH_PREFIX}$${VERSION//-/.}" ; \ CREDENTIALS="$$(cat "$(CREDENTIALS_FILE)")" ; \ diff --git a/docker/README.asciidoc b/docker/README.asciidoc index d0bdcaf..0cecede 100644 --- a/docker/README.asciidoc +++ b/docker/README.asciidoc @@ -293,6 +293,13 @@ docker build \ -t mycompany/check-mk-enterprise:1.5.0p3 .... +Doing it like this the build process will download 2 files from our download +server: The Debian stretch package and the GPG public key for verifying the +package signature. To prevent this you may put the files that are needed during +the build into the `docker` directory. For the above call you would have to put +the `check-mk-enterprise-1.5.0p3.stretch_amd64.deb` and `Check_MK-pubkey.gpg` +into this directory. + We'll offer prebuilt images for the Enterprise and Managed Services Edition in the future. For the moment you'll have to build them on your own (e.g. using the command above). diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index 62d68a6..91061a9 100644 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -100,7 +100,7 @@ def _build(request, client, edition, version, add_args=None): assert attrs["Size"] < 840000000 - assert len(attrs["RootFS"]["Layers"]) == 5 + assert len(attrs["RootFS"]["Layers"]) == 6 return image, build_logs @@ -224,6 +224,32 @@ def test_start_with_custom_command(request, client): assert output.endswith("1\n") +# Test that the local deb package is used by making the build fail because of an empty file +def test_build_using_local_deb(request, client): + pkg_path = os.path.join(build_path, build_version.package_name_of_distro("stretch")) + try: + with open(pkg_path, "w") as f: + f.write("") + + with pytest.raises(docker.errors.BuildError): + _build(request, client, "enterprise", build_version) + finally: + os.unlink(pkg_path) + + +# Test that the local GPG file is used by making the build fail because of an empty file +def test_build_using_local_gpg_pubkey(request, client): + pkg_path = os.path.join(build_path, "Check_MK-pubkey.gpg") + try: + with open(pkg_path, "w") as f: + f.write("") + + with pytest.raises(docker.errors.BuildError): + _build(request, client, "enterprise", build_version) + finally: + os.unlink(pkg_path) + + def test_start_enable_mail(request, client): c = _start(request, client, environment={ "MAIL_RELAY_HOST": "mailrelay.mydomain.com", diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 92ed47f..2220d1f 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -174,8 +174,12 @@ class CMKVersion(object): def package_name(self): + return self.package_name_of_distro(self._needed_distro()) + + + def package_name_of_distro(self, distro): return "check-mk-%s-%s_0.%s_%s.deb" % \ - (self.edition(), self.version, self._needed_distro(), self._needed_architecture()) + (self.edition(), self.version, distro, self._needed_architecture()) def package_url(self):

6 years

Reserved 10 Werk IDS

by Konstantin Büttner

Module: check_mk Branch: master Commit: 72b9caf765c2fab22d4fc02f8979653460d4d8e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72b9caf765c2fa… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Sep 14 15:22:12 2018 +0200 Reserved 10 Werk IDS Change-Id: I0507191c4b2f1694b1ac971aa4a5757c3b895dda --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index c15883c..2575065 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6629 +6639

6 years

6462 aix_hacmp_resources: Now configurable via WATO

by Konstantin Büttner

Module: check_mk Branch: master Commit: 15de79084458d10f4d11c64c6e9e868dc3f5962f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15de79084458d1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Aug 24 17:35:14 2018 +0200 6462 aix_hacmp_resources: Now configurable via WATO Previously, the check would expect a resource to be online on the first node. It can now be configured to accept the resource to be online on any node. Change-Id: Id5bea8a543ca6c02505e393f3550d2c513718e7c --- .werks/6462 | 12 ++++++++++ checkman/aix_hacmp_resources | 4 ++-- checks/aix_hacmp_resources | 38 +++++++++++++++++++++++--------- cmk/gui/plugins/wato/check_parameters.py | 26 ++++++++++++++++++++++ 4 files changed, 68 insertions(+), 12 deletions(-) diff --git a/.werks/6462 b/.werks/6462 new file mode 100644 index 0000000..eabc75d --- /dev/null +++ b/.werks/6462 @@ -0,0 +1,12 @@ +Title: aix_hacmp_resources: Now configurable via WATO +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1535124865 +Class: feature + +Previously, the check would expect a resource to be online +on the first node. It can now be configured to accept +the resource to be online on any node. diff --git a/checkman/aix_hacmp_resources b/checkman/aix_hacmp_resources index 8f97aba..c4ef5eb 100644 --- a/checkman/aix_hacmp_resources +++ b/checkman/aix_hacmp_resources @@ -6,8 +6,8 @@ distribution: check_mk description: This check monitors the resource group states on different nodes of AIX HACMP cluster manager. - The status will be OK, if the first node reports 'online'. Otherwise - the status changes to CRIT. + The status will be OK, if the first, or any node reports 'online', + depending on the configuration. Otherwise the status changes to CRIT. This check needs the check_mk_agent.aix agent. diff --git a/checks/aix_hacmp_resources b/checks/aix_hacmp_resources index d11c54f..b0768bc 100644 --- a/checks/aix_hacmp_resources +++ b/checks/aix_hacmp_resources @@ -35,6 +35,10 @@ # {u'pdb213rg': [(u'pasv0450', u'online'), (u'pasv0449', u'offline')], # u'pmon01rg': [(u'pasv0449', u'online'), (u'pasv0450', u'offline')]} +factory_settings["aix_hacmp_resources"] = { + "expect_online_on" : "first", +} + def parse_aix_hacmp_resources(info): parsed = {} @@ -54,23 +58,37 @@ def inventory_aix_hacmp_resources(parsed): def check_aix_hacmp_resources(item, params, parsed): - if item in parsed: - resource_stats = [] - infotext = "" - for node_name, resource_status in parsed[item]: - resource_stats.append(resource_status) - infotext += "%s on node %s, " % (resource_status, node_name) - - state = 0 - if resource_stats[0] != "online": + data = parsed.get(item) + if data is None: + return + + if params is None: + expected_behaviour = "first" + else: + expected_behaviour = params.get("expect_online_on", "first") + + resource_states = [] + infotext = "" + for node_name, resource_state in parsed[item]: + resource_states.append(resource_state) + infotext += "%s on node %s, " % (resource_state, node_name) + + state = 0 + if expected_behaviour == "first": + if resource_states[0] != "online": + state = 2 + elif expected_behaviour == "any": + if not any((resource_state == u"online" for resource_state in resource_states)): state = 2 - return state, infotext[:-2] + return state, infotext[:-2] check_info['aix_hacmp_resources'] = { + 'default_levels_variable' : "aix_hacmp_resources", 'parse_function' : parse_aix_hacmp_resources, 'inventory_function' : inventory_aix_hacmp_resources, 'check_function' : check_aix_hacmp_resources, 'service_description' : 'HACMP RG %s', + 'group' : 'hacmp_resources', } diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 87d8cdc..25f4835 100755 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -4792,6 +4792,32 @@ register_check_parameters( match_type = "dict", ) +register_check_parameters( + subgroup_applications, + "hacmp_resources", + _("AIX HACMP Resource Groups"), + Transform( + Dictionary( + elements=[ + ( + "expect_online_on", + DropdownChoice( + title=_(u"Expect resource to be online on"), + choices=[ + ("first", _(u"the first node")), + ("any", _(u"any node")), + ], + ) + ), + ], + optional_keys=[], + ), + forth=lambda x: {"expect_online_on":"first"}, + ), + TextAscii(title=_(u"Resource Group")), + match_type="first", +) + #. # .--Environment---------------------------------------------------------. # | _____ _ _ |

6 years

6503 FIX Fixed error handling for duplicate EC rule IDs.

by Sven Panne

Module: check_mk Branch: master Commit: 85dd6b27269fc283103fd1584b3d1daab7869521 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85dd6b27269fc2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Sep 14 10:46:26 2018 +0200 6503 FIX Fixed error handling for duplicate EC rule IDs. Trying to insert an EC rule with an already existing ID resulted in a GUI crash, this has been fixed. Change-Id: If38a8c3067f003b212d403eb061af898c81951e6 --- .werks/6503 | 12 ++++++++++++ cmk/gui/wato/mkeventd.py | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/6503 b/.werks/6503 new file mode 100644 index 0000000..993308d --- /dev/null +++ b/.werks/6503 @@ -0,0 +1,12 @@ +Title: Fixed error handling for duplicate EC rule IDs. +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1536843614 + +Trying to insert an EC rule with an already existing ID resulted in a GUI +crash, this has been fixed. diff --git a/cmk/gui/wato/mkeventd.py b/cmk/gui/wato/mkeventd.py index 521890b..84ff85d 100644 --- a/cmk/gui/wato/mkeventd.py +++ b/cmk/gui/wato/mkeventd.py @@ -1957,8 +1957,8 @@ class ModeEventConsoleEditRule(EventConsoleMode): for pack in self._rule_packs: for r in pack["rules"]: if r["id"] == self._rule["id"]: - error_text = _("A rule with this ID already exists in rule pack <b>%s</b>.") % pack["title"] - raise MKUserError("rule_p_id", error_text) + raise MKUserError("rule_p_id", + _("A rule with this ID already exists in rule pack <b>%s</b>.") % pack["title"]) try: num_groups = re.compile(self._rule["match"]).groups

6 years

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 32324aec90798555c60f1f7bf9122e53bf329ceb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32324aec907985… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 13 20:24:14 2018 +0200 Reserved 20 Werk IDS Change-Id: I2a2a7c5f1c0a7623f3338162e987ddacc7980b5e --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 6eceed0..c15883c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6609 +6629

6 years

Do not localize state ID strings for cisco stack switch status

by Konstantin Büttner

Module: check_mk Branch: master Commit: f40fbfbf3e1c1b1ab728234e84275edb37bec7ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f40fbfbf3e1c1b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Sep 13 16:42:42 2018 +0200 Do not localize state ID strings for cisco stack switch status Change-Id: I2a3b8a629da4601c3dcdbe7c6d1bb09675215337 --- cmk/gui/plugins/wato/check_parameters.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 086c13c..87d8cdc 100755 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -897,17 +897,17 @@ register_check_parameters( _("Cisco Stack Switch Status"), Dictionary( elements=[ - ("waiting", MonitoringState(title=_(u"waiting"), default_value=0, help=_(u"Waiting for other switches to come online"))), - ("progressing", MonitoringState(title=_(u"progressing"), default_value=0, help=_(u"Master election or mismatch checks in progress"))), - ("added", MonitoringState(title=_(u"added"), default_value=0, help=_(u"Added to stack"))), - ("ready", MonitoringState(title=_(u"ready"), default_value=0, help=_(u"Ready"))), - ("sdmMismatch", MonitoringState(title=_(u"sdmMismatch"), default_value=1, help=_(u"SDM template mismatch"))), - ("verMismatch", MonitoringState(title=_(u"verMismatch"), default_value=1, help=_(u"OS version mismatch"))), - ("featureMismatch", MonitoringState(title=_(u"featureMismatch"), default_value=1, help=_(u"Configured feature mismatch"))), - ("newMasterInit", MonitoringState(title=_(u"newMasterInit"), default_value=0, help=_(u"Waiting for new master initialization"))), - ("provisioned", MonitoringState(title=_(u"provisioned"), default_value=0, help=_(u"Not an active member of the stack"))), - ("invalid", MonitoringState(title=_(u"invalid"), default_value=2, help=_(u"State machine in invalid state"))), - ("removed", MonitoringState(title=_(u"removed"), default_value=2, help=_(u"Removed from stack"))), + ("waiting", MonitoringState(title=u"waiting", default_value=0, help=_(u"Waiting for other switches to come online"))), + ("progressing", MonitoringState(title=u"progressing", default_value=0, help=_(u"Master election or mismatch checks in progress"))), + ("added", MonitoringState(title=u"added", default_value=0, help=_(u"Added to stack"))), + ("ready", MonitoringState(title=u"ready", default_value=0, help=_(u"Ready"))), + ("sdmMismatch", MonitoringState(title=u"sdmMismatch", default_value=1, help=_(u"SDM template mismatch"))), + ("verMismatch", MonitoringState(title=u"verMismatch", default_value=1, help=_(u"OS version mismatch"))), + ("featureMismatch", MonitoringState(title=u"featureMismatch", default_value=1, help=_(u"Configured feature mismatch"))), + ("newMasterInit", MonitoringState(title=u"newMasterInit", default_value=0, help=_(u"Waiting for new master initialization"))), + ("provisioned", MonitoringState(title=u"provisioned", default_value=0, help=_(u"Not an active member of the stack"))), + ("invalid", MonitoringState(title=u"invalid", default_value=2, help=_(u"State machine in invalid state"))), + ("removed", MonitoringState(title=u"removed", default_value=2, help=_(u"Removed from stack"))), ], optional_keys=[], ),

6 years

6564 FIX Fixed incorrect rate computation affecting various checks in some cases

by Lars Michelsen

Module: check_mk Branch: master Commit: 163493ec54158eb168ea9f1be22e4d1f782fc37e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=163493ec54158e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 13 11:45:36 2018 +0200 6564 FIX Fixed incorrect rate computation affecting various checks in some cases All previous 1.5 releases used a partially broken counter / rate computation in various checks in specific situations, e.g. inotify checks. Not all check results were computed wrong, only the ones based on counter / rate computations. When a single check monitors several services on a host, only the first of these services was affected by this issue. Change-Id: Ib7883c2684b14871a13151b2be11b6a35643dd8a --- .werks/6564 | 17 +++++++++++++++++ cmk_base/checking.py | 6 ------ cmk_base/data_sources/host_sections.py | 5 +++++ cmk_base/item_state.py | 22 +++++++++++++++------- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/.werks/6564 b/.werks/6564 new file mode 100644 index 0000000..6c270dd --- /dev/null +++ b/.werks/6564 @@ -0,0 +1,17 @@ +Title: Fixed incorrect rate computation affecting various checks in some cases +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1536829823 + +All previous 1.5 releases used a partially broken counter / rate computation in +various checks in specific situations, e.g. inotify checks. Not all check +results were computed wrong, only the ones based on counter / rate +computations. + +When a single check monitors several services on a host, only the first of +these services was affected by this issue. diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 97a9919..22178b0 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -265,12 +265,6 @@ def execute_check(multi_host_sections, hostname, ipaddress, check_plugin_name, i section_name = cmk_base.check_utils.section_name_of(check_plugin_name) - # We need to set this again, because get_section_content has the side effect of setting this with - # item None if there is a parse function. This would break the entire set_item/get_rate logic - # for checks with items that rely on this being handled by the API. - # TODO: Write a regression test for this. - item_state.set_item_state_prefix(check_plugin_name, item) - dont_submit = False section_content = None try: diff --git a/cmk_base/data_sources/host_sections.py b/cmk_base/data_sources/host_sections.py index 82942e2..d3db705 100644 --- a/cmk_base/data_sources/host_sections.py +++ b/cmk_base/data_sources/host_sections.py @@ -252,6 +252,9 @@ class MultiHostSections(object): if not parse_function: return section_content + # TODO: Item state needs to be handled in local objects instead of the + # item_state._cached_item_states object + orig_item_state_prefix = item_state.get_item_state_prefix() try: item_state.set_item_state_prefix(section_name, None) return parse_function(section_content) @@ -259,6 +262,8 @@ class MultiHostSections(object): if cmk.debug.enabled(): raise raise MKParseFunctionError(*sys.exc_info()) + finally: + item_state.set_item_state_prefix(*orig_item_state_prefix) return section_content diff --git a/cmk_base/item_state.py b/cmk_base/item_state.py index 38975e8..590f22f 100644 --- a/cmk_base/item_state.py +++ b/cmk_base/item_state.py @@ -155,23 +155,27 @@ class CachedItemStates(object): pass + def get_item_state(self, user_key, default=None): + key = self.get_unique_item_state_key(user_key) + return self._item_states.get(key, default) + + def set_item_state(self, user_key, state): key = self.get_unique_item_state_key(user_key) self._item_states[key] = state self._updated_item_states[key] = state - def set_item_state_prefix(self, args): - self._item_state_prefix = args + def get_all_item_states(self): + return self._item_states - def get_item_state(self, user_key, default=None): - key = self.get_unique_item_state_key(user_key) - return self._item_states.get(key, default) + def get_item_state_prefix(self): + return self._item_state_prefix - def get_all_item_states(self): - return self._item_states + def set_item_state_prefix(self, args): + self._item_state_prefix = args def get_unique_item_state_key(self, user_key): @@ -237,6 +241,10 @@ def set_item_state_prefix(*args): _cached_item_states.set_item_state_prefix(args) +def get_item_state_prefix(): + return _cached_item_states.get_item_state_prefix() + + def _unique_item_state_key(user_key): _cached_item_states.get_unique_item_state_key(user_key)

6 years

lnx_if: Fixed node_info being "None" instead of None for non cluster hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ec3149a8c81439d7bfac3ca2c484f59d11d5993 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ec3149a8c8143… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 13 11:56:06 2018 +0200 lnx_if: Fixed node_info being "None" instead of None for non cluster hosts Change-Id: Ia8feeb675ea58c608d5a47e98d573bfb7382563d --- checks/lnx_if | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/checks/lnx_if b/checks/lnx_if index e335778..2eb9d8c 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -205,11 +205,14 @@ def parse_lnx_if(info): else: ifPhysAddress = '' - if_table.append(map(str, [ - node_info, ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, + + row = [ node_info ] + map(str, [ + ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, outucast, outmcast, outbcast, - ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias, ifPhysAddress ])) + ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias, ifPhysAddress ]) + + if_table.append(row) return if_table

6 years

Fixed remaining unused-variable warnings and enable the warning in checks/ .

by Sven Panne

6 years

← Newer
1
...
19
20
21
22
23
24
25
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018