From 6b47a74930507e71f30dfa810baa9c382b9dae17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= Date: Fri, 25 Oct 2019 15:37:00 +0200 Subject: [PATCH] stack/monitor: Drop not used parameter check-free-disk-space now simply accept parameters from the profile, and their defaults are sane enough. --- stack/monitor/buildout.hash.cfg | 2 +- stack/monitor/instance-monitor.cfg.jinja2.in | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/stack/monitor/buildout.hash.cfg b/stack/monitor/buildout.hash.cfg index 5915429b91..70078e4080 100644 --- a/stack/monitor/buildout.hash.cfg +++ b/stack/monitor/buildout.hash.cfg @@ -14,7 +14,7 @@ # not need these here). [monitor2-template] filename = instance-monitor.cfg.jinja2.in -md5sum = e1c7d1c21a942064e2f3f40463b10177 +md5sum = 6af448ca9d1574081edad9af924879e3 [monitor-httpd-conf] _update_hash_filename_ = templates/monitor-httpd.conf.in diff --git a/stack/monitor/instance-monitor.cfg.jinja2.in b/stack/monitor/instance-monitor.cfg.jinja2.in index b359e7f971..41201336c8 100644 --- a/stack/monitor/instance-monitor.cfg.jinja2.in +++ b/stack/monitor/instance-monitor.cfg.jinja2.in @@ -97,7 +97,6 @@ parameter-file-path = ${monitor-instance-parameter:configuration-file-path} parameter-list = raw monitor-user ${monitor-instance-parameter:username} htpasswd monitor-password ${httpd-monitor-htpasswd:password-file} ${monitor-instance-parameter:username} ${httpd-monitor-htpasswd:htpasswd-path} - file min-free-disk-MB ${promise-check-free-disk-space:config-threshold-file} ${monitor-instance-parameter:instance-configuration} # htpasswd entry: htpasswd key password-file username htpasswd-file @@ -378,7 +377,6 @@ config-monitor-url = ${monitor-instance-parameter:monitor-base-url} module = check_free_disk_space name = check-free-disk-space.py config-collectordb = ${monitor-instance-parameter:collector-db} -config-threshold-file = ${directory:etc}/min-free-disk-size [monitor-base] # create dependencies between required monitor parts -- 2.30.9