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

Merge grafana/agent:main into grafana/alloy:main (2024-03-13) #31

Merged
merged 13 commits into from
Mar 13, 2024

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Mar 13, 2024

Second weekly sync of grafana/agent:main into grafana/alloy:main, mainly to pull in grafana/agent#6674.

erikbaranowski and others added 13 commits March 12, 2024 08:47
…(#6633)

Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>
Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>
* Upgrade Go to 1.22.1

* update build images
…658)

Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>
Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>
* Improve converter diagnostic output by including a Footer and removing lower
  level diagnostics when a configuration fails to generate.

Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>

---------

Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>
Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>
* Update to using FETCH_HEAD since we are using FETCH which doesnt update HEAD.

* Update to using FETCH_HEAD since we are using FETCH which doesnt update HEAD.

* Use pull and not fetch

* add comments

* fix linting

* Update CHANGELOG.md

Co-authored-by: Robert Fratto <robertfratto@gmail.com>

---------

Co-authored-by: Robert Fratto <robertfratto@gmail.com>
Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>
This commit adds stability levels to services. Every service, with the
exception of remotecfg, is then given a stability level of stable.
remotecfg is given a stability level of "beta."
@rfratto rfratto enabled auto-merge March 13, 2024 16:39
@rfratto rfratto disabled auto-merge March 13, 2024 16:39
@rfratto rfratto enabled auto-merge March 13, 2024 16:39
@rfratto rfratto merged commit 77dde60 into main Mar 13, 2024
8 of 9 checks passed
@rfratto rfratto deleted the sync-grafana-agent-2023-03-13-1 branch March 13, 2024 16:40
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 15, 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.

5 participants