@cryptotaxi247 / netdata-1 / commits / 2548d0350

properly position memory charts on the dashboard; #3242

Costa Tsaousis (ktsaou) committed Jan 10, 2018 at 14:29 UTC 2548d0350719e23299f0c16ad25e434c374c786c
8 files changed +38 -17
src/common.h
+21
@@ -115,6 +115,27 @@
115 #include <sys/capability.h>
116 #endif
117
118 +// ----------------------------------------------------------------------------
119 +// netdata chart priorities
120 +
121 +// This is a work in progress - to scope is to collect here all chart priorities.
122 +// These should be based on the CONTEXT of the charts + the chart id when needed
123 +// - for each SECTION +1000 (or +X000 for big sections)
124 +// - for each FAMILY +100
125 +// - for each CHART +10
126 +
127 +// Memory Section - 1xxx
128 +#define NETDATA_CHART_PRIO_MEM_SYSTEM 1000
129 +#define NETDATA_CHART_PRIO_MEM_SYSTEM_AVAILABLE 1010
130 +#define NETDATA_CHART_PRIO_MEM_SYSTEM_COMMITTED 1020
131 +#define NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS 1030
132 +#define NETDATA_CHART_PRIO_MEM_KERNEL 1100
133 +#define NETDATA_CHART_PRIO_MEM_SLAB 1200
134 +#define NETDATA_CHART_PRIO_MEM_KSM 1300
135 +#define NETDATA_CHART_PRIO_MEM_NUMA 1400
136 +#define NETDATA_CHART_PRIO_MEM_HW 1500
137 +
138 +
139 // ----------------------------------------------------------------------------
140 // netdata common definitions
141
src/freebsd_sysctl.c
+2 -2
@@ -273,7 +273,7 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
273 "MB",
274 "freebsd",
275 "vm.vmtotal",
276 - 5000,
276 + NETDATA_CHART_PRIO_MEM_SYSTEM_COMMITTED,
277 update_every,
278 RRDSET_TYPE_AREA
279 );
@@ -1107,7 +1107,7 @@ int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) {
1107 "page faults/s",
1108 "freebsd",
1109 "vm.stats.vm.v_pgfaults",
1110 - 500,
1110 + NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS,
1111 update_every,
1112 RRDSET_TYPE_LINE
1113 );
src/macos_mach_smi.c
+1 -1
@@ -196,7 +196,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
196 , "page faults/s"
197 , "macos"
198 , "mach_smi"
199 - , 500
199 + , NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS
200 , update_every
201 , RRDSET_TYPE_LINE
202 );
src/proc_meminfo.c
+6 -6
@@ -190,7 +190,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
190 , "MB"
191 , "proc"
192 , "meminfo"
193 - , 4000
193 + , NETDATA_CHART_PRIO_MEM_SYSTEM_AVAILABLE
194 , update_every
195 , RRDSET_TYPE_AREA
196 );
@@ -263,7 +263,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
263 , "MB"
264 , "proc"
265 , "meminfo"
266 - , 9000
266 + , NETDATA_CHART_PRIO_MEM_HW
267 , update_every
268 , RRDSET_TYPE_LINE
269 );
@@ -296,7 +296,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
296 , "MB"
297 , "proc"
298 , "meminfo"
299 - , 4005
299 + , NETDATA_CHART_PRIO_MEM_SYSTEM_COMMITTED
300 , update_every
301 , RRDSET_TYPE_AREA
302 );
@@ -329,7 +329,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
329 , "MB"
330 , "proc"
331 , "meminfo"
332 - , 5000
332 + , NETDATA_CHART_PRIO_MEM_KERNEL
333 , update_every
334 , RRDSET_TYPE_LINE
335 );
@@ -369,7 +369,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
369 , "MB"
370 , "proc"
371 , "meminfo"
372 - , 6000
372 + , NETDATA_CHART_PRIO_MEM_KERNEL + 1
373 , update_every
374 , RRDSET_TYPE_STACKED
375 );
@@ -408,7 +408,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
408 , "MB"
409 , "proc"
410 , "meminfo"
411 - , 6500
411 + , NETDATA_CHART_PRIO_MEM_SLAB
412 , update_every
413 , RRDSET_TYPE_STACKED
414 );
src/proc_vmstat.c
+2 -2
@@ -168,7 +168,7 @@ int do_proc_vmstat(int update_every, usec_t dt) {
168 , "page faults/s"
169 , "proc"
170 , "vmstat"
171 - , 4010
171 + , NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS
172 , update_every
173 , RRDSET_TYPE_LINE
174 );
@@ -213,7 +213,7 @@ int do_proc_vmstat(int update_every, usec_t dt) {
213 , "events/s"
214 , "proc"
215 , "vmstat"
216 - , 800
216 + , NETDATA_CHART_PRIO_MEM_NUMA
217 , update_every
218 , RRDSET_TYPE_LINE
219 );
src/sys_devices_system_edac_mc.c
+2 -2
@@ -142,7 +142,7 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
142 , "errors"
143 , "proc"
144 , "/sys/devices/system/edac/mc"
145 - , 6600
145 + , NETDATA_CHART_PRIO_MEM_HW + 50
146 , update_every
147 , RRDSET_TYPE_LINE
148 );
@@ -180,7 +180,7 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
180 , "errors"
181 , "proc"
182 , "/sys/devices/system/edac/mc"
183 - , 6610
183 + , NETDATA_CHART_PRIO_MEM_HW + 60
184 , update_every
185 , RRDSET_TYPE_LINE
186 );
src/sys_devices_system_node.c
+1 -1
@@ -107,7 +107,7 @@ int do_proc_sys_devices_system_node(int update_every, usec_t dt) {
107 , "events/s"
108 , "proc"
109 , "/sys/devices/system/node"
110 - , 1000
110 + , NETDATA_CHART_PRIO_MEM_NUMA + 10
111 , update_every
112 , RRDSET_TYPE_LINE
113 );
src/sys_kernel_mm_ksm.c
+3 -3
@@ -104,7 +104,7 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
104 , "MB"
105 , "proc"
106 , "/sys/kernel/mm/ksm"
107 - , 5000
107 + , NETDATA_CHART_PRIO_MEM_KSM
108 , update_every
109 , RRDSET_TYPE_AREA
110 );
@@ -144,7 +144,7 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
144 , "MB"
145 , "proc"
146 , "/sys/kernel/mm/ksm"
147 - , 5001
147 + , NETDATA_CHART_PRIO_MEM_KSM + 1
148 , update_every
149 , RRDSET_TYPE_AREA
150 );
@@ -178,7 +178,7 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
178 , "percentage"
179 , "proc"
180 , "/sys/kernel/mm/ksm"
181 - , 5002
181 + , NETDATA_CHART_PRIO_MEM_KSM + 2
182 , update_every
183 , RRDSET_TYPE_LINE
184 );