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-19) #39

Merged
merged 24 commits into from
Mar 19, 2024

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Mar 19, 2024

Here we are again!

mattdurham and others added 24 commits March 13, 2024 13:57
* Make git test linux only.

* fix lint
* Set explicit units in histograms

* Use stacked panels.
They give us more information about the total data for all pods.

* Fix units of batch histogram
…#6636)

Bumps [github.com/go-jose/go-jose/v3](https://github.com/go-jose/go-jose) from 3.0.1 to 3.0.3.
- [Release notes](https://github.com/go-jose/go-jose/releases)
- [Changelog](https://github.com/go-jose/go-jose/blob/v3.0.3/CHANGELOG.md)
- [Commits](go-jose/go-jose@v3.0.1...v3.0.3)

---
updated-dependencies:
- dependency-name: github.com/go-jose/go-jose/v3
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…6678)

Bumps google.golang.org/protobuf from 1.32.0 to 1.33.0.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/jackc/pgx/v4](https://github.com/jackc/pgx) from 4.18.1 to 4.18.2.
- [Changelog](https://github.com/jackc/pgx/blob/v4.18.2/CHANGELOG.md)
- [Commits](jackc/pgx@v4.18.1...v4.18.2)

---
updated-dependencies:
- dependency-name: github.com/jackc/pgx/v4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Small tweak for patch releases case.
* create a path for traces in the static mode config builder

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

---------

Signed-off-by: erikbaranowski <[email protected]>
Default values for filesystem.fs_types_exclude and netstat.fields do
not contain escapes for the "|" character.

Co-authored-by: Clayton Cornell <[email protected]>
…… (#6700)

* Pass in a label prefix from static to otelcolconvert so multiple trace configs don't bump into each other

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

* only add a label prefix if we have more than one trace config

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

---------

Signed-off-by: erikbaranowski <[email protected]>
This commit re-syncs `otelcol.receiver.opencensus` with the upstream
defaults, namely changing the default listen port from 4317 to 55678.

This is considered a breaking change; a section has been written in the
upgrade guide notifying users to explicitly set the endpoint to the
previous port to retain old behavior when upgrading.

Closes #6489.
…#6643)

Signed-off-by: hainenber <[email protected]>
Co-authored-by: Clayton Cornell <[email protected]>
Co-authored-by: Robert Fratto <[email protected]>
…ssor` to upstream (#6513)

Signed-off-by: hainenber <[email protected]>
Co-authored-by: Clayton Cornell <[email protected]>
The deprecation status of classic modules was constrained to the concept
page of modules. This commit adds the deprecation notice to each
component reference page and mentions it in the release notes.

Co-authored-by: Clayton Cornell <[email protected]>
* WIP

* feedback, ty

* feedback

* Write about config changes to agent using helm chart

* generic install done

* generic configure done

* wip

* simplify

* cleanup

* Update docs/sources/flow/get-started/install/kubernetes.md

Co-authored-by: Clayton Cornell <[email protected]>

* Clayton's review, thanks!

Co-authored-by: Clayton Cornell <[email protected]>

* Update docs/sources/flow/get-started/install/kubernetes.md

Co-authored-by: Clayton Cornell <[email protected]>

---------

Co-authored-by: Clayton Cornell <[email protected]>
… (#6675)

* otelcolconvert: support converting bearertoken and headerssetter auth extensions

Signed-off-by: Paschalis Tsilias <[email protected]>

* our defaults now match upstream for queue size so we can remove setting in the .yaml for converter tests

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

---------

Signed-off-by: Paschalis Tsilias <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Co-authored-by: erikbaranowski <[email protected]>
* add otel conversion to otelcol.exporter.logging

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

* reorganize static builder code and stub out automatic_logging for traces handling

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

* wire up default otelcol.exporter.logging to replace the automatic_logging processor

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

---------

Signed-off-by: erikbaranowski <[email protected]>
…netes` package (#6592)

Signed-off-by: hainenber <[email protected]>
Co-authored-by: William Dumont <[email protected]>
@rfratto rfratto merged commit 4d5df55 into main Mar 19, 2024
9 checks passed
@rfratto rfratto deleted the sync-grafana-agent-2024-03-19-1 branch March 19, 2024 15:00
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 19, 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.

10 participants