Skip to content

Commit

Permalink
chore: [release-3.1.x] chore: fix some comments (#13728)
Browse files Browse the repository at this point in the history
Co-authored-by: beforetech <[email protected]>
  • Loading branch information
grafanabot and beforetech authored Jul 31, 2024
1 parent 5a725d2 commit dc4bcb3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/sources/send-data/fluentd/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fluent-gem install fluent-plugin-grafana-loki

The Docker image `grafana/fluent-plugin-loki:main` contains [default configuration files](https://github.com/grafana/loki/tree/main/clients/cmd/fluentd/docker/conf). By default, fluentd containers use that default configuration. You can instead specify your `fluentd.conf` configuration file with a `FLUENTD_CONF` environment variable.

This image also uses `LOKI_URL`, `LOKI_USERNAME`, and `LOKI_PASSWORD` environment variables to specify the the Loki endpoint, user, and password (you can leave the USERNAME and PASSWORD blank if they're not used).
This image also uses `LOKI_URL`, `LOKI_USERNAME`, and `LOKI_PASSWORD` environment variables to specify the Loki endpoint, user, and password (you can leave the USERNAME and PASSWORD blank if they're not used).

This image starts an instance of Fluentd that forwards incoming logs to the specified Loki URL. As an alternate, containerized applications can also use [docker driver plugin]({{< relref "../docker-driver" >}}) to ship logs without needing Fluentd.

Expand Down
2 changes: 1 addition & 1 deletion docs/sources/setup/upgrade/upgrade-to-6x/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Reasons:
* The Agent Operator is deprecated.
* The dependency on the Prometheus operator is not one we are able to support well.

The [Meta Monitoring Chart](https://github.com/grafana/meta-monitoring-chart) is an improvement over the the previous approach because it allows for installing a clustered Grafana Agent which can send metrics, logs, and traces to Grafana Cloud, or letting you install a monitoring-only local installation of Loki, Mimir, Tempo, and Grafana.
The [Meta Monitoring Chart](https://github.com/grafana/meta-monitoring-chart) is an improvement over the previous approach because it allows for installing a clustered Grafana Agent which can send metrics, logs, and traces to Grafana Cloud, or letting you install a monitoring-only local installation of Loki, Mimir, Tempo, and Grafana.

The monitoring sections of this chart still exist but are disabled by default.

Expand Down

0 comments on commit dc4bcb3

Please sign in to comment.