Merge branch 'main' into n4a-calc-testing

Author: lamATnginx

.github/labeler.yml

@@ -67,7 +67,7 @@ product/nginx-one:
           - 'content/nginx-one/**'
           - 'content/includes/nginx-one/**'
 
-product/nginxaas:
+product/nginxaas-azure:
   - changed-files:
       - any-glob-to-any-file:
           - 'content/nginxaas-azure/**'

.github/pull_request_template.md

@@ -14,7 +14,7 @@
 [//]: # "If the changes were defined by a GitHub issue, reference it using keywords."
 [//]: # "https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests"
 
-[//]: # "Do not like to any internal, non-public resources. This includes internal repository issues or anything in an intranet."
+[//]: # "Do not link to any internal, non-public resources. This includes internal repository issues or anything in an intranet."
 [//]: # "You can make reference to internal discussions without linking to them: see 'Referencing internal information'."
 [//]: # "https://github.com/nginx/documentation/blob/main/documentation/closed-contributions.md#referencing-internal-information"
 

.github/workflows/build-push.yml

@@ -80,7 +80,7 @@ jobs:
     permissions: read-all
     steps:
       - name: Send notification
-        uses:  8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e # v3.18.0
+        uses:  8398a7/action-slack@77eaa4f1c608a7d68b38af4e3f739dcd8cba273e # v3.19.0
         with: 
           status: custom
           custom_payload: |
@@ -115,51 +115,4 @@ jobs:
             }
     env:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_FRIENDS_OF_DOCS }}
-      PREVIEW_URL: ${{ needs.call-docs-build-push.outputs.PREVIEW_URL }}
-
-
-  lighthouseci:
-    if: github.event.pull_request
-    needs: call-docs-build-push
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          ref: ${{ github.event.workflow_run.head_branch }}
-      - uses: actions/setup-node@v5
-        with:
-          node-version: 18
-      - name: Installing packages
-        run: npm install
-      - name: Generating lighthouse reports for PR and main...
-        run: | 
-            node lighthouse-script.js
-      - name: Compare the artifacts for negative differences in performance
-        continue-on-error: true
-        run: |
-            FIELDS=("performance" "accessibility") 
-            for FIELD in "${FIELDS[@]}"; do
-                PR_VALUE=$(cat lighthouse-reports/pr-report.json | jq -r ".categories.$FIELD.score")
-                MAIN_VALUE=$(cat lighthouse-reports/main-report.json | jq -r ".categories.$FIELD.score")
-                echo "$FIELD: PR - $PR_VALUE | Main - $MAIN_VALUE"
-
-                if [ $FIELD = "performance" ]; then  
-                  LOWER_BOUND=$(echo "$MAIN_VALUE - 0.05" | bc)
-                  UPPER_BOUND=$(echo "$MAIN_VALUE + 0.05" | bc)
-                  if (( $(echo "$PR_VALUE < $LOWER_BOUND" | bc -l) || $(echo "$PR_VALUE > $UPPER_BOUND" | bc -l) )); then
-                      echo "Error: $FIELD score in PR ($PR_VALUE) is less than in MAIN ($MAIN_VALUE)"
-                      exit 1
-                  fi
-                else
-                  if (( $(echo "$PR_VALUE < $MAIN_VALUE" | bc -l) )); then
-                    echo "Error: $FIELD score in PR ($PR_VALUE) is less than in MAIN ($MAIN_VALUE)"
-                    exit 1
-                  fi
-                fi
-            done
-      - uses: actions/upload-artifact@v4
-        if: ${{ !cancelled() }}
-        with:
-            name: lighthouse-reports
-            path: lighthouse-reports/
-            retention-days: 30
+      PREVIEW_URL: ${{ needs.call-docs-build-push.outputs.PREVIEW_URL }}

.github/workflows/notification.yml

@@ -42,7 +42,7 @@ jobs:
             }
 
       - name: Send notification
-        uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e # v3.18.0
+        uses: 8398a7/action-slack@77eaa4f1c608a7d68b38af4e3f739dcd8cba273e # v3.19.0
         with:
           status: custom
           custom_payload: |

.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@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
+        uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
         with:
           sarif_file: results.sarif

.gitignore

@@ -35,9 +35,6 @@ resources/
 .netlify/plugins/*
 .netlify/
 
-# Local Lighthouse artifacts
-lighthouse-reports
-
 *.pyc
 build
 *.swp

content/_index.md

@@ -43,7 +43,7 @@ Learn how to deliver, manage, and protect your applications using F5 NGINX produ
 {{</card-section>}}
 
 {{<card-section showAsCards="true" title="F5 NGINX as a Service">}}
-  {{<card title="F5 NGINX as a Service for Azure" titleUrl="/nginxaas/azure/" brandIcon="NGINX-for-Azure-product-icon.svg" isLanding="true">}}
+  {{<card title="F5 NGINXaaS for Azure" titleUrl="/nginxaas/azure/" brandIcon="NGINX-for-Azure-product-icon.svg" isLanding="true">}}
     Infrastructure-as-a-Service (IaaS) version of NGINX Plus for your Microsoft Azure application stack.
   {{</card >}}
 {{</card-section>}}

content/agent/installation-upgrade/getting-started.md

@@ -71,7 +71,7 @@ tls:
   skip_verify: true
 ```
 
-For more information, see [Agent Protocol Definitions and Documentation](https://github.com/nginx/agent/tree/main/docs/proto/README.md).
+For more information, see [Agent Protocol Definitions and Documentation](https://github.com/nginx/agent/blob/dev-v2/docs/proto/README.md).
 
 ### Enable the REST interface
 
@@ -152,7 +152,7 @@ Open a web browser to view the mock control plane at [http://localhost:54790](ht
 - **configs/raw** - shows the actual configuration as it would live on the data plane
 - **metrics** - shows a buffer of metrics sent to the management plane (similar to what will be sent back in the REST API)
 
-For more NGINX Agent use cases, refer to the [NGINX Agent SDK examples](https://github.com/nginx/agent/tree/main/sdk/examples).
+For more NGINX Agent use cases, refer to the [NGINX Agent SDK examples](https://github.com/nginx/agent/tree/dev-v2/sdk/examples).
 
 ## Start and Enable Start on Boot
 

content/includes/nginx-plus/oss-plus-comparison.md

@@ -0,0 +1,5 @@
+---
+docs:
+---
+
+{{< call-out "note" >}}For a detailed comparison between NGINX Plus and NGINX Open Source, refer to [Differences between NGINX Open Source and NGINX Plus](https://www.f5.com/products/get-f5/nginx-open-source-vs-nginx-one-differences-in-features) on the F5 website.{{</ call-out >}}

content/includes/nic/compatibility-tables/nic-nap.md

@@ -4,6 +4,7 @@ The following table shows compatibility between NGINX Ingress Controller (NIC) a
 | NIC Version         | NAP-WAF Version | Config Manager | Enforcer |
 | ------------------- | --------------- | -------------- | -------- |
 | {{< nic-version >}} | 35+5.498        | 5.8.0          | 5.8.0    |
+| 5.1.1               | 35+5.498        | 5.8.0          | 5.8.0    |
 | 5.0.0               | 34+5.342        | 5.6.0          | 5.6.0    |
 | 4.0.1               | 33+5.264        | 5.5.0          | 5.5.0    |
 | 3.7.2               | 32+5.1          | 5.3.0          | 5.3.0    |