Augustin Husson
87463257a7
upgrade lezer deps to be aligned between the mirror and prometheus
...
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2021-12-20 20:53:44 +01:00
Ganesh Vernekar
b8565c5884
Merge 2.30.4 and 2.31.2 into main ( #10049 )
...
* Fix queries after a failed snapshot replay (#9980 ) (#9987 )
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
* Fix queries after a failed snapshot replay (#9980 ) (#9986 )
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
* Cut v2.30.4 (#9988 )
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
* Cut v2.31.2 (#9989 )
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2021-12-20 22:37:35 +05:30
Ganesh Vernekar
ae3eca0909
Merge remote-tracking branch 'upstream/release-2.31' into merge-releases
...
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2021-12-20 22:16:59 +05:30
Ganesh Vernekar
0c7838c370
Merge remote-tracking branch 'upstream/release-2.30' into merge-releases
...
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2021-12-20 19:43:45 +05:30
Shihao Xia
f5c3ea1bf2
fix missing db.Close() in web_test.go in order to avoid goroutine leak ( #10035 )
...
Signed-off-by: Shihao Xia <charlesxsh@hotmail.com>
2021-12-20 17:37:53 +05:30
jessicagreben
59f7ef06d0
update exit code for sd
...
Signed-off-by: jessicagreben <jessicagrebens@gmail.com>
2021-12-18 04:45:15 -08:00
Shihao Xia
3696d7dedb
fix potential goroutine leaks
...
Signed-off-by: Shihao Xia <charlesxsh@hotmail.com>
2021-12-17 18:35:30 -05:00
Julien Pivotto
27343277fa
Merge release-2.32 forward into main ( #10032 )
...
* storage: expose bug in iterators #10027
Signed-off-by: beorn7 <beorn@grafana.com>
* storage: fix bug #10027 in iterators' Seek method
Signed-off-by: beorn7 <beorn@grafana.com>
* Append reporting metrics without limit
If reporting metrics fails due to reaching the limit, this makes the
target appear as UP in the UI, but the metrics are missing.
This commit bypasses that limit for report metrics.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
* Remove check against cfg so interval/ timeout are always set (#10023 ) (#10031 )
Signed-off-by: Nicholas Blott <blottn@tcd.ie>
Co-authored-by: Nicholas Blott <blottn@tcd.ie>
* Cut v2.32.1
Signed-off-by: Julius Volz <julius.volz@gmail.com>
* Apply suggestions from code review
Signed-off-by: Julius Volz <julius.volz@gmail.com>
Co-authored-by: Levi Harrison <git@leviharrison.dev>
Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu>
Co-authored-by: Nicholas Blott <blottn@tcd.ie>
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Co-authored-by: Levi Harrison <git@leviharrison.dev>
2021-12-17 23:18:38 +01:00
Julius Volz
41f1a8125e
Merge pull request #10042 from prometheus/cut-2-32-1
...
Cut v2.32.1
2021-12-17 20:15:41 +01:00
Julius Volz
c53817c04c
Apply suggestions from code review
...
Signed-off-by: Julius Volz <julius.volz@gmail.com>
Co-authored-by: Levi Harrison <git@leviharrison.dev>
2021-12-17 17:17:33 +01:00
renzheng.wang
3462b79f4b
fix TestAgentAPIEndPoints ( #9882 )
...
* fix TestAgentAPIEndPoints
Signed-off-by: renzheng.wang <wangrzneu@gmail.com>
* fix TestAgentAPIEndPoints
Signed-off-by: renzheng.wang <wangrzneu@gmail.com>
2021-12-17 14:36:15 +00:00
Julius Volz
bf6e6b444e
Cut v2.32.1
...
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2021-12-17 13:28:18 +01:00
Julius Volz
fa552b98bb
Merge pull request #9996 from roidelapluie/fixreportlimit
...
Fix reporting metrics when sample limit is reached during the report
2021-12-17 13:17:07 +01:00
Julien Pivotto
67a64ee092
Remove check against cfg so interval/ timeout are always set ( #10023 ) ( #10031 )
...
Signed-off-by: Nicholas Blott <blottn@tcd.ie>
Co-authored-by: Nicholas Blott <blottn@tcd.ie>
2021-12-16 16:46:14 +01:00
Björn Rabenstein
565ee356df
Merge pull request #10030 from prometheus/beorn7/iterators
...
storage: expose and fix bug #10027 in iterators' Seek method
2021-12-16 14:35:40 +01:00
Nicholas Blott
c92673fb14
Remove check against cfg so interval/ timeout are always set ( #10023 )
...
Signed-off-by: Nicholas Blott <blottn@tcd.ie>
2021-12-16 13:28:46 +01:00
Julien Pivotto
e94a0b28e1
Append reporting metrics without limit
...
If reporting metrics fails due to reaching the limit, this makes the
target appear as UP in the UI, but the metrics are missing.
This commit bypasses that limit for report metrics.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-12-16 13:26:53 +01:00
beorn7
0ede6ae321
storage: fix bug #10027 in iterators' Seek method
...
Signed-off-by: beorn7 <beorn@grafana.com>
2021-12-16 12:07:35 +01:00
beorn7
b042e29569
storage: expose bug in iterators #10027
...
Signed-off-by: beorn7 <beorn@grafana.com>
2021-12-16 12:02:15 +01:00
uesyn
13af2470bf
Add stripPort to template function ( #10002 )
...
* template: add `stripPort` to template functions
Signed-off-by: GitHub <suemura@zlab.co.jp>
2021-12-16 09:27:31 +00:00
dependabot[bot]
a14960eae1
build(deps): bump github.com/prometheus/exporter-toolkit ( #9975 )
...
Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit ) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/prometheus/exporter-toolkit/releases )
- [Changelog](https://github.com/prometheus/exporter-toolkit/blob/master/CHANGELOG.md )
- [Commits](https://github.com/prometheus/exporter-toolkit/compare/v0.7.0...v0.7.1 )
---
updated-dependencies:
- dependency-name: github.com/prometheus/exporter-toolkit
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-15 09:59:14 +01:00
dependabot[bot]
87c5e9bc37
build(deps): bump github.com/gophercloud/gophercloud ( #10017 )
...
Bumps [github.com/gophercloud/gophercloud](https://github.com/gophercloud/gophercloud ) from 0.23.0 to 0.24.0.
- [Release notes](https://github.com/gophercloud/gophercloud/releases )
- [Changelog](https://github.com/gophercloud/gophercloud/blob/master/CHANGELOG.md )
- [Commits](https://github.com/gophercloud/gophercloud/compare/v0.23.0...v0.24.0 )
---
updated-dependencies:
- dependency-name: github.com/gophercloud/gophercloud
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>
2021-12-15 09:57:36 +01:00
Julien Pivotto
db1551bd21
Merge pull request #10016 from prometheus/release-2.32
...
Merge back release 2.32
2021-12-14 20:58:58 +01:00
Julius Volz
52c693a63b
Merge pull request #9984 from prometheus/cut-2-32-0
...
Cut v2.32.0
2021-12-14 16:09:51 +01:00
dependabot[bot]
9cf3f8ea18
build(deps): bump github.com/docker/docker
...
Bumps [github.com/docker/docker](https://github.com/docker/docker ) from 20.10.11+incompatible to 20.10.12+incompatible.
- [Release notes](https://github.com/docker/docker/releases )
- [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/docker/docker/compare/v20.10.11...v20.10.12 )
---
updated-dependencies:
- dependency-name: github.com/docker/docker
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-14 16:09:13 +01:00
dependabot[bot]
1de77fe650
build(deps): bump github.com/Azure/go-autorest/autorest
...
Bumps [github.com/Azure/go-autorest/autorest](https://github.com/Azure/go-autorest ) from 0.11.22 to 0.11.23.
- [Release notes](https://github.com/Azure/go-autorest/releases )
- [Changelog](https://github.com/Azure/go-autorest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Azure/go-autorest/compare/autorest/v0.11.22...autorest/v0.11.23 )
---
updated-dependencies:
- dependency-name: github.com/Azure/go-autorest/autorest
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-14 16:08:56 +01:00
Julius Volz
4aee56432b
Merge pull request #10013 from roidelapluie/updatebinfmt
...
Update circleci orb
2021-12-14 16:08:45 +01:00
dependabot[bot]
77503e3f59
build(deps): bump google.golang.org/api from 0.61.0 to 0.63.0
...
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client ) from 0.61.0 to 0.63.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](https://github.com/googleapis/google-api-go-client/compare/v0.61.0...v0.63.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>
2021-12-14 16:08:39 +01:00
Julien Pivotto
e1408510e1
Update circleci orb
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-12-14 15:01:12 +01:00
Julien Pivotto
06c0483045
Update circleci orb
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-12-14 14:41:50 +01:00
dependabot[bot]
18ee5fd279
build(deps): bump github.com/aws/aws-sdk-go from 1.42.22 to 1.42.23
...
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go ) from 1.42.22 to 1.42.23.
- [Release notes](https://github.com/aws/aws-sdk-go/releases )
- [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.42.22...v1.42.23 )
---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-14 13:43:30 +01:00
Julien Pivotto
2366d23036
Format endpointslice documentation like other sections
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-12-14 13:43:15 +01:00
fpetkovski
de87515b24
Implement target discovery in own k8s namespace
...
This commit adds support for discovering targets from the same
Kubernetes namespace as the Prometheus pod itself. Own-namespace
discovery can be indicated by using "." as the namespace.
Fixes #9782
Signed-off-by: fpetkovski <filip.petkovsky@gmail.com>
2021-12-14 13:41:38 +01:00
Julius Volz
89263292a9
Cut v2.32.0
...
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2021-12-13 20:28:54 +01:00
dependabot[bot]
6f3e664ae7
build(deps): bump actions/upload-artifact from 2.2.4 to 2.3.0 ( #9994 )
...
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact ) from 2.2.4 to 2.3.0.
- [Release notes](https://github.com/actions/upload-artifact/releases )
- [Commits](https://github.com/actions/upload-artifact/compare/v2.2.4...v2.3.0 )
---
updated-dependencies:
- dependency-name: actions/upload-artifact
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>
2021-12-10 14:10:51 +01:00
dependabot[bot]
f45e9f93bd
build(deps): bump github.com/Azure/azure-sdk-for-go ( #9998 )
...
Bumps [github.com/Azure/azure-sdk-for-go](https://github.com/Azure/azure-sdk-for-go ) from 59.4.0+incompatible to 60.1.0+incompatible.
- [Release notes](https://github.com/Azure/azure-sdk-for-go/releases )
- [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/CHANGELOG.md )
- [Commits](https://github.com/Azure/azure-sdk-for-go/compare/v59.4.0...v60.1.0 )
---
updated-dependencies:
- dependency-name: github.com/Azure/azure-sdk-for-go
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-10 14:10:24 +01:00
dependabot[bot]
86adf4f33e
build(deps-dev): bump eslint from 8.4.0 to 8.4.1 in /web/ui ( #9961 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 8.4.0 to 8.4.1.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.4.0...v8.4.1 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-10 14:01:36 +01:00
dependabot[bot]
0e2b3ab9d3
build(deps): bump k8s.io/client-go from 0.22.4 to 0.23.0 ( #9976 )
...
Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go ) from 0.22.4 to 0.23.0.
- [Release notes](https://github.com/kubernetes/client-go/releases )
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kubernetes/client-go/compare/v0.22.4...v0.23.0 )
---
updated-dependencies:
- dependency-name: k8s.io/client-go
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>
2021-12-10 14:00:52 +01:00
dependabot[bot]
77670cb5a2
build(deps): bump github.com/aws/aws-sdk-go from 1.42.20 to 1.42.22 ( #9995 )
...
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go ) from 1.42.20 to 1.42.22.
- [Release notes](https://github.com/aws/aws-sdk-go/releases )
- [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.42.20...v1.42.22 )
---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-10 13:22:32 +01:00
Ganesh Vernekar
fbe3167fda
Support having an empty queue for writing m-map chunks immediately ( #84 )
...
* Support having an empty queue for flushing m-map chunks
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
* Use old ChunkDiskMapper for 0 length
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
* Fix tests
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
* Fix lint
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2021-12-10 17:30:34 +05:30
Augustin Husson
a97da71ea9
deactivate dependabot for web dependencies ( #9973 )
...
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2021-12-10 12:15:48 +01:00
Marco Pracucci
0b925be33d
Nits after PR 57 merge ( #85 )
...
Signed-off-by: Marco Pracucci <marco@pracucci.com>
2021-12-10 15:40:04 +05:30
Chris Marchbanks
0a8d28ea93
Merge pull request #9934 from bboreham/remote-write-struct
...
remote-write: buffer struct instead of interface to reduce garbage-collection
2021-12-09 09:17:45 -07:00
Bryan Boreham
bd6436605d
Review feedback
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2021-12-09 14:40:44 +00:00
Julius Volz
b9edb9031f
Merge pull request #9985 from codesome/release-2.32
...
Cherry pick #9980 onto release-2.32
2021-12-09 12:38:47 +01:00
Ganesh Vernekar
bd21aafb66
Cut v2.31.2 ( #9989 )
...
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2021-12-09 04:29:17 -07:00
Ganesh Vernekar
c0a8b0cd40
Cut v2.30.4 ( #9988 )
...
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2021-12-09 12:17:47 +01:00
Ganesh Vernekar
160aee17bb
Merge pull request #77 from grafana/syncp
...
Sync with Prometheus main
2021-12-09 16:25:41 +05:30
Ganesh Vernekar
087e3c7360
Fix queries after a failed snapshot replay ( #9980 ) ( #9986 )
...
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2021-12-09 11:49:17 +01:00
Ganesh Vernekar
df36efb98a
Merge remote-tracking branch 'upstream/main' into syncp
2021-12-09 16:07:02 +05:30