Merge pull request #559 from lucasponce/AlertsCenterWork

Alerts center work
hawkular · Oct 14, 2015 · 2c84067 · 2c84067
2 parents 27e081d + c12d560
commit 2c84067
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/console/src/main/scripts/plugins/metrics/html/alerts-center-list.html b/console/src/main/scripts/plugins/metrics/html/alerts-center-list.html
@@ -68,7 +68,7 @@ <h3 class="pull-left">Alerts ({{ac.headerLinks.total}})</h3>
           </tr>
           </thead>
           <tbody>
-          <tr ng-repeat="alert in ac.alertsList | filter:ac.search | orderBy:ac.sortField:ac.sortAsc" ng-class="{'hk-selected': ac.selected}"
+          <tr ng-repeat="alert in ac.alertsList | filter:ac.search" ng-class="{'hk-selected': ac.selected}"
               ng-click="ac.selectItem(alert)">
             <td><input type="checkbox" ng-checked="alert.selected"/></td>
             <td ng-class="{'hk-bold': alert.status === 'OPEN'}">{{alert.status|firstUpper}}</td>

diff --git a/console/src/main/scripts/plugins/metrics/ts/alertsCenterList.ts b/console/src/main/scripts/plugins/metrics/ts/alertsCenterList.ts
@@ -110,7 +110,6 @@ module HawkularMetrics {
           this.headerLinks = this.HkHeaderParser.parse(queriedAlerts.headers);
           this.alertsList = queriedAlerts.alertList;
           this.lastUpdateDate = new Date();
-          console.dir(this.headerLinks);
       }, (error) => {
         this.$log.warn(error);
       }).catch((error) => {

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts
@@ -91,6 +91,7 @@ module HawkularMetrics {
             autoDisable: true, // Disable trigger after firing, to not have repeated alerts of same issue
             autoEnable: true, // Enable trigger once an alert is resolved
             autoResolve: false, // Don't change into AUTORESOLVE mode as we don't have AUTORESOLVE conditions
+            severity: 'MEDIUM',
             actions: {email: [this.defaultEmail]},
             context: {
               resourceType: 'App Server',
@@ -148,6 +149,7 @@ module HawkularMetrics {
             autoDisable: true, // Disable trigger after firing, to not have repeated alerts of same issue
             autoEnable: true, // Enable trigger once an alert is resolved
             autoResolve: false, // Don't change into AUTORESOLVE mode as we don't have AUTORESOLVE conditions
+            severity: 'HIGH',
             actions: {email: [this.defaultEmail]},
             context: {
               resourceType: 'App Server',
@@ -202,6 +204,7 @@ module HawkularMetrics {
             autoDisable: true, // Disable trigger after firing, to not have repeated alerts of same issue
             autoEnable: true, // Enable trigger once an alert is resolved
             autoResolve: false, // Don't change into AUTORESOLVE mode as we don't have AUTORESOLVE conditions
+            severity: 'HIGH',
             actions: {email: [this.defaultEmail]},
             context: {
               resourceType: 'App Server',

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerWebAlerts.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerWebAlerts.ts
@@ -91,6 +91,7 @@ module HawkularMetrics {
             autoDisable: true, // Disable trigger after firing, to not have repeated alerts of same issue
             autoEnable: true, // Enable trigger once an alert is resolved
             autoResolve: false, // Don't change into AUTORESOLVE mode as we don't have AUTORESOLVE conditions
+            severity: 'MEDIUM',
             actions: {email: [this.defaultEmail]},
             context: {
               resourceType: 'App Server',
@@ -149,6 +150,7 @@ module HawkularMetrics {
               autoDisable: true, // Disable trigger after firing, to not have repeated alerts of same issue
               autoEnable: true, // Enable trigger once an alert is resolved
               autoResolve: false, // Don't change into AUTORESOLVE mode as we don't have AUTORESOLVE conditions
+              severity: 'LOW',
               actions: {email: [this.defaultEmail]},
               context: {
                 resourceType: 'App Server',
@@ -205,6 +207,7 @@ module HawkularMetrics {
               autoDisable: true, // Disable trigger after firing, to not have repeated alerts of same issue
               autoEnable: true, // Enable trigger once an alert is resolved
               autoResolve: false, // Don't change into AUTORESOLVE mode as we don't have AUTORESOLVE conditions
+              severity: 'LOW',
               actions: {email: [this.defaultEmail]},
               context: {
                 resourceType: 'App Server',

diff --git a/console/src/main/scripts/plugins/metrics/ts/urlList.ts b/console/src/main/scripts/plugins/metrics/ts/urlList.ts
@@ -215,6 +215,7 @@ module HawkularMetrics {
               id: triggerId,
               name: url,
               description: 'Response Time for URL ' + url,
+              severity: 'HIGH',
               actions: {email: [defaultEmail]},
               context: {
                 resourceType: 'URL',
@@ -277,6 +278,7 @@ module HawkularMetrics {
               id: triggerId,
               name: url,
               description: 'Availability for URL ' + url,
+              severity: 'CRITICAL',
               actions: {email: [defaultEmail]},
               context: {
                 resourceType: 'URL',