@@ -64,14 +64,14 @@ groups:
6464 sum by (bucket,project_id) (
6565 label_replace(
6666 rate(radosgw_requests_duration_sum{method=~"GET|PUT"}[5m]),
67- "project_id", "$1", "tenant", "([a-f0-9]{32} )"
67+ "project_id", "$1", "tenant", "(.* )"
6868 )
6969 )
7070 /
7171 sum by (bucket,project_id) (
7272 label_replace(
7373 rate(radosgw_requests_duration_count{method=~"GET|PUT"}[5m]),
74- "project_id", "$1", "tenant", "([a-f0-9]{32} )"
74+ "project_id", "$1", "tenant", "(.* )"
7575 )
7676 )
7777 # Upload Object Latency (PUT+POST) – avg over 5 m, in ms
@@ -81,14 +81,14 @@ groups:
8181 sum by (bucket,project_id) (
8282 label_replace(
8383 rate(radosgw_requests_duration_sum{method=~"PUT|POST"}[5m]),
84- "project_id", "$1", "tenant", "([a-f0-9]{32} )"
84+ "project_id", "$1", "tenant", "(.* )"
8585 )
8686 )
8787 /
8888 sum by (bucket,project_id) (
8989 label_replace(
9090 rate(radosgw_requests_duration_count{method=~"PUT|POST"}[5m]),
91- "project_id", "$1", "tenant", "([a-f0-9]{32} )"
91+ "project_id", "$1", "tenant", "(.* )"
9292 )
9393 )
9494 ) * 1000
@@ -99,14 +99,14 @@ groups:
9999 sum by (bucket,project_id) (
100100 label_replace(
101101 rate(radosgw_requests_duration_sum{method="GET"}[5m]),
102- "project_id", "$1", "tenant", "([a-f0-9]{32} )"
102+ "project_id", "$1", "tenant", "(.* )"
103103 )
104104 )
105105 /
106106 sum by (bucket,project_id) (
107107 label_replace(
108108 rate(radosgw_requests_duration_count{method="GET"}[5m]),
109- "project_id", "$1", "tenant", "([a-f0-9]{32} )"
109+ "project_id", "$1", "tenant", "(.* )"
110110 )
111111 )
112112 ) * 1000
@@ -117,14 +117,14 @@ groups:
117117 sum by (bucket,project_id) (
118118 label_replace(
119119 rate(radosgw_requests_duration_sum{method="DELETE"}[5m]),
120- "project_id", "$1", "tenant", "([a-f0-9]{32} )"
120+ "project_id", "$1", "tenant", "(.* )"
121121 )
122122 )
123123 /
124124 sum by (bucket,project_id) (
125125 label_replace(
126126 rate(radosgw_requests_duration_count{method="DELETE"}[5m]),
127- "project_id", "$1", "tenant", "([a-f0-9]{32} )"
127+ "project_id", "$1", "tenant", "(.* )"
128128 )
129129 )
130130 ) * 1000
@@ -133,7 +133,7 @@ groups:
133133 expr : |
134134 sum by (bucket,project_id,http_status) (
135135 label_replace(
136- rate(radosgw_errors_total {http_status=~"4.."}[5m]),
136+ rate(radosgw_http_errors_by_user {http_status=~"4.."}[5m]),
137137 "project_id", "$1", "tenant", "([a-f0-9]{32})"
138138 )
139139 )
@@ -142,7 +142,7 @@ groups:
142142 expr : |
143143 sum by (bucket,project_id,http_status) (
144144 label_replace(
145- rate(radosgw_errors_total {http_status=~"5.."}[5m]),
145+ rate(radosgw_http_errors_by_user {http_status=~"5.."}[5m]),
146146 "project_id", "$1", "tenant", "([a-f0-9]{32})"
147147 )
148148 )
0 commit comments