Skip to content

Commit 0552098

Browse files
authored
Fix precommit linting issues (#413)
* fix: use the proper views for pgmonitor-extension queries. doc update. new table stat metric * chore: add changelog fragment * chore: correct precommit linting
1 parent 1708dac commit 0552098

File tree

67 files changed

+355
-403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+355
-403
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ default_install_hook_types:
33
- pre-commit
44
repos:
55
- repo: https://github.com/pre-commit/pre-commit-hooks
6-
rev: v4.3.0
6+
rev: v4.6.0
77
hooks:
88
- id: check-merge-conflict
99
- id: check-symlinks
@@ -15,25 +15,11 @@ repos:
1515
- id: trailing-whitespace
1616
args: ['--markdown-linebreak-ext=md']
1717
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
18-
rev: v9.0.0
18+
rev: v9.16.0
1919
hooks:
2020
- id: commitlint
2121
stages: [commit-msg]
2222
additional_dependencies: ['@commitlint/config-conventional']
23-
- repo: https://github.com/ansible-community/ansible-lint.git
24-
rev: v5.4.0
25-
# rev: v5.4.0 will not change until we drop ansible 2.9
26-
hooks:
27-
- id: ansible-lint
28-
always_run: true
29-
pass_filenames: false
30-
# do not add file filters here as ansible-lint does not give reliable
31-
# results when called with individual files.
32-
# https://github.com/ansible/ansible-lint/issues/611
33-
verbose: true
34-
entry: ansible-lint --force-color -p -v .
35-
additional_dependencies:
36-
- 'ansible<2.10'
3723
- repo: https://github.com/codespell-project/codespell
3824
rev: v2.1.0
3925
hooks:

blackbox_exporter/common/blackbox_exporter.sysconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
# This file must be in a pathname that matches the EnvironmentFile entry in the service file (Default: /etc/sysconfig/blackbox_exporter)
88
#
99
OPT="--config.file=/etc/blackbox_exporter/crunchy-blackbox.yml"
10-

build/packages.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ packages:
108108

109109
- sql-exporter:
110110
files:
111-
- { source: "https://github.com/CrunchyData/pgmonitor/sql_exporter/linux/crunchy-sql-exporter@.service" target: "/usr/lib/systemd/system/crunchy-sql-exporter@.service", mode: "0645", type: "file", owner: "root", group: "root" }
111+
- { source: "https://github.com/CrunchyData/pgmonitor/sql_exporter/linux/crunchy-sql-exporter@.service", target: "/usr/lib/systemd/system/crunchy-sql-exporter@.service", mode: "0645", type: "file", owner: "root", group: "root" }
112112
- { target: "/usr/bin/sql_exporter", mode: "0755", type: "file", owner: "root", group: "root" }
113113
- { target: "/etc/sql_exporter", type: "folder", mode: "0755", owner: "root", group: "root" }
114114
upstream_repo: "https://github.com/burningalchemist/sql_exporter"
@@ -160,9 +160,9 @@ packages:
160160
files:
161161
- { source: "grafana/linux/Filesystem_Details.json", target: "/etc/grafana/crunchy_dashboards/", mode: "0640", type: "file", rpm_new: false, owner: "grafana", group: "grafana" }
162162
- { source: "grafana/linux/Network_Details.json", target: "/etc/grafana/crunchy_dashboards/", mode: "0640", type: "file", rpm_new: false, owner: "grafana", group: "grafana" }
163-
- { source: "grafana/linux/OS_Details.json", target: "/etc/grafana/crunchy_dashboards/", mode: "0640", type: "file", rpm_new: false, owner: "grafana", group: "grafana" }
164-
- { source: "grafana/linux/OS_Overview.json", target: "/etc/grafana/crunchy_dashboards/", mode: "0640", type: "file", rpm_new: false, owner: "grafana", group: "grafana" }
165-
pkg_dependency:
163+
- { source: "grafana/linux/OS_Details.json", target: "/etc/grafana/crunchy_dashboards/", mode: "0640", type: "file", rpm_new: false, owner: "grafana", group: "grafana" }
164+
- { source: "grafana/linux/OS_Overview.json", target: "/etc/grafana/crunchy_dashboards/", mode: "0640", type: "file", rpm_new: false, owner: "grafana", group: "grafana" }
165+
pkg_dependency:
166166
- { pkg_name: "pgmonitor-grafana-extras-common" }
167167
upstream_repo: "https://github.com/CrunchyData/pgmonitor"
168168

changelogs/fragments/361.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ major_changes:
66
- postgres_exporter - Note that postgres_exporter is still supported but will be deprecated in a future version
77
- grafana - New Grafana minimum version is now 10.4. All dashboards have been updated to fix AngularJS deprecation warnings and re-exported from 10.4.
88
- grafana - Add new dashboards for sql_exporter support. New PostgreSQL Overview and PgBouncer direct metrics dashboards
9-
- grafana - Organize packages to allow better choice of available Grafana dashboards
9+
- grafana - Organize packages to allow better choice of available Grafana dashboards
1010
- grafana - Remove top level general Overview dashboard

changelogs/fragments/399.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ trivial:
33
- packaging - Update the build file to set blackbox-exporter-extras group to ccp_monitoring for consistency with other extras packages
44
- packaging - Take out remove_files lines since the files referenced have been gone for a long time now and packages aren't doing that anymore
55
- packaging - Take out package conflicts with containers packages. There are no containers packages being done at this time
6-

changelogs/fragments/412.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
bugfixes:
22
- sql_exporter - use the new views from pgmonitor-extension instead of full queries
3+
- sql_exporter - add new metric for n_tup_newpage_upd
34
- docs - add reference links to upstream configuration docs

grafana/common/crunchy_grafana_datasource.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ datasources:
1717
editable: False
1818
orgId: 1
1919
version: 1
20-

hugo/archetypes/default.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ title: "{{ replace .Name "-" " " | title }}"
33
date: {{ .Date }}
44
draft: true
55
---
6-

hugo/content/_index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,3 @@ Copyright © 2017-2024 Crunchy Data Solutions, Inc. All Rights Reserved.
9393
CRUNCHY DATA SOLUTIONS, INC. PROVIDES THIS GUIDE "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF NON INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
9494

9595
Crunchy, Crunchy Data Solutions, Inc. and the Crunchy Hippo Logo are trademarks of Crunchy Data Solutions, Inc. All Rights Reserved.
96-

hugo/content/changelog/v5_upgrade/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ sudo systemctl disable crunchy-postgres-exporter@postgres_exporter_pg##_per_db
2323

2424
Note the values after the @ symbol may be different depending on the sysconfig files that have been created for your exporters. There may also be exporters running for multiple clusters and we would recommend replacing all of the existing postgres_exporters with the new sql_exporter.
2525

26-
If you've installed pgMonitor with the packages provided by Crunchy Data, those packages can now be uninstalled as well.
26+
If you've installed pgMonitor with the packages provided by Crunchy Data, those packages can now be uninstalled as well.
2727

2828
| Package Name | Description |
2929
|--------------------------------|---------------------------------------------------------------------------|
@@ -50,7 +50,7 @@ If postgres_exporter was not set up with packages, you can now manually remove a
5050

5151

5252
### Prometheus
53-
All postgres_exporter Prometheus targets can now be removed. The default location for Prometheus targets is `/etc/prometheus/auto.d/`, but please check your Prometheus installation for possible additional target locations. In the identified location(s), remove any targets for the postgres_exporter. The default ports for postgres_exporter were 9187 and 9188, so any targets with these ports should be examined for removal. Note that if alerting had previously been enabled, the previous step likely caused multiple alerts to fire; once this step is done, you can simply reload Prometheus to clear these targets and any related alerts should resolve themselves.
53+
All postgres_exporter Prometheus targets can now be removed. The default location for Prometheus targets is `/etc/prometheus/auto.d/`, but please check your Prometheus installation for possible additional target locations. In the identified location(s), remove any targets for the postgres_exporter. The default ports for postgres_exporter were 9187 and 9188, so any targets with these ports should be examined for removal. Note that if alerting had previously been enabled, the previous step likely caused multiple alerts to fire; once this step is done, you can simply reload Prometheus to clear these targets and any related alerts should resolve themselves.
5454

5555
```bash
5656
sudo systemctl reload prometheus

0 commit comments

Comments
 (0)