diff --git a/clusters/cl01tl/manifests/outline/RedisReplication-redis-replication-outline.yaml b/clusters/cl01tl/manifests/outline/RedisReplication-redis-replication-outline.yaml index b73317956..e76e90ac6 100644 --- a/clusters/cl01tl/manifests/outline/RedisReplication-redis-replication-outline.yaml +++ b/clusters/cl01tl/manifests/outline/RedisReplication-redis-replication-outline.yaml @@ -4,29 +4,33 @@ metadata: name: redis-replication-outline namespace: outline labels: + helm.sh/chart: redis-replication-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-outline app.kubernetes.io/instance: outline app.kubernetes.io/part-of: outline spec: clusterSize: 3 podSecurityContext: - runAsUser: 1000 fsGroup: 1000 + runAsUser: 1000 kubernetesConfig: - image: quay.io/opstree/redis:v8.4.0 + image: "quay.io/opstree/redis:v8.4.0" imagePullPolicy: IfNotPresent resources: requests: - cpu: 50m - memory: 128Mi + cpu: 10m + memory: 32Mi storage: volumeClaimTemplate: spec: - storageClassName: ceph-block - accessModes: ["ReadWriteOnce"] + accessModes: + - ReadWriteOnce resources: requests: storage: 1Gi + storageClassName: ceph-block redisExporter: enabled: true - image: quay.io/opstree/redis-exporter:v1.80.1 + image: "quay.io/opstree/redis-exporter:v1.80.1" diff --git a/clusters/cl01tl/manifests/outline/RedisSentinel-redis-sentinel-outline.yaml b/clusters/cl01tl/manifests/outline/RedisSentinel-redis-sentinel-outline.yaml index eb0a20d24..192075d5e 100644 --- a/clusters/cl01tl/manifests/outline/RedisSentinel-redis-sentinel-outline.yaml +++ b/clusters/cl01tl/manifests/outline/RedisSentinel-redis-sentinel-outline.yaml @@ -4,20 +4,26 @@ metadata: name: redis-sentinel-outline namespace: outline labels: + helm.sh/chart: redis-replication-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-sentinel-outline app.kubernetes.io/instance: outline app.kubernetes.io/part-of: outline spec: clusterSize: 3 podSecurityContext: - runAsUser: 1000 fsGroup: 1000 + runAsUser: 1000 redisSentinelConfig: redisReplicationName: redis-replication-outline kubernetesConfig: - image: quay.io/opstree/redis-sentinel:v8.4.0 + image: "quay.io/opstree/redis-sentinel:v8.4.0" imagePullPolicy: IfNotPresent resources: requests: cpu: 10m - memory: 128Mi + memory: 32Mi + redisExporter: + enabled: true + image: "quay.io/opstree/redis-exporter:v1.80.1" diff --git a/clusters/cl01tl/manifests/outline/ServiceMonitor-redis-replication-outline.yaml b/clusters/cl01tl/manifests/outline/ServiceMonitor-redis-replication-outline.yaml index 3d9883949..5a5e56b7e 100644 --- a/clusters/cl01tl/manifests/outline/ServiceMonitor-redis-replication-outline.yaml +++ b/clusters/cl01tl/manifests/outline/ServiceMonitor-redis-replication-outline.yaml @@ -4,15 +4,18 @@ metadata: name: redis-replication-outline namespace: outline labels: + helm.sh/chart: redis-replication-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: redis-replication-outline app.kubernetes.io/instance: outline app.kubernetes.io/part-of: outline - redis-operator: "true" - env: production spec: selector: matchLabels: + app: redis-replication-outline redis_setup_type: replication + role: replication endpoints: - port: redis-exporter interval: 30s diff --git a/clusters/cl01tl/manifests/outline/ServiceMonitor-redis-sentinel-outline.yaml b/clusters/cl01tl/manifests/outline/ServiceMonitor-redis-sentinel-outline.yaml new file mode 100644 index 000000000..51cb6f450 --- /dev/null +++ b/clusters/cl01tl/manifests/outline/ServiceMonitor-redis-sentinel-outline.yaml @@ -0,0 +1,22 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: redis-sentinel-outline + namespace: outline + labels: + helm.sh/chart: redis-replication-0.5.0 + app.kubernetes.io/version: "0.5.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: redis-sentinel-outline + app.kubernetes.io/instance: outline + app.kubernetes.io/part-of: outline +spec: + selector: + matchLabels: + app: redis-sentinel-outline + redis_setup_type: sentinel + role: sentinel + endpoints: + - port: sentinel-client + interval: 30s + scrapeTimeout: 10s