Merge remote-tracking branch 'origin' into internal/nim-release-2.20.0

Author: travisamartin

_banners/agent-v3-release.md

@@ -0,0 +1,9 @@
+{{< banner "notice" "NGINX Agent 3.0 is now available" >}}
+
+
+F5 NGINX One Console does not currently support Agent 3.x. If you are using NGINX One Console in your environment, upgrade to the latest Agent 2.x version by following the [Upgrade NGINX Agent](/nginx-agent/installation-upgrade/upgrade/) guide.
+
+Please see the [Technical specifications](/nginx-agent/technical-specifications/) for product compatibility.
+
+
+{{< /banner >}}

content/agent/_index.md

@@ -1,8 +1,12 @@
 ---
 title: NGINX Agent
-description: NGINX Agent is a companion daemon for your NGINX Open Source or NGINX
-  Plus instance.
 url: /nginx-agent/
 cascade:
   logo: NGINX-product-icon.png
+  banner:
+    enabled: true
+    type: deprecation
+    start-date: 2025-05-29
+    end-date: 2025-09-09
+    md: /_banners/agent-v3-release.md
 ---

content/agent/technical-specifications.md

@@ -12,6 +12,17 @@ type:
 
 This document provides technical specifications for NGINX Agent. It includes information on supported distributions, deployment environments, NGINX versions, sizing recommendations, and logging.
 
+## NGINX Agent v3.0 Compatibility 
+{{< bootstrap-table "table table-striped table-bordered" >}}
+| NGINX Product                | Agent Version  |
+|------------------------------|----------------|
+| **NGINX One Console**        | 2.x            |
+| **NGINX Gateway Fabric**     | 3.x            | 
+| **NGINX Plus**               | 2.x, 3.x       |
+| **NGINX Ingress Controller** | 2.x            |
+| **NGINX Instance Manager**   | 2.x            |
+{{< /bootstrap-table >}}
+
 ## Supported Distributions
 
 NGINX Agent can run in most environments. We support the following distributions:

content/nginx-one/_index.md

@@ -40,7 +40,7 @@ cascade:
     {{</ card >}}
   {{</ card-section >}}
 
-  # Other Products 
+  # Other Components 
   {{< card-section title="Kubernetes Solutions">}}
     {{< card title="NGINX Ingress Controller" titleUrl="/nginx-ingress-controller/" icon="NGINX-Ingress-Controller-product-icon">}}
       Kubernetes traffic management with API gateway, identity, and observability features. 

content/nginx/fips-compliance-nginx-plus.md

@@ -31,7 +31,7 @@ This statement uses the following terms:
 
 - **Cryptographic module**: The OpenSSL software, comprised of libraries of FIPS‑validated algorithms that can be used by other applications.
 
