mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-11-06 02:51:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #907 from paulfantom/grafana-v2

Browse Source 
jsonnet/grafana: re-map datasources and config
This commit is contained in:
Paweł Krupa 2021-02-05 16:59:31 +01:00 committed by GitHub
commit 2ff04a63a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
jsonnet/kube-prometheus/components/grafana.libsonnet
View File

@ -26,45 +26,54 @@ local defaults = {
rawDashboards: {}, rawDashboards: {},
folderDashboards: {}, folderDashboards: {},
containers: [], containers: [],
datasources: [],
config: {},
}; };
function(params) { function(params) {
local g = self, local g = self,
config:: defaults + params, cfg:: defaults + params,
//local g.config = defaults + params,
// Safety check // Safety check
assert std.isObject(g.config.resources), assert std.isObject(g.cfg.resources),
local glib = (import 'github.com/brancz/kubernetes-grafana/grafana/grafana.libsonnet') + { local glib = (import 'github.com/brancz/kubernetes-grafana/grafana/grafana.libsonnet') + {
_config+:: { _config+:: {
namespace: g.config.namespace, namespace: g.cfg.namespace,
versions+:: { versions+:: {
grafana: g.config.version, grafana: g.cfg.version,
}, },
imageRepos+:: { imageRepos+:: {
grafana: g.config.imageRepos, grafana: g.cfg.imageRepos,
}, },
prometheus+:: { prometheus+:: {
name: g.config.prometheusName, name: g.cfg.prometheusName,
}, },
grafana+:: { grafana+:: {
labels: g.config.commonLabels, labels: g.cfg.commonLabels,
dashboards: g.config.dashboards, dashboards: g.cfg.dashboards,
resources: g.config.resources, resources: g.cfg.resources,
rawDashboards: g.config.rawDashboards, rawDashboards: g.cfg.rawDashboards,
folderDashboards: g.config.folderDashboards, folderDashboards: g.cfg.folderDashboards,
containers: g.config.containers, containers: g.cfg.containers,
}, config+: g.cfg.config,
} + (
// Conditionally overwrite default setting.
if std.length(g.cfg.datasources) > 0 then
{ datasources: g.cfg.datasources }
else {}
),
}, },
}, },
// Add object only if user passes config and config is not empty
[if std.objectHas(params, 'config') && std.length(params.config) > 0 then 'config']: glib.grafana.config,
service: glib.grafana.service, service: glib.grafana.service,
serviceAccount: glib.grafana.serviceAccount, serviceAccount: glib.grafana.serviceAccount,
deployment: glib.grafana.deployment, deployment: glib.grafana.deployment,
dashboardDatasources: glib.grafana.dashboardDatasources, dashboardDatasources: glib.grafana.dashboardDatasources,
dashboardSources: glib.grafana.dashboardSources, dashboardSources: glib.grafana.dashboardSources,
dashboardDefinitions: if std.length(g.config.dashboards) > 0 then { dashboardDefinitions: if std.length(g.cfg.dashboards) > 0 then {
apiVersion: 'v1', apiVersion: 'v1',
kind: 'ConfigMapList', kind: 'ConfigMapList',
items: glib.grafana.dashboardDefinitions, items: glib.grafana.dashboardDefinitions,
@ -74,8 +83,8 @@ function(params) {
kind: 'ServiceMonitor', kind: 'ServiceMonitor',
metadata: { metadata: {
name: 'grafana', name: 'grafana',
namespace: g.config.namespace, namespace: g.cfg.namespace,
labels: g.config.commonLabels, labels: g.cfg.commonLabels,
}, },
spec: { spec: {
selector: { selector: {