Content differences:
--- /etc/prometheus/blackbox.yml.d/service_catalog.yml.orig
+++ /etc/prometheus/blackbox.yml.d/service_catalog.yml
@@ -2005,19 +2005,19 @@
fail_if_not_ssl: true
tls_config: *180
timeout: 3s
- http_image-suggestion_ip4:
+ http_data-gateway_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &181
- Host: image-suggestion.svc.codfw.wmnet
+ Host: data-gateway.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &182
- server_name: image-suggestion.svc.codfw.wmnet
- timeout: 3s
- http_image-suggestion_ip6:
+ server_name: data-gateway.svc.codfw.wmnet
+ timeout: 3s
+ http_data-gateway_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2027,19 +2027,19 @@
fail_if_not_ssl: true
tls_config: *182
timeout: 3s
- http_data-gateway_ip4:
+ http_data-gateway-staging_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &183
- Host: data-gateway.svc.codfw.wmnet
+ Host: data-gateway.k8s-staging.discovery.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &184
- server_name: data-gateway.svc.codfw.wmnet
- timeout: 3s
- http_data-gateway_ip6:
+ server_name: data-gateway.k8s-staging.discovery.wmnet
+ timeout: 3s
+ http_data-gateway-staging_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2049,19 +2049,19 @@
fail_if_not_ssl: true
tls_config: *184
timeout: 3s
- http_data-gateway-staging_ip4:
+ http_developer-portal_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &185
- Host: data-gateway.k8s-staging.discovery.wmnet
+ Host: developer-portal.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &186
- server_name: data-gateway.k8s-staging.discovery.wmnet
- timeout: 3s
- http_data-gateway-staging_ip6:
+ server_name: developer-portal.svc.codfw.wmnet
+ timeout: 3s
+ http_developer-portal_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2071,68 +2071,68 @@
fail_if_not_ssl: true
tls_config: *186
timeout: 3s
- http_developer-portal_ip4:
+ http_netbox_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &187
- Host: developer-portal.svc.codfw.wmnet
- fail_if_ssl: false
- fail_if_not_ssl: true
- tls_config: &188
- server_name: developer-portal.svc.codfw.wmnet
- timeout: 3s
- http_developer-portal_ip6:
- prober: http
- http:
- preferred_ip_protocol: ip6
- ip_protocol_fallback: false
- headers: *187
- fail_if_ssl: false
- fail_if_not_ssl: true
- tls_config: *188
- timeout: 3s
- http_netbox_ip4:
- prober: http
- http:
- preferred_ip_protocol: ip4
- ip_protocol_fallback: false
- headers: &189
Host: netbox.wikimedia.org
- valid_status_codes: &190
+ valid_status_codes: &188
- 302
no_follow_redirects: true
fail_if_ssl: false
fail_if_not_ssl: true
+ tls_config: &189
+ server_name: netbox.wikimedia.org
+ timeout: 3s
+ http_netbox_ip6:
+ prober: http
+ http:
+ preferred_ip_protocol: ip6
+ ip_protocol_fallback: false
+ headers: *187
+ valid_status_codes: *188
+ no_follow_redirects: true
+ fail_if_ssl: false
+ fail_if_not_ssl: true
+ tls_config: *189
+ timeout: 3s
+ http_logs-api_ip4:
+ prober: http
+ http:
+ preferred_ip_protocol: ip4
+ ip_protocol_fallback: false
+ headers: &190
+ Host: logs-api.svc.eqiad.wmnet
+ fail_if_ssl: false
+ fail_if_not_ssl: true
tls_config: &191
- server_name: netbox.wikimedia.org
- timeout: 3s
- http_netbox_ip6:
- prober: http
- http:
- preferred_ip_protocol: ip6
- ip_protocol_fallback: false
- headers: *189
- valid_status_codes: *190
- no_follow_redirects: true
+ server_name: logs-api.svc.eqiad.wmnet
+ timeout: 3s
+ http_logs-api_ip6:
+ prober: http
+ http:
+ preferred_ip_protocol: ip6
+ ip_protocol_fallback: false
+ headers: *190
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: *191
timeout: 3s
- http_logs-api_ip4:
+ http_commons-impact-analytics_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &192
- Host: logs-api.svc.eqiad.wmnet
+ Host: commons-impact-analytics.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &193
- server_name: logs-api.svc.eqiad.wmnet
- timeout: 3s
- http_logs-api_ip6:
+ server_name: commons-impact-analytics.svc.codfw.wmnet
+ timeout: 3s
+ http_commons-impact-analytics_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2142,19 +2142,19 @@
fail_if_not_ssl: true
tls_config: *193
timeout: 3s
- http_commons-impact-analytics_ip4:
+ http_device-analytics_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &194
- Host: commons-impact-analytics.svc.codfw.wmnet
+ Host: device-analytics.discovery.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &195
- server_name: commons-impact-analytics.svc.codfw.wmnet
- timeout: 3s
- http_commons-impact-analytics_ip6:
+ server_name: device-analytics.discovery.wmnet
+ timeout: 3s
+ http_device-analytics_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2164,19 +2164,19 @@
fail_if_not_ssl: true
tls_config: *195
timeout: 3s
- http_device-analytics_ip4:
+ http_geo-analytics_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &196
- Host: device-analytics.discovery.wmnet
+ Host: geo-analytics.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &197
- server_name: device-analytics.discovery.wmnet
- timeout: 3s
- http_device-analytics_ip6:
+ server_name: geo-analytics.svc.codfw.wmnet
+ timeout: 3s
+ http_geo-analytics_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2186,19 +2186,19 @@
fail_if_not_ssl: true
tls_config: *197
timeout: 3s
- http_geo-analytics_ip4:
+ http_media-analytics_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &198
- Host: geo-analytics.svc.codfw.wmnet
+ Host: media-analytics.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &199
- server_name: geo-analytics.svc.codfw.wmnet
- timeout: 3s
- http_geo-analytics_ip6:
+ server_name: media-analytics.svc.codfw.wmnet
+ timeout: 3s
+ http_media-analytics_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2208,19 +2208,19 @@
fail_if_not_ssl: true
tls_config: *199
timeout: 3s
- http_media-analytics_ip4:
+ http_page-analytics_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &200
- Host: media-analytics.svc.codfw.wmnet
+ Host: page-analytics.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &201
- server_name: media-analytics.svc.codfw.wmnet
- timeout: 3s
- http_media-analytics_ip6:
+ server_name: page-analytics.svc.codfw.wmnet
+ timeout: 3s
+ http_page-analytics_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2230,19 +2230,19 @@
fail_if_not_ssl: true
tls_config: *201
timeout: 3s
- http_page-analytics_ip4:
+ http_editor-analytics_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &202
- Host: page-analytics.svc.codfw.wmnet
+ Host: editor-analytics.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &203
- server_name: page-analytics.svc.codfw.wmnet
- timeout: 3s
- http_page-analytics_ip6:
+ server_name: editor-analytics.svc.codfw.wmnet
+ timeout: 3s
+ http_editor-analytics_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2252,19 +2252,19 @@
fail_if_not_ssl: true
tls_config: *203
timeout: 3s
- http_editor-analytics_ip4:
+ http_edit-analytics_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &204
- Host: editor-analytics.svc.codfw.wmnet
+ Host: edit-analytics.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &205
- server_name: editor-analytics.svc.codfw.wmnet
- timeout: 3s
- http_editor-analytics_ip6:
+ server_name: edit-analytics.svc.codfw.wmnet
+ timeout: 3s
+ http_edit-analytics_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2274,40 +2274,18 @@
fail_if_not_ssl: true
tls_config: *205
timeout: 3s
- http_edit-analytics_ip4:
- prober: http
- http:
- preferred_ip_protocol: ip4
- ip_protocol_fallback: false
- headers: &206
- Host: edit-analytics.svc.codfw.wmnet
- fail_if_ssl: false
- fail_if_not_ssl: true
- tls_config: &207
- server_name: edit-analytics.svc.codfw.wmnet
- timeout: 3s
- http_edit-analytics_ip6:
- prober: http
- http:
- preferred_ip_protocol: ip6
- ip_protocol_fallback: false
- headers: *206
- fail_if_ssl: false
- fail_if_not_ssl: true
- tls_config: *207
- timeout: 3s
http_pki_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
- fail_if_body_not_matches_regexp: &208
+ fail_if_body_not_matches_regexp: &206
- signer="discovery"
- headers: &209
+ headers: &207
Host: pki.discovery.wmnet
fail_if_ssl: true
fail_if_not_ssl: false
- tls_config: &210
+ tls_config: &208
server_name: pki.discovery.wmnet
timeout: 3s
http_pki_ip6:
@@ -2315,25 +2293,47 @@
http:
preferred_ip_protocol: ip6
ip_protocol_fallback: false
- fail_if_body_not_matches_regexp: *208
- headers: *209
+ fail_if_body_not_matches_regexp: *206
+ headers: *207
fail_if_ssl: true
fail_if_not_ssl: false
+ tls_config: *208
+ timeout: 3s
+ http_rest-gateway_ip4:
+ prober: http
+ http:
+ preferred_ip_protocol: ip4
+ ip_protocol_fallback: false
+ headers: &209
+ Host: rest-gateway.discovery.wmnet
+ fail_if_ssl: false
+ fail_if_not_ssl: true
+ tls_config: &210
+ server_name: rest-gateway.discovery.wmnet
+ timeout: 3s
+ http_rest-gateway_ip6:
+ prober: http
+ http:
+ preferred_ip_protocol: ip6
+ ip_protocol_fallback: false
+ headers: *209
+ fail_if_ssl: false
+ fail_if_not_ssl: true
tls_config: *210
timeout: 3s
- http_rest-gateway_ip4:
+ http_machinetranslation_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &211
- Host: rest-gateway.discovery.wmnet
+ Host: machinetranslation.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &212
- server_name: rest-gateway.discovery.wmnet
- timeout: 3s
- http_rest-gateway_ip6:
+ server_name: machinetranslation.svc.codfw.wmnet
+ timeout: 3s
+ http_machinetranslation_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2343,19 +2343,19 @@
fail_if_not_ssl: true
tls_config: *212
timeout: 3s
- http_machinetranslation_ip4:
+ http_wikifunctions_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &213
- Host: machinetranslation.svc.codfw.wmnet
+ Host: wikifunctions.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &214
- server_name: machinetranslation.svc.codfw.wmnet
- timeout: 3s
- http_machinetranslation_ip6:
+ server_name: wikifunctions.svc.codfw.wmnet
+ timeout: 3s
+ http_wikifunctions_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2365,19 +2365,19 @@
fail_if_not_ssl: true
tls_config: *214
timeout: 3s
- http_wikifunctions_ip4:
+ http_config-master_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &215
- Host: wikifunctions.svc.codfw.wmnet
+ Host: config-master.discovery.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &216
- server_name: wikifunctions.svc.codfw.wmnet
- timeout: 3s
- http_wikifunctions_ip6:
+ server_name: config-master.discovery.wmnet
+ timeout: 3s
+ http_config-master_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2387,19 +2387,19 @@
fail_if_not_ssl: true
tls_config: *216
timeout: 3s
- http_config-master_ip4:
+ http_ipoid_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &217
- Host: config-master.discovery.wmnet
+ Host: ipoid.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &218
- server_name: config-master.discovery.wmnet
- timeout: 3s
- http_config-master_ip6:
+ server_name: ipoid.svc.codfw.wmnet
+ timeout: 3s
+ http_ipoid_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2409,19 +2409,19 @@
fail_if_not_ssl: true
tls_config: *218
timeout: 3s
- http_ipoid_ip4:
+ http_superset-next_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &219
- Host: ipoid.svc.codfw.wmnet
+ Host: superset-next.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &220
- server_name: ipoid.svc.codfw.wmnet
- timeout: 3s
- http_ipoid_ip6:
+ server_name: superset-next.svc.codfw.wmnet
+ timeout: 3s
+ http_superset-next_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2431,19 +2431,19 @@
fail_if_not_ssl: true
tls_config: *220
timeout: 3s
- http_superset-next_ip4:
+ http_superset_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &221
- Host: superset-next.svc.codfw.wmnet
+ Host: superset.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &222
- server_name: superset-next.svc.codfw.wmnet
- timeout: 3s
- http_superset-next_ip6:
+ server_name: superset.svc.codfw.wmnet
+ timeout: 3s
+ http_superset_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2453,19 +2453,19 @@
fail_if_not_ssl: true
tls_config: *222
timeout: 3s
- http_superset_ip4:
+ http_test-kitchen_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &223
- Host: superset.svc.codfw.wmnet
+ Host: test-kitchen.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &224
- server_name: superset.svc.codfw.wmnet
- timeout: 3s
- http_superset_ip6:
+ server_name: test-kitchen.svc.codfw.wmnet
+ timeout: 3s
+ http_test-kitchen_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2475,19 +2475,19 @@
fail_if_not_ssl: true
tls_config: *224
timeout: 3s
- http_test-kitchen_ip4:
+ http_test-kitchen-next_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &225
- Host: test-kitchen.svc.codfw.wmnet
+ Host: test-kitchen-next.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &226
- server_name: test-kitchen.svc.codfw.wmnet
- timeout: 3s
- http_test-kitchen_ip6:
+ server_name: test-kitchen-next.svc.codfw.wmnet
+ timeout: 3s
+ http_test-kitchen-next_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2497,38 +2497,16 @@
fail_if_not_ssl: true
tls_config: *226
timeout: 3s
- http_test-kitchen-next_ip4:
+ http_chart-renderer_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &227
- Host: test-kitchen-next.svc.codfw.wmnet
+ Host: chart-renderer.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &228
- server_name: test-kitchen-next.svc.codfw.wmnet
- timeout: 3s
- http_test-kitchen-next_ip6:
- prober: http
- http:
- preferred_ip_protocol: ip6
- ip_protocol_fallback: false
- headers: *227
- fail_if_ssl: false
- fail_if_not_ssl: true
- tls_config: *228
- timeout: 3s
- http_chart-renderer_ip4:
- prober: http
- http:
- preferred_ip_protocol: ip4
- ip_protocol_fallback: false
- headers: &229
- Host: chart-renderer.svc.codfw.wmnet
- fail_if_ssl: false
- fail_if_not_ssl: true
- tls_config: &230
server_name: chart-renderer.svc.codfw.wmnet
timeout: 10s
http_chart-renderer_ip6:
@@ -2536,24 +2514,46 @@
http:
preferred_ip_protocol: ip6
ip_protocol_fallback: false
- headers: *229
- fail_if_ssl: false
- fail_if_not_ssl: true
- tls_config: *230
+ headers: *227
+ fail_if_ssl: false
+ fail_if_not_ssl: true
+ tls_config: *228
timeout: 10s
http_blunderbuss_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
+ headers: &229
+ Host: blunderbuss.svc.codfw.wmnet
+ fail_if_ssl: false
+ fail_if_not_ssl: true
+ tls_config: &230
+ server_name: blunderbuss.svc.codfw.wmnet
+ timeout: 3s
+ http_blunderbuss_ip6:
+ prober: http
+ http:
+ preferred_ip_protocol: ip6
+ ip_protocol_fallback: false
+ headers: *229
+ fail_if_ssl: false
+ fail_if_not_ssl: true
+ tls_config: *230
+ timeout: 3s
+ http_opensearch-test_ip4:
+ prober: http
+ http:
+ preferred_ip_protocol: ip4
+ ip_protocol_fallback: false
headers: &231
- Host: blunderbuss.svc.codfw.wmnet
+ Host: opensearch-test.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &232
- server_name: blunderbuss.svc.codfw.wmnet
- timeout: 3s
- http_blunderbuss_ip6:
+ server_name: opensearch-test.svc.codfw.wmnet
+ timeout: 3s
+ http_opensearch-test_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2563,19 +2563,19 @@
fail_if_not_ssl: true
tls_config: *232
timeout: 3s
- http_opensearch-test_ip4:
+ http_opensearch-ipoid_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &233
- Host: opensearch-test.svc.codfw.wmnet
+ Host: opensearch-ipoid.svc.codfw.wmnet
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &234
- server_name: opensearch-test.svc.codfw.wmnet
- timeout: 3s
- http_opensearch-test_ip6:
+ server_name: opensearch-ipoid.svc.codfw.wmnet
+ timeout: 3s
+ http_opensearch-ipoid_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2585,68 +2585,68 @@
fail_if_not_ssl: true
tls_config: *234
timeout: 3s
- http_opensearch-ipoid_ip4:
+ http_analytics-web_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &235
- Host: opensearch-ipoid.svc.codfw.wmnet
- fail_if_ssl: false
- fail_if_not_ssl: true
- tls_config: &236
- server_name: opensearch-ipoid.svc.codfw.wmnet
- timeout: 3s
- http_opensearch-ipoid_ip6:
- prober: http
- http:
- preferred_ip_protocol: ip6
- ip_protocol_fallback: false
- headers: *235
- fail_if_ssl: false
- fail_if_not_ssl: true
- tls_config: *236
- timeout: 3s
- http_analytics-web_ip4:
- prober: http
- http:
- preferred_ip_protocol: ip4
- ip_protocol_fallback: false
- headers: &237
Host: analytics.wikimedia.org
- valid_status_codes: &238
+ valid_status_codes: &236
- 302
no_follow_redirects: true
fail_if_ssl: false
fail_if_not_ssl: true
+ tls_config: &237
+ server_name: analytics.wikimedia.org
+ timeout: 3s
+ http_analytics-web_ip6:
+ prober: http
+ http:
+ preferred_ip_protocol: ip6
+ ip_protocol_fallback: false
+ headers: *235
+ valid_status_codes: *236
+ no_follow_redirects: true
+ fail_if_ssl: false
+ fail_if_not_ssl: true
+ tls_config: *237
+ timeout: 3s
+ http_codesearch_ip4:
+ prober: http
+ http:
+ preferred_ip_protocol: ip4
+ ip_protocol_fallback: false
+ headers: &238
+ Host: codesearch.wikimedia.org
+ fail_if_ssl: false
+ fail_if_not_ssl: true
tls_config: &239
- server_name: analytics.wikimedia.org
- timeout: 3s
- http_analytics-web_ip6:
- prober: http
- http:
- preferred_ip_protocol: ip6
- ip_protocol_fallback: false
- headers: *237
- valid_status_codes: *238
- no_follow_redirects: true
+ server_name: codesearch.wikimedia.org
+ timeout: 3s
+ http_codesearch_ip6:
+ prober: http
+ http:
+ preferred_ip_protocol: ip6
+ ip_protocol_fallback: false
+ headers: *238
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: *239
timeout: 3s
- http_codesearch_ip4:
+ http_zarcillo_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &240
- Host: codesearch.wikimedia.org
+ Host: zarcillo.wikimedia.org
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &241
- server_name: codesearch.wikimedia.org
- timeout: 3s
- http_codesearch_ip6:
+ server_name: zarcillo.wikimedia.org
+ timeout: 3s
+ http_zarcillo_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2656,19 +2656,19 @@
fail_if_not_ssl: true
tls_config: *241
timeout: 3s
- http_zarcillo_ip4:
+ http_os-reports_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &242
- Host: zarcillo.wikimedia.org
+ Host: os-reports.wikimedia.org
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &243
- server_name: zarcillo.wikimedia.org
- timeout: 3s
- http_zarcillo_ip6:
+ server_name: os-reports.wikimedia.org
+ timeout: 3s
+ http_os-reports_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2678,19 +2678,19 @@
fail_if_not_ssl: true
tls_config: *243
timeout: 3s
- http_os-reports_ip4:
+ http_wmf-navigator_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &244
- Host: os-reports.wikimedia.org
+ Host: wmf-navigator.wikimedia.org
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &245
- server_name: os-reports.wikimedia.org
- timeout: 3s
- http_os-reports_ip6:
+ server_name: wmf-navigator.wikimedia.org
+ timeout: 3s
+ http_wmf-navigator_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2700,19 +2700,19 @@
fail_if_not_ssl: true
tls_config: *245
timeout: 3s
- http_wmf-navigator_ip4:
+ http_gerrit-https_ip4:
prober: http
http:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
headers: &246
- Host: wmf-navigator.wikimedia.org
+ Host: gerrit.wikimedia.org
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: &247
- server_name: wmf-navigator.wikimedia.org
- timeout: 3s
- http_wmf-navigator_ip6:
+ server_name: gerrit.wikimedia.org
+ timeout: 3s
+ http_gerrit-https_ip6:
prober: http
http:
preferred_ip_protocol: ip6
@@ -2721,35 +2721,13 @@
fail_if_ssl: false
fail_if_not_ssl: true
tls_config: *247
- timeout: 3s
- http_gerrit-https_ip4:
- prober: http
- http:
- preferred_ip_protocol: ip4
- ip_protocol_fallback: false
- headers: &248
- Host: gerrit.wikimedia.org
- fail_if_ssl: false
- fail_if_not_ssl: true
- tls_config: &249
- server_name: gerrit.wikimedia.org
- timeout: 3s
- http_gerrit-https_ip6:
- prober: http
- http:
- preferred_ip_protocol: ip6
- ip_protocol_fallback: false
- headers: *248
- fail_if_ssl: false
- fail_if_not_ssl: true
- tls_config: *249
timeout: 3s
tcp_gerrit-ssh_ip4:
prober: tcp
tcp:
preferred_ip_protocol: ip4
ip_protocol_fallback: false
- tls_config: &250
+ tls_config: &248
server_name: gerrit-ssh.svc.codfw.wmnet
tls: false
timeout: 3s
@@ -2758,6 +2736,6 @@
tcp:
preferred_ip_protocol: ip6
ip_protocol_fallback: false
- tls_config: *250
+ tls_config: *248
tls: false
timeout: 3s