Merge pull request #123 from ARGOeu/devel

Version 0.6.1
ARGOeu · Jul 4, 2024 · 7999ba7 · 7999ba7
2 parents a528544 + 7361257
commit 7999ba7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/argo-scg.spec b/argo-scg.spec
@@ -4,7 +4,7 @@
 
 Summary:       ARGO Sensu configuration manager.
 Name:          argo-scg
-Version:       0.6.0
+Version:       0.6.1
 Release:       1%{?dist}
 Source0:       %{name}-%{version}.tar.gz
 License:       ASL 2.0
@@ -48,6 +48,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 4 2024 Katarina Zailac <[email protected]> - 0.6.1-1%{?dist}
+- ARGO-4564 When clearing namespace for deletion, remove all the silenced entries
 * Mon Jun 17 2024 Katarina Zailac <[email protected]> - 0.6.0-1%{?dist}
 - ARGO-4555 Display only events for the given tenant
 - ARGO-4663 Fix wrongly referenced variable

diff --git a/modules/sensu.py b/modules/sensu.py
@@ -84,7 +84,7 @@ def handle_namespaces(self):
             try:
                 subprocess.check_output(
                     f"sensuctl dump "
-                    f"entities,events,assets,checks,filters,handlers "
+                    f"entities,events,assets,checks,filters,handlers,silenced "
                     f"--namespace {namespace} | sensuctl delete", shell=True
                 )
                 self.logger.info(f"Namespace {namespace} emptied")

diff --git a/tests/test_sensu.py b/tests/test_sensu.py
@@ -3826,8 +3826,8 @@ def test_handle_namespaces_with_deletion(
             )
         ], any_order=True)
         mock_subprocess.assert_called_once_with(
-            "sensuctl dump entities,events,assets,checks,filters,handlers "
-            "--namespace Tenant5 | sensuctl delete", shell=True
+            "sensuctl dump entities,events,assets,checks,filters,handlers,"
+            "silenced --namespace Tenant5 | sensuctl delete", shell=True
         )
         mock_delete.assert_called_once_with(
             "https://sensu.mock.com:8080/api/core/v2/namespaces/Tenant5",
@@ -3877,8 +3877,8 @@ def test_handle_namespaces_with_deletion_subprocess_error(
             )
         ], any_order=True)
         mock_subprocess.assert_called_once_with(
-            "sensuctl dump entities,events,assets,checks,filters,handlers "
-            "--namespace Tenant5 | sensuctl delete", shell=True
+            "sensuctl dump entities,events,assets,checks,filters,handlers,"
+            "silenced --namespace Tenant5 | sensuctl delete", shell=True
         )
         self.assertEqual(mock_delete.call_count, 0)
         self.assertEqual(
@@ -3925,8 +3925,8 @@ def test_handle_namespaces_with_deletion_error_delete_api_with_msg(
             )
         ], any_order=True)
         mock_subprocess.assert_called_once_with(
-            "sensuctl dump entities,events,assets,checks,filters,handlers "
-            "--namespace Tenant5 | sensuctl delete", shell=True
+            "sensuctl dump entities,events,assets,checks,filters,handlers,"
+            "silenced --namespace Tenant5 | sensuctl delete", shell=True
         )
         mock_delete.assert_called_once_with(
             "https://sensu.mock.com:8080/api/core/v2/namespaces/Tenant5",
@@ -3975,8 +3975,8 @@ def test_handle_namespaces_with_deletion_error_delete_api_without_msg(
             )
         ], any_order=True)
         mock_subprocess.assert_called_once_with(
-            "sensuctl dump entities,events,assets,checks,filters,handlers "
-            "--namespace Tenant5 | sensuctl delete", shell=True
+            "sensuctl dump entities,events,assets,checks,filters,handlers,"
+            "silenced --namespace Tenant5 | sensuctl delete", shell=True
         )
         mock_delete.assert_called_once_with(
             "https://sensu.mock.com:8080/api/core/v2/namespaces/Tenant5",