Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PMM-12154 pull upstream changes #153

Merged
merged 180 commits into from
Oct 26, 2023
Merged

Conversation

BupycHuk
Copy link
Member

@BupycHuk BupycHuk commented Oct 2, 2023

No description provided.

rgeyer and others added 30 commits May 25, 2022 14:35
Signed-off-by: Ryan J. Geyer <me@ryangeyer.com>
- Remove multi server support from new collector package
- Add http handler for multi-target support

Signed-off-by: Joe Adams <github@joeadams.io>
The config module supports adding configuration to the exporter via a config file. This supports adding authentication details in a config file so that /probe requests can specify authentication for endpoints

Signed-off-by: Joe Adams <github@joeadams.io>
Signed-off-by: Joe Adams <github@joeadams.io>

Co-authored-by: Ben Kochie <superq@gmail.com>
Signed-off-by: Joe Adams <github@joeadams.io>
fix for exporter issue 633: prometheus-community#633

"Scan error on column index 2, name \"checkpoint_write_time\": converting driver.Value type float64 (\"6.594096e+06\") to a int: invalid syntax prometheus-community#633"

Signed-off-by: bravosierrasierra <bravosierrasierra@users.noreply.github.com>
…avosierrasierra-patch-2

Fix checkpoint_write_time value type
Error:
sql: Scan error on column index 3, name \"checkpoint_sync_time\": converting driver.Value type float64 (\"1.876469e+06\") to a int: invalid syntax

See also:
prometheus-community#633
prometheus-community#666

Signed-off-by: Nicolas Rodriguez <nico@nicoladmin.fr>
…cast

Fix checkpoint_sync_time value type
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.35.0 to 0.37.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.35.0...v0.37.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…/dependabot/go_modules/github.com/prometheus/common-0.37.0

Bump github.com/prometheus/common from 0.35.0 to 0.37.0
Signed-off-by: Luckz <224748+Luckz@users.noreply.github.com>
* [BUGFIX] Fix checkpoint_write_time value type prometheus-community#666
* [BUGFIX] Fix checkpoint_sync_time value type prometheus-community#667

Signed-off-by: SuperQ <superq@gmail.com>
dsn is designed to replace the other uses of dsn as a string in the long term. dsn is designed to be safe to log, properly redacting passwords. The goal is eventually always parse datasource information into a dsn type object which can safely be passed around and logged without worrying about wrapping calls in a redaction function (today this function is loggableDSN().

This should solve the root issue in prometheus-community#648, prometheus-community#677, and prometheus-community#643, although the full fix will require more changes to update all code references over to use the dsn type.

Signed-off-by: Joe Adams <github@joeadams.io>
BREAKING CHANGES:

This release changes support for multiple postgres servers to use the
multi-target exporter pattern. This makes it much easier to monitor multiple
PostgreSQL servers from a single exporter by passing the target via URL
params. See the Multi-Target Support section of the README.

* [CHANGE] Add multi-target support prometheus-community#618
* [BUGFIX] Add dsn type for handling datasources prometheus-community#678

Signed-off-by: SuperQ <superq@gmail.com>
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
- Moves new dsn type to config.DSN. This will prevent circular dependencies.
- Change DSN.query to be url.Values. This allows the multi-target functionality to merge values without re-parsing the query string
- Change NewProbeCollector to use the new config.DSN type
- Add DSN.GetConnectionString to return a string formatted for the sql driver to use during connection

Signed-off-by: Joe Adams <github@joeadams.io>
Signed-off-by: Joe Adams <github@joeadams.io>
Update multi-target handler to use new DSN type
Signed-off-by: Joe Adams <github@joeadams.io>
Signed-off-by: Ildar Valiullin <preved.911@gmail.com>
Bumps [github.com/lib/pq](https://github.com/lib/pq) from 1.10.6 to 1.10.7.
- [Release notes](https://github.com/lib/pq/releases)
- [Commits](lib/pq@v1.10.6...v1.10.7)

---
updated-dependencies:
- dependency-name: github.com/lib/pq
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…/dependabot/go_modules/github.com/lib/pq-1.10.7

Bump github.com/lib/pq from 1.10.6 to 1.10.7
It is necessary to be able to exclude backups from long-running
transaction alerts, as they are to be expected. With the current
pg_stat_activity metric there is no ability to filter out
specific users or application names.

Resolves prometheus-community#668

Signed-off-by: cezmunsta <github@incoming-email.co.uk>
Signed-off-by: cezmunsta <github@incoming-email.co.uk>
@BupycHuk BupycHuk temporarily deployed to CI October 3, 2023 10:37 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 3, 2023 10:37 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 11:28 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 11:28 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 11:28 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 11:28 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 11:28 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 12:08 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 12:08 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 12:08 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 12:08 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 12:08 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 20:47 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 20:47 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 20:47 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 20:47 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 5, 2023 20:47 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 16, 2023 13:06 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 16, 2023 13:06 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 16, 2023 13:06 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 16, 2023 13:07 — with GitHub Actions Inactive
@BupycHuk BupycHuk temporarily deployed to CI October 16, 2023 13:07 — with GitHub Actions Inactive
@BupycHuk BupycHuk merged commit 82694ff into main Oct 26, 2023
5 of 7 checks passed
@BupycHuk BupycHuk deleted the PMM-12154-pull-upstream-changes branch October 26, 2023 09:59
@BupycHuk BupycHuk restored the PMM-12154-pull-upstream-changes branch November 15, 2023 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.