Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions charts/drop/templates/metrics-scraper-rbac.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{{- if and .Values.serviceMonitor.enabled .Values.metrics.enabled .Values.metrics.secureServing }}
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "drop.fullname" . }}-metrics-scraper
labels:
{{- include "drop.labels" . | nindent 4 }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ include "drop.fullname" . }}-metrics-scraper-token
labels:
{{- include "drop.labels" . | nindent 4 }}
annotations:
kubernetes.io/service-account.name: {{ include "drop.fullname" . }}-metrics-scraper
type: kubernetes.io/service-account-token
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ include "drop.fullname" . }}-metrics-scraper
labels:
{{- include "drop.labels" . | nindent 4 }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ include "drop.fullname" . }}-metrics-reader
subjects:
- kind: ServiceAccount
name: {{ include "drop.fullname" . }}-metrics-scraper
namespace: {{ .Release.Namespace }}
{{- end }}
25 changes: 21 additions & 4 deletions charts/drop/templates/servicemonitor.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{{- if .Values.serviceMonitor.enabled }}
{{- if and .Values.serviceMonitor.enabled .Values.metrics.enabled }}
{{- if and .Values.metrics.secureServing (not .Values.certManager.enabled) }}
{{- fail "serviceMonitor.enabled with metrics.secureServing requires certManager.enabled=true so the scraper can verify the metrics TLS certificate" }}
{{- end }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
Expand All @@ -11,14 +14,28 @@ metadata:
spec:
endpoints:
- port: https-metrics
scheme: https
interval: {{ .Values.serviceMonitor.interval }}
{{- if .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- if .Values.metrics.secureServing }}
scheme: https
# Token is read from a Secret instead of bearerTokenFile, which is
# rejected by Grafana Alloy and newer Prometheus Operator setups.
authorization:
type: Bearer
credentials:
name: {{ include "drop.fullname" . }}-metrics-scraper-token
key: token
tlsConfig:
insecureSkipVerify: true
bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
serverName: {{ include "drop.fullname" . }}-metrics.{{ .Release.Namespace }}.svc
ca:
secret:
name: {{ include "drop.fullname" . }}-metrics-tls
key: ca.crt
{{- else }}
scheme: http
{{- end }}
selector:
matchLabels:
{{- include "drop.selectorLabels" . | nindent 6 }}
Expand Down
12 changes: 11 additions & 1 deletion docs/content/docs/monitoring.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,19 @@ llmsDescription: |

```bash
helm install drop oci://ghcr.io/corewire/charts/drop \
--set serviceMonitor.enabled=true
--set serviceMonitor.enabled=true \
--set certManager.enabled=true
```

With `metrics.secureServing=true` (default) the chart creates a dedicated
`<release>-metrics-scraper` ServiceAccount, a token Secret, and a binding to
`<release>-metrics-reader`. The ServiceMonitor references that token via
`authorization.credentials`, so it works with scrapers that forbid
`bearerTokenFile` (e.g. Grafana Alloy). The scraper verifies the metrics
certificate against the cert-manager CA, so `certManager.enabled=true` is
required; rendering fails otherwise. With `metrics.secureServing=false` the
endpoint is scraped over plain HTTP without authentication.

### Example Queries

```promql
Expand Down
Loading