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 main into remote-write-2.0 #13946

Merged
merged 371 commits into from
Apr 18, 2024
Merged

Merge main into remote-write-2.0 #13946

merged 371 commits into from
Apr 18, 2024

Conversation

bwplotka
Copy link
Member

Opening PR to run CI through here.

dependabot bot and others added 30 commits March 1, 2024 23:48
Bumps [github.com/influxdata/influxdb](https://github.com/influxdata/influxdb) from 1.11.4 to 1.11.5.
- [Release notes](https://github.com/influxdata/influxdb/releases)
- [Commits](influxdata/influxdb@v1.11.4...v1.11.5)

---
updated-dependencies:
- dependency-name: github.com/influxdata/influxdb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Update `github.com/hashicorp/nomad/api` now that we require Go 1.21.

Signed-off-by: SuperQ <superq@gmail.com>
…b.com/prometheus/alertmanager-0.27.0

build(deps): bump github.com/prometheus/alertmanager from 0.26.0 to 0.27.0
…entation/examples/remote_storage/github.com/influxdata/influxdb-1.11.5

build(deps): bump github.com/influxdata/influxdb from 1.11.4 to 1.11.5 in /documentation/examples/remote_storage
…g.org/x/oauth2-0.17.0

build(deps): bump golang.org/x/oauth2 from 0.16.0 to 0.17.0
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.4 to 1.9.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.4...v1.9.0)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…ufbuild/buf-lint-action-1.1.0

build(deps): bump bufbuild/buf-lint-action from 1.0.3 to 1.1.0
…ctions/setup-go-5.0.0

build(deps): bump actions/setup-go from 4.1.0 to 5.0.0
…ctions/upload-artifact-4.3.1

build(deps): bump actions/upload-artifact from 4.0.0 to 4.3.1
…cripts/golangci/golangci-lint-action-4.0.0

build(deps): bump golangci/golangci-lint-action from 3.7.0 to 4.0.0 in /scripts
Bumps [actions/cache](https://github.com/actions/cache) from 3.3.1 to 4.0.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@88522ab...ab5e6d0)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…ctions/cache-4.0.1

build(deps): bump actions/cache from 3.3.1 to 4.0.1
…entelemetry-io-0441a389d0

build(deps): bump the go-opentelemetry-io group with 10 updates
docs: textparse.Parser return type mismatch
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.157.0 to 0.167.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.157.0...v0.167.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…entation/examples/remote_storage/github.com/stretchr/testify-1.9.0

build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0 in /documentation/examples/remote_storage
Always align scrapes even if tolerance is bigger than 1% of scrape interval
Route different alerts to different alertmanagers
…e.golang.org/api-0.167.0

build(deps): bump google.golang.org/api from 0.157.0 to 0.167.0
Signed-off-by: darshanime <deathbullet@gmail.com>
Signed-off-by: beorn7 <beorn@grafana.com>
SampleRingIterator: add currType field
Signed-off-by: Charles Korn <charles.korn@grafana.com>
When a limit is specified, the API may return arbitrary rows, so don't
check specific response values.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
This is what we use for builds, so do the main testing (with -race) under that flag.

Drop non-stringlabels tests from current Go version; previous Go version still runs them.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
…ues if it's supported by the linter

clean up common-lint target

Signed-off-by: machine424 <ayoubmrini424@gmail.com>
API tests: fix flaky TestEndpoints
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
NeerajGartia21 and others added 5 commits April 11, 2024 12:53
…13916)

includes Inf and NaN as numbers to histogram

---------

Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>
Signed-off-by: Björn Rabenstein <github@rabenste.in>
Co-authored-by: Björn Rabenstein <github@rabenste.in>
histograms: support expansion of native histogram values in templating
In a previous PR, the generated parser was created using an old version of goyacc.

Also adds -l to disable line directives, which fixes debug processing and reduces diffs at the expense of making it more difficult to reason about the generated output.

Signed-off-by: Owen Williams <owen.williams@grafana.com>
List Prometheus v3 coordinators in MAINTAINERS.md
# Conflicts:
#	cmd/prometheus/main.go
#	docs/command-line/prometheus.md
#	documentation/examples/remote_storage/go.mod
#	documentation/examples/remote_storage/go.sum
#	storage/remote/client.go
#	storage/remote/otlptranslator/prometheusremotewrite/helper.go
#	storage/remote/queue_manager.go
#	storage/remote/queue_manager_test.go
#	storage/remote/write_handler.go
#	storage/remote/write_handler_test.go
#	tsdb/wlog/watcher_test.go
Signed-off-by: bwplotka <bwplotka@gmail.com>
@bwplotka bwplotka merged commit 7b88101 into remote-write-2.0 Apr 18, 2024
37 checks passed
@bwplotka bwplotka deleted the rw-2-main2 branch April 18, 2024 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet