More refactoring to use new avail api with 'distinct=true'

hawkular · Apr 20, 2015 · 4bb819c · 4bb819c
1 parent 8b40b80
commit 4bb819c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 26 deletions.
diff --git a/plugins/metrics/plugins/metrics/html/availability.html b/plugins/metrics/plugins/metrics/html/availability.html
@@ -31,11 +31,11 @@ <h1>Availability</h1>
     </div>
 
     <h2>Avail points: {{vm.availabilityDataPoints.length}}</h2>
-    <hawkular-chart
-      availData="{{vm.availabilityDataPoints}}"
+    <availability-chart
+      data="{{vm.availabilityDataPoints}}"
       chart-type="availability"
       chart-height="250">
-    </hawkular-chart>
+    </availability-chart>
   </div>
 
 </section>
diff --git a/plugins/metrics/plugins/metrics/ts/addUrlPage.ts b/plugins/metrics/plugins/metrics/ts/addUrlPage.ts
@@ -81,7 +81,6 @@ module HawkularMetrics {
 
       this.$log.info('Adding new Resource Url to Hawkular-inventory: ' + url);
 
-      globalChartTimeRange = new ChartTimeRange(1);
       var metricId: string;
       var defaultEmail = this.$rootScope['user_email'] ? this.$rootScope['user_email'] : 'myemail@company.com';
       var err = (error: any, msg: string): void => this.HawkularErrorManager.errorHandler(error, msg);

diff --git a/plugins/metrics/plugins/metrics/ts/metricsAvailabilityPage.ts b/plugins/metrics/plugins/metrics/ts/metricsAvailabilityPage.ts
@@ -159,11 +159,11 @@ module HawkularMetrics {
           availabilityId: metricId,
           start: startTime,
           end: endTime,
-          buckets: 60
+          distinct: true
         }).$promise
           .then((response) => {
 
-            console.info("Availability Data: ");
+            console.log("Availability Data: ");
             console.dir(response);
             this.availabilityDataPoints = response;
 

diff --git a/plugins/metrics/plugins/metrics/ts/metricsGlobals.ts b/plugins/metrics/plugins/metrics/ts/metricsGlobals.ts
@@ -30,24 +30,5 @@ module HawkularMetrics {
   /// @todo: this will go away once we have KeyCloak integration
   export var globalTenantId = "test";
 
-  export var globalEnvironmentId = "test";
-
-  export var globalChartTimeRange:ChartTimeRange;
-
-  export class ChartTimeRange {
-    startTimestamp:number;
-    endTimestamp:number;
-
-    constructor(private initialHoursDifference:number) {
-      /// just set a default if no ctors given
-      this.init();
-    }
-
-    init() {
-      this.endTimestamp = moment().valueOf();
-      this.startTimestamp = moment().subtract(this.initialHoursDifference, 'hours').valueOf();
-    }
-
-  }
 
 }
diff --git a/plugins/metrics/plugins/metrics/ts/metricsResponsePage.ts b/plugins/metrics/plugins/metrics/ts/metricsResponsePage.ts
@@ -195,13 +195,14 @@ module HawkularMetrics {
         startTime = this.startTimeStamp;
       }
 
+
       if (metricId) {
         this.HawkularMetric.NumericMetricData.queryMetrics({
           tenantId: globalTenantId,
           numericId: metricId,
           start: startTime,
           end: endTime,
-          buckets: 60
+          buckets: 120
         }).$promise
           .then((response) => {