Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #622 from jshaughn/hawkular-654-3
Browse files Browse the repository at this point in the history 
Hawkular 654 3
  • Loading branch information
@mtho11
mtho11 committed Oct 30, 2015
2 parents 555dddf + b3b419c commit 0161f1f
Show file tree
Hide file tree
Showing 10 changed files with 296 additions and 203 deletions.
45 changes: 28 additions & 17 deletions console/src/main/scripts/plugins/metrics/html/modals/trigger-availability-setup.html
View file
Expand Up @@ -2,28 +2,39 @@
<button type="button" class="close" ng-click="tc.cancel()">
<span class="pficon pficon-close"></span>
</button>
<h4 class="modal-title">Availability Alert Settings</h4>
<h2 class="modal-title">Alert Definition Details</h2>
</div>

<div class="modal-body hk-alert-settings">
<tabset>
<tab heading="{{tc.adm.trigger.name}}">
<div id="hk-gc" class="hk-tab-content">
<p>Configure conditions settings for alerts and notifications.</p>
<div class="row">
<div class="col-lg-9 col-md-8">
<div class="panel panel-default clearfix">
<div class="panel-heading">
<h2>{{tc.adm.trigger.name}}</h2>
</div>
<div class="panel-body">
<form class="form-horizontal">
<div ng-include="'plugins/metrics/html/partials/trigger-general-setup.html'"></div>

<form class="form-horizontal">
<hk-fieldset-dampening hk-duration="tc.adm.trigger.evalTimeSetting"
hk-title="Downtime"
hk-switch="tc.adm.trigger.conditionEnabled"
hk-title-met="Every time it goes down."
hk-title-unmet="Only when it is down for more than:"></hk-fieldset-dampening>
<h3>Alert Settings</h3>

<hk-fieldset-notification hk-alert-email="tc.adm.trigger.email"
hk-disabled="!tc.adm.trigger.conditionEnabled"></hk-fieldset-notification>
</form>
</div>
</tab>
</tabset>
<fieldset>
<legend>{{tc.adm.trigger.conditionContext.description !== '' ?
tc.adm.trigger.conditionContext.description : "Downtime"}}
</legend>
</fieldset>
<hk-fieldset-dampening hk-duration="tc.adm.trigger.evalTimeSetting"
hk-title="Downtime"
hk-title-met="Every time it goes down."
hk-title-unmet="Only when it is down for more than:"></hk-fieldset-dampening>

<hk-fieldset-notification hk-alert-email="tc.adm.trigger.email"></hk-fieldset-notification>
</form>
</div>
</div>
</div>
</div>
</div>

</div>
<div class="modal-footer">
Expand Down
98 changes: 48 additions & 50 deletions console/src/main/scripts/plugins/metrics/html/modals/trigger-range-percent-setup.html
View file
Expand Up @@ -2,72 +2,70 @@
<button type="button" class="close" ng-click="tc.cancel()">
<span class="pficon pficon-close"></span>
</button>
<h4 class="modal-title">Range Alert Settings</h4>
<h2 class="modal-title">Alert Definition Details</h2>
</div>

<div class="modal-body hk-alert-settings">
<tabset>
<tab heading="{{tc.adm.trigger.name}}">
<div class="row">
<div class="col-lg-9 col-md-8">
<div class="panel panel-default clearfix">
<div class="panel-heading">
<h2>{{tc.adm.trigger.name}}</h2>
</div>
<div class="panel-body">
<form class="form-horizontal">
<div ng-include="'plugins/metrics/html/partials/trigger-general-setup.html'"></div>

<h3>Alert Settings</h3>

<div id="hk-trigger" class="hk-tab-content">
<p>Configure conditions settings for alerts and notifications.</p>
<fieldset>
<legend>{{tc.adm.trigger.conditionContext.description !== '' ?
tc.adm.trigger.conditionContext.description : "Range"}}
</legend>

