proc_module generalization
Costa Tsaousis (ktsaou) committed
Jan 13, 2017 at 23:16 UTC
0ef04b6369c355f1afe5e226a4ec644845f2c24b
1 file changed
+95
-218
src/plugin_proc.c
+95
-218
@@ -1,5 +1,61 @@
1
#include "common.h"
2
3
+static struct proc_module {
4
+ const char *name;
5
+ const char *dim;
6
+
7
+ int enabled;
8
+
9
+ int (*func)(int update_every, usec_t dt);
10
+ usec_t last_run_usec;
11
+ usec_t duration;
12
+
13
+ RRDDIM *rd;
14
+
15
+} proc_modules[] = {
16
+
17
+ // system metrics
18
+ { .name = "/proc/stat", .dim = "stat", .func = do_proc_stat },
19
+ { .name = "/proc/uptime", .dim = "uptime", .func = do_proc_uptime },
20
+ { .name = "/proc/loadavg", .dim = "loadavg", .func = do_proc_loadavg },
21
+ { .name = "/proc/sys/kernel/random/entropy_avail", .dim = "entropy", .func = do_proc_sys_kernel_random_entropy_avail },
22
+
23
+ // CPU metrics
24
+ { .name = "/proc/interrupts", .dim = "interrupts", .func = do_proc_interrupts },
25
+ { .name = "/proc/softirqs", .dim = "softirqs", .func = do_proc_softirqs },
26
+
27
+ // memory metrics
28
+ { .name = "/proc/vmstat", .dim = "vmstat", .func = do_proc_vmstat },
29
+ { .name = "/proc/meminfo", .dim = "meminfo", .func = do_proc_meminfo },
30
+ { .name = "/sys/kernel/mm/ksm", .dim = "ksm", .func = do_sys_kernel_mm_ksm },
31
+ { .name = "/sys/devices/system/edac/mc", .dim = "ecc", .func = do_proc_sys_devices_system_edac_mc },
32
+
33
+ // network metrics
34
+ { .name = "/proc/net/dev", .dim = "netdev", .func = do_proc_net_dev },
35
+ { .name = "/proc/net/netstat", .dim = "netstat", .func = do_proc_net_netstat },
36
+ { .name = "/proc/net/snmp", .dim = "snmp", .func = do_proc_net_snmp },
37
+ { .name = "/proc/net/snmp6", .dim = "snmp6", .func = do_proc_net_snmp6 },
38
+ { .name = "/proc/net/softnet_stat", .dim = "softnet", .func = do_proc_net_softnet_stat },
39
+ { .name = "/proc/net/ip_vs/stats", .dim = "ipvs", .func = do_proc_net_ip_vs_stats },
40
+
41
+ // firewall metrics
42
+ { .name = "/proc/net/stat/conntrack", .dim = "conntrack", .func = do_proc_net_stat_conntrack },
43
+ { .name = "/proc/net/stat/synproxy", .dim = "synproxy", .func = do_proc_net_stat_synproxy },
44
+
45
+ // disk metrics
46
+ { .name = "/proc/diskstats", .dim = "diskstats", .func = do_proc_diskstats },
47
+
48
+ // NFS metrics
49
+ { .name = "/proc/net/rpc/nfsd", .dim = "nfsd", .func = do_proc_net_rpc_nfsd },
50
+ { .name = "/proc/net/rpc/nfs", .dim = "nfs", .func = do_proc_net_rpc_nfs },
51
+
52
+ // IPC metrics
53
+ { .name = "ipc", .dim = "ipc", .func = do_ipc },
54
+
55
+ // the terminator of this array
56
+ { .name = NULL, .dim = NULL, .func = NULL }
57
+};
58
+
59
void *proc_main(void *ptr)
60
{
61
(void)ptr;
@@ -17,250 +73,71 @@ void *proc_main(void *ptr)
73
config_get_boolean("plugin:proc:/proc/net/dev:fireqos_monitor", "enabled", 0);
74
75
// when ZERO, attempt to do it
20
- int vdo_proc_net_dev = !config_get_boolean("plugin:proc", "/proc/net/dev", 1);
21
- int vdo_proc_diskstats = !config_get_boolean("plugin:proc", "/proc/diskstats", 1);
22
- int vdo_proc_net_snmp = !config_get_boolean("plugin:proc", "/proc/net/snmp", 1);
23
- int vdo_proc_net_snmp6 = !config_get_boolean("plugin:proc", "/proc/net/snmp6", 1);
24
- int vdo_proc_net_netstat = !config_get_boolean("plugin:proc", "/proc/net/netstat", 1);
25
- int vdo_proc_net_stat_conntrack = !config_get_boolean("plugin:proc", "/proc/net/stat/conntrack", 1);
26
- int vdo_proc_net_ip_vs_stats = !config_get_boolean("plugin:proc", "/proc/net/ip_vs/stats", 1);
27
- int vdo_proc_net_stat_synproxy = !config_get_boolean("plugin:proc", "/proc/net/stat/synproxy", 1);
28
- int vdo_proc_stat = !config_get_boolean("plugin:proc", "/proc/stat", 1);
29
- int vdo_proc_meminfo = !config_get_boolean("plugin:proc", "/proc/meminfo", 1);
30
- int vdo_proc_vmstat = !config_get_boolean("plugin:proc", "/proc/vmstat", 1);
31
- int vdo_proc_net_rpc_nfs = !config_get_boolean("plugin:proc", "/proc/net/rpc/nfs", 1);
32
- int vdo_proc_net_rpc_nfsd = !config_get_boolean("plugin:proc", "/proc/net/rpc/nfsd", 1);
33
- int vdo_proc_sys_kernel_random_entropy_avail = !config_get_boolean("plugin:proc", "/proc/sys/kernel/random/entropy_avail", 1);
34
- int vdo_proc_sys_devices_system_edac_mc = !config_get_boolean("plugin:proc", "/sys/devices/system/edac/mc", 1);
35
- int vdo_proc_interrupts = !config_get_boolean("plugin:proc", "/proc/interrupts", 1);
36
- int vdo_proc_softirqs = !config_get_boolean("plugin:proc", "/proc/softirqs", 1);
37
- int vdo_proc_net_softnet_stat = !config_get_boolean("plugin:proc", "/proc/net/softnet_stat", 1);
38
- int vdo_proc_loadavg = !config_get_boolean("plugin:proc", "/proc/loadavg", 1);
39
- int vdo_proc_uptime = !config_get_boolean("plugin:proc", "/proc/uptime", 1);
40
- int vdo_ipc = !config_get_boolean("plugin:proc", "ipc", 1);
41
- int vdo_sys_kernel_mm_ksm = !config_get_boolean("plugin:proc", "/sys/kernel/mm/ksm", 1);
76
int vdo_cpu_netdata = !config_get_boolean("plugin:proc", "netdata server resources", 1);
77
44
- // keep track of the time each module was called
45
- usec_t sutime_proc_net_dev = 0ULL;
46
- usec_t sutime_proc_diskstats = 0ULL;
47
- usec_t sutime_proc_net_snmp = 0ULL;
48
- usec_t sutime_proc_net_snmp6 = 0ULL;
49
- usec_t sutime_proc_net_netstat = 0ULL;
50
- usec_t sutime_proc_net_stat_conntrack = 0ULL;
51
- usec_t sutime_proc_net_ip_vs_stats = 0ULL;
52
- usec_t sutime_proc_net_stat_synproxy = 0ULL;
53
- usec_t sutime_proc_stat = 0ULL;
54
- usec_t sutime_proc_meminfo = 0ULL;
55
- usec_t sutime_proc_vmstat = 0ULL;
56
- usec_t sutime_proc_net_rpc_nfs = 0ULL;
57
- usec_t sutime_proc_net_rpc_nfsd = 0ULL;
58
- usec_t sutime_proc_sys_kernel_random_entropy_avail = 0ULL;
59
- usec_t sutime_proc_sys_devices_system_edac_mc = 0ULL;
60
- usec_t sutime_proc_interrupts = 0ULL;
61
- usec_t sutime_proc_softirqs = 0ULL;
62
- usec_t sutime_proc_net_softnet_stat = 0ULL;
63
- usec_t sutime_proc_loadavg = 0ULL;
64
- usec_t sutime_proc_uptime = 0ULL;
65
- usec_t sutime_ipc = 0ULL;
66
- usec_t sutime_sys_kernel_mm_ksm = 0ULL;
78
+ // check the enabled status for each module
79
+ int i;
80
+ for(i = 0 ; proc_modules[i].name ;i++) {
81
+ proc_modules[i].enabled = config_get_boolean("plugin:proc", proc_modules[i].name, 1);
82
+ proc_modules[i].last_run_usec = 0ULL;
83
+ proc_modules[i].duration = 0ULL;
84
+ proc_modules[i].rd = NULL;
85
+ }
86
87
usec_t step = rrd_update_every * USEC_PER_SEC;
88
for(;;) {
70
- usec_t now = now_realtime_usec();
89
+ usec_t now = now_monotonic_usec();
90
usec_t next = now - (now % step) + step;
91
92
while(now < next) {
93
sleep_usec(next - now);
75
- now = now_realtime_usec();
94
+ now = now_monotonic_usec();
95
}
96
97
if(unlikely(netdata_exit)) break;
98
99
// BEGIN -- the job to be done
100
82
- if(!vdo_sys_kernel_mm_ksm) {
83
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_sys_kernel_mm_ksm().");
101
+ for(i = 0 ; proc_modules[i].name ;i++) {
102
+ if(unlikely(!proc_modules[i].enabled)) continue;
103
85
- now = now_realtime_usec();
86
- vdo_sys_kernel_mm_ksm = do_sys_kernel_mm_ksm(rrd_update_every, (sutime_sys_kernel_mm_ksm > 0)?now - sutime_sys_kernel_mm_ksm:0ULL);
87
- sutime_sys_kernel_mm_ksm = now;
88
- }
89
- if(unlikely(netdata_exit)) break;
104
+ debug(D_PROCNETDEV_LOOP, "PROC calling %s.", proc_modules[i].name);
105
91
- if(!vdo_proc_loadavg) {
92
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_loadavg().");
93
- now = now_realtime_usec();
94
- vdo_proc_loadavg = do_proc_loadavg(rrd_update_every, (sutime_proc_loadavg > 0)?now - sutime_proc_loadavg:0ULL);
95
- sutime_proc_loadavg = now;
96
- }
97
- if(unlikely(netdata_exit)) break;
106
+ proc_modules[i].enabled = !proc_modules[i].func(rrd_update_every, (proc_modules[i].last_run_usec > 0)?now - proc_modules[i].last_run_usec:0ULL);
107
+ proc_modules[i].last_run_usec = now;
108
99
- if(!vdo_proc_uptime) {
100
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_uptime().");
101
- now = now_realtime_usec();
102
- vdo_proc_uptime = do_proc_uptime(rrd_update_every, (sutime_proc_uptime > 0)?now - sutime_proc_uptime:0ULL);
103
- sutime_proc_uptime = now;
104
- }
105
- if(unlikely(netdata_exit)) break;
106
-
107
- if(!vdo_ipc) {
108
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_ipc().");
109
- now = now_realtime_usec();
110
- vdo_ipc = do_ipc(rrd_update_every, (sutime_ipc > 0)?now - sutime_ipc:0ULL);
111
- sutime_ipc = now;
112
- }
113
- if(unlikely(netdata_exit)) break;
114
-
115
- if(!vdo_proc_interrupts) {
116
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_interrupts().");
117
- now = now_realtime_usec();
118
- vdo_proc_interrupts = do_proc_interrupts(rrd_update_every, (sutime_proc_interrupts > 0)?now - sutime_proc_interrupts:0ULL);
119
- sutime_proc_interrupts = now;
120
- }
121
- if(unlikely(netdata_exit)) break;
109
+ now = now_monotonic_usec();
110
+ proc_modules[i].duration = now - proc_modules[i].last_run_usec;
111
123
- if(!vdo_proc_softirqs) {
124
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_softirqs().");
125
- now = now_realtime_usec();
126
- vdo_proc_softirqs = do_proc_softirqs(rrd_update_every, (sutime_proc_softirqs > 0)?now - sutime_proc_softirqs:0ULL);
127
- sutime_proc_softirqs = now;
112
+ if(unlikely(netdata_exit)) break;
113
}
129
- if(unlikely(netdata_exit)) break;
130
-
131
- if(!vdo_proc_net_softnet_stat) {
132
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_softnet_stat().");
133
- now = now_realtime_usec();
134
- vdo_proc_net_softnet_stat = do_proc_net_softnet_stat(rrd_update_every, (sutime_proc_net_softnet_stat > 0)?now - sutime_proc_net_softnet_stat:0ULL);
135
- sutime_proc_net_softnet_stat = now;
136
- }
137
- if(unlikely(netdata_exit)) break;
138
-
139
- if(!vdo_proc_sys_kernel_random_entropy_avail) {
140
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_sys_kernel_random_entropy_avail().");
141
- now = now_realtime_usec();
142
- vdo_proc_sys_kernel_random_entropy_avail = do_proc_sys_kernel_random_entropy_avail(rrd_update_every, (sutime_proc_sys_kernel_random_entropy_avail > 0)?now - sutime_proc_sys_kernel_random_entropy_avail:0ULL);
143
- sutime_proc_sys_kernel_random_entropy_avail = now;
144
- }
145
- if(unlikely(netdata_exit)) break;
146
-
147
- if(!vdo_proc_sys_devices_system_edac_mc) {
148
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_sys_devices_system_edac_mc().");
149
- now = now_realtime_usec();
150
- vdo_proc_sys_devices_system_edac_mc = do_proc_sys_devices_system_edac_mc(rrd_update_every, (sutime_proc_sys_devices_system_edac_mc > 0)?now - sutime_proc_sys_devices_system_edac_mc:0ULL);
151
- sutime_proc_sys_devices_system_edac_mc = now;
152
- }
153
- if(unlikely(netdata_exit)) break;
154
-
155
- if(!vdo_proc_net_dev) {
156
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_dev().");
157
- now = now_realtime_usec();
158
- vdo_proc_net_dev = do_proc_net_dev(rrd_update_every, (sutime_proc_net_dev > 0)?now - sutime_proc_net_dev:0ULL);
159
- sutime_proc_net_dev = now;
160
- }
161
- if(unlikely(netdata_exit)) break;
162
-
163
- if(!vdo_proc_diskstats) {
164
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_diskstats().");
165
- now = now_realtime_usec();
166
- vdo_proc_diskstats = do_proc_diskstats(rrd_update_every, (sutime_proc_diskstats > 0)?now - sutime_proc_diskstats:0ULL);
167
- sutime_proc_diskstats = now;
168
- }
169
- if(unlikely(netdata_exit)) break;
170
-
171
- if(!vdo_proc_net_snmp) {
172
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_snmp().");
173
- now = now_realtime_usec();
174
- vdo_proc_net_snmp = do_proc_net_snmp(rrd_update_every, (sutime_proc_net_snmp > 0)?now - sutime_proc_net_snmp:0ULL);
175
- sutime_proc_net_snmp = now;
176
- }
177
- if(unlikely(netdata_exit)) break;
178
-
179
- if(!vdo_proc_net_snmp6) {
180
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_snmp6().");
181
- now = now_realtime_usec();
182
- vdo_proc_net_snmp6 = do_proc_net_snmp6(rrd_update_every, (sutime_proc_net_snmp6 > 0)?now - sutime_proc_net_snmp6:0ULL);
183
- sutime_proc_net_snmp6 = now;
184
- }
185
- if(unlikely(netdata_exit)) break;
186
-
187
- if(!vdo_proc_net_netstat) {
188
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_netstat().");
189
- now = now_realtime_usec();
190
- vdo_proc_net_netstat = do_proc_net_netstat(rrd_update_every, (sutime_proc_net_netstat > 0)?now - sutime_proc_net_netstat:0ULL);
191
- sutime_proc_net_netstat = now;
192
- }
193
- if(unlikely(netdata_exit)) break;
194
-
195
- if(!vdo_proc_net_stat_conntrack) {
196
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_stat_conntrack().");
197
- now = now_realtime_usec();
198
- vdo_proc_net_stat_conntrack = do_proc_net_stat_conntrack(rrd_update_every, (sutime_proc_net_stat_conntrack > 0)?now - sutime_proc_net_stat_conntrack:0ULL);
199
- sutime_proc_net_stat_conntrack = now;
200
- }
201
- if(unlikely(netdata_exit)) break;
202
-
203
- if(!vdo_proc_net_ip_vs_stats) {
204
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_net_ip_vs_stats().");
205
- now = now_realtime_usec();
206
- vdo_proc_net_ip_vs_stats = do_proc_net_ip_vs_stats(rrd_update_every, (sutime_proc_net_ip_vs_stats > 0)?now - sutime_proc_net_ip_vs_stats:0ULL);
207
- sutime_proc_net_ip_vs_stats = now;
208
- }
209
- if(unlikely(netdata_exit)) break;
210
-
211
- if(!vdo_proc_net_stat_synproxy) {
212
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_net_stat_synproxy().");
213
- now = now_realtime_usec();
214
- vdo_proc_net_stat_synproxy = do_proc_net_stat_synproxy(rrd_update_every, (sutime_proc_net_stat_synproxy > 0)?now - sutime_proc_net_stat_synproxy:0ULL);
215
- sutime_proc_net_stat_synproxy = now;
216
- }
217
- if(unlikely(netdata_exit)) break;
218
-
219
- if(!vdo_proc_stat) {
220
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_stat().");
221
- now = now_realtime_usec();
222
- vdo_proc_stat = do_proc_stat(rrd_update_every, (sutime_proc_stat > 0)?now - sutime_proc_stat:0ULL);
223
- sutime_proc_stat = now;
224
- }
225
- if(unlikely(netdata_exit)) break;
226
-
227
- if(!vdo_proc_meminfo) {
228
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_meminfo().");
229
- now = now_realtime_usec();
230
- vdo_proc_meminfo = do_proc_meminfo(rrd_update_every, (sutime_proc_meminfo > 0)?now - sutime_proc_meminfo:0ULL);
231
- sutime_proc_meminfo = now;
232
- }
233
- if(unlikely(netdata_exit)) break;
234
-
235
- if(!vdo_proc_vmstat) {
236
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_vmstat().");
237
- now = now_realtime_usec();
238
- vdo_proc_vmstat = do_proc_vmstat(rrd_update_every, (sutime_proc_vmstat > 0)?now - sutime_proc_vmstat:0ULL);
239
- sutime_proc_vmstat = now;
240
- }
241
- if(unlikely(netdata_exit)) break;
242
-
243
- if(!vdo_proc_net_rpc_nfsd) {
244
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_rpc_nfsd().");
245
- now = now_realtime_usec();
246
- vdo_proc_net_rpc_nfsd = do_proc_net_rpc_nfsd(rrd_update_every, (sutime_proc_net_rpc_nfsd > 0)?now - sutime_proc_net_rpc_nfsd:0ULL);
247
- sutime_proc_net_rpc_nfsd = now;
248
- }
249
- if(unlikely(netdata_exit)) break;
250
-
251
- if(!vdo_proc_net_rpc_nfs) {
252
- debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_rpc_nfs().");
253
- now = now_realtime_usec();
254
- vdo_proc_net_rpc_nfs = do_proc_net_rpc_nfs(rrd_update_every, (sutime_proc_net_rpc_nfs > 0)?now - sutime_proc_net_rpc_nfs:0ULL);
255
- sutime_proc_net_rpc_nfs = now;
256
- }
257
- if(unlikely(netdata_exit)) break;
114
115
// END -- the job is done
116
117
// --------------------------------------------------------------------
118
119
if(!vdo_cpu_netdata) {
120
+ static RRDSET *st = NULL;
121
+ if(unlikely(!st)) {
122
+ st = rrdset_find_bytype("netdata", "plugin_proc_modules");
123
+
124
+ if(!st) {
125
+ st = rrdset_create("netdata", "plugin_proc_modules", NULL, "proc.internal", NULL, "NetData Proc Plugin Modules Durations", "milliseconds/s", 132001, rrd_update_every, RRDSET_TYPE_STACKED);
126
+
127
+ for(i = 0 ; proc_modules[i].name ;i++) {
128
+ if(unlikely(!proc_modules[i].enabled)) continue;
129
+ proc_modules[i].rd = rrddim_add(st, proc_modules[i].dim, NULL, 1, 1000, RRDDIM_ABSOLUTE);
130
+ }
131
+ }
132
+ }
133
+ else rrdset_next(st);
134
+
135
+ for(i = 0 ; proc_modules[i].name ;i++) {
136
+ if(unlikely(!proc_modules[i].enabled)) continue;
137
+ rrddim_set_by_pointer(st, proc_modules[i].rd, proc_modules[i].duration);
138
+ }
139
+ rrdset_done(st);
140
+
141
global_statistics_charts();
142
registry_statistics();
143
}