jsonnet: fix copy-paste errors, format, and lint

Signed-off-by: paulfantom <pawel@krupa.net.pl>
This commit is contained in:
paulfantom 2021-01-13 09:13:35 +01:00
parent 55900d9e1c
commit b4fcf8f6cc
No known key found for this signature in database
GPG Key ID: 12AE0185401674E7
2 changed files with 57 additions and 58 deletions

View File

@ -186,7 +186,7 @@ local monitoringMixins = import './mixins/monitoring-mixins.libsonnet';
limits: { cpu: '20m', memory: '40Mi' }, limits: { cpu: '20m', memory: '40Mi' },
}, },
}, },
local allRules = local allRules =
$.mixins.nodeExporter.prometheusRules + $.mixins.nodeExporter.prometheusRules +
$.mixins.kubernetes.prometheusRules + $.mixins.kubernetes.prometheusRules +

View File

@ -1,78 +1,77 @@
local defaults = { local defaults = {
local defaults = self,
namespace: error 'must provide namespace', namespace: error 'must provide namespace',
prometheusName: error 'must provide namespace', prometheusName: error 'must provide Prometheus resource name',
alertmanagerName: error 'must provide namespace', alertmanagerName: error 'must provide Alertmanager resource name',
}; };
function(params) { function(params) {
local m = self, local m = self,
config:: defaults + params, config:: defaults + params,
base+: base+:
(import '../alerts/general.libsonnet') + (import '../alerts/general.libsonnet') +
(import '../alerts/node.libsonnet') + (import '../alerts/node.libsonnet') +
(import '../rules/node-rules.libsonnet') + (import '../rules/node-rules.libsonnet') +
(import '../rules/general.libsonnet') { (import '../rules/general.libsonnet') {
_config+:: { _config+:: {
nodeExporterSelector: 'job="node-exporter"', nodeExporterSelector: 'job="node-exporter"',
hostNetworkInterfaceSelector: 'device!~"veth.+"', hostNetworkInterfaceSelector: 'device!~"veth.+"',
},
}, },
},
kubernetes: kubernetes:
(import 'github.com/kubernetes-monitoring/kubernetes-mixin/mixin.libsonnet') { (import 'github.com/kubernetes-monitoring/kubernetes-mixin/mixin.libsonnet') {
_config+:: { _config+:: {
cadvisorSelector: 'job="kubelet", metrics_path="/metrics/cadvisor"', cadvisorSelector: 'job="kubelet", metrics_path="/metrics/cadvisor"',
kubeletSelector: 'job="kubelet", metrics_path="/metrics"', kubeletSelector: 'job="kubelet", metrics_path="/metrics"',
kubeStateMetricsSelector: 'job="kube-state-metrics"', kubeStateMetricsSelector: 'job="kube-state-metrics"',
nodeExporterSelector: 'job="node-exporter"', nodeExporterSelector: 'job="node-exporter"',
kubeSchedulerSelector: 'job="kube-scheduler"', kubeSchedulerSelector: 'job="kube-scheduler"',
kubeControllerManagerSelector: 'job="kube-controller-manager"', kubeControllerManagerSelector: 'job="kube-controller-manager"',
kubeApiserverSelector: 'job="apiserver"', kubeApiserverSelector: 'job="apiserver"',
podLabel: 'pod', podLabel: 'pod',
runbookURLPattern: 'https://github.com/prometheus-operator/kube-prometheus/wiki/%s', runbookURLPattern: 'https://github.com/prometheus-operator/kube-prometheus/wiki/%s',
diskDeviceSelector: 'device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"', diskDeviceSelector: 'device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"',
hostNetworkInterfaceSelector: 'device!~"veth.+"', hostNetworkInterfaceSelector: 'device!~"veth.+"',
},
}, },
},
kubeStateMetrics: kubeStateMetrics:
(import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-mixin/mixin.libsonnet') { (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-mixin/mixin.libsonnet') {
_config+:: { _config+:: {
kubeStateMetricsSelector: 'job="kube-state-metrics"', kubeStateMetricsSelector: 'job="kube-state-metrics"',
},
}, },
},
prometheusOperator: prometheusOperator:
(import 'github.com/prometheus-operator/prometheus-operator/jsonnet/mixin/mixin.libsonnet') { (import 'github.com/prometheus-operator/prometheus-operator/jsonnet/mixin/mixin.libsonnet') {
_config+:: { _config+:: {
prometheusOperatorSelector: 'job="prometheus-operator",namespace="' + m.config.namespace + '"', prometheusOperatorSelector: 'job="prometheus-operator",namespace="' + m.config.namespace + '"',
},
}, },
},
prometheus: prometheus:
(import 'github.com/prometheus/prometheus/documentation/prometheus-mixin/mixin.libsonnet') { (import 'github.com/prometheus/prometheus/documentation/prometheus-mixin/mixin.libsonnet') {
_config+:: { _config+:: {
prometheusSelector: 'job="prometheus-' + m.config.prometheusName + '",namespace="' + m.config.namespace + '"', prometheusSelector: 'job="prometheus-' + m.config.prometheusName + '",namespace="' + m.config.namespace + '"',
prometheusName: '{{$labels.namespace}}/{{$labels.pod}}', prometheusName: '{{$labels.namespace}}/{{$labels.pod}}',
},
}, },
},
alertmanager: alertmanager:
(import 'github.com/prometheus/alertmanager/doc/alertmanager-mixin/mixin.libsonnet') { (import 'github.com/prometheus/alertmanager/doc/alertmanager-mixin/mixin.libsonnet') {
_config+:: { _config+:: {
alertmanagerName: '{{ $labels.namespace }}/{{ $labels.pod}}', alertmanagerName: '{{ $labels.namespace }}/{{ $labels.pod}}',
alertmanagerClusterLabels: 'namespace,service', alertmanagerClusterLabels: 'namespace,service',
alertmanagerSelector: 'job="alertmanager-' + m.config.alertmanagerName + '",namespace="' + m.config.namespace + '"', alertmanagerSelector: 'job="alertmanager-' + m.config.alertmanagerName + '",namespace="' + m.config.namespace + '"',
},
}, },
},
nodeExporter: nodeExporter:
(import 'github.com/prometheus/node_exporter/docs/node-mixin/mixin.libsonnet') { (import 'github.com/prometheus/node_exporter/docs/node-mixin/mixin.libsonnet') {
_config+:: { _config+:: {
nodeExporterSelector: 'job="node-exporter"', nodeExporterSelector: 'job="node-exporter"',
fsSpaceFillingUpCriticalThreshold: 15, fsSpaceFillingUpCriticalThreshold: 15,
diskDeviceSelector: 'device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"', diskDeviceSelector: 'device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"',
},
}, },
},
} }