Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

Use a context manager for file I/O in werks handling. Fixed decoding.

by Sven Panne

Module: check_mk Branch: master Commit: 63a6b955e28d7b19875b43a608ceaab475a6ae55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63a6b955e28d7b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 13 09:50:04 2018 +0100 Use a context manager for file I/O in werks handling. Fixed decoding. Note that first stripping and then decoding is simply wrong, it must be done the other way round. The wrong order just works by accident with UTF-8. Change-Id: Ib95c752e51fb680c7386c87723208e8516bc512f --- cmk/werks.py | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/cmk/werks.py b/cmk/werks.py index 6757763..0be76a0 100644 --- a/cmk/werks.py +++ b/cmk/werks.py @@ -26,6 +26,7 @@ """Code for processing Check_MK werks. This is needed by several components, so it's best place is in the central library.""" +import codecs import os import json @@ -110,12 +111,8 @@ def load(): def load_precompiled_werks_file(path): - werks = {} - - for werk_id, werk in json.load(open(path)).items(): - werks[int(werk_id)] = werk - - return werks + with open(path) as fp: + return {int(werk_id): werk for werk_id, werk in json.load(fp).iteritems()} def load_raw_files(werks_dir): @@ -148,19 +145,20 @@ def _load_werk(path): "body": [], } in_header = True - for line in file(path): - line = line.strip().decode("utf-8") - if in_header and not line: - in_header = False - elif in_header: - key, text = line.split(":", 1) - try: - value = int(text.strip()) - except ValueError: - value = text.strip() - werk[key.lower()] = value - else: - werk["body"].append(line) + with codecs.open(path, encoding="utf-8") as fp: + for line in fp: + line = line.strip() + if in_header and not line: + in_header = False + elif in_header: + key, text = line.split(":", 1) + try: + value = int(text.strip()) + except ValueError: + value = text.strip() + werk[key.lower()] = value + else: + werk["body"].append(line) werk.setdefault("compatible", "compat") werk.setdefault("edition", "cre")

5 years, 9 months

Fixed potential encoding issue when generating the nagios config

by Lars Michelsen

