Skip to content

Commit

Permalink
feat(thanos): Added rule instance label support
Browse files Browse the repository at this point in the history 
Signed-off-by: Steve Hipwell <[email protected]>
  • Loading branch information
@stevehipwell
stevehipwell committed Dec 6, 2023
1 parent fa3e2b2 commit 47996ed
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 3 deletions.
1 change: 1 addition & 0 deletions charts/thanos/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Added `compact.deduplication.enabled` value to disable compact deduplication.
- Added `compact.deduplication.func` value to set the compact deduplication function.
- Added `rule.instanceLabel` to set the label `thanos-rule` to `<NAMESPACE>/<RULE_FULLNAME>`.

### Changed

Expand Down
7 changes: 5 additions & 2 deletions charts/thanos/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ helm upgrade --install --namespace default --values ./my-values.yaml my-release
The following table lists the configurable parameters of the _Thanos_ chart and their default values.

| Parameter | Description | Default |
|----------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------|
| -------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------ |
| `image.repository` | Image repository. | `quay.io/thanos/thanos` |
| `image.tag` | Image tag; this will default to `.Chart.AppVersion` if not set (tag can be completely omitted by setting it to `-`) . | |
| `image.digest` | Image digest. | |
Expand Down Expand Up @@ -58,7 +58,9 @@ The following table lists the configurable parameters of the _Thanos_ chart and
| `compact.priorityClassName` | Priority class name to use for the compact pod. | `""` |
| `compact.terminationGracePeriodSeconds` | Termination grace period for the compact pod. | `null` |
| `compact.extraEnv` | Extra environment variables for the _thanos-compact_ container in the compact pod. | `[]` |
| `compact.replicaDeduplication` | If `true`, use the `penalty` deduplication function optimised for HA Prometheus replicas. | `false` |
| `compact.deduplication.enabled` | If `true`, deduplication is enabled for compact. | `true` |
| `compact.deduplication.func` | If specified override the default deduplication function. | `false` |
| `compact.replicaDeduplication` | **DEPRECATED** - If `true`, use the `penalty` deduplication function optimised for HA Prometheus replicas. | |
| `compact.extraArgs` | Extra arguments for the _thanos-compact_ container in the compact pod. | `[]` |
| `compact.livenessProbe` | Liveness probe for the compact pod. | See _values.yaml_ |
| `compact.readinessProbe` | Readiness probe for the compact pod. | See _values.yaml_ |
Expand Down Expand Up @@ -245,6 +247,7 @@ The following table lists the configurable parameters of the _Thanos_ chart and
| `rule.priorityClassName` | Priority class name to use for the rule pod. | `""` |
| `rule.terminationGracePeriodSeconds` | Termination grace period for the rule pod. | `null` |
| `rule.extraEnv` | Extra environment variables for the _thanos-rule_ container in the rule pod. | `[]` |
| `rule.instanceLabel` | If `true`, add a label for the rule instance. | `false` |
| `rule.retention` | Block retention period on local disk (`--tsdb.retention`). | `48h` |
| `rule.blockDuration` | Block duration for TSDB block (`--tsdb.block-duration`). | `2h` |
| `rule.evalInterval` | Rule evaluation interval (`--eval-interval`). | `1m` |
Expand Down
2 changes: 2 additions & 0 deletions charts/thanos/ci/kubeconform.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ rule:
- key: system
operator: Exists

instanceLabel: true

storeGateway:
podDisruptionBudget:
enabled: true
Expand Down
5 changes: 4 additions & 1 deletion charts/thanos/templates/rule/statefulset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ spec:
- --http-address=0.0.0.0:10902
- --data-dir=/var/thanos/rule
- --objstore.config-file=/etc/thanos/objstore.yaml
{{- if .Values.rule.instanceLabel }}
- {{ printf "--label=thanos-rule=%s/%s" .Release.Namespace (include "thanos.rule.fullname" .) }}
{{- end }}
- --label=rule_replica="$(NAME)"
- --alert.label-drop=rule_replica
{{- if .Values.receive.enabled }}
Expand All @@ -86,7 +89,7 @@ spec:
{{- end }}
- --tsdb.retention={{ .Values.rule.retention }}
- --tsdb.block-duration={{ .Values.rule.blockDuration }}
- {{ printf "--query=dnssrv+_http._tcp.%s.%s.svc.%s" (include "thanos.query.fullname" .) .Release.Namespace .Values.clusterDomain}}
- {{ printf "--query=dnssrv+_http._tcp.%s.%s.svc.%s" (include "thanos.query.fullname" .) .Release.Namespace .Values.clusterDomain }}
- --rule-file=/etc/thanos/rules/*.yaml
- --eval-interval={{ .Values.rule.evalInterval }}
- --alertmanagers.config-file=/etc/thanos/alertmanagers-config.yaml
Expand Down
1 change: 1 addition & 0 deletions charts/thanos/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@ rule:

extraEnv: []

instanceLabel: false
retention: 48h
blockDuration: 2h
evalInterval: 1m
Expand Down

0 comments on commit 47996ed

Please sign in to comment.