From 41e3225c8867c412f72d82c940ea80d2c12e5148 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Sun, 27 Feb 2022 01:12:48 +0000 Subject: [PATCH] Fix a typo in a prometheus help string This patch fixes a typo in the prometheus help string for pool member abort metrics. Previously the help string had "octavia_pool_server_aborts_total" where it should be "octavia_pool_member_aborts_total". Change-Id: I403398aa00b0c39804f1a1699b11f7da7fc33cd9 --- octavia/cmd/prometheus_proxy.py | 2 +- octavia/tests/common/sample_octavia_prometheus | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/octavia/cmd/prometheus_proxy.py b/octavia/cmd/prometheus_proxy.py index 1737915f0e..2cd7f8744e 100644 --- a/octavia/cmd/prometheus_proxy.py +++ b/octavia/cmd/prometheus_proxy.py @@ -398,7 +398,7 @@ METRIC_MAP = { ("octavia_pool_client_aborts_total{", None, {"proxy=": "pool="}), "haproxy_backend_server_aborts_total ": ("octavia_pool_member_aborts_total ", - "# HELP octavia_pool_server_aborts_total Total number of data " + "# HELP octavia_pool_member_aborts_total Total number of data " "transfers aborted by the server.\n", None), "haproxy_backend_server_aborts_total{": ("octavia_pool_member_aborts_total{", None, {"proxy=": "pool="}), diff --git a/octavia/tests/common/sample_octavia_prometheus b/octavia/tests/common/sample_octavia_prometheus index 9ed333b6dc..f868ac16d8 100644 --- a/octavia/tests/common/sample_octavia_prometheus +++ b/octavia/tests/common/sample_octavia_prometheus @@ -363,7 +363,7 @@ octavia_pool_failed_header_rewriting_total{pool="6034884d-ed47-49d5-ade7-8fa2c45 # TYPE octavia_pool_client_aborts_total counter octavia_pool_client_aborts_total{pool="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74"} 0 octavia_pool_client_aborts_total{pool="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db"} 0 -# HELP octavia_pool_server_aborts_total Total number of data transfers aborted by the server. +# HELP octavia_pool_member_aborts_total Total number of data transfers aborted by the server. # TYPE octavia_pool_member_aborts_total counter octavia_pool_member_aborts_total{pool="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74"} 0 octavia_pool_member_aborts_total{pool="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db"} 0