mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-02 08:31:11 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
10285 commits 288 branches 448 tags 661 MiB
Commit graph

10285 commits

This branch
This branch
All branches
Author SHA1 Message Date
Goutham Veeramachaneni 2381d7be57
Send target and metadata cache in context (again) (#10636) 
* Send target and metadata cache in context (again)

The previous attempt was rolled back in #10590 due to memory issues.

`sl.parentCtx` and `sl.ctx` both had a copy of the cache and target info
in the previous attempt and it was hard to pin-point where the context
was being retained causing the memory increase.

I've experimented a bunch in #10627 to figure out that this approach doesn't
cause memory increase. Beyond that, just using this info in _any_ other context
is causing a memory increase.

The change fixed a bunch of long-standing in the OTel Collector that the
community was waiting on and release is blocked on a few downstream distrubutions
of OTel Collector waiting on a fix. I propose to merge this change in while
I investigate what is happening.

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

* Gate the change behind a manager option

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2022-05-03 11:45:52 -07:00
Kemal Akkoyun dd5f9daab9
Update link for referenced CNCF code of conduct (#10664) 
xref: https://github.com/prometheus/client_golang/pull/1041
xref: https://github.com/prometheus/client_golang/pull/1039
xref: https://github.com/prometheus/common/pull/377
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
 2022-05-03 18:32:23 +02:00
André Bauer 8cc27af6eb
fix markdown lint issues (#10591) 
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
 2022-05-03 10:59:09 +02:00
Julien Pivotto 71dbb4d091
Add lowercase and uppercase relabel action (#10641) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-05-03 10:09:53 +02:00
dependabot[bot] 4e6374180d
build(deps): bump google.golang.org/grpc from 1.45.0 to 1.46.0 (#10648) 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.45.0 to 1.46.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.45.0...v1.46.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  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>
 2022-05-02 15:48:50 +02:00
dependabot[bot] 0e938f89fd
build(deps): bump go.opentelemetry.io/otel from 1.6.1 to 1.7.0 (#10653) 
Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.6.1 to 1.7.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.6.1...v1.7.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/otel
  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>
 2022-05-02 15:48:31 +02:00
dependabot[bot] 51eb754e77
build(deps): bump github.com/linode/linodego from 1.4.0 to 1.4.1 (#10654) 
Bumps [github.com/linode/linodego](https://github.com/linode/linodego) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/linode/linodego/releases)
- [Commits](https://github.com/linode/linodego/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: github.com/linode/linodego
  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>
 2022-05-02 15:47:54 +02:00
dependabot[bot] d066b9c4c5
build(deps): bump k8s.io/api from 0.23.5 to 0.23.6 (#10649) 
Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.23.5 to 0.23.6.
- [Release notes](https://github.com/kubernetes/api/releases)
- [Commits](https://github.com/kubernetes/api/compare/v0.23.5...v0.23.6)

---
updated-dependencies:
- dependency-name: k8s.io/api
  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>
 2022-05-02 11:06:43 +02:00
dependabot[bot] 621afdc804
build(deps): bump bufbuild/buf-setup-action from 1.3.1 to 1.4.0 (#10646) 
Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](https://github.com/bufbuild/buf-setup-action/compare/v1.3.1...v1.4.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>
 2022-05-02 11:05:33 +02:00
dependabot[bot] b2e2751e23
build(deps): bump google.golang.org/api from 0.74.0 to 0.77.0 (#10647) 
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.74.0 to 0.77.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.74.0...v0.77.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>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-02 11:05:23 +02:00
Julien Pivotto 453e8a61df
Release Shepherd for 2.37 LTS (#10637) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-04-29 16:21:11 +02:00
Arunprasad Rajkumar 854d671b6b
chore: remove unused file assets_generate.go (#10638) 
This file seem to be a remaining of https://github.com/prometheus/prometheus/pull/10220

Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>
 2022-04-28 22:24:20 +02:00
Björn Rabenstein f76104d3e4
Merge pull request #10635 from prometheus/beorn7/doc 
Update README.md
 2022-04-27 17:31:05 +02:00
beorn7 01d90aef3c README.md: Cease to call the React UI "new experimental" 
Signed-off-by: beorn7 <beorn@grafana.com>
 2022-04-27 17:26:02 +02:00
beorn7 5d7b929e77 README.md: Update Godoc link 
Signed-off-by: beorn7 <beorn@grafana.com>
 2022-04-27 14:15:39 +02:00
Ted Robertson 9558b9b54b
Examples: explain what the duration in brackets means (#10589) 
Signed-off-by: Ted Robertson <10043369+tredondo@users.noreply.github.com>
 2022-04-27 11:31:01 +02:00
Ziqi Zhao 74e5b596da
add stripDomain to template function (#10475) 
* add stripDomain to template function

Signed-off-by: Ziqi Zhao <zzqwf12345@163.com>
 2022-04-27 11:30:05 +02:00
Matthieu MOREL e2ede285a2
refactor: move from io/ioutil to io and os packages (#10528) 
* refactor: move from io/ioutil to io and os packages
* use fs.DirEntry instead of os.FileInfo after os.ReadDir

Signed-off-by: MOREL Matthieu <matthieu.morel@cnp.fr>
 2022-04-27 11:24:36 +02:00
AndreSPy1 d8ca9aa67b
Allow setting the search term on alerts, targets, and discovery pages via the URL (#10613) 
* changes in files of the expr in alerts, service and targets, Signed-off-by: AndreSPy1 <elsenorcito@gmail.com>

Signed-off-by: AndreSPy1 <elsenorcito@gmail.com>

* update prettier corrections

Signed-off-by: AndreSPy1 <elsenorcito@gmail.com>

* update prettier corrections

Signed-off-by: AndreSPy1 <elsenorcito@gmail.com>

* correction suggested fixes PR

Signed-off-by: AndreSPy1 <elsenorcito@gmail.com>

* Update Snap AlertContents.test.tsx and update recommendations in the code

Signed-off-by: AndreSPy1 <elsenorcito@gmail.com>

* Update web/ui/react-app/src/components/SearchBar.tsx

exactly, thanks :)

Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: AndreSPy1 <elsenorcito@gmail.com>

* Revert "Update web/ui/react-app/src/components/SearchBar.tsx
"

This reverts commit 679c763a02f65297e3f761db372a0928550f288c.

Signed-off-by: AndreSPy1 <elsenorcito@gmail.com>

* update SearchBar component

Signed-off-by: AndreSPy1 <elsenorcito@gmail.com>

* eslint-disable update SearchBar testing failed

Signed-off-by: AndreSPy1 <elsenorcito@gmail.com>

* correction part in eslint-disable

Signed-off-by: AndreSPy1 <elsenorcito@gmail.com>

* fully corrected suggestion with search expression in url

Signed-off-by: AndreSPy1 <elsenorcito@gmail.com>

* implementation in handleSearchChange with useCallBack

Signed-off-by: AndreSPy1 <elsenorcito@gmail.com>

Co-authored-by: Julius Volz <julius.volz@gmail.com>
 2022-04-26 21:20:48 +02:00
David Heap 685493187e
Support numerical labels in PuppetDB service discovery (#10633) 
Fixes #10626 where previously only bool and string were supported

Signed-off-by: David Heap <david.heap@tnp.net.uk>
 2022-04-26 17:39:33 +05:30
Julien Pivotto 64fc3e58fe
Split go1.18 and changelog (#10622) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-04-26 13:57:02 +02:00
Mauro Stettler 64e6c171c2
Merge pull request #216 from grafana/merge_upstream 
add option to use the new chunk disk mapper from upstream
 2022-04-25 11:27:15 -04:00
Mauro Stettler 55cbbafe38
update comment 
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
 2022-04-25 15:05:21 +00:00
Julien Pivotto fc3f1b8ded
Move issue template to yml; add form. (#10576) 
* Move issue template to yml; add form.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>

* Address comment

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

* Add render for versions

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

* Add placeholders

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

* More placeholder

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

* More required: true

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

* More render:

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-04-22 16:36:30 +02:00
Julien Pivotto 9fcf0b3d46
Merge pull request #10616 from prometheus/release-2.35 
Release 2.35
 2022-04-21 14:17:08 +02:00
Augustin Husson 6656cd29fe
cut v2.35.0 (#10614) 
* cut v2.35.0

Signed-off-by: Augustin Husson <husson.augustin@gmail.com>

* add a note about the changes introduced by go1.18

Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2022-04-21 11:38:51 +02:00
Joker b2c21433eb
Fix exemplar docs. (#10609) 
Signed-off-by: Joker <joker9764@126.com>
 2022-04-21 10:15:14 +02:00
Julien Pivotto 09da88114d Support overriding minimum TLS version 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-04-20 23:41:30 +02:00
Chris Marchbanks a11e73edda
Fix a deadlock between Batch and FlushAndShutdown (#10608) 
If FlushAndShutdown is called with a full batchQueue, and then Batch is
called rather than the normal path of reading from a queue a deadlock
might be encountered. Rather than having FlushAndShutdown having
blocking code while holding a lock retry sending the batch every second.

Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2022-04-20 20:50:41 +02:00
Oleg Zaytsev 19bfb1e6e1
Merge pull request #221: Update prometheus to af0f6da5 
Update prometheus to `af0f6da5`
 2022-04-20 18:18:44 +02:00
Oleg Zaytsev 9d66af50a8
Fix TestMemSeries_append_atVariableRate 
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
 2022-04-20 17:50:05 +02:00
Oleg Zaytsev ac87e2d4d6 Merge remote-tracking branch 'prometheus/main' into update-prometheus 2022-04-20 17:39:51 +02:00
Oleg Zaytsev af0f6da5cb
Fix chunk overflow appending samples at a variable rate (#10607) 
* Add a test with variable samples rate append

This test overflows the chunk created in memseries, and the total amount
of samples in the (only) mmapped chunk is 29, instead of the 65565
appended ones.

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

* Cut new chunk when rate prediction was wrong

When appending samples at a slow rate, and then appending at a higher
rate, the prediction we made to cut a new chunk is no longer valid.
Sometimes this can even cause an overflow in the chunk, if more samples
than uint16 can hold are appended.

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

* Improve comment on 2*samplesPerChunk

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

* Assert that all chunks have less than 240 samples

Also, trigger new chunk at 240, not at more than 240

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
 2022-04-20 14:54:20 +02:00
Mauro Stettler 00f1b1556c
undo renaming 
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
 2022-04-19 20:16:20 +00:00
Mauro Stettler 2eef3e76b8
check return status of cutnewfile 
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
 2022-04-19 20:15:37 +00:00
Mauro Stettler 3fa636a799
fix unit test 
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
 2022-04-19 19:57:33 +00:00
Mauro Stettler 04114aa2e6
add old chunk disk mapper back 
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
 2022-04-19 19:21:22 +00:00
Mauro Stettler bd50b04fed
remove old chunk disk mapper initialization and replace it with the upstream one 
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
 2022-04-18 18:03:05 +00:00
Paschalis Tsilias 40c1efe8bc
tsdb/agent: Ignore duplicate exemplars (#10595) 
* tsdb/agent: Ignore duplicate exemplars

Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>

* Make each exemplar unique in TestCommit

Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>

* Re-Trigger CI for Windows and UI-related steps

Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>

* Change test comment to properly re-trigger pipeline

Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>

* Defer Close() calls for test agent and segment reader

Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>
 2022-04-18 11:41:04 -04:00
Paschalis Tsilias 4deb1a90d2 Amend Protobuf docstrings referring to model/ packages 
Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>
 2022-04-16 00:37:16 +02:00
Jesus Vazquez ee2f94b752
Merge pull request #209 from grafana/jvp/merge-prometheus-main 
Merge prometheus/main
 2022-04-15 12:40:51 +02:00
Jesus Vazquez a07d60a5dd Remove codeql analysis workflow 2022-04-15 12:16:42 +02:00
Jesus Vazquez 7106db9303 Merge remote-tracking branch 'upstream/main' into jvp/merge-prometheus-main 2022-04-15 12:09:46 +02:00
Julien Pivotto 685ce9964d
Merge pull request #10599 from prometheus/release-2.35 
Merge back release 2.35
 2022-04-15 00:10:06 +02:00
Julien Pivotto 624967fdbf
Add note about Prometheus as a library (#10594) 
* Add note about Prometheus as a library

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-04-14 22:23:47 +02:00
Augustin Husson 5b80eaa3ca
cut v2.35.0-rc1 (#10596) 
* cut v2.35.0-rc1

Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2022-04-14 16:41:28 +02:00
Goutham Veeramachaneni ec3d02019e
Pass the correct context to staleness Appender (#10588) 
OTel Collector prints the following error when a target disappears:

```
2022-04-13T14:20:24.932-0400	warn	scrape/scrape.go:1408	Stale append failed	{"kind": "receiver", "name": "prometheus", "scrape_pool": "beep-boop", "target": "http://localhost:9090/metrics", "error": "transaction aborted"}
```

This `transaction aborted` error is returned by the custom appender that is
used by the collector when the context of the appender is cancelled:
b7bf11174e/receiver/prometheusreceiver/internal/otlp_transaction.go (L81-L82)

We call `endOfRunStaleness` after `sl.stop()` which cancels `sl.ctx`.
The other `.Appender()` calls use `parentCtx` for the same reason.

This hasn't come up so far because Prometheus' Appender implementation just
ignores the context passed.

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2022-04-14 10:03:07 -04:00
Julien Pivotto b4d0dcb6e8 Tracing/GRPC: Set TLS credentials only when insecure is false. 
Fixes #10542

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-04-14 15:18:59 +02:00
Julien Pivotto db8c550570
Revoke storing target and metadata cache in context. (#10590) 
Storing the scrape cache and the target (which also contains that cache)
is apparently causing hige memory increase. I think me might not control
the lifespan of the context enough, therefore old objects keep living in
memory for longer than needed.

Let's unblock the release and look for an alternative so that downstream
consumers can get access to that data.

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-04-14 15:18:46 +02:00
Julien Pivotto 4d8b77546d
Changelog: add missing enhancement (#10593) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-04-14 15:05:26 +02:00