Merge branch 'main' into n4a-landing

Author: JTorreG

content/includes/nginx-one/alert-labels.md

@@ -0,0 +1,27 @@
+---
+files:
+  - content/nginx-one/secure-your-fleet/secure.md
+  - content/nginx-one/glossary.md
+---
+
+
+You can configure a variety of NGINX alerts in the F5 Distributed Cloud. If you have access to the [F5 Distributed Cloud]({{< ref "/nginx-one/getting-started.md#confirm-access-to-the-f5-distributed-cloud" >}}), log in and select the **Audit Logs & Alerts** tile. 
+
+Go to **Notifications > Alerts**. Select the gear icon and select **Alert Name > Active Alerts**. You may see one or more of the following alerts in the **Audit Logs & Alerts** Console. 
+
+{{<bootstrap-table "table table-striped table-bordered">}}
+
+### Alert Labels
+
+| **Alertname**                  | **Description**                                                    | **Alert Level** | **Action**                                                                                                      |
+|--------------------------------|----------------------------------------------------------------------|-----------------|------------------------------------------------------------------------------------------------------------------|
+| HighCVENGINX                  | A high-severity CVE is impacting an NGINX instance                  | Critical        | Review the CVE details in the NGINX One Console. Apply updates or change configurations to resolve the vulnerability. |
+| MediumCVENGINX                | A medium-severity CVE is impacting an NGINX instance                | Major           | Review the CVE details in the NGINX One Console. Apply updates or configuration changes as needed.               |
+| LowCVENGINX                   | A low-severity CVE is impacting an NGINX instance                   | Minor           | Review the CVE details in the NGINX One Console. Consider updates or configuration changes to maintain security.  |
+| SecurityRecommendationNGINX   | A security recommendation has been found for an NGINX configuration | Critical        | Review the configuration issue in the NGINX One Console. Follow the recommendations to secure the instance or Config Sync Group.      |
+| OptimizationRecommendationNGINX| An optimization recommendation has been found for an NGINX configuration| Major          | Review the optimization details in the NGINX One Console. Update the configuration to for the instance or Config Sync Group to enhance performance.       |
+| BestPracticeRecommendationNGINX| A best practice recommendation has been found for an NGINX configuration | Minor          | Review the best practice recommendation in the NGINX One Console. Update the configuration for the instance or Config Sync Group to align with industry standards. |
+| NGINXOffline                  | An NGINX instance is now offline                                   | Major           | Verify the host is online. Check the NGINX Agent's status on the instance and ensure it is connected to the NGINX One Console. |
+| NGINXUnavailable              | An NGINX instance is now unavailable                               | Major           | Ensure the NGINX Agent and host are active. Verify the NGINX Agent can connect to the NGINX One Console and resolve any network issues. |
+| NewNGINX                      | A new NGINX instance has connected to NGINX One                   | Minor           | Review the instance details in the NGINX One Console. Confirm availability, CVEs, and recommendations to ensure the instance is operational. |
+{{</bootstrap-table>}}

content/includes/nginx-one/conf/nginx-agent-conf.md

@@ -8,15 +8,12 @@ files:
 ```yaml
 command:
   server:
-    host: "<NGINX-One-Console-URL>" # Command server host
+    host: "agent.connect.nginx.com" # Command server host
     port: 443                       # Command server port
   auth:
     token: "<your-data-plane-key-here>" # Authentication token for the command server
   tls:
     skip_verify: false
 ```
 
-Replace the placeholder values:
-
-- `<NGINX-One-Console-URL>`: The URL of your NGINX One Console instance, typically https://INSERT_YOUR_TENANT_NAME.console.ves.volterra.io/ .
-- `<your-data-plane-key-here>`: Your Data Plane key.
+Replace `<your-data-plane-key-here>` with your Data Plane key.

content/nginx-one/agent/overview/_index.md

@@ -1,5 +1,5 @@
 ---
 title: "Overview"
 weight: 100
-url: /nginx-one/agent/install-upgrade/
----
+url: /nginx-one/agent/overview/
+---

content/nginx-one/glossary.md

@@ -28,6 +28,10 @@ This glossary defines terms used in the F5 NGINX One Console and F5 Distributed
 
 {{< include "nap-waf/config/common/nginx-app-protect-waf-terminology.md" >}}
 
+## NGINX Alerts
+
+{{< include "/nginx-one/alert-labels.md" >}}
+
 ## Legal notice: Licensing agreements for NGINX products
 
 Using NGINX One is subject to our End User Service Agreement (EUSA). For [NGINX Plus]({{< ref "/nginx" >}}), usage is governed by the End User License Agreement (EULA). Open source projects, including [NGINX Agent](https://github.com/nginx/agent) and [NGINX Open Source](https://github.com/nginx/nginx), are covered under their respective licenses. For more details on these licenses, follow the provided links.

content/nginxaas-azure/getting-started/nginx-configuration/overview.md

@@ -74,7 +74,9 @@ Some directives cannot be overridden by the user provided configuration.
 
 ## NGINX listen port restrictions
 
-- Due to port restrictions on Azure Load Balancer health probes, ports `19`, `21`, `70`, and `119` are not allowed. The NGINXaaS deployment can listen on all other ports.
+- Due to port restrictions on Azure Load Balancer health probes, certain ports are not allowed for the `listen` directive in NGINX configuration. The following ports are blocked:
+  - `19`, `21`, `70`, `119` - Azure health probe restricted ports
+  - `49151`, `49153`, `5140`, `50000`, `54141`, `54779` - reserved ports to support other NGINXaaS features
 
 - The [Basic]({{< ref "/nginxaas-azure/billing/overview.md#basic-plan" >}}) plan (and the deprecated Standard (v1) plan) supports a maximum of 5 listen ports in the NGINX configuration. Configurations that specify over 5 unique ports are rejected.
 

content/nginxaas-azure/quickstart/upgrade-channels.md

@@ -15,7 +15,7 @@ Maintaining the latest version NGINX Plus, operating system (OS), and other soft
 {{<bootstrap-table "table table-striped table-bordered">}}
 | Channel     | Description               |
 |-------------|---------------------------|
-| preview     | Selecting this channel automatically upgrades your deployment to the latest supported version of NGINX Plus and its dependencies soon after they become available. We recommend using this setting to try out new capabilities in deployments running in your development, testing, and staging environments. |
+| preview     | Selecting this channel automatically upgrades your deployment to the latest supported version of NGINX Plus and its dependencies soon after they become available. We recommend using this setting to try out new capabilities in deployments running in your development, testing, and staging environments. Avoid using it in your production environment. |
 | stable      | A deployment running on this channel will receive updates on NGINX Plus and its dependencies at a slower rate than the **Preview** channel. We recommend using this setting for production deployments where you might want stable features instead of the latest ones. This is the **default channel** if you do not specify one for your deployment. |
 {{</bootstrap-table>}}
 

content/nic/releases.md

@@ -48,7 +48,7 @@ Lastly, in our previous v5.0.0 release, we removed support for Open Tracing. Thi
 [GitHub Container](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress),
 [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress).
 - For NGINX Plus, use the 5.1.0 images from the F5 Container registry or build your own image using the 5.1.0 source code
-- For Helm, use version 2.2.0 of the chart.
+- For Helm, use version 2.2.1 of the chart.
 
 ### <i class="fa-solid fa-life-ring"></i> Supported Platforms
 

layouts/shortcodes/nic-helm-version.html

@@ -1 +1 @@
-2.2.0
+2.2.1

layouts/shortcodes/nic-operator-version.html

@@ -1 +1 @@
-3.2.0
+3.2.1