<form class="form-horizontal">
<fieldset>
<legend>Range</legend>
<div class="form-group">
<label class="col-sm-3 control-label">Maximum</label>
<div class="form-group">
<label class="col-sm-3 control-label">Maximum</label>

<div class="col-sm-6">
<span class="hk-input-text">{{tc.ceiling / 1024 / 1024 | number : 2}} MB</span>
<div class="col-sm-6">
<span class="hk-input-text">{{tc.ceiling / 1024 / 1024 | number : 2}} MB</span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="usage-greater">Usage greater than</label>
<div class="form-group">
<label class="col-sm-3 control-label" for="usage-greater">Usage greater than</label>

<div class="col-sm-5">
<div class="input-group hk-input-small">
<input type="number" min="0" max="100" ng-model="tc.adm.trigger.conditionGtPercent" class="form-control"
id="usage-greater" ng-disabled="!tc.adm.trigger.conditionGtEnabled">
<div class="col-sm-5">
<div class="input-group hk-input-small">
<input type="number" min="0" max="100" ng-model="tc.adm.trigger.conditionGtPercent"
class="form-control" id="usage-greater">

<div class="input-group-addon">%</div>
<div class="input-group-addon">%</div>
</div>
<span class="input-detail">({{tc.adm.trigger.conditionGtPercent ? (tc.ceiling * tc.adm.trigger.conditionGtPercent / 100/1024/1024 | number:2) : '-'}} MB)</span>
</div>
<span class="input-detail">({{tc.adm.trigger.conditionGtEnabled && tc.adm.trigger.conditionGtPercent ? (tc.ceiling * tc.adm.trigger.conditionGtPercent / 100/1024/1024 | number:2) : '-'}} MB)</span>
</div>
<div class="col-sm-4">
<hk-switch hk-model="tc.adm.trigger.conditionGtEnabled"
id="usage-greater-switch" class="pull-right"></hk-switch>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="usage-less">Usage less than</label>
<div class="form-group">
<label class="col-sm-3 control-label" for="usage-less">Usage less than</label>

<div class="col-sm-5">
<div class="input-group hk-input-small">
<input type="number" min="0" max="100" ng-model="tc.adm.trigger.conditionLtPercent" class="form-control"
id="usage-less" ng-disabled="!tc.adm.trigger.conditionLtEnabled">
<div class="col-sm-5">
<div class="input-group hk-input-small">
<input type="number" min="0" max="100" ng-model="tc.adm.trigger.conditionLtPercent"
class="form-control" id="usage-less">

<div class="input-group-addon">%</div>
<div class="input-group-addon">%</div>
</div>
<span class="input-detail">({{tc.adm.trigger.conditionLtPercent ? (tc.ceiling * tc.adm.trigger.conditionLtPercent / 100/1024/1024 | number:2) : '-'}} MB)</span>
</div>
<span class="input-detail">({{tc.adm.trigger.conditionLtEnabled && tc.adm.trigger.conditionLtPercent ? (tc.ceiling * tc.adm.trigger.conditionLtPercent / 100/1024/1024 | number:2) : '-'}} MB)</span>
</div>
<div class="col-sm-4">
<hk-switch hk-model="tc.adm.trigger.conditionLtEnabled"
id="usage-less-switch" class="pull-right"></hk-switch>
</div>
</div>
</fieldset>
<hk-fieldset-dampening hk-duration="tc.adm.trigger.evalTimeSetting"
hk-disabled="!tc.adm.trigger.conditionLtEnabled && !tc.adm.trigger.conditionGtEnabled">
</hk-fieldset-dampening>
</fieldset>
<hk-fieldset-dampening hk-duration="tc.adm.trigger.evalTimeSetting"></hk-fieldset-dampening>

