Merge grafana/agent:main into grafana/alloy:main (2024-03-11) #25
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: erikbaranowski <[email protected]>
* 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]>
Signed-off-by: erikbaranowski <[email protected]>
It seems `PodLogs` is meant in this peace of text, but `LogInstance` is written. This because in the next line it says LogInstances are deprecated. Co-authored-by: Clayton Cornell <[email protected]>
Signed-off-by: Paschalis Tsilias <[email protected]>
Signed-off-by: Paschalis Tsilias <[email protected]>
* Correct canonical URL * Update share syntax * Remove table that was accidentally pasted in from discovery.dns * Update docs/sources/flow/tutorials/flow-by-example/get-started.md Co-authored-by: Jack Baldry <[email protected]> * Fix up the H1 --------- Co-authored-by: Jack Baldry <[email protected]>
Signed-off-by: Paschalis Tsilias <[email protected]>
* Port promtail changes part 1 * changelog
This commit adds native histogram to Flow controller metrics (component evaluation time and component evaluation wait time). For the scope of this commit, both classic and native histograms are used for these metrics. A future commit will remove the classic histogram.
This commit adds support for native histograms in controller metrics. For basic backwards compatibility, the panels will show eitehr native histograms or classic histograms, but not both at the same time (due to how the "or" operator works in Prometheus).
… histograms (#6607) If both classic and native histograms are visualized concurrently, the old query would not consistently work properly in Grafana, as the `or` operator would return both classic and native histograms. This would cause Grafana to visualize the histograms inconsistently, sometimes showing nothing for time ranges where native histogram data should be available.
…ams (#6611) Native histograms do not have an `le` label, so there is no point in specifying `sum by (le)`. This change was tested and makes no visual difference to the panels.
* 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
…c when recreating the instance (#6608) Signed-off-by: hainenber <[email protected]>
Signed-off-by: Paschalis Tsilias <[email protected]>
Signed-off-by: hainenber <[email protected]> Co-authored-by: Clayton Cornell <[email protected]>
…ntu (#6612) Signed-off-by: hainenber <[email protected]>
* Update collect logs example * Correct spacing in River file
PR #6559 accidentally committed web/ui/build, because the .gitignore for it has moved to another directory. This commit removes the folder and explicitly adds it to the root-level .gitignore to prevent this from happening again.
…… (#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]>
The callback for one of the assert.EventuallyWithT calls incorrectly passed the test-wide *testing.T instance. This causes that assert.EventuallyWithT call to always return on the first tick, regardless of whether the assertion passed. This means that on slower machines, the first assertion would fail, the assert.EventuallyWithT call would return prematurely, and the rest of the test would fail in turn.
* add test for excluded paths * comment
Signed-off-by: hainenber <[email protected]>
* port loki 23d8c7c63c8b3cdc28645c7b50803ac5a53ddfa2 * port loki 9dad6a1350fdaa313fbea5512050c1f6f142e863 * Port loki d3d7ab7d82c6dda769f3867df3be8be9651b2fb5 * port loki a91f3f11b3bf15d559b7b9206fc7c2791ca71fdc * port loki 472496feb7c6b2461b6a537a7acaa0d6f6046ea4 * changelog
Signed-off-by: Paschalis Tsilias <[email protected]>
* Fix metric names * Remove LB exporter panels * Generate dashboards
* [FEAT #6416] nodePort value can be set now * [FEAT #6416] README fix * [FEAT #6416] test added * [FEAT #6416] tests have not been generated --------- Co-authored-by: Paschalis Tsilias <[email protected]>
* import source retrieves content as a map[string]string instead of string to allow an import source to return multiple sources * move detector into filedetector pkg * update import_file source to support importing a folder as a module * update doc * update changelog * add tests * lint * Update CHANGELOG.md * use directory instead of folder * export and rename types * use maps from stdlib instead of exp pkg * rename folder * protect the detector with mutex and prevent memory leaks * small refactor of collectFiles * Update docs/sources/flow/reference/config-blocks/import.file.md Co-authored-by: Clayton Cornell <[email protected]> * move test folder according to new structure * remove forgotten unused field --------- Co-authored-by: Clayton Cornell <[email protected]>
* import source retrieves content as a map[string]string instead of string to allow an import source to return multiple sources * add support directories support to import git * changelog and doc * add test * add temporary code for import_file * cleanup after merge * Update docs/sources/flow/reference/config-blocks/import.git.md Co-authored-by: Robert Fratto <[email protected]> * use Stat to check if the path is a dir or a file --------- Co-authored-by: Robert Fratto <[email protected]>
* docs: change release cadence description Change the release cadence description to allow for emergency minor releases to be published outside of the normal six-week cycle. This change is intended to be used for emergencies, and not a tool that is normally relied on. * docs: change release cadence to include OpenTelemetry Collector updates Change the release cadence description so that minor releases published within a cadence (e.g., not emergency releases) include updates to the OpenTelemetry Collector dependency, when updates are available.
Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.8.0 to 1.9.0. - [Release notes](https://github.com/helm/kind-action/releases) - [Commits](helm/kind-action@v1.8.0...v1.9.0) --- updated-dependencies: - dependency-name: helm/kind-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…594) Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.17.0 to 0.18.0. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](aquasecurity/trivy-action@84384bd...062f259) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [azure/setup-helm](https://github.com/azure/setup-helm) from 3 to 4. - [Release notes](https://github.com/azure/setup-helm/releases) - [Changelog](https://github.com/Azure/setup-helm/blob/main/CHANGELOG.md) - [Commits](Azure/setup-helm@v3...v4) --- updated-dependencies: - dependency-name: azure/setup-helm dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: shubhamgavali1998 <[email protected]> Co-authored-by: mattdurham <[email protected]> Co-authored-by: Clayton Cornell <[email protected]>
Signed-off-by: Paschalis Tsilias <[email protected]>
Signed-off-by: Paschalis Tsilias <[email protected]>
* add nonroot docker image * sign drone * back to one image * space
…gent-2024-03-11-1
rfratto
added
the
backport-to-agent:no
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Weekly sync of grafana/agent:main into grafana/alloy:main. There were mostly merge conflicts in documentation, but I followed the pattern established in #9 to resolve them.