Merge branch 'main' into nap-release-5.7

Author: ADubhlaoich

.github/workflows/ossf_scorecard.yml

@@ -56,6 +56,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload SARIF results to code scanning
-        uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           sarif_file: results.sarif

_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 >}}

_banners/ngf-2.0-release.md

@@ -0,0 +1,7 @@
+{{< banner "notice" "NGINX Gateway Fabric 2.0 is now available" >}}
+
+NGINX Gateway Fabric 2.0 has released! Follow [these instructions]({{< ref "/ngf/install/upgrade-version.md#upgrade-from-v1x-to-v2x" >}}) to upgrade from 1.x to 2.0.
+
+For 1.x, checkout [an older version]({{< ref "/ngf/install/upgrade-version.md#access-nginx-gateway-fabric-1x-documentation" >}}) of documentation.
+
+{{< /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/configuration/configure-nginx-agent-features.md

@@ -5,6 +5,7 @@ weight: 150
 toc: true
 type:
 - how-to
+docs: DOCS-1678
 ---
 
 ## Overview
@@ -47,7 +48,7 @@ The following table lists the NGINX Agent features.
     ssh user@your-nginx-instance
 ```
 
-2. **Edit NGINX Agent configuration:** 
+2. **Edit NGINX Agent configuration:**
 
 ```
     sudo vim /etc/nginx-agent/nginx-agent.conf
@@ -60,7 +61,7 @@ The following table lists the NGINX Agent features.
       - metrics
       - metrics-throttle
       - dataplane-status
-``` 
+```
 
 4. **Restart the NGINX Agent service:** Restart the NGINX Agent service to enable changes.
 
@@ -73,7 +74,7 @@ Once the steps have been completed, users will be able to view metrics data bein
     ssh user@your-nginx-instance
 ```
 
-2. **Edit NGINX Agent configuration:** 
+2. **Edit NGINX Agent configuration:**
 
 ```
     sudo vim /etc/nginx-agent/nginx-agent.conf
@@ -86,9 +87,9 @@ Once the steps have been completed, users will be able to view metrics data bein
       - nginx-config-async
       - dataplane-status
       - file-watcher
-``` 
+```
 
 4. **Restart the NGINX Agent service:** Restart the NGINX Agent service to enable changes.
 
-Once the steps have been completed, users will be able to publish NGINX configurations but metrics data will not be collected by the NGINX Agent. 
+Once the steps have been completed, users will be able to publish NGINX configurations but metrics data will not be collected by the NGINX Agent.
 

content/agent/configuration/health-checks.md

@@ -5,6 +5,7 @@ weight: 400
 toc: true
 type:
 - how-to
+docs: DOCS-1677
 ---
 
 ## Overview

content/agent/installation-upgrade/upgrade.md

@@ -12,9 +12,7 @@ type:
 
 Learn how to upgrade NGINX Agent.
 
-## Upgrade NGINX Agent from version v2.31.0 or greater
-
-{{< note >}} Starting from version v2.31.0, NGINX Agent will automatically restart itself during an upgrade. {{< /note >}}
+## Upgrade NGINX Agent
 
 To upgrade NGINX Agent, follow these steps:
 
@@ -41,43 +39,48 @@ To upgrade NGINX Agent, follow these steps:
         sudo apt-get install -y --only-upgrade nginx-agent -o Dpkg::Options::="--force-confold"
         ```
 
+## Upgrade NGINX Agent to a Specific Version 
 
+To upgrade NGINX Agent to a specific **v2.x version**, follow these steps: 
 
-## Upgrade NGINX Agent from a version less than v2.31.0
-
-To upgrade NGINX Agent, take the following steps:
+#### Steps to Upgrade: 
 
-1. Open an SSH connection to the server where you’ve installed NGINX Agent and log in.
+1. Open an SSH connection to the server running  NGINX Agent and log in.
 
-1. Make a backup copy of the following locations to ensure that you can successfully recover if the upgrade has issues:
+1. Back up the following files and directories to ensure you can restore the environment in case of issues during the upgrade: 
 
     - `/etc/nginx-agent`
-    - `config_dirs` values for any configuration specified in `/etc/nginx-agent/nginx-agent.conf`
-
-1. Stop NGINX Agent:
+    - Any `config_dirs` directory specified in `/etc/nginx-agent/nginx-agent.conf`.
 
-    ```shell
-    sudo systemctl stop nginx-agent
-    ```
-
-1. Install the updated version of NGINX Agent:
-
-    - CentOS, RHEL, RPM-Based
+1. Perform the version-controlled upgrade. 
 
+   - Debian, Ubuntu, Deb-Based
+        
         ```shell
-        sudo yum -y makecache
-        sudo yum update -y nginx-agent
+        sudo apt-get update
+        sudo apt-get install -y nginx-agent=<specific-version> -o Dpkg::Options::="--force-confold"
         ```
-
-    - Debian, Ubuntu, Deb-Based
-
+        
+        Example (to upgrade to version 2.41.1~noble): 
+        
         ```shell
-        sudo apt-get update
-        sudo apt-get install -y --only-upgrade nginx-agent -o Dpkg::Options::="--force-confold"
+        sudo apt-get install -y nginx-agent=2.41.1~noble -o Dpkg::Options::="--force-confold"
         ```
 
-1. Start NGINX Agent:
+    - CentOS, RHEL, RPM-Based        
+       
+        ```shell
+        sudo yum install -y nginx-agent-<specific-version>
+        ```
+        
+        Example (to upgrade to version `2.41.1`): 
+    
+        ```shell
+        sudo yum install -y nginx-agent-2.41.1
+        ```
 
+1. Verify the installed version:    
+    
     ```shell
-    sudo systemctl start nginx-agent
+    sudo nginx-agent --version
     ```

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/includes/ngf/installation/expose-nginx-gateway-fabric.md

@@ -50,4 +50,4 @@ There are two options for accessing NGINX Gateway Fabric depending on the type o
 
 NGINX Gateway Fabric uses the created service to update the **Addresses** field in the **Gateway Status** resource. Using a **LoadBalancer** service sets this field to the IP address and/or hostname of that service. Without a service, the pod IP address is used.
 
-This gateway is associated with the NGINX Gateway Fabric through the **gatewayClassName** field. The default installation of NGINX Gateway Fabric creates a **GatewayClass** with the name **nginx**. NGINX Gateway Fabric will only configure gateways with a **gatewayClassName** of **nginx** unless you change the name via the `--gatewayclass` [command-line flag]({{< ref "/ngf/reference/cli-help.md#static-mode">}}).
+This gateway is associated with the NGINX Gateway Fabric through the **gatewayClassName** field. The default installation of NGINX Gateway Fabric creates a **GatewayClass** with the name **nginx**. NGINX Gateway Fabric will only configure gateways with a **gatewayClassName** of **nginx** unless you change the name via the `--gatewayclass` [command-line flag]({{< ref "/ngf/reference/cli-help.md#controller">}}).

content/includes/ngf/installation/helm/pulling-the-chart.md

@@ -2,11 +2,9 @@
 docs: "DOCS-1439"
 ---
 
-Pull the latest stable release of the NGINX Gateway Fabric chart:
+```shell
+helm pull oci://ghcr.io/nginx/charts/nginx-gateway-fabric --untar
+cd nginx-gateway-fabric
+```
 
-   ```shell
-   helm pull oci://ghcr.io/nginx/charts/nginx-gateway-fabric --untar
-   cd nginx-gateway-fabric
-   ```
-
-   If you want the latest version from the **main** branch, add `--version 0.0.0-edge` to your pull command.
+For the latest version from the **main** branch, add _--version 0.0.0-edge_ to your pull command.