<hk-fieldset-notification hk-alert-email="tc.adm.trigger.email"
hk-disabled="!tc.adm.trigger.conditionLtEnabled && !tc.adm.trigger.conditionGtEnabled">
</hk-fieldset-notification>
</form>
<hk-fieldset-notification hk-alert-email="tc.adm.trigger.email"></hk-fieldset-notification>
</form>
</div>
</div>
</tab>
</tabset>

</div>
</div>
</div>

</div>
<div class="modal-footer">
Expand Down
81 changes: 39 additions & 42 deletions console/src/main/scripts/plugins/metrics/html/modals/trigger-range-setup.html
View file
Expand Up @@ -2,63 +2,60 @@
<button type="button" class="close" ng-click="tc.cancel()">
<span class="pficon pficon-close"></span>
</button>
<h4 class="modal-title">Range Alert Settings</h4>
<h2 class="modal-title">Alert Definition Details</h2>
</div>

<div class="modal-body hk-alert-settings">
<tabset>
<tab heading="{{tc.adm.trigger.name}}">
<div class="row">
<div class="col-lg-9 col-md-8">
<div class="panel panel-default clearfix">
<div class="panel-heading">
<h2>{{tc.adm.trigger.name}}</h2>
</div>
<div class="panel-body">
<form class="form-horizontal">
<div ng-include="'plugins/metrics/html/partials/trigger-general-setup.html'"></div>

<div id="hk-trigger" class="hk-tab-content">
<p>Configure conditions settings for alerts and notifications.</p>
<h3>Alert Settings</h3>

<form class="form-horizontal">
<fieldset>
<legend>Range</legend>
<div class="form-group">
<label class="col-sm-3 control-label" for="min">Minimun</label>
<fieldset>
<legend>{{tc.adm.trigger.conditionContext.description !== '' ?
tc.adm.trigger.conditionContext.description : "Range"}}
</legend>

<div class="col-sm-5">
<div class="input-group hk-input-small">
<input type="number" min="0" max="10000" ng-model="tc.adm.trigger.minThreshold" class="form-control"
id="min" ng-disabled="!tc.adm.trigger.minEnabled">
<div class="form-group">
<label class="col-sm-3 control-label" for="min">Minimum</label>

<div class="col-sm-5">
<div class="input-group">
<input type="number" ng-model="tc.adm.trigger.minThreshold" class="form-control" id="min">
</div>
<div class="input-group-addon">{{tc.adm.trigger.conditionContext.unit}}</div>
</div>
</div>
<div class="col-sm-4">
<hk-switch hk-model="tc.adm.trigger.minEnabled"
id="min-switch" class="pull-right"></hk-switch>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="max">Maximun</label>

<div class="col-sm-5">
<div class="input-group hk-input-small">
<input type="number" min="0" max="10000" ng-model="tc.adm.trigger.maxThreshold"
class="form-control" id="max" ng-disabled="!tc.adm.trigger.maxEnabled">
<div class="form-group">
<label class="col-sm-3 control-label" for="max">Maximum</label>

<div class="col-sm-5">
<div class="input-group">
<input type="number" ng-model="tc.adm.trigger.maxThreshold" class="form-control" id="max">
</div>
<div class="input-group-addon">{{tc.adm.trigger.conditionContext.unit}}</div>
</div>
</div>
<div class="col-sm-4">
<hk-switch hk-model="tc.adm.trigger.maxEnabled"
id="max-switch" class="pull-right"></hk-switch>
</div>
</div>
</fieldset>
<hk-fieldset-dampening hk-duration="tc.adm.trigger.evalTimeSetting"
hk-disabled="!tc.adm.trigger.minEnabled && !tc.adm.trigger.maxEnabled">
</hk-fieldset-dampening>

<hk-fieldset-notification hk-alert-email="tc.adm.trigger.email"
hk-disabled="!tc.adm.trigger.minEnabled && !tc.adm.trigger.maxEnabled">
</hk-fieldset-notification>
</form>
</div>
</tab>
</tabset>
</fieldset>

