Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #882 from pavolloffay/charts-removed-height
Browse files Browse the repository at this point in the history
Charts removed height property
  • Loading branch information
mtho11 committed May 25, 2016
2 parents cd4c6dd + 2013314 commit 6d643a5
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ <h2>CPU Usage</h2>
data="os.chartCpuData"
chart-type="rhqbar"
hide-high-low-values="false"
y-axis-units="Usage (%)"
chart-height="250">
y-axis-units="Usage (%)">
</hk-metric-chart>
</div>

Expand All @@ -99,8 +98,7 @@ <h2>CPU Usage</h2>
data="os.chartCpuDataMulti[cpu]"
chart-type="rhqbar"
hide-high-low-values="false"
y-axis-units="Usage (%)"
chart-height="150">
y-axis-units="Usage (%)">
</hk-metric-chart>
</div>
</span>
Expand Down Expand Up @@ -146,8 +144,7 @@ <h2>File System Usage</h2>
<hk-metric-chart
multi-data="os.chartFileSystemData[fs.id]"
chart-type="multiline"
y-axis-units="Disk Space (MB)"
chart-height="250">
y-axis-units="Disk Space (MB)">
</hk-metric-chart>
</div>
<div class="row hk-legend hk-legend-inline text-left hk-legend-metrics">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ <h2>Web Sessions</h2>
<hk-metric-chart
multi-data="vm.chartWebSessionData"
chart-type="multiline"
y-axis-units="Count (#)"
chart-height="250">
y-axis-units="Count (#)">
</hk-metric-chart>
<!--
<div class="context-graph-container" ng-if="vm.contextChartActiveWebSessionData.length > 2">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ <h3 class="pull-left">Metrics</h3>
<h2>Availability</h2>
<div class="hk-graph-container hk-graph-metrics">
<hk-metric-chart multi-data="vm.chartAvailData"
chart-type="multiline" y-axis-units="Availability (#)"
chart-height="250">
chart-type="multiline" y-axis-units="Availability (#)">
</hk-metric-chart>
</div>
<div class="row hk-legend hk-legend-inline text-left hk-legend-metrics">
Expand Down Expand Up @@ -55,8 +54,7 @@ <h2>Responsiveness</h2>
<div class="hk-graph-container hk-graph-metrics">
<hk-metric-chart multi-data="vm.chartRespData"
chart-type="multiline"
y-axis-units="Responsiveness (ms)"
chart-height="250">
y-axis-units="Responsiveness (ms)">
</hk-metric-chart>
</div>
<div class="row hk-legend hk-legend-inline text-left hk-legend-metrics">
Expand Down
6 changes: 2 additions & 4 deletions console/src/main/scripts/plugins/metrics/html/explorer.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,10 @@ <h2>{{chart.name}}</h2>
chart-type="line"
hide-high-low-values="false"
use-zero-min-value="false"
y-axis-units="{{chart.type.unit}}"
chart-height="250">
y-axis-units="{{chart.type.unit}}">
</hk-metric-chart>
<hk-availability-chart ng-if="exc.chartType[chart.id] ==='AVAILABILITY'"
data="exc.chartData[chart.id]"
chart-height="250">
data="exc.chartData[chart.id]">
</hk-availability-chart>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ <h2>Response Time</h2>
chart-type="line"
alert-value="{{vm.threshold}}"
use-zero-min-value="true"
y-axis-units="Response Time (ms)"
chart-height="250">
y-axis-units="Response Time (ms)">
</hk-metric-chart>
</div>

Expand Down

0 comments on commit 6d643a5

Please sign in to comment.