Merge v0.18.2 to main #822
Merged
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
* 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
(cherry picked from commit 992e3cf)
…ue, OTLP HTPP, and updated postgres exporter
# Conflicts: # .drone/drone.yml # .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/prom/instance/configstore/remote.go # 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
rfratto
approved these changes
Aug 12, 2021
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 * Update version number to v0.18.2 and fix issues with prefixes. * Update missed merges * Add operate allowed version 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
bot
added
the
frozen-due-to-age
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.
PR Description
Merge changes from v0.18.2 into main
Which issue(s) this PR fixes
Closes #812
Closes #815
Notes to the Reviewer
PR Checklist