Merge 38e697c into bf44118

hc/api/management/commands/sendalerts.py

@@ -21,11 +21,12 @@ def handle_many(self):
         now = timezone.now()
         going_down = query.filter(alert_after__lt=now, status="up")
         going_up = query.filter(alert_after__gt=now, status="down")
-        going_nag = query.filter(nag_after__lt=now, status="down", nag_mode=True)
+        # checks that are in nag_mode and the status is down, this will get all checks to be nagged
+        checks_to_nag = query.filter(nag_after__lt=now, status="down", nag_mode=True)
         #job runs often
         # going_often = query.filter(alert_after__lt=now, status="often")
         # Don't combine this in one query so Postgres can query using index:
-        checks = list(going_down.iterator()) + list(going_up.iterator()) + list(going_nag.iterator())
+        checks = list(going_down.iterator()) + list(going_up.iterator()) + list(checks_to_nag.iterator())
         if not checks:
             return False
 
@@ -49,7 +50,13 @@ def handle_one(self, check):
         check.save()
 
         if check.status == "down":
+            # this will check the status has gone down
             if check.nag_mode == True:
+                ''' 
+                This will ensure that after a check has gone down then
+                the nag_mode is set to True. This is done at the same time
+                as when the first alert has been sent.
+                '''
                 check.nag_after = (timezone.now() + check.nag_interval)
                 check.save()
 

static/css/my_checks.css

@@ -45,6 +45,11 @@
 #nag-slider.noUi-connect {
   background: #f0ad4e;
 } 
+#nag_check{
+    width: 470px;
+    background-color: #fafafa;
+    border-radius: 3px;
+}
 
 #period-slider .noUi-value, #grace-slider .noUi-value, #nag-slider .noUi-value {
     width: 60px;

templates/front/my_checks.html

@@ -157,7 +157,7 @@ <h4 class="update-timeout-title">Name and Tags</h4>
                                 title="Tag Nag Mode on.">
                                 Nag Mode
                             </span>
-                            <select name="nag_mode">
+                            <select name="nag_mode" id="nag_check">
                                 <option value="True">True</option>
                                 <option selected="selected" value="False">False</option>
                             </select>

templates/front/my_checks_desktop.html

@@ -31,9 +31,6 @@
             {% elif check.get_status == "down" %}
                 <span class="status icon-down"></span>
             {% endif %}
-            {% if check.nag_mode == True %}
-                <span class="glyphicon glyphicon-exclamation-sign" style="color:rgb(235, 82, 82)"></span>
-            {% endif %}
         </td>
         <td class="name-cell">
             <div data-name="{{ check.name }}"