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

[dev.multiple-integrations] Merge main (again) - #1193

Merged
rfratto merged 6 commits into
grafana-cold-storage:dev.multiple-integrationsfrom
rfratto:merge-main-20211217
Dec 17, 2021
Merged

[dev.multiple-integrations] Merge main (again)#1193
rfratto merged 6 commits into
grafana-cold-storage:dev.multiple-integrationsfrom
rfratto:merge-main-20211217

Conversation

@rfratto

@rfratto rfratto commented Dec 17, 2021

Copy link
Copy Markdown
Contributor

Merge main to bring in #1192.

mapno and others added 6 commits December 17, 2021 11:52
* Jsonnet lint

* Upgrade jsonnet libs

* Tracing pipeline dashboard

* Changelog

* Lint

* Lint

* Specify transport for receivers

* Add alerts

* Changelog

* Add grafana prefix

* Fix jsonnet formatting
…d-storage#1154)

Make reference to how any collector can be enabled if it's non
experimental, but some collectors accept extra configuration.
…nfigs (grafana-cold-storage#1192)

* pkg/integrations: decouple common config from integrations

* fix linting issues
@rfratto
rfratto enabled auto-merge December 17, 2021 22:49
@rfratto
rfratto merged commit 7810ec3 into grafana-cold-storage:dev.multiple-integrations Dec 17, 2021
@rfratto
rfratto deleted the merge-main-20211217 branch December 17, 2021 22:56
@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 6, 2024
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 6, 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