From 3be7771072b7f168b660fdbc57dd36e600923e7c Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Thu, 30 Mar 2023 19:56:35 +0530 Subject: [PATCH 1/5] Allow to run balckbox exporter for SSL certs expiration --- .github/workflows/release.yaml | 1 + Makefile | 4 +- charts/signoz/Chart.lock | 7 +- charts/signoz/Chart.yaml | 4 + .../prometheus-blackbox-exporter-7.7.0.tgz | Bin 0 -> 9928 bytes .../_otel_collector_metrics_config.tpl | 256 ++++++++++++++++++ .../otel-collector-metrics/configmap.yaml | 2 +- charts/signoz/values.yaml | 226 +++++++--------- ct.yaml | 3 +- 9 files changed, 371 insertions(+), 132 deletions(-) create mode 100644 charts/signoz/charts/prometheus-blackbox-exporter-7.7.0.tgz create mode 100644 charts/signoz/templates/_otel_collector_metrics_config.tpl diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 60e586b6..0f9d6dd6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -27,6 +27,7 @@ jobs: helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx helm repo add minio https://charts.min.io helm repo add bitnami https://charts.bitnami.com/bitnami + helm repo add prometheus-community https://prometheus-community.github.io/helm-charts - name: Run chart-releaser uses: helm/chart-releaser-action@v1.2.1 diff --git a/Makefile b/Makefile index 1b59f014..152845a9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ RELEASE_NAME := my-release -NAMESPACE := platform # k8s namespace for installing the chart +NAMESPACE := default # k8s namespace for installing the chart delete-namespace: kubectl delete namespace $(NAMESPACE) @@ -19,7 +19,7 @@ local-setup: dependency-update # print resulting manifests to console without applying them debug: - helm install --dry-run --debug $(RELEASE_NAME) signoz/signoz + helm install --dry-run --debug $(RELEASE_NAME) charts/signoz # install the chart to configured namespace install: setup diff --git a/charts/signoz/Chart.lock b/charts/signoz/Chart.lock index 609bc8aa..3da10fbb 100644 --- a/charts/signoz/Chart.lock +++ b/charts/signoz/Chart.lock @@ -17,5 +17,8 @@ dependencies: - name: keycloak repository: https://charts.bitnami.com/bitnami version: 10.1.5 -digest: sha256:7e783326354b1036fdf23d8a1f7b0a2aaaaf913e26a61e166b223a24e50398fd -generated: "2023-02-25T02:08:05.683026+05:30" +- name: prometheus-blackbox-exporter + repository: https://prometheus-community.github.io/helm-charts + version: 7.7.0 +digest: sha256:1685fd46f36a6a61e79e31a2c457dd15ca7d2dbe99b44ce17efe00991d965b2d +generated: "2023-03-30T18:12:19.53538+05:30" diff --git a/charts/signoz/Chart.yaml b/charts/signoz/Chart.yaml index b71b8a5e..8f735096 100644 --- a/charts/signoz/Chart.yaml +++ b/charts/signoz/Chart.yaml @@ -43,6 +43,10 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: keycloak.enabled version: 10.1.5 + - name: prometheus-blackbox-exporter + repository: https://prometheus-community.github.io/helm-charts + condition: prometheus-blackbox-exporter.enabled + version: 7.7.0 maintainers: - name: SigNoz email: hello@signoz.io diff --git a/charts/signoz/charts/prometheus-blackbox-exporter-7.7.0.tgz b/charts/signoz/charts/prometheus-blackbox-exporter-7.7.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..c4142307533f6233fd468dbf9e794f39f7d46b7e GIT binary patch literal 9928 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 Date: Tue, 4 Apr 2023 00:37:47 +0530 Subject: [PATCH 2/5] revert changes to Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 152845a9..1b59f014 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ RELEASE_NAME := my-release -NAMESPACE := default # k8s namespace for installing the chart +NAMESPACE := platform # k8s namespace for installing the chart delete-namespace: kubectl delete namespace $(NAMESPACE) @@ -19,7 +19,7 @@ local-setup: dependency-update # print resulting manifests to console without applying them debug: - helm install --dry-run --debug $(RELEASE_NAME) charts/signoz + helm install --dry-run --debug $(RELEASE_NAME) signoz/signoz # install the chart to configured namespace install: setup From 6cab17079aa735485f0f527384c69fa860e63c31 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Tue, 4 Apr 2023 01:16:40 +0530 Subject: [PATCH 3/5] Update scrape address --- charts/signoz/templates/_otel_collector_metrics_config.tpl | 2 +- charts/signoz/values.yaml | 2 +- ct.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/signoz/templates/_otel_collector_metrics_config.tpl b/charts/signoz/templates/_otel_collector_metrics_config.tpl index 3aa6fe89..2bee00e6 100644 --- a/charts/signoz/templates/_otel_collector_metrics_config.tpl +++ b/charts/signoz/templates/_otel_collector_metrics_config.tpl @@ -12,7 +12,7 @@ - source_labels: [__param_target] target_label: endpoint - target_label: __address__ - replacement: blackbox-exporter:9115 + replacement: my-release-prometheus-blackbox-exporter:9115 {{- end }} {{- define "prometheus-receiver" -}} diff --git a/charts/signoz/values.yaml b/charts/signoz/values.yaml index c15724e1..ef8c61f6 100644 --- a/charts/signoz/values.yaml +++ b/charts/signoz/values.yaml @@ -2380,7 +2380,7 @@ keycloak: # Used for SSL certificate expiry monitoring and alerting prometheus-blackbox-exporter: - enabled: + enabled: true # -- Blackbox Exporter image image: diff --git a/ct.yaml b/ct.yaml index e7d1adc1..489d9e2b 100644 --- a/ct.yaml +++ b/ct.yaml @@ -15,4 +15,4 @@ chart-repos: - ingress-nginx=https://kubernetes.github.io/ingress-nginx - minio=https://charts.min.io - bitnami=https://charts.bitnami.com/bitnami - - prometheus-community=https://prometheus-community.github.io/helm-charts \ No newline at end of file + - prometheus-community=https://prometheus-community.github.io/helm-charts From 4e395413394415ee92d1a83506717d74faed72a6 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Tue, 4 Apr 2023 01:20:48 +0530 Subject: [PATCH 4/5] clean up and disable by default --- charts/signoz/values.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/charts/signoz/values.yaml b/charts/signoz/values.yaml index ef8c61f6..af202d90 100644 --- a/charts/signoz/values.yaml +++ b/charts/signoz/values.yaml @@ -1587,9 +1587,8 @@ otelCollectorMetrics: signoz.io/path: /metrics blackboxexporter: - enabled: true + enabled: false targets: - - https://signoz.io fullname: blackbox-exporter podSecurityContext: {} @@ -2380,7 +2379,7 @@ keycloak: # Used for SSL certificate expiry monitoring and alerting prometheus-blackbox-exporter: - enabled: true + enabled: false # -- Blackbox Exporter image image: From 615684f4183306fe454a9ef0c58473ca78b502e2 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Tue, 4 Apr 2023 01:47:16 +0530 Subject: [PATCH 5/5] make dependency-update --- charts/signoz/Chart.lock | 7 +++++-- charts/signoz/templates/_otel_collector_metrics_config.tpl | 2 +- .../signoz/templates/otel-collector-metrics/configmap.yaml | 2 +- charts/signoz/values.yaml | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/charts/signoz/Chart.lock b/charts/signoz/Chart.lock index 6860d709..101b18b3 100644 --- a/charts/signoz/Chart.lock +++ b/charts/signoz/Chart.lock @@ -17,5 +17,8 @@ dependencies: - name: keycloak repository: https://charts.bitnami.com/bitnami version: 10.1.5 -digest: sha256:a2056dea59f72dc965d3c154925ff5bd13697c0ec9545dabeb8ba064430c334e -generated: "2023-03-31T17:07:30.454673+05:45" +- name: prometheus-blackbox-exporter + repository: https://prometheus-community.github.io/helm-charts + version: 7.7.0 +digest: sha256:dc2062dcdae4bae56364948c79fb0161913df9030c327c6e9fb43513ff0cd153 +generated: "2023-04-04T01:44:05.579243+05:30" diff --git a/charts/signoz/templates/_otel_collector_metrics_config.tpl b/charts/signoz/templates/_otel_collector_metrics_config.tpl index 2bee00e6..e0f7d109 100644 --- a/charts/signoz/templates/_otel_collector_metrics_config.tpl +++ b/charts/signoz/templates/_otel_collector_metrics_config.tpl @@ -253,4 +253,4 @@ service: receivers: [hostmetrics] processors: [resourcedetection, k8sattributes/hostmetrics, batch] exporters: [clickhousemetricswrite/hostmetrics] -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/signoz/templates/otel-collector-metrics/configmap.yaml b/charts/signoz/templates/otel-collector-metrics/configmap.yaml index 58a68ad0..72bb02c1 100644 --- a/charts/signoz/templates/otel-collector-metrics/configmap.yaml +++ b/charts/signoz/templates/otel-collector-metrics/configmap.yaml @@ -6,4 +6,4 @@ metadata: {{- include "otelCollectorMetrics.labels" . | nindent 4 }} data: otel-collector-metrics-config.yaml: |- - {{ include "otelCollectorMetrics" . | nindent 4 }} \ No newline at end of file + {{ include "otelCollectorMetrics" . | nindent 4 }} diff --git a/charts/signoz/values.yaml b/charts/signoz/values.yaml index a31a9a56..1713a294 100644 --- a/charts/signoz/values.yaml +++ b/charts/signoz/values.yaml @@ -2460,4 +2460,4 @@ prometheus-blackbox-exporter: ttl: 5 pod: - labels: {} \ No newline at end of file + labels: {}