From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 21 Nov 2006 17:14:36 +0000 (+0100)
Subject: Merge branch 'ff/dns'
X-Git-Tag: collectd-3.11.0~42
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=27f7e9a53a309c23143691c37e50727a5f0e2386;p=collectd.git

Merge branch 'ff/dns'

Conflicts:

	configure.in
	contrib/collection.cgi
---

27f7e9a53a309c23143691c37e50727a5f0e2386
diff --cc configure.in
index 1cbdc725,d2aff865..cfce3805
--- a/configure.in
+++ b/configure.in
@@@ -272,9 -272,9 +272,12 @@@ AC_CHECK_HEADERS(kvm.h
  # For debugging interface (variable number of arguments)
  AC_CHECK_HEADERS(stdarg.h)
  
 +# Regular expressions for the ignorelist.
 +AC_CHECK_HEADERS(regex.h)
 +
+ # For the dns plugin
+ AC_CHECK_HEADERS(arpa/nameser.h)
+ 
  dnl Checking for libraries
  AC_CHECK_LIB(m, ext)
  
diff --cc contrib/collection.cgi
index a7f63fd4,2c769419..ddf44653
--- a/contrib/collection.cgi
+++ b/contrib/collection.cgi
@@@ -1058,7 -1117,8 +1117,8 @@@ our $GraphArgs 
  	delay => ['-t', 'NTPd peer delay ({inst})', '-v', 'Seconds'],
  	df => ['-t', '{host}:{inst} usage', '-v', 'Percent', '-l', '0'],
  	disk => ['-t', '{host} disk {inst} usage', '-v', 'Byte/s'],
+ 	dns_traffic => ['-t', '{host} DNS traffic', '-v', 'Bit/s'],
 -	fanspeed => ['-t', '{host} fanspeed {inst}', '-v', 'rpm'],
 +	fanspeed => ['-t', '{host} fanspeed {inst}', '-v', 'RPM'],
  	frequency_offset => ['-t', 'NTPd frequency offset ({inst})', '-v', 'Parts per million'],
  	hddtemp => ['-t', '{host} hdd temperature {inst}', '-v', '°Celsius'],
  	if_errors => ['-t', '{host} {inst} errors', '-v', 'Errors/s'],