Merge remote-tracking branch 'origin' into epic-472-port-nginx-one-labs

Author: travisamartin

content/includes/config-snippets/enable-nplus-api-dashboard.md

@@ -0,0 +1,37 @@
+---
+docs:
+files:
+- content/nginx-one/workshops/lab5/upgrade-nginx-plus-to-latest-version.md
+- content/includes/use-cases/monitoring/enable-nginx-plus-api.md
+---
+
+```nginx
+# This block enables the NGINX Plus API and dashboard
+# For configuration and security recommendations, see:
+# https://docs.nginx.com/nginx/admin-guide/monitoring/live-activity-monitoring/#configuring-the-api
+server {
+    # Change the listen port if 9000 conflicts
+    # (8080 is the conventional API port)
+    listen 9000;
+
+    location /api/ {
+        # To restrict write methods (POST, PATCH, DELETE), uncomment:
+        # limit_except GET {
+        #     auth_basic "NGINX Plus API";
+        #     auth_basic_user_file /path/to/passwd/file;
+        # }
+
+        # Enable API in write mode
+        api write=on;
+
+        # To restrict access by network, uncomment and set your network:
+        # allow 192.0.2.0/24   # replace with your network
+        # deny  all;
+    }
+
+    # Serve the built-in dashboard at /dashboard.html
+    location = /dashboard.html {
+        root /usr/share/nginx/html;
+    }
+}
+```

content/includes/use-cases/monitoring/enable-nginx-plus-api.md

@@ -4,61 +4,15 @@ files:
   - content/nim/monitoring/overview-metrics.md
   - content/nginx-one/getting-started.md
 ---
-<!-- include in content/nginx-one/getting-started.md disabled, hopefully temporarily -->
-To collect comprehensive metrics for NGINX Plus -- including bytes streamed, information about upstream systems and caches, and counts of all HTTP status codes -- add the following to your NGINX Plus configuration file (for example, `/etc/nginx/nginx.conf` or an included file):
 
