triggers panel: option for trigger description
This commit is contained in:
4
dist/panel-triggers/partials/module.html
vendored
4
dist/panel-triggers/partials/module.html
vendored
@@ -28,7 +28,9 @@
|
|||||||
</span>
|
</span>
|
||||||
for {{trigger.age}}
|
for {{trigger.age}}
|
||||||
|
|
||||||
<span class="alert-list-info alert-list-info-left">{{trigger.comments}}</span>
|
<span class="alert-list-info alert-list-info-left" ng-if="ctrl.panel.descriptionField">
|
||||||
|
{{trigger.comments}}
|
||||||
|
</span>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -25,6 +25,12 @@
|
|||||||
checked="editor.panel.severityField"
|
checked="editor.panel.severityField"
|
||||||
on-change="ctrl.render()">
|
on-change="ctrl.render()">
|
||||||
</gf-form-switch>
|
</gf-form-switch>
|
||||||
|
<gf-form-switch class="gf-form"
|
||||||
|
label-class="width-9"
|
||||||
|
label="Description"
|
||||||
|
checked="editor.panel.descriptionField"
|
||||||
|
on-change="ctrl.render()">
|
||||||
|
</gf-form-switch>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="section gf-form-group">
|
<div class="section gf-form-group">
|
||||||
|
|||||||
2
dist/panel-triggers/specs/migrations.spec.js
vendored
2
dist/panel-triggers/specs/migrations.spec.js
vendored
@@ -53,6 +53,7 @@ describe('Triggers Panel schema migration', () => {
|
|||||||
hostTechNameField: false,
|
hostTechNameField: false,
|
||||||
statusField: false,
|
statusField: false,
|
||||||
severityField: false,
|
severityField: false,
|
||||||
|
descriptionField: true,
|
||||||
hideHostsInMaintenance: false,
|
hideHostsInMaintenance: false,
|
||||||
showTriggers: 'all triggers',
|
showTriggers: 'all triggers',
|
||||||
sortTriggersBy: { text: 'last change', value: 'lastchange' },
|
sortTriggersBy: { text: 'last change', value: 'lastchange' },
|
||||||
@@ -84,6 +85,7 @@ describe('Triggers Panel schema migration', () => {
|
|||||||
hostTechNameField: false,
|
hostTechNameField: false,
|
||||||
statusField: true,
|
statusField: true,
|
||||||
severityField: true,
|
severityField: true,
|
||||||
|
descriptionField: true,
|
||||||
hideHostsInMaintenance: false,
|
hideHostsInMaintenance: false,
|
||||||
showTriggers: 'all triggers',
|
showTriggers: 'all triggers',
|
||||||
sortTriggersBy: { text: 'last change', value: 'lastchange' },
|
sortTriggersBy: { text: 'last change', value: 'lastchange' },
|
||||||
|
|||||||
1
dist/panel-triggers/triggers_panel_ctrl.js
vendored
1
dist/panel-triggers/triggers_panel_ctrl.js
vendored
@@ -134,6 +134,7 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
|
|||||||
hostTechNameField: false,
|
hostTechNameField: false,
|
||||||
statusField: true,
|
statusField: true,
|
||||||
severityField: true,
|
severityField: true,
|
||||||
|
descriptionField: true,
|
||||||
// Options
|
// Options
|
||||||
hideHostsInMaintenance: false,
|
hideHostsInMaintenance: false,
|
||||||
showTriggers: 'all triggers',
|
showTriggers: 'all triggers',
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -28,7 +28,9 @@
|
|||||||
</span>
|
</span>
|
||||||
for {{trigger.age}}
|
for {{trigger.age}}
|
||||||
|
|
||||||
<span class="alert-list-info alert-list-info-left">{{trigger.comments}}</span>
|
<span class="alert-list-info alert-list-info-left" ng-if="ctrl.panel.descriptionField">
|
||||||
|
{{trigger.comments}}
|
||||||
|
</span>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -25,6 +25,12 @@
|
|||||||
checked="editor.panel.severityField"
|
checked="editor.panel.severityField"
|
||||||
on-change="ctrl.render()">
|
on-change="ctrl.render()">
|
||||||
</gf-form-switch>
|
</gf-form-switch>
|
||||||
|
<gf-form-switch class="gf-form"
|
||||||
|
label-class="width-9"
|
||||||
|
label="Description"
|
||||||
|
checked="editor.panel.descriptionField"
|
||||||
|
on-change="ctrl.render()">
|
||||||
|
</gf-form-switch>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="section gf-form-group">
|
<div class="section gf-form-group">
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ describe('Triggers Panel schema migration', () => {
|
|||||||
hostTechNameField: false,
|
hostTechNameField: false,
|
||||||
statusField: false,
|
statusField: false,
|
||||||
severityField: false,
|
severityField: false,
|
||||||
|
descriptionField: true,
|
||||||
hideHostsInMaintenance: false,
|
hideHostsInMaintenance: false,
|
||||||
showTriggers: 'all triggers',
|
showTriggers: 'all triggers',
|
||||||
sortTriggersBy: { text: 'last change', value: 'lastchange' },
|
sortTriggersBy: { text: 'last change', value: 'lastchange' },
|
||||||
@@ -84,6 +85,7 @@ describe('Triggers Panel schema migration', () => {
|
|||||||
hostTechNameField: false,
|
hostTechNameField: false,
|
||||||
statusField: true,
|
statusField: true,
|
||||||
severityField: true,
|
severityField: true,
|
||||||
|
descriptionField: true,
|
||||||
hideHostsInMaintenance: false,
|
hideHostsInMaintenance: false,
|
||||||
showTriggers: 'all triggers',
|
showTriggers: 'all triggers',
|
||||||
sortTriggersBy: { text: 'last change', value: 'lastchange' },
|
sortTriggersBy: { text: 'last change', value: 'lastchange' },
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ export const PANEL_DEFAULTS = {
|
|||||||
hostTechNameField: false,
|
hostTechNameField: false,
|
||||||
statusField: true,
|
statusField: true,
|
||||||
severityField: true,
|
severityField: true,
|
||||||
|
descriptionField: true,
|
||||||
// Options
|
// Options
|
||||||
hideHostsInMaintenance: false,
|
hideHostsInMaintenance: false,
|
||||||
showTriggers: 'all triggers',
|
showTriggers: 'all triggers',
|
||||||
|
|||||||
Reference in New Issue
Block a user