From 0435200fb118fc232a61ea0aa86f0c034ecb4960 Mon Sep 17 00:00:00 2001
From: morenod <dsanzmor@redhat.com>
Date: Thu, 17 Jul 2025 12:45:37 +0200
Subject: [PATCH] Disable real metrics on devstack injected data jobs

We need to disable real data metrics comming from host and
instances on injected data jobs as they are creating wrong results
when they are mixed with the injected data.

We already did this on watcher-operator disabling ceilometer agent and
node_exported on [1] so now we have to do it on devstack installations,
disabling meminfo on node_exporter for host metrics (cpu is already
disabled) and sg-core for instance metrics

[1] https://github.com/openstack-k8s-operators/watcher-operator/pull/196

Change-Id: I4130ca6dd7cb52d96842e04e7720431ebc76efff
Signed-off-by: morenod <dsanzmor@redhat.com>
---
 .zuul.yaml | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index b71946390..4504f0ba8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -47,6 +47,13 @@
           rabbit: false
           mysql: false
     vars:
+      devstack_localrc:
+        GNOCCHI_ARCHIVE_POLICY_TEMPEST: "ceilometer-low-rate"
+        CEILOMETER_PIPELINE_INTERVAL: 15
+      devstack_services:
+        ceilometer-acompute: false
+        ceilometer-acentral: true
+        ceilometer-anotification: true
       devstack_local_conf:
         post-config:
           $WATCHER_CONF:
@@ -66,6 +73,8 @@
               block_migration_for_live_migration: true
             placement:
               min_microversion: 1.29
+            telemetry:
+              ceilometer_polling_interval: 15
       devstack_plugins:
         ceilometer: https://opendev.org/openstack/ceilometer
 
@@ -99,7 +108,6 @@
       zuul_copy_output:
         /etc/hosts: logs
 
-
 - job:
     name: watcher-tempest-functional-ipv6-only
     parent: devstack-tempest-ipv6
@@ -157,6 +165,7 @@
         watcher: https://opendev.org/openstack/watcher
         devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
       devstack_services:
+        ceilometer-acompute: true
         watcher-api: true
         watcher-decision-engine: true
         watcher-applier: true
@@ -174,9 +183,6 @@
         CEILOMETER_BACKENDS: "sg-core"
         CEILOMETER_PIPELINE_INTERVAL: 15
         CEILOMETER_ALARM_THRESHOLD: 6000000000
-        # avoid collecting real host cpu metrics since tests
-        # will inject fake metrics when needed
-        NODE_EXPORTER_COLLECTOR_EXCLUDE: "cpu"
         PROMETHEUS_CONFIG_FILE: "/home/zuul/prometheus.yml"
       devstack_local_conf:
         post-config:
@@ -235,9 +241,6 @@
         devstack_localrc:
           CEILOMETER_BACKEND: "none"
           CEILOMETER_BACKENDS: "none"
-          # avoid collecting real host cpu metric since tests
-          # will inject fake metrics when needed
-          NODE_EXPORTER_COLLECTOR_EXCLUDE: "cpu"
         devstack_local_conf:
           post-config:
             $WATCHER_CONF:
@@ -251,11 +254,23 @@
 - job:
     name: watcher-prometheus-integration
     parent: watcher-sg-core-tempest-base
+    vars:
+      devstack_services:
+        ceilometer-acompute: false
+        node_exporter: false
+    group-vars:
+      subnode:
+        devstack_services:
+          ceilometer-acompute: false
+          node_exporter: false
 
 - job:
     name: watcher-prometheus-integration-realdata
     parent: watcher-sg-core-tempest-base
     vars:
+      devstack_services:
+        ceilometer-acompute: true
+        node_exporter: true
       devstack_localrc:
         NODE_EXPORTER_COLLECTOR_EXCLUDE: ""
       devstack_local_conf:
@@ -263,11 +278,15 @@
           $TEMPEST_CONFIG:
             optimize:
               datasource: ""
+              real_workload_period: 300
       # All tests inside watcher_tempest_plugin.tests.scenario with tag "real_load"
       tempest_test_regex: (^watcher_tempest_plugin.tests.scenario)(.*\[.*\breal_load\b.*\].*)
       tempest_exclude_regex: ""
     group-vars:
       subnode:
+        devstack_services:
+          ceilometer-acompute: true
+          node_exporter: true
         devstack_localrc:
           NODE_EXPORTER_COLLECTOR_EXCLUDE: ""