Skip to content

Commit 573ad1b

Browse files
author
iago.henrique
committed
Merge branch 'feat/fix_enable_disable_zabbix_alarms_FIX' into 'dev'
Feat/fix enable disable zabbix alarms fix See merge request dbdev/dbaas!12
2 parents f0a1d5d + f13f379 commit 573ad1b

File tree

1 file changed

+27
-6
lines changed

1 file changed

+27
-6
lines changed

dbaas/workflow/steps/util/zabbix.py

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -334,12 +334,22 @@ def __unicode__(self):
334334
def do(self):
335335
if not self.is_valid:
336336
return
337-
self.zabbix_provider.disable_alarms()
337+
# Try and Exception to fix error Session terminated
338+
try:
339+
self.zabbix_provider.disable_alarms()
340+
except:
341+
self.provider_write = None
342+
self.zabbix_provider.disable_alarms()
338343

339344
def undo(self):
340345
if not self.is_valid:
341346
return
342-
self.zabbix_provider.enable_alarms()
347+
# Try and Exception to fix error Session terminated
348+
try:
349+
self.zabbix_provider.enable_alarms()
350+
except:
351+
self.provider_write = None
352+
self.zabbix_provider.enable_alarms()
343353

344354

345355
class EnableAlarms(ZabbixStep):
@@ -354,11 +364,22 @@ def is_valid(self):
354364
def do(self):
355365
if not self.is_valid:
356366
return
357-
358-
self.zabbix_provider.enable_alarms()
367+
# Try and Exception to fix error Session terminated
368+
try:
369+
self.zabbix_provider.enable_alarms()
370+
except:
371+
self.provider_write = None
372+
self.zabbix_provider.enable_alarms()
359373

360374
def undo(self):
361-
self.zabbix_provider.disable_alarms()
375+
if not self.is_valid:
376+
return
377+
# Try and Exception to fix error Session terminated
378+
try:
379+
self.zabbix_provider.disable_alarms()
380+
except:
381+
self.provider_write = None
382+
self.zabbix_provider.disable_alarms()
362383

363384

364385
class UpdateMonitoring(ZabbixStep):
@@ -422,4 +443,4 @@ def do(self):
422443
host_name=self.instance.dns,
423444
macro='{$MONGO_SSL}',
424445
value=value
425-
)
446+
)

0 commit comments

Comments
 (0)