Merge pull request #190 from vrockai/HAWKULAR-272

HAWKULAR-272: Fixed alert settings time-related bugs
hawkular · Jun 4, 2015 · 98149cf · 98149cf
2 parents 64f9ff9 + ca6c749
commit 98149cf
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 12 deletions.
diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/alerts-setup.html b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/alerts-setup.html
@@ -102,8 +102,7 @@ <h4 class="modal-title">Alert Settings</h4>
           <div class="col-md-6 inline-row">
             <div class="input-group duration">
               <input type="number" class="form-control" placeholder="Duration" ng-model="mas.downtimeDuration"
-                     ng-change="mas.changeDowntimeTimeUnits()" id="downtimeDuration"
-                     ng-change="mas.alertSettingTouch()">
+                     id="downtimeDuration" ng-change="mas.alertSettingTouch()">
               <select pf-select ng-model="mas.downtimeUnit" id="downtimeUnit"
                       ng-options="item.value as item.label for item in mas.timeUnits"
                       ng-change="mas.changeDowntimeTimeUnits()"></select>

diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less
@@ -977,6 +977,12 @@ section {
   }
 }
 
+.alert-settings {
+  .input-group-btn {
+    width: auto;
+  }
+}
+
 /* Toastr Overrides */
 
 #toast-container > div {

diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/metricsAlerts.ts b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/metricsAlerts.ts
@@ -123,7 +123,7 @@ module HawkularMetrics {
     public saveProgress: boolean = false;
     public responseDuration: number;
     public downtimeDuration: number;
-    public responseUnit: number = 60000;
+    public responseUnit: number = 1;
     public downtimeUnit: number = 1;
     public thresDampDurationEnabled = false;
 
@@ -133,14 +133,14 @@ module HawkularMetrics {
       {value: 1, label: 'miliseconds'},
       {value: 1000, label: 'seconds'},
       {value: 60000, label: 'minutes'},
-      {value: 360000, label: 'hours'}
+      {value: 3600000, label: 'hours'}
     ];
 
     public timeUnitsDict = {
       '1': 'miliseconds',
       '1000': 'seconds',
       '60000': 'minutes',
-      '360000': 'hours'
+      '3600000': 'hours'
     };
 
     constructor(public $scope:any,
@@ -171,6 +171,7 @@ module HawkularMetrics {
         this.trigger_thres_damp = data;
         this.alertSetupBackup.trigger_thres_damp = angular.copy(this.trigger_thres_damp);
 
+        this.responseUnit = this.getTimeUnit(data[0].evalTimeSetting);
         this.responseDuration = data[0].evalTimeSetting / this.responseUnit;
         this.alertSetupBackup.responseDuration = angular.copy(this.responseDuration);
 
@@ -199,7 +200,11 @@ module HawkularMetrics {
       }).then((data)=> {
         this.trigger_avail_damp = data;
         this.alertSetupBackup.trigger_avail_damp = angular.copy(this.trigger_avail_damp);
-        this.downtimeDuration = data[0].evalTimeSetting;
+
+        this.downtimeUnit = this.getTimeUnit(data[0].evalTimeSetting);
+        this.downtimeDuration = data[0].evalTimeSetting / this.downtimeUnit;
+        this.alertSetupBackup.downtimeDuration = angular.copy(this.downtimeDuration);
+
         this.$log.debug('this.trigger_avail_damp', this.trigger_avail_damp);
       }, (error)=> {
         return this.HawkularErrorManager.errorHandler(error, 'Error fetching availability trigger dampening.');
@@ -209,14 +214,26 @@ module HawkularMetrics {
       this.$log.debug('this.metricId', this.metricId);
     }
 
+    // Get the most meaningful time unit (so that time value is not a very long fraction).
+    private getTimeUnit(timeValue: number): number {
+      var timeUnit = 1;
+
+      for (var i = 0; i < this.timeUnits.length; i++) {
+        var unit = this.timeUnits[i].value;
+        if (timeValue % unit === 0 && unit > timeUnit) {
+          timeUnit = unit;
+        }
+      }
+
+      return timeUnit;
+    }
+
     public changeResponseTimeUnits():void {
-      this.trigger_thres_damp[0].evalTimeSetting = this.responseDuration * this.responseUnit;
-      this.alertSettingTouch();
+      this.responseDuration = this.trigger_thres_damp[0].evalTimeSetting / this.responseUnit;
     }
 
     public changeDowntimeTimeUnits():void {
-      this.trigger_avail_damp[0].evalTimeSetting = this.downtimeDuration * this.downtimeUnit;
-      this.alertSettingTouch();
+      this.downtimeDuration = this.trigger_avail_damp[0].evalTimeSetting / this.downtimeUnit;
     }
 
     public cancel(): void {
@@ -254,8 +271,6 @@ module HawkularMetrics {
       }, (error)=> {
         return this.HawkularErrorManager.errorHandler(error, 'Error updating threshold trigger.', errorCallback);
       }).then(()=> {
-        this.changeResponseTimeUnits();
-
         if (!this.thresDampDurationEnabled) {
           this.trigger_thres_damp[0].evalTimeSetting = 0;
         }
@@ -296,6 +311,8 @@ module HawkularMetrics {
     }
 
     public alertSettingTouch(): void {
+      this.trigger_thres_damp[0].evalTimeSetting = this.responseDuration * this.responseUnit;
+      this.trigger_avail_damp[0].evalTimeSetting = this.downtimeDuration * this.downtimeUnit;
 
       if (!angular.equals(!!this.alertSetupBackup.thresDampDurationEnabled,!!this.thresDampDurationEnabled) ||
         !angular.equals(this.alertSetupBackup.responseDuration, this.responseDuration) ||