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

jsonnet: refactor the rest of mixins and grafana inclusion

Browse Source 
Signed-off-by: paulfantom <pawel@krupa.net.pl>
This commit is contained in:
paulfantom
2021-01-15 09:26:57 +01:00
parent 86d4571aea
commit 5624c5a9a8
5 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example.jsonnet
View File

@@ -14,7 +14,7 @@ local kp =
}, },
}; };
{ ['setup/0namespace-namespace']: kp.kubePrometheus.namespace } + { 'setup/0namespace-namespace': kp.kubePrometheus.namespace } +
{ {
['setup/prometheus-operator-' + name]: kp.prometheusOperator[name] ['setup/prometheus-operator-' + name]: kp.prometheusOperator[name]
for name in std.filter((function(name) name != 'serviceMonitor' && name != 'prometheusRule'), std.objectFields(kp.prometheusOperator)) for name in std.filter((function(name) name != 'serviceMonitor' && name != 'prometheusRule'), std.objectFields(kp.prometheusOperator))

2
jsonnet/kube-prometheus/grafana/grafana.libsonnet
View File

@@ -60,7 +60,7 @@ function(params) {
dashboardDefinitions: if std.length(g.config.dashboards) > 0 then { dashboardDefinitions: if std.length(g.config.dashboards) > 0 then {
apiVersion: 'v1', apiVersion: 'v1',
kind: 'ConfigMapList', kind: 'ConfigMapList',
items: g.dashboardDefinitions, items: glib.grafana.dashboardDefinitions,
}, },
serviceMonitor: { serviceMonitor: {
apiVersion: 'monitoring.coreos.com/v1', apiVersion: 'monitoring.coreos.com/v1',

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

@@ -11,6 +11,7 @@ local prometheus = import './prometheus/prometheus.libsonnet';
local prometheusOperator = import './prometheus-operator/prometheus-operator.libsonnet'; local prometheusOperator = import './prometheus-operator/prometheus-operator.libsonnet';
{ {
local all = self,
alertmanager: alertmanager({ alertmanager: alertmanager({
name: $._config.alertmanagerName, name: $._config.alertmanagerName,
namespace: $._config.namespace, namespace: $._config.namespace,
@@ -25,12 +26,16 @@ local prometheusOperator = import './prometheus-operator/prometheus-operator.lib
version: '0.18.0', version: '0.18.0',
image: 'quay.io/prometheus/blackbox-exporter:v0.18.0', image: 'quay.io/prometheus/blackbox-exporter:v0.18.0',
}), }),
// TODO(paulfantom) This should be done by iterating over all objects and looking for object.mixin.grafanaDashboards
local allDashboards = $.nodeExporter.mixin.grafanaDashboards +
$.prometheus.mixin.grafanaDashboards +
$.kubernetesMixin.mixin.grafanaDashboards,
grafana: grafana({ grafana: grafana({
namespace: $._config.namespace, namespace: $._config.namespace,
version: '7.3.5', version: '7.3.5',
image: 'grafana/grafana:v7.3.7', image: 'grafana/grafana:v7.3.7',
dashboards: {},
prometheusName: $._config.prometheusName, prometheusName: $._config.prometheusName,
dashboards: allDashboards,
}), }),
kubeStateMetrics: kubeStateMetrics({ kubeStateMetrics: kubeStateMetrics({
namespace: $._config.namespace, namespace: $._config.namespace,