Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use loki in k3d agent DS instead of promtail #406

Merged
merged 3 commits into from
Feb 10, 2021

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Feb 10, 2021

PR Description

Removes promtail from the k3d example and replaces it with using a loki block in the Agent DS config.

I also found an issue where the positions_directory wasn't set in the production loki config, so it would've broken with 0.12.0.

Which issue(s) this PR fixes

Notes to the Reviewer

PR Checklist

  • CHANGELOG updated
  • Documentation added
  • Tests updated

external_labels: {},
}],

pipeline_stages: [
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This block was moved to loki_config.libsonnet.

@@ -4,4 +4,5 @@ k3d create \
--name agent-k3d \
--publish 30080:30080 \
--api-port 50443 \
-v /var/lib/k3d/agent-k3d/storage/:/var/lib/rancher/k3s/storage/
-v /var/lib/k3d/agent-k3d/storage/:/var/lib/rancher/k3s/storage/ \
-v /etc/machine-id:/etc/machine-id
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is needed for the Loki to work, where /etc/machine-id is bind-mounted. Promtail didn't need it unless you were reading from the systemd journal, but the Agent config always adds it.

@rfratto rfratto merged commit 56be388 into grafana:master Feb 10, 2021
@rfratto rfratto deleted the use-loki-in-k3d-ds branch February 22, 2021 15:39
@mattdurham mattdurham mentioned this pull request Sep 7, 2021
3 tasks
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Apr 17, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants