fix for mainchart buttons, made chart refreshes more frequent
Costa Tsaousis (ktsaou) committed
Apr 6, 2014 at 14:34 UTC
9ad044a5672b34f81dbba788b37e5c005eb8ebac
2 files changed
+13
-13
web/index.html
+6
-6
@@ -446,13 +446,13 @@
446
<tr><td align="center">
447
<div class="btn-group">
448
<form id="mainchartform">
449
- <div class="btn-group btn-group-xs" data-toggle="buttons" >
450
- <button type="button" class="btn btn-primary mainchart_play_button" data-toggle="tooltip" title=" click <span class='glyphicon glyphicon-play'></span> to have the graph auto-refresh, or click <span class='glyphicon glyphicon-pause'></span> to pause the graph. When paused the graph can be zoomed and panned horizontally." data-play-text="<span class='glyphicon glyphicon-pause'></span>" data-pause-text="<span class='glyphicon glyphicon-play'></span>" onClick="setMainChartPlay('toggle');">
449
+ <div class="btn-group btn-group-xs" data-toggle="tooltip" title=" click <span class='glyphicon glyphicon-play'></span> to have the graph auto-refresh, or click <span class='glyphicon glyphicon-pause'></span> to pause the graph. When paused the graph can be zoomed and panned horizontally." >
450
+ <button type="button" class="btn btn-primary mainchart_play_button" data-play-text="<span class='glyphicon glyphicon-pause'></span>" data-pause-text="<span class='glyphicon glyphicon-play'></span>" onClick="setMainChartPlay('toggle');">
451
<span class="glyphicon glyphicon-pause"></span>
452
</button>
453
</div>
454
- <div class="btn-group btn-group-xs" data-toggle="buttons" >
455
- <button type="button" class="btn btn-primary mainchart_avg_button" data-toggle="tooltip" title="use the maximum ( <span class='glyphicon glyphicon-signal'></span> ) or the average ( <span class='glyphicon glyphicon-align-justify'></span> ) value of grouped points" data-max-text="<span class='glyphicon glyphicon-signal'></span>" data-average-text="<span class='glyphicon glyphicon-align-justify'></span>" onClick="setMainChartGroupMethod('toggle');">
454
+ <div class="btn-group btn-group-xs" data-toggle="tooltip" title="use the maximum ( <span class='glyphicon glyphicon-signal'></span> ) or the average ( <span class='glyphicon glyphicon-align-justify'></span> ) value of grouped points" >
455
+ <button type="button" class="btn btn-primary mainchart_avg_button" data-max-text="<span class='glyphicon glyphicon-signal'></span>" data-average-text="<span class='glyphicon glyphicon-align-justify'></span>" onClick="setMainChartGroupMethod('toggle');">
456
<span class="glyphicon glyphicon-signal"></span>
457
</button>
458
</div>
@@ -497,8 +497,8 @@
497
<input type="radio" name="group" id="group60" onChange="setMainChartGroup(60);">60
498
</label>
499
</div>
500
- <div class="btn-group btn-group-xs" data-toggle="buttons" >
501
- <button type="button" class="btn btn-primary mainchart_max_button" data-toggle="tooltip" title="maximized ( <span class='glyphicon glyphicon-fullscreen'></span> ) or normal ( <span class='glyphicon glyphicon-resize-small'></span> ) view of the graph" data-maximized-text="<span class='glyphicon glyphicon-resize-small'></span>" data-normal-text="<span class='glyphicon glyphicon-fullscreen'></span>" onClick="setMainChartMax('toggle');">
500
+ <div class="btn-group btn-group-xs" data-toggle="tooltip" title="maximized ( <span class='glyphicon glyphicon-fullscreen'></span> ) or normal ( <span class='glyphicon glyphicon-resize-small'></span> ) view of the graph" >
501
+ <button type="button" class="btn btn-primary mainchart_max_button" data-maximized-text="<span class='glyphicon glyphicon-resize-small'></span>" data-normal-text="<span class='glyphicon glyphicon-fullscreen'></span>" onClick="setMainChartMax('toggle');">
502
<span class="glyphicon glyphicon-fullscreen"></span>
503
</button>
504
</div>
web/netdata.js
+7
-7
@@ -273,7 +273,7 @@ function loadCharts(base_url, doNext) {
273
case "cpu":
274
json.charts[i].category = "CPU";
275
json.charts[i].glyphicon = "glyphicon-dashboard";
276
- json.charts[i].group = 15;
276
+ json.charts[i].group = 10;
277
278
if(json.charts[i].id.substring(0, 7) == "cpu.cpu") {
279
json.charts[i].chartOptions.vAxis.minValue = 0;
@@ -290,7 +290,7 @@ function loadCharts(base_url, doNext) {
290
case "net":
291
json.charts[i].category = "Network Interfaces";
292
json.charts[i].glyphicon = "glyphicon-transfer";
293
- json.charts[i].group = 10;
293
+ json.charts[i].group = 5;
294
295
// disable IFB and net.lo devices by default
296
if((json.charts[i].id.substring(json.charts[i].id.length - 4, json.charts[i].id.length) == "-ifb")
@@ -301,31 +301,31 @@ function loadCharts(base_url, doNext) {
301
case "ipv4":
302
json.charts[i].category = "IPv4";
303
json.charts[i].glyphicon = "glyphicon-globe";
304
- json.charts[i].group = 20;
304
+ json.charts[i].group = 10;
305
break;
306
307
case "conntrack":
308
json.charts[i].category = "Netfilter";
309
json.charts[i].glyphicon = "glyphicon-cloud";
310
- json.charts[i].group = 20;
310
+ json.charts[i].group = 10;
311
break;
312
313
case "ipvs":
314
json.charts[i].category = "IPVS";
315
json.charts[i].glyphicon = "glyphicon-sort";
316
- json.charts[i].group = 15;
316
+ json.charts[i].group = 10;
317
break;
318
319
case "disk":
320
json.charts[i].category = "Disk I/O";
321
json.charts[i].glyphicon = "glyphicon-hdd";
322
- json.charts[i].group = 15;
322
+ json.charts[i].group = 10;
323
break;
324
325
default:
326
json.charts[i].category = "Unknown";
327
json.charts[i].glyphicon = "glyphicon-search";
328
- json.charts[i].group = 30;
328
+ json.charts[i].group = 15;
329
break;
330
}
331
});