More fixes to observability_strategy: none

infrawatch · Jun 22, 2023 · efba27b · efba27b
1 parent 65ca6b4
commit efba27b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/roles/servicetelemetry/tasks/base_smartgateway.yml b/roles/servicetelemetry/tasks/base_smartgateway.yml
@@ -8,4 +8,7 @@
 
 - name: Deploy SG-specific ServiceMonitor for metrics SGs
   include_tasks: component_servicemonitor.yml
-  when: data_type == 'metrics'
+  when:
+    - data_type == 'metrics'
+    - has_monitoring_api | bool
+    - observability_strategy != 'none'
diff --git a/roles/servicetelemetry/tasks/main.yml b/roles/servicetelemetry/tasks/main.yml
@@ -40,7 +40,7 @@
     prometheus_operator_label: 'app.kubernetes.io/managed-by: observability-operator'
   when: observability_strategy in ['use_redhat', 'use_hybrid']
 
-- name: Check if we have monitoring.coreos.com API
+- name: Check if we have the requested monitoring API
   set_fact:
     has_monitoring_api: "{{ True if (prometheus_operator_api_string | dirname) in api_groups else False }}"