Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

3823 FIX The windows agent were unable to execute powershell,

by Andreas Boesl

python and pearl scripts Message-ID: <5800dfe9.ABt58KJPkVHaC5YE%ab(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: 2d91bf86927fe4b847d12e0295820d9c1d648d00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d91bf86927fe4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 14 15:34:38 2016 +0200 3823 FIX The windows agent were unable to execute powershell, python and pearl scripts --- .werks/3823 | 9 +++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1324544 -> 1324544 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15382124 -> 15382124 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1324544 -> 1324544 bytes agents/windows/check_mk_agent.exe | Bin 1298944 -> 1299456 bytes agents/windows/check_mk_agent.msi | Bin 2893312 -> 2893824 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13294903 -> 13294903 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1298944 -> 1299456 bytes agents/windows/install_agent-64.exe | Bin 584705 -> 584706 bytes agents/windows/install_agent.exe | Bin 581474 -> 581396 bytes agents/windows/sections/SectionPluginGroup.cc | 4 ++-- 13 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/3823 b/.werks/3823 new file mode 100644 index 0000000..660583e --- /dev/null +++ b/.werks/3823 @@ -0,0 +1,9 @@ +Title: The windows agent were unable to execute powershell, python and pearl scripts +Level: 2 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1476451997 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c368072..a0cf2e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 3936 FIX: chrony: support new params dictionary and rule "State of NTP time synchronisation" * 3649 FIX: Added a workaround for an escaping-related bug in old bash versions... * 3958 FIX: netapp_qtree_quota: fixed graph scaling + * 3823 FIX: The windows agent were unable to execute powershell, python and pearl scripts Multisite: * 3897 FIX: Fixed possible exception in raw edition when rendering graphs diff --git a/agents/windows/build_version b/agents/windows/build_version index 102ae24..4bc9790 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2105 +2114 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index e7dca43..1999ec9 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 59e6df6..424b7d0 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index dc59c3f..eead573 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 22829d5..95007b2 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 9f381e4..95cd100 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 79e0699..dc59afa 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index f524858..87a232c 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index d4c9e3e..ba706ab 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 5e96350..1dbe35a 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/sections/SectionPluginGroup.cc b/agents/windows/sections/SectionPluginGroup.cc index 23d80d5..4166f4b 100644 --- a/agents/windows/sections/SectionPluginGroup.cc +++ b/agents/windows/sections/SectionPluginGroup.cc @@ -476,12 +476,12 @@ bool SectionPluginGroup::fileInvalid(const char *name) const { } std::string SectionPluginGroup::withInterpreter(const char *path) const { - size_t path_len = strlen(path) - 4; + size_t path_len = strlen(path); if (!strcmp(path + path_len - 3, ".pl")) { return std::string("perl.exe \"") + path + "\""; } else if (!strcmp(path + path_len - 3, ".py")) { return std::string("python.exe \"") + path + "\""; - } else if (!strcmp(path + path_len, ".vbs")) { + } else if (!strcmp(path + path_len - 4, ".vbs")) { // If this is a vbscript don't rely on the default handler for this // file extensions. This might be notepad or some other editor by // default on a lot of systems. So better add cscript as interpreter.

7 years, 11 months

3958 FIX netapp_qtree_quota: fixed graph scaling

by Simon Betz

Module: check_mk Branch: master Commit: cc7eac31a318f206bbdff27b78c90612e1f8c1b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc7eac31a318f2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 14 15:33:27 2016 +0200 3958 FIX netapp_qtree_quota: fixed graph scaling --- .werks/3958 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/3958 b/.werks/3958 new file mode 100644 index 0000000..f812d29 --- /dev/null +++ b/.werks/3958 @@ -0,0 +1,10 @@ +Title: netapp_qtree_quota: fixed graph scaling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1476451960 + + diff --git a/ChangeLog b/ChangeLog index 65ed130..c368072 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 3896 FIX: Agent RPMs: Fixing dependency issue with old check_mk-agent-oracle-*.rpm and check_mk-agent-logwatch-*.rpm * 3936 FIX: chrony: support new params dictionary and rule "State of NTP time synchronisation" * 3649 FIX: Added a workaround for an escaping-related bug in old bash versions... + * 3958 FIX: netapp_qtree_quota: fixed graph scaling Multisite: * 3897 FIX: Fixed possible exception in raw edition when rendering graphs diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index b98f945..479e065 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4070,6 +4070,7 @@ check_metrics["check_mk-fast_lta_silent_cubes.capacity"] = df_translation check_metrics["check_mk-fast_lta_volumes"] = df_translation check_metrics["check_mk-libelle_business_shadow.archive_dir"] = df_translation check_metrics["check_mk-netapp_api_volumes"] = df_translation +check_metrics["check_mk-netapp_api_qtree_quota"] = df_translation check_metrics["check_mk-emc_isilon_quota"] = df_translation check_metrics["check_mk-emc_isilon_ifs"] = df_translation check_metrics["check_mk-mongodb_collections"] = df_translation

7 years, 11 months

Fixed lynting for htmllib

by Roland Halbig

Module: check_mk Branch: master Commit: 42a62c28998c75c275873e151002250fab1717b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42a62c28998c75… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Oct 14 15:14:54 2016 +0200 Fixed lynting for htmllib --- web/htdocs/htmllib.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9bf29f7..dd21200 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -601,15 +601,6 @@ class HTMLGenerator(OutputFunnel): self.close_li() - def heading(self, text): - self.h3(text) - - - - - - - # # Scriptingi #

7 years, 11 months

Enriched HTML class in htmllib, first version. Moved sidebar snapin functions to htmllib ( wrappers remaining).

by Roland Halbig

Module: check_mk Branch: master Commit: d7b8c3227f53fc300b430bc60e478b28bafdb800 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7b8c3227f53fc… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Oct 14 14:51:39 2016 +0200 Enriched HTML class in htmllib, first version. Moved sidebar snapin functions to htmllib (wrappers remaining). --- web/htdocs/htmllib.py | 211 ++++++++++++++++++++++++++++++++++++++++++++------ web/htdocs/sidebar.py | 38 +++------ 2 files changed, 198 insertions(+), 51 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d7b8c3227f…

7 years, 11 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: b89e06b3e12b1f32a67ce3d3a9357d6042d4ccf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b89e06b3e12b1f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 14 14:07:44 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/ChronoUtils.h | 2 ++ livestatus/src/LogEntry.cc | 22 ++++++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/livestatus/src/ChronoUtils.h b/livestatus/src/ChronoUtils.h index 79d17e7..9b9b005 100644 --- a/livestatus/src/ChronoUtils.h +++ b/livestatus/src/ChronoUtils.h @@ -73,6 +73,8 @@ public: FormattedTimePoint(std::chrono::system_clock::time_point tp, const std::string &format) : _tp(tp), _format(format) {} + FormattedTimePoint(time_t t, const std::string &format) + : _tp(std::chrono::system_clock::from_time_t(t)), _format(format) {} friend std::ostream &operator<<(std::ostream &os, const FormattedTimePoint &f) { diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index b4622a4..10bdf82 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -239,13 +239,26 @@ std::vector<LogEntry::LogDef> LogEntry::log_definitions{ LOGCLASS_NOTIFICATION, LogEntryType::none, {Param::ContactName, Param::HostName, Param::StateType, - Param::CommandName, Param::Comment}}, + Param::CommandName, Param::CheckOutput, Param::Comment}}, //////////////// - LogDef{"SERVICE NOTIFICATION RESULT: ", + LogDef{ + "SERVICE NOTIFICATION RESULT: ", + LOGCLASS_NOTIFICATION, + LogEntryType::none, + {Param::ContactName, Param::HostName, Param::SvcDesc, Param::StateType, + Param::CommandName, Param::CheckOutput, Param::Comment}}, + //////////////// + LogDef{"HOST NOTIFICATION PROGRESS: ", + LOGCLASS_NOTIFICATION, + LogEntryType::none, + {Param::ContactName, Param::HostName, Param::StateType, + Param::CommandName, Param::CheckOutput}}, + //////////////// + LogDef{"SERVICE NOTIFICATION PROGRESS: ", LOGCLASS_NOTIFICATION, LogEntryType::none, {Param::ContactName, Param::HostName, Param::SvcDesc, - Param::StateType, Param::CommandName, Param::Comment}}, + Param::StateType, Param::CommandName, Param::CheckOutput}}, //////////////// LogDef{"HOST ALERT HANDLER STARTED: ", 8, // LOGCLASS_ALERT_HANDLERS, @@ -396,7 +409,8 @@ unordered_map<string, HostState> hostStateTypes{ {"UNREACHABLE", HostState::unreachable}, // states from "... ALERT"/"... NOTIFICATION" {"RECOVERY", HostState::up}, - // states from "... ALERT HANDLER STOPPED" + // states from "... ALERT HANDLER STOPPED" and "(HOST|SERVICE) NOTIFICATION + // (RESULT|PROGRESS)" {"OK", HostState::up}, {"WARNING", HostState::down}, {"CRITICAL", HostState::unreachable},

7 years, 11 months

Fixed bug in yet unused code

by Lars Michelsen

Module: check_mk Branch: master Commit: c5751b1197b61c3fc2e228ef72809fa06a010e91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5751b1197b61c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 13:49:53 2016 +0200 Fixed bug in yet unused code --- lib/log.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/log.py b/lib/log.py index b68721c..d729aeb 100644 --- a/lib/log.py +++ b/lib/log.py @@ -121,12 +121,12 @@ class LogMixin(object): @property def logger(self): if not self._logger: - self._logger = logging.getLogger('.'.join([__name__, self.__class__.__name__])) + self._logger = _logging.getLogger('.'.join([__name__, self.__class__.__name__])) return self._logger @classmethod - def logger(cls): + def cls_logger(cls): if not cls._cls_logger: - cls._cls_logger = logging.getLogger('.'.join([__name__, cls.__name__])) + cls._cls_logger = _logging.getLogger('.'.join([__name__, cls.__name__])) return cls._cls_logger

7 years, 11 months

Started implementing new standard Check_MK logging mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: 027da39d982c4eeade855be732caa157d15f39d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=027da39d982c4e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 13:24:34 2016 +0200 Started implementing new standard Check_MK logging mechanism --- lib/log.py | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++ modules/check_mk.py | 22 +++++++-- tests/lib/test_log.py | 47 ++++++++++++++++++ 3 files changed, 196 insertions(+), 5 deletions(-) diff --git a/lib/log.py b/lib/log.py new file mode 100644 index 0000000..b68721c --- /dev/null +++ b/lib/log.py @@ -0,0 +1,132 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +import sys +import logging as _logging + +# Users should be able to set log levels without importing "logging" + +CRITICAL = _logging.CRITICAL +ERROR = _logging.ERROR +WARNING = _logging.WARNING +INFO = _logging.INFO +DEBUG = _logging.DEBUG + + +# We need an additional log level between INFO and DEBUG to reflect the +# verbose() and vverbose() mechanisms of Check_MK. + +VERBOSE = 15 + +class CMKLogger(_logging.getLoggerClass()): + def __init__(self, name, level=_logging.NOTSET): + super(CMKLogger, self).__init__(name, level) + + _logging.addLevelName(VERBOSE, "VERBOSE") + + def verbose(self, msg, *args, **kwargs): + if self.isEnabledFor(VERBOSE): + self._log(VERBOSE, msg, args, **kwargs) + +_logging.setLoggerClass(CMKLogger) + + +# Set default logging handler to avoid "No handler found" warnings. +# Python 2.7+ +logger = _logging.getLogger("cmk") +logger.addHandler(_logging.NullHandler()) +logger.setLevel(INFO) + + +def get_logger(name): + """This function provides the logging object for client code. + + It returns a child logger of the "cmk" main logger, identified + by the given name. The name of the child logger will be prefixed + with "cmk.", for example "cmk.mkeventd" in case of "mkeventd". + """ + return logger.getChild(name) + + +def setup_console_logging(): + """This method enables all log messages to be written to the console + without any additional information like date/time, logger-name. Just + the log line is written. + + This can be used for existing command line applications which were + using sys.stdout.write() or print() before. + """ + + handler = _logging.StreamHandler(stream=sys.stdout) + + formatter = _logging.Formatter("%(message)s") + handler.setFormatter(formatter) + + logger.addHandler(handler) + + +def set_verbosity(verbosity): + """Values for "verbosity": + + 0: enables INFO and above + 1: enables VERBOSE and above + 2: enables DEBUG and above (ALL messages) + """ + if verbosity == 0: + logger.setLevel(INFO) + + elif verbosity == 1: + logger.setLevel(VERBOSE) + + elif verbosity == 2: + logger.setLevel(DEBUG) + + else: + raise NotImplementedError() + + +# TODO: Experimental. Not yet used. +class LogMixin(object): + """Inherit from this class to provide logging support. + + Makes a logger available via "self.logger" for objects and + "self.cls_logger" for the class. + """ + _logger = None + _cls_logger = None + + @property + def logger(self): + if not self._logger: + self._logger = logging.getLogger('.'.join([__name__, self.__class__.__name__])) + return self._logger + + + @classmethod + def logger(cls): + if not cls._cls_logger: + cls._cls_logger = logging.getLogger('.'.join([__name__, cls.__name__])) + return cls._cls_logger diff --git a/modules/check_mk.py b/modules/check_mk.py index 6265a42..138f91d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -48,9 +48,11 @@ import inspect from cmk.regex import regex, is_regex from cmk.exceptions import MKGeneralException, MKTerminate import cmk.debug +import cmk.log import cmk.tty as tty import cmk.store as store import cmk.paths +import cmk.render as render import cmk.man_pages as man_pages # .--Prelude-------------------------------------------------------------. @@ -74,14 +76,21 @@ if '--debug' in sys.argv[1:]: cmk.debug.enable() opt_interactive = '--interactive' in sys.argv[1:] -opt_verbose = ('-v' in sys.argv[1:] or '--verbose' in sys.argv[1:]) and 1 or 0 + +opt_verbose = 0 # TODO: Remove this once opt_verbose is gone + +cmk.log.setup_console_logging() +logger = cmk.log.get_logger("base") + +# TODO: This is not really good parsing, because it not cares about syntax like e.g. "-nv". +# The later regular argument parsing is handling this correctly. Try to clean this up. +cmk.log.set_verbosity(verbosity=len([ a for a in sys.argv if a in [ "-v", "--verbose"] ])) if '--profile' in sys.argv[1:]: import cProfile g_profile = cProfile.Profile() g_profile.enable() - if opt_verbose: - sys.stderr.write("Enabled profiling.\n") + logger.verbose("Enabled profiling.") #. @@ -4654,16 +4663,17 @@ done = False seen_I = 0 check_types = None exit_status = 0 -opt_verbose = 0 # start again from 0, was already faked at the beginning opt_inv_hw_changes = 0 opt_inv_sw_changes = 0 opt_inv_sw_missing = 0 opt_inv_fail_status = 1 # State in case of an error (default: WARN) +_verbosity = 0 # Scan modifying options first (makes use independent of option order) for o,a in opts: + # -v/--verbose is handled above manually. Simply ignore it here. if o in [ '-v', '--verbose' ]: - opt_verbose += 1 + _verbosity += 1 elif o in [ '-f', '--force' ]: opt_force = True elif o == '-c': @@ -4720,6 +4730,8 @@ for o,a in opts: elif o == "--log-to-stdout": opt_log_to_stdout = True +cmk.log.set_verbosity(verbosity=_verbosity) + # Perform actions (major modes) try: for o, a in opts: diff --git a/tests/lib/test_log.py b/tests/lib/test_log.py new file mode 100644 index 0000000..aa05d24 --- /dev/null +++ b/tests/lib/test_log.py @@ -0,0 +1,47 @@ +import pytest +import cmk.log + +def test_get_logger(): + l = cmk.log.get_logger("asd") + assert l.name == "cmk.asd" + assert l.parent == cmk.log.logger + + l = cmk.log.get_logger("asd.aaa") + assert l.name == "cmk.asd.aaa" + + +def test_setup_console_logging(capsys): + out, err = capsys.readouterr() + assert out == "" + assert err == "" + + cmk.log.get_logger("test").info("test123") + + out, err = capsys.readouterr() + assert out == "" + assert err == "" + + cmk.log.setup_console_logging() + l = cmk.log.get_logger("test") + l.info("test123") + + out, err = capsys.readouterr() + assert out == "test123\n" + assert err == "" + + +def test_set_verbosity(): + l = cmk.log.get_logger("test_logger") + assert l.getEffectiveLevel() == cmk.log.INFO + + cmk.log.set_verbosity(0) + assert l.getEffectiveLevel() == cmk.log.INFO + + cmk.log.set_verbosity(1) + assert l.getEffectiveLevel() == cmk.log.VERBOSE + + cmk.log.set_verbosity(2) + assert l.getEffectiveLevel() == cmk.log.DEBUG + + with pytest.raises(NotImplementedError): + cmk.log.set_verbosity(3)

7 years, 11 months

Changed cmk --backup/--restore to use new output/logging mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: 09f076f35d32d4bb25b69525991674161d699974 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09f076f35d32d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 13:25:17 2016 +0200 Changed cmk --backup/--restore to use new output/logging mechanism --- modules/check_mk.py | 51 +++++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 138f91d..3679f3d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -295,8 +295,7 @@ except Exception, e: # those checks that do not support inventory. It must be known before # we read in all the checks def no_discovery_possible(check_type, info): - if opt_verbose: - sys.stdout.write("%s does not support discovery. Skipping it.\n" % check_type) + logger.verbose("%s does not support discovery. Skipping it.\n", check_type) return [] @@ -1774,9 +1773,8 @@ def snmp_get_oid(hostname, ipaddress, oid): stdout=subprocess.PIPE, stderr=subprocess.PIPE) exitstatus = snmp_process.wait() if exitstatus: - if opt_verbose: - sys.stderr.write(tty.red + tty.bold + "ERROR: " + tty.normal + "SNMP error\n") - sys.stderr.write(snmp_process.stderr.read()) + logger.verbose(tty.red + tty.bold + "ERROR: " + tty.normal + "SNMP error") + logger.verbose(snmp_process.stderr.read()) return None line = snmp_process.stdout.readline().strip() @@ -2704,18 +2702,14 @@ class fake_file: def do_backup(tarname): import tarfile - if opt_verbose: - sys.stderr.write("Creating backup file '%s'...\n" % tarname) + logger.verbose("Creating backup file '%s'...", tarname) tar = tarfile.open(tarname, "w:gz") - for name, path, canonical_name, descr, is_dir, \ _unused_owned_by_nagios, _unused_group_www in backup_paths: absdir = os.path.abspath(path) if os.path.exists(path): - if opt_verbose: - sys.stderr.write(" Adding %s (%s) " % (descr, absdir)) if is_dir: basedir = absdir filename = "." @@ -2736,20 +2730,17 @@ def do_backup(tarname): info.mode = 0644 info.type = tarfile.REGTYPE info.name = subtarname - if opt_verbose: - sys.stderr.write("(%d bytes)...\n" % info.size) + logger.verbose(" Added %s (%s) with a size of %s", descr, absdir, render.bytes(info.size)) tar.addfile(info, fake_file(subdata)) tar.close() - if opt_verbose: - sys.stderr.write("Successfully created backup.\n") + logger.verbose("Successfully created backup.") def do_restore(tarname): import shutil - if opt_verbose: - sys.stderr.write("Restoring from '%s'...\n" % tarname) + logger.verbose("Restoring from '%s'...", tarname) if not os.path.exists(tarname): raise MKGeneralException("Unable to restore: File does not exist") @@ -2761,8 +2752,7 @@ def do_restore(tarname): basedir = absdir filename = "." if os.path.exists(absdir): - if opt_verbose: - sys.stderr.write(" Deleting old contents of '%s'\n" % absdir) + logger.verbose(" Deleting old contents of '%s'", absdir) # The path might point to a symbalic link. So it is no option # to call shutil.rmtree(). We must delete just the contents for f in os.listdir(absdir): @@ -2774,23 +2764,20 @@ def do_restore(tarname): else: os.remove(p) except Exception, e: - sys.stderr.write(" Warning: cannot delete %s: %s\n" % (p, e)) + logger.warning(" Warning: cannot delete %s: %s", p, e) else: basedir = os.path.dirname(absdir) filename = os.path.basename(absdir) canonical_path = basedir + "/" + canonical_name if os.path.exists(canonical_path): - if opt_verbose: - sys.stderr.write(" Deleting old version of '%s'\n" % canonical_path) + logger.verbose(" Deleting old version of '%s'", canonical_path) os.remove(canonical_path) if not os.path.exists(basedir): - if opt_verbose: - sys.stderr.write(" Creating directory %s\n" % basedir) + logger.verbose(" Creating directory %s", basedir) os.makedirs(basedir) - if opt_verbose: - sys.stderr.write(" Extracting %s (%s)\n" % (descr, absdir)) + logger.verbose(" Extracting %s (%s)", descr, absdir) if is_dir: os.system("tar xzf '%s' --force-local --to-stdout '%s' 2>/dev/null " "| tar xf - -C '%s' '%s' 2>/dev/null" % \ @@ -2804,19 +2791,19 @@ def do_restore(tarname): to_user = omd_site() else: to_user = "root" + if group_www: to_group = ":%s" % omd_site() - if opt_verbose: - sys.stderr.write(" Adding group write permissions\n") - os.system("chmod -R g+w '%s'" % absdir) + + logger.verbose(" Adding group write permissions") + os.system("chmod -R g+w '%s'" % absdir) else: to_group = ":root" - if opt_verbose: - sys.stderr.write(" Changing ownership to %s%s\n" % (to_user, to_group)) + + logger.verbose(" Changing ownership to %s%s\n", to_user, to_group) os.system("chown -R '%s%s' '%s' 2>/dev/null" % (to_user, to_group, absdir)) - if opt_verbose: - sys.stderr.write("Successfully restored backup.\n") + logger.verbose("Successfully restored backup.") def do_flush(hosts):

7 years, 11 months

3821 FIX WATO Network Scan: Fixed risk of loosing site tags when performing a network scan

by Andreas Boesl

Module: check_mk Branch: master Commit: 32658ebc3b244dbab8c00dec68f7dbb21bfbb72f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32658ebc3b244d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 14 12:08:55 2016 +0200 3821 FIX WATO Network Scan: Fixed risk of loosing site tags when performing a network scan A network scan on a folder could cause the loss of any site tags configured in this folder. As a result, these hosts were monitored multiple times on different sites, when a distributed WATO setup was used. --- .werks/3821 | 14 ++++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 ++ 3 files changed, 17 insertions(+) diff --git a/.werks/3821 b/.werks/3821 new file mode 100644 index 0000000..2509a56 --- /dev/null +++ b/.werks/3821 @@ -0,0 +1,14 @@ +Title: WATO Network Scan: Fixed risk of loosing site tags when performing a network scan +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i2 +Date: 1476439400 +Class: fix + +A network scan on a folder could cause the loss of any site tags configured in this +folder. As a result, these hosts were monitored multiple times on different sites, +when a distributed WATO setup was used. + +Developer note: This only happened when a "fresh" apache process handled this request. +Any hosttags and site defines were missing.. diff --git a/ChangeLog b/ChangeLog index ebf4add..65ed130 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * 3901 Logfile pattern analyser: pattern lists can now be searched * 3914 FIX: Roles: Aliases are now unique during cloning * 3820 FIX: Network scan: no longer fails completely if hostname already exists in configuration... + * 3821 FIX: WATO Network Scan: Fixed risk of loosing site tags when performing a network scan... Notifications: * 3957 mail: now allows extra HTML section between body and table diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5ad73ab..7174435 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15854,6 +15854,8 @@ def read_agent_contents_file(root): # master site. Finds the next folder to scan and starts it via WATO # automation. The result is written to the folder in the master site. def execute_network_scan_job(): + init_wato_datastructures() + if is_wato_slave_site(): return # Don't execute this job on slaves.

7 years, 11 months

updated werk

by Simon Betz

Module: check_mk Branch: master Commit: 5c8db5ff922fee35345c12efa7ed57fc60afdc04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c8db5ff922fee… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 14 11:34:23 2016 +0200 updated werk --- .werks/3611 | 2 +- ChangeLog | 4 +-- checks/websphere_mq_queues | 49 ++++++++++++++++++++++-------------- web/plugins/wato/check_parameters.py | 40 +++++++++++++++++++++++------ 4 files changed, 66 insertions(+), 29 deletions(-) diff --git a/.werks/3611 b/.werks/3611 index 64d9c89..0461c00 100644 --- a/.werks/3611 +++ b/.werks/3611 @@ -1,4 +1,4 @@ -Title: websphere_mq_queues: now age of messages not processed is configurable +Title: websphere_mq_queues: now age and state of messages not processed is configurable Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index 77fd5cb..ebf4add 100644 --- a/ChangeLog +++ b/ChangeLog @@ -149,8 +149,8 @@ * 3609 apc_rackpdu_power: now upper levels for electrical current are confiugurable * 3136 windows agent: improved crash reporting... * 3137 linux and solaris agent: mrpe checks now support option to append the cache age to cached results... - * 3610 mk_oracle: linux plugin now available for solaris... - * 3611 websphere_mq_queues: now age of messages not processed is configurable... + * 3610 mk_oracle: linux plugin now available for solaris + * 3611 websphere_mq_queues: now age and state of messages not processed is configurable... * 3612 nfsmounts: new rule for en/disabling performance data * 3615 if: Convert bandwidth from octets into bits for graph display... NOTE: Please refer to the migration notes! diff --git a/checks/websphere_mq_queues b/checks/websphere_mq_queues index 811445f..71ba46b 100644 --- a/checks/websphere_mq_queues +++ b/checks/websphere_mq_queues @@ -74,7 +74,7 @@ def parse_websphere_mq_queues(info): parsed[queue_name].setdefault('max_depth', int(line[2])) if len(line) > 3: - for what in line[3].split(')'): + for what in "".join(line[3:-1]).replace(" ", "").split(')'): if "(" in what: key, val = what.split('(') parsed[queue_name].setdefault(key, val) @@ -141,29 +141,40 @@ def check_websphere_mq_queues(item, params, parsed): yield state_perc, info_perc - if data.get("time_on_client") and data.get("LGETDATE") and \ - data.get("LGETTIME"): + if data.get("time_on_client") and \ + "LGETDATE" in data and "LGETTIME" in data: - time_str = "%s %s" % (data['LGETDATE'], data['LGETTIME']) - time_diff = data["time_on_client"] - \ - time.mktime(time.strptime(time_str, "%Y-%m-%d %H.%M.%S")) - state_diff = 0 - info_diff = "since %s" % get_age_human_readable(time_diff) + params = params.get("messages_not_processed", {}) - if 'messages_not_processed_age' in params: - warn_diff, crit_diff = params['messages_not_processed_age'] + if cur_depth and data["LGETDATE"] and data["LGETTIME"]: + time_str = "%s %s" % (data['LGETDATE'], data['LGETTIME']) + time_diff = data["time_on_client"] - \ + time.mktime(time.strptime(time_str, "%Y-%m-%d %H.%M.%S")) + state_diff = 0 + info_diff = "Messages not processed since %s" % get_age_human_readable(time_diff) - if time_diff >= crit_diff: - state_diff = 2 - elif time_diff >= warn_diff: - state_diff = 1 + if 'age' in params: + warn_diff, crit_diff = params['age'] - if state_diff: - info_diff += " (warn/crit at %s/%s)" % \ - (get_age_human_readable(warn_diff), - get_age_human_readable(crit_diff)) + if time_diff >= crit_diff: + state_diff = 2 + elif time_diff >= warn_diff: + state_diff = 1 + + if state_diff: + info_diff += " (warn/crit at %s/%s)" % \ + (get_age_human_readable(warn_diff), + get_age_human_readable(crit_diff)) + + yield state_diff, info_diff + + elif cur_depth: + yield params.get("state", 0), "No age of %d message%s not processed" % \ + (cur_depth, cur_depth > 1 and "s" or "") + + else: + yield 0, "Messages processed" - yield state_diff, info_diff check_info["websphere_mq_queues"] = { diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8aa8c29..21254f0 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1507,6 +1507,14 @@ register_check_parameters( def transform_websphere_mq(source): if isinstance(source, tuple): return {"message_count": source} + + elif "messages_not_processed_age" in source: + age_params = source["messages_not_processed_age"] + source["messages_not_processed"] = {} + source["messages_not_processed"]["age"] = age_params + del source["messages_not_processed_age"] + return source + else: return source @@ -1570,14 +1578,32 @@ register_check_parameters( ], optional_keys = [] )), - ("messages_not_processed_age", - Tuple( - title = _("Time settings for messages not processed"), + ("messages_not_processed", + Dictionary( + title = _("Settings for messages not processed"), + help = _("With this rule you can determine the warn and crit age " + "if LGETTIME and LGETDATE is available in the agent data. " + "Note that if LGETTIME and LGETDATE are available but not set " + "you can set the service state which is default WARN. " + "This rule applies only if the current depth is greater than zero."), elements = [ - Age(title = _("Warning at")), - Age(title = _("Critical at")), - ], - )), + ("age", + Tuple( + title = _("Upper levels for the age"), + elements = [ + Age(title = _("Warning at")), + Age(title = _("Critical at")), + ], + ) + ), + ("state", + MonitoringState( + title = _("State if LGETTIME and LGETDATE are available but not set"), + default_value = 1) + ), + ] + ), + ), ], ), forth = transform_websphere_mq

7 years, 11 months

← Newer
1
...
15
16
17
18
19
20
21
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016