Skip to content

Commit 61c9c6a

Browse files
committed
Fixed work with luminous 12.2.2 introduced by mon_health_preluminous_compat_warning option.
1 parent c41a2d8 commit 61c9c6a

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

app/static/js/ceph.dash.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $(function () {
3131
position: 'bottom-center'
3232
},
3333
geometry: {
34-
startAngle: 180,
34+
startAngle: 180,
3535
endAngle: 0
3636
},
3737
margin: {
@@ -46,7 +46,7 @@ $(function () {
4646
]
4747
},
4848
scale: {
49-
startValue: 0,
49+
startValue: 0,
5050
endValue: 100,
5151
majorTick: {
5252
tickInterval: 20
@@ -118,7 +118,7 @@ $(function () {
118118
percentPrecision: 2,
119119
font: { size: 14, color: '#1c1e22', family: 'Helvetica' },
120120
arrowLength: 10,
121-
customizeText: function() {
121+
customizeText: function() {
122122
return this.valueText + " - " + this.argumentText + " (" + this.percentText + ")";
123123
}
124124
},
@@ -309,20 +309,21 @@ $(function () {
309309

310310
// *overall status*
311311
clusterStatusOverall = data['health']['overall_status'];
312-
if (data['health']['status'] || false) {
313-
clusterStatusOverall = data['health']['status'];
314-
}
315-
clusterHealthSummary = [];
316-
if (data['health']['summary'] || false) {
317-
$.each(data['health']['summary'], function(index, check) {
318-
clusterHealthSummary.push(check['summary']);
319-
});
312+
if (data['health']['status'] || false) {
313+
clusterStatusOverall = data['health']['status'];
320314
}
315+
clusterHealthSummary = [];
321316
if (data['health']['checks'] || false) {
322317
$.each(data['health']['checks'], function(index, check) {
323318
clusterHealthSummary.push(check['summary']['message']);
324319
});
325320
}
321+
else if (data['health']['summary'] || false) {
322+
$.each(data['health']['summary'], function(index, check) {
323+
clusterHealthSummary.push(check['summary']);
324+
});
325+
}
326+
326327

327328
// *monitor state*
328329
monmapMons = data['monmap']['mons'];

0 commit comments

Comments
 (0)