Revert "Use proxy_from_environment in Alertmanager (#1782)" (#1792)

This reverts commit 3f42eba.

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Revert `proxy_from_environment: true`, as this is only compatible with observability-bundle >= v1.8.0.
+
 ## [4.84.0] - 2025-01-06
 
 ### Changed

files/templates/alertmanager/alertmanager.yaml

@@ -1,7 +1,9 @@
 global:
   resolve_timeout: 5m
+[[- if .ProxyURL ]]
   http_config:
-    proxy_from_environment: true
+    proxy_url:  [[ .ProxyURL ]]
+[[- end ]]
 [[- if .SlackApiToken ]]
   slack_api_url: "https://slack.com/api/chat.postMessage"
 [[- else ]]
@@ -178,7 +180,9 @@ receivers:
         credentials: [[ .OpsgenieKey ]]
       follow_redirects: true
       enable_http2: true
-      proxy_from_environment: true
+      [[- if .ProxyURL ]]
+      proxy_url:  [[ .ProxyURL ]]
+      [[- end ]]
     url: https://api.opsgenie.com/v2/heartbeats/[[ .Installation ]]/ping
 [[- end ]]
 
@@ -189,13 +193,15 @@ receivers:
 - name: falco_noise_slack
   slack_configs:
   - channel: '#noise-falco'
+    [[- if .SlackApiToken ]]
     http_config:
-      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- if .ProxyURL ]]
+      proxy_url:  [[ .ProxyURL ]]
       [[- end ]]
-      proxy_from_environment: true
+    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -223,13 +229,15 @@ receivers:
   [[- else ]]
   - channel: '#alert-atlas-test'
   [[- end ]]
+    [[- if .SlackApiToken ]]
     http_config:
-      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- if .ProxyURL ]]
+      proxy_url:  [[ .ProxyURL ]]
       [[- end ]]
-      proxy_from_environment: true
+    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -257,13 +265,15 @@ receivers:
   [[- else ]]
   - channel: '#alert-phoenix-test'
   [[- end ]]
+    [[- if .SlackApiToken ]]
     http_config:
-      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- if .ProxyURL ]]
+      proxy_url:  [[ .ProxyURL ]]
       [[- end ]]
-      proxy_from_environment: true
+    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -291,13 +301,15 @@ receivers:
   [[- else ]]
   - channel: '#alert-bigmac-test'
   [[- end ]]
+    [[- if .SlackApiToken ]]
     http_config:
-      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- if .ProxyURL ]]
+      proxy_url:  [[ .ProxyURL ]]
       [[- end ]]
-      proxy_from_environment: true
+    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -325,13 +337,15 @@ receivers:
   [[- else ]]
   - channel: '#alert-rocket-test'
   [[- end ]]
+    [[- if .SlackApiToken ]]
     http_config:
-      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- if .ProxyURL ]]
+      proxy_url:  [[ .ProxyURL ]]
       [[- end ]]
-      proxy_from_environment: true
+    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -355,13 +369,15 @@ receivers:
 - name: team_shield_slack
   slack_configs:
   - channel: '#alert-shield'
+    [[- if .SlackApiToken ]]
     http_config:
-      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- if .ProxyURL ]]
+      proxy_url:  [[ .ProxyURL ]]
       [[- end ]]
-      proxy_from_environment: true
+    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -389,13 +405,15 @@ receivers:
   [[- else ]]
   - channel: '#alert-turtles-test'
   [[- end ]]
+    [[- if .SlackApiToken ]]
     http_config:
-      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- if .ProxyURL ]]
+      proxy_url:  [[ .ProxyURL ]]
       [[- end ]]
-      proxy_from_environment: true
+    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -419,13 +437,15 @@ receivers:
 - name: team_tenet_slack
   slack_configs:
   - channel: '#alert-tenet'
+    [[- if .SlackApiToken ]]
     http_config:
-      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- if .ProxyURL ]]
+      proxy_url:  [[ .ProxyURL ]]
       [[- end ]]
-      proxy_from_environment: true
+    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -449,13 +469,15 @@ receivers:
 - name: team_honeybadger_slack
   slack_configs:
   - channel: '#alert-honeybadger'
+    [[- if .SlackApiToken ]]
     http_config:
-      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- if .ProxyURL ]]
+      proxy_url:  [[ .ProxyURL ]]
       [[- end ]]
-      proxy_from_environment: true
+    [[- end ]]
     send_resolved: true
     actions:
     - type: button

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-1-capa-mc.golden

@@ -1,7 +1,5 @@
 global:
   resolve_timeout: 5m
-  http_config:
-    proxy_from_environment: true
   slack_api_url: https://slack
 
 templates:
@@ -118,8 +116,6 @@ receivers:
 - name: falco_noise_slack
   slack_configs:
   - channel: '#noise-falco'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -143,8 +139,6 @@ receivers:
 - name: team_atlas_slack
   slack_configs:
   - channel: '#alert-atlas-test'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -168,8 +162,6 @@ receivers:
 - name: team_phoenix_slack
   slack_configs:
   - channel: '#alert-phoenix-test'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -193,8 +185,6 @@ receivers:
 - name: team_bigmac_slack
   slack_configs:
   - channel: '#alert-bigmac-test'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -218,8 +208,6 @@ receivers:
 - name: team_rocket_slack
   slack_configs:
   - channel: '#alert-rocket-test'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -243,8 +231,6 @@ receivers:
 - name: team_shield_slack
   slack_configs:
   - channel: '#alert-shield'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -268,8 +254,6 @@ receivers:
 - name: team_turtles_slack
   slack_configs:
   - channel: '#alert-turtles-test'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -293,8 +277,6 @@ receivers:
 - name: team_tenet_slack
   slack_configs:
   - channel: '#alert-tenet'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -318,8 +300,6 @@ receivers:
 - name: team_honeybadger_slack
   slack_configs:
   - channel: '#alert-honeybadger'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-2-capa.golden

@@ -1,7 +1,5 @@
 global:
   resolve_timeout: 5m
-  http_config:
-    proxy_from_environment: true
   slack_api_url: https://slack
 
 templates:
@@ -118,8 +116,6 @@ receivers:
 - name: falco_noise_slack
   slack_configs:
   - channel: '#noise-falco'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -143,8 +139,6 @@ receivers:
 - name: team_atlas_slack
   slack_configs:
   - channel: '#alert-atlas-test'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -168,8 +162,6 @@ receivers:
 - name: team_phoenix_slack
   slack_configs:
   - channel: '#alert-phoenix-test'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -193,8 +185,6 @@ receivers:
 - name: team_bigmac_slack
   slack_configs:
   - channel: '#alert-bigmac-test'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -218,8 +208,6 @@ receivers:
 - name: team_rocket_slack
   slack_configs:
   - channel: '#alert-rocket-test'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -243,8 +231,6 @@ receivers:
 - name: team_shield_slack
   slack_configs:
   - channel: '#alert-shield'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -268,8 +254,6 @@ receivers:
 - name: team_turtles_slack
   slack_configs:
   - channel: '#alert-turtles-test'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -293,8 +277,6 @@ receivers:
 - name: team_tenet_slack
   slack_configs:
   - channel: '#alert-tenet'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button
@@ -318,8 +300,6 @@ receivers:
 - name: team_honeybadger_slack
   slack_configs:
   - channel: '#alert-honeybadger'
-    http_config:
-      proxy_from_environment: true
     send_resolved: true
     actions:
     - type: button