Use scrapeconfig instead of servicemonitor

README.md

@@ -40,6 +40,7 @@ loaded for you.
 * smartgatewayCollectdEventsManifest
 * smartgatewayCeilometerEventsManifest
 * servicemonitorManifest
+* scrapeconfigManifest
 
 ## Development
 

deploy/olm-catalog/service-telemetry-operator/manifests/service-telemetry-operator.clusterserviceversion.yaml

@@ -203,6 +203,15 @@ spec:
       - kind: ServiceMonitors
         name: servicemonitors.monitoring.coreos.com
         version: v1
+      - kind: ScrapeConfigs
+        name: scrapeconfigs.monitoring.coreos.com
+        version: v1alpha1
+      - kind: ServiceMonitors
+        name: servicemonitors.monitoring.rhobs
+        version: v1
+      - kind: ScrapeConfigs
+        name: scrapeconfigs.monitoring.rhobs
+        version: v1alpha1
       version: v1beta1
   description: Service Telemetry Operator for monitoring clouds
   displayName: Service Telemetry Operator
@@ -378,17 +387,21 @@ spec:
         - apiGroups:
           - monitoring.coreos.com
           resources:
+          - scrapeconfigs
           - servicemonitors
           verbs:
           - get
           - create
+          - delete
         - apiGroups:
           - monitoring.rhobs
           resources:
+          - scrapeconfigs
           - servicemonitors
           verbs:
           - get
           - create
+          - delete
         - apiGroups:
           - apps
           resourceNames:

deploy/role.yaml

@@ -129,17 +129,21 @@ rules:
 - apiGroups:
   - monitoring.coreos.com
   resources:
+  - scrapeconfigs
   - servicemonitors
   verbs:
   - get
   - create
+  - delete
 - apiGroups:
   - monitoring.rhobs
   resources:
+  - scrapeconfigs
   - servicemonitors
   verbs:
   - get
   - create
+  - delete
 - apiGroups:
   - apps
   resourceNames:

roles/servicetelemetry/tasks/base_smartgateway.yml

@@ -6,8 +6,8 @@
   k8s:
     definition: "{{ lookup('template', manifest) | from_yaml }}"
 
-- name: Deploy SG-specific ServiceMonitor for metrics SGs
-  include_tasks: component_servicemonitor.yml
+- name: Deploy SG-specific ScrapeConfig for metrics SGs
+  include_tasks: component_scrapeconfig.yml
   when:
     - data_type == 'metrics'
     - has_monitoring_api | bool

roles/servicetelemetry/tasks/component_scrapeconfig.yml

@@ -0,0 +1,87 @@
+- name: Look up prometheus-stf SA to get auth secret name
+  k8s_info:
+    api_version: v1
+    kind: ServiceAccount
+    namespace: '{{ ansible_operator_meta.namespace }}'
+    name: prometheus-stf
+  register: service_account
+
+- name: Look up auth secret to get token secret name
+  k8s_info:
+    api_version: v1
+    kind: Secret
+    namespace: '{{ ansible_operator_meta.namespace }}'
+    name: '{{ service_account.resources[0].secrets[0].name }}'
+  register: auth_secret
+
+- name: Create SG-specific Service Monitor manifest
+  set_fact:
+    sg_specific_scrapeconfig_manifest: |
+      apiVersion: {{ prometheus_operator_api_string | replace("/v1","/v1alpha1") }}
+      kind: ScrapeConfig
+      metadata:
+        labels:
+          app: smart-gateway
+        name: '{{ this_smartgateway }}'
+        namespace: '{{ ansible_operator_meta.namespace }}'
+      spec:
+        authorization:
+          type: bearer
+          credentials:
+            name: '{{ auth_secret.resources[0].metadata.annotations['openshift.io/token-secret.name'] }}'
+            key: token
+        metricRelabelings:
+          - action: labeldrop
+            regex: pod
+            sourcelabels: []
+          - action: labeldrop
+            regex: namespace
+            sourcelabels: []
+          - action: labeldrop
+            regex: instance
+            sourcelabels: []
+          - action: labeldrop
+            regex: job
+            sourcelabels: []
+          - action: labeldrop
+            regex: publisher
+            sourcelabels: []
+        scheme: HTTPS
+        scrapeInterval: {{ servicetelemetry_vars.backends.metrics.prometheus.scrape_interval }}
+        staticConfigs:
+        - targets:
+          - '{{ this_smartgateway }}.{{ ansible_operator_meta.namespace }}.svc:8083'
+        tlsConfig:
+          ca:
+            configMap:
+              name: serving-certs-ca-bundle
+              key: service-ca.crt
+          serverName: '{{ this_smartgateway }}.{{ ansible_operator_meta.namespace }}.svc'
+
+- name: Create ScrapeConfig to scrape Smart Gateway
+  k8s:
+    state: '{{ "present" if servicetelemetry_vars.backends.metrics.prometheus.enabled else "absent" }}'
+    definition:
+      '{{ sg_specific_scrapeconfig_manifest }}'
+
+- name: Create additional ScrapeConfig if provided
+  k8s:
+    state: '{{ "present" if servicetelemetry_vars.backends.metrics.prometheus.enabled else "absent" }}'
+    definition:
+      '{{ scrapeconfig_manifest }}'
+  when: scrapeconfig_manifest is defined
+
+- name: Create additional ServiceMonitor if provided (legacy)
+  k8s:
+    state: '{{ "present" if servicetelemetry_vars.backends.metrics.prometheus.enabled else "absent" }}'
+    definition:
+      '{{ servicemonitor_manifest }}'
+  when: servicemonitor_manifest is defined
+
+- name: Remove (legacy) default ServiceMonitors
+  k8s:
+    state: absent
+    api_version: '{{ prometheus_operator_api_string }}'
+    kind: ServiceMonitor
+    namespace: '{{ ansible_operator_meta.namespace }}'
+    name: '{{ this_smartgateway }}'

roles/servicetelemetry/templates/manifest_alertmanager.j2

@@ -12,7 +12,7 @@ spec:
 {% endif %}
   replicas: {{ servicetelemetry_vars.alerting.alertmanager.deployment_size }}
   serviceAccountName: alertmanager-stf
-  serviceMonitorSelector:
+  scrapeConfigSelector:
     matchLabels:
       app: smart-gateway
   listenLocal: true

roles/servicetelemetry/templates/manifest_prometheus.j2

@@ -17,7 +17,7 @@ spec:
   ruleSelector: {}
   securityContext: {}
   serviceAccountName: prometheus-stf
-  serviceMonitorSelector:
+  scrapeConfigSelector:
     matchLabels:
       app: smart-gateway
   listenLocal: true

tests/smoketest/smoketest.sh

@@ -129,8 +129,8 @@ echo "*** [INFO] Showing oc get all..."
 oc get all
 echo
 
-echo "*** [INFO] Showing servicemonitors..."
-oc get servicemonitors.monitoring.rhobs -o yaml
+echo "*** [INFO] Showing scrapeconfigs..."
+oc get scrapeconfigs.monitoring.rhobs -o yaml
 echo
 
 if [ "$SMOKETEST_VERBOSE" = "true" ]; then