Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

bailing out is now handled by raising an exception

by Lars Michelsen

Module: check_mk Branch: master Commit: 71cd6884ce12baf243dab201fe273148ead3b026 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71cd6884ce12ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 14:22:02 2016 +0200 bailing out is now handled by raising an exception --- cmk_base/compress_history.py | 6 ++++-- lib/exceptions.py | 14 +++++++++++++- modules/check_mk.py | 8 +++++--- modules/check_mk_base.py | 13 ------------- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/cmk_base/compress_history.py b/cmk_base/compress_history.py index 6f4e713..c9e1e29 100644 --- a/cmk_base/compress_history.py +++ b/cmk_base/compress_history.py @@ -29,12 +29,14 @@ # logfiles and then compress them. Do *not* compress compressed # files again. +from cmk.exceptions import MKBailOut + import cmk.log logger = cmk.log.get_logger(__name__) def do_compress_history(args): if not args: - bail_out("Please specify files to compress.") + raise MKBailOut("Please specify files to compress.") for filename in args: try: @@ -43,7 +45,7 @@ def do_compress_history(args): except Exception, e: if cmk.debug.enabled(): raise - bail_out(str(e)) + raise MKBailOut("%s" % e) def compress_history_file(input_path, output_path): diff --git a/lib/exceptions.py b/lib/exceptions.py index d42244c..3642b83 100644 --- a/lib/exceptions.py +++ b/lib/exceptions.py @@ -65,6 +65,18 @@ class MKGeneralException(MKException): # propagate the termination up the callstack. # This should be raised in all cases where the program termination is a # "normal" case and no exception handling like printing a stack trace -# should be done. +# nor an error message should be done. The program is stopped with +# exit code 0. class MKTerminate(Exception): pass + + +# This is raised to print an error message and then end the program. +# The program should catch this at top level and end exit the program +# with exit code 3, in order to be compatible with monitoring plugin API. +class MKBailOut(Exception): + def __init__(self, reason): + self.reason = reason + + def __str__(self): + return self.reason diff --git a/modules/check_mk.py b/modules/check_mk.py index aa7334d..d6a2f71 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -46,7 +46,7 @@ import py_compile import inspect from cmk.regex import regex, is_regex -from cmk.exceptions import MKGeneralException, MKTerminate +from cmk.exceptions import MKGeneralException, MKTerminate, MKBailOut import cmk.debug import cmk.log import cmk.tty as tty @@ -4882,7 +4882,8 @@ try: elif o in [ '-A', '--bake-agents' ]: if 'do_bake_agents' not in globals(): - bail_out("Agent baking is not implemented in your version of Check_MK. Sorry.") + raise MKBailOut("Agent baking is not implemented in your version of Check_MK. Sorry.") + if args: hostnames = parse_hostname_list(args, with_clusters = False, with_foreign_hosts = True) else: @@ -4892,7 +4893,8 @@ try: elif o == '--cap': if 'do_cap' not in globals(): - bail_out("Agent packages are not supported by your version of Check_MK.") + raise MKBailOut("Agent packages are not supported by your version of Check_MK.") + do_cap(args) done = True diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 815d984..37ab13e 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -72,7 +72,6 @@ import cmk_base.agent_simulator # from --debug # - remove all remaining print commands and use sys.stdout.write instead # or define a new output function -# - Also create a function bail_out() for printing and error and exiting #. # .--Globals-------------------------------------------------------------. @@ -114,12 +113,6 @@ def vverbose(text): if opt_verbose >= 2: verbose(text) -# Output text to sys.stderr with a linefeed added. Exists -# afterwards with and exit code of 3, in order to be -# compatible with monitoring plugin API. -def bail_out(reason): - raise MKBailOut(reason) - def warning(reason): stripped = reason.lstrip() indent = reason[:len(reason) - len(stripped)] @@ -187,12 +180,6 @@ RAISE = False ZERO = 0.0 -class MKBailOut(Exception): - def __init__(self, reason): - self.reason = reason - def __str__(self): - return self.reason - class MKCounterWrapped(Exception): def __init__(self, reason): self.reason = reason

7 years, 11 months

Changed cmk_base modules to use cmk logging api

by Lars Michelsen

Module: check_mk Branch: master Commit: b50aa0de3abe458f117b6f3ad5310083b9d398eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b50aa0de3abe45… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 13:48:55 2016 +0200 Changed cmk_base modules to use cmk logging api --- cmk_base/agent_simulator.py | 2 ++ cmk_base/compress_history.py | 7 ++-- cmk_base/localize.py | 41 ++++++++++++----------- cmk_base/packaging.py | 80 +++++++++++++++++++++++--------------------- lib/log.py | 7 +++- 5 files changed, 75 insertions(+), 62 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b50aa0de3a…

