Skip to content

Commit 5cdd7c2

Browse files
pacho-rhpacho-rh
authored
Merge pull request #909 from hmariset/update-caching-ns
chore(KFLUXVNGD-527): Update Caching Squid's namespace
2 parents 1f8b27a + bed6fff commit 5cdd7c2

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎dashboards/grafana-dashboard-caching-squid-exporter.configmap.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ data:
127127
"uid": "${squid_datasource}"
128128
},
129129
"editorMode": "code",
130-
"expr": "squid_up{namespace=\"proxy\", service=\"squid\"}",
130+
"expr": "squid_up{namespace=\"caching\", service=\"squid\"}",
131131
"legendFormat": "__auto",
132132
"range": true,
133133
"refId": "A"
@@ -227,7 +227,7 @@ data:
227227
},
228228
"disableTextWrap": false,
229229
"editorMode": "code",
230-
"expr": "100 *\nsum(rate(squid_client_http_hits_total{namespace=\"proxy\", service=\"squid\"}[5m]))\n/\nsum(rate(squid_client_http_requests_total{namespace=\"proxy\", service=\"squid\"}[5m]))\n",
230+
"expr": "100 *\nsum(rate(squid_client_http_hits_total{namespace=\"caching\", service=\"squid\"}[5m]))\n/\nsum(rate(squid_client_http_requests_total{namespace=\"caching\", service=\"squid\"}[5m]))\n",
231231
"fullMetaSearch": false,
232232
"includeNullMetadata": true,
233233
"legendFormat": "__auto",
@@ -720,7 +720,7 @@ data:
720720
"uid": "${squid_datasource}"
721721
},
722722
"editorMode": "code",
723-
"expr": "avg by (hostname) (squid_site_hit_ratio{namespace=\"proxy\"})",
723+
"expr": "avg by (hostname) (squid_site_hit_ratio{namespace=\"caching\"})",
724724
"legendFormat": "__auto",
725725
"range": true,
726726
"refId": "A"
@@ -818,7 +818,7 @@ data:
818818
"uid": "${squid_datasource}"
819819
},
820820
"editorMode": "code",
821-
"expr": "sum by (hostname) (rate(squid_site_misses_total{namespace=\"proxy\"}[5m]))",
821+
"expr": "sum by (hostname) (rate(squid_site_misses_total{namespace=\"caching\"}[5m]))",
822822
"legendFormat": "__auto",
823823
"range": true,
824824
"refId": "A"
@@ -916,7 +916,7 @@ data:
916916
"uid": "${squid_datasource}"
917917
},
918918
"editorMode": "code",
919-
"expr": "sum by (hostname) (rate(squid_site_bytes_total{namespace=\"proxy\"}[5m]))",
919+
"expr": "sum by (hostname) (rate(squid_site_bytes_total{namespace=\"caching\"}[5m]))",
920920
"legendFormat": "__auto",
921921
"range": true,
922922
"refId": "A"
@@ -1014,7 +1014,7 @@ data:
10141014
"uid": "${squid_datasource}"
10151015
},
10161016
"editorMode": "code",
1017-
"expr": "sum by (hostname) (rate(squid_site_hits_total{namespace=\"proxy\"}[5m]))",
1017+
"expr": "sum by (hostname) (rate(squid_site_hits_total{namespace=\"caching\"}[5m]))",
10181018
"legendFormat": "__auto",
10191019
"range": true,
10201020
"refId": "A"
@@ -1113,7 +1113,7 @@ data:
11131113
},
11141114
"disableTextWrap": false,
11151115
"editorMode": "code",
1116-
"expr": "sum by (hostname) (rate(squid_site_requests_total{namespace=\"proxy\"}[5m]))",
1116+
"expr": "sum by (hostname) (rate(squid_site_requests_total{namespace=\"caching\"}[5m]))",
11171117
"fullMetaSearch": false,
11181118
"includeNullMetadata": true,
11191119
"legendFormat": "__auto",
@@ -1214,7 +1214,7 @@ data:
12141214
"uid": "${squid_datasource}"
12151215
},
12161216
"editorMode": "code",
1217-
"expr": "100 *\nsum(rate(squid_client_http_errors_total{namespace=\"proxy\", service=\"squid\"}[5m]))\n/\nsum(rate(squid_client_http_requests_total{namespace=\"proxy\", service=\"squid\"}[5m]))",
1217+
"expr": "100 *\nsum(rate(squid_client_http_errors_total{namespace=\"caching\", service=\"squid\"}[5m]))\n/\nsum(rate(squid_client_http_requests_total{namespace=\"caching\", service=\"squid\"}[5m]))",
12181218
"legendFormat": "__auto",
12191219
"range": true,
12201220
"refId": "A"
@@ -1312,7 +1312,7 @@ data:
13121312
"uid": "${squid_datasource}"
13131313
},
13141314
"editorMode": "code",
1315-
"expr": "rate(squid_client_http_kbytes_out_kbytes_total{namespace=\"proxy\", service=\"squid\"}[5m])",
1315+
"expr": "rate(squid_client_http_kbytes_out_kbytes_total{namespace=\"caching\", service=\"squid\"}[5m])",
13161316
"legendFormat": "__auto",
13171317
"range": true,
13181318
"refId": "A"
@@ -1410,7 +1410,7 @@ data:
14101410
"uid": "${squid_datasource}"
14111411
},
14121412
"editorMode": "code",
1413-
"expr": "sum(rate(squid_client_http_requests_total{namespace=\"proxy\", service=\"squid\"}[5m]))",
1413+
"expr": "sum(rate(squid_client_http_requests_total{namespace=\"caching\", service=\"squid\"}[5m]))",
14141414
"legendFormat": "__auto",
14151415
"range": true,
14161416
"refId": "A"