Module: check_mk Branch: master Commit: a5f69c00607975a4ff3cc305aee7bdc87bea1ac4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5f69c00607975… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 12 19:54:08 2018 +0100 Fixed potential encoding issue when generating the nagios config Change-Id: Iab2a2b91d16028e90aa0f9727b49854f401345c0 --- cmk_base/core_nagios.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index e2fe08d..e8e3c7e 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -352,7 +352,7 @@ define servicedependency { } """ % (template, hostname, description.encode("utf-8"), check_interval, - _extra_service_conf_of(hostname, description), action_cfg, checkname)) + _extra_service_conf_of(hostname, description), action_cfg, checkname.encode("utf-8"))) checknames_to_define.add(checkname) have_at_least_one_service = True

5 years, 9 months

Nuked one more table.begin()/end() pair.

by Sven Panne

Module: check_mk Branch: master Commit: c8cf15481eda5918897dcee18df56a48878a25a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8cf15481eda59… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 13 09:00:07 2018 +0100 Nuked one more table.begin()/end() pair. table.end()'s return value has been unused since 2015 (77d6eeec4), so we can simplify things a bit and use open_table() in one more place. Change-Id: Iffa56c4787d600b46af348f0ee9e8b94a670c0aa --- cmk/gui/plugins/views/availability.py | 100 +++++++++++++++++----------------- cmk/gui/table.py | 7 +-- 2 files changed, 50 insertions(+), 57 deletions(-) diff --git a/cmk/gui/plugins/views/availability.py b/cmk/gui/plugins/views/availability.py index 4da0c91..f727c77 100644 --- a/cmk/gui/plugins/views/availability.py +++ b/cmk/gui/plugins/views/availability.py @@ -456,57 +456,55 @@ def render_availability_table(group_title, availability_table, what, avoptions): # TODO: If summary line is activated, then sorting should now move that line to the # top. It should also stay at the bottom. This would require an extension to the # table.py module. - table.begin( - "av_items", - av_table["title"], - css="availability", - searchable=False, - limit=None, - omit_headers="omit_headers" in avoptions["labelling"]) - - show_urls, show_timeline = False, False - for row in av_table["rows"]: - table.row() - - # Column with icons - timeline_url = None - if row["urls"]: - show_urls = True - table.cell("", css="buttons") - for image, tooltip, url in row["urls"]: - html.icon_button(url, tooltip, image) - if image == "timeline": - timeline_url = url - - # Column with host/service or aggregate name - for title, (name, url) in zip(av_table["object_titles"], row["object"]): - table.cell(title, html.render_a(name, url)) - - if "timeline" in row: - show_timeline = True - table.cell(_("Timeline"), css="timeline") - html.open_a(href=timeline_url) - render_timeline_bar(row["timeline"], "inline") - html.close_a() - - # Columns with the actual availability data - for (title, help_txt), (text, css) in zip(av_table["cell_titles"], row["cells"]): - table.cell(title, text, css=css, help_txt=help_txt) - - if "summary" in av_table: - table.row(css="summary", fixed=True) - if show_urls: - table.cell("", "") # Empty cell in URLs column - table.cell("", _("Summary"), css="heading") - for _x in xrange(1, len(av_table["object_titles"])): - table.cell("", "") # empty cells, of more object titles than one - if show_timeline: - table.cell("", "") - - for (title, help_txt), (text, css) in zip(av_table["cell_titles"], av_table["summary"]): - table.cell(title, text, css="heading " + css, help_txt=help_txt) - - return table.end() # returns Table data if fetch == True + with table.open_table( + "av_items", + av_table["title"], + css="availability", + searchable=False, + limit=None, + omit_headers="omit_headers" in avoptions["labelling"]): + + show_urls, show_timeline = False, False + for row in av_table["rows"]: + table.row() + + # Column with icons + timeline_url = None + if row["urls"]: + show_urls = True + table.cell("", css="buttons") + for image, tooltip, url in row["urls"]: + html.icon_button(url, tooltip, image) + if image == "timeline": + timeline_url = url + + # Column with host/service or aggregate name + for title, (name, url) in zip(av_table["object_titles"], row["object"]): + table.cell(title, html.render_a(name, url)) + + if "timeline" in row: + show_timeline = True + table.cell(_("Timeline"), css="timeline") + html.open_a(href=timeline_url) + render_timeline_bar(row["timeline"], "inline") + html.close_a() + + # Columns with the actual availability data + for (title, help_txt), (text, css) in zip(av_table["cell_titles"], row["cells"]): + table.cell(title, text, css=css, help_txt=help_txt) + + if "summary" in av_table: + table.row(css="summary", fixed=True) + if show_urls: + table.cell("", "") # Empty cell in URLs column + table.cell("", _("Summary"), css="heading") + for _x in xrange(1, len(av_table["object_titles"])): + table.cell("", "") # empty cells, of more object titles than one + if show_timeline: + table.cell("", "") + + for (title, help_txt), (text, css) in zip(av_table["cell_titles"], av_table["summary"]): + table.cell(title, text, css="heading " + css, help_txt=help_txt) def render_timeline_bar(timeline_layout, style): diff --git a/cmk/gui/table.py b/cmk/gui/table.py index 14bdcd5..97b09ce 100644 --- a/cmk/gui/table.py +++ b/cmk/gui/table.py @@ -75,7 +75,7 @@ def groupheader(title): def end(): assert tables table = tables.pop() - return table.end() + table.end() def update_headinfo(num_rows): @@ -214,11 +214,6 @@ class Table(object): self.finish_previous() html.unplug() - # Output-Format "fetch" simply means that all data is being - # returned as Python-values to be rendered somewhere else. - if self.options["output_format"] == "fetch": - return self.headers, self.rows - if not self.rows and self.options["omit_if_empty"]: return

5 years, 9 months

6824 aws_s3, aws_s3_objects: New checks for AWS/S3

by Simon Betz

Module: check_mk Branch: master Commit: 24825ac7e80957aa779dc4ee623576064ddff684 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24825ac7e80957… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 11 11:57:26 2018 +0100 6824 aws_s3, aws_s3_objects: New checks for AWS/S3 Change-Id: Ia7fab76284cae49cadee4724685fd349ce01567b --- .werks/6824 | 11 ++++ agents/special/agent_aws | 150 +++++++++++++++++++++++++++++++++++++++++++++++ checkman/aws_s3 | 13 ++++ checkman/aws_s3_objects | 13 ++++ checks/aws.include | 24 ++++++-- checks/aws_ec2 | 18 ++---- checks/aws_s3 | 49 ++++++++++++++++ checks/aws_s3_objects | 51 ++++++++++++++++ 8 files changed, 311 insertions(+), 18 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=24825ac7e8…

5 years, 9 months

agent_aws: Default resolution of 5 min requires an aysnchronous execution

by Simon Betz

Module: check_mk Branch: master Commit: 816f61c737dc9ddcf56e12b4c68e54597836bb5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=816f61c737dc9d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 11 13:50:12 2018 +0100 agent_aws: Default resolution of 5 min requires an aysnchronous execution Change-Id: Id24213ae2bf13b1be06450b6b707ef010d46ab02 --- agents/special/agent_aws | 97 +++++++++++++++++++++++++++---------- checks/agent_aws | 1 + cmk/paths.py | 2 +- tests/unit/checks/test_agent_aws.py | 2 +- 4 files changed, 75 insertions(+), 27 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 471f2b9..07e2862 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -34,11 +34,12 @@ import json import logging import sys import time +import os from typing import NamedTuple, Any - -import boto3 -import botocore - +from pathlib2 import Path +import boto3 # type: ignore +import botocore # type: ignore +from cmk.paths import tmp_dir import cmk.password_store # .--helpers-------------------------------------------------------------. @@ -99,6 +100,8 @@ AWSSectionResult = NamedTuple("Result", [ ("content", Any), ]) +AWSStateFilesPath = Path(os.environ['OMD_ROOT']) / tmp_dir / "agents/agent_aws" + class AWSSection(object): __metaclass__ = abc.ABCMeta @@ -121,6 +124,10 @@ class AWSSection(object): """ pass + @property + def period(self): + return 2 * self.interval + def run(self): if self._client is None: msg = "%s: No client initialized" % self.__class__.__name__ @@ -223,7 +230,8 @@ class EC2(AWSSection): class AWSSections(object): - def __init__(self, session): + def __init__(self, session, hostname): + self._hostname = hostname self._session = session self._sections = [] self._results = {} @@ -262,8 +270,12 @@ class AWSSections(object): logging.info(e) self._exceptions.append(e) - def run(self): + def run(self, use_cache=True): + now = time.time() for section in self._sections: + if use_cache and self._section_cache_is_recent_enough(now, section): + continue + try: result = section.run() except Exception as e: @@ -273,38 +285,70 @@ class AWSSections(object): self._results.setdefault((section.name, section.interval), result) if not self._results: - logging.info("No results") + logging.info("No results or cached data") return - self._write_results() + self._write_exceptions() + self._write_section_results(now) + + def _section_cache_is_recent_enough(self, now, section): + state_dir = AWSStateFilesPath / self._hostname + state_dir.mkdir(parents=True, exist_ok=True) + state_file = state_dir / Path("%s-%s" % (self._session.region_name, section.name)) + if not state_file.exists(): + logging.info("New state file of section '%s'", section.name) + state_file.touch() + return False - def _write_results(self): + try: + age = now - state_file.stat().st_mtime + except OSError as e: + if e.errno == 2: # No such file or directory + logging.info("Cannot calculate age; new state file of section '%s'", section.name) + state_file.touch() + return False + else: + raise + + if age >= section.interval: + logging.info("State file of section '%s' is outdated: %s >= %s", section.name, age, + section.interval) + state_file.touch() + return False + return True + + def _write_exceptions(self): sys.stdout.write("<<<aws_exceptions>>>\n") if self._exceptions: - for e in self._exceptions: - sys.stdout.write("%s\n" % e.message) + out = "\n".join([e.message for e in self._exceptions]) else: - sys.stdout.write("No exceptions\n") + out = "No exceptions" + sys.stdout.write("%s\n" % out) - now = int(time.time()) + def _write_section_results(self, now): for (section_name, section_interval), result in self._results.iteritems(): if not result: - msg = "No results of %s" % section_name - logging.info(msg) + logging.info("No results of %s", section_name) continue + if not isinstance(result, list): msg = "Section result must be formatted as a list of 'AWSSectionResult's" logging.info(msg) raise AWSSectionError(msg) - section_header = "<<<aws_%s:cached(%s,%s)>>>\n" % (section_name, now, section_interval) - for row in result: - if row.piggyback_hostname: - sys.stdout.write("<<<<%s>>>>\n" % row.piggyback_hostname) - sys.stdout.write(section_header) - sys.stdout.write("%s\n" % json.dumps(row.content, default=_datetime_converter)) - if row.piggyback_hostname: - sys.stdout.write("<<<<>>>>\n") + self._write_section_result(section_name, int(now + section_interval + 60), result) + + def _write_section_result(self, section_name, until, result): + section_header = "<<<aws_%s:persist(%s)>>>\n" % (section_name, until) + for row in result: + write_piggyback_header = row.piggyback_hostname\ + and row.piggyback_hostname != self._hostname + if write_piggyback_header: + sys.stdout.write("<<<<%s>>>>\n" % row.piggyback_hostname) + sys.stdout.write(section_header) + sys.stdout.write("%s\n" % json.dumps(row.content, default=_datetime_converter)) + if write_piggyback_header: + sys.stdout.write("<<<<>>>>\n") #. @@ -326,6 +370,9 @@ def parse_arguments(argv): parser.add_argument( "--aws-secret-access-key", required=True, help="The secret key for your AWS account.") parser.add_argument("--region", required=True, help="The region to use.") + parser.add_argument( + "--no-cache", action="store_true", help="Execute all sections, do not rely on cached data.") + parser.add_argument("hostname") return parser.parse_args(argv) @@ -353,8 +400,8 @@ def main(args=None): region_name=args.region) try: - aws_sections = AWSSections(s) - aws_sections.run() + aws_sections = AWSSections(s, args.hostname) + aws_sections.run(use_cache=not args.no_cache) except Exception as e: if args.debug: raise diff --git a/checks/agent_aws b/checks/agent_aws index f08a435..0393d3b 100644 --- a/checks/agent_aws +++ b/checks/agent_aws @@ -33,6 +33,7 @@ def agent_aws_arguments(params, hostname, ipaddress): passwordstore_get_cmdline("%s", params["--aws-secret-access-key"]), "--region", params["--region"], + hostname, ] diff --git a/cmk/paths.py b/cmk/paths.py index dd702e5..6431fc0 100644 --- a/cmk/paths.py +++ b/cmk/paths.py @@ -51,7 +51,7 @@ tcp_cache_dir = None data_source_cache_dir = None snmp_scan_cache_dir = None include_cache_dir = None -tmp_dir = None +tmp_dir = '' logwatch_dir = None nagios_objects_file = None nagios_command_pipe_path = None diff --git a/tests/unit/checks/test_agent_aws.py b/tests/unit/checks/test_agent_aws.py index bba4178..0e65b5c 100644 --- a/tests/unit/checks/test_agent_aws.py +++ b/tests/unit/checks/test_agent_aws.py @@ -6,7 +6,7 @@ import pytest "--aws-access-key-id": "user", "--aws-secret-access-key": "d1ng", "--region": 'region-eu', - }, ['--aws-access-key-id', 'user', '--aws-secret-access-key', 'd1ng', '--region', 'region-eu']), + }, ['--aws-access-key-id', 'user', '--aws-secret-access-key', 'd1ng', '--region', 'region-eu', 'host']), ]) def test_aws(check_manager, params, result): agent = check_manager.get_special_agent("agent_aws")

