Get PR 2050 through the finish line (grafana#2317)

* 2044 reenable proxy_url * Removed unused variable errProxyURLNotAllowed Signed-off-by: Marco Pracucci <[email protected]> * Update PR number Signed-off-by: Marco Pracucci <[email protected]> * Update CHANGELOG.md Co-authored-by: Arve Knudsen <[email protected]> * Keep blocking OAuth2 HTTP proxy because it's not protected by our firewall Signed-off-by: Marco Pracucci <[email protected]> Co-authored-by: supergicko <[email protected]> Co-authored-by: Arve Knudsen <[email protected]>
udmire · Jul 11, 2022 · 8c24b7a · 8c24b7a
1 parent 91d0752
commit 8c24b7a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 * [CHANGE] Compactor: delete source and output blocks from local disk on compaction failed, to reduce likelihood that subsequent compactions fail because of no space left on disk. #2261
 * [CHANGE] Ruler: Remove unused CLI flags `-ruler.search-pending-for` and `-ruler.flush-period` (and their respective YAML config options). #2288
+* [ENHANCEMENT] Alertmanager: Allow the HTTP `proxy_url` configuration option in the receiver's configuration. #2317
 * [BUGFIX] Compactor: log the actual error on compaction failed. #2261
 
 ### Mixin

diff --git a/pkg/alertmanager/api.go b/pkg/alertmanager/api.go
@@ -422,9 +422,6 @@ func validateReceiverHTTPConfig(cfg commoncfg.HTTPClientConfig) error {
 	if cfg.BearerTokenFile != "" {
 		return errPasswordFileNotAllowed
 	}
-	if cfg.ProxyURL.URL != nil {
-		return errProxyURLNotAllowed
-	}
 	if cfg.OAuth2 != nil && cfg.OAuth2.ClientSecretFile != "" {
 		return errOAuth2SecretFileNotAllowed
 	}

diff --git a/pkg/alertmanager/api_test.go b/pkg/alertmanager/api_test.go
@@ -317,7 +317,6 @@ alertmanager_config: |
         client_secret: xxx
         token_url: http://example.com
         proxy_url: http://example.com
-
   route:
     receiver: 'default-receiver'
   receivers:
@@ -428,23 +427,6 @@ alertmanager_config: |
               token_url: http://example.com
               client_secret: xxx
               proxy_url: http://localhost
-
-  route:
-    receiver: 'default-receiver'
-`,
-			err: errors.Wrap(errProxyURLNotAllowed, "error validating Alertmanager config"),
-		},
-		{
-			name: "Should return error if receiver's HTTP proxy_url is set",
-			cfg: `
-alertmanager_config: |
-  receivers:
-    - name: default-receiver
-      webhook_configs:
-        - url: http://localhost
-          http_config:
-            proxy_url: http://localhost
-
   route:
     receiver: 'default-receiver'
 `,