Use proxy_from_environment in Alertmanager (#1782)

* Use proxy_from_environment in Alertmanager

* move SlackApiToken condition

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Use `proxy_from_environment: true` in Alertmanager configuration to read proxy settings from the environment.
+
 ### Fixed
 
 - Fix CVE-2024-45338 by updating golang.org/x/net to v0.33.0

files/templates/alertmanager/alertmanager.yaml

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

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

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