From cdb7a8159855583c1075694e9e30c412d8033cc3 Mon Sep 17 00:00:00 2001
From: Mike Thompson <mithomps@redhat.com>
Date: Tue, 17 Feb 2015 19:16:31 -0800
Subject: [PATCH] Add queryMetrics and queryMetricsTimeRange methods to
 NumericMetricData factory.

---
 src/rest/hawkRest-metric-factory.ts | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/rest/hawkRest-metric-factory.ts b/src/rest/hawkRest-metric-factory.ts
index 3e562cb..d765f64 100644
--- a/src/rest/hawkRest-metric-factory.ts
+++ b/src/rest/hawkRest-metric-factory.ts
@@ -56,11 +56,24 @@ module hawkularRest {
         tenantId : '@tenantId'
       });
 
-      factory.NumericMetricData = $resource(prefix + '/rhq-metrics/:tenantId/metrics/numeric/:numericId/data', {
-        tenantId : '@tenantId',
-        numericId : '@numericId'
+
+      factory['NumericMetricData'] = $resource(prefix + '/:tenantId/metrics/numeric/:numericId/data', {
+        tenantId: '@tenantId',
+        numericId: '@numericId'
+      }, {
+        queryMetrics: {
+          method: 'GET',
+          isArray: false,
+          params: {type: 'num'}
+        },
+        queryMetricsTimeRange: {
+          method: 'GET',
+          isArray: false,
+          params: {type: 'num', buckets: 60, start: '@startTimestamp', end: '@endTimestamp'}
+        }
       });
 
+
       factory.NumericMetricMeta = $resource(prefix + '/rhq-metrics/:tenantId/metrics/numeric/:numericId/meta', {
         tenantId : '@tenantId',
         numericId : '@numericId'