Port n1 lab 4 workshop

content/nginx-one/workshops/lab1/getting-started-with-nginx-one.md

@@ -116,7 +116,7 @@ You can only delete a key after you revoke it.
 
 Now that you’ve explored NGINX One Console and created a key, you’re ready to connect your first NGINX instance.
 
-[Go to Lab 2: Run workshop components with Docker]({{< ref "nginx-one/workshops/lab2/run-workshop-components-with-docker.md" >}})
+Go to [Lab 2: Run workshop components with Docker]({{< ref "nginx-one/workshops/lab2/run-workshop-components-with-docker.md" >}})
 
 ---
 

content/nginx-one/workshops/lab2/run-workshop-components-with-docker.md

@@ -45,11 +45,15 @@ Make sure you have:
 2. **Change to the Lab 2 directory**
 
    ```shell
-   cd workshops/nginx-one/lab2
+   cd static/workshops/nginx-one/lab2
    ```
 
 This folder contains `docker-compose.yml` and `generate_certs.sh`.
 
+{{<fa "download">}} {{<link "/workshops/nginx-one/lab2/docker-compose.yml" "Download docker-compose.yaml">}}
+
+{{<fa "download">}} {{<link "/workshops/nginx-one/lab2/generate_certs.sh" "Download generate_certs.sh">}}
+
 ---
 
 ## Set environment variables
@@ -141,7 +145,7 @@ If you don’t see them, double-check your `$TOKEN` or generate a new data plane
 
 Now that your containers are up and registered, go on to explore NGINX One Console features in Lab 3.
 
-[Go to Lab 3 →](../lab3/readme.md)
+Go to [Lab 3: Explore NGINX One Console features]({{< ref "nginx-one/workshops/lab3/explore-nginx-one-console-and-features.md" >}})
 
 ---
 

content/nginx-one/workshops/lab3/explore-nginx-one-console-and-features.md

@@ -33,9 +33,14 @@ By the end of this tutorial, you’ll know how to:
 Make sure you have:
 
 - An F5 Distributed Cloud (XC) account with NGINX One enabled  
-- All containers from Lab 2 running and registered  
+- All containers from [Lab 2](nginx-one/workshops/lab2/run-workshop-components-with-docker.md) running and registered  
+- Your unique identifier in the `NAME` environment variable (set in Lab 2), for example `s.jobs`:
+
+   ```shell
+   export NAME="s.jobs"
+   ```
+
 - Basic NGINX and Linux knowledge  
-- Your `$NAME` environment variable set (from [Lab 2]({{< ref "nginx-one/workshops/lab2/run-workshop-components-with-docker.md" >}}))  
 
 ---
 
@@ -174,7 +179,7 @@ Try it on:
 
 ## Next steps
 
-When you’re ready, move on to [Lab 4 →](../lab4/readme.md)
+Go to [Lab 4: Config Sync Groups]({{< ref "nginx-one/workshops/lab4/config-sync-groups.md" >}})
 
 ---
 

content/nginx-one/workshops/lab4/config-sync-groups.md

