From 31185dc8aaa70cc73395c446fad2231404a872b4 Mon Sep 17 00:00:00 2001
From: Kemal Akkoyun <kakkoyun@gmail.com>
Date: Fri, 20 Nov 2020 16:08:40 +0100
Subject: [PATCH] Address review issues
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
---
jsonnet/kube-prometheus/prometheus/prometheus.libsonnet | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
index 52020656..1545b697 100644
--- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
@@ -1,3 +1,5 @@
+local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet';
+
{
_config+:: {
namespace: 'default',
@@ -291,7 +293,7 @@
honorLabels: true,
tlsConfig: { insecureSkipVerify: true },
bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
- metricRelabelings: (import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet'),
+ metricRelabelings: relabelings,
relabelings: [{
sourceLabels: ['__metrics_path__'],
targetLabel: 'metrics_path',
@@ -363,7 +365,7 @@
tlsConfig: {
insecureSkipVerify: true,
},
- metricRelabelings: (import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet') + [
+ metricRelabelings: relabelings + [
{
sourceLabels: ['__name__'],
regex: 'etcd_(debugging|disk|request|server).*',
@@ -408,7 +410,7 @@
serverName: 'kubernetes',
},
bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
- metricRelabelings: (import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet') + [
+ metricRelabelings: relabelings + [
{
sourceLabels: ['__name__'],
regex: 'etcd_(debugging|disk|server).*',
--
GitLab