Просмотр исходного кода

feat(alerting): move timestamp to new row

ref #5850
bergquist 9 лет назад
Родитель
Сommit
53a9dec407

+ 2 - 2
public/app/features/alerting/alert_tab_ctrl.ts

@@ -76,11 +76,11 @@ export class AlertTabCtrl {
       });
     }).then(() => {
       this.backendSrv.get(`/api/alert-history?dashboardId=${this.panelCtrl.dashboard.id}&panelId=${this.panel.id}`).then(res => {
-        this.alertHistory = _.map(res, (ah) => {
+        this.alertHistory = _.map(res, ah => {
           ah.time = moment(ah.timestamp).format('MMM D, YYYY HH:mm:ss');
           ah.stateModel = alertDef.getStateDisplayModel(ah.newState);
 
-          ah.metrics = _.map(ah.data, (ev) => {
+          ah.metrics = _.map(ah.data, ev=> {
             return ev.Metric + "=" + ev.Value;
           }).join(', ');
 

+ 5 - 2
public/app/features/alerting/partials/alert_tab.html

@@ -134,8 +134,11 @@
 									<div class="card-item-sub-name">
 										<span class="alert-list-item-state {{ah.stateModel.stateClass}}">
 											<i class="{{ah.stateModel.iconClass}}"></i>
-											{{ah.text}}
-										</span> at {{ah.time}} {{ah.metrics}}
+											{{ah.stateModel.text}}
+										</span> {{ah.metrics}}
+									</div>
+									<div class="card-item-sub-name">
+										{{ah.time}}
 									</div>
 								</div>
 							</div>