Replace OpenSearch SLM and Backup with SM Policy

config/flavors/air-gapped/sc-config.yaml

@@ -67,7 +67,7 @@ opensearch:
   snapshot:
     min: 300 # 12 / day * 30 days = 360, subtract some to account for failures
     max: 500
-    ageSeconds: 2592000 # 30 days
+    retentionAge: 30d # 30 days
     backupSchedule: 30 */2 * * * # 30 min past every 2nd hour to avoid collision with retention
 
 harbor:

config/flavors/dev/sc-config.yaml

@@ -43,7 +43,6 @@ opensearch:
   snapshot:
     enabled: false
     backupSchedule: 0 */12 * * * # run twice/day
-    retentionSchedule: 0 1 * * * # 1am
 
 prometheus:
   alertmanagerSpec:

config/flavors/prod/sc-config.yaml

@@ -63,7 +63,7 @@ opensearch:
   snapshot:
     min: 300 # 12 / day * 30 days = 360, subtract some to account for failures
     max: 500
-    ageSeconds: 2592000 # 30 days
+    retentionAge: 30d # 30 days
     backupSchedule: 30 */2 * * * # 30 min past every 2nd hour to avoid collision with retention
 
 harbor:

config/sc-config.yaml

@@ -973,22 +973,9 @@ opensearch:
     repository: opensearch-snapshots # Uses the bucket set in `objectStorage.buckets.opensearch`
     min: 7
     max: 14
-    ageSeconds: 864000
-    maxRequestSeconds: 1200
+    retentionAge: 10d
     backupSchedule: 0 */2 * * *
-    backupStartingDeadlineSeconds: 600
-    backupActiveDeadlineSeconds: 600
-    retentionSchedule: '@daily'
-    retentionStartingDeadlineSeconds: 600
-    retentionActiveDeadlineSeconds: 2700
-    retentionResources:
-      requests:
-        cpu: 50m
-        memory: 32Mi
-      limits:
-        cpu: 100m
-        memory: 128Mi
-
+    retentionSchedule: 0 0 * * *
   exporter:
     serviceMonitor:
       interval: 30s

config/schemas/config.yaml

@@ -5606,7 +5606,7 @@ properties:
       snapshot:
         title: OpenSearch Snapshot
         description: |-
-          Configures the CronJob and repository to take snapshots in OpenSearch.
+          Configure OpenSearch snapshot creation and retention.
 
           This requires that `objectStorage` is configured, and will use the bucket or container set in `objectStorage.buckets.opensearch`.
         type: object
@@ -5620,9 +5620,6 @@ properties:
             title: OpenSearch Snapshot Repository
             type: string
             default: opensearch-snapshots
-          ageSeconds:
-            default: 864000
-            type: number
           min:
             title: OpenSearch Minimum Retained Snapshots
             type: number
@@ -5631,41 +5628,24 @@ properties:
             title: OpenSearch Maximum Retained Snapshots
             default: 14
             type: number
-          maxRequestSeconds:
-            type: number
-            default: 1200
           backupSchedule:
-            title: OpenSearch Backup CronJob Schedule
+            title: OpenSearch Snapshot Backup Schedule
             description: |-
               Schedule to trigger Opensearch backups.
               Uses the Cron format, see https://en.wikipedia.org/wiki/Cron.
             default: 0 */2 * * *
             $ref: '#/$defs/cronSchedule'
-          backupStartingDeadlineSeconds:
-            title: OpenSearch Backup Job Starting Deadline
-            type: number
-            default: 600
-          backupActiveDeadlineSeconds:
-            title: OpenSearch Backup Job Active Deadline
-            type: number
-            default: 600
           retentionSchedule:
-            title: OpenSearch Retention CronJob Schedule
+            title: OpenSearch Snapshot Retention Schedule
             description: |-
               Schedule to check for and remove old snapshots.
               Uses the Cron format, see https://en.wikipedia.org/wiki/Cron.
-            default: '@daily'
+            default: '0 0 * * *'
             $ref: '#/$defs/cronSchedule'
-          retentionStartingDeadlineSeconds:
-            title: OpenSearch Retention Job Starting Deadline
-            type: number
-            default: 600
-          retentionActiveDeadlineSeconds:
-            title: OpenSearch Retention Job Active Deadline
-            type: number
-            default: 2700
-          retentionResources:
-            $ref: '#/$defs/kubernetesResourceRequirements'
+          retentionAge:
+            title: OpenSearch Maximum Snapshot Age
+            type: string
+            default: '10d'
       securityadmin:
         title: OpenSearch Security Admin
         description: Configures the Job that initialises OpenSearch Security.

docs/sbom.yaml

@@ -466,10 +466,6 @@
   name: node-local-dns
   app_version: ''
   chart_version: 0.1.1
-- domain: Custom Helm Charts
-  name: opensearch-backup
-  app_version: 0.1.0
-  chart_version: 0.1.0
 - domain: Custom Helm Charts
   name: opensearch-configurer
   app_version: 0.1.0
@@ -486,10 +482,6 @@
   name: opensearch-securityadmin
   app_version: 0.1.0
   chart_version: 0.1.0
-- domain: Custom Helm Charts
-  name: opensearch-slm
-  app_version: 0.1.0
-  chart_version: 0.1.0
 - domain: Custom Helm Charts
   name: openstack-monitoring
   app_version: 1.16.0
@@ -780,7 +772,6 @@
     - opensearch
     - init-harbor
     - opensearch-configurer
-    - opensearch-backup
 - domain: Container images
   name: "docker.io/opensearchproject/opensearch-dashboards"
   tag: "2.12.0"

helmfile.d/charts/README.md

@@ -8,11 +8,11 @@ As part of our effort to make our Helm charts available for public and internal
 
     ```terminal
     cd helmfile.d/charts
-    helm pull --verify oci://ghcr.io/elastisys/opensearch-slm --version 0.1.0 --keyring public.gpg
+    helm pull --verify oci://ghcr.io/elastisys/opensearch-configurer --version 0.1.0 --keyring public.gpg
     ```
 
 1. Pull and install charts e.g:
 
     ```terminal
-    helm install opensearch-slm oci://ghcr.io/elastisys/opensearch-slm --version 0.1.0 --namespace <NAMESPACE>
+    helm install opensearch-configurer oci://ghcr.io/elastisys/opensearch-configurer --version 0.1.0 --namespace <NAMESPACE>
     ```

helmfile.d/charts/grafana-dashboards/dashboards/backup-dashboard.json

@@ -218,7 +218,7 @@
       "pluginVersion": "8.2.7",
       "targets": [
         {
-          "expr": "min((time()-kube_job_status_completion_time{job_name=~\"opensearch-backup-.*\", cluster=~\"$cluster\"})/3600)",
+          "expr": "min((time()-elasticsearch_snapshot_stats_latest_snapshot_timestamp_seconds{cluster=~\"$cluster\"})/3600)",
           "instant": false,
           "interval": "",
           "legendFormat": "{{job_name}}",

helmfile.d/charts/networkpolicy/service-cluster/templates/opensearch/master.yaml

@@ -16,12 +16,6 @@ spec:
         - podSelector:
             matchLabels:
               app.kubernetes.io/instance: opensearch-curator
-        - podSelector:
-            matchLabels:
-              app.kubernetes.io/instance: opensearch-backup
-        - podSelector:
-            matchLabels:
-              app.kubernetes.io/instance: opensearch-slm
         - podSelector:
             matchLabels:
               app: opensearch-dashboards