7 years, 11 months

Replaced own in memory pseudo file object with standard StringIO

by Lars Michelsen

Module: check_mk Branch: master Commit: d6c5b088b13b86f26ee6868f0cf3c4fb3a0152a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6c5b088b13b86… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 14:41:10 2016 +0200 Replaced own in memory pseudo file object with standard StringIO --- cmk_base/packaging.py | 7 ++++--- modules/automation.py | 4 ++-- modules/check_mk.py | 44 +++----------------------------------------- 3 files changed, 9 insertions(+), 46 deletions(-) diff --git a/cmk_base/packaging.py b/cmk_base/packaging.py index 2a357d3..98d476e 100644 --- a/cmk_base/packaging.py +++ b/cmk_base/packaging.py @@ -30,6 +30,7 @@ import pprint import sys import tarfile import time +from cStringIO import StringIO import cmk.tty as tty import cmk.paths @@ -328,8 +329,8 @@ def create_mkp_file(package, file_name=None, file_object=None): return info tar = tarfile.open(name=file_name, fileobj=file_object, mode="w:gz") - info_file = fake_file(pprint.pformat(package)) - info = create_info("info", info_file.size()) + info_file = StringIO(pprint.pformat(package)) + info = create_info("info", len(info_file.getvalue())) tar.addfile(info, info_file) # Now pack the actual files into sub tars @@ -342,7 +343,7 @@ def create_mkp_file(package, file_name=None, file_object=None): subtarname = part + ".tar" subdata = os.popen("tar cf - --dereference --force-local -C '%s' %s" % (dir, " ".join(filenames))).read() info = create_info(subtarname, len(subdata)) - tar.addfile(info, fake_file(subdata)) + tar.addfile(info, StringIO(subdata)) tar.close() diff --git a/modules/automation.py b/modules/automation.py index d19908e..5705e95 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1137,9 +1137,9 @@ def automation_get_package(args): if not package: raise MKAutomationError("Package not installed or corrupt") - output_file = fake_file() + output_file = StringIO() cmk_base.packaging.create_mkp_file(package, file_object=output_file) - return package, output_file.content() + return package, output_file.getvalue() def automation_create_or_edit_package(args, mode): diff --git a/modules/check_mk.py b/modules/check_mk.py index d6a2f71..9c7eccc 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -45,6 +45,8 @@ import fcntl import py_compile import inspect +from cStringIO import StringIO + from cmk.regex import regex, is_regex from cmk.exceptions import MKGeneralException, MKTerminate, MKBailOut import cmk.debug @@ -2660,46 +2662,6 @@ def pack_autochecks(): # | implemented here. | # '----------------------------------------------------------------------' -class fake_file: - def __init__(self, content=""): - self._content = content - self._pointer = 0 - - def size(self): - return len(self._content) - - def read(self, size): - size = min(size, len(self._content) - self._pointer) - new_end = self._pointer + size - data = self._content[self._pointer:new_end] - self._pointer = new_end - return data - - def write(self, data): - self._content += data - - def content(self): - return self._content - - def tell(self): - return self._pointer - - def seek(self, offset, whence=0): - if whence == 0: - new_pointer = offset - elif whence == 1: - new_pointer = self._pointer + offset - elif whence == 2: - new_pointer = self.size() - offset - else: - raise IOError("Invalid value for whence") - - if new_pointer < 0: - raise IOError("Invalid seek") - - self._pointer = new_pointer - - def do_backup(tarname): import tarfile logger.verbose("Creating backup file '%s'...", tarname) @@ -2731,7 +2693,7 @@ def do_backup(tarname): info.type = tarfile.REGTYPE info.name = subtarname logger.verbose(" Added %s (%s) with a size of %s", descr, absdir, render.bytes(info.size)) - tar.addfile(info, fake_file(subdata)) + tar.addfile(info, StringIO(subdata)) tar.close() logger.verbose("Successfully created backup.")

7 years, 11 months

Started moving packaging module to cmk_base

by Lars Michelsen

Module: check_mk Branch: master Commit: 6541dd59bbfd202cdbf5e4a7590e1b8ea306fced URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6541dd59bbfd20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 13 16:08:21 2016 +0200 Started moving packaging module to cmk_base --- {modules => cmk_base}/packaging.py | 6 +++++- modules/automation.py | 42 +++++++++++++++++++------------------- modules/check_mk.py | 4 ++-- modules/check_mk_base.py | 2 ++ tests/testlib/pylint_cmk.py | 1 - 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/modules/packaging.py b/cmk_base/packaging.py similarity index 99% rename from modules/packaging.py rename to cmk_base/packaging.py index c10c686..24dabb0 100644 --- a/modules/packaging.py +++ b/cmk_base/packaging.py @@ -24,8 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import os import ast -import pprint, tarfile +import pprint +import sys +import tarfile +import time import cmk.tty as tty import cmk.paths diff --git a/modules/automation.py b/modules/automation.py index 13450a8..d19908e 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1118,47 +1118,47 @@ def automation_get_agent_output(args): def automation_get_package_info(args): - load_module("packaging") + import cmk_base.packaging packages = {} - for package_name in all_package_names(): - packages[package_name] = read_package_info(package_name) + for package_name in cmk_base.packaging.all_package_names(): + packages[package_name] = cmk_base.packaging.read_package_info(package_name) return { - "installed" : packages, - "unpackaged" : unpackaged_files(), - "parts" : package_part_info(), + "installed" : packages, + "unpackaged" : cmk_base.packaging.unpackaged_files(), + "parts" : cmk_base.packaging.package_part_info(), } def automation_get_package(args): - load_module("packaging") + import cmk_base.packaging package_name = args[0] - package = read_package_info(package_name) + package = cmk_base.packaging.read_package_info(package_name) if not package: raise MKAutomationError("Package not installed or corrupt") output_file = fake_file() - create_mkp_file(package, file_object=output_file) + cmk_base.packaging.create_mkp_file(package, file_object=output_file) return package, output_file.content() def automation_create_or_edit_package(args, mode): - load_module("packaging") + import cmk_base.packaging package_name = args[0] new_package_info = eval(sys.stdin.read()) if mode == "create": - create_package(new_package_info) + cmk_base.packaging.create_package(new_package_info) else: - edit_package(package_name, new_package_info) + cmk_base.packaging.edit_package(package_name, new_package_info) return None def automation_install_package(args): - load_module("packaging") + import cmk_base.packaging file_content = sys.stdin.read() input_file = fake_file(file_content) try: - return install_package(file_object=input_file) + return cmk_base.packaging.install_package(file_object=input_file) except Exception, e: if cmk.debug.enabled(): raise @@ -1166,29 +1166,29 @@ def automation_install_package(args): def automation_remove_or_release_package(args, mode): - load_module("packaging") + import cmk_base.packaging package_name = args[0] - package = read_package_info(package_name) + package = cmk_base.packaging.read_package_info(package_name) if not package: raise MKAutomationError("Package not installed or corrupt") if mode == "remove": - remove_package(package) + cmk_base.packaging.remove_package(package) else: - remove_package_info(package_name) + cmk_base.packaging.remove_package_info(package_name) return None def automation_remove_unpackaged_file(args): - load_module("packaging") + import cmk_base.packaging part_name = args[0] - if part_name not in [ p[0] for p in package_parts ]: + if part_name not in [ p[0] for p in cmk_base.packaging.package_parts ]: raise MKAutomationError("Invalid package part") rel_path = args[1] if "../" in rel_path or rel_path.startswith("/"): raise MKAutomationError("Invalid file name") - for part, _unused_title, _unused_perm, dir in package_parts: + for part, _unused_title, _unused_perm, dir in cmk_base.packaging.package_parts: if part == part_name: abspath = dir + "/" + rel_path if not os.path.isfile(abspath): diff --git a/modules/check_mk.py b/modules/check_mk.py index 3217d6d..aa7334d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4773,8 +4773,8 @@ try: show_paths() done = True elif o in ['-P', '--package']: - load_module("packaging") - do_packaging(args) + import cmk_base.packaging + cmk_base.packaging.do_packaging(args) done = True elif o in ['--localize']: import cmk_base.localize diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 3f39a25..815d984 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1346,10 +1346,12 @@ def is_expected_agent_version(agent_version, expected_version): (agent_version, expected_version, e)) +# Works with Check_MK version (without tailing .cee and/or .demo) def is_daily_build_version(v): return len(v) == 10 or '-' in v +# Works with Check_MK version (without tailing .cee and/or .demo) def branch_of_daily_build(v): if len(v) == 10: return "master" diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index 228ca43..48d97dd 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -24,7 +24,6 @@ def ordered_module_files(): "modules/notify.py", "modules/events.py", "modules/nagios.py", - "modules/packaging.py", "modules/prediction.py", "modules/automation.py", "modules/inventory.py",

7 years, 11 months

Moved helper functions to own module

by Lars Michelsen

Module: check_mk Branch: master Commit: a908c127d73dc7f689ec0cb743f6bbc1e6fffa71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a908c127d73dc7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 14:58:58 2016 +0200 Moved helper functions to own module --- cmk_base/packaging.py | 13 ++++--- cmk_base/utils.py | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ modules/automation.py | 3 +- modules/check_mk_base.py | 67 +++--------------------------------- 4 files changed, 103 insertions(+), 69 deletions(-) diff --git a/cmk_base/packaging.py b/cmk_base/packaging.py index 98d476e..5d5943e 100644 --- a/cmk_base/packaging.py +++ b/cmk_base/packaging.py @@ -38,6 +38,8 @@ import cmk.paths import cmk.log logger = cmk.log.get_logger(__name__) +import cmk_base.utils + pac_ext = ".mkp" # TODO: Subclass MKGeneralException()? @@ -528,16 +530,16 @@ def verify_check_mk_version(package): min_version = package["version.min_required"] cmk_version = cmk.__version__ - if is_daily_build_version(min_version): - min_branch = branch_of_daily_build(min_version) + if cmk_base.utils.is_daily_build_version(min_version): + min_branch = cmk_base.utils.branch_of_daily_build(min_version) if min_branch == "master": return # can not check exact version else: # use the branch name (e.g. 1.2.8 as min version) min_version = min_branch - if is_daily_build_version(cmk_version): - branch = branch_of_daily_build(cmk_version) + if cmk_base.utils.is_daily_build_version(cmk_version): + branch = cmk_base.utils.branch_of_daily_build(cmk_version) if branch == "master": return # can not check exact version else: @@ -546,7 +548,8 @@ def verify_check_mk_version(package): compatible = True try: - compatible = parse_check_mk_version(min_version) <= parse_check_mk_version(cmk_version) + compatible = cmk_base.utils.parse_check_mk_version(min_version) \ + <= cmk_base.utils.parse_check_mk_version(cmk_version) except: # Be compatible: When a version can not be parsed, then skip this check if cmk.debug.enabled(): diff --git a/cmk_base/utils.py b/cmk_base/utils.py new file mode 100644 index 0000000..36ecde2 --- /dev/null +++ b/cmk_base/utils.py @@ -0,0 +1,89 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + +"""This is an unsorted collection of functions which are needed in +Check_MK modules and/or cmk_base modules code.""" + +# TODO: Try to find a better place for them. + + +# Works with Check_MK version (without tailing .cee and/or .demo) +def is_daily_build_version(v): + return len(v) == 10 or '-' in v + + +# Works with Check_MK version (without tailing .cee and/or .demo) +def branch_of_daily_build(v): + if len(v) == 10: + return "master" + else: + return v.split('-')[0] + + +# Parses versions of Check_MK and converts them into comparable integers. +# This does not handle daily build numbers, only official release numbers. +# 1.2.4p1 -> 01020450001 +# 1.2.4 -> 01020450000 +# 1.2.4b1 -> 01020420100 +# 1.2.3i1p1 -> 01020310101 +# 1.2.3i1 -> 01020310100 +# TODO: Copied to werks.py - find location for common code. +def parse_check_mk_version(v): + def extract_number(s): + number = '' + for i, c in enumerate(s): + try: + int(c) + number += c + except ValueError: + s = s[i:] + return number and int(number) or 0, s + return number and int(number) or 0, '' + + parts = v.split('.') + while len(parts) < 3: + parts.append("0") + + major, minor, rest = parts + sub, rest = extract_number(rest) + + if not rest: + val = 50000 + elif rest[0] == 'p': + num, rest = extract_number(rest[1:]) + val = 50000 + num + elif rest[0] == 'i': + num, rest = extract_number(rest[1:]) + val = 10000 + num*100 + + if rest and rest[0] == 'p': + num, rest = extract_number(rest[1:]) + val += num + elif rest[0] == 'b': + num, rest = extract_number(rest[1:]) + val = 20000 + num*100 + + return int('%02d%02d%02d%05d' % (int(major), int(minor), sub, val)) diff --git a/modules/automation.py b/modules/automation.py index 5705e95..0768f98 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1155,8 +1155,7 @@ def automation_create_or_edit_package(args, mode): def automation_install_package(args): import cmk_base.packaging - file_content = sys.stdin.read() - input_file = fake_file(file_content) + input_file = StringIO(sys.stdin.read()) try: return cmk_base.packaging.install_package(file_object=input_file) except Exception, e: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 37ab13e..046d1fa 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -61,6 +61,7 @@ import cmk.crash_reporting as crash_reporting import cmk.paths import cmk_base.agent_simulator +import cmk_base.utils # PLANNED CLEANUP: # - central functions for outputting verbose information and bailing @@ -1308,10 +1309,10 @@ def is_expected_agent_version(agent_version, expected_version): elif type(expected_version) == tuple and expected_version[0] == 'at_least': spec = expected_version[1] - if is_daily_build_version(agent_version) and 'daily_build' in spec: + if cmk_base.utils.is_daily_build_version(agent_version) and 'daily_build' in spec: expected = int(spec['daily_build'].replace('.', '')) - branch = branch_of_daily_build(agent_version) + branch = cmk_base.utils.branch_of_daily_build(agent_version) if branch == "master": agent = int(agent_version.replace('.', '')) @@ -1322,7 +1323,8 @@ def is_expected_agent_version(agent_version, expected_version): return False elif 'release' in spec: - if parse_check_mk_version(agent_version) < parse_check_mk_version(spec['release']): + if cmk_base.utils.parse_check_mk_version(agent_version) \ + < cmk_base.utils.parse_check_mk_version(spec['release']): return False return True @@ -1333,65 +1335,6 @@ def is_expected_agent_version(agent_version, expected_version): (agent_version, expected_version, e)) -# Works with Check_MK version (without tailing .cee and/or .demo) -def is_daily_build_version(v): - return len(v) == 10 or '-' in v - - -# Works with Check_MK version (without tailing .cee and/or .demo) -def branch_of_daily_build(v): - if len(v) == 10: - return "master" - else: - return v.split('-')[0] - - -# Parses versions of Check_MK and converts them into comparable integers. -# This does not handle daily build numbers, only official release numbers. -# 1.2.4p1 -> 01020450001 -# 1.2.4 -> 01020450000 -# 1.2.4b1 -> 01020420100 -# 1.2.3i1p1 -> 01020310101 -# 1.2.3i1 -> 01020310100 -# TODO: Copied to werks.py - find location for common code. -def parse_check_mk_version(v): - def extract_number(s): - number = '' - for i, c in enumerate(s): - try: - int(c) - number += c - except ValueError: - s = s[i:] - return number and int(number) or 0, s - return number and int(number) or 0, '' - - parts = v.split('.') - while len(parts) < 3: - parts.append("0") - - major, minor, rest = parts - sub, rest = extract_number(rest) - - if not rest: - val = 50000 - elif rest[0] == 'p': - num, rest = extract_number(rest[1:]) - val = 50000 + num - elif rest[0] == 'i': - num, rest = extract_number(rest[1:]) - val = 10000 + num*100 - - if rest and rest[0] == 'p': - num, rest = extract_number(rest[1:]) - val += num - elif rest[0] == 'b': - num, rest = extract_number(rest[1:]) - val = 20000 + num*100 - - return int('%02d%02d%02d%05d' % (int(major), int(minor), sub, val)) - - # Loops over all checks for a host, gets the data, calls the check # function that examines that data and sends the result to the Core. def do_all_checks_on_host(hostname, ipaddress, only_check_types = None, fetch_agent_version = True):

