Commit graph

203 commits

Author SHA1 Message Date
Arve Knudsen 3989da3514 Disable GitHub Actions Dependabot updates
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2023-09-18 13:32:59 +02:00
Arve Knudsen e48d4e5835 Merge remote-tracking branch 'prometheus/main' into chore/sync-prometheus
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2023-09-18 09:29:42 +02:00
Pedro Nacht 35a7ae6eb3
Ensure dependabot updates workflows in ./scripts
Signed-off-by: Pedro Kaj Kjellerup Nacht <pnacht@google.com>
2023-09-13 13:52:37 +00:00
Pedro Nacht 142c829fce
Hash-pin GitHub Actions
Signed-off-by: Pedro Kaj Kjellerup Nacht <pnacht@google.com>
2023-09-13 13:52:14 +00:00
Dimitar Dimitrov 77ac7ad40a
Merge remote-tracking branch 'upstream/main' into dimitar/pull-upstream 2023-09-05 16:19:00 +02:00
michalbiesek d1ff3eb868
Update golangci-lint (#12688)
Signed-off-by: Michal Biesek <michalbiesek@gmail.com>
2023-09-01 12:15:54 +02:00
dependabot[bot] dd00c74faf
build(deps): bump bufbuild/buf-setup-action from 1.23.1 to 1.26.1 (#12703)
Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.23.1 to 1.26.1.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](https://github.com/bufbuild/buf-setup-action/compare/v1.23.1...v1.26.1)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-01 10:40:12 +02:00
dependabot[bot] be831bbfe1
build(deps): bump golangci/golangci-lint-action from 3.6.0 to 3.7.0 (#12704)
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](https://github.com/golangci/golangci-lint-action/compare/v3.6.0...v3.7.0)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-01 10:39:55 +02:00
Michal Biesek 7d1110a679
Update Go version
Update build/test to use Go 1.21.

Signed-off-by: Michal Biesek <michalbiesek@gmail.com>
2023-08-25 17:47:40 +02:00
Matthieu MOREL 7e91a79c49
ci(deps): group k8s and opentelemetry dependencies
Dependabot allows to group dependencies by a list of pattern.
This allows it on k8s.io and opentelemetry dependencies separately

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2023-08-15 20:50:29 +02:00
Goutham Veeramachaneni ad4f514e66
Add OTLP Ingestion endpoint (#12571)
* Add OTLP Ingestion endpoint

We copy files from the otel-collector-contrib. See the README in
`storage/remote/otlptranslator/README.md`.

This supersedes: https://github.com/prometheus/prometheus/pull/11965

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

* Return a 200 OK

It is what the OTEL Golang SDK expect :(

https://github.com/open-telemetry/opentelemetry-go/issues/4363

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

---------

Signed-off-by: gouthamve <gouthamve@gmail.com>
Signed-off-by: Goutham <gouthamve@gmail.com>
2023-07-28 12:35:28 +02:00
Julien Pivotto 94edd08859
CI: Fix typo: arfefact -> artefacts (#12590)
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2023-07-22 14:29:34 +01:00
Jeanette Tan 8035c04624 Merge remote-tracking branch 'upstream/main'
Minor conflicts:
rules/manager.go
tsdb/compact.go
tsdb/db.go
go.mod
2023-07-19 21:40:27 +08:00
Julien Pivotto e0502f00c8
Merge pull request #11285 from ashishkurmi/main
ci: add minimum GitHub token permissions for workflows
2023-07-18 13:22:07 +02:00
Julian Tölle 5a0dea1d91
docs: use actual flag for signing off commits
Flag is documented as --signoff: https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---signoff

Signed-off-by: Julian Tölle <julian.toelle@hetzner-cloud.de>
2023-07-17 14:30:33 +02:00
Marco Pracucci 7ad111b27e
Merge remote-tracking branch 'remotes/prometheus/main' into update-upstream 2023-07-06 15:13:54 +02:00
Julien Pivotto fb06a127c7
Merge pull request #12512 from prometheus/dependabot/github_actions/bufbuild/buf-setup-action-1.23.1
build(deps): bump bufbuild/buf-setup-action from 1.20.0 to 1.23.1
2023-07-04 23:39:57 +02:00
Julien Pivotto 543d77327a
Merge pull request #12511 from prometheus/dependabot/github_actions/golangci/golangci-lint-action-3.6.0
build(deps): bump golangci/golangci-lint-action from 3.4.0 to 3.6.0
2023-07-04 23:39:35 +02:00
dependabot[bot] e8d4466ef4
build(deps): bump bufbuild/buf-setup-action from 1.20.0 to 1.23.1
Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.20.0 to 1.23.1.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](https://github.com/bufbuild/buf-setup-action/compare/v1.20.0...v1.23.1)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-04 11:58:23 +00:00
dependabot[bot] 1a355ded01
build(deps): bump golangci/golangci-lint-action from 3.4.0 to 3.6.0
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3.4.0 to 3.6.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](https://github.com/golangci/golangci-lint-action/compare/v3.4.0...v3.6.0)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-01 23:10:44 +00:00
Bryan Boreham 8a0c58dda5 Remove duplicated .github directory
Seems to have been an accident 8 months ago.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2023-06-30 17:15:44 +00:00
Francis Begyn a6449cd89c
Merge branch 'prometheus:main' into main 2023-06-30 14:50:54 +02:00
Julien Pivotto fe639b545f
Merge pull request #12420 from prometheus/dependabot/github_actions/bufbuild/buf-setup-action-1.20.0
build(deps): bump bufbuild/buf-setup-action from 1.17.0 to 1.20.0
2023-06-27 15:28:35 +02:00
SuperQ c18f5b6487
Update golangci-lint
* Update golangci-lint to v1.53.3.
* Update the sync script handler for the old golanci-lint action.

Signed-off-by: SuperQ <superq@gmail.com>
2023-06-27 14:21:39 +02:00
dependabot[bot] 084f38df12
build(deps): bump bufbuild/buf-setup-action from 1.17.0 to 1.20.0
Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.17.0 to 1.20.0.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](https://github.com/bufbuild/buf-setup-action/compare/v1.17.0...v1.20.0)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-01 23:57:03 +00:00
Julien Pivotto 2657e3a6ac
Merge pull request #12307 from prometheus/dependabot/github_actions/bufbuild/buf-setup-action-1.17.0
build(deps): bump bufbuild/buf-setup-action from 1.16.0 to 1.17.0
2023-05-17 00:49:41 +02:00
Ganesh Vernekar a96350f15f
Remove codesome and add jesusvazquez in CODEOWNERS for tsdb
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2023-05-09 19:30:18 +05:30
Oleg Zaytsev e5eb66f422
Merge pull request #503 from grafana/fixup-labels-usage3
labels: add stringlabels version of StableHash
2023-05-05 13:11:00 +02:00
Bryan Boreham 763af2dcce
Disable PRs from dependabot (#502)
* Disable PRs from dependabot

This repo should be be as far as possible identical to upstream Prometheus, so we don't want these PRs.

* Update .github/dependabot.yml

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

---------

Co-authored-by: Marco Pracucci <marco@pracucci.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2023-05-04 16:57:35 +00:00
Oleg Zaytsev 2cb71a164d Add CI pipeline to test with -tags=stringlabels
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
2023-05-04 16:55:28 +02:00
dependabot[bot] 1068be1991
build(deps): bump bufbuild/buf-setup-action from 1.16.0 to 1.17.0
Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.16.0 to 1.17.0.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](https://github.com/bufbuild/buf-setup-action/compare/v1.16.0...v1.17.0)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-01 23:57:09 +00:00
György Krajcsovits be2747dc52 Fix OOMing golangci-lint
Upgrade to version I tested locally.
The old version blew my memory.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2023-04-28 16:53:32 +02:00
Jeanette Tan caac4d5071 Upgrade go version to match prometheus (and need 1.19 for gomemlimit) 2023-04-26 22:27:32 +08:00
Bryan Boreham 13938d0ccc Update test_golang_oldest to 1.19
Since test_go is on 1.20, and it should use the previous version.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2023-04-22 10:16:49 +02:00
Matthieu MOREL 7e9acc2e46
golangci-lint: remove skip-cache and restore singleCaseSwitch rule
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2023-04-20 18:43:51 +02:00
Matthieu MOREL fb3eb21230 enable gocritic, unconvert and unused linters
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2023-04-13 19:20:22 +00:00
dependabot[bot] 3923e83413
build(deps): bump bufbuild/buf-setup-action from 1.13.1 to 1.16.0 (#12209)
Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.13.1 to 1.16.0.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](https://github.com/bufbuild/buf-setup-action/compare/v1.13.1...v1.16.0)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-03 23:25:07 +02:00
Julien Pivotto be07be7ff1
Merge pull request #12208 from prometheus/dependabot/github_actions/actions/cache-3.3.1
build(deps): bump actions/cache from 3.2.4 to 3.3.1
2023-04-03 22:11:04 +02:00
Julien Pivotto e37e53ac54
Merge pull request #12210 from prometheus/dependabot/github_actions/actions/setup-go-4
build(deps): bump actions/setup-go from 3 to 4
2023-04-03 22:10:14 +02:00
Julien Pivotto 53c66ee391
Merge pull request #12211 from prometheus/dependabot/github_actions/prometheus/promci-0.1.0
build(deps): bump prometheus/promci from 0.0.2 to 0.1.0
2023-04-03 22:08:49 +02:00
SuperQ 8b01189327
Move errcheck excludes config
Eliminate the need for a second config file for golangci-lint config
file by moving the list of errcheck exclude functions into the yaml
config.

Signed-off-by: SuperQ <superq@gmail.com>
2023-04-03 09:33:04 +02:00
dependabot[bot] a9af885de2
build(deps): bump prometheus/promci from 0.0.2 to 0.1.0
Bumps [prometheus/promci](https://github.com/prometheus/promci) from 0.0.2 to 0.1.0.
- [Release notes](https://github.com/prometheus/promci/releases)
- [Commits](https://github.com/prometheus/promci/compare/v0.0.2...v0.1.0)

---
updated-dependencies:
- dependency-name: prometheus/promci
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-01 23:57:22 +00:00
dependabot[bot] e15b0a29ac
build(deps): bump actions/setup-go from 3 to 4
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3 to 4.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](https://github.com/actions/setup-go/compare/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-01 23:57:17 +00:00
dependabot[bot] 2bd2a6006d
build(deps): bump actions/cache from 3.2.4 to 3.3.1
Bumps [actions/cache](https://github.com/actions/cache) from 3.2.4 to 3.3.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.2.4...v3.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-01 23:57:09 +00:00
Ganesh Vernekar 22806f2e83
Remove codesome as codeowner from promql/
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2023-03-27 17:18:01 +05:30
Francis Begyn 9e5cc340c3 stop github actions from sending me mail
Currently github actions keep sending me mails about things that should
only run on the prometheus organisation actions. This change makes sure
to check who owns the repository before running the CI workflow.

Signed-off-by: Francis Begyn <francis@begyn.be>
2023-03-14 18:56:24 +01:00
SuperQ 504a16d135
Update Go version
Update build/test to use Go 1.20.

Signed-off-by: SuperQ <superq@gmail.com>
2023-03-09 14:41:24 +01:00
Yuri Nikolic e75ad3db53 Necessary changes to make merge work 2023-03-09 14:38:06 +01:00
Yuri Nikolic 0eb15fce6d Merge remotes/prometheus/main into origin/main 2023-03-08 18:25:45 +01:00
Yuri Nikolic 88d9726b20 Fixing conflicts with commit 666f61a4d5 2023-03-08 16:54:40 +01:00