create a new resolved attribute for incidents

Author: diegocepedaw

db/dummy_data.sql

@@ -68,9 +68,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `incident` WRITE;
 INSERT INTO `incident` VALUES
-    (1,40,'2017-01-25 23:22:55','2017-01-25 23:24:55','{\"console_url\": \"\", \"fabric\": \"DC1\", \"notes\": \"This is a note\", \"filename\": \"dashboard\", \"zones\": [\"zone1\", \"zone2\"], \"metanodes\": [[\"execution_time.metanode1\", \"threshold: 72 is greater than the max (65)\"]], \"nodes\": [[\"execution_time.server1.example.com\", \"threshold: 72 is greater than the max (65)\"]], \"graph_image_url\": \"http://url.example.com/foo\", \"name\":\"API Alert\"}',1,8,1,0),
-    (2,40,'2017-01-25 23:22:55','2017-01-25 23:24:55','{\"console_url\": \"\", \"fabric\": \"DC1\", \"notes\": \"This is a note\", \"filename\": \"dashboard\", \"zones\": [\"zone1\", \"zone2\"], \"metanodes\": [[\"execution_time.metanode1\", \"threshold: 72 is greater than the max (65)\"]], \"nodes\": [[\"execution_time.server1.example.com\", \"threshold: 72 is greater than the max (65)\"]], \"graph_image_url\": \"http://url.example.com/foo\", \"name\":\"API Alert\"}',1,8,1,0),
-    (3,40,'2017-01-25 23:22:55','2017-01-25 23:24:55','{\"console_url\": \"\", \"fabric\": \"DC1\", \"notes\": \"This is a note\", \"filename\": \"dashboard\", \"zones\": [\"zone1\", \"zone2\"], \"metanodes\": [[\"execution_time.metanode1\", \"threshold: 72 is greater than the max (65)\"]], \"nodes\": [[\"execution_time.server1.example.com\", \"threshold: 72 is greater than the max (65)\"]], \"graph_image_url\": \"http://url.example.com/foo\", \"name\":\"API Alert\"}',1,8,1,0);
+    (1,40,'2017-01-25 23:22:55','2017-01-25 23:24:55','{\"console_url\": \"\", \"fabric\": \"DC1\", \"notes\": \"This is a note\", \"filename\": \"dashboard\", \"zones\": [\"zone1\", \"zone2\"], \"metanodes\": [[\"execution_time.metanode1\", \"threshold: 72 is greater than the max (65)\"]], \"nodes\": [[\"execution_time.server1.example.com\", \"threshold: 72 is greater than the max (65)\"]], \"graph_image_url\": \"http://url.example.com/foo\", \"name\":\"API Alert\"}',1,8,1,0,0),
+    (2,40,'2017-01-25 23:22:55','2017-01-25 23:24:55','{\"console_url\": \"\", \"fabric\": \"DC1\", \"notes\": \"This is a note\", \"filename\": \"dashboard\", \"zones\": [\"zone1\", \"zone2\"], \"metanodes\": [[\"execution_time.metanode1\", \"threshold: 72 is greater than the max (65)\"]], \"nodes\": [[\"execution_time.server1.example.com\", \"threshold: 72 is greater than the max (65)\"]], \"graph_image_url\": \"http://url.example.com/foo\", \"name\":\"API Alert\"}',1,8,1,0,0),
+    (3,40,'2017-01-25 23:22:55','2017-01-25 23:24:55','{\"console_url\": \"\", \"fabric\": \"DC1\", \"notes\": \"This is a note\", \"filename\": \"dashboard\", \"zones\": [\"zone1\", \"zone2\"], \"metanodes\": [[\"execution_time.metanode1\", \"threshold: 72 is greater than the max (65)\"]], \"nodes\": [[\"execution_time.server1.example.com\", \"threshold: 72 is greater than the max (65)\"]], \"graph_image_url\": \"http://url.example.com/foo\", \"name\":\"API Alert\"}',1,8,1,0,0);
 UNLOCK TABLES;
 
 LOCK TABLES `incident_emails` WRITE;

db/schema_0.sql

