@cryptotaxi247 / netdata-1 / commits / dea82781b

normalized plugin names on all plugins; #4379 (#4387)

Costa Tsaousis committed Oct 13, 2018 at 13:17 UTC dea82781b0a366f07244a2379275dc3001e60df3
49 files changed +1231 -958
src/main.h
+7 -7
@@ -25,17 +25,17 @@ struct option_def {
25 };
26
27 struct netdata_static_thread {
28 - char *name;
28 + char *name; // the name of the thread as it should appear in the logs
29
30 - char *config_section;
31 - char *config_name;
30 + char *config_section; // the section of netdata.conf to check if this is enabled or not
31 + char *config_name; // the name of the config option to check if it is true or false
32
33 - volatile sig_atomic_t enabled;
33 + volatile sig_atomic_t enabled; // the current status of the thread
34
35 - netdata_thread_t *thread;
35 + netdata_thread_t *thread; // internal use, to maintain a pointer to the created thread
36
37 - void (*init_routine) (void);
38 - void *(*start_routine) (void *);
37 + void (*init_routine) (void); // an initialization function to run before spawning the thread
38 + void *(*start_routine) (void *); // the threaded worker
39 };
40
41 extern void cancel_main_threads(void);
src/plugins/all.h
+263 -49
@@ -29,75 +29,289 @@
29 // - for each FAMILY +100
30 // - for each CHART +10
31
32 -#define NETDATA_CHART_PRIO_SYSTEM_IP 501
33 -#define NETDATA_CHART_PRIO_SYSTEM_IPV6 502
32 +#define NETDATA_CHART_PRIO_SYSTEM_CPU 100
33 +#define NETDATA_CHART_PRIO_SYSTEM_LOAD 100
34 +#define NETDATA_CHART_PRIO_SYSTEM_IO 150
35 +#define NETDATA_CHART_PRIO_SYSTEM_PGPGIO 151
36 +#define NETDATA_CHART_PRIO_SYSTEM_RAM 200
37 +#define NETDATA_CHART_PRIO_SYSTEM_SWAP 201
38 +#define NETDATA_CHART_PRIO_SYSTEM_SWAPIO 250
39 +#define NETDATA_CHART_PRIO_SYSTEM_NET 500
40 +#define NETDATA_CHART_PRIO_SYSTEM_IPV4 500 // freebsd only
41 +#define NETDATA_CHART_PRIO_SYSTEM_IP 501
42 +#define NETDATA_CHART_PRIO_SYSTEM_IPV6 502
43 +#define NETDATA_CHART_PRIO_SYSTEM_PROCESSES 600
44 +#define NETDATA_CHART_PRIO_SYSTEM_FORKS 700
45 +#define NETDATA_CHART_PRIO_SYSTEM_ACTIVE_PROCESSES 750
46 +#define NETDATA_CHART_PRIO_SYSTEM_CTXT 800
47 +#define NETDATA_CHART_PRIO_SYSTEM_IDLEJITTER 800
48 +#define NETDATA_CHART_PRIO_SYSTEM_INTR 900
49 +#define NETDATA_CHART_PRIO_SYSTEM_SOFTIRQS 950
50 +#define NETDATA_CHART_PRIO_SYSTEM_SOFTNET_STAT 955
51 +#define NETDATA_CHART_PRIO_SYSTEM_INTERRUPTS 1000
52 +#define NETDATA_CHART_PRIO_SYSTEM_DEV_INTR 1000 // freebsd only
53 +#define NETDATA_CHART_PRIO_SYSTEM_SOFT_INTR 1100 // freebsd only
54 +#define NETDATA_CHART_PRIO_SYSTEM_ENTROPY 1000
55 +#define NETDATA_CHART_PRIO_SYSTEM_UPTIME 1000
56 +#define NETDATA_CHART_PRIO_SYSTEM_IPC_MSQ_QUEUES 990 // freebsd only
57 +#define NETDATA_CHART_PRIO_SYSTEM_IPC_MSQ_MESSAGES 1000 // freebsd only
58 +#define NETDATA_CHART_PRIO_SYSTEM_IPC_MSQ_SIZE 1100 // freebsd only
59 +#define NETDATA_CHART_PRIO_SYSTEM_IPC_SEMAPHORES 1000
60 +#define NETDATA_CHART_PRIO_SYSTEM_IPC_SEM_ARRAYS 1000
61 +#define NETDATA_CHART_PRIO_SYSTEM_IPC_SHARED_MEM_SEGS 1000 // freebsd only
62 +#define NETDATA_CHART_PRIO_SYSTEM_IPC_SHARED_MEM_SIZE 1000 // freebsd only
63 +#define NETDATA_CHART_PRIO_SYSTEM_PACKETS 7001 // freebsd only
64 +
65 +
66 +// CPU per core
67 +
68 +#define NETDATA_CHART_PRIO_CPU_PER_CORE 1000 // +1 per core
69 +#define NETDATA_CHART_PRIO_CPU_TEMPERATURE 1050 // freebsd only
70 +#define NETDATA_CHART_PRIO_CPUFREQ_SCALING_CUR_FREQ 5003 // freebsd only
71 +
72 +#define NETDATA_CHART_PRIO_CORE_THROTTLING 5001
73 +#define NETDATA_CHART_PRIO_PACKAGE_THROTTLING 5002
74 +
75 +// Interrupts per core
76 +
77 +#define NETDATA_CHART_PRIO_INTERRUPTS_PER_CORE 1100 // +1 per core
78
79 // Memory Section - 1xxx
36 -#define NETDATA_CHART_PRIO_MEM_SYSTEM 1000
37 -#define NETDATA_CHART_PRIO_MEM_SYSTEM_AVAILABLE 1010
38 -#define NETDATA_CHART_PRIO_MEM_SYSTEM_COMMITTED 1020
39 -#define NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS 1030
40 -#define NETDATA_CHART_PRIO_MEM_KERNEL 1100
41 -#define NETDATA_CHART_PRIO_MEM_SLAB 1200
42 -#define NETDATA_CHART_PRIO_MEM_HUGEPAGES 1250
43 -#define NETDATA_CHART_PRIO_MEM_KSM 1300
44 -#define NETDATA_CHART_PRIO_MEM_NUMA 1400
45 -#define NETDATA_CHART_PRIO_MEM_HW 1500
80
81 +#define NETDATA_CHART_PRIO_MEM_SYSTEM_AVAILABLE 1010
82 +#define NETDATA_CHART_PRIO_MEM_SYSTEM_COMMITTED 1020
83 +#define NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS 1030
84 +#define NETDATA_CHART_PRIO_MEM_KERNEL 1100
85 +#define NETDATA_CHART_PRIO_MEM_SLAB 1200
86 +#define NETDATA_CHART_PRIO_MEM_HUGEPAGES 1250
87 +#define NETDATA_CHART_PRIO_MEM_KSM 1300
88 +#define NETDATA_CHART_PRIO_MEM_KSM_SAVINGS 1301
89 +#define NETDATA_CHART_PRIO_MEM_KSM_RATIOS 1302
90 +#define NETDATA_CHART_PRIO_MEM_NUMA 1400
91 +#define NETDATA_CHART_PRIO_MEM_NUMA_NODES 1410
92 +#define NETDATA_CHART_PRIO_MEM_HW 1500
93 +#define NETDATA_CHART_PRIO_MEM_HW_ECC_CE 1550
94 +#define NETDATA_CHART_PRIO_MEM_HW_ECC_UE 1560
95 +
96 +// Disks
97 +
98 +#define NETDATA_CHART_PRIO_DISK_IO 2000
99 +#define NETDATA_CHART_PRIO_DISK_OPS 2001
100 +#define NETDATA_CHART_PRIO_DISK_QOPS 2002
101 +#define NETDATA_CHART_PRIO_DISK_BACKLOG 2003
102 +#define NETDATA_CHART_PRIO_DISK_UTIL 2004
103 +#define NETDATA_CHART_PRIO_DISK_AWAIT 2005
104 +#define NETDATA_CHART_PRIO_DISK_AVGSZ 2006
105 +#define NETDATA_CHART_PRIO_DISK_SVCTM 2007
106 +#define NETDATA_CHART_PRIO_DISK_MOPS 2021
107 +#define NETDATA_CHART_PRIO_DISK_IOTIME 2022
108 +#define NETDATA_CHART_PRIO_BCACHE_CACHE_ALLOC 2120
109 +#define NETDATA_CHART_PRIO_BCACHE_HIT_RATIO 2120
110 +#define NETDATA_CHART_PRIO_BCACHE_RATES 2121
111 +#define NETDATA_CHART_PRIO_BCACHE_SIZE 2122
112 +#define NETDATA_CHART_PRIO_BCACHE_USAGE 2123
113 +#define NETDATA_CHART_PRIO_BCACHE_OPS 2124
114 +#define NETDATA_CHART_PRIO_BCACHE_BYPASS 2125
115 +#define NETDATA_CHART_PRIO_BCACHE_CACHE_READ_RACES 2126
116 +
117 +#define NETDATA_CHART_PRIO_DISKSPACE_SPACE 2023
118 +#define NETDATA_CHART_PRIO_DISKSPACE_INODES 2024
119 +
120 +// NFS (server)
121 +
122 +#define NETDATA_CHART_PRIO_NFSD_READCACHE 2100
123 +#define NETDATA_CHART_PRIO_NFSD_FILEHANDLES 2101
124 +#define NETDATA_CHART_PRIO_NFSD_IO 2102
125 +#define NETDATA_CHART_PRIO_NFSD_THREADS 2103
126 +#define NETDATA_CHART_PRIO_NFSD_THREADS_FULLCNT 2104
127 +#define NETDATA_CHART_PRIO_NFSD_THREADS_HISTOGRAM 2105
128 +#define NETDATA_CHART_PRIO_NFSD_READAHEAD 2105
129 +#define NETDATA_CHART_PRIO_NFSD_NET 2107
130 +#define NETDATA_CHART_PRIO_NFSD_RPC 2108
131 +#define NETDATA_CHART_PRIO_NFSD_PROC2 2109
132 +#define NETDATA_CHART_PRIO_NFSD_PROC3 2110
133 +#define NETDATA_CHART_PRIO_NFSD_PROC4 2111
134 +#define NETDATA_CHART_PRIO_NFSD_PROC4OPS 2112
135 +
136 +// NFS (client)
137 +
138 +#define NETDATA_CHART_PRIO_NFS_NET 2207
139 +#define NETDATA_CHART_PRIO_NFS_RPC 2208
140 +#define NETDATA_CHART_PRIO_NFS_PROC2 2209
141 +#define NETDATA_CHART_PRIO_NFS_PROC3 2210
142 +#define NETDATA_CHART_PRIO_NFS_PROC4 2211
143 +
144 +// BTRFS
145 +
146 +#define NETDATA_CHART_PRIO_BTRFS_DISK 2300
147 +#define NETDATA_CHART_PRIO_BTRFS_DATA 2301
148 +#define NETDATA_CHART_PRIO_BTRFS_METADATA 2302
149 +#define NETDATA_CHART_PRIO_BTRFS_SYSTEM 2303
150 +
151 +// ZFS
152 +
153 +#define NETDATA_CHART_PRIO_ZFS_ARC_SIZE 2500
154 +#define NETDATA_CHART_PRIO_ZFS_L2_SIZE 2500
155 +#define NETDATA_CHART_PRIO_ZFS_READS 2510
156 +#define NETDATA_CHART_PRIO_ZFS_ACTUAL_HITS 2519
157 +#define NETDATA_CHART_PRIO_ZFS_ARC_SIZE_BREAKDOWN 2520
158 +#define NETDATA_CHART_PRIO_ZFS_IMPORTANT_OPS 2522
159 +#define NETDATA_CHART_PRIO_ZFS_MEMORY_OPS 2523
160 +#define NETDATA_CHART_PRIO_ZFS_IO 2700
161 +#define NETDATA_CHART_PRIO_ZFS_HITS 2520
162 +#define NETDATA_CHART_PRIO_ZFS_DHITS 2530
163 +#define NETDATA_CHART_PRIO_ZFS_DEMAND_DATA_HITS 2531
164 +#define NETDATA_CHART_PRIO_ZFS_PREFETCH_DATA_HITS 2532
165 +#define NETDATA_CHART_PRIO_ZFS_PHITS 2540
166 +#define NETDATA_CHART_PRIO_ZFS_MHITS 2550
167 +#define NETDATA_CHART_PRIO_ZFS_L2HITS 2560
168 +#define NETDATA_CHART_PRIO_ZFS_LIST_HITS 2600
169 +#define NETDATA_CHART_PRIO_ZFS_HASH_ELEMENTS 2800
170 +#define NETDATA_CHART_PRIO_ZFS_HASH_CHAINS 2810
171 +
172 +
173 +// SOFTIRQs
174 +
175 +#define NETDATA_CHART_PRIO_SOFTIRQS_PER_CORE 3000 // +1 per core
176
48 -// IP
177 +// IPFW (freebsd)
178
50 -#define NETDATA_CHART_PRIO_IP 4000
51 -#define NETDATA_CHART_PRIO_IP_ERRORS 4100
52 -#define NETDATA_CHART_PRIO_IP_TCP 4200
53 -#define NETDATA_CHART_PRIO_IP_TCP_MEM 4290
54 -#define NETDATA_CHART_PRIO_IP_BCAST 4500
55 -#define NETDATA_CHART_PRIO_IP_MCAST 4600
56 -#define NETDATA_CHART_PRIO_IP_ECN 4700
179 +#define NETDATA_CHART_PRIO_IPFW_PACKETS 3001
180 +#define NETDATA_CHART_PRIO_IPFW_BYTES 3002
181 +#define NETDATA_CHART_PRIO_IPFW_ACTIVE 3003
182 +#define NETDATA_CHART_PRIO_IPFW_EXPIRED 3004
183 +#define NETDATA_CHART_PRIO_IPFW_MEM 3005
184
185
186 +// IPVS
187 +
188 +#define NETDATA_CHART_PRIO_IPVS_NET 3100
189 +#define NETDATA_CHART_PRIO_IPVS_SOCKETS 3101
190 +#define NETDATA_CHART_PRIO_IPVS_PACKETS 3102
191 +
192 +// Softnet
193 +
194 +#define NETDATA_CHART_PRIO_SOFTNET_PER_CORE 4101 // +1 per core
195 +
196 +// IP STACK
197 +
198 +#define NETDATA_CHART_PRIO_IP_ERRORS 4100
199 +#define NETDATA_CHART_PRIO_IP_TCP_CONNABORTS 4210
200 +#define NETDATA_CHART_PRIO_IP_TCP_SYN_QUEUE 4215
201 +#define NETDATA_CHART_PRIO_IP_TCP_ACCEPT_QUEUE 4216
202 +#define NETDATA_CHART_PRIO_IP_TCP_REORDERS 4220
203 +#define NETDATA_CHART_PRIO_IP_TCP_OFO 4250
204 +#define NETDATA_CHART_PRIO_IP_TCP_SYNCOOKIES 4260
205 +#define NETDATA_CHART_PRIO_IP_TCP_MEM 4290
206 +#define NETDATA_CHART_PRIO_IP_BCAST 4500
207 +#define NETDATA_CHART_PRIO_IP_BCAST_PACKETS 4510
208 +#define NETDATA_CHART_PRIO_IP_MCAST 4600
209 +#define NETDATA_CHART_PRIO_IP_MCAST_PACKETS 4610
210 +#define NETDATA_CHART_PRIO_IP_ECN 4700
211 +
212 // IPv4
213
61 -#define NETDATA_CHART_PRIO_IPV4 5100
62 -#define NETDATA_CHART_PRIO_IPV4_SOCKETS 5100
63 -#define NETDATA_CHART_PRIO_IPV4_PACKETS 5130
64 -#define NETDATA_CHART_PRIO_IPV4_ERRORS 5150
65 -#define NETDATA_CHART_PRIO_IPV4_ICMP 5170
66 -#define NETDATA_CHART_PRIO_IPV4_TCP 5200
67 -#define NETDATA_CHART_PRIO_IPV4_TCP_MEM 5290
68 -#define NETDATA_CHART_PRIO_IPV4_UDP 5300
69 -#define NETDATA_CHART_PRIO_IPV4_UDP_MEM 5390
70 -#define NETDATA_CHART_PRIO_IPV4_UDPLITE 5400
71 -#define NETDATA_CHART_PRIO_IPV4_RAW 5450
72 -#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS 5460
73 -#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS_MEM 5470
214 +#define NETDATA_CHART_PRIO_IPV4_SOCKETS 5100
215 +#define NETDATA_CHART_PRIO_IPV4_PACKETS 5130
216 +#define NETDATA_CHART_PRIO_IPV4_ERRORS 5150
217 +#define NETDATA_CHART_PRIO_IPV4_ICMP 5170
218 +#define NETDATA_CHART_PRIO_IPV4_TCP 5200
219 +#define NETDATA_CHART_PRIO_IPV4_TCP_SOCKETS 5201
220 +#define NETDATA_CHART_PRIO_IPV4_TCP_MEM 5290
221 +#define NETDATA_CHART_PRIO_IPV4_UDP 5300
222 +#define NETDATA_CHART_PRIO_IPV4_UDP_MEM 5390
223 +#define NETDATA_CHART_PRIO_IPV4_UDPLITE 5400
224 +#define NETDATA_CHART_PRIO_IPV4_RAW 5450
225 +#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS 5460
226 +#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS_MEM 5470
227
228 // IPv6
229
77 -#define NETDATA_CHART_PRIO_IPV6 6200
78 -#define NETDATA_CHART_PRIO_IPV6_PACKETS 6200
79 -#define NETDATA_CHART_PRIO_IPV6_ERRORS 6300
80 -#define NETDATA_CHART_PRIO_IPV6_FRAGMENTS 6400
81 -#define NETDATA_CHART_PRIO_IPV6_TCP 6500
82 -#define NETDATA_CHART_PRIO_IPV6_UDP 6600
83 -#define NETDATA_CHART_PRIO_IPV6_UDP_ERRORS 6610
84 -#define NETDATA_CHART_PRIO_IPV6_UDPLITE 6700
85 -#define NETDATA_CHART_PRIO_IPV6_UDPLITE_ERRORS 6710
86 -#define NETDATA_CHART_PRIO_IPV6_RAW 6800
87 -#define NETDATA_CHART_PRIO_IPV6_BCAST 6840
88 -#define NETDATA_CHART_PRIO_IPV6_MCAST 6850
89 -#define NETDATA_CHART_PRIO_IPV6_ICMP 6900
230 +#define NETDATA_CHART_PRIO_IPV6_PACKETS 6200
231 +#define NETDATA_CHART_PRIO_IPV6_ECT 6210
232 +#define NETDATA_CHART_PRIO_IPV6_ERRORS 6300
233 +#define NETDATA_CHART_PRIO_IPV6_FRAGMENTS 6400
234 +#define NETDATA_CHART_PRIO_IPV6_FRAGSOUT 6401
235 +#define NETDATA_CHART_PRIO_IPV6_FRAGSIN 6402
236 +#define NETDATA_CHART_PRIO_IPV6_TCP 6500
237 +#define NETDATA_CHART_PRIO_IPV6_UDP 6600
238 +#define NETDATA_CHART_PRIO_IPV6_UDP_PACKETS 6601
239 +#define NETDATA_CHART_PRIO_IPV6_UDP_ERRORS 6610
240 +#define NETDATA_CHART_PRIO_IPV6_UDPLITE 6700
241 +#define NETDATA_CHART_PRIO_IPV6_UDPLITE_PACKETS 6701
242 +#define NETDATA_CHART_PRIO_IPV6_UDPLITE_ERRORS 6710
243 +#define NETDATA_CHART_PRIO_IPV6_RAW 6800
244 +#define NETDATA_CHART_PRIO_IPV6_BCAST 6840
245 +#define NETDATA_CHART_PRIO_IPV6_MCAST 6850
246 +#define NETDATA_CHART_PRIO_IPV6_MCAST_PACKETS 6851
247 +#define NETDATA_CHART_PRIO_IPV6_ICMP 6900
248 +#define NETDATA_CHART_PRIO_IPV6_ICMP_REDIR 6910
249 +#define NETDATA_CHART_PRIO_IPV6_ICMP_ERRORS 6920
250 +#define NETDATA_CHART_PRIO_IPV6_ICMP_ECHOS 6930
251 +#define NETDATA_CHART_PRIO_IPV6_ICMP_GROUPMEMB 6940
252 +#define NETDATA_CHART_PRIO_IPV6_ICMP_ROUTER 6950
253 +#define NETDATA_CHART_PRIO_IPV6_ICMP_NEIGHBOR 6960
254 +#define NETDATA_CHART_PRIO_IPV6_ICMP_LDV2 6970
255 +#define NETDATA_CHART_PRIO_IPV6_ICMP_TYPES 6980
256 +
257 +
258 +// Network interfaces
259
260 +#define NETDATA_CHART_PRIO_FIRST_NET_IFACE 7000 // 6 charts per interface
261 +#define NETDATA_CHART_PRIO_FIRST_NET_PACKETS 7001
262 +#define NETDATA_CHART_PRIO_FIRST_NET_ERRORS 7002
263 +#define NETDATA_CHART_PRIO_FIRST_NET_DROPS 7003
264 +#define NETDATA_CHART_PRIO_FIRST_NET_EVENTS 7006
265 +#define NETDATA_CHART_PRIO_CGROUP_NET_IFACE 43000
266
267 // SCTP
268
94 -#define NETDATA_CHART_PRIO_SCTP 7000
269 +#define NETDATA_CHART_PRIO_SCTP 7000
270 +
271 +// QoS
272 +
273 +#define NETDATA_CHART_PRIO_TC_QOS 7000
274 +#define NETDATA_CHART_PRIO_TC_QOS_PACKETS 7010
275 +#define NETDATA_CHART_PRIO_TC_QOS_DROPPED 7020
276 +#define NETDATA_CHART_PRIO_TC_QOS_TOCKENS 7030
277 +#define NETDATA_CHART_PRIO_TC_QOS_CTOCKENS 7040
278
279
280 // Netfilter
281
99 -#define NETDATA_CHART_PRIO_NETFILTER 8700
100 -#define NETDATA_CHART_PRIO_SYNPROXY 8750
282 +#define NETDATA_CHART_PRIO_NETFILTER_SOCKETS 8700
283 +#define NETDATA_CHART_PRIO_NETFILTER_NEW 8701
284 +#define NETDATA_CHART_PRIO_NETFILTER_CHANGES 8702
285 +#define NETDATA_CHART_PRIO_NETFILTER_EXPECT 8703
286 +#define NETDATA_CHART_PRIO_NETFILTER_ERRORS 8705
287 +#define NETDATA_CHART_PRIO_NETFILTER_SEARCH 8710
288 +
289 +#define NETDATA_CHART_PRIO_NETFILTER_PACKETS 8906
290 +#define NETDATA_CHART_PRIO_NETFILTER_BYTES 8907
291 +
292 +// SYNPROXY
293 +
294 +#define NETDATA_CHART_PRIO_SYNPROXY_SYN_RECEIVED 8751
295 +#define NETDATA_CHART_PRIO_SYNPROXY_COOKIES 8752
296 +#define NETDATA_CHART_PRIO_SYNPROXY_CONN_OPEN 8753
297 +#define NETDATA_CHART_PRIO_SYNPROXY_ENTRIES 8754
298 +
299 +// CGROUPS
300 +
301 +#define NETDATA_CHART_PRIO_CGROUPS_SYSTEMD 19000 // many charts
302 +#define NETDATA_CHART_PRIO_CGROUPS_CONTAINERS 40000 // many charts
303 +
304 +// STATSD
305 +
306 +#define NETDATA_CHART_PRIO_STATSD_PRIVATE 90000 // many charts
307 +
308 +// INTERNAL NETDATA INFO
309 +
310 +#define NETDATA_CHART_PRIO_CHECKS 99999
311 +
312 +#define NETDATA_CHART_PRIO_NETDATA_DISKSPACE 132020
313 +#define NETDATA_CHART_PRIO_NETDATA_TC_CPU 135000
314 +#define NETDATA_CHART_PRIO_NETDATA_TC_TIME 135001
315
316
317 #endif //NETDATA_ALL_H
src/plugins/checks.plugin/plugin_checks.c
+9 -9
@@ -29,9 +29,9 @@ void *checks_main(void *ptr) {
29 , NULL
30 , "Caller gives microseconds"
31 , "a million !"
32 - , "netdata"
33 - , "checks"
34 - , 99999
32 + , "checks.plugin"
33 + , ""
34 + , NETDATA_CHART_PRIO_CHECKS
35 , localhost->rrd_update_every
36 , RRDSET_TYPE_LINE
37 );
@@ -47,9 +47,9 @@ void *checks_main(void *ptr) {
47 , NULL
48 , "Netdata calcs microseconds"
49 , "a million !"
50 - , "netdata"
51 - , "checks"
52 - , 99999
50 + , "checks.plugin"
51 + , ""
52 + , NETDATA_CHART_PRIO_CHECKS
53 , localhost->rrd_update_every
54 , RRDSET_TYPE_LINE
55 );
@@ -64,9 +64,9 @@ void *checks_main(void *ptr) {
64 , NULL
65 , "Clock difference"
66 , "microseconds diff"
67 - , "netdata"
68 - , "checks"
69 - , 99999
67 + , "checks.plugin"
68 + , ""
69 + , NETDATA_CHART_PRIO_CHECKS
70 , localhost->rrd_update_every
71 , RRDSET_TYPE_LINE
72 );
src/plugins/freebsd.plugin/freebsd_devstat.c
+18 -18
@@ -361,9 +361,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
361 "disk.io",
362 "Disk I/O Bandwidth",
363 "kilobytes/s",
364 - "freebsd",
364 + "freebsd.plugin",
365 "devstat",
366 - 2000,
366 + NETDATA_CHART_PRIO_DISK_IO,
367 update_every,
368 RRDSET_TYPE_AREA
369 );
@@ -398,9 +398,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
398 "disk.ops",
399 "Disk Completed I/O Operations",
400 "operations/s",
401 - "freebsd",
401 + "freebsd.plugin",
402 "devstat",
403 - 2001,
403 + NETDATA_CHART_PRIO_DISK_OPS,
404 update_every,
405 RRDSET_TYPE_LINE
406 );
@@ -437,9 +437,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
437 "disk.qops",
438 "Disk Current I/O Operations",
439 "operations",
440 - "freebsd",
440 + "freebsd.plugin",
441 "devstat",
442 - 2002,
442 + NETDATA_CHART_PRIO_DISK_QOPS,
443 update_every,
444 RRDSET_TYPE_LINE
445 );
@@ -466,9 +466,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
466 "disk.util",
467 "Disk Utilization Time",
468 "% of time working",
469 - "freebsd",
469 + "freebsd.plugin",
470 "devstat",
471 - 2004,
471 + NETDATA_CHART_PRIO_DISK_UTIL,
472 update_every,
473 RRDSET_TYPE_AREA
474 );
@@ -499,9 +499,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
499 "disk.iotime",
500 "Disk Total I/O Time",
501 "milliseconds/s",
502 - "freebsd",
502 + "freebsd.plugin",
503 "devstat",
504 - 2022,
504 + NETDATA_CHART_PRIO_DISK_IOTIME,
505 update_every,
506 RRDSET_TYPE_LINE
507 );
@@ -547,9 +547,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
547 "disk.await",
548 "Average Completed I/O Operation Time",
549 "ms per operation",
550 - "freebsd",
550 + "freebsd.plugin",
551 "devstat",
552 - 2005,
552 + NETDATA_CHART_PRIO_DISK_AWAIT,
553 update_every,
554 RRDSET_TYPE_LINE
555 );
@@ -612,9 +612,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
612 "disk.avgsz",
613 "Average Completed I/O Operation Bandwidth",
614 "kilobytes per operation",
615 - "freebsd",
615 + "freebsd.plugin",
616 "devstat",
617 - 2006,
617 + NETDATA_CHART_PRIO_DISK_AVGSZ,
618 update_every,
619 RRDSET_TYPE_AREA
620 );
@@ -669,9 +669,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
669 "disk.svctm",
670 "Average Service Time",
671 "ms per operation",
672 - "freebsd",
672 + "freebsd.plugin",
673 "devstat",
674 - 2007,
674 + NETDATA_CHART_PRIO_DISK_SVCTM,
675 update_every,
676 RRDSET_TYPE_LINE
677 );
@@ -729,9 +729,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
729 NULL,
730 "Disk I/O",
731 "kilobytes/s",
732 - "freebsd",
732 + "freebsd.plugin",
733 "devstat",
734 - 150,
734 + NETDATA_CHART_PRIO_SYSTEM_IO,
735 update_every,
736 RRDSET_TYPE_AREA
737 );
src/plugins/freebsd.plugin/freebsd_getifaddrs.c
+18 -18
@@ -251,9 +251,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
251 NULL,
252 "Network Traffic",
253 "kilobits/s",
254 - "freebsd",
254 + "freebsd.plugin",
255 "getifaddrs",
256 - 500,
256 + NETDATA_CHART_PRIO_SYSTEM_NET,
257 update_every,
258 RRDSET_TYPE_AREA
259 );
@@ -295,9 +295,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
295 NULL,
296 "Network Packets",
297 "packets/s",
298 - "freebsd",
298 + "freebsd.plugin",
299 "getifaddrs",
300 - 7001,
300 + NETDATA_CHART_PRIO_SYSTEM_PACKETS,
301 update_every,
302 RRDSET_TYPE_LINE
303 );
@@ -340,9 +340,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
340 NULL,
341 "IPv4 Bandwidth",
342 "kilobits/s",
343 - "freebsd",
343 + "freebsd.plugin",
344 "getifaddrs",
345 - 500,
345 + NETDATA_CHART_PRIO_SYSTEM_IPV4,
346 update_every,
347 RRDSET_TYPE_AREA
348 );
@@ -379,9 +379,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
379 NULL,
380 "IPv6 Bandwidth",
381 "kilobits/s",
382 - "freebsd",
382 + "freebsd.plugin",
383 "getifaddrs",
384 - 500,
384 + NETDATA_CHART_PRIO_SYSTEM_IPV6,
385 update_every,
386 RRDSET_TYPE_AREA
387 );
@@ -449,9 +449,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
449 "net.net",
450 "Bandwidth",
451 "kilobits/s",
452 - "freebsd",
452 + "freebsd.plugin",
453 "getifaddrs",
454 - 7000,
454 + NETDATA_CHART_PRIO_FIRST_NET_IFACE,
455 update_every,
456 RRDSET_TYPE_AREA
457 );
@@ -478,9 +478,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
478 "net.packets",
479 "Packets",
480 "packets/s",
481 - "freebsd",
481 + "freebsd.plugin",
482 "getifaddrs",
483 - 7001,
483 + NETDATA_CHART_PRIO_FIRST_NET_PACKETS,
484 update_every,
485 RRDSET_TYPE_LINE
486 );
@@ -517,9 +517,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
517 "net.errors",
518 "Interface Errors",
519 "errors/s",
520 - "freebsd",
520 + "freebsd.plugin",
521 "getifaddrs",
522 - 7002,
522 + NETDATA_CHART_PRIO_FIRST_NET_ERRORS,
523 update_every,
524 RRDSET_TYPE_LINE
525 );
@@ -551,9 +551,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
551 "net.drops",
552 "Interface Drops",
553 "drops/s",
554 - "freebsd",
554 + "freebsd.plugin",
555 "getifaddrs",
556 - 7003,
556 + NETDATA_CHART_PRIO_FIRST_NET_DROPS,
557 update_every,
558 RRDSET_TYPE_LINE
559 );
@@ -586,9 +586,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
586 "net.events",
587 "Network Interface Events",
588 "events/s",
589 - "freebsd",
589 + "freebsd.plugin",
590 "getifaddrs",
591 - 7006,
591 + NETDATA_CHART_PRIO_FIRST_NET_EVENTS,
592 update_every,
593 RRDSET_TYPE_LINE
594 );
src/plugins/freebsd.plugin/freebsd_getmntinfo.c
+4 -4
@@ -227,9 +227,9 @@ int do_getmntinfo(int update_every, usec_t dt) {
227 "disk.space",
228 title,
229 "GB",
230 - "freebsd",
230 + "freebsd.plugin",
231 "getmntinfo",
232 - 2023,
232 + NETDATA_CHART_PRIO_DISKSPACE_SPACE,
233 update_every,
234 RRDSET_TYPE_STACKED
235 );
@@ -266,9 +266,9 @@ int do_getmntinfo(int update_every, usec_t dt) {
266 "disk.inodes",
267 title,
268 "Inodes",
269 - "freebsd",
269 + "freebsd.plugin",
270 "getmntinfo",
271 - 2024,
271 + NETDATA_CHART_PRIO_DISKSPACE_INODES,
272 update_every,
273 RRDSET_TYPE_STACKED
274 );
src/plugins/freebsd.plugin/freebsd_ipfw.c
+10 -10
@@ -164,9 +164,9 @@ int do_ipfw(int update_every, usec_t dt) {
164 NULL,
165 "Memory allocated by rules",
166 "bytes",
167 - "freebsd",
167 + "freebsd.plugin",
168 "ipfw",
169 - 3005,
169 + NETDATA_CHART_PRIO_IPFW_MEM,
170 update_every,
171 RRDSET_TYPE_STACKED
172 );
@@ -197,9 +197,9 @@ int do_ipfw(int update_every, usec_t dt) {
197 NULL,
198 "Packets",
199 "packets/s",
200 - "freebsd",
200 + "freebsd.plugin",
201 "ipfw",
202 - 3001,
202 + NETDATA_CHART_PRIO_IPFW_PACKETS,
203 update_every,
204 RRDSET_TYPE_STACKED
205 );
@@ -214,9 +214,9 @@ int do_ipfw(int update_every, usec_t dt) {
214 NULL,
215 "Bytes",
216 "bytes/s",
217 - "freebsd",
217 + "freebsd.plugin",
218 "ipfw",
219 - 3002,
219 + NETDATA_CHART_PRIO_IPFW_BYTES,
220 update_every,
221 RRDSET_TYPE_STACKED
222 );
@@ -318,9 +318,9 @@ int do_ipfw(int update_every, usec_t dt) {
318 NULL,
319 "Active rules",
320 "rules",
321 - "freebsd",
321 + "freebsd.plugin",
322 "ipfw",
323 - 3003,
323 + NETDATA_CHART_PRIO_IPFW_ACTIVE,
324 update_every,
325 RRDSET_TYPE_STACKED
326 );
@@ -335,9 +335,9 @@ int do_ipfw(int update_every, usec_t dt) {
335 NULL,
336 "Expired rules",
337 "rules",
338 - "freebsd",
338 + "freebsd.plugin",
339 "ipfw",
340 - 3004,
340 + NETDATA_CHART_PRIO_IPFW_EXPIRED,
341 update_every,
342 RRDSET_TYPE_STACKED
343 );
src/plugins/freebsd.plugin/freebsd_kstat_zfs.c
+2 -2
@@ -209,8 +209,8 @@ int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
209 // missing mib: GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.arc_need_free", mibs.arc_need_free, arcstats.arc_need_free);
210 // missing mib: GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.arc_sys_free", mibs.arc_sys_free, arcstats.arc_sys_free);
211
212 - generate_charts_arcstats("freebsd", update_every);
213 - generate_charts_arc_summary("freebsd", update_every);
212 + generate_charts_arcstats("freebsd", "zfs", update_every);
213 + generate_charts_arc_summary("freebsd", "zfs", update_every);
214
215 return 0;
216 }
src/plugins/freebsd.plugin/freebsd_sysctl.c
+84 -83
@@ -143,9 +143,9 @@ int do_vm_loadavg(int update_every, usec_t dt){
143 NULL,
144 "System Load Average",
145 "load",
146 - "freebsd",
146 + "freebsd.plugin",
147 "vm.loadavg",
148 - 100,
148 + NETDATA_CHART_PRIO_SYSTEM_LOAD,
149 (update_every < MIN_LOADAVG_UPDATE_EVERY) ?
150 MIN_LOADAVG_UPDATE_EVERY : update_every, RRDSET_TYPE_LINE
151 );
@@ -212,9 +212,9 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
212 NULL,
213 "System Active Processes",
214 "processes",
215 - "freebsd",
215 + "freebsd.plugin",
216 "vm.vmtotal",
217 - 750,
217 + NETDATA_CHART_PRIO_SYSTEM_ACTIVE_PROCESSES,
218 update_every,
219 RRDSET_TYPE_LINE
220 );
@@ -241,9 +241,9 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
241 NULL,
242 "System Processes",
243 "processes",
244 - "freebsd",
244 + "freebsd.plugin",
245 "vm.vmtotal",
246 - 600,
246 + NETDATA_CHART_PRIO_SYSTEM_PROCESSES,
247 update_every,
248 RRDSET_TYPE_LINE
249 );
@@ -273,7 +273,7 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
273 NULL,
274 "Committed (Allocated) Memory",
275 "MB",
276 - "freebsd",
276 + "freebsd.plugin",
277 "vm.vmtotal",
278 NETDATA_CHART_PRIO_MEM_SYSTEM_COMMITTED,
279 update_every,
@@ -332,9 +332,10 @@ int do_kern_cp_time(int update_every, usec_t dt) {
332 "system.cpu",
333 "Total CPU utilization",
334 "percentage",
335 - "freebsd",
335 + "freebsd.plugin",
336 "kern.cp_time",
337 - 100, update_every,
337 + NETDATA_CHART_PRIO_SYSTEM_CPU,
338 + update_every,
339 RRDSET_TYPE_STACKED
340 );
341
@@ -413,9 +414,9 @@ int do_kern_cp_times(int update_every, usec_t dt) {
414 "cpu.cpu",
415 "Core utilization",
416 "percentage",
416 - "freebsd",
417 + "freebsd.plugin",
418 "kern.cp_times",
418 - 1000,
419 + NETDATA_CHART_PRIO_CPU_PER_CORE,
420 update_every,
421 RRDSET_TYPE_STACKED
422 );
@@ -497,9 +498,9 @@ int do_dev_cpu_temperature(int update_every, usec_t dt) {
498 "cpu.temperatute",
499 "Core temperature",
500 "Celsius",
500 - "freebsd",
501 + "freebsd.plugin",
502 "dev.cpu.temperature",
502 - 1050,
503 + NETDATA_CHART_PRIO_CPU_TEMPERATURE,
504 update_every,
505 RRDSET_TYPE_LINE
506 );
@@ -550,9 +551,9 @@ int do_dev_cpu_0_freq(int update_every, usec_t dt) {
551 NULL,
552 "Current CPU Scaling Frequency",
553 "MHz",
553 - "freebsd",
554 + "freebsd.plugin",
555 "dev.cpu.0.freq",
555 - 5003,
556 + NETDATA_CHART_PRIO_CPUFREQ_SCALING_CUR_FREQ,
557 update_every,
558 RRDSET_TYPE_LINE
559 );
@@ -614,9 +615,9 @@ int do_hw_intcnt(int update_every, usec_t dt) {
615 NULL,
616 "Total Hardware Interrupts",
617 "interrupts/s",
617 - "freebsd",
618 + "freebsd.plugin",
619 "hw.intrcnt",
619 - 900,
620 + NETDATA_CHART_PRIO_SYSTEM_INTR,
621 update_every,
622 RRDSET_TYPE_LINE
623 );
@@ -659,9 +660,9 @@ int do_hw_intcnt(int update_every, usec_t dt) {
660 NULL,
661 "System interrupts",
662 "interrupts/s",
662 - "freebsd",
663 + "freebsd.plugin",
664 "hw.intrcnt",
664 - 1000,
665 + NETDATA_CHART_PRIO_SYSTEM_INTERRUPTS,
666 update_every,
667 RRDSET_TYPE_STACKED
668 );
@@ -717,9 +718,9 @@ int do_vm_stats_sys_v_intr(int update_every, usec_t dt) {
718 NULL,
719 "Device Interrupts",
720 "interrupts/s",
720 - "freebsd",
721 + "freebsd.plugin",
722 "vm.stats.sys.v_intr",
722 - 1000,
723 + NETDATA_CHART_PRIO_SYSTEM_DEV_INTR,
724 update_every,
725 RRDSET_TYPE_LINE
726 );
@@ -763,9 +764,9 @@ int do_vm_stats_sys_v_soft(int update_every, usec_t dt) {
764 NULL,
765 "Software Interrupts",
766 "interrupts/s",
766 - "freebsd",
767 + "freebsd.plugin",
768 "vm.stats.sys.v_soft",
768 - 1100,
769 + NETDATA_CHART_PRIO_SYSTEM_SOFT_INTR,
770 update_every,
771 RRDSET_TYPE_LINE
772 );
@@ -809,9 +810,9 @@ int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) {
810 NULL,
811 "CPU Context Switches",
812 "context switches/s",
812 - "freebsd",
813 + "freebsd.plugin",
814 "vm.stats.sys.v_swtch",
814 - 800,
815 + NETDATA_CHART_PRIO_SYSTEM_CTXT,
816 update_every,
817 RRDSET_TYPE_LINE
818 );
@@ -855,9 +856,9 @@ int do_vm_stats_sys_v_forks(int update_every, usec_t dt) {
856 NULL,
857 "Started Processes",
858 "processes/s",
858 - "freebsd",
859 + "freebsd.plugin",
860 "vm.stats.sys.v_swtch",
860 - 700,
861 + NETDATA_CHART_PRIO_SYSTEM_FORKS,
862 update_every,
863 RRDSET_TYPE_LINE
864 );
@@ -932,9 +933,9 @@ int do_vm_swap_info(int update_every, usec_t dt) {
933 NULL,
934 "System Swap",
935 "MB",
935 - "freebsd",
936 + "freebsd.plugin",
937 "vm.swap_info",
937 - 201,
938 + NETDATA_CHART_PRIO_SYSTEM_SWAP,
939 update_every,
940 RRDSET_TYPE_STACKED
941 );
@@ -992,9 +993,9 @@ int do_system_ram(int update_every, usec_t dt) {
993 NULL,
994 "System RAM",
995 "MB",
995 - "freebsd",
996 + "freebsd.plugin",
997 "system.ram",
997 - 200,
998 + NETDATA_CHART_PRIO_SYSTEM_RAM,
999 update_every,
1000 RRDSET_TYPE_STACKED
1001 );
@@ -1053,9 +1054,9 @@ int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) {
1054 NULL,
1055 "Swap I/O",
1056 "kilobytes/s",
1056 - "freebsd",
1057 + "freebsd.plugin",
1058 "vm.stats.vm.v_swappgs",
1058 - 250,
1059 + NETDATA_CHART_PRIO_SYSTEM_SWAPIO,
1060 update_every,
1061 RRDSET_TYPE_AREA
1062 );
@@ -1107,7 +1108,7 @@ int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) {
1108 NULL,
1109 "Memory Page Faults",
1110 "page faults/s",
1110 - "freebsd",
1111 + "freebsd.plugin",
1112 "vm.stats.vm.v_pgfaults",
1113 NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS,
1114 update_every,
@@ -1189,9 +1190,9 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {
1190 NULL,
1191 "IPC Semaphores",
1192 "semaphores",
1192 - "freebsd",
1193 + "freebsd.plugin",
1194 "kern.ipc.sem",
1194 - 1000,
1195 + NETDATA_CHART_PRIO_SYSTEM_IPC_SEMAPHORES,
1196 update_every,
1197 RRDSET_TYPE_AREA
1198 );
@@ -1214,9 +1215,9 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {
1215 NULL,
1216 "IPC Semaphore Arrays",
1217 "arrays",
1217 - "freebsd",
1218 + "freebsd.plugin",
1219 "kern.ipc.sem",
1219 - 1000,
1220 + NETDATA_CHART_PRIO_SYSTEM_IPC_SEM_ARRAYS,
1221 update_every,
1222 RRDSET_TYPE_AREA
1223 );
@@ -1288,9 +1289,9 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
1289 NULL,
1290 "IPC Shared Memory Segments",
1291 "segments",
1291 - "freebsd",
1292 + "freebsd.plugin",
1293 "kern.ipc.shm",
1293 - 1000,
1294 + NETDATA_CHART_PRIO_SYSTEM_IPC_SHARED_MEM_SEGS,
1295 update_every,
1296 RRDSET_TYPE_AREA
1297 );
@@ -1313,9 +1314,9 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
1314 NULL,
1315 "IPC Shared Memory Segments Size",
1316 "kilobytes",
1316 - "freebsd",
1317 + "freebsd.plugin",
1318 "kern.ipc.shm",
1318 - 1000,
1319 + NETDATA_CHART_PRIO_SYSTEM_IPC_SHARED_MEM_SIZE,
1320 update_every,
1321 RRDSET_TYPE_AREA
1322 );
@@ -1393,9 +1394,9 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
1394 NULL,
1395 "Number of IPC Message Queues",
1396 "queues",
1396 - "freebsd",
1397 + "freebsd.plugin",
1398 "kern.ipc.msq",
1398 - 990,
1399 + NETDATA_CHART_PRIO_SYSTEM_IPC_MSQ_QUEUES,
1400 update_every,
1401 RRDSET_TYPE_AREA
1402 );
@@ -1418,9 +1419,9 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
1419 NULL,
1420 "Number of Messages in IPC Message Queues",
1421 "messages",
1421 - "freebsd",
1422 + "freebsd.plugin",
1423 "kern.ipc.msq",
1423 - 1000,
1424 + NETDATA_CHART_PRIO_SYSTEM_IPC_MSQ_MESSAGES,
1425 update_every,
1426 RRDSET_TYPE_AREA
1427 );
@@ -1443,9 +1444,9 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
1444 NULL,
1445 "Size of IPC Message Queues",
1446 "bytes",
1446 - "freebsd",
1447 + "freebsd.plugin",
1448 "kern.ipc.msq",
1448 - 1100,
1449 + NETDATA_CHART_PRIO_SYSTEM_IPC_MSQ_SIZE,
1450 update_every,
1451 RRDSET_TYPE_LINE
1452 );
@@ -1487,9 +1488,9 @@ int do_uptime(int update_every, usec_t dt) {
1488 NULL,
1489 "System Uptime",
1490 "seconds",
1490 - "freebsd",
1491 + "freebsd.plugin",
1492 "uptime",
1492 - 1000,
1493 + NETDATA_CHART_PRIO_SYSTEM_UPTIME,
1494 update_every,
1495 RRDSET_TYPE_LINE
1496 );
@@ -1615,9 +1616,9 @@ int do_net_isr(int update_every, usec_t dt) {
1616 NULL,
1617 "System softnet_stat",
1618 "events/s",
1618 - "freebsd",
1619 + "freebsd.plugin",
1620 "net.isr",
1620 - 955,
1621 + NETDATA_CHART_PRIO_SYSTEM_SOFTNET_STAT,
1622 update_every,
1623 RRDSET_TYPE_LINE
1624 );
@@ -1668,9 +1669,9 @@ int do_net_isr(int update_every, usec_t dt) {
1669 NULL,
1670 "Per CPU netisr statistics",
1671 "events/s",
1671 - "freebsd",
1672 + "freebsd.plugin",
1673 "net.isr",
1673 - 1101 + i,
1674 + NETDATA_CHART_PRIO_SOFTNET_PER_CORE + i,
1675 update_every,
1676 RRDSET_TYPE_LINE
1677 );
@@ -1730,7 +1731,7 @@ int do_net_inet_tcp_states(int update_every, usec_t dt) {
1731 NULL,
1732 "IPv4 TCP Connections",
1733 "active connections",
1733 - "freebsd",
1734 + "freebsd.plugin",
1735 "net.inet.tcp.states",
1736 2500,
1737 update_every,
@@ -1814,7 +1815,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1815 NULL,
1816 "IPv4 TCP Packets",
1817 "packets/s",
1817 - "freebsd",
1818 + "freebsd.plugin",
1819 "net.inet.tcp.stats",
1820 2600,
1821 update_every,
@@ -1846,7 +1847,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1847 NULL,
1848 "IPv4 TCP Errors",
1849 "packets/s",
1849 - "freebsd",
1850 + "freebsd.plugin",
1851 "net.inet.tcp.stats",
1852 2700,
1853 update_every,
@@ -1888,7 +1889,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1889 NULL,
1890 "IPv4 TCP Handshake Issues",
1891 "events/s",
1891 - "freebsd",
1892 + "freebsd.plugin",
1893 "net.inet.tcp.stats",
1894 2900,
1895 update_every,
@@ -1929,7 +1930,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1930 NULL,
1931 "TCP Connection Aborts",
1932 "connections/s",
1932 - "freebsd",
1933 + "freebsd.plugin",
1934 "net.inet.tcp.stats",
1935 3010,
1936 update_every,
@@ -1969,7 +1970,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1970 NULL,
1971 "TCP Out-Of-Order Queue",
1972 "packets/s",
1972 - "freebsd",
1973 + "freebsd.plugin",
1974 "net.inet.tcp.stats",
1975 3050,
1976 update_every,
@@ -2001,7 +2002,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
2002 NULL,
2003 "TCP SYN Cookies",
2004 "packets/s",
2004 - "freebsd",
2005 + "freebsd.plugin",
2006 "net.inet.tcp.stats",
2007 3100,
2008 update_every,
@@ -2038,7 +2039,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
2039 NULL,
2040 "TCP Listen Socket Issues",
2041 "packets/s",
2041 - "freebsd",
2042 + "freebsd.plugin",
2043 "net.inet.tcp.stats",
2044 3015,
2045 update_every,
@@ -2072,7 +2073,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
2073 NULL,
2074 "IPv4 ECN Statistics",
2075 "packets/s",
2075 - "freebsd",
2076 + "freebsd.plugin",
2077 "net.inet.tcp.stats",
2078 8700,
2079 update_every,
@@ -2146,7 +2147,7 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
2147 NULL,
2148 "IPv4 UDP Packets",
2149 "packets/s",
2149 - "freebsd",
2150 + "freebsd.plugin",
2151 "net.inet.udp.stats",
2152 2601,
2153 update_every,
@@ -2179,7 +2180,7 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
2180 NULL,
2181 "IPv4 UDP Errors",
2182 "events/s",
2182 - "freebsd",
2183 + "freebsd.plugin",
2184 "net.inet.udp.stats",
2185 2701,
2186 update_every,
@@ -2265,7 +2266,7 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2266 , NULL
2267 , "IPv4 ICMP Packets"
2268 , "packets/s"
2268 - , "freebsd"
2269 + "freebsd.plugin",
2270 , "net.inet.icmp.stats"
2271 , 2602
2272 , update_every
@@ -2298,7 +2299,7 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2299 , NULL
2300 , "IPv4 ICMP Errors"
2301 , "packets/s"
2301 - , "freebsd"
2302 + "freebsd.plugin",
2303 , "net.inet.icmp.stats"
2304 , 2603
2305 , update_every
@@ -2334,7 +2335,7 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2335 , NULL
2336 , "IPv4 ICMP Messages"
2337 , "packets/s"
2337 - , "freebsd"
2338 + "freebsd.plugin",
2339 , "net.inet.icmp.stats"
2340 , 2604
2341 , update_every
@@ -2412,7 +2413,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2413 NULL,
2414 "IPv4 Packets",
2415 "packets/s",
2415 - "freebsd",
2416 + "freebsd.plugin",
2417 "net.inet.ip.stats",
2418 3000,
2419 update_every,
@@ -2448,7 +2449,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2449 NULL,
2450 "IPv4 Fragments Sent",
2451 "packets/s",
2451 - "freebsd",
2452 + "freebsd.plugin",
2453 "net.inet.ip.stats",
2454 3010,
2455 update_every,
@@ -2484,7 +2485,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2485 NULL,
2486 "IPv4 Fragments Reassembly",
2487 "packets/s",
2487 - "freebsd",
2488 + "freebsd.plugin",
2489 "net.inet.ip.stats",
2490 3011,
2491 update_every,
@@ -2522,7 +2523,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2523 NULL,
2524 "IPv4 Errors",
2525 "packets/s",
2525 - "freebsd",
2526 + "freebsd.plugin",
2527 "net.inet.ip.stats",
2528 3002,
2529 update_every,
@@ -2613,7 +2614,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2614 NULL,
2615 "IPv6 Packets",
2616 "packets/s",
2616 - "freebsd",
2617 + "freebsd.plugin",
2618 "net.inet6.ip6.stats",
2619 3000,
2620 update_every,
@@ -2653,7 +2654,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2654 NULL,
2655 "IPv6 Fragments Sent",
2656 "packets/s",
2656 - "freebsd",
2657 + "freebsd.plugin",
2658 "net.inet6.ip6.stats",
2659 3010,
2660 update_every,
@@ -2693,7 +2694,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2694 NULL,
2695 "IPv6 Fragments Reassembly",
2696 "packets/s",
2696 - "freebsd",
2697 + "freebsd.plugin",
2698 "net.inet6.ip6.stats",
2699 3011,
2700 update_every,
@@ -2744,7 +2745,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2745 NULL,
2746 "IPv6 Errors",
2747 "packets/s",
2747 - "freebsd",
2748 + "freebsd.plugin",
2749 "net.inet6.ip6.stats",
2750 3002,
2751 update_every,
@@ -2858,7 +2859,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2859 NULL,
2860 "IPv6 ICMP Messages",
2861 "messages/s",
2861 - "freebsd",
2862 + "freebsd.plugin",
2863 "net.inet6.icmp6.stats",
2864 10000,
2865 update_every,
@@ -2893,7 +2894,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2894 NULL,
2895 "IPv6 ICMP Redirects",
2896 "redirects/s",
2896 - "freebsd",
2897 + "freebsd.plugin",
2898 "net.inet6.icmp6.stats",
2899 10050,
2900 update_every,
@@ -2940,7 +2941,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2941 NULL,
2942 "IPv6 ICMP Errors",
2943 "errors/s",
2943 - "freebsd",
2944 + "freebsd.plugin",
2945 "net.inet6.icmp6.stats",
2946 10100,
2947 update_every,
@@ -2995,7 +2996,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2996 NULL,
2997 "IPv6 ICMP Echo",
2998 "messages/s",
2998 - "freebsd",
2999 + "freebsd.plugin",
3000 "net.inet6.icmp6.stats",
3001 10200,
3002 update_every,
@@ -3038,7 +3039,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
3039 NULL,
3040 "IPv6 Router Messages",
3041 "messages/s",
3041 - "freebsd",
3042 + "freebsd.plugin",
3043 "net.inet6.icmp6.stats",
3044 10400,
3045 update_every,
@@ -3081,7 +3082,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
3082 NULL,
3083 "IPv6 Neighbor Messages",
3084 "messages/s",
3084 - "freebsd",
3085 + "freebsd.plugin",
3086 "net.inet6.icmp6.stats",
3087 10500,
3088 update_every,
@@ -3131,7 +3132,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
3132 NULL,
3133 "IPv6 ICMP Types",
3134 "messages/s",
3134 - "freebsd",
3135 + "freebsd.plugin",
3136 "net.inet6.icmp6.stats",
3137 10700,
3138 update_every,
src/plugins/idlejitter.plugin/plugin_idlejitter.c
+2 -2
@@ -30,9 +30,9 @@ void *cpuidlejitter_main(void *ptr) {
30 , NULL
31 , "CPU Idle Jitter"
32 , "microseconds lost/s"
33 - , "idlejitter"
33 + , "idlejitter.plugin"
34 , NULL
35 - , 800
35 + , NETDATA_CHART_PRIO_SYSTEM_IDLEJITTER
36 , localhost->rrd_update_every
37 , RRDSET_TYPE_AREA
38 );
src/plugins/linux-cgroups.plugin/sys_fs_cgroup.c
+119 -118
@@ -2,12 +2,13 @@
2
3 #include "sys_fs_cgroup.h"
4
5 +#define PLUGIN_CGROUPS_NAME "cgroups.plugin"
6 +#define PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME "systemd"
7 +#define PLUGIN_CGROUPS_MODULE_CGROUPS_NAME "/sys/fs/cgroup"
8 +
9 // ----------------------------------------------------------------------------
10 // cgroup globals
11
8 -#define CHART_PRIORITY_SYSTEMD_SERVICES 19000
9 -#define CHART_PRIORITY_CONTAINERS 40000
10 -
12 static long system_page_size = 4096; // system will be queried via sysconf() in configuration()
13
14 static int cgroup_enable_cpuacct_stat = CONFIG_BOOLEAN_AUTO;
@@ -1465,9 +1466,9 @@ void update_systemd_services_charts(
1466 , "services.cpu"
1467 , title
1468 , "%"
1468 - , "cgroup"
1469 - , "systemd"
1470 - , CHART_PRIORITY_SYSTEMD_SERVICES
1469 + , PLUGIN_CGROUPS_NAME
1470 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1471 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD
1472 , update_every
1473 , RRDSET_TYPE_STACKED
1474 );
@@ -1489,9 +1490,9 @@ void update_systemd_services_charts(
1490 , (cgroup_used_memory_without_cache) ? "Systemd Services Used Memory without Cache"
1491 : "Systemd Services Used Memory"
1492 , "MB"
1492 - , "cgroup"
1493 - , "systemd"
1494 - , CHART_PRIORITY_SYSTEMD_SERVICES + 10
1493 + , PLUGIN_CGROUPS_NAME
1494 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1495 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 10
1496 , update_every
1497 , RRDSET_TYPE_STACKED
1498 );
@@ -1512,9 +1513,9 @@ void update_systemd_services_charts(
1513 , "services.mem_rss"
1514 , "Systemd Services RSS Memory"
1515 , "MB"
1515 - , "cgroup"
1516 - , "systemd"
1517 - , CHART_PRIORITY_SYSTEMD_SERVICES + 20
1516 + , PLUGIN_CGROUPS_NAME
1517 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1518 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 20
1519 , update_every
1520 , RRDSET_TYPE_STACKED
1521 );
@@ -1533,9 +1534,9 @@ void update_systemd_services_charts(
1534 , "services.mem_mapped"
1535 , "Systemd Services Mapped Memory"
1536 , "MB"
1536 - , "cgroup"
1537 - , "systemd"
1538 - , CHART_PRIORITY_SYSTEMD_SERVICES + 30
1537 + , PLUGIN_CGROUPS_NAME
1538 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1539 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 30
1540 , update_every
1541 , RRDSET_TYPE_STACKED
1542 );
@@ -1554,9 +1555,9 @@ void update_systemd_services_charts(
1555 , "services.mem_cache"
1556 , "Systemd Services Cache Memory"
1557 , "MB"
1557 - , "cgroup"
1558 - , "systemd"
1559 - , CHART_PRIORITY_SYSTEMD_SERVICES + 40
1558 + , PLUGIN_CGROUPS_NAME
1559 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1560 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 40
1561 , update_every
1562 , RRDSET_TYPE_STACKED
1563 );
@@ -1575,9 +1576,9 @@ void update_systemd_services_charts(
1576 , "services.mem_writeback"
1577 , "Systemd Services Writeback Memory"
1578 , "MB"
1578 - , "cgroup"
1579 - , "systemd"
1580 - , CHART_PRIORITY_SYSTEMD_SERVICES + 50
1579 + , PLUGIN_CGROUPS_NAME
1580 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1581 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 50
1582 , update_every
1583 , RRDSET_TYPE_STACKED
1584 );
@@ -1596,9 +1597,9 @@ void update_systemd_services_charts(
1597 , "services.mem_pgfault"
1598 , "Systemd Services Memory Minor Page Faults"
1599 , "MB/s"
1599 - , "cgroup"
1600 - , "systemd"
1601 - , CHART_PRIORITY_SYSTEMD_SERVICES + 60
1600 + , PLUGIN_CGROUPS_NAME
1601 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1602 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 60
1603 , update_every
1604 , RRDSET_TYPE_STACKED
1605 );
@@ -1616,9 +1617,9 @@ void update_systemd_services_charts(
1617 , "services.mem_pgmajfault"
1618 , "Systemd Services Memory Major Page Faults"
1619 , "MB/s"
1619 - , "cgroup"
1620 - , "systemd"
1621 - , CHART_PRIORITY_SYSTEMD_SERVICES + 70
1620 + , PLUGIN_CGROUPS_NAME
1621 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1622 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 70
1623 , update_every
1624 , RRDSET_TYPE_STACKED
1625 );
@@ -1637,9 +1638,9 @@ void update_systemd_services_charts(
1638 , "services.mem_pgpgin"
1639 , "Systemd Services Memory Charging Activity"
1640 , "MB/s"
1640 - , "cgroup"
1641 - , "systemd"
1642 - , CHART_PRIORITY_SYSTEMD_SERVICES + 80
1641 + , PLUGIN_CGROUPS_NAME
1642 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1643 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 80
1644 , update_every
1645 , RRDSET_TYPE_STACKED
1646 );
@@ -1658,9 +1659,9 @@ void update_systemd_services_charts(
1659 , "services.mem_pgpgout"
1660 , "Systemd Services Memory Uncharging Activity"
1661 , "MB/s"
1661 - , "cgroup"
1662 - , "systemd"
1663 - , CHART_PRIORITY_SYSTEMD_SERVICES + 90
1662 + , PLUGIN_CGROUPS_NAME
1663 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1664 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 90
1665 , update_every
1666 , RRDSET_TYPE_STACKED
1667 );
@@ -1681,9 +1682,9 @@ void update_systemd_services_charts(
1682 , "services.mem_failcnt"
1683 , "Systemd Services Memory Limit Failures"
1684 , "MB"
1684 - , "cgroup"
1685 - , "systemd"
1686 - , CHART_PRIORITY_SYSTEMD_SERVICES + 110
1685 + , PLUGIN_CGROUPS_NAME
1686 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1687 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 110
1688 , update_every
1689 , RRDSET_TYPE_STACKED
1690 );
@@ -1704,9 +1705,9 @@ void update_systemd_services_charts(
1705 , "services.swap_usage"
1706 , "Systemd Services Swap Memory Used"
1707 , "MB"
1707 - , "cgroup"
1708 - , "systemd"
1709 - , CHART_PRIORITY_SYSTEMD_SERVICES + 100
1708 + , PLUGIN_CGROUPS_NAME
1709 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1710 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 100
1711 , update_every
1712 , RRDSET_TYPE_STACKED
1713 );
@@ -1727,9 +1728,9 @@ void update_systemd_services_charts(
1728 , "services.io_read"
1729 , "Systemd Services Disk Read Bandwidth"
1730 , "KB/s"
1730 - , "cgroup"
1731 - , "systemd"
1732 - , CHART_PRIORITY_SYSTEMD_SERVICES + 120
1731 + , PLUGIN_CGROUPS_NAME
1732 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1733 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 120
1734 , update_every
1735 , RRDSET_TYPE_STACKED
1736 );
@@ -1748,9 +1749,9 @@ void update_systemd_services_charts(
1749 , "services.io_write"
1750 , "Systemd Services Disk Write Bandwidth"
1751 , "KB/s"
1751 - , "cgroup"
1752 - , "systemd"
1753 - , CHART_PRIORITY_SYSTEMD_SERVICES + 130
1752 + , PLUGIN_CGROUPS_NAME
1753 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1754 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 130
1755 , update_every
1756 , RRDSET_TYPE_STACKED
1757 );
@@ -1771,9 +1772,9 @@ void update_systemd_services_charts(
1772 , "services.io_ops_read"
1773 , "Systemd Services Disk Read Operations"
1774 , "operations/s"
1774 - , "cgroup"
1775 - , "systemd"
1776 - , CHART_PRIORITY_SYSTEMD_SERVICES + 140
1775 + , PLUGIN_CGROUPS_NAME
1776 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1777 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 140
1778 , update_every
1779 , RRDSET_TYPE_STACKED
1780 );
@@ -1792,9 +1793,9 @@ void update_systemd_services_charts(
1793 , "services.io_ops_write"
1794 , "Systemd Services Disk Write Operations"
1795 , "operations/s"
1795 - , "cgroup"
1796 - , "systemd"
1797 - , CHART_PRIORITY_SYSTEMD_SERVICES + 150
1796 + , PLUGIN_CGROUPS_NAME
1797 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1798 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 150
1799 , update_every
1800 , RRDSET_TYPE_STACKED
1801 );
@@ -1815,9 +1816,9 @@ void update_systemd_services_charts(
1816 , "services.throttle_io_read"
1817 , "Systemd Services Throttle Disk Read Bandwidth"
1818 , "KB/s"
1818 - , "cgroup"
1819 - , "systemd"
1820 - , CHART_PRIORITY_SYSTEMD_SERVICES + 160
1819 + , PLUGIN_CGROUPS_NAME
1820 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1821 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 160
1822 , update_every
1823 , RRDSET_TYPE_STACKED
1824 );
@@ -1836,9 +1837,9 @@ void update_systemd_services_charts(
1837 , "services.throttle_io_write"
1838 , "Systemd Services Throttle Disk Write Bandwidth"
1839 , "KB/s"
1839 - , "cgroup"
1840 - , "systemd"
1841 - , CHART_PRIORITY_SYSTEMD_SERVICES + 170
1840 + , PLUGIN_CGROUPS_NAME
1841 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1842 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 170
1843 , update_every
1844 , RRDSET_TYPE_STACKED
1845 );
@@ -1859,9 +1860,9 @@ void update_systemd_services_charts(
1860 , "services.throttle_io_ops_read"
1861 , "Systemd Services Throttle Disk Read Operations"
1862 , "operations/s"
1862 - , "cgroup"
1863 - , "systemd"
1864 - , CHART_PRIORITY_SYSTEMD_SERVICES + 180
1863 + , PLUGIN_CGROUPS_NAME
1864 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1865 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 180
1866 , update_every
1867 , RRDSET_TYPE_STACKED
1868 );
@@ -1880,9 +1881,9 @@ void update_systemd_services_charts(
1881 , "services.throttle_io_ops_write"
1882 , "Systemd Services Throttle Disk Write Operations"
1883 , "operations/s"
1883 - , "cgroup"
1884 - , "systemd"
1885 - , CHART_PRIORITY_SYSTEMD_SERVICES + 190
1884 + , PLUGIN_CGROUPS_NAME
1885 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1886 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 190
1887 , update_every
1888 , RRDSET_TYPE_STACKED
1889 );
@@ -1903,9 +1904,9 @@ void update_systemd_services_charts(
1904 , "services.queued_io_ops_read"
1905 , "Systemd Services Queued Disk Read Operations"
1906 , "operations/s"
1906 - , "cgroup"
1907 - , "systemd"
1908 - , CHART_PRIORITY_SYSTEMD_SERVICES + 200
1907 + , PLUGIN_CGROUPS_NAME
1908 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1909 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 200
1910 , update_every
1911 , RRDSET_TYPE_STACKED
1912 );
@@ -1924,9 +1925,9 @@ void update_systemd_services_charts(
1925 , "services.queued_io_ops_write"
1926 , "Systemd Services Queued Disk Write Operations"
1927 , "operations/s"
1927 - , "cgroup"
1928 - , "systemd"
1929 - , CHART_PRIORITY_SYSTEMD_SERVICES + 210
1928 + , PLUGIN_CGROUPS_NAME
1929 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1930 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 210
1931 , update_every
1932 , RRDSET_TYPE_STACKED
1933 );
@@ -1947,9 +1948,9 @@ void update_systemd_services_charts(
1948 , "services.merged_io_ops_read"
1949 , "Systemd Services Merged Disk Read Operations"
1950 , "operations/s"
1950 - , "cgroup"
1951 - , "systemd"
1952 - , CHART_PRIORITY_SYSTEMD_SERVICES + 220
1951 + , PLUGIN_CGROUPS_NAME
1952 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1953 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 220
1954 , update_every
1955 , RRDSET_TYPE_STACKED
1956 );
@@ -1968,9 +1969,9 @@ void update_systemd_services_charts(
1969 , "services.merged_io_ops_write"
1970 , "Systemd Services Merged Disk Write Operations"
1971 , "operations/s"
1971 - , "cgroup"
1972 - , "systemd"
1973 - , CHART_PRIORITY_SYSTEMD_SERVICES + 230
1972 + , PLUGIN_CGROUPS_NAME
1973 + , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1974 + , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 230
1975 , update_every
1976 , RRDSET_TYPE_STACKED
1977 );
@@ -2250,9 +2251,9 @@ void update_cgroup_charts(int update_every) {
2251 , "cgroup.cpu"
2252 , title
2253 , "%"
2253 - , "cgroup"
2254 - , "default"
2255 - , CHART_PRIORITY_CONTAINERS
2254 + , PLUGIN_CGROUPS_NAME
2255 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2256 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS
2257 , update_every
2258 , RRDSET_TYPE_STACKED
2259 );
@@ -2283,9 +2284,9 @@ void update_cgroup_charts(int update_every) {
2284 , "cgroup.cpu_per_core"
2285 , title
2286 , "%"
2286 - , "cgroup"
2287 - , "default"
2288 - , CHART_PRIORITY_CONTAINERS + 100
2287 + , PLUGIN_CGROUPS_NAME
2288 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2289 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 100
2290 , update_every
2291 , RRDSET_TYPE_STACKED
2292 );
@@ -2317,9 +2318,9 @@ void update_cgroup_charts(int update_every) {
2318 , "cgroup.mem"
2319 , title
2320 , "MB"
2320 - , "cgroup"
2321 - , "default"
2322 - , CHART_PRIORITY_CONTAINERS + 210
2321 + , PLUGIN_CGROUPS_NAME
2322 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2323 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 210
2324 , update_every
2325 , RRDSET_TYPE_STACKED
2326 );
@@ -2357,9 +2358,9 @@ void update_cgroup_charts(int update_every) {
2358 , "cgroup.writeback"
2359 , title
2360 , "MB"
2360 - , "cgroup"
2361 - , "default"
2362 - , CHART_PRIORITY_CONTAINERS + 300
2361 + , PLUGIN_CGROUPS_NAME
2362 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2363 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 300
2364 , update_every
2365 , RRDSET_TYPE_AREA
2366 );
@@ -2389,9 +2390,9 @@ void update_cgroup_charts(int update_every) {
2390 , "cgroup.mem_activity"
2391 , title
2392 , "MB/s"
2392 - , "cgroup"
2393 - , "default"
2394 - , CHART_PRIORITY_CONTAINERS + 400
2393 + , PLUGIN_CGROUPS_NAME
2394 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2395 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 400
2396 , update_every
2397 , RRDSET_TYPE_LINE
2398 );
@@ -2417,9 +2418,9 @@ void update_cgroup_charts(int update_every) {
2418 , "cgroup.pgfaults"
2419 , title
2420 , "MB/s"
2420 - , "cgroup"
2421 - , "default"
2422 - , CHART_PRIORITY_CONTAINERS + 500
2421 + , PLUGIN_CGROUPS_NAME
2422 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2423 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 500
2424 , update_every
2425 , RRDSET_TYPE_LINE
2426 );
@@ -2447,9 +2448,9 @@ void update_cgroup_charts(int update_every) {
2448 , "cgroup.mem_usage"
2449 , title
2450 , "MB"
2450 - , "cgroup"
2451 - , "default"
2452 - , CHART_PRIORITY_CONTAINERS + 200
2451 + , PLUGIN_CGROUPS_NAME
2452 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2453 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 200
2454 , update_every
2455 , RRDSET_TYPE_STACKED
2456 );
@@ -2477,9 +2478,9 @@ void update_cgroup_charts(int update_every) {
2478 , "cgroup.mem_failcnt"
2479 , title
2480 , "count"
2480 - , "cgroup"
2481 - , "default"
2482 - , CHART_PRIORITY_CONTAINERS + 250
2481 + , PLUGIN_CGROUPS_NAME
2482 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2483 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 250
2484 , update_every
2485 , RRDSET_TYPE_LINE
2486 );
@@ -2505,9 +2506,9 @@ void update_cgroup_charts(int update_every) {
2506 , "cgroup.io"
2507 , title
2508 , "KB/s"
2508 - , "cgroup"
2509 - , "default"
2510 - , CHART_PRIORITY_CONTAINERS + 1200
2509 + , PLUGIN_CGROUPS_NAME
2510 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2511 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 1200
2512 , update_every
2513 , RRDSET_TYPE_AREA
2514 );
@@ -2535,9 +2536,9 @@ void update_cgroup_charts(int update_every) {
2536 , "cgroup.serviced_ops"
2537 , title
2538 , "operations/s"
2538 - , "cgroup"
2539 - , "default"
2540 - , CHART_PRIORITY_CONTAINERS + 1200
2539 + , PLUGIN_CGROUPS_NAME
2540 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2541 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 1200
2542 , update_every
2543 , RRDSET_TYPE_LINE
2544 );
@@ -2565,9 +2566,9 @@ void update_cgroup_charts(int update_every) {
2566 , "cgroup.throttle_io"
2567 , title
2568 , "KB/s"
2568 - , "cgroup"
2569 - , "default"
2570 - , CHART_PRIORITY_CONTAINERS + 1200
2569 + , PLUGIN_CGROUPS_NAME
2570 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2571 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 1200
2572 , update_every
2573 , RRDSET_TYPE_AREA
2574 );
@@ -2595,9 +2596,9 @@ void update_cgroup_charts(int update_every) {
2596 , "cgroup.throttle_serviced_ops"
2597 , title
2598 , "operations/s"
2598 - , "cgroup"
2599 - , "default"
2600 - , CHART_PRIORITY_CONTAINERS + 1200
2599 + , PLUGIN_CGROUPS_NAME
2600 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2601 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 1200
2602 , update_every
2603 , RRDSET_TYPE_LINE
2604 );
@@ -2625,9 +2626,9 @@ void update_cgroup_charts(int update_every) {
2626 , "cgroup.queued_ops"
2627 , title
2628 , "operations"
2628 - , "cgroup"
2629 - , "default"
2630 - , CHART_PRIORITY_CONTAINERS + 2000
2629 + , PLUGIN_CGROUPS_NAME
2630 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2631 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 2000
2632 , update_every
2633 , RRDSET_TYPE_LINE
2634 );
@@ -2655,9 +2656,9 @@ void update_cgroup_charts(int update_every) {
2656 , "cgroup.merged_ops"
2657 , title
2658 , "operations/s"
2658 - , "cgroup"
2659 - , "default"
2660 - , CHART_PRIORITY_CONTAINERS + 2100
2659 + , PLUGIN_CGROUPS_NAME
2660 + , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2661 + , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 2100
2662 , update_every
2663 , RRDSET_TYPE_LINE
2664 );
@@ -2746,7 +2747,7 @@ void *cgroups_main(void *ptr) {
2747 , NULL
2748 , "NetData CGroups Plugin CPU usage"
2749 , "milliseconds/s"
2749 - , "cgroup"
2750 + , PLUGIN_CGROUPS_NAME
2751 , "stats"
2752 , 132000
2753 , cgroup_update_every
src/plugins/linux-cgroups.plugin/sys_fs_cgroup.h
+1 -1
@@ -9,7 +9,7 @@
9
10 #define NETDATA_PLUGIN_HOOK_LINUX_CGROUPS \
11 { \
12 - .name = "PLUGIN[cgroup]", \
12 + .name = "PLUGIN[cgroups]", \
13 .config_section = CONFIG_SECTION_PLUGINS, \
14 .config_name = "cgroups", \
15 .enabled = 1, \
src/plugins/linux-diskspace.plugin/plugin_diskspace.c
+9 -7
@@ -2,6 +2,8 @@
2
3 #include "plugin_diskspace.h"
4
5 +#define PLUGIN_DISKSPACE_NAME "diskspace.plugin"
6 +
7 #define DELAULT_EXCLUDED_PATHS "/proc/* /sys/* /var/run/user/* /run/user/* /snap/* /var/lib/docker/*"
8 #define DEFAULT_EXCLUDED_FILESYSTEMS "*gvfs *gluster* *s3fs *ipfs *davfs2 *httpfs *sshfs *gdfs *moosefs fusectl"
9 #define CONFIG_SECTION_DISKSPACE "plugin:proc:diskspace"
@@ -261,9 +263,9 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
263 , "disk.space"
264 , title
265 , "GB"
264 - , "diskspace"
266 + , PLUGIN_DISKSPACE_NAME
267 , NULL
266 - , 2023
268 + , NETDATA_CHART_PRIO_DISKSPACE_SPACE
269 , update_every
270 , RRDSET_TYPE_STACKED
271 );
@@ -301,9 +303,9 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
303 , "disk.inodes"
304 , title
305 , "Inodes"
304 - , "diskspace"
306 + , PLUGIN_DISKSPACE_NAME
307 , NULL
306 - , 2024
308 + , NETDATA_CHART_PRIO_DISKSPACE_INODES
309 , update_every
310 , RRDSET_TYPE_STACKED
311 );
@@ -408,9 +410,9 @@ void *diskspace_main(void *ptr) {
410 , NULL
411 , "NetData Disk Space Plugin CPU usage"
412 , "milliseconds/s"
411 - , "diskspace"
413 + , PLUGIN_DISKSPACE_NAME
414 , NULL
413 - , 132020
415 + , NETDATA_CHART_PRIO_NETDATA_DISKSPACE
416 , update_every
417 , RRDSET_TYPE_STACKED
418 );
@@ -436,7 +438,7 @@ void *diskspace_main(void *ptr) {
438 , NULL
439 , "NetData Disk Space Plugin Duration"
440 , "milliseconds/run"
439 - , "diskspace"
441 + , PLUGIN_DISKSPACE_NAME
442 , NULL
443 , 132021
444 , update_every
src/plugins/linux-nfacct.plugin/plugin_nfacct.c
+16 -14
@@ -4,6 +4,8 @@
4
5 #if defined(INTERNAL_PLUGIN_NFACCT)
6
7 +#define PLUGIN_NFACCT_NAME "nfacct.plugin"
8 +
9 #ifdef HAVE_LIBMNL
10 #include <libmnl/libmnl.h>
11
@@ -304,9 +306,9 @@ static void nfstat_send_metrics() {
306 , NULL
307 , "Connection Tracker New Connections"
308 , "connections/s"
307 - , "nfacct"
309 + , PLUGIN_NFACCT_NAME
310 , NULL
309 - , NETDATA_CHART_PRIO_NETFILTER + 1
311 + , NETDATA_CHART_PRIO_NETFILTER_NEW
312 , nfstat_root.update_every
313 , RRDSET_TYPE_LINE
314 );
@@ -340,9 +342,9 @@ static void nfstat_send_metrics() {
342 , NULL
343 , "Connection Tracker Changes"
344 , "changes/s"
343 - , "nfacct"
345 + , PLUGIN_NFACCT_NAME
346 , NULL
345 - , NETDATA_CHART_PRIO_NETFILTER + 2
347 + , NETDATA_CHART_PRIO_NETFILTER_CHANGES
348 , nfstat_root.update_every
349 , RRDSET_TYPE_LINE
350 );
@@ -377,9 +379,9 @@ static void nfstat_send_metrics() {
379 , NULL
380 , "Connection Tracker Searches"
381 , "searches/s"
380 - , "nfacct"
382 + , PLUGIN_NFACCT_NAME
383 , NULL
382 - , NETDATA_CHART_PRIO_NETFILTER + 10
384 + , NETDATA_CHART_PRIO_NETFILTER_SEARCH
385 , nfstat_root.update_every
386 , RRDSET_TYPE_LINE
387 );
@@ -414,9 +416,9 @@ static void nfstat_send_metrics() {
416 , NULL
417 , "Connection Tracker Errors"
418 , "events/s"
417 - , "nfacct"
419 + , PLUGIN_NFACCT_NAME
420 , NULL
419 - , NETDATA_CHART_PRIO_NETFILTER + 5
421 + , NETDATA_CHART_PRIO_NETFILTER_ERRORS
422 , nfstat_root.update_every
423 , RRDSET_TYPE_LINE
424 );
@@ -453,9 +455,9 @@ static void nfstat_send_metrics() {
455 , NULL
456 , "Connection Tracker Expectations"
457 , "expectations/s"
456 - , "nfacct"
458 + , PLUGIN_NFACCT_NAME
459 , NULL
458 - , NETDATA_CHART_PRIO_NETFILTER + 3
460 + , NETDATA_CHART_PRIO_NETFILTER_EXPECT
461 , nfstat_root.update_every
462 , RRDSET_TYPE_LINE
463 );
@@ -673,9 +675,9 @@ static void nfacct_send_metrics() {
675 , NULL
676 , "Netfilter Accounting Packets"
677 , "packets/s"
676 - , "nfacct"
678 + , PLUGIN_NFACCT_NAME
679 , NULL
678 - , NETDATA_CHART_PRIO_NETFILTER + 206
680 + , NETDATA_CHART_PRIO_NETFILTER_PACKETS
681 , nfacct_root.update_every
682 , RRDSET_TYPE_STACKED
683 );
@@ -716,9 +718,9 @@ static void nfacct_send_metrics() {
718 , NULL
719 , "Netfilter Accounting Bandwidth"
720 , "kilobytes/s"
719 - , "nfacct"
721 + , PLUGIN_NFACCT_NAME
722 , NULL
721 - , NETDATA_CHART_PRIO_NETFILTER + 207
723 + , NETDATA_CHART_PRIO_NETFILTER_BYTES
724 , nfacct_root.update_every
725 , RRDSET_TYPE_STACKED
726 );
src/plugins/linux-proc.plugin/ipc.c
+4 -4
@@ -197,9 +197,9 @@ int do_ipc(int update_every, usec_t dt) {
197 , NULL
198 , "IPC Semaphores"
199 , "semaphores"
200 - , "linux"
200 + , PLUGIN_PROC_NAME
201 , "ipc"
202 - , 1000
202 + , NETDATA_CHART_PRIO_SYSTEM_IPC_SEMAPHORES
203 , localhost->rrd_update_every
204 , RRDSET_TYPE_AREA
205 );
@@ -215,9 +215,9 @@ int do_ipc(int update_every, usec_t dt) {
215 , NULL
216 , "IPC Semaphore Arrays"
217 , "arrays"
218 - , "linux"
218 + , PLUGIN_PROC_NAME
219 , "ipc"
220 - , 1000
220 + , NETDATA_CHART_PRIO_SYSTEM_IPC_SEM_ARRAYS
221 , localhost->rrd_update_every
222 , RRDSET_TYPE_AREA
223 );
src/plugins/linux-proc.plugin/plugin_proc.h
+4
@@ -18,6 +18,10 @@
18 .start_routine = proc_main \
19 },
20
21 +
22 +#define PLUGIN_PROC_CONFIG_NAME "proc"
23 +#define PLUGIN_PROC_NAME PLUGIN_PROC_CONFIG_NAME ".plugin"
24 +
25 extern void *proc_main(void *ptr);
26
27 extern int do_proc_net_dev(int update_every, usec_t dt);
src/plugins/linux-proc.plugin/proc_diskstats.c
+90 -89
@@ -3,13 +3,14 @@
3 #include "plugin_proc.h"
4
5 #define RRD_TYPE_DISK "disk"
6 +#define PLUGIN_PROC_MODULE_DISKSTATS_NAME "/proc/diskstats"
7 +#define CONFIG_SECTION_PLUGIN_PROC_DISKSTATS "plugin:" PLUGIN_PROC_CONFIG_NAME ":" PLUGIN_PROC_MODULE_DISKSTATS_NAME
8
9 #define DISK_TYPE_UNKNOWN 0
10 #define DISK_TYPE_PHYSICAL 1
11 #define DISK_TYPE_PARTITION 2
12 #define DISK_TYPE_VIRTUAL 3
13
12 -#define CONFIG_SECTION_DISKSTATS "plugin:proc:/proc/diskstats"
14 #define DEFAULT_EXCLUDED_DISKS "loop* ram*"
15
16 static struct disk {
@@ -257,9 +258,9 @@ void bcache_read_priority_stats(struct disk *d, const char *family, int update_e
258 , "disk.bcache_cache_alloc"
259 , "BCache Cache Allocations"
260 , "percentage"
260 - , "proc"
261 - , "diskstats"
262 - , 2120
261 + , PLUGIN_PROC_NAME
262 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
263 + , NETDATA_CHART_PRIO_BCACHE_CACHE_ALLOC
264 , update_every
265 , RRDSET_TYPE_STACKED
266 );
@@ -304,7 +305,7 @@ static inline int is_major_enabled(int major) {
305 if(major_configs[major] == -1) {
306 char buffer[CONFIG_MAX_NAME + 1];
307 snprintfz(buffer, CONFIG_MAX_NAME, "performance metrics for disks with major %d", major);
307 - major_configs[major] = (char)config_get_boolean(CONFIG_SECTION_DISKSTATS, buffer, 1);
308 + major_configs[major] = (char)config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, buffer, 1);
309 }
310
311 return (int)major_configs[major];
@@ -429,7 +430,7 @@ static void get_disk_config(struct disk *d) {
430 def_enable = CONFIG_BOOLEAN_NO;
431
432 char var_name[4096 + 1];
432 - snprintfz(var_name, 4096, "plugin:proc:/proc/diskstats:%s", d->disk);
433 + snprintfz(var_name, 4096, CONFIG_SECTION_PLUGIN_PROC_DISKSTATS ":%s", d->disk);
434
435 def_enable = config_get_boolean_ondemand(var_name, "enable", def_enable);
436 if(unlikely(def_enable == CONFIG_BOOLEAN_NO)) {
@@ -781,59 +782,59 @@ int do_proc_diskstats(int update_every, usec_t dt) {
782 if(unlikely(!globals_initialized)) {
783 globals_initialized = 1;
784
784 - global_enable_new_disks_detected_at_runtime = config_get_boolean(CONFIG_SECTION_DISKSTATS, "enable new disks detected at runtime", global_enable_new_disks_detected_at_runtime);
785 - global_enable_performance_for_physical_disks = config_get_boolean_ondemand(CONFIG_SECTION_DISKSTATS, "performance metrics for physical disks", global_enable_performance_for_physical_disks);
786 - global_enable_performance_for_virtual_disks = config_get_boolean_ondemand(CONFIG_SECTION_DISKSTATS, "performance metrics for virtual disks", global_enable_performance_for_virtual_disks);
787 - global_enable_performance_for_partitions = config_get_boolean_ondemand(CONFIG_SECTION_DISKSTATS, "performance metrics for partitions", global_enable_performance_for_partitions);
788 -
789 - global_do_io = config_get_boolean_ondemand(CONFIG_SECTION_DISKSTATS, "bandwidth for all disks", global_do_io);
790 - global_do_ops = config_get_boolean_ondemand(CONFIG_SECTION_DISKSTATS, "operations for all disks", global_do_ops);
791 - global_do_mops = config_get_boolean_ondemand(CONFIG_SECTION_DISKSTATS, "merged operations for all disks", global_do_mops);
792 - global_do_iotime = config_get_boolean_ondemand(CONFIG_SECTION_DISKSTATS, "i/o time for all disks", global_do_iotime);
793 - global_do_qops = config_get_boolean_ondemand(CONFIG_SECTION_DISKSTATS, "queued operations for all disks", global_do_qops);
794 - global_do_util = config_get_boolean_ondemand(CONFIG_SECTION_DISKSTATS, "utilization percentage for all disks", global_do_util);
795 - global_do_backlog = config_get_boolean_ondemand(CONFIG_SECTION_DISKSTATS, "backlog for all disks", global_do_backlog);
796 - global_do_bcache = config_get_boolean_ondemand(CONFIG_SECTION_DISKSTATS, "bcache for all disks", global_do_bcache);
797 - global_bcache_priority_stats_update_every = (int)config_get_number(CONFIG_SECTION_DISKSTATS, "bcache priority stats update every", global_bcache_priority_stats_update_every);
798 -
799 - global_cleanup_removed_disks = config_get_boolean(CONFIG_SECTION_DISKSTATS, "remove charts of removed disks" , global_cleanup_removed_disks);
785 + global_enable_new_disks_detected_at_runtime = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "enable new disks detected at runtime", global_enable_new_disks_detected_at_runtime);
786 + global_enable_performance_for_physical_disks = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "performance metrics for physical disks", global_enable_performance_for_physical_disks);
787 + global_enable_performance_for_virtual_disks = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "performance metrics for virtual disks", global_enable_performance_for_virtual_disks);
788 + global_enable_performance_for_partitions = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "performance metrics for partitions", global_enable_performance_for_partitions);
789 +
790 + global_do_io = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "bandwidth for all disks", global_do_io);
791 + global_do_ops = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "operations for all disks", global_do_ops);
792 + global_do_mops = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "merged operations for all disks", global_do_mops);
793 + global_do_iotime = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "i/o time for all disks", global_do_iotime);
794 + global_do_qops = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "queued operations for all disks", global_do_qops);
795 + global_do_util = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "utilization percentage for all disks", global_do_util);
796 + global_do_backlog = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "backlog for all disks", global_do_backlog);
797 + global_do_bcache = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "bcache for all disks", global_do_bcache);
798 + global_bcache_priority_stats_update_every = (int)config_get_number(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "bcache priority stats update every", global_bcache_priority_stats_update_every);
799 +
800 + global_cleanup_removed_disks = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "remove charts of removed disks" , global_cleanup_removed_disks);
801
802 char buffer[FILENAME_MAX + 1];
803
804 snprintfz(buffer, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/block/%s");
804 - path_to_sys_block_device = config_get(CONFIG_SECTION_DISKSTATS, "path to get block device", buffer);
805 + path_to_sys_block_device = config_get(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "path to get block device", buffer);
806
807 snprintfz(buffer, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/block/%s/bcache");
807 - path_to_sys_block_device_bcache = config_get(CONFIG_SECTION_DISKSTATS, "path to get block device bcache", buffer);
808 + path_to_sys_block_device_bcache = config_get(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "path to get block device bcache", buffer);
809
810 snprintfz(buffer, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/devices/virtual/block/%s");
810 - path_to_sys_devices_virtual_block_device = config_get(CONFIG_SECTION_DISKSTATS, "path to get virtual block device", buffer);
811 + path_to_sys_devices_virtual_block_device = config_get(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "path to get virtual block device", buffer);
812
813 snprintfz(buffer, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/dev/block/%lu:%lu/%s");
813 - path_to_sys_dev_block_major_minor_string = config_get(CONFIG_SECTION_DISKSTATS, "path to get block device infos", buffer);
814 + path_to_sys_dev_block_major_minor_string = config_get(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "path to get block device infos", buffer);
815
816 //snprintfz(buffer, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/block/%s/queue/hw_sector_size");
816 - //path_to_get_hw_sector_size = config_get(CONFIG_SECTION_DISKSTATS, "path to get h/w sector size", buffer);
817 + //path_to_get_hw_sector_size = config_get(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "path to get h/w sector size", buffer);
818
819 //snprintfz(buffer, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/dev/block/%lu:%lu/subsystem/%s/../queue/hw_sector_size");
819 - //path_to_get_hw_sector_size_partitions = config_get(CONFIG_SECTION_DISKSTATS, "path to get h/w sector size for partitions", buffer);
820 + //path_to_get_hw_sector_size_partitions = config_get(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "path to get h/w sector size for partitions", buffer);
821
822 snprintfz(buffer, FILENAME_MAX, "%s/dev/mapper", netdata_configured_host_prefix);
822 - path_to_device_mapper = config_get(CONFIG_SECTION_DISKSTATS, "path to device mapper", buffer);
823 + path_to_device_mapper = config_get(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "path to device mapper", buffer);
824
825 snprintfz(buffer, FILENAME_MAX, "%s/dev/disk/by-label", netdata_configured_host_prefix);
825 - path_to_device_label = config_get(CONFIG_SECTION_DISKSTATS, "path to /dev/disk/by-label", buffer);
826 + path_to_device_label = config_get(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "path to /dev/disk/by-label", buffer);
827
828 snprintfz(buffer, FILENAME_MAX, "%s/dev/disk/by-id", netdata_configured_host_prefix);
828 - path_to_device_id = config_get(CONFIG_SECTION_DISKSTATS, "path to /dev/disk/by-id", buffer);
829 + path_to_device_id = config_get(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "path to /dev/disk/by-id", buffer);
830
831 snprintfz(buffer, FILENAME_MAX, "%s/dev/vx/dsk", netdata_configured_host_prefix);
831 - path_to_veritas_volume_groups = config_get(CONFIG_SECTION_DISKSTATS, "path to /dev/vx/dsk", buffer);
832 + path_to_veritas_volume_groups = config_get(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "path to /dev/vx/dsk", buffer);
833
833 - name_disks_by_id = config_get_boolean(CONFIG_SECTION_DISKSTATS, "name disks by id", name_disks_by_id);
834 + name_disks_by_id = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "name disks by id", name_disks_by_id);
835
836 excluded_disks = simple_pattern_create(
836 - config_get(CONFIG_SECTION_DISKSTATS, "exclude disks", DEFAULT_EXCLUDED_DISKS)
837 + config_get(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "exclude disks", DEFAULT_EXCLUDED_DISKS)
838 , NULL
839 , SIMPLE_PATTERN_EXACT
840 );
@@ -844,7 +845,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
845 if(unlikely(!ff)) {
846 char filename[FILENAME_MAX + 1];
847 snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/proc/diskstats");
847 - ff = procfile_open(config_get(CONFIG_SECTION_DISKSTATS, "filename to monitor", filename), " \t", PROCFILE_FLAG_DEFAULT);
848 + ff = procfile_open(config_get(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "filename to monitor", filename), " \t", PROCFILE_FLAG_DEFAULT);
849 }
850 if(unlikely(!ff)) return 0;
851
@@ -960,9 +961,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
961 , "disk.io"
962 , "Disk I/O Bandwidth"
963 , "kilobytes/s"
963 - , "proc"
964 - , "diskstats"
965 - , 2000
964 + , PLUGIN_PROC_NAME
965 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
966 + , NETDATA_CHART_PRIO_DISK_IO
967 , update_every
968 , RRDSET_TYPE_AREA
969 );
@@ -991,9 +992,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
992 , "disk.ops"
993 , "Disk Completed I/O Operations"
994 , "operations/s"
994 - , "proc"
995 - , "diskstats"
996 - , 2001
995 + , PLUGIN_PROC_NAME
996 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
997 + , NETDATA_CHART_PRIO_DISK_OPS
998 , update_every
999 , RRDSET_TYPE_LINE
1000 );
@@ -1024,9 +1025,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1025 , "disk.qops"
1026 , "Disk Current I/O Operations"
1027 , "operations"
1027 - , "proc"
1028 - , "diskstats"
1029 - , 2002
1028 + , PLUGIN_PROC_NAME
1029 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1030 + , NETDATA_CHART_PRIO_DISK_QOPS
1031 , update_every
1032 , RRDSET_TYPE_LINE
1033 );
@@ -1055,9 +1056,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1056 , "disk.backlog"
1057 , "Disk Backlog"
1058 , "backlog (ms)"
1058 - , "proc"
1059 - , "diskstats"
1060 - , 2003
1059 + , PLUGIN_PROC_NAME
1060 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1061 + , NETDATA_CHART_PRIO_DISK_BACKLOG
1062 , update_every
1063 , RRDSET_TYPE_AREA
1064 );
@@ -1086,9 +1087,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1087 , "disk.util"
1088 , "Disk Utilization Time"
1089 , "% of time working"
1089 - , "proc"
1090 - , "diskstats"
1091 - , 2004
1090 + , PLUGIN_PROC_NAME
1091 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1092 + , NETDATA_CHART_PRIO_DISK_UTIL
1093 , update_every
1094 , RRDSET_TYPE_AREA
1095 );
@@ -1117,9 +1118,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1118 , "disk.mops"
1119 , "Disk Merged Operations"
1120 , "merged operations/s"
1120 - , "proc"
1121 - , "diskstats"
1122 - , 2021
1121 + , PLUGIN_PROC_NAME
1122 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1123 + , NETDATA_CHART_PRIO_DISK_MOPS
1124 , update_every
1125 , RRDSET_TYPE_LINE
1126 );
@@ -1150,9 +1151,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1151 , "disk.iotime"
1152 , "Disk Total I/O Time"
1153 , "milliseconds/s"
1153 - , "proc"
1154 - , "diskstats"
1155 - , 2022
1154 + , PLUGIN_PROC_NAME
1155 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1156 + , NETDATA_CHART_PRIO_DISK_IOTIME
1157 , update_every
1158 , RRDSET_TYPE_LINE
1159 );
@@ -1186,9 +1187,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1187 , "disk.await"
1188 , "Average Completed I/O Operation Time"
1189 , "ms per operation"
1189 - , "proc"
1190 - , "diskstats"
1191 - , 2005
1190 + , PLUGIN_PROC_NAME
1191 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1192 + , NETDATA_CHART_PRIO_DISK_AWAIT
1193 , update_every
1194 , RRDSET_TYPE_LINE
1195 );
@@ -1217,9 +1218,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1218 , "disk.avgsz"
1219 , "Average Completed I/O Operation Bandwidth"
1220 , "kilobytes per operation"
1220 - , "proc"
1221 - , "diskstats"
1222 - , 2006
1221 + , PLUGIN_PROC_NAME
1222 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1223 + , NETDATA_CHART_PRIO_DISK_AVGSZ
1224 , update_every
1225 , RRDSET_TYPE_AREA
1226 );
@@ -1248,9 +1249,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1249 , "disk.svctm"
1250 , "Average Service Time"
1251 , "ms per operation"
1251 - , "proc"
1252 - , "diskstats"
1253 - , 2007
1252 + , PLUGIN_PROC_NAME
1253 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1254 + , NETDATA_CHART_PRIO_DISK_SVCTM
1255 , update_every
1256 , RRDSET_TYPE_LINE
1257 );
@@ -1353,9 +1354,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1354 , "disk.bcache_hit_ratio"
1355 , "BCache Cache Hit Ratio"
1356 , "percentage"
1356 - , "proc"
1357 - , "diskstats"
1358 - , 2120
1357 + , PLUGIN_PROC_NAME
1358 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1359 + , NETDATA_CHART_PRIO_BCACHE_HIT_RATIO
1360 , update_every
1361 , RRDSET_TYPE_LINE
1362 );
@@ -1385,9 +1386,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1386 , "disk.bcache_rates"
1387 , "BCache Rates"
1388 , "KB/s"
1388 - , "proc"
1389 - , "diskstats"
1390 - , 2121
1389 + , PLUGIN_PROC_NAME
1390 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1391 + , NETDATA_CHART_PRIO_BCACHE_RATES
1392 , update_every
1393 , RRDSET_TYPE_AREA
1394 );
@@ -1412,9 +1413,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1413 , "disk.bcache_size"
1414 , "BCache Cache Sizes"
1415 , "MB"
1415 - , "proc"
1416 - , "diskstats"
1417 - , 2122
1416 + , PLUGIN_PROC_NAME
1417 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1418 + , NETDATA_CHART_PRIO_BCACHE_SIZE
1419 , update_every
1420 , RRDSET_TYPE_AREA
1421 );
@@ -1437,9 +1438,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1438 , "disk.bcache_usage"
1439 , "BCache Cache Usage"
1440 , "percent"
1440 - , "proc"
1441 - , "diskstats"
1442 - , 2123
1441 + , PLUGIN_PROC_NAME
1442 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1443 + , NETDATA_CHART_PRIO_BCACHE_USAGE
1444 , update_every
1445 , RRDSET_TYPE_AREA
1446 );
@@ -1463,9 +1464,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1464 , "disk.bcache_cache_read_races"
1465 , "BCache Cache Read Races"
1466 , "operations/s"
1466 - , "proc"
1467 - , "diskstats"
1468 - , 2126
1467 + , PLUGIN_PROC_NAME
1468 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1469 + , NETDATA_CHART_PRIO_BCACHE_CACHE_READ_RACES
1470 , update_every
1471 , RRDSET_TYPE_LINE
1472 );
@@ -1491,9 +1492,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1492 , "disk.bcache"
1493 , "BCache Cache I/O Operations"
1494 , "operations/s"
1494 - , "proc"
1495 - , "diskstats"
1496 - , 2124
1495 + , PLUGIN_PROC_NAME
1496 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1497 + , NETDATA_CHART_PRIO_BCACHE_OPS
1498 , update_every
1499 , RRDSET_TYPE_LINE
1500 );
@@ -1525,9 +1526,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1526 , "disk.bcache_bypass"
1527 , "BCache Cache Bypass I/O Operations"
1528 , "operations/s"
1528 - , "proc"
1529 - , "diskstats"
1530 - , 2125
1529 + , PLUGIN_PROC_NAME
1530 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1531 + , NETDATA_CHART_PRIO_BCACHE_BYPASS
1532 , update_every
1533 , RRDSET_TYPE_LINE
1534 );
@@ -1563,9 +1564,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1564 , NULL
1565 , "Disk I/O"
1566 , "kilobytes/s"
1566 - , "proc"
1567 - , "diskstats"
1568 - , 150
1567 + , PLUGIN_PROC_NAME
1568 + , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1569 + , NETDATA_CHART_PRIO_SYSTEM_IO
1570 , update_every
1571 , RRDSET_TYPE_AREA
1572 );
src/plugins/linux-proc.plugin/proc_interrupts.c
+11 -8
@@ -2,6 +2,9 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_INTERRUPTS_NAME "/proc/interrupts"
6 +#define CONFIG_SECTION_PLUGIN_PROC_INTERRUPTS "plugin:" PLUGIN_PROC_CONFIG_NAME ":" PLUGIN_PROC_MODULE_INTERRUPTS_NAME
7 +
8 #define MAX_INTERRUPT_NAME 50
9
10 struct cpu_interrupt {
@@ -57,12 +60,12 @@ int do_proc_interrupts(int update_every, usec_t dt) {
60 struct interrupt *irrs = NULL;
61
62 if(unlikely(do_per_core == -1))
60 - do_per_core = config_get_boolean("plugin:proc:/proc/interrupts", "interrupts per core", 1);
63 + do_per_core = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_INTERRUPTS, "interrupts per core", 1);
64
65 if(unlikely(!ff)) {
66 char filename[FILENAME_MAX + 1];
67 snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/proc/interrupts");
65 - ff = procfile_open(config_get("plugin:proc:/proc/interrupts", "filename to monitor", filename), " \t:", PROCFILE_FLAG_DEFAULT);
68 + ff = procfile_open(config_get(CONFIG_SECTION_PLUGIN_PROC_INTERRUPTS, "filename to monitor", filename), " \t:", PROCFILE_FLAG_DEFAULT);
69 }
70 if(unlikely(!ff))
71 return 1;
@@ -152,9 +155,9 @@ int do_proc_interrupts(int update_every, usec_t dt) {
155 , NULL
156 , "System interrupts"
157 , "interrupts/s"
155 - , "proc"
156 - , "interrupts"
157 - , 1000
158 + , PLUGIN_PROC_NAME
159 + , PLUGIN_PROC_MODULE_INTERRUPTS_NAME
160 + , NETDATA_CHART_PRIO_SYSTEM_INTERRUPTS
161 , update_every
162 , RRDSET_TYPE_STACKED
163 );
@@ -217,9 +220,9 @@ int do_proc_interrupts(int update_every, usec_t dt) {
220 , "cpu.interrupts"
221 , title
222 , "interrupts/s"
220 - , "proc"
221 - , "interrupts"
222 - , 1100 + c
223 + , PLUGIN_PROC_NAME
224 + , PLUGIN_PROC_MODULE_INTERRUPTS_NAME
225 + , NETDATA_CHART_PRIO_INTERRUPTS_PER_CORE + c
226 , update_every
227 , RRDSET_TYPE_STACKED
228 );
src/plugins/linux-proc.plugin/proc_loadavg.c
+12 -9
@@ -2,6 +2,9 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_LOADAVG_NAME "/proc/loadavg"
6 +#define CONFIG_SECTION_PLUGIN_PROC_LOADAVG "plugin:" PLUGIN_PROC_CONFIG_NAME ":" PLUGIN_PROC_MODULE_LOADAVG_NAME
7 +
8 // linux calculates this once every 5 seconds
9 #define MIN_LOADAVG_UPDATE_EVERY 5
10
@@ -14,7 +17,7 @@ int do_proc_loadavg(int update_every, usec_t dt) {
17 char filename[FILENAME_MAX + 1];
18 snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/proc/loadavg");
19
17 - ff = procfile_open(config_get("plugin:proc:/proc/loadavg", "filename to monitor", filename), " \t,:|/", PROCFILE_FLAG_DEFAULT);
20 + ff = procfile_open(config_get(CONFIG_SECTION_PLUGIN_PROC_LOADAVG, "filename to monitor", filename), " \t,:|/", PROCFILE_FLAG_DEFAULT);
21 if(unlikely(!ff))
22 return 1;
23 }
@@ -24,8 +27,8 @@ int do_proc_loadavg(int update_every, usec_t dt) {
27 return 0; // we return 0, so that we will retry to open it next time
28
29 if(unlikely(do_loadavg == -1)) {
27 - do_loadavg = config_get_boolean("plugin:proc:/proc/loadavg", "enable load average", 1);
28 - do_all_processes = config_get_boolean("plugin:proc:/proc/loadavg", "enable total processes", 1);
30 + do_loadavg = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_LOADAVG, "enable load average", 1);
31 + do_all_processes = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_LOADAVG, "enable total processes", 1);
32 }
33
34 if(unlikely(procfile_lines(ff) < 1)) {
@@ -62,9 +65,9 @@ int do_proc_loadavg(int update_every, usec_t dt) {
65 , NULL
66 , "System Load Average"
67 , "load"
65 - , "proc"
66 - , "loadavg"
67 - , 100
68 + , PLUGIN_PROC_NAME
69 + , PLUGIN_PROC_MODULE_LOADAVG_NAME
70 + , NETDATA_CHART_PRIO_SYSTEM_LOAD
71 , (update_every < MIN_LOADAVG_UPDATE_EVERY) ? MIN_LOADAVG_UPDATE_EVERY : update_every
72 , RRDSET_TYPE_LINE
73 );
@@ -102,9 +105,9 @@ int do_proc_loadavg(int update_every, usec_t dt) {
105 , NULL
106 , "System Active Processes"
107 , "processes"
105 - , "proc"
106 - , "loadavg"
107 - , 750
108 + , PLUGIN_PROC_NAME
109 + , PLUGIN_PROC_MODULE_LOADAVG_NAME
110 + , NETDATA_CHART_PRIO_SYSTEM_ACTIVE_PROCESSES
111 , update_every
112 , RRDSET_TYPE_LINE
113 );
src/plugins/linux-proc.plugin/proc_meminfo.c
+35 -32
@@ -2,6 +2,9 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_MEMINFO_NAME "/proc/meminfo"
6 +#define CONFIG_SECTION_PLUGIN_PROC_MEMINFO "plugin:" PLUGIN_PROC_CONFIG_NAME ":" PLUGIN_PROC_MODULE_MEMINFO_NAME
7 +
8 int do_proc_meminfo(int update_every, usec_t dt) {
9 (void)dt;
10
@@ -58,15 +61,15 @@ int do_proc_meminfo(int update_every, usec_t dt) {
61 HardwareCorrupted = 0;
62
63 if(unlikely(!arl_base)) {
61 - do_ram = config_get_boolean("plugin:proc:/proc/meminfo", "system ram", 1);
62 - do_swap = config_get_boolean_ondemand("plugin:proc:/proc/meminfo", "system swap", CONFIG_BOOLEAN_AUTO);
63 - do_hwcorrupt = config_get_boolean_ondemand("plugin:proc:/proc/meminfo", "hardware corrupted ECC", CONFIG_BOOLEAN_AUTO);
64 - do_committed = config_get_boolean("plugin:proc:/proc/meminfo", "committed memory", 1);
65 - do_writeback = config_get_boolean("plugin:proc:/proc/meminfo", "writeback memory", 1);
66 - do_kernel = config_get_boolean("plugin:proc:/proc/meminfo", "kernel memory", 1);
67 - do_slab = config_get_boolean("plugin:proc:/proc/meminfo", "slab memory", 1);
68 - do_hugepages = config_get_boolean_ondemand("plugin:proc:/proc/meminfo", "hugepages", CONFIG_BOOLEAN_AUTO);
69 - do_transparent_hugepages = config_get_boolean_ondemand("plugin:proc:/proc/meminfo", "transparent hugepages", CONFIG_BOOLEAN_AUTO);
64 + do_ram = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_MEMINFO, "system ram", 1);
65 + do_swap = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_MEMINFO, "system swap", CONFIG_BOOLEAN_AUTO);
66 + do_hwcorrupt = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_MEMINFO, "hardware corrupted ECC", CONFIG_BOOLEAN_AUTO);
67 + do_committed = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_MEMINFO, "committed memory", 1);
68 + do_writeback = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_MEMINFO, "writeback memory", 1);
69 + do_kernel = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_MEMINFO, "kernel memory", 1);
70 + do_slab = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_MEMINFO, "slab memory", 1);
71 + do_hugepages = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_MEMINFO, "hugepages", CONFIG_BOOLEAN_AUTO);
72 + do_transparent_hugepages = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_MEMINFO, "transparent hugepages", CONFIG_BOOLEAN_AUTO);
73
74 arl_base = arl_create("meminfo", NULL, 60);
75 arl_expect(arl_base, "MemTotal", &MemTotal);
@@ -118,7 +121,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
121 if(unlikely(!ff)) {
122 char filename[FILENAME_MAX + 1];
123 snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/proc/meminfo");
121 - ff = procfile_open(config_get("plugin:proc:/proc/meminfo", "filename to monitor", filename), " \t:", PROCFILE_FLAG_DEFAULT);
124 + ff = procfile_open(config_get(CONFIG_SECTION_PLUGIN_PROC_MEMINFO, "filename to monitor", filename), " \t:", PROCFILE_FLAG_DEFAULT);
125 if(unlikely(!ff))
126 return 1;
127 }
@@ -160,9 +163,9 @@ int do_proc_meminfo(int update_every, usec_t dt) {
163 , NULL
164 , "System RAM"
165 , "MB"
163 - , "proc"
164 - , "meminfo"
165 - , 200
166 + , PLUGIN_PROC_NAME
167 + , PLUGIN_PROC_MODULE_MEMINFO_NAME
168 + , NETDATA_CHART_PRIO_SYSTEM_RAM
169 , update_every
170 , RRDSET_TYPE_STACKED
171 );
@@ -195,8 +198,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
198 , NULL
199 , "Available RAM for applications"
200 , "MB"
198 - , "proc"
199 - , "meminfo"
201 + , PLUGIN_PROC_NAME
202 + , PLUGIN_PROC_MODULE_MEMINFO_NAME
203 , NETDATA_CHART_PRIO_MEM_SYSTEM_AVAILABLE
204 , update_every
205 , RRDSET_TYPE_AREA
@@ -231,9 +234,9 @@ int do_proc_meminfo(int update_every, usec_t dt) {
234 , NULL
235 , "System Swap"
236 , "MB"
234 - , "proc"
235 - , "meminfo"
236 - , 201
237 + , PLUGIN_PROC_NAME
238 + , PLUGIN_PROC_MODULE_MEMINFO_NAME
239 + , NETDATA_CHART_PRIO_SYSTEM_SWAP
240 , update_every
241 , RRDSET_TYPE_STACKED
242 );
@@ -268,8 +271,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
271 , NULL
272 , "Corrupted Memory, detected by ECC"
273 , "MB"
271 - , "proc"
272 - , "meminfo"
274 + , PLUGIN_PROC_NAME
275 + , PLUGIN_PROC_MODULE_MEMINFO_NAME
276 , NETDATA_CHART_PRIO_MEM_HW
277 , update_every
278 , RRDSET_TYPE_LINE
@@ -301,8 +304,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
304 , NULL
305 , "Committed (Allocated) Memory"
306 , "MB"
304 - , "proc"
305 - , "meminfo"
307 + , PLUGIN_PROC_NAME
308 + , PLUGIN_PROC_MODULE_MEMINFO_NAME
309 , NETDATA_CHART_PRIO_MEM_SYSTEM_COMMITTED
310 , update_every
311 , RRDSET_TYPE_AREA
@@ -334,8 +337,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
337 , NULL
338 , "Writeback Memory"
339 , "MB"
337 - , "proc"
338 - , "meminfo"
340 + , PLUGIN_PROC_NAME
341 + , PLUGIN_PROC_MODULE_MEMINFO_NAME
342 , NETDATA_CHART_PRIO_MEM_KERNEL
343 , update_every
344 , RRDSET_TYPE_LINE
@@ -374,8 +377,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
377 , NULL
378 , "Memory Used by Kernel"
379 , "MB"
377 - , "proc"
378 - , "meminfo"
380 + , PLUGIN_PROC_NAME
381 + , PLUGIN_PROC_MODULE_MEMINFO_NAME
382 , NETDATA_CHART_PRIO_MEM_KERNEL + 1
383 , update_every
384 , RRDSET_TYPE_STACKED
@@ -413,8 +416,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
416 , NULL
417 , "Reclaimable Kernel Memory"
418 , "MB"
416 - , "proc"
417 - , "meminfo"
419 + , PLUGIN_PROC_NAME
420 + , PLUGIN_PROC_MODULE_MEMINFO_NAME
421 , NETDATA_CHART_PRIO_MEM_SLAB
422 , update_every
423 , RRDSET_TYPE_STACKED
@@ -450,8 +453,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
453 , NULL
454 , "Dedicated HugePages Memory"
455 , "MB"
453 - , "proc"
454 - , "meminfo"
456 + , PLUGIN_PROC_NAME
457 + , PLUGIN_PROC_MODULE_MEMINFO_NAME
458 , NETDATA_CHART_PRIO_MEM_HUGEPAGES + 1
459 , update_every
460 , RRDSET_TYPE_STACKED
@@ -491,8 +494,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
494 , NULL
495 , "Transparent HugePages Memory"
496 , "MB"
494 - , "proc"
495 - , "meminfo"
497 + , PLUGIN_PROC_NAME
498 + , PLUGIN_PROC_MODULE_MEMINFO_NAME
499 , NETDATA_CHART_PRIO_MEM_HUGEPAGES
500 , update_every
501 , RRDSET_TYPE_STACKED
src/plugins/linux-proc.plugin/proc_net_dev.c
+33 -30
@@ -2,6 +2,9 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_NETDEV_NAME "/proc/net/dev"
6 +#define CONFIG_SECTION_PLUGIN_PROC_NETDEV "plugin:" PLUGIN_PROC_CONFIG_NAME ":" PLUGIN_PROC_MODULE_NETDEV_NAME
7 +
8 // ----------------------------------------------------------------------------
9 // netdev list
10
@@ -298,7 +301,7 @@ static inline void netdev_rename_cgroup(struct netdev *d, struct netdev_rename *
301 snprintfz(buffer, RRD_ID_LENGTH_MAX, "net %s", r->container_device);
302 d->chart_family = strdupz(buffer);
303
301 - d->priority = 43000;
304 + d->priority = NETDATA_CHART_PRIO_CGROUP_NET_IFACE;
305 d->flipped = 1;
306 }
307
@@ -407,7 +410,7 @@ static struct netdev *get_netdev(const char *name) {
410 d->chart_id_net_packets = strdupz(d->name);
411
412 d->chart_family = strdupz(d->name);
410 - d->priority = 7000;
413 + d->priority = NETDATA_CHART_PRIO_FIRST_NET_IFACE;
414
415 netdev_rename_lock(d);
416
@@ -437,25 +440,25 @@ int do_proc_net_dev(int update_every, usec_t dt) {
440 char filename[FILENAME_MAX + 1];
441
442 snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/devices/virtual/net/%s");
440 - path_to_sys_devices_virtual_net = config_get("plugin:proc:/proc/net/dev", "path to get virtual interfaces", filename);
443 + path_to_sys_devices_virtual_net = config_get(CONFIG_SECTION_PLUGIN_PROC_NETDEV, "path to get virtual interfaces", filename);
444
442 - enable_new_interfaces = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "enable new interfaces detected at runtime", CONFIG_BOOLEAN_AUTO);
445 + enable_new_interfaces = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETDEV, "enable new interfaces detected at runtime", CONFIG_BOOLEAN_AUTO);
446
444 - do_bandwidth = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "bandwidth for all interfaces", CONFIG_BOOLEAN_AUTO);
445 - do_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "packets for all interfaces", CONFIG_BOOLEAN_AUTO);
446 - do_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "errors for all interfaces", CONFIG_BOOLEAN_AUTO);
447 - do_drops = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "drops for all interfaces", CONFIG_BOOLEAN_AUTO);
448 - do_fifo = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "fifo for all interfaces", CONFIG_BOOLEAN_AUTO);
449 - do_compressed = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "compressed packets for all interfaces", CONFIG_BOOLEAN_AUTO);
450 - do_events = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "frames, collisions, carrier counters for all interfaces", CONFIG_BOOLEAN_AUTO);
447 + do_bandwidth = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETDEV, "bandwidth for all interfaces", CONFIG_BOOLEAN_AUTO);
448 + do_packets = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETDEV, "packets for all interfaces", CONFIG_BOOLEAN_AUTO);
449 + do_errors = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETDEV, "errors for all interfaces", CONFIG_BOOLEAN_AUTO);
450 + do_drops = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETDEV, "drops for all interfaces", CONFIG_BOOLEAN_AUTO);
451 + do_fifo = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETDEV, "fifo for all interfaces", CONFIG_BOOLEAN_AUTO);
452 + do_compressed = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETDEV, "compressed packets for all interfaces", CONFIG_BOOLEAN_AUTO);
453 + do_events = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETDEV, "frames, collisions, carrier counters for all interfaces", CONFIG_BOOLEAN_AUTO);
454
452 - disabled_list = simple_pattern_create(config_get("plugin:proc:/proc/net/dev", "disable by default interfaces matching", "lo fireqos* *-ifb"), NULL, SIMPLE_PATTERN_EXACT);
455 + disabled_list = simple_pattern_create(config_get(CONFIG_SECTION_PLUGIN_PROC_NETDEV, "disable by default interfaces matching", "lo fireqos* *-ifb"), NULL, SIMPLE_PATTERN_EXACT);
456 }
457
458 if(unlikely(!ff)) {
459 char filename[FILENAME_MAX + 1];
460 snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, (*netdata_configured_host_prefix)?"/proc/1/net/dev":"/proc/net/dev");
458 - ff = procfile_open(config_get("plugin:proc:/proc/net/dev", "filename to monitor", filename), " \t,:|", PROCFILE_FLAG_DEFAULT);
461 + ff = procfile_open(config_get(CONFIG_SECTION_PLUGIN_PROC_NETDEV, "filename to monitor", filename), " \t,:|", PROCFILE_FLAG_DEFAULT);
462 if(unlikely(!ff)) return 1;
463 }
464
@@ -577,8 +580,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
580 , "net.net"
581 , "Bandwidth"
582 , "kilobits/s"
580 - , "proc"
581 - , "net/dev"
583 + , PLUGIN_PROC_NAME
584 + , PLUGIN_PROC_MODULE_NETDEV_NAME
585 , d->priority
586 , update_every
587 , RRDSET_TYPE_AREA
@@ -618,8 +621,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
621 , "net.packets"
622 , "Packets"
623 , "packets/s"
621 - , "proc"
622 - , "net/dev"
624 + , PLUGIN_PROC_NAME
625 + , PLUGIN_PROC_MODULE_NETDEV_NAME
626 , d->priority + 1
627 , update_every
628 , RRDSET_TYPE_LINE
@@ -663,8 +666,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
666 , "net.errors"
667 , "Interface Errors"
668 , "errors/s"
666 - , "proc"
667 - , "net/dev"
669 + , PLUGIN_PROC_NAME
670 + , PLUGIN_PROC_MODULE_NETDEV_NAME
671 , d->priority + 2
672 , update_every
673 , RRDSET_TYPE_LINE
@@ -706,8 +709,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
709 , "net.drops"
710 , "Interface Drops"
711 , "drops/s"
709 - , "proc"
710 - , "net/dev"
712 + , PLUGIN_PROC_NAME
713 + , PLUGIN_PROC_MODULE_NETDEV_NAME
714 , d->priority + 3
715 , update_every
716 , RRDSET_TYPE_LINE
@@ -749,8 +752,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
752 , "net.fifo"
753 , "Interface FIFO Buffer Errors"
754 , "errors"
752 - , "proc"
753 - , "net/dev"
755 + , PLUGIN_PROC_NAME
756 + , PLUGIN_PROC_MODULE_NETDEV_NAME
757 , d->priority + 4
758 , update_every
759 , RRDSET_TYPE_LINE
@@ -792,8 +795,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
795 , "net.compressed"
796 , "Compressed Packets"
797 , "packets/s"
795 - , "proc"
796 - , "net/dev"
798 + , PLUGIN_PROC_NAME
799 + , PLUGIN_PROC_MODULE_NETDEV_NAME
800 , d->priority + 5
801 , update_every
802 , RRDSET_TYPE_LINE
@@ -835,8 +838,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
838 , "net.events"
839 , "Network Interface Events"
840 , "events/s"
838 - , "proc"
839 - , "net/dev"
841 + , PLUGIN_PROC_NAME
842 + , PLUGIN_PROC_MODULE_NETDEV_NAME
843 , d->priority + 6
844 , update_every
845 , RRDSET_TYPE_LINE
@@ -871,9 +874,9 @@ int do_proc_net_dev(int update_every, usec_t dt) {
874 , NULL
875 , "Physical Network Interfaces Aggregated Bandwidth"
876 , "kilobits/s"
874 - , "proc"
875 - , "net/dev"
876 - , 500
877 + , PLUGIN_PROC_NAME
878 + , PLUGIN_PROC_MODULE_NETDEV_NAME
879 + , NETDATA_CHART_PRIO_SYSTEM_NET
880 , update_every
881 , RRDSET_TYPE_AREA
882 );
src/plugins/linux-proc.plugin/proc_net_ip_vs_stats.c
+16 -14
@@ -2,21 +2,23 @@
2
3 #include "plugin_proc.h"
4
5 -#define RRD_TYPE_NET_IPVS "ipvs"
5 +#define RRD_TYPE_NET_IPVS "ipvs"
6 +#define PLUGIN_PROC_MODULE_NET_IPVS_NAME "/proc/net/ip_vs_stats"
7 +#define CONFIG_SECTION_PLUGIN_PROC_NET_IPVS "plugin:" PLUGIN_PROC_CONFIG_NAME ":" PLUGIN_PROC_MODULE_NET_IPVS_NAME
8
9 int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
10 (void)dt;
11 static int do_bandwidth = -1, do_sockets = -1, do_packets = -1;
12 static procfile *ff = NULL;
13
12 - if(do_bandwidth == -1) do_bandwidth = config_get_boolean("plugin:proc:/proc/net/ip_vs_stats", "IPVS bandwidth", 1);
13 - if(do_sockets == -1) do_sockets = config_get_boolean("plugin:proc:/proc/net/ip_vs_stats", "IPVS connections", 1);
14 - if(do_packets == -1) do_packets = config_get_boolean("plugin:proc:/proc/net/ip_vs_stats", "IPVS packets", 1);
14 + if(do_bandwidth == -1) do_bandwidth = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_NET_IPVS, "IPVS bandwidth", 1);
15 + if(do_sockets == -1) do_sockets = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_NET_IPVS, "IPVS connections", 1);
16 + if(do_packets == -1) do_packets = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_NET_IPVS, "IPVS packets", 1);
17
18 if(!ff) {
19 char filename[FILENAME_MAX + 1];
20 snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/proc/net/ip_vs_stats");
19 - ff = procfile_open(config_get("plugin:proc:/proc/net/ip_vs_stats", "filename to monitor", filename), " \t,:|", PROCFILE_FLAG_DEFAULT);
21 + ff = procfile_open(config_get(CONFIG_SECTION_PLUGIN_PROC_NET_IPVS, "filename to monitor", filename), " \t,:|", PROCFILE_FLAG_DEFAULT);
22 }
23 if(!ff) return 1;
24
@@ -52,9 +54,9 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
54 , NULL
55 , "IPVS New Connections"
56 , "connections/s"
55 - , "proc"
56 - , "net/ip_vs_stats"
57 - , 3101
57 + , PLUGIN_PROC_NAME
58 + , PLUGIN_PROC_MODULE_NET_IPVS_NAME
59 + , NETDATA_CHART_PRIO_IPVS_SOCKETS
60 , update_every
61 , RRDSET_TYPE_LINE
62 );
@@ -80,9 +82,9 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
82 , NULL
83 , "IPVS Packets"
84 , "packets/s"
83 - , "proc"
84 - , "net/ip_vs_stats"
85 - , 3102
85 + , PLUGIN_PROC_NAME
86 + , PLUGIN_PROC_MODULE_NET_IPVS_NAME
87 + , NETDATA_CHART_PRIO_IPVS_PACKETS
88 , update_every
89 , RRDSET_TYPE_LINE
90 );
@@ -110,9 +112,9 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
112 , NULL
113 , "IPVS Bandwidth"
114 , "kilobits/s"
113 - , "proc"
114 - , "net/ip_vs_stats"
115 - , 3100
115 + , PLUGIN_PROC_NAME
116 + , PLUGIN_PROC_MODULE_NET_IPVS_NAME
117 + , NETDATA_CHART_PRIO_IPVS_NET
118 , update_every
119 , RRDSET_TYPE_AREA
120 );
src/plugins/linux-proc.plugin/proc_net_netstat.c
+53 -51
@@ -3,6 +3,8 @@
3 #include "plugin_proc.h"
4
5 #define RRD_TYPE_NET_NETSTAT "ip"
6 +#define PLUGIN_PROC_MODULE_NETSTAT_NAME "/proc/net/netstat"
7 +#define CONFIG_SECTION_PLUGIN_PROC_NETSTAT "plugin:" PLUGIN_PROC_CONFIG_NAME ":" PLUGIN_PROC_MODULE_NETSTAT_NAME
8
9 unsigned long long tcpext_TCPSynRetrans = 0;
10
@@ -116,22 +118,22 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
118 hash_ipext = simple_hash("IpExt");
119 hash_tcpext = simple_hash("TcpExt");
120
119 - do_bandwidth = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "bandwidth", CONFIG_BOOLEAN_AUTO);
120 - do_inerrors = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "input errors", CONFIG_BOOLEAN_AUTO);
121 - do_mcast = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "multicast bandwidth", CONFIG_BOOLEAN_AUTO);
122 - do_bcast = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "broadcast bandwidth", CONFIG_BOOLEAN_AUTO);
123 - do_mcast_p = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "multicast packets", CONFIG_BOOLEAN_AUTO);
124 - do_bcast_p = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "broadcast packets", CONFIG_BOOLEAN_AUTO);
125 - do_ecn = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "ECN packets", CONFIG_BOOLEAN_AUTO);
121 + do_bandwidth = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "bandwidth", CONFIG_BOOLEAN_AUTO);
122 + do_inerrors = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "input errors", CONFIG_BOOLEAN_AUTO);
123 + do_mcast = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "multicast bandwidth", CONFIG_BOOLEAN_AUTO);
124 + do_bcast = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "broadcast bandwidth", CONFIG_BOOLEAN_AUTO);
125 + do_mcast_p = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "multicast packets", CONFIG_BOOLEAN_AUTO);
126 + do_bcast_p = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "broadcast packets", CONFIG_BOOLEAN_AUTO);
127 + do_ecn = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "ECN packets", CONFIG_BOOLEAN_AUTO);
128
127 - do_tcpext_reorder = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP reorders", CONFIG_BOOLEAN_AUTO);
128 - do_tcpext_syscookies = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP SYN cookies", CONFIG_BOOLEAN_AUTO);
129 - do_tcpext_ofo = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP out-of-order queue", CONFIG_BOOLEAN_AUTO);
130 - do_tcpext_connaborts = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP connection aborts", CONFIG_BOOLEAN_AUTO);
131 - do_tcpext_memory = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP memory pressures", CONFIG_BOOLEAN_AUTO);
129 + do_tcpext_reorder = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "TCP reorders", CONFIG_BOOLEAN_AUTO);
130 + do_tcpext_syscookies = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "TCP SYN cookies", CONFIG_BOOLEAN_AUTO);
131 + do_tcpext_ofo = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "TCP out-of-order queue", CONFIG_BOOLEAN_AUTO);
132 + do_tcpext_connaborts = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "TCP connection aborts", CONFIG_BOOLEAN_AUTO);
133 + do_tcpext_memory = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "TCP memory pressures", CONFIG_BOOLEAN_AUTO);
134
133 - do_tcpext_syn_queue = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP SYN queue", CONFIG_BOOLEAN_AUTO);
134 - do_tcpext_accept_queue = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP accept queue", CONFIG_BOOLEAN_AUTO);
135 + do_tcpext_syn_queue = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "TCP SYN queue", CONFIG_BOOLEAN_AUTO);
136 + do_tcpext_accept_queue = config_get_boolean_ondemand(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "TCP accept queue", CONFIG_BOOLEAN_AUTO);
137
138 arl_ipext = arl_create("netstat/ipext", NULL, 60);
139 arl_tcpext = arl_create("netstat/tcpext", NULL, 60);
@@ -230,7 +232,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
232 if(unlikely(!ff)) {
233 char filename[FILENAME_MAX + 1];
234 snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/proc/net/netstat");
233 - ff = procfile_open(config_get("plugin:proc:/proc/net/netstat", "filename to monitor", filename), " \t:", PROCFILE_FLAG_DEFAULT);
235 + ff = procfile_open(config_get(CONFIG_SECTION_PLUGIN_PROC_NETSTAT, "filename to monitor", filename), " \t:", PROCFILE_FLAG_DEFAULT);
236 if(unlikely(!ff)) return 1;
237 }
238
@@ -274,8 +276,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
276 , NULL
277 , "IP Bandwidth"
278 , "kilobits/s"
277 - , "proc"
278 - , "net/netstat"
279 + , PLUGIN_PROC_NAME
280 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
281 , NETDATA_CHART_PRIO_SYSTEM_IP
282 , update_every
283 , RRDSET_TYPE_AREA
@@ -309,8 +311,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
311 , NULL
312 , "IP Input Errors"
313 , "packets/s"
312 - , "proc"
313 - , "net/netstat"
314 + , PLUGIN_PROC_NAME
315 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
316 , NETDATA_CHART_PRIO_IP_ERRORS
317 , update_every
318 , RRDSET_TYPE_LINE
@@ -348,8 +350,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
350 , NULL
351 , "IP Multicast Bandwidth"
352 , "kilobits/s"
351 - , "proc"
352 - , "net/netstat"
353 + , PLUGIN_PROC_NAME
354 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
355 , NETDATA_CHART_PRIO_IP_MCAST
356 , update_every
357 , RRDSET_TYPE_AREA
@@ -386,8 +388,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
388 , NULL
389 , "IP Broadcast Bandwidth"
390 , "kilobits/s"
389 - , "proc"
390 - , "net/netstat"
391 + , PLUGIN_PROC_NAME
392 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
393 , NETDATA_CHART_PRIO_IP_BCAST
394 , update_every
395 , RRDSET_TYPE_AREA
@@ -424,9 +426,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
426 , NULL
427 , "IP Multicast Packets"
428 , "packets/s"
427 - , "proc"
428 - , "net/netstat"
429 - , NETDATA_CHART_PRIO_IP_MCAST + 10
429 + , PLUGIN_PROC_NAME
430 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
431 + , NETDATA_CHART_PRIO_IP_MCAST_PACKETS
432 , update_every
433 , RRDSET_TYPE_LINE
434 );
@@ -461,9 +463,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
463 , NULL
464 , "IP Broadcast Packets"
465 , "packets/s"
464 - , "proc"
465 - , "net/netstat"
466 - , NETDATA_CHART_PRIO_IP_BCAST + 10
466 + , PLUGIN_PROC_NAME
467 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
468 + , NETDATA_CHART_PRIO_IP_BCAST_PACKETS
469 , update_every
470 , RRDSET_TYPE_LINE
471 );
@@ -499,8 +501,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
501 , NULL
502 , "IP ECN Statistics"
503 , "packets/s"
502 - , "proc"
503 - , "net/netstat"
504 + , PLUGIN_PROC_NAME
505 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
506 , NETDATA_CHART_PRIO_IP_ECN
507 , update_every
508 , RRDSET_TYPE_LINE
@@ -551,8 +553,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
553 , NULL
554 , "TCP Memory Pressures"
555 , "events/s"
554 - , "proc"
555 - , "net/netstat"
556 + , PLUGIN_PROC_NAME
557 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
558 , NETDATA_CHART_PRIO_IP_TCP_MEM
559 , update_every
560 , RRDSET_TYPE_LINE
@@ -585,9 +587,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
587 , NULL
588 , "TCP Connection Aborts"
589 , "connections/s"
588 - , "proc"
589 - , "net/netstat"
590 - , NETDATA_CHART_PRIO_IP_TCP + 10
590 + , PLUGIN_PROC_NAME
591 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
592 + , NETDATA_CHART_PRIO_IP_TCP_CONNABORTS
593 , update_every
594 , RRDSET_TYPE_LINE
595 );
@@ -629,9 +631,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
631 , NULL
632 , "TCP Reordered Packets by Detection Method"
633 , "packets/s"
632 - , "proc"
633 - , "net/netstat"
634 - , NETDATA_CHART_PRIO_IP_TCP + 20
634 + , PLUGIN_PROC_NAME
635 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
636 + , NETDATA_CHART_PRIO_IP_TCP_REORDERS
637 , update_every
638 , RRDSET_TYPE_LINE
639 );
@@ -670,9 +672,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
672 , NULL
673 , "TCP Out-Of-Order Queue"
674 , "packets/s"
673 - , "proc"
674 - , "net/netstat"
675 - , NETDATA_CHART_PRIO_IP_TCP + 50
675 + , PLUGIN_PROC_NAME
676 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
677 + , NETDATA_CHART_PRIO_IP_TCP_OFO
678 , update_every
679 , RRDSET_TYPE_LINE
680 );
@@ -711,9 +713,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
713 , NULL
714 , "TCP SYN Cookies"
715 , "packets/s"
714 - , "proc"
715 - , "net/netstat"
716 - , NETDATA_CHART_PRIO_IP_TCP + 60
716 + , PLUGIN_PROC_NAME
717 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
718 + , NETDATA_CHART_PRIO_IP_TCP_SYNCOOKIES
719 , update_every
720 , RRDSET_TYPE_LINE
721 );
@@ -752,9 +754,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
754 , NULL
755 , "TCP SYN Queue Issues"
756 , "packets/s"
755 - , "proc"
756 - , "net/netstat"
757 - , NETDATA_CHART_PRIO_IP_TCP + 15
757 + , PLUGIN_PROC_NAME
758 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
759 + , NETDATA_CHART_PRIO_IP_TCP_SYN_QUEUE
760 , update_every
761 , RRDSET_TYPE_LINE
762 );
@@ -790,9 +792,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
792 , NULL
793 , "TCP Accept Queue Issues"
794 , "packets/s"
793 - , "proc"
794 - , "net/netstat"
795 - , NETDATA_CHART_PRIO_IP_TCP + 16
795 + , PLUGIN_PROC_NAME
796 + , PLUGIN_PROC_MODULE_NETSTAT_NAME
797 + , NETDATA_CHART_PRIO_IP_TCP_ACCEPT_QUEUE
798 , update_every
799 , RRDSET_TYPE_LINE
800 );
src/plugins/linux-proc.plugin/proc_net_rpc_nfs.c
+24 -21
@@ -2,6 +2,9 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_NFS_NAME "/proc/net/rpc/nfs"
6 +#define CONFIG_SECTION_PLUGIN_PROC_NFS "plugin:" PLUGIN_PROC_CONFIG_NAME ":" PLUGIN_PROC_MODULE_NFS_NAME
7 +
8 struct nfs_procs {
9 char name[30];
10 unsigned long long value;
@@ -145,18 +148,18 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
148 if(!ff) {
149 char filename[FILENAME_MAX + 1];
150 snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/proc/net/rpc/nfs");
148 - ff = procfile_open(config_get("plugin:proc:/proc/net/rpc/nfs", "filename to monitor", filename), " \t", PROCFILE_FLAG_DEFAULT);
151 + ff = procfile_open(config_get(CONFIG_SECTION_PLUGIN_PROC_NFS, "filename to monitor", filename), " \t", PROCFILE_FLAG_DEFAULT);
152 }
153 if(!ff) return 1;
154
155 ff = procfile_readall(ff);
156 if(!ff) return 0; // we return 0, so that we will retry to open it next time
157
155 - if(do_net == -1) do_net = config_get_boolean("plugin:proc:/proc/net/rpc/nfs", "network", 1);
156 - if(do_rpc == -1) do_rpc = config_get_boolean("plugin:proc:/proc/net/rpc/nfs", "rpc", 1);
157 - if(do_proc2 == -1) do_proc2 = config_get_boolean("plugin:proc:/proc/net/rpc/nfs", "NFS v2 procedures", 1);
158 - if(do_proc3 == -1) do_proc3 = config_get_boolean("plugin:proc:/proc/net/rpc/nfs", "NFS v3 procedures", 1);
159 - if(do_proc4 == -1) do_proc4 = config_get_boolean("plugin:proc:/proc/net/rpc/nfs", "NFS v4 procedures", 1);
158 + if(do_net == -1) do_net = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_NFS, "network", 1);
159 + if(do_rpc == -1) do_rpc = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_NFS, "rpc", 1);
160 + if(do_proc2 == -1) do_proc2 = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_NFS, "NFS v2 procedures", 1);
161 + if(do_proc3 == -1) do_proc3 = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_NFS, "NFS v3 procedures", 1);
162 + if(do_proc4 == -1) do_proc4 = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_NFS, "NFS v4 procedures", 1);
163
164 // if they are enabled, reset them to 1
165 // later we do them =2 to avoid doing strcmp() for all lines
@@ -288,9 +291,9 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
291 , NULL
292 , "NFS Client Network"
293 , "operations/s"
291 - , "proc"
292 - , "net/rpc/nfs"
293 - , 2207
294 + , PLUGIN_PROC_NAME
295 + , PLUGIN_PROC_MODULE_NFS_NAME
296 + , NETDATA_CHART_PRIO_NFS_NET
297 , update_every
298 , RRDSET_TYPE_STACKED
299 );
@@ -328,9 +331,9 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
331 , NULL
332 , "NFS Client Remote Procedure Calls Statistics"
333 , "calls/s"
331 - , "proc"
332 - , "net/rpc/nfs"
333 - , 2208
334 + , PLUGIN_PROC_NAME
335 + , PLUGIN_PROC_MODULE_NFS_NAME
336 + , NETDATA_CHART_PRIO_NFS_RPC
337 , update_every
338 , RRDSET_TYPE_LINE
339 );
@@ -361,9 +364,9 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
364 , NULL
365 , "NFS v2 Client Remote Procedure Calls"
366 , "calls/s"
364 - , "proc"
365 - , "net/rpc/nfs"
366 - , 2209
367 + , PLUGIN_PROC_NAME
368 + , PLUGIN_PROC_MODULE_NFS_NAME
369 + , NETDATA_CHART_PRIO_NFS_PROC2
370 , update_every
371 , RRDSET_TYPE_STACKED
372 );
@@ -394,9 +397,9 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
397 , NULL
398 , "NFS v3 Client Remote Procedure Calls"
399 , "calls/s"
397 - , "proc"
398 - , "net/rpc/nfs"
399 - , 2210
400 + , PLUGIN_PROC_NAME
401 + , PLUGIN_PROC_MODULE_NFS_NAME
402 + , NETDATA_CHART_PRIO_NFS_PROC3
403 , update_every
404 , RRDSET_TYPE_STACKED
405 );
@@ -427,9 +430,9 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
430 , NULL
431 , "NFS v4 Client Remote Procedure Calls"
432 , "calls/s"
430 - , "proc"
431 - , "net/rpc/nfs"
432 - , 2211
433 + , PLUGIN_PROC_NAME
434 + , PLUGIN_PROC_MODULE_NFS_NAME
435 + , NETDATA_CHART_PRIO_NFS_PROC4
436 , update_every
437 , RRDSET_TYPE_STACKED
438 );
src/plugins/linux-proc.plugin/proc_net_rpc_nfsd.c
+41 -39
@@ -2,6 +2,8 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_NFSD_NAME "/proc/net/rpc/nfsd"
6 +
7 struct nfsd_procs {
8 char name[30];
9 unsigned long long value;
@@ -517,9 +519,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
519 , NULL
520 , "NFS Server Read Cache"
521 , "reads/s"
520 - , "proc"
521 - , "net/rpc/nfsd"
522 - , 2100
522 + , PLUGIN_PROC_NAME
523 + , PLUGIN_PROC_MODULE_NFSD_NAME
524 + , NETDATA_CHART_PRIO_NFSD_READCACHE
525 , update_every
526 , RRDSET_TYPE_STACKED
527 );
@@ -555,9 +557,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
557 , NULL
558 , "NFS Server File Handles"
559 , "handles/s"
558 - , "proc"
559 - , "net/rpc/nfsd"
560 - , 2101
560 + , PLUGIN_PROC_NAME
561 + , PLUGIN_PROC_MODULE_NFSD_NAME
562 + , NETDATA_CHART_PRIO_NFSD_FILEHANDLES
563 , update_every
564 , RRDSET_TYPE_LINE
565 );
@@ -595,9 +597,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
597 , NULL
598 , "NFS Server I/O"
599 , "kilobytes/s"
598 - , "proc"
599 - , "net/rpc/nfsd"
600 - , 2102
600 + , PLUGIN_PROC_NAME
601 + , PLUGIN_PROC_MODULE_NFSD_NAME
602 + , NETDATA_CHART_PRIO_NFSD_IO
603 , update_every
604 , RRDSET_TYPE_AREA
605 );
@@ -628,9 +630,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
630 , NULL
631 , "NFS Server Threads"
632 , "threads"
631 - , "proc"
632 - , "net/rpc/nfsd"
633 - , 2103
633 + , PLUGIN_PROC_NAME
634 + , PLUGIN_PROC_MODULE_NFSD_NAME
635 + , NETDATA_CHART_PRIO_NFSD_THREADS
636 , update_every
637 , RRDSET_TYPE_LINE
638 );
@@ -656,9 +658,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
658 , NULL
659 , "NFS Server Threads Full Count"
660 , "ops/s"
659 - , "proc"
660 - , "net/rpc/nfsd"
661 - , 2104
661 + , PLUGIN_PROC_NAME
662 + , PLUGIN_PROC_MODULE_NFSD_NAME
663 + , NETDATA_CHART_PRIO_NFSD_THREADS_FULLCNT
664 , update_every
665 , RRDSET_TYPE_LINE
666 );
@@ -693,9 +695,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
695 , NULL
696 , "NFS Server Threads Usage Histogram"
697 , "percentage"
696 - , "proc"
697 - , "net/rpc/nfsd"
698 - , 2105
698 + , PLUGIN_PROC_NAME
699 + , PLUGIN_PROC_MODULE_NFSD_NAME
700 + , NETDATA_CHART_PRIO_NFSD_THREADS_HISTOGRAM
701 , update_every
702 , RRDSET_TYPE_LINE
703 );
@@ -752,9 +754,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
754 , NULL
755 , "NFS Server Read Ahead Depth"
756 , "percentage"
755 - , "proc"
756 - , "net/rpc/nfsd"
757 - , 2105
757 + , PLUGIN_PROC_NAME
758 + , PLUGIN_PROC_MODULE_NFSD_NAME
759 + , NETDATA_CHART_PRIO_NFSD_READAHEAD
760 , update_every
761 , RRDSET_TYPE_STACKED
762 );
@@ -806,9 +808,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
808 , NULL
809 , "NFS Server Network Statistics"
810 , "packets/s"
809 - , "proc"
810 - , "net/rpc/nfsd"
811 - , 2107
811 + , PLUGIN_PROC_NAME
812 + , PLUGIN_PROC_MODULE_NFSD_NAME
813 + , NETDATA_CHART_PRIO_NFSD_NET
814 , update_every
815 , RRDSET_TYPE_STACKED
816 );
@@ -845,9 +847,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
847 , NULL
848 , "NFS Server Remote Procedure Calls Statistics"
849 , "calls/s"
848 - , "proc"
849 - , "net/rpc/nfsd"
850 - , 2108
850 + , PLUGIN_PROC_NAME
851 + , PLUGIN_PROC_MODULE_NFSD_NAME
852 + , NETDATA_CHART_PRIO_NFSD_RPC
853 , update_every
854 , RRDSET_TYPE_LINE
855 );
@@ -881,9 +883,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
883 , NULL
884 , "NFS v2 Server Remote Procedure Calls"
885 , "calls/s"
884 - , "proc"
885 - , "net/rpc/nfsd"
886 - , 2109
886 + , PLUGIN_PROC_NAME
887 + , PLUGIN_PROC_MODULE_NFSD_NAME
888 + , NETDATA_CHART_PRIO_NFSD_PROC2
889 , update_every
890 , RRDSET_TYPE_STACKED
891 );
@@ -914,9 +916,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
916 , NULL
917 , "NFS v3 Server Remote Procedure Calls"
918 , "calls/s"
917 - , "proc"
918 - , "net/rpc/nfsd"
919 - , 2110
919 + , PLUGIN_PROC_NAME
920 + , PLUGIN_PROC_MODULE_NFSD_NAME
921 + , NETDATA_CHART_PRIO_NFSD_PROC3
922 , update_every
923 , RRDSET_TYPE_STACKED
924 );
@@ -947,9 +949,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
949 , NULL
950 , "NFS v4 Server Remote Procedure Calls"
951 , "calls/s"
950 - , "proc"
951 - , "net/rpc/nfsd"
952 - , 2111
952 + , PLUGIN_PROC_NAME
953 + , PLUGIN_PROC_MODULE_NFSD_NAME
954 + , NETDATA_CHART_PRIO_NFSD_PROC4
955 , update_every
956 , RRDSET_TYPE_STACKED
957 );
@@ -980,9 +982,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
982 , NULL
983 , "NFS v4 Server Operations"
984 , "operations/s"
983 - , "proc"
984 - , "net/rpc/nfsd"
985 - , 2112
985 + , PLUGIN_PROC_NAME
986 + , PLUGIN_PROC_MODULE_NFSD_NAME
987 + , NETDATA_CHART_PRIO_NFSD_PROC4OPS
988 , update_every
989 , RRDSET_TYPE_STACKED
990 );
src/plugins/linux-proc.plugin/proc_net_sctp_snmp.c
+13 -12
@@ -1,6 +1,7 @@
1 // SPDX-License-Identifier: GPL-3.0-or-later
2
3 #include "plugin_proc.h"
4 +#define PLUGIN_PROC_MODULE_NET_SCTP_SNMP_NAME "/proc/net/sctp/snmp"
5
6 int do_proc_net_sctp_snmp(int update_every, usec_t dt) {
7 (void)dt;
@@ -137,8 +138,8 @@ int do_proc_net_sctp_snmp(int update_every, usec_t dt) {
138 , NULL
139 , "SCTP current total number of established associations"
140 , "associations"
140 - , "proc"
141 - , "net/sctp/snmp"
141 + , PLUGIN_PROC_NAME
142 + , PLUGIN_PROC_MODULE_NET_SCTP_SNMP_NAME
143 , NETDATA_CHART_PRIO_SCTP
144 , update_every
145 , RRDSET_TYPE_LINE
@@ -171,8 +172,8 @@ int do_proc_net_sctp_snmp(int update_every, usec_t dt) {
172 , NULL
173 , "SCTP Association Transitions"
174 , "transitions/s"
174 - , "proc"
175 - , "net/sctp/snmp"
175 + , PLUGIN_PROC_NAME
176 + , PLUGIN_PROC_MODULE_NET_SCTP_SNMP_NAME
177 , NETDATA_CHART_PRIO_SCTP + 10
178 , update_every
179 , RRDSET_TYPE_LINE
@@ -209,8 +210,8 @@ int do_proc_net_sctp_snmp(int update_every, usec_t dt) {
210 , NULL
211 , "SCTP Packets"
212 , "packets/s"
212 - , "proc"
213 - , "net/sctp/snmp"
213 + , PLUGIN_PROC_NAME
214 + , PLUGIN_PROC_MODULE_NET_SCTP_SNMP_NAME
215 , NETDATA_CHART_PRIO_SCTP + 20
216 , update_every
217 , RRDSET_TYPE_LINE
@@ -244,8 +245,8 @@ int do_proc_net_sctp_snmp(int update_every, usec_t dt) {
245 , NULL
246 , "SCTP Packet Errors"
247 , "packets/s"
247 - , "proc"
248 - , "net/sctp/snmp"
248 + , PLUGIN_PROC_NAME
249 + , PLUGIN_PROC_MODULE_NET_SCTP_SNMP_NAME
250 , NETDATA_CHART_PRIO_SCTP + 30
251 , update_every
252 , RRDSET_TYPE_LINE
@@ -280,8 +281,8 @@ int do_proc_net_sctp_snmp(int update_every, usec_t dt) {
281 , NULL
282 , "SCTP Fragmentation"
283 , "packets/s"
283 - , "proc"
284 - , "net/sctp/snmp"
284 + , PLUGIN_PROC_NAME
285 + , PLUGIN_PROC_MODULE_NET_SCTP_SNMP_NAME
286 , NETDATA_CHART_PRIO_SCTP + 40
287 , update_every
288 , RRDSET_TYPE_LINE);
@@ -320,8 +321,8 @@ int do_proc_net_sctp_snmp(int update_every, usec_t dt) {
321 , NULL
322 , "SCTP Chunk Types"
323 , "chunks/s"
323 - , "proc"
324 - , "net/sctp/snmp"
324 + , PLUGIN_PROC_NAME
325 + , PLUGIN_PROC_MODULE_NET_SCTP_SNMP_NAME
326 , NETDATA_CHART_PRIO_SCTP + 50
327 , update_every
328 , RRDSET_TYPE_LINE
src/plugins/linux-proc.plugin/proc_net_snmp.c
+33 -32
@@ -1,6 +1,7 @@
1 // SPDX-License-Identifier: GPL-3.0-or-later
2
3 #include "plugin_proc.h"
4 +#define PLUGIN_PROC_MODULE_NET_SNMP_NAME "/proc/net/snmp"
5
6 #define RRD_TYPE_NET_SNMP "ipv4"
7
@@ -275,8 +276,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
276 , NULL
277 , "IPv4 Packets"
278 , "packets/s"
278 - , "proc"
279 - , "net/snmp"
279 + , PLUGIN_PROC_NAME
280 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
281 , NETDATA_CHART_PRIO_IPV4_PACKETS
282 , update_every
283 , RRDSET_TYPE_LINE
@@ -315,8 +316,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
316 , NULL
317 , "IPv4 Fragments Sent"
318 , "packets/s"
318 - , "proc"
319 - , "net/snmp"
319 + , PLUGIN_PROC_NAME
320 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
321 , NETDATA_CHART_PRIO_IPV4_FRAGMENTS
322 , update_every
323 , RRDSET_TYPE_LINE
@@ -354,8 +355,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
355 , NULL
356 , "IPv4 Fragments Reassembly"
357 , "packets/s"
357 - , "proc"
358 - , "net/snmp"
358 + , PLUGIN_PROC_NAME
359 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
360 , NETDATA_CHART_PRIO_IPV4_FRAGMENTS + 1
361 , update_every
362 , RRDSET_TYPE_LINE
@@ -396,8 +397,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
397 , NULL
398 , "IPv4 Errors"
399 , "packets/s"
399 - , "proc"
400 - , "net/snmp"
400 + , PLUGIN_PROC_NAME
401 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
402 , NETDATA_CHART_PRIO_IPV4_ERRORS
403 , update_every
404 , RRDSET_TYPE_LINE
@@ -463,8 +464,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
464 , NULL
465 , "IPv4 ICMP Packets"
466 , "packets/s"
466 - , "proc"
467 - , "net/snmp"
467 + , PLUGIN_PROC_NAME
468 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
469 , NETDATA_CHART_PRIO_IPV4_ICMP
470 , update_every
471 , RRDSET_TYPE_LINE
@@ -496,8 +497,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
497 , NULL
498 , "IPv4 ICMP Errors"
499 , "packets/s"
499 - , "proc"
500 - , "net/snmp"
500 + , PLUGIN_PROC_NAME
501 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
502 , NETDATA_CHART_PRIO_IPV4_ICMP + 1
503 , update_every
504 , RRDSET_TYPE_LINE
@@ -594,8 +595,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
595 , NULL
596 , "IPv4 ICMP Messages"
597 , "packets/s"
597 - , "proc"
598 - , "net/snmp"
598 + , PLUGIN_PROC_NAME
599 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
600 , NETDATA_CHART_PRIO_IPV4_ICMP + 2
601 , update_every
602 , RRDSET_TYPE_LINE
@@ -691,8 +692,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
692 , NULL
693 , "IPv4 TCP Connections"
694 , "active connections"
694 - , "proc"
695 - , "net/snmp"
695 + , PLUGIN_PROC_NAME
696 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
697 , NETDATA_CHART_PRIO_IPV4_TCP
698 , update_every
699 , RRDSET_TYPE_LINE
@@ -724,8 +725,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
725 , NULL
726 , "IPv4 TCP Packets"
727 , "packets/s"
727 - , "proc"
728 - , "net/snmp"
728 + , PLUGIN_PROC_NAME
729 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
730 , NETDATA_CHART_PRIO_IPV4_TCP + 4
731 , update_every
732 , RRDSET_TYPE_LINE
@@ -760,8 +761,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
761 , NULL
762 , "IPv4 TCP Errors"
763 , "packets/s"
763 - , "proc"
764 - , "net/snmp"
764 + , PLUGIN_PROC_NAME
765 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
766 , NETDATA_CHART_PRIO_IPV4_TCP + 20
767 , update_every
768 , RRDSET_TYPE_LINE
@@ -798,8 +799,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
799 , NULL
800 , "IPv4 TCP Opens"
801 , "connections/s"
801 - , "proc"
802 - , "net/snmp"
802 + , PLUGIN_PROC_NAME
803 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
804 , NETDATA_CHART_PRIO_IPV4_TCP + 5
805 , update_every
806 , RRDSET_TYPE_LINE
@@ -836,8 +837,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
837 , NULL
838 , "IPv4 TCP Handshake Issues"
839 , "events/s"
839 - , "proc"
840 - , "net/snmp"
840 + , PLUGIN_PROC_NAME
841 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
842 , NETDATA_CHART_PRIO_IPV4_TCP + 30
843 , update_every
844 , RRDSET_TYPE_LINE
@@ -897,8 +898,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
898 , NULL
899 , "IPv4 UDP Packets"
900 , "packets/s"
900 - , "proc"
901 - , "net/snmp"
901 + , PLUGIN_PROC_NAME
902 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
903 , NETDATA_CHART_PRIO_IPV4_UDP
904 , update_every
905 , RRDSET_TYPE_LINE
@@ -943,8 +944,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
944 , NULL
945 , "IPv4 UDP Errors"
946 , "events/s"
946 - , "proc"
947 - , "net/snmp"
947 + , PLUGIN_PROC_NAME
948 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
949 , NETDATA_CHART_PRIO_IPV4_UDP + 10
950 , update_every
951 , RRDSET_TYPE_LINE
@@ -1017,8 +1018,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
1018 , NULL
1019 , "IPv4 UDPLite Packets"
1020 , "packets/s"
1020 - , "proc"
1021 - , "net/snmp"
1021 + , PLUGIN_PROC_NAME
1022 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
1023 , NETDATA_CHART_PRIO_IPV4_UDPLITE
1024 , update_every
1025 , RRDSET_TYPE_LINE
@@ -1052,8 +1053,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
1053 , NULL
1054 , "IPv4 UDPLite Errors"
1055 , "packets/s"
1055 - , "proc"
1056 - , "net/snmp"
1056 + , PLUGIN_PROC_NAME
1057 + , PLUGIN_PROC_MODULE_NET_SNMP_NAME
1058 , NETDATA_CHART_PRIO_IPV4_UDPLITE + 10
1059 , update_every
1060 , RRDSET_TYPE_LINE);
src/plugins/linux-proc.plugin/proc_net_snmp6.c
+59 -58
@@ -3,6 +3,7 @@
3 #include "plugin_proc.h"
4
5 #define RRD_TYPE_NET_SNMP6 "ipv6"
6 +#define PLUGIN_PROC_MODULE_NET_SNMP6_NAME "/proc/net/snmp6"
7
8 int do_proc_net_snmp6(int update_every, usec_t dt) {
9 (void)dt;
@@ -291,8 +292,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
292 , NULL
293 , "IPv6 Bandwidth"
294 , "kilobits/s"
294 - , "proc"
295 - , "net/snmp6"
295 + , PLUGIN_PROC_NAME
296 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
297 , NETDATA_CHART_PRIO_SYSTEM_IPV6
298 , update_every
299 , RRDSET_TYPE_AREA
@@ -327,8 +328,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
328 , NULL
329 , "IPv6 Packets"
330 , "packets/s"
330 - , "proc"
331 - , "net/snmp6"
331 + , PLUGIN_PROC_NAME
332 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
333 , NETDATA_CHART_PRIO_IPV6_PACKETS
334 , update_every
335 , RRDSET_TYPE_LINE
@@ -366,9 +367,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
367 , NULL
368 , "IPv6 Fragments Sent"
369 , "packets/s"
369 - , "proc"
370 - , "net/snmp6"
371 - , NETDATA_CHART_PRIO_IPV6_FRAGMENTS + 1
370 + , PLUGIN_PROC_NAME
371 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
372 + , NETDATA_CHART_PRIO_IPV6_FRAGSOUT
373 , update_every
374 , RRDSET_TYPE_LINE
375 );
@@ -412,9 +413,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
413 , NULL
414 , "IPv6 Fragments Reassembly"
415 , "packets/s"
415 - , "proc"
416 - , "net/snmp6"
417 - , NETDATA_CHART_PRIO_IPV6_FRAGMENTS + 2
416 + , PLUGIN_PROC_NAME
417 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
418 + , NETDATA_CHART_PRIO_IPV6_FRAGSIN
419 , update_every
420 , RRDSET_TYPE_LINE);
421 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
@@ -467,8 +468,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
468 , NULL
469 , "IPv6 Errors"
470 , "packets/s"
470 - , "proc"
471 - , "net/snmp6"
471 + , PLUGIN_PROC_NAME
472 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
473 , NETDATA_CHART_PRIO_IPV6_ERRORS
474 , update_every
475 , RRDSET_TYPE_LINE
@@ -516,9 +517,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
517 , NULL
518 , "IPv6 UDP Packets"
519 , "packets/s"
519 - , "proc"
520 - , "net/snmp6"
521 - , NETDATA_CHART_PRIO_IPV6_UDP + 1
520 + , PLUGIN_PROC_NAME
521 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
522 + , NETDATA_CHART_PRIO_IPV6_UDP_PACKETS
523 , update_every
524 , RRDSET_TYPE_LINE
525 );
@@ -562,8 +563,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
563 , NULL
564 , "IPv6 UDP Errors"
565 , "events/s"
565 - , "proc"
566 - , "net/snmp6"
566 + , PLUGIN_PROC_NAME
567 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
568 , NETDATA_CHART_PRIO_IPV6_UDP_ERRORS
569 , update_every
570 , RRDSET_TYPE_LINE
@@ -605,9 +606,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
606 , NULL
607 , "IPv6 UDPlite Packets"
608 , "packets/s"
608 - , "proc"
609 - , "net/snmp6"
610 - , NETDATA_CHART_PRIO_IPV6_UDPLITE + 1
609 + , PLUGIN_PROC_NAME
610 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
611 + , NETDATA_CHART_PRIO_IPV6_UDPLITE_PACKETS
612 , update_every
613 , RRDSET_TYPE_LINE
614 );
@@ -650,8 +651,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
651 , NULL
652 , "IPv6 UDP Lite Errors"
653 , "events/s"
653 - , "proc"
654 - , "net/snmp6"
654 + , PLUGIN_PROC_NAME
655 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
656 , NETDATA_CHART_PRIO_IPV6_UDPLITE_ERRORS
657 , update_every
658 , RRDSET_TYPE_LINE
@@ -691,8 +692,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
692 , NULL
693 , "IPv6 Multicast Bandwidth"
694 , "kilobits/s"
694 - , "proc"
695 - , "net/snmp6"
695 + , PLUGIN_PROC_NAME
696 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
697 , NETDATA_CHART_PRIO_IPV6_MCAST
698 , update_every
699 , RRDSET_TYPE_AREA
@@ -726,8 +727,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
727 , NULL
728 , "IPv6 Broadcast Bandwidth"
729 , "kilobits/s"
729 - , "proc"
730 - , "net/snmp6"
730 + , PLUGIN_PROC_NAME
731 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
732 , NETDATA_CHART_PRIO_IPV6_BCAST
733 , update_every
734 , RRDSET_TYPE_AREA
@@ -761,9 +762,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
762 , NULL
763 , "IPv6 Multicast Packets"
764 , "packets/s"
764 - , "proc"
765 - , "net/snmp6"
766 - , NETDATA_CHART_PRIO_IPV6_MCAST + 1
765 + , PLUGIN_PROC_NAME
766 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
767 + , NETDATA_CHART_PRIO_IPV6_MCAST_PACKETS
768 , update_every
769 , RRDSET_TYPE_LINE
770 );
@@ -796,8 +797,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
797 , NULL
798 , "IPv6 ICMP Messages"
799 , "messages/s"
799 - , "proc"
800 - , "net/snmp6"
800 + , PLUGIN_PROC_NAME
801 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
802 , NETDATA_CHART_PRIO_IPV6_ICMP
803 , update_every
804 , RRDSET_TYPE_LINE
@@ -830,9 +831,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
831 , NULL
832 , "IPv6 ICMP Redirects"
833 , "redirects/s"
833 - , "proc"
834 - , "net/snmp6"
835 - , NETDATA_CHART_PRIO_IPV6_ICMP + 10
834 + , PLUGIN_PROC_NAME
835 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
836 + , NETDATA_CHART_PRIO_IPV6_ICMP_REDIR
837 , update_every
838 , RRDSET_TYPE_LINE
839 );
@@ -886,9 +887,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
887 , NULL
888 , "IPv6 ICMP Errors"
889 , "errors/s"
889 - , "proc"
890 - , "net/snmp6"
891 - , NETDATA_CHART_PRIO_IPV6_ICMP + 20
890 + , PLUGIN_PROC_NAME
891 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
892 + , NETDATA_CHART_PRIO_IPV6_ICMP_ERRORS
893 , update_every
894 , RRDSET_TYPE_LINE
895 );
@@ -946,9 +947,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
947 , NULL
948 , "IPv6 ICMP Echo"
949 , "messages/s"
949 - , "proc"
950 - , "net/snmp6"
951 - , NETDATA_CHART_PRIO_IPV6_ICMP + 30
950 + , PLUGIN_PROC_NAME
951 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
952 + , NETDATA_CHART_PRIO_IPV6_ICMP_ECHOS
953 , update_every
954 , RRDSET_TYPE_LINE
955 );
@@ -996,9 +997,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
997 , NULL
998 , "IPv6 ICMP Group Membership"
999 , "messages/s"
999 - , "proc"
1000 - , "net/snmp6"
1001 - , NETDATA_CHART_PRIO_IPV6_ICMP + 40
1000 + , PLUGIN_PROC_NAME
1001 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
1002 + , NETDATA_CHART_PRIO_IPV6_ICMP_GROUPMEMB
1003 , update_every
1004 , RRDSET_TYPE_LINE);
1005
@@ -1045,9 +1046,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
1046 , NULL
1047 , "IPv6 Router Messages"
1048 , "messages/s"
1048 - , "proc"
1049 - , "net/snmp6"
1050 - , NETDATA_CHART_PRIO_IPV6_ICMP + 50
1049 + , PLUGIN_PROC_NAME
1050 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
1051 + , NETDATA_CHART_PRIO_IPV6_ICMP_ROUTER
1052 , update_every
1053 , RRDSET_TYPE_LINE
1054 );
@@ -1091,9 +1092,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
1092 , NULL
1093 , "IPv6 Neighbor Messages"
1094 , "messages/s"
1094 - , "proc"
1095 - , "net/snmp6"
1096 - , NETDATA_CHART_PRIO_IPV6_ICMP + 60
1095 + , PLUGIN_PROC_NAME
1096 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
1097 + , NETDATA_CHART_PRIO_IPV6_ICMP_NEIGHBOR
1098 , update_every
1099 , RRDSET_TYPE_LINE
1100 );
@@ -1129,9 +1130,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
1130 , NULL
1131 , "IPv6 ICMP MLDv2 Reports"
1132 , "reports/s"
1132 - , "proc"
1133 - , "net/snmp6"
1134 - , NETDATA_CHART_PRIO_IPV6_ICMP + 70
1133 + , PLUGIN_PROC_NAME
1134 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
1135 + , NETDATA_CHART_PRIO_IPV6_ICMP_LDV2
1136 , update_every
1137 , RRDSET_TYPE_LINE
1138 );
@@ -1183,9 +1184,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
1184 , NULL
1185 , "IPv6 ICMP Types"
1186 , "messages/s"
1186 - , "proc"
1187 - , "net/snmp6"
1188 - , NETDATA_CHART_PRIO_IPV6_ICMP + 80
1187 + , PLUGIN_PROC_NAME
1188 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
1189 + , NETDATA_CHART_PRIO_IPV6_ICMP_TYPES
1190 , update_every
1191 , RRDSET_TYPE_LINE
1192 );
@@ -1241,9 +1242,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
1242 , NULL
1243 , "IPv6 ECT Packets"
1244 , "packets/s"
1244 - , "proc"
1245 - , "net/snmp6"
1246 - , NETDATA_CHART_PRIO_IPV6_PACKETS + 10
1245 + , PLUGIN_PROC_NAME
1246 + , PLUGIN_PROC_MODULE_NET_SNMP6_NAME
1247 + , NETDATA_CHART_PRIO_IPV6_ECT
1248 , update_every
1249 , RRDSET_TYPE_LINE
1250 );
src/plugins/linux-proc.plugin/proc_net_sockstat.c
+21 -19
@@ -2,6 +2,8 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME "/proc/net/sockstat"
6 +
7 static struct proc_net_sockstat {
8 kernel_uint_t sockets_used;
9
@@ -231,8 +233,8 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
233 , NULL
234 , "IPv4 Sockets Used"
235 , "sockets"
234 - , "proc"
235 - , "net/sockstat"
236 + , PLUGIN_PROC_NAME
237 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
238 , NETDATA_CHART_PRIO_IPV4_SOCKETS
239 , update_every
240 , RRDSET_TYPE_LINE
@@ -266,9 +268,9 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
268 , NULL
269 , "IPv4 TCP Sockets"
270 , "sockets"
269 - , "proc"
270 - , "net/sockstat"
271 - , NETDATA_CHART_PRIO_IPV4_TCP + 1
271 + , PLUGIN_PROC_NAME
272 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
273 + , NETDATA_CHART_PRIO_IPV4_TCP_SOCKETS
274 , update_every
275 , RRDSET_TYPE_LINE
276 );
@@ -304,8 +306,8 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
306 , NULL
307 , "IPv4 TCP Sockets Memory"
308 , "KB"
307 - , "proc"
308 - , "net/sockstat"
309 + , PLUGIN_PROC_NAME
310 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
311 , NETDATA_CHART_PRIO_IPV4_TCP_MEM
312 , update_every
313 , RRDSET_TYPE_AREA
@@ -336,8 +338,8 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
338 , NULL
339 , "IPv4 UDP Sockets"
340 , "sockets"
339 - , "proc"
340 - , "net/sockstat"
341 + , PLUGIN_PROC_NAME
342 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
343 , NETDATA_CHART_PRIO_IPV4_UDP
344 , update_every
345 , RRDSET_TYPE_LINE
@@ -368,8 +370,8 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
370 , NULL
371 , "IPv4 UDP Sockets Memory"
372 , "KB"
371 - , "proc"
372 - , "net/sockstat"
373 + , PLUGIN_PROC_NAME
374 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
375 , NETDATA_CHART_PRIO_IPV4_UDP_MEM
376 , update_every
377 , RRDSET_TYPE_AREA
@@ -400,8 +402,8 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
402 , NULL
403 , "IPv4 UDPLITE Sockets"
404 , "sockets"
403 - , "proc"
404 - , "net/sockstat"
405 + , PLUGIN_PROC_NAME
406 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
407 , NETDATA_CHART_PRIO_IPV4_UDPLITE
408 , update_every
409 , RRDSET_TYPE_LINE
@@ -432,8 +434,8 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
434 , NULL
435 , "IPv4 RAW Sockets"
436 , "sockets"
435 - , "proc"
436 - , "net/sockstat"
437 + , PLUGIN_PROC_NAME
438 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
439 , NETDATA_CHART_PRIO_IPV4_RAW
440 , update_every
441 , RRDSET_TYPE_LINE
@@ -464,8 +466,8 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
466 , NULL
467 , "IPv4 FRAG Sockets"
468 , "fragments"
467 - , "proc"
468 - , "net/sockstat"
469 + , PLUGIN_PROC_NAME
470 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
471 , NETDATA_CHART_PRIO_IPV4_FRAGMENTS
472 , update_every
473 , RRDSET_TYPE_LINE
@@ -496,8 +498,8 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
498 , NULL
499 , "IPv4 FRAG Sockets Memory"
500 , "KB"
499 - , "proc"
500 - , "net/sockstat"
501 + , PLUGIN_PROC_NAME
502 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
503 , NETDATA_CHART_PRIO_IPV4_FRAGMENTS_MEM
504 , update_every
505 , RRDSET_TYPE_AREA
src/plugins/linux-proc.plugin/proc_net_sockstat6.c
+12 -10
@@ -2,6 +2,8 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_NET_SOCKSTAT6_NAME "/proc/net/sockstat6"
6 +
7 static struct proc_net_sockstat6 {
8 kernel_uint_t tcp6_inuse;
9 kernel_uint_t udp6_inuse;
@@ -124,8 +126,8 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
126 , NULL
127 , "IPv6 TCP Sockets"
128 , "sockets"
127 - , "proc"
128 - , "net/sockstat6"
129 + , PLUGIN_PROC_NAME
130 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT6_NAME
131 , NETDATA_CHART_PRIO_IPV6_TCP
132 , update_every
133 , RRDSET_TYPE_LINE
@@ -156,8 +158,8 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
158 , NULL
159 , "IPv6 UDP Sockets"
160 , "sockets"
159 - , "proc"
160 - , "net/sockstat6"
161 + , PLUGIN_PROC_NAME
162 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT6_NAME
163 , NETDATA_CHART_PRIO_IPV6_UDP
164 , update_every
165 , RRDSET_TYPE_LINE
@@ -188,8 +190,8 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
190 , NULL
191 , "IPv6 UDPLITE Sockets"
192 , "sockets"
191 - , "proc"
192 - , "net/sockstat6"
193 + , PLUGIN_PROC_NAME
194 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT6_NAME
195 , NETDATA_CHART_PRIO_IPV6_UDPLITE
196 , update_every
197 , RRDSET_TYPE_LINE
@@ -220,8 +222,8 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
222 , NULL
223 , "IPv6 RAW Sockets"
224 , "sockets"
223 - , "proc"
224 - , "net/sockstat6"
225 + , PLUGIN_PROC_NAME
226 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT6_NAME
227 , NETDATA_CHART_PRIO_IPV6_RAW
228 , update_every
229 , RRDSET_TYPE_LINE
@@ -252,8 +254,8 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
254 , NULL
255 , "IPv6 FRAG Sockets"
256 , "fragments"
255 - , "proc"
256 - , "net/sockstat6"
257 + , PLUGIN_PROC_NAME
258 + , PLUGIN_PROC_MODULE_NET_SOCKSTAT6_NAME
259 , NETDATA_CHART_PRIO_IPV6_FRAGMENTS
260 , update_every
261 , RRDSET_TYPE_LINE
src/plugins/linux-proc.plugin/proc_net_softnet_stat.c
+8 -6
@@ -2,6 +2,8 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_NET_SOFTNET_NAME "/proc/net/softnet_stat"
6 +
7 static inline char *softnet_column_name(size_t column) {
8 switch(column) {
9 // https://github.com/torvalds/linux/blob/a7fd20d1c476af4563e66865213474a2f9f473a4/net/core/net-procfs.c#L161-L166
@@ -89,9 +91,9 @@ int do_proc_net_softnet_stat(int update_every, usec_t dt) {
91 , "system.softnet_stat"
92 , "System softnet_stat"
93 , "events/s"
92 - , "proc"
93 - , "net/softnet_stat"
94 - , 955
94 + , PLUGIN_PROC_NAME
95 + , PLUGIN_PROC_MODULE_NET_SOFTNET_NAME
96 + , NETDATA_CHART_PRIO_SYSTEM_SOFTNET_STAT
97 , update_every
98 , RRDSET_TYPE_LINE
99 );
@@ -125,9 +127,9 @@ int do_proc_net_softnet_stat(int update_every, usec_t dt) {
127 , "cpu.softnet_stat"
128 , title
129 , "events/s"
128 - , "proc"
129 - , "net/softnet_stat"
130 - , 4101 + l
130 + , PLUGIN_PROC_NAME
131 + , PLUGIN_PROC_MODULE_NET_SOFTNET_NAME
132 + , NETDATA_CHART_PRIO_SOFTNET_PER_CORE + l
133 , update_every
134 , RRDSET_TYPE_LINE
135 );
src/plugins/linux-proc.plugin/proc_net_stat_conntrack.c
+19 -18
@@ -4,6 +4,7 @@
4
5 #define RRD_TYPE_NET_STAT_NETFILTER "netfilter"
6 #define RRD_TYPE_NET_STAT_CONNTRACK "conntrack"
7 +#define PLUGIN_PROC_MODULE_CONNTRACK_NAME "/proc/net/stat/nf_conntrack"
8
9 int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
10 static procfile *ff = NULL;
@@ -142,9 +143,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
143 , NULL
144 , "Connection Tracker Connections"
145 , "active connections"
145 - , "proc"
146 - , "net/stat/nf_conntrack"
147 - , NETDATA_CHART_PRIO_NETFILTER
146 + , PLUGIN_PROC_NAME
147 + , PLUGIN_PROC_MODULE_CONNTRACK_NAME
148 + , NETDATA_CHART_PRIO_NETFILTER_SOCKETS
149 , update_every
150 , RRDSET_TYPE_LINE
151 );
@@ -175,9 +176,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
176 , NULL
177 , "Connection Tracker New Connections"
178 , "connections/s"
178 - , "proc"
179 - , "net/stat/nf_conntrack"
180 - , NETDATA_CHART_PRIO_NETFILTER + 1
179 + , PLUGIN_PROC_NAME
180 + , PLUGIN_PROC_MODULE_CONNTRACK_NAME
181 + , NETDATA_CHART_PRIO_NETFILTER_NEW
182 , update_every
183 , RRDSET_TYPE_LINE
184 );
@@ -212,9 +213,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
213 , NULL
214 , "Connection Tracker Changes"
215 , "changes/s"
215 - , "proc"
216 - , "net/stat/nf_conntrack"
217 - , NETDATA_CHART_PRIO_NETFILTER + 2
216 + , PLUGIN_PROC_NAME
217 + , PLUGIN_PROC_MODULE_CONNTRACK_NAME
218 + , NETDATA_CHART_PRIO_NETFILTER_CHANGES
219 , update_every
220 , RRDSET_TYPE_LINE
221 );
@@ -249,9 +250,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
250 , NULL
251 , "Connection Tracker Expectations"
252 , "expectations/s"
252 - , "proc"
253 - , "net/stat/nf_conntrack"
254 - , NETDATA_CHART_PRIO_NETFILTER + 3
253 + , PLUGIN_PROC_NAME
254 + , PLUGIN_PROC_MODULE_CONNTRACK_NAME
255 + , NETDATA_CHART_PRIO_NETFILTER_EXPECT
256 , update_every
257 , RRDSET_TYPE_LINE
258 );
@@ -286,9 +287,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
287 , NULL
288 , "Connection Tracker Searches"
289 , "searches/s"
289 - , "proc"
290 - , "net/stat/nf_conntrack"
291 - , NETDATA_CHART_PRIO_NETFILTER + 10
290 + , PLUGIN_PROC_NAME
291 + , PLUGIN_PROC_MODULE_CONNTRACK_NAME
292 + , NETDATA_CHART_PRIO_NETFILTER_SEARCH
293 , update_every
294 , RRDSET_TYPE_LINE
295 );
@@ -324,9 +325,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
325 , NULL
326 , "Connection Tracker Errors"
327 , "events/s"
327 - , "proc"
328 - , "net/stat/nf_conntrack"
329 - , NETDATA_CHART_PRIO_NETFILTER + 5
328 + , PLUGIN_PROC_NAME
329 + , PLUGIN_PROC_MODULE_CONNTRACK_NAME
330 + , NETDATA_CHART_PRIO_NETFILTER_ERRORS
331 , update_every
332 , RRDSET_TYPE_LINE
333 );
src/plugins/linux-proc.plugin/proc_net_stat_synproxy.c
+14 -12
@@ -2,6 +2,8 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_SYNPROXY_NAME "/proc/net/stat/synproxy"
6 +
7 #define RRD_TYPE_NET_STAT_NETFILTER "netfilter"
8 #define RRD_TYPE_NET_STAT_SYNPROXY "synproxy"
9
@@ -70,9 +72,9 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
72 , NULL
73 , "SYNPROXY Entries Used"
74 , "entries"
73 - , "proc"
74 - , "net/stat/synproxy"
75 - , NETDATA_CHART_PRIO_SYNPROXY + 4
75 + , PLUGIN_PROC_NAME
76 + , PLUGIN_PROC_MODULE_SYNPROXY_NAME
77 + , NETDATA_CHART_PRIO_SYNPROXY_ENTRIES
78 , update_every
79 , RRDSET_TYPE_LINE
80 );
@@ -100,9 +102,9 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
102 , NULL
103 , "SYNPROXY SYN Packets received"
104 , "SYN/s"
103 - , "proc"
104 - , "net/stat/synproxy"
105 - , NETDATA_CHART_PRIO_SYNPROXY + 1
105 + , PLUGIN_PROC_NAME
106 + , PLUGIN_PROC_MODULE_SYNPROXY_NAME
107 + , NETDATA_CHART_PRIO_SYNPROXY_SYN_RECEIVED
108 , update_every
109 , RRDSET_TYPE_LINE
110 );
@@ -130,9 +132,9 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
132 , NULL
133 , "SYNPROXY Connections Reopened"
134 , "connections/s"
133 - , "proc"
134 - , "net/stat/synproxy"
135 - , NETDATA_CHART_PRIO_SYNPROXY + 3
135 + , PLUGIN_PROC_NAME
136 + , PLUGIN_PROC_MODULE_SYNPROXY_NAME
137 + , NETDATA_CHART_PRIO_SYNPROXY_CONN_OPEN
138 , update_every
139 , RRDSET_TYPE_LINE
140 );
@@ -160,9 +162,9 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
162 , NULL
163 , "SYNPROXY TCP Cookies"
164 , "cookies/s"
163 - , "proc"
164 - , "net/stat/synproxy"
165 - , NETDATA_CHART_PRIO_SYNPROXY + 2
165 + , PLUGIN_PROC_NAME
166 + , PLUGIN_PROC_MODULE_SYNPROXY_NAME
167 + , NETDATA_CHART_PRIO_SYNPROXY_COOKIES
168 , update_every
169 , RRDSET_TYPE_LINE
170 );
src/plugins/linux-proc.plugin/proc_softirqs.c
+8 -6
@@ -2,6 +2,8 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_SOFTIRQS_NAME "/proc/softirqs"
6 +
7 #define MAX_INTERRUPT_NAME 50
8
9 struct cpu_interrupt {
@@ -134,9 +136,9 @@ int do_proc_softirqs(int update_every, usec_t dt) {
136 , NULL
137 , "System softirqs"
138 , "softirqs/s"
137 - , "proc"
138 - , "softirqs"
139 - , 950
139 + , PLUGIN_PROC_NAME
140 + , PLUGIN_PROC_MODULE_SOFTIRQS_NAME
141 + , NETDATA_CHART_PRIO_SYSTEM_SOFTIRQS
142 , update_every
143 , RRDSET_TYPE_STACKED
144 );
@@ -212,9 +214,9 @@ int do_proc_softirqs(int update_every, usec_t dt) {
214 , "cpu.softirqs"
215 , title
216 , "softirqs/s"
215 - , "proc"
216 - , "softirqs"
217 - , 3000 + c
217 + , PLUGIN_PROC_NAME
218 + , PLUGIN_PROC_MODULE_SOFTIRQS_NAME
219 + , NETDATA_CHART_PRIO_SOFTIRQS_PER_CORE + c
220 , update_every
221 , RRDSET_TYPE_STACKED
222 );
src/plugins/linux-proc.plugin/proc_spl_kstat_zfs.c
+2 -2
@@ -148,8 +148,8 @@ int do_proc_spl_kstat_zfs_arcstats(int update_every, usec_t dt) {
148 if(unlikely(arcstats.l2exist == -1))
149 arcstats.l2exist = 0;
150
151 - generate_charts_arcstats("proc", update_every);
152 - generate_charts_arc_summary("proc", update_every);
151 + generate_charts_arcstats(PLUGIN_PROC_NAME, ZFS_PROC_ARCSTATS, update_every);
152 + generate_charts_arc_summary(PLUGIN_PROC_NAME, ZFS_PROC_ARCSTATS, update_every);
153
154 return 0;
155 }
src/plugins/linux-proc.plugin/proc_stat.c
+27 -25
@@ -2,6 +2,8 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_STAT_NAME "/proc/stat"
6 +
7 struct per_core_single_number_file {
8 unsigned char found:1;
9 const char *filename;
@@ -241,14 +243,14 @@ int do_proc_stat(int update_every, usec_t dt) {
243 type = "system";
244 context = "system.cpu";
245 family = id;
244 - priority = 100;
246 + priority = NETDATA_CHART_PRIO_SYSTEM_CPU;
247 }
248 else {
249 title = "Core utilization";
250 type = "cpu";
251 context = "cpu.cpu";
252 family = "utilization";
251 - priority = 1000;
253 + priority = NETDATA_CHART_PRIO_CPU_PER_CORE;
254
255 // TODO: check for /sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq
256 // TODO: check for /sys/devices/system/cpu/cpu*/cpufreq/stats/time_in_state
@@ -292,9 +294,9 @@ int do_proc_stat(int update_every, usec_t dt) {
294 , context
295 , title
296 , "percentage"
295 - , "proc"
296 - , "stat"
297 - , priority
297 + , PLUGIN_PROC_NAME
298 + , PLUGIN_PROC_MODULE_STAT_NAME
299 + , priority + core
300 , update_every
301 , RRDSET_TYPE_STACKED
302 );
@@ -347,9 +349,9 @@ int do_proc_stat(int update_every, usec_t dt) {
349 , NULL
350 , "CPU Interrupts"
351 , "interrupts/s"
350 - , "proc"
351 - , "stat"
352 - , 900
352 + , PLUGIN_PROC_NAME
353 + , PLUGIN_PROC_MODULE_STAT_NAME
354 + , NETDATA_CHART_PRIO_SYSTEM_INTR
355 , update_every
356 , RRDSET_TYPE_LINE
357 );
@@ -379,9 +381,9 @@ int do_proc_stat(int update_every, usec_t dt) {
381 , NULL
382 , "CPU Context Switches"
383 , "context switches/s"
382 - , "proc"
383 - , "stat"
384 - , 800
384 + , PLUGIN_PROC_NAME
385 + , PLUGIN_PROC_MODULE_STAT_NAME
386 + , NETDATA_CHART_PRIO_SYSTEM_CTXT
387 , update_every
388 , RRDSET_TYPE_LINE
389 );
@@ -420,9 +422,9 @@ int do_proc_stat(int update_every, usec_t dt) {
422 , NULL
423 , "Started Processes"
424 , "processes/s"
423 - , "proc"
424 - , "stat"
425 - , 700
425 + , PLUGIN_PROC_NAME
426 + , PLUGIN_PROC_MODULE_STAT_NAME
427 + , NETDATA_CHART_PRIO_SYSTEM_FORKS
428 , update_every
429 , RRDSET_TYPE_LINE
430 );
@@ -452,9 +454,9 @@ int do_proc_stat(int update_every, usec_t dt) {
454 , NULL
455 , "System Processes"
456 , "processes"
455 - , "proc"
456 - , "stat"
457 - , 600
457 + , PLUGIN_PROC_NAME
458 + , PLUGIN_PROC_MODULE_STAT_NAME
459 + , NETDATA_CHART_PRIO_SYSTEM_PROCESSES
460 , update_every
461 , RRDSET_TYPE_LINE
462 );
@@ -486,9 +488,9 @@ int do_proc_stat(int update_every, usec_t dt) {
488 , "cpu.core_throttling"
489 , "Core Thermal Throttling Events"
490 , "events/s"
489 - , "proc"
490 - , "stat"
491 - , 5001
491 + , PLUGIN_PROC_NAME
492 + , PLUGIN_PROC_MODULE_STAT_NAME
493 + , NETDATA_CHART_PRIO_CORE_THROTTLING
494 , update_every
495 , RRDSET_TYPE_LINE
496 );
@@ -516,9 +518,9 @@ int do_proc_stat(int update_every, usec_t dt) {
518 , "cpu.package_throttling"
519 , "Package Thermal Throttling Events"
520 , "events/s"
519 - , "proc"
520 - , "stat"
521 - , 5002
521 + , PLUGIN_PROC_NAME
522 + , PLUGIN_PROC_MODULE_STAT_NAME
523 + , NETDATA_CHART_PRIO_PACKAGE_THROTTLING
524 , update_every
525 , RRDSET_TYPE_LINE
526 );
@@ -546,8 +548,8 @@ int do_proc_stat(int update_every, usec_t dt) {
548 , "cpu.scaling_cur_freq"
549 , "Per CPU Core, Current CPU Scaling Frequency"
550 , "MHz"
549 - , "proc"
550 - , "stat"
551 + , PLUGIN_PROC_NAME
552 + , PLUGIN_PROC_MODULE_STAT_NAME
553 , 5003
554 , update_every
555 , RRDSET_TYPE_LINE
src/plugins/linux-proc.plugin/proc_sys_kernel_random_entropy_avail.c
+3 -3
@@ -31,9 +31,9 @@ int do_proc_sys_kernel_random_entropy_avail(int update_every, usec_t dt) {
31 , NULL
32 , "Available Entropy"
33 , "entropy"
34 - , "proc"
35 - , "sys/kernel/random/entropy_avail"
36 - , 1000
34 + , PLUGIN_PROC_NAME
35 + , "/proc/sys/kernel/random/entropy_avail"
36 + , NETDATA_CHART_PRIO_SYSTEM_ENTROPY
37 , update_every
38 , RRDSET_TYPE_LINE
39 );
src/plugins/linux-proc.plugin/proc_uptime.c
+3 -3
@@ -85,9 +85,9 @@ int do_proc_uptime(int update_every, usec_t dt) {
85 , NULL
86 , "System Uptime"
87 , "seconds"
88 - , "proc"
89 - , "uptime"
90 - , 1000
88 + , PLUGIN_PROC_NAME
89 + , "/proc/uptime"
90 + , NETDATA_CHART_PRIO_SYSTEM_UPTIME
91 , update_every
92 , RRDSET_TYPE_LINE
93 );
src/plugins/linux-proc.plugin/proc_vmstat.c
+12 -10
@@ -2,6 +2,8 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_VMSTAT_NAME "/proc/vmstat"
6 +
7 int do_proc_vmstat(int update_every, usec_t dt) {
8 (void)dt;
9
@@ -104,9 +106,9 @@ int do_proc_vmstat(int update_every, usec_t dt) {
106 , NULL
107 , "Swap I/O"
108 , "kilobytes/s"
107 - , "proc"
108 - , "vmstat"
109 - , 250
109 + , PLUGIN_PROC_NAME
110 + , PLUGIN_PROC_MODULE_VMSTAT_NAME
111 + , NETDATA_CHART_PRIO_SYSTEM_SWAPIO
112 , update_every
113 , RRDSET_TYPE_AREA
114 );
@@ -136,9 +138,9 @@ int do_proc_vmstat(int update_every, usec_t dt) {
138 , NULL
139 , "Memory Paged from/to disk"
140 , "kilobytes/s"
139 - , "proc"
140 - , "vmstat"
141 - , 151
141 + , PLUGIN_PROC_NAME
142 + , PLUGIN_PROC_MODULE_VMSTAT_NAME
143 + , NETDATA_CHART_PRIO_SYSTEM_PGPGIO
144 , update_every
145 , RRDSET_TYPE_AREA
146 );
@@ -168,8 +170,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
170 , NULL
171 , "Memory Page Faults"
172 , "page faults/s"
171 - , "proc"
172 - , "vmstat"
173 + , PLUGIN_PROC_NAME
174 + , PLUGIN_PROC_MODULE_VMSTAT_NAME
175 , NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS
176 , update_every
177 , RRDSET_TYPE_LINE
@@ -213,8 +215,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
215 , NULL
216 , "NUMA events"
217 , "events/s"
216 - , "proc"
217 - , "vmstat"
218 + , PLUGIN_PROC_NAME
219 + , PLUGIN_PROC_MODULE_VMSTAT_NAME
220 , NETDATA_CHART_PRIO_MEM_NUMA
221 , update_every
222 , RRDSET_TYPE_LINE
src/plugins/linux-proc.plugin/sys_devices_system_edac_mc.c
+4 -4
@@ -142,9 +142,9 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
142 , NULL
143 , "ECC Memory Correctable Errors"
144 , "errors"
145 - , "proc"
145 + , PLUGIN_PROC_NAME
146 , "/sys/devices/system/edac/mc"
147 - , NETDATA_CHART_PRIO_MEM_HW + 50
147 + , NETDATA_CHART_PRIO_MEM_HW_ECC_CE
148 , update_every
149 , RRDSET_TYPE_LINE
150 );
@@ -180,9 +180,9 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
180 , NULL
181 , "ECC Memory Uncorrectable Errors"
182 , "errors"
183 - , "proc"
183 + , PLUGIN_PROC_NAME
184 , "/sys/devices/system/edac/mc"
185 - , NETDATA_CHART_PRIO_MEM_HW + 60
185 + , NETDATA_CHART_PRIO_MEM_HW_ECC_UE
186 , update_every
187 , RRDSET_TYPE_LINE
188 );
src/plugins/linux-proc.plugin/sys_devices_system_node.c
+2 -2
@@ -107,9 +107,9 @@ int do_proc_sys_devices_system_node(int update_every, usec_t dt) {
107 , NULL
108 , "NUMA events"
109 , "events/s"
110 - , "proc"
110 + , PLUGIN_PROC_NAME
111 , "/sys/devices/system/node"
112 - , NETDATA_CHART_PRIO_MEM_NUMA + 10
112 + , NETDATA_CHART_PRIO_MEM_NUMA_NODES
113 , update_every
114 , RRDSET_TYPE_LINE
115 );
src/plugins/linux-proc.plugin/sys_fs_btrfs.c
+14 -12
@@ -2,6 +2,8 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_BTRFS_NAME "/sys/fs/btrfs"
6 +
7 typedef struct btrfs_disk {
8 char *name;
9 uint32_t hash;
@@ -557,9 +559,9 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
559 , "btrfs.disk"
560 , title
561 , "MB"
560 - , "proc"
561 - , "sys/fs/btrfs"
562 - , 2300
562 + , PLUGIN_PROC_NAME
563 + , PLUGIN_PROC_MODULE_BTRFS_NAME
564 + , NETDATA_CHART_PRIO_BTRFS_DISK
565 , update_every
566 , RRDSET_TYPE_STACKED
567 );
@@ -613,9 +615,9 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
615 , "btrfs.data"
616 , title
617 , "MB"
616 - , "proc"
617 - , "sys/fs/btrfs"
618 - , 2301
618 + , PLUGIN_PROC_NAME
619 + , PLUGIN_PROC_MODULE_BTRFS_NAME
620 + , NETDATA_CHART_PRIO_BTRFS_DATA
621 , update_every
622 , RRDSET_TYPE_STACKED
623 );
@@ -654,9 +656,9 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
656 , "btrfs.metadata"
657 , title
658 , "MB"
657 - , "proc"
658 - , "sys/fs/btrfs"
659 - , 2302
659 + , PLUGIN_PROC_NAME
660 + , PLUGIN_PROC_MODULE_BTRFS_NAME
661 + , NETDATA_CHART_PRIO_BTRFS_METADATA
662 , update_every
663 , RRDSET_TYPE_STACKED
664 );
@@ -697,9 +699,9 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
699 , "btrfs.system"
700 , title
701 , "MB"
700 - , "proc"
701 - , "sys/fs/btrfs"
702 - , 2303
702 + , PLUGIN_PROC_NAME
703 + , PLUGIN_PROC_MODULE_BTRFS_NAME
704 + , NETDATA_CHART_PRIO_BTRFS_SYSTEM
705 , update_every
706 , RRDSET_TYPE_STACKED
707 );
src/plugins/linux-proc.plugin/sys_kernel_mm_ksm.c
+10 -8
@@ -2,6 +2,8 @@
2
3 #include "plugin_proc.h"
4
5 +#define PLUGIN_PROC_MODULE_KSM_NAME "/sys/kernel/mm/ksm"
6 +
7 typedef struct ksm_name_value {
8 char filename[FILENAME_MAX + 1];
9 unsigned long long value;
@@ -104,8 +106,8 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
106 , NULL
107 , "Kernel Same Page Merging"
108 , "MB"
107 - , "proc"
108 - , "/sys/kernel/mm/ksm"
109 + , PLUGIN_PROC_NAME
110 + , PLUGIN_PROC_MODULE_KSM_NAME
111 , NETDATA_CHART_PRIO_MEM_KSM
112 , update_every
113 , RRDSET_TYPE_AREA
@@ -144,9 +146,9 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
146 , NULL
147 , "Kernel Same Page Merging Savings"
148 , "MB"
147 - , "proc"
148 - , "/sys/kernel/mm/ksm"
149 - , NETDATA_CHART_PRIO_MEM_KSM + 1
149 + , PLUGIN_PROC_NAME
150 + , PLUGIN_PROC_MODULE_KSM_NAME
151 + , NETDATA_CHART_PRIO_MEM_KSM_SAVINGS
152 , update_every
153 , RRDSET_TYPE_AREA
154 );
@@ -178,9 +180,9 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
180 , NULL
181 , "Kernel Same Page Merging Effectiveness"
182 , "percentage"
181 - , "proc"
182 - , "/sys/kernel/mm/ksm"
183 - , NETDATA_CHART_PRIO_MEM_KSM + 2
183 + , PLUGIN_PROC_NAME
184 + , PLUGIN_PROC_MODULE_KSM_NAME
185 + , NETDATA_CHART_PRIO_MEM_KSM_RATIOS
186 , update_every
187 , RRDSET_TYPE_LINE
188 );
src/plugins/linux-proc.plugin/zfs_common.c
+38 -38
@@ -4,7 +4,7 @@
4
5 struct arcstats arcstats = { 0 };
6
7 -void generate_charts_arcstats(const char *plugin, int update_every) {
7 +void generate_charts_arcstats(const char *plugin, const char *module, int update_every) {
8
9 // ARC reads
10 unsigned long long aread = arcstats.hits + arcstats.misses;
@@ -48,8 +48,8 @@ void generate_charts_arcstats(const char *plugin, int update_every) {
48 , "ZFS ARC Size"
49 , "MB"
50 , plugin
51 - , "zfs"
52 - , 2500
51 + , module
52 + , NETDATA_CHART_PRIO_ZFS_ARC_SIZE
53 , update_every
54 , RRDSET_TYPE_AREA
55 );
@@ -86,8 +86,8 @@ void generate_charts_arcstats(const char *plugin, int update_every) {
86 , "ZFS L2 ARC Size"
87 , "MB"
88 , plugin
89 - , "zfs"
90 - , 2500
89 + , module
90 + , NETDATA_CHART_PRIO_ZFS_L2_SIZE
91 , update_every
92 , RRDSET_TYPE_AREA
93 );
@@ -123,8 +123,8 @@ void generate_charts_arcstats(const char *plugin, int update_every) {
123 , "ZFS Reads"
124 , "reads/s"
125 , plugin
126 - , "zfs"
127 - , 2510
126 + , module
127 + , NETDATA_CHART_PRIO_ZFS_READS
128 , update_every
129 , RRDSET_TYPE_AREA
130 );
@@ -168,8 +168,8 @@ void generate_charts_arcstats(const char *plugin, int update_every) {
168 , "ZFS ARC L2 Read/Write Rate"
169 , "kilobytes/s"
170 , plugin
171 - , "zfs"
172 - , 2700
171 + , module
172 + , NETDATA_CHART_PRIO_ZFS_IO
173 , update_every
174 , RRDSET_TYPE_AREA
175 );
@@ -202,8 +202,8 @@ void generate_charts_arcstats(const char *plugin, int update_every) {
202 , "ZFS ARC Hits"
203 , "percentage"
204 , plugin
205 - , "zfs"
206 - , 2520
205 + , module
206 + , NETDATA_CHART_PRIO_ZFS_HITS
207 , update_every
208 , RRDSET_TYPE_STACKED
209 );
@@ -236,8 +236,8 @@ void generate_charts_arcstats(const char *plugin, int update_every) {
236 , "ZFS Demand Hits"
237 , "percentage"
238 , plugin
239 - , "zfs"
240 - , 2530
239 + , module
240 + , NETDATA_CHART_PRIO_ZFS_DHITS
241 , update_every
242 , RRDSET_TYPE_STACKED
243 );
@@ -270,8 +270,8 @@ void generate_charts_arcstats(const char *plugin, int update_every) {
270 , "ZFS Prefetch Hits"
271 , "percentage"
272 , plugin
273 - , "zfs"
274 - , 2540
273 + , module
274 + , NETDATA_CHART_PRIO_ZFS_PHITS
275 , update_every
276 , RRDSET_TYPE_STACKED
277 );
@@ -304,8 +304,8 @@ void generate_charts_arcstats(const char *plugin, int update_every) {
304 , "ZFS Metadata Hits"
305 , "percentage"
306 , plugin
307 - , "zfs"
308 - , 2550
307 + , module
308 + , NETDATA_CHART_PRIO_ZFS_MHITS
309 , update_every
310 , RRDSET_TYPE_STACKED
311 );
@@ -338,8 +338,8 @@ void generate_charts_arcstats(const char *plugin, int update_every) {
338 , "ZFS L2 Hits"
339 , "percentage"
340 , plugin
341 - , "zfs"
342 - , 2560
341 + , module
342 + , NETDATA_CHART_PRIO_ZFS_L2HITS
343 , update_every
344 , RRDSET_TYPE_STACKED
345 );
@@ -374,8 +374,8 @@ void generate_charts_arcstats(const char *plugin, int update_every) {
374 , "ZFS List Hits"
375 , "hits/s"
376 , plugin
377 - , "zfs"
378 - , 2600
377 + , module
378 + , NETDATA_CHART_PRIO_ZFS_LIST_HITS
379 , update_every
380 , RRDSET_TYPE_AREA
381 );
@@ -396,7 +396,7 @@ void generate_charts_arcstats(const char *plugin, int update_every) {
396 }
397 }
398
399 -void generate_charts_arc_summary(const char *plugin, int update_every) {
399 +void generate_charts_arc_summary(const char *plugin, const char *module, int update_every) {
400 unsigned long long arc_accesses_total = arcstats.hits + arcstats.misses;
401 unsigned long long real_hits = arcstats.mfu_hits + arcstats.mru_hits;
402 unsigned long long real_misses = arc_accesses_total - real_hits;
@@ -433,8 +433,8 @@ void generate_charts_arc_summary(const char *plugin, int update_every) {
433 , "ZFS ARC Size Breakdown"
434 , "percentage"
435 , plugin
436 - , "zfs"
437 - , 2520
436 + , module
437 + , NETDATA_CHART_PRIO_ZFS_ARC_SIZE_BREAKDOWN
438 , update_every
439 , RRDSET_TYPE_STACKED
440 );
@@ -472,8 +472,8 @@ void generate_charts_arc_summary(const char *plugin, int update_every) {
472 , "ZFS Memory Operations"
473 , "operations/s"
474 , plugin
475 - , "zfs"
476 - , 2523
475 + , module
476 + , NETDATA_CHART_PRIO_ZFS_MEMORY_OPS
477 , update_every
478 , RRDSET_TYPE_LINE
479 );
@@ -518,8 +518,8 @@ void generate_charts_arc_summary(const char *plugin, int update_every) {
518 , "ZFS Important Operations"
519 , "operations/s"
520 , plugin
521 - , "zfs"
522 - , 2522
521 + , module
522 + , NETDATA_CHART_PRIO_ZFS_IMPORTANT_OPS
523 , update_every
524 , RRDSET_TYPE_LINE
525 );
@@ -556,8 +556,8 @@ void generate_charts_arc_summary(const char *plugin, int update_every) {
556 , "ZFS Actual Cache Hits"
557 , "percentage"
558 , plugin
559 - , "zfs"
560 - , 2519
559 + , module
560 + , NETDATA_CHART_PRIO_ZFS_ACTUAL_HITS
561 , update_every
562 , RRDSET_TYPE_STACKED
563 );
@@ -590,8 +590,8 @@ void generate_charts_arc_summary(const char *plugin, int update_every) {
590 , "ZFS Data Demand Efficiency"
591 , "percentage"
592 , plugin
593 - , "zfs"
594 - , 2531
593 + , module
594 + , NETDATA_CHART_PRIO_ZFS_DEMAND_DATA_HITS
595 , update_every
596 , RRDSET_TYPE_STACKED
597 );
@@ -624,8 +624,8 @@ void generate_charts_arc_summary(const char *plugin, int update_every) {
624 , "ZFS Data Prefetch Efficiency"
625 , "percentage"
626 , plugin
627 - , "zfs"
628 - , 2532
627 + , module
628 + , NETDATA_CHART_PRIO_ZFS_PREFETCH_DATA_HITS
629 , update_every
630 , RRDSET_TYPE_STACKED
631 );
@@ -658,8 +658,8 @@ void generate_charts_arc_summary(const char *plugin, int update_every) {
658 , "ZFS ARC Hash Elements"
659 , "elements"
660 , plugin
661 - , "zfs"
662 - , 2800
661 + , module
662 + , NETDATA_CHART_PRIO_ZFS_HASH_ELEMENTS
663 , update_every
664 , RRDSET_TYPE_LINE
665 );
@@ -692,8 +692,8 @@ void generate_charts_arc_summary(const char *plugin, int update_every) {
692 , "ZFS ARC Hash Chains"
693 , "chains"
694 , plugin
695 - , "zfs"
696 - , 2810
695 + , module
696 + , NETDATA_CHART_PRIO_ZFS_HASH_CHAINS
697 , update_every
698 , RRDSET_TYPE_LINE
699 );
src/plugins/linux-proc.plugin/zfs_common.h
+2 -2
@@ -109,7 +109,7 @@ struct arcstats {
109 int l2exist;
110 };
111
112 -void generate_charts_arcstats(const char *plugin, int update_every);
113 -void generate_charts_arc_summary(const char *plugin, int update_every);
112 +void generate_charts_arcstats(const char *plugin, const char *module, int update_every);
113 +void generate_charts_arc_summary(const char *plugin, const char *module, int update_every);
114
115 #endif //NETDATA_ZFS_COMMON_H
src/plugins/linux-tc.plugin/plugin_tc.c
+15 -14
@@ -3,6 +3,7 @@
3 #include "plugin_tc.h"
4
5 #define RRD_TYPE_TC "tc"
6 +#define PLUGIN_TC_NAME "tc.plugin"
7
8 // ----------------------------------------------------------------------------
9 // /sbin/tc processor
@@ -393,9 +394,9 @@ static inline void tc_device_commit(struct tc_device *d) {
394 , RRD_TYPE_TC ".qos"
395 , "Class Usage"
396 , "kilobits/s"
396 - , "tc"
397 + , PLUGIN_TC_NAME
398 , NULL
398 - , 7000
399 + , NETDATA_CHART_PRIO_TC_QOS
400 , localhost->rrd_update_every
401 , d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE : RRDSET_TYPE_STACKED
402 );
@@ -441,9 +442,9 @@ static inline void tc_device_commit(struct tc_device *d) {
442 , RRD_TYPE_TC ".qos_packets"
443 , "Class Packets"
444 , "packets/s"
444 - , "tc"
445 + , PLUGIN_TC_NAME
446 , NULL
446 - , 7010
447 + , NETDATA_CHART_PRIO_TC_QOS_PACKETS
448 , localhost->rrd_update_every
449 , d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE : RRDSET_TYPE_STACKED
450 );
@@ -494,9 +495,9 @@ static inline void tc_device_commit(struct tc_device *d) {
495 , RRD_TYPE_TC ".qos_dropped"
496 , "Class Dropped Packets"
497 , "packets/s"
497 - , "tc"
498 + , PLUGIN_TC_NAME
499 , NULL
499 - , 7020
500 + , NETDATA_CHART_PRIO_TC_QOS_DROPPED
501 , localhost->rrd_update_every
502 , d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE : RRDSET_TYPE_STACKED
503 );
@@ -547,9 +548,9 @@ static inline void tc_device_commit(struct tc_device *d) {
548 , RRD_TYPE_TC ".qos_tokens"
549 , "Class Tokens"
550 , "tokens"
550 - , "tc"
551 + , PLUGIN_TC_NAME
552 , NULL
552 - , 7030
553 + , NETDATA_CHART_PRIO_TC_QOS_TOCKENS
554 , localhost->rrd_update_every
555 , RRDSET_TYPE_LINE
556 );
@@ -601,9 +602,9 @@ static inline void tc_device_commit(struct tc_device *d) {
602 , RRD_TYPE_TC ".qos_ctokens"
603 , "Class cTokens"
604 , "ctokens"
604 - , "tc"
605 + , PLUGIN_TC_NAME
606 , NULL
606 - , 7040
607 + , NETDATA_CHART_PRIO_TC_QOS_CTOCKENS
608 , localhost->rrd_update_every
609 , RRDSET_TYPE_LINE
610 );
@@ -1077,9 +1078,9 @@ void *tc_main(void *ptr) {
1078 , NULL
1079 , "NetData TC CPU usage"
1080 , "milliseconds/s"
1080 - , "tc"
1081 + , PLUGIN_TC_NAME
1082 , NULL
1082 - , 135000
1083 + , NETDATA_CHART_PRIO_NETDATA_TC_CPU
1084 , localhost->rrd_update_every
1085 , RRDSET_TYPE_STACKED
1086 );
@@ -1104,9 +1105,9 @@ void *tc_main(void *ptr) {
1105 , NULL
1106 , "NetData TC script execution"
1107 , "milliseconds/run"
1107 - , "tc"
1108 + , PLUGIN_TC_NAME
1109 , NULL
1109 - , 135001
1110 + , NETDATA_CHART_PRIO_NETDATA_TC_TIME
1111 , localhost->rrd_update_every
1112 , RRDSET_TYPE_AREA
1113 );
src/plugins/statsd.plugin/statsd.c
+20 -19
@@ -3,7 +3,8 @@
3 #include "statsd.h"
4
5 #define STATSD_CHART_PREFIX "statsd"
6 -#define STATSD_CHART_PRIORITY 90000
6 +
7 +#define PLUGIN_STATSD_NAME "statsd.plugin"
8
9 // --------------------------------------------------------------------------------------
10
@@ -1202,7 +1203,7 @@ static int statsd_readfile(const char *filename, STATSD_APP *app, STATSD_APP_CHA
1203 chart->context = strdupz(s);
1204 chart->family = strdupz("overview");
1205 chart->units = strdupz("value");
1205 - chart->priority = STATSD_CHART_PRIORITY;
1206 + chart->priority = NETDATA_CHART_PRIO_STATSD_PRIVATE;
1207 chart->chart_type = RRDSET_TYPE_LINE;
1208
1209 chart->next = app->charts;
@@ -1451,7 +1452,7 @@ static inline RRDSET *statsd_private_rrdset_create(
1452 , context // context
1453 , title // title
1454 , units // units
1454 - , "statsd" // plugin
1455 + , PLUGIN_STATSD_NAME // plugin
1456 , "private_chart" // module
1457 , priority // priority
1458 , update_every // update every
@@ -1490,7 +1491,7 @@ static inline void statsd_private_chart_gauge(STATSD_METRIC *m) {
1491 , context // context
1492 , title // title
1493 , "value" // units
1493 - , STATSD_CHART_PRIORITY
1494 + , NETDATA_CHART_PRIO_STATSD_PRIVATE
1495 , statsd.update_every
1496 , RRDSET_TYPE_LINE
1497 );
@@ -1532,7 +1533,7 @@ static inline void statsd_private_chart_counter_or_meter(STATSD_METRIC *m, const
1533 , context // context
1534 , title // title
1535 , "events/s" // units
1535 - , STATSD_CHART_PRIORITY
1536 + , NETDATA_CHART_PRIO_STATSD_PRIVATE
1537 , statsd.update_every
1538 , RRDSET_TYPE_AREA
1539 );
@@ -1574,7 +1575,7 @@ static inline void statsd_private_chart_set(STATSD_METRIC *m) {
1575 , context // context
1576 , title // title
1577 , "entries" // units
1577 - , STATSD_CHART_PRIORITY
1578 + , NETDATA_CHART_PRIO_STATSD_PRIVATE
1579 , statsd.update_every
1580 , RRDSET_TYPE_LINE
1581 );
@@ -1616,7 +1617,7 @@ static inline void statsd_private_chart_timer_or_histogram(STATSD_METRIC *m, con
1617 , context // context
1618 , title // title
1619 , units // units
1619 - , STATSD_CHART_PRIORITY
1620 + , NETDATA_CHART_PRIO_STATSD_PRIVATE
1621 , statsd.update_every
1622 , RRDSET_TYPE_AREA
1623 );
@@ -1989,7 +1990,7 @@ static inline void statsd_update_app_chart(STATSD_APP *app, STATSD_APP_CHART *ch
1990 , chart->context // context
1991 , chart->title // title
1992 , chart->units // units
1992 - , "statsd" // plugin
1993 + , PLUGIN_STATSD_NAME // plugin
1994 , chart->source // module
1995 , chart->priority // priority
1996 , statsd.update_every // update every
@@ -2249,7 +2250,7 @@ void *statsd_main(void *ptr) {
2250 , NULL
2251 , "Metrics in the netdata statsd database"
2252 , "metrics"
2252 - , "statsd"
2253 + , PLUGIN_STATSD_NAME
2254 , "stats"
2255 , 132010
2256 , statsd.update_every
@@ -2270,7 +2271,7 @@ void *statsd_main(void *ptr) {
2271 , NULL
2272 , "Useful metrics in the netdata statsd database"
2273 , "metrics"
2273 - , "statsd"
2274 + , PLUGIN_STATSD_NAME
2275 , "stats"
2276 , 132010
2277 , statsd.update_every
@@ -2291,7 +2292,7 @@ void *statsd_main(void *ptr) {
2292 , NULL
2293 , "Events processed by the netdata statsd server"
2294 , "events/s"
2294 - , "statsd"
2295 + , PLUGIN_STATSD_NAME
2296 , "stats"
2297 , 132011
2298 , statsd.update_every
@@ -2314,7 +2315,7 @@ void *statsd_main(void *ptr) {
2315 , NULL
2316 , "Read operations made by the netdata statsd server"
2317 , "reads/s"
2317 - , "statsd"
2318 + , PLUGIN_STATSD_NAME
2319 , "stats"
2320 , 132012
2321 , statsd.update_every
@@ -2331,7 +2332,7 @@ void *statsd_main(void *ptr) {
2332 , NULL
2333 , "Bytes read by the netdata statsd server"
2334 , "kilobits/s"
2334 - , "netdata"
2335 + , PLUGIN_STATSD_NAME
2336 , "stats"
2337 , 132013
2338 , statsd.update_every
@@ -2348,7 +2349,7 @@ void *statsd_main(void *ptr) {
2349 , NULL
2350 , "Network packets processed by the netdata statsd server"
2351 , "packets/s"
2351 - , "netdata"
2352 + , PLUGIN_STATSD_NAME
2353 , "stats"
2354 , 132014
2355 , statsd.update_every
@@ -2365,7 +2366,7 @@ void *statsd_main(void *ptr) {
2366 , NULL
2367 , "statsd server TCP connects and disconnects"
2368 , "events"
2368 - , "statsd"
2369 + , PLUGIN_STATSD_NAME
2370 , "stats"
2371 , 132015
2372 , statsd.update_every
@@ -2382,7 +2383,7 @@ void *statsd_main(void *ptr) {
2383 , NULL
2384 , "statsd server TCP connected sockets"
2385 , "connected"
2385 - , "statsd"
2386 + , PLUGIN_STATSD_NAME
2387 , "stats"
2388 , 132016
2389 , statsd.update_every
@@ -2398,7 +2399,7 @@ void *statsd_main(void *ptr) {
2399 , NULL
2400 , "Private metric charts created by the netdata statsd server"
2401 , "charts"
2401 - , "statsd"
2402 + , PLUGIN_STATSD_NAME
2403 , "stats"
2404 , 132020
2405 , statsd.update_every
@@ -2414,7 +2415,7 @@ void *statsd_main(void *ptr) {
2415 , "netdata.statsd_cpu"
2416 , "NetData statsd charting thread CPU usage"
2417 , "milliseconds/s"
2417 - , "statsd"
2418 + , PLUGIN_STATSD_NAME
2419 , "stats"
2420 , 132001
2421 , statsd.update_every
@@ -2440,7 +2441,7 @@ void *statsd_main(void *ptr) {
2441 , "netdata.statsd_cpu"
2442 , title
2443 , "milliseconds/s"
2443 - , "statsd"
2444 + , PLUGIN_STATSD_NAME
2445 , "stats"
2446 , 132002 + i
2447 , statsd.update_every
web/dashboard.js
+6 -3
@@ -4159,9 +4159,12 @@ var NETDATA = window.NETDATA || {};
4159
4160 if (typeof this.chart.plugin === 'string' && this.chart.plugin !== '') {
4161 str = this.chart.plugin;
4162 - if (typeof this.chart.module === 'string' && this.chart.module !== '') {
4163 - str += '/' + this.chart.module;
4164 - }
4162 +
4163 + if(str.endsWith(".plugin"))
4164 + str = str.substring(0, str.length - 7);
4165 +
4166 + if (typeof this.chart.module === 'string' && this.chart.module !== '')
4167 + str += ':' + this.chart.module;
4168
4169 if (withContext && context !== '')
4170 str += ', ' + context;
web/index.html
+1 -1
@@ -5786,6 +5786,6 @@
5786 </div>
5787 </div>
5788 <div id="hiddenDownloadLinks" style="display: none;" hidden></div>
5789 - <script type="text/javascript" src="dashboard.js?v20181005-5"></script>
5789 + <script type="text/javascript" src="dashboard.js?v20181013-2"></script>
5790 </body>
5791 </html>