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

grafana-alloy: init at 1.1.1 #317741

Merged
merged 5 commits into from
Jun 7, 2024
Merged

grafana-alloy: init at 1.1.1 #317741

merged 5 commits into from
Jun 7, 2024

Conversation

vunso
Copy link

@vunso vunso commented Jun 6, 2024

Description of changes

Adding (grafana-)alloy, a rewrite of grafana-agent.

https://github.com/grafana/alloy
https://grafana.com/oss/alloy
Closes #303418

@flokli @emilylange I added you as maintainers as you already maintain grafana-agent and signaled interest in maintaining alloy as well. I hope that's ok!

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@flokli
Copy link
Contributor

flokli commented Jun 6, 2024

I updated this PR, fixed the darwin build by setting proxyVendor = true. Also noticed 1.1.1 is out since last week, so I updated it to that too and pushed to this PR.

I ran some smoketests locally, the web interface comes up and it accepts my old river config (from grafana-agent times), so things are looking fine.

I'd be fine to merging this in, but let's give @emilylange some time to also review this.

I was planning to continue with a NixOS module in a followup PR, either tomorrow or on the weekend, but no promises ;-)

Copy link
Member

@emilylange emilylange left a comment

Choose a reason for hiding this comment

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

Also, @flokli, your grafana-agent: set mainProgram commit reads grafana-agent, not grafana-alloy.
You mixed that up.

We should probably just squash all of this into a single commit called
grafana-alloy: init at 1.1.1

pkgs/by-name/gr/grafana-alloy/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/gr/grafana-alloy/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/gr/grafana-alloy/package.nix Show resolved Hide resolved
pkgs/by-name/gr/grafana-alloy/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/gr/grafana-alloy/package.nix Outdated Show resolved Hide resolved
@emilylange emilylange changed the title grafana-alloy: init at 1.0.0 grafana-alloy: init at 1.1.1 Jun 6, 2024
Copy link
Member

@emilylange emilylange left a comment

Choose a reason for hiding this comment

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

And we could format this with /new package/ with nixfmt-rfc-style.

pkgs/by-name/gr/grafana-alloy/package.nix Show resolved Hide resolved
pkgs/by-name/gr/grafana-alloy/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/gr/grafana-alloy/package.nix Outdated Show resolved Hide resolved
@emilylange emilylange marked this pull request as draft June 6, 2024 19:00
@flokli
Copy link
Contributor

flokli commented Jun 6, 2024

Also, @flokli, your grafana-agent: set mainProgram commit reads grafana-agent, not grafana-alloy.
You mixed that up.

FIxed.

We should probably just squash all of this into a single commit called grafana-alloy: init at 1.1.1

I wanna maintain the original authorship, this already had quite some people touching it.

And we could format this with /new package/ with nixfmt-rfc-style.

I personally don't think the new formatter is an improvement, and have nixpkgs-fmt as my autoformatter configured in the editor - so doing it would get in my way. I'd like to keep it like this until it becomes nixpkgs-wide policy.

@flokli flokli requested a review from emilylange June 6, 2024 19:14
@flokli flokli marked this pull request as ready for review June 6, 2024 19:14
@ofborg ofborg bot requested a review from emilylange June 6, 2024 20:32
@flokli flokli merged commit f1736f9 into NixOS:master Jun 7, 2024
27 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Package request: Grafana Alloy
5 participants