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

Merge pull request #8332 from brancz/fix-grafana-config

Browse source 
mixin: Scope grafana config
This commit is contained in:
Frederic Branczyk 2020-12-30 19:47:31 +01:00 committed by GitHub
parent 32d8dee872 62bc755733
commit 83c5fa1ea5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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\..*' // Example: @'http://test-alertmanager\..*'
nonNotifyingAlertmanagerRegEx: @'', nonNotifyingAlertmanagerRegEx: @'',
grafana: { grafanaPrometheus: {
prefix: 'Prometheus / ', prefix: 'Prometheus / ',
tags: ['prometheus-mixin'], tags: ['prometheus-mixin'],
// The default refresh time for all dashboards, default to 60s // 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+:: { grafanaDashboards+:: {
'prometheus.json': 'prometheus.json':
g.dashboard( g.dashboard(
'%(prefix)sOverview' % $._config.grafana '%(prefix)sOverview' % $._config.grafanaPrometheus
) )
.addMultiTemplate('job', 'prometheus_build_info', 'job') .addMultiTemplate('job', 'prometheus_build_info', 'job')
.addMultiTemplate('instance', 'prometheus_build_info', 'instance') .addMultiTemplate('instance', 'prometheus_build_info', 'instance')
@ -99,8 +99,8 @@ local template = grafana.template;
g.stack, g.stack,
) )
) + { ) + {
tags: $._config.grafana.tags, tags: $._config.grafanaPrometheus.tags,
refresh: $._config.grafana.refresh, refresh: $._config.grafanaPrometheus.refresh,
}, },
// Remote write specific dashboard. // Remote write specific dashboard.
'prometheus-remote-write.json': 'prometheus-remote-write.json':
@ -293,7 +293,7 @@ local template = grafana.template;
)); ));
dashboard.new( dashboard.new(
title='%(prefix)sRemote Write' % $._config.grafana, title='%(prefix)sRemote Write' % $._config.grafanaPrometheus,
editable=true editable=true
) )
.addTemplate( .addTemplate(
@ -380,8 +380,8 @@ local template = grafana.template;
.addPanel(retriedSamples) .addPanel(retriedSamples)
.addPanel(enqueueRetries) .addPanel(enqueueRetries)
) + { ) + {
tags: $._config.grafana.tags, tags: $._config.grafanaPrometheus.tags,
refresh: $._config.grafana.refresh, refresh: $._config.grafanaPrometheus.refresh,
}, },
}, },
} }