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

Sync grafana/agent:c6fbc923 into grafana/alloy:main #13

Merged
merged 4 commits into from
Feb 29, 2024

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Feb 29, 2024

Third attempt after #11, #12; this PR instead is based off of grafana/agent:main directly:

git remote add grafana-agent [email protected]:grafana/agent.git 
git fetch grafana-agent main 
git checkout -b sync-grafana-agent grafana-agent/main
git push -u origin HEAD

This means that it obviously has merge conflicts immediately.

thampiotr and others added 4 commits February 28, 2024 15:00
* Update loki dep to k190

* port renames

* fix loki push api
* Add windows build for boring crypto

* add changelog

* add details on cngcrypto and fips

* put some jsonnet into a function

Signed-off-by: erikbaranowski <[email protected]>

---------

Signed-off-by: erikbaranowski <[email protected]>
Co-authored-by: erikbaranowski <[email protected]>
* fix issue with 64 bit registry

* fix issue with 64 bit registry
@rfratto rfratto merged commit cd81fb9 into main Feb 29, 2024
8 of 9 checks passed
@rfratto rfratto deleted the sync-grafana-agent branch February 29, 2024 04:11
@rfratto rfratto restored the sync-grafana-agent branch February 29, 2024 04:22
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 31, 2024
@rfratto rfratto added the backport-to-agent:no PR should NOT be backported to the agent repo. label Apr 23, 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