From 837cde059a3a2db1a30b2325c8259fc14682f11b Mon Sep 17 00:00:00 2001 From: Manuel Montecelo Date: Thu, 13 May 2021 16:45:50 +0200 Subject: [PATCH] TT#122035 Adapt to allow victoria-metrics running In templates.git, the template-conditions for ngcp-service.services.yml are: victoria-metrics: group: - ngcp-upgrade-ignore - monitoring systemd: victoria-metrics.service monit: victoria-metrics enable: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'victoria-metrics' ? 'yes' : 'no' %] so the service is enabled in all nodes, not only management, and thus system-tests complains: https://jenkins.mgm.sipwise.com/job/system-tester/399308/tapTestReport/ 194 - - Service: victoria-metrics.service: enabled: doesn't match, expect: [false] found: [true] 195 - - Service: victoria-metrics.service: running: doesn't match, expect: [false] found: [true] So setting the same conditions for these tests as for its enablement in the services config file. Change-Id: I1be7ca2fc21463685ba0119746ad5bbe9a0c14a0 --- templates/500_init-daemons-dabian.yaml.tt2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/500_init-daemons-dabian.yaml.tt2 b/templates/500_init-daemons-dabian.yaml.tt2 index 802e3bb..ca8264b 100644 --- a/templates/500_init-daemons-dabian.yaml.tt2 +++ b/templates/500_init-daemons-dabian.yaml.tt2 @@ -98,5 +98,5 @@ service: running: [% monitoring.backend == 'influxdb' ? 'true' : 'false' %] victoria-metrics.service: - enabled: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'victoria-metrics' && is_mgmt ? 'true' : 'false' %] - running: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'victoria-metrics' && is_mgmt ? 'true' : 'false' %] + enabled: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'victoria-metrics' %] + running: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'victoria-metrics' %]