From c5d265a14eb537773601558929332b8e32f05aaf Mon Sep 17 00:00:00 2001
From: Arunprasad Rajkumar <arajkuma@redhat.com>
Date: Mon, 27 Sep 2021 11:58:50 +0530
Subject: [PATCH] thanos: bump to latest and add
 `thanosPrometheusCommonDimensions`

This commit pulls latest changes from thanos mixins and sets `thanosPrometheusCommonDimensions`
to `namespace, pod` for k8s use case.

Refer https://github.com/thanos-io/thanos/pull/4508 for more details.

Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>
---
 jsonnet/kube-prometheus/components/prometheus.libsonnet | 1 +
 jsonnetfile.lock.json                                   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet
index 27367963..6ee18196 100644
--- a/jsonnet/kube-prometheus/components/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet
@@ -59,6 +59,7 @@ function(params) {
       targetGroups: {},
       sidecar: {
         selector: p._config.mixin._config.thanosSelector,
+        thanosPrometheusCommonDimensions: 'namespace, pod',
         dimensions: std.join(', ', ['job', 'instance']),
       },
     },
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index f030d06d..2ab151e3 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -141,8 +141,8 @@
           "subdir": "mixin"
         }
       },
-      "version": "b894fd6537c8b445aa9d907867e492bb26cebcd5",
-      "sum": "X+060DnePPeN/87fgj0SrfxVitywTk8hZA9V4nHxl1g=",
+      "version": "b4b8434ca5a4a873762d73bf22fa4e0e1f43f6f1",
+      "sum": "Og+wEHfgzXBvBLAeeQvGNoiCw3FY4LQHlJdpsG/owj8=",
       "name": "thanos-mixin"
     },
     {
-- 
GitLab