<hk-fieldset-dampening hk-duration="tc.adm.trigger.evalTimeSetting"></hk-fieldset-dampening>

<hk-fieldset-notification hk-alert-email="tc.adm.trigger.email"></hk-fieldset-notification>
</form>
</div>
</div>
</div>
</div>
</div>

<div class="modal-footer">
<button type="button" class="btn btn-default" ng-click="tc.cancel()">Cancel</button>
<button type="button" class="btn btn-primary" ng-click="tc.save()"
Expand Down
66 changes: 33 additions & 33 deletions console/src/main/scripts/plugins/metrics/html/modals/trigger-threshold-setup.html
View file
Expand Up @@ -2,48 +2,48 @@
<button type="button" class="close" ng-click="tc.cancel()">
<span class="pficon pficon-close"></span>
</button>
<h4 class="modal-title">Threshold Alert Settings</h4>
<h2 class="modal-title">Alert Definition Details</h2>
</div>
<div class="modal-body hk-alert-settings">
<tabset>
<tab heading="{{tc.adm.trigger.name}}">
<div id="hk-gc" class="hk-tab-content">
<p>Configure conditions settings for alerts and notifications.</p>
<div class="row">
<div class="col-lg-9 col-md-8">
<div class="panel panel-default clearfix">
<div class="panel-heading">
<h2>{{tc.adm.trigger.name}}</h2>
</div>
<div class="panel-body">
<form class="form-horizontal">
<div ng-include="'plugins/metrics/html/partials/trigger-general-setup.html'"></div>

<form class="form-horizontal">
<fieldset>
<legend>Threshold</legend>
<div class="form-group">
<label class="col-sm-3 control-label"
ng-if="tc.adm.trigger.conditionOperator === 'LT'">Less than</label>
<label class="col-sm-3 control-label"
ng-if="tc.adm.trigger.conditionOperator != 'LT'">Greater than</label>
<h3>Alert Settings</h3>

<div class="col-sm-5">
<div class="input-group hk-input-small">
<input type="number" ng-model="tc.adm.trigger.conditionThreshold" class="form-control" id="usage"
ng-disabled="!tc.adm.trigger.conditionEnabled">
<fieldset>
<legend>{{tc.adm.trigger.conditionContext.description !== '' ?
tc.adm.trigger.conditionContext.description : "Threshold"}}</legend>
<div class="form-group">
<label class="col-sm-3 control-label"
ng-if="tc.adm.trigger.conditionOperator === 'LT'">Less than</label>
<label class="col-sm-3 control-label"
ng-if="tc.adm.trigger.conditionOperator != 'LT'">Greater than</label>

<div class="input-group-addon">ms</div>
<div class="col-sm-5">
<div class="input-group">
<input type="number" ng-model="tc.adm.trigger.conditionThreshold" class="form-control">

<div class="input-group-addon">{{tc.adm.trigger.conditionContext.unit}}</div>
</div>
</div>
</div>
<div class="col-sm-4">
<hk-switch hk-model="tc.adm.trigger.conditionEnabled"
id="usage-switch" class="pull-right"></hk-switch>
</div>
</div>
</fieldset>
<hk-fieldset-dampening hk-duration="tc.adm.trigger.evalTimeSetting"
hk-disabled="!tc.adm.trigger.conditionEnabled"></hk-fieldset-dampening>

<hk-fieldset-notification hk-alert-email="tc.adm.trigger.email"
hk-disabled="!tc.adm.trigger.conditionEnabled"></hk-fieldset-notification>
</form>
</div>
</tab>
</tabset>
</fieldset>

<hk-fieldset-dampening hk-duration="tc.adm.trigger.evalTimeSetting"></hk-fieldset-dampening>

<hk-fieldset-notification hk-alert-email="tc.adm.trigger.email"></hk-fieldset-notification>
</form>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" ng-click="tc.cancel()">Cancel</button>
Expand Down

0 comments on commit 0161f1f

Please sign in to comment.