Merge branch 'feat/fix_enable_disable_zabbix_alarms_FIX' into 'dev'

Feat/fix enable disable zabbix alarms fix See merge request dbdev/dbaas!12
globocom · Jun 12, 2023 · 573ad1b · 573ad1b
2 parents f0a1d5d + f13f379
commit 573ad1b
Showing 1 changed file with 27 additions and 6 deletions.
diff --git a/dbaas/workflow/steps/util/zabbix.py b/dbaas/workflow/steps/util/zabbix.py
@@ -334,12 +334,22 @@ def __unicode__(self):
     def do(self):
         if not self.is_valid:
             return
-        self.zabbix_provider.disable_alarms()
+        # Try and Exception to fix error Session terminated
+        try:
+            self.zabbix_provider.disable_alarms()
+        except:
+            self.provider_write = None
+            self.zabbix_provider.disable_alarms()
 
     def undo(self):
         if not self.is_valid:
             return
-        self.zabbix_provider.enable_alarms()
+        # Try and Exception to fix error Session terminated
+        try:
+            self.zabbix_provider.enable_alarms()
+        except:
+            self.provider_write = None
+            self.zabbix_provider.enable_alarms()
 
 
 class EnableAlarms(ZabbixStep):
@@ -354,11 +364,22 @@ def is_valid(self):
     def do(self):
         if not self.is_valid:
             return
-
-        self.zabbix_provider.enable_alarms()
+        # Try and Exception to fix error Session terminated
+        try:
+            self.zabbix_provider.enable_alarms()
+        except:
+            self.provider_write = None
+            self.zabbix_provider.enable_alarms()
 
     def undo(self):
-        self.zabbix_provider.disable_alarms()
+        if not self.is_valid:
+            return
+        # Try and Exception to fix error Session terminated
+        try:
+            self.zabbix_provider.disable_alarms()
+        except:
+            self.provider_write = None
+            self.zabbix_provider.disable_alarms()
 
 
 class UpdateMonitoring(ZabbixStep):
@@ -422,4 +443,4 @@ def do(self):
             host_name=self.instance.dns,
             macro='{$MONGO_SSL}',
             value=value
-        )
+        )