Skip to content

Commit

Permalink
Latest dist product of Metrics API refactor.
Browse files Browse the repository at this point in the history
  • Loading branch information
mtho11 committed Jun 15, 2015
1 parent 166dc57 commit 64f7ba1
Show file tree
Hide file tree
Showing 2 changed files with 260 additions and 74 deletions.
167 changes: 130 additions & 37 deletions dist/hawkular-ui-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,50 +258,143 @@ var hawkularRest;
this.port = port;
return this;
};
this.$get = ['$resource', '$location', '$http', function ($resource, $location, $http) {
this.$get = ['$resource', '$location', '$http', function ($resource, $location) {
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 url = prefix + metricUrlPart;
var factory = {};
factory.Tenant = $resource(url + '/tenants', {});
factory.Metric = $resource(url + '/', null, {
queryGauges: {
method: 'GET',
isArray: true,
params: { type: 'gauge' }
},
queryAvailability: {
method: 'GET',
isArray: true,
params: { type: 'availability' }
}
});
factory.GaugeMetric = $resource(url + '/gauges');
factory.GaugeMetricData = $resource(url + '/gauges/:gaugeId/data', {
gaugeId: '@gaugeId'
}, {
queryMetrics: {
method: 'GET',
isArray: true
},
queryMetricsTimeRange: {
method: 'GET',
isArray: true,
params: { buckets: 60, start: '@startTimestamp', end: '@endTimestamp' }
}
});
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) {
$http.defaults.headers.common['Hawkular-Tenant'] = tenantId;
factory.Metric = function (tenantId) {
return $resource(url + '/metrics', null, {
queryGauges: {
method: 'GET',
isArray: true,
params: { type: 'gauge' },
headers: { 'Hawkular-Tenant': tenantId }
},
queryAvailability: {
method: 'GET',
isArray: true,
params: { type: 'availability' },
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
factory.GaugeMetric = function (tenantId) {
return $resource(url + '/gauges', null, {
get: {
method: 'GET',
headers: { 'Hawkular-Tenant': tenantId }
},
query: {
method: 'GET',
isArray: true,
headers: { 'Hawkular-Tenant': tenantId }
},
save: {
method: 'POST',
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
factory.GaugeMetricData = function (tenantId) {
return $resource(url + '/gauges/:gaugeId/data', {
gaugeId: '@gaugeId'
}, {
queryMetrics: {
method: 'GET',
isArray: true,
headers: { 'Hawkular-Tenant': tenantId }
},
queryMetricsTimeRange: {
method: 'GET',
isArray: true,
params: { buckets: 60, start: '@startTimestamp', end: '@endTimestamp' },
headers: { 'Hawkular-Tenant': tenantId }
},
get: {
method: 'GET',
headers: { 'Hawkular-Tenant': tenantId }
},
save: {
method: 'POST',
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
factory.GaugeMetricMultiple = function (tenantId) {
return $resource(url + '/gauges/data', {
gaugeId: '@gaugeId'
}, {
get: {
method: 'GET',
headers: { 'Hawkular-Tenant': tenantId },
query: {
method: 'GET',
isArray: true,
headers: { 'Hawkular-Tenant': tenantId }
}
},
save: {
method: 'POST',
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
factory.AvailabilityMetric = function (tenantId) {
return $resource(url + '/availability', null, {
get: {
method: 'GET',
headers: { 'Hawkular-Tenant': tenantId }
},
query: {
method: 'GET',
isArray: true,
headers: { 'Hawkular-Tenant': tenantId }
},
save: {
method: 'POST',
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
factory.AvailabilityMetricData = function (tenantId) {
return $resource(url + '/availability/:availabilityId/data', {
availabilityId: '@availabilityId'
}, {
get: {
method: 'GET',
headers: { 'Hawkular-Tenant': tenantId }
},
query: {
method: 'GET',
isArray: true,
headers: { 'Hawkular-Tenant': tenantId }
},
save: {
method: 'POST',
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
factory.AvailabilityMetricMultiple = function (tenantId) {
return $resource(url + '/availability/data', null, {
get: {
method: 'GET',
headers: { 'Hawkular-Tenant': tenantId }
},
query: {
method: 'GET',
isArray: true,
headers: { 'Hawkular-Tenant': tenantId }
},
save: {
method: 'POST',
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
return factory;
}];
Expand Down
167 changes: 130 additions & 37 deletions dist/hawkular-ui-service.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,50 +258,143 @@ var hawkularRest;
this.port = port;
return this;
};
this.$get = ['$resource', '$location', '$http', function ($resource, $location, $http) {
this.$get = ['$resource', '$location', '$http', function ($resource, $location) {
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 url = prefix + metricUrlPart;
var factory = {};
factory.Tenant = $resource(url + '/tenants', {});
factory.Metric = $resource(url + '/', null, {
queryGauges: {
method: 'GET',
isArray: true,
params: { type: 'gauge' }
},
queryAvailability: {
method: 'GET',
isArray: true,
params: { type: 'availability' }
}
});
factory.GaugeMetric = $resource(url + '/gauges');
factory.GaugeMetricData = $resource(url + '/gauges/:gaugeId/data', {
gaugeId: '@gaugeId'
}, {
queryMetrics: {
method: 'GET',
isArray: true
},
queryMetricsTimeRange: {
method: 'GET',
isArray: true,
params: { buckets: 60, start: '@startTimestamp', end: '@endTimestamp' }
}
});
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) {
$http.defaults.headers.common['Hawkular-Tenant'] = tenantId;
factory.Metric = function (tenantId) {
return $resource(url + '/metrics', null, {
queryGauges: {
method: 'GET',
isArray: true,
params: { type: 'gauge' },
headers: { 'Hawkular-Tenant': tenantId }
},
queryAvailability: {
method: 'GET',
isArray: true,
params: { type: 'availability' },
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
factory.GaugeMetric = function (tenantId) {
return $resource(url + '/gauges', null, {
get: {
method: 'GET',
headers: { 'Hawkular-Tenant': tenantId }
},
query: {
method: 'GET',
isArray: true,
headers: { 'Hawkular-Tenant': tenantId }
},
save: {
method: 'POST',
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
factory.GaugeMetricData = function (tenantId) {
return $resource(url + '/gauges/:gaugeId/data', {
gaugeId: '@gaugeId'
}, {
queryMetrics: {
method: 'GET',
isArray: true,
headers: { 'Hawkular-Tenant': tenantId }
},
queryMetricsTimeRange: {
method: 'GET',
isArray: true,
params: { buckets: 60, start: '@startTimestamp', end: '@endTimestamp' },
headers: { 'Hawkular-Tenant': tenantId }
},
get: {
method: 'GET',
headers: { 'Hawkular-Tenant': tenantId }
},
save: {
method: 'POST',
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
factory.GaugeMetricMultiple = function (tenantId) {
return $resource(url + '/gauges/data', {
gaugeId: '@gaugeId'
}, {
get: {
method: 'GET',
headers: { 'Hawkular-Tenant': tenantId },
query: {
method: 'GET',
isArray: true,
headers: { 'Hawkular-Tenant': tenantId }
}
},
save: {
method: 'POST',
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
factory.AvailabilityMetric = function (tenantId) {
return $resource(url + '/availability', null, {
get: {
method: 'GET',
headers: { 'Hawkular-Tenant': tenantId }
},
query: {
method: 'GET',
isArray: true,
headers: { 'Hawkular-Tenant': tenantId }
},
save: {
method: 'POST',
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
factory.AvailabilityMetricData = function (tenantId) {
return $resource(url + '/availability/:availabilityId/data', {
availabilityId: '@availabilityId'
}, {
get: {
method: 'GET',
headers: { 'Hawkular-Tenant': tenantId }
},
query: {
method: 'GET',
isArray: true,
headers: { 'Hawkular-Tenant': tenantId }
},
save: {
method: 'POST',
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
factory.AvailabilityMetricMultiple = function (tenantId) {
return $resource(url + '/availability/data', null, {
get: {
method: 'GET',
headers: { 'Hawkular-Tenant': tenantId }
},
query: {
method: 'GET',
isArray: true,
headers: { 'Hawkular-Tenant': tenantId }
},
save: {
method: 'POST',
headers: { 'Hawkular-Tenant': tenantId }
}
});
};
return factory;
}];
Expand Down

0 comments on commit 64f7ba1

Please sign in to comment.