Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

by Sven Rueß

Module: check_mk Branch: master Commit: 21027dd3d20c70f94df2540c9cb8075147b06402 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21027dd3d20c70… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Tue Oct 25 12:28:45 2016 +0200 New bug related to distributed monitoring and automation --- .bugs/2523 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.bugs/2523 b/.bugs/2523 new file mode 100644 index 0000000..c5265e3 --- /dev/null +++ b/.bugs/2523 @@ -0,0 +1,19 @@ +Title: Distributed Monitoring: Not blocked automatic updates for slave sites +Component: wato +State: open +Date: 2016-10-25 12:23:06 +Targetversion: 1.2.8 +Class: bug + +The user is using a distributed monitoring setup with central WATO configuration. +The slave sites are only monitoring a part of the hosts configured on the master and +the site ID is inherited by the folder properties. + +Our normal setup will disable WATO on all slave sites. The problem is, that this will not +disable WebAPI or the direct Multisite URLs. We should block this both ways, too. +Otherwise the user is able to make locale changes, which will be overwritten by the +global configuration on a later time. + +Workaround: +Only do those automatic changes on the Master site. Never do it on the slave site. +Take care about, that all of the scripts are using the Master site for those configurations.

7 years, 10 months

Reserved 1 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: f5a2a6f551eb870e4c49ae323c1c0770db48ed2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5a2a6f551eb87… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Tue Oct 25 12:22:56 2016 +0200 Reserved 1 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index c6b5c3e..29a7357 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2523 +2524

7 years, 10 months

Bug related to distributed monitoring setup

by Sven Rueß

Module: check_mk Branch: master Commit: fe02818f51efa183fbadbf2d3a6cec6b0779171d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe02818f51efa1… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Tue Oct 25 12:22:33 2016 +0200 Bug related to distributed monitoring setup --- .bugs/2522 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.bugs/2522 b/.bugs/2522 new file mode 100644 index 0000000..1722aca --- /dev/null +++ b/.bugs/2522 @@ -0,0 +1,26 @@ +Title: Distributed Monitoring: User action breaks configuration +Component: multisite +State: open +Date: 2016-10-25 12:10:19 +Targetversion: 1.2.8 +Class: bug + +The user is using a distributed monitoring setup with central WATO configuration. +The slave sites are only monitoring a part of the hosts configured on the master and +the site ID is inherited by the folder properties. + +Our normal setup will disable WATO on all slave sites. If the user is activating it +or will use our WebAPI or Multisite URLs for adaptations, the configuration is broken. +All hosts will be started to monitor on this slave. It is related to the missing site ID +in our configuration. All unknown site IDs will be replaced with the ID from the slave. + +We should take care about the transfered configuration to our slave sites. Those sites should +only receive the configuration which is needed by them. + +Otherwise we have to handle the missing site IDs correctly. Any modification on slave sites +should not break the correct configuration. + +Workaround: +Please modify global settings of affected slave sites. Edit and save without any change. +After the activation, all slave sites will be updated to the correct configuration. +If the duplicated hosts does not disappear, please login to the slave and do a cmk -R as site user.

7 years, 10 months

Reserved 1 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 94f7dc7d7000e45802cf1e75946f7375d0bd9168 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94f7dc7d7000e4… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Tue Oct 25 12:10:08 2016 +0200 Reserved 1 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 6357d64..c6b5c3e 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2522 +2523

7 years, 10 months

moved some first rule matching utility functions to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: b1b5a5ce27cfb2c35be28832f3eefac62d15efb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1b5a5ce27cfb2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Oct 22 15:58:05 2016 +0200 moved some first rule matching utility functions to dedicated module --- cmk_base/rulesets.py | 166 +++++++++++++++++++++++++++++++++++++++++++++++ modules/automation.py | 6 +- modules/check_mk.py | 174 ++++++-------------------------------------------- modules/events.py | 10 ++- 4 files changed, 197 insertions(+), 159 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b1b5a5ce27…

7 years, 10 months

Cleaned up all g_global_caches to standard in-memory cache handling

by Lars Michelsen

Module: check_mk Branch: master Commit: cb25df8b0b855743856dd53370bd07e4b1375364 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb25df8b0b8557… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 21 20:37:17 2016 +0200 Cleaned up all g_global_caches to standard in-memory cache handling --- cmk_base/__init__.py | 10 +- cmk_base/caching.py | 47 +++++-- modules/check_mk.py | 286 ++++++++++++++++++++++------------------- modules/check_mk_base.py | 78 ++++------- modules/nagios.py | 1 + tests/cmk_base/test_caching.py | 73 +++++++++++ 6 files changed, 301 insertions(+), 194 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cb25df8b0b…

7 years, 10 months

Fixed some issues in recent refactorings

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ebce956f18202b44507c874826dd08baa348be3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ebce956f18202… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 24 16:24:39 2016 +0200 Fixed some issues in recent refactorings --- cmk_base/rulesets.py | 1 + modules/check_mk.py | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cmk_base/rulesets.py b/cmk_base/rulesets.py index 9049098..10536c4 100644 --- a/cmk_base/rulesets.py +++ b/cmk_base/rulesets.py @@ -27,6 +27,7 @@ from cmk.regex import regex, is_regex from cmk.exceptions import MKGeneralException +import cmk_base def parse_host_rule(rule): rule, rule_options = get_rule_options(rule) diff --git a/modules/check_mk.py b/modules/check_mk.py index 8cd70f7..2e5bcd2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1914,13 +1914,15 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='co # Now add checks a cluster might receive from its nodes if is_cluster(hostname): + single_host_checks = cmk_base.config_cache.get_dict("single_host_checks") + for node in nodes_of(hostname): - node_checks = g_singlehost_checks.get(node, []) + node_checks = single_host_checks.get(node, []) if not skip_autochecks: node_checks = node_checks + read_autochecks_of(node, world) for entry in node_checks: if len(entry) == 4: - entry = entry[1:] # drop hostname from g_singlehost_checks + entry = entry[1:] # drop hostname from single_host_checks checkname, item, params = entry descr = service_description(node, checkname, item) if hostname == host_of_clustered_service(node, descr): @@ -2197,7 +2199,7 @@ def lookup_ip_address(hostname, family=None): return cached_dns_lookup(hostname, family) -def init_ip_lookup_cache(): +def initialize_ip_lookup_cache(): # Already created and initialized. Simply return it! if cmk_base.config_cache.exists("ip_lookup"): return cmk_base.config_cache.get_dict("ip_lookup") @@ -2221,6 +2223,8 @@ def init_ip_lookup_cache(): def write_ip_lookup_cache(): + ip_lookup_cache = cmk_base.config_cache.get_dict("ip_lookup") + # TODO: Write using cmk.store suffix = "." + str(os.getpid()) file(cmk.paths.var_dir + '/ipaddresses.cache' + suffix, 'w').write(repr(ip_lookup_cache))

7 years, 10 months

Started moving in-memory cache handling to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: b77e51cb8a52ccd0194e55017024f46882d49ebe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b77e51cb8a52cc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 20 11:44:35 2016 +0200 Started moving in-memory cache handling to dedicated module --- cmk_base/__init__.py | 4 ++++ cmk_base/caching.py | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ modules/check_mk.py | 10 +++++---- modules/check_mk_base.py | 17 +++++++------- 4 files changed, 76 insertions(+), 13 deletions(-) diff --git a/cmk_base/__init__.py b/cmk_base/__init__.py index 66c865c..a0fd6ad 100644 --- a/cmk_base/__init__.py +++ b/cmk_base/__init__.py @@ -27,3 +27,7 @@ """This is the python module hierarchy used by Check_MK's core components, former called modules. This hosts the checking, discovery and a lot of other functionality.""" + +import cmk_base.caching + +cache = cmk_base.caching.CacheManager() diff --git a/cmk_base/caching.py b/cmk_base/caching.py new file mode 100644 index 0000000..dea4964 --- /dev/null +++ b/cmk_base/caching.py @@ -0,0 +1,58 @@ +#!/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. + +"""Managing in-memory caches through the execution time of cmk""" + +from cmk.exceptions import MKGeneralException + + +class CacheManager(object): + def __init__(self): + self._caches = {} + + + def register(self, name): + if name in self._caches: + raise MKGeneralException("The cache \"%s\" is already registered" % name) + + self._caches[name] = Cache() + return self._caches[name] + + + def clear_all(): + for cache in self._caches.values(): + cache.clear() + + + def get(self, name): + return self._caches[name] + + + +# Just a small wrapper round a dict to get some caching specific functionality +# for analysis etc. +class Cache(dict): + pass diff --git a/modules/check_mk.py b/modules/check_mk.py index f03ac5d..3849925 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -58,6 +58,7 @@ import cmk.render as render import cmk.man_pages as man_pages import cmk_base.console as console +import cmk_base.cache # .--Prelude-------------------------------------------------------------. # | ____ _ _ | @@ -1951,11 +1952,12 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='co skip_autochecks = True # speed up multiple lookup of same host - if not skip_autochecks and use_cache and hostname in g_check_table_cache: + check_table_cache = cmk_base.cache.get("check_tables") + if not skip_autochecks and use_cache and hostname in check_table_cache: if remove_duplicates and is_dual_host(hostname): - return remove_duplicate_checks(g_check_table_cache[hostname]) + return remove_duplicate_checks(check_table_cache[hostname]) else: - return g_check_table_cache[hostname] + return check_table_cache[hostname] check_table = {} @@ -2078,7 +2080,7 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='co deps.append(d) if not skip_autochecks and use_cache: - g_check_table_cache[hostname] = check_table + check_table_cache[hostname] = check_table if remove_duplicates: return remove_duplicate_checks(check_table) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 3b81110..983faad 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -64,6 +64,7 @@ import cmk_base.agent_simulator import cmk_base.utils import cmk_base.prediction import cmk_base.console as console +import cmk_base.cache # PLANNED CLEANUP: # - central functions for outputting verbose information and bailing @@ -99,8 +100,7 @@ def reset_global_caches(): global g_ip_lookup_cache g_ip_lookup_cache = None # permanently cached ipaddresses from ipaddresses.cache - for cachevar_name in g_global_caches: - globals()[cachevar_name] = {} + cmk_base.cache.clear_all() # global variables used to cache temporary values that do not need @@ -125,10 +125,8 @@ g_global_caches = [] # global variables used to cache temporary values that need to # be reset after a configuration change. -g_check_table_cache = {} # per-host-checktables -g_global_caches.append('g_check_table_cache') -g_nodesof_cache = {} # Nodes of cluster hosts -g_global_caches.append('g_nodesof_cache') +cmk_base.cache.register("check_tables") # Check table of a host +cmk_base.cache.register("nodes_of") # Nodes of cluster hosts reset_global_caches() @@ -1973,16 +1971,17 @@ def i_am_root(): # Returns the nodes of a cluster, or None if hostname is # not a cluster def nodes_of(hostname): - nodes = g_nodesof_cache.get(hostname, False) + nodes_of_cache = cmk_base.cache.get("nodes_of") + nodes = nodes_of_cache.get(hostname, False) if nodes != False: return nodes for tagged_hostname, nodes in clusters.items(): if hostname == tagged_hostname.split("|")[0]: - g_nodesof_cache[hostname] = nodes + nodes_of_cache[hostname] = nodes return nodes - g_nodesof_cache[hostname] = None + nodes_of_cache[hostname] = None return None def check_uses_snmp(check_type):

7 years, 10 months

fixed typo

by Marcel Arentz

Module: check_mk Branch: master Commit: 4128b706c12527c44ea8f7ae3e65eeb870f1a3c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4128b706c12527… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Oct 24 15:46:32 2016 +0200 fixed typo --- checks/cpu_util.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 9d188dc..a277242 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -27,7 +27,7 @@ # Common file for all (modern) checks that check CPU utilization (not load!) # Example for check parameters: -# 1. Variant: Tuple (warn, crit). This is legaacy style +# 1. Variant: Tuple (warn, crit). This is legacy style # 2. Variant: dictionary: # # param = {

7 years, 11 months

Remove obsolete and outdated sections from check manpages

by Mathias Kettner

Module: check_mk Branch: master Commit: fd09000bfddf0bde61ba039e09c5c238609f4044 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd09000bfddf0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 15:18:31 2016 +0200 Remove obsolete and outdated sections from check manpages Information about the configuration is now found in WATO. If you need the correct syntax of a check configuration then please create a configuration example with WATO and look into the <tt>rules.mk</tt> file as a reference. Also the information about the metrics has been dropped since the new metric system has a correct description for each metric. --- lib/man_pages.py | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/lib/man_pages.py b/lib/man_pages.py index cbacf1c..c0c8377 100644 --- a/lib/man_pages.py +++ b/lib/man_pages.py @@ -567,55 +567,12 @@ class ManPageRenderer(object): self._print_subheader("Item") self._print_textbody(header['item']) - self._print_subheader("Check parameters") - if self.man_page.has_key('parameters'): - self._begin_table(["Parameter", "Type", "Description"]) - first = True - for parameter_name, text in self.man_page['parameters']: - if not first: - self._print_empty_line() - first = False - self._print_splitwrap(self._parameters_color, parameter_name + ": ", self._normal_color, text) - self._end_table() - else: - self._print_line("None.") - - self._print_subheader("Metrics") - if header.has_key('perfdata'): - self._print_textbody(header['perfdata']) - else: - self._print_textbody("None.") - self._print_subheader("Discovery") if header.has_key('inventory'): self._print_textbody(header['inventory']) else: self._print_textbody("No discovery supported.") - self._print_subheader("Configuration variables") - if self.man_page.has_key('configuration'): - self._begin_table(["Variable", "Type", "Description"]) - first = True - for conf_name, text in self.man_page['configuration']: - if not first: - self._print_empty_line() - first = False - self._print_splitwrap(tty.colorset(2, 4, 1), conf_name + ": ", - tty.normal + tty.colorset(7, 4), text) - self._end_table() - else: - self._print_line("None.") - - if header.has_key("examples"): - self._print_subheader("Examples") - lines = header['examples'].split('\n') - self._begin_main_mk() - for line in lines: - if line.lstrip().startswith('#'): - self._print_line(line) - elif line != "<br>": - self._print_line(line, self._examples_color, True) # nomarkup - self._end_main_mk() self._print_empty_line() self.output.flush()

7 years, 11 months

← Newer
1
...
5
6
7
8
9
10
11
...
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