diff --git a/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/_index.md b/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/_index.md
new file mode 100644
index 000000000..1471107ce
--- /dev/null
+++ b/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/_index.md
@@ -0,0 +1,10 @@
+---
+title: "4.1.0 to 4.2.1"
+linkTitle: "4.1.0 to 4.2.1"
+description: "Instructions to upgrade your observability platform for {{% ctx %}} from 4.1.0 to 4.2.1."
+weight: 970
+---
+
+{{% alert title="Note" %}}
+There is no upgrade to 4.2.1 required for cloud-hosted observability platforms.
+{{% / alert %}}
diff --git a/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/_index.md b/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/_index.md
new file mode 100644
index 000000000..59f2ef8fd
--- /dev/null
+++ b/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/_index.md
@@ -0,0 +1,6 @@
+---
+title: "On-Premise"
+linkTitle: "On-Premise"
+description: "Information about upgrading an on-premise observability platform for {{% ctx %}}."
+weight: 1
+---
\ No newline at end of file
diff --git a/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/_index.md b/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/_index.md
new file mode 100644
index 000000000..0b777445d
--- /dev/null
+++ b/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Grafana"
+linkTitle: "Grafana"
+description: "Information about upgrading an on-premise Grafana platform for {{% ctx %}}."
+weight: 1
+---
\ No newline at end of file
diff --git a/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/prerequisites.md b/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/prerequisites.md
new file mode 100644
index 000000000..40449a128
--- /dev/null
+++ b/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/prerequisites.md
@@ -0,0 +1,31 @@
+---
+title: "Prerequisites"
+linkTitle: "Prerequisites"
+description: "The prerequisites required before performing the observability upgrade."
+weight: 1
+---
+
+# {{% param title %}}
+
+## Verify Upgrade Required
+
+On the server that Grafana Loki is installed on:
+
+1. Log in to the server.
+1. Open a File Explorer and navigate to the folder that Grafana Loki is running from, e.g. `C:\ProgramData\Cortex\Observability\Loki`.
+1. Open the `loki-local-config.yaml` configuration file in a text editor.
+1. Search the file for `compactor:`.
+1. If the search returns no results, proceed with the upgrade process, if results are returned then Observability has already been updated to 4.2.1 automatically as part of the [3.0.0 to 4.0.0][] upgrade and no further steps are required.
+
+## Backup Old Files
+
+1. On the server that Grafana Loki is installed on, create a folder called `Observability Backups` in a known location.
+1. Open File Explorer and navigate to the location that Grafana Loki is running from, e.g. `C:\ProgramData\Cortex\Observability\Loki\`.
+1. Copy the `loki-local-config.yaml` file and save it to the `Observability Backups` folder created at step 1.
+
+## Next Steps?
+
+1. [Upgrade Grafana Loki][]
+
+[3.0.0 to 4.0.0]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.3_0_0to4_0_0.OnPremise.Grafana.MainDoc" >}}
+[Upgrade Grafana Loki]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.4_1_0to4_2_1.OnPremise.Grafana.UpgradeLoki" >}}
diff --git a/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/try-it-out.md b/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/try-it-out.md
new file mode 100644
index 000000000..b6519c2b6
--- /dev/null
+++ b/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/try-it-out.md
@@ -0,0 +1,61 @@
+---
+title: "Try it out"
+linkTitle: "Try it out"
+description: "Information about trying out the observability platform after upgrade."
+weight: 5
+---
+
+# {{% param title %}}
+
+This guide describes how to verify that the upgrade has been successful. Please ensure that [Upgrade Grafana Loki][Upgrade Loki] has been completed before taking these steps.
+
+## Confirm New Data is Processed
+
+{{% alert title="Note" %}}
+This test uses the test flow published as part of testing the {{% ctx %}} installation. See {{< ahref path="Cortex.GettingStarted.OnPremise.InstallInnovationOnly.MultipleServerWithHA.TryItOutPublishedFlowNew" title="Testing HA installation" >}} or {{< ahref path="Cortex.GettingStarted.OnPremise.InstallInnovationOnly.SingleServerWithoutHA.TryItOutPublishedFlowNew" title="Testing non-HA installation" >}}. An alternative flow can be used that exists on the system and can be executed.
+{{% / alert %}}
+
+1. Open an HTTP client, such as [Postman][]. Make a request with the following format:
+ | Property | Value |
+ |---------------|-------------------------------------------------------------------------------------|
+ | Action | POST |
+ | URL | For HA installation use:
`https://{FQDN of Load Balancer Server}/api/default/default/flows/{Flow Name}/executions?packageName={Package Name}`
e.g. `https://load-balancer.domain.com/api/default/default/flows/NewFlow/executions?packageName=NewPackage`
For non-HA installation use:
`https://{FQDN of server}:8722/api/default/default/flows/{Flow Name}/executions?packageName={Package Name}`
e.g. `https://server.domain.com:8722/api/default/default/flows/NewFlow/executions?packageName=NewPackage`|
+ | Content Type | application/json |
+ | Body | {} |
+ | Authentication| Basic |
+ | Username | The value used for `ApiGatewayBasicAuthUsername` when installing Application Services. See [HA Installation script configuration][] or [Non-HA Installation script configuration][] for the value specified.|
+ | Password | The value used for `ApiGatewayBasicAuthPassword` when installing Application Services (Unencrypted). See [HA Installation script configuration][] or [Non-HA Installation script configuration][] for the value specified.|
+
+ {{% alert title="Note" %}} If you used self-signed certificates when installing the Application Servers you may need to disable SSL certificate validation in your HTTP client. {{% /alert %}}
+
+1. Once the request has completed, in your web browser, navigate to and log in to your configured Grafana.
+1. Open the *Dashboards* page via the menu on the left sidebar.
+1. Click the folder name that the dashboards were imported to.
+1. Click the *Flow Execution Requests* dashboard to open it.
+1. The request made at step 1 should be visible on the dashboard.
+{{% alert title="Note" %}}
+If other requests have been made then there may be more than one request visible on the dashboard.
+{{% / alert %}}
+1. Open the *Dashboards* page via the menu on the left sidebar.
+1. Click the folder name that the dashboards were imported to.
+1. Click the *Platform Health* dashboard to open it.
+1. The request made at step 1 should be visible on the dashboard.
+{{% alert title="Note" %}}
+If other requests have been made then there may be more than one request visible on the dashboard.
+{{% / alert %}}
+
+## Confirm Retention Period is being Applied
+
+1. In a web browser, navigate to and log in to your configured Grafana.
+1. Open the *Flow Execution Requests* dashboard.
+1. Set the *Time Filter* to be a period greater than the retention period that has been set.
+1. Ensure that there is no data available for the time period that is greater than the retention period.
+
+ {{% alert title="Note" %}}
+Loki may take some time to remove logs older than the retention period, therefore, if there is still data available beyond the retention period, repeat the above steps at a later time.
+ {{% / alert %}}
+
+[HA Installation script configuration]: {{< url path="Cortex.GettingStarted.OnPremise.InstallInnovationOnly.MultipleServerWithHA.ConfigureInstallationScriptNew" >}}
+[Upgrade Loki]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.4_1_0to4_2_1.OnPremise.Grafana.UpgradeLoki" >}}
+[Non-HA Installation script configuration]: {{< url path="Cortex.GettingStarted.OnPremise.InstallInnovationOnly.SingleServerWithoutHA.ConfigureInstallationScriptNew" >}}
+[Postman]: {{< url path="Postman.Downloads.MainDoc" >}}
diff --git a/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/upgrade-loki.md b/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/upgrade-loki.md
new file mode 100644
index 000000000..de7436d89
--- /dev/null
+++ b/content/en/docs/2025.9/Guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/upgrade-loki.md
@@ -0,0 +1,47 @@
+---
+title: "Upgrade Grafana Loki"
+linkTitle: "Upgrade Grafana Loki"
+description: "The steps to Upgrade Grafana Loki."
+weight: 4
+---
+
+# {{% param title %}}
+
+This guide describes how to upgrade Grafana Loki. Please ensure that the [Prerequisites][] have been completed before starting this upgrade.
+
+## Perform Upgrade
+
+On the server that Grafana Loki is installed on:
+
+1. Log in to the server.
+1. Open a File Explorer and navigate to the folder that Grafana Loki is running from, e.g. `C:\ProgramData\Cortex\Observability\Loki`.
+1. Open the `loki-local-config.yaml` configuration file in a text editor.
+1. Copy the following code and paste it in to the `loki-local-config.yaml` file. It should be added immediately before the `schema_config:` section typically found on line 30.
+
+ ``` text
+ compactor:
+ retention_enabled: true
+ delete_request_store: filesystem
+ working_directory: /data/retention
+
+ ```
+
+1. Copy the following code and paste it in to the `loki-local-config.yaml` file. It should be added to the end of the `limits_config:` section typically found on line 55 after the addition of the code in the previous step.
+
+ ``` text
+ retention_period: 8760h
+ ```
+
+1. If a different retention period to the default of 12 months (8760 hours) is required, change the value ensuring that only the required retention is configured.
+1. Save the file.
+1. Restart the Grafana Loki Service:
+ 1. Open `services.msc`.
+ 1. Locate the `Loki` service.
+ 1. Right click on the service name and select `Restart`. If the service is not already running, select `Start`.
+
+## Next Steps?
+
+1. [Try it out][]
+
+[Prerequisites]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.4_1_0to4_2_1.OnPremise.Grafana.Prerequisites" >}}
+[Try it out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.4_1_0to4_2_1.OnPremise.Grafana.TryItOut" >}}
diff --git a/content/en/docs/2025.9/_shared/executionPackageCurrentVersion.md b/content/en/docs/2025.9/_shared/executionPackageCurrentVersion.md
index 2620b3e62..833380abd 100644
--- a/content/en/docs/2025.9/_shared/executionPackageCurrentVersion.md
+++ b/content/en/docs/2025.9/_shared/executionPackageCurrentVersion.md
@@ -1 +1 @@
-28.4.0.25430
\ No newline at end of file
+29.1.2.26142
\ No newline at end of file
diff --git a/content/en/docs/2025.9/getting-started/cloud/add-observability-to-innovation/Grafana/import-dashboards.md b/content/en/docs/2025.9/getting-started/cloud/add-observability-to-innovation/Grafana/import-dashboards.md
index ac990abe9..102f60ce0 100644
--- a/content/en/docs/2025.9/getting-started/cloud/add-observability-to-innovation/Grafana/import-dashboards.md
+++ b/content/en/docs/2025.9/getting-started/cloud/add-observability-to-innovation/Grafana/import-dashboards.md
@@ -66,6 +66,6 @@ To do this, follow these steps for all default {{% ctx %}} dashboards imported:
[configured Loki data source]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.SetupLoki.MainDoc" >}}
[Grafana]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.SetupGrafana.MainDoc" >}}
-[Grafana.Dashboards.zip]: {{< url path="GitHub.Cortex.Observability.4_1_0.GrafanaDashboardsZip" >}}
+[Grafana.Dashboards.zip]: {{< url path="GitHub.Cortex.Observability.4_2_1.GrafanaDashboardsZip" >}}
[Loki]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.SetupLoki.MainDoc" >}}
-[Try it Out]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.TryItOut.MainDoc" >}}
\ No newline at end of file
+[Try it Out]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.TryItOut.MainDoc" >}}
diff --git a/content/en/docs/2025.9/getting-started/cloud/add-observability-to-innovation/Grafana/install-alloy/install-alloy.md b/content/en/docs/2025.9/getting-started/cloud/add-observability-to-innovation/Grafana/install-alloy/install-alloy.md
index 2d3c281da..9972851c7 100644
--- a/content/en/docs/2025.9/getting-started/cloud/add-observability-to-innovation/Grafana/install-alloy/install-alloy.md
+++ b/content/en/docs/2025.9/getting-started/cloud/add-observability-to-innovation/Grafana/install-alloy/install-alloy.md
@@ -27,5 +27,5 @@ This archive contains the `config.alloy` configuration file and PowerShell scrip
[Configure Grafana Alloy]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.InstallAlloy.ConfigureAlloy.MainDoc" >}}
[Grafana Alloy 1.10.2]: {{< url path="Grafana.Products.Loki.Alloy.1_10.2" >}}
-[Grafana Alloy.zip]: {{< url path="GitHub.Cortex.Observability.4_1_0.GrafanaAlloyInstallZip" >}}
+[Grafana Alloy.zip]: {{< url path="GitHub.Cortex.Observability.4_2_1.GrafanaAlloyInstallZip" >}}
[Prerequisites]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.Prerequisites" >}}
diff --git a/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/install-alloy/install-alloy.md b/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/install-alloy/install-alloy.md
index a1652aff9..d6e1e6005 100644
--- a/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/install-alloy/install-alloy.md
+++ b/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/install-alloy/install-alloy.md
@@ -27,6 +27,6 @@ This archive contains the `config.alloy` configuration file and PowerShell scrip
[Configure Grafana Alloy]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallAlloy.ConfigureAlloy" >}}
[Grafana Alloy 1.10.2]: {{< url path="Grafana.Products.Loki.Alloy.1_10.2" >}}
-[Grafana Alloy.zip]: {{< url path="GitHub.Cortex.Observability.4_1_0.GrafanaAlloyInstallZip" >}}
+[Grafana Alloy.zip]: {{< url path="GitHub.Cortex.Observability.4_2_1.GrafanaAlloyInstallZip" >}}
[Prerequisites]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.Prerequisites" >}}
[Reverse Proxy Authentication]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallLoki.ConfigureAuthentication" >}}
diff --git a/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/install-loki/configure-loki.md b/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/install-loki/configure-loki.md
index 22d70b1cc..c8a5c1799 100644
--- a/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/install-loki/configure-loki.md
+++ b/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/install-loki/configure-loki.md
@@ -134,6 +134,25 @@ If the order is incorrect:
1. Select the newly created website.
1. In the *Manage Website* pane, click *Restart*.
+## Configure Log Retention
+
+Grafana Loki is configured with a default retention period of 12 months for it's logs. This means that Grafana can query data up to 12 months old. Once the 12 months is reached, Loki will remove older logs.
+
+If a different retention period is required then this can be set, however, it should only be set to the period that is needed otherwise excessive disk space may be used unnecessarily.
+
+To change the retention period:
+
+1. Open the `loki-local-config.yaml` configuration file, which is located in the folder that Loki was installed to eg `C:\ProgramData\Cortex\Observability\Loki`.
+1. Locate the `retention_period:` configuration value at approximately line 55.
+1. Set the value of the retention required in hours, e.g. 6 months would be `4380h` or 9 months would be `6570h`.
+1. Save the file.
+
+### Re-Start the Grafana Loki Service
+
+1. Open `services.msc`.
+1. Locate the `Loki` service.
+1. Right click on the service name and select `Restart`. If the service is not already running, select `Start`.
+
## Next Steps?
1. [Install Grafana Alloy][]
diff --git a/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/install-loki/install-loki.md b/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/install-loki/install-loki.md
index d2d955bb5..5dea373d6 100644
--- a/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/install-loki/install-loki.md
+++ b/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/install-loki/install-loki.md
@@ -26,7 +26,6 @@ This archive contains the `loki-local-config.yaml` configuration file, [NSSM][]
[Configure Loki]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallLoki.ConfigureLoki" >}}
[Grafana Loki 3.5.5]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaLoki.3_5_5.GrafanaLokiInstallZip" >}}
-[Grafana Loki Install.zip]: {{< url path="GitHub.Cortex.Observability.4_1_0.GrafanaLokiInstallZip" >}}
+[Grafana Loki Install.zip]: {{< url path="GitHub.Cortex.Observability.4_2_1.GrafanaLokiInstallZip" >}}
[NSSM]: {{< url path="NSSM.MainDoc" >}}
[Prerequisites]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.Prerequisites" >}}
-[Software Requirements]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.SoftwareRequirements" >}}
diff --git a/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/setup-grafana.md b/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/setup-grafana.md
index e87954deb..50bd252a7 100644
--- a/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/setup-grafana.md
+++ b/content/en/docs/2025.9/getting-started/on-premise/add-observability-to-innovation/Grafana/setup-grafana.md
@@ -78,7 +78,7 @@ To do this, follow these steps for all default {{% ctx %}} dashboards imported:
1. [Try it Out][]
-[Grafana.Dashboards.zip]: {{< url path="GitHub.Cortex.Observability.4_1_0.GrafanaDashboardsZip" >}}
+[Grafana.Dashboards.zip]: {{< url path="GitHub.Cortex.Observability.4_2_1.GrafanaDashboardsZip" >}}
[Grafana]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallGrafana.MainDoc" >}}
[Loki]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallLoki.MainDoc" >}}
[Try it Out]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.TryItOut" >}}
diff --git a/content/en/docs/2025.9/getting-started/on-premise/install-innovation-only/multiple-server-with-ha/installation/setup-gateway.md b/content/en/docs/2025.9/getting-started/on-premise/install-innovation-only/multiple-server-with-ha/installation/setup-gateway.md
index 50249252c..c44621e83 100644
--- a/content/en/docs/2025.9/getting-started/on-premise/install-innovation-only/multiple-server-with-ha/installation/setup-gateway.md
+++ b/content/en/docs/2025.9/getting-started/on-premise/install-innovation-only/multiple-server-with-ha/installation/setup-gateway.md
@@ -23,8 +23,8 @@ Log on to Gateway and run through the setup wizard:
Password: `Adm1n1strat0r`
1. On a newly installed system, you will be presented with a Setup Wizard at this point, which will guide you through some basic configuration steps:
* [Account Details]
- * [LDAP Connection]
- * [LDAP Authorisation]
+ * [Authentication]
+ * [Authorisation]
1. Follow the steps in the setup wizard to configure the relevant areas:
### Account Details
@@ -36,8 +36,9 @@ Log on to Gateway and run through the setup wizard:
1. Change the Administrator password to a unique, secret password and click `Next Step`:
{{< figure class="centre" src="/images/Gateway Setup3.png" title="Change Password Screen" >}}
- ### LDAP Connection
+ ### Authentication
+ 1. Select the LDAP tab.
1. Enter the details of your Active Directory server and provide a Username and Password for a user with read access to it:
A connection to an Active Directory server must be established in order to assign authorisation rights to users.
@@ -49,9 +50,9 @@ Log on to Gateway and run through the setup wizard:
1. To reduce the scope of any Active Directory searches, add one or more base DNs (Distinguished Names). For each base DN click `Add` and enter the full LDAP path e.g `CN=group, OU=organisational unit, DC=domain, DC=com`. These will be used as the roots of any Active Directory searches performed. For more information about distinguished names see .
1. Click `Test Connection` to validate the connection and the user credentials entered and click `Next Step`.
- {{< figure class="centre" src="/images/Gateway Setup4.png" title="LDAP Connection Screen" >}}
+ {{< figure class="centre" src="/images/Gateway Setup4.png" title="Authentication Screen" >}}
- ### LDAP Authorisation
+ ### Authorisation
1. If the authorisation grid fails to load first time round, click `Retry`.
1. Assign access permissions to Active Directory groups:
@@ -67,7 +68,7 @@ Log on to Gateway and run through the setup wizard:
1. Expand the groups or OUs, or search for the group or OU, to be assigned one or more roles.
1. Check the relevant roles for each group. Checking a parent group will cascade the setting to all child groups.
- {{< figure class="centre" src="/images/Gateway Setup5.png" title="LDAP Authorisation Screen" >}}
+ {{< figure class="centre" src="/images/Gateway Setup5.png" title="Authorisation Screen" >}}
1. Click `Complete Setup` to commit the changes.
1. To test the permissions, log out as Administrator and then log in as a user with `Studio` permissions.
@@ -78,7 +79,7 @@ Log on to Gateway and run through the setup wizard:
[Account Details]: {{< ref "#account-details" >}}
[Gateway Installation]: {{< url path="Cortex.GettingStarted.OnPremise.InstallInnovationOnly.MultipleServerWithHA.GatewayInstallationNew" >}}
-[LDAP Authorisation]: {{< ref "#ldap-authorisation" >}}
-[LDAP Connection]: {{< ref "#ldap-connection" >}}
+[Authorisation]: {{< ref "#authorisation" >}}
+[Authentication]: {{< ref "#authentication" >}}
[supported web browser]: {{< url path="Cortex.GettingStarted.OnPremise.InstallInnovationOnly.MultipleServerWithHA.WebBrowserRequirementsNew" >}}
[Post-Installation]: {{< url path="Cortex.GettingStarted.OnPremise.InstallInnovationOnly.MultipleServerWithHA.PostInstallation" >}}
diff --git a/content/en/docs/2025.9/getting-started/on-premise/install-innovation-only/single-server-without-ha/installation/setup-gateway.md b/content/en/docs/2025.9/getting-started/on-premise/install-innovation-only/single-server-without-ha/installation/setup-gateway.md
index a3053860a..313dc2d54 100644
--- a/content/en/docs/2025.9/getting-started/on-premise/install-innovation-only/single-server-without-ha/installation/setup-gateway.md
+++ b/content/en/docs/2025.9/getting-started/on-premise/install-innovation-only/single-server-without-ha/installation/setup-gateway.md
@@ -23,8 +23,8 @@ Log on to Gateway and run through the setup wizard:
Password: `Adm1n1strat0r`
1. On a newly installed system, you will be presented with a Setup Wizard at this point, which will guide you through some basic configuration steps:
* [Account Details]
- * [LDAP Connection]
- * [LDAP Authorisation]
+ * [Authentication]
+ * [Authorisation]
1. Follow the steps in the setup wizard to configure the relevant areas:
### Account Details
@@ -36,8 +36,9 @@ Log on to Gateway and run through the setup wizard:
1. Change the Administrator password to a unique, secret password and click `Next Step`:
{{< figure class="centre" src="/images/Gateway Setup3.png" title="Change Password Screen" >}}
- ### LDAP Connection
+ ### Authentication
+ 1. Select the LDAP tab.
1. Enter the details of your Active Directory server and provide a Username and Password for a user with read access to it:
A connection to an Active Directory server must be established in order to assign authorisation rights to users.
@@ -49,9 +50,9 @@ Log on to Gateway and run through the setup wizard:
1. To reduce the scope of any Active Directory searches, add one or more base DNs (Distinguished Names). For each base DN click `Add` and enter the full LDAP path e.g `CN=group, OU=organisational unit, DC=domain, DC=com`. These will be used as the roots of any Active Directory searches performed. For more information about distinguished names see .
1. Click `Test Connection` to validate the connection and the user credentials entered and click `Next Step`.
- {{< figure class="centre" src="/images/Gateway Setup4.png" title="LDAP Connection Screen" >}}
+ {{< figure class="centre" src="/images/Gateway Setup4.png" title="Authentication Screen" >}}
- ### LDAP Authorisation
+ ### Authorisation
1. If the authorisation grid fails to load first time round, click `Retry`.
1. Assign access permissions to Active Directory groups:
@@ -67,7 +68,7 @@ Log on to Gateway and run through the setup wizard:
1. Expand the groups or OUs, or search for the group or OU, to be assigned one or more roles.
1. Check the relevant roles for each group. Checking a parent group will cascade the setting to all child groups.
- {{< figure class="centre" src="/images/Gateway Setup5.png" title="LDAP Authorisation Screen" >}}
+ {{< figure class="centre" src="/images/Gateway Setup5.png" title="Authorisation Screen" >}}
1. Click `Complete Setup` to commit the changes.
1. To test the permissions, log out as Administrator and then log in as a user with `Studio` permissions.
@@ -77,8 +78,8 @@ Log on to Gateway and run through the setup wizard:
1. [Post-Installation][]
[Account Details]: {{< ref "#account-details" >}}
-[LDAP Authorisation]: {{< ref "#ldap-authorisation" >}}
-[LDAP Connection]: {{< ref "#ldap-connection" >}}
+[Authorisation]: {{< ref "#authorisation" >}}
+[Authentication]: {{< ref "#authentication" >}}
[Install Web Application Server]: {{< url path="Cortex.GettingStarted.OnPremise.InstallInnovationOnly.SingleServerWithoutHA.InstallWebApplicationServerNew" >}}
[supported web browser]: {{< url path="Cortex.GettingStarted.OnPremise.InstallInnovationOnly.SingleServerWithoutHA.WebBrowserRequirementsNew" >}}
-[Post-Installation]: {{< url path="Cortex.GettingStarted.OnPremise.InstallInnovationOnly.SingleServerWithoutHA.PostInstallation" >}}
+[Post-Installation]: {{< url path="Cortex.GettingStarted.OnPremise.InstallInnovationOnly.SingleServerWithoutHA.PostInstallation" >}}
\ No newline at end of file
diff --git a/content/static/2025.9/images/Gateway Setup1.png b/content/static/2025.9/images/Gateway Setup1.png
index 6fa7a984e..689a8e8b6 100644
Binary files a/content/static/2025.9/images/Gateway Setup1.png and b/content/static/2025.9/images/Gateway Setup1.png differ
diff --git a/content/static/2025.9/images/Gateway Setup2.png b/content/static/2025.9/images/Gateway Setup2.png
index 1077d2d37..1c425e0d5 100644
Binary files a/content/static/2025.9/images/Gateway Setup2.png and b/content/static/2025.9/images/Gateway Setup2.png differ
diff --git a/content/static/2025.9/images/Gateway Setup3.png b/content/static/2025.9/images/Gateway Setup3.png
index 0fd42a1ca..22677fe26 100644
Binary files a/content/static/2025.9/images/Gateway Setup3.png and b/content/static/2025.9/images/Gateway Setup3.png differ
diff --git a/content/static/2025.9/images/Gateway Setup4.png b/content/static/2025.9/images/Gateway Setup4.png
index 30d21549c..6bc207bfb 100644
Binary files a/content/static/2025.9/images/Gateway Setup4.png and b/content/static/2025.9/images/Gateway Setup4.png differ
diff --git a/content/static/2025.9/images/Gateway Setup5.png b/content/static/2025.9/images/Gateway Setup5.png
index 9915ffc7d..6a543ea8d 100644
Binary files a/content/static/2025.9/images/Gateway Setup5.png and b/content/static/2025.9/images/Gateway Setup5.png differ
diff --git a/data/urls.toml b/data/urls.toml
index 48731e4f3..7d6599008 100644
--- a/data/urls.toml
+++ b/data/urls.toml
@@ -850,6 +850,12 @@
Prerequisites = "/docs/guides/upgrade-guides/upgrade-observability/4.0.0-to-4.1.0/cloud/grafana/prerequisites"
TryItOut = "/docs/guides/upgrade-guides/upgrade-observability/4.0.0-to-4.1.0/cloud/grafana/try-it-out"
UpgradeAlloy = "/docs/guides/upgrade-guides/upgrade-observability/4.0.0-to-4.1.0/cloud/grafana/upgrade-alloy"
+ [Cortex.Guides.UpgradeGuides.UpgradeObservability.4_1_0to4_2_1]
+ [Cortex.Guides.UpgradeGuides.UpgradeObservability.4_1_0to4_2_1.OnPremise]
+ [Cortex.Guides.UpgradeGuides.UpgradeObservability.4_1_0to4_2_1.OnPremise.Grafana]
+ Prerequisites = "/docs/guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/prerequisites"
+ TryItOut = "/docs/guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/try-it-out"
+ UpgradeLoki = "/docs/guides/upgrade-guides/upgrade-observability/4.1.0-to-4.2.1/on-premise/grafana/upgrade-loki"
[Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise]
[Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana]
BackupOldFiles = "/docs/guides/upgrade-guides/upgrade-observability/on-premise/grafana/prerequisites/#backup-old-files"
@@ -2600,11 +2606,12 @@
GrafanaLokiInstallZip = "https://github.com/CortexIntelligentAutomation/observability/releases/download/v4.0.0/Grafana.Loki.Install.zip"
[GitHub.Cortex.Observability.4_1_0]
Release = "https://github.com/CortexIntelligentAutomation/observability/releases/tag/v4.1.0"
- GrafanaAlloyInstallZip = "https://github.com/CortexIntelligentAutomation/observability/releases/download/v4.1.0/Grafana.Alloy.Install.zip"
- GrafanaLokiInstallZip = "https://github.com/CortexIntelligentAutomation/observability/releases/download/v4.1.0/Grafana.Loki.Install.zip"
- GrafanaDashboardsZip = "https://github.com/CortexIntelligentAutomation/observability/releases/download/v4.1.0/Grafana.Dashboards.zip"
[GitHub.Cortex.Observability.4_2_0]
Release = "https://github.com/CortexIntelligentAutomation/observability/releases/tag/v4.2.0"
+ [GitHub.Cortex.Observability.4_2_1]
+ GrafanaAlloyInstallZip = "https://github.com/CortexIntelligentAutomation/observability/releases/download/v4.2.1/Grafana.Alloy.Install.zip"
+ GrafanaLokiInstallZip = "https://github.com/CortexIntelligentAutomation/observability/releases/download/v4.2.1/Grafana.Loki.Install.zip"
+ GrafanaDashboardsZip = "https://github.com/CortexIntelligentAutomation/observability/releases/download/v4.2.1/Grafana.Dashboards.zip"
[Grafana]
MainDoc = "https://grafana.com/"
[Grafana.Products]