[checkmk-commits] Centralize tuple ruleset defines

Module: check_mk Branch: master Commit: 28e109f51652ee284c89be2b14a489153632ee75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28e109f51652ee… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Apr 12 18:13:01 2019 +0200 Centralize tuple ruleset defines Change-Id: I108b8ffb13da59ef666cb571519dadfe5cfb2d36 --- cmk/gui/watolib/utils.py | 10 ++++++---- cmk/utils/rulesets/tuple_rulesets.py | 32 ++++++++++++++++++++++++++++++++ cmk_base/config.py | 14 ++++++++------ 3 files changed, 46 insertions(+), 10 deletions(-) diff --git a/cmk/gui/watolib/utils.py b/cmk/gui/watolib/utils.py index 77099b8..be9f397 100644 --- a/cmk/gui/watolib/utils.py +++ b/cmk/gui/watolib/utils.py @@ -33,6 +33,7 @@ from contextlib import contextmanager import cmk import cmk.utils.paths +import cmk.utils.rulesets.tuple_rulesets import cmk.utils.store as store import cmk.gui.config as config @@ -40,10 +41,11 @@ from cmk.gui.globals import html from cmk.gui.i18n import _ from cmk.gui.exceptions import MKGeneralException -# Constants used in configuration files -ALL_HOSTS = ['@all'] -ALL_SERVICES = [""] -NEGATE = '@negate' +# TODO: Clean up all call sites in the GUI and only use them in WATO config file loading code +ALL_HOSTS = cmk.utils.rulesets.tuple_rulesets.ALL_HOSTS +ALL_SERVICES = cmk.utils.rulesets.tuple_rulesets.ALL_SERVICES +NEGATE = cmk.utils.rulesets.tuple_rulesets.NEGATE + NO_ITEM = {} # Just an arbitrary unique thing ENTRY_NEGATE_CHAR = "!" diff --git a/cmk/utils/rulesets/tuple_rulesets.py b/cmk/utils/rulesets/tuple_rulesets.py new file mode 100644 index 0000000..d6929fb --- /dev/null +++ b/cmk/utils/rulesets/tuple_rulesets.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2019 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. + +# Conveniance macros for legacy tuple based host and service rules +PHYSICAL_HOSTS = ['@physical'] # all hosts but not clusters +CLUSTER_HOSTS = ['@cluster'] # all cluster hosts +ALL_HOSTS = ['@all'] # physical and cluster hosts +ALL_SERVICES = [""] # optical replacement" +NEGATE = '@negate' # negation in boolean lists diff --git a/cmk_base/config.py b/cmk_base/config.py index 2d77fb2..bea4422 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -42,6 +42,7 @@ import cmk.utils.debug import cmk.utils.paths from cmk.utils.regex import regex, is_regex import cmk.utils.translations +import cmk.utils.rulesets.tuple_rulesets import cmk.utils.store as store import cmk.utils from cmk.utils.exceptions import MKGeneralException, MKTerminate @@ -1805,12 +1806,13 @@ def _in_servicematcher_list(service_matchers, item): # | Some constants to be used in the configuration and at other places | # '----------------------------------------------------------------------' -# Conveniance macros for host and service rules -PHYSICAL_HOSTS = ['@physical'] # all hosts but not clusters -CLUSTER_HOSTS = ['@cluster'] # all cluster hosts -ALL_HOSTS = ['@all'] # physical and cluster hosts -ALL_SERVICES = [""] # optical replacement" -NEGATE = '@negate' # negation in boolean lists +# Conveniance macros for legacy tuple based host and service rules +# TODO: Deprecate these in a gentle way +PHYSICAL_HOSTS = cmk.utils.rulesets.tuple_rulesets.PHYSICAL_HOSTS +CLUSTER_HOSTS = cmk.utils.rulesets.tuple_rulesets.CLUSTER_HOSTS +ALL_HOSTS = cmk.utils.rulesets.tuple_rulesets.ALL_HOSTS +ALL_SERVICES = cmk.utils.rulesets.tuple_rulesets.ALL_SERVICES +NEGATE = cmk.utils.rulesets.tuple_rulesets.NEGATE # TODO: Cleanup access to check_info[] -> replace it by different function calls # like for example check_exists(...)