Skip to content

Commit 0da4966

Browse files
author
Donna-Marie Smith
committed
Merge branch 'main' of https://github.com/CortexIntelligentAutomation/docs into feature/upgrade-observability-components-to-latest-versions
2 parents 27f4f7a + 3a23a51 commit 0da4966

11 files changed

Lines changed: 50 additions & 22 deletions

File tree

content/en/blog/releases/2025.X/2025.7.md

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,13 @@ The [Performance][] of the {{% ctx %}} Platform has been improved by:
3939
* [optimising stopping multiple running executions][Performance - Improved performance of stopping multiple running executions].
4040
* [optimising the monitoring execution updates][Performance - Improved performance of monitoring execution updates].
4141

42-
[Observability][] has been updated to use [Grafana Alloy instead of Promtail for ingesting logs to Grafana Loki][Observability - Migrated from Promtail to Grafana Alloy].
42+
[Observability][] has been updated to:
43+
44+
* use [Grafana Alloy instead of Promtail for ingesting logs to Grafana Loki][Observability - Migrated from Promtail to Grafana Alloy].
45+
* update the following [components within the Observability platform][Observability Upgrades] to the latest versions:
46+
47+
* Grafana - 12.1.1
48+
* Grafana Loki - 3.5.5
4349

4450
Finally, the [Documentation][] includes updates related to:
4551

@@ -229,17 +235,29 @@ Affected Components:
229235

230236
##### Migrated from Promtail to Grafana Alloy
231237

232-
`{{% ctx %}} Observability` has been updated to use [Grafana Alloy][] instead of [Promtail][] for ingesting logs to [Grafana Loki][]. This is due to [Promtail][] having been deprecated and marked as end-of-life on the 2nd of March 2026.
238+
{{% ctx %}} Observability has been updated to use [Grafana Alloy][] instead of [Promtail][] for ingesting logs to [Grafana Loki][]. This is due to [Promtail][] having been deprecated and marked as end-of-life on the 2nd of March 2026.
233239

234240
{{% alert title="Note" %}}
235-
There is currently not documentation on how to migrate from `Promtail` to `Grafana Alloy`. This will be added in `2025.9`.
241+
There is currently no documentation on how to migrate from `Promtail` to `Grafana Alloy`. This will be added in `2025.9`.
236242
In the meantime, for further assistance, please raise a case in the {{< ahref path="Cortex.ServicePortal.MainDoc" version="2025.7" title="{{% ctx %}} Service Portal" >}}.
237243
{{% /alert %}}
238244

239245
Affected Components:
240246

241247
* {{% ctx %}} Observability
242248

249+
##### Observability Upgrades
250+
251+
Grafana and Grafana Loki have been updated to the latest versions, all related documentation and screenshots have been updated to reflect these changes.
252+
253+
* Grafana - 12.1.1
254+
* Grafana Loki - 3.5.5
255+
256+
Affected Components:
257+
258+
* Grafana
259+
* Grafana Loki
260+
243261
#### Documentation
244262

245263
##### Added new User Guide
@@ -337,7 +355,7 @@ Known limitations have been added within the 2025.7 release of the {{% ctx %}} P
337355

338356
| Release | Grafana Version | Grafana Loki Version | {{% ctx %}} Observability Version |
339357
|---------|--------------------------|----------------------|-------------------------------------------|
340-
| 2025.7 | [10.4.1][Grafana 10.4.1] | [3.0.0][Loki 3.0.0] | [4.0.0][Observability 4.0.0] |
358+
| 2025.7 | [12.1.1][Grafana 12.1.1] | [3.5.5][Loki 3.5.5] | [4.0.0][Observability 4.0.0] |
341359
| 2025.3 | [10.4.1][Grafana 10.4.1] | [3.0.0][Loki 3.0.0] | [3.0.0][Observability 3.0.0] (deprecated) |
342360
| 2025.1 | [10.4.1][Grafana 10.4.1] | [3.0.0][Loki 3.0.0] | [3.0.0][Observability 3.0.0] (deprecated) |
343361
| 2024.11 | [10.4.1][Grafana 10.4.1] | [3.0.0][Loki 3.0.0] | [3.0.0][Observability 3.0.0] (deprecated) |
@@ -419,7 +437,7 @@ Releases are currently forecast to be made available on:
419437