-- **Cryptographic boundary**: The operational functions that use FIPS‑validated algorithms. For NGINX Plus, the cryptographic boundary includes all functionality that is implemented by the [http_ssl](http://nginx.org/en/docs/http/ngx_http_ssl_module.html), [http_v2](http://nginx.org/en/docs/http/ngx_http_v2_module.html), [stream_ssl](http://nginx.org/en/docs/stream/ngx_stream_ssl_module.html), and [mail_ssl](http://nginx.org/en/docs/mail/ngx_mail_ssl_module.html) modules. These modules implement SSL and TLS operations for inbound and outbound connections which use HTTP, HTTP/2, TCP, and mail protocols.
+- **Cryptographic boundary**: The operational functions that use FIPS‑validated algorithms. For NGINX Plus, the cryptographic boundary includes all functionality that is implemented by the [http_ssl](http://nginx.org/en/docs/http/ngx_http_ssl_module.html), [http_v2](http://nginx.org/en/docs/http/ngx_http_v2_module.html), [stream_ssl](http://nginx.org/en/docs/stream/ngx_stream_ssl_module.html), [mail_ssl](http://nginx.org/en/docs/mail/ngx_mail_ssl_module.html), and [http_auth_jwt](http://nginx.org/en/docs/http/ngx_http_auth_jwt_module.html) modules. These modules implement SSL and TLS operations for inbound and outbound connections which use HTTP, HTTP/2, TCP, and mail protocols.
 
 - **NGINX Plus**: The NGINX Plus software application developed by NGINX, Inc. and delivered in binary format from NGINX servers.
 

content/nginxaas-azure/loadbalancer-kubernetes.md

@@ -148,7 +148,7 @@ The NLK controller can be installed in your Kubernetes cluster using either Helm
 Install the NLK controller using `helm install`. Be sure your kubectl context is pointed at the desired cluster.
 
 ```bash
-helm install nlk oci://registry-1.docker.io/nginxcharts/nginxaas-loadbalancer-kubernetes --version 1.0.0 \
+helm install nlk oci://registry-1.docker.io/nginxcharts/nginxaas-loadbalancer-kubernetes --version 1.1.1 \
   --set "nlk.dataplaneApiKey=${keyValue}" \
   --set "nlk.config.nginxHosts=${dataplaneAPIEndpoint}nplus"
 ```

content/nginxaas-azure/monitoring/enable-monitoring.md

@@ -12,7 +12,7 @@ Monitoring your application's performance is crucial for maintaining its reliabi
 
 Refer to the [Azure monitor overview](https://docs.microsoft.com/en-us/azure/azure-monitor/overview) documentation from Microsoft to learn more about Azure Monitor.
 
-### Prerequisites
+## Prerequisites
 
 - A system assigned managed identity with `Monitoring Metrics Publisher` role.
 
@@ -25,7 +25,7 @@ Azure Monitor will collects metrics from the NGINXaaS deployment automatically i
 ## Exporting
 You can export Azure Monitor metrics to other destinations like Log Analytics workspace, Azure Storage Account, Azure Event Hubs or Azure Monitor partner solutions using Diagnostic Setting. For more information, see the [Metrics diagnostic setting](https://learn.microsoft.com/en-us/azure/azure-monitor/essentials/diagnostic-settings).
 
-To configure diagnostic settings for a service, see [Create diagnostic settings in Azure Monitor](https://learn.microsoft.com/en-us/azure/azure-monitor/essentials/create-diagnostic-settings).
+To configure diagnostic settings for a service, see [Create diagnostic settings in Azure Monitor](https://learn.microsoft.com/en-us/azure/azure-monitor/essentials/create-diagnostic-settings). You can export metrics by selecting the `AllMetrics` category in diagnostic settings.
 
 {{<note>}} Not all metrics are exportable via diagnostic settings, for a list of exportable metrics, see [NGINXaaS exportable metrics](https://learn.microsoft.com/en-us/azure/azure-monitor/reference/supported-metrics/nginx-nginxplus-nginxdeployments-metrics).{{</note>}}
 

content/nginxaas-azure/monitoring/migrate-to-platform-metrics.md

@@ -0,0 +1,36 @@
+---
+title: Migrate from Custom metrics to Platform metrics
+weight: 1000
+toc: true
+url: /nginxaas/azure/getting-started/migrate-to-platform-metrics/
+type:
+- how-to
+---
+
+## Overview
+
+F5 NGINXaaS for Azure previously supported monitoring through [Custom Metrics](https://learn.microsoft.com/en-us/azure/azure-monitor/metrics/metrics-custom-overview), which is a preview feature in Azure. As a preview feature, support for Custom Metrics will be removed in the future. We've added support for Platform Metrics, which is the recommended way to monitor resources in Azure. We strongly recommend switching your deployment's monitoring to Platform Metrics to take advantage of lower latency and better reliability.
+
+## Migration steps
+
+Follow the steps in this section to migrate your deployment monitoring from Custom metrics to Platform metrics.
+
+1. Verify that your NGINXaaS deployment meets the [pre-requisites]({{< ref "/nginxaas-azure/monitoring/enable-monitoring.md#prerequisites">}}) for Platform metrics to work.
+2. If the pre-requisites are met, Platform metrics are enabled by default on all NGINXaaS deployment. Verify that you are able to see the new metrics in Azure Monitor under the `Standard Metrics` namespace.
+3. Turn off legacy monitoring:
+
+   - Using the Azure portal
+     1. In the Azure portal, go to the **NGINX monitoring** page for your NGINXaaS deployment.
+     2. Turn off the **Send metrics to Azure Monitor** setting.
+     3. Select **Save**.
+
+   - Using Terraform
+     1. Set `diagnose_support_enabled` to false in the `azurerm_nginx_deployment` resource.
+     2. Run `terraform plan` followed by `terraform apply` to upgrade the deployment.
+
+   - Using the Azure CLI
+     Run the following command:
+     ```shell
+     az nginx deployment update --name myDeployment --resource-group \
+     myResourceGroup --enable-diagnostics="false"
+     ```