Merge pull request #7 from zjj2wry/svc_name

add service name to metrics labels

Dockerfile

@@ -1,15 +1,15 @@
 # build stage
 FROM golang:1.12-alpine AS build-env
-RUN apk add --no-cache --update alpine-sdk
+RUN apk add --no-cache --update alpine-sdk ca-certificates
 ENV REPO_PATH=/build
 COPY . $REPO_PATH
 WORKDIR $REPO_PATH
 RUN make build
 
 # final stage
-FROM alpine
+FROM scratch
 LABEL maintainer="Daniel Martins <daniel.martins@descomplica.com.br>"
 WORKDIR /app
 COPY --from=build-env /build/bin/aws-limits-exporter /app/
-RUN apk add --no-cache --update ca-certificates
+COPY --from=build-env /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 ENTRYPOINT /app/aws-limits-exporter -logtostderr

Makefile

@@ -2,7 +2,7 @@
 export GOBIN := $(PWD)/bin
 export PATH := $(GOBIN):$(PATH)
 export INSTALL_FLAG=
-export TAG=0.4.4
+export TAG=0.4.5
 
 DOCKER_IMAGE = aws-limits-exporter
 DOCKER_REPO = gcr.io/pingcap-public
@@ -27,7 +27,7 @@ test-cover:
 	@go test ./... -timeout 2m -race -cover
 
 build:
-	CGO_ENABLED=0 GOOS=$(OS) go build $(INSTALL_FLAG) -a --ldflags "-X main.VERSION=$(TAG) -w -extldflags '-static'" -tags netgo -o $(GOBIN)/aws-limits-exporter ./cmd
+	CGO_ENABLED=0 GOOS=$(OS) go build -mod vendor $(INSTALL_FLAG) -a --ldflags "-X main.VERSION=$(TAG) -w -extldflags '-static'" -tags netgo -o $(GOBIN)/aws-limits-exporter ./cmd
 
 clean:
 	@go clean

cmd/main.go

@@ -22,7 +22,6 @@ var (
 
 func main() {
 	flag.Parse()
-
 	glog.Infof("AWS Limits Exporter v%s started.", VERSION)
 
 	exporter := core.NewSupportExporter(*region)

core/support.go

@@ -242,8 +242,8 @@ func (e *SupportExporter) Describe(ch chan<- *prometheus.Desc) {
 			serviceName := aws.StringValue(resource.Metadata[1])
 			serviceNameLower := strings.ToLower(serviceName)
 
-			e.metricsUsed[resourceID] = newServerMetric(region, serviceNameLower, "used_total", "Current used amount of the given resource.", []string{"resource"})
-			e.metricsLimit[resourceID] = newServerMetric(region, serviceNameLower, "limit_total", "Current limit of the given resource.", []string{"resource"})
+			e.metricsUsed[resourceID] = newServerMetric(region, serviceNameLower, "used_total", "Current used amount of the given resource.", []string{"resource", "service"})
+			e.metricsLimit[resourceID] = newServerMetric(region, serviceNameLower, "limit_total", "Current limit of the given resource.", []string{"resource", "service"})
 
 			ch <- e.metricsUsed[resourceID]
 			ch <- e.metricsLimit[resourceID]
@@ -275,13 +275,14 @@ func (e *SupportExporter) Collect(ch chan<- prometheus.Metric) {
 			}
 
 			resourceName := aws.StringValue(resource.Metadata[2])
+			serviceName := aws.StringValue(resource.Metadata[1])
 
 			metricLimit := e.metricsLimit[resourceID]
 			limitValue, _ := strconv.ParseFloat(aws.StringValue(resource.Metadata[3]), 64)
-			ch <- prometheus.MustNewConstMetric(metricLimit, prometheus.GaugeValue, limitValue, resourceName)
+			ch <- prometheus.MustNewConstMetric(metricLimit, prometheus.GaugeValue, limitValue, resourceName, serviceName)
 
 			usedValue, _ := strconv.ParseFloat(aws.StringValue(resource.Metadata[4]), 64)
-			ch <- prometheus.MustNewConstMetric(metricUsed, prometheus.GaugeValue, usedValue, resourceName)
+			ch <- prometheus.MustNewConstMetric(metricUsed, prometheus.GaugeValue, usedValue, resourceName, serviceName)
 		}
 	}
 }

go.mod

@@ -5,7 +5,5 @@ go 1.12
 require (
 	github.com/aws/aws-sdk-go v1.25.34
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/prometheus/client_golang v1.2.1
 )