-```nginx
-# This block:
-# - Enables the read-write NGINX Plus API under /api/
-# - Serves the built-in dashboard at /dashboard.html
-# - Restricts write methods (POST, PATCH, DELETE) to authenticated users
-#   and a specified IP range
-# Change the listen port if 9000 conflicts; 8080 is the conventional API port.
-server {
-    # Listen on port 9000 for API and dashboard traffic
-    listen 9000 default_server;
+To collect comprehensive metrics for NGINX Plus, including bytes streamed, information about upstream systems and caches, and counts of all HTTP status codes, add the following to your NGINX Plus configuration file, for example `/etc/nginx/nginx.conf` or an included file:
 
-    # Handle API calls under /api/
-    location /api/ {
-        # Enable write operations (POST, PATCH, DELETE)
-        api write=on;
+{{< include "config-snippets/enable-nplus-api-dashboard.md" >}}
 
-        # Allow GET requests from any IP
-        allow 0.0.0.0/0;
-        # Deny all other requests by default
-        deny all;
+{{< call-out "note" "Security tip" >}}
+- By default, all clients can call the API.  
+- To limit who can access the API, uncomment the `allow` and `deny` lines under `api write=on` and replace the example CIDR with your trusted network.  
+- To restrict write methods (`POST`, `PATCH`, `DELETE`), uncomment and configure the `limit_except GET` block and set up [HTTP basic authentication](https://nginx.org/en/docs/http/ngx_http_auth_basic_module.html).  
+{{</ call-out >}}
 
-        # For methods other than GET, require auth and restrict to a network
-        limit_except GET {
-            # Prompt for credentials with this realm
-            auth_basic "NGINX Plus API";
-            # Path to the file with usernames and passwords
-            auth_basic_user_file /path/to/passwd/file;
-
-            # Allow only this IP range (replace with your own)
-            allow 192.0.2.0/24;
-            # Deny all other IPs
-            deny all;
-        }
-    }
-
-    # Serve the dashboard page at /dashboard.html
-    location = /dashboard.html {
-        # Files are located under this directory
-        root /usr/share/nginx/html;
-    }
-
-    # Redirect any request for / to the dashboard
-    location / {
-        return 301 /dashboard.html;
-    }
-}
-```
-
-For more details, see the [NGINX Plus API module documentation](https://nginx.org/en/docs/http/ngx_http_api_module.html) and [Configuring the NGINX Plus API]({{< ref "nginx/admin-guide/monitoring/live-activity-monitoring.md#configuring-the-api" >}}).
-
-After saving the changes, reload NGINX:
-
-```shell
-nginx -s reload
-```
+For more details, see the [NGINX Plus API module](https://nginx.org/en/docs/http/ngx_http_api_module.html) documentation and [Configuring the NGINX Plus API]({{< ref "/nginx/admin-guide/monitoring/live-activity-monitoring.md#configuring-the-api" >}}).

content/nginx-one/_index.md

@@ -1,10 +1,12 @@
 ---
 title: F5 NGINX One Console
-description: The F5 NGINX One Console makes it easy to manage NGINX instances across locations and environments. The console lets you monitor and control your NGINX fleet from one place—you can check configurations, track performance metrics, identify security vulnerabilities, manage SSL certificates, and more.
+nd-subtitle: The F5 NGINX One Console makes it easy to manage NGINX instances across locations and environments. The console lets you monitor and control your NGINX fleet from one place—you can check configurations, track performance metrics, identify security vulnerabilities, manage SSL certificates, and more.
 url: /nginx-one/
-hasCustomContent: true
+nd-landing-page: true
 cascade:
   logo: "NGINX-One-product-icon.svg"
+nd-content-type: landing-page
+nd-product: NGINX One
 ---
 {{< card-layout >}}
   {{< card-section >}}
@@ -35,38 +37,37 @@ cascade:
     {{< card title="Glossary" >}}
       Learn terms unique to NGINX One Console 
     {{</ card >}}
-    {{< card title="Changelog" >}}
-      {{< changelog-dates >}}
+    {{< card title="Changelog" >}}{{< changelog-dates >}}
     {{</ card >}}
   {{</ card-section >}}
 
   # Other Components 
   {{< card-section title="Kubernetes Solutions">}}
-    {{< card title="NGINX Ingress Controller" titleUrl="/nginx-ingress-controller/" icon="NGINX-Ingress-Controller-product-icon">}}
+    {{< card title="NGINX Ingress Controller" titleUrl="/nginx-ingress-controller/" brandIcon="NGINX-Ingress-Controller-product-icon">}}
       Kubernetes traffic management with API gateway, identity, and observability features. 
     {{</ card >}}
-    {{< card title="NGINX Gateway Fabric" titleUrl="/nginx-gateway-fabric" icon="NGINX-product-icon">}}
+    {{< card title="NGINX Gateway Fabric" titleUrl="/nginx-gateway-fabric" brandIcon="NGINX-product-icon">}}
       Next generation Kubernetes connectivity using the Gateway API. 
     {{</ card >}}
   {{</ card-section >}}
   {{< card-section title="Local Console Option">}}
-    {{< card title="NGINX Instance Manager" titleUrl="/nginx-instance-manager" icon="NGINX-Instance-Manager-product-icon">}}
+    {{< card title="NGINX Instance Manager" titleUrl="/nginx-instance-manager" brandIcon="NGINX-Instance-Manager-product-icon">}}
       Track and control NGINX Open Source and NGINX Plus instances. 
     {{</ card >}}
   {{</ card-section >}}
   {{< card-section title="Modern App Delivery">}}
-    {{< card title="NGINX Plus" titleUrl="/nginx" icon="NGINX-Plus-product-icon-RGB">}}
+    {{< card title="NGINX Plus" titleUrl="/nginx" brandIcon="NGINX-Plus-product-icon-RGB">}}
       The all-in-one load balancer, reverse proxy, web server, content cache, and API gateway. 
     {{</ card >}}
-    {{< card title="NGINX Open Source" titleUrl="https://nginx.org" icon="NGINX-product-icon">}}
+    {{< card title="NGINX Open Source" titleUrl="https://nginx.org" brandIcon="NGINX-product-icon">}}
       The open source all-in-one load balancer, content cache, and web server 
     {{</ card >}}
   {{</ card-section >}}
   {{< card-section title="Security">}}
-    {{< card title="NGINX App Protect WAF" titleUrl="/nginx-app-protect-waf" icon="NGINX-App-Protect-WAF-product-icon">}}
+    {{< card title="NGINX App Protect WAF" titleUrl="/nginx-app-protect-waf" brandIcon="NGINX-App-Protect-WAF-product-icon">}}
       Lightweight, high-performance, advanced protection against Layer 7 attacks on your apps and APIs. 
     {{</ card >}}
-    {{< card title="NGINX App Protect DoS" titleUrl="/nginx-app-protect-dos" icon="NGINX-App-Protect-DoS-product-icon">}}
+    {{< card title="NGINX App Protect DoS" titleUrl="/nginx-app-protect-dos" brandIcon="NGINX-App-Protect-DoS-product-icon">}}
       Defend, adapt, and mitigate against Layer 7 denial-of-service attacks on your apps and APIs. 
     {{</ card >}}
   {{</ card-section >}}

go.mod

@@ -2,4 +2,4 @@ module github.com/nginxinc/docs
 
 go 1.19
 
-require github.com/nginxinc/nginx-hugo-theme v0.42.37 // indirect
+require github.com/nginxinc/nginx-hugo-theme v0.43.2 // indirect

go.sum

@@ -1,2 +1,2 @@
-github.com/nginxinc/nginx-hugo-theme v0.42.37 h1:KtESjG1VG6ioSQBWfwgIiDVEmq9mylpunV2NENM8XvI=
-github.com/nginxinc/nginx-hugo-theme v0.42.37/go.mod h1:DPNgSS5QYxkjH/BfH4uPDiTfODqWJ50NKZdorguom8M=
+github.com/nginxinc/nginx-hugo-theme v0.43.2 h1:g+5+egVI1OOsXRcDSQvWeRhihZfc7LDTnWceZWS7J/o=
+github.com/nginxinc/nginx-hugo-theme v0.43.2/go.mod h1:DPNgSS5QYxkjH/BfH4uPDiTfODqWJ50NKZdorguom8M=