Skip to content
This repository was archived by the owner on Jul 28, 2026. It is now read-only.

Merge 'main' into 'dev.multiple-integrations' - #1145

Merged
rfratto merged 29 commits into
grafana-cold-storage:dev.multiple-integrationsfrom
rfratto:dev.multiple-integrations.update
Dec 2, 2021
Merged

Merge 'main' into 'dev.multiple-integrations'#1145
rfratto merged 29 commits into
grafana-cold-storage:dev.multiple-integrationsfrom
rfratto:dev.multiple-integrations.update

Conversation

@rfratto

@rfratto rfratto commented Dec 2, 2021

Copy link
Copy Markdown
Contributor

No description provided.

hjet and others added 28 commits November 4, 2021 16:58
…ge#1065)

* Add metrics service per Grafana Agent

* Update changelog

* Remove dead code
…-cold-storage#1064)

* Add relabel_config.libsonnet to logs templates dir
* Update CHANGELOG.md
* Ditch cache library for map + mutex

The implementation with the cache library had a ver bad performance,
specially when calling `Items()`, since it would create a new map
and copy all items to it.

This commit changes the implementation to use a map with a mutex.

* Clean up and comments

* Correctly set expiration time

* Notify of ready edges instead of looping through all

* Use list to store edges

* Minor fixes and comments

* Properly check when head edge should be evicted

* Remove old logic from previous implementations

* Extract store to its own struct

* Remove ugly copy

* Fix shutdown

* Correct log level

* Correctly measure dropped spans

* Minor fixes

* Move collection logic outside store

* Store tests

* Fix dropped items logic

* Lint fixes

* Fix flaky test

* Unnest for clarity

* Skip empty service name spans

* Update changelog

* Fmt
* upgrade loki version

* update kubernetes sd config in test

* fix windows logger

* update prometheus

* update prometheus dependency to grafana/prometheus

* remove commented replace

* add changelog entry for primary dependency updates

* comment on klog-gokit replace

* remove weaveworks/common replace

* get rid of forks with merged PRs

* make crds

* update changelog entry for prometheus
…storage#1077)

Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
…rafana-cold-storage#1075)

* pkg/integrations: Add Ryan Geyer and Gabriel Antunes as code owners

* update MAINTAINERS list
* Add Helm quickstart guide

* Update CHANGELOG.md

* Remove trailing newlines

* Update docs/operator/helm-getting-started.md

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* Update docs/operator/helm-getting-started.md

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* Update docs/operator/helm-getting-started.md

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* Update docs/operator/helm-getting-started.md

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* Update docs/operator/helm-getting-started.md

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* Update docs/operator/helm-getting-started.md

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* Update docs/operator/helm-getting-started.md

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* Update docs/operator/helm-getting-started.md

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>

* Review edits and link from production/README.md

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>
* hack around dash not having pipefail

* fix typo 🤦‍♂️

* remove cat

* add comment

* fix shellcheck issues

* trap and send TERM sig in fatal

* hide error message
* update github.com/go-kit/kit to v0.12.0

* node_exporter integration: fix build error on non-linux GOOS

Co-authored-by: Robert Fratto <robertfratto@gmail.com>
* Reorg agent operator docs
* Update CHANGELOG.md
…ld-storage#1076)

* Document new options

* Add tests and fix logic

* Changelog

* lint

* Moar fixes

* Remove noisy log

* Ups, clean up println

* Better naming
* Fix parsePostgresURL issue

* Update Implementation and fix unit test

* Add nolint and fix unit test

* Update changelog

* move changelog entry to unreleased

Co-authored-by: Robert Fratto <robertfratto@gmail.com>
…1092)

* adding the logger to statsd exporter mapper

* Updating changelog

* Fixing typo in changelog

* update statsd_exporter to include registry fix

Fixes grafana-cold-storage#1002

Co-authored-by: Robert Fratto <robertfratto@gmail.com>
…rafana-cold-storage#1119)

This avoids noisy logs when someone uses the agent only for logs/traces.

Fixes #735
* Setup CD for agent

This deploys agent to dev on a merge to main.

Depends on https://github.com/grafana/deployment_tools/pull/19936

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Update config and drone hash

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Hopefully final changes

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Finally make it work!

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
* fix relref link

* Update docs/scraping-service/_index.md

Co-authored-by: Mario <mariorvinas@gmail.com>

Co-authored-by: Mario <mariorvinas@gmail.com>
@rfratto
rfratto force-pushed the dev.multiple-integrations.update branch from 00fcb61 to 8660209 Compare December 2, 2021 18:16
@rfratto
rfratto requested review from mattdurham and rlankfo December 2, 2021 18:17

@mattdurham mattdurham left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

@rfratto
rfratto merged commit 5df6222 into grafana-cold-storage:dev.multiple-integrations Dec 2, 2021
@rfratto
rfratto deleted the dev.multiple-integrations.update branch December 2, 2021 18:44
@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 7, 2024
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 7, 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.