Skip to content

Commit

Permalink
Attempt to fix the usage of tenantId for Hawkular Metrics service.
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Negrea committed Jun 1, 2015
1 parent cc6b0e4 commit 1df7e83
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 56 deletions.
38 changes: 15 additions & 23 deletions dist/hawkular-ui-service.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ var hawkularRest;

var hawkularRest;
(function (hawkularRest) {
hawkularRest._module.provider('HawkularMetric', function () {
hawkularRest._module.provider('HawkularMetric', ['$httpProvider', function ($httpProvider) {
this.setHost = function (host) {
this.host = host;
return this;
Expand All @@ -257,29 +257,24 @@ var hawkularRest;
this.setHost(this.host || $location.host() || 'localhost');
this.setPort(this.port || $location.port() || 8080);
var prefix = 'http://' + this.host + ':' + this.port;
var metricUrlPart = '/hawkular-metrics';
var metricUrlPart = '/hawkular/metrics';
var url = prefix + metricUrlPart;
var factory = {};
factory.Tenant = $resource(url + '/tenants', {});
factory.Metric = $resource(url + '/:tenantId/metrics', {
tenantId: '@tenantId'
}, {
factory.Metric = $resource(url + '/', null, {
queryNum: {
method: 'GET',
isArray: true,
params: { type: 'num' }
params: { type: 'gauges' }
},
queryAvail: {
method: 'GET',
isArray: true,
params: { type: 'avail' }
params: { type: 'availability' }
}
});
factory.NumericMetric = $resource(url + '/:tenantId/metrics/numeric', {
tenantId: '@tenantId'
});
factory.NumericMetricData = $resource(url + '/:tenantId/metrics/numeric/:numericId/data', {
tenantId: '@tenantId',
factory.NumericMetric = $resource(url + '/gauges');
factory.NumericMetricData = $resource(url + '/gauges/:numericId/data', {
numericId: '@numericId'
}, {
queryMetrics: {
Expand All @@ -292,21 +287,18 @@ var hawkularRest;
params: { buckets: 60, start: '@startTimestamp', end: '@endTimestamp' }
}
});
factory.NumericMetricMultiple = $resource(url + '/:tenantId/metrics/numeric/data', {
tenantId: '@tenantId',
factory.NumericMetricMultiple = $resource(url + '/gauges/data', {
numericId: '@numericId'
});
factory.AvailabilityMetric = $resource(url + '/:tenantId/metrics/availability', {
tenantId: '@tenantId'
});
factory.AvailabilityMetricData = $resource(url + '/:tenantId/metrics/availability/:availabilityId/data', {
tenantId: '@tenantId',
factory.AvailabilityMetric = $resource(url + '/availability');
factory.AvailabilityMetricData = $resource(url + '/availability/:availabilityId/data', {
availabilityId: '@availabilityId'
});
factory.AvailabilityMetricMultiple = $resource(url + '/:tenantId/metrics/availability/data', {
tenantId: '@tenantId'
});
factory.AvailabilityMetricMultiple = $resource(url + '/availability/data');
factory.configureTenantId = function (tenantId) {
$httpProvider.defaults.headers.get['Hawkular-Tenant'] = this.tenantId;
};
return factory;
}];
});
}]);
})(hawkularRest || (hawkularRest = {}));
2 changes: 1 addition & 1 deletion dist/hawkular-ui-service.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 22 additions & 8 deletions src/rest/hawkRest-metric-factory.spec.rest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ describe('Provider: Hawkular live REST', function() {
};

debug && dump('creating tenant..', tenant);
HawkularMetric.configureTenantId(tennantId);
result = HawkularMetric.Tenant.save(tenant);
httpReal.submit();

Expand All @@ -65,6 +66,7 @@ describe('Provider: Hawkular live REST', function() {
beforeEach(function(done) {

debug && dump('querying tenants..');
HawkularMetric.configureTenantId(tennantId);
result = HawkularMetric.Tenant.query();
httpReal.submit();

Expand Down Expand Up @@ -93,6 +95,7 @@ describe('Provider: Hawkular live REST', function() {
};

debug && dump('creating tenant..', tenant);
HawkularMetric.configureTenantId(tennantId);
result = HawkularMetric.Tenant.save(tenant);
httpReal.submit();

Expand Down Expand Up @@ -145,12 +148,15 @@ describe('Provider: Hawkular live REST', function() {

beforeEach(function(done) {

console.log('?????????????????????', tennantId)

var metric = {
id: metricId
};

debug && dump('creating numeric metric..', metric);
result = HawkularMetric.NumericMetric.save({ tenantId: tennantId }, metric);
HawkularMetric.configureTenantId(tennantId);
result = HawkularMetric.NumericMetric.save(metric);
httpReal.submit();

result.$promise.then(function(){
Expand All @@ -173,7 +179,8 @@ describe('Provider: Hawkular live REST', function() {
beforeEach(function(done) {

debug && dump('querying numeric metric..');
result = HawkularMetric.Metric.queryNum({ tenantId: tennantId });
HawkularMetric.configureTenantId(tennantId);
result = HawkularMetric.Metric.queryNum();
httpReal.submit();

result.$promise.then(function(){
Expand Down Expand Up @@ -202,8 +209,10 @@ describe('Provider: Hawkular live REST', function() {
{"timestamp": 1456857688195, "value": 2.3}
];


debug && dump('creating numeric metric data..', data);
result = HawkularMetric.NumericMetricData.save({ tenantId: tennantId, numericId: metricId }, data);
HawkularMetric.configureTenantId(tennantId);
result = HawkularMetric.NumericMetricData.save({ numericId: metricId }, data);
httpReal.submit();

result.$promise.then(function(){
Expand Down Expand Up @@ -243,7 +252,8 @@ describe('Provider: Hawkular live REST', function() {
];

debug && dump('creating numeric metric multiple data..', data);
result = HawkularMetric.NumericMetricMultiple.save({ tenantId: tennantId }, data);
HawkularMetric.configureTenantId(tennantId);
result = HawkularMetric.NumericMetricMultiple.save(data);
httpReal.submit();

result.$promise.then(function(){
Expand Down Expand Up @@ -278,7 +288,8 @@ describe('Provider: Hawkular live REST', function() {
};

debug && dump('creating availability metric..', metric);
result = HawkularMetric.AvailabilityMetric.save({ tenantId: tennantId }, metric);
HawkularMetric.configureTenantId(tennantId);
result = HawkularMetric.AvailabilityMetric.save(null, metric);
httpReal.submit();

result.$promise.then(function(){
Expand All @@ -301,7 +312,8 @@ describe('Provider: Hawkular live REST', function() {
beforeEach(function(done) {

debug && dump('qyerying availability metric..');
result = HawkularMetric.Metric.queryAvail({ tenantId: tennantId });
HawkularMetric.configureTenantId(tennantId);
result = HawkularMetric.Metric.queryAvail();
httpReal.submit();

result.$promise.then(function(){
Expand Down Expand Up @@ -330,7 +342,8 @@ describe('Provider: Hawkular live REST', function() {
];

debug && dump('creating availability metric data..', data);
result = HawkularMetric.AvailabilityMetricData.save({ tenantId: tennantId, availabilityId: 'myavail' }, data);
HawkularMetric.configureTenantId(tennantId);
result = HawkularMetric.AvailabilityMetricData.save({ availabilityId: 'myavail' }, data);
httpReal.submit();

result.$promise.then(function(){
Expand Down Expand Up @@ -370,7 +383,8 @@ describe('Provider: Hawkular live REST', function() {
];

debug && dump('creating availability metric multiple data..', data);
result = HawkularMetric.AvailabilityMetricMultiple.save({ tenantId: tennantId }, data);
HawkularMetric.configureTenantId(tennantId);
result = HawkularMetric.AvailabilityMetricMultiple.save(data);
httpReal.submit();

result.$promise.then(function(){
Expand Down

0 comments on commit 1df7e83

Please sign in to comment.