fix docker build (ClickHouse#24)

Dockerfile

@@ -1,4 +1,19 @@
-FROM        sdurrheimer/alpine-golang-make-onbuild
-MAINTAINER  Yegor Andreenko
+FROM golang:1.11 AS BUILD
 
-EXPOSE     9116
+MAINTAINER  Roman Tkalenko
+
+ADD . /go/src/github.com/f1yegor/clickhouse_exporter
+
+WORKDIR /go/src/github.com/f1yegor/clickhouse_exporter
+
+RUN make init && make
+
+FROM frolvlad/alpine-glibc
+
+COPY --from=BUILD /go/bin/clickhouse_exporter /usr/local/bin/clickhouse_exporter
+
+ENTRYPOINT ["/usr/local/bin/clickhouse_exporter"]
+
+CMD ["-scrape_uri=http://localhost:8123"]
+
+EXPOSE 9116

exporter/exporter.go

@@ -46,7 +46,7 @@ func NewExporter(uri url.URL, insecure bool, user, password string) *Exporter {
 	metricsURI.RawQuery = q.Encode()
 
 	asyncMetricsURI := uri
-	q.Set("query", "select * from system.asynchronous_metrics")
+	q.Set("query", "select metric, value from system.asynchronous_metrics")
 	asyncMetricsURI.RawQuery = q.Encode()
 
 	eventsURI := uri
@@ -203,24 +203,9 @@ func (e *Exporter) handleResponse(uri string) ([]byte, error) {
 		return nil, fmt.Errorf("Status %s (%d): %s", resp.Status, resp.StatusCode, data)
 	}
 
-	if strings.Contains(uri, "system.metrics") || strings.Contains(uri, "system.events") {
-		data = DataFix(data)
-	}
 	return data, nil
 }
 
-func DataFix(data []byte) []byte {
-	datastr := string(data)
-	var fixedData string
-	for _, line := range strings.Split(datastr, "\n") {
-		parts := strings.Fields(line)
-		if len(parts) >= 2 {
-			fixedData = fixedData + fmt.Sprintf("%v %v\n", parts[0], parts[1])
-		}
-	}
-	return []byte(fixedData)
-}
-
 type lineResult struct {
 	key   string
 	value int