Skip to content
This repository was archived by the owner on Jul 28, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

- [ENHANCEMENT] Switch to drone for releases. (@mattdurham)

- [ENHANCEMENT] Update postgres_exporter to a [branch of](https://github.com/grafana/postgres_exporter/tree/exporter-package-v0.10.0) v0.10.0

- [BUGFIX] Regex capture groups like `${1}` will now be kept intact when
using `-config.expand-env`.

Expand Down
5 changes: 5 additions & 0 deletions docs/configuration/integrations/postgres-exporter-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ Full reference of options:
exclude_databases:
[ - <string> ]

# Includes only specific databases (excluding all others) when autodiscover_databases
# is true.
include_databases:
[ - <string> ]

# Path to a YAML file containing custom queries to run. Check out
# postgres_exporter's queries.yaml for examples of the format:
# https://github.com/prometheus-community/postgres_exporter/blob/master/queries.yaml
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/davidmparrott/kafka_exporter/v2 v2.0.1
github.com/drone/envsubst v1.0.2
github.com/fatih/structs v1.1.0
github.com/go-kit/kit v0.10.0
github.com/go-kit/kit v0.11.0

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a few drive-by updates in go.mod and go.sum. I'll confess to still being a bit of a n00b WRT go modules, so I think these are okay, but I am not 100% sure.

The agent still builds. and tests still pass, so I think we're good.

Part of the extensive nature of the change here is that the postgres exporter repo changed from github.com/wrouesnel/postgres_exporter to github.com/prometheus-community/postgres_exporter.

Due to my go mod inexperience, I did a go mod tidy which... May be wrong.

github.com/go-logfmt/logfmt v0.5.0
github.com/go-logr/logr v0.4.0
github.com/gogo/protobuf v1.3.2
Expand Down Expand Up @@ -37,6 +37,7 @@ require (
github.com/opentracing/opentracing-go v1.2.0
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pkg/errors v0.9.1
github.com/prometheus-community/postgres_exporter v0.0.0-00010101000000-000000000000
github.com/prometheus-community/windows_exporter v0.0.0-00010101000000-000000000000
github.com/prometheus-operator/prometheus-operator v0.47.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.47.0
Expand All @@ -49,12 +50,11 @@ require (
github.com/prometheus/procfs v0.6.1-0.20210313121648-b565fefb1664
github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02
github.com/prometheus/statsd_exporter v0.21.0
github.com/sirupsen/logrus v1.7.0
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.1.3
github.com/stretchr/testify v1.7.0
github.com/uber/jaeger-client-go v2.29.1+incompatible
github.com/weaveworks/common v0.0.0-20210419092856-009d1eebd624
github.com/wrouesnel/postgres_exporter v0.0.0-00010101000000-000000000000
go.opencensus.io v0.23.0
go.opentelemetry.io/collector v0.29.0
go.uber.org/atomic v1.8.0
Expand Down Expand Up @@ -99,9 +99,9 @@ replace gopkg.in/yaml.v2 => github.com/rfratto/go-yaml v0.0.0-20200521142311-984
replace (
github.com/google/dnsmasq_exporter => github.com/grafana/dnsmasq_exporter v0.2.1-0.20201029182940-e5169b835a23
github.com/ncabatoff/process-exporter => github.com/grafana/process-exporter v0.7.3-0.20210106202358-831154072e2a
github.com/prometheus-community/postgres_exporter => github.com/grafana/postgres_exporter v0.8.1-0.20210722175051-db35d7c2f520
github.com/prometheus-community/windows_exporter => github.com/grafana/windows_exporter v0.15.1-0.20210325142439-9e8f66d53433
github.com/prometheus/mysqld_exporter => github.com/grafana/mysqld_exporter v0.12.2-0.20201015182516-5ac885b2d38a
github.com/wrouesnel/postgres_exporter => github.com/grafana/postgres_exporter v0.8.1-0.20201106170118-5eedee00c1db

)

Expand Down
Loading