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

[release-v0.40] Prepare release v0.40.2 #6620

Merged
merged 11 commits into from
Mar 5, 2024

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Mar 5, 2024

No description provided.

erikbaranowski and others added 6 commits March 5, 2024 13:55
* Set permissions on the  folder when installing via the windows installer rather than relying on the parent folder permissions.

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

---------

Signed-off-by: erikbaranowski <[email protected]>
(cherry picked from commit 9e4d3b5)
* Move UpdateBlock from componentNode interface to blockNode interface.

This change means that all blockNodes have now the possibility to update their managed block with the update River block content.

* Update the loader to update the managed block of a config node  on reload if it already existed in the graph.
With this optimization, we re-use existing nodes and update them instead of creating a new node.
This is especially useful for modules.

* add two new tests to check that on reload the config nodes behave as expected

* add updateblock to declare node

* update loader logic to detect duplicated blocks and reuse already defined blocks

* add updateblock to import config node

* update changelog

* move function and remove unnecessary check

(cherry picked from commit 2e9d5a2)
…c when recreating the instance (grafana#6608)

Signed-off-by: hainenber <[email protected]>
(cherry picked from commit 7a61067)
* Port promtail changes part 1

* changelog

(cherry picked from commit 1a642cf)
@rfratto rfratto requested a review from clayton-cornell as a code owner March 5, 2024 19:00
@rfratto rfratto force-pushed the prepare-release-v0.40.2 branch from b9bb410 to 1398821 Compare March 5, 2024 19:01
@rfratto rfratto requested a review from erikbaranowski March 5, 2024 19:06
@rfratto

This comment was marked as outdated.

@rfratto

This comment was marked as outdated.

grafana#6622)

* On new windows installs, remove default read permissions from agent config

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

* only apply permissions for a new install

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

* Update CHANGELOG.md

Co-authored-by: Robert Fratto <[email protected]>

---------

Signed-off-by: erikbaranowski <[email protected]>
Co-authored-by: Robert Fratto <[email protected]>
(cherry picked from commit e8a3d29)
@rfratto rfratto merged commit caf49e8 into grafana:release-v0.40 Mar 5, 2024
10 checks passed
@rfratto rfratto deleted the prepare-release-v0.40.2 branch March 5, 2024 20:54
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Apr 5, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants