Merge pull request #135 from thanos-io/pod-reference-instance

*: Relabel pod reference into instance label

Author: brancz

examples/all/manifests/thanos-compact-serviceMonitor.yaml

@@ -11,6 +11,12 @@ metadata:
 spec:
   endpoints:
   - port: http
+    relabelings:
+    - separator: /
+      sourceLabels:
+      - namespace
+      - pod
+      targetLabel: instance
   selector:
     matchLabels:
       app.kubernetes.io/component: database-compactor

examples/all/manifests/thanos-query-serviceMonitor.yaml

@@ -11,6 +11,12 @@ metadata:
 spec:
   endpoints:
   - port: http
+    relabelings:
+    - separator: /
+      sourceLabels:
+      - namespace
+      - pod
+      targetLabel: instance
   selector:
     matchLabels:
       app.kubernetes.io/component: query-layer

examples/all/manifests/thanos-receive-serviceMonitor.yaml

@@ -11,6 +11,12 @@ metadata:
 spec:
   endpoints:
   - port: http
+    relabelings:
+    - separator: /
+      sourceLabels:
+      - namespace
+      - pod
+      targetLabel: instance
   selector:
     matchLabels:
       app.kubernetes.io/component: database-write-hashring

examples/all/manifests/thanos-rule-serviceMonitor.yaml

@@ -11,6 +11,12 @@ metadata:
 spec:
   endpoints:
   - port: http
+    relabelings:
+    - separator: /
+      sourceLabels:
+      - namespace
+      - pod
+      targetLabel: instance
   selector:
     matchLabels:
       app.kubernetes.io/component: rule-evaluation-engine

examples/all/manifests/thanos-store-serviceMonitor.yaml

@@ -11,6 +11,12 @@ metadata:
 spec:
   endpoints:
   - port: http
+    relabelings:
+    - separator: /
+      sourceLabels:
+      - namespace
+      - pod
+      targetLabel: instance
   selector:
     matchLabels:
       app.kubernetes.io/component: object-store-gateway

jsonnet/kube-thanos/kube-thanos-compact.libsonnet

@@ -111,7 +111,14 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
           matchLabels: tc.config.podLabelSelector,
         },
         endpoints: [
-          { port: 'http' },
+          {
+            port: 'http',
+            relabelings: [{
+              sourceLabels: ['namespace', 'pod'],
+              separator: '/',
+              targetLabel: 'instance',
+            }],
+          },
         ],
       },
     },

jsonnet/kube-thanos/kube-thanos-query.libsonnet

@@ -111,7 +111,14 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
           matchLabels: tq.config.podLabelSelector,
         },
         endpoints: [
-          { port: 'http' },
+          {
+            port: 'http',
+            relabelings: [{
+              sourceLabels: ['namespace', 'pod'],
+              separator: '/',
+              targetLabel: 'instance',
+            }],
+          },
         ],
       },
     },

jsonnet/kube-thanos/kube-thanos-receive.libsonnet

@@ -160,7 +160,14 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
           matchLabels: tr.config.podLabelSelector,
         },
         endpoints: [
-          { port: 'http' },
+          {
+            port: 'http',
+            relabelings: [{
+              sourceLabels: ['namespace', 'pod'],
+              separator: '/',
+              targetLabel: 'instance',
+            }],
+          },
         ],
       },
     },

jsonnet/kube-thanos/kube-thanos-rule.libsonnet

@@ -125,7 +125,14 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
           matchLabels: tr.config.podLabelSelector,
         },
         endpoints: [
-          { port: 'http' },
+          {
+            port: 'http',
+            relabelings: [{
+              sourceLabels: ['namespace', 'pod'],
+              separator: '/',
+              targetLabel: 'instance',
+            }],
+          },
         ],
       },
     },

jsonnet/kube-thanos/kube-thanos-store.libsonnet

@@ -275,7 +275,14 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
           matchLabels: ts.config.podLabelSelector,
         },
         endpoints: [
-          { port: 'http' },
+          {
+            port: 'http',
+            relabelings: [{
+              sourceLabels: ['namespace', 'pod'],
+              separator: '/',
+              targetLabel: 'instance',
+            }],
+          },
         ],
       },
     },