420438
[Observability]: {{< ref "#observability" >}}
421439
[Observability - Migrated from Promtail to Grafana Alloy]: {{< ref "#migrated-from-promtail-to-grafana-alloy" >}}
422-
440+
[Observability Upgrades]: {{< ref "#observability-upgrades" >}}
423441
[Documentation]: {{< ref "#documentation" >}}
424442
[Documentation - Added new User Guide]: {{< ref "#added-new-user-guide" >}}
425443
[Documentation - Added new Tutorial]: {{< ref "#added-new-tutorial" >}}
@@ -456,7 +474,9 @@ Releases are currently forecast to be made available on:
456474
[Grafana Loki]: {{< url path="Grafana.Products.Loki.MainDoc" >}}
457475
[Grafana 8.5.4]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaWebApp.Windows" >}}
458476
[Grafana 10.4.1]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaWebApp.10.4.1.Windows" >}}
477+
[Grafana 12.1.1]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaWebApp.12.1.1.Windows" >}}
459478
[Loki 3.0.0]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaLoki.3.0.0.Release" >}}
479+
[Loki 3.5.5]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaLoki.3.5.5.Release" >}}
460480
[Loki 2.5.0]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaLoki.Release" >}}
461481
[Observability 4.0.0]: {{< url path="GitHub.Cortex.Observability.4.0.0.Release" >}}
462482
[Observability 3.0.0]: {{< url path="GitHub.Cortex.Observability.3.0.0.Release" >}}

content/en/docs/2025.5/Reference/Concepts/fundamentals/variables/using-variables.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ None
202202
[Exception]: {{< url path="Cortex.Reference.DataTypes.Exceptions.Exception.MainDoc" >}}
203203
[String]: {{< url path="Cortex.Reference.DataTypes.Text.String.MainDoc" >}}
204204

205+
[Variable Editor]: {{< url path="Cortex.Reference.Concepts.Fundamentals.Blocks.BlockProperties.PropertyEditors.VariableEditor.MainDoc" >}}
206+
205207
[Variables Grid]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Dev.FlowEditor.BottomPanel.VariablesGrid.MainDoc" >}}
206208

207209
[Properties]: {{< url path="Cortex.Reference.Glossary.P-T.PropertyCSharp" >}}

content/en/docs/2025.7/Reference/Concepts/fundamentals/variables/using-variables.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ None
202202
[Exception]: {{< url path="Cortex.Reference.DataTypes.Exceptions.Exception.MainDoc" >}}
203203
[String]: {{< url path="Cortex.Reference.DataTypes.Text.String.MainDoc" >}}
204204

205+
[Variable Editor]: {{< url path="Cortex.Reference.Concepts.Fundamentals.Blocks.BlockProperties.PropertyEditors.VariableEditor.MainDoc" >}}
205206
[Variables Grid]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Dev.FlowEditor.BottomPanel.VariablesGrid.MainDoc" >}}
206207

207208
[Properties]: {{< url path="Cortex.Reference.Glossary.P-T.PropertyCSharp" >}}

content/en/docs/2025.7/Whats New/_index.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ The performance of the {{% ctx %}} Platform has been improved by:
3535

3636
## Improved Observability
3737

38-
Observability has been updated to use [Grafana Alloy instead of Promtail for ingesting logs to Grafana Loki][Observability - Migrated from Promtail to Grafana Alloy].
38+
* Observability has been updated to use [Grafana Alloy instead of Promtail for ingesting logs to Grafana Loki][Observability - Migrated from Promtail to Grafana Alloy].
39+
40+
* The following [components within the Observability platform have been updated][Observability Upgrades] to the latest major versions:
41+
* Grafana - 12.1.1
42+
* Grafana Loki - 3.5.5
3943

