This repository has been archived by the owner on Nov 9, 2017. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into integration-latest-of-everything
Conflicts: console/src/main/scripts/plugins/metrics/ts/alertsManager.ts console/src/main/scripts/plugins/metrics/ts/metricsResponsePage.ts
- Loading branch information
Showing
9 changed files
with
250 additions
and
140 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 136 additions & 0 deletions
136
console/src/main/scripts/plugins/metrics/ts/metricService.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| /// | ||
| /// Copyright 2015 Red Hat, Inc. and/or its affiliates | ||
| /// and other contributors as indicated by the @author tags. | ||
| /// | ||
| /// Licensed under the Apache License, Version 2.0 (the "License"); | ||
| /// you may not use this file except in compliance with the License. | ||
| /// You may obtain a copy of the License at | ||
| /// | ||
| /// http://www.apache.org/licenses/LICENSE-2.0 | ||
| /// | ||
| /// Unless required by applicable law or agreed to in writing, software | ||
| /// distributed under the License is distributed on an "AS IS" BASIS, | ||
| /// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| /// See the License for the specific language governing permissions and | ||
| /// limitations under the License. | ||
| /// | ||
|
|
||
| /// <reference path="metricsPlugin.ts"/> | ||
| /// @TODO Move to shared service location | ||
|
|
||
| module HawkularMetrics { | ||
|
|
||
|
|
||
| export interface IMetricResponse { | ||
| timestamp: number; | ||
| value?: number; | ||
| avg: number; | ||
| min: number; | ||
| max: number; | ||
| percentile95th?: number; | ||
| median?: number; | ||
| } | ||
|
|
||
|
|
||
| export interface IContextChartDataPoint { | ||
| timestamp: number; | ||
| start?: number; | ||
| end?: number; | ||
| value: number; | ||
| avg: number; | ||
| empty: boolean; | ||
| } | ||
|
|
||
| export interface IChartDataPoint extends IContextChartDataPoint { | ||
| date: Date; | ||
| min: number; | ||
| max: number; | ||
| percentile95th: number; | ||
| median: number; | ||
| } | ||
|
|
||
| export interface IChartData { | ||
| id: MetricId; | ||
| startTimeStamp: TimestampInMillis; | ||
| endTimeStamp: TimestampInMillis; | ||
| dataPoints: IChartDataPoint[]; | ||
| contextDataPoints: IChartDataPoint[]; | ||
| annotationDataPoints: IChartDataPoint[]; | ||
| } | ||
|
|
||
| export interface IMetricService { | ||
| retrieveGaugeMetric(personaId:PersonaId, metricId:MetricId, | ||
| startTime?:TimestampInMillis, | ||
| endTime?:TimestampInMillis, | ||
| buckets?:number):ng.IPromise<IChartDataPoint[]>; | ||
| } | ||
|
|
||
| export class MetricService implements IMetricService { | ||
|
|
||
| public static $inject = ['$log', 'HawkularMetric', 'AlertService']; | ||
|
|
||
| constructor(private $log:ng.ILogService, | ||
| private HawkularMetric:any, | ||
| private AlertService:IAlertService) { | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * formatBucketedChartOutput | ||
| * @param response | ||
| * @returns {any} | ||
| */ | ||
| public static formatBucketedChartOutput(response):IChartDataPoint[] { | ||
| // The schema is different for bucketed output | ||
| return _.map(response, (point:IChartDataPoint) => { | ||
| return { | ||
| timestamp: point.start, | ||
| date: new Date(point.start), | ||
| value: !angular.isNumber(point.value) ? 0 : point.value, | ||
| avg: (point.empty) ? 0 : point.avg, | ||
| min: !angular.isNumber(point.min) ? 0 : point.min, | ||
| max: !angular.isNumber(point.max) ? 0 : point.max, | ||
| percentile95th: !angular.isNumber(point.percentile95th) ? 0 : point.percentile95th, | ||
| median: !angular.isNumber(point.median) ? 0 : point.median, | ||
| empty: point.empty | ||
| }; | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * RetrieveGaugeMetric | ||
| * @param personaId | ||
| * @param metricId | ||
| * @param startTime | ||
| * @param endTime | ||
| * @param buckets | ||
| * @returns ng.IPromise<IChartDataPoint[]> | ||
| */ | ||
| public retrieveGaugeMetric(personaId:PersonaId, | ||
| metricId:MetricId, | ||
| startTime?:TimestampInMillis, | ||
| endTime?:TimestampInMillis, | ||
| buckets = 120):ng.IPromise<IChartDataPoint[]> { | ||
|
|
||
| // calling refreshChartData without params use the model values | ||
| if (!endTime) { | ||
| endTime = Date.now(); | ||
| } | ||
| if (!startTime) { | ||
| startTime = Date.now() - (8 * 60 * 60 * 1000); | ||
| } | ||
|
|
||
| return this.HawkularMetric.GaugeMetricData(personaId).queryMetrics({ | ||
| gaugeId: metricId, | ||
| start: startTime, | ||
| end: endTime, | ||
| buckets: buckets | ||
| }).$promise; | ||
|
|
||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
| _module.service('MetricService', MetricService); | ||
| } |
Oops, something went wrong.