ci: Use v2 deploy preview (#16432)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Author: jdbaldry

.github/workflows/deploy-pr-preview.yml

@@ -11,14 +11,21 @@ on:
 
 jobs:
   deploy-pr-preview:
-    if: ${{ ! github.event.pull_request.head.repo.fork }}
+    if: "!github.event.pull_request.head.repo.fork"
     uses: grafana/writers-toolkit/.github/workflows/deploy-preview.yml@main
     with:
-      sha: ${{ github.event.pull_request.head.sha }}
       branch: ${{ github.head_ref }}
       event_number: ${{ github.event.number }}
-      title: ${{ github.event.pull_request.title }}
       repo: loki
-      website_directory: content/docs/loki/latest
-      relative_prefix: /docs/loki/latest/
-      index_file: true
+      sha: ${{ github.event.pull_request.head.sha }}
+      sources: |
+        [
+          {
+            "index_file": "content/docs/loki/_index.md",
+            "relative_prefix": "/docs/loki/latest/",
+            "repo": "loki",
+            "source_directory": "docs/sources",
+            "website_directory": "content/docs/loki/latest"
+          }
+        ]
+      title: ${{ github.event.pull_request.title }}

docs/sources/get-started/_index.md

@@ -9,28 +9,34 @@ description: Provides an overview of the steps for implementing Grafana Loki to
 
 {{< youtube id="1uk8LtQqsZQ" >}}
 
-Loki is a horizontally scalable, highly available, multi-tenant log aggregation system inspired by Prometheus. It is designed to be very cost-effective and easy to operate. It does not index the contents of the logs, but rather a set of labels for each log stream.
+Loki is a horizontally scalable, highly available, multi-tenant log aggregation system inspired by Prometheus.
+It's designed to be very cost-effective and easy to operate.
+It doesn't index the contents of the logs, but rather a set of labels for each log stream.
 
-Because all Loki implementations are unique, the installation process is
-different for every customer. But there are some steps in the process that
-should be common to every installation.
+Because all Loki implementations are unique, the installation process is different for every customer.
+But there are some steps in the process that are common to every installation.
 
 To collect logs and view your log data generally involves the following steps:
 
 ![Loki implementation steps](loki-install.png)
 
-1. Install Loki on Kubernetes in simple scalable mode, using the recommended [Helm chart](https://grafana.com/docs/loki/<LOKI_VERSION>/setup/install/helm/install-scalable/). Supply the Helm chart with your object storage authentication details.
+1. Install Loki on Kubernetes in simple scalable mode, using the recommended [Helm chart](https://grafana.com/docs/loki/<LOKI_VERSION>/setup/install/helm/install-scalable/).
+   Supply the Helm chart with your object storage authentication details.
    - [Storage options](https://grafana.com/docs/loki/<LOKI_VERSION>/operations/storage/)
    - [Configuration reference](https://grafana.com/docs/loki/<LOKI_VERSION>/configure/)
-   - There are [examples](https://grafana.com/docs/loki/<LOKI_VERSION>/configure/examples/) for specific Object Storage providers that you can modify.
+   - There are [examples](https://grafana.com/docs/loki/<LOKI_VERSION>/configure/examples/) for specific object storage providers that you can modify.
 1. Deploy [Grafana Alloy](https://grafana.com/docs/alloy/latest/) to collect logs from your applications.
-    1. On Kubernetes, deploy Grafana Alloy using the Helm chart. Configure Grafana Alloy to scrape logs from your Kubernetes cluster, and add your Loki endpoint details. See the following section for an example Grafana Alloy configuration file.
-    1. Add [labels](https://grafana.com/docs/loki/<LOKI_VERSION>/get-started/labels/) to your logs following our [best practices](https://grafana.com/docs/loki/<LOKI_VERSION>/get-started/labels/bp-labels/). Most Loki users start by adding labels that describe where the logs are coming from (region, cluster, environment, etc.).
+   1. On Kubernetes, deploy Grafana Alloy using the Helm chart.
+      Configure Grafana Alloy to scrape logs from your Kubernetes cluster, and add your Loki endpoint details.
+      Refer to the following section for an example Grafana Alloy configuration file.
+   1. Add [labels](https://grafana.com/docs/loki/<LOKI_VERSION>/get-started/labels/) to your logs following our [best practices](https://grafana.com/docs/loki/<LOKI_VERSION>/get-started/labels/bp-labels/).
+      Most Loki users start by adding labels that describe where the logs are coming from such as region, cluster, or environment.
 1. Deploy [Grafana](https://grafana.com/docs/grafana/latest/setup-grafana/) or [Grafana Cloud](https://grafana.com/docs/grafana-cloud/quickstart/) and configure a [Loki data source](https://grafana.com/docs/grafana/latest/datasources/loki/configure-loki-data-source/).
-1. Select the [Explore feature](https://grafana.com/docs/grafana/latest/explore/) in the Grafana main menu. To [view logs in Explore](https://grafana.com/docs/grafana/latest/explore/logs-integration/):
-    1. Pick a time range.
-    1. Choose the Loki data source.
-    1. Use [LogQL](https://grafana.com/docs/loki/<LOKI_VERSION>/query/) in the [query editor](https://grafana.com/docs/grafana/latest/datasources/loki/query-editor/), use the Builder view to explore your labels, or select from sample pre-configured queries using the **Kick start your query** button.
+1. Select the [Explore feature](https://grafana.com/docs/grafana/latest/explore/) in the Grafana main menu.
+   To [view logs in Explore](https://grafana.com/docs/grafana/latest/explore/logs-integration/):
+   1. Pick a time range.
+   1. Choose the Loki data source.
+   1. Use [LogQL](https://grafana.com/docs/loki/<LOKI_VERSION>/query/) in the [query editor](https://grafana.com/docs/grafana/latest/datasources/loki/query-editor/), use the Builder view to explore your labels, or select from sample pre-configured queries using the **Kick start your query** button.
 
 **Next steps:** Learn more about the Loki query language, [LogQL](https://grafana.com/docs/loki/<LOKI_VERSION>/query/).
 
@@ -46,115 +52,126 @@ This sample `values.yaml` file is configured to:
 
 1. Install Loki with the [Helm chart](https://grafana.com/docs/loki/<LOKI_VERSION>/setup/install/helm/install-scalable/).
 
-1. Deploy either Grafana Alloy or the Grafana Agent, using the Helm chart:
-    - [Grafana Alloy Helm chart](https://grafana.com/docs/alloy/latest/get-started/install/kubernetes/)
-    - [Grafana Agent Helm chart](https://grafana.com/docs/agent/latest/flow/setup/install/kubernetes/)
+1. Deploy either Grafana Alloy or Grafana Agent, using the Helm chart:
+
+   - [Grafana Alloy Helm chart](https://grafana.com/docs/alloy/latest/get-started/install/kubernetes/)
+   - [Grafana Agent Helm chart](https://grafana.com/docs/agent/latest/flow/setup/install/kubernetes/)
 
 1. Create a `values.yaml` file, based on the following example, making sure to update the value for `forward_to = [loki.write.endpoint.receiver]`:
 
-    {{< code >}}
-
-```yaml-alloy
-alloy:
-  mounts:
-    varlog: true
-  configMap:
-    content: |
-      logging {
-        level  = "info"
-        format = "logfmt"
-      }
-
-      discovery.kubernetes "pods" {
-        role = "pod"
-      }
-
-      loki.source.kubernetes "pods" {
-        targets    = discovery.kubernetes.pods.targets
-        forward_to = [loki.write.endpoint.receiver]
-      }
-
-      loki.write "endpoint" {
-        endpoint {
-            url = "http://loki-gateway.default.svc.cluster.local:80/loki/api/v1/push"
-            tenant_id = "local"
-        }
-      }
-
-```
-
-```yaml-static-agent
-agent:
-  mounts:
-    varlog: true
-  configMap:
-    content: |
-      logging {
-        level  = "info"
-        format = "logfmt"
-      }
-
-      discovery.kubernetes "k8s" {
-        role = "pod"
-      }
-
-      discovery.relabel "k8s" {
-        targets = discovery.kubernetes.k8s.targets
-
-        rule {
-          source_labels = ["__meta_kubernetes_pod_name"]
-          action = "replace"
-          target_label = "pod"
-        }
-        rule {
-          source_labels = ["__meta_kubernetes_pod_container_name"]
-          action = "replace"
-          target_label = "container"
-        }
-
-        rule {
-          source_labels = ["__meta_kubernetes_namespace", "__meta_kubernetes_pod_label_name"]
-          target_label  = "job"
-          separator     = "/"
-        }
-
-        rule {
-          source_labels = ["__meta_kubernetes_pod_uid", "__meta_kubernetes_pod_container_name"]
-          target_label  = "__path__"
-          separator     = "/"
-          replacement   = "/var/log/pods/*$1/*.log"
-        }
-      }
-
-      local.file_match "pods" {
-        path_targets = discovery.relabel.k8s.output
-      }
-
-      loki.source.file "pods" {
-        targets = local.file_match.pods.targets
-        forward_to = [loki.write.endpoint.receiver]
-      }
-
-      loki.write "endpoint" {
-        endpoint {
-            url = "http://loki-gateway:80/loki/api/v1/push"
-            tenant_id = "cloud"
-        }
-      }
-```
-
-    {{< /code >}}
+   {{< tabs >}}
+   {{< tab-content name="Grafana Alloy" >}}
+
+   ```yaml
+   alloy:
+     mounts:
+       varlog: true
+     configMap:
+       content: |
+         logging {
+           level  = "info"
+           format = "logfmt"
+         }
+
+         discovery.kubernetes "pods" {
+           role = "pod"
+         }
+
+         loki.source.kubernetes "pods" {
+           targets    = discovery.kubernetes.pods.targets
+           forward_to = [loki.write.endpoint.receiver]
+         }
+
+         loki.write "endpoint" {
+           endpoint {
+               url = "http://loki-gateway.default.svc.cluster.local:80/loki/api/v1/push"
+               tenant_id = "local"
+           }
+         }
+   ```
+
+   {{< /tab-content >}}
+   {{< tab-content name="Grafana Agent" >}}
+
+   ```yaml
+   agent:
+     mounts:
+       varlog: true
+     configMap:
+       content: |
+         logging {
+           level  = "info"
+           format = "logfmt"
+         }
+
+         discovery.kubernetes "k8s" {
+           role = "pod"
+         }
+
+         discovery.relabel "k8s" {
+           targets = discovery.kubernetes.k8s.targets
+
+           rule {
+             source_labels = ["__meta_kubernetes_pod_name"]
+             action = "replace"
+             target_label = "pod"
+           }
+           rule {
+             source_labels = ["__meta_kubernetes_pod_container_name"]
+             action = "replace"
+             target_label = "container"
+           }
+
+           rule {
+             source_labels = ["__meta_kubernetes_namespace", "__meta_kubernetes_pod_label_name"]
+             target_label  = "job"
+             separator     = "/"
+           }
+
+           rule {
+             source_labels = ["__meta_kubernetes_pod_uid", "__meta_kubernetes_pod_container_name"]
+             target_label  = "__path__"
+             separator     = "/"
+             replacement   = "/var/log/pods/*$1/*.log"
+           }
+         }
+
+         local.file_match "pods" {
+           path_targets = discovery.relabel.k8s.output
+         }
+
+         loki.source.file "pods" {
+           targets = local.file_match.pods.targets
+           forward_to = [loki.write.endpoint.receiver]
+         }
+
+         loki.write "endpoint" {
+           endpoint {
+               url = "http://loki-gateway:80/loki/api/v1/push"
+               tenant_id = "cloud"
+           }
+         }
+   ```
+
+   {{< /tab-content >}}
+   {{< /tabs >}}
 
 1. Then install Alloy or the Agent in your Kubernetes cluster using:
 
-    {{< code >}}
+   {{< tabs >}}
+   {{< tab-content name="Grafana Alloy" >}}
+
+   ```alloy
+   helm install alloy grafana/alloy -f ./values.yml
+   ```
+
+   {{< /tab-content >}}
 
-```alloy
-helm install alloy grafana/alloy -f ./values.yml    
+   {{< tab-content name="Grafana Agent" >}}
 
-```
+   ```agent
+   helm upgrade -f values.yaml agent grafana/grafana-agent
+   ```
 
-```agent
-helm upgrade -f values.yaml agent grafana/grafana-agent 
-```
-    {{< /code >}}
+   {{< /tab-content >}}
+   {{< /tabs >}}