Merge branch 'v2.x' into W-17113338-API-manager-hyperforce-fa

Author: kevintroller

modules/ROOT/pages/create-instance-task-flex.adoc

@@ -52,6 +52,17 @@ In the following diagram, different routes manage requests to flight information
 
 image:multiple-upstreams.png[Flex Gateway manages the traffic to multiple upstreams]
 
+=== Limits
+
+[%header%autowidth.spread,cols="a,>.<a,a"]
+|===
+| Limit | Value | Notes
+| Upstreams per API | 50 | Each API supports 50 upstreams. The 50 upstreams can consist of a combination of different routes.
+| Routes per API | 50 | Each API supports 50 routes. 
+| Upstreams per route| 10|
+| Headers per route rule | 10| 
+| ===
+
 === Routes
 
 Each API instance supports up to 50 routes and each route can support up to 10 upstream services. Configure what requests a route can receive by defining route rules and a route order. At least one route per API instance is required. 
@@ -60,10 +71,6 @@ Before adding additional routes, enter an optional *Route label* for clarity.
 
 You can add additional routes by clicking *Add Route*, and you can delete routes by clicking the *Trash Can* icon (image:trash-can-icon.png[2%,2%]). If only one route is defined, you cannot delete that route.
 
-=== Limits
-
-include::partial$api-manager-limits.adoc[]
-
 ==== Route Rules
 
 You can direct requests to different routes by using route rules. 
@@ -163,6 +170,7 @@ Configure the following fields for each upstream service:
 
 
 
+
 //promote-api
 include::partial$task-promote-api.adoc[]
 

modules/ROOT/pages/create-instance-task-mule.adoc

@@ -59,6 +59,55 @@ include::partial$api-configuration-tables.adoc[tags=mule-proxy-upstream]
 +
 include::partial$task-add-api-instance.adoc[tags=last-steps]
 
+== Create New API Asset
+
+NOTE: This feature is only available on GovCloud environments. If you want to create an API asset in other environments, refer to xref:exchange::to-create-an-asset.adoc#create-an-api-asset[]
+
+An API asset specifies an interface completely, including its functions, descriptions, how to handle return codes, and dependencies.
+
+Creating an asset sets the asset type, which cannot be changed. All versions of an asset always have the same type.
+
+To create an API asset:
+
+. In API Manager, click *Add API*.
+
+. From the dropdown list, select *Create new API asset*
+
+. Enter a name for the asset.
+
+. Select the asset type from the drop-down list:
+
+** REST API - RAML: Provide a RAML API specification file. RAML specifications must be a RAML file (.raml).
+
+** REST API - OAS: Provide an OAS API specification file. OAS specifications can be either a YAML (.yaml) or JSON (.json) file. Exchange supports OAS 2.0 and OAS 3.0 specifications.
+
+** SOAP API - WSDL: Provide a WSDL API specification file. SOAP specifications file can be either a WSDL (.wsdl) or XML (.xml) file.
+
+** AsyncAPI: Provide an AsyncAPI specification file in a YAML (.yaml) or JSON (.json) file.
+
+** AsyncAPI with Avro schemas: Provide an Avro fragment in an AVSC (.avsc) file.
+
+** API Spec Fragment - RAML: Provide an API Fragment RAML specification file. Fragment specifications must be a RAML file (.raml).
+
+** API Spec Fragment - JSON: Provide an API Fragment JSON specification (.json) file.
+
+** API Spec Fragment - OpenAPI Specification (OAS): Provide an API Fragment OpenAPI specification file either JSON or YAML.
+
+** HTTP API: This asset does not require a file. This asset type provides an API endpoint that is defined by API Manager.
+
+. For assets that require a file:
+
+.. Click *Choose File* to locate the API specification file.
+
+.. Select the main file of the API. +
+  If the file is a ZIP, the selected main file must be in the root directory of the ZIP file. If the file is not a ZIP or if the file is a ZIP file with only one main file, then the main file is selected automatically.
+
+. If you want to edit the *GroupId*, *AssetId*, *Version*, and *API version* (GAV), click *Advanced*. +
+Exchange generates the group ID, asset ID, and version (GAV) for you, and you can change these values as needed. You can change an API’s asset version and version separately. Use the advanced settings to change the asset version.
+
+. Choose an option for *Lifecycle state*. The default is Stable.
+
+. Click *Publish*.
 
 //promote-api
 include::partial$task-promote-api.adoc[]

modules/ROOT/pages/using-api-alerts.adoc

@@ -4,7 +4,19 @@ include::_attributes.adoc[]
 endif::[]
 :keywords: alerts, api, api alerts
 
-Anypoint Platform alerts you about request behavior, performance issues, actions related to client application contracts, and runtime events. The platform supports three types of alerts: API alerts, contracts alerts, and runtime alerts. API alerts and contracts alerts are managed by Anypoint API Manager (API Manager). Runtime alerts are managed by Anypoint Runtime Manager (Runtime Manager).
+Anypoint Platform alerts you about request behavior, performance issues, actions related to client application contracts, and runtime events. 
+
+The platform supports three types of alerts: 
+
+* API alerts
+* Contracts alerts
+* Runtime alerts
+
+API alerts and contracts alerts are managed by Anypoint API Monitoring. 
+Runtime alerts are managed by Anypoint Runtime Manager (Runtime Manager).
+Refer to xref:gateway::flex-use-api-alerts.adoc[Using Flex Gateway API Alert] to learn how to use the new API Monitoring alerts.
+
+NOTE: Customers who were already using legacy Analytics-based API Alerts on API Manager instead of API Monitoring can continue to access this functionality until November 30, 2024. This functionality is not available for new clients.
 
 [NOTE]
 API Alerts aren't available on Hyperforce deployments.
@@ -54,6 +66,9 @@ After an alert is triggered, API Manager sends the first set of two notification
 
 Note: API Alerts are sent from `no-reply@mulesoft.com`. This cannot be customized.
 
+The alert email can be sent before the corresponding sliding window has fully closed. +
+Although the alert condition is evaluated based on the sliding window, the condition may be met before all metrics for the window arrive. For example: If the alert condition is set to "error count > 1 in a 5-minute window" and 10 errors occur within the first minute, the alert email is sent during that first minute, even though the sliding window continues to accumulate metrics for the remaining 4 minutes.
+
 == Contracts Alerts
 
 API Manager automatically notifies users when actions related to contracts occur. For instance, when a client application requests access to an API instance, API Manager sends a notification with the status of the request. Depending on the configuration, status might indicate that the request is pending manual approval, or it might indicate that the request has been auto-approved.