apps sc: replace opensearch slm and backup with snapshot management p…

…olicy
elastisys · Nov 14, 2024 · 39a506d · 39a506d
1 parent 4440cac
commit 39a506d
Show file tree

Hide file tree

Showing 35 changed files with 143 additions and 761 deletions.
diff --git a/config/flavors/air-gapped/sc-config.yaml b/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:

diff --git a/config/flavors/dev/sc-config.yaml b/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:

diff --git a/config/flavors/prod/sc-config.yaml b/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:

diff --git a/config/sc-config.yaml b/config/sc-config.yaml
@@ -972,22 +972,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

diff --git a/docs/sbom.yaml b/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"

diff --git a/helmfile.d/charts/README.md b/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>
     ```
diff --git a/helmfile.d/charts/grafana-dashboards/dashboards/backup-dashboard.json b/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}}",

diff --git a/helmfile.d/charts/networkpolicy/service-cluster/templates/opensearch/backup.yaml b/helmfile.d/charts/networkpolicy/service-cluster/templates/opensearch/backup.yaml
diff --git a/helmfile.d/charts/networkpolicy/service-cluster/templates/opensearch/master.yaml b/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

diff --git a/helmfile.d/charts/networkpolicy/service-cluster/templates/opensearch/slm.yaml b/helmfile.d/charts/networkpolicy/service-cluster/templates/opensearch/slm.yaml
diff --git a/helmfile.d/charts/opensearch/backup/.helmignore b/helmfile.d/charts/opensearch/backup/.helmignore
diff --git a/helmfile.d/charts/opensearch/backup/Chart.yaml b/helmfile.d/charts/opensearch/backup/Chart.yaml
diff --git a/helmfile.d/charts/opensearch/backup/scripts/backup.sh b/helmfile.d/charts/opensearch/backup/scripts/backup.sh
diff --git a/helmfile.d/charts/opensearch/backup/templates/_helpers.tpl b/helmfile.d/charts/opensearch/backup/templates/_helpers.tpl
diff --git a/helmfile.d/charts/opensearch/backup/templates/configmap.yaml b/helmfile.d/charts/opensearch/backup/templates/configmap.yaml
diff --git a/helmfile.d/charts/opensearch/backup/templates/cronjob.yaml b/helmfile.d/charts/opensearch/backup/templates/cronjob.yaml
diff --git a/helmfile.d/charts/opensearch/backup/values.yaml b/helmfile.d/charts/opensearch/backup/values.yaml