triggers panel: show data source info for trigger

This commit is contained in:
Alexander Zobnin
2017-12-11 11:35:03 +03:00
parent 5e7a3d7a5d
commit 087a4de9a0
10 changed files with 59 additions and 17 deletions

View File

@@ -33,10 +33,13 @@
</div>
</div>
<div class="alert-list-footer">
<span class="alert-list-text">{{trigger.lastchange}}</span>
<span class="alert-list-text">
<!--Img Link-->
</span>
<div class="trigger-info-block">
<span ng-if="ctrl.panel.datasources.length > 1" class="alert-list-text zabbix-trigger-source">
<i class="gicon gicon-datasources"></i>
{{trigger.datasource}}
</span>
<span class="alert-list-text">{{trigger.lastchange}}</span>
</div>
<div class="trigger-info-block">
<a ng-if="trigger.url" href="{{trigger.url}}" target="_blank">

View File

@@ -210,6 +210,8 @@ export class TriggerPanelCtrl extends PanelCtrl {
return this.getAcknowledges(triggers, ds);
}).then((triggers) => {
return this.filterTriggers(triggers, ds);
}).then((triggers) => {
return this.addTriggerDataSource(triggers, ds);
});
});
@@ -277,6 +279,13 @@ export class TriggerPanelCtrl extends PanelCtrl {
return triggerList;
}
addTriggerDataSource(triggers, ds) {
_.each(triggers, (trigger) => {
trigger.datasource = ds;
});
return triggers;
}
sortTriggers(triggerList) {
if (this.panel.sortTriggersBy.value === 'priority') {
triggerList = _.sortBy(triggerList, ['priority', 'triggerid']).reverse();

View File

@@ -17,13 +17,22 @@
.trigger-info-block {
display: inline;
i {
margin-right: 0.4rem;
}
i,
a {
i, a {
color: $gray-2;
}
.zabbix-trigger-source {
margin-right: 1.5rem;
font-weight: bold;
.gicon-datasources {
opacity: 0.4;
}
}
}
}