Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
make fmt
Signed-off-by: Tom Wilkie <[email protected]>
  • Loading branch information
tomwilkie committed Apr 7, 2020
commit bb31466ae90d5bb9c42530ce78b9e6326b785837
2 changes: 1 addition & 1 deletion prometheus-ksonnet/grafana/dashboards.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
function(mixinName, acc)
local mixin = $.mixins[mixinName] + emptyMixin;
if std.objectHas(mixin, 'grafanaDashboardFolder')
then acc + {
then acc {
[mixin.grafanaDashboardFolder]: mixin.grafanaDashboards,
}
else acc,
Expand Down
74 changes: 37 additions & 37 deletions prometheus-ksonnet/prometheus-ksonnet.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -10,45 +10,45 @@
(import 'lib/prometheus-configmap.libsonnet') +
(import 'lib/config.libsonnet') +
{
mixins+:: {
kubernetes+:
(import 'kubernetes-mixin/mixin.libsonnet') {
_config+:: {
cadvisorSelector: 'job="kube-system/cadvisor"',
kubeletSelector: 'job="kube-system/kubelet"',
kubeStateMetricsSelector: 'job="%s/kube-state-metrics"' % $._config.namespace,
nodeExporterSelector: 'job="%s/node-exporter"' % $._config.namespace, // Also used by node-mixin.
notKubeDnsSelector: 'job!="kube-system/kube-dns"',
kubeSchedulerSelector: 'job="kube-system/kube-scheduler"',
kubeControllerManagerSelector: 'job="kube-system/kube-controller-manager"',
kubeApiserverSelector: 'job="kube-system/kube-apiserver"',
podLabel: 'instance',
},
},
mixins+:: {
kubernetes+:
(import 'kubernetes-mixin/mixin.libsonnet') {
_config+:: {
cadvisorSelector: 'job="kube-system/cadvisor"',
kubeletSelector: 'job="kube-system/kubelet"',
kubeStateMetricsSelector: 'job="%s/kube-state-metrics"' % $._config.namespace,
nodeExporterSelector: 'job="%s/node-exporter"' % $._config.namespace, // Also used by node-mixin.
notKubeDnsSelector: 'job!="kube-system/kube-dns"',
kubeSchedulerSelector: 'job="kube-system/kube-scheduler"',
kubeControllerManagerSelector: 'job="kube-system/kube-controller-manager"',
kubeApiserverSelector: 'job="kube-system/kube-apiserver"',
podLabel: 'instance',
},
},

prometheus+:
(import 'prometheus-mixin/mixin.libsonnet') {
_config+:: {
prometheusSelector: 'job="default/prometheus"',
},
},
prometheus+:
(import 'prometheus-mixin/mixin.libsonnet') {
_config+:: {
prometheusSelector: 'job="default/prometheus"',
},
},

alertmanager+:
(import 'alertmanager-mixin/mixin.libsonnet') {
_config+:: {
alertmanagerSelector: 'job="default/alertmanager"',
},
},
alertmanager+:
(import 'alertmanager-mixin/mixin.libsonnet') {
_config+:: {
alertmanagerSelector: 'job="default/alertmanager"',
},
},

node_exporter+:
(import 'node-mixin/mixin.libsonnet') {
_config+:: {
nodeExporterSelector: 'job="%s/node-exporter"' % $._config.namespace, // Also used by node-mixin.
node_exporter+:
(import 'node-mixin/mixin.libsonnet') {
_config+:: {
nodeExporterSelector: 'job="%s/node-exporter"' % $._config.namespace, // Also used by node-mixin.

// Do not page if nodes run out of disk space.
nodeCriticalSeverity: 'warning',
grafanaPrefix: '/grafana',
},
},
},
// Do not page if nodes run out of disk space.
nodeCriticalSeverity: 'warning',
grafanaPrefix: '/grafana',
},
},
},
}