5 years, 9 months

6823 aws_ec2, aws_ec2.cpu_util, aws_ec2.credits, aws_ec2.disk_io, aws_ec2.network_io: New checks which monitors AWS/EC2 instances

by Simon Betz

Module: check_mk Branch: master Commit: 80b29a5b8dee18a1cb9a2fb28f23c70fe070c11c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80b29a5b8dee18… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 10 15:06:52 2018 +0100 6823 aws_ec2, aws_ec2.cpu_util, aws_ec2.credits, aws_ec2.disk_io, aws_ec2.network_io: New checks which monitors AWS/EC2 instances Change-Id: Icb33ca6bab5a46c13dd8c95820f6b43b424faa12 --- .werks/6823 | 11 ++ agents/special/agent_aws | 68 +++++++- checkman/aws_ec2 | 13 ++ checkman/aws_ec2.cpu_credits | 14 ++ checkman/aws_ec2.cpu_util | 13 ++ checkman/aws_ec2.disk_io | 13 ++ checkman/aws_ec2.network_io | 13 ++ checkman/aws_ec2_summary | 2 + checks/aws_ec2 | 241 +++++++++++++++++++++++++++ cmk/gui/plugins/wato/check_parameters/aws.py | 51 ++++++ tests/unit/cmk/gui/test_watolib.py | 2 + 11 files changed, 437 insertions(+), 4 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=80b29a5b8d…

