From af3757dda01ac7f341f5cb49e03e29a1a9c969eb Mon Sep 17 00:00:00 2001 From: Abdullah Alotaibi Date: Sun, 21 Apr 2024 13:30:33 +0300 Subject: [PATCH 1/5] add svm support for prometheus-statsd-exporter --- .../templates/servicemonitor.yaml | 28 +++++++++++++++++++ stable/prometheus-statsd-exporter/values.yaml | 6 ++++ 2 files changed, 34 insertions(+) create mode 100644 stable/prometheus-statsd-exporter/templates/servicemonitor.yaml diff --git a/stable/prometheus-statsd-exporter/templates/servicemonitor.yaml b/stable/prometheus-statsd-exporter/templates/servicemonitor.yaml new file mode 100644 index 00000000..41a5432b --- /dev/null +++ b/stable/prometheus-statsd-exporter/templates/servicemonitor.yaml @@ -0,0 +1,28 @@ +{{- if and .Values.metrics.enabled (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: {{ include "prometheus-statsd-exporter.fullname" . }} + labels: + name: {{ include "prometheus-statsd-exporter.fullname" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + {{- with .Values.metrics.additionalLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + namespaceSelector: + matchNames: + - {{ .Release.Namespace }} + selector: + matchLabels: + app.kubernetes.io/name: {{ include "prometheus-statsd-exporter.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + endpoints: + - port: frontend + {{- if .Values.metrics.scrapeInterval }} + interval: {{ .Values.metrics.scrapeInterval }} + {{- end }} + {{- if .Values.metrics.scrapeTimeout }} + scrapeTimeout: {{ .Values.metrics.scrapeTimeout }} + {{- end }} +{{- end }} diff --git a/stable/prometheus-statsd-exporter/values.yaml b/stable/prometheus-statsd-exporter/values.yaml index 7203218f..2cdfc36c 100644 --- a/stable/prometheus-statsd-exporter/values.yaml +++ b/stable/prometheus-statsd-exporter/values.yaml @@ -34,6 +34,12 @@ securityContext: {} service: type: ClusterIP +metrics: + enabled: false + additionalLabels: {} + scrapeInterval: 30s + scrapeTimeout: 10s + resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little From bc1224172548c4ce2d78c83c5d2ab6f2a1210abf Mon Sep 17 00:00:00 2001 From: Abdullah Barrak Date: Mon, 22 Apr 2024 10:45:27 +0300 Subject: [PATCH 2/5] docs: add metrics vars docs for prometheus-statsd-exporter --- stable/prometheus-statsd-exporter/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stable/prometheus-statsd-exporter/README.md b/stable/prometheus-statsd-exporter/README.md index 526cb879..e6b17074 100644 --- a/stable/prometheus-statsd-exporter/README.md +++ b/stable/prometheus-statsd-exporter/README.md @@ -62,6 +62,10 @@ helm install my-release deliveryhero/prometheus-statsd-exporter -f values.yaml | service.type | string | `"ClusterIP"` | | | serviceAccount.create | bool | `true` | | | serviceAccount.name | string | `""` | | +| metrics.enabled | bool | `false` | | +| metrics.additionalLabels | object | `{}` | | +| metrics.scrapeInterval | string | `"30s"` | | +| metrics.scrapeTimeout | string | `"10s"` | | | tolerations | list | `[]` | | ## Maintainers From 6639fdf521f3c44eebcf8a076f57879bf7335cb1 Mon Sep 17 00:00:00 2001 From: Abdullah Barrak Date: Mon, 22 Apr 2024 13:58:21 +0300 Subject: [PATCH 3/5] bump chart version --- stable/prometheus-statsd-exporter/Chart.yaml | 2 +- stable/prometheus-statsd-exporter/README.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stable/prometheus-statsd-exporter/Chart.yaml b/stable/prometheus-statsd-exporter/Chart.yaml index b0ef3eb4..ba92e81a 100644 --- a/stable/prometheus-statsd-exporter/Chart.yaml +++ b/stable/prometheus-statsd-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: v0.18.0 description: StatsD to Prometheus metrics exporter name: prometheus-statsd-exporter -version: 0.1.3 +version: 0.1.4 home: https://github.com/prometheus/statsd_exporter sources: - https://github.com/prometheus/statsd_exporter diff --git a/stable/prometheus-statsd-exporter/README.md b/stable/prometheus-statsd-exporter/README.md index e6b17074..da470237 100644 --- a/stable/prometheus-statsd-exporter/README.md +++ b/stable/prometheus-statsd-exporter/README.md @@ -53,6 +53,10 @@ helm install my-release deliveryhero/prometheus-statsd-exporter -f values.yaml | image.repository | string | `"prom/statsd-exporter"` | | | image.tag | string | `"v0.18.0"` | | | imagePullSecrets | list | `[]` | | +| metrics.enabled | bool | `false` | | +| metrics.additionalLabels | object | `{}` | | +| metrics.scrapeInterval | string | `"30s"` | | +| metrics.scrapeTimeout | string | `"10s"` | | | nameOverride | string | `""` | | | nodeSelector | object | `{}` | | | podSecurityContext | object | `{}` | | @@ -62,10 +66,6 @@ helm install my-release deliveryhero/prometheus-statsd-exporter -f values.yaml | service.type | string | `"ClusterIP"` | | | serviceAccount.create | bool | `true` | | | serviceAccount.name | string | `""` | | -| metrics.enabled | bool | `false` | | -| metrics.additionalLabels | object | `{}` | | -| metrics.scrapeInterval | string | `"30s"` | | -| metrics.scrapeTimeout | string | `"10s"` | | | tolerations | list | `[]` | | ## Maintainers From 2ad41594d1ac4ea6083c4db97d86dadba0e55347 Mon Sep 17 00:00:00 2001 From: Abdullah Barrak Date: Mon, 22 Apr 2024 15:11:52 +0300 Subject: [PATCH 4/5] fix docs linter --- stable/prometheus-statsd-exporter/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/prometheus-statsd-exporter/README.md b/stable/prometheus-statsd-exporter/README.md index da470237..bcd128ed 100644 --- a/stable/prometheus-statsd-exporter/README.md +++ b/stable/prometheus-statsd-exporter/README.md @@ -53,8 +53,8 @@ helm install my-release deliveryhero/prometheus-statsd-exporter -f values.yaml | image.repository | string | `"prom/statsd-exporter"` | | | image.tag | string | `"v0.18.0"` | | | imagePullSecrets | list | `[]` | | -| metrics.enabled | bool | `false` | | | metrics.additionalLabels | object | `{}` | | +| metrics.enabled | bool | `false` | | | metrics.scrapeInterval | string | `"30s"` | | | metrics.scrapeTimeout | string | `"10s"` | | | nameOverride | string | `""` | | From 251bf5677252354a9d3bdd94a6ff0ad71a3164c7 Mon Sep 17 00:00:00 2001 From: Abdullah Barrak Date: Mon, 22 Apr 2024 15:44:33 +0300 Subject: [PATCH 5/5] bump version --- stable/prometheus-statsd-exporter/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/prometheus-statsd-exporter/README.md b/stable/prometheus-statsd-exporter/README.md index bcd128ed..eeae11b6 100644 --- a/stable/prometheus-statsd-exporter/README.md +++ b/stable/prometheus-statsd-exporter/README.md @@ -1,6 +1,6 @@ # prometheus-statsd-exporter -![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![AppVersion: v0.18.0](https://img.shields.io/badge/AppVersion-v0.18.0-informational?style=flat-square) +![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![AppVersion: v0.18.0](https://img.shields.io/badge/AppVersion-v0.18.0-informational?style=flat-square) StatsD to Prometheus metrics exporter