Merge branch 'master' into master

Author: zero3233

Dockerfile

@@ -1,7 +1,5 @@
 FROM golang:alpine as build-env
 
-RUN apk add git
-
 # Copy source + vendor
 COPY . /go/src/github.com/tencentyun/qcloud-exporter
 WORKDIR /go/src/github.com/tencentyun/qcloud-exporter
@@ -12,4 +10,8 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -v -a -ldflags
 
 FROM alpine
 COPY --from=build-env /go/bin/qcloud_exporter /usr/bin/qcloud_exporter
+RUN apk update
+#RUN apk add git
+RUN apk add curl
+RUN apk add tcpdump
 ENTRYPOINT ["qcloud_exporter"]

pkg/metric/repository.go

@@ -138,7 +138,6 @@ func (repo *TcmMetricRepositoryImpl) GetSamples(s *TcmSeries, st int64, et int64
 	} else {
 		response, err = repo.monitorClient.GetMonitorData(request)
 	}
-	level.Info(repo.logger).Log("reqid",response.Response.RequestId)
 	if err != nil {
 		return
 	}
@@ -191,7 +190,6 @@ func (repo *TcmMetricRepositoryImpl) listSampleByBatch(
 	} else {
 		response, err = repo.monitorClient.GetMonitorData(request)
 	}
-	level.Info(repo.logger).Log("reqid",response.Response.RequestId)
 	if err != nil {
 		return nil, err
 	}