Merge branch 'main' into nap-helm-chart

Author: ADubhlaoich

.github/labeler.yml

@@ -0,0 +1,122 @@
+# Label PRs based on modified file paths (v5 format)
+# https://github.com/actions/labeler
+
+# General documentation
+
+documentation:
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'content/**'
+      - 'assets/**'
+      - 'static/**'
+      - 'data/**'
+
+# Product labels
+
+product/agent:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'content/agent/**'
+          - 'content/includes/agent/**'
+
+product/amplify:
+  - changed-files:
+      - any-glob-to-any-file: 'content/amplify/**'
+
+product/controller:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'content/controller/**'
+          - 'content/includes/controller/**'
+
+product/mesh:
+  - changed-files:
+      - any-glob-to-any-file: 'content/mesh/**'
+
+product/modsec-waf:
+  - changed-files:
+      - any-glob-to-any-file: 'content/modsec-waf/**'
+
+product/nap-dos:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'content/nap-dos/**'
+          - 'content/includes/nap-dos/**'
+
+product/nap-waf:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'content/nap-waf/**'
+          - 'content/includes/nap-waf/**'
+
+product/ngf:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'content/ngf/**'
+          - 'content/includes/ngf/**'
+
+product/nginx-plus:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'content/nginx/**'
+          - 'content/includes/nginx-plus/**'
+
+product/nginx-one:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'content/nginx-one/**'
+          - 'content/includes/nginx-one/**'
+
+product/nginxaas:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'content/nginxaas-azure/**'
+          - 'content/includes/nginxaas-azure/**'
+
+product/nim:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'content/nim/**'
+          - 'content/includes/nim/**'
+
+product/nms:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'content/nms/**'
+          - 'content/includes/nms/**'
+
+product/unit:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'content/unit/**'
+          - 'content/includes/unit/**'
+
+# Other labels
+
+process documentation:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'templates/**'
+          - '*.md'
+          - 'LICENSE'
+
+tooling:
+  - changed-files:
+      - any-glob-to-any-file:
+          - 'layouts/**'
+          - '.github/**'
+          - '.cloudcannon/**'
+          - 'styles/**'
+          - 'layouts/**'
+          - 'config/**'
+          - 'archetypes/**'
+          - '*.yml'
+          - '*.yaml'
+          - '*.json'
+          - '*.ts'
+          - '*.sh'
+          - '*.js'
+          - 'Makefile'
+          - '.vale.ini'
+          - '.gitignore'
+          - '.gitattributes'

.github/workflows/labeler.yml

@@ -0,0 +1,17 @@
+name: PR Labeler
+
+on:
+- pull_request_target
+
+permissions:
+  contents: read  # Required to read the labeler.yml file
+  pull-requests: write  # Required to apply labels to PRs
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Apply labels based on file paths
+        uses: actions/labeler@v5
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

.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@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           sarif_file: results.sarif

content/nginx/deployment-guides/amazon-web-services/route-53-global-server-load-balancing.md

@@ -7,6 +7,8 @@ doctypes:
 title: Global Server Load Balancing with Amazon Route 53 and NGINX Plus
 toc: true
 weight: 300
