Merge upstream prometheus/prometheus at `4ac7806` #613

gotjosh · 2024-04-25T10:03:41Z

No description provided.

Bumps [actions/cache](https://github.com/actions/cache) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@ab5e6d0...0c45773) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@b39b52d...60edb5d) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…er/compute/armcompute/v5 Bumps [github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5](https://github.com/Azure/azure-sdk-for-go) from 5.5.0 to 5.6.0. - [Release notes](https://github.com/Azure/azure-sdk-for-go/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md) - [Commits](Azure/azure-sdk-for-go@sdk/resourcemanager/compute/armcompute/v5.5.0...sdk/resourcemanager/compute/armcompute/v5.6.0) --- updated-dependencies: - dependency-name: github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: Aleks Fazlieva <britishrum@users.noreply.github.com> Signed-off-by: suntala <arati.rana@grafana.com>

When all alerts were dropped after alert relabeling, the `sendAll()` function didn't release the lock properly which created a deadlock with the Alertmanager target discovery. In addition, the commit detects early when there are no Alertmanager endpoint to notify to avoid unnecessary work. Signed-off-by: Simon Pasquier <spasquie@redhat.com>

Notifier: fix deadlock when zero alerts

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@b4ffde6...9bb5618) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.50.1 to 0.51.1. - [Release notes](https://github.com/prometheus/prometheus/releases) - [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md) - [Commits](prometheus/prometheus@v0.50.1...v0.51.1) --- updated-dependencies: - dependency-name: github.com/prometheus/prometheus dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [bufbuild/buf-breaking-action](https://github.com/bufbuild/buf-breaking-action) from 1.1.2 to 1.1.4. - [Release notes](https://github.com/bufbuild/buf-breaking-action/releases) - [Commits](bufbuild/buf-breaking-action@f47418c...c57b3d8) --- updated-dependencies: - dependency-name: bufbuild/buf-breaking-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [bufbuild/buf-lint-action](https://github.com/bufbuild/buf-lint-action) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/bufbuild/buf-lint-action/releases) - [Commits](bufbuild/buf-lint-action@044d13a...06f9dd8) --- updated-dependencies: - dependency-name: bufbuild/buf-lint-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Fix unavailable link Signed-off-by: hanghuge <cmoman@outlook.com>

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

The Prometheus v3 coordinators are full members of the Prometheus GH org, a status that our governance specifies for maintainers. As discussed, it appears best to formalize maintainership by listing the coordinators in the MAINTAINERS.md file of prometheus/prometheus. Signed-off-by: beorn7 <beorn@grafana.com>

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

golangci-lint: enable usestdlibvars linter

[DOCS] Fix unavailable link to Kubernetes docs

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

Thanos can create and destroy TSDBs dynamically, and once a TSDB disappears its files are deleted. Calculating the size of the WAL then fails with errors like: ``` msg: "Failed to calculate size of "wal" dir", "err": "lstat /tsdbdir/wal: no such file or directory", "caller": "wlog.go:271" ``` Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

Merge 2.51.2 into main

…(#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

This commit adds 2 new metadata labels for the endpointslice role: * `__meta_kubernetes_endpointslice_endpoint_node_name` * `__meta_kubernetes_endpointslice_endpoint_zone` The latter is only present when the `discovery.k8s.io/v1` API group is available. I also updated the configuration doc and added an entry for the `__meta_kubernetes_endpointslice_endpoint_hostname` label which was missing. Signed-off-by: Simon Pasquier <spasquie@redhat.com>

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

…b.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5-5.6.0 build(deps): bump github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 from 5.5.0 to 5.6.0

…entation/examples/remote_storage/github.com/prometheus/prometheus-0.51.1 build(deps): bump github.com/prometheus/prometheus from 0.50.1 to 0.51.1 in /documentation/examples/remote_storage

…ctions/checkout-4.1.2 build(deps): bump actions/checkout from 4.1.1 to 4.1.2

…entation/examples/remote_storage/github.com/prometheus/common-0.53.0 build(deps): bump github.com/prometheus/common from 0.50.0 to 0.53.0 in /documentation/examples/remote_storage

Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>

Since it requires go 1.22 Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>

Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>

tsdb/wlog: unregister metrics on WL close

…data discovery(k8s): add metadata labels to endpointslices

Update go modules before 2.52 release

Bumps [github.com/hetznercloud/hcloud-go/v2](https://github.com/hetznercloud/hcloud-go) from 2.7.1 to 2.7.2. - [Release notes](https://github.com/hetznercloud/hcloud-go/releases) - [Changelog](https://github.com/hetznercloud/hcloud-go/blob/main/CHANGELOG.md) - [Commits](hetznercloud/hcloud-go@v2.7.1...v2.7.2) --- updated-dependencies: - dependency-name: github.com/hetznercloud/hcloud-go/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.51.24 to 1.51.25. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.51.24...v1.51.25) --- 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>

…ufbuild/buf-breaking-action-1.1.4 build(deps): bump bufbuild/buf-breaking-action from 1.1.2 to 1.1.4

…ufbuild/buf-lint-action-1.1.1 build(deps): bump bufbuild/buf-lint-action from 1.1.0 to 1.1.1

…b.com/hetznercloud/hcloud-go/v2-2.7.2 build(deps): bump github.com/hetznercloud/hcloud-go/v2 from 2.7.1 to 2.7.2

…b.com/aws/aws-sdk-go-1.51.25 build(deps): bump github.com/aws/aws-sdk-go from 1.51.24 to 1.51.25

…re restore time per rule group When a rule group changes or prometheus is restarted we need to ensure we restore the active alerts that were firing for a corresponding rule, for that Prometheus uses the `ALERTS_FOR_STATE` series to query the previous state and restore it. If a given rule has high cardinality (think 100s of 1000s for series) this proccess can take a bit of time - this is the first of a series of PRs to improve this problem and I'd like to start with exposing the time it takes to restore a rule group as a gauge. Signed-off-by: gotjosh <josue.abreu@gmail.com>

Currently, running promtool tsdb analyze with the --extended flag will cause an 'index out of range' error if running it against a block that does not have any native histogram chunks. This change ensures that promtool won't try to display data that doesn't exist. Signed-off-by: Will Hegedus <whegedus@linode.com>

… log line to record total time Signed-off-by: gotjosh <josue.abreu@gmail.com>

Signed-off-by: gotjosh <josue.abreu@gmail.com>

…(#13958) * Avoid creating new slices for labels values on postings for matchers Signed-off-by: alanprot <alanprot@gmail.com> * refactor Signed-off-by: alanprot <alanprot@gmail.com> --------- Signed-off-by: alanprot <alanprot@gmail.com>

Rule Manager: Add `rule_group_last_restore_duration_seconds` to measure restore time per rule group

CLAassistant · 2024-04-25T10:03:52Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
5 out of 14 committers have signed the CLA.

✅ suntala
✅ bboreham
✅ ywwg
✅ beorn7
✅ gotjosh
❌ simonpasquier
❌ mmorel-35
❌ hanghuge
❌ GiedriusS
❌ NeerajGartia21
❌ wbh1
❌ alanprot
❌ SuperQ
❌ ArthurSens
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

.github/workflows/ci.yml

+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - run: go install ./cmd/promtool/.
+      - run: go install github.com/google/go-jsonnet/cmd/jsonnet@latest
+      - run: go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest


.github/workflows/ci.yml

+      - run: go install ./cmd/promtool/.
+      - run: go install github.com/google/go-jsonnet/cmd/jsonnet@latest
+      - run: go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest
+      - run: go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest


.github/workflows/ci.yml

+      - run: go install github.com/google/go-jsonnet/cmd/jsonnet@latest
+      - run: go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest
+      - run: go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest
+      - run: make -C documentation/prometheus-mixin clean


.github/workflows/ci.yml

@@ -0,0 +1,236 @@
+---


.github/workflows/codeql-analysis.yml

+
+permissions:
+  contents: read
+  security-events: write


* upstream/main: (32 commits) Avoid creating new slices for labels values on postings for matchers (#13958) Improve the metric description Add a changelog entry Change variable name to `restoreStartTime` from `now` and introduce a log line to record total time promtool: Fix panic on extended tsdb analyze (#13976) Rule Manager: Add `rule_group_last_restore_duration_seconds` to measure restore time per rule group build(deps): bump github.com/aws/aws-sdk-go from 1.51.24 to 1.51.25 build(deps): bump github.com/hetznercloud/hcloud-go/v2 Downgrade github.com/ovh/go-ovh back to v1.4.3 Downgrade k8s apis back to v0.29.3 Update Go dependencies before 2.52 build(deps): bump github.com/prometheus/common tsdb/wlog: add test for metrics unregistering discovery(k8s): add metadata labels to endpointslices parser: remake generated_parser output (#13923) Adds Inf and NaN as Numbers to Histogram in Promql Testing Framework (#13916) tsdb/wlog: unregister metrics on WL close golangci-lint: enable whitespace linter (#13905) Cut release 2.51.2 List Prometheus v3 coordinators in MAINTAINERS.md ... Signed-off-by: gotjosh <josue.abreu@gmail.com>

dependabot bot and others added 30 commits March 21, 2024 08:14

Support expansion of native histogram values in alert templates

44f385f

Co-authored-by: Aleks Fazlieva <britishrum@users.noreply.github.com> Signed-off-by: suntala <arati.rana@grafana.com>

Support native histogram values in template functions

9a7c6a5

Co-authored-by: Aleks Fazlieva <britishrum@users.noreply.github.com> Signed-off-by: suntala <arati.rana@grafana.com>

Merge pull request #13861 from simonpasquier/fix-sendall-deadlock

c97a066

Notifier: fix deadlock when zero alerts

Signed-off-by: hanghuge <cmoman@outlook.com>

c14a158

Fix unavailable link Signed-off-by: hanghuge <cmoman@outlook.com>

golangci-lint: enable usestdlibvars linter

d496687

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

Cut release 2.51.2

b4c0ab5

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

Merge pull request #13906 from mmorel-35/usestdlibvars

adf9939

golangci-lint: enable usestdlibvars linter

Merge pull request #13898 from hanghuge/main

594b317

[DOCS] Fix unavailable link to Kubernetes docs

Merge branch 'main' into merge-2.51.2-into-main

e1dd8e7

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

golangci-lint: enable whitespace linter (#13905)

6f595c6

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

Merge pull request #13913 from prometheus/merge-2.51.2-into-main

2a43026

Merge 2.51.2 into main

Merge pull request #13731 from suntala/suntala/native-histogram-template

4ec5c25

histograms: support expansion of native histogram values in templating

Merge pull request #13891 from prometheus/beorn7/maintainers

b938bbc

List Prometheus v3 coordinators in MAINTAINERS.md

tsdb/wlog: add test for metrics unregistering

bdf4907

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

Merge pull request #13817 from prometheus/dependabot/go_modules/githu…

dff4c06

…b.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5-5.6.0 build(deps): bump github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 from 5.5.0 to 5.6.0

Merge pull request #13867 from prometheus/dependabot/go_modules/docum…

1030205

…entation/examples/remote_storage/github.com/prometheus/prometheus-0.51.1 build(deps): bump github.com/prometheus/prometheus from 0.50.1 to 0.51.1 in /documentation/examples/remote_storage

Merge pull request #13810 from prometheus/dependabot/github_actions/a…

ee42e63

…ctions/checkout-4.1.2 build(deps): bump actions/checkout from 4.1.1 to 4.1.2

ArthurSens and others added 20 commits April 18, 2024 14:58

Merge pull request #13952 from prometheus/dependabot/go_modules/docum…

9faf105

…entation/examples/remote_storage/github.com/prometheus/common-0.53.0 build(deps): bump github.com/prometheus/common from 0.50.0 to 0.53.0 in /documentation/examples/remote_storage

Update Go dependencies before 2.52

c152b02

Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>

Downgrade k8s apis back to v0.29.3

8543f48

Since it requires go 1.22 Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>

Downgrade github.com/ovh/go-ovh back to v1.4.3

bcb3e2c

Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>

Merge pull request #13919 from GiedriusS/dont_forget_to_unregister

b5b5e1e

tsdb/wlog: unregister metrics on WL close

Merge pull request #13935 from simonpasquier/more-endpointslices-meta…

f36915b

…data discovery(k8s): add metadata labels to endpointslices

Merge pull request #13954 from prometheus/update-go-modules

0f222ed

Update go modules before 2.52 release

Merge pull request #13873 from prometheus/dependabot/github_actions/b…

97eab68

…ufbuild/buf-breaking-action-1.1.4 build(deps): bump bufbuild/buf-breaking-action from 1.1.2 to 1.1.4

Merge pull request #13874 from prometheus/dependabot/github_actions/b…

8cd7e04

…ufbuild/buf-lint-action-1.1.1 build(deps): bump bufbuild/buf-lint-action from 1.1.0 to 1.1.1

Merge pull request #13961 from prometheus/dependabot/go_modules/githu…

a903ef8

…b.com/hetznercloud/hcloud-go/v2-2.7.2 build(deps): bump github.com/hetznercloud/hcloud-go/v2 from 2.7.1 to 2.7.2

Merge pull request #13962 from prometheus/dependabot/go_modules/githu…

76b0318

…b.com/aws/aws-sdk-go-1.51.25 build(deps): bump github.com/aws/aws-sdk-go from 1.51.24 to 1.51.25

Change variable name to restoreStartTime from now and introduce a…

381a77a

… log line to record total time Signed-off-by: gotjosh <josue.abreu@gmail.com>

Add a changelog entry

d672eda

Signed-off-by: gotjosh <josue.abreu@gmail.com>

Improve the metric description

5beb2fe

Signed-off-by: gotjosh <josue.abreu@gmail.com>

Merge pull request #13974 from prometheus/measure-restore-time-rules

4ac7806

Rule Manager: Add `rule_group_last_restore_duration_seconds` to measure restore time per rule group

github-advanced-security bot found potential problems Apr 25, 2024

View reviewed changes

gotjosh changed the title ~~Gotjosh/merge upstream~~ Merge upstream prometheus/prometheus at 4ac7806 Apr 25, 2024

pstibrany approved these changes Apr 25, 2024

View reviewed changes

gotjosh force-pushed the gotjosh/merge-upstream branch from 9d54448 to 0ebe215 Compare April 25, 2024 10:17

gotjosh closed this Apr 25, 2024

gotjosh deleted the gotjosh/merge-upstream branch April 25, 2024 10:18

gotjosh restored the gotjosh/merge-upstream branch April 25, 2024 10:18

gotjosh deleted the gotjosh/merge-upstream branch April 25, 2024 10:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge upstream prometheus/prometheus at `4ac7806` #613

Merge upstream prometheus/prometheus at `4ac7806` #613

gotjosh commented Apr 25, 2024

CLAassistant commented Apr 25, 2024 •

edited

Loading

Merge upstream prometheus/prometheus at 4ac7806 #613

Merge upstream prometheus/prometheus at 4ac7806 #613

Conversation

gotjosh commented Apr 25, 2024

CLAassistant commented Apr 25, 2024 • edited Loading

Merge upstream prometheus/prometheus at `4ac7806` #613

Merge upstream prometheus/prometheus at `4ac7806` #613

CLAassistant commented Apr 25, 2024 •

edited

Loading