Integrate availability chart.

hawkular · Jun 1, 2015 · ada7d93 · ada7d93
1 parent 65f2573
commit ada7d93
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/ui/console/src/main/scripts/bower.json b/ui/console/src/main/scripts/bower.json
@@ -22,7 +22,7 @@
     "bootstrap-select": "1.6",
     "d3": "3.4.8",
     "event-drops": "0.1.1",
-    "hawkular-charts": "0.3.0",
+    "hawkular-charts": "0.3.1",
     "hawkular-ui-services": "0.2.5",
     "hawtio-core-navigation": "2.0.39",
     "hawtio-core": "2.0.16",

diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/availability.html b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/availability.html
@@ -63,26 +63,20 @@ <h3 class="pull-left" data-toggle="tooltip" data-placement="top" title="" data-o
     <div class="hk-info-top clearfix">
       <h3 class="pull-left">Metrics</h3>
       <div class="hk-update pull-right">
-        <button class="btn btn-link hk-chart-update" tooltip-trigger tooltip-placement="top" tooltip="Update chart"><i class="fa fa-refresh"></i></button>
+        <button ng-click="vm.refreshAvailPageNow(vm.getRawMetricId())" class="btn btn-link hk-chart-update" tooltip-trigger tooltip-placement="top" tooltip="Update chart"><i class="fa fa-refresh"></i></button>
       </div>
     </div>
 
     <div class="panel panel-default hk-graph">
       <h2>Availability</h2>
-      <img src="img/graph-availability.png" alt="graph" width="944" height="197">
+      <availability-chart
+              data="{{vm.availabilityDataPoints}}"
+              chart-type="availability"
+              chart-height="215">
+      </availability-chart>
+
     </div>
-    <!--<div class="panel panel-default graph">-->
-      <!--<div class="update pull-right" ng-show="vm.availabilityDataPoints.length > 0" >-->
-        <!--<i class="fa fa-clock-o"></i><a ng-click="vm.refreshAvailPageNow(vm.getRawMetricId())"><strong>Last update</strong> 20 seconds ago</a>-->
-      <!--</div>-->
 
-      <!--<h2>Avail points: {{vm.availabilityDataPoints.length}}</h2>-->
-      <!--<availability-chart-->
-        <!--data="{{vm.availabilityDataPoints}}"-->
-        <!--chart-type="availability"-->
-        <!--chart-height="250">-->
-      <!--</availability-chart>-->
-    <!--</div>-->
 
   </section>
 </div>