mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 13:44:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

mixin: Scope grafana config

Browse source 
In its current form this configuration clashes in one of the most widely
used configurations (kube-prometheus). This patch scopes the
configuration to prevent this.

Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
This commit is contained in:
Frederic Branczyk 2020-12-30 17:47:04 +01:00
parent 32d8dee872
commit 62bc755733
No known key found for this signature in database
GPG key ID: 576DA6AF8CB9027F
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
documentation/prometheus-mixin/config.libsonnet
View file

@ -38,7 +38,7 @@
// Example: @'http://test-alertmanager\..*'
nonNotifyingAlertmanagerRegEx: @'',
grafana: {
grafanaPrometheus: {
prefix: 'Prometheus / ',
tags: ['prometheus-mixin'],
// The default refresh time for all dashboards, default to 60s

12
documentation/prometheus-mixin/dashboards.libsonnet
View file

@ -11,7 +11,7 @@ local template = grafana.template;
grafanaDashboards+:: {
'prometheus.json':
g.dashboard(
'%(prefix)sOverview' % $._config.grafana
'%(prefix)sOverview' % $._config.grafanaPrometheus
)
.addMultiTemplate('job', 'prometheus_build_info', 'job')
.addMultiTemplate('instance', 'prometheus_build_info', 'instance')
@ -99,8 +99,8 @@ local template = grafana.template;
g.stack,
)
) + {
tags: $._config.grafana.tags,
refresh: $._config.grafana.refresh,
tags: $._config.grafanaPrometheus.tags,
refresh: $._config.grafanaPrometheus.refresh,
},
// Remote write specific dashboard.
'prometheus-remote-write.json':
@ -293,7 +293,7 @@ local template = grafana.template;
));
dashboard.new(
title='%(prefix)sRemote Write' % $._config.grafana,
title='%(prefix)sRemote Write' % $._config.grafanaPrometheus,
editable=true
)
.addTemplate(
@ -380,8 +380,8 @@ local template = grafana.template;
.addPanel(retriedSamples)
.addPanel(enqueueRetries)
) + {
tags: $._config.grafana.tags,
refresh: $._config.grafana.refresh,
tags: $._config.grafanaPrometheus.tags,
refresh: $._config.grafanaPrometheus.refresh,
},
},
}