move SlackApiToken condition

giantswarm · Dec 17, 2024 · 1a40477 · 1a40477
1 parent 9d34438
commit 1a40477
Show file tree

Hide file tree

Showing 17 changed files with 306 additions and 18 deletions.
diff --git a/files/templates/alertmanager/alertmanager.yaml b/files/templates/alertmanager/alertmanager.yaml
@@ -189,13 +189,13 @@ receivers:
 - name: falco_noise_slack
   slack_configs:
   - channel: '#noise-falco'
-    [[- if .SlackApiToken ]]
     http_config:
+      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- end ]]
       proxy_from_environment: true
-    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -223,13 +223,13 @@ receivers:
   [[- else ]]
   - channel: '#alert-atlas-test'
   [[- end ]]
-    [[- if .SlackApiToken ]]
     http_config:
+      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- end ]]
       proxy_from_environment: true
-    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -257,13 +257,13 @@ receivers:
   [[- else ]]
   - channel: '#alert-phoenix-test'
   [[- end ]]
-    [[- if .SlackApiToken ]]
     http_config:
+      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- end ]]
       proxy_from_environment: true
-    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -291,13 +291,13 @@ receivers:
   [[- else ]]
   - channel: '#alert-bigmac-test'
   [[- end ]]
-    [[- if .SlackApiToken ]]
     http_config:
+      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- end ]]
       proxy_from_environment: true
-    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -325,13 +325,13 @@ receivers:
   [[- else ]]
   - channel: '#alert-rocket-test'
   [[- end ]]
-    [[- if .SlackApiToken ]]
     http_config:
+      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- end ]]
       proxy_from_environment: true
-    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -355,13 +355,13 @@ receivers:
 - name: team_shield_slack
   slack_configs:
   - channel: '#alert-shield'
-    [[- if .SlackApiToken ]]
     http_config:
+      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- end ]]
       proxy_from_environment: true
-    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -389,13 +389,13 @@ receivers:
   [[- else ]]
   - channel: '#alert-turtles-test'
   [[- end ]]
-    [[- if .SlackApiToken ]]
     http_config:
+      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- end ]]
       proxy_from_environment: true
-    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -419,13 +419,13 @@ receivers:
 - name: team_tenet_slack
   slack_configs:
   - channel: '#alert-tenet'
-    [[- if .SlackApiToken ]]
     http_config:
+      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- end ]]
       proxy_from_environment: true
-    [[- end ]]
     send_resolved: true
     actions:
     - type: button
@@ -449,13 +449,13 @@ receivers:
 - name: team_honeybadger_slack
   slack_configs:
   - channel: '#alert-honeybadger'
-    [[- if .SlackApiToken ]]
     http_config:
+      [[- if .SlackApiToken ]]
       authorization:
         type: Bearer
         credentials: [[ .SlackApiToken ]]
+      [[- end ]]
       proxy_from_environment: true
-    [[- end ]]
     send_resolved: true
     actions:
     - type: button

diff --git a/...e/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-1-capa-mc.golden b/...e/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-1-capa-mc.golden
@@ -118,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
@@ -141,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
@@ -164,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
@@ -187,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
@@ -210,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
@@ -233,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
@@ -256,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
@@ -279,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
@@ -302,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

diff --git a/...urce/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-2-capa.golden b/...urce/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-2-capa.golden
@@ -118,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
@@ -141,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
@@ -164,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
@@ -187,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
@@ -210,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
@@ -233,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
@@ -256,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
@@ -279,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
@@ -302,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

diff --git a/...urce/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-3-capz.golden b/...urce/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-3-capz.golden
@@ -118,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
@@ -141,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
@@ -164,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
@@ -187,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
@@ -210,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
@@ -233,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
@@ -256,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
@@ -279,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
@@ -302,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