From efba27b06c6b06c2a36011175507440e7cf6cf0f Mon Sep 17 00:00:00 2001 From: Chris Sibbitt Date: Thu, 22 Jun 2023 16:10:27 -0400 Subject: [PATCH] More fixes to observability_strategy: none --- roles/servicetelemetry/tasks/base_smartgateway.yml | 5 ++++- roles/servicetelemetry/tasks/main.yml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/servicetelemetry/tasks/base_smartgateway.yml b/roles/servicetelemetry/tasks/base_smartgateway.yml index 95c46c6d8..4d0cfdafd 100644 --- 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 index 89a006a30..11dfc1629 100644 --- 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 }}"