Merge branch 'main' into docs/update-new-instructions

Author: ADubhlaoich

content/includes/nim/tech-specs/nim-app-protect-support.md

@@ -8,7 +8,7 @@ NGINX Instance Manager supports the following versions of [NGINX App Protect WAF
 
 | NGINX Instance Manager | NGINX App Protect WAF              |
 |------------------------|------------------------------------|
-| 2.17.0–2.19.1          | Release 4.8.0–4.13.0, 5.1.0–5.5.0 |
+| 2.17.0–2.19.1          | Release 4.8.0–4.14.0, 5.1.0–5.6.0 |
 | 2.15.1–2.16.0          | Release 4.8.0–4.10.0              |
 | 2.14.1–2.15.0          | Release 4.4.0–4.7.0               |
 | 2.13.0–2.14.0          | Release 4.3.0–4.5.0               |

content/nginxaas-azure/quickstart/loadbalancer-kubernetes.md

@@ -71,6 +71,7 @@ The steps in this section must be completed once for each new setup. We will ins
 
 {{<note>}}
 The data plane API key has the following requirements:
+
 - The key should have an expiration date. The default expiration date is six months from the date of creation. The expiration date cannot be longer than two years from the date of creation.
 - The key should be at least 12 characters long.
 - The key requires three out of four of the following types of characters:
@@ -184,6 +185,7 @@ You can also install the NLK controller AKS extension by navigating to [F5 NGINX
 - On the **Basics** tab, provide the following information:
 
   {{<bootstrap-table "table table-striped table-bordered">}}
+
   | Field                       | Description                |
   |---------------------------- | ---------------------------- |
   | Subscription                | Select the appropriate Azure subscription. |
@@ -194,6 +196,7 @@ You can also install the NLK controller AKS extension by navigating to [F5 NGINX
 - Select **Application Details**, and provide the following information:
 
   {{<bootstrap-table "table table-striped table-bordered">}}
+
   | Field                       | Description                |
   |---------------------------- | ---------------------------- |
   | Cluster extension resource name             | Provide a name for the NLK controller.             |
@@ -247,10 +250,18 @@ Expose a Kubernetes `Service` to route traffic to your workload.  The `Service`
 - Choose one of the following `Service` types:
   - `NodePort`: To route external traffic into the cluster using a well defined port exposed on each AKS worker node.
   - `ClusterIP`: To route traffic to pods directly if you are running an Azure Container Networking Interface (CNI) that lets you expose the pods on the Azure VNET.
+  - `LoadBalancer`: To route traffic to the cluster's external load balancer. The load balancer routes traffic into the cluster as normal.   
 - The port name must be formatted as `{{NGINX Context}}-{{NGINX upstream name}}`. For example:
   - If the upstream is in the `http` context and named `my-service` then the name is `http-my-service`
   - If the upstream is in the `stream` context and named `jet` then the port name is `stream-jet`
 
+{{< note >}}
+**NGINX Ingress Controller users**: with v5.0.0 and upwards, if you wish to route traffic from your NGINXaaS deployment to your NGINX Ingress Controller service, please make the following changes to your helm chart values:
+
+- Add `"nginx.com/nginxaas": "nginxaas"` to the NGINX Ingress Controller service annotations.
+- Modify the `service.httpPort.name` or `service.httpsPort.name` values to provide the expected port name format, as above.  
+{{</ note >}}
+
 The following example uses a service of type `NodePort`:
 
 ```yaml
@@ -331,6 +342,7 @@ flowchart TB
 ```
 
 {{<note>}}
+
 - Configuring multiple NLK controllers to update the same upstream isn't supported and will result in unpredictable behavior.
 {{</note>}}
 
@@ -341,6 +353,7 @@ Multiple NLK controllers can be installed in the same AKS cluster to update sepa
 Each NLK needs a unique helm release name and needs a unique helm value for `nlk.config.serviceAnnotationMatch`.  Each NLK will only watch services that have the matching annotation.
 
 {{<note>}}
+
 - Consider using `helm` to install multiple NLK controllers on an AKS cluster. Installing multiple copies of the controller on the same AKS cluster is not supported via the [AKS Extension](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/f5-networks.f5-nginx-for-azure-aks-extension?tab=overview).
 {{</note>}}
 
@@ -361,6 +374,7 @@ The logs can be made more verbose by setting the Helm value `nlk.config.logLevel
 NGINXaaS supports exporting dynamic upstream update logs to an Azure Storage account or to a Log Analytics workspace.
 
 To setup logging:
+
 1. Select **Diagnostic settings** under **Monitoring**.
 1. Select **Add diagnostic setting**.
 1. On the following panel, provide a **Diagnostic setting name**.

content/nim/nginx-app-protect/setup-waf-config-management.md

@@ -53,11 +53,13 @@ The following table shows the NGINX App Protect WAF Release version and its corr
 
 | NGINX App Protect WAF Release version | WAF Compiler               |
 |---------------------------------------|----------------------------|
+| NGINX App Protect WAF 5.6.0           | nms-nap-compiler-v5.342.0  |
 | NGINX App Protect WAF 5.5.0           | nms-nap-compiler-v5.264.0  |
 | NGINX App Protect WAF 5.4.0           | nms-nap-compiler-v5.210.0  |
 | NGINX App Protect WAF 5.3.0           | nms-nap-compiler-v5.144.0  |
 | NGINX App Protect WAF 5.2.0           | nms-nap-compiler-v5.48.0   |
 | NGINX App Protect WAF 5.1.0           | nms-nap-compiler-v5.17.0   |
+| NGINX App Protect WAF 4.14.0          | nms-nap-compiler-v5.342.0  |
 | NGINX App Protect WAF 4.13.0          | nms-nap-compiler-v5.264.0  |
 | NGINX App Protect WAF 4.12.0          | nms-nap-compiler-v5.210.0  |
 | NGINX App Protect WAF 4.11.0          | nms-nap-compiler-v5.144.0  |
@@ -95,15 +97,15 @@ The following table shows the NGINX App Protect WAF Release version and its corr
 Install the WAF compiler, then restart the `nms-integrations` service:
 
 ```bash
-sudo apt-get install nms-nap-compiler-v5.264.0
+sudo apt-get install nms-nap-compiler-v5.342.0
 ```
 
 {{<note>}}
 
 - If you want to have more than one version of the `nms-nap-compiler` installed on your system at once, you'll need to append `-o Dpkg::Options::="--force-overwrite"` to the `nms-nap-compiler` installation commands after your initial `nms-nap-compiler` installation. For example, the installation command would look like this:
 
 ```bash
-sudo apt-get install nms-nap-compiler-v5.264.0 -o Dpkg::Options::="--force-overwrite"
+sudo apt-get install nms-nap-compiler-v5.342.0 -o Dpkg::Options::="--force-overwrite"
 ```
 
 {{</note>}}
@@ -115,7 +117,7 @@ Download the file dependencies.repo to `/etc/yum.repos.d`, enable the `codeready
 ```bash
 sudo wget -P /etc/yum.repos.d https://cs.nginx.com/static/files/dependencies.repo
 sudo subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms
-sudo yum install nms-nap-compiler-v5.264.0
+sudo yum install nms-nap-compiler-v5.342.0
 ```
 
 ### RHEL 7.4 or later; CentOS
@@ -124,7 +126,7 @@ Download the file `dependencies.repo` to `/etc/yum.repos.d`, enable the RHEL 7 s
 ```bash
 sudo wget -P /etc/yum.repos.d https://cs.nginx.com/static/files/dependencies.repo
 sudo yum-config-manager --enable rhui-REGION-rhel-server-optional rhui-REGION-rhel-server-releases rhel-7-server-optional-rpms
-sudo yum install nms-nap-compiler-v5.264.0
+sudo yum install nms-nap-compiler-v5.342.0
 ```
 
 ### Amazon Linux 2 LTS
@@ -136,7 +138,7 @@ sudo wget -P /etc/yum.repos.d https://cs.nginx.com/static/files/app-protect-7.re
 sudo amazon-linux-extras enable epel
 sudo yum clean metadata
 sudo yum install epel-release
-sudo yum install nms-nap-compiler-v5.264.0
+sudo yum install nms-nap-compiler-v5.342.0
 ```
 
 ### Oracle Linux 7.4 or later
@@ -145,7 +147,7 @@ Download the file `dependencies.repo` to `/etc/yum.repos.d`, enable the `ol8_cod
 ```bash
 sudo wget -P /etc/yum.repos.d https://cs.nginx.com/static/files/dependencies.repo
 sudo yum-config-manager --enable ol8_codeready_builder
-sudo yum install nms-nap-compiler-v5.264.0
+sudo yum install nms-nap-compiler-v5.342.0
 ```
 
 ### Download from MyF5
@@ -1088,24 +1090,24 @@ Check if the WAF compiler has been installed and is working properly by viewing
 sudo /opt/nms-nap-compiler/app_protect-<version>/bin/apcompile -h
 ```
 
-For example, to view the help description for WAF compiler 5.264.0, run the following command:
+For example, to view the help description for WAF compiler 5.342.0, run the following command:
 
 ``` bash
-sudo /opt/nms-nap-compiler/app_protect-5.264.0/bin/apcompile -h
+sudo /opt/nms-nap-compiler/app_protect-5.342.0/bin/apcompile -h
 ```
 
 The output looks similar to the following example:
 
 ```text
 USAGE:
-    /opt/nms-nap-compiler/app_protect-5.264.0/bin/apcompile <options>
+    /opt/nms-nap-compiler/app_protect-5.342.0/bin/apcompile <options>
 
 Examples:
-    /opt/nms-nap-compiler/app_protect-5.264.0/bin/apcompile -p /path/to/policy.json -o mypolicy.tgz
-    /opt/nms-nap-compiler/app_protect-5.264.0/bin/apcompile -p policyA.json -g myglobal.json -o /path/to/policyA_bundle.tgz
-    /opt/nms-nap-compiler/app_protect-5.264.0/bin/apcompile -g myglobalsettings.json --global-state-outfile /path/to/myglobalstate.tgz
-    /opt/nms-nap-compiler/app_protect-5.264.0/bin/apcompile -b /path/to/policy_bundle.tgz --dump
-    /opt/nms-nap-compiler/app_protect-5.264.0/bin/apcompile -l logprofA.json -o /path/to/logprofA_bundle.tgz
+    /opt/nms-nap-compiler/app_protect-5.342.0/bin/apcompile -p /path/to/policy.json -o mypolicy.tgz
+    /opt/nms-nap-compiler/app_protect-5.342.0/bin/apcompile -p policyA.json -g myglobal.json -o /path/to/policyA_bundle.tgz
+    /opt/nms-nap-compiler/app_protect-5.342.0/bin/apcompile -g myglobalsettings.json --global-state-outfile /path/to/myglobalstate.tgz
+    /opt/nms-nap-compiler/app_protect-5.342.0/bin/apcompile -b /path/to/policy_bundle.tgz --dump
+    /opt/nms-nap-compiler/app_protect-5.342.0/bin/apcompile -l logprofA.json -o /path/to/logprofA_bundle.tgz
 ...
 ```