for idaholab#446, allow specifying OPENSEARCH_INDEX_SIZE_PRUNE_LIMIT …

…for other database modes
mmguero-dev · Sep 16, 2024 · 87086cd · 87086cd
1 parent f9067e5
commit 87086cd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/scripts/install.py b/scripts/install.py
@@ -1369,10 +1369,7 @@ def tweak_malcolm_runtime(self, malcolm_install_path):
                     diskUsageManagementPrompt = InstallerYesOrNo(
                         (
                             'Should Malcolm delete the oldest database indices and capture artifacts based on available storage?'
-                            if (
-                                (opensearchPrimaryMode == DatabaseMode.OpenSearchLocal)
-                                and (malcolmProfile == PROFILE_MALCOLM)
-                            )
+                            if (malcolmProfile == PROFILE_MALCOLM)
                             else 'Should Malcolm delete the oldest capture artifacts based on available storage?'
                         ),
                         default=args.arkimeManagePCAP
@@ -1384,14 +1381,10 @@ def tweak_malcolm_runtime(self, malcolm_install_path):
                     if diskUsageManagementPrompt:
 
                         # delete oldest indexes based on index pattern size
-                        if (
-                            (malcolmProfile == PROFILE_MALCOLM)
-                            and (opensearchPrimaryMode == DatabaseMode.OpenSearchLocal)
-                            and InstallerYesOrNo(
-                                'Delete the oldest indices when the database exceeds a certain size?',
-                                default=bool(args.indexPruneSizeLimit),
-                                extraLabel=BACK_LABEL,
-                            )
+                        if (malcolmProfile == PROFILE_MALCOLM) and InstallerYesOrNo(
+                            'Delete the oldest indices when the database exceeds a certain size?',
+                            default=bool(args.indexPruneSizeLimit),
+                            extraLabel=BACK_LABEL,
                         ):
                             indexPruneSizeLimit = ''
                             loopBreaker = CountUntilException(MaxAskForValueCount, 'Invalid index threshold')

diff --git a/shared/bin/opensearch_index_size_prune.py b/shared/bin/opensearch_index_size_prune.py
@@ -223,9 +223,11 @@ def main():
             if ('node' in stat) and (stat['node'] != 'UNASSIGNED'):
                 esDiskUsageStats.append(
                     {
-                        key: humanfriendly.parse_size(value)
-                        if re.match(r'^\d+(\.\d+)?\s*[kmgtp]?b$', value, flags=re.IGNORECASE)
-                        else value
+                        key: (
+                            humanfriendly.parse_size(value)
+                            if re.match(r'^\d+(\.\d+)?\s*[kmgtp]?b$', value, flags=re.IGNORECASE)
+                            else value
+                        )
                         for (key, value) in stat.items()
                     }
                 )