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.38] Prepare for v0.38.1 release #5893

Merged
merged 13 commits into from
Nov 30, 2023

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Nov 30, 2023

No description provided.

cedricziel and others added 13 commits November 30, 2023 09:10
* Add missing CHANGELOG entry
* Mirror fix to static mode

(cherry picked from commit 7da5726)
)

* Agent Management: Introduce support for template variables

  - This change allows managing template variables for remote
    configuration on a per-agent basis.
  - Both base configurations and snippets can be interpreted as
    templates and evaluated at load time with the provided template
    variables.
  - Templates must follow go's `text/template` syntax.
  - This greatly increases the flexibility and reusability of snippets.
  - Template evaluation has been tested in different scenarios and seems
    really robust. If the variables defined in the template cannot be
    resolved (even nested ones), and empty string is rendered
    instead.
  - Note: templates are only evaluated when the `template_variables`
    field within the `agent_metadata` remote config field is non-empty.
  - Note: this feature only applies to static mode.

* Improve naming

* Check error for template execution

* Add tests

  - Tests different scenarios, including:
    - Referencing non existing nested objects
    - Conditionals
    - Ranges
    - Character escaping

* Update CHANGELOG

* Always evaluate templates

  - This is required because certain agents might start before their
    labels are synced. If some of the snippets assigned to them contain
    template variables, loading the config will fail.

* Add test for template inside a template

  - Templates inside templates must be escaped using backticks to avoid
    them being evaluated by the snippet template execution

* Move feature to the next release in CHANGELOG

* Document templating functionality

* Fix doc

(cherry picked from commit d388f94)
…ollectors. (grafana#5832)

Fix grafana#5831 and use the defaults from windows.

(cherry picked from commit 15d3d9f)
* Fix CVE-2023-47108 by updating `otelgrpc` from v0.45.0 to v0.46.0.

* Stop using the deprecated trace.NewNoopTracerProvider.
  Using noop.NewTracerProvider from
  "go.opentelemetry.io/otel/trace/noop" instead.

* Reorder changelog
  Comply with the ordering in:
  https://github.com/grafana/agent/blob/main/docs/developer/contributing.md#updating-the-changelog

---------

Signed-off-by: hainenber <[email protected]>
Co-authored-by: Paulin Todev <[email protected]>
(cherry picked from commit a2348a0)
…or's name is a prefix of another (grafana#5862)

Co-authored-by: Paul Bormans <[email protected]>
(cherry picked from commit f232fb4)
* max_cache_size was being set to 0, due to issue where it doesnt exist in static but the default wasnt carrying over to river syntax. In truth we should never write it.

* Clean up from PR

(cherry picked from commit 356c50c)
Co-authored-by: Clayton Cornell <[email protected]>
(cherry picked from commit 7bf82ea)
* Fix promtail converter: docker_sd

* changelog and lint

* typo

(cherry picked from commit c5dc968)
@rfratto rfratto requested a review from a team November 30, 2023 14:13
@rfratto rfratto requested review from a team and clayton-cornell as code owners November 30, 2023 14:13
Copy link
Collaborator

@mattdurham mattdurham left a comment

Choose a reason for hiding this comment

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

lgtm

@rfratto rfratto merged commit 15e3e86 into grafana:release-v0.38 Nov 30, 2023
8 checks passed
@rfratto rfratto deleted the prep-0.38.1-release branch November 30, 2023 14:30
@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 Feb 21, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 21, 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.

8 participants