Skip to content

Commit 8d7651f

Browse files
committed
The ccp_pg_hba_checksum metric was accidentally removed during a rebase/merge conflict resolution. This commit adds that metric back and adjusts a metrics test accordingly.
1 parent dd5204a commit 8d7651f

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

internal/collector/generated/postgres_5m_metrics.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/collector/postgres_5m_metrics.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,15 @@
3535
Function monitor.sequence_status() can provide more details if run directly on system.
3636
static_attributes:
3737
server: "localhost:5432"
38+
39+
- sql: SELECT monitor.pg_hba_checksum() AS status;
40+
metrics:
41+
- metric_name: ccp_pg_hba_checksum
42+
value_column: status
43+
description: |
44+
Value of checksum monitoring status for pg_catalog.pg_hba_file_rules (pg_hba.conf).
45+
0 = valid config. 1 = settings changed.
46+
Settings history is available for review in the table `monitor.pg_hba_checksum`.
47+
To reset current config to valid after alert, run monitor.pg_hba_checksum_set_valid(). Note this will clear the history table.
48+
static_attributes:
49+
server: "localhost:5432"

internal/collector/postgres_metrics_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ func TestRemoveMetricsFromQueries(t *testing.T) {
1717
err := json.Unmarshal(fiveMinuteMetrics, &fiveMinuteMetricsArr)
1818
assert.NilError(t, err)
1919

20-
assert.Equal(t, len(fiveMinuteMetricsArr), 2)
20+
assert.Equal(t, len(fiveMinuteMetricsArr), 3)
2121
newArr := removeMetricsFromQueries([]string{"ccp_database_size_bytes"}, fiveMinuteMetricsArr)
22-
assert.Equal(t, len(newArr), 1)
22+
assert.Equal(t, len(newArr), 2)
2323

2424
t.Run("DeleteOneMetric", func(t *testing.T) {
2525
sqlMetricsData := `[

0 commit comments

Comments
 (0)