maia: ignore metrics from limes-global (#7546)

sapcc · Dec 16, 2024 · ee3509c · ee3509c
1 parent 83f41d0
commit ee3509c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/openstack/maia/Chart.yaml b/openstack/maia/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Expose Prometheus as multi-tenant OpenStack service
 name: maia
-version: 1.6.8
+version: 1.6.9
 dependencies:
   - name: prometheus-server-pre7
     alias: prometheus_server

diff --git a/openstack/maia/templates/etc/_maia_scrape_config.yaml.tpl b/openstack/maia/templates/etc/_maia_scrape_config.yaml.tpl
@@ -97,8 +97,8 @@
       # import any tenant-specific metric, except for those which already have been imported
       - '{__name__=~"^castellum_aggregated_.+",project_id!=""}'
       - '{__name__=~"^openstack_.+",project_id!=""}'
-      - '{__name__=~"^limes_(?:project|domain)_(?:quota|usage|committed_per_az|usage_per_az)$"}'
-      - '{__name__=~"^limes_swift_.+",project_id!=""}'
+      - '{__name__=~"^limes_(?:project|domain)_(?:quota|usage|committed_per_az|usage_per_az)$",namespace="limes"}' # the namespace match filters limes-global
+      - '{__name__=~"^limes_swift_.+",project_id!="",namespace="limes"}'
       - '{__name__=~"^keppel_.+",project_id!=""}'
 
 - job_name: 'prometheus-infra-collector'
@@ -266,4 +266,4 @@
   metric_relabel_configs:
     - regex: "cluster|cluster_type|instance|job|organization|prometheus|prometheus_replica"
       action: labeldrop
-{{ end }}
+{{ end }}