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

feat(static/metrics): migrate default WAL directory to data-alloy #571

Merged
merged 4 commits into from
Apr 19, 2024

Conversation

hainenber
Copy link
Contributor

PR Description

I notice that there are a few places where data-agent is still referenced despite the default directory for storage is now data-alloy.

Which issue(s) this PR fixes

Notes to the Reviewer

I have a hunch that these refs are being intentionally kept for other purposes. If that's the case, kindly help closing the PR as I don't have further context :D

PR Checklist

  • CHANGELOG.md updated

@@ -19,7 +19,7 @@ import (
var DefaultConfig = Config{
Global: instance.DefaultGlobalConfig,
InstanceRestartBackoff: 5 * time.Second,
WALDir: "data-agent/",
WALDir: "data-alloy/",
Copy link
Member

Choose a reason for hiding this comment

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

This one is intentional; internal/static is kept around for the config converters from static -> Alloy, and so we want to keep its default configuration the same, where it does write to data-agent/ by default :)

Copy link
Member

Choose a reason for hiding this comment

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

Maybe adding a comment instead would be useful here so others can more easily understand why it’s not renamed

@hainenber hainenber force-pushed the refactor-leftover-data-agent-ref branch from 5579e4e to 249350c Compare April 16, 2024 14:59
Comment on lines 22 to 24
// The following legacy WALDir path is intetionally kept for config conversion from static to Alloy.
// Consult Alloy maintainers for changes.
WALDir: "data-alloy/",
Copy link
Member

@tpaschalis tpaschalis Apr 17, 2024

Choose a reason for hiding this comment

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

Can we keep this line as data-agent like Robert said in his previous comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops, forgot this one. Done in the HEAD commit :D

@tpaschalis tpaschalis enabled auto-merge (squash) April 19, 2024 13:30
@tpaschalis tpaschalis merged commit 57a0197 into grafana:main Apr 19, 2024
10 checks passed
@hainenber hainenber deleted the refactor-leftover-data-agent-ref branch April 19, 2024 15:57
@rfratto rfratto added the backport-to-agent:no PR should NOT be backported to the agent repo. label Apr 23, 2024
hainenber added a commit to hainenber/alloy that referenced this pull request May 1, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport-to-agent:no PR should NOT be backported to the agent repo. frozen-due-to-age
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants