Module: check_mk
Branch: master
Commit: 5372821c794d8d21e95a9ccc50c9502a0d495658
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5372821c794d8d…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed Mar 21 10:32:10 2018 +0100
Make some EC settings helper functions private.
Change-Id: Ic39755c4a365601dc1d4149beb1582585ecdcfc1
---
cmk/ec/export.py | 17 +++++++++++------
cmk/ec/settings.py | 8 ++++----
web/htdocs/mkeventd.py | 8 +++++---
3 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/cmk/ec/export.py b/cmk/ec/export.py
index 3f196e6..fc8f04d 100644
--- a/cmk/ec/export.py
+++ b/cmk/ec/export.py
@@ -150,14 +150,21 @@ class RulePackType(Enum): # pylint: disable=too-few-public-methods
return RulePackType.modified_mkp
+def _default_settings():
+ # type: () -> cmk.ec.settings.Settings
+ """Returns default EC settings. This function should vanish in the
long run!"""
+ return cmk.ec.settings.settings('',
+ Path(cmk.paths.omd_root),
+ Path(cmk.paths.default_config_dir),
+ [''])
+
+
def rule_pack_dir():
# type: () -> Path
"""
Returns the default WATO directory of the Event Console.
"""
- paths = cmk.ec.settings.default_paths(Path(cmk.paths.omd_root),
- Path(cmk.paths.default_config_dir))
- return paths.config_dir.value / "wato"
+ return _default_settings().paths.config_dir.value / "wato"
def mkp_rule_pack_dir():
@@ -166,9 +173,7 @@ def mkp_rule_pack_dir():
Returns the default directory for rule pack exports of the
Event Console.
"""
- paths = cmk.ec.settings.default_paths(Path(cmk.paths.omd_root),
- Path(cmk.paths.default_config_dir))
- return paths.config_dir.value / "mkp" / "rule_packs"
+ return _default_settings().paths.config_dir.value / "mkp" /
"rule_packs"
def read_rule_packs(context):
diff --git a/cmk/ec/settings.py b/cmk/ec/settings.py
index e878040..fa837c3 100644
--- a/cmk/ec/settings.py
+++ b/cmk/ec/settings.py
@@ -68,7 +68,7 @@ Paths = NamedTuple(
('mongodb_config_file', AnnotatedPath)])
-def default_paths(omd_root, default_config_dir):
+def _default_paths(omd_root, default_config_dir):
# type: (Path, Path) -> Paths
"""Returns all default filesystem paths related to the event
console"""
run_dir = omd_root / 'tmp/run/mkeventd'
@@ -112,7 +112,7 @@ PortNumbers = NamedTuple(
('snmptrap_udp', PortNumber)])
-def default_port_numbers():
+def _default_port_numbers():
# type: () -> PortNumbers
"""Returns all port numbers related to the event
console"""
return PortNumbers(syslog_udp=PortNumber(514),
@@ -227,8 +227,8 @@ Settings = NamedTuple(
def settings(version, omd_root, default_config_dir, argv):
# type: (str, Path, Path, List[str]) -> Settings
"""Returns all event console settings"""
- paths = default_paths(omd_root, default_config_dir)
- port_numbers = default_port_numbers()
+ paths = _default_paths(omd_root, default_config_dir)
+ port_numbers = _default_port_numbers()
parser = ECArgumentParser(Path(argv[0]).name, version, paths, port_numbers)
args = parser.parse_args(argv[1:])
options = Options(
diff --git a/web/htdocs/mkeventd.py b/web/htdocs/mkeventd.py
index 5301fe6..4cec8d2 100644
--- a/web/htdocs/mkeventd.py
+++ b/web/htdocs/mkeventd.py
@@ -155,9 +155,11 @@ def eventd_configuration():
"debug_rules": False,
}
- ec_paths = cmk.ec.settings.default_paths(Path(cmk.paths.omd_root),
- Path(cmk.paths.default_config_dir))
- for path in [ec_paths.main_config_file.value] +
sorted(ec_paths.config_dir.value.glob('**/*.mk')):
+ settings = cmk.ec.settings.settings('',
+ Path(cmk.paths.omd_root),
+ Path(cmk.paths.default_config_dir),
+ [''])
+ for path in [settings.paths.main_config_file.value] +
sorted(settings.paths.config_dir.value.glob('**/*.mk')):
cmk.store.load_mk_file(str(path), config)
cached_config = (html, config)