From 2acf707b8ba1a3fc64ee9518faa18f675b017b6f Mon Sep 17 00:00:00 2001 From: Viliam Rockai Date: Tue, 10 Feb 2015 14:58:09 +0100 Subject: [PATCH] Changing the REST root from rhq to hawkular --- .../dist/hawkular-rest-service.js | 18 +++++++++--------- .../src/hawkRest-metric-factory.ts | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/services/hawkular-rest-service/dist/hawkular-rest-service.js b/services/hawkular-rest-service/dist/hawkular-rest-service.js index 03488b0..8978b96 100644 --- a/services/hawkular-rest-service/dist/hawkular-rest-service.js +++ b/services/hawkular-rest-service/dist/hawkular-rest-service.js @@ -66,8 +66,8 @@ var hawkularRest; this.$get = ['$resource', function ($resource) { var prefix = 'http://' + this.host + ':' + this.port; var factory = {}; - factory['Tenant'] = $resource(prefix + '/rhq-metrics/tenants', {}); - factory['Metric'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics', { + factory['Tenant'] = $resource(prefix + '/hawkular-metrics/tenants', {}); + factory['Metric'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics', { tenantId: '@tenantId' }, { queryNum: { @@ -86,31 +86,31 @@ var hawkularRest; params: { type: 'log' } } }); - factory['NumericMetric'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/numeric', { + factory['NumericMetric'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/numeric', { tenantId: '@tenantId' }); - factory['NumericMetricData'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/numeric/:numericId/data', { + factory['NumericMetricData'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/numeric/:numericId/data', { tenantId: '@tenantId', numericId: '@numericId' }); - factory['NumericMetricMeta'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/numeric/:numericId/meta', { + factory['NumericMetricMeta'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/numeric/:numericId/meta', { tenantId: '@tenantId', numericId: '@numericId' }, { update: 'PUT' }); - factory['NumericMetricMultiple'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/numeric/data', { + factory['NumericMetricMultiple'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/numeric/data', { tenantId: '@tenantId', numericId: '@numericId' }); - factory['AvailabilityMetric'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/availability', { + factory['AvailabilityMetric'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/availability', { tenantId: '@tenantId' }); - factory['AvailabilityMetricData'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/availability/:availabilityId/data', { + factory['AvailabilityMetricData'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/availability/:availabilityId/data', { tenantId: '@tenantId', availabilityId: '@availabilityId' }); - factory['AvailabilityMetricMultiple'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/availability/data', { + factory['AvailabilityMetricMultiple'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/availability/data', { tenantId: '@tenantId' }); return factory; diff --git a/services/hawkular-rest-service/src/hawkRest-metric-factory.ts b/services/hawkular-rest-service/src/hawkRest-metric-factory.ts index f65415c..6d71a36 100644 --- a/services/hawkular-rest-service/src/hawkRest-metric-factory.ts +++ b/services/hawkular-rest-service/src/hawkRest-metric-factory.ts @@ -29,9 +29,9 @@ module hawkularRest { var prefix = 'http://' + this.host + ':' + this.port; var factory = {}; - factory['Tenant'] = $resource(prefix + '/rhq-metrics/tenants', {}); + factory['Tenant'] = $resource(prefix + '/hawkular-metrics/tenants', {}); - factory['Metric'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics', { + factory['Metric'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics', { tenantId : '@tenantId' }, { queryNum: { @@ -51,37 +51,37 @@ module hawkularRest { } }); - factory['NumericMetric'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/numeric', { + factory['NumericMetric'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/numeric', { tenantId : '@tenantId' }); - factory['NumericMetricData'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/numeric/:numericId/data', { + factory['NumericMetricData'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/numeric/:numericId/data', { tenantId : '@tenantId', numericId : '@numericId' }); - factory['NumericMetricMeta'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/numeric/:numericId/meta', { + factory['NumericMetricMeta'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/numeric/:numericId/meta', { tenantId : '@tenantId', numericId : '@numericId' }, { update: 'PUT' }); - factory['NumericMetricMultiple'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/numeric/data', { + factory['NumericMetricMultiple'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/numeric/data', { tenantId : '@tenantId', numericId : '@numericId' }); - factory['AvailabilityMetric'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/availability', { + factory['AvailabilityMetric'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/availability', { tenantId : '@tenantId' }); - factory['AvailabilityMetricData'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/availability/:availabilityId/data', { + factory['AvailabilityMetricData'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/availability/:availabilityId/data', { tenantId : '@tenantId', availabilityId : '@availabilityId' }); - factory['AvailabilityMetricMultiple'] = $resource(prefix + '/rhq-metrics/:tenantId/metrics/availability/data', { + factory['AvailabilityMetricMultiple'] = $resource(prefix + '/hawkular-metrics/:tenantId/metrics/availability/data', { tenantId : '@tenantId' });