Skip to content

Commit adaa0b5

Browse files
authored
Merge branch 'prometheus-community:master' into fix/pg_stat_archiver-version
2 parents 21c9b0d + 922d2aa commit adaa0b5

21 files changed

+64
-230
lines changed

.circleci/config.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
version: 2.1
33

44
orbs:
5-
prometheus: prometheus/prometheus@0.11.0
5+
prometheus: prometheus/prometheus@0.15.0
66

77
executors:
88
# This must match .promu.yml.
99
golang:
1010
docker:
11-
- image: circleci/golang:1.16
11+
- image: circleci/golang:1.17
1212

1313
jobs:
1414
test:
@@ -22,7 +22,7 @@ jobs:
2222

2323
integration:
2424
docker:
25-
- image: circleci/golang:1.16
25+
- image: circleci/golang:1.17
2626
- image: << parameters.postgres_image >>
2727
environment:
2828
POSTGRES_DB: circle_test
@@ -56,13 +56,11 @@ workflows:
5656
matrix:
5757
parameters:
5858
postgres_image:
59-
- circleci/postgres:9.4
60-
- circleci/postgres:9.5
61-
- circleci/postgres:9.6
6259
- circleci/postgres:10
6360
- circleci/postgres:11
6461
- circleci/postgres:12
6562
- circleci/postgres:13
63+
- cimg/postgres:14.1
6664
- prometheus/build:
6765
name: build
6866
filters:

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ assignees: ''
3737
insert list of flags used here
3838
```
3939

40-
* PostgresSQL version:
40+
* PostgreSQL version:
4141

4242
insert PostgreSQL version here
4343

.promu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
go:
22
# This must match .circle/config.yml.
3-
version: 1.16
3+
version: 1.17
44
repository:
55
path: github.com/prometheus-community/postgres_exporter
66
build:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.10.1 / 2022-01-14
2+
3+
* [BUGFIX] Fix broken log-level for values other than debug. #560
4+
15
## 0.10.0 / 2021-07-08
26

37
* [ENHANCEMENT] Add ability to set included databases when autoDiscoverDatabases is enabled #499

MAINTAINERS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
* Ben Kochie <superq@gmail.com> @SuperQ
22
* William Rouesnel <wrouesnel@wrouesnel.com> @wrouesnel
3+
* Joe Adams <github@joeadams.io> @sysadmind

Makefile.common

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,23 @@ ifneq ($(shell which gotestsum),)
7878
endif
7979
endif
8080

81-
PROMU_VERSION ?= 0.12.0
81+
PROMU_VERSION ?= 0.13.0
8282
PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
8383

8484
GOLANGCI_LINT :=
8585
GOLANGCI_LINT_OPTS ?=
86-
GOLANGCI_LINT_VERSION ?= v1.39.0
86+
GOLANGCI_LINT_VERSION ?= v1.42.0
8787
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
8888
# windows isn't included here because of the path separator being different.
8989
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
9090
ifeq ($(GOHOSTARCH),$(filter $(GOHOSTARCH),amd64 i386))
91-
GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
91+
# If we're in CI and there is an Actions file, that means the linter
92+
# is being run in Actions, so we don't need to run it here.
93+
ifeq (,$(CIRCLE_JOB))
94+
GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
95+
else ifeq (,$(wildcard .github/workflows/golangci-lint.yml))
96+
GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
97+
endif
9298
endif
9399
endif
94100

@@ -118,7 +124,7 @@ endif
118124
%: common-% ;
119125

120126
.PHONY: common-all
121-
common-all: precheck style check_license lint unused build test
127+
common-all: precheck style check_license lint yamllint unused build test
122128

123129
.PHONY: common-style
124130
common-style:
@@ -154,7 +160,7 @@ endif
154160
update-go-deps:
155161
@echo ">> updating Go dependencies"
156162
@for m in $$($(GO) list -mod=readonly -m -f '{{ if and (not .Indirect) (not .Main)}}{{.Path}}{{end}}' all); do \
157-
$(GO) get $$m; \
163+
$(GO) get -d $$m; \
158164
done
159165
GO111MODULE=$(GO111MODULE) $(GO) mod tidy
160166
ifneq (,$(wildcard vendor))
@@ -198,6 +204,15 @@ else
198204
endif
199205
endif
200206

207+
.PHONY: common-yamllint
208+
common-yamllint:
209+
@echo ">> running yamllint on all YAML files in the repository"
210+
ifeq (, $(shell which yamllint))
211+
@echo "yamllint not installed so skipping"
212+
else
213+
yamllint .
214+
endif
215+
201216
# For backward-compatibility.
202217
.PHONY: common-staticcheck
203218
common-staticcheck: lint

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.10.0
1+
0.10.1

cmd/postgres_exporter/datasource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"regexp"
2222
"strings"
2323

24-
"github.com/go-kit/kit/log/level"
24+
"github.com/go-kit/log/level"
2525
"github.com/prometheus/client_golang/prometheus"
2626
)
2727

cmd/postgres_exporter/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"net/http"
1818
"os"
1919

20-
"github.com/go-kit/kit/log"
21-
"github.com/go-kit/kit/log/level"
20+
"github.com/go-kit/log"
21+
"github.com/go-kit/log/level"
2222
"github.com/prometheus/client_golang/prometheus"
2323
"github.com/prometheus/client_golang/prometheus/promhttp"
2424
"github.com/prometheus/common/promlog"

cmd/postgres_exporter/namespace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"time"
2121

2222
"github.com/blang/semver"
23-
"github.com/go-kit/kit/log/level"
23+
"github.com/go-kit/log/level"
2424
"github.com/lib/pq"
2525
"github.com/prometheus/client_golang/prometheus"
2626
)

0 commit comments

Comments
 (0)