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

fix: Backport several fixes for version 4 #426

Merged
merged 5 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.swp
exporter/postgres/queries.yml
hugo/.hugo_build.lock
18 changes: 2 additions & 16 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ default_install_hook_types:
- pre-commit
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.6.0
hooks:
- id: check-merge-conflict
- id: check-symlinks
Expand All @@ -15,25 +15,11 @@ repos:
- id: trailing-whitespace
args: ['--markdown-linebreak-ext=md']
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
rev: v9.0.0
rev: v9.16.0
hooks:
- id: commitlint
stages: [commit-msg]
additional_dependencies: ['@commitlint/config-conventional']
- repo: https://github.com/ansible-community/ansible-lint.git
rev: v5.4.0
# rev: v5.4.0 will not change until we drop ansible 2.9
hooks:
- id: ansible-lint
always_run: true
pass_filenames: false
# do not add file filters here as ansible-lint does not give reliable
# results when called with individual files.
# https://github.com/ansible/ansible-lint/issues/611
verbose: true
entry: ansible-lint --force-color -p -v .
additional_dependencies:
- 'ansible<2.10'
- repo: https://github.com/codespell-project/codespell
rev: v2.1.0
hooks:
Expand Down
2 changes: 1 addition & 1 deletion build/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ packages:
pkg_conflict:
- { pkg_name: "grafana-containers" }
pkg_dependency:
- { pkg_name: "grafana", gte: 9.2.19, lt: 10.0.0 }
- { pkg_name: "grafana", gte: 10.4, lt: 11 }
upstream_repo: "https://github.com/CrunchyData/pgmonitor"

- pg_bloat_check:
Expand Down
4 changes: 4 additions & 0 deletions changelogs/fragments/425.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
breaking_changes:
- grafana - Update the dashboards to support Grafana 10.4 so that we're on an officially supported version of Grafana. This does potentially break backward compatibility with Grafana 9.x, so an update to Grafana 10.4 will be required with this version of pgMonitor.
bugfixes:
- postgres_exporter - Fix query for pgBackRest monitoring to handle 3 number versions
Loading