+draft: true
+noindex: true
 ---
 
 This deployment guide explains how to configure global server load balancing (GSLB) of traffic for web domains hosted in Amazon [Elastic Compute Cloud](https://aws.amazon.com/ec2/) (EC2). For high availability and improved performance, you set up multiple backend servers (web servers, application servers, or both) for a domain in two or more AWS regions. Within each region, NGINX Plus load balances traffic across the backend servers.

content/nginxaas-azure/billing/overview.md

@@ -33,15 +33,6 @@ The SKU for the Basic pricing plan is `basic_Monthly`.
 {{< note >}}The costs for your plan will appear on the Azure Portal Cost Analysis page and the Azure Consumption APIs. There may be a 24h delay before usage is visible.{{< /note >}}
 
 
-### Standard plan (deprecated)
-
-The Standard plan is comparable to the Standard V2 plan except that it doesn't support some features like NGINX App Protect WAF.
-
-The SKU to use for the Standard pricing plan is `standard_Monthly`.
-
-{{< note >}} Standard plan is now deprecated in favor of Standard V2 plan.{{< /note >}}
-
-
 ## NGINX Capacity Unit (NCU)
 
 {{< include "/nginxaas-azure/ncu-description.md" >}}

content/nginxaas-azure/changelog.md

@@ -13,6 +13,12 @@ To see a list of currently active issues, visit the [Known issues]({{< relref "/
 
 To review older entries, visit the [Changelog archive]({{< relref "/nginxaas-azure/changelog-archive" >}}) section.
 
+## March 5, 2025
+
+- {{% icon-info %}} **Retirement of Standard Plan**
+
+   The `Standard` plan for NGINXaaS for Azure has been retired, and you can no longer use it to create new deployments. If you have a deployment running on the `Standard` plan, consider [migrating]({{< relref "/nginxaas-azure/troubleshooting/migrate-from-standard.md">}}) it to the [`Standard V2 plan`]({{< relref "/nginxaas-azure/billing/overview.md#standard-v2-plan" >}}) to access new features such as NGINX App Protect WAF and additional listen ports. Plan migration does not incur downtime.
+
 ## February 10, 2025
 
 - {{% icon-feature %}} **NGINXaaS Load Balancer for Kubernetes is now Generally Available**

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

@@ -62,7 +62,7 @@ Some directives cannot be overridden by the user provided configuration.
   |------------------ | ----------------------- | -----------------|
   | `user` | `nginx` | The `nginx` user has the correct permissions for accessing certificates, policy files and other auxfiles. |
   | `worker_processes` | `auto` | Set to `auto` to automatically set `worker_processes` to the number of CPU cores. |
-  | `worker_connections` |   <ul><li>standard plan `4000`</li><li>basic plan `3000`</li></ul> | To ensure reasonable performance of the NGINXaaS deployment for standard plan the `worker_connections` is fixed at 400/NCU; for basic plan this is set lower. |
+  | `worker_connections` |   <ul><li>Standard V2 plan `4000`</li><li>basic plan `3000`</li></ul> | To ensure reasonable performance of the NGINXaaS deployment for Standard V2 plan, the `worker_connections` is fixed at 400/NCU; for basic plan this is set lower. |
   | `pid` | `/run/nginx/nginx.pid` | Set to this value to allow NGINXaaS to automatically manage the NGINX master process. |
   | `daemon` | `on` | Automatically set to `on` to allow NGINXaaS to manage the NGINX master process. |
   | `master_process` | `on` | This directive is intended for NGINX developers. |

content/nginxaas-azure/monitoring/metrics-catalog.md

@@ -11,16 +11,18 @@ F5 NGINX as a Service for Azure (NGINXaaS) provides a rich set of metrics that y
 
 ## Available metrics
 
-- [NGINXaaS Statistics](#nginxaas-statistics)
-- [NGINX connections statistics](#nginx-connections-statistics)
-- [NGINX requests and response statistics](#nginx-requests-and-response-statistics)
-- [NGINX SSL Statistics](#nginx-ssl-statistics)
-- [NGINX Cache Statistics](#nginx-cache-statistics)
-- [NGINX Worker Statistics](#nginx-worker-statistics)
-- [NGINX Upstream Statistics](#nginx-upstream-statistics)
-- [NGINX System Statistics](#nginx-system-statistics)
-- [NGINX Stream Statistics](#nginx-stream-statistics)
-- [NGINX Resolver Statistics](#nginx-resolver-statistics)
+- [Available metrics](#available-metrics)
+- [Metrics](#metrics)
+  - [NGINXaaS statistics](#nginxaas-statistics)
+  - [NGINX connections statistics](#nginx-connections-statistics)
+  - [NGINX requests and response statistics](#nginx-requests-and-response-statistics)
+  - [NGINX SSL statistics](#nginx-ssl-statistics)
+  - [NGINX cache statistics](#nginx-cache-statistics)
+  - [NGINX worker statistics](#nginx-worker-statistics)
+  - [NGINX upstream statistics](#nginx-upstream-statistics)
+  - [NGINX system statistics](#nginx-system-statistics)
+  - [NGINX stream statistics](#nginx-stream-statistics)
+  - [NGINX resolver statistics](#nginx-resolver-statistics)
 
 ## Metrics
 
@@ -33,9 +35,9 @@ The metrics are categorized by the namespace used in Azure Monitor. The dimensio
 
 | **Metric**            | **Dimensions** | **Type** | **Description**                                                                                                                                                                                                                                                                                                           | **Roll-up per** |
 | --------------------- | -------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
-| ncu.provisioned       |                | count    | The number of successfully provisioned NCUs during the aggregation interval. During scaling events, this may lag behind `ncu.requested` as the system works to achieve the request. Available for Standard plan deployments.                                                                                              | deployment      |
-| ncu.requested         |                | count    | The requested number of NCUs during the aggregation interval. Describes the goal state of the system. Available for Standard plan deployments.                                                                                                                                                                            | deployment      |
-| ncu.consumed          |                | count    | The estimated number of NCUs used to handle the current traffic. This may burst above the `ncu.provisioned`. This can be used to guide scaling out or in to match your workload. See [Scaling Guidance]({{< relref "/nginxaas-azure/quickstart/scaling.md#iterative-approach" >}}) for details. Available for Standard plan deployments. | deployment      |
+| ncu.provisioned       |                | count    | The number of successfully provisioned NCUs during the aggregation interval. During scaling events, this may lag behind `ncu.requested` as the system works to achieve the request. Available for Standard plan(s) only.                                                                                              | deployment      |
+| ncu.requested         |                | count    | The requested number of NCUs during the aggregation interval. Describes the goal state of the system. Available for Standard plans(s) only.                                                                                                                                                                            | deployment      |
+| ncu.consumed          |                | count    | The estimated number of NCUs used to handle the current traffic. This may burst above the `ncu.provisioned`. This can be used to guide scaling out or in to match your workload. See [Scaling Guidance]({{< relref "/nginxaas-azure/quickstart/scaling.md#iterative-approach" >}}) for details. Available for Standard plan(s) only. | deployment      |
 | system.worker_connections | pid process_name | count | The number of nginx worker connections used on the dataplane. This metric is one of the factors which determines the deployment's consumed NCU value.  | deployment |
 | nginxaas.certificates | name status    | count    | The number of certificates added to the NGINXaaS deployment dimensioned by the name of the certificate and its status. Refer to [Certificate Health]({{< relref "/nginxaas-azure/getting-started/ssl-tls-certificates/overview.md#monitor-certificates" >}}) to learn more about the status dimension.             | deployment      |
 | nginxaas.maxmind      | status         | count    | The status of any MaxMind license in use for downloading geoip2 databases. Refer to [License Health]({{< relref "/nginxaas-azure/quickstart/geoip2.md#monitoring" >}}) to learn more about the status dimension.                                                                                                                 | deployment      |

content/nginxaas-azure/overview/overview.md

@@ -46,7 +46,7 @@ NGINXaaS for Azure is supported in the following regions:
 
 ### Redundancy
 
-With the Standard Plan, NGINXaaS uses the following redundancy features to keep your service available.
+With the Standard V2 Plan, NGINXaaS uses the following redundancy features to keep your service available.
 
 - We run _at least_ two NGINX Plus instances for each deployment in an active-active pattern
 - NGINX Plus is constantly monitored for health. Any unhealthy instances are replaced with new ones

content/nginxaas-azure/quickstart/scaling.md

@@ -9,7 +9,7 @@ url: /nginxaas/azure/quickstart/scaling/
 
 F5 NGINX as a Service for Azure (NGINXaaS) supports manual and automatic scaling of your deployment, allowing you to adapt to application traffic demands while controlling cost.
 
-{{<note>}}Scaling requires the Standard plan.{{</note>}}
+{{<note>}}This feature is only available for Standard plan(s).{{</note>}}
 
 An NGINXaaS deployment can be scaled out to increase the capacity (increasing the cost) or scaled in to decrease the capacity (reducing the cost). Capacity is measured in [NGINX Capacity Units (NCU)](#nginx-capacity-unit-ncu).
 
@@ -65,7 +65,7 @@ The following table outlines constraints on the specified capacity based on the
 {{<bootstrap-table "table table-striped table-bordered">}}
 | **Marketplace Plan**         | **Minimum Capacity (NCUs)** | **Maximum Capacity (NCUs)** | **Multiple of**            |
 |------------------------------|-----------------------------|-----------------------------|----------------------------|
-| Standard                     | 10                          | 500                         | 10                         |
+| Standard plan(s)                  | 10                          | 500                         | 10                         |
 {{</bootstrap-table>}}
 
 {{< note >}}If you need a higher maximum capacity, please [open a request](https://my.f5.com/manage/s/) and specify the Resource ID of your NGINXaaS deployment, the region, and the desired maximum capacity you wish to scale to.{{< /note >}}