@@ -59,6 +59,7 @@ CREATE TABLE `incident` (
   `application_id` int(11) NOT NULL,
   `current_step` int(11) NOT NULL,
   `active` tinyint(1) NOT NULL,
+  `resolved` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `ix_incident_plan_id` (`plan_id`),
   KEY `ix_incident_updated` (`updated`),

src/iris/api.py

@@ -161,7 +161,8 @@ def ts_to_sql_datetime(ts):
     'created': 'UNIX_TIMESTAMP(`incident`.`created`) as `created`',
     'owner': '`target`.`name` as `owner`',
     'current_step': '`incident`.`current_step` as `current_step`',
-    'title_variable_name': '`template_variable`.`name` as `title_variable_name`'
+    'title_variable_name': '`template_variable`.`name` as `title_variable_name`',
+    'resolved': '`incident`.`resolved` as `resolved`'
 }
 
 incident_filters = {
@@ -175,6 +176,7 @@ def ts_to_sql_datetime(ts):
     'created': '`incident`.`created`',
     'owner': '`target`.`name`',
     'current_step': '`incident`.`current_step`',
+    'resolved': '`incident`.`resolved` as `resolved`'
 }
 
 incident_filter_types = {
@@ -200,7 +202,8 @@ def ts_to_sql_datetime(ts):
     `target`.`name` as `owner`,
     `application`.`name` as `application`,
     `incident`.`current_step` as `current_step`,
-    `incident`.`active` as `active`
+    `incident`.`active` as `active`,
+    `incident`.`resolved` as `resolved`
 FROM `incident`
 JOIN `plan` ON `incident`.`plan_id` = `plan`.`id`
 LEFT OUTER JOIN `target` ON `incident`.`owner_id` = `target`.`id`
@@ -1873,6 +1876,24 @@ def on_post(self, req, resp, incident_id):
                                  'active': is_active})
 
 
+class Resolved(object):
+    allow_read_no_auth = False
+
+    def on_post(self, req, resp, incident_id):
+
+        incident_params = ujson.loads(req.context['body'])
+        if 'resolved' not in incident_params:
+            raise HTTPBadRequest('resolved field required')
+        resolved = incident_params.get('resolved')
+        try:
+            utils.resolve_incident(incident_id, resolved)
+        except Exception as e:
+            raise HTTPInternalServerError(description=e)
+        resp.status = HTTP_200
+        resp.body = ujson.dumps({'incident_id': incident_id,
+                                 'resolved': resolved})
+
+
 class ClaimIncidents(object):
     allow_read_no_auth = False
 
