public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

singlestat: fix sizing bug #9337 (#9448)

Browse Source
This commit is contained in:
Alexander Zobnin
2017-10-06 13:41:39 +02:00
committed by Torkel Ödegaard
parent 7af4daf23b
commit 5561a099b0
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/panel/singlestat/module.ts
+8 -4
View File
@@ -432,7 +432,8 @@ class SingleStatCtrl extends MetricsPanelCtrl {
function addGauge() { function addGauge() {
var width = elem.width(); var width = elem.width();
var height = elem.height(); var height = elem.height();
var dimension = Math.min(width, height); // Allow to use a bit more space for wide gauges
var dimension = Math.min(width, height * 1.3);
ctrl.invalidGaugeRange = false; ctrl.invalidGaugeRange = false;
if (panel.gauge.minValue > panel.gauge.maxValue) { if (panel.gauge.minValue > panel.gauge.maxValue) {
@@ -469,8 +470,11 @@ class SingleStatCtrl extends MetricsPanelCtrl {
var fontScale = parseInt(panel.valueFontSize) / 100; var fontScale = parseInt(panel.valueFontSize) / 100;
var fontSize = Math.min(dimension/5, 100) * fontScale; var fontSize = Math.min(dimension/5, 100) * fontScale;
var gaugeWidth = Math.min(dimension/6, 60); // Reduce gauge width if threshold labels enabled
var gaugeWidthReduceRatio = panel.gauge.thresholdLabels ? 1.5 : 1;
var gaugeWidth = Math.min(dimension/6, 60) / gaugeWidthReduceRatio;
var thresholdMarkersWidth = gaugeWidth/5; var thresholdMarkersWidth = gaugeWidth/5;
var thresholdLabelFontSize = fontSize / 2.5;
var options = { var options = {
series: { series: {
@@ -491,8 +495,8 @@ class SingleStatCtrl extends MetricsPanelCtrl {
values: thresholds, values: thresholds,
label: { label: {
show: panel.gauge.thresholdLabels, show: panel.gauge.thresholdLabels,
margin: 8, margin: thresholdMarkersWidth + 1,
font: { size: 18 } font: { size: thresholdLabelFontSize }
}, },
show: panel.gauge.thresholdMarkers, show: panel.gauge.thresholdMarkers,
width: thresholdMarkersWidth, width: thresholdMarkersWidth,