Skip to content

Commit ad8deb0

Browse files
authored
Merge pull request #24 from qonto/feat-upgrade-to-sql-exporter
feat(PostgreSQL): upgrade alerts to sql exporter
2 parents 4a3496a + b389d48 commit ad8deb0

27 files changed

+206
-224
lines changed

.github/workflows/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ jobs:
8181
- name: Checkout
8282
uses: actions/checkout@v4
8383

84-
- name: Downgrade Helm # 1.13.0 has bug that block push charts on OCI https://github.com/helm/helm/issues/12491
84+
- name: Get Helm
8585
run: |
86-
curl -sSLo /tmp/helm.tar.gz "https://get.helm.sh/helm-v3.12.0-linux-amd64.tar.gz" && \
86+
curl -sSLo /tmp/helm.tar.gz "https://get.helm.sh/helm-v3.13.1-linux-amd64.tar.gz" && \
8787
tar --strip-components=1 -C /tmp -xzvf /tmp/helm.tar.gz linux-amd64/helm && \
8888
mv /tmp/helm /usr/local/bin/helm && \
8989
rm -f /tmp/helm.tar.gz
@@ -112,9 +112,9 @@ jobs:
112112
- name: Checkout
113113
uses: actions/checkout@v4
114114

115-
- name: Downgrade Helm # 1.13.0 has bug that block push charts on OCI https://github.com/helm/helm/issues/12491
115+
- name: Get helm
116116
run: |
117-
curl -sSLo /tmp/helm.tar.gz "https://get.helm.sh/helm-v3.12.0-linux-amd64.tar.gz" && \
117+
curl -sSLo /tmp/helm.tar.gz "https://get.helm.sh/helm-v3.13.1-linux-amd64.tar.gz" && \
118118
tar --strip-components=1 -C /tmp -xzvf /tmp/helm.tar.gz linux-amd64/helm && \
119119
mv /tmp/helm /usr/local/bin/helm && \
120120
rm -f /tmp/helm.tar.gz

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
name: helm
4141
runs-on: ubuntu-latest
4242
env:
43-
HELM_UNITTEST_VERSION: v0.3.5
43+
HELM_UNITTEST_VERSION: v0.4.1
4444
steps:
4545
- uses: actions/checkout@v3
4646

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Any alerts:
119119

120120
Any runboks:
121121

122-
* Explains why the alert is raied
122+
* Explains why the alert is raised
123123
* Estimates the impact on systems
124124
* Help to find the root cause
125125
* Provides guidelines to mitigate the situation

charts/prometheus-postgresql-alerts/prometheus_tests/PostgreSQLExporterErrors.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

charts/prometheus-postgresql-alerts/prometheus_tests/PostgreSQLExporterMissingScrapeErrorMetric.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

charts/prometheus-postgresql-alerts/prometheus_tests/PostgreSQLExporterScrapingLimit.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

charts/prometheus-postgresql-alerts/prometheus_tests/PostgreSQLInactiveLogicalReplicationSlot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ tests:
88
- name: PostgreSQLInactiveLogicalReplicationSlot
99
interval: 1m
1010
input_series:
11-
- series: 'pg_replication_slots_active{slot_type="logical", server="db1.unittest.eu-west-3.rds.amazonaws.com:5432", slot_name="unittest"}'
11+
- series: 'pg_replication_slots_active{slot_type="logical", target="db1", slot_name="unittest"}'
1212
values: 0x10
1313
alert_rule_test:
1414
- alertname: PostgreSQLInactiveLogicalReplicationSlot
1515
eval_time: 10m
1616
exp_alerts:
1717
- exp_labels:
18-
server: db1.unittest.eu-west-3.rds.amazonaws.com:5432
18+
target: db1
1919
slot_name: unittest
2020
severity: warning
2121
exp_annotations:

charts/prometheus-postgresql-alerts/prometheus_tests/PostgreSQLInactivePhysicalReplicationSlot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ tests:
88
- name: PostgreSQLInactivePhysicalReplicationSlot
99
interval: 1m
1010
input_series:
11-
- series: 'pg_replication_slots_active{slot_type="physical", server="db1.unittest.eu-west-3.rds.amazonaws.com:5432", slot_name="unittest"}'
11+
- series: 'pg_replication_slots_active{slot_type="physical", target="db1", slot_name="unittest"}'
1212
values: 0x10
1313
alert_rule_test:
1414
- alertname: PostgreSQLInactivePhysicalReplicationSlot
1515
eval_time: 10m
1616
exp_alerts:
1717
- exp_labels:
18-
server: db1.unittest.eu-west-3.rds.amazonaws.com:5432
18+
target: db1
1919
slot_name: unittest
2020
severity: warning
2121
exp_annotations:

charts/prometheus-postgresql-alerts/prometheus_tests/PostgreSQLInvalidIndex.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ tests:
88
- name: PostgreSQLInvalidIndex
99
interval: 1m
1010
input_series:
11-
- series: 'pg_stat_user_indexes_idx_blks_hit{cluster="db1", datname="unittest", relname="test", indexrelname="idx_id", indisvalid="false"}'
11+
- series: 'pg_stat_user_indexes_invalid_index_count{target="db1", datname="unittest", relname="test", indexrelname="idx_id"}'
1212
values: 1x60
1313
alert_rule_test:
1414
- alertname: PostgreSQLInvalidIndex
1515
eval_time: 1h
1616
exp_alerts:
1717
- exp_labels:
18-
cluster: db1
18+
target: db1
1919
datname: unittest
2020
relname: test
2121
indexrelname: idx_id

charts/prometheus-postgresql-alerts/prometheus_tests/PostgreSQLLongRunningQuery.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ tests:
88
- name: PostgreSQLLongRunningQuery
99
interval: 1m
1010
input_series:
11-
- series: 'pg_active_backend_duration_minutes{server="db1.unittest.eu-west-3.rds.amazonaws.com:5432",datname="unittest",usename="test",pid="1234"}'
11+
- series: 'pg_active_backend_duration_minutes{target="db1",datname="unittest",usename="test",pid="1234"}'
1212
values: 40+1x10
1313
alert_rule_test:
1414
- alertname: PostgreSQLLongRunningQuery
1515
eval_time: 1m
1616
exp_alerts:
1717
- exp_labels:
18-
server: db1.unittest.eu-west-3.rds.amazonaws.com:5432
18+
target: db1
1919
datname: unittest
2020
usename: test
2121
severity: warning

0 commit comments

Comments
 (0)