Merge pull request #207 from CBIIT/os_snapshot

Os snapshot
CBIIT · Aug 12, 2024 · e5e8fc4 · e5e8fc4
2 parents 971810a + 12007fe
commit e5e8fc4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/ansible/collections/bento/common/roles/opensearch_dataloading/files/opensearch-backup.py b/ansible/collections/bento/common/roles/opensearch_dataloading/files/opensearch-backup.py
@@ -68,13 +68,22 @@ def registerRepo(argList, awsauth):
 
 
 def createSnapshot(argList, awsauth):
+  # Create Index list to exclude hidden (default) indices
+  if argList['indices']:
+    print("setting backup to use listed indices")
+    indices = '-.*,' + argList['indices']
+  else:
+    print("setting backup to use all indices")
+    indices = '*,-.*'
+
   # Create Snapshot
   snapshot_url = argList['oshost'] + '_snapshot/' + argList['repo'] + '/' + argList['snapshot'] + '/'
   print(snapshot_url)
 
   headers = {"Content-Type": "application/json"}
   payload = {
-    "indices": argList['indices'],
+    "indices": indices,
+    "include_global_state": False
   }
 
   print("taking opensearch snapshot")

diff --git a/ansible/collections/bento/common/roles/opensearch_dataloading/files/opensearch-restore.py b/ansible/collections/bento/common/roles/opensearch_dataloading/files/opensearch-restore.py
@@ -102,10 +102,18 @@ def restoreIndexes(argList, awsauth):
   # Restoring Indexes
   print("started restore the indices")
 
+  # Create Index list to exclude hidden (default) indices
+  if argList['indices']:
+    print("setting restore to use listed indices")
+    indices = '-.*,' + argList['indices']
+  else:
+    print("setting restore to use all indices")
+    indices = '*,-.*'
+
   headers = {"Content-Type": "application/json"}
 
   payload = {
-    "indices": argList['indices'],
+    "indices": indices,
     "include_global_state": False,
   }
   path = '_snapshot/' + argList['repo'] + '/' + argList['snapshot'] + '/_restore'

diff --git a/terraform/modules/secrets/README.md b/terraform/modules/secrets/README.md
@@ -3,13 +3,13 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 4.66.1 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >=4.66.1 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.66.1 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >=4.66.1 |
 
 ## Modules
 
@@ -19,8 +19,8 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [aws_secretsmanager_secret.secrets](https://registry.terraform.io/providers/hashicorp/aws/4.66.1/docs/resources/secretsmanager_secret) | resource |
-| [aws_secretsmanager_secret_version.secrets_value](https://registry.terraform.io/providers/hashicorp/aws/4.66.1/docs/resources/secretsmanager_secret_version) | resource |
+| [aws_secretsmanager_secret.secrets](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/secretsmanager_secret) | resource |
+| [aws_secretsmanager_secret_version.secrets_value](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/secretsmanager_secret_version) | resource |
 
 ## Inputs