added config options for all /proc and /sys filenames monitored required for #10

diff --git a/src/proc_diskstats.c b/src/proc_diskstats.c
index fcdf51d24640fb50836085dc7d46fde5686895f8..85fa4c8e3d1bd5fc255f7c4f70f9ffb9f13a8281 100755 (executable)
--- a/src/proc_diskstats.c
+++ b/src/proc_diskstats.c
@@ -17,7 +17,7 @@
 
 int do_proc_diskstats(int update_every, unsigned long long dt) {
        static procfile *ff = NULL;
-
+       static char *path_to_get_hw_sector_size = NULL;
        static int enable_new_disks = -1;
        static int do_io = -1, do_ops = -1, do_merged_ops = -1, do_iotime = -1, do_cur_ops = -1;
 
@@ -31,9 +31,11 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
 
        if(dt) {};
 
-       if(!ff) ff = procfile_open("/proc/diskstats", " \t", PROCFILE_FLAG_DEFAULT);
+       if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/diskstats", "filename to monitor", "/proc/diskstats"), " \t", PROCFILE_FLAG_DEFAULT);
        if(!ff) return 1;
 
+       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");
+
        ff = procfile_readall(ff);
        if(!ff) return 0; // we return 0, so that we will retry to open it next time
 
@@ -208,7 +210,7 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
                                // replace all / with !
                                while((t = strchr(tf, '/'))) *t = '!';
 
-                               snprintf(ssfilename, FILENAME_MAX, "/sys/block/%s/queue/hw_sector_size", tf);
+                               snprintf(ssfilename, FILENAME_MAX, path_to_get_hw_sector_size, tf);
                                FILE *fpss = fopen(ssfilename, "r");
                                if(fpss) {
                                        char ssbuffer[1025];

diff --git a/src/proc_interrupts.c b/src/proc_interrupts.c
index c402e97631a422dd0c43eef9e1bb516a25688adb..a2c7f4714bb7fafd24266d10b72f217769799351 100755 (executable)
--- a/src/proc_interrupts.c
+++ b/src/proc_interrupts.c
@@ -31,7 +31,7 @@ int do_proc_interrupts(int update_every, unsigned long long dt) {
 
        if(do_per_core == -1) do_per_core = config_get_boolean("plugin:proc:/proc/interrupts", "interrupts per core", 0);
 
-       if(!ff) ff = procfile_open("/proc/interrupts", " \t", PROCFILE_FLAG_DEFAULT);
+       if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/interrupts", "filename to monitor", "/proc/interrupts"), " \t", PROCFILE_FLAG_DEFAULT);
        if(!ff) return 1;
 
        ff = procfile_readall(ff);

diff --git a/src/proc_meminfo.c b/src/proc_meminfo.c
index ab9a80d1a766b93e2e0d0ece874fda5dbb3601ed..07805e540b84efcd16e8a638a7e24cb4a74b119e 100755 (executable)
--- a/src/proc_meminfo.c
+++ b/src/proc_meminfo.c
@@ -28,7 +28,7 @@ int do_proc_meminfo(int update_every, unsigned long long dt) {
 
        if(dt) {};
 
-       if(!ff) ff = procfile_open("/proc/meminfo", " \t:", PROCFILE_FLAG_DEFAULT);
+       if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/meminfo", "filename to monitor", "/proc/meminfo"), " \t:", PROCFILE_FLAG_DEFAULT);
        if(!ff) return 1;
 
        ff = procfile_readall(ff);

diff --git a/src/proc_net_dev.c b/src/proc_net_dev.c
index 2416c752205cfce35b8ad2d9d909568774721688..c4dcd139f222a9e5898f415a60221de17eae59b6 100755 (executable)
--- a/src/proc_net_dev.c
+++ b/src/proc_net_dev.c
@@ -15,7 +15,7 @@ int do_proc_net_dev(int update_every, unsigned long long dt) {
 
        if(dt) {};
 
-       if(!ff) ff = procfile_open("/proc/net/dev", " \t,:|", PROCFILE_FLAG_DEFAULT);
+       if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/net/dev", "filename to monitor", "/proc/net/dev"), " \t,:|", PROCFILE_FLAG_DEFAULT);
        if(!ff) return 1;
 
        ff = procfile_readall(ff);

diff --git a/src/proc_net_ip_vs_stats.c b/src/proc_net_ip_vs_stats.c
index 862cc51d4028624f463f63a011d0e089fbc3182c..1e947eb784d181b88964a7808dbb53d07cf48bda 100755 (executable)
--- a/src/proc_net_ip_vs_stats.c
+++ b/src/proc_net_ip_vs_stats.c
@@ -21,7 +21,7 @@ int do_proc_net_ip_vs_stats(int update_every, unsigned long long dt) {
 
        if(dt) {};
 
-       if(!ff) ff = procfile_open("/proc/net/ip_vs_stats", " \t,:|", PROCFILE_FLAG_DEFAULT);
+       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);
        if(!ff) return 1;
 
        ff = procfile_readall(ff);

diff --git a/src/proc_net_netstat.c b/src/proc_net_netstat.c
index 0b5c3938dccecb73efcadd4c8650b1f83428589b..c62fa93c3b3bda66eff3363e39ec930c5c385f7c 100755 (executable)
--- a/src/proc_net_netstat.c
+++ b/src/proc_net_netstat.c
@@ -23,7 +23,7 @@ int do_proc_net_netstat(int update_every, unsigned long long dt) {
 
        if(dt) {};
 
-       if(!ff) ff = procfile_open("/proc/net/netstat", " \t:", PROCFILE_FLAG_DEFAULT);
+       if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/net/netstat", "filename to monitor", "/proc/net/netstat"), " \t:", PROCFILE_FLAG_DEFAULT);
        if(!ff) return 1;
 
        ff = procfile_readall(ff);

diff --git a/src/proc_net_rpc_nfsd.c b/src/proc_net_rpc_nfsd.c
index ca75edd69ecb595f279b993a32ac8146f87ac3ea..c3bbf14c5c49d0fd09e2a4150cc8587045c50326 100644 (file)
--- a/src/proc_net_rpc_nfsd.c
+++ b/src/proc_net_rpc_nfsd.c
@@ -138,7 +138,7 @@ int do_proc_net_rpc_nfsd(int update_every, unsigned long long dt) {
 
        if(dt) {};
 
-       if(!ff) ff = procfile_open("/proc/net/rpc/nfsd", " \t", PROCFILE_FLAG_DEFAULT);
+       if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/net/rpc/nfsd", "filename to monitor", "/proc/net/rpc/nfsd"), " \t", PROCFILE_FLAG_DEFAULT);
        if(!ff) return 1;
 
        ff = procfile_readall(ff);

diff --git a/src/proc_net_snmp.c b/src/proc_net_snmp.c
index 4efd24839f84d56deddf5a3e16493473a52ad03f..0c62b87d8cebe8d67e023b08881e6a9f1124f774 100755 (executable)
--- a/src/proc_net_snmp.c
+++ b/src/proc_net_snmp.c
@@ -32,7 +32,7 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
 
        if(dt) {};
 
-       if(!ff) ff = procfile_open("/proc/net/snmp", " \t:", PROCFILE_FLAG_DEFAULT);
+       if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/net/snmp", "filename to monitor", "/proc/net/snmp"), " \t:", PROCFILE_FLAG_DEFAULT);
        if(!ff) return 1;
 
        ff = procfile_readall(ff);

diff --git a/src/proc_net_stat_conntrack.c b/src/proc_net_stat_conntrack.c
index 5ffa5da91c7392a0ff52e8f5787177a6bc2d9ec7..d6b864b7bc1b8e5ee81e3d10e9e8b3f695c190c3 100755 (executable)
--- a/src/proc_net_stat_conntrack.c
+++ b/src/proc_net_stat_conntrack.c
@@ -26,7 +26,7 @@ int do_proc_net_stat_conntrack(int update_every, unsigned long long dt) {
 
        if(dt) {};
 
-       if(!ff) ff = procfile_open("/proc/net/stat/nf_conntrack", " \t:", PROCFILE_FLAG_DEFAULT);
+       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);
        if(!ff) return 1;
 
        ff = procfile_readall(ff);

diff --git a/src/proc_stat.c b/src/proc_stat.c
index a29725997f41d9d019b0cea646faff8863f47d47..b836549500445f63762e502e15d0fff9c6b10c28 100755 (executable)
--- a/src/proc_stat.c
+++ b/src/proc_stat.c
@@ -26,7 +26,7 @@ int do_proc_stat(int update_every, unsigned long long dt) {
 
        if(dt) {};
 
-       if(!ff) ff = procfile_open("/proc/stat", " \t:", PROCFILE_FLAG_DEFAULT);
+       if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/stat", "filename to monitor", "/proc/stat"), " \t:", PROCFILE_FLAG_DEFAULT);
        if(!ff) return 1;
 
        ff = procfile_readall(ff);

diff --git a/src/proc_sys_kernel_random_entropy_avail.c b/src/proc_sys_kernel_random_entropy_avail.c
index 0488f5b636486542c32bc37a2351990a2d5d5533..c3311ee40c6771b53fcf77dda6504033b77c2d37 100755 (executable)
--- a/src/proc_sys_kernel_random_entropy_avail.c
+++ b/src/proc_sys_kernel_random_entropy_avail.c
@@ -13,7 +13,7 @@ int do_proc_sys_kernel_random_entropy_avail(int update_every, unsigned long long
 
        if(dt) {} ;
 
-       if(!ff) ff = procfile_open("/proc/sys/kernel/random/entropy_avail", "", PROCFILE_FLAG_DEFAULT);
+       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);
        if(!ff) return 1;
 
        ff = procfile_readall(ff);

diff --git a/src/proc_vmstat.c b/src/proc_vmstat.c
index 0842ebe0e538311eecf63a888715074218c35fd0..4b9337269dc383f343748aeabc0303e9383a89da 100755 (executable)
--- a/src/proc_vmstat.c
+++ b/src/proc_vmstat.c
@@ -24,7 +24,7 @@ int do_proc_vmstat(int update_every, unsigned long long dt) {
 
        if(dt) {};
 
-       if(!ff) ff = procfile_open("/proc/vmstat", " \t:", PROCFILE_FLAG_DEFAULT);
+       if(!ff) ff = procfile_open(config_get("plugin:proc:/proc/vmstat", "filename to monitor", "/proc/vmstat"), " \t:", PROCFILE_FLAG_DEFAULT);
        if(!ff) return 1;
 
        ff = procfile_readall(ff);