cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix bugs

Browse source
This commit is contained in:
Michael Gröning 2014-11-07 17:16:48 +01:00 committed by Greg DeKoenigsberg
parent 304abbce85
commit f9041a1b29
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
monitoring/nagios.py
View file

@ -217,7 +217,7 @@ def main():
# 'minutes' and 'service' manually.
##################################################################
if action not in ['command', 'silence_nagios', 'unsilence_nagios', 'servicegroup_downtime']:
if action not in ['command', 'silence_nagios', 'unsilence_nagios']:
if not host:
module.fail_json(msg='no host specified for action requiring one')
######################################################################
@ -289,7 +289,7 @@ class Nagios(object):
self.action = kwargs['action']
self.author = kwargs['author']
self.host = kwargs['host']
self.service_group = kwargs['servicegroup']
self.servicegroup = kwargs['servicegroup']
self.minutes = int(kwargs['minutes'])
self.cmdfile = kwargs['cmdfile']
self.command = kwargs['command']
@ -879,11 +879,11 @@ class Nagios(object):
services=self.services,
minutes=self.minutes)
elif self.action == "servicegroup_host_downtime":
if self.services == 'servicegroup':
self.schedule_servicegroup_host_downtime(self, self.servicegroup, minutes=30)
if self.servicegroup:
self.schedule_servicegroup_host_downtime(servicegroup = self.servicegroup, minutes = self.minutes)
elif self.action == "servicegroup_service_downtime":
if self.services == 'servicegroup':
self.schedule_servicegroup_host_downtime(self, self.servicegroup, minutes=30)
if self.servicegroup:
self.schedule_servicegroup_svc_downtime(servicegroup = self.servicegroup, minutes = self.minutes)
# toggle the host AND service alerts
elif self.action == 'silence':