added grouping every 3,4,90
Costa Tsaousis (ktsaou) committed
Nov 23, 2015 at 21:13 UTC
7af35dfab87168adcdd2196a6061e5672a47791c
3 files changed
+15
-5
web/index.html
+9
-2
@@ -85,11 +85,15 @@
85
<label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="do not group points, show the raw data">
86
<input type="radio" name="group" id="group1" onChange="setMainChartGroup(1);">1
87
</label>
88
-
88
<label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="group in half, show 1 every 2 points of data">
89
<input type="radio" name="group" id="group2" onChange="setMainChartGroup(2);">2
90
</label>
92
-
91
+ <label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="group every 3 points of data">
92
+ <input type="radio" name="group" id="group3" onChange="setMainChartGroup(3);">3
93
+ </label>
94
+ <label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="group every 4 points of data">
95
+ <input type="radio" name="group" id="group4" onChange="setMainChartGroup(4);">4
96
+ </label>
97
<label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="group every 5 points of data">
98
<input type="radio" name="group" id="group5" onChange="setMainChartGroup(5);">5
99
</label>
@@ -111,6 +115,9 @@
115
<label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="group every 60 points of data">
116
<input type="radio" name="group" id="group60" onChange="setMainChartGroup(60);">60
117
</label>
118
+ <label class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="group every 90 points of data">
119
+ <input type="radio" name="group" id="group90" onChange="setMainChartGroup(90);">90
120
+ </label>
121
</div>
122
<div class="btn-group btn-group" data-toggle="tooltip" data-placement="top" title="maximized ( <span class='glyphicon glyphicon-fullscreen'></span> ) or normal ( <span class='glyphicon glyphicon-resize-small'></span> ) view of the graph" >
123
<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');">
web/netdata.js
+5
-2
@@ -156,13 +156,16 @@ function calculateChartPointsToShow(c, divisor, maxtime, group, enable_curve) {
156
else {
157
c.group = Math.round(data_points / screen_points);
158
159
- if(c.group > 45) c.group = 60;
159
+ if(c.group > 60) c.group = 90;
160
+ else if(c.group > 45) c.group = 60;
161
else if(c.group > 30) c.group = 45;
162
else if(c.group > 20) c.group = 30;
163
else if(c.group > 15) c.group = 20;
164
else if(c.group > 10) c.group = 15;
165
else if(c.group > 5) c.group = 10;
165
- else if(c.group > 2) c.group = 5;
166
+ else if(c.group > 4) c.group = 5;
167
+ else if(c.group > 3) c.group = 4;
168
+ else if(c.group > 2) c.group = 3;
169
else if(c.group > 1) c.group = 2;
170
else c.group = 1;
171
web/theme.css
+1
-1
@@ -67,11 +67,11 @@ body {
67
-moz-box-shadow: 0px 2px 2px 0px rgba(204, 204, 204, 0.6);
68
-webkit-box-shadow: 0px 2px 2px 0px rgba(204, 204, 204, 0.6);
69
position: absolute;
70
- z-index: 1000;
70
line-height: 90% !important;
71
margin: 0 0 0 0 !important;
72
padding: 0.5em 0.1em 0.5em 0.1em !important;
73
width: 180px !important;
74
+ z-index: 1000 !important;
75
}
76
.google-visualization-tooltip-item-list {
77
list-style-type: none;