diff --git a/.github/styles/base/Kongterms.yml b/.github/styles/base/Kongterms.yml index a3811197bf..3310807719 100644 --- a/.github/styles/base/Kongterms.yml +++ b/.github/styles/base/Kongterms.yml @@ -16,5 +16,5 @@ swap: Kong Gateway Operator: "{{site.gateway_operator_product_name}}" "{{site.kgo_product_name}}": "{{site.gateway_operator_product_name}}" ServiceHub: Service Hub - Runtime Manager: Gateway Manager + Runtime Manager: API Gateway dbless: DB-less diff --git a/app/_gateway_entities/ca-certificate.md b/app/_gateway_entities/ca-certificate.md index 8d71cd23b4..8e6c23649e 100644 --- a/app/_gateway_entities/ca-certificate.md +++ b/app/_gateway_entities/ca-certificate.md @@ -26,7 +26,7 @@ related_resources: - text: Reserved entity names url: /gateway/reserved-entity-names/ - text: "{{site.konnect_short_name}} Control Plane resource limits" - url: /gateway-manager/control-plane-resource-limits/ + url: /gateway/control-plane-resource-limits/ tools: - admin-api diff --git a/app/_gateway_entities/certificate.md b/app/_gateway_entities/certificate.md index cad40278ce..0aef2ef21b 100644 --- a/app/_gateway_entities/certificate.md +++ b/app/_gateway_entities/certificate.md @@ -22,7 +22,7 @@ related_resources: - text: Reserved entity names url: /gateway/reserved-entity-names/ - text: "{{site.konnect_short_name}} Control Plane resource limits" - url: /gateway-manager/control-plane-resource-limits/ + url: /gateway/control-plane-resource-limits/ tools: diff --git a/app/_gateway_entities/consumer-group.md b/app/_gateway_entities/consumer-group.md index a1db01c5da..ebb949f1e1 100644 --- a/app/_gateway_entities/consumer-group.md +++ b/app/_gateway_entities/consumer-group.md @@ -23,7 +23,7 @@ related_resources: - text: Reserved entity names url: /gateway/reserved-entity-names/ - text: "{{site.konnect_short_name}} Control Plane resource limits" - url: /gateway-manager/control-plane-resource-limits/ + url: /gateway/control-plane-resource-limits/ api_specs: diff --git a/app/_gateway_entities/consumer.md b/app/_gateway_entities/consumer.md index 19f5cedc4f..f88799e865 100644 --- a/app/_gateway_entities/consumer.md +++ b/app/_gateway_entities/consumer.md @@ -25,8 +25,8 @@ related_resources: url: /how-to/?query=consumer - text: Reserved entity names url: /gateway/reserved-entity-names/ - - text: "{{site.konnect_short_name}} Control Plane resource limits" - url: /gateway-manager/control-plane-resource-limits/ + - text: "{{site.konnect_short_name}} control plane resource limits" + url: /gateway/control-plane-resource-limits/ faqs: - q: What are credentials, and why do I need them? @@ -167,16 +167,16 @@ rows: ## Centrally-managed Consumers {% new_in 3.10 %} -Consumers can be scoped to a {{site.konnect_short_name}} region and managed centrally, or be scoped to a Control Plane in Gateway Manager. +Consumers can be scoped to a {{site.konnect_short_name}} region and managed centrally, or be scoped to a control plane. Centralized Consumer management provides the following benefits: -* **Set up a Consumer identity centrally**: Only define a Consumer once, instead of defining it in multiple Control Planes. -* **Avoid conflicts from duplicate Consumer configuration**: Users don't need to replicate changes to Consumer identity in multiple Control Planes and Consumer configuration doesn't conflict. -* **Reduce configuration sync issues between the Control Plane and the Data Planes**: Consumers that are managed centrally aren't part of the configuration that is pushed down from the Control Plane to the Data Planes, so it reduces config size and latency. +* **Set up a Consumer identity centrally**: Only define a Consumer once, instead of defining it in multiple control planes. +* **Avoid conflicts from duplicate Consumer configuration**: Users don't need to replicate changes to Consumer identity in multiple control planes and Consumer configuration doesn't conflict. +* **Reduce configuration sync issues between the control plane and the data planes**: Consumers that are managed centrally aren't part of the configuration that is pushed down from the control plane to the data planes, so it reduces config size and latency. -Centrally managed Consumers exist outside of Control Planes, so they can be used across Control Planes. +Centrally managed Consumers exist outside of control planes, so they can be used across control planes. -Use the following table to help you determine if you should use centrally-managed Consumers or Consumers scoped to Control Planes: +Use the following table to help you determine if you should use centrally-managed Consumers or Consumers scoped to control planes: {% feature_table %} @@ -184,12 +184,12 @@ columns: - title: "Centrally-managed Consumers" key: central center: true - - title: Control Plane scoped Consumer + - title: Control plane scoped Consumer key: cp_consumer center: true features: - - title: "Share Consumer identity in more than one Control Plane" + - title: "Share Consumer identity in more than one control plane" central: true cp_consumer: false - title: "Supported authentication strategies" @@ -205,7 +205,7 @@ features: You can manage Consumers centrally using the [{{site.konnect_short_name}} Consumers API](/api/konnect/consumers/v1/). -Only Org Admins and Control Plane Admins have CRUD permissions for these Consumers. +Only Org Admins and control plane Admins have CRUD permissions for these Consumers. When you create a Consumer centrally, you must assign it to a realm. A realm groups Consumers around an identity, defined by organizational boundaries, such as a production realm or a development realm. Realms are connected to a [geographic region](/konnect-platform/geos/) in {{site.konnect_short_name}}. Additionally, centrally managed Consumers must have a [specific Key Authentication configuration](/plugins/key-auth/examples/identity-realms/) set up to allow these Consumers to authenticate. @@ -213,7 +213,7 @@ Realms are connected to a [geographic region](/konnect-platform/geos/) in {{site For a complete tutorial, see [Create a centrally-managed Consumer in {{site.konnect_short_name}}](/how-to/create-centrally-managed-consumer/). {:.info} -> **Note:** If you are using KIC to manage your Data Plane nodes in {{site.konnect_short_name}}, ensure that you configure the [`cluster_telemetry_endpoint`](/gateway/configuration/#cluster-telemetry-endpoint) in the Data Plane. You can find your specific `cluster_telemetry_endpoint` in [Gateway Manager](https://cloud.konghq.com/gateway-manager/), in the Data Plane node setup instructions. +> **Note:** If you are using KIC to manage your data plane nodes in {{site.konnect_short_name}}, ensure that you configure the [`cluster_telemetry_endpoint`](/gateway/configuration/#cluster-telemetry-endpoint) in the data plane. You can find your specific `cluster_telemetry_endpoint` when setting up a data plane node. ## Consumer schema diff --git a/app/_gateway_entities/key-set.md b/app/_gateway_entities/key-set.md index 6bf5cc7d41..a3b80d81ba 100644 --- a/app/_gateway_entities/key-set.md +++ b/app/_gateway_entities/key-set.md @@ -15,7 +15,7 @@ related_resources: - text: Reserved entity names url: /gateway/reserved-entity-names/ - text: "{{site.konnect_short_name}} Control Plane resource limits" - url: /gateway-manager/control-plane-resource-limits/ + url: /gateway/control-plane-resource-limits/ tools: diff --git a/app/_gateway_entities/key.md b/app/_gateway_entities/key.md index cf6f9fa9c8..a1d9f68682 100644 --- a/app/_gateway_entities/key.md +++ b/app/_gateway_entities/key.md @@ -24,7 +24,7 @@ related_resources: - text: Securing {{site.base_gateway}} url: /gateway/security/ - text: "{{site.konnect_short_name}} Control Plane resource limits" - url: /gateway-manager/control-plane-resource-limits/ + url: /gateway/control-plane-resource-limits/ api_specs: diff --git a/app/_gateway_entities/plugin.md b/app/_gateway_entities/plugin.md index 9d269ed079..a8790c42fb 100644 --- a/app/_gateway_entities/plugin.md +++ b/app/_gateway_entities/plugin.md @@ -14,7 +14,7 @@ related_resources: - text: Custom plugins url: /custom-plugins/ - text: "{{site.konnect_short_name}} Control Plane resource limits" - url: /gateway-manager/control-plane-resource-limits/ + url: /gateway/control-plane-resource-limits/ tools: diff --git a/app/_gateway_entities/route.md b/app/_gateway_entities/route.md index f6ebe2bc73..de12f3ba4a 100644 --- a/app/_gateway_entities/route.md +++ b/app/_gateway_entities/route.md @@ -24,7 +24,7 @@ related_resources: - text: Traffic control and routing url: /gateway/traffic-control-and-routing/ - text: "{{site.konnect_short_name}} Control Plane resource limits" - url: /gateway-manager/control-plane-resource-limits/ + url: /gateway/control-plane-resource-limits/ next_steps: - text: Learn about the Expressions router diff --git a/app/_gateway_entities/service.md b/app/_gateway_entities/service.md index 7899d59787..9e3af81fb4 100644 --- a/app/_gateway_entities/service.md +++ b/app/_gateway_entities/service.md @@ -18,7 +18,7 @@ related_resources: - text: Reserved entity names url: /gateway/reserved-entity-names/ - text: "{{site.konnect_short_name}} Control Plane resource limits" - url: /gateway-manager/control-plane-resource-limits/ + url: /gateway/control-plane-resource-limits/ tools: - admin-api diff --git a/app/_gateway_entities/sni.md b/app/_gateway_entities/sni.md index 155836176b..6d636bd6e9 100644 --- a/app/_gateway_entities/sni.md +++ b/app/_gateway_entities/sni.md @@ -14,7 +14,7 @@ related_resources: - text: Using SSL certificates in {{site.base_gateway}} url: /gateway/ssl-certificates/ - text: "{{site.konnect_short_name}} Control Plane resource limits" - url: /gateway-manager/control-plane-resource-limits/ + url: /gateway/control-plane-resource-limits/ tools: - admin-api diff --git a/app/_gateway_entities/target.md b/app/_gateway_entities/target.md index 140b0c1360..b7ded6c328 100644 --- a/app/_gateway_entities/target.md +++ b/app/_gateway_entities/target.md @@ -23,7 +23,7 @@ related_resources: - text: Reserved entity names url: /gateway/reserved-entity-names/ - text: "{{site.konnect_short_name}} Control Plane resource limits" - url: /gateway-manager/control-plane-resource-limits/ + url: /gateway/control-plane-resource-limits/ schema: api: gateway/admin-ee diff --git a/app/_gateway_entities/upstream.md b/app/_gateway_entities/upstream.md index 3af89c64db..67c7a539a9 100644 --- a/app/_gateway_entities/upstream.md +++ b/app/_gateway_entities/upstream.md @@ -34,7 +34,7 @@ related_resources: - text: Reserved entity names url: /gateway/reserved-entity-names/ - text: "{{site.konnect_short_name}} Control Plane resource limits" - url: /gateway-manager/control-plane-resource-limits/ + url: /gateway/control-plane-resource-limits/ schema: api: gateway/admin-ee diff --git a/app/_gateway_entities/vault.md b/app/_gateway_entities/vault.md index 1f50693151..d655b81c08 100644 --- a/app/_gateway_entities/vault.md +++ b/app/_gateway_entities/vault.md @@ -20,7 +20,7 @@ related_resources: - text: Managing sensitive data with decK url: /deck/gateway/sensitive-data/ - text: "{{site.konnect_short_name}} Control Plane resource limits" - url: /gateway-manager/control-plane-resource-limits/ + url: /gateway/control-plane-resource-limits/ faqs: diff --git a/app/_how-tos/create-centrally-managed-consumer.md b/app/_how-tos/create-centrally-managed-consumer.md index 02fe2a72a8..54e72a0ef3 100644 --- a/app/_how-tos/create-centrally-managed-consumer.md +++ b/app/_how-tos/create-centrally-managed-consumer.md @@ -33,7 +33,7 @@ tags: tldr: q: How do I centrally manage Consumers in {{site.konnect_short_name}}? - a: Centrally-managed Consumers exist outside of a Control Plane. To create one, you must first create a realm using the {{site.konnect_short_name}} API as well as a Consumer associated with the realm. Then, create a key for the centrally-managed Consumer that they can use for authentication. Enable the Key Authentication plugin, configuring `identity_realms`. Centrally-managed Consumers can then authenticate via key auth with their key. + a: Centrally-managed Consumers exist outside of a control plane. To create one, you must first create a realm using the {{site.konnect_short_name}} API as well as a Consumer associated with the realm. Then, create a key for the centrally-managed Consumer that they can use for authentication. Enable the Key Authentication plugin, configuring `identity_realms`. Centrally-managed Consumers can then authenticate via key auth with their key. faqs: - q: When should I use centrally-managed Consumers instead of Consumers scoped to control planes? a: | @@ -58,15 +58,15 @@ cleanup: ## Create a realm -First, export your Control Plane ID and [region](/konnect-platform/geos/) (for example, `us`) so we can use it in the request. You can find these under your Control Plane settings in [Gateway Manager](https://cloud.konghq.com/gateway-manager/): +First, export your control plane ID and [region](/konnect-platform/geos/) (for example, `us`) so we can use it in the request. You can find these under your [control plane settings](https://cloud.konghq.com/gateway-manager/): ```sh export KONNECT_CONTROL_PLANE_ID={control-plane-id} export DECK_CONTROL_PLANE_REGION={region} ``` -Centrally-managed Consumers are assigned to realms instead of Control Planes. Realms exist outside of the Control Plane. +Centrally-managed Consumers are assigned to realms instead of control planes. Realms exist outside of the control plane. -Use the [`/realms` endpoint](/api/konnect/consumers/#/operations/create-realm) to create a realm and associate it with allowed Control Planes: +Use the [`/realms` endpoint](/api/konnect/consumers/#/operations/create-realm) to create a realm and associate it with allowed control planes: {% konnect_api_request %} @@ -126,7 +126,7 @@ export CONSUMER_KEY={consumer-key} ## Enable authentication with the Key Authentication plugin -Consumers require authentication. Currently, you can only use the [Key Auth plugin](/plugins/key-auth/) to authenticate centrally-managed Consumers. In this example, we'll configure `identity_realms` on first the realm and then the Control Plane. By doing it this way, the Data Plane will first reach out to the realm. If the API key is not found in the realm, the Data Plane will look for the API key in the Control Plane config. +Consumers require authentication. Currently, you can only use the [Key Auth plugin](/plugins/key-auth/) to authenticate centrally-managed Consumers. In this example, we'll configure `identity_realms` on first the realm and then the control plane. By doing it this way, the data plane will first reach out to the realm. If the API key is not found in the realm, the data plane will look for the API key in the control plane config. Enable the Key Auth plugin on the `example-service`: @@ -152,7 +152,7 @@ variables: value: $CONTROL_PLANE_REGION {% endentity_examples %} -`identity_realms` are scoped to the Control Plane by default (`scope: cp`). The order in which you configure the `identity_realms` dictates the priority in which the Data Plane attempts to authenticate the provided API keys. See [identity realms precedence](/plugins/key-auth/#identity-realms) for more information. +`identity_realms` are scoped to the control plane by default (`scope: cp`). The order in which you configure the `identity_realms` dictates the priority in which the data plane attempts to authenticate the provided API keys. See [identity realms precedence](/plugins/key-auth/#identity-realms) for more information. ## Validate diff --git a/app/_how-tos/kic-install.md b/app/_how-tos/kic-install.md index cbb63a0110..2d2208e954 100644 --- a/app/_how-tos/kic-install.md +++ b/app/_how-tos/kic-install.md @@ -61,12 +61,12 @@ tags: ## Konnect setup {:.info} -> For UI setup instructions to install {{ site.kic_product_name }} on {{ site.konnect_short_name }}, use the [Gateway Manager setup UI](https://cloud.konghq.com/us/gateway-manager/create-control-plane). +> For UI setup instructions to install {{ site.kic_product_name }} on {{ site.konnect_short_name }}, use the [control plane setup UI](https://cloud.konghq.com/us/gateway-manager/create-control-plane). To create a {{ site.kic_product_name }} in {{ site.konnect_short_name }} deployment, you need the following items: -1. A {{ site.kic_product_name }} Control Plane, including the Control Plane URL -1. An mTLS certificate for {{ site.kic_product_name }} to talk to {{ site.konnect_short_name }} +1. A {{ site.kic_product_name }} control plane, including the control plane URL. +1. An mTLS certificate for {{ site.kic_product_name }} to talk to {{ site.konnect_short_name }}. {% include k8s/kic-konnect-install.md %} diff --git a/app/_how-tos/operator-get-started-hybrid-create-route.md b/app/_how-tos/operator-get-started-hybrid-create-route.md index 19d6981471..7c05c61288 100644 --- a/app/_how-tos/operator-get-started-hybrid-create-route.md +++ b/app/_how-tos/operator-get-started-hybrid-create-route.md @@ -38,7 +38,8 @@ next_steps: {:data-deployment-topology='konnect'} ## Create a Service -Creating the `KongService` object in your Kubernetes cluster will provision a {{site.konnect_product_name}} service in your [Gateway Manager](/gateway-manager/). You can refer to the CR [API](/operator/reference/custom-resources/#kongservice) to see all the available fields. +Creating the `KongService` object in your Kubernetes cluster will provision a {{site.konnect_product_name}} service for your [API Gateway](/gateway/). +You can refer to the CR [API](/operator/reference/custom-resources/#kongservice) to see all the available fields. Your `KongService` must be associated with a `KonnectGatewayControlPlane` object that you've created in your cluster. @@ -61,12 +62,12 @@ spec: {% endkonnect_crd %} -At this point, you should see the Service in the Gateway Manager UI. +At this point, you should see the Service in the API Gateway UI. ## Create a Route -Creating the `KongRoute` object in your Kubernetes cluster will provision a {{site.konnect_product_name}} Route in -your [Gateway Manager](/gateway-manager/). +Creating the `KongRoute` object in your Kubernetes cluster will provision a {{site.konnect_product_name}} Route for +your [API Gateway](/gateway/). You can refer to the CR [API](/operator/reference/custom-resources/#kongroute) to see all the available fields. ### Associate a Route with a Service diff --git a/app/_how-tos/operator-konnect-consumer.md b/app/_how-tos/operator-konnect-consumer.md index b2eed7922b..48f693f58e 100644 --- a/app/_how-tos/operator-konnect-consumer.md +++ b/app/_how-tos/operator-konnect-consumer.md @@ -28,7 +28,7 @@ tags: tldr: q: How can I configure Consumers and Consumer Groups with KGO? - a: Use the `KongConsumer` and `KongConsumerGroup` CRDs to configure consumers and groups in Konnect Gateway Manager through your Kubernetes cluster. + a: Use the `KongConsumer` and `KongConsumerGroup` CRDs to configure Consumers and Groups in {{site.konnect_short_name}} through your Kubernetes cluster. prereqs: @@ -41,7 +41,7 @@ prereqs: ## Create a `KongConsumer` -Define a `KongConsumer` resource to provision a consumer in [{{site.konnect_short_name}} Gateway Manager](/gateway-manager/). +Define a `KongConsumer` resource to provision a Consumer in {{site.konnect_short_name}}. {% konnect_crd %} @@ -62,7 +62,7 @@ spec: ## Create a `KongConsumerGroup` -Creating the KongConsumerGroup object in your Kubernetes cluster will provision a {{site.konnect_short_name}} Consumer Group in your Gateway Manager. +Creating the KongConsumerGroup object in your Kubernetes cluster will provision a {{site.konnect_short_name}} Consumer Group in your control plane. {% konnect_crd %} diff --git a/app/_how-tos/operator-konnect-dp-certificate.md b/app/_how-tos/operator-konnect-dp-certificate.md index f451146ddb..c9544e3423 100644 --- a/app/_how-tos/operator-konnect-dp-certificate.md +++ b/app/_how-tos/operator-konnect-dp-certificate.md @@ -22,7 +22,7 @@ works_on: entities: [] related_resources: - text: Data Plane reference - url: /gateway-manager/data-plane-reference/ + url: /gateway/data-plane-reference/ tags: - konnect-crd diff --git a/app/_how-tos/operator-konnect-getstarted-services-routes.md b/app/_how-tos/operator-konnect-getstarted-services-routes.md index e7726b1be3..a62d3a5c6f 100644 --- a/app/_how-tos/operator-konnect-getstarted-services-routes.md +++ b/app/_how-tos/operator-konnect-getstarted-services-routes.md @@ -118,7 +118,7 @@ spec: ## Validation -You can validate from the command line or [Gateway Manager UI](/gateway-manager/) to confirm that both the `KongService` and `KongRoute` have been provisioned and are in a valid state: +You can validate from the command line or [{{site.konnect_short_name}} UI](/gateway/) to confirm that both the `KongService` and `KongRoute` have been provisioned and are in a valid state: diff --git a/app/_how-tos/operator-konnect-key-keyset.md b/app/_how-tos/operator-konnect-key-keyset.md index 3dbb79c6a1..4b7091b60b 100644 --- a/app/_how-tos/operator-konnect-key-keyset.md +++ b/app/_how-tos/operator-konnect-key-keyset.md @@ -1,6 +1,6 @@ --- title: Create a Key and Key Set -description: "Provision Keys and Key Sets in {{site.konnect_short_name}} Gateway Manager using CRDs, and associate Keys with Key Sets." +description: "Provision Keys and Key Sets in {{site.konnect_short_name}} using CRDs, and associate Keys with Key Sets." content_type: how_to permalink: /operator/konnect/crd/gateway/key-keyset/ diff --git a/app/_how-tos/operator-konnect-plugin.md b/app/_how-tos/operator-konnect-plugin.md index 28f4e7d0ae..e81af13603 100644 --- a/app/_how-tos/operator-konnect-plugin.md +++ b/app/_how-tos/operator-konnect-plugin.md @@ -1,6 +1,6 @@ --- title: Enable a plugin on a Route -description: "Enable a plugin on a Route in {{site.konnect_short_name}} using the KongPlugin and KongPluginBinding CRDs and configure it for use with your Control Plane." +description: "Enable a plugin on a Route in {{site.konnect_short_name}} using the KongPlugin and KongPluginBinding CRDs and configure it for use with your control plane." content_type: how_to permalink: /operator/konnect/crd/gateway/plugin/ @@ -46,7 +46,7 @@ prereqs: In this tutorial, we'll bind a plugin to {{site.base_gateway}} entities, like a Route, using the `KongPluginBinding` CRD. -First, create a Gateway Service in [{{site.konnect_short_name}} Gateway Manager](/gateway-manager/) using the `KongService` CRD: +First, create a Gateway Service in {{site.konnect_short_name}} using the `KongService` CRD: {% konnect_crd %} diff --git a/app/_how-tos/operator-konnect-service-route.md b/app/_how-tos/operator-konnect-service-route.md index 10e0363e4d..878187ab4c 100644 --- a/app/_how-tos/operator-konnect-service-route.md +++ b/app/_how-tos/operator-konnect-service-route.md @@ -26,7 +26,7 @@ tags: tldr: q: How can I create a Service and Route for {{site.konnect_short_name}} using KGO? - a: Define a `KongService` and `KongRoute` in your Kubernetes cluster to provision and configure Gateway entities through the {{site.konnect_short_name}} Gateway Manager. + a: Define a `KongService` and `KongRoute` in your Kubernetes cluster to provision and configure Gateway entities in {{site.konnect_short_name}}. prereqs: @@ -39,7 +39,7 @@ prereqs: ## Create a `KongService` -Create a Gateway Service in the [{{site.konnect_short_name}} Gateway Manager](/gateway-manager/). The Service must reference an existing `KonnectGatewayControlPlane`. +Create a Gateway Service in {{site.konnect_short_name}}. The Service must reference an existing `KonnectGatewayControlPlane`. {% konnect_crd %} diff --git a/app/_includes/components/entity_example/format/ui.md b/app/_includes/components/entity_example/format/ui.md index e4ede15c11..fe7e688baf 100644 --- a/app/_includes/components/entity_example/format/ui.md +++ b/app/_includes/components/entity_example/format/ui.md @@ -51,7 +51,7 @@ The following creates a new Gateway Service called **{{ include.presenter.data[' 1. Select **Plugins**. 1. Click **New Plugin** and choose a plugin. 1. Choose a scope for the plugin: - * **Global**, which applies the plugin to all Gateway Services, Routes, Consumers, and Consumer Groups in the Workspace (Kong Manager) or control plane (Gateway Manager). + * **Global**, which applies the plugin to all Gateway Services, Routes, Consumers, and Consumer Groups in the Workspace (Kong Manager) or control plane ({{site.konnect_short_name}}). * **Scoped**, which lets you choose a specific Gateway Service, Route, Consumer, or Consumer Group to apply the plugin to. The types of entities you have available here depend on the plugin you picked. diff --git a/app/_includes/indices.html b/app/_includes/indices.html index 7488fe5ee9..f27fc24862 100644 --- a/app/_includes/indices.html +++ b/app/_includes/indices.html @@ -14,7 +14,7 @@ {% for section in group.sections %}{% unless section.hidden %}
{% if section.title %} - + {% endif %}
diff --git a/app/_includes/konnect/deployment-topologies.md b/app/_includes/konnect/deployment-topologies.md index 226f4ad769..5a0d475dd1 100644 --- a/app/_includes/konnect/deployment-topologies.md +++ b/app/_includes/konnect/deployment-topologies.md @@ -1,7 +1,7 @@ {% mermaid %} flowchart TD - A(Dev Portal • Gateway Manager • Advanced Analytics • Catalog) + A(Dev Portal • Advanced Analytics • Catalog) B( Kong-managed Control Plane #40;Kong Gateway instance#41;) C( Data Plane #40;Kong Gateway instance#41;) diff --git a/app/_indices/gateway.yaml b/app/_indices/gateway.yaml index a76df838dd..42e5e58316 100644 --- a/app/_indices/gateway.yaml +++ b/app/_indices/gateway.yaml @@ -44,20 +44,20 @@ sections: items: - path: /gateway/topology-hosting-options/ - title: Choose a hosting strategy - description: Decide which Data Plane node strategy to use based on your use case. - url: /gateway-manager/data-plane-reference/#choose-a-data-plane-node-hosting-strategy + description: Decide which data plane node strategy to use based on your use case. + url: /gateway/data-plane-reference/#choose-a-data-plane-node-hosting-strategy - title: Serverless Gateways - description: Lightweight API gateways, where the Control Plane is hosted by Konnect and Data Plane nodes are automatically provisioned. + description: Lightweight API gateways, where the control plane is hosted by Konnect and data plane nodes are automatically provisioned. url: /gateway/topology-hosting-options/#serverless-gateways - path: /dedicated-cloud-gateways/ - - title: Self-managed Data Planes - description: Host your own Data Plane nodes on the supported system of your choice. + - title: Self-managed data planes + description: Host your own data plane nodes on the supported system of your choice. url: /gateway/install/ - title: Serverless Gateways items: - title: Provision a serverless gateway - description: Create a serverless Control Plane and hosted Data Plane. + description: Create a serverless control plane and hosted data plane. url: /serverless-gateways/reference/#how-do-i-provision-a-serverless-gateway - title: Custom domains description: Konnect integrates domain name management and configuration with serverless gateways. @@ -69,17 +69,17 @@ sections: - title: Dedicated Cloud Gateways items: - title: Provision a Dedicated Cloud Gateway - description: Use the Konnect Cloud Gateways API to provision a Control Plane. + description: Use the Konnect Cloud Gateways API to provision a control plane. url: /dedicated-cloud-gateways/reference/#how-do-i-provision-a-control-plane - title: Custom plugin streaming - description: Stream custom plugins from the Control Plane to the Data Plane. + description: Stream custom plugins from the control plane to the data plane. url: /dedicated-cloud-gateways/reference/#custom-plugins - title: Supported geos description: Supported geos for Dedicated Cloud Gateways. url: /konnect-platform/geos/#dedicated-cloud-gateways - - title: Upgrade Data Planes - description: Upgrade Data Plane nodes in a Dedicated Cloud Gateway. - url: /gateway-manager/data-plane-reference/#upgrade-data-planes + - title: Upgrade data planes + description: Upgrade data plane nodes in a Dedicated Cloud Gateway. + url: /gateway/data-plane-reference/#upgrade-data-planes - title: Cloud Gateways API description: Konnect API for managing Dedicated Cloud Gateways infrastructure. url: /api/konnect/cloud-gateways/ @@ -257,13 +257,16 @@ sections: - gateway tags: - kong-manager - - title: Gateway Manager + - title: "API Gateway in {{site.konnect_short_name}}" items: - - path: /gateway-manager/ - - path: /gateway-manager/**/* - - text: Troubleshoot Data Plane nodes - description: Learn how to resolve some common issues with Data Plane nodes - url: /gateway-manager/data-plane-reference/#troubleshoot-data-plane-nodes + - path: /gateway/data-plane-reference/ + - path: /gateway/data-plane-version-compatibility/ + - path: /gateway/control-plane-groups/ + - path: /gateway/control-plane-resource-limits/ + - path: /gateway/aws-private-link/ + - title: Troubleshoot data plane nodes + description: Learn how to resolve some common issues with data plane nodes + url: /gateway/data-plane-reference/#troubleshoot-data-plane-nodes - title: Reference allow_duplicates: true diff --git a/app/_indices/konnect.yaml b/app/_indices/konnect.yaml index a0b5740416..b4e4e11fd1 100644 --- a/app/_indices/konnect.yaml +++ b/app/_indices/konnect.yaml @@ -16,8 +16,8 @@ sections: - path: /dev-portal/ - path: /catalog/ - path: /advanced-analytics/ - - path: /ai-manager/ - - path: /gateway-manager/ + - path: /ai-gateway/ + - path: /gateway/ - path: /mesh-manager/ - title: Org and Account Management diff --git a/app/_kong_plugins/aws-lambda/examples/dedicated-cloud-gateway.yaml b/app/_kong_plugins/aws-lambda/examples/dedicated-cloud-gateway.yaml index 8797bbed1d..5873e70ebd 100644 --- a/app/_kong_plugins/aws-lambda/examples/dedicated-cloud-gateway.yaml +++ b/app/_kong_plugins/aws-lambda/examples/dedicated-cloud-gateway.yaml @@ -24,10 +24,12 @@ requirements: ] } ``` - You can find your account ID and network ID in {{site.konnect_short_name}} by navigating to your Data Plane and Networks in Gateway Manager. - - + You can locate the required IDs in the {{site.konnect_short_name}} UI. + Navigate to **API Gateway** in the {{site.konnect_short_name}} menu, click a control plane, then find each ID: + * **Account ID**: Find the ID in the control plane info panel. + * **Network ID**: Navigate to **Networks** in the control plane menu. + variables: key: description: Your AWS access key ID. diff --git a/app/_kong_plugins/http-log/index.md b/app/_kong_plugins/http-log/index.md index 7e9a3d41f6..09c57b9f26 100644 --- a/app/_kong_plugins/http-log/index.md +++ b/app/_kong_plugins/http-log/index.md @@ -40,7 +40,7 @@ related_resources: - text: "{{site.base_gateway}} logs" url: /gateway/logs/ - text: "{{site.konnect_short_name}} logs" - url: /gateway-manager/konnect-logs/ + url: /dedicated-cloud-gateways/konnect-logs/ faqs: - q: When does the HTTP Log plugin record log entries in a request/response timeline? diff --git a/app/_landing_pages/admin-api.yaml b/app/_landing_pages/admin-api.yaml index 777bc89ebe..a75340ce4f 100644 --- a/app/_landing_pages/admin-api.yaml +++ b/app/_landing_pages/admin-api.yaml @@ -123,7 +123,7 @@ rows: - type: faqs config: - q: Does the Kong Admin API work with Gateway entities in {{site.konnect_short_name}}? - a: It does not. All of the apps in {{site.konnect_short_name}} have their own APIs. To manage entities in the Gateway Manager, you can use the [Konnect Control Plane Config API](/api/konnect/control-planes-config/v2/). + a: It does not. All of the apps in {{site.konnect_short_name}} have their own APIs. To manage API Gateway entities in {{site.konnect_short_name}}, you can use the [Konnect Control Plane Config API](/api/konnect/control-planes-config/v2/). - q: Can I use the Admin API in DB-less mode? a: | In DB-less mode, you configure {{site.base_gateway}} declaratively. The Admin API for each {{site.base_gateway}} node functions independently, reflecting the memory state of that particular node. diff --git a/app/_landing_pages/advanced-analytics.yaml b/app/_landing_pages/advanced-analytics.yaml index dfc5c418a3..605b5fa8c2 100644 --- a/app/_landing_pages/advanced-analytics.yaml +++ b/app/_landing_pages/advanced-analytics.yaml @@ -56,7 +56,7 @@ rows: **Modes:** - **On:** Both basic and advanced analytics data is collected, allowing in-depth insights and reporting. - - **Off:** Advanced analytics collection stops, but basic API metrics remain available in Gateway Manager, + - **Off:** Advanced analytics collection stops, but basic API metrics remain available for API Gateway, and can still be used for custom reports. Advanced Analytics includes the ability to build organization-specific views with [Custom Dashboards](/custom-dashboards/). diff --git a/app/_landing_pages/ai-gateway.yaml b/app/_landing_pages/ai-gateway.yaml index c9f772376e..3b95fb03a2 100644 --- a/app/_landing_pages/ai-gateway.yaml +++ b/app/_landing_pages/ai-gateway.yaml @@ -39,6 +39,7 @@ rows: config: url: /assets/images/gateway/ai-gateway-overview.svg alt_text: Overview of AI gateway + - columns: - blocks: - type: structured_text @@ -91,6 +92,30 @@ rows: url: /ai-gateway/ai-providers/ align: end + - columns: + - blocks: + - type: structured_text + config: + header: + text: "AI Gateway in {{site.konnect_short_name}}" + blocks: + - type: text + text: | + {{site.konnect_short_name}} provides a [unified control plane](https://cloud.konghq.com/ai-manager) to create, manage, and monitor LLMs + using the {{site.konnect_short_name}} platform. + + Key features include: + * **Routing and [load balancing](/ai-gateway/load-balancing/)**: Assign Gateway Services and define how traffic is distributed across models. + * **Streaming and authentication**: Enable streaming responses and manage authentication through the AI Gateway. + * **Access control**: Create and apply access tiers to control how clients interact with LLMs. + * **Usage analytics**: Monitor request and token volumes, track error rates, and measure average latency with historical comparisons. + * **Visual traffic maps**: Explore interactive maps that show how requests flow between clients and models in real time. + + - blocks: + - type: image + config: + url: /assets/images/konnect/ai-manager.png + alt_text: "AI Gateway Dashboard in Konnect" - header: columns: @@ -115,7 +140,7 @@ rows: blocks: - type: unordered_list items: - - "[AI Manager](/ai-manager/): GUI for managing all your Kong AI Gateway resources in one place." + - "[AI Gateway editor](https://cloud.konghq.com/ai-manager): GUI for managing all your Kong AI Gateway resources in one place." - "[decK](/deck/): Manage Kong AI Gateway and {{site.base_gateway}} configuration through declarative state files." - "[Terraform](/terraform/): Manage infrastructure as code and automated deployments to streamline setup and configuration of {{site.konnect_short_name}} and {{site.base_gateway}}." - "[KIC](/kubernetes-ingress-controller/): Manage ingress traffic and routing rules for your services." diff --git a/app/_landing_pages/ai-manager.yaml b/app/_landing_pages/ai-manager.yaml deleted file mode 100644 index 21869694f2..0000000000 --- a/app/_landing_pages/ai-manager.yaml +++ /dev/null @@ -1,81 +0,0 @@ -metadata: - title: "AI Manager" - content_type: landing_page - description: Learn about managing service meshes and control planes with Mesh Manager. - breadcrumbs: - - /ai-gateway/ - products: - - ai-gateway - -rows: - - header: - type: h1 - text: "AI Manager" - sub_text: Manage all of your LLMs in a single dashboard - - - columns: - - blocks: - - type: structured_text - config: - header: - text: "What is AI Manager?" - blocks: - - type: text - text: | - [AI Manager](https://cloud.konghq.com/ai-manager) in {{site.konnect_short_name}} - provides a unified control plane to create, manage, and monitor LLMs - using the {{site.konnect_short_name}} platform. - - Key features include: - * **Routing and [load balancing](/ai-gateway/load-balancing/)**: Assign Gateway Services and define how traffic is distributed across models. - * **Streaming and authentication**: Enable streaming responses and manage authentication through the AI Gateway. - * **Access control**: Create and apply access tiers to control how clients interact with LLMs. - * **Usage analytics**: Monitor request and token volumes, track error rates, and measure average latency with historical comparisons. - * **Visual traffic maps**: Explore interactive maps that show how requests flow between clients and models in real time. - - - blocks: - - type: image - config: - url: /assets/images/konnect/ai-manager.png - alt_text: "AI Manager Dashboard" - - - header: - type: h2 - text: "Get started" - columns: - - blocks: - - type: card - config: - title: Expose an LLM - description: | - Expose an LLM model in AI Manager. - icon: /assets/icons/llm.svg - cta: - url: https://cloud.konghq.com/ai-manager/expose - - blocks: - - type: card - config: - title: AI plugins - description: | - Learn how to use AI plugins to govern LLM usage, security and more. - icon: /assets/icons/plug.svg - cta: - url: /plugins/?category=ai - - blocks: - - type: card - config: - title: AI providers - description: Learn about the various providers supported by AI Gateway. - icon: /assets/icons/ai.svg - cta: - url: /ai-gateway/ai-providers/ - align: end - - blocks: - - type: card - config: - title: About AI Gateway - description: | - Learn more about capabilities of AI Gateway. - icon: /assets/icons/ai.svg - cta: - url: /ai-gateway/ \ No newline at end of file diff --git a/app/_landing_pages/dedicated-cloud-gateways.yaml b/app/_landing_pages/dedicated-cloud-gateways.yaml index 4183bd504e..079c006968 100644 --- a/app/_landing_pages/dedicated-cloud-gateways.yaml +++ b/app/_landing_pages/dedicated-cloud-gateways.yaml @@ -39,7 +39,7 @@ rows: - Automatic scaling with Autopilot mode. - Support for AWS, Azure, and GCP in multiple [regions](/konnect-platform/geos/). - You can manage your Dedicated Cloud Gateway nodes in [Gateway Manager](https://cloud.konghq.com/gateway-manager/). + You can manage your Dedicated Cloud Gateway nodes in the [{{site.konnect_short_name}} UI](https://cloud.konghq.com/gateway-manager/). - type: button config: align: left @@ -121,7 +121,7 @@ rows: icon: /assets/icons/gateway.svg cta: text: Set up nodes - url: /gateway-manager/data-plane-reference/ + url: /gateway/data-plane-reference/ - blocks: - type: card config: diff --git a/app/_landing_pages/gateway-manager.yaml b/app/_landing_pages/gateway-manager.yaml deleted file mode 100644 index a5fb0a2116..0000000000 --- a/app/_landing_pages/gateway-manager.yaml +++ /dev/null @@ -1,229 +0,0 @@ -metadata: - title: "Gateway Manager" - content_type: landing_page - description: Learn about managing Control Planes and Data Plane nodes with Gateway Manager. - tags: - - gateway-manager - - control-plane - - data-plane-nodes - breadcrumbs: - - /gateway-manager/ - products: - - gateway - works_on: - - konnect - -rows: - - header: - type: h1 - text: "Gateway Manager" - sub_text: Manage all Kong runtimes in a single console - - - columns: - - blocks: - - type: structured_text - config: - header: - text: "What is Gateway Manager?" - blocks: - - type: text - text: | - Gateway Manager is a {{site.konnect_short_name}} module that lets you catalog, connect to, and monitor - the status of all Control Planes (CPs) and Data Plane nodes (DPs) in one place. - - With Gateway Manager, you can: - - Manage Control Planes and their configurations - - Deploy and monitor Data Plane nodes - - Use fully-managed cloud gateways or self-hosted infrastructure - - Ensure high availability, security, and scalability for your API traffic - - - blocks: - - type: image - config: - url: /assets/images/gateway-manager/konnect-control-plane-dashboard.png - alt_text: "Gateway Manager dashboard" - - - header: - type: h2 - text: "Control Plane architecture" - columns: - - blocks: - - type: structured_text - config: - blocks: - - type: text - text: | - **{{site.base_gateway}} Control Planes** - - Every [region](/konnect-platform/geos/) in every organization starts with one default Control Plane. - With {{site.konnect_short_name}}, you can configure additional {{site.base_gateway}} Control Planes, - each of which will have isolated configuration. Use multiple Control Planes in one - {{site.konnect_short_name}} organization to manage Data Plane nodes and their configuration - in any groupings you want. - - - type: text - text: | - Some common use cases for using multiple Control Planes include: - - type: unordered_list - items: - - "**Environment separation:** Split environments based on their purpose, such as development, staging, and production." - - "**Region separation:** Assign each Control Plane to a region or group of regions. Spin up Data Plane nodes in those regions for each Control Plane." - - "**Team separation:** Dedicate each Control Plane to a different team and share resources based on team purpose." - - "**Resource hosting and management separation:** Run a hybrid Control Plane with self-hosted Data Plane nodes, and a separate Dedicated Cloud Gateway Control Plane with Kong-managed nodes." - - - blocks: - - type: mermaid - config: - diagram: | - flowchart TD - A(Hybrid - Control Plane) - B(Fully-managed - Control Plane) - C( Self-managed - Data Plane nodes - #40;locally-hosted#41;) - D( Self-managed - Data Plane nodes - #40;hosted by you in cloud provider#41;) - E( Fully-managed - Data Plane nodes - #40;hosted by Kong#41;) - - subgraph id1 [Konnect] - A - B - end - - A --proxy configuration---> C & D - B --proxy configuration---> E - - style id1 stroke-dasharray:3,rx:10,ry:10 - - - - header: - type: h2 - text: "Cloud hosted" - columns: - - blocks: - - type: card - config: - title: Serverless Gateways - description: | - Serverless Gateways provide fully managed Data Plane nodes with automatic scaling. - Ideal for rapid provisioning and API experimentation. - icon: /assets/icons/menu.svg - cta: - text: Learn more - url: /serverless-gateways/ - - blocks: - - type: card - config: - title: Dedicated Cloud Gateways - description: | - Dedicated Cloud Gateways allow full control over infrastructure placement while - providing fully managed Data Plane nodes. - icon: /assets/icons/gateway.svg - cta: - text: Learn more - url: /dedicated-cloud-gateways/ - - - header: - type: h2 - text: "Configurable entities" - columns: - - blocks: - - type: entity_card - config: - entity: service - - blocks: - - type: entity_card - config: - entity: route - - blocks: - - type: entity_card - config: - entity: consumer - - columns: - - blocks: - - type: entity_card - config: - entity: consumer-group - - blocks: - - type: entity_card - config: - entity: upstream - - blocks: - - type: entity_card - config: - entity: target - - columns: - - blocks: - - type: entity_card - config: - entity: plugin - - blocks: - - type: entity_card - config: - entity: certificate - - blocks: - - type: entity_card - config: - entity: vault - - header: - type: h2 - text: "Learn more" - columns: - - blocks: - - type: card - config: - title: Control Plane Groups - description: | - Control Plane Groups enable teams to share infrastructure while maintaining - independent configurations. - icon: /assets/icons/gateway.svg - cta: - text: Learn more - url: /gateway-manager/control-plane-groups/ - - blocks: - - type: card - config: - title: Data Plane nodes - description: | - Learn how to set up and manage self-managed and cloud-hosted Data Plane nodes. - icon: /assets/icons/gateway.svg - cta: - text: Learn more - url: /gateway-manager/data-plane-reference/ - - blocks: - - type: card - config: - title: "{{site.base_gateway}} Control Plane and Data Plane communication" - description: | - Learn about how Control Planes and Data Plane nodes communicate with each other. - icon: /assets/icons/gateway.svg - cta: - text: Learn more - url: /gateway/cp-dp-communication/ - - blocks: - - type: card - config: - title: "Troubleshoot version compatibility issues between Data Planes" - description: | - Reference of all possible compatibility errors between {{site.base_gateway}} Data Planes of different versions. - icon: /assets/icons/gateway.svg - cta: - text: Learn more - url: /gateway-manager/version-compatibility/ - - - header: - type: h2 - text: References - columns: - - blocks: - - type: reference_list - config: - tags: - - gateway-manager - quantity: 5 - allow_empty: true \ No newline at end of file diff --git a/app/_landing_pages/gateway.yaml b/app/_landing_pages/gateway.yaml index 119c55c5ca..055ffa5a91 100644 --- a/app/_landing_pages/gateway.yaml +++ b/app/_landing_pages/gateway.yaml @@ -34,7 +34,6 @@ rows: text: | Diagram of how {{ site.base_gateway }} works - - header: type: h2 text: "Install {{ site.base_gateway }}" @@ -108,6 +107,31 @@ rows: cta: url: /gateway/deployment-topologies/ align: end + + - columns: + - blocks: + - type: structured_text + config: + header: + text: "API Gateway in {{site.konnect_short_name}}" + blocks: + - type: text + text: | + {{site.konnect_short_name}} lets you catalog, connect to, and monitor + the status of all API Gateway control planes (CPs) and data plane nodes (DPs) in one place. + + Key features include: + - Manage control planes and their configurations + - Deploy and monitor data plane nodes + - Use fully-managed cloud gateways or self-hosted infrastructure + - Ensure high availability, security, and scalability for your API traffic + + - blocks: + - type: image + config: + url: /assets/images/gateway-manager/konnect-control-plane-dashboard.png + alt_text: "API Gateway dashboard in {{site.konnect_short_name}}" + - header: type: h2 text: "Core concepts in {{site.base_gateway}}" diff --git a/app/_landing_pages/gateway/deployment-topologies.yaml b/app/_landing_pages/gateway/deployment-topologies.yaml index d25614c5a3..237f130041 100644 --- a/app/_landing_pages/gateway/deployment-topologies.yaml +++ b/app/_landing_pages/gateway/deployment-topologies.yaml @@ -60,7 +60,7 @@ rows: config: diagram: | flowchart TD - A(Dev Portal • Gateway Manager • Analytics • Catalog) + A(Dev Portal • Analytics • Catalog) B( Control Plane #40;Kong Gateway instance#41;) B2( Control Plane diff --git a/app/_landing_pages/gateway/topology-hosting-options.yaml b/app/_landing_pages/gateway/topology-hosting-options.yaml index f5f338ba77..45e4d4de95 100644 --- a/app/_landing_pages/gateway/topology-hosting-options.yaml +++ b/app/_landing_pages/gateway/topology-hosting-options.yaml @@ -104,7 +104,7 @@ rows: config: diagram: | flowchart TD - A(Dev Portal • Gateway Manager • Advanced Analytics • Catalog) + A(Dev Portal • Advanced Analytics • Catalog) B( Kong-managed Control Plane #40;Kong Gateway instance#41;) C( Data Plane diff --git a/app/_landing_pages/konnect.yaml b/app/_landing_pages/konnect.yaml index 9d1b1ee85b..9d2494ac91 100644 --- a/app/_landing_pages/konnect.yaml +++ b/app/_landing_pages/konnect.yaml @@ -115,15 +115,13 @@ rows: - text: Get started url: /ai-gateway/get-started/ align: end - - text: Manage - url: /ai-manager/ - align: end + - blocks: - type: card config: title: API Gateway description: | - Gateway Manager is a {{site.konnect_short_name}} module that lets you catalog, connect to, and monitor the status of all {{site.base_gateway}} control planes and data plane nodes in one place. + {{site.konnect_short_name}} lets you catalog, connect to, and monitor the status of all {{site.base_gateway}} control planes and data plane nodes in one place. icon: /assets/icons/gateway.svg ctas: - text: Learn @@ -132,9 +130,6 @@ rows: - text: Get started url: /gateway/get-started/ align: end - - text: Manage - url: /gateway-manager/ - align: end - blocks: - type: card @@ -299,7 +294,7 @@ rows: icon: /assets/icons/deployment.svg cta: text: "{{site.konnect_short_name}} data plane reference" - url: /gateway-manager/data-plane-reference/ + url: /gateway/data-plane-reference/ align: end - blocks: - type: card @@ -395,7 +390,7 @@ rows: licenses are automatically provisioned to your organization. You do not need to manage these licenses manually. - Any data plane nodes or {{site.kic_product_name}} associations configured through the Gateway Manager + Any data plane nodes or {{site.kic_product_name}} associations configured through {{site.konnect_short_name}} also implicitly receive the same license from the {{site.konnect_saas}} control plane. You should never have to deal with a license directly. diff --git a/app/_landing_pages/serverless-gateways.yaml b/app/_landing_pages/serverless-gateways.yaml index 8c1018bea7..de4da11507 100644 --- a/app/_landing_pages/serverless-gateways.yaml +++ b/app/_landing_pages/serverless-gateways.yaml @@ -26,7 +26,7 @@ rows: blocks: - type: text text: | - Serverless gateways are lightweight API gateways. Their Control Plane is hosted by {{site.konnect_short_name}} and Data Plane nodes are automatically provisioned. Serverless gateways are ideal for developers who want to test or experiment in a pre-production environment. + Serverless gateways are lightweight API gateways. Their control plane is hosted by {{site.konnect_short_name}} and data plane nodes are automatically provisioned. Serverless gateways are ideal for developers who want to test or experiment in a pre-production environment. Serverless gateways offer the following benefits: * {{site.konnect_short_name}} manages provisioning and placement. @@ -37,9 +37,9 @@ rows: config: diagram: | flowchart LR - A(Dev Portal • Gateway Manager • Advanced Analytics • Catalog) + A(Dev Portal • Advanced Analytics • Catalog) B( Kong-managed Control Plane #40;Kong Gateway instance#41;) - C( Data Plane #40;Kong Gateway instance#41;) + C( Data plane #40;Kong Gateway instance#41;) subgraph id1 [Konnect] A --- B diff --git a/app/_plugins/generators/indices.rb b/app/_plugins/generators/indices.rb index 2576aeb03d..cd70190489 100644 --- a/app/_plugins/generators/indices.rb +++ b/app/_plugins/generators/indices.rb @@ -219,7 +219,8 @@ def template def render(index, groups, site) context = { 'index' => index, - 'groups' => groups + 'groups' => groups, + 'site' => site.config } Liquid::Template.parse(template).render(context, registers: { site: site }) end diff --git a/app/_redirects b/app/_redirects index 8649d6056c..1fe02028fa 100644 --- a/app/_redirects +++ b/app/_redirects @@ -1,5 +1,15 @@ # Plugin examples /plugins/request-callout/examples/dynamic-url/ /plugins/request-callout/examples/dynamic-url-via-lua-code/ +# Renames +/gateway-manager/aws-private-link/ /gateway/aws-private-link/ +/gateway-manager/data-plane-reference/ /gateway/data-plane-reference/ +/gateway-manager/control-plane-groups/ /gateway/control-plane-groups/ +/gateway-manager/control-plane-resource-limits/ /gateway/control-resource-limits/ +/gateway-manager/konnect-labels/ /konnect-platform/konnect-labels/ +/gateway-manager/version-compatibility/ /gateway/data-plane-version-compatibility/ +/gateway-manager/konnect-logs/ /dedicated-cloud-gateways/konnect-logs/ +/gateway-manager/ /gateway/ +/ai-manager/ /ai-gateway/ # API spec links (delete when fixed) /gateway/latest/plan-and-deploy/security/secrets-management/getting-started /gateway/entities/vault/ diff --git a/app/advanced-analytics/explorer.md b/app/advanced-analytics/explorer.md index 35b8045712..e3194a706a 100644 --- a/app/advanced-analytics/explorer.md +++ b/app/advanced-analytics/explorer.md @@ -85,7 +85,7 @@ This toggle lets you enable or disable data collection for your API traffic per **Modes:** - **On:** Both basic and advanced analytics data is collected, allowing in-depth insights and reporting. -- **Off:** Advanced analytics collection stops, but basic API metrics remain available in Gateway Manager, +- **Off:** Advanced analytics collection stops, but basic API metrics remain available for API Gateway in {{site.konnect_short_name}}, and can still be used for custom reports. ## Metrics diff --git a/app/custom-plugins/konnect-hybrid-mode.md b/app/custom-plugins/konnect-hybrid-mode.md index 030c27f6eb..760359e5de 100644 --- a/app/custom-plugins/konnect-hybrid-mode.md +++ b/app/custom-plugins/konnect-hybrid-mode.md @@ -27,8 +27,6 @@ related_resources: url: /custom-plugins/ - text: Custom plugins reference url: /custom-plugins/reference/ - - text: Gateway Manager - url: /gateway-manager/ faqs: - q: What does a non-breaking change to a plugin schema look like? @@ -84,9 +82,9 @@ faqs: --- -You can add custom plugins to the Gateway Manager by uploading a Lua schema file to a Control Plane. +You can add custom plugins to API Gateway in {{site.konnect_short_name}} by uploading a Lua schema file to a Control Plane. -Using that schema, Gateway Manager creates a plugin configuration object in {{site.konnect_short_name}}, +Using that schema, Gateway creates a plugin configuration object in {{site.konnect_short_name}}, making the plugin available for configuration alongside all the Kong bundled plugins. This means that {{site.konnect_short_name}} only sees a custom plugin's configuration options, and doesn't see any other plugin code. diff --git a/app/deck/gateway/konnect-configuration.md b/app/deck/gateway/konnect-configuration.md index 1149e0260e..1484d347b2 100644 --- a/app/deck/gateway/konnect-configuration.md +++ b/app/deck/gateway/konnect-configuration.md @@ -101,7 +101,7 @@ or use a flag when running any decK command. ## Making decK work with AWS PrivateLink -You can make Admin API calls for control plane configuration using decK with a private connection through AWS PrivateLink to stay compliant and save data transfer costs. Once you set up [AWS PrivateLink](/gateway-manager/aws-private-link/) for your environment, you can make decK calls by using the domain `region.svc.konghq.com/api/`. +You can make Admin API calls for control plane configuration using decK with a private connection through AWS PrivateLink to stay compliant and save data transfer costs. Once you set up [AWS PrivateLink](/gateway/aws-private-link/) for your environment, you can make decK calls by using the domain `region.svc.konghq.com/api/`. ## Troubleshooting The following sections explain how to resolve common issues you may encounter when using decK with {{site.konnect_short_name}}. diff --git a/app/dedicated-cloud-gateways/azure-peering.md b/app/dedicated-cloud-gateways/azure-peering.md index ca65ef56c7..9522feb87d 100644 --- a/app/dedicated-cloud-gateways/azure-peering.md +++ b/app/dedicated-cloud-gateways/azure-peering.md @@ -88,7 +88,7 @@ This process includes three main steps: ### Konnect configuration for VNET peering -To configure peering in {{site.konnect_short_name}} you need to input the following values from Azure into the {{site.konnect_short_name}} [Gateway Manager](https://cloud.konghq.com/gateway-manager/) UI for your Dedicated Cloud Gateway: +To configure peering in {{site.konnect_short_name}} you need to input the following values from Azure into the {{site.konnect_short_name}} UI for your Dedicated Cloud Gateway: * Azure Tenant ID * Azure VNET Subscription ID diff --git a/app/gateway-manager/konnect-logs.md b/app/dedicated-cloud-gateways/konnect-logs.md similarity index 59% rename from app/gateway-manager/konnect-logs.md rename to app/dedicated-cloud-gateways/konnect-logs.md index 93581b527a..29fffb4556 100644 --- a/app/gateway-manager/konnect-logs.md +++ b/app/dedicated-cloud-gateways/konnect-logs.md @@ -1,5 +1,5 @@ --- -title: "{{site.konnect_short_name}} Data Plane logs" +title: "Dedicated Cloud Gateway data plane logs" content_type: reference layout: reference breadcrumbs: @@ -11,10 +11,11 @@ works_on: tags: - logging + - dedicated-cloud-gateways search_aliases: - data plane logs -description: "Review logs for Data Plane activity in {{site.konnect_short_name}}." +description: "Review logs for data plane activity in {{site.konnect_short_name}} Dedicated Cloud Gateways." related_resources: - text: "Dedicated Cloud Gateways" url: /dedicated-cloud-gateways/ @@ -26,14 +27,14 @@ related_resources: url: /gateway/logs/ --- -Data Plane logs provide users with the ability to view, filter, search, and download logs for the Data Plane nodes associated with a Dedicated Cloud Gateway. -Reviewing logs is essential for debugging, monitoring, and understanding the behavior of Data Plane nodes. +Data plane logs provide users with the ability to view, filter, search, and download logs for the data plane nodes associated with a Dedicated Cloud Gateway. +Reviewing logs is essential for debugging, monitoring, and understanding the behavior of data plane nodes. -## Log management in Gateway Manager +## Gateway log management in {{site.konnect_short_name}} -You can access Data Plane logs from the Data Plane dashboard in [Gateway Manager](https://cloud.konghq.com/us/gateway-manager/). +You can access data plane logs from the data plane dashboard in a Dedicated Cloud Gateway. -From the Data Plane dashboard, you can perform the following actions: +From the data plane dashboard, you can perform the following actions: {% table %} columns: - title: Use Case @@ -42,15 +43,15 @@ columns: key: description rows: - feature: View logs - description: Access detailed logs for all Data Plane nodes in your gateway. + description: Access detailed logs for all data plane nodes in your gateway. - feature: Filter logs description: Type keywords or phrases in the **Filter Log Messages** box to refine log content. - feature: Download logs description: Click the download icon near the log table to save logs locally. - - feature: Data Plane node selection - description: Use the **Node ID** input box to view logs from a specific Data Plane node. + - feature: Data plane node selection + description: Use the **Node ID** input box to view logs from a specific data plane node. - feature: Date range selection description: Use the date picker tool to specify a date range for logs. - feature: Group-specific logs - description: Navigate to a specific Data Plane group within the Gateway Manager to view logs limited to that group. + description: Navigate to a specific data plane group within a control plane to view logs limited to that group. {% endtable %} diff --git a/app/dedicated-cloud-gateways/transit-gateways.md b/app/dedicated-cloud-gateways/transit-gateways.md index 3f1979121b..8201fd7a09 100644 --- a/app/dedicated-cloud-gateways/transit-gateways.md +++ b/app/dedicated-cloud-gateways/transit-gateways.md @@ -97,7 +97,7 @@ This process includes three main steps: 1. Open the **Resource Access Manager**, and select **Create Resource Share**. 1. Choose **Transit Gateways** as the resource type and select the newly created gateway. 1. Name the resource share and retain default managed permission settings. - 1. Enable **Allow external accounts**, choose **AWS Account**, and enter the **AWS ID** from the {{site.konnect_short_name}} UI (**Gateway Manager > Networks**). + 1. Enable **Allow external accounts**, choose **AWS Account**, and enter the **AWS ID** from the {{site.konnect_short_name}} UI (**API Gateway > Networks**). 1. Create the resource share and save the resulting **RAM Share ARN**. 2. Accept the Transit Gateway Attachment in AWS: @@ -113,7 +113,9 @@ This process includes three main steps: To finish setup in {{site.konnect_short_name}}: -1. Go to **[Gateway Manager](https://cloud.konghq.com/gateway-manager/), select your Dedicated Cloud Gateway, and click **Networks** in the sidebar. +1. In the {{site.konnect_short_name}} menu, navigate to **[API Gateway](https://cloud.konghq.com/gateway-manager/)**. +1. Click your Dedicated Cloud Gateway. +1. In the sidebar, navigate to **Networks**. 1. Select your network and click **Attach Transit Gateway**. 1. Provide the following information: * Transit Gateway Name diff --git a/app/dev-portal/api-products.md b/app/dev-portal/api-products.md index 88fcefd1f3..1c6fac8b24 100644 --- a/app/dev-portal/api-products.md +++ b/app/dev-portal/api-products.md @@ -55,7 +55,7 @@ Here are some of the things you can do from the API Product dashboard: ## API product versions -A {{site.konnect_short_name}} API product version is linked to a Gateway Service inside a [control plane](/gateway-manager/#control-plane-architecture). As such, the configurations or plugins that are associated with the Gateway Service are also associated with the API product version. +A {{site.konnect_short_name}} API product version is linked to a Gateway Service inside a control plane. As such, the configurations or plugins that are associated with the Gateway Service are also associated with the API product version. API products can have multiple API product versions, and each version can be linked to a Gateway Service. API products can be made available in multiple environments by linking API product versions to Gateway Services in different control planes. You can also associate an API spec with a product version and make the spec accessible in the v2 Dev Portal. diff --git a/app/dev-portal/security-settings.md b/app/dev-portal/security-settings.md index e22cab3500..850edf6339 100644 --- a/app/dev-portal/security-settings.md +++ b/app/dev-portal/security-settings.md @@ -104,7 +104,7 @@ When RBAC is enabled for a Dev Portal, the option to configure API access polici Authentication strategies determine how [published APIs](/catalog/apis/#publish-your-api-to-dev-portal) are authenticated, and how developers create API Keys. -Authentication strategies automatically configure the {{site.konnect_short_name}} Gateway Service by enabling the {{site.konnect_short_name}} Application Auth (KAA) plugin on the [Gateway Service linked to the API](/catalog/apis/#gateway-service-link). The KAA plugin can only be configured from the associated Dev Portal and not the {{site.konnect_short_name}} Gateway Manager. +Authentication strategies automatically configure the {{site.konnect_short_name}} Gateway Service by enabling the {{site.konnect_short_name}} Application Auth (KAA) plugin on the [Gateway Service linked to the API](/catalog/apis/#gateway-service-link). The KAA plugin can only be configured from the associated Dev Portal and not from API Gateway. #### Default application authentication strategy diff --git a/app/gateway-manager/aws-private-link.md b/app/gateway/aws-private-link.md similarity index 99% rename from app/gateway-manager/aws-private-link.md rename to app/gateway/aws-private-link.md index e2345de327..9a05e73736 100644 --- a/app/gateway-manager/aws-private-link.md +++ b/app/gateway/aws-private-link.md @@ -12,7 +12,7 @@ api_specs: - konnect/control-planes-config breadcrumbs: - - /gateway-manager/ + - /konnect/ related_resources: - text: AWS PrivateLink Interface Endpoints diff --git a/app/gateway-manager/control-plane-groups.md b/app/gateway/control-plane-groups.md similarity index 98% rename from app/gateway-manager/control-plane-groups.md rename to app/gateway/control-plane-groups.md index 239ec82fb5..8d5933ef00 100644 --- a/app/gateway-manager/control-plane-groups.md +++ b/app/gateway/control-plane-groups.md @@ -3,7 +3,7 @@ title: "Control Plane Groups" content_type: reference layout: reference breadcrumbs: - - /gateway-manager/ + - /konnect/ products: - gateway works_on: @@ -72,8 +72,6 @@ faqs: a: Even if configurations conflict and can’t be merged, the Control Plane Group is still created. Conflict detection only occurs after a Data Plane node is connected. related_resources: - - text: "Gateway Manager" - url: /gateway-manager/ - text: "{{site.base_gateway}} logs" url: /gateway/logs/ # - text: "{{site.base_gateway}} debugging" @@ -169,7 +167,7 @@ There are some special cases and behaviors to note for [Gateway entities](/gatew All entities in a Control Plane Group must have unique names and IDs. For example, if two members of a Control Plane Group both have a Service named `example_service`, -it will cause a [conflict](/gateway-manager/control-plane-groups/#control-plane-conflicts/) which must be resolved to restore function. +it will cause a [conflict](/gateway/control-plane-groups/#control-plane-conflicts/) which must be resolved to restore function. A number of {{site.base_gateway}} entities can be associated with each other. Based on the type of association, the behavior of these associated entities in a Control Plane Group follows one of these patterns: diff --git a/app/gateway-manager/control-plane-resource-limits.md b/app/gateway/control-plane-resource-limits.md similarity index 83% rename from app/gateway-manager/control-plane-resource-limits.md rename to app/gateway/control-plane-resource-limits.md index 7921407245..8dd31c0247 100644 --- a/app/gateway-manager/control-plane-resource-limits.md +++ b/app/gateway/control-plane-resource-limits.md @@ -1,9 +1,9 @@ --- -title: "Default resource limits for Control Planes" +title: "Default resource limits for control planes" content_type: reference layout: reference breadcrumbs: - - /gateway-manager/ + - /konnect/ products: - gateway works_on: @@ -12,14 +12,14 @@ tags: - control-plane - gateway-manager -description: In Gateway Manager, every {{site.konnect_short_name}} Control Plane has a default resource limit per Gateway entity. +description: In {{site.konnect_short_name}}, every control plane has a default resource limit per Gateway entity. related_resources: - text: Gateway entities url: /gateway/entities/ --- -In [Gateway Manager](/gateway-manager/), every {{site.konnect_short_name}} Control Plane has a default resource limit per [Gateway entity](/gateway/entities/). +In {{site.konnect_short_name}}, every API Gateway control plane has a default resource limit per [Gateway entity](/gateway/entities/). If you need any of the {{site.konnect_short_name}} entity resource limits increased, contact [Kong Support](https://support.konghq.com). diff --git a/app/gateway/cp-dp-communication.md b/app/gateway/cp-dp-communication.md index 5ab4143012..73298b90ea 100644 --- a/app/gateway/cp-dp-communication.md +++ b/app/gateway/cp-dp-communication.md @@ -210,7 +210,7 @@ Using the {{site.konnect_short_name}} UI, you can generate a CA certificate, whi Certificates generated by {{site.konnect_short_name}} are valid for 10 years. If you bring your own certificates, make sure to review the expiration date and associated metadata. If you originally created your Data Plane node container using one of the -Docker options in Gateway Manager, we recommend creating a new Data Plane node with renewed +Docker options in {{site.konnect_short_name}}, we recommend creating a new Data Plane node with renewed certificates. 1. Stop the Data Plane node container. @@ -221,7 +221,7 @@ updated certificates. If your Data Plane nodes are running on Linux or Kubernetes, or if you have a Docker container that was _not_ created using the quick setup script, you must -generate new certificates and replace them on the existing nodes. For more information, see the [Data Plane reference](/gateway-manager/data-plane-reference/). +generate new certificates and replace them on the existing nodes. For more information, see the [Data Plane reference](/gateway/data-plane-reference/). ## Generate a certificate/key pair in {{site.base_gateway}} on-prem diff --git a/app/gateway/cp-outage.md b/app/gateway/cp-outage.md index 962c7e1f66..324ad98b8f 100644 --- a/app/gateway/cp-outage.md +++ b/app/gateway/cp-outage.md @@ -10,7 +10,7 @@ works_on: - on-prem - konnect breadcrumbs: - - /gateway-manager/ + - /konnect/ tags: - control-plane @@ -24,7 +24,7 @@ description: Configure Data Plane resilience in case of a Control Plane outage. related_resources: - text: "{{site.konnect_short_name}} Data Plane nodes" - url: /gateway-manager/data-plane-reference/ + url: /gateway/data-plane-reference/ - text: "{{site.base_gateway}} Control Plane and Data Plane communication" url: /gateway/cp-dp-communication/ diff --git a/app/gateway-manager/data-plane-reference.md b/app/gateway/data-plane-reference.md similarity index 95% rename from app/gateway-manager/data-plane-reference.md rename to app/gateway/data-plane-reference.md index f417536713..7bf7554598 100644 --- a/app/gateway-manager/data-plane-reference.md +++ b/app/gateway/data-plane-reference.md @@ -29,9 +29,9 @@ faqs: ``` http://35.233.198.16:80/mock ``` - - q: Can I choose a specific {{site.base_gateway}} version when using quickstart scripts in Gateway Manager? + - q: Can I choose a specific {{site.base_gateway}} version when using quickstart scripts? a: | - Yes. Gateway Manager lets you select the {{site.base_gateway}} version for your quickstart scripts. + Yes. {{site.konnect_short_name}} lets you select the {{site.base_gateway}} version for your quickstart scripts. - q: Can I SSH directly into {{site.konnect_short_name}} Data Plane nodes? a: | @@ -43,8 +43,6 @@ faqs: related_resources: - - text: Gateway Manager - url: /gateway-manager/ - text: Dedicated Cloud Gateways url: /dedicated-cloud-gateways/ - text: Serverless Gateways @@ -56,12 +54,12 @@ tags: - gateway-manager breadcrumbs: - - /gateway-manager/ + - /konnect/ --- A Data Plane node is a single instance of {{site.base_gateway}} that acts as a proxy and serves traffic. -In {{site.konnect_short_name}}, Data Plane nodes are managed by [Control Planes](/gateway-manager/control-plane-groups/). +In {{site.konnect_short_name}}, Data Plane nodes are managed by [Control Planes](/gateway/control-plane-groups/). Control Planes manage and store configurations in {{site.konnect_short_name}}, and they distribute those configurations to Data Planes nodes. Data Plane nodes don't manage their own configurations. @@ -185,9 +183,8 @@ This is a zero downtime upgrade because {{site.konnect_short_name}} synchronizes and shut down the nodes you are replacing. {:.info} - > You can't shut down data plane nodes from within Gateway Manager. Old - nodes will also remain listed as `Connected` in Gateway Manager for a - few hours after they have been removed or shut down. + > You can't shut down data plane nodes from the {{site.konnect_short_name}} UI. + Old nodes will also remain listed as `Connected` for a few hours after they have been removed or shut down. 1. Test passing data through your new data plane node by accessing your proxy URL. @@ -268,7 +265,7 @@ rows: ## Custom Data Plane labels -Labels are commonly used for metadata information. Set anything that you need to identify your Data Plane nodes -- deployment type, region, size, the team that the node belongs to, the purpose it serves, or any other identifiable information. For more information, review the [{{site.konnect_short_name}} labels](/gateway-manager/konnect-labels/) documentation. +Labels are commonly used for metadata information. Set anything that you need to identify your Data Plane nodes -- deployment type, region, size, the team that the node belongs to, the purpose it serves, or any other identifiable information. For more information, review the [{{site.konnect_short_name}} labels](/konnect-platform/konnect-labels/) documentation. ## Troubleshoot Data Plane nodes @@ -282,7 +279,7 @@ If this happens, you will see the status `Out of sync` on the Data Plane Nodes p **Solution:** Troubleshoot the issue using the following methods: * Ensure the Data Plane node is running. If it's not running, start it; if it is running, restart it. -After starting it, check the sync status in the Gateway Manager. +After starting it, check the sync status in {{site.konnect_short_name}}. * Check the logs of the Data Plane node that's appearing as `Out of sync`. The default directory for {{site.base_gateway}} logs is [`/usr/local/kong/logs`](/gateway/configuration/#log-level). @@ -294,7 +291,7 @@ The default directory for {{site.base_gateway}} logs is [`/usr/local/kong/logs`] * Data Plane node failed to receive a ping response from the Control Plane. You may have an issue on the host network where the node resides. - Diagnose and resolve the issue, then restart the node and check the sync status in the Gateway Manager. + Diagnose and resolve the issue, then restart the node and check the sync status in {{site.konnect_short_name}}. If the logs show a license issue, or if you are unable to resolve sync issues using the above methods, contact [Kong Support](https://support.konghq.com/). @@ -321,7 +318,7 @@ If your version is up-to-date but the feature still isn't working, contact [Kong ### Kubernetes Data Plane node installation doesn't work -**Problem:** You followed the Kubernetes installation instructions in Gateway Manager but your Data Plane node isn't connecting. +**Problem:** You followed the Kubernetes installation instructions in the {{site.konnect_short_name}} UI but your Data Plane node isn't connecting. **Solution:** Check your deployment logs for errors: diff --git a/app/gateway-manager/version-compatibility.md b/app/gateway/data-plane-version-compatibility.md similarity index 88% rename from app/gateway-manager/version-compatibility.md rename to app/gateway/data-plane-version-compatibility.md index 671a2c8f25..9a3fa986de 100644 --- a/app/gateway-manager/version-compatibility.md +++ b/app/gateway/data-plane-version-compatibility.md @@ -3,7 +3,7 @@ title: Version compatibility in Control Planes content_type: reference layout: reference breadcrumbs: - - /gateway-manager/ + - /konnect/ products: - gateway works_on: @@ -15,8 +15,6 @@ tags: description: Running multiple versions of Data Plane nodes with a single Control Plane can cause version compatibility issues. related_resources: - - text: "Gateway Manager" - url: /gateway-manager/ - text: "{{site.base_gateway}} logs" url: /gateway/logs/ # - text: "{{site.base_gateway}} debugging" @@ -30,7 +28,7 @@ We recommend running one major version (2.x or 3.x) of a Data Plane node per Con If you mix major Data Plane node versions, the Control Plane will support the least common subset of configurations across all the versions connected to the {{site.konnect_short_name}} Control Plane. For example, if you are running 2.8.1.3 on one Data Plane node and 3.0.0.0 on another, the Control Plane will only push configurations that can be used by the 2.8.1.3 Data Plane node. -If you experience compatibility errors, [upgrade your Data Plane nodes](/gateway-manager/data-plane-reference/#upgrade-data-planes) to match the version of the highest-versioned Data Plane node in your Control Plane. +If you experience compatibility errors, [upgrade your Data Plane nodes](/gateway/data-plane-reference/#upgrade-data-planes) to match the version of the highest-versioned Data Plane node in your Control Plane. The following table defines the possible compatibility errors with {{site.konnect_short_name}} Data Plane nodes: diff --git a/app/gateway/debugger-spans.md b/app/gateway/debugger-spans.md index 7a53c4252d..b05dbf3770 100644 --- a/app/gateway/debugger-spans.md +++ b/app/gateway/debugger-spans.md @@ -2,7 +2,8 @@ title: Debugger spans description: 'Spans represent a single unit of trace in {{site.base_gateway}} this page contains all available spans.' breadcrumbs: - - /gateway-manager/ + - /gateway/ + - /gateway/debugger/ content_type: reference layout: reference search_aliases: diff --git a/app/gateway/debugger.md b/app/gateway/debugger.md index 56941612e3..ba2d76522f 100644 --- a/app/gateway/debugger.md +++ b/app/gateway/debugger.md @@ -2,7 +2,7 @@ title: "Troubleshooting with {{site.konnect_short_name}} Debugger" description: "The Debugger enables control plane administrators to initiate targeted deep session traces in specific data plane nodes." breadcrumbs: - - /gateway-manager/ + - /gateway/ content_type: reference layout: reference search_aliases: diff --git a/app/gateway/hybrid-mode.md b/app/gateway/hybrid-mode.md index b35a313487..df6f50ac19 100644 --- a/app/gateway/hybrid-mode.md +++ b/app/gateway/hybrid-mode.md @@ -273,7 +273,7 @@ the Control Plane. If the compatibility checks fail, the Control Plane stops pushing out new config to the incompatible Data Planes to avoid breaking them. In {{site.konnect_short_name}}, you will see compatibility errors on the Control Plane that has conflicts. -See [version compatibility in Control Planes](/gateway-manager/version-compatibility/) for all errors and resolutions. +See [version compatibility in Control Planes](/gateway/data-plane-version-compatibility/) for all errors and resolutions. If a config can not be pushed to a Data Plane due to failure of the compatibility checks, the Control Plane will contain `warn` level lines in the diff --git a/app/gateway/logs.md b/app/gateway/logs.md index 05511e6f62..ac640849a0 100644 --- a/app/gateway/logs.md +++ b/app/gateway/logs.md @@ -22,7 +22,7 @@ related_resources: - text: "{{site.base_gateway}} audit logs" url: /gateway/audit-logs/ - text: "{{site.konnect_short_name}} logs" - url: /gateway-manager/konnect-logs/ + url: /dedicated-cloud-gateways/konnect-logs/ - text: "{{site.konnect_short_name}} platform audit logs" url: /konnect-platform/audit-logs/ - text: Logging plugins diff --git a/app/gateway/quickstart-reference.md b/app/gateway/quickstart-reference.md index 29dc4dc9f3..bdc23ca96b 100644 --- a/app/gateway/quickstart-reference.md +++ b/app/gateway/quickstart-reference.md @@ -101,7 +101,7 @@ This key will not be exposed outside of the host machine. The script creates a [Gateway Service](/gateway/entities/service/) with two [Routes](/gateway/entities/route/), and configures the AI Proxy plugin on those Routes based on the provider that you specify. Check out the full script at [https://get.konghq.com/ai](https://get.konghq.com/ai) to see which entities -it generates, and access all of your Routes and Services by visiting either [Gateway Manager in {{site.konnect_short_name}}](https://cloud.konghq.com/gateway-manager/) or +it generates, and access all of your Routes and Services by visiting either [API Gateway in {{site.konnect_short_name}}](https://cloud.konghq.com/gateway-manager/) or [Kong Manager](/gateway/kong-manager/) at `https://localhost:8002` in any browser. {:.info} diff --git a/app/gateway/self-managed-migration.md b/app/gateway/self-managed-migration.md index 678c5b63f1..af9b52315a 100644 --- a/app/gateway/self-managed-migration.md +++ b/app/gateway/self-managed-migration.md @@ -130,7 +130,7 @@ a list of Workspaces for a particular {{site.base_gateway}} deployment by using {{site.base_gateway}} Workspaces provide a way to share runtime infrastructure across isolated configurations. With {{site.konnect_short_name}}, this is achieved using -[Control Plane groups](/gateway-manager/control-plane-groups/). Control Planes can be added to +[Control Plane groups](/gateway/control-plane-groups/). Control Planes can be added to and removed from Control Plane groups, and you can set them up to mirror your existing multi-tenant Workspace configuration. With Control Plane groups set up, you can connect Data Plane instances to each group, creating @@ -157,8 +157,8 @@ on [custom plugin support](/gateway/entities/plugin/#custom-plugins) requirement Migrating custom plugins to {{site.konnect_short_name}} requires uploading and associating your custom plugin's `schema.lua` file to the desired Control Plane. This can be done using the -Konnect UI in [Gateway Manager](https://cloud.konghq.com/gateway-manager/) or the -[Konnect Control Planes Config API](/api/konnect/control-planes-config/#/operations/list-plugin-schemas). +{{site.konnect_short_name}} UI or the +[{{site.konnect_short_name}} Control Planes Config API](/api/konnect/control-planes-config/#/operations/list-plugin-schemas). Just like in self-managed deployments, the custom plugin code must be distributed to the Data Plane instances. @@ -218,8 +218,8 @@ The recommended approach for migrating your Data Plane instances to {{site.konne create new Data Plane instances connected to your Control Plane, validate their configuration and connectivity, and then decommission the self-managed Data Plane instances. -See the [Data Plane hosting options](/gateway/topology-hosting-options/) for more information. The easiest -way to deploy new Data Planes is using the {{site.konnect_short_name}} Gateway Manager, which provides integrated +See the [Data Plane hosting options](/gateway/topology-hosting-options/) for more information. +The easiest way to deploy new Data Planes is using the {{site.konnect_short_name}} UI, which provides integrated launchers for popular operating systems and compute platforms. ## Next steps diff --git a/app/gateway/upgrade/backup-and-restore.md b/app/gateway/upgrade/backup-and-restore.md index d9a2a66f27..d25548b712 100644 --- a/app/gateway/upgrade/backup-and-restore.md +++ b/app/gateway/upgrade/backup-and-restore.md @@ -78,17 +78,16 @@ See the reference for [Entities managed by decK](/deck/reference/entities/) for Due to these limitations, we recommend prioritizing the [database-native method](#database-native-backup) in deployments using a database. -## Back up and restore Gateway entities for a {{site.konnect_short_name}} Control Plane +## Back up and restore Gateway entities for a {{site.konnect_short_name}} control plane -If you're running {{site.base_gateway}} as a Control Plane in {{site.konnect_short_name}}, use decK for backup and restore. +If you're running {{site.base_gateway}} as a control plane in {{site.konnect_short_name}}, use decK for backup and restore. Review the list of [entities managed by decK](/deck/reference/entities/) to see what can be backed up using this method. {:.info} -> **Note:** This method only backs up Control Plane configurations in Gateway Manager. It does not back up Dev Portal, API Products, {{site.konnect_catalog}}, and so on. Data stored in these applications, such as API specs and documents, must be manually backed up. -### Back up a {{site.konnect_short_name}} Control Plane +### Back up a {{site.konnect_short_name}} control plane Use `deck gateway dump` to back up your configuration: @@ -98,7 +97,7 @@ deck gateway dump -o my-backup.yaml \ --konnect-control-plane-name $CONTROL_PLANE_NAME ``` -This command generates a state file for the Control Plane's entity +This command generates a state file for the control plane's entity configuration, for example: ```yaml @@ -117,14 +116,14 @@ services: ... ``` -### Restore a {{site.konnect_short_name}} Control Plane +### Restore a {{site.konnect_short_name}} control plane -You can restore entity configuration for a Control Plane using a declarative configuration file. +You can restore entity configuration for a control plane using a declarative configuration file. You must do this for one group at a time. Assuming you have a backup file, for example, `my-backup.yaml`: -1. Run a diff between your backup file and the Control Plane in {{site.konnect_short_name}} to +1. Run a diff between your backup file and the control plane in {{site.konnect_short_name}} to make sure you're applying the configuration you want: ```sh @@ -134,7 +133,7 @@ make sure you're applying the configuration you want: ``` 2. If you're satisfied with the diff result, run `deck gateway sync` to sync your configuration to -a Control Plane: +a control plane: ```sh deck gateway sync my-backup.yaml \ @@ -142,8 +141,8 @@ a Control Plane: --konnect-control-plane-name $CONTROL_PLANE_NAME ``` -Check your Control Plane in {{site.konnect_short_name}} to make sure the sync worked. -Open [Gateway Manager](https://cloud.konghq.com/gateway-manager/), select your Control Plane, and check through the configured entities. +Check your control plane in {{site.konnect_short_name}} to make sure the sync worked. +Open [**API Gateway**](https://cloud.konghq.com/gateway-manager/), select your control plane, and check through the configured entities. ## Back up and restore Gateway entities in a self-managed deployment diff --git a/app/index.html b/app/index.html index 0568a2acd8..d8eae3e904 100644 --- a/app/index.html +++ b/app/index.html @@ -104,18 +104,6 @@

Catalog

Overview All documentation
-
-
- Kong Gateway Manager icon -
-

Gateway Manager

-

Catalog, connect to, and monitor the status of all Control Planes (CPs) and Data Plane nodes (DPs) in one place

-
-
- Overview - All documentation -
-
Kong Mesh Manager icon
diff --git a/app/konnect-platform/account.md b/app/konnect-platform/account.md index c8c33ecd3a..f8459ceb22 100644 --- a/app/konnect-platform/account.md +++ b/app/konnect-platform/account.md @@ -100,7 +100,7 @@ When you create a {{site.konnect_short_name}} account, {{site.ee_product_name}}, licenses are automatically provisioned to the organization. You do not need to manage these licenses manually. -Any data plane nodes or {{site.kic_product_name}} associations configured through the [Gateway Manager](/gateway-manager/) +Any data plane nodes or {{site.kic_product_name}} associations configured in {{site.konnect_short_name}} also implicitly receive the same license from the {{site.konnect_short_name}} control plane. You should never have to deal with a license directly. diff --git a/app/konnect-platform/compatibility.md b/app/konnect-platform/compatibility.md index 695b4dfac5..b3765058a4 100644 --- a/app/konnect-platform/compatibility.md +++ b/app/konnect-platform/compatibility.md @@ -21,8 +21,6 @@ breadcrumbs: related_resources: - text: "{{site.base_gateway}}" url: /gateway/ - - text: "Mesh Manager" - url: /mesh-manager/ - text: "decK" url: /deck/ - text: "Plugins" @@ -31,7 +29,7 @@ related_resources: faqs: - q: Are the {{site.konnect_short_name}} Control Plane and associated database migrations or upgrades done by Kong Inc.? a: The {{site.base_gateway}} Control Plane and its dependencies are fully managed by {{site.konnect_short_name}}. As new versions of {{site.base_gateway}} are released, {{site.konnect_short_name}} supports them as long as they are under our [active support schedule](/gateway/version-support-policy/). - - q: Will {{site.konnect_short_name}} Control Plane upgrades always show incompatible messages on the Gateway Manager page if the Data Plane nodes are not the same version as the {{site.konnect_short_name}} Control Plane? + - q: Will {{site.konnect_short_name}} Control Plane upgrades always show incompatible messages on the API Gateway page in {{site.konnect_short_name}} if the Data Plane nodes are not the same version as the {{site.konnect_short_name}} Control Plane? a: An old configuration may still be 100% compatible with older Data Plane nodes and therefore not show any error messages in the {{site.konnect_short_name}} UI. If there are compatibility issues detected when pushing the payload down to the Data Plane, then this will be reflected in the UI. - q: Will new features be available if the {{site.konnect_short_name}} Control Plane detects incompatible Data Plane nodes? a: | @@ -56,7 +54,7 @@ This reference explains which browsers, software versions, tools, and applicatio ## {{site.mesh_product_name}} compatibility -To use [Mesh Manager](/mesh-manager/), you must also use a compatible version of {{site.mesh_product_name}}: +To use Mesh in {{site.konnect_short_name}}, you must also use a compatible version of {{site.mesh_product_name}}: {% feature_table %} item_title: "{{site.mesh_product_name}} version" diff --git a/app/gateway-manager/konnect-labels.md b/app/konnect-platform/konnect-labels.md similarity index 96% rename from app/gateway-manager/konnect-labels.md rename to app/konnect-platform/konnect-labels.md index d86addd299..382aaffcfd 100644 --- a/app/gateway-manager/konnect-labels.md +++ b/app/konnect-platform/konnect-labels.md @@ -3,7 +3,7 @@ title: '{{site.konnect_short_name}} labels' content_type: reference layout: reference breadcrumbs: - - /gateway-manager/ + - /konnect/ products: - gateway @@ -19,7 +19,7 @@ description: Learn about labels in {{site.konnect_short_name}} related_resources: - text: Data Plane reference - url: /gateway-manager/data-plane-reference/ + url: /gateway/data-plane-reference/ --- diff --git a/app/kubernetes-ingress-controller/troubleshooting/konnect.md b/app/kubernetes-ingress-controller/troubleshooting/konnect.md index 6dbf0e15f7..786407a746 100644 --- a/app/kubernetes-ingress-controller/troubleshooting/konnect.md +++ b/app/kubernetes-ingress-controller/troubleshooting/konnect.md @@ -34,7 +34,7 @@ related_resources: url: /kubernetes-ingress-controller/troubleshooting/failure-modes/ --- -{{ site.kic_product_name }} must communicate with the {{ site.konnect_short_name }} APIs to provide an integration with [Gateway Manager](/gateway-manager/). If you encounter issues with KIC in {{ site.konnect_short_name }}, you should first inspect logs from {{ site.kic_product_name }} to identify the root cause. +{{ site.kic_product_name }} must communicate with the {{ site.konnect_short_name }} APIs to provide an integration with {{site.konnect_short_name}}. If you encounter issues with KIC in {{ site.konnect_short_name }}, you should first inspect logs from {{ site.kic_product_name }} to identify the root cause. ## Prometheus Metrics diff --git a/app/operator/konnect/labelling.md b/app/operator/konnect/labelling.md index c2c063f502..4b468af3d6 100644 --- a/app/operator/konnect/labelling.md +++ b/app/operator/konnect/labelling.md @@ -45,7 +45,7 @@ kind: KonnectGatewayControlPlane name: gateway-control-plane {% endvalidation %} -At this point, labels should be visible in the [Gateway Manager](https://cloud.konghq.com/us/gateway-manager/) UI. +At this point, labels should be visible in the {{site.konnect_short_name}} UI. ## Tagging @@ -78,7 +78,7 @@ kind: KongService name: service {% endvalidation %} -At this point, tags should be visible in the [Gateway Manager](https://cloud.konghq.com/us/gateway-manager/) UI. +At this point, tags should be visible in the {{site.konnect_short_name}} UI. ### `konghq.com/tags` annotation diff --git a/app/serverless-gateways/reference.md b/app/serverless-gateways/reference.md index aaab4b59b8..112c138f32 100644 --- a/app/serverless-gateways/reference.md +++ b/app/serverless-gateways/reference.md @@ -56,7 +56,7 @@ related_resources: --- Serverless gateways are lightweight API gateways. Their Control Plane is hosted by {{site.konnect_short_name}} and Data Plane nodes are automatically provisioned. Serverless gateways are ideal for developers who want to test or experiment in a pre-production environment. -You can manage your serverless gateway nodes in [Gateway Manager](https://cloud.konghq.com/gateway-manager/). +You can manage your serverless gateway nodes under **API Gateway** in {{site.konnect_short_name}}. ## How do serverless gateways work? diff --git a/docs/release-checklists.md b/docs/release-checklists.md index 8576c714ad..c314190e79 100644 --- a/docs/release-checklists.md +++ b/docs/release-checklists.md @@ -50,7 +50,7 @@ After Gateway is available on Konnect: There are a few items that we expect to come from engineering teams with each release: * [Performance benchmark update](https://developer.konghq.com/gateway/performance/benchmarks/) -* [Konnect compatibility errors reference](https://developer.konghq.com/gateway-manager/version-compatibility/) +* [Konnect compatibility errors reference](https://developer.konghq.com/gateway/data-plane-version-compatibility/) ### Patch releases