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 v0.18.1 into main #802

Merged
merged 38 commits into from
Aug 9, 2021
Merged

Merge v0.18.1 into main #802

merged 38 commits into from
Aug 9, 2021

Conversation

mattdurham
Copy link
Collaborator

PR Description

This is the merge of changed code from v0.18.1. Primarily the remote.go change and versioning

Which issue(s) this PR fixes

Closes #789

Notes to the Reviewer

PR Checklist

  • CHANGELOG updated
  • Documentation added
  • Tests updated

# Conflicts:
#	.github/workflows/test.yml
#	CHANGELOG.md
#	Makefile
#	docs/configuration-reference.md
#	docs/getting-started.md
#	docs/operator/getting-started.md
#	docs/upgrade-guide.md
#	example/docker-compose/agent/config/agent-local.yaml
#	go.mod
#	go.sum
#	pkg/tempo/config.go
#	pkg/tempo/config_test.go
#	production/README.md
#	production/grafanacloud-install.sh
#	production/kubernetes/agent-bare.yaml
#	production/kubernetes/agent-loki.yaml
#	production/kubernetes/agent-sigv4.yaml
#	production/kubernetes/agent-tempo.yaml
#	production/kubernetes/agent.yaml
#	production/kubernetes/build/lib/version.libsonnet
#	production/kubernetes/install-bare.sh
#	production/kubernetes/install-loki.sh
#	production/kubernetes/install-sigv4.sh
#	production/kubernetes/install-tempo.sh
#	production/kubernetes/install.sh
#	production/tanka/grafana-agent/v1/main.libsonnet
@mattdurham mattdurham marked this pull request as ready for review August 9, 2021 15:59
@mattdurham mattdurham requested a review from rfratto August 9, 2021 16:00
@mattdurham mattdurham merged commit 8d18c1e into main Aug 9, 2021
@mattdurham mattdurham deleted the merge_v0.18.1_into_main branch August 9, 2021 16:58
@mattdurham mattdurham mentioned this pull request Sep 7, 2021
3 tasks
rfratto added a commit that referenced this pull request Sep 22, 2021
* move the KV store list optimization to the KV fork

* add extra kv fixture to verify prefix trimming works

* linter

* changelog

* make TestWatchPrefix less flaky on slow machines
mattdurham added a commit that referenced this pull request Nov 11, 2021
* Initialize biggest ref to existing ref when reading a segment (#676)

* initialize biggest ref to existing ref when reading a segment

* changelog

* allow new test to be less hard-coded

* explain error if test fails

* clarify changelog issue

* prepare for v0.16.1 release (#679)

* adding docker-compose example for local testing

(cherry picked from commit 992e3cf)

* Cherry picking kafka importer

* update Operator FAQ to describe custom scrape jobs (#658)

* Merge

* merge for race condition

* Wall cherry pick

* Import Kafka

* Bump version number to v0.17.0

* Initial release of v0.18.0 includes github_exporter, enabled flag issue, OTLP HTPP, and updated postgres exporter

* Tempo/traces docs fixes for v0.18.0 (#784)

* Needs to be loki for the naming change

* Update date

* No change, just trying to trigger drone

* Fix for drone naming

* Changes that needed to me imported for drone to work.

* Update drone issues

* sign drone

* Drone changes

* Update operator

* standardize on seego

* Test tag

* fix tag

* updated makefile

* release tag fixing

* remove extra tag

* consul specific list support added

* Fix type

* Add comment

* Fix for etcd issue that I introduced

* Update to v0.18.1

* Fix for test error

* Fix small naming/style issues

* Fix small naming/style issues

* Update go.mod

* Update configuration changes to v0.18.1

Co-authored-by: Robert Fratto <robert.fratto@grafana.com>
Co-authored-by: Gabriel <g.amaral.antunes@gmail.com>
Co-authored-by: Mario <mariorvinas@gmail.com>
@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 11, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 11, 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.

Potential inefficiency retrieving configurations from consul in scraping service mode
4 participants