diff --git a/cluster/apps/rook-system/benji/helm-release.yaml b/cluster/apps/rook-system/benji/helm-release.yaml index 5ba58664f..4c59df97b 100644 --- a/cluster/apps/rook-system/benji/helm-release.yaml +++ b/cluster/apps/rook-system/benji/helm-release.yaml @@ -20,7 +20,7 @@ spec: timeZone: Europe/Paris benji: configuration: - configurationVersion: '1' + configurationVersion: "1" databaseEngine: postgresql://benji:secret@benji-postgresql-headless:5432/benji defaultStorage: storage-1 storages: @@ -48,12 +48,12 @@ spec: activeDeadlineSeconds: null startingDeadlineSeconds: null crontab: - - name: backup-data + - name: backup-pvc schedule: "00 22 * * *" command: - benji-backup-pvc - --selector - - 'benji-backup.me/instance=benji-k8s' + - "benji-backup.me/instance=benji-k8s" - name: benji-enforce schedule: "30 22 * * *" command: diff --git a/cluster/apps/rook-system/benji/kustomization.yaml b/cluster/apps/rook-system/benji/kustomization.yaml index bc7678bc6..e6cbed3c7 100644 --- a/cluster/apps/rook-system/benji/kustomization.yaml +++ b/cluster/apps/rook-system/benji/kustomization.yaml @@ -8,3 +8,4 @@ resources: - podmonitor.yaml - prometheus-rule.yaml - pgbackups.yaml + #- job.yaml diff --git a/cluster/core/rook-ceph/cluster/helm-release.yaml b/cluster/core/rook-ceph/cluster/helm-release.yaml index 51efbff8f..e6c54018f 100644 --- a/cluster/core/rook-ceph/cluster/helm-release.yaml +++ b/cluster/core/rook-ceph/cluster/helm-release.yaml @@ -53,7 +53,7 @@ spec: devices: - name: "nvme0n1" cephBlockPools: - - name: ceph-blockpool + - name: replicapool spec: failureDomain: host replicated: diff --git a/cluster/core/rook-ceph/monitoring/servicemonitor.yaml b/cluster/core/rook-ceph/monitoring/servicemonitor.yaml index cb4b8f61d..438e453ff 100644 --- a/cluster/core/rook-ceph/monitoring/servicemonitor.yaml +++ b/cluster/core/rook-ceph/monitoring/servicemonitor.yaml @@ -18,26 +18,26 @@ spec: - port: http-metrics path: /metrics interval: 5s ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: csi-metrics - namespace: rook-ceph - labels: - team: rook -spec: - namespaceSelector: - matchNames: - - rook-ceph - selector: - matchLabels: - app: csi-metrics - endpoints: - - port: csi-http-metrics - path: /metrics - interval: 5s - # comment csi-grpc-metrics realated information if csi grpc metrics is not enabled - - port: csi-grpc-metrics - path: /metrics - interval: 5s +# --- +# apiVersion: monitoring.coreos.com/v1 +# kind: ServiceMonitor +# metadata: +# name: csi-metrics +# namespace: rook-ceph +# labels: +# team: rook +# spec: +# namespaceSelector: +# matchNames: +# - rook-ceph +# selector: +# matchLabels: +# app: csi-metrics +# endpoints: +# - port: csi-http-metrics +# path: /metrics +# interval: 5s +# # comment csi-grpc-metrics realated information if csi grpc metrics is not enabled +# - port: csi-grpc-metrics +# path: /metrics +# interval: 5s