Continue with Availability chart.

hawkular · Apr 20, 2015 · bc69a2d · bc69a2d
1 parent 5556078
commit bc69a2d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/plugins/metrics/plugins/metrics/html/availability.html b/plugins/metrics/plugins/metrics/html/availability.html
@@ -30,12 +30,12 @@ <h1>Availability</h1>
       <i class="fa fa-clock-o"></i><a ng-click="vm.refreshAvailPageNow(vm.getRawMetricId())"><strong>Last update</strong> 20 seconds ago</a>
     </div>
 
-    <h3>Chart Placeholder</h3>
-    <!--<hawkular-chart-->
-      <!--data="{{vm.availabilityDataPoints}}"-->
-      <!--chart-type="availability"-->
-      <!--chart-height="250">-->
-    <!--</hawkular-chart>-->
+    <h2>Avail points: {{vm.availabilityDataPoints.length}}</h2>
+    <hawkular-chart
+      availData="{{vm.availabilityDataPoints}}"
+      chart-type="availability"
+      chart-height="250">
+    </hawkular-chart>
   </div>
 
 </section>
diff --git a/plugins/metrics/plugins/metrics/ts/metricsAvailabilityPage.ts b/plugins/metrics/plugins/metrics/ts/metricsAvailabilityPage.ts
@@ -91,7 +91,6 @@ module HawkularMetrics {
     autoRefreshAvailability(intervalInSeconds:number):void {
       this.endTimeStamp = this.$scope.hkEndTimestamp;
       this.startTimeStamp = this.$scope.hkStartTimestamp;
-      this.$log.debug("first time through Availability page raw metricId is: " + this.getRawMetricId());
       this.refreshAvailPageNow(this.getRawMetricId());
       this.autoRefreshPromise = this.$interval(()  => {
         console.info('Autorefresh Availabilty for: ' + this.getRawMetricId());
@@ -163,13 +162,7 @@ module HawkularMetrics {
 
             console.info("Availability Data: ");
             console.dir(response);
-
-            if (this.availabilityDataPoints.length) {
-              this.availabilityDataPoints = response;
-
-            } else {
-              this.noDataFoundForId(this.getRawMetricId());
-            }
+            this.availabilityDataPoints = response;
 
           }, (error) => {
             this.$log.error('Error Loading Avail data');