Show trigger expression on events page

moira-alert · Jan 18, 2016 · 20bc474 · 20bc474
1 parent 29ab06b
commit 20bc474
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/static/css/moira.css b/static/css/moira.css
@@ -123,7 +123,7 @@ main { flex: 1 0 auto; }
 tr:hover .click-ident {visibility: visible;}
 .event-trigger {background-color: #f7f7f7; width: 100%; padding: 20px; border-bottom: 1px solid lightgray}
 .event-trigger-row {padding-bottom: 5px;}
-.event-trigger-row-h {width:65px; color: #9e9e9e;}
+.event-trigger-row-h {width:90px; color: #9e9e9e;}
 .events-tab-content {margin-top: 15px;}
 .metric-current-state-h {color: #9e9e9e; border-bottom: 1px solid #f5f5f5; padding-bottom: 10px}
 .metric-current-state-row {padding-top:10px; padding-bottom: 10px; height: 60px; border-bottom: 1px solid #f5f5f5; max-height: 60px; overflow-y: hidden; }

diff --git a/static/events.html b/static/events.html
@@ -37,17 +37,21 @@
 					</div>
 				</div>
 				<div class="event-trigger-row">
-					<div class="row">
-						<div class="col event-trigger-row-h">Target</div>
-						<div class="col" ng-bind="trigger.targets[0].value"></div>
+					<div class="row" ng-repeat="target in trigger.targets">
+						<div class="col event-trigger-row-h">Target<span ng-if="trigger.targets.length > 1"> t{{$index + 1}}</span></div>
+						<div class="col" ng-bind="target.value"></div>
 					</div>
 				</div>
 				<div class="event-trigger-row">
-					<div class="row">
+					<div class="row" ng-if="!trigger.json.expression">
 						<div class="col event-trigger-row-h">Value</div>
 						<div class="col">Warning: {{trigger.warn_value.str}}, Error: {{trigger.error_value.str}}, {{trigger.json.ttl_state}} after {{(trigger.json.ttl
 							+ ' sec') || 'never'}}</div>
 					</div>
+					<div class="row" ng-if="trigger.json.expression">
+						<div class="col event-trigger-row-h">Expression</div>
+						<div class="col" ng-bind="trigger.json.expression"></div>
+					</div>
 				</div>
 				<div class="event-trigger-row">
 					<div class="row">