triggers panel: show data source info for trigger
This commit is contained in:
11
dist/panel-triggers/partials/module.html
vendored
11
dist/panel-triggers/partials/module.html
vendored
@@ -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">
|
||||
|
||||
10
dist/panel-triggers/triggers_panel_ctrl.js
vendored
10
dist/panel-triggers/triggers_panel_ctrl.js
vendored
@@ -330,6 +330,8 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
|
||||
return _this5.getAcknowledges(triggers, ds);
|
||||
}).then(function (triggers) {
|
||||
return _this5.filterTriggers(triggers, ds);
|
||||
}).then(function (triggers) {
|
||||
return _this5.addTriggerDataSource(triggers, ds);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -402,6 +404,14 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
|
||||
|
||||
return triggerList;
|
||||
}
|
||||
}, {
|
||||
key: 'addTriggerDataSource',
|
||||
value: function addTriggerDataSource(triggers, ds) {
|
||||
_.each(triggers, function (trigger) {
|
||||
trigger.datasource = ds;
|
||||
});
|
||||
return triggers;
|
||||
}
|
||||
}, {
|
||||
key: 'sortTriggers',
|
||||
value: function sortTriggers(triggerList) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user