From 823ac4edcf55d2c2b90f87102269b3f89adb57de Mon Sep 17 00:00:00 2001
From: Nick <nickbadger1980@googlemail.com>
Date: Mon, 6 Aug 2018 06:50:01 +0100
Subject: [PATCH] Ensure honorLabels is set to true for prometheus-operator
 ServiceMonitor (#1722)

---
 helm/prometheus-operator/templates/servicemonitor-configmap.yaml | 1 +
 jsonnet/prometheus-operator/prometheus-operator.libsonnet        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/helm/prometheus-operator/templates/servicemonitor-configmap.yaml b/helm/prometheus-operator/templates/servicemonitor-configmap.yaml
index 5eeb83db2..beacb7ae6 100644
--- a/helm/prometheus-operator/templates/servicemonitor-configmap.yaml
+++ b/helm/prometheus-operator/templates/servicemonitor-configmap.yaml
@@ -25,3 +25,4 @@ data:
         endpoints:
         - port: http
           interval: 30s
+          honorLabels: true
diff --git a/jsonnet/prometheus-operator/prometheus-operator.libsonnet b/jsonnet/prometheus-operator/prometheus-operator.libsonnet
index 7e89589d3..2039ac451 100644
--- a/jsonnet/prometheus-operator/prometheus-operator.libsonnet
+++ b/jsonnet/prometheus-operator/prometheus-operator.libsonnet
@@ -170,6 +170,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
           endpoints: [
             {
               port: 'http',
+              honorLabels: true,
             },
           ],
           selector: {