From e8cc5966999ba0a7ccf53a74c266f8a52afe180a Mon Sep 17 00:00:00 2001
From: paulfantom <pawel@krupa.net.pl>
Date: Thu, 17 Sep 2020 10:27:40 +0200
Subject: [PATCH] jsonnet/kube-prometheus: use prometheus-operator mixin
---
.../kube-prometheus/alerts/alerts.libsonnet | 3 +-
.../alerts/prometheus-operator.libsonnet | 63 -------------------
jsonnet/kube-prometheus/jsonnetfile.json | 9 +++
.../kube-prometheus/kube-prometheus.libsonnet | 1 +
jsonnetfile.lock.json | 34 ++++++----
5 files changed, 33 insertions(+), 77 deletions(-)
delete mode 100644 jsonnet/kube-prometheus/alerts/prometheus-operator.libsonnet
diff --git a/jsonnet/kube-prometheus/alerts/alerts.libsonnet b/jsonnet/kube-prometheus/alerts/alerts.libsonnet
index 3521aa82..adc46130 100644
--- a/jsonnet/kube-prometheus/alerts/alerts.libsonnet
+++ b/jsonnet/kube-prometheus/alerts/alerts.libsonnet
@@ -1,4 +1,3 @@
(import 'alertmanager.libsonnet') +
(import 'general.libsonnet') +
-(import 'node.libsonnet') +
-(import 'prometheus-operator.libsonnet')
+(import 'node.libsonnet')
diff --git a/jsonnet/kube-prometheus/alerts/prometheus-operator.libsonnet b/jsonnet/kube-prometheus/alerts/prometheus-operator.libsonnet
deleted file mode 100644
index 731994a2..00000000
--- a/jsonnet/kube-prometheus/alerts/prometheus-operator.libsonnet
+++ /dev/null
@@ -1,63 +0,0 @@
-{
- prometheusAlerts+:: {
- groups+: [
- {
- name: 'prometheus-operator',
- rules: [
- {
- alert: 'PrometheusOperatorListErrors',
- expr: |||
- (sum by (controller,namespace) (rate(prometheus_operator_list_operations_failed_total{%(prometheusOperatorSelector)s}[10m])) / sum by (controller,namespace) (rate(prometheus_operator_list_operations_total{%(prometheusOperatorSelector)s}[10m]))) > 0.4
- ||| % $._config,
- labels: {
- severity: 'warning',
- },
- annotations: {
- message: 'Errors while performing List operations in controller {{$labels.controller}} in {{$labels.namespace}} namespace.',
- },
- 'for': '15m',
- },
- {
- alert: 'PrometheusOperatorWatchErrors',
- expr: |||
- (sum by (controller,namespace) (rate(prometheus_operator_watch_operations_failed_total{%(prometheusOperatorSelector)s}[10m])) / sum by (controller,namespace) (rate(prometheus_operator_watch_operations_total{%(prometheusOperatorSelector)s}[10m]))) > 0.4
- ||| % $._config,
- labels: {
- severity: 'warning',
- },
- annotations: {
- message: 'Errors while performing Watch operations in controller {{$labels.controller}} in {{$labels.namespace}} namespace.',
- },
- 'for': '15m',
- },
- {
- alert: 'PrometheusOperatorReconcileErrors',
- expr: |||
- rate(prometheus_operator_reconcile_errors_total{%(prometheusOperatorSelector)s}[5m]) > 0.1
- ||| % $._config,
- labels: {
- severity: 'warning',
- },
- annotations: {
- message: 'Errors while reconciling {{ $labels.controller }} in {{ $labels.namespace }} Namespace.',
- },
- 'for': '10m',
- },
- {
- alert: 'PrometheusOperatorNodeLookupErrors',
- expr: |||
- rate(prometheus_operator_node_address_lookup_errors_total{%(prometheusOperatorSelector)s}[5m]) > 0.1
- ||| % $._config,
- labels: {
- severity: 'warning',
- },
- annotations: {
- message: 'Errors while reconciling Prometheus in {{ $labels.namespace }} Namespace.',
- },
- 'for': '10m',
- },
- ],
- },
- ],
- },
-}
diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json
index 30e7f660..4da94526 100644
--- a/jsonnet/kube-prometheus/jsonnetfile.json
+++ b/jsonnet/kube-prometheus/jsonnetfile.json
@@ -28,6 +28,15 @@
},
"version": "release-0.42"
},
+ {
+ "source": {
+ "git": {
+ "remote": "https://github.com/prometheus-operator/prometheus-operator",
+ "subdir": "jsonnet/mixin"
+ }
+ },
+ "version": "master"
+ },
{
"source": {
"git": {
diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
index 71369ac3..88c3e44f 100644
--- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
@@ -9,6 +9,7 @@ local configMapList = k3.core.v1.configMapList;
(import 'github.com/prometheus/node_exporter/docs/node-mixin/mixin.libsonnet') +
(import './alertmanager/alertmanager.libsonnet') +
(import 'github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet') +
+(import 'github.com/prometheus-operator/prometheus-operator/jsonnet/mixin/mixin.libsonnet') +
(import './prometheus/prometheus.libsonnet') +
(import './prometheus-adapter/prometheus-adapter.libsonnet') +
(import 'github.com/kubernetes-monitoring/kubernetes-mixin/mixin.libsonnet') +
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 6c0add96..77843e0f 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -4,7 +4,7 @@
{
"source": {
"git": {
- "remote": "https://github.com/brancz/kubernetes-grafana.git",
+ "remote": "https://github.com/brancz/kubernetes-grafana",
"subdir": "grafana"
}
},
@@ -14,7 +14,7 @@
{
"source": {
"git": {
- "remote": "https://github.com/etcd-io/etcd.git",
+ "remote": "https://github.com/etcd-io/etcd",
"subdir": "Documentation/etcd-mixin"
}
},
@@ -24,7 +24,7 @@
{
"source": {
"git": {
- "remote": "https://github.com/grafana/grafonnet-lib.git",
+ "remote": "https://github.com/grafana/grafonnet-lib",
"subdir": "grafonnet"
}
},
@@ -34,7 +34,7 @@
{
"source": {
"git": {
- "remote": "https://github.com/grafana/jsonnet-libs.git",
+ "remote": "https://github.com/grafana/jsonnet-libs",
"subdir": "grafana-builder"
}
},
@@ -44,7 +44,7 @@
{
"source": {
"git": {
- "remote": "https://github.com/ksonnet/ksonnet-lib.git",
+ "remote": "https://github.com/ksonnet/ksonnet-lib",
"subdir": ""
}
},
@@ -55,7 +55,7 @@
{
"source": {
"git": {
- "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
+ "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin",
"subdir": ""
}
},
@@ -65,7 +65,7 @@
{
"source": {
"git": {
- "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
+ "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin",
"subdir": "lib/promgrafonnet"
}
},
@@ -75,7 +75,7 @@
{
"source": {
"git": {
- "remote": "https://github.com/kubernetes/kube-state-metrics.git",
+ "remote": "https://github.com/kubernetes/kube-state-metrics",
"subdir": "jsonnet/kube-state-metrics"
}
},
@@ -85,7 +85,7 @@
{
"source": {
"git": {
- "remote": "https://github.com/kubernetes/kube-state-metrics.git",
+ "remote": "https://github.com/kubernetes/kube-state-metrics",
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
@@ -95,7 +95,17 @@
{
"source": {
"git": {
- "remote": "https://github.com/prometheus-operator/prometheus-operator.git",
+ "remote": "https://github.com/prometheus-operator/prometheus-operator",
+ "subdir": "jsonnet/mixin"
+ }
+ },
+ "version": "64863c320adddf1ab7da9cd0af1bea6978f9a72b",
+ "sum": "vqz67twCROf5kVgo/61luBOx25Mk7Okbt8YP+/7xjT0="
+ },
+ {
+ "source": {
+ "git": {
+ "remote": "https://github.com/prometheus-operator/prometheus-operator",
"subdir": "jsonnet/prometheus-operator"
}
},
@@ -105,7 +115,7 @@
{
"source": {
"git": {
- "remote": "https://github.com/prometheus/node_exporter.git",
+ "remote": "https://github.com/prometheus/node_exporter",
"subdir": "docs/node-mixin"
}
},
@@ -115,7 +125,7 @@
{
"source": {
"git": {
- "remote": "https://github.com/prometheus/prometheus.git",
+ "remote": "https://github.com/prometheus/prometheus",
"subdir": "documentation/prometheus-mixin"
}
},
--
GitLab