5 years, 9 months

CMK-1429: cmk-update-agent: Remove unnecessary test for python

by Andreas Umbreit

Module: check_mk Branch: master Commit: c2711471219590d960930effe5e764ba2fde90c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2711471219590… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue Dec 11 15:36:37 2018 +0100 CMK-1429: cmk-update-agent: Remove unnecessary test for python Change-Id: I05026ae185c2d56a119e8f0a5a0efa0554235d0d --- tests/git/test_find_debug_print.py | 9 +++++++++ tests/git/test_permissions.py | 41 ++++++++++++++++++++++---------------- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/tests/git/test_find_debug_print.py b/tests/git/test_find_debug_print.py index 1c8b824..5536b41 100644 --- a/tests/git/test_find_debug_print.py +++ b/tests/git/test_find_debug_print.py @@ -23,6 +23,13 @@ check_paths = [ "agents/plugins", ] + +exclude_folders = [ + "plugins/build", + "plugins/build_32", + "chroot" +] + def test_find_debug_code(): scanned = 0 for base_path in [ cmk_path(), cmc_path(), cme_path() ]: @@ -35,6 +42,8 @@ def test_find_debug_code(): scanned += 1 for filename in filenames: file_path = "%s/%s" % (dirpath, filename) + if [folder in file_path for folder in exclude_folders]: + continue for nr, line in enumerate(open(file_path)): if nr == 0 and ("bash" in line or "php" in line): diff --git a/tests/git/test_permissions.py b/tests/git/test_permissions.py index 33c5a43..84c6492 100644 --- a/tests/git/test_permissions.py +++ b/tests/git/test_permissions.py @@ -5,34 +5,41 @@ import os import glob from testlib import cmk_path + def is_executable(path): return os.path.isfile(path) and os.access(path, os.X_OK) + def is_not_executable(path): return os.path.isfile(path) and not os.access(path, os.X_OK) + permissions = [ # globbing pattern check function, excludes - ('active_checks/*', is_executable, ['Makefile', 'check_mkevents.cc']), - ('agents/special/agent_*', is_executable, []), - ('agents/special/lib/*', is_not_executable, []), - ('agents/check_mk_agent.*', is_executable, ['check_mk_agent.spec']), - ('agents/plugins/*', is_executable, ['README']), - ('checks/*', is_not_executable, []), - ('checkman/*', is_not_executable, []), - ('inventory/*', is_not_executable, []), - ('pnp-templates/*', is_not_executable, []), - ('notifications/*', is_executable, ['README', 'debug']), - ('bin/*', is_executable, ['Makefile', 'mkevent.cc', 'mkeventd_open514.cc']), + ('active_checks/*', is_executable, ['Makefile', 'check_mkevents.cc']), + ('agents/special/agent_*', is_executable, []), + ('agents/special/lib/*', is_not_executable, []), + ('agents/check_mk_agent.*', is_executable, ['check_mk_agent.spec']), + ('agents/plugins/*', is_executable, ['README']), + ('checks/*', is_not_executable, []), + ('checkman/*', is_not_executable, []), + ('inventory/*', is_not_executable, []), + ('pnp-templates/*', is_not_executable, []), + ('notifications/*', is_executable, ['README', 'debug']), + ('bin/*', is_executable, ['Makefile', 'mkevent.cc', 'mkeventd_open514.cc']), # Enterprise specific - ('enterprise/bin/*', is_executable, []), - ('enterprise/active_checks/*', is_executable, []), - ('enterprise/agents/bakery/*', is_not_executable, []), - ('enterprise/agents/plugins/*', is_executable, ["chroot_version", "Makefile", "pyinstaller-deps.make", "chroot", "src", "cmk_update_agent.pyc", "pip-deps-32.make", "pip-deps.make"]), - ('enterprise/alert_handlers/*', is_executable, []), - ('enterprise/alert_handlers/*', is_executable, []), + ('enterprise/bin/*', is_executable, []), + ('enterprise/active_checks/*', is_executable, []), + ('enterprise/agents/bakery/*', is_not_executable, []), + ('enterprise/agents/plugins/*', is_executable, [ + "chroot_version", "Makefile", "pyinstaller-deps.make", "chroot", "src", + "cmk_update_agent.pyc", "pip-deps-32.make", "pip-deps.make", "dist", "cmk-update-agent.spec", "cmk-update-agent-32.spec", "build" + ]), + ('enterprise/alert_handlers/*', is_executable, []), + ('enterprise/alert_handlers/*', is_executable, []), ] + def test_permissions(): for pattern, check_func, excludes in permissions: for f in glob.glob("%s/%s" % (cmk_path(), pattern)):

5 years, 9 months

6934 FIX cmk-update-agent: Remove unnecessary check for python interpreter

by Andreas Umbreit

Module: check_mk Branch: master Commit: 9eb937d1ede16159f35210a06e9cf8ab5930ee84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9eb937d1ede161… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Wed Dec 12 08:40:49 2018 +0100 6934 FIX cmk-update-agent: Remove unnecessary check for python interpreter Since Check_MK 1.5, the Agent Updater gets deployed as a binary file to linux systems by default. Hence it is no longer necessary to check for an available python2 interpreter on agent installation unless the Agent Updater gets deployed as a script. This werk adapts the agent's preinstall scripts so that no unnecessary checks are induced anymore. CMK-1429 Change-Id: I89ca0abb2ef1ded0409725df7caa8249864c1d32 --- .werks/6934 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.werks/6934 b/.werks/6934 new file mode 100644 index 0000000..9037e11 --- /dev/null +++ b/.werks/6934 @@ -0,0 +1,16 @@ +Title: cmk-update-agent: Remove unnecessary check for python interpreter +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1544600004 +Class: fix + +Since Check_MK 1.5, the Agent Updater gets deployed as a binary file to +linux systems by default. + +Hence it is no longer necessary to check for an available python2 interpreter +on agent installation unless the Agent Updater gets deployed as a script. + +This werk adapts the agent's preinstall scripts so that no unnecessary checks are induced anymore.

5 years, 9 months

6945 mk_filestats: Plugin to monitor files (Count, Age, Size)

by Moritz Kiemer

Module: check_mk Branch: master Commit: 2dc7becbea1097ca61b7677be7cbfbb8c6a616b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dc7becbea1097… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Dec 6 11:39:14 2018 +0100 6945 mk_filestats: Plugin to monitor files (Count, Age, Size) A new plugin is introduced with a functionality similar to fileinfo. It reports count, size and age of sets of files specified using a globbing pattern. However, this plugin is designed with large filesets in mind. It therefore provides different options to reduce the data reported to the Check_MK server and/or to avoid unnecessary stat calls on the client. For more information, please refer to the "--help" option of the plugin and the example configration file in agents/cfg_examples. CMK-1059 Change-Id: Icf99831444a5258029ef37233406d515d1cb7f61 --- .werks/6945 | 18 + agents/cfg_examples/mk_filestats.cfg | 45 ++ agents/plugins/mk_filestats.py | 519 +++++++++++++++++++++ checkman/filestats | 32 ++ checkman/filestats.count_only | 31 ++ checkman/filestats.extremes_only | 32 ++ checks/filestats | 264 +++++++++++ cmk/gui/plugins/wato/check_parameters/filestats.py | 130 ++++++ .../checks/generictests/datasets/filestats_1.py | 72 +++ .../generictests/datasets/filestats_count_only.py | 31 ++ tests/unit/cmk/gui/test_watolib.py | 2 + tests/unit/plugins/test_mk_filestats.py | 117 +++++ 12 files changed, 1293 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2dc7becbea…

5 years, 9 months

Tiny polishing for previous XML output commit.

by Sven Panne

Module: check_mk Branch: master Commit: 05740de424b1668df33a241cd298600c5ecd4de9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05740de424b166… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 12 15:53:08 2018 +0100 Tiny polishing for previous XML output commit. Change-Id: Ic3834b7fc6c68390414128f57aff0c5df7ff0bc0 --- cmk/gui/webapi.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmk/gui/webapi.py b/cmk/gui/webapi.py index 89cd3c3..6949a2c 100644 --- a/cmk/gui/webapi.py +++ b/cmk/gui/webapi.py @@ -80,7 +80,7 @@ def load_plugins(force): config.builtin_role_ids) -FORMATTERS = { +_FORMATTERS = { "json": ( json.dumps, lambda response: json.dumps(response, sort_keys=True, indent=4, separators=(',', ': '))), @@ -95,11 +95,13 @@ FORMATTERS = { def page_api(): try: pretty_print = False - if html.output_format not in FORMATTERS: + if not html.request.has_var("output_format"): + html.set_output_format("json") + if html.output_format not in _FORMATTERS: html.set_output_format("python") raise MKUserError( None, "Only %s are supported as output formats" % " and ".join( - '"%s"' % f for f in FORMATTERS)) + '"%s"' % f for f in _FORMATTERS)) # TODO: Add some kind of helper for boolean-valued variables? pretty_print_var = html.request.var("pretty_print", "no").lower() @@ -182,4 +184,4 @@ def page_api(): "result": _("Unhandled exception: %s") % traceback.format_exc(), } - html.write(FORMATTERS[html.output_format][1 if pretty_print else 0](response)) + html.write(_FORMATTERS[html.output_format][1 if pretty_print else 0](response))

5 years, 9 months

← Newer
1
...
18
19
20
21
22
23
24
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018