diff --git a/changelogs/fragments/459.yml b/changelogs/fragments/459.yml new file mode 100644 index 0000000..67fcd37 --- /dev/null +++ b/changelogs/fragments/459.yml @@ -0,0 +1,4 @@ +minor_changes: + - sql_exporter - Removed the metric `ccp_backrest_last_info_repo_total_size_bytes`. When block incremental backups are enabled, this metric is no longer available from pgBackRest. + - postgres_exporter - Removed the metric `ccp_backrest_last_info_repo_total_size_bytes`. + - grafana - Removed the `Last Backup Size (Total)` panel from the pgBackRest Grafana dashboard since it was backed by the removed metric. diff --git a/grafana/postgres/PGBackrest.json b/grafana/postgres/PGBackrest.json index 78b3c09..34bf0b5 100644 --- a/grafana/postgres/PGBackrest.json +++ b/grafana/postgres/PGBackrest.json @@ -75,7 +75,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.4.2", + "pluginVersion": "10.4.15", "targets": [ { "datasource": { @@ -385,105 +385,6 @@ "x": 0, "y": 11 }, - "id": 8, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "right", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "10.4.2", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${ccp_datasource}" - }, - "exemplar": true, - "expr": "ccp_backrest_last_info_repo_total_size_bytes{stanza=\"[[backrest_stanza]]\", repo=\"[[backrest_repo]]\"} + on(job,instance) group_left() (ccp_is_in_recovery_status == 2)", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "{{backup_type}}", - "refId": "A" - } - ], - "title": "Last Backup Size (Total)", - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${ccp_datasource}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "links": [], - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "bytes" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 11 - }, "id": 9, "options": { "legend": { @@ -622,6 +523,6 @@ "timezone": "", "title": "pgBackRest", "uid": "QtHwNCrik", - "version": 1, + "version": 2, "weekStart": "" } diff --git a/hugo/content/exporter/_index.md b/hugo/content/exporter/_index.md index 063b7a4..420d5f4 100644 --- a/hugo/content/exporter/_index.md +++ b/hugo/content/exporter/_index.md @@ -450,8 +450,6 @@ Backup monitoring only covers pgBackRest at this time. These metrics only need t * *ccp_backrest_last_info_repo_backup_size_bytes* - Actual size of only this individual backup in the pgbackrest repository - * *ccp_backrest_last_info_repo_total_size_bytes* - Total size of this backup in the pgbackrest repository, including all required previous backups and WAL - * *ccp_backrest_last_info_backup_error* - Count of errors tracked for this backup. Note this does not track incomplete backups, only errors encountered during the backup (checksum errors, file truncation, invalid headers, etc) #### Per-Database Metrics diff --git a/postgres_exporter/linux/queries_backrest.yml b/postgres_exporter/linux/queries_backrest.yml index 6077d94..5b0ba81 100644 --- a/postgres_exporter/linux/queries_backrest.yml +++ b/postgres_exporter/linux/queries_backrest.yml @@ -24,7 +24,6 @@ ccp_backrest_last_info: , a.backup_data->'database'->>'repo-key' AS repo , a.backup_data->>'type' AS backup_type , a.backup_data->'info'->'repository'->>'delta' AS repo_backup_size_bytes - , a.backup_data->'info'->'repository'->>'size' AS repo_total_size_bytes , (a.backup_data->'timestamp'->>'stop')::bigint - (a.backup_data->'timestamp'->>'start')::bigint AS backup_runtime_seconds , CASE WHEN a.backup_data->>'error' = 'true' THEN 1 @@ -64,9 +63,6 @@ ccp_backrest_last_info: - repo_backup_size_bytes: usage: "GAUGE" description: "Actual size of only this individual backup in the pgbackrest repository" - - repo_total_size_bytes: - usage: "GAUGE" - description: "Total size of this backup in the pgbackrest repository, including all required previous backups and WAL" - backup_runtime_seconds: usage: "GAUGE" description: "Total runtime in seconds of this backup" diff --git a/sql_exporter/common/crunchy_backrest_collector.yml b/sql_exporter/common/crunchy_backrest_collector.yml index 8bfae4f..570f3da 100644 --- a/sql_exporter/common/crunchy_backrest_collector.yml +++ b/sql_exporter/common/crunchy_backrest_collector.yml @@ -21,16 +21,6 @@ metrics: - repo - backup_type query_ref: ccp_backrest_last_info - - metric_name: ccp_backrest_last_info_repo_total_size_bytes - type: gauge - help: "Total size of this backup in the pgbackrest repository, including all required previous backups and WAL" - values: [repo_total_size_bytes] - key_labels: - - config_file - - stanza - - repo - - backup_type - query_ref: ccp_backrest_last_info - metric_name: ccp_backrest_last_info_backup_runtime_seconds type: gauge help: "Total runtime in seconds of this backup" @@ -107,7 +97,6 @@ queries: , repo , backup_type , repo_backup_size_bytes - , repo_total_size_bytes , backup_runtime_seconds , backup_error FROM pgmonitor_ext.ccp_backrest_last_info