From c2fb1f42089f0dd22a4e92eb3cf1e52a688b850f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=81LFALVI=20Tam=C3=A1s?= <tamas.palfalvi@inbuss.hu>
Date: Thu, 26 Nov 2020 22:26:23 +0100
Subject: [PATCH] include the blackbox exporter mixin by default
---
README.md | 3 +--
docs/blackbox-exporter.md | 9 ++-------
jsonnet/kube-prometheus/kube-prometheus.libsonnet | 1 +
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 042652b8..c8afb50b 100644
--- a/README.md
+++ b/README.md
@@ -734,8 +734,7 @@ See [exposing Prometheus/Alertmanager/Grafana](docs/exposing-prometheus-alertman
```jsonnet
local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
- // ... other necessary mixins ...
- (import 'kube-prometheus/blackbox-exporter/blackbox-exporter.libsonnet') +
+ // ... all necessary mixins ...
{
_config+:: {
// ... configuration for other features ...
diff --git a/docs/blackbox-exporter.md b/docs/blackbox-exporter.md
index 4c3adb97..cb40fd5f 100644
--- a/docs/blackbox-exporter.md
+++ b/docs/blackbox-exporter.md
@@ -4,12 +4,8 @@ The `prometheus-operator` defines a `Probe` resource type that can be used to de
## Adding blackbox exporter manifests to an existing `kube-prometheus` configuration
-1. Add the blackbox exporter mixin to the list of imports:
-```
-(import 'kube-prometheus/blackbox-exporter/blackbox-exporter.libsonnet')
-```
-2. Override blackbox-related configuration parameters as needed.
-3. Add the following to the list of renderers to render the blackbox exporter manifests:
+1. Override blackbox-related configuration parameters as needed.
+2. Add the following to the list of renderers to render the blackbox exporter manifests:
```
{ ['blackbox-exporter-' + name]: kp.blackboxExporter[name] for name in std.objectFields(kp.blackboxExporter) }
```
@@ -35,7 +31,6 @@ The `prometheus-operator` defines a `Probe` resource type that can be used to de
```jsonnet
local kp =
(import 'kube-prometheus/kube-prometheus.libsonnet') +
- (import 'kube-prometheus/blackbox-exporter/blackbox-exporter.libsonnet')
{
_config+:: {
namespace: 'monitoring',
diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
index 3bfd4768..38bb061e 100644
--- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
@@ -5,6 +5,7 @@ local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet';
(import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-mixin/mixin.libsonnet') +
(import './node-exporter/node-exporter.libsonnet') +
(import 'github.com/prometheus/node_exporter/docs/node-mixin/mixin.libsonnet') +
+(import './blackbox-exporter/blackbox-exporter.libsonnet') +
(import './alertmanager/alertmanager.libsonnet') +
(import 'github.com/prometheus/alertmanager/doc/alertmanager-mixin/mixin.libsonnet') +
(import 'github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet') +
--
GitLab