Merge branch 'show_no_data_in_list'

public/app/features/alerting/alert_list_ctrl.ts

@@ -37,6 +37,9 @@ export class AlertListCtrl {
       this.alerts = _.map(result, alert => {
         alert.stateModel = alertDef.getStateDisplayModel(alert.state);
         alert.newStateDateAgo = moment(alert.newStateDate).fromNow().replace(" ago", "");
+        if (alert.evalData && alert.evalData.no_data) {
+          alert.no_data = true;
+        }
         return alert;
       });
     });

public/app/features/alerting/alert_tab_ctrl.ts

@@ -82,6 +82,15 @@ export class AlertTabCtrl {
         ah.time = moment(ah.time).format('MMM D, YYYY HH:mm:ss');
         ah.stateModel = alertDef.getStateDisplayModel(ah.newState);
         ah.metrics = alertDef.joinEvalMatches(ah.data, ', ');
+
+        if (ah.data.errorMessage) {
+          ah.metrics = "Error: " + ah.data.errorMessage;
+        }
+
+        if (ah.data.no_data) {
+          ah.metrics = "(due to no data)";
+        }
+
         return ah;
       });
     });

public/app/features/alerting/partials/alert_list.html

@@ -52,11 +52,11 @@
               <div class="card-item-sub-name">
                 <span class="alert-list-item-state {{alert.stateModel.stateClass}}">
                   <i class="{{alert.stateModel.iconClass}}"></i>
-                  {{alert.stateModel.text}}
+                  {{alert.stateModel.text}} <span class="small muted" ng-show="alert.no_data">(due to no data)</span>
                 </span> for {{alert.newStateDateAgo}}
               </div>
-              <div class="small muted" ng-show="alert.executionError">
-                {{alert.executionError}}
+              <div class="small muted" ng-show="alert.executionError !== ''">
+                Error: "{{alert.executionError}}"
               </div>
             </div>
           </div>
@@ -64,6 +64,4 @@
       </li>
     </ol>
   </section>
-
 </div>
-