Drop the default scrape metrics

Author: reggeenr

metrics-collector/Dockerfile

@@ -8,7 +8,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app main.go
 
 # Stage 2: Download and extract Prometheus
 FROM busybox:1.36-glibc AS prometheus-downloader
-ARG PROMETHEUS_VERSION=3.9.1
+ARG PROMETHEUS_VERSION=3.10.0
 ARG TARGETARCH=amd64
 
 WORKDIR /tmp

metrics-collector/README.md

@@ -61,6 +61,7 @@ ibmcloud ce job create \
     --mode daemon \
     --cpu 0.25 \
     --memory 0.5G \
+    --service-account reader \
     --build-size xlarge \
     --env INTERVAL=30 \
     --env METRICS_ENABLED=true \

metrics-collector/prometheus.yml.template

@@ -14,11 +14,6 @@ scrape_configs:
         regex: (.+)
         replacement: '${CE_PROJECT_NAME}'
         target_label: ibm_codeengine_project_name
-    metric_relabel_configs:
-      # Droping scrape metrics (e.g. scrape_duration_seconds)
-      - source_labels: [__name__]
-        regex: 'scrape_duration_seconds|scrape_samples_scraped|scrape_series_added|scrape_samples_post_metric_relabeling'
-        action: drop
 
   - job_name: 'codeengine-metrics-user'
     fallback_scrape_protocol: PrometheusText0.0.4
@@ -99,4 +94,9 @@ scrape_configs:
 remote_write:
 - url: https://${METRICS_REMOTE_WRITE_FQDN}/prometheus/remote/write
   authorization:
-    credentials_file: "/etc/secrets/monitoring-apikey"
+    credentials_file: "/etc/secrets/monitoring-apikey"
+  write_relabel_configs:
+    # Dropping scrape metrics (e.g. scrape_duration_seconds)
+    - source_labels: [__name__]
+      regex: 'scrape_duration_seconds|scrape_samples_scraped|scrape_series_added|scrape_samples_post_metric_relabeling'
+      action: drop

metrics-collector/setup/ibm-cloud-monitoring/code-engine-component-resource-overview.json

@@ -22,7 +22,7 @@
       "links": null,
       "advancedQueries": [
         {
-          "query": "(sum by (ibm_codeengine_component_name) (ibm_codeengine_instance_cpu_usage_millicores{$__scope}) / sum by (ibm_codeengine_component_name) (ibm_codeengine_instance_cpu_limit_millicores)) * 100",
+          "query": "(sum by (ibm_codeengine_component_name) (ibm_codeengine_instance_cpu_usage_millicores{$__scope}) / sum by (ibm_codeengine_component_name) (ibm_codeengine_instance_cpu_limit_millicores{$__scope})) * 100",
           "enabled": true,
           "displayInfo": {
             "displayName": "CPU %",