@@ -5263,6 +5284,7 @@ def construct_falcon_api(debug, healthcheck_path, allowed_origins, iris_sender_a
     api.add_route('/v0/incidents/{incident_id}', Incident())
     api.add_route('/v0/incidents', Incidents())
     api.add_route('/v0/incidents/claim', ClaimIncidents())
+    api.add_route('/v0/incidents/{incident_id}/resolve', Resolved())
     api.add_route('/v0/incidents/{incident_id}/comments', Comments())
 
     api.add_route('/v0/messages/{message_id}', Message())

src/iris/ui/static/js/iris.js

@@ -1260,7 +1260,7 @@ iris = {
     initialized: false,
     data: {
       url: '/v0/incidents/',
-      fields: ['id', 'owner', 'application', 'plan', 'plan_id', 'created', 'updated', 'active', 'current_step'],
+      fields: ['id', 'owner', 'application', 'plan', 'plan_id', 'created', 'updated', 'active', 'current_step', 'resolved'],
       $page: $('.main'),
       $table: $('#incidents-table'),
       $filterApp: $('#filter-application'),
@@ -1284,6 +1284,7 @@ iris = {
           { width: '10%' },
           { width: '10%' },
           null,
+          null,
           null
         ]
       }
@@ -1501,6 +1502,7 @@ iris = {
       reescalateBtn: '#re-escalate-btn',
       reescalatePlanContainer: '.re-escalate-plan-container',
       claimIncidentBtn: '#claim-incident',
+      resolveIncidentBtn: '#resolve-incident',
       showAddCommentBtn: '#show-comment',
       hideAddCommentBtn: '#cancel-comment',
       addCommentBtn: '#comment-incident',
@@ -1537,6 +1539,7 @@ iris = {
       data.$page.on('click', data.showReescalateBtn, this.reescalateModal.bind(this));
       data.$page.on('click', data.selectPlanBtn, this.selectPlan.bind(this));
       data.$page.on('click', data.reescalateBtn, this.reescalateIncident.bind(this));
+      data.$page.on('click', data.resolveIncidentBtn, this.resolveIncident.bind(this));
     },
     showComment: function() {
       $(this.data.addCommentContainer).show();
@@ -1618,6 +1621,27 @@ iris = {
         $this.prop('disabled', false);
       });
     },
+    resolveIncident: function(e){
+      var $this = $(e.target),
+          resolved = $this.attr('data-action') === 'resolve' ? true : false,
+          self = this,
+          incidentId = $this.attr('data-id');
+      $.ajax({
+        url: self.data.url + incidentId + '/resolve',
+        data: JSON.stringify({
+          resolved: resolved
+        }),
+        method: 'POST',
+        contentType: 'application/json'
+      }).done(function(){
+        self.getIncident(incidentId).done(function(){
+          var message = resolved ? 'Incident ' + incidentId + ' marked as resolved.' : 'Incident ' + incidentId + ' marked as unresolved.';
+          iris.createAlert(message, 'success');
+        });
+      }).fail(function(){
+        iris.createAlert('Failed to modify incident', 'danger');
+      });
+    },
     reescalateModal: function() {
       var $modal = $(this.data.reescalateModal),
           self = this;

src/iris/ui/templates/incident.html

@@ -13,10 +13,10 @@ <h3>
         <span class="light"> Owner:</span> {{#if owner}} {{owner}} {{else}} Unclaimed {{/if}}
       </span>
       {{#isUser owner}}
-        <button type="button" id="claim-incident" class="pull-right btn btn-default blue btn-sm" data-id="{{id}}" data-action="unclaim">Unclaim Incident</button>
+        <button type="button" id="claim-incident" class="pull-right btn btn-default blue btn-sm" data-id="{{id}}" data-action="unclaim" data-toggle="tooltip" data-placement="right" title="This will cause the incident to continue escalating where it left off at the time it was claimed">Unclaim Incident</button>
       {{else}}
         {{#if active}}
-          <button type="button" id="claim-incident" class="pull-right btn btn-default blue btn-sm" data-id="{{id}}" data-action="claim">Claim Incident</button>
+          <button type="button" id="claim-incident" class="pull-right btn btn-default blue btn-sm" data-id="{{id}}" data-action="claim" data-toggle="tooltip" data-placement="right" title="This stops any further escalation and marks you as the owner of the incident">Claim Incident</button>
         {{else}}
           {{#if owner}}
             <button type="button" id="claim-incident" class="pull-right btn btn-default btn-sm disabled" disabled data-id="{{id}}" data-action="claim">Claimed</button>
@@ -25,8 +25,18 @@ <h3>
           {{/if}}
         {{/if}}
       {{/isUser}}
-      <button type="button" id="re-escalate-modal-btn" class="pull-right btn btn-default blue btn-sm">Re-escalate</button>
+      <button type="button" id="re-escalate-modal-btn" class="pull-right btn btn-default blue btn-sm" data-toggle="tooltip" data-placement="left" title="Re-raise this incident using a different plan">Re-escalate</button>
     </h3>
+    <h4>
+      {{#if owner}}
+        {{#if resolved}} <i>Resolved</i> {{else}} Unresolved{{/if}}
+          {{#if resolved}}
+            <button type="button" id="resolve-incident" class="pull-right btn btn-default blue btn-sm" data-id="{{id}}" data-action="unresolve" data-toggle="tooltip" data-placement="right" title="This removes a semantic tag that indicates the underlying issue is mitigated">Mark Unresolved</button>
+          {{else}}
+            <button type="button" id="resolve-incident" class="pull-right btn btn-default blue btn-sm" data-id="{{id}}" data-action="resolve" data-toggle="tooltip" data-placement="right" title="This applies a semantic tag that indicates the underlying issue is mitigated">Mark Resolved</button>
+          {{/if}}
+        {{/if}}
+    </h4>
     <span class="light italic"><small>created at {{convertToLocal created}}</small></span>
     {{#if updated}}
       <span class="light">|</span>

src/iris/ui/templates/incidents.html

@@ -142,6 +142,7 @@ <h4 class="modal-title">Claim all active incidents</h4>
       <td class="light created">Created On <i class="glyphicon glyphicon-sort"></i></td>
       <td class="light active">Active <i class="glyphicon glyphicon-sort"></i></td>
       <td class="light claim center">Claim <i class="glyphicon glyphicon-sort"></i></td>
+      <td class="light resolved">Resolved <i class="glyphicon glyphicon-sort"></i></td>
     </tr>
   </thead>
   <tbody>
@@ -181,6 +182,7 @@ <h4 class="modal-title">Claim all active incidents</h4>
           {{/if}}
         {{/isUser}}
         </td>
+        <td> {{#if resolved}} Resolved {{else}} Unresolved {{/if}}</td>
       </tr>
     {{/each}}
   </tbody>

src/iris/ui/templates/plan.html

@@ -94,7 +94,7 @@ <h5>Target {{this}}</h5>
   <div class="module">
     <h3>
       {{name}} <i class="badge" data-active="{{active}}"> </i>
-      <button type="button" class="btn btn-default blue btn-sm pull-right" id="clone-plan">Clone Plan</button>
+      <button type="button" class="btn btn-default blue btn-sm pull-right" id="clone-plan" data-toggle="tooltip" data-placement="right" title="Make changes to the plan or fork it off into a new plan">Edit Plan</button>
       <button type="button" class="btn btn-default blue btn-sm pull-right" id="test-plan-modal-btn">Test Plan</button>
     </h3>
     <div class="form-inline version-container">

src/iris/ui/templates/template.html

@@ -59,7 +59,7 @@ <h4 class="modal-title">Related Plans</h4>
     {{#if viewMode}}
     <h3>
       {{name}} <i class="badge" data-active="{{active}}"> </i>
-      <button type="button" class="btn btn-default blue btn-sm pull-right" id="clone-template">Clone template</button>
+      <button type="button" class="btn btn-default blue btn-sm pull-right" id="clone-template" data-toggle="tooltip" data-placement="right" title="Make changes to the template or fork it off into a new template">Edit template</button>
     </h3>
     <div><small><a class="view-related" data-toggle="modal" data-target="#view-related-modal" data-name="{{name}}" href=""> View all plans using this template. </a></small></div>
     <div class="form-inline pull-left version-container">

src/iris/utils.py

@@ -312,6 +312,30 @@ def claim_incidents_from_batch_id(batch_id, owner):
     connection.close()
 
 
+def resolve_incident(incident_id, resolved_state):
+
+    now = datetime.datetime.utcnow()
+    resolved = 1
+    if not resolved_state:
+        resolved = 0
+
+    connection = db.engine.raw_connection()
+    cursor = connection.cursor()
+    try:
+        cursor.execute('''UPDATE `incident`
+                        SET `incident`.`updated` = %(updated)s,
+                            `incident`.`resolved` = %(resolved)s
+                            WHERE `incident`.`id` = %(incident_id)s''',
+                       {'incident_id': incident_id, 'resolved': resolved, 'updated': now})
+
+        connection.commit()
+    except Exception:
+        logger.exception('failed updating resolved state for incident %s', incident_id)
+    finally:
+        cursor.close()
+        connection.close()
+
+
 def msgpack_unpack_msg_from_socket(socket):
     unpacker = msgpack.Unpacker()
     while True:

test/e2etest.py

@@ -1297,6 +1297,13 @@ def test_post_incident(sample_user, sample_team, sample_application_name, sample
     assert re.status_code == 400
     assert re.json()['title'] == 'Invalid claim: no matching owner'
 
+    # Test resolvling
+    re = requests.post(base_url + 'incidents/%s/resolve' % incident_id, headers=username_header(sample_user), json={
+        'resolved': True
+    })
+    assert re.status_code == 200
+    assert re.json() == {'incident_id': str(incident_id), 'resolved': True}
+
 
 def test_post_dynamic_incident(sample_user, sample_team, sample_application_name, sample_template_name):
     data = {