From 2d338ce6f4457b43943bee7cfc732be58addc653 Mon Sep 17 00:00:00 2001 From: seven beep Date: Sun, 1 Nov 2026 12:52:54 +0100 Subject: [PATCH] plugins: set MK_CONFDIR default Trying to use mk_podman.py, my configuration was not read from /etc/check_mk/podman.cfg. Some plugins already set it explicitly, some don't. This commit try to add consistency for the variable default, at least in python scripts. --- agents/plugins/mk_docker.py | 2 +- agents/plugins/mk_logwatch.py | 2 +- agents/plugins/mk_podman.py | 2 +- cmk/plugins/files/agents/mk_filestats.py | 2 +- cmk/plugins/mongodb/agents/mk_mongodb.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agents/plugins/mk_docker.py b/agents/plugins/mk_docker.py index 92d86c20cea..75fd75c681a 100755 --- a/agents/plugins/mk_docker.py +++ b/agents/plugins/mk_docker.py @@ -72,7 +72,7 @@ def override(func): VERSION = "0.1" -DEFAULT_CFG_FILE = os.path.join(os.getenv("MK_CONFDIR", ""), "docker.cfg") +DEFAULT_CFG_FILE = os.path.join(os.getenv("MK_CONFDIR", "/etc/check_mk"), "docker.cfg") DEFAULT_CFG_SECTION = { "base_url": "unix://var/run/docker.sock", diff --git a/agents/plugins/mk_logwatch.py b/agents/plugins/mk_logwatch.py index 8123c1649f5..018d0265c25 100755 --- a/agents/plugins/mk_logwatch.py +++ b/agents/plugins/mk_logwatch.py @@ -59,7 +59,7 @@ MK_VARDIR = os.getenv("LOGWATCH_DIR") or os.getenv("MK_VARDIR") or os.getenv("MK_STATEDIR") or "." -MK_CONFDIR = os.getenv("LOGWATCH_DIR") or os.getenv("MK_CONFDIR") or "." +MK_CONFDIR = os.getenv("LOGWATCH_DIR") or os.getenv("MK_CONFDIR") or "/etc/check_mk" REMOTE = ( os.getenv("REMOTE") diff --git a/agents/plugins/mk_podman.py b/agents/plugins/mk_podman.py index c419f3af9b0..4ea4627ef38 100755 --- a/agents/plugins/mk_podman.py +++ b/agents/plugins/mk_podman.py @@ -62,7 +62,7 @@ def parse_arguments(argv: Sequence[str] | None = None) -> argparse.Namespace: return args -DEFAULT_CFG_FILE = Path(os.getenv("MK_CONFDIR", "")) / "mk_podman.cfg" +DEFAULT_CFG_FILE = Path(os.getenv("MK_CONFDIR", "/etc/check_mk")) / "mk_podman.cfg" DEFAULT_CFG_SECTION = { "connection_method": "api", diff --git a/cmk/plugins/files/agents/mk_filestats.py b/cmk/plugins/files/agents/mk_filestats.py index 1664b422f5a..1a9521a891f 100755 --- a/cmk/plugins/files/agents/mk_filestats.py +++ b/cmk/plugins/files/agents/mk_filestats.py @@ -133,7 +133,7 @@ def ensure_text(s): return s -DEFAULT_CFG_FILE = os.path.join(os.getenv("MK_CONFDIR", ""), "filestats.cfg") +DEFAULT_CFG_FILE = os.path.join(os.getenv("MK_CONFDIR", "/etc/check_mk"), "filestats.cfg") DEFAULT_CFG_SECTION = {"output": "file_stats", "subgroups_delimiter": "@"} diff --git a/cmk/plugins/mongodb/agents/mk_mongodb.py b/cmk/plugins/mongodb/agents/mk_mongodb.py index 43152fdb5e2..e47835a4e81 100755 --- a/cmk/plugins/mongodb/agents/mk_mongodb.py +++ b/cmk/plugins/mongodb/agents/mk_mongodb.py @@ -795,7 +795,7 @@ def section_logwatch(client): update_statefile(state_file, startup_warnings) -DEFAULT_CFG_FILE = os.path.join(os.getenv("MK_CONFDIR", ""), "mk_mongodb.cfg") +DEFAULT_CFG_FILE = os.path.join(os.getenv("MK_CONFDIR", "/etc/check_mk"), "mk_mongodb.cfg") LOGGER = logging.getLogger(__name__)