Skip to content

Commit

Permalink
More updates for the metrics service.
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Negrea committed Jun 1, 2015
1 parent 1df7e83 commit e06c6da
Show file tree
Hide file tree
Showing 7 changed files with 339 additions and 41 deletions.
14 changes: 7 additions & 7 deletions dist/hawkular-ui-service.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,17 +265,17 @@ var hawkularRest;
queryNum: {
method: 'GET',
isArray: true,
params: { type: 'gauges' }
params: { type: 'gauge' }
},
queryAvail: {
method: 'GET',
isArray: true,
params: { type: 'availability' }
}
});
factory.NumericMetric = $resource(url + '/gauges');
factory.NumericMetricData = $resource(url + '/gauges/:numericId/data', {
numericId: '@numericId'
factory.GaugeMetric = $resource(url + '/gauges');
factory.GaugeMetric = $resource(url + '/gauges/:gaugeId/data', {
gaugeId: '@gaugeId'
}, {
queryMetrics: {
method: 'GET',
Expand All @@ -287,16 +287,16 @@ var hawkularRest;
params: { buckets: 60, start: '@startTimestamp', end: '@endTimestamp' }
}
});
factory.NumericMetricMultiple = $resource(url + '/gauges/data', {
numericId: '@numericId'
factory.GaugeMetricMultiple = $resource(url + '/gauges/data', {
gaugeId: '@gaugeId'
});
factory.AvailabilityMetric = $resource(url + '/availability');
factory.AvailabilityMetricData = $resource(url + '/availability/:availabilityId/data', {
availabilityId: '@availabilityId'
});
factory.AvailabilityMetricMultiple = $resource(url + '/availability/data');
factory.configureTenantId = function (tenantId) {
$httpProvider.defaults.headers.get['Hawkular-Tenant'] = this.tenantId;
$httpProvider.defaults.headers.common['Hawkular-Tenant'] = tenantId;
};
return factory;
}];
Expand Down
305 changes: 304 additions & 1 deletion dist/hawkular-ui-service.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gulp/scripts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ gulp.task('scripts', function () {
.pipe($.header(license))
.pipe(gulp.dest(paths.dist + '/'))
.pipe($.concat('hawkular-ui-service.min.js'))
.pipe($.uglify())
//.pipe($.uglify())
.pipe(gulp.dest(paths.dist + '/'));
});

Expand Down
4 changes: 2 additions & 2 deletions src/rest/hawkRest-metric-factory.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe('Factory: hawkMetric', function() {
it('should create a tenant', function() {
var tenantId = 'myTenantId';

$httpBackend.expectPOST(prefix + '/hawkular-metrics/tenants')
$httpBackend.expectPOST(prefix + '/hawkular/metrics/tenants')
.respond(200);
var result = HawkularRest.Tenant.create({tenantId: tenantId});

Expand All @@ -26,7 +26,7 @@ describe('Factory: hawkMetric', function() {
it('should create a metric', function() {
var tenantId = 'myTenantId';

$httpBackend.expectGET(prefix + '/hawkular-metrics/' + tenantId + '/metrics')
$httpBackend.expectGET(prefix + '/hawkular/metrics/' + tenantId + '/metrics')
.respond([{
name: 'mock.metric',
metadata: {
Expand Down
38 changes: 17 additions & 21 deletions src/rest/hawkRest-metric-factory.spec.rest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ describe('Provider: Hawkular live REST', function() {

var debug = false;
var suffix = '-test-' + new Date().getTime();
var tennantId = 'com.acme.sk' + suffix;
var tennantId2 = 'com.acme.sk2' + suffix;
var tenantId1 = 'com.acme.sk' + suffix;
var tenantId2 = 'com.acme.sk2' + suffix;
var metricId = 'mymetric' + suffix;

var arrayContainsField = function(array, field, value) {
Expand All @@ -17,7 +17,7 @@ describe('Provider: Hawkular live REST', function() {
}
}
return false;
}
};

beforeEach(module('hawkular.services', 'httpReal', function(HawkularMetricProvider) {
HawkularMetricProvider.setHost(__karma__.config.hostname);
Expand All @@ -38,11 +38,11 @@ describe('Provider: Hawkular live REST', function() {
beforeEach(function(done) {

var tenant = {
id: tennantId
id: tenantId1
};

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

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

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

Expand All @@ -80,7 +79,7 @@ describe('Provider: Hawkular live REST', function() {

it('should get previously created tenant only', function() {
expect(result.$resolved).toBe(true);
expect(arrayContainsField(result, 'id', tennantId)).toBe(true);
expect(arrayContainsField(result, 'id', tenantId1)).toBe(true);
});
});

Expand All @@ -91,11 +90,10 @@ describe('Provider: Hawkular live REST', function() {
beforeEach(function(done) {

var tenant = {
id: tennantId2
id: tenantId2
};

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

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

beforeEach(function(done) {

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

var metric = {
id: metricId
};

debug && dump('creating numeric metric..', metric);
HawkularMetric.configureTenantId(tennantId);
result = HawkularMetric.NumericMetric.save(metric);
HawkularMetric.configureTenantId(tenantId1);
result = HawkularMetric.GaugeMetric.save(metric);
httpReal.submit();

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

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

Expand Down Expand Up @@ -211,8 +207,8 @@ describe('Provider: Hawkular live REST', function() {


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

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

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

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

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

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

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

Expand Down Expand Up @@ -342,7 +338,7 @@ describe('Provider: Hawkular live REST', function() {
];

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

Expand Down Expand Up @@ -383,7 +379,7 @@ describe('Provider: Hawkular live REST', function() {
];

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

Expand Down
16 changes: 7 additions & 9 deletions src/rest/hawkRest-metric-factory.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ module hawkularRest {
queryNum: {
method: 'GET',
isArray: true,
params: { type: 'gauges' }
params: { type: 'gauge' }
},
queryAvail: {
method: 'GET',
Expand All @@ -62,10 +62,10 @@ module hawkularRest {
}
});

factory.NumericMetric = $resource(url + '/gauges');
factory.GaugeMetric = $resource(url + '/gauges');

factory.NumericMetricData = $resource(url + '/gauges/:numericId/data', {
numericId: '@numericId'
factory.GaugeMetric = $resource(url + '/gauges/:gaugeId/data', {
gaugeId: '@gaugeId'
}, {
queryMetrics: {
method: 'GET',
Expand All @@ -78,8 +78,8 @@ module hawkularRest {
}
});

factory.NumericMetricMultiple = $resource(url + '/gauges/data', {
numericId : '@numericId'
factory.GaugeMetricMultiple = $resource(url + '/gauges/data', {
gaugeId : '@gaugeId'
});

factory.AvailabilityMetric = $resource(url + '/availability');
Expand All @@ -91,9 +91,7 @@ module hawkularRest {
factory.AvailabilityMetricMultiple = $resource(url + '/availability/data');

factory.configureTenantId = function(tenantId) {
//console.log('--------------------------------', $httpProvider);
console.log('--------------------------------', $httpProvider.defaults.headers['Hawkular-Tenant'] = tenantId);
//$httpProvider.defaults.headers.get['Hawkular-Tenant'] = this.tenantId;
$httpProvider.defaults.headers.common['Hawkular-Tenant'] = tenantId;
};

return factory;
Expand Down
1 change: 1 addition & 0 deletions src/rest/hawkRest.spec.rest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ angular.module('httpReal', ['ng'])
var TIMEOUT = 30000;

var errorFn = function(error){
console.log(error);
var msg = 'ngResource error: ' + (error && error.data && error.data.errorMsg ? error.data.errorMsg : JSON.stringify(error));
return(msg);
};

0 comments on commit e06c6da

Please sign in to comment.