‎rhobs/alerting/data_plane/prometheus.caching_squid_alerts.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spec:
1212
rules:
1313
- alert: CachingSquidDown
1414
expr: |
15-
konflux_up{namespace="proxy", service="squid"} == 0
15+
konflux_up{namespace="caching", service="squid"} == 0
1616
for: 5m
1717
labels:
1818
severity: critical
@@ -21,7 +21,7 @@ spec:
2121
summary: >-
2222
Caching Squid proxy is down
2323
description: >-
24-
Squid exporter cannot scrape the Squid proxy successfully in namespace proxy.
24+
Squid exporter cannot scrape the Squid proxy successfully in namespace caching.
2525
The proxy has been down for 5 minutes.
2626
alert_team_handle: <!subteam^S07NDQV6A4D>
2727
team: vanguard

‎rhobs/recording/caching_availability_recording_rules.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ spec:
1212
- record: konflux_up
1313
expr: |
1414
min by (namespace, service) (
15-
squid_up{namespace="proxy", service="squid"}
15+
squid_up{namespace="caching", service="squid"}
1616
)

‎test/promql/tests/data_plane/caching_squid_alerts_test.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ tests:
66
- name: CachingSquidDownFiring
77
interval: 1m
88
input_series:
9-
- series: 'konflux_up{namespace="proxy", service="squid"}'
9+
- series: 'konflux_up{namespace="caching", service="squid"}'
1010
values: '0x10'
1111

1212
alert_rule_test:
@@ -16,11 +16,11 @@ tests:
1616
- exp_labels:
1717
severity: critical
1818
slo: "true"
19-
namespace: "proxy"
19+
namespace: "caching"
2020
service: "squid"
2121
exp_annotations:
2222
summary: "Caching Squid proxy is down"
23-
description: "Squid exporter cannot scrape the Squid proxy successfully in namespace proxy. The proxy has been down for 5 minutes."
23+
description: "Squid exporter cannot scrape the Squid proxy successfully in namespace caching. The proxy has been down for 5 minutes."
2424
alert_team_handle: "<!subteam^S07NDQV6A4D>"
2525
team: vanguard
2626
runbook_url: https://gitlab.cee.redhat.com/konflux/docs/sop/-/blob/main/vanguard/sre/caching-squid-down.md
@@ -29,7 +29,7 @@ tests:
2929
- name: CachingSquidDownNotFiring
3030
interval: 1m
3131
input_series:
32-
- series: 'konflux_up{namespace="proxy", service="squid"}'
32+
- series: 'konflux_up{namespace="caching", service="squid"}'
3333
values: '1x10'
3434

3535
alert_rule_test:

‎test/promql/tests/recording/caching_availability_recording_rules_test.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ tests:
77
- interval: 1m
88
# All replicas up → konflux_up = 1
99
input_series:
10-
- series: 'squid_up{namespace="proxy", service="squid", job="uwm/scrape", instance="10.0.0.1:9301", pod="squid-0"}'
10+
- series: 'squid_up{namespace="caching", service="squid", job="uwm/scrape", instance="10.0.0.1:9301", pod="squid-0"}'
1111
values: '1 1 1'
12-
- series: 'squid_up{namespace="proxy", service="squid", job="uwm/scrape", instance="10.0.0.2:9301", pod="squid-1"}'
12+
- series: 'squid_up{namespace="caching", service="squid", job="uwm/scrape", instance="10.0.0.2:9301", pod="squid-1"}'
1313
values: '1 1 1'
1414
promql_expr_test:
1515
- expr: konflux_up
1616
eval_time: 2m
1717
exp_samples:
18-
- labels: 'konflux_up{namespace="proxy", service="squid"}'
18+
- labels: 'konflux_up{namespace="caching", service="squid"}'
1919
value: 1
2020

2121
- interval: 1m
2222
# One replica down → konflux_up = 0 (min across targets)
2323
input_series:
24-
- series: 'squid_up{namespace="proxy", service="squid", job="uwm/scrape", instance="10.0.0.1:9301", pod="squid-0"}'
24+
- series: 'squid_up{namespace="caching", service="squid", job="uwm/scrape", instance="10.0.0.1:9301", pod="squid-0"}'
2525
values: '1 1 1'
26-
- series: 'squid_up{namespace="proxy", service="squid", job="uwm/scrape", instance="10.0.0.2:9301", pod="squid-1"}'
26+
- series: 'squid_up{namespace="caching", service="squid", job="uwm/scrape", instance="10.0.0.2:9301", pod="squid-1"}'
2727
values: '1 0 0'
2828
promql_expr_test:
2929
- expr: konflux_up
3030
eval_time: 2m
3131
exp_samples:
32-
- labels: 'konflux_up{namespace="proxy", service="squid"}'
32+
- labels: 'konflux_up{namespace="caching", service="squid"}'
3333
value: 0

0 commit comments

Comments
 (0)