Merge branch 'master' into ghi-39

This commit is contained in:
Matt Bostock
2017-04-06 18:15:49 +01:00
committed by GitHub
4 changed files with 19 additions and 4 deletions

View File

@@ -372,3 +372,10 @@ table.table.examples > tbody > tr td:first-child {
.modal-body>table.table>tbody>tr>td.modal-row-actions {
vertical-align: middle;
}
.panel-heading > span.alert-group-link {
margin-left: -8px;
}
span.alert-group-link > a {
color: #fff;
}

View File

@@ -6,6 +6,14 @@
%div.panel{class: cls_panel}
%div.panel-heading.text-center
-if (Object.keys(group.labels).length > 0) {
-var filters = [];
-$.each(group.labels, function(label_key, label_val) {
-filters.push(label_key + '=' + label_val);
-var groupLink = '?q=' + filters.join(',');
%span.pull-left.alert-group-link
%a{href: groupLink, title: 'Link to this alert group', 'data-toggle': 'tooltip', 'data-placement': 'top'}
%i.fa.fa-link
%span.badge.pull-right
=group.alerts.length
%div.panel-title

File diff suppressed because one or more lines are too long

View File

@@ -204,7 +204,7 @@
},
{
"labels": {
"alertname": "Memory_Usage_High",
"alertname": "Memory_Usage_Too_High",
"cluster": "prod"
},
"blocks": [
@@ -260,7 +260,7 @@
"alerts": [
{
"labels": {
"alertname": "Memory_Usage_Too_High",
"alertname": "Free_Disk_Space_Too_Low",
"instance": "server5",
"job": "node_exporter",
"cluster": "staging"