4044
## Improved Documentation
4145

@@ -66,6 +70,7 @@ For a full list of what has been introduced in this release, please see the [202
6670
[Performance - Improved performance of stopping multiple running executions]: {{< url path="Cortex.Blogs.Releases.2025.7.ImprovedPerformanceOfStoppingMultipleRunningExecutions" version="2025.7" >}}
6771
[Performance - Improved performance of monitoring execution updates]: {{< url path="Cortex.Blogs.Releases.2025.7.ImprovedPerformanceOfMonitoringExecutionUpdates" version="2025.7" >}}
6872
[Observability - Migrated from Promtail to Grafana Alloy]: {{< url path="Cortex.Blogs.Releases.2025.7.MigratedFromPromtailToGrafanaAlloy" version="2025.7" >}}
73+
[Observability Upgrades]: {{< url path="Cortex.Blogs.Releases.2025.7.ObservabilityUpgrades" version="2025.7" >}}
6974
[Documentation - Added new User Guide]: {{< url path="Cortex.Blogs.Releases.2025.7.AddedNewUserGuide" version="2025.7" >}}
7075
[Documentation - Added new Tutorial]: {{< url path="Cortex.Blogs.Releases.2025.7.AddedNewTutorial" version="2025.7" >}}
7176
[Documentation - Updated documentation to point to Flow Editor User Guide]: {{< url path="Cortex.Blogs.Releases.2025.7.UpdatedDocumentationToPointToFlowEditorUserGuide" version="2025.7" >}}

content/en/docs/2025.7/getting-started/cloud/add-observability-to-innovation/Grafana/install-alloy/install-alloy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This guide describes how to install Grafana Alloy on the Application Server(s).
1111

1212
## Install Grafana Alloy
1313

14-
1. Download the [Grafana Alloy 1.10.0][] archive.
14+
1. Download the [Grafana Alloy 1.10.2][] archive.
1515
1. Extract content of the downloaded archive to a suitable location, e.g. `C:\ProgramData\Cortex\Observability\Grafana Alloy`.
1616
1. Download the [Grafana Alloy.zip][] archive and extract its contents alongside the previously extracted Grafana Alloy `alloy-installer-windows-amd64.exe`.
1717
This archive contains the `config.alloy` configuration file and PowerShell scripts to install Grafana Alloy as a Windows service.
@@ -26,6 +26,6 @@ This archive contains the `config.alloy` configuration file and PowerShell scrip
2626
1. [Configure Grafana Alloy][]
2727

2828
[Configure Grafana Alloy]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.InstallAlloy.ConfigureAlloy.MainDoc" >}}
29-
[Grafana Alloy 1.10.0]: {{< url path="Grafana.Products.Loki.Alloy.1.10.0" >}}
29+
[Grafana Alloy 1.10.2]: {{< url path="Grafana.Products.Loki.Alloy.1.10.2" >}}
3030
[Grafana Alloy.zip]: {{< url path="GitHub.Cortex.Observability.4.0.0.GrafanaAlloyInstallZip" >}}
3131
[Prerequisites]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.Prerequisites" >}}

content/en/docs/2025.7/getting-started/cloud/add-observability-to-innovation/Grafana/prerequisites.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The application servers must have internet access in order to communicate with t
2121

2222
| Server Role | Windows Server[^1] | Other Software |
2323
|--------------------|------------------------------------------------|--------------------|
24-
| Application Server | [2022 (x64)][] *Recommended*<br>[2019 (x64)][] | [Grafana Alloy 1.10.0][] |
24+
| Application Server | [2022 (x64)][] *Recommended*<br>[2019 (x64)][] | [Grafana Alloy 1.10.2][] |
2525

2626
[^1]: Windows Server Standard and Datacenter editions are supported. Filesystem **must be NTFS** and networking **must use IPv4**. Linux is not supported, but may be in the future.
2727

@@ -59,5 +59,5 @@ Grafana Alloy requires a domain user that is not a member of the Local Administr
5959
[2019 (x64)]: {{< url path="Microsoft.Downloads.Windows.Server2019" >}}
6060
[2022 (x64)]: {{< url path="Microsoft.Downloads.Windows.Server2022" >}}
6161
[Architecture]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.Architecture.MainDoc" >}}
62-
[Grafana Alloy 1.10.0]: {{< url path="Grafana.Products.Loki.Alloy.1.10.0" >}}
62+
[Grafana Alloy 1.10.2]: {{< url path="Grafana.Products.Loki.Alloy.1.10.2" >}}
6363
[Set up Grafana]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.SetupGrafana.MainDoc" >}}

content/en/docs/2025.7/getting-started/on-premise/add-observability-to-innovation/Grafana/install-alloy/install-alloy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This guide describes how to install Grafana Alloy on the Application Server(s).
1111

1212
## Install Grafana Alloy
1313

14-
1. Download the [Grafana Alloy 1.10.0][] archive.
14+
1. Download the [Grafana Alloy 1.10.2][] archive.
1515
1. Extract content of the downloaded archive to a suitable location, e.g. `C:\ProgramData\Cortex\Observability\Grafana Alloy`.
1616
1. Download the [Grafana Alloy.zip][] archive and extract its contents alongside the previously extracted Grafana Alloy `alloy-installer-windows-amd64.exe`.
1717
This archive contains the `config.alloy` configuration file and PowerShell scripts to install Grafana Alloy as a Windows service.
@@ -26,7 +26,7 @@ This archive contains the `config.alloy` configuration file and PowerShell scrip
2626
1. [Configure Grafana Alloy][]
2727

2828
[Configure Grafana Alloy]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallAlloy.ConfigureAlloy" >}}
29-
[Grafana Alloy 1.10.0]: {{< url path="Grafana.Products.Loki.Alloy.1.10.0" >}}
29+
[Grafana Alloy 1.10.2]: {{< url path="Grafana.Products.Loki.Alloy.1.10.2" >}}
3030
[Grafana Alloy.zip]: {{< url path="GitHub.Cortex.Observability.4.0.0.GrafanaAlloyInstallZip" >}}
3131
[Prerequisites]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.Prerequisites" >}}
3232
[Reverse Proxy Authentication]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallLoki.ConfigureAuthentication" >}}

content/en/docs/2025.7/getting-started/on-premise/add-observability-to-innovation/Grafana/install-grafana/install-grafana.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ This guide describes how to install Grafana on the Web Application Server. Pleas
1111

1212
## Install Grafana
1313

14-
1. Download the [Grafana 10.4.1][] Windows installer.
14+
1. Download the [Grafana 12.1.1][] Windows installer.
1515
1. Run the installer and install Grafana to a suitable location.
1616

1717
## Next Steps?
1818

1919
1. [Configure Grafana][]
2020

2121
[Configure Grafana]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallGrafana.ConfigureGrafana" >}}
22-
[Grafana 10.4.1]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaWebApp.10.4.1.Windows" >}}
22+
[Grafana 12.1.1]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaWebApp.12.1.1.Windows" >}}
2323
[Prerequisites]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.Prerequisites" >}}
2424
[Software Requirements]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.SoftwareRequirements" >}}

content/en/docs/2025.7/getting-started/on-premise/add-observability-to-innovation/Grafana/install-loki/install-loki.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This guide describes how to install Grafana Loki on the Web Application Server.
1111

1212
## Install Grafana Loki
1313

14-
1. Download [Grafana Loki 3.0.0][] archive.
14+
1. Download [Grafana Loki 3.5.5][] archive.
1515
1. Extract content of the downloaded archive to a suitable location, e.g. `C:\ProgramData\Cortex\Observability\Loki`.
1616
1. Download the [Grafana Loki Install.zip][] archive and extract its contents alongside the previously extracted Grafana Loki `loki-windows-amd64.exe`.
1717
This archive contains the `loki-local-config.yaml` configuration file, [NSSM][] (the Non-Sucking Service Manager program) and PowerShell scripts to help manage Grafana Loki as a Windows service.
@@ -25,7 +25,7 @@ This archive contains the `loki-local-config.yaml` configuration file, [NSSM][]
2525
1. [Configure Loki][]
2626

2727
[Configure Loki]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallLoki.ConfigureLoki" >}}
28-
[Grafana Loki 3.0.0]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaLoki.3.0.0.GrafanaLokiInstallZip" >}}
28+
[Grafana Loki 3.5.5]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaLoki.3.5.5.GrafanaLokiInstallZip" >}}
2929
[Grafana Loki Install.zip]: {{< url path="GitHub.Cortex.Observability.4.0.0.GrafanaLokiInstallZip" >}}
3030
[NSSM]: {{< url path="NSSM.MainDoc" >}}
3131
[Prerequisites]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.Prerequisites" >}}

content/en/docs/2025.7/getting-started/on-premise/add-observability-to-innovation/Grafana/prerequisites.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ The application servers (as described in {{< ahref path="Cortex.GettingStarted.O
4040

4141
| Server&nbsp;Role | Windows&nbsp;Server[^1] | IIS[^2] | Other&nbsp;Software |
4242
|------------------|-------------------------|---------|----------|
43-
| Web Application Server | [2022 (x64)][] *Recommended*<br>[2019 (x64)][] | 10.0.20348[^3]<br>10.0.17763[^4]<br>[URL Rewrite module 2.1][] | [Grafana 10.4.1][] *Enterprise Edition*<br>[Grafana Loki 3.0.0][]|
44-
| Application Server | [2022 (x64)][] *Recommended*<br>[2019 (x64)][] | | [Grafana Alloy 1.10.0][]|
43+
| Web Application Server | [2022 (x64)][] *Recommended*<br>[2019 (x64)][] | 10.0.20348[^3]<br>10.0.17763[^4]<br>[URL Rewrite module 2.1][] | [Grafana 12.1.1][] *Enterprise Edition*<br>[Grafana Loki 3.5.5][]|
44+
| Application Server | [2022 (x64)][] *Recommended*<br>[2019 (x64)][] | | [Grafana Alloy 1.10.2][]|
4545

4646
[^1]: Windows Server Standard and Datacenter editions are supported. Filesystem **must be NTFS** and networking **must use IPv4**. Linux is not supported, but may be in the future.
4747
[^2]: IIS is supported; other web servers, including IIS Express are not supported.
@@ -161,9 +161,9 @@ Grafana Alloy requires a domain user that is not a member of the Local Administr
161161
[configuring Grafana to use HTTPS]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallGrafana.ConfigureHTTPS" >}}
162162
[Create Self-Signed Certificates]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.Advanced.CreateSelfSignedCertificates" >}}
163163
[Make Installation Artefacts Available]: {{< url path="Cortex.GettingStarted.OnPremise.InstallInnovationOnly.MultipleServerWithHA.MakeInstallationArtefactsAvailableNew" >}}
164-
[Grafana 10.4.1]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaWebApp.10.4.1.Windows" >}}
165-
[Grafana Alloy 1.10.0]: {{< url path="Grafana.Products.Loki.Alloy.1.10.0" >}}
166-
[Grafana Loki 3.0.0]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaLoki.3.0.0.GrafanaLokiInstallZip" >}}
164+
[Grafana 12.1.1]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaWebApp.12.1.1.Windows" >}}
165+
[Grafana Alloy 1.10.2]: {{< url path="Grafana.Products.Loki.Alloy.1.10.2" >}}
166+
[Grafana Loki 3.5.5]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaLoki.3.5.5.GrafanaLokiInstallZip" >}}
167167
[Install Grafana]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallGrafana.MainDoc" >}}
168168
[installation]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallLoki.InstallCertificate" >}}
169169
[Let’s Encrypt]: {{< url path="LetsEncrypt.MainDoc" >}}

0 commit comments

Comments
 (0)