-
Notifications
You must be signed in to change notification settings - Fork 621
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
chore(examples, docs): Migrate agent to alloy in docs and examples #3762
Conversation
9994c1f
to
24f08b4
Compare
24f08b4
to
fa39993
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Nothing obviously wrong. But I also haven't run every example.
grafana-agent: | ||
image: grafana/agent:main | ||
grafana-alloy: | ||
image: grafana/alloy:main |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we should use a released version for alloy too?
image: grafana/alloy:main | |
image: grafana/alloy:latest |
Looks good to me! @korniltsev you probably should take a look, I suspect Alberto wanted to tag you and not me |
I think we should use |
The renames in ebpf/local examples breaks discovery.relabel configuration. The binary and exe name is alloy, not grafana-alloy. I propose to apply this. diff --git a/examples/grafana-alloy-auto-instrumentation/ebpf/local/config.alloy b/examples/grafana-alloy-auto-instrumentation/ebpf/local/config.alloy
index a2f6f2d98..4c1bf1848 100644
--- a/examples/grafana-alloy-auto-instrumentation/ebpf/local/config.alloy
+++ b/examples/grafana-alloy-auto-instrumentation/ebpf/local/config.alloy
@@ -18,16 +18,16 @@ discovery.relabel "alloy" {
// Filter needed processes
rule {
source_labels = ["__meta_process_exe"]
- regex = ".*/grafana-alloy"
+ regex = ".*/alloy"
action = "keep"
}
// provide arbitrary service_name label, otherwise it will be "unspecified"
rule {
source_labels = ["__meta_process_exe"]
target_label = "service_name"
- regex = ".*/grafana-alloy"
+ regex = ".*/alloy"
action = "replace"
- replacement = "ebpf/local/grafana-alloy"
+ replacement = "ebpf/local/alloy"
}
} |
I updated the PR with the comments (latest instead of main, and fixing bin name). I didn't run the examples so I propose that everyone (dima and tolya) try and fix their examples in separate PRs. |
Migrating agent to alloy. Expect a lot of changes in urls, pointing to Alloy doc, using alloy images and config conventions.
I could test golang-pull, which worked.
Needs to be tested: