Graduate Alertmanager API and sharding from experimental

Remove experimental markers for Alertmanager API and sharding:
- New flag is -alertmanager.enable-api. The old flag is deprecated but still valid
- Remove WarnExperimentalUse("Alertmanager sharding") call
- Remove both items from experimental features list in v1-guarantees.md

The flag name itself is kept unchanged for backwards compatibility.

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

Author: friedrichg

docs/api/_index.md

@@ -796,7 +796,7 @@ POST /multitenant_alertmanager/delete_tenant_config
 ```
 
 This endpoint deletes configuration for a tenant identified by `X-Scope-OrgID` header.
-It is internal, available even if Alertmanager API is not enabled by using `-experimental.alertmanager.enable-api`.
+It is internal, available even if Alertmanager API is not enabled by using `-alertmanager.enable-api`.
 The endpoint returns a status code of `200` if the user's configuration has been deleted, or it didn't exist in the first place.
 
 _Requires [authentication](#authentication)._
@@ -811,7 +811,7 @@ Get the current Alertmanager configuration for the authenticated tenant, reading
 
 This endpoint doesn't accept any URL query parameter and returns `200` on success.
 
-_This experimental endpoint is disabled by default and can be enabled via the `-experimental.alertmanager.enable-api` CLI flag (or its respective YAML config option)._
+_This endpoint is disabled by default and can be enabled via the `-alertmanager.enable-api` CLI flag (or its respective YAML config option)._
 
 _Requires [authentication](#authentication)._
 
@@ -825,7 +825,7 @@ Stores or updates the Alertmanager configuration for the authenticated tenant. T
 
 This endpoint expects the Alertmanager **YAML** configuration in the request body and returns `201` on success.
 
-_This experimental endpoint is disabled by default and can be enabled via the `-experimental.alertmanager.enable-api` CLI flag (or its respective YAML config option)._
+_This endpoint is disabled by default and can be enabled via the `-alertmanager.enable-api` CLI flag (or its respective YAML config option)._
 
 _Requires [authentication](#authentication)._
 
@@ -863,7 +863,7 @@ Deletes the Alertmanager configuration for the authenticated tenant.
 
 This endpoint doesn't accept any URL query parameter and returns `200` on success.
 
-_This experimental endpoint is disabled by default and can be enabled via the `-experimental.alertmanager.enable-api` CLI flag (or its respective YAML config option)._
+_This endpoint is disabled by default and can be enabled via the `-alertmanager.enable-api` CLI flag (or its respective YAML config option)._
 
 _Requires [authentication](#authentication)._
 

docs/configuration/config-file-reference.md

@@ -610,8 +610,8 @@ cluster:
   # CLI flag: -alertmanager.cluster.push-pull-interval
   [push_pull_interval: <duration> | default = 1m]
 
-# Enable the experimental alertmanager config api.
-# CLI flag: -experimental.alertmanager.enable-api
+# Enable the alertmanager config api.
+# CLI flag: -alertmanager.enable-api
 [enable_api: <boolean> | default = false]
 
 # Maximum number of concurrent GET API requests before returning an error.

docs/configuration/v1-guarantees.md

@@ -43,8 +43,6 @@ Currently experimental features are:
 - Zone awareness based replication.
 - Ruler API (to PUT rules).
 - Alertmanager:
-  - API (enabled via `-experimental.alertmanager.enable-api`)
-  - Sharding of tenants across multiple instances (enabled via `-alertmanager.sharding-enabled`)
   - Receiver integrations firewall (configured via `-alertmanager.receivers-firewall.*`)
 - Memcached client DNS-based service discovery.
 - In-memory (FIFO) and Redis cache.

docs/getting-started/cortex-values.yaml

@@ -147,7 +147,7 @@ config:
     # -- Disable alertmanager gossip cluster by setting empty listen_address to empty string
     cluster:
       listen_address: '0.0.0.0:9094'
-    # -- Enable the experimental alertmanager config api.
+    # -- Enable the alertmanager config api.
     enable_api: true
     external_url: '/api/prom/alertmanager'
   frontend:

integration/e2ecortex/services.go

@@ -393,7 +393,7 @@ func NewAlertmanager(name string, flags map[string]string, image string) *Cortex
 		e2e.NewCommandWithoutEntrypoint("cortex", e2e.BuildArgs(e2e.MergeFlags(map[string]string{
 			"-target":                               "alertmanager",
 			"-log.level":                            "warn",
-			"-experimental.alertmanager.enable-api": "true",
+			"-alertmanager.enable-api": "true",
 		}, flags))...),
 		e2e.NewHTTPReadinessProbe(httpPort, "/ready", 200, 299),
 		httpPort,
@@ -413,7 +413,7 @@ func NewAlertmanagerWithTLS(name string, flags map[string]string, image string)
 		e2e.NewCommandWithoutEntrypoint("cortex", e2e.BuildArgs(e2e.MergeFlags(map[string]string{
 			"-target":                               "alertmanager",
 			"-log.level":                            "warn",
-			"-experimental.alertmanager.enable-api": "true",
+			"-alertmanager.enable-api": "true",
 		}, flags))...),
 		e2e.NewTCPReadinessProbe(httpPort),
 		httpPort,

pkg/alertmanager/multitenant.go

@@ -119,7 +119,8 @@ func (cfg *MultitenantAlertmanagerConfig) RegisterFlags(f *flag.FlagSet) {
 	f.StringVar(&cfg.AutoWebhookRoot, "alertmanager.configs.auto-webhook-root", "", "Root of URL to generate if config is "+autoWebhookURL)
 	f.DurationVar(&cfg.PollInterval, "alertmanager.configs.poll-interval", 15*time.Second, "How frequently to poll Cortex configs")
 
-	f.BoolVar(&cfg.EnableAPI, "experimental.alertmanager.enable-api", false, "Enable the experimental alertmanager config api.")
+	f.BoolVar(&cfg.EnableAPI, "alertmanager.enable-api", false, "Enable the alertmanager config api.")
+	f.BoolVar(&cfg.EnableAPI, "experimental.alertmanager.enable-api", false, "Deprecated: Use -alertmanager.enable-api instead.")
 	f.IntVar(&cfg.APIConcurrency, "alertmanager.api-concurrency", 0, "Maximum number of concurrent GET API requests before returning an error.")
 	f.DurationVar(&cfg.GCInterval, "alertmanager.alerts-gc-interval", 30*time.Minute, "Alertmanager alerts Garbage collection interval.")
 	f.BoolVar(&cfg.ShardingEnabled, "alertmanager.sharding-enabled", false, "Shard tenants across multiple alertmanager instances.")
@@ -352,8 +353,6 @@ func NewMultitenantAlertmanager(cfg *MultitenantAlertmanagerConfig, store alerts
 
 	var ringStore kv.Client
 	if cfg.ShardingEnabled {
-		util_log.WarnExperimentalUse("Alertmanager sharding")
-
 		ringStore, err = kv.NewClient(
 			cfg.ShardingRing.KVStore,
 			ring.GetCodec(),

schemas/cortex-config-schema.json

@@ -279,9 +279,9 @@
         },
         "enable_api": {
           "default": false,
-          "description": "Enable the experimental alertmanager config api.",
+          "description": "Enable the alertmanager config api.",
           "type": "boolean",
-          "x-cli-flag": "experimental.alertmanager.enable-api"
+          "x-cli-flag": "alertmanager.enable-api"
         },
         "enabled_tenants": {
           "description": "Comma separated list of tenants whose alerts this alertmanager can process. If specified, only these tenants will be handled by alertmanager, otherwise this alertmanager can process alerts from all tenants.",