added internal plugin for reading /proc/loadavg and disables charts.d/load_average.chart.sh

9 files changed, 432 insertions, 152 deletions

diff --git a/charts.d/load_average.chart.sh b/charts.d/load_average.chart.sh
index 8cc5af6ec6..257ea7cadc 100755
--- a/charts.d/load_average.chart.sh
+++ b/charts.d/load_average.chart.sh
@@ -3,6 +3,12 @@
 load_average_update_every=5
 load_priority=100
 
+# this is an example charts.d collector
+# it is disabled by default.
+# there is no point to enable it, since netdata already
+# collects this information using its internal plugins.
+load_average_enabled=0
+
 load_average_check() {
 	# this should return:
 	#  - 0 to enable the chart
@@ -15,6 +21,7 @@ load_average_check() {
 		load_average_update_every=5
 	fi
 
+	[ ${load_average_enabled} -eq 0 ] && return 1
 	return 0
 }
 
diff --git a/src/Makefile.am b/src/Makefile.am
index bbff03999d..0c51bb54b2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,6 +40,7 @@ netdata_SOURCES = \
 	proc_diskstats.c \
 	proc_interrupts.c \
 	proc_softirqs.c \
+	proc_loadavg.c \
 	proc_meminfo.c \
 	proc_net_dev.c \
 	proc_net_ip_vs_stats.c \
diff --git a/src/plugin_proc.c b/src/plugin_proc.c
index 21aeecfb99..3784b72a2a 100755
--- a/src/plugin_proc.c
+++ b/src/plugin_proc.c
@@ -51,6 +51,7 @@ void *proc_main(void *ptr)
 	int vdo_proc_sys_kernel_random_entropy_avail	= !config_get_boolean("plugin:proc", "/proc/sys/kernel/random/entropy_avail", 1);
 	int vdo_proc_interrupts			= !config_get_boolean("plugin:proc", "/proc/interrupts", 1);
 	int vdo_proc_softirqs			= !config_get_boolean("plugin:proc", "/proc/softirqs", 1);
+	int vdo_proc_loadavg			= !config_get_boolean("plugin:proc", "/proc/loadavg", 1);
 	int vdo_sys_kernel_mm_ksm		= !config_get_boolean("plugin:proc", "/sys/kernel/mm/ksm", 1);
 	int vdo_cpu_netdata 			= !config_get_boolean("plugin:proc", "netdata server resources", 1);
 
@@ -68,7 +69,10 @@ void *proc_main(void *ptr)
 			debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_sys_kernel_mm_ksm().");
 			vdo_sys_kernel_mm_ksm = do_sys_kernel_mm_ksm(rrd_update_every, usec+susec);
 		}
-
+		if(!vdo_proc_loadavg) {
+			debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_loadavg().");
+			vdo_proc_loadavg = do_proc_loadavg(rrd_update_every, usec+susec);
+		}
 		if(!vdo_proc_interrupts) {
 			debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_interrupts().");
 			vdo_proc_interrupts = do_proc_interrupts(rrd_update_every, usec+susec);
@@ -93,37 +97,30 @@ void *proc_main(void *ptr)
 			debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_snmp().");
 			vdo_proc_net_snmp = do_proc_net_snmp(rrd_update_every, usec+susec);
 		}
-
 		if(!vdo_proc_net_netstat) {
 			debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_netstat().");
 			vdo_proc_net_netstat = do_proc_net_netstat(rrd_update_every, usec+susec);
 		}
-
 		if(!vdo_proc_net_stat_conntrack) {
 			debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_stat_conntrack().");
 			vdo_proc_net_stat_conntrack	= do_proc_net_stat_conntrack(rrd_update_every, usec+susec);
 		}
-
 		if(!vdo_proc_net_ip_vs_stats) {
 			debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_net_ip_vs_stats().");
 			vdo_proc_net_ip_vs_stats = do_proc_net_ip_vs_stats(rrd_update_every, usec+susec);
 		}
-
 		if(!vdo_proc_stat) {
 			debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_stat().");
 			vdo_proc_stat = do_proc_stat(rrd_update_every, usec+susec);
 		}
-
 		if(!vdo_proc_meminfo) {
 			debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_meminfo().");
 			vdo_proc_meminfo = do_proc_meminfo(rrd_update_every, usec+susec);
 		}
-
 		if(!vdo_proc_vmstat) {
 			debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_vmstat().");
 			vdo_proc_vmstat = do_proc_vmstat(rrd_update_every, usec+susec);
 		}
-
 		if(!vdo_proc_net_rpc_nfsd) {
 			debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_rpc_nfsd().");
 			vdo_proc_net_rpc_nfsd = do_proc_net_rpc_nfsd(rrd_update_every, usec+susec);
diff --git a/src/plugin_proc.h b/src/plugin_proc.h
index dcbd8dbb60..28b8c59ef0 100755
--- a/src/plugin_proc.h
+++ b/src/plugin_proc.h
@@ -17,5 +17,6 @@ extern int do_proc_sys_kernel_random_entropy_avail(int update_every, unsigned lo
 extern int do_proc_interrupts(int update_every, unsigned long long dt);
 extern int do_proc_softirqs(int update_every, unsigned long long dt);
 extern int do_sys_kernel_mm_ksm(int update_every, unsigned long long dt);
+extern int do_proc_loadavg(int update_every, unsigned long long dt);
 
 #endif /* NETDATA_PLUGIN_PROC_H */
diff --git a/src/proc_net_snmp.c b/src/proc_net_snmp.c
index 3ea94fe590..efefbadce7 100755
--- a/src/proc_net_snmp.c
+++ b/src/proc_net_snmp.c
@@ -91,10 +91,10 @@ int do_proc_net_snmp(int update_every, unsigned long long dt) {
 			// these are not counters
 			if(Forwarding) {};		// is forwarding enabled?
 			if(DefaultTTL) {};		// the default ttl on packets
-			if(ReasmTimeout) {};	// reassemply timeout
+			if(ReasmTimeout) {};	// Reassembly timeout
 
 			// this counter is not used
-			if(InDelivers) {};		// total number of packets delivered to IP user-protcols
+			if(InDelivers) {};		// total number of packets delivered to IP user-protocols
 
 			// --------------------------------------------------------------------
 
diff --git a/src/proc_stat.c b/src/proc_stat.c
index 4009644d71..3d090ed714 100755
--- a/src/proc_stat.c
+++ b/src/proc_stat.c
@@ -172,7 +172,7 @@ int do_proc_stat(int update_every, unsigned long long dt) {
 	if(do_forks) {
 		st = rrdset_find_bytype("system", "forks");
 		if(!st) {
-			st = rrdset_create("system", "forks", NULL, "processes", NULL, "New Processes", "processes/s", 700, update_every, RRDSET_TYPE_LINE);
+			st = rrdset_create("system", "forks", NULL, "processes", NULL, "Started Processes", "processes/s", 700, update_every, RRDSET_TYPE_LINE);
 			st->isdetail = 1;
 
 			rrddim_add(st, "started", NULL, 1, 1, RRDDIM_INCREMENTAL);
@@ -188,7 +188,7 @@ int do_proc_stat(int update_every, unsigned long long dt) {
 	if(do_processes) {
 		st = rrdset_find_bytype("system", "processes");
 		if(!st) {
-			st = rrdset_create("system", "processes", NULL, "processes", NULL, "Processes", "processes", 600, update_every, RRDSET_TYPE_LINE);
+			st = rrdset_create("system", "processes", NULL, "processes", NULL, "System Processes", "processes", 600, update_every, RRDSET_TYPE_LINE);
 
 			rrddim_add(st, "running", NULL, 1, 1, RRDDIM_ABSOLUTE);
 			rrddim_add(st, "blocked", NULL, -1, 1, RRDDIM_ABSOLUTE);
diff --git a/src/proc_sys_kernel_random_entropy_avail.c b/src/proc_sys_kernel_random_entropy_avail.c
index 40b84ed793..be9070acab 100755
--- a/src/proc_sys_kernel_random_entropy_avail.c
+++ b/src/proc_sys_kernel_random_entropy_avail.c
@@ -29,7 +29,7 @@ int do_proc_sys_kernel_random_entropy_avail(int update_every, unsigned long long
 
 	RRDSET *st = rrdset_find_bytype("system", "entropy");
 	if(!st) {
-		st = rrdset_create("system", "entropy", NULL, "cryptography", NULL, "Available Entropy", "entropy", 1000, update_every, RRDSET_TYPE_LINE);
+		st = rrdset_create("system", "entropy", NULL, "entropy", NULL, "Available Entropy", "entropy", 1000, update_every, RRDSET_TYPE_LINE);
 		rrddim_add(st, "entropy", NULL, 1, 1, RRDDIM_ABSOLUTE);
 	}
 	else rrdset_next(st);
diff --git a/src/proc_vmstat.c b/src/proc_vmstat.c
index 6dd2788e53..46ddbae7f5 100755
--- a/src/proc_vmstat.c
+++ b/src/proc_vmstat.c
@@ -18,7 +18,196 @@
 
 int do_proc_vmstat(int update_every, unsigned long long dt) {
 	static procfile *ff = NULL;
-	static int do_swapio = -1, do_io = -1, do_pgfaults = -1;
+	static int do_swapio = -1, do_io = -1, do_pgfaults = -1, gen_hashes = -1;
+
+	// static uint32_t hash_allocstall = -1;
+	// static uint32_t hash_compact_blocks_moved = -1;
+	// static uint32_t hash_compact_fail = -1;
+	// static uint32_t hash_compact_pagemigrate_failed = -1;
+	// static uint32_t hash_compact_pages_moved = -1;
+	// static uint32_t hash_compact_stall = -1;
+	// static uint32_t hash_compact_success = -1;
+	// static uint32_t hash_htlb_buddy_alloc_fail = -1;
+	// static uint32_t hash_htlb_buddy_alloc_success = -1;
+	// static uint32_t hash_kswapd_high_wmark_hit_quickly = -1;
+	// static uint32_t hash_kswapd_inodesteal = -1;
+	// static uint32_t hash_kswapd_low_wmark_hit_quickly = -1;
+	// static uint32_t hash_kswapd_skip_congestion_wait = -1;
+	// static uint32_t hash_nr_active_anon = -1;
+	// static uint32_t hash_nr_active_file = -1;
+	// static uint32_t hash_nr_anon_pages = -1;
+	// static uint32_t hash_nr_anon_transparent_hugepages = -1;
+	// static uint32_t hash_nr_bounce = -1;
+	// static uint32_t hash_nr_dirtied = -1;
+	// static uint32_t hash_nr_dirty = -1;
+	// static uint32_t hash_nr_dirty_background_threshold = -1;
+	// static uint32_t hash_nr_dirty_threshold = -1;
+	// static uint32_t hash_nr_file_pages = -1;
+	// static uint32_t hash_nr_free_pages = -1;
+	// static uint32_t hash_nr_inactive_anon = -1;
+	// static uint32_t hash_nr_inactive_file = -1;
+	// static uint32_t hash_nr_isolated_anon = -1;
+	// static uint32_t hash_nr_isolated_file = -1;
+	// static uint32_t hash_nr_kernel_stack = -1;
+	// static uint32_t hash_nr_mapped = -1;
+	// static uint32_t hash_nr_mlock = -1;
+	// static uint32_t hash_nr_page_table_pages = -1;
+	// static uint32_t hash_nr_shmem = -1;
+	// static uint32_t hash_nr_slab_reclaimable = -1;
+	// static uint32_t hash_nr_slab_unreclaimable = -1;
+	// static uint32_t hash_nr_unevictable = -1;
+	// static uint32_t hash_nr_unstable = -1;
+	// static uint32_t hash_nr_vmscan_immediate_reclaim = -1;
+	// static uint32_t hash_nr_vmscan_write = -1;
+	// static uint32_t hash_nr_writeback = -1;
+	// static uint32_t hash_nr_writeback_temp = -1;
+	// static uint32_t hash_nr_written = -1;
+	// static uint32_t hash_pageoutrun = -1;
+	// static uint32_t hash_pgactivate = -1;
+	// static uint32_t hash_pgalloc_dma = -1;
+	// static uint32_t hash_pgalloc_dma32 = -1;
+	// static uint32_t hash_pgalloc_movable = -1;
+	// static uint32_t hash_pgalloc_normal = -1;
+	// static uint32_t hash_pgdeactivate = -1;
+	static uint32_t hash_pgfault = -1;
+	// static uint32_t hash_pgfree = -1;
+	// static uint32_t hash_pginodesteal = -1;
+	static uint32_t hash_pgmajfault = -1;
+	static uint32_t hash_pgpgin = -1;
+	static uint32_t hash_pgpgout = -1;
+	// static uint32_t hash_pgrefill_dma = -1;
+	// static uint32_t hash_pgrefill_dma32 = -1;
+	// static uint32_t hash_pgrefill_movable = -1;
+	// static uint32_t hash_pgrefill_normal = -1;
+	// static uint32_t hash_pgrotated = -1;
+	// static uint32_t hash_pgscan_direct_dma = -1;
+	// static uint32_t hash_pgscan_direct_dma32 = -1;
+	// static uint32_t hash_pgscan_direct_movable = -1;
+	// static uint32_t hash_pgscan_direct_normal = -1;
+	// static uint32_t hash_pgscan_kswapd_dma = -1;
+	// static uint32_t hash_pgscan_kswapd_dma32 = -1;
+	// static uint32_t hash_pgscan_kswapd_movable = -1;
+	// static uint32_t hash_pgscan_kswapd_normal = -1;
+	// static uint32_t hash_pgsteal_direct_dma = -1;
+	// static uint32_t hash_pgsteal_direct_dma32 = -1;
+	// static uint32_t hash_pgsteal_direct_movable = -1;
+	// static uint32_t hash_pgsteal_direct_normal = -1;
+	// static uint32_t hash_pgsteal_kswapd_dma = -1;
+	// static uint32_t hash_pgsteal_kswapd_dma32 = -1;
+	// static uint32_t hash_pgsteal_kswapd_movable = -1;
+	// static uint32_t hash_pgsteal_kswapd_normal = -1;
+	static uint32_t hash_pswpin = -1;
+	static uint32_t hash_pswpout = -1;
+	// static uint32_t hash_slabs_scanned = -1;
+	// static uint32_t hash_thp_collapse_alloc = -1;
+	// static uint32_t hash_thp_collapse_alloc_failed = -1;
+	// static uint32_t hash_thp_fault_alloc = -1;
+	// static uint32_t hash_thp_fault_fallback = -1;
+	// static uint32_t hash_thp_split = -1;
+	// static uint32_t hash_unevictable_pgs_cleared = -1;
+	// static uint32_t hash_unevictable_pgs_culled = -1;
+	// static uint32_t hash_unevictable_pgs_mlocked = -1;
+	// static uint32_t hash_unevictable_pgs_mlockfreed = -1;
+	// static uint32_t hash_unevictable_pgs_munlocked = -1;
+	// static uint32_t hash_unevictable_pgs_rescued = -1;
+	// static uint32_t hash_unevictable_pgs_scanned = -1;
+	// static uint32_t hash_unevictable_pgs_stranded = -1;
+
+	if(gen_hashes != 1) {
+		gen_hashes = 1;
+		// hash_allocstall = simple_hash("allocstall");
+		// hash_compact_blocks_moved = simple_hash("compact_blocks_moved");
+		// hash_compact_fail = simple_hash("compact_fail");
+		// hash_compact_pagemigrate_failed = simple_hash("compact_pagemigrate_failed");
+		// hash_compact_pages_moved = simple_hash("compact_pages_moved");
+		// hash_compact_stall = simple_hash("compact_stall");
+		// hash_compact_success = simple_hash("compact_success");
+		// hash_htlb_buddy_alloc_fail = simple_hash("htlb_buddy_alloc_fail");
+		// hash_htlb_buddy_alloc_success = simple_hash("htlb_buddy_alloc_success");
+		// hash_kswapd_high_wmark_hit_quickly = simple_hash("kswapd_high_wmark_hit_quickly");
+		// hash_kswapd_inodesteal = simple_hash("kswapd_inodesteal");
+		// hash_kswapd_low_wmark_hit_quickly = simple_hash("kswapd_low_wmark_hit_quickly");
+		// hash_kswapd_skip_congestion_wait = simple_hash("kswapd_skip_congestion_wait");
+		// hash_nr_active_anon = simple_hash("nr_active_anon");
+		// hash_nr_active_file = simple_hash("nr_active_file");
+		// hash_nr_anon_pages = simple_hash("nr_anon_pages");
+		// hash_nr_anon_transparent_hugepages = simple_hash("nr_anon_transparent_hugepages");
+		// hash_nr_bounce = simple_hash("nr_bounce");
+		// hash_nr_dirtied = simple_hash("nr_dirtied");
+		// hash_nr_dirty = simple_hash("nr_dirty");
+		// hash_nr_dirty_background_threshold = simple_hash("nr_dirty_background_threshold");
+		// hash_nr_dirty_threshold = simple_hash("nr_dirty_threshold");
+		// hash_nr_file_pages = simple_hash("nr_file_pages");
+		// hash_nr_free_pages = simple_hash("nr_free_pages");
+		// hash_nr_inactive_anon = simple_hash("nr_inactive_anon");
+		// hash_nr_inactive_file = simple_hash("nr_inactive_file");
+		// hash_nr_isolated_anon = simple_hash("nr_isolated_anon");
+		// hash_nr_isolated_file = simple_hash("nr_isolated_file");
+		// hash_nr_kernel_stack = simple_hash("nr_kernel_stack");
+		// hash_nr_mapped = simple_hash("nr_mapped");
+		// hash_nr_mlock = simple_hash("nr_mlock");
+		// hash_nr_page_table_pages = simple_hash("nr_page_table_pages");
+		// hash_nr_shmem = simple_hash("nr_shmem");
+		// hash_nr_slab_reclaimable = simple_hash("nr_slab_reclaimable");
+		// hash_nr_slab_unreclaimable = simple_hash("nr_slab_unreclaimable");
+		// hash_nr_unevictable = simple_hash("nr_unevictable");
+		// hash_nr_unstable = simple_hash("nr_unstable");
+		// hash_nr_vmscan_immediate_reclaim = simple_hash("nr_vmscan_immediate_reclaim");
+		// hash_nr_vmscan_write = simple_hash("nr_vmscan_write");
+		// hash_nr_writeback = simple_hash("nr_writeback");
+		// hash_nr_writeback_temp = simple_hash("nr_writeback_temp");
+		// hash_nr_written = simple_hash("nr_written");
+		// hash_pageoutrun = simple_hash("pageoutrun");
+		// hash_pgactivate = simple_hash("pgactivate");
+		// hash_pgalloc_dma = simple_hash("pgalloc_dma");
+		// hash_pgalloc_dma32 = simple_hash("pgalloc_dma32");
+		// hash_pgalloc_movable = simple_hash("pgalloc_movable");
+		// hash_pgalloc_normal = simple_hash("pgalloc_normal");
+		// hash_pgdeactivate = simple_hash("pgdeactivate");
+		hash_pgfault = simple_hash("pgfault");
+		// hash_pgfree = simple_hash("pgfree");
+		// hash_pginodesteal = simple_hash("pginodesteal");
+		hash_pgmajfault = simple_hash("pgmajfault");
+		hash_pgpgin = simple_hash("pgpgin");
+		hash_pgpgout = simple_hash("pgpgout");
+		// hash_pgrefill_dma = simple_hash("pgrefill_dma");
+		// hash_pgrefill_dma32 = simple_hash("pgrefill_dma32");
+		// hash_pgrefill_movable = simple_hash("pgrefill_movable");
+		// hash_pgrefill_normal = simple_hash("pgrefill_normal");
+		// hash_pgrotated = simple_hash("pgrotated");
+		// hash_pgscan_direct_dma = simple_hash("pgscan_direct_dma");
+		// hash_pgscan_direct_dma32 = simple_hash("pgscan_direct_dma32");
+		// hash_pgscan_direct_movable = simple_hash("pgscan_direct_movable");
+		// hash_pgscan_direct_normal = simple_hash("pgscan_direct_normal");
+		// hash_pgscan_kswapd_dma = simple_hash("pgscan_kswapd_dma");
+		// hash_pgscan_kswapd_dma32 = simple_hash("pgscan_kswapd_dma32");
+		// hash_pgscan_kswapd_movable = simple_hash("pgscan_kswapd_movable");
+		// hash_pgscan_kswapd_normal = simple_hash("pgscan_kswapd_normal");
+		// hash_pgsteal_direct_dma = simple_hash("pgsteal_direct_dma");
+		// hash_pgsteal_direct_dma32 = simple_hash("pgsteal_direct_dma32");
+		// hash_pgsteal_direct_movable = simple_hash("pgsteal_direct_movable");
+		// hash_pgsteal_direct_normal = simple_hash("pgsteal_direct_normal");
+		// hash_pgsteal_kswapd_dma = simple_hash("pgsteal_kswapd_dma");
+		// hash_pgsteal_kswapd_dma32 = simple_hash("pgsteal_kswapd_dma32");
+		// hash_pgsteal_kswapd_movable = simple_hash("pgsteal_kswapd_movable");
+		// hash_pgsteal_kswapd_normal = simple_hash("pgsteal_kswapd_normal");
+		hash_pswpin = simple_hash("pswpin");
+		hash_pswpout = simple_hash("pswpout");
+		// hash_slabs_scanned = simple_hash("slabs_scanned");
+		// hash_thp_collapse_alloc = simple_hash("thp_collapse_alloc");
+		// hash_thp_collapse_alloc_failed = simple_hash("thp_collapse_alloc_failed");
+		// hash_thp_fault_alloc = simple_hash("thp_fault_alloc");
+		// hash_thp_fault_fallback = simple_hash("thp_fault_fallback");
+		// hash_thp_split = simple_hash("thp_split");
+		// hash_unevictable_pgs_cleared = simple_hash("unevictable_pgs_cleared");
+		// hash_unevictable_pgs_culled = simple_hash("unevictable_pgs_culled");
+		// hash_unevictable_pgs_mlocked = simple_hash("unevictable_pgs_mlocked");
+		// hash_unevictable_pgs_mlockfreed = simple_hash("unevictable_pgs_mlockfreed");
+		// hash_unevictable_pgs_munlocked = simple_hash("unevictable_pgs_munlocked");
+		// hash_unevictable_pgs_rescued = simple_hash("unevictable_pgs_rescued");
+		// hash_unevictable_pgs_scanned = simple_hash("unevictable_pgs_scanned");
+		// hash_unevictable_pgs_stranded = simple_hash("unevictable_pgs_stranded");
+	}
 
 	if(do_swapio == -1)	do_swapio = config_get_boolean("plugin:proc:/proc/vmstat", "swap i/o", 1);
 	if(do_io == -1)		do_io = config_get_boolean("plugin:proc:/proc/vmstat", "disk i/o", 1);
@@ -39,19 +228,98 @@ int do_proc_vmstat(int update_every, unsigned long long dt) {
 	uint32_t lines = procfile_lines(ff), l;
 	uint32_t words;
 
-	unsigned long long nr_free_pages = 0, nr_inactive_anon = 0, nr_active_anon = 0, nr_inactive_file = 0, nr_active_file = 0, nr_unevictable = 0, nr_mlock = 0,
-		nr_anon_pages = 0, nr_mapped = 0, nr_file_pages = 0, nr_dirty = 0, nr_writeback = 0, nr_slab_reclaimable = 0, nr_slab_unreclaimable = 0, nr_page_table_pages = 0,
-		nr_kernel_stack = 0, nr_unstable = 0, nr_bounce = 0, nr_vmscan_write = 0, nr_vmscan_immediate_reclaim = 0, nr_writeback_temp = 0, nr_isolated_anon = 0, nr_isolated_file = 0,
-		nr_shmem = 0, nr_dirtied = 0, nr_written = 0, nr_anon_transparent_hugepages = 0, nr_dirty_threshold = 0, nr_dirty_background_threshold = 0,
-		pgpgin = 0, pgpgout = 0, pswpin = 0, pswpout = 0, pgalloc_dma = 0, pgalloc_dma32 = 0, pgalloc_normal = 0, pgalloc_movable = 0, pgfree = 0, pgactivate = 0, pgdeactivate = 0,
-		pgfault = 0, pgmajfault = 0, pgrefill_dma = 0, pgrefill_dma32 = 0, pgrefill_normal = 0, pgrefill_movable = 0, pgsteal_kswapd_dma = 0, pgsteal_kswapd_dma32 = 0,
-		pgsteal_kswapd_normal = 0, pgsteal_kswapd_movable = 0, pgsteal_direct_dma = 0, pgsteal_direct_dma32 = 0, pgsteal_direct_normal = 0, pgsteal_direct_movable = 0,
-		pgscan_kswapd_dma = 0, pgscan_kswapd_dma32 = 0, pgscan_kswapd_normal = 0, pgscan_kswapd_movable = 0, pgscan_direct_dma = 0, pgscan_direct_dma32 = 0, pgscan_direct_normal = 0,
-		pgscan_direct_movable = 0, pginodesteal = 0, slabs_scanned = 0, kswapd_inodesteal = 0, kswapd_low_wmark_hit_quickly = 0, kswapd_high_wmark_hit_quickly = 0,
-		kswapd_skip_congestion_wait = 0, pageoutrun = 0, allocstall = 0, pgrotated = 0, compact_blocks_moved = 0, compact_pages_moved = 0, compact_pagemigrate_failed = 0,
-		compact_stall = 0, compact_fail = 0, compact_success = 0, htlb_buddy_alloc_success = 0, htlb_buddy_alloc_fail = 0, unevictable_pgs_culled = 0, unevictable_pgs_scanned = 0,
-		unevictable_pgs_rescued = 0, unevictable_pgs_mlocked = 0, unevictable_pgs_munlocked = 0, unevictable_pgs_cleared = 0, unevictable_pgs_stranded = 0, unevictable_pgs_mlockfreed = 0,
-		thp_fault_alloc = 0, thp_fault_fallback = 0, thp_collapse_alloc = 0, thp_collapse_alloc_failed = 0, thp_split = 0;
+	// unsigned long long allocstall = 0ULL;
+	// unsigned long long compact_blocks_moved = 0ULL;
+	// unsigned long long compact_fail = 0ULL;
+	// unsigned long long compact_pagemigrate_failed = 0ULL;
+	// unsigned long long compact_pages_moved = 0ULL;
+	// unsigned long long compact_stall = 0ULL;
+	// unsigned long long compact_success = 0ULL;
+	// unsigned long long htlb_buddy_alloc_fail = 0ULL;
+	// unsigned long long htlb_buddy_alloc_success = 0ULL;
+	// unsigned long long kswapd_high_wmark_hit_quickly = 0ULL;
+	// unsigned long long kswapd_inodesteal = 0ULL;
+	// unsigned long long kswapd_low_wmark_hit_quickly = 0ULL;
+	// unsigned long long kswapd_skip_congestion_wait = 0ULL;
+	// unsigned long long nr_active_anon = 0ULL;
+	// unsigned long long nr_active_file = 0ULL;
+	// unsigned long long nr_anon_pages = 0ULL;
+	// unsigned long long nr_anon_transparent_hugepages = 0ULL;
+	// unsigned long long nr_bounce = 0ULL;
+	// unsigned long long nr_dirtied = 0ULL;
+	// unsigned long long nr_dirty = 0ULL;
+	// unsigned long long nr_dirty_background_threshold = 0ULL;
+	// unsigned long long nr_dirty_threshold = 0ULL;
+	// unsigned long long nr_file_pages = 0ULL;
+	// unsigned long long nr_free_pages = 0ULL;
+	// unsigned long long nr_inactive_anon = 0ULL;
+	// unsigned long long nr_inactive_file = 0ULL;
+	// unsigned long long nr_isolated_anon = 0ULL;
+	// unsigned long long nr_isolated_file = 0ULL;
+	// unsigned long long nr_kernel_stack = 0ULL;
+	// unsigned long long nr_mapped = 0ULL;
+	// unsigned long long nr_mlock = 0ULL;
+	// unsigned long long nr_page_table_pages = 0ULL;
+	// unsigned long long nr_shmem = 0ULL;
+	// unsigned long long nr_slab_reclaimable = 0ULL;
+	// unsigned long long nr_slab_unreclaimable = 0ULL;
+	// unsigned long long nr_unevictable = 0ULL;
+	// unsigned long long nr_unstable = 0ULL;
+	// unsigned long long nr_vmscan_immediate_reclaim = 0ULL;
+	// unsigned long long nr_vmscan_write = 0ULL;
+	// unsigned long long nr_writeback = 0ULL;
+	// unsigned long long nr_writeback_temp = 0ULL;
+	// unsigned long long nr_written = 0ULL;
+	// unsigned long long pageoutrun = 0ULL;
+	// unsigned long long pgactivate = 0ULL;
+	// unsigned long long pgalloc_dma = 0ULL;
+	// unsigned long long pgalloc_dma32 = 0ULL;
+	// unsigned long long pgalloc_movable = 0ULL;
+	// unsigned long long pgalloc_normal = 0ULL;
+	// unsigned long long pgdeactivate = 0ULL;
+	unsigned long long pgfault = 0ULL;
+	// unsigned long long pgfree = 0ULL;
+	// unsigned long long pginodesteal = 0ULL;
+	unsigned long long pgmajfault = 0ULL;
+	unsigned long long pgpgin = 0ULL;
+	unsigned long long pgpgout = 0ULL;
+	// unsigned long long pgrefill_dma = 0ULL;
+	// unsigned long long pgrefill_dma32 = 0ULL;
+	// unsigned long long pgrefill_movable = 0ULL;
+	// unsigned long long pgrefill_normal = 0ULL;
+	// unsigned long long pgrotated = 0ULL;
+	// unsigned long long pgscan_direct_dma = 0ULL;
+	// unsigned long long pgscan_direct_dma32 = 0ULL;
+	// unsigned long long pgscan_direct_movable = 0ULL;
+	// unsigned long long pgscan_direct_normal = 0ULL;
+	// unsigned long long pgscan_kswapd_dma = 0ULL;
+	// unsigned long long pgscan_kswapd_dma32 = 0ULL;
+	// unsigned long long pgscan_kswapd_movable = 0ULL;
+	// unsigned long long pgscan_kswapd_normal = 0ULL;
+	// unsigned long long pgsteal_direct_dma = 0ULL;
+	// unsigned long long pgsteal_direct_dma32 = 0ULL;
+	// unsigned long long pgsteal_direct_movable = 0ULL;
+	// unsigned long long pgsteal_direct_normal = 0ULL;
+	// unsigned long long pgsteal_kswapd_dma = 0ULL;
+	// unsigned long long pgsteal_kswapd_dma32 = 0ULL;
+	// unsigned long long pgsteal_kswapd_movable = 0ULL;
+	// unsigned long long pgsteal_kswapd_normal = 0ULL;
+	unsigned long long pswpin = 0ULL;
+	unsigned long long pswpout = 0ULL;
+	// unsigned long long slabs_scanned = 0ULL;
+	// unsigned long long thp_collapse_alloc = 0ULL;
+	// unsigned long long thp_collapse_alloc_failed = 0ULL;
+	// unsigned long long thp_fault_alloc = 0ULL;
+	// unsigned long long thp_fault_fallback = 0ULL;
+	// unsigned long long thp_split = 0ULL;
+	// unsigned long long unevictable_pgs_cleared = 0ULL;
+	// unsigned long long unevictable_pgs_culled = 0ULL;
+	// unsigned long long unevictable_pgs_mlocked = 0ULL;
+	// unsigned long long unevictable_pgs_mlockfreed = 0ULL;
+	// unsigned long long unevictable_pgs_munlocked = 0ULL;
+	// unsigned long long unevictable_pgs_rescued = 0ULL;
+	// unsigned long long unevictable_pgs_scanned = 0ULL;
+	// unsigned long long unevictable_pgs_stranded = 0ULL;
 
 	for(l = 0; l < lines ;l++) {
 		words = procfile_linewords(ff, l);
@@ -61,154 +329,156 @@ int do_proc_vmstat(int update_every, unsigned long long dt) {
 		}
 
 		char *name = procfile_lineword(ff, l, 0);
-		unsigned long long value = strtoull(procfile_lineword(ff, l, 1), NULL, 10);
-
-		     if(!nr_free_pages && strcmp(name, "nr_free_pages") == 0) nr_free_pages = value;
-		else if(!nr_inactive_anon && strcmp(name, "nr_inactive_anon") == 0) nr_inactive_anon = value;
-		else if(!nr_active_anon && strcmp(name, "nr_active_anon") == 0) nr_active_anon = value;
-		else if(!nr_inactive_file && strcmp(name, "nr_inactive_file") == 0) nr_inactive_file = value;
-		else if(!nr_active_file && strcmp(name, "nr_active_file") == 0) nr_active_file = value;
-		else if(!nr_unevictable && strcmp(name, "nr_unevictable") == 0) nr_unevictable = value;
-		else if(!nr_mlock && strcmp(name, "nr_mlock") == 0) nr_mlock = value;
-		else if(!nr_anon_pages && strcmp(name, "nr_anon_pages") == 0) nr_anon_pages = value;
-		else if(!nr_mapped && strcmp(name, "nr_mapped") == 0) nr_mapped = value;
-		else if(!nr_file_pages && strcmp(name, "nr_file_pages") == 0) nr_file_pages = value;
-		else if(!nr_dirty && strcmp(name, "nr_dirty") == 0) nr_dirty = value;
-		else if(!nr_writeback && strcmp(name, "nr_writeback") == 0) nr_writeback = value;
-		else if(!nr_slab_reclaimable && strcmp(name, "nr_slab_reclaimable") == 0) nr_slab_reclaimable = value;
-		else if(!nr_slab_unreclaimable && strcmp(name, "nr_slab_unreclaimable") == 0) nr_slab_unreclaimable = value;
-		else if(!nr_page_table_pages && strcmp(name, "nr_page_table_pages") == 0) nr_page_table_pages = value;
-		else if(!nr_kernel_stack && strcmp(name, "nr_kernel_stack") == 0) nr_kernel_stack = value;
-		else if(!nr_unstable && strcmp(name, "nr_unstable") == 0) nr_unstable = value;
-		else if(!nr_bounce && strcmp(name, "nr_bounce") == 0) nr_bounce = value;
-		else if(!nr_vmscan_write && strcmp(name, "nr_vmscan_write") == 0) nr_vmscan_write = value;
-		else if(!nr_vmscan_immediate_reclaim && strcmp(name, "nr_vmscan_immediate_reclaim") == 0) nr_vmscan_immediate_reclaim = value;
-		else if(!nr_writeback_temp && strcmp(name, "nr_writeback_temp") == 0) nr_writeback_temp = value;
-		else if(!nr_isolated_anon && strcmp(name, "nr_isolated_anon") == 0) nr_isolated_anon = value;
-		else if(!nr_isolated_file && strcmp(name, "nr_isolated_file") == 0) nr_isolated_file = value;
-		else if(!nr_shmem && strcmp(name, "nr_shmem") == 0) nr_shmem = value;
-		else if(!nr_dirtied && strcmp(name, "nr_dirtied") == 0) nr_dirtied = value;
-		else if(!nr_written && strcmp(name, "nr_written") == 0) nr_written = value;
-		else if(!nr_anon_transparent_hugepages && strcmp(name, "nr_anon_transparent_hugepages") == 0) nr_anon_transparent_hugepages = value;
-		else if(!nr_dirty_threshold && strcmp(name, "nr_dirty_threshold") == 0) nr_dirty_threshold = value;
-		else if(!nr_dirty_background_threshold && strcmp(name, "nr_dirty_background_threshold") == 0) nr_dirty_background_threshold = value;
-		else if(!pgpgin && strcmp(name, "pgpgin") == 0) pgpgin = value;
-		else if(!pgpgout && strcmp(name, "pgpgout") == 0) pgpgout = value;
-		else if(!pswpin && strcmp(name, "pswpin") == 0) pswpin = value;
-		else if(!pswpout && strcmp(name, "pswpout") == 0) pswpout = value;
-		else if(!pgalloc_dma && strcmp(name, "pgalloc_dma") == 0) pgalloc_dma = value;
-		else if(!pgalloc_dma32 && strcmp(name, "pgalloc_dma32") == 0) pgalloc_dma32 = value;
-		else if(!pgalloc_normal && strcmp(name, "pgalloc_normal") == 0) pgalloc_normal = value;
-		else if(!pgalloc_movable && strcmp(name, "pgalloc_movable") == 0) pgalloc_movable = value;
-		else if(!pgfree && strcmp(name, "pgfree") == 0) pgfree = value;
-		else if(!pgactivate && strcmp(name, "pgactivate") == 0) pgactivate = value;
-		else if(!pgdeactivate && strcmp(name, "pgdeactivate") == 0) pgdeactivate = value;
-		else if(!pgfault && strcmp(name, "pgfault") == 0) pgfault = value;
-		else if(!pgmajfault && strcmp(name, "pgmajfault") == 0) pgmajfault = value;
-		else if(!pgrefill_dma && strcmp(name, "pgrefill_dma") == 0) pgrefill_dma = value;
-		else if(!pgrefill_dma32 && strcmp(name, "pgrefill_dma32") == 0) pgrefill_dma32 = value;
-		else if(!pgrefill_normal && strcmp(name, "pgrefill_normal") == 0) pgrefill_normal = value;
-		else if(!pgrefill_movable && strcmp(name, "pgrefill_movable") == 0) pgrefill_movable = value;
-		else if(!pgsteal_kswapd_dma && strcmp(name, "pgsteal_kswapd_dma") == 0) pgsteal_kswapd_dma = value;
-		else if(!pgsteal_kswapd_dma32 && strcmp(name, "pgsteal_kswapd_dma32") == 0) pgsteal_kswapd_dma32 = value;
-		else if(!pgsteal_kswapd_normal && strcmp(name, "pgsteal_kswapd_normal") == 0) pgsteal_kswapd_normal = value;
-		else if(!pgsteal_kswapd_movable && strcmp(name, "pgsteal_kswapd_movable") == 0) pgsteal_kswapd_movable = value;
-		else if(!pgsteal_direct_dma && strcmp(name, "pgsteal_direct_dma") == 0) pgsteal_direct_dma = value;
-		else if(!pgsteal_direct_dma32 && strcmp(name, "pgsteal_direct_dma32") == 0) pgsteal_direct_dma32 = value;
-		else if(!pgsteal_direct_normal && strcmp(name, "pgsteal_direct_normal") == 0) pgsteal_direct_normal = value;
-		else if(!pgsteal_direct_movable && strcmp(name, "pgsteal_direct_movable") == 0) pgsteal_direct_movable = value;
-		else if(!pgscan_kswapd_dma && strcmp(name, "pgscan_kswapd_dma") == 0) pgscan_kswapd_dma = value;
-		else if(!pgscan_kswapd_dma32 && strcmp(name, "pgscan_kswapd_dma32") == 0) pgscan_kswapd_dma32 = value;
-		else if(!pgscan_kswapd_normal && strcmp(name, "pgscan_kswapd_normal") == 0) pgscan_kswapd_normal = value;
-		else if(!pgscan_kswapd_movable && strcmp(name, "pgscan_kswapd_movable") == 0) pgscan_kswapd_movable = value;
-		else if(!pgscan_direct_dma && strcmp(name, "pgscan_direct_dma") == 0) pgscan_direct_dma = value;
-		else if(!pgscan_direct_dma32 && strcmp(name, "pgscan_direct_dma32") == 0) pgscan_direct_dma32 = value;
-		else if(!pgscan_direct_normal && strcmp(name, "pgscan_direct_normal") == 0) pgscan_direct_normal = value;
-		else if(!pgscan_direct_movable && strcmp(name, "pgscan_direct_movable") == 0) pgscan_direct_movable = value;
-		else if(!pginodesteal && strcmp(name, "pginodesteal") == 0) pginodesteal = value;
-		else if(!slabs_scanned && strcmp(name, "slabs_scanned") == 0) slabs_scanned = value;
-		else if(!kswapd_inodesteal && strcmp(name, "kswapd_inodesteal") == 0) kswapd_inodesteal = value;
-		else if(!kswapd_low_wmark_hit_quickly && strcmp(name, "kswapd_low_wmark_hit_quickly") == 0) kswapd_low_wmark_hit_quickly = value;
-		else if(!kswapd_high_wmark_hit_quickly && strcmp(name, "kswapd_high_wmark_hit_quickly") == 0) kswapd_high_wmark_hit_quickly = value;
-		else if(!kswapd_skip_congestion_wait && strcmp(name, "kswapd_skip_congestion_wait") == 0) kswapd_skip_congestion_wait = value;
-		else if(!pageoutrun && strcmp(name, "pageoutrun") == 0) pageoutrun = value;
-		else if(!allocstall && strcmp(name, "allocstall") == 0) allocstall = value;
-		else if(!pgrotated && strcmp(name, "pgrotated") == 0) pgrotated = value;
-		else if(!compact_blocks_moved && strcmp(name, "compact_blocks_moved") == 0) compact_blocks_moved = value;
-		else if(!compact_pages_moved && strcmp(name, "compact_pages_moved") == 0) compact_pages_moved = value;
-		else if(!compact_pagemigrate_failed && strcmp(name, "compact_pagemigrate_failed") == 0) compact_pagemigrate_failed = value;
-		else if(!compact_stall && strcmp(name, "compact_stall") == 0) compact_stall = value;
-		else if(!compact_fail && strcmp(name, "compact_fail") == 0) compact_fail = value;
-		else if(!compact_success && strcmp(name, "compact_success") == 0) compact_success = value;
-		else if(!htlb_buddy_alloc_success && strcmp(name, "htlb_buddy_alloc_success") == 0) htlb_buddy_alloc_success = value;
-		else if(!htlb_buddy_alloc_fail && strcmp(name, "htlb_buddy_alloc_fail") == 0) htlb_buddy_alloc_fail = value;
-		else if(!unevictable_pgs_culled && strcmp(name, "unevictable_pgs_culled") == 0) unevictable_pgs_culled = value;
-		else if(!unevictable_pgs_scanned && strcmp(name, "unevictable_pgs_scanned") == 0) unevictable_pgs_scanned = value;
-		else if(!unevictable_pgs_rescued && strcmp(name, "unevictable_pgs_rescued") == 0) unevictable_pgs_rescued = value;
-		else if(!unevictable_pgs_mlocked && strcmp(name, "unevictable_pgs_mlocked") == 0) unevictable_pgs_mlocked = value;
-		else if(!unevictable_pgs_munlocked && strcmp(name, "unevictable_pgs_munlocked") == 0) unevictable_pgs_munlocked = value;
-		else if(!unevictable_pgs_cleared && strcmp(name, "unevictable_pgs_cleared") == 0) unevictable_pgs_cleared = value;
-		else if(!unevictable_pgs_stranded && strcmp(name, "unevictable_pgs_stranded") == 0) unevictable_pgs_stranded = value;
-		else if(!unevictable_pgs_mlockfreed && strcmp(name, "unevictable_pgs_mlockfreed") == 0) unevictable_pgs_mlockfreed = value;
-		else if(!thp_fault_alloc && strcmp(name, "thp_fault_alloc") == 0) thp_fault_alloc = value;
-		else if(!thp_fault_fallback && strcmp(name, "thp_fault_fallback") == 0) thp_fault_fallback = value;
-		else if(!thp_collapse_alloc && strcmp(name, "thp_collapse_alloc") == 0) thp_collapse_alloc = value;
-		else if(!thp_collapse_alloc_failed && strcmp(name, "thp_collapse_alloc_failed") == 0) thp_collapse_alloc_failed = value;
-		else if(!thp_split && strcmp(name, "thp_split") == 0) thp_split = value;
-	}
+		char * value = procfile_lineword(ff, l, 1);
+		if(!name || !*name || !value || !*value) continue;
+
+		uint32_t hash = simple_hash(name);
 
-	RRDSET *st;
+		if(0) ;
+		// else if(hash == hash_allocstall && strcmp(name, "allocstall") == 0) allocstall = strtoull(value, NULL, 10);
+		// else if(hash == hash_compact_blocks_moved && strcmp(name, "compact_blocks_moved") == 0) compact_blocks_moved = strtoull(value, NULL, 10);
+		// else if(hash == hash_compact_fail && strcmp(name, "compact_fail") == 0) compact_fail = strtoull(value, NULL, 10);
+		// else if(hash == hash_compact_pagemigrate_failed && strcmp(name, "compact_pagemigrate_failed") == 0) compact_pagemigrate_failed = strtoull(value, NULL, 10);
+		// else if(hash == hash_compact_pages_moved && strcmp(name, "compact_pages_moved") == 0) compact_pages_moved = strtoull(value, NULL, 10);
+		// else if(hash == hash_compact_stall && strcmp(name, "compact_stall") == 0) compact_stall = strtoull(value, NULL, 10);
+		// else if(hash == hash_compact_success && strcmp(name, "compact_success") == 0) compact_success = strtoull(value, NULL, 10);
+		// else if(hash == hash_htlb_buddy_alloc_fail && strcmp(name, "htlb_buddy_alloc_fail") == 0) htlb_buddy_alloc_fail = strtoull(value, NULL, 10);
+		// else if(hash == hash_htlb_buddy_alloc_success && strcmp(name, "htlb_buddy_alloc_success") == 0) htlb_buddy_alloc_success = strtoull(value, NULL, 10);
+		// else if(hash == hash_kswapd_high_wmark_hit_quickly && strcmp(name, "kswapd_high_wmark_hit_quickly") == 0) kswapd_high_wmark_hit_quickly = strtoull(value, NULL, 10);
+		// else if(hash == hash_kswapd_inodesteal && strcmp(name, "kswapd_inodesteal") == 0) kswapd_inodesteal = strtoull(value, NULL, 10);
+		// else if(hash == hash_kswapd_low_wmark_hit_quickly && strcmp(name, "kswapd_low_wmark_hit_quickly") == 0) kswapd_low_wmark_hit_quickly = strtoull(value, NULL, 10);
+		// else if(hash == hash_kswapd_skip_congestion_wait && strcmp(name, "kswapd_skip_congestion_wait") == 0) kswapd_skip_congestion_wait = strtoull(value, NULL, 10);
+		// else if(hash == hash_nr_active_anon && strcmp(name, "nr_active_anon") == 0) nr_active_anon = strtoull(value, NULL, 10);
+		// else if(hash == hash_nr_active_file && strcmp(name, "nr_active_file") == 0) nr_active_file = strtoull(value, NULL, 10);
+		// else if(hash == hash_nr_anon_pages && strcmp(name, "nr_anon_pages") == 0) nr_anon_pages = strtoull(value, NULL, 10);
+		// else if(hash == hash_nr_anon_transparent_hugepages && strcmp(name, "nr_anon_transparent_hugepages") == 0) nr_anon_transparent_hugepages = strtoull(value, NULL, 10);
+		// else if(hash == hash_nr_bounce && strcmp(name, "nr_bounce") == 0) nr_bounce = strtoull(value, NULL, 10);
+		// else if(hash == hash_nr_dirtied && strcmp(name, "nr_dirtied") == 0) nr_dirtied = strtoull(value, NULL, 10);
+		// else if(hash == hash_nr_dirty && strcmp(name, "nr_dirty") == 0) nr_dirty = strtoull(value, NULL, 10);
+		// else if(hash == hash_nr_dirty_background_threshold && strcmp(name, "nr_dirty_background_threshold") == 0) nr_dirty_background_threshold = strtoull(value, NULL, 10);
+		// else if(hash == hash_nr_dirty_threshold && strcmp(name, "nr_dirty_threshold") == 0) nr_dirty_threshold = strtoull(value, NULL, 10);</