diff --git a/clusters/cl01tl/helm/grafana-operator/Chart.lock b/clusters/cl01tl/helm/grafana-operator/Chart.lock index f5a95e08e..01821e837 100644 --- a/clusters/cl01tl/helm/grafana-operator/Chart.lock +++ b/clusters/cl01tl/helm/grafana-operator/Chart.lock @@ -5,5 +5,11 @@ dependencies: - name: postgres-cluster repository: oci://harbor.alexlebens.net/helm-charts version: 6.16.1 -digest: sha256:9640766b4a15b50a759edbc8a2aad816f9240be72bf06364acb387464245d51a -generated: "2025-12-11T19:19:12.375716-06:00" +- name: redis-replication + repository: oci://harbor.alexlebens.net/helm-charts + version: 0.5.0 +- name: redis-replication + repository: oci://harbor.alexlebens.net/helm-charts + version: 0.5.0 +digest: sha256:4f60224b5cd36161d504cc17955b7927de2cb017b4bcaebb7c573bc55c080cb7 +generated: "2025-12-15T12:19:37.996743-06:00" diff --git a/clusters/cl01tl/helm/grafana-operator/Chart.yaml b/clusters/cl01tl/helm/grafana-operator/Chart.yaml index 07a25cf9d..94d4db365 100644 --- a/clusters/cl01tl/helm/grafana-operator/Chart.yaml +++ b/clusters/cl01tl/helm/grafana-operator/Chart.yaml @@ -23,5 +23,13 @@ dependencies: alias: postgres-18-cluster version: 6.16.1 repository: oci://harbor.alexlebens.net/helm-charts + - name: redis-replication + alias: redis-replication-unified-alerting + version: 0.5.0 + repository: oci://harbor.alexlebens.net/helm-charts + - name: redis-replication + alias: redis-replication-renovate + version: 0.5.0 + repository: oci://harbor.alexlebens.net/helm-charts icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/grafana.png appVersion: v5.20.0 diff --git a/clusters/cl01tl/helm/grafana-operator/templates/redis-replication.yaml b/clusters/cl01tl/helm/grafana-operator/templates/redis-replication.yaml deleted file mode 100644 index 2f3d24d1f..000000000 --- a/clusters/cl01tl/helm/grafana-operator/templates/redis-replication.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisReplication -metadata: - name: redis-replication-unified-alerting - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: redis-replication-unified-alerting - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - clusterSize: 3 - podSecurityContext: - runAsUser: 1000 - fsGroup: 1000 - kubernetesConfig: - image: quay.io/opstree/redis:v8.4.0 - imagePullPolicy: IfNotPresent - resources: - requests: - cpu: 50m - memory: 128Mi - storage: - volumeClaimTemplate: - spec: - storageClassName: ceph-block - accessModes: ["ReadWriteOnce"] - resources: - requests: - storage: 1Gi - redisExporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.80.1 - ---- -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisReplication -metadata: - name: redis-replication-remote-cache - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: redis-replication-remote-cache - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - clusterSize: 3 - podSecurityContext: - runAsUser: 1000 - fsGroup: 1000 - kubernetesConfig: - image: quay.io/opstree/redis:v8.4.0 - imagePullPolicy: IfNotPresent - resources: - requests: - cpu: 50m - memory: 128Mi - storage: - volumeClaimTemplate: - spec: - storageClassName: ceph-block - accessModes: ["ReadWriteOnce"] - resources: - requests: - storage: 1Gi - redisExporter: - enabled: true - image: quay.io/opstree/redis-exporter:v1.80.1 diff --git a/clusters/cl01tl/helm/grafana-operator/templates/service-monitor.yaml b/clusters/cl01tl/helm/grafana-operator/templates/service-monitor.yaml deleted file mode 100644 index 3acedd21d..000000000 --- a/clusters/cl01tl/helm/grafana-operator/templates/service-monitor.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: redis-replication-grafana-operator - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: redis-replication-grafana-operator - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} - redis-operator: "true" - env: production -spec: - selector: - matchLabels: - redis_setup_type: replication - endpoints: - - port: redis-exporter - interval: 30s - scrapeTimeout: 10s diff --git a/clusters/cl01tl/helm/grafana-operator/values.yaml b/clusters/cl01tl/helm/grafana-operator/values.yaml index 58c99fc07..bd8d8fdd8 100644 --- a/clusters/cl01tl/helm/grafana-operator/values.yaml +++ b/clusters/cl01tl/helm/grafana-operator/values.yaml @@ -73,3 +73,21 @@ postgres-18-cluster: # immediate: true # schedule: "0 0 4 * * SAT" # backupName: garage-remote +redis-replication-unified-alerting: + replicationNameOverride: redis-replication-unified-alerting + sentinelNameOverride: redis-sentinel-unified-alerting + existingSecret: + enabled: false + redisReplication: + clusterSize: 3 + redisSentinel: + enabled: true + clusterSize: 3 +redis-replication-remote-cache: + replicationNameOverride: redis-replication-remote-cache + existingSecret: + enabled: false + redisReplication: + clusterSize: 1 + redisSentinel: + enabled: false