From ef59bbf6d3741fa6ed350b329078ddfef6de9af5 Mon Sep 17 00:00:00 2001 From: Jayclifford345 Date: Fri, 24 May 2024 15:46:03 +0100 Subject: [PATCH 1/3] feat: Added video and updated Grafana Agent -> Alloy --- docs/sources/send-data/_index.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/sources/send-data/_index.md b/docs/sources/send-data/_index.md index 4fd5f7681ea5b..84bf8c027ea6b 100644 --- a/docs/sources/send-data/_index.md +++ b/docs/sources/send-data/_index.md @@ -10,16 +10,18 @@ weight: 500 # Send log data to Loki There are a number of different clients available to send log data to Loki. -While all clients can be used simultaneously to cover multiple use cases, which client is initially picked to send logs depends on your use case. +While all clients can be used simultaneously to cover multiple use cases, which client is initially picked to send logs depends on your use case. + +{{< youtube id="xtEppndO7F8" >}} ## Grafana Clients The following clients are developed and supported (for those customers who have purchased a support contract) by Grafana Labs for sending logs to Loki: -- [Grafana Agent](/docs/agent/latest/) - The Grafana Agent is the recommended client for the Grafana stack. It can collect telemetry data for metrics, logs, traces, and continuous profiles and is fully compatible with the Prometheus, OpenTelemetry, and Grafana open source ecosystems. -- [Promtail]({{< relref "./promtail" >}}) - Promtail is the client of choice when you're running Kubernetes, as you can configure it to automatically scrape logs from pods running on the same node that Promtail runs on. Promtail and Prometheus running together in Kubernetes enables powerful debugging: if Prometheus and Promtail use the same labels, users can use tools like Grafana to switch between metrics and logs based on the label set. -Promtail is also the client of choice on bare-metal since it can be configured to tail logs from all files given a host path. It is the easiest way to send logs to Loki from plain-text files (for example, things that log to `/var/log/*.log`). -Lastly, Promtail works well if you want to extract metrics from logs such as counting the occurrences of a particular message. +- [Grafana Alloy](/docs/alloy/latest/) - Grafana Alloy is the recommended client for the Grafana stack. It can collect telemetry data for metrics, logs, traces, and continuous profiles and is fully compatible with the Prometheus, OpenTelemetry, and Grafana open source ecosystems. +- [Promtail]({{< relref "./promtail" >}}) - Promtail is the client of choice when you're running Kubernetes, as you can configure it to automatically scrape logs from pods running on the same node that Promtail runs on. Promtail and Prometheus running together in Kubernetes enables powerful debugging: if Prometheus and Promtail use the same labels, users can use tools like Grafana to switch between metrics and logs based on the label set. +Promtail is also the client of choice on bare-metal since it can be configured to tail logs from all files given a host path. It is the easiest way to send logs to Loki from plain-text files (for example, things that log to `/var/log/*.log`). +Lastly, Promtail works well if you want to extract metrics from logs such as counting the occurrences of a particular message. **Promtails features are now also available within Grafana Alloy.** - [xk6-loki extension](https://github.com/grafana/xk6-loki) - The k6-loki extension lets you perform [load testing on Loki]({{< relref "./k6" >}}). ## OpenTelemetry Collector From 5623d1be33dcc229e4e4884f73ece521b6c16bc1 Mon Sep 17 00:00:00 2001 From: Jayclifford345 Date: Tue, 28 May 2024 09:20:43 +0100 Subject: [PATCH 2/3] Revert "feat: Added video and updated Grafana Agent -> Alloy" This reverts commit ef59bbf6d3741fa6ed350b329078ddfef6de9af5. --- docs/sources/send-data/_index.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/sources/send-data/_index.md b/docs/sources/send-data/_index.md index 84bf8c027ea6b..4fd5f7681ea5b 100644 --- a/docs/sources/send-data/_index.md +++ b/docs/sources/send-data/_index.md @@ -10,18 +10,16 @@ weight: 500 # Send log data to Loki There are a number of different clients available to send log data to Loki. -While all clients can be used simultaneously to cover multiple use cases, which client is initially picked to send logs depends on your use case. - -{{< youtube id="xtEppndO7F8" >}} +While all clients can be used simultaneously to cover multiple use cases, which client is initially picked to send logs depends on your use case. ## Grafana Clients The following clients are developed and supported (for those customers who have purchased a support contract) by Grafana Labs for sending logs to Loki: -- [Grafana Alloy](/docs/alloy/latest/) - Grafana Alloy is the recommended client for the Grafana stack. It can collect telemetry data for metrics, logs, traces, and continuous profiles and is fully compatible with the Prometheus, OpenTelemetry, and Grafana open source ecosystems. -- [Promtail]({{< relref "./promtail" >}}) - Promtail is the client of choice when you're running Kubernetes, as you can configure it to automatically scrape logs from pods running on the same node that Promtail runs on. Promtail and Prometheus running together in Kubernetes enables powerful debugging: if Prometheus and Promtail use the same labels, users can use tools like Grafana to switch between metrics and logs based on the label set. -Promtail is also the client of choice on bare-metal since it can be configured to tail logs from all files given a host path. It is the easiest way to send logs to Loki from plain-text files (for example, things that log to `/var/log/*.log`). -Lastly, Promtail works well if you want to extract metrics from logs such as counting the occurrences of a particular message. **Promtails features are now also available within Grafana Alloy.** +- [Grafana Agent](/docs/agent/latest/) - The Grafana Agent is the recommended client for the Grafana stack. It can collect telemetry data for metrics, logs, traces, and continuous profiles and is fully compatible with the Prometheus, OpenTelemetry, and Grafana open source ecosystems. +- [Promtail]({{< relref "./promtail" >}}) - Promtail is the client of choice when you're running Kubernetes, as you can configure it to automatically scrape logs from pods running on the same node that Promtail runs on. Promtail and Prometheus running together in Kubernetes enables powerful debugging: if Prometheus and Promtail use the same labels, users can use tools like Grafana to switch between metrics and logs based on the label set. +Promtail is also the client of choice on bare-metal since it can be configured to tail logs from all files given a host path. It is the easiest way to send logs to Loki from plain-text files (for example, things that log to `/var/log/*.log`). +Lastly, Promtail works well if you want to extract metrics from logs such as counting the occurrences of a particular message. - [xk6-loki extension](https://github.com/grafana/xk6-loki) - The k6-loki extension lets you perform [load testing on Loki]({{< relref "./k6" >}}). ## OpenTelemetry Collector From 8af2049d43037ccf4379d5e7d8befe9b56169e5d Mon Sep 17 00:00:00 2001 From: Jayclifford345 Date: Tue, 28 May 2024 09:21:10 +0100 Subject: [PATCH 3/3] Added video --- docs/sources/send-data/_index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/sources/send-data/_index.md b/docs/sources/send-data/_index.md index 4fd5f7681ea5b..2064860dbbcdd 100644 --- a/docs/sources/send-data/_index.md +++ b/docs/sources/send-data/_index.md @@ -12,6 +12,8 @@ weight: 500 There are a number of different clients available to send log data to Loki. While all clients can be used simultaneously to cover multiple use cases, which client is initially picked to send logs depends on your use case. +{{< youtube id="xtEppndO7F8" >}} + ## Grafana Clients The following clients are developed and supported (for those customers who have purchased a support contract) by Grafana Labs for sending logs to Loki: