Skip to content

Commit 3fb41c8

Browse files
SuperQangaz
SuperQ
authored and
angaz
committed
Release 0.10.1
* [BUGFIX] Fix broken log-level for values other than debug. prometheus-community#560 Signed-off-by: SuperQ <[email protected]> Signed-off-by: Angus Dippenaar <[email protected]>
1 parent 7d3e088 commit 3fb41c8

10 files changed

+47
-25
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:

‎.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

‎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/pg_setting_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14+
//go:build !integration
1415
// +build !integration
1516

1617
package main

‎cmd/postgres_exporter/postgres_exporter_integration_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
// These are specialized integration tests. We only build them when we're doing
1515
// a lot of additional work to keep the external docker environment they require
1616
// working.
17+
//go:build integration
1718
// +build integration
1819

1920
package main

‎cmd/postgres_exporter/postgres_exporter_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14+
//go:build !integration
1415
// +build !integration
1516

1617
package main

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ go 1.14
44

55
require (
66
github.com/blang/semver v3.5.1+incompatible
7-
github.com/go-kit/log v0.1.0
8-
github.com/lib/pq v1.10.1
7+
github.com/go-kit/log v0.2.0
8+
github.com/lib/pq v1.10.4
99
github.com/prometheus/client_golang v1.11.0
1010
github.com/prometheus/client_model v0.2.0
11-
github.com/prometheus/common v0.29.0
12-
github.com/prometheus/exporter-toolkit v0.6.0
11+
github.com/prometheus/common v0.32.1
12+
github.com/prometheus/exporter-toolkit v0.7.1
1313
gopkg.in/alecthomas/kingpin.v2 v2.2.6
1414
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
1515
gopkg.in/yaml.v2 v2.4.0

‎go.sum

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,14 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
6666
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
6767
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
6868
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
69-
github.com/go-kit/log v0.1.0 h1:DGJh0Sm43HbOeYDNnVZFl8BvcYVvjD5bqYJvp0REbwQ=
7069
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
70+
github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw=
71+
github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
7172
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
7273
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
73-
github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
7474
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
75-
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
75+
github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
76+
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
7677
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
7778
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
7879
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -148,8 +149,8 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
148149
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
149150
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
150151
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
151-
github.com/lib/pq v1.10.1 h1:6VXZrLU0jHBYyAqrSPa+MgPfnSvTPuMgK+k0o5kVFWo=
152-
github.com/lib/pq v1.10.1/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
152+
github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk=
153+
github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
153154
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
154155
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
155156
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -178,10 +179,11 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T
178179
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
179180
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
180181
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
181-
github.com/prometheus/common v0.29.0 h1:3jqPBvKT4OHAbje2Ql7KeaaSicDBCxMYwEJU1zRJceE=
182182
github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
183-
github.com/prometheus/exporter-toolkit v0.6.0 h1:rGoS9gIqj3sXaw+frvo0ozCs1CxBRqpOCGsbixC52UI=
184-
github.com/prometheus/exporter-toolkit v0.6.0/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
183+
github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=
184+
github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
185+
github.com/prometheus/exporter-toolkit v0.7.1 h1:c6RXaK8xBVercEeUQ4tRNL8UGWzDHfvj9dseo1FcK1Y=
186+
github.com/prometheus/exporter-toolkit v0.7.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
185187
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
186188
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
187189
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=

0 commit comments

Comments
 (0)