Commit f34aeeab authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

stack/monitor: cleanup deprecated (and confusing) config

parent 3d6db516
Pipeline #16775 failed with stage
in 0 seconds
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[monitor2-template] [monitor2-template]
filename = instance-monitor.cfg.jinja2.in filename = instance-monitor.cfg.jinja2.in
md5sum = be2953358a3af37c6e1e0846a18f44ec md5sum = fce342a392141f91c2e1a7b40efa9896
[monitor-httpd-conf] [monitor-httpd-conf]
_update_hash_filename_ = templates/monitor-httpd.conf.in _update_hash_filename_ = templates/monitor-httpd.conf.in
......
...@@ -97,7 +97,6 @@ parameter-file-path = ${monitor-instance-parameter:configuration-file-path} ...@@ -97,7 +97,6 @@ parameter-file-path = ${monitor-instance-parameter:configuration-file-path}
parameter-list = parameter-list =
raw monitor-user ${monitor-instance-parameter:username} raw monitor-user ${monitor-instance-parameter:username}
htpasswd monitor-password ${httpd-monitor-htpasswd:password-file} ${monitor-instance-parameter:username} ${httpd-monitor-htpasswd:htpasswd-path} 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} ${monitor-instance-parameter:instance-configuration}
# htpasswd entry: htpasswd key password-file username htpasswd-file # htpasswd entry: htpasswd key password-file username htpasswd-file
...@@ -396,7 +395,6 @@ config-monitor-url = ${monitor-instance-parameter:monitor-base-url} ...@@ -396,7 +395,6 @@ config-monitor-url = ${monitor-instance-parameter:monitor-base-url}
module = check_free_disk_space module = check_free_disk_space
name = check-free-disk-space.py name = check-free-disk-space.py
config-collectordb = ${monitor-instance-parameter:collector-db} config-collectordb = ${monitor-instance-parameter:collector-db}
config-threshold-file = ${directory:etc}/min-free-disk-size
[monitor-base] [monitor-base]
# create dependencies between required monitor parts # create dependencies between required monitor parts
......
  • mentioned in commit 6b6f024a

    Toggle commit list
  • This was causing test failures with caddy ( https://erp5js.nexedi.net/#/test_result_module/20210730-717281A3/8? )

    ======================================================================
    FAIL: test_file_list_plugin (test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate)
    ----------------------------------------------------------------------
    Traceback (most recent call last):
      File "/srv/slapgrid/slappart54/srv/testnode/dau/soft/2682db75ca7c8253fee14ca45d185cc6/parts/slapos-repository/software/caddy-frontend/test/test.py", line 373, in test_file_list_plugin
        self._test_file_list(['etc', 'plugin'], ['.pyc'])
      File "/srv/slapgrid/slappart54/srv/testnode/dau/soft/2682db75ca7c8253fee14ca45d185cc6/parts/slapos-repository/software/caddy-frontend/test/test.py", line 339, in _test_file_list
        self.assertTestData(runtime_data)
      File "/srv/slapgrid/slappart54/srv/testnode/dau/soft/2682db75ca7c8253fee14ca45d185cc6/parts/slapos-repository/software/caddy-frontend/test/test.py", line 317, in assertTestData
        msg=msg
    AssertionError: 'T-0/etc/plugin/__init__.py\nT-0/etc/plugin/aibcc-user-caucase-updater.py\nT-0/e [truncated]... != 'T-0/etc/plugin/__init__.py\nT-0/etc/plugin/aibcc-user-caucase-updater.py\nT-0/e [truncated]...
      T-0/etc/plugin/__init__.py
      T-0/etc/plugin/aibcc-user-caucase-updater.py
      T-0/etc/plugin/aikc-user-caucase-updater.py
      T-0/etc/plugin/buildout-T-0-status.py
      T-0/etc/plugin/caucased-backend-client.py
      T-0/etc/plugin/check-backend-haproxy-statistic-url-caddy-frontend-1.py
    - T-0/etc/plugin/check-free-disk-space.py
      T-0/etc/plugin/monitor-bootstrap-status.py
      T-0/etc/plugin/monitor-http-frontend.py
      T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
      T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
      T-0/etc/plugin/rejected-slave.py
      T-1/etc/plugin/__init__.py
      T-1/etc/plugin/buildout-T-1-status.py
      T-1/etc/plugin/caucased.py
    - T-1/etc/plugin/check-free-disk-space.py
      T-1/etc/plugin/expose-csr_id-ip-port-listening.py
      T-1/etc/plugin/kedifa-http-reply.py
      T-1/etc/plugin/monitor-bootstrap-status.py
      T-1/etc/plugin/monitor-http-frontend.py
      T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
      T-1/etc/plugin/promise-logrotate-setup.py
      T-2/etc/plugin/__init__.py
      T-2/etc/plugin/backend-client-caucase-updater.py
      T-2/etc/plugin/backend-haproxy-configuration.py
      T-2/etc/plugin/backend_haproxy_http.py
      T-2/etc/plugin/backend_haproxy_https.py
      T-2/etc/plugin/buildout-T-2-status.py
      T-2/etc/plugin/caddy_frontend_ipv4_http.py
      T-2/etc/plugin/caddy_frontend_ipv4_https.py
      T-2/etc/plugin/caddy_frontend_ipv6_http.py
      T-2/etc/plugin/caddy_frontend_ipv6_https.py
      T-2/etc/plugin/caucase-updater.py
    - T-2/etc/plugin/check-free-disk-space.py
      T-2/etc/plugin/expose-csr_id-ip-port-listening.py
      T-2/etc/plugin/frontend-caddy-configuration-promise.py
      T-2/etc/plugin/monitor-bootstrap-status.py
      T-2/etc/plugin/monitor-http-frontend.py
      T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
      T-2/etc/plugin/promise-logrotate-setup.py
      T-2/etc/plugin/re6st-connectivity.py
      T-2/etc/plugin/slave-introspection-configuration.py
      T-2/etc/plugin/slave_introspection_https.py
      T-2/etc/plugin/trafficserver-cache-availability.py
      T-2/etc/plugin/trafficserver-port-listening.py

    because this no longer installs promise-check-free-disk-space. For now, I'm reverting in !1029 (merged) so that we can get back to 0 failures and then discuss a fix.

  • mentioned in commit acbdbbb3

    Toggle commit list
  • mentioned in commit bb1e0b44

    Toggle commit list
  • mentioned in commit c24cb8b4

    Toggle commit list
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment