Merge pull request #180 from vrockai/AlertResolution

Alert resolution update
hawkular · Jun 2, 2015 · 96e6dc1 · 96e6dc1
2 parents 5a7059c + 6c507ce
commit 96e6dc1
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -86,7 +86,7 @@
     <version.org.apache.activemq>5.10.0</version.org.apache.activemq>
     <version.org.hawkular.accounts>1.0.4</version.org.hawkular.accounts>
     <version.org.hawkular.agent>0.0.9</version.org.hawkular.agent>
-    <version.org.hawkular.alerts>0.0.4</version.org.hawkular.alerts>
+    <version.org.hawkular.alerts>0.0.5</version.org.hawkular.alerts>
     <version.org.hawkular.availCreator>${project.version}</version.org.hawkular.availCreator>
     <version.org.hawkular.bus>0.0.6</version.org.hawkular.bus>
     <version.org.hawkular.console>${project.version}</version.org.hawkular.console>

diff --git a/ui/console/src/main/scripts/bower.json b/ui/console/src/main/scripts/bower.json
@@ -23,7 +23,7 @@
     "d3": "3.4.8",
     "event-drops": "0.1.1",
     "hawkular-charts": "0.3.2",
-    "hawkular-ui-services": "0.3.0",
+    "hawkular-ui-services": "0.3.1",
     "hawtio-core-navigation": "2.0.39",
     "hawtio-core": "2.0.16",
     "hawtio-template-cache": "2.0.2",

diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/alerts-view.html b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/alerts-view.html
@@ -62,6 +62,18 @@ <h1>No alerts.</h1>
         <span ng-if="!alert.isThisYear">{{alert.end | date:'medium' }}).</span>
         The average response time was {{alert.avg  | number: 0}} ms.
       </div>
+
+      <div class="alert-resolver">
+        <a ng-click="mac.alertResolve(alert, $index)" tooltip="Mark as resolved"
+           tooltip-placement="top"
+           tooltip-trigger="mouseenter"
+           tooltip-popup-delay="500">
+          <i class="fa" ng-class="{'fa-check-square-o': hover, 'fa-square-o': !hover}"
+             ng-mouseenter="hover = true"
+             ng-mouseleave="hover = false">
+          </i>
+        </a>
+      </div>
     </div>
 
   </div>

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
@@ -968,4 +968,33 @@ section {
   .form-horizontal .inline-row .duration {
     margin-right: 35px;
   }
+}
+.alert {
+
+  .hk-event {
+    padding-right: 1em;
+  }
+
+  .alert-resolver {
+    position: absolute;
+    padding-left: 1em;
+    width: 2em;
+    right: 1em;
+    cursor: pointer;
+
+    a > i.fa.fa-square-o {
+      color: @gray;
+    }
+
+    a i.fa-check-square-o {
+
+      &:hover {
+        color: @link-hover-color;
+      }
+    }
+
+    a i.fa-check-square-o {
+      color: @link-hover-color;
+    }
+  }
 }
diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/addUrlPage.ts b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/addUrlPage.ts
@@ -182,7 +182,7 @@ module HawkularMetrics {
         }
         var expanded = this.resourceList ? this.resourceList.expanded : [];
         aResourceList.expanded = expanded;
-        this.HawkularAlert.Alert.query({}, (anAlertList) => {
+        this.HawkularAlert.Alert.query({statuses:'OPEN'}, (anAlertList) => {
           this.alertList = anAlertList;
         }, this);
         var promises = [];

diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/alertsManager.ts b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/alertsManager.ts
@@ -213,18 +213,18 @@ module HawkularMetrics {
 
        */
 
-      return this.HawkularAlert.Alert.query({triggerIds:metricId+'_trigger_avail,' + metricId+'_trigger_thres'}).$promise.then((serverAlerts: any) => {
+      return this.HawkularAlert.Alert.query({
+            triggerIds:metricId+'_trigger_avail,' + metricId+'_trigger_thres',
+            statuses:'OPEN'
+          }).$promise.then((serverAlerts: any) => {
 
         var momentNow = this.$moment();
 
-        this.$log.debug('querying data finished', serverAlerts);
-
         for (var i = 0; i < serverAlerts.length; i++) {
           var consoleAlert: any = {};
           var serverAlert = serverAlerts[i];
 
-          this.$log.debug('server Alert to inspect: ', serverAlert);
-
+          consoleAlert.id = serverAlert.alertId;
           consoleAlert.end = serverAlert.ctime;
 
           var sum: number = 0.0;

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
@@ -41,7 +41,6 @@ module HawkularMetrics {
 
       this.$log.debug('querying data');
       this.$log.debug('$routeParams', $routeParams);
-
       this.openSetup = () => {
         var modalInstance = $modal.open({
           templateUrl: 'plugins/metrics/html/alerts-setup.html',
@@ -78,6 +77,19 @@ module HawkularMetrics {
         this.alertList.$resolved = true; // FIXME
       }, (error) => { return this.HawkularErrorManager.errorHandler(error, 'Error fetching alerts.'); });
     }
+
+    public alertResolve(alert: any, index: number): void {
+      for (var i = 0; i< this.alertList.length; i++) {
+        if (this.alertList[i].$$hashKey === alert.$$hashKey) {
+          console.log(this.alertList[i]);
+          this.HawkularAlert.Alert.resolve({alertIds: alert.id}, {}).$promise.then( () => {
+            this.alertList.splice(i, 1);
+          });
+          break;
+        }
+      }
+    }
+
   }
 
   _module.controller('MetricsAlertController', MetricsAlertController);

diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/pagination.ts b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/ts/pagination.ts
@@ -113,7 +113,6 @@ module HawkularMetrics {
         scope.goTos = [0];
         scope.$watchGroup(['headers', 'perPage'], () => {
           var pagesNumber = Math.ceil((scope.headers.total || 1) / scope.perPage);
-          console.log('pagesNumber', pagesNumber);
           scope.goTos = new Array(pagesNumber);
         });