From f08e05bcbd8524f6e304ca6859202f1356ceb391 Mon Sep 17 00:00:00 2001 From: J Stickler Date: Mon, 29 Apr 2024 18:25:17 -0400 Subject: [PATCH] docs: manual backport #12737 (#12762) --- docs/sources/configure/_index.md | 7 ------- docs/sources/configure/index.template | 7 ------- docs/sources/send-data/promtail/configuration.md | 7 +++++++ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/docs/sources/configure/_index.md b/docs/sources/configure/_index.md index 9aefb9d189ae3..5122c5b92868e 100644 --- a/docs/sources/configure/_index.md +++ b/docs/sources/configure/_index.md @@ -36,13 +36,6 @@ is especially useful in making sure your config files and flags are being read a `-log-config-reverse-order` is the flag we run Loki with in all our environments, the config entries are reversed so that the order of configs reads correctly top to bottom when viewed in Grafana's Explore. -## Reload at runtime - -Promtail can reload its configuration at runtime. If the new configuration -is not well-formed, the changes will not be applied. -A configuration reload is triggered by sending a `SIGHUP` to the Promtail process or -sending a HTTP POST request to the `/reload` endpoint (when the `--server.enable-runtime-reload` flag is enabled). - ## Configuration file reference To specify which configuration file to load, pass the `-config.file` flag at the diff --git a/docs/sources/configure/index.template b/docs/sources/configure/index.template index ea980be2bec01..fa55d9bde7acb 100644 --- a/docs/sources/configure/index.template +++ b/docs/sources/configure/index.template @@ -36,13 +36,6 @@ is especially useful in making sure your config files and flags are being read a `-log-config-reverse-order` is the flag we run Loki with in all our environments, the config entries are reversed so that the order of configs reads correctly top to bottom when viewed in Grafana's Explore. -## Reload at runtime - -Promtail can reload its configuration at runtime. If the new configuration -is not well-formed, the changes will not be applied. -A configuration reload is triggered by sending a `SIGHUP` to the Promtail process or -sending a HTTP POST request to the `/reload` endpoint (when the `--server.enable-runtime-reload` flag is enabled). - ## Configuration file reference To specify which configuration file to load, pass the `-config.file` flag at the diff --git a/docs/sources/send-data/promtail/configuration.md b/docs/sources/send-data/promtail/configuration.md index 4f77691b2d366..0fc7f2c07b91f 100644 --- a/docs/sources/send-data/promtail/configuration.md +++ b/docs/sources/send-data/promtail/configuration.md @@ -43,6 +43,13 @@ For more detailed information on configuring how to discover and scrape logs fro targets, see [Scraping]({{< relref "./scraping" >}}). For more information on transforming logs from scraped targets, see [Pipelines]({{< relref "./pipelines" >}}). +## Reload at runtime + +Promtail can reload its configuration at runtime. If the new configuration +is not well-formed, the changes will not be applied. +A configuration reload is triggered by sending a `SIGHUP` to the Promtail process or +sending a HTTP POST request to the `/reload` endpoint (when the `--server.enable-runtime-reload` flag is enabled). + ### Use environment variables in the configuration You can use environment variable references in the configuration file to set values that need to be configurable during deployment.