diff --git a/prometheus/prom_rules/prometheus.latency.rules.yml b/prometheus/prom_rules/prometheus.latency.rules.yml index 33f437614..ba8082992 100644 --- a/prometheus/prom_rules/prometheus.latency.rules.yml +++ b/prometheus/prom_rules/prometheus.latency.rules.yml @@ -45,11 +45,6 @@ groups: expr: timestamp(sum(changes(scylla_manager_scheduler_run_total{status="ERROR",type="backup"}[2m])) by (cluster) > 0) or on(cluster) manager:backup_fail_ts - record: manager:repair_progress expr: (max(scylla_manager_scheduler_run_indicator{type="repair"}) by (cluster) >bool 0)*((max(scylla_manager_repair_token_ranges_total) by(cluster)<= 0)*0 or on(cluster) (sum(scylla_manager_repair_token_ranges_success>=0) by (cluster) + sum(scylla_manager_repair_token_ranges_error>=0) by (cluster))/sum(scylla_manager_repair_token_ranges_total>=0) by (cluster)) - - record: scylla_manager_repair_progress - expr: sum(manager:repair_progress) by (cluster) - labels: - dd: "1" - by: "cluster" - record: manager:backup_progress expr: (max(scylla_manager_scheduler_run_indicator{type="backup"}) by (cluster) >bool 0)*((max(scylla_manager_backup_files_size_bytes) by(cluster)<= 0)*0 or on(cluster) (sum(scylla_manager_backup_files_uploaded_bytes) by (cluster) + sum(scylla_manager_backup_files_skipped_bytes) by (cluster) + sum(scylla_manager_backup_files_failed_bytes)by(cluster))/sum(scylla_manager_backup_files_size_bytes>=0) by (cluster)) - record: scylla_manager_backup_progress diff --git a/prometheus/prometheus.yml.template b/prometheus/prometheus.yml.template index df4aac15a..d360b7f6e 100644 --- a/prometheus/prometheus.yml.template +++ b/prometheus/prometheus.yml.template @@ -196,11 +196,11 @@ scrape_configs: - source_labels: [host] target_label: instance - source_labels: [__name__] - regex: '(scylla_manager_scheduler_last_duration)' + regex: '(scylla_manager_scheduler_last_duration|scylla_manager_repair_progress)' target_label: dd replacement: '1' - source_labels: [__name__] - regex: '(scylla_manager_scheduler_last_duration)' + regex: '(scylla_manager_scheduler_last_duration|scylla_manager_repair_progress)' target_label: by replacement: 'cluster'