Skip to content

Commit 1b17893

Browse files
author
cortex-lp
committed
resolve more conflicts
1 parent a0136ea commit 1b17893

5 files changed

Lines changed: 6 additions & 7 deletions

File tree

content/en/docs/2025.9/getting-started/cloud/add-observability-to-innovation/Grafana/import-dashboards.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ To do this, follow these steps for all default {{% ctx %}} dashboards imported:
6666

6767
[configured Loki data source]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.SetupLoki.MainDoc" >}}
6868
[Grafana]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.SetupGrafana.MainDoc" >}}
69-
[Grafana.Dashboards.zip]: {{< url path="GitHub.Cortex.Observability.4_1_0.GrafanaDashboardsZip" >}}
69+
[Grafana.Dashboards.zip]: {{< url path="GitHub.Cortex.Observability.4_2_1.GrafanaDashboardsZip" >}}
7070
[Loki]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.SetupLoki.MainDoc" >}}
71-
[Try it Out]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.TryItOut.MainDoc" >}}
71+
[Try it Out]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.TryItOut.MainDoc" >}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ This archive contains the `config.alloy` configuration file and PowerShell scrip
2727

2828
[Configure Grafana Alloy]: {{< url path="Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.InstallAlloy.ConfigureAlloy.MainDoc" >}}
2929
[Grafana Alloy 1.10.2]: {{< url path="Grafana.Products.Loki.Alloy.1_10.2" >}}
30-
[Grafana Alloy.zip]: {{< url path="GitHub.Cortex.Observability.4_1_0.GrafanaAlloyInstallZip" >}}
30+
[Grafana Alloy.zip]: {{< url path="GitHub.Cortex.Observability.4_2_1.GrafanaAlloyInstallZip" >}}
3131
[Prerequisites]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.Prerequisites" >}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ This archive contains the `config.alloy` configuration file and PowerShell scrip
2727

2828
[Configure Grafana Alloy]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallAlloy.ConfigureAlloy" >}}
2929
[Grafana Alloy 1.10.2]: {{< url path="Grafana.Products.Loki.Alloy.1_10.2" >}}
30-
[Grafana Alloy.zip]: {{< url path="GitHub.Cortex.Observability.4_1_0.GrafanaAlloyInstallZip" >}}
30+
[Grafana Alloy.zip]: {{< url path="GitHub.Cortex.Observability.4_2_1.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.9/getting-started/on-premise/add-observability-to-innovation/Grafana/install-loki/install-loki.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ This archive contains the `loki-local-config.yaml` configuration file, [NSSM][]
2626

2727
[Configure Loki]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallLoki.ConfigureLoki" >}}
2828
[Grafana Loki 3.5.5]: {{< url path="Grafana.SelfManaged.Downloads.GrafanaLoki.3_5_5.GrafanaLokiInstallZip" >}}
29-
[Grafana Loki Install.zip]: {{< url path="GitHub.Cortex.Observability.4_1_0.GrafanaLokiInstallZip" >}}
29+
[Grafana Loki Install.zip]: {{< url path="GitHub.Cortex.Observability.4_2_1.GrafanaLokiInstallZip" >}}
3030
[NSSM]: {{< url path="NSSM.MainDoc" >}}
3131
[Prerequisites]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.Prerequisites" >}}
32-
[Software Requirements]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.SoftwareRequirements" >}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ To do this, follow these steps for all default {{% ctx %}} dashboards imported:
7878

7979
1. [Try it Out][]
8080

81-
[Grafana.Dashboards.zip]: {{< url path="GitHub.Cortex.Observability.4_1_0.GrafanaDashboardsZip" >}}
81+
[Grafana.Dashboards.zip]: {{< url path="GitHub.Cortex.Observability.4_2_1.GrafanaDashboardsZip" >}}
8282
[Grafana]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallGrafana.MainDoc" >}}
8383
[Loki]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.InstallLoki.MainDoc" >}}
8484
[Try it Out]: {{< url path="Cortex.GettingStarted.OnPremise.AddObservabilityToInnovation.Grafana.TryItOut" >}}

0 commit comments

Comments
 (0)