HAWKULAR-83 Accommodate new metrics changes

hawkular · Mar 20, 2015 · 860a829 · 860a829
1 parent 5ce3b4f
commit 860a829
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 24 deletions.
diff --git a/bower.json b/bower.json
@@ -15,11 +15,11 @@
     "!dist/*"
   ],
   "dependencies": {
-    "angular-resource": "~1.3.11",
-    "angular": "~1.3.11"
+    "angular-resource": "1.3.15",
+    "angular": "1.3.15"
   },
   "devDependencies": {
-    "angular-mocks": "~1.3.11",
+    "angular-mocks": "1.3.15",
     "hawtio-core-dts": "2.0.11"
   }
 }
diff --git a/dist/hawkular-ui-service.js b/dist/hawkular-ui-service.js
@@ -202,11 +202,6 @@ var hawkularRest;
                     method: 'GET',
                     isArray: true,
                     params: { type: 'avail' }
-                },
-                queryLog: {
-                    method: 'GET',
-                    isArray: true,
-                    params: { type: 'log' }
                 }
             });
             factory.NumericMetric = $resource(url + '/:tenantId/metrics/numeric', {
@@ -218,13 +213,12 @@ var hawkularRest;
             }, {
                 queryMetrics: {
                     method: 'GET',
-                    isArray: false,
-                    params: { type: 'num' }
+                    isArray: true
                 },
                 queryMetricsTimeRange: {
                     method: 'GET',
-                    isArray: false,
-                    params: { type: 'num', buckets: 60, start: '@startTimestamp', end: '@endTimestamp' }
+                    isArray: true,
+                    params: { buckets: 60, start: '@startTimestamp', end: '@endTimestamp' }
                 }
             });
             factory.NumericMetricMeta = $resource(url + '/:tenantId/metrics/numeric/:numericId/meta', {

diff --git a/dist/hawkular-ui-service.min.js b/dist/hawkular-ui-service.min.js
diff --git a/src/rest/hawkRest-metric-factory.spec.js b/src/rest/hawkRest-metric-factory.spec.js
@@ -14,7 +14,7 @@ describe('Factory: hawkMetric', function() {
   it('should create a tenant', function() {
     var tenantId = 'myTenantId';
 
-    $httpBackend.expectPOST(prefix + '/rhq-metrics/tenants')
+    $httpBackend.expectPOST(prefix + '/hawkular-metrics/tenants')
       .respond(200);
     var result = HawkularRest.Tenant.create({tenantId: tenantId});
 
@@ -26,7 +26,7 @@ describe('Factory: hawkMetric', function() {
   it('should create a metric', function() {
     var tenantId = 'myTenantId';
 
-    $httpBackend.expectGET(prefix + '/rhq-metrics/' + tenantId + '/metrics')
+    $httpBackend.expectGET(prefix + '/hawkular-metrics/' + tenantId + '/metrics')
       .respond([{
         name: 'mock.metric',
         metadata: {

diff --git a/src/rest/hawkRest-metric-factory.ts b/src/rest/hawkRest-metric-factory.ts
@@ -61,11 +61,6 @@ module hawkularRest {
           method: 'GET',
           isArray: true,
           params: { type: 'avail' }
-        },
-        queryLog: {
-          method: 'GET',
-          isArray: true,
-          params: { type: 'log' }
         }
       });
 
@@ -80,13 +75,12 @@ module hawkularRest {
       }, {
         queryMetrics: {
           method: 'GET',
-          isArray: false,
-          params: {type: 'num'}
+          isArray: true
         },
         queryMetricsTimeRange: {
           method: 'GET',
-          isArray: false,
-          params: {type: 'num', buckets: 60, start: '@startTimestamp', end: '@endTimestamp'}
+          isArray: true,
+          params: {buckets: 60, start: '@startTimestamp', end: '@endTimestamp'}
         }
       });