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

misc: fix changelog entry #5812

Merged
merged 1 commit into from
Nov 20, 2023
Merged

misc: fix changelog entry #5812

merged 1 commit into from
Nov 20, 2023

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Nov 20, 2023

PR #5802 accidentally added the changelog entry to a published release.

PR grafana#5802 accidentally added the changelog entry to a published release.
Copy link
Member

@tpaschalis tpaschalis left a comment

Choose a reason for hiding this comment

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

Whoops, apologies.

@rfratto rfratto merged commit bc3babc into grafana:main Nov 20, 2023
10 checks passed
@rfratto rfratto deleted the fix-changelog branch November 20, 2023 14:51
rfratto added a commit to rfratto/agent that referenced this pull request Nov 20, 2023
PR grafana#5802 accidentally added the changelog entry to a published release.

(cherry picked from commit bc3babc)
rfratto added a commit that referenced this pull request Nov 20, 2023
* packaging: fix grafana-agent-flow.river (#5802) (#5809)

* packaging: fix grafana-agent-flow.river (#5802)

Add needed label in default `grafana-agent-flow.river` default configuration used in downstream packages.

* Update CHANGELOG.md

(cherry picked from commit eac661f)

* misc: fix changelog entry (#5812)

PR #5802 accidentally added the changelog entry to a published release.

(cherry picked from commit bc3babc)

* feat(module/git): allow module.git use cached content when failed to fetch (#5712)

Signed-off-by: hainenber <[email protected]>
(cherry picked from commit 39b78a8)

* Fix converter output for prometheus.exporter.windows to not unnecessarily add empty blocks (#5817)

(cherry picked from commit 165914b)

* delete obsolete broken windows test (#5818)

(cherry picked from commit bcbc7ab)

* prepare for release v0.38.0-rc.1 (#5821)

(cherry picked from commit 7d775c1)

---------

Co-authored-by: Brice Waegeneire <[email protected]>
Co-authored-by: Đỗ Trọng Hải <[email protected]>
Co-authored-by: Erik Baranowski <[email protected]>
hainenber pushed a commit to hainenber/agent that referenced this pull request Nov 25, 2023
PR grafana#5802 accidentally added the changelog entry to a published release.
hainenber pushed a commit to hainenber/agent that referenced this pull request Nov 25, 2023
PR grafana#5802 accidentally added the changelog entry to a published release.
rfratto added a commit that referenced this pull request Jan 2, 2024
* feat(exporter/elasticsearch): add Basic Auth support

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

* misc: fix changelog entry (#5812)

PR #5802 accidentally added the changelog entry to a published release.

* fix(exporter/elasticsearch): only add Auth header when needed

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

* doc(exporter/elasticsearch): add Basic Auth block desc

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

* feat(exporter/elasticsearch): add Basic Auth support

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

* feat(exporter/elasticsearch): support Basic Auth for static config

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

* chore(CHANGELOG): remove merge conflict artifact

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

* misc: fix changelog entry

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

* feat(converter): map ES exporter's BasicAuth flow from static to flow

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

* fix(converter): nil check for ES exporter's Basic Auth

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

* lint

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

---------

Signed-off-by: hainenber <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Co-authored-by: Robert Fratto <[email protected]>
Co-authored-by: erikbaranowski <[email protected]>
hainenber added a commit to hainenber/agent that referenced this pull request Jan 6, 2024
* feat(exporter/elasticsearch): add Basic Auth support

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

* misc: fix changelog entry (grafana#5812)

PR grafana#5802 accidentally added the changelog entry to a published release.

* fix(exporter/elasticsearch): only add Auth header when needed

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

* doc(exporter/elasticsearch): add Basic Auth block desc

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

* feat(exporter/elasticsearch): add Basic Auth support

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

* feat(exporter/elasticsearch): support Basic Auth for static config

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

* chore(CHANGELOG): remove merge conflict artifact

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

* misc: fix changelog entry

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

* feat(converter): map ES exporter's BasicAuth flow from static to flow

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

* fix(converter): nil check for ES exporter's Basic Auth

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

* lint

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

---------

Signed-off-by: hainenber <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Co-authored-by: Robert Fratto <[email protected]>
Co-authored-by: erikbaranowski <[email protected]>
BarunKGP pushed a commit to BarunKGP/grafana-agent that referenced this pull request Feb 20, 2024
* feat(exporter/elasticsearch): add Basic Auth support

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

* misc: fix changelog entry (grafana#5812)

PR grafana#5802 accidentally added the changelog entry to a published release.

* fix(exporter/elasticsearch): only add Auth header when needed

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

* doc(exporter/elasticsearch): add Basic Auth block desc

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

* feat(exporter/elasticsearch): add Basic Auth support

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

* feat(exporter/elasticsearch): support Basic Auth for static config

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

* chore(CHANGELOG): remove merge conflict artifact

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

* misc: fix changelog entry

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

* feat(converter): map ES exporter's BasicAuth flow from static to flow

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

* fix(converter): nil check for ES exporter's Basic Auth

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

* lint

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

---------

Signed-off-by: hainenber <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Co-authored-by: Robert Fratto <[email protected]>
Co-authored-by: erikbaranowski <[email protected]>
@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.

2 participants