From 7fcca0cc469b89957fd3821c72c3bb2d167a23ba Mon Sep 17 00:00:00 2001
From: "Chandan Kumar (raukadah)" <chkumar@redhat.com>
Date: Thu, 30 Jan 2025 14:22:41 +0530
Subject: [PATCH] Enable prometheus and node_exporter from
 devstack-plugin-prometheus

https://opendev.org/openstack/devstack-plugin-prometheus is the new
devstack plugin providing functionality to install/configure
prometheus/node_exporter.

It will replace sg_core devstack plugin in future.

Depends-On: https://review.opendev.org/c/openstack/watcher/+/938893
Depends-On: https://review.opendev.org/c/openstack/devstack-plugin-prometheus/+/940426

Change-Id: Ia75e6597275b36c04cde653c16f7d45ed23bc261
Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
---
 .zuul.yaml                               | 33 ++++++++++++++++++++----
 playbooks/generate_prometheus_config.yml |  9 +++++++
 playbooks/templates/prometheus.yml.j2    | 13 ++++++++++
 3 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 playbooks/generate_prometheus_config.yml
 create mode 100644 playbooks/templates/prometheus.yml.j2

diff --git a/.zuul.yaml b/.zuul.yaml
index 84e99beb4..824105822 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -174,6 +174,8 @@
     description: |
       This job is for testing watcher and sg-core/prometheus installation
     abstract: true
+    pre-run:
+      - playbooks/generate_prometheus_config.yml
     irrelevant-files: *irrelevent_files
     timeout: 7800
     required-projects: &base_sg_required_projects
@@ -184,6 +186,7 @@
       - openstack/watcher
       - openstack/python-watcherclient
       - openstack/watcher-tempest-plugin
+      - openstack/devstack-plugin-prometheus
     vars:
       configure_swap_size: 8192
       devstack_plugins:
@@ -191,6 +194,7 @@
         aodh: https://opendev.org/openstack/aodh
         sg-core: https://github.com/openstack-k8s-operators/sg-core
         watcher: https://opendev.org/openstack/watcher
+        devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
       devstack_services:
         watcher-api: true
         watcher-decision-engine: true
@@ -202,15 +206,25 @@
         s-container: false
         s-object: false
         s-proxy: false
+        # Prometheus related service
+        prometheus: true
+        node_exporter: true
       devstack_localrc:
         CEILOMETER_BACKENDS: "sg-core"
         CEILOMETER_PIPELINE_INTERVAL: 15
         CEILOMETER_ALARM_THRESHOLD: 6000000000
-        NODE_EXPORTER_ENABLE: true
+        NODE_EXPORTER_ENABLE: false
+        PROMETHEUS_ENABLE: false
         PROMETHEUS_SERVICE_SCRAPE_TARGETS: "sg-core,node-exporter"
+        PROMETHEUS_CONFIG_FILE: "/home/zuul/prometheus.yml"
       devstack_local_conf:
         post-config:
           $WATCHER_CONF:
+            watcher_datasources:
+              datasources: prometheus
+            prometheus_client:
+              host: 127.0.0.1
+              port: 9090
             watcher_cluster_data_model_collectors.compute:
               period: 120
             watcher_cluster_data_model_collectors.baremetal:
@@ -234,29 +248,38 @@
             telemetry:
               disable_ssl_certificate_validation: True
               ceilometer_polling_interval: 15
+            # Note(Chandan Kumar): Setting datasource to empty till we
+            # add prometheus datasource support in watcher-tempest-plugin
+            optimize:
+              datasource: ""
       tempest_plugins:
         - watcher-tempest-plugin
       # TODO (rlandy): enable all scenario tests
       # when tests can be run with prometheus data source.
       # https://bugs.launchpad.net/watcher-tempest-plugin/+bug/2090853
       tempest_test_regex: "\
-        (^watcher_tempest_plugin.tests.api)|\
-        (^watcher_tempest_plugin.tests.client_functional)|\
-        (^watcher_tempest_plugin.tests.scenario.test_execute_dummy_optim)"
+        (^^watcher_tempest_plugin.tests.scenario.test_execute_vm_workload_consolidation)|\
+        (^watcher_tempest_plugin.tests.scenario.test_execute_workload_balancing)"
       tempest_concurrency: 1
       tox_envlist: all
+      zuul_copy_output:
+        /etc/prometheus/prometheus.yml: logs
     group-vars:
       subnode:
         devstack_plugins:
           ceilometer: https://opendev.org/openstack/ceilometer
           sg-core: https://github.com/openstack-k8s-operators/sg-core
+          devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
         devstack_services:
           ceilometer-acompute: true
           sg-core: false
+          prometheus: false
+          node_exporter: true
         devstack_localrc:
           CEILOMETER_BACKEND: "none"
           CEILOMETER_BACKENDS: "none"
-          NODE_EXPORTER_ENABLE: true
+          # sg_core related var
+          NODE_EXPORTER_ENABLE: false
           PROMETHEUS_ENABLE: false
         devstack_local_conf:
           post-config:
diff --git a/playbooks/generate_prometheus_config.yml b/playbooks/generate_prometheus_config.yml
new file mode 100644
index 000000000..aafd93108
--- /dev/null
+++ b/playbooks/generate_prometheus_config.yml
@@ -0,0 +1,9 @@
+---
+- hosts: all
+  tasks:
+    - name: Generate prometheus.yml config file
+      delegate_to: controller
+      template:
+        src: "templates/prometheus.yml.j2"
+        dest: "/home/zuul/prometheus.yml"
+        mode: "0644"
diff --git a/playbooks/templates/prometheus.yml.j2 b/playbooks/templates/prometheus.yml.j2
new file mode 100644
index 000000000..09f245e43
--- /dev/null
+++ b/playbooks/templates/prometheus.yml.j2
@@ -0,0 +1,13 @@
+global:
+  scrape_interval: 10s
+scrape_configs:
+  - job_name: "node"
+    static_configs:
+      - targets: ["localhost:3000"]
+{% if 'compute' in groups %}
+{% for host in groups['compute'] %}
+      - targets: ["{{ hostvars[host]['ansible_fqdn'] }}:9100"]
+        labels:
+          fqdn: "{{ hostvars[host]['ansible_fqdn'] }}"
+{% endfor %}
+{% endif %}