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
22 changes: 22 additions & 0 deletions charts/base-cluster/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -393,4 +393,26 @@ ingress:
provider: nginx
```

### 8.x.x -> 9.0.0

This release adds the capability to configure alertmanager to push it's alerts
to multiple receivers, including email.

To migrate to this new version you have to remove `.monitoring.prometheus.alertmanager.receivers.pagerduty.enabled`

### 9.x.x -> 10.0.0

This release adds support for [k8up](https://k8up.io) as a backup provider.

If you are using velero, you need to migrate to using `.backup.provider.velero`.

### 10.x.x -> 11.0.0

This release fixes the grafana tempo deployment compaction / retention.

For this we switched from the distributed deployment to the single binary deployment.

Because of this you need to migrate to the `.monitoring.tracing.<field>` instead
of `.monitoring.tracing.ingester.<field>`

{{ .Files.Get "values.md" }}
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ spec:

otelcol.exporter.otlp "tempo" {
client {
endpoint = "grafana-tempo-distributor:4317"
endpoint = "grafana-tempo:4317"

tls {
insecure = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,51 +9,51 @@ metadata:
app.kubernetes.io/part-of: monitoring
spec:
chart:
spec: {{- include "base-cluster.helm.chartSpec" (dict "repo" "grafana" "chart" "tempo-distributed" "context" $) | nindent 6 }}
spec: {{- include "base-cluster.helm.chartSpec" (dict "repo" "grafana" "chart" "tempo" "context" $) | nindent 6 }}
interval: 1h
driftDetection:
mode: enabled
dependsOn:
- name: kube-prometheus-stack
namespace: monitoring
values:
{{- if .Values.global.imageRegistry }}
global:
image:
registry: {{ $.Values.global.imageRegistry }}
{{- end }}
ingester: {{- include "common.resourcesWithPreset" .Values.monitoring.tracing.ingester | nindent 6 }}
persistentVolumeClaimRetentionPolicy:
enabled: true
whenDeleted: Delete
whenScaled: Retain
replicas: &replicas 1
config:
replication_factor: *replicas
persistence:
enabled: true
size: {{ .Values.monitoring.tracing.ingester.persistence.size }}
tempo:
{{- with .Values.global.imageRegistry }}
registry: {{ . }}
{{- end }}
resources: {{- include "common.resources" .Values.monitoring.tracing.resources | nindent 8 }}
Comment thread
cwrau marked this conversation as resolved.
Comment thread
cwrau marked this conversation as resolved.
Comment thread
cwrau marked this conversation as resolved.
securityContext:
privileged: false
seLinuxOptions: {}
seccompProfile:
type: RuntimeDefault
podSecurityContext:
fsGroupChangePolicy: OnRootMismatch
supplementalGroups: []
sysctls: []
receivers:
otlp:
protocols:
grpc:
endpoint: "0.0.0.0:4317"
reportingEnabled: false

persistentVolumeClaimRetentionPolicy:
enabled: true
whenDeleted: Delete
whenScaled: Retain
replicas: 1
retention: 48h
persistence:
enabled: true
size: {{ .Values.monitoring.tracing.persistence.size }}
securityContext:
fsGroupChangePolicy: OnRootMismatch
supplementalGroups: []
sysctls: []
metricsGenerator:
enabled: true
traces:
otlp:
grpc:
enabled: true
metaMonitoring:
serviceMonitor:
enabled: true
labels:
monitoring/provisioned-by: base-cluster
remoteWriteUrl: "http://kube-prometheus-stack-prometheus:9090/api/v1/write"
serviceMonitor:
enabled: true
additionalLabels:
monitoring/provisioned-by: base-cluster
---
apiVersion: v1
kind: ConfigMap
Expand Down
30 changes: 12 additions & 18 deletions charts/base-cluster/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -871,30 +871,24 @@
"enabled": {
"type": "boolean"
},
"ingester": {
"resourcesPreset": {
"$ref": "#/$defs/resourcesPreset"
},
"resources": {
"$ref": "#/$defs/resourceRequirements"
},
"persistence": {
"type": "object",
"properties": {
"resourcesPreset": {
"$ref": "#/$defs/resourcesPreset"
},
"resources": {
"$ref": "#/$defs/resourceRequirements"
},
"persistence": {
"type": "object",
"properties": {
"size": {
"$ref": "#/$defs/quantity"
}
},
"additionalProperties": false
"size": {
"$ref": "#/$defs/quantity"
}
},
"additionalProperties": false
}
}
},
"additionalProperties": false
},
"additionalProperties": false
}
},
"additionalProperties": false
},
Expand Down
11 changes: 5 additions & 6 deletions charts/base-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ global:
charts:
loki: 6.46.0
alloy: 1.5.0
tempo-distributed: 1.57.0
tempo: 1.24.1
condition: "{{ and .Values.monitoring.prometheus.enabled (or .Values.monitoring.loki.enabled .Values.monitoring.tracing.enabled) }}"
external-dns:
url: https://kubernetes-sigs.github.io/external-dns
Expand Down Expand Up @@ -347,11 +347,10 @@ monitoring:
effect: NoSchedule
tracing:
enabled: false
ingester:
resourcesPreset: small
resources: {}
persistence:
size: 10Gi
resourcesPreset: small
resources: {}
persistence:
size: 10Gi

descheduler:
enabled: true
Expand Down
Loading