added config options for all /proc and /sys filenames monitored required for #10
Costa Tsaousis (ktsaou) committed
Oct 11, 2015 at 16:19 UTC
c5f2511615b291b48fba1a8a64f4b65462d8bc6a
12 files changed
+16
-14
src/proc_diskstats.c
+5
-3
@@ -17,7 +17,7 @@
17
18
int do_proc_diskstats(int update_every, unsigned long long dt) {
19
static procfile *ff = NULL;
20
-
20
+ static char *path_to_get_hw_sector_size = NULL;
21
static int enable_new_disks = -1;
22
static int do_io = -1, do_ops = -1, do_merged_ops = -1, do_iotime = -1, do_cur_ops = -1;
23
@@ -31,9 +31,11 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
31
32
if(dt) {};
33
34
- if(!ff) ff = procfile_open("/proc/diskstats", " \t", PROCFILE_FLAG_DEFAULT);
34
+ if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/diskstats", "filename to monitor", "/proc/diskstats"), " \t", PROCFILE_FLAG_DEFAULT);
35
if(!ff) return 1;
36
37
+ if(!path_to_get_hw_sector_size) path_to_get_hw_sector_size = config_get("plugin:proc:/proc/diskstats", "path to get h/w sector size", "/sys/block/%s/queue/hw_sector_size");
38
+
39
ff = procfile_readall(ff);
40
if(!ff) return 0; // we return 0, so that we will retry to open it next time
41
@@ -208,7 +210,7 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
210
// replace all / with !
211
while((t = strchr(tf, '/'))) *t = '!';
212
211
- snprintf(ssfilename, FILENAME_MAX, "/sys/block/%s/queue/hw_sector_size", tf);
213
+ snprintf(ssfilename, FILENAME_MAX, path_to_get_hw_sector_size, tf);
214
FILE *fpss = fopen(ssfilename, "r");
215
if(fpss) {
216
char ssbuffer[1025];
src/proc_interrupts.c
+1
-1
@@ -31,7 +31,7 @@ int do_proc_interrupts(int update_every, unsigned long long dt) {
31
32
if(do_per_core == -1) do_per_core = config_get_boolean("plugin:proc:/proc/interrupts", "interrupts per core", 0);
33
34
- if(!ff) ff = procfile_open("/proc/interrupts", " \t", PROCFILE_FLAG_DEFAULT);
34
+ if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/interrupts", "filename to monitor", "/proc/interrupts"), " \t", PROCFILE_FLAG_DEFAULT);
35
if(!ff) return 1;
36
37
ff = procfile_readall(ff);
src/proc_meminfo.c
+1
-1
@@ -28,7 +28,7 @@ int do_proc_meminfo(int update_every, unsigned long long dt) {
28
29
if(dt) {};
30
31
- if(!ff) ff = procfile_open("/proc/meminfo", " \t:", PROCFILE_FLAG_DEFAULT);
31
+ if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/meminfo", "filename to monitor", "/proc/meminfo"), " \t:", PROCFILE_FLAG_DEFAULT);
32
if(!ff) return 1;
33
34
ff = procfile_readall(ff);
src/proc_net_dev.c
+1
-1
@@ -15,7 +15,7 @@ int do_proc_net_dev(int update_every, unsigned long long dt) {
15
16
if(dt) {};
17
18
- if(!ff) ff = procfile_open("/proc/net/dev", " \t,:|", PROCFILE_FLAG_DEFAULT);
18
+ if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/net/dev", "filename to monitor", "/proc/net/dev"), " \t,:|", PROCFILE_FLAG_DEFAULT);
19
if(!ff) return 1;
20
21
ff = procfile_readall(ff);
src/proc_net_ip_vs_stats.c
+1
-1
@@ -21,7 +21,7 @@ int do_proc_net_ip_vs_stats(int update_every, unsigned long long dt) {
21
22
if(dt) {};
23
24
- if(!ff) ff = procfile_open("/proc/net/ip_vs_stats", " \t,:|", PROCFILE_FLAG_DEFAULT);
24
+ if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/net/ip_vs_stats", "filename to monitor", "/proc/net/ip_vs_stats"), " \t,:|", PROCFILE_FLAG_DEFAULT);
25
if(!ff) return 1;
26
27
ff = procfile_readall(ff);
src/proc_net_netstat.c
+1
-1
@@ -23,7 +23,7 @@ int do_proc_net_netstat(int update_every, unsigned long long dt) {
23
24
if(dt) {};
25
26
- if(!ff) ff = procfile_open("/proc/net/netstat", " \t:", PROCFILE_FLAG_DEFAULT);
26
+ if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/net/netstat", "filename to monitor", "/proc/net/netstat"), " \t:", PROCFILE_FLAG_DEFAULT);
27
if(!ff) return 1;
28
29
ff = procfile_readall(ff);
src/proc_net_rpc_nfsd.c
+1
-1
@@ -138,7 +138,7 @@ int do_proc_net_rpc_nfsd(int update_every, unsigned long long dt) {
138
139
if(dt) {};
140
141
- if(!ff) ff = procfile_open("/proc/net/rpc/nfsd", " \t", PROCFILE_FLAG_DEFAULT);
141
+ if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/net/rpc/nfsd", "filename to monitor", "/proc/net/rpc/nfsd"), " \t", PROCFILE_FLAG_DEFAULT);
142
if(!ff) return 1;
143
144
ff = procfile_readall(ff);
src/proc_net_snmp.c
+1
-1
@@ -32,7 +32,7 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
32
33
if(dt) {};
34
35
- if(!ff) ff = procfile_open("/proc/net/snmp", " \t:", PROCFILE_FLAG_DEFAULT);
35
+ if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/net/snmp", "filename to monitor", "/proc/net/snmp"), " \t:", PROCFILE_FLAG_DEFAULT);
36
if(!ff) return 1;
37
38
ff = procfile_readall(ff);
src/proc_net_stat_conntrack.c
+1
-1
@@ -26,7 +26,7 @@ int do_proc_net_stat_conntrack(int update_every, unsigned long long dt) {
26
27
if(dt) {};
28
29
- if(!ff) ff = procfile_open("/proc/net/stat/nf_conntrack", " \t:", PROCFILE_FLAG_DEFAULT);
29
+ if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/net/stat/nf_conntrack", "filename to monitor", "/proc/net/stat/nf_conntrack"), " \t:", PROCFILE_FLAG_DEFAULT);
30
if(!ff) return 1;
31
32
ff = procfile_readall(ff);
src/proc_stat.c
+1
-1
@@ -26,7 +26,7 @@ int do_proc_stat(int update_every, unsigned long long dt) {
26
27
if(dt) {};
28
29
- if(!ff) ff = procfile_open("/proc/stat", " \t:", PROCFILE_FLAG_DEFAULT);
29
+ if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/stat", "filename to monitor", "/proc/stat"), " \t:", PROCFILE_FLAG_DEFAULT);
30
if(!ff) return 1;
31
32
ff = procfile_readall(ff);
src/proc_sys_kernel_random_entropy_avail.c
+1
-1
@@ -13,7 +13,7 @@ int do_proc_sys_kernel_random_entropy_avail(int update_every, unsigned long long
13
14
if(dt) {} ;
15
16
- if(!ff) ff = procfile_open("/proc/sys/kernel/random/entropy_avail", "", PROCFILE_FLAG_DEFAULT);
16
+ if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/sys/kernel/random/entropy_avail", "filename to monitor", "/proc/sys/kernel/random/entropy_avail"), "", PROCFILE_FLAG_DEFAULT);
17
if(!ff) return 1;
18
19
ff = procfile_readall(ff);
src/proc_vmstat.c
+1
-1
@@ -24,7 +24,7 @@ int do_proc_vmstat(int update_every, unsigned long long dt) {
24
25
if(dt) {};
26
27
- if(!ff) ff = procfile_open("/proc/vmstat", " \t:", PROCFILE_FLAG_DEFAULT);
27
+ if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/vmstat", "filename to monitor", "/proc/vmstat"), " \t:", PROCFILE_FLAG_DEFAULT);
28
if(!ff) return 1;
29
30
ff = procfile_readall(ff);