Merge branch 'custom-receivers'

Author: lomik

.gitmodules

@@ -19,3 +19,15 @@
 [submodule "vendor/github.com/sevlyar/go-daemon"]
 	path = vendor/github.com/sevlyar/go-daemon
 	url = https://github.com/sevlyar/go-daemon
+[submodule "vendor/github.com/uber-go/zap"]
+	path = vendor/github.com/uber-go/zap
+	url = https://github.com/uber-go/zap
+[submodule "vendor/github.com/lomik/zapwriter"]
+	path = vendor/github.com/lomik/zapwriter
+	url = https://github.com/lomik/zapwriter
+[submodule "vendor/github.com/lomik/stop"]
+	path = vendor/github.com/lomik/stop
+	url = https://github.com/lomik/stop
+[submodule "vendor/github.com/uber-go/atomic"]
+	path = vendor/github.com/uber-go/atomic
+	url = https://github.com/uber-go/atomic

Makefile

@@ -14,7 +14,7 @@ submodules:
 	git submodule update --recursive
 
 $(NAME):
-	$(GO) build $(NAME).go
+	$(GO) build github.com/lomik/$(NAME)
 
 gox-build:
 	rm -rf out
@@ -59,4 +59,4 @@ fpm-build-rpm:
 		--config-files /etc/$(NAME)/$(NAME).conf \
 		out/$(NAME)-linux-$(ARCH)=/usr/bin/$(NAME) \
 		deploy/systemd/$(NAME).service=/usr/lib/systemd/system/$(NAME).service \
-		out/root/=/
+		out/root/=/

README.md

@@ -51,10 +51,6 @@ Usage of carbon-clickhouse:
 
 ```toml
 [common]
-# If logfile is empty use stderr
-logfile = "/var/log/carbon-clickhouse/carbon-clickhouse.log"
-# Logging error level. Valid values: "debug", "info", "warn", "warning", "error"
-loglevel = "info"
 # Prefix for store all internal carbon-clickhouse graphs. Supported macroses: {host}
 metric-prefix = "carbon.agents.{host}"
 # Endpoint for store internal carbon metrics. Valid values: "" or "local", "tcp://host:port", "udp://host:port"
@@ -64,6 +60,12 @@ metric-interval = "1m0s"
 # GOMAXPROCS
 max-cpu = 1
 
+[logging]
+# "stderr", "stdout" can be used as file name
+file = "/var/log/carbon-clickhouse/carbon-clickhouse.log"
+# Logging error level. Valid values: "debug", "info", "warn" "error"
+level = "info"
+
 [clickhouse]
 # Url to ClickHouse http port. 
 url = "http://localhost:8123/"
@@ -82,27 +84,18 @@ tree-timeout = "1m0s"
 # Folder for buffering received data
 path = "/data/carbon-clickhouse/"
 # Internal queue size between receiver and writer to files
-input-buffer = 1048576
-# Rotate (and upload) file every N bytes
-chunk-bytes = 134217728
-# And every interval seconds.
+# Rotate (and upload) file interval.
 # Minimize chunk-interval for minimize lag between point receive and store
 chunk-interval = "1s"
 
 [udp]
 listen = ":2003"
 enabled = true
-log-incomplete = false
 
 [tcp]
 listen = ":2003"
 enabled = true
 
-[pickle]
-listen = ":2004"
-max-message-size = 67108864
-enabled = true
-
 [pprof]
 listen = "localhost:7007"
 enabled = false

_vendor/src/github.com/Sirupsen

@@ -0,0 +1 @@
+../../../../vendor/github.com/lomik/stop

_vendor/src/github.com/howeyc

@@ -0,0 +1 @@
+../../../../vendor/github.com/lomik/zapwriter