@@ -0,0 +1,213 @@
+---
+title: "Lab 4: Config Sync Groups"
+weight: 400
+toc: true
+nd-content-type: tutorial
+nd-product: nginx-one
+---
+
+## Overview
+
+In this lab, you create and manage Config Sync Groups in NGINX One Console. Config Sync Groups keep your NGINX instances in sync with a shared configuration. You learn to create a group, add instances, apply a shared config, and fix sync errors.
+
+## What you’ll learn
+
+By the end of this lab, you'll know how to:
+
+- Create a Config Sync Group  
+- Add instances to a Config Sync Group  
+- Update the shared configuration for a Config Sync Group  
+
+## Before you begin
+
+Make sure you have:
+
+- Completed [Lab 2: Run workshop components with Docker]({{< ref "nginx-one/workshops/lab2/run-workshop-components-with-docker.md" >}})  
+- Docker and Docker Compose installed and running  
+- Your data plane key in the `TOKEN` environment variable (set in Lab 2):  
+
+  ```shell
+  export TOKEN="your-data-plane-key"
+  ```
+
+- Your NGINX Plus JWT license file saved as `nginx-repo.jwt`, and `JWT` set (set in Lab 2):
+
+  ```shell
+  export JWT=$(cat path/to/nginx-repo.jwt)
+  ```
+
+- Your unique identifier in the NAME environment variable (set in Lab 2), for example `s.jobs`:
+
+   ```shell
+   export NAME="s.jobs"
+   ```
+
+- Basic familiarity with Linux command line and NGINX concepts
+
+---
+
+## Exercise 1: Create a Config Sync Group
+
+A Config Sync Group lets you apply one configuration to multiple NGINX instances and keep them in sync.
+
+1. In the NGINX One Console, select **Manage > Config Sync Groups**.  
+2. In the **Config Sync Groups** pane, select **Add Config Sync Group**.  
+3. In the **Add Config Sync Group** form, in the **Name** field, enter `$NAME-sync-group` (for example, `s.jobs-sync-group`).  
+4. Select **Create**. The new group appears with **Details** and **Configuration** tabs.  
+   - The **Details** tab shows:
+     - Object ID  
+     - Last publication status and config version ID  
+     - Config Sync Status (for example, Unknown)  
+     - Instance status counts (In Sync, Out of Sync, Offline, Unavailable)  
+5. Switch to the **Configuration** tab to view your group’s configuration files. It’s empty for now. You’ll add one in Exercise 2.
+
+---
+
+## Exercise 2: Add instances to the Config Sync Group
+
+{{< call-out "note" "Note" "" >}} You can mix OSS and Plus instances in one group. But any config feature you use must work on every instance. If you need Plus-only features, put them in a separate group. {{</ call-out >}}
+
+When you create a Config Sync Group, it has no shared config to begin with. You can add a shared config in two ways:
+
+- **Define config manually**: select your group, go to the **Configuration** tab, then select **Edit Configuration**. Add or paste your NGINX config, select **Next**, review the diff, and select **Save and Publish**.  
+- **Populate from first instance**: add one NGINX instance. The console uses that instance’s existing config as the group’s shared config.  
+
+### Populate group config from first instance
+
+Add a single NGINX instance so the console uses its existing config as the group’s shared config.
+
+1. Select **Manage > Config Sync Groups**.
+2. Select your `$NAME-sync-group` group. (For example, `s.jobs-sync-group`.)
+3. On the **Details** tab, in the **Instances** pane, select **Add Instance to Config Sync Group**.  
+4. Select **Register a new instance with NGINX One then add to config sync group**, then select **Next**.  
+5. Select **Use existing key**, paste `$TOKEN` (or your actual data plane key) into the **Data Plane Key** box.  
+6. Select the **Docker Container** tab. The tab shows sample commands for logging in, pulling an image, and running the container. Copy those sample commands and modify them as follows:
+
+7. Log in to the private registry:  
+
+   ```shell
+   echo "$JWT" \
+     | docker login private-registry.nginx.com \
+       --username "$JWT" --password-stdin
+   ```
+
+8. Pull a Docker (replace version as needed). Subject to availability, you can replace the agent with the specific NGINX Plus version, OS type, and OS version you need. Here we are going to pull the r31 version of NGINX+ on alpine to demonstrate that.See [Pulling the image]({{< ref "nginx/admin-guide/installing-nginx/installing-nginx-docker.md#pull-the-image" >}}).
+
+   ```shell
+   docker pull private-registry.nginx.com/nginx-plus/agent:nginx-plus-r31-alpine-3.19-20240522
+   ```
+
+9. Copy the docker run command from the user interface and modify it as follows:
+
+   - Replace `YOUR_JWT_HERE` in `--env NGINX_LICENSE_JWT` with `$JWT`
+   - Replace `YOUR_DATA_PLANE_KEY` in `--env NGINX_AGENT_SERVER_TOKEN` with `$TOKEN`
+   - Add `--hostname "$NAME-one-manual"` and `--name "$NAME-one-manual"` flags
+   - Ensure `--env NGINX_AGENT_INSTANCE_GROUP="$NAME-sync-group"` is set
+
+   ```shell
+   docker run \
+   --hostname "$NAME-one-manual" \
+   --name "$NAME-one-manual" \
+   --env NGINX_LICENSE_JWT="$JWT" \
+   --env NGINX_AGENT_SERVER_GRPCPORT=443 \
+   --env NGINX_AGENT_SERVER_HOST=agent.connect.nginx.com \
+   --env NGINX_AGENT_SERVER_TOKEN="$TOKEN" \
+   --env NGINX_AGENT_INSTANCE_GROUP="$NAME-sync-group" \
+   --env NGINX_AGENT_TLS_ENABLE=true \
+   --restart always \
+   --runtime runc \
+   -d private-registry.nginx.com/nginx-plus/agent:nginx-plus-r31-alpine-3.19-20240522
+   ```
+
+10. In the **Config Sync Groups** panel, select **Refresh**. The new instance appears and the shared config populates. The first instance added becomes the default config source.
+11. Select the **Configuration** tab to view the shared config.
+
+#### Add instances using Docker Compose
+
+Instead of registering each container manually, you can set the sync group in your compose file and restart all containers at once.
+
+You can edit the `docker-config.yaml` file to add those instances to the config sync group:
+
+1. Stop the running containers:
+
+   ```shell
+   docker compose down
+   ```
+
+2. Open `docker-compose.yaml` in a text editor.
+3. Uncomment the lines beginning with:
+
+   ```yaml
+   NGINX_AGENT_INSTANCE_GROUP: $NAME-sync-group
+   ```
+
+4. Restart all containers:
+
+   ```shell
+   docker compose up --force-recreate -d
+   ```
+
+5. In the NGINX One Console, select **Refresh**. The instances with `NGINX_AGENT_INSTANCE_GROUP` set appear in the Config Sync Group.
+
+6. Instances automatically sync the existing NGINX config. When the sync finishes, the **Config Sync Status** shows `In Sync`.
+
+<span style="display: inline-block;">
+{{< img src="nginx-one/images/config-sync-status.png"
+    alt="Table showing hostnames, NGINX versions, operating systems, availability status, and green In Sync indicators for each instance in the config sync group" >}}
+</span>
+
+
+## Exercise 3: Edit the group config and sync changes
+
+Modify the shared group configuration and apply those changes to all group members.
+
+1. Select **Manage > Config Sync Groups**, then choose your `$NAME-sync-group` (for example, `s-jobs-sync-group`).  
+2. Select the **Configuration** tab.  
+3. Select **Edit Configuration** (pencil icon).  
+4. In the file list, select `default.conf`.  
+5. In the editor pane, add these lines at 21–24:  
+
+   ```yaml
+   location /test_header {
+       add_header X-Test-App true;
+       return 200 'HTTP/1.1 200 OK\nContent-Type: text/html\n\n<html><body>Welcome to Lab 4 of the NGINX One Console Workshop!</body></html>';
+   }
+   ```
+
+   <span style="display: inline-block;">
+   {{< img src="nginx-one/images/config-sync-edits.png"
+   alt="" >}}
+   </span>
+
+   When you make these edits, the file is marked "modified" and the validator shows **NGINX Config OK**.
+6. Select **Next**, review the diff, then select **Save and Publish**.  
+7. Select the **Details** tab and confirm **Last Publication Status** shows **Succeeded**.  
+8. In the **Instances** table, confirm each host shows **Config Sync Status** = **In Sync**.  
+9. Test your change by curling any instance’s HTTP endpoint. Replace `<HOST>` and `<PORT>` with your instance’s host name or IP and the port shown in the Instances table (for example, `localhost:80`):  
+
+   ```shell
+   curl http://localhost:80/test_header
+   ```  
+
+   You should see:
+
+   ```text
+   HTTP/1.1 200 OK
+   Content-Type: text/html
+
+   <html><body>Welcome to Lab 4 of the NGINX One Console Workshop!</body></html>
+   ```
+
+---
+
+## Next steps
+
+You have created a Config Sync Group and added instances. In Lab 5, you will install your NGINX Plus license (JWT) on each instance so you can upgrade them to NGINX R34.
+
+Go to [Lab 5: Upgrade to R34]()
+
+---
+
+## References
+
+- [NGINX One Console docs](https://docs.nginx.com/nginx-one/)

workshops/nginx-one/lab2/nginx-plus/etc/nginx/conf.d/default.conf → static/workshops/nginx-one/lab2/nginx-plus/etc/nginx/conf.d/default.conf

@@ -18,11 +18,11 @@ server {
         root   /usr/share/nginx/html;
     }
 
-      location /test_header {
+     location /test_header {
         add_header X-Test-App true;
-        return 200 'HTTP/1.1 200 OK\nContent-Type: text/html\n\n<html><body>Welcome to Lab 4 of the NGINX One Workshop!</body></html>';
+        return 200 'HTTP/1.1 200 OK\nContent-Type: text/html\n\n<html><body>Welcome to Lab 4 of the NGINX One Console Workshop!</body></html>';
     }
-
+        
     # proxy the PHP scripts to Apache listening on 127.0.0.1:80
     #
     #location ~ \.php$ {

workshops/nginx-one/lab2/nginx-plus/etc/nginx/nginx.conf → static/workshops/nginx-one/lab2/nginx-plus/etc/nginx/nginx.conf

@@ -1,6 +1,6 @@
 
 user  nginx;
-worker_processes 1;
+worker_processes  auto;
 
 error_log  /var/log/nginx/error.log  notice;
 pid        /var/run/nginx.pid;
@@ -19,8 +19,6 @@ http {
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';
 
-    include /etc/nginx/includes/log_formats/*.conf; # Custom Access logs formats found here
-
     access_log  /var/log/nginx/access.log  main;
 
     sendfile        on;