easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address review issues

Browse Source 
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
This commit is contained in:
Kemal Akkoyun
2020-11-20 16:08:40 +01:00
parent 5a610adc8c
commit 31185dc8aa
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
View File

@@ -1,3 +1,5 @@
local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet';
{ {
_config+:: { _config+:: {
namespace: 'default', namespace: 'default',
@@ -291,7 +293,7 @@
honorLabels: true, honorLabels: true,
tlsConfig: { insecureSkipVerify: true }, tlsConfig: { insecureSkipVerify: true },
bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token', bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
metricRelabelings: (import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet'), metricRelabelings: relabelings,
relabelings: [{ relabelings: [{
sourceLabels: ['__metrics_path__'], sourceLabels: ['__metrics_path__'],
targetLabel: 'metrics_path', targetLabel: 'metrics_path',
@@ -363,7 +365,7 @@
tlsConfig: { tlsConfig: {
insecureSkipVerify: true, insecureSkipVerify: true,
}, },
metricRelabelings: (import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet') + [ metricRelabelings: relabelings + [
{ {
sourceLabels: ['__name__'], sourceLabels: ['__name__'],
regex: 'etcd_(debugging|disk|request|server).*', regex: 'etcd_(debugging|disk|request|server).*',
@@ -408,7 +410,7 @@
serverName: 'kubernetes', serverName: 'kubernetes',
}, },
bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token', bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
metricRelabelings: (import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet') + [ metricRelabelings: relabelings + [
{ {
sourceLabels: ['__name__'], sourceLabels: ['__name__'],
regex: 'etcd_(debugging|disk|server).*', regex: 'etcd_(debugging|disk|server).*',