resourceIds can't end with /, we use ~ instead

hawkular · Aug 21, 2015 · 8e1328b · 8e1328b
1 parent 1c015a7
commit 8e1328b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
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
@@ -77,7 +77,7 @@ module HawkularMetrics {
 
         var triggerId: string = this.resourceId + '_jvm_pheap';
         var resourceId: string = triggerId.slice(0,-10);
-        var dataId: string = 'MI~R~[' + resourceId + '~/]~MT~WildFly Memory Metrics~Heap Used';
+        var dataId: string = 'MI~R~[' + resourceId + '~~]~MT~WildFly Memory Metrics~Heap Used';
 
         return this.HawkularAlertsManager.createAlertDefinition({
           name: triggerId,
@@ -104,7 +104,7 @@ module HawkularMetrics {
 
         var triggerId: string = this.resourceId + '_jvm_nheap';
         var resourceId: string = triggerId.slice(0,-10);
-        var dataId: string = 'MI~R~[' + resourceId + '~/]~MT~WildFly Memory Metrics~Heap Used';
+        var dataId: string = 'MI~R~[' + resourceId + '~~]~MT~WildFly Memory Metrics~Heap Used';
 
         return this.HawkularAlertsManager.createAlertDefinition({
           name: triggerId,
@@ -128,7 +128,7 @@ module HawkularMetrics {
         // Jvm trigger doesn't exist, need to create one
         var triggerId: string = this.resourceId + '_jvm_garba';
         var resourceId: string = triggerId.slice(0,-10);
-        var dataId: string = 'MI~R~[' + resourceId + '~/]~MT~WildFly Memory Metrics~Accumulated GC Duration';
+        var dataId: string = 'MI~R~[' + resourceId + '~~]~MT~WildFly Memory Metrics~Accumulated GC Duration';
 
         return this.HawkularAlertsManager.createAlertDefinition({
           name: triggerId,

diff --git a/console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts b/console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts
@@ -126,7 +126,7 @@ module HawkularMetrics {
               var p = HawkularInventory.FeedResource.get({
                 environmentId: globalEnvironmentId,
                 feedId: idParts[0],
-                resourceId: $route.current.params.resourceId + '~/'
+                resourceId: $route.current.params.resourceId + '~~'
               }).$promise;
               p.then((response) => {
                   return response;