From 6d31332dbbf889add921db436448fe69a956eaf7 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 27 Mar 2026 18:16:07 +0100 Subject: [PATCH] MT#59936 Adapt for prometheus cfg-schema keys reorganization Several keys have been moved and renamed, adapt their use. Change-Id: I4b5e85b33b7e6fb5458c3890dc241d0b34aa2647 --- templates/410_process-ngcp.yaml.tt2 | 4 ++-- templates/500_init-daemons-dabian.yaml.tt2 | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/410_process-ngcp.yaml.tt2 b/templates/410_process-ngcp.yaml.tt2 index ebc6f0a..3eab867 100644 --- a/templates/410_process-ngcp.yaml.tt2 +++ b/templates/410_process-ngcp.yaml.tt2 @@ -54,7 +54,7 @@ process: running: {{if and [% is_proxy ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}} prometheus: - running: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'prometheus' ? 'true' : 'false' %] + running: [% monitoring.backend == 'prometheus' && prometheus.flavor == 'prometheus' ? 'true' : 'false' %] # We have to use a truncated process name because that's the COMM limit # on Linux (15 characters). Real name: prometheus-mysqld-exporter. @@ -120,4 +120,4 @@ process: # We have to use a truncated process name because that's the COMM limit # on Linux (15 characters). Real name: victoria-metrics. victoria-metric: - running: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'victoria-metrics' ? 'true' : 'false' %] + running: [% monitoring.backend == 'prometheus' && prometheus.flavor == 'victoria-metrics' ? 'true' : 'false' %] diff --git a/templates/500_init-daemons-dabian.yaml.tt2 b/templates/500_init-daemons-dabian.yaml.tt2 index 8a6ec2a..436749b 100644 --- a/templates/500_init-daemons-dabian.yaml.tt2 +++ b/templates/500_init-daemons-dabian.yaml.tt2 @@ -60,8 +60,8 @@ service: running: true prometheus.service: - enabled: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'prometheus' ? 'true' : 'false' %] - running: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'prometheus' ? 'true' : 'false' %] + enabled: [% monitoring.backend == 'prometheus' && prometheus.flavor == 'prometheus' ? 'true' : 'false' %] + running: [% monitoring.backend == 'prometheus' && prometheus.flavor == 'prometheus' ? 'true' : 'false' %] prometheus-mysqld-exporter.service: enabled: [% monitoring.backend == 'prometheus' ? 'true' : 'false' %] @@ -92,5 +92,5 @@ service: running: false victoria-metrics.service: - enabled: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'victoria-metrics' ? 'true' : 'false' %] - running: [% monitoring.backend == 'prometheus' && monitoring.prometheus_server == 'victoria-metrics' ? 'true' : 'false' %] + enabled: [% monitoring.backend == 'prometheus' && prometheus.flavor == 'victoria-metrics' ? 'true' : 'false' %] + running: [% monitoring.backend == 'prometheus' && prometheus.flavor == 'victoria-metrics' ? 'true' : 'false' %]