Merge pull request #42 from rshivane/apptuit-master

Support for collecting metrics over UDP

collectors/etc/udp_bridge_conf.py

@@ -4,7 +4,7 @@ def enabled():
   return True
 
 def flush_delay():
-  return 60
+  return 15
 
 def usetcp():
   return False

deb/Makefile

@@ -45,13 +45,15 @@ deb:
 	cp $(VPATH)/collectors/0/netstat.py build/usr/local/xcollector/collectors/0/
 	cp $(VPATH)/collectors/0/procnettcp.py build/usr/local/xcollector/collectors/0/
 	cp $(VPATH)/collectors/0/procstats.py build/usr/local/xcollector/collectors/0/
+	cp $(VPATH)/collectors/0/udp_bridge.py build/usr/local/xcollector/collectors/0/
 	cp $(VPATH)/collectors/__init__.py build/usr/local/xcollector/collectors/
 	cp $(VPATH)/collectors/etc/__init__.py build/usr/local/xcollector/collectors/etc/
 	cp $(VPATH)/collectors/etc/config.py build/usr/local/xcollector/collectors/etc/
 	cp $(VPATH)/collectors/etc/grok_scraper_conf.py build/usr/local/xcollector/collectors/etc/
 	cp $(VPATH)/collectors/etc/metric_naming.py build/usr/local/xcollector/collectors/etc/
 	cp $(VPATH)/collectors/etc/mysqlconf.py build/usr/local/xcollector/collectors/etc/
 	cp $(VPATH)/collectors/etc/yaml_conf.py build/usr/local/xcollector/collectors/etc/
+	cp $(VPATH)/collectors/etc/udp_bridge_conf.py build/usr/local/xcollector/collectors/etc/
 	cp $(VPATH)/collectors/lib/__init__.py build/usr/local/xcollector/collectors/lib/
 	cp $(VPATH)/collectors/lib/utils.py build/usr/local/xcollector/collectors/lib/
 	cp $(VPATH)/conf/*.yml build/usr/local/xcollector/conf/

rpm/xcollector.spec

@@ -92,6 +92,7 @@ mkdir -p %{buildroot}/%{py2_sitelib}/
 #%{tcollectordir}/collectors/etc/postgresqlconf.py
 #%{tcollectordir}/collectors/etc/udp_bridge_conf.py
 #%{tcollectordir}/collectors/etc/zabbix_bridge_conf.py
+%{tcollectordir}/collectors/etc/udp_bridge_conf.py
 %{tcollectordir}/conf/grok.yml %config
 %{tcollectordir}/conf/grok_nginx.yml %config
 %{tcollectordir}/conf/grok_tomcat.yml %config
@@ -108,6 +109,7 @@ mkdir -p %{buildroot}/%{py2_sitelib}/
 %{tcollectordir}/collectors/0/netstat.py
 %{tcollectordir}/collectors/0/procnettcp.py
 %{tcollectordir}/collectors/0/procstats.py
+%{tcollectordir}/collectors/0/udp_bridge.py
 #%{tcollectordir}/collectors/0/smart_stats.py
 %{tcollectordir}/collectors/0/mysql.py
 %{tcollectordir}/collectors/0/memcache.py