Merge branch 'master' into master-ttl

* master: (30 commits)
  Update common Prometheus files
  Update common Prometheus files
  Update common Prometheus files
  Bump Go version to 1.17
  Update common Prometheus files
  Update common Prometheus files
  Update common Prometheus files
  Cut v1.4.2
  Update dependencies
  Update build tags to new style
  Log shutdown gracefully (prometheus#428)
  Simplify and update the issue template
  Update common Prometheus files
  go.mod: Update dependencies
  Replace go-kit/kit with go-kit/log
  Update common Prometheus files
  Cut v1.4.1
  Fix spelling and comment
  Fix spelling in test
  Fix issue where labels aren't persisted when draining
  ...

Author: thinker0

.circleci/config.yml

@@ -1,51 +1,45 @@
----
 version: 2.1
-
 orbs:
-  prometheus: prometheus/[email protected]
-
+  prometheus: prometheus/[email protected]
 executors:
   # Whenever the Go version is updated here, .promu.yml should also be updated.
   golang:
     docker:
-    - image: circleci/golang:1.15
-
+      - image: circleci/golang:1.17
 jobs:
   test:
     executor: golang
-
     steps:
-    - prometheus/setup_environment
-    - run: make
-    - prometheus/store_artifact:
-        file: pushgateway
-
+      - prometheus/setup_environment
+      - run: make
+      - prometheus/store_artifact:
+          file: pushgateway
 workflows:
   version: 2
   pushgateway:
     jobs:
-    - test:
-        filters:
-          tags:
-            only: /.*/
-    - prometheus/build:
-        name: build
-        filters:
-          tags:
-            only: /.*/
-    - prometheus/publish_master:
-        requires:
-        - test
-        - build
-        filters:
-          branches:
-            only: master
-    - prometheus/publish_release:
-        requires:
-        - test
-        - build
-        filters:
-          tags:
-            only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
-          branches:
-            ignore: /.*/
+      - test:
+          filters:
+            tags:
+              only: /.*/
+      - prometheus/build:
+          name: build
+          filters:
+            tags:
+              only: /.*/
+      - prometheus/publish_master:
+          requires:
+            - test
+            - build
+          filters:
+            branches:
+              only: master
+      - prometheus/publish_release:
+          requires:
+            - test
+            - build
+          filters:
+            tags:
+              only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+            branches:
+              ignore: /.*/

.github/ISSUE_TEMPLATE.md

@@ -1,26 +1,8 @@
 <!--
 
 	Note that we use GitHub issues for bugs and (uncontroversial) feature
-	requests (see below for details).
-
-	Please do *NOT* ask usage questions in GitHub issues.  Usage questions make
-	most sense on the users mailing list, where more people are available to
-	potentially respond to your question, and the whole community can benefit
-	from the answers provided (perhaps your question has already been answered,
-	search the archive to find out):
-	https://groups.google.com/forum/#!forum/prometheus-users
-
-	While a GitHub issue is fine to track progress on an uncontroversial
-	feature request, many feature requests touch the best practices and
-	concepts of Prometheus as a whole and need to be discussed with the wider
-	developer community first. This is in particular true for a request to
-	reconsider a prior rejection of a feature request or any of the declared
-	non-goals (see README.md). Those overarching discussions happen on the
-	developer mailing list (GitHub issues, in particular closed ones, are not
-	tracked by the wider developer community and thus inadequate):
-	https://groups.google.com/forum/#!forum/prometheus-developers
-	
-	You can find more information at: https://prometheus.io/community/
+	requests. For questions and discussions, please use GitHub discussions or
+	any of the other community channels: https://prometheus.io/community/
 
 -->
 

.github/workflows/golangci-lint.yml

@@ -0,0 +1,31 @@
+name: golangci-lint
+on:
+  push:
+    paths:
+      - "go.sum"
+      - "go.mod"
+      - "**.go"
+      - "scripts/errcheck_excludes.txt"
+      - ".github/workflows/golangci-lint.yml"
+      - ".golangci.yml"
+  pull_request:
+    paths:
+      - "go.sum"
+      - "go.mod"
+      - "**.go"
+      - "scripts/errcheck_excludes.txt"
+      - ".github/workflows/golangci-lint.yml"
+      - ".golangci.yml"
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.42.0

.gitignore

@@ -6,3 +6,4 @@
 *~
 *.exe
 *.tar.gz
+/vendor

.golangci.yml

@@ -1,6 +1,3 @@
-run:
-  modules-download-mode: vendor
-
 # Run only staticcheck for now. Additional linters will be enabled one-by-one.
 linters:
   enable:

.promu.yml

@@ -1,11 +1,11 @@
 go:
     # Whenever the Go version is updated here, .circle/config.yml should also
     # be updated.
-    version: 1.15
+    version: 1.17
 repository:
     path: github.com/prometheus/pushgateway
 build:
-    flags: -mod=vendor -a -tags netgo
+    flags: -a -tags netgo
     ldflags: |
         -X github.com/prometheus/common/version.Version={{.Version}}
         -X github.com/prometheus/common/version.Revision={{.Revision}}

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.4.2 / 2021-10-11
+
+* [BUGFIX] Do not log an error upon graceful shutdown. #428
+* [BUGFIX] Update dependencies to pull in possibly relevant bugfixes.
+
+## 1.4.1 / 2021-05-28
+
+* [BUGFIX] Persist labels properly when draining. #404
+* [BUGFIX] Use relative paths for web assets. #390
+
 ## 1.4.0 / 2021-01-23
 
 * [FEATURE] **Experimental!** Add TLS and basic authentication to HTTP endpoints. #381

Makefile.common

@@ -78,17 +78,23 @@ ifneq ($(shell which gotestsum),)
 endif
 endif
 
-PROMU_VERSION ?= 0.7.0
+PROMU_VERSION ?= 0.13.0
 PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
 
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v1.18.0
+GOLANGCI_LINT_VERSION ?= v1.42.0
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
 # windows isn't included here because of the path separator being different.
 ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
 	ifeq ($(GOHOSTARCH),$(filter $(GOHOSTARCH),amd64 i386))
-		GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
+		# If we're in CI and there is an Actions file, that means the linter
+		# is being run in Actions, so we don't need to run it here.
+		ifeq (,$(CIRCLE_JOB))
+			GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
+		else ifeq (,$(wildcard .github/workflows/golangci-lint.yml))
+			GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
+		endif
 	endif
 endif
 
@@ -118,7 +124,7 @@ endif
 %: common-% ;
 
 .PHONY: common-all
-common-all: precheck style check_license lint unused build test
+common-all: precheck style check_license lint yamllint unused build test
 
 .PHONY: common-style
 common-style:
@@ -154,7 +160,7 @@ endif
 update-go-deps:
 	@echo ">> updating Go dependencies"
 	@for m in $$($(GO) list -mod=readonly -m -f '{{ if and (not .Indirect) (not .Main)}}{{.Path}}{{end}}' all); do \
-		$(GO) get $$m; \
+		$(GO) get -d $$m; \
 	done
 	GO111MODULE=$(GO111MODULE) $(GO) mod tidy
 ifneq (,$(wildcard vendor))
@@ -198,6 +204,15 @@ else
 endif
 endif
 
+.PHONY: common-yamllint
+common-yamllint:
+	@echo ">> running yamllint on all YAML files in the repository"
+ifeq (, $(shell which yamllint))
+	@echo "yamllint not installed so skipping"
+else
+	yamllint .
+endif
+
 # For backward-compatibility.
 .PHONY: common-staticcheck
 common-staticcheck: lint

VERSION

@@ -1 +1 @@
-1.4.0
+1.4.2

api/v1/api.go

@@ -18,8 +18,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/common/route"
 
 	dto "github.com/prometheus/client_model/go"