7 years, 11 months

Also test cmk_base from cmc git

by Lars Michelsen

Module: check_mk Branch: master Commit: dd9ae6c7b2da9854bb20f8a0e92fde849aab9c76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd9ae6c7b2da98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 16:58:49 2016 +0200 Also test cmk_base from cmc git --- tests/pylint/test_pylint_misc.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/pylint/test_pylint_misc.py b/tests/pylint/test_pylint_misc.py index 8798810..ede344e 100755 --- a/tests/pylint/test_pylint_misc.py +++ b/tests/pylint/test_pylint_misc.py @@ -10,6 +10,7 @@ import testlib.pylint_cmk as pylint_cmk def test_pylint_misc(): search_paths = [ "cmk_base", + "../cmc/cmk_base", "lib", "bin", "notifications",

7 years, 11 months

Separated prediction code to dedicated python module

by Lars Michelsen

Module: check_mk Branch: master Commit: 4418bf913d323bcd8d26ae2aebab1238781a2f22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4418bf913d323b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 15:54:47 2016 +0200 Separated prediction code to dedicated python module --- {modules => cmk_base}/prediction.py | 46 ++++++++++++++++++++++++------------- modules/check_mk_base.py | 5 +++- tests/testlib/pylint_cmk.py | 1 - 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/modules/prediction.py b/cmk_base/prediction.py similarity index 88% rename from modules/prediction.py rename to cmk_base/prediction.py index 1a7aa36..9eb05c0 100644 --- a/modules/prediction.py +++ b/cmk_base/prediction.py @@ -24,27 +24,40 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Code for predictive monitoring / anomaly detection +"""Code for predictive monitoring / anomaly detection""" -# Export data from an RRD file. This requires an up-to-date -# version of the rrdtools. +import os +import time +import math +import livestatus + +import cmk.paths +import cmk.debug + +from cmk.exceptions import MKGeneralException + +import cmk.log +logger = cmk.log.get_logger(__name__) # Fetch RRD historic metrics data of a specific service. returns a tuple # of (step, [value1, value2, ...]) -# IMPORTANT: Until we have a central library, keep this function in sync with +# TODO: IMPORTANT: Until we have a central library, keep this function in sync with # the function get_rrd_data() from web/prediction.py. def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime): step = 1 rpn = "%s.%s" % (varname, cf.lower()) # "MAX" -> "max" + lql = "GET services\n" \ "Columns: rrddata:m1:%s:%d:%d:%d\n" \ "OutputFormat: python\n" \ "Filter: host_name = %s\n" \ "Filter: description = %s\n" % ( rpn, fromtime, untiltime, step, hostname, service_description) + try: - response = eval(simple_livestatus_query(lql))[0][0] + connection = livestatus.SingleSiteConnection("unix:%s" % cmk.paths.livestatus_unix_socket) + response = connection.query_value(lql) except Exception, e: if cmk.debug.enabled(): raise @@ -120,7 +133,7 @@ def get_prediction_timegroup(t, period_info): return timegroup, from_time, until_time, rel_time -def compute_prediction(pred_file, timegroup, params, period_info, from_time, dsname, cf): +def compute_prediction(hostname, service_description, pred_file, timegroup, params, period_info, from_time, dsname, cf): # Collect all slices back into the past until the time horizon # is reached begin = from_time @@ -140,7 +153,7 @@ def compute_prediction(pred_file, timegroup, params, period_info, from_time, dsn while begin >= absolute_begin: tg, fr, un = get_prediction_timegroup(begin, period_info)[:3] if tg == timegroup: - step, data = get_rrd_data(g_hostname, g_service_description, + step, data = get_rrd_data(hostname, service_description, dsname, cf, fr, un-1) if smallest_step == None: smallest_step = step @@ -190,7 +203,7 @@ def stdev(point_line, average): # levels_factor: this multiplies all absolute levels. Usage for example # in the cpu.loads check the multiplies the levels by the number of CPU # cores. -def get_predictive_levels(dsname, params, cf, levels_factor=1.0): +def get_levels(hostname, service_description, dsname, params, cf, levels_factor=1.0): # Compute timegroup now = time.time() period_info = prediction_periods[params["period"]] @@ -204,8 +217,8 @@ def get_predictive_levels(dsname, params, cf, levels_factor=1.0): get_prediction_timegroup(now, period_info) # Compute directory for prediction data - dir = "%s/prediction/%s/%s/%s" % (cmk.paths.var_dir, g_hostname, - pnp_cleanup(g_service_description), pnp_cleanup(dsname)) + dir = "%s/prediction/%s/%s/%s" % (cmk.paths.var_dir, hostname, + pnp_cleanup(service_description), pnp_cleanup(dsname)) if not os.path.exists(dir): os.makedirs(dir) @@ -228,15 +241,15 @@ def get_predictive_levels(dsname, params, cf, levels_factor=1.0): last_info = eval(file(info_file).read()) for k, v in params.items(): if last_info.get(k) != v: - verbose("Prediction parameters have changed") + logger.verbose("Prediction parameters have changed") last_info = None break except IOError: - verbose("No previous prediction for group %s available." % timegroup) + logger.verbose("No previous prediction for group %s available.", timegroup) last_info = None if last_info and last_info["time"] + period_info["valid"] * period_info["slice"] < now: - verbose("Prediction of %s outdated" % timegroup) + logger.verbose("Prediction of %s outdated", timegroup) last_info = None if last_info: @@ -252,14 +265,15 @@ def get_predictive_levels(dsname, params, cf, levels_factor=1.0): try: info = eval(file(dir + "/" + f).read()) if info["period"] != params["period"]: - verbose("Removing obsolete prediction %s" % f[:-5]) + logger.verbose("Removing obsolete prediction %s", f[:-5]) os.remove(dir + "/" + f) os.remove(dir + "/" + f[:-5]) except: pass - verbose("Computing prediction for time group %s" % timegroup) - prediction = compute_prediction(pred_file, timegroup, params, period_info, from_time, dsname, cf) + logger.verbose("Computing prediction for time group %s", timegroup) + prediction = compute_prediction(hostname, service_description, pred_file, timegroup, + params, period_info, from_time, dsname, cf) info = { "time" : now, diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 046d1fa..ce7266c 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -62,6 +62,7 @@ import cmk.paths import cmk_base.agent_simulator import cmk_base.utils +import cmk_base.prediction # PLANNED CLEANUP: # - central functions for outputting verbose information and bailing @@ -2101,7 +2102,8 @@ def check_levels(value, dsname, params, unit="", factor=1.0, scale=1.0, statemar else: try: ref_value, ((warn_upper, crit_upper), (warn_lower, crit_lower)) = \ - get_predictive_levels(dsname, params, "MAX", levels_factor=factor * scale) + cmk_base.prediction.get_levels(g_hostname, g_service_description, + dsname, params, "MAX", levels_factor=factor * scale) if ref_value: infotexts.append("predicted reference: %.2f%s" % (ref_value / scale, unit)) @@ -2307,6 +2309,7 @@ def camelcase_to_underscored(name): # Return plain response from local Livestatus - without any parsing +# TODO: Use livestatus module def simple_livestatus_query(lql): s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) s.connect(cmk.paths.livestatus_unix_socket) diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index 48d97dd..a21c22e 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -24,7 +24,6 @@ def ordered_module_files(): "modules/notify.py", "modules/events.py", "modules/nagios.py", - "modules/prediction.py", "modules/automation.py", "modules/inventory.py", "../cmc/modules/real_time_checks.py",

7 years, 11 months

Reenabled opt_verbose for compatibility until it has been removed completely

by Lars Michelsen

Module: check_mk Branch: master Commit: ea0549ddd1a6891fa6172a5f6d7e263eba5d417f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea0549ddd1a689… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 18 14:57:50 2016 +0200 Reenabled opt_verbose for compatibility until it has been removed completely --- modules/check_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 3679f3d..05c2f74 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4661,6 +4661,7 @@ for o,a in opts: # -v/--verbose is handled above manually. Simply ignore it here. if o in [ '-v', '--verbose' ]: _verbosity += 1 + opt_verbose += 1 # TODO: Remove this once opt_verbose usage has been removed elif o in [ '-f', '--force' ]: opt_force = True elif o == '-c':

7 years, 11 months

Reorder option in ESXi datasource program rule set

by Mathias Kettner

Module: check_mk Branch: master Commit: 19e5d92f45f0cbf3612dbff575a89b1e104a71e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19e5d92f45f0cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 14:44:00 2016 +0200 Reorder option in ESXi datasource program rule set Group related options better. --- web/plugins/wato/datasource_programs.py | 90 ++++++++++++++++----------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 3aa4932..02c94d1 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -60,6 +60,18 @@ register_rule(group, allow_empty = False, ) ), + ( "direct", + DropdownChoice( + title = _("Type of query"), + choices = [ + ( True, _("Queried host is a host system" ) ), + ( "hostsystem_agent", _("Queried host is a host system with Check_MK Agent installed") ), + ( False, _("Queried host is the vCenter") ), + ( "agent", _("Queried host is the vCenter with Check_MK Agent installed") ), + ], + default = True, + ) + ), ( "tcp_port", Integer( title = _("TCP Port number"), @@ -93,6 +105,17 @@ register_rule(group, unit = _("seconds"), ) ), + ( "use_pysphere", + Checkbox( + title = _("Compatibility mode"), + label = _("Support ESX 4.1 (using slower PySphere implementation)"), + true_label = _("Support 4.1"), + false_label = _("fast"), + help = _("The current very performant implementation of the ESX special agent " + "does not support older ESX versions than 5.0. Please use the slow " + "compatibility mode for those old hosts."), + ) + ), ( "infos", Transform( ListChoice( @@ -110,6 +133,18 @@ register_rule(group, title = _("Retrieve information about..."), ) ), + ( "skip_placeholder_vms", + Checkbox( + title = _("Placeholder VMs"), + label = _("Do no monitor placeholder VMs"), + default_value = True, + true_label = _("ignore"), + false_label = _("monitor"), + help = _("Placeholder VMs are created by the Site Recovery Manager(SRM) and act as backup " + "virtual machines in case the default vm is unable to start. This option tells the " + "vsphere agent to exclude placeholder vms in its output." + )) + ), ( "host_pwr_display", DropdownChoice( title = _("Display ESX Host power state on"), @@ -121,16 +156,6 @@ register_rule(group, default = None, ) ), - ( "vm_piggyname", - DropdownChoice( - title = _("Piggyback name of virtual machines"), - choices = [ - ( "alias", _("Use the name specified in the ESX system") ), - ( "hostname", _("Use the VMs hostname if set, otherwise fall back to ESX name") ), - ], - default = "alias", - ) - ), ( "vm_pwr_display", DropdownChoice( title = _("Display VM power state on"), @@ -142,6 +167,16 @@ register_rule(group, default = None, ) ), + ( "vm_piggyname", + DropdownChoice( + title = _("Piggyback name of virtual machines"), + choices = [ + ( "alias", _("Use the name specified in the ESX system") ), + ( "hostname", _("Use the VMs hostname if set, otherwise fall back to ESX name") ), + ], + default = "alias", + ) + ), ( "spaces", DropdownChoice( title = _("Spaces in hostnames"), @@ -152,41 +187,6 @@ register_rule(group, default = "underscore", ) ), - ( "direct", - DropdownChoice( - title = _("Type of query"), - choices = [ - ( True, _("Queried host is a host system" ) ), - ( "hostsystem_agent", _("Queried host is a host system with Check_MK Agent installed") ), - ( False, _("Queried host is the vCenter") ), - ( "agent", _("Queried host is the vCenter with Check_MK Agent installed") ), - ], - default = True, - ) - ), - ( "skip_placeholder_vms", - Checkbox( - title = _("Placeholder VMs"), - label = _("Do no monitor placeholder VMs"), - default_value = True, - true_label = _("ignore"), - false_label = _("monitor"), - help = _("Placeholder VMs are created by the Site Recovery Manager(SRM) and act as backup " - "virtual machines in case the default vm is unable to start. This option tells the " - "vsphere agent to exclude placeholder vms in its output." - )) - ), - ( "use_pysphere", - Checkbox( - title = _("Compatibility mode"), - label = _("Support ESX 4.1 (using slower PySphere implementation)"), - true_label = _("Support 4.1"), - false_label = _("fast"), - help = _("The current very performant implementation of the ESX special agent " - "does not support older ESX versions than 5.0. Please use the slow " - "compatibility mode for those old hosts."), - ) - ), ], optional_keys = [ "tcp_port", "timeout", "vm_pwr_display", "host_pwr_display", "vm_piggyname" ], ),

7 years, 11 months

3827 FIX windows agent: fixed 3 bugs which broke the skype section

by Andreas Boesl

Module: check_mk Branch: master Commit: 6086d53058b7f9c3633adffaa44d1df490f4e9c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6086d53058b7f9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 18 14:03:39 2016 +0200 3827 FIX windows agent: fixed 3 bugs which broke the skype section --- .werks/3827 | 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 -> 15382636 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1324544 -> 1324544 bytes agents/windows/check_mk_agent.exe | Bin 1299456 -> 1299456 bytes agents/windows/check_mk_agent.msi | Bin 2893824 -> 2893824 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13294903 -> 13295415 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1299456 -> 1299456 bytes agents/windows/install_agent-64.exe | Bin 584706 -> 584767 bytes agents/windows/install_agent.exe | Bin 581396 -> 581457 bytes agents/windows/sections/SectionPerfcounter.cc | 2 +- agents/windows/sections/SectionSkype.cc | 3 ++- 14 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/3827 b/.werks/3827 new file mode 100644 index 0000000..0f64d0c --- /dev/null +++ b/.werks/3827 @@ -0,0 +1,9 @@ +Title: windows agent: fixed 3 bugs which broke the skype section +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1476792181 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 61ed808..73cba57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * 3825 FIX: local check: no longer cuts away any trailing "9" digits in P mode * 3964 FIX: df_zos: Fixed not working filesystemcheck for IBM z/OS... * 3826 FIX: netapp_api_connection: now removes duplicate warning messages + * 3827 FIX: windows agent: fixed 3 bugs which broke the skype section Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/agents/windows/build_version b/agents/windows/build_version index 4bc9790..4e14254 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2114 +2133 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 1999ec9..cf89279 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 424b7d0..ae7b078 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 eead573..16f1abd 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 95007b2..4315c37 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 95cd100..cd1849d 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 dc59afa..95f4318 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 87a232c..0a9de51 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 ba706ab..96a96f1 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 1dbe35a..2d53be3 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/sections/SectionPerfcounter.cc b/agents/windows/sections/SectionPerfcounter.cc index 062a0e8..0190c7e 100644 --- a/agents/windows/sections/SectionPerfcounter.cc +++ b/agents/windows/sections/SectionPerfcounter.cc @@ -81,7 +81,7 @@ bool SectionPerfcounter::produceOutputInner(std::ostream &out, instance_name = instance_names[instance_values.first]; } out << to_utf8(instance_name.c_str()) << "," - << to_utf8(join(instance_values.second, L",").c_str()); + << to_utf8(join(instance_values.second, L",").c_str()) << "\n"; } } catch (const std::exception &e) { crash_log("Exception: %s", e.what()); diff --git a/agents/windows/sections/SectionSkype.cc b/agents/windows/sections/SectionSkype.cc index f6492da..a9cacd2 100644 --- a/agents/windows/sections/SectionSkype.cc +++ b/agents/windows/sections/SectionSkype.cc @@ -25,9 +25,10 @@ #include "SectionSkype.h" #include "SectionPerfcounter.h" -SectionSkype::SectionSkype() { +SectionSkype::SectionSkype() : SectionGroup("skype") { withToggleIfMissing(); withNestedSubtables(); + withSeparator(','); for (LPCWSTR data_source : {L"LS:WEB - Address Book Web Query",

7 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
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