Skip to content

CA-201311: Fix email alert text when trigger level is 0 #2603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 2, 2016
Merged

CA-201311: Fix email alert text when trigger level is 0 #2603

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions scripts/mail-alarm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ class EmailTextGenerator:

class CpuUsageAlarmETG(EmailTextGenerator):
def __init__(self, cls, obj_uuid, value, alarm_trigger_period, alarm_trigger_level):
if not alarm_trigger_period: alarm_trigger_period = 60
if alarm_trigger_period is None:
alarm_trigger_period = 60
if cls == 'Host':
self.params = get_host_params(obj_uuid)
elif cls == 'VM':
Expand Down Expand Up @@ -144,7 +145,8 @@ class CpuUsageAlarmETG(EmailTextGenerator):

class NetworkUsageAlarmETG(EmailTextGenerator):
def __init__(self, cls, obj_uuid, value, alarm_trigger_period, alarm_trigger_level):
if not alarm_trigger_period: alarm_trigger_period = 60
if alarm_trigger_period is None:
alarm_trigger_period = 60
if cls == 'Host':
self.params = get_host_params(obj_uuid)
elif cls == 'VM':
Expand Down Expand Up @@ -178,7 +180,8 @@ class NetworkUsageAlarmETG(EmailTextGenerator):

class MemoryUsageAlarmETG(EmailTextGenerator):
def __init__(self, cls, obj_uuid, value, alarm_trigger_period, alarm_trigger_level):
if not alarm_trigger_period: alarm_trigger_period = 60
if alarm_trigger_period is None:
alarm_trigger_period = 60
if cls != 'Host':
raise Exception, "programmer error - this alarm should only be available for hosts"
self.params = get_host_params(obj_uuid)
Expand Down Expand Up @@ -208,7 +211,8 @@ class MemoryUsageAlarmETG(EmailTextGenerator):

class DiskUsageAlarmETG(EmailTextGenerator):
def __init__(self, cls, obj_uuid, value, alarm_trigger_period, alarm_trigger_level):
if not alarm_trigger_period: alarm_trigger_period = 60
if alarm_trigger_period is None:
alarm_trigger_period = 60
if cls != 'VM':
raise Exception, "programmer error - this alarm should only be available for VMs"
self.params = get_VM_params(obj_uuid)
Expand Down Expand Up @@ -237,7 +241,8 @@ class DiskUsageAlarmETG(EmailTextGenerator):

class Dom0FSUsageAlarmETG(EmailTextGenerator):
def __init__(self, cls, obj_uuid, value, alarm_trigger_level):
if not alarm_trigger_level: alarm_trigger_level = 0.9
if alarm_trigger_level is None:
alarm_trigger_level = 0.9
if cls != 'VM':
raise Exception, "programmer error - this alarm should only be available for control domain VM"
self.params = get_VM_params(obj_uuid)
Expand All @@ -261,7 +266,8 @@ class Dom0FSUsageAlarmETG(EmailTextGenerator):

class Dom0MemUsageAlarmETG(EmailTextGenerator):
def __init__(self, cls, obj_uuid, value, alarm_trigger_level):
if not alarm_trigger_level: alarm_trigger_level = 0.95
if alarm_trigger_level is None:
alarm_trigger_level = 0.95
if cls != 'VM':
raise Exception, "programmer error - this alarm should only be available for control domain VM"
self.params = get_VM_params(obj_uuid)
Expand Down