From 53fa230be01ce40def9c8a93ef4bf8966c9ef8c7 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 7 Mar 2024 14:11:20 +0000 Subject: [PATCH 1/6] Cut v2.51.0-rc.0 Signed-off-by: Bryan Boreham --- CHANGELOG.md | 32 ++++++++++++++++++++ VERSION | 2 +- web/ui/module/codemirror-promql/package.json | 4 +-- web/ui/module/lezer-promql/package.json | 2 +- web/ui/package-lock.json | 14 ++++----- web/ui/package.json | 2 +- web/ui/react-app/package.json | 4 +-- 7 files changed, 46 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b0350004fd..a548d29a2eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,37 @@ # Changelog +## 2.51.0-rc.0 / 2024-03-07 + +This version is built with Go 1.22.1. + +There is a new optional build tag "dedupelabels", which should reduce memory consumption (#12304). +It is off by default; there will be an optional alternative image to try it out. + +* [BUGFIX] PromQL: Constrain extrapolation in rate() to half of sample interval #13725 +* [CHANGE] Scraping: Always align scrapes even if tolerance is bigger than 1% of scrape interval #13624 +* [FEATURE] Alerting: Relabel rules for AlertManagerConfig; allows routing alerts to different alertmanagers #12551 +* [FEATURE] API: add limit param to series, label-names and label-values APIs #13396 +* [FEATURE] UI (experimental native histograms): Add native histogram chart to Table view #13658 +* [FEATURE] Promtool: Add a "tsdb dump-openmetrics" to dump in OpemMetrics format. #13194 +* [FEATURE] PromQL (experimental native histograms): Add histogram_avg function #13467 +* [ENHANCEMENT] Rules: Evaluate independent rules concurrently #12946, #13527 +* [ENHANCEMENT] Scraping (experimental native histograms): Support exemplars #13488 +* [ENHANCEMENT] Remote Write: Disable resharding during active retry backoffs #13562 +* [ENHANCEMENT] Observability: Add 'type' label to prometheus_tsdb_head_out_of_order_samples_appended_total #13607 +* [ENHANCEMENT] API: Faster generation of targets into JSON #13469, #13484 +* [ENHANCEMENT] Scraping, API: Use faster compression library #10782 +* [ENHANCEMENT] OpenTelemetry: Performance improvements in OTLP parsing #13627 +* [ENHANCEMENT] TSDB: Use cheaper Mutex on series #13473 +* [ENHANCEMENT] PromQL: Optimisations to reduce CPU and memory #13448, #13536 +* [BUGFIX] API: Metadata API using wrong JSON field names #13633 +* [BUGFIX] Remote Write: Stop slowing down when a new WAL segment is created #13583, #13628 +* [BUGFIX] PromQL: Fix wrongly scoped range vectors with @ modifier #13559 +* [BUGFIX] Kubernetes SD: Pod status changes were not discovered by Endpoints service discovery #13337 +* [BUGFIX] Azure SD: Don't crash when given a ScaleSetVM with missing details #13578 +* [BUGFIX] Remote Write: Fix signing for AWS sigv4 transport #13497 +* [BUGFIX] Observability: Exemplars emitted by Prometheus use "trace_id" not "traceID" #13589 +* [BUGFIX] Observability: Fix PrometheusNotIngestingSamples alert in mixin #13505 + ## 2.50.1 / 2024-02-26 * [BUGFIX] API: Fix metadata API using wrong field names. #13633 diff --git a/VERSION b/VERSION index 895eb8a3b25..284f7bfe087 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.50.1 +2.51.0-rc.0 diff --git a/web/ui/module/codemirror-promql/package.json b/web/ui/module/codemirror-promql/package.json index 89aa2e9ea25..f352fb75b4d 100644 --- a/web/ui/module/codemirror-promql/package.json +++ b/web/ui/module/codemirror-promql/package.json @@ -1,6 +1,6 @@ { "name": "@prometheus-io/codemirror-promql", - "version": "0.50.1", + "version": "0.51.0-rc.0", "description": "a CodeMirror mode for the PromQL language", "types": "dist/esm/index.d.ts", "module": "dist/esm/index.js", @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/prometheus/prometheus/blob/main/web/ui/module/codemirror-promql/README.md", "dependencies": { - "@prometheus-io/lezer-promql": "0.50.1", + "@prometheus-io/lezer-promql": "0.51.0-rc.0", "lru-cache": "^7.18.3" }, "devDependencies": { diff --git a/web/ui/module/lezer-promql/package.json b/web/ui/module/lezer-promql/package.json index 16f3f42637a..d5e53e9d1bc 100644 --- a/web/ui/module/lezer-promql/package.json +++ b/web/ui/module/lezer-promql/package.json @@ -1,6 +1,6 @@ { "name": "@prometheus-io/lezer-promql", - "version": "0.50.1", + "version": "0.51.0-rc.0", "description": "lezer-based PromQL grammar", "main": "dist/index.cjs", "type": "module", diff --git a/web/ui/package-lock.json b/web/ui/package-lock.json index c241d42e575..53ad8ea5a76 100644 --- a/web/ui/package-lock.json +++ b/web/ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "prometheus-io", - "version": "0.50.1", + "version": "0.51.0-rc.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "prometheus-io", - "version": "0.50.1", + "version": "0.51.0-rc.0", "workspaces": [ "react-app", "module/*" @@ -30,10 +30,10 @@ }, "module/codemirror-promql": { "name": "@prometheus-io/codemirror-promql", - "version": "0.50.1", + "version": "0.51.0-rc.0", "license": "Apache-2.0", "dependencies": { - "@prometheus-io/lezer-promql": "0.50.1", + "@prometheus-io/lezer-promql": "0.51.0-rc.0", "lru-cache": "^7.18.3" }, "devDependencies": { @@ -69,7 +69,7 @@ }, "module/lezer-promql": { "name": "@prometheus-io/lezer-promql", - "version": "0.50.1", + "version": "0.51.0-rc.0", "license": "Apache-2.0", "devDependencies": { "@lezer/generator": "^1.5.1", @@ -19233,7 +19233,7 @@ }, "react-app": { "name": "@prometheus-io/app", - "version": "0.50.1", + "version": "0.51.0-rc.0", "dependencies": { "@codemirror/autocomplete": "^6.11.1", "@codemirror/commands": "^6.3.2", @@ -19251,7 +19251,7 @@ "@lezer/lr": "^1.3.14", "@nexucis/fuzzy": "^0.4.1", "@nexucis/kvsearch": "^0.8.1", - "@prometheus-io/codemirror-promql": "0.50.1", + "@prometheus-io/codemirror-promql": "0.51.0-rc.0", "bootstrap": "^4.6.2", "css.escape": "^1.5.1", "downshift": "^7.6.2", diff --git a/web/ui/package.json b/web/ui/package.json index a28cb80657b..e541db85f56 100644 --- a/web/ui/package.json +++ b/web/ui/package.json @@ -28,5 +28,5 @@ "ts-jest": "^29.1.1", "typescript": "^4.9.5" }, - "version": "0.50.1" + "version": "0.51.0-rc.0" } diff --git a/web/ui/react-app/package.json b/web/ui/react-app/package.json index 113b2298ce1..ebc2f2d18b0 100644 --- a/web/ui/react-app/package.json +++ b/web/ui/react-app/package.json @@ -1,6 +1,6 @@ { "name": "@prometheus-io/app", - "version": "0.50.1", + "version": "0.51.0-rc.0", "private": true, "dependencies": { "@codemirror/autocomplete": "^6.11.1", @@ -19,7 +19,7 @@ "@lezer/lr": "^1.3.14", "@nexucis/fuzzy": "^0.4.1", "@nexucis/kvsearch": "^0.8.1", - "@prometheus-io/codemirror-promql": "0.50.1", + "@prometheus-io/codemirror-promql": "0.51.0-rc.0", "bootstrap": "^4.6.2", "css.escape": "^1.5.1", "downshift": "^7.6.2", From a0f60ce5f9d71ff152b6c049459fe2055f594925 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 8 Mar 2024 10:24:40 +0000 Subject: [PATCH 2/6] Changelog: remove some less-relevant items, fix ordering Signed-off-by: Bryan Boreham --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a548d29a2eb..05975d0d058 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ This version is built with Go 1.22.1. There is a new optional build tag "dedupelabels", which should reduce memory consumption (#12304). It is off by default; there will be an optional alternative image to try it out. -* [BUGFIX] PromQL: Constrain extrapolation in rate() to half of sample interval #13725 * [CHANGE] Scraping: Always align scrapes even if tolerance is bigger than 1% of scrape interval #13624 * [FEATURE] Alerting: Relabel rules for AlertManagerConfig; allows routing alerts to different alertmanagers #12551 * [FEATURE] API: add limit param to series, label-names and label-values APIs #13396 @@ -21,16 +20,15 @@ It is off by default; there will be an optional alternative image to try it out. * [ENHANCEMENT] API: Faster generation of targets into JSON #13469, #13484 * [ENHANCEMENT] Scraping, API: Use faster compression library #10782 * [ENHANCEMENT] OpenTelemetry: Performance improvements in OTLP parsing #13627 -* [ENHANCEMENT] TSDB: Use cheaper Mutex on series #13473 * [ENHANCEMENT] PromQL: Optimisations to reduce CPU and memory #13448, #13536 * [BUGFIX] API: Metadata API using wrong JSON field names #13633 +* [BUGFIX] PromQL: Constrain extrapolation in rate() to half of sample interval #13725 * [BUGFIX] Remote Write: Stop slowing down when a new WAL segment is created #13583, #13628 * [BUGFIX] PromQL: Fix wrongly scoped range vectors with @ modifier #13559 * [BUGFIX] Kubernetes SD: Pod status changes were not discovered by Endpoints service discovery #13337 * [BUGFIX] Azure SD: Don't crash when given a ScaleSetVM with missing details #13578 * [BUGFIX] Remote Write: Fix signing for AWS sigv4 transport #13497 * [BUGFIX] Observability: Exemplars emitted by Prometheus use "trace_id" not "traceID" #13589 -* [BUGFIX] Observability: Fix PrometheusNotIngestingSamples alert in mixin #13505 ## 2.50.1 / 2024-02-26 From ca277d6526a4d8c468d2f0ba65db13f5c50b1f06 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 8 Mar 2024 12:36:14 +0000 Subject: [PATCH 3/6] Add fixes and one more enhancement Signed-off-by: Bryan Boreham --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05975d0d058..34f96a30fca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,8 @@ This version is built with Go 1.22.1. There is a new optional build tag "dedupelabels", which should reduce memory consumption (#12304). It is off by default; there will be an optional alternative image to try it out. -* [CHANGE] Scraping: Always align scrapes even if tolerance is bigger than 1% of scrape interval #13624 -* [FEATURE] Alerting: Relabel rules for AlertManagerConfig; allows routing alerts to different alertmanagers #12551 +* [CHANGE] Scraping: Do experimental timestamp alignment even if tolerance is bigger than 1% of scrape interval #13624, #13737 +* [FEATURE] Alerting: Relabel rules for AlertManagerConfig; allows routing alerts to different alertmanagers #12551, #13735 * [FEATURE] API: add limit param to series, label-names and label-values APIs #13396 * [FEATURE] UI (experimental native histograms): Add native histogram chart to Table view #13658 * [FEATURE] Promtool: Add a "tsdb dump-openmetrics" to dump in OpemMetrics format. #13194 @@ -16,6 +16,7 @@ It is off by default; there will be an optional alternative image to try it out. * [ENHANCEMENT] Rules: Evaluate independent rules concurrently #12946, #13527 * [ENHANCEMENT] Scraping (experimental native histograms): Support exemplars #13488 * [ENHANCEMENT] Remote Write: Disable resharding during active retry backoffs #13562 +* [ENHANCEMENT] Observability: Add native histograms to latency/duration metrics #13681 * [ENHANCEMENT] Observability: Add 'type' label to prometheus_tsdb_head_out_of_order_samples_appended_total #13607 * [ENHANCEMENT] API: Faster generation of targets into JSON #13469, #13484 * [ENHANCEMENT] Scraping, API: Use faster compression library #10782 From 699f31a2a6820e2452ebeb6c3dcabf15e6078c87 Mon Sep 17 00:00:00 2001 From: michaelact <86778470+michaelact@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:19:39 +0700 Subject: [PATCH 4/6] [BUGFIX] Azure SD: Fix 'error: parameter virtualMachineScaleSetName cannot be empty' (#13702) Erroneous code was introduced during a merge-back-to-main at #13399. Signed-off-by: michaelact <86778470+michaelact@users.noreply.github.com> --- discovery/azure/azure.go | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/discovery/azure/azure.go b/discovery/azure/azure.go index a5d81f4ff6e..16628c7bfd0 100644 --- a/discovery/azure/azure.go +++ b/discovery/azure/azure.go @@ -413,26 +413,20 @@ func (d *Discovery) refresh(ctx context.Context) ([]*targetgroup.Group, error) { } else { networkInterface, err = client.getVMScaleSetVMNetworkInterfaceByID(ctx, nicID, vm.ScaleSet, vm.InstanceID) } + if err != nil { if errors.Is(err, errorNotFound) { level.Warn(d.logger).Log("msg", "Network interface does not exist", "name", nicID, "err", err) } else { ch <- target{labelSet: nil, err: err} } - d.addToCache(nicID, networkInterface) - } else { - networkInterface, err = client.getVMScaleSetVMNetworkInterfaceByID(ctx, nicID, vm.ScaleSet, vm.InstanceID) - if err != nil { - if errors.Is(err, errorNotFound) { - level.Warn(d.logger).Log("msg", "Network interface does not exist", "name", nicID, "err", err) - } else { - ch <- target{labelSet: nil, err: err} - } - // Get out of this routine because we cannot continue without a network interface. - return - } - d.addToCache(nicID, networkInterface) + + // Get out of this routine because we cannot continue without a network interface. + return } + + // Continue processing with the network interface + d.addToCache(nicID, networkInterface) } if networkInterface.Properties == nil { From b280ace4ec3778a6f83ba3412b4d1ad8d572cebb Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 8 Mar 2024 15:22:42 +0000 Subject: [PATCH 5/6] Add Azure SD bugfix And remove mention of change already in 2.50. Signed-off-by: Bryan Boreham --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34f96a30fca..83d262c843a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ It is off by default; there will be an optional alternative image to try it out. * [BUGFIX] Remote Write: Stop slowing down when a new WAL segment is created #13583, #13628 * [BUGFIX] PromQL: Fix wrongly scoped range vectors with @ modifier #13559 * [BUGFIX] Kubernetes SD: Pod status changes were not discovered by Endpoints service discovery #13337 -* [BUGFIX] Azure SD: Don't crash when given a ScaleSetVM with missing details #13578 +* [BUGFIX] Azure SD: Fix 'error: parameter virtualMachineScaleSetName cannot be empty' (#13702) * [BUGFIX] Remote Write: Fix signing for AWS sigv4 transport #13497 * [BUGFIX] Observability: Exemplars emitted by Prometheus use "trace_id" not "traceID" #13589 From 392a726a3b50406bc8ae7053dade6f6188742751 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 8 Mar 2024 15:23:10 +0000 Subject: [PATCH 6/6] Remove mention of change already in 2.50.1. Signed-off-by: Bryan Boreham --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83d262c843a..0a997771462 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,6 @@ It is off by default; there will be an optional alternative image to try it out. * [ENHANCEMENT] Scraping, API: Use faster compression library #10782 * [ENHANCEMENT] OpenTelemetry: Performance improvements in OTLP parsing #13627 * [ENHANCEMENT] PromQL: Optimisations to reduce CPU and memory #13448, #13536 -* [BUGFIX] API: Metadata API using wrong JSON field names #13633 * [BUGFIX] PromQL: Constrain extrapolation in rate() to half of sample interval #13725 * [BUGFIX] Remote Write: Stop slowing down when a new WAL segment is created #13583, #13628 * [BUGFIX] PromQL: Fix wrongly scoped range vectors with @ modifier #13559