From 0859b94acced918c445396289bfaae03619ea217 Mon Sep 17 00:00:00 2001 From: Massaki Archambault Date: Mon, 6 Sep 2021 19:45:09 -0400 Subject: [PATCH] fully setup blackbox-exporter --- .../bases/blackbox-exporter/kustomization.yaml | 1 - .../bases/drone/drone-server-ingress.yaml | 2 +- kustomize/bases/gitea/gitea-ingress.yaml | 2 +- kustomize/bases/grafana/grafana-ingress.yaml | 2 +- .../dashboard-ingress.yaml | 2 +- kustomize/bases/longhorn/longhorn-ingress.yaml | 2 +- .../bases/nextcloud/nextcloud-ingress.yaml | 2 +- kustomize/bases/prometheus/kustomization.yaml | 6 +----- .../bases/prometheus/prometheus-ingress.yaml | 2 +- kustomize/bases/traefik/traefik-ingress.yaml | 2 +- .../namespaces/monitoring/kustomization.yaml | 5 +++++ .../monitoring/probes/blackbox-exporter.yaml} | 8 ++++++-- .../servicemonitors/any-namespaces-http.yaml} | 2 +- .../monitoring}/servicemonitors/kubelet.yaml | 0 .../monitoring}/servicemonitors/longhorn.yaml | 0 .../servicemonitors/prometheus.yaml | 0 kustomize/overlays/prod/kustomization.yaml | 8 +++++++- .../blackbox-exporter-bobcat-miner.yaml | 11 +++++++++++ .../probes/external-services-bobcat-miner.yaml | 18 ++++++++++++++++++ 19 files changed, 57 insertions(+), 18 deletions(-) rename kustomize/{bases/blackbox-exporter/blackbox-exporter-probe.yaml => namespaces/monitoring/probes/blackbox-exporter.yaml} (59%) rename kustomize/{bases/prometheus/servicemonitors/generic-any-namespaces.yaml => namespaces/monitoring/servicemonitors/any-namespaces-http.yaml} (89%) rename kustomize/{bases/prometheus => namespaces/monitoring}/servicemonitors/kubelet.yaml (100%) rename kustomize/{bases/prometheus => namespaces/monitoring}/servicemonitors/longhorn.yaml (100%) rename kustomize/{bases/prometheus => namespaces/monitoring}/servicemonitors/prometheus.yaml (100%) create mode 100644 kustomize/overlays/prod/patches/blackbox-exporter-bobcat-miner.yaml create mode 100644 kustomize/overlays/prod/probes/external-services-bobcat-miner.yaml diff --git a/kustomize/bases/blackbox-exporter/kustomization.yaml b/kustomize/bases/blackbox-exporter/kustomization.yaml index d4ee125..eb16224 100644 --- a/kustomize/bases/blackbox-exporter/kustomization.yaml +++ b/kustomize/bases/blackbox-exporter/kustomization.yaml @@ -1,3 +1,2 @@ resources: - blackbox-exporter-deployment.yaml - - blackbox-exporter-probe.yaml diff --git a/kustomize/bases/drone/drone-server-ingress.yaml b/kustomize/bases/drone/drone-server-ingress.yaml index abf43c2..caf8af3 100644 --- a/kustomize/bases/drone/drone-server-ingress.yaml +++ b/kustomize/bases/drone/drone-server-ingress.yaml @@ -4,7 +4,7 @@ metadata: name: drone labels: app.kubernetes.io/name: drone - probe: blackbox + probe: blackbox-http spec: rules: - host: ${DRONE_EXTERNAL_HOST} diff --git a/kustomize/bases/gitea/gitea-ingress.yaml b/kustomize/bases/gitea/gitea-ingress.yaml index d10bcb3..b898413 100644 --- a/kustomize/bases/gitea/gitea-ingress.yaml +++ b/kustomize/bases/gitea/gitea-ingress.yaml @@ -4,7 +4,7 @@ metadata: name: gitea labels: app.kubernetes.io/name: gitea - probe: blackbox + probe: blackbox-http spec: rules: - host: ${GITEA_EXTERNAL_HOST} diff --git a/kustomize/bases/grafana/grafana-ingress.yaml b/kustomize/bases/grafana/grafana-ingress.yaml index 25006ad..a6985a8 100644 --- a/kustomize/bases/grafana/grafana-ingress.yaml +++ b/kustomize/bases/grafana/grafana-ingress.yaml @@ -4,7 +4,7 @@ metadata: name: grafana labels: app.kubernetes.io/name: grafana - probe: blackbox + probe: blackbox-http spec: rules: - host: ${GRAFANA_EXTERNAL_HOST} diff --git a/kustomize/bases/kubernetes-dashboard/dashboard-ingress.yaml b/kustomize/bases/kubernetes-dashboard/dashboard-ingress.yaml index d918a3b..535bdb6 100644 --- a/kustomize/bases/kubernetes-dashboard/dashboard-ingress.yaml +++ b/kustomize/bases/kubernetes-dashboard/dashboard-ingress.yaml @@ -4,7 +4,7 @@ metadata: name: kubernetes-dashboard labels: app.kubernetes.io/name: kubernetes-dashboard - probe: blackbox + probe: blackbox-http spec: rules: - host: ${KUBERNETES_DASHBOARD_EXTERNAL_HOST} diff --git a/kustomize/bases/longhorn/longhorn-ingress.yaml b/kustomize/bases/longhorn/longhorn-ingress.yaml index 0fad84d..9b033ae 100644 --- a/kustomize/bases/longhorn/longhorn-ingress.yaml +++ b/kustomize/bases/longhorn/longhorn-ingress.yaml @@ -5,7 +5,7 @@ metadata: namespace: longhorn-system labels: app.kubernetes.io/name: longhorn-ui - probe: blackbox + probe: blackbox-http spec: rules: - host: ${LONGHORN_EXTERNAL_HOST} diff --git a/kustomize/bases/nextcloud/nextcloud-ingress.yaml b/kustomize/bases/nextcloud/nextcloud-ingress.yaml index 130b1f9..0372402 100644 --- a/kustomize/bases/nextcloud/nextcloud-ingress.yaml +++ b/kustomize/bases/nextcloud/nextcloud-ingress.yaml @@ -4,7 +4,7 @@ metadata: name: nextcloud labels: app.kubernetes.io/name: nextcloud - probe: blackbox + probe: blackbox-http spec: rules: - host: ${NEXTCLOUD_EXTERNAL_HOST} diff --git a/kustomize/bases/prometheus/kustomization.yaml b/kustomize/bases/prometheus/kustomization.yaml index e7cfed2..cac6d6b 100644 --- a/kustomize/bases/prometheus/kustomization.yaml +++ b/kustomize/bases/prometheus/kustomization.yaml @@ -2,8 +2,4 @@ resources: - prometheus.yaml - prometheus-rbac.yaml - prometheus-ingress.yaml - - traefik-podmonitor.yaml - - servicemonitors/generic-any-namespaces.yaml - - servicemonitors/kubelet.yaml - - servicemonitors/longhorn.yaml - - servicemonitors/prometheus.yaml \ No newline at end of file + - traefik-podmonitor.yaml \ No newline at end of file diff --git a/kustomize/bases/prometheus/prometheus-ingress.yaml b/kustomize/bases/prometheus/prometheus-ingress.yaml index 2e95e0f..8daa9ec 100644 --- a/kustomize/bases/prometheus/prometheus-ingress.yaml +++ b/kustomize/bases/prometheus/prometheus-ingress.yaml @@ -4,7 +4,7 @@ metadata: name: prometheus labels: app.kubernetes.io/name: prometheus - probe: blackbox + probe: blackbox-http spec: rules: - host: ${PROMETHEUS_EXTERNAL_HOST} diff --git a/kustomize/bases/traefik/traefik-ingress.yaml b/kustomize/bases/traefik/traefik-ingress.yaml index 787c21e..86bd9ed 100644 --- a/kustomize/bases/traefik/traefik-ingress.yaml +++ b/kustomize/bases/traefik/traefik-ingress.yaml @@ -4,7 +4,7 @@ metadata: name: traefik labels: app.kubernetes.io/name: traefik - probe: blackbox + probe: blackbox-http spec: rules: - host: ${TRAEFIK_EXTERNAL_HOST} diff --git a/kustomize/namespaces/monitoring/kustomization.yaml b/kustomize/namespaces/monitoring/kustomization.yaml index 4ff8c99..bfff7c5 100644 --- a/kustomize/namespaces/monitoring/kustomization.yaml +++ b/kustomize/namespaces/monitoring/kustomization.yaml @@ -3,6 +3,11 @@ bases: # - ../../bases/node-exporter - ../../bases/blackbox-exporter - ../../bases/kube-state-metrics + - servicemonitors/any-namespaces-http.yaml + - servicemonitors/kubelet.yaml + - servicemonitors/longhorn.yaml + - servicemonitors/prometheus.yaml + - probes/blackbox-exporter.yaml resources: - namespace.yaml diff --git a/kustomize/bases/blackbox-exporter/blackbox-exporter-probe.yaml b/kustomize/namespaces/monitoring/probes/blackbox-exporter.yaml similarity index 59% rename from kustomize/bases/blackbox-exporter/blackbox-exporter-probe.yaml rename to kustomize/namespaces/monitoring/probes/blackbox-exporter.yaml index b3280a7..aa2938c 100644 --- a/kustomize/bases/blackbox-exporter/blackbox-exporter-probe.yaml +++ b/kustomize/namespaces/monitoring/probes/blackbox-exporter.yaml @@ -1,7 +1,7 @@ apiVersion: monitoring.coreos.com/v1 kind: Probe metadata: - name: blackbox-exporter + name: blackbox-exporter-http labels: app.kubernetes.io/name: blackbox-exporter monitor: prometheus @@ -15,4 +15,8 @@ spec: any: true selector: matchLabels: - probe: blackbox \ No newline at end of file + probe: blackbox-http + relabelingConfigs: + - action: replace + sourceLabels: [__meta_kubernetes_ingress_label_app_kubernetes_io_name] + targetLabel: name diff --git a/kustomize/bases/prometheus/servicemonitors/generic-any-namespaces.yaml b/kustomize/namespaces/monitoring/servicemonitors/any-namespaces-http.yaml similarity index 89% rename from kustomize/bases/prometheus/servicemonitors/generic-any-namespaces.yaml rename to kustomize/namespaces/monitoring/servicemonitors/any-namespaces-http.yaml index cdfe005..dcbe5c8 100644 --- a/kustomize/bases/prometheus/servicemonitors/generic-any-namespaces.yaml +++ b/kustomize/namespaces/monitoring/servicemonitors/any-namespaces-http.yaml @@ -1,7 +1,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: servicemonitor-http + name: any-namespaces-http labels: monitor: prometheus spec: diff --git a/kustomize/bases/prometheus/servicemonitors/kubelet.yaml b/kustomize/namespaces/monitoring/servicemonitors/kubelet.yaml similarity index 100% rename from kustomize/bases/prometheus/servicemonitors/kubelet.yaml rename to kustomize/namespaces/monitoring/servicemonitors/kubelet.yaml diff --git a/kustomize/bases/prometheus/servicemonitors/longhorn.yaml b/kustomize/namespaces/monitoring/servicemonitors/longhorn.yaml similarity index 100% rename from kustomize/bases/prometheus/servicemonitors/longhorn.yaml rename to kustomize/namespaces/monitoring/servicemonitors/longhorn.yaml diff --git a/kustomize/bases/prometheus/servicemonitors/prometheus.yaml b/kustomize/namespaces/monitoring/servicemonitors/prometheus.yaml similarity index 100% rename from kustomize/bases/prometheus/servicemonitors/prometheus.yaml rename to kustomize/namespaces/monitoring/servicemonitors/prometheus.yaml diff --git a/kustomize/overlays/prod/kustomization.yaml b/kustomize/overlays/prod/kustomization.yaml index 297a3ec..1d2eeb3 100644 --- a/kustomize/overlays/prod/kustomization.yaml +++ b/kustomize/overlays/prod/kustomization.yaml @@ -1,10 +1,13 @@ bases: - - ../../namespaces/kubernetes-dashboard + # - ../../namespaces/kubernetes-dashboard - ../../namespaces/gitea - ../../namespaces/grafana - ../../namespaces/monitoring - ../../namespaces/nextcloud +resources: + - probes/external-services-bobcat-miner.yaml + images: - name: gitea/gitea newTag: 1.15.0 @@ -69,3 +72,6 @@ transformers: # kind: Deployment # name: nextcloud # path: patches/nextcloud-deployment-patch.yaml + +# patchesStrategicMerge: +# - patches/blackbox-exporter-probe-patch.yaml diff --git a/kustomize/overlays/prod/patches/blackbox-exporter-bobcat-miner.yaml b/kustomize/overlays/prod/patches/blackbox-exporter-bobcat-miner.yaml new file mode 100644 index 0000000..1fcd076 --- /dev/null +++ b/kustomize/overlays/prod/patches/blackbox-exporter-bobcat-miner.yaml @@ -0,0 +1,11 @@ +apiVersion: monitoring.coreos.com/v1 +kind: Probe +metadata: + name: blackbox-exporter +spec: + targets: + staticConfig: + static: + - http://192.168.40.30/ + labels: + name: bobcat-miner \ No newline at end of file diff --git a/kustomize/overlays/prod/probes/external-services-bobcat-miner.yaml b/kustomize/overlays/prod/probes/external-services-bobcat-miner.yaml new file mode 100644 index 0000000..964c982 --- /dev/null +++ b/kustomize/overlays/prod/probes/external-services-bobcat-miner.yaml @@ -0,0 +1,18 @@ +apiVersion: monitoring.coreos.com/v1 +kind: Probe +metadata: + name: blackbox-exporter-bobcat-miner + labels: + app.kubernetes.io/name: blackbox-exporter + monitor: prometheus + namespace: monitoring +spec: + module: http_2xx + prober: + url: blackbox-exporter.monitoring.svc:9115 + targets: + staticConfig: + static: + - http://192.168.40.30/ + labels: + name: bobcat-miner