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

examples,jsonnet: expose kubernetes-grafana API to fix grafana examples

Browse Source 
Signed-off-by: paulfantom <pawel@krupa.net.pl>
This commit is contained in:
paulfantom
2021-02-02 10:00:08 +01:00
parent 8588e30bd0
commit ab3dff2016
4 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/grafana-additional-jsonnet-dashboard-example.jsonnet
View File

@@ -6,10 +6,11 @@ local template = grafana.template;
local graphPanel = grafana.graphPanel; local graphPanel = grafana.graphPanel;
local kp = (import 'kube-prometheus/main.libsonnet') + { local kp = (import 'kube-prometheus/main.libsonnet') + {
_config+:: { values+:: {
common+:: {
namespace: 'monitoring', namespace: 'monitoring',
}, },
grafana+:: { grafana+: {
dashboards+:: { dashboards+:: {
'my-dashboard.json': 'my-dashboard.json':
dashboard.new('My Dashboard') dashboard.new('My Dashboard')
@@ -36,6 +37,7 @@ local kp = (import 'kube-prometheus/main.libsonnet') + {
), ),
}, },
}, },
},
}; };
{ ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } + { ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } +

6
examples/grafana-additional-rendered-dashboard-example-2.jsonnet
View File

@@ -1,12 +1,14 @@
local kp = (import 'kube-prometheus/main.libsonnet') + { local kp = (import 'kube-prometheus/main.libsonnet') + {
_config+:: { values+:: {
common+:: {
namespace: 'monitoring', namespace: 'monitoring',
}, },
grafana+:: { grafana+: {
rawDashboards+:: { rawDashboards+:: {
'my-dashboard.json': (importstr 'example-grafana-dashboard.json'), 'my-dashboard.json': (importstr 'example-grafana-dashboard.json'),
}, },
}, },
},
}; };
{ ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } + { ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } +

9
examples/grafana-additional-rendered-dashboard-example.jsonnet
View File

@@ -1,15 +1,14 @@
local kp = (import 'kube-prometheus/main.libsonnet') + { local kp = (import 'kube-prometheus/main.libsonnet') + {
_config+:: { values+:: {
common+:: {
namespace: 'monitoring', namespace: 'monitoring',
}, },
grafanaDashboards+:: { // monitoring-mixin compatibility grafana+: {
'my-dashboard.json': (import 'example-grafana-dashboard.json'),
},
grafana+:: {
dashboards+:: { // use this method to import your dashboards to Grafana dashboards+:: { // use this method to import your dashboards to Grafana
'my-dashboard.json': (import 'example-grafana-dashboard.json'), 'my-dashboard.json': (import 'example-grafana-dashboard.json'),
}, },
}, },
},
}; };
{ ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } + { ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } +

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

@@ -22,6 +22,10 @@ local defaults = {
}, },
prometheusName: error 'must provide prometheus name', prometheusName: error 'must provide prometheus name',
dashboards: {}, dashboards: {},
// TODO(paulfantom): expose those to have a stable API. After kubernetes-grafana refactor those could probably be removed.
rawDashboards: {},
folderDashboards: {},
containers: [],
}; };
function(params) { function(params) {
@@ -47,6 +51,9 @@ function(params) {
labels: g.config.commonLabels, labels: g.config.commonLabels,
dashboards: g.config.dashboards, dashboards: g.config.dashboards,
resources: g.config.resources, resources: g.config.resources,
rawDashboards: g.config.rawDashboards,
folderDashboards: g.config.folderDashboards,
containers: g.config.containers,
}, },
}, },
}, },