Update config from upstream

conf/monitorix.conf

@@ -79,6 +79,8 @@ secure_log_date_format = %b %e
     hptemp          = n
     lmsens          = n
     gensens         = n
+    ipmi            = n
+    ambsens         = n
     nvidia          = n
     disk            = n
     fs              = y
@@ -98,12 +100,14 @@ secure_log_date_format = %b %e
     nginx           = y
     lighttpd        = n
     mysql           = y
+    mongodb         = n
     varnish         = n
     pagespeed       = n
     squid           = n
     nfss            = n
     nfsc            = n
     bind            = n
+    unbound         = n
     ntp             = n
     chrony          = n
     fail2ban        = y
@@ -111,6 +115,7 @@ secure_log_date_format = %b %e
     raspberrypi     = n
     phpapc          = n
     memcached       = n
+    phpfpm          = n
     apcupsd         = n
     nut             = n
     wowza           = n
@@ -817,7 +822,7 @@ logo_bottom = logo_bot.png
 	remote	= 300x100
 </graph_size>
 
-graph_name = system, kern, proc, hptemp, lmsens, gensens, nvidia, disk, fs, zfs, du, net, netstat, tc, libvirt, process, serv, mail, port, user, ftp, apache, nginx, lighttpd, mysql, varnish, pagespeed, squid, nfss, nfsc, bind, ntp, chrony, fail2ban, icecast, raspberrypi, phpapc, memcached, apcupsd, nut, wowza, int, verlihub
+graph_name = system, kern, proc, hptemp, lmsens, gensens, ipmi, ambsens, nvidia, disk, fs, zfs, du, net, netstat, tc, libvirt, process, serv, mail, port, user, ftp, apache, nginx, lighttpd, mysql, mongodb, varnish, pagespeed, squid, nfss, nfsc, bind, unbound, ntp, chrony, fail2ban, icecast, raspberrypi, phpapc, memcached, phpfpm, apcupsd, nut, wowza, int, verlihub
 
 <graph_title>
 	system		= System load average and usage
@@ -826,6 +831,8 @@ graph_name = system, kern, proc, hptemp, lmsens, gensens, nvidia, disk, fs, zfs,
 	hptemp		= HP ProLiant System Health
 	lmsens		= LM-Sensors and GPU temperatures
 	gensens		= Generic sensor statistics
+	ipmi		= IPMI sensor statistics
+	ambsens		= Ambient sensor statistics
 	nvidia		= NVIDIA temperatures and usage
 	disk		= Disk drive temperatures and health
 	fs		= Filesystem usage and I/O activity
@@ -845,12 +852,14 @@ graph_name = system, kern, proc, hptemp, lmsens, gensens, nvidia, disk, fs, zfs,
 	nginx		= Nginx statistics
 	lighttpd	= Lighttpd statistics
 	mysql		= MySQL statistics
+	mongodb		= MongoDB statistics
 	varnish		= Varnish statistics
 	pagespeed	= PageSpeed statistics
 	squid		= Squid statistics
 	nfss		= NFS server statistics
 	nfsc		= NFS client statistics
 	bind		= BIND statistics
+	unbound		= Unbound statistics
 	ntp		= NTP statistics
 	chrony		= Chrony statistics
 	fail2ban	= Fail2ban statistics
@@ -858,6 +867,7 @@ graph_name = system, kern, proc, hptemp, lmsens, gensens, nvidia, disk, fs, zfs,
 	raspberrypi	= Raspberry Pi sensor statistics
 	phpapc		= Alternative PHP Cache statistics
 	memcached	= Memcached statistics
+	phpfpm		= PHP-FPM statistics
 	apcupsd		= APC UPS statistics
 	nut		= Network UPS Tools statistics
 	wowza		= Wowza Media Server
@@ -867,8 +877,10 @@ graph_name = system, kern, proc, hptemp, lmsens, gensens, nvidia, disk, fs, zfs,
 
 <graphs>
 	_system1	= System load
-	_system2	= Active processes
+	_system2	= Memory allocation
-	_system3	= Memory allocation
+	_system3	= Active processes
+	_system4	= Entropy
+	_system5	= Uptime
 	_kern1		= Kernel usage
 	_kern2		= Context switches and forks
 	_kern3		= VFS usage
@@ -881,8 +893,9 @@ graph_name = system, kern, proc, hptemp, lmsens, gensens, nvidia, disk, fs, zfs,
 	_lmsens3	= MB and CPU temperatures
 	_lmsens4	= Fan speeds
 	_lmsens5	= GPU temperatures
-	_gensens1	= Temperatures
+	_gensens	= Generic sensors
-	_gensens2	= CPU frequency
+	_ipmi		= IPMI sensors
+	_ambsens	= Ambient sensors
 	_nvidia1	= NVIDIA temperatures
 	_nvidia2	= CPU usage
 	_nvidia3	= Memory usage
@@ -898,6 +911,8 @@ graph_name = system, kern, proc, hptemp, lmsens, gensens, nvidia, disk, fs, zfs,
 	_zfs3		= L2ARC cache
 	_zfs4		= Pool data usage
 	_zfs5		= Pool usage
+	_zfs6		= Operations
+	_zfs7		= Bandwidth
 	_du		= Directory usage
 	_net1		= Network traffic
 	_net2		= Network packets
@@ -957,6 +972,12 @@ graph_name = system, kern, proc, hptemp, lmsens, gensens, nvidia, disk, fs, zfs,
 	_mysql4		= MySQL queries
 	_mysql5		= MySQL connections
 	_mysql6		= MySQL traffic
+	_mongodb1	= MongoDB operations
+	_mongodb2	= MongoDB metrics document
+	_mongodb3	= MongoDB write performance
+	_mongodb4	= MongoDB connections
+	_mongodb5	= MongoDB requests & asserts
+	_mongodb6	= MongoDB traffic
 	_varnish1	= Varnish statistics
 	_varnish2	= Backend usage
 	_varnish3	= Client connections
@@ -1002,6 +1023,16 @@ graph_name = system, kern, proc, hptemp, lmsens, gensens, nvidia, disk, fs, zfs,
 	_bind5		= Cache DB RRsets (_default)
 	_bind6		= Memory usage
 	_bind7		= Task manager
+	_unbound1	= Queries and cache
+	_unbound2	= Queries by type
+	_unbound3	= Recursion time
+	_unbound4	= Uptime
+	_unbound5	= Specific traffic
+	_unbound6	= Memory usage
+	_unbound7	= Answers by type
+	_unbound8	= Queries by flags
+	_unbound9	= Less than 1s resolving time
+	_unbound10	= More than 1s resolving time
 	_ntp1		= NTP timing stats
 	_ntp2		= Stratum level
 	_ntp3		= Codes
@@ -1027,6 +1058,12 @@ graph_name = system, kern, proc, hptemp, lmsens, gensens, nvidia, disk, fs, zfs,
 	_memcached5	= Objects I/O
 	_memcached6	= Connections
 	_memcached7	= Memcached traffic
+	_phpfpm1	= Accepted connections
+	_phpfpm2	= Active processes
+	_phpfpm3	= Listen queue
+	_phpfpm4	= Total processes
+	_phpfpm5	= Max. children reached
+	_phpfpm6	= Slow requests
 	_apcupsd1	= Line voltage
 	_apcupsd2	= Battery charge
 	_apcupsd3	= Temperatures