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

jsonnet: unify internal configuration field name

Browse Source 
Signed-off-by: paulfantom <pawel@krupa.net.pl>
This commit is contained in:
paulfantom
2021-03-16 19:14:55 +01:00
parent ed884b0399
commit 0bf34a24f8
14 changed files with 297 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,35 +33,35 @@ local defaults = {
function(params) {
local g = self,
cfg:: defaults + params,
_config:: defaults + params,
// Safety check
assert std.isObject(g.cfg.resources),
assert std.isObject(g._config.resources),
local glib = (import 'github.com/brancz/kubernetes-grafana/grafana/grafana.libsonnet') + {
_config+:: {
namespace: g.cfg.namespace,
namespace: g._config.namespace,
versions+:: {
grafana: g.cfg.version,
grafana: g._config.version,
},
imageRepos+:: {
grafana: g.cfg.imageRepos,
grafana: g._config.imageRepos,
},
prometheus+:: {
name: g.cfg.prometheusName,
name: g._config.prometheusName,
},
grafana+:: {
labels: g.cfg.commonLabels,
dashboards: g.cfg.dashboards,
resources: g.cfg.resources,
rawDashboards: g.cfg.rawDashboards,
folderDashboards: g.cfg.folderDashboards,
containers: g.cfg.containers,
config+: g.cfg.config,
plugins+: g.cfg.plugins,
labels: g._config.commonLabels,
dashboards: g._config.dashboards,
resources: g._config.resources,
rawDashboards: g._config.rawDashboards,
folderDashboards: g._config.folderDashboards,
containers: g._config.containers,
config+: g._config.config,
plugins+: g._config.plugins,
} + (
// Conditionally overwrite default setting.
if std.length(g.cfg.datasources) > 0 then
{ datasources: g.cfg.datasources }
if std.length(g._config.datasources) > 0 then
{ datasources: g._config.datasources }
else {}
),
},
@@ -75,7 +75,7 @@ function(params) {
dashboardDatasources: glib.grafana.dashboardDatasources,
dashboardSources: glib.grafana.dashboardSources,
dashboardDefinitions: if std.length(g.cfg.dashboards) > 0 then {
dashboardDefinitions: if std.length(g._config.dashboards) > 0 then {
apiVersion: 'v1',
kind: 'ConfigMapList',
items: glib.grafana.dashboardDefinitions,
@@ -85,8 +85,8 @@ function(params) {
kind: 'ServiceMonitor',
metadata: {
name: 'grafana',
namespace: g.cfg.namespace,
labels: g.cfg.commonLabels,
namespace: g._config.namespace,
labels: g._config.commonLabels,
},
spec: {
selector: {