Merge branch 'panel-triggers' into grafana-3.0

This commit is contained in:
Alexander Zobnin
2016-01-10 23:06:11 +03:00

View File

@@ -1,36 +1,51 @@
<grafana-panel>
<div style="padding-top: 10px">
<table class="table table-bordered zbx-trigger-table">
<div class="table-panel-wrapper">
<grafana-panel>
<div class="table-panel-container">
<div class="table-panel-header-bg"></div>
<div class="table-panel-scroll">
<table class="table-panel-table">
<thead>
<tr>
<th ng-if="panel.hostField">Host</th>
<th ng-if="panel.severityField">Severity</th>
<th style="width: 50%">Issue</th>
<th ng-if="panel.lastChangeField">Last change</th>
<th ng-if="panel.ageField">Age</th>
<th ng-if="panel.infoField">Info</th>
<th ng-if="panel.hostField" style="width: 15%">
<div class="table-panel-table-header-inner pointer">
Host
</div>
</th>
<th ng-if="panel.severityField" style="width: 120px">
<div class="table-panel-table-header-inner pointer">Severity</div>
</th>
<th>
<div class="table-panel-table-header-inner pointer">Issue</div>
</th>
<th ng-if="panel.lastChangeField" style="width: 180px">
<div class="table-panel-table-header-inner pointer">Last change</div>
</th>
<th ng-if="panel.ageField" style="width: 180px">
<div class="table-panel-table-header-inner pointer">Age</div>
</th>
<th ng-if="panel.infoField" style="width: 100px">
<div class="table-panel-table-header-inner pointer">Info</div>
</th>
</tr>
</thead>
<tbody>
<tr class=""
ng-repeat="trigger in triggerList"
style="background-color: {{trigger.color}}">
<tr ng-repeat="trigger in triggerList">
<td ng-if="panel.hostField">
<div>
<span><strong>{{trigger.host}}</strong></span>
</div>
</td>
<td ng-if="panel.severityField">
<td ng-if="panel.severityField" style="background-color: {{trigger.color}}; color: white">
<div>
{{trigger.severity}}
</div>
</td>
<td>
<td style="background-color: {{trigger.color}}; color: white">
<div>
{{trigger.description}}
<a ng-if="trigger.comments"
class="pointer"
style="float: right;"
style="float: right; padding-right: 8px"
data-toggle="collapse"
data-target="#comments-{{trigger.triggerid}}"
bs-tooltip="'Show additional trigger description'"
@@ -53,8 +68,7 @@
id="acknowledges-{{trigger.triggerid}}"
ng-if="trigger.acknowledges">
<div style="padding-top: 12px;">
<table class="table table-condensed table-striped table-bordered zbx-table-ack"
style="background-color: initial">
<table class="table table-condensed">
<thead>
<tr>
<th><small>Time</small></th>
@@ -88,23 +102,20 @@
<td ng-if="panel.infoField">
<!-- Trigger Url -->
<a class="zbx-trigger-info"
ng-if="trigger.url"
<a ng-if="trigger.url"
href="{{trigger.url}}"
target="_blank">
<i class="fa fa-external-link"></i>
</a>
<!-- Trigger state -->
<span class="zbx-trigger-info"
ng-if="trigger.state === '1'"
<span ng-if="trigger.state === '1'"
bs-tooltip="'{{trigger.error}}'">
<i class="fa fa-question-circle"></i>
</span>
<!-- Trigger acknowledges -->
<a class="zbx-trigger-info"
ng-if="trigger.acknowledges"
<a ng-if="trigger.acknowledges"
bs-tooltip="'Acknowledges ({{trigger.acknowledges.length}})'"
data-toggle="collapse"
data-target="#acknowledges-{{trigger.triggerid}}">
@@ -115,4 +126,7 @@
</tbody>
</table>
</div>
</grafana-panel>
</div>
<div class="table-panel-footer"></div>
</grafana-panel>
</div>