Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync upstream to current HEAD at e2f037e554a8a336ca4487324dd4ceee893fda0a #792

Merged
merged 100 commits into from
Dec 16, 2024
Merged
Changes from 1 commit
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
90e832c
scrape: fix nil panic after scrape loop reload
GiedriusS Dec 2, 2024
8d4bcd2
promql: Fix various UTF-8 bugs related to quoting
ywwg Dec 3, 2024
5479fb3
scrape: update test after review
GiedriusS Dec 9, 2024
eeef17e
docs: Added native histogram WAL record documentation.
bwplotka Dec 9, 2024
664177b
Merge pull request #15554 from prometheus/waldocs
bwplotka Dec 9, 2024
fe4e817
chore: fix some function names in comment
avoidaway Dec 9, 2024
6c8163e
Merge pull request #15556 from avoidaway/main
ArthurSens Dec 9, 2024
5d76510
scrape: update test name
GiedriusS Dec 9, 2024
0a77294
RELEASE.md: schedule 3.[1,2,3,4] releases
jan--f Dec 5, 2024
437362a
fix(deduper): use ptr to sync.RWMutex, fix panic during concurrent use
tjhop Dec 10, 2024
a70cba8
Merge pull request #15562 from tjhop/fix/dedupe-logger-concurrent-map…
bwplotka Dec 10, 2024
addaf41
Merge pull request #15542 from jan--f/schedule-3.1
bboreham Dec 10, 2024
c69aeab
Merge pull request #15563 from GiedriusS/fix_setting_field
bboreham Dec 10, 2024
f61e66a
chore(deps-dev): bump globals from 15.10.0 to 15.13.0 in /web/ui (#15…
dependabot[bot] Dec 10, 2024
35047db
chore(deps): bump @tanstack/react-query from 5.59.0 to 5.62.0 in /web…
dependabot[bot] Dec 10, 2024
7d4096d
chore(deps): bump @codemirror/language from 6.10.2 to 6.10.6 in /web/…
dependabot[bot] Dec 10, 2024
6539d2c
chore(deps-dev): bump @eslint/js from 9.11.1 to 9.16.0 in /web/ui (#1…
dependabot[bot] Dec 10, 2024
2fe71b4
chore(deps-dev): bump @vitejs/plugin-react in /web/ui (#15517)
dependabot[bot] Dec 10, 2024
7afd2f1
chore(deps): bump react-router-dom from 6.26.2 to 7.0.1 in /web/ui (#…
dependabot[bot] Dec 10, 2024
0ae424d
chore(deps): bump @mantine/code-highlight in /web/ui (#15515)
dependabot[bot] Dec 10, 2024
64dd707
Add old UI to dependabot
SuperQ Dec 10, 2024
3a4e771
Merge pull request #15531 from prometheus/owilliams/promqltest
beorn7 Dec 10, 2024
6daf75d
chore(deps): bump @types/lodash from 4.17.9 to 4.17.13 in /web/ui (#1…
dependabot[bot] Dec 10, 2024
f0077f0
chore(deps-dev): bump @types/jest from 29.5.13 to 29.5.14 in /web/ui …
dependabot[bot] Dec 10, 2024
ee18650
chore(deps-dev): bump @eslint/compat from 1.1.1 to 1.2.4 in /web/ui (…
dependabot[bot] Dec 10, 2024
018f4f3
chore(deps): bump @reduxjs/toolkit from 2.2.7 to 2.4.0 in /web/ui (#1…
dependabot[bot] Dec 10, 2024
8784e28
chore(deps): bump sanitize-html from 2.13.0 to 2.13.1 in /web/ui (#15…
dependabot[bot] Dec 10, 2024
2c279de
chore(deps): bump @testing-library/jest-dom in /web/ui (#15276)
dependabot[bot] Dec 10, 2024
6674991
chore(deps): bump uplot from 1.6.30 to 1.6.31 in /web/ui (#15277)
dependabot[bot] Dec 10, 2024
1055502
chore(deps): bump @lezer/common from 1.2.1 to 1.2.3 in /web/ui (#15278)
dependabot[bot] Dec 10, 2024
faf398e
chore(deps): bump @uiw/react-codemirror from 4.23.3 to 4.23.6 in /web…
dependabot[bot] Dec 10, 2024
431fb1a
chore(deps): bump google.golang.org/api from 0.204.0 to 0.209.0 (#15501)
dependabot[bot] Dec 10, 2024
d1c251f
chore(deps): bump github.com/ionos-cloud/sdk-go/v6 from 6.2.1 to 6.3.…
dependabot[bot] Dec 10, 2024
944c804
chore(deps): bump google.golang.org/grpc from 1.67.1 to 1.68.1 (#15576)
dependabot[bot] Dec 11, 2024
e1bfdd2
chore(deps-dev): bump eslint-plugin-react-hooks in /web/ui (#15568)
dependabot[bot] Dec 11, 2024
b0e7de1
promqltest: allow running tests with custom storage implementation
achille-roussel Dec 11, 2024
5cc095e
Merge pull request #15571 from prometheus/superq/dependabot_old_ui
bwplotka Dec 11, 2024
ebfa1dd
promql: Purge Holt-Winters from a doc comment
beorn7 Dec 11, 2024
f44bba3
config: Remove validation GetScrapeConfigs; require using config.Load.
bwplotka Dec 11, 2024
9895d88
OTLP receiver: Use stdlib for splitting metric name in classical mode…
aknuds1 Dec 11, 2024
dd147ec
chore(deps): bump @codemirror/view in /web/ui/react-app (#15609)
dependabot[bot] Dec 11, 2024
9438966
chore(deps-dev): bump @types/jest in /web/ui/react-app (#15631)
dependabot[bot] Dec 11, 2024
a976b8b
chore(deps): bump @mantine/code-highlight in /web/ui (#15630)
dependabot[bot] Dec 11, 2024
29846dd
chore(deps-dev): bump eslint from 9.11.1 to 9.16.0 in /web/ui (#15628)
dependabot[bot] Dec 11, 2024
cfb54fa
chore(deps-dev): bump @testing-library/react-hooks in /web/ui/react-a…
dependabot[bot] Dec 11, 2024
3c99111
chore(deps-dev): bump eslint-plugin-react-refresh in /web/ui (#15602)
dependabot[bot] Dec 11, 2024
c4ed196
chore(deps): bump @codemirror/language in /web/ui/react-app (#15621)
dependabot[bot] Dec 11, 2024
4ac6032
chore(deps-dev): bump sinon from 18.0.0 to 19.0.2 in /web/ui/react-ap…
dependabot[bot] Dec 11, 2024
7294aea
chore(deps-dev): bump @rollup/plugin-node-resolve in /web/ui (#15270)
dependabot[bot] Dec 11, 2024
45d3d2e
chore(deps-dev): bump @eslint/eslintrc from 3.1.0 to 3.2.0 in /web/ui…
dependabot[bot] Dec 11, 2024
16f4adb
chore(deps-dev): bump @lezer/generator from 1.7.1 to 1.7.2 in /web/ui…
dependabot[bot] Dec 11, 2024
3071349
chore(deps-dev): bump prettier from 3.3.3 to 3.4.2 in /web/ui (#15620)
dependabot[bot] Dec 11, 2024
f0c9154
chore(deps): bump @reduxjs/toolkit from 2.4.0 to 2.5.0 in /web/ui (#1…
dependabot[bot] Dec 11, 2024
e07de08
chore(deps): bump @codemirror/lint from 6.8.1 to 6.8.4 in /web/ui (#1…
dependabot[bot] Dec 11, 2024
ab3681f
chore(deps): bump lru-cache from 11.0.1 to 11.0.2 in /web/ui (#15596)
dependabot[bot] Dec 11, 2024
8b716e3
chore(deps-dev): bump vitest from 2.1.1 to 2.1.8 in /web/ui (#15591)
dependabot[bot] Dec 11, 2024
e62a737
chore(deps): bump @codemirror/search in /web/ui/react-app
dependabot[bot] Dec 11, 2024
9cf597c
Merge pull request #15635 from prometheus/beorn7/promql
jan--f Dec 11, 2024
b9e2ac0
Merge pull request #15632 from prometheus/dependabot/npm_and_yarn/web…
bwplotka Dec 11, 2024
a940deb
chore(deps-dev): bump @types/jquery in /web/ui/react-app (#15590)
dependabot[bot] Dec 11, 2024
c66d78c
chore(deps-dev): bump vite from 5.4.8 to 6.0.3 in /web/ui (#15611)
dependabot[bot] Dec 11, 2024
d33019e
chore(deps): bump @fortawesome/react-fontawesome in /web/ui/react-app…
dependabot[bot] Dec 11, 2024
f451246
chore(deps): bump downshift from 9.0.6 to 9.0.8 in /web/ui/react-app …
dependabot[bot] Dec 11, 2024
ee33890
chore(deps): bump @testing-library/react in /web/ui (#15588)
dependabot[bot] Dec 11, 2024
4cbf44e
chore(deps): bump @floating-ui/dom from 1.6.10 to 1.6.12 in /web/ui (…
dependabot[bot] Dec 11, 2024
da53bad
chore(deps): bump @codemirror/commands in /web/ui/react-app (#15612)
dependabot[bot] Dec 11, 2024
f7fec4d
chore(deps): bump @nexucis/fuzzy in /web/ui/react-app (#15629)
dependabot[bot] Dec 11, 2024
b10d5e0
chore(deps): bump sass from 1.77.6 to 1.82.0 in /web/ui/react-app (#1…
dependabot[bot] Dec 11, 2024
077d4ed
chore(deps): bump @lezer/common from 1.2.1 to 1.2.3 in /web/ui/react-…
dependabot[bot] Dec 11, 2024
28e611a
chore(deps): bump http-proxy-middleware in /web/ui/react-app (#15610)
dependabot[bot] Dec 11, 2024
8df0548
chore(deps): bump moment-timezone in /web/ui/react-app (#15641)
dependabot[bot] Dec 11, 2024
cc4fcc1
chore(deps-dev): bump nock from 13.5.5 to 13.5.6 in /web/ui (#15642)
dependabot[bot] Dec 11, 2024
00e0cdc
chore(deps): bump @mantine/dates from 7.13.1 to 7.15.0 in /web/ui (#1…
dependabot[bot] Dec 11, 2024
ec95602
chore(deps): bump @lezer/highlight in /web/ui/react-app (#15660)
dependabot[bot] Dec 11, 2024
d6a24b2
chore(deps): bump @mantine/notifications in /web/ui (#15658)
dependabot[bot] Dec 11, 2024
bb54eaf
chore(deps): bump @nexucis/kvsearch in /web/ui/react-app (#15659)
dependabot[bot] Dec 11, 2024
032391a
chore(deps): bump @codemirror/autocomplete in /web/ui/react-app (#15649)
dependabot[bot] Dec 11, 2024
4b142dc
chore(deps-dev): bump typescript from 5.6.2 to 5.7.2 in /web/ui (#15650)
dependabot[bot] Dec 11, 2024
9362ba3
chore(deps-dev): bump @types/node in /web/ui/react-app (#15651)
dependabot[bot] Dec 11, 2024
5aa80fb
chore(deps): bump react-router-dom from 7.0.1 to 7.0.2 in /web/ui (#1…
dependabot[bot] Dec 11, 2024
db36cbc
chore(deps): bump @tanstack/react-query from 5.62.0 to 5.62.7 in /web…
dependabot[bot] Dec 11, 2024
94aa9e9
chore(deps): bump sanitize-html and @types/sanitize-html (#15663)
dependabot[bot] Dec 12, 2024
463dd3e
chore(deps): bump @codemirror/autocomplete in /web/ui (#15656)
dependabot[bot] Dec 12, 2024
f232699
chore(deps-dev): bump ts-jest from 29.2.2 to 29.2.5 in /web/ui/react-…
dependabot[bot] Dec 12, 2024
abddce3
chore(deps): bump @tabler/icons-react from 3.19.0 to 3.24.0 in /web/u…
dependabot[bot] Dec 12, 2024
9f93a2a
chore(deps): bump react-redux from 9.1.2 to 9.2.0 in /web/ui (#15645)
dependabot[bot] Dec 12, 2024
987b42f
chore(deps): bump @codemirror/lint in /web/ui/react-app (#15647)
dependabot[bot] Dec 12, 2024
6910277
chore(deps): bump @prometheus-io/codemirror-promql in /web/ui/react-a…
dependabot[bot] Dec 12, 2024
3c6700b
chore(deps): bump golang.org/x/tools from 0.27.0 to 0.28.0 (#15593)
dependabot[bot] Dec 12, 2024
ceeab58
chore(deps): bump github.com/prometheus/common from 0.60.1 to 0.61.0
dependabot[bot] Dec 12, 2024
aa9fef7
Apply suggestions from code review
bwplotka Dec 12, 2024
b7f5f36
Merge pull request #15604 from prometheus/dependabot/go_modules/githu…
bwplotka Dec 12, 2024
134a0c7
Improved error.
bwplotka Dec 12, 2024
7d0f6b7
Add specific Azure permissions required for Azure SD (#15549)
jeremiahharbach Dec 12, 2024
fec7ca0
Merge pull request #15637 from prometheus/fix15538-2
bwplotka Dec 12, 2024
791df43
Merge pull request #15668 from firetiger-inc/promqltest-with-storage
bwplotka Dec 13, 2024
9009724
[BUGFIX] PromQL: Adds test for `absent`, `absent_over_time` and `deri…
NeerajGartia21 Dec 13, 2024
7802ca2
RuleDependencyController: Fix for indeterminate conditions (#15560)
julienduchesne Dec 13, 2024
e2f037e
rules: Add new `RuleEvaluationTimeSum` field to groups (#15672)
julienduchesne Dec 13, 2024
dbdc94f
Merge commit 'e2f037e554a8a336ca4487324dd4ceee893fda0a' into juliendu…
julienduchesne Dec 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[BUGFIX] PromQL: Adds test for absent, absent_over_time and `deri…
…v` func with histograms (#15667)

Add test for `absent`, `absent_over_time` and `deriv` func with histograms

Signed-off-by: Neeraj Gartia <[email protected]>

---------

Signed-off-by: Neeraj Gartia <[email protected]>
  • Loading branch information
NeerajGartia21 authored Dec 13, 2024
commit 9009724c5b68d917b68b6c8801893ec2dc21522f
29 changes: 29 additions & 0 deletions promql/promqltest/testdata/functions.test
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,9 @@ clear
load 5m
testcounter_reset_middle_total 0+10x4 0+10x5
http_requests_total{job="app-server", instance="1", group="canary"} 0+80x10
testcounter_reset_middle_mix 0+10x4 0+10x5 {{schema:0 sum:1 count:1}} {{schema:1 sum:2 count:2}}
http_requests_mix{job="app-server", instance="1", group="canary"} 0+80x10 {{schema:0 sum:1 count:1}}
http_requests_histogram{job="app-server", instance="1", group="canary"} {{schema:0 sum:1 count:2}}x10

# deriv should return the same as rate in simple cases.
eval instant at 50m rate(http_requests_total{group="canary", instance="1", job="app-server"}[50m])
Expand All @@ -268,6 +271,16 @@ eval instant at 50m deriv(http_requests_total{group="canary", instance="1", job=
eval instant at 50m deriv(testcounter_reset_middle_total[100m])
{} 0.010606060606060607

# deriv should ignore histograms.
eval instant at 110m deriv(http_requests_mix{group="canary", instance="1", job="app-server"}[110m])
{group="canary", instance="1", job="app-server"} 0.26666666666666666

eval instant at 100m deriv(testcounter_reset_middle_mix[110m])
{} 0.010606060606060607

eval instant at 50m deriv(http_requests_histogram[60m])
#empty

# predict_linear should return correct result.
# X/s = [ 0, 300, 600, 900,1200,1500,1800,2100,2400,2700,3000]
# Y = [ 0, 10, 20, 30, 40, 0, 10, 20, 30, 40, 50]
Expand Down Expand Up @@ -1110,11 +1123,16 @@ clear
# Don't return anything when there's something there.
load 5m
http_requests{job="api-server", instance="0", group="production"} 0+10x10
http_requests_histogram{job="api-server", instance="0", group="production"} {{schema:0 sum:1 count:1}}x11

eval instant at 50m absent(http_requests)

eval instant at 50m absent(sum(http_requests))

eval instant at 50m absent(http_requests_histogram)

eval instant at 50m absent(sum(http_requests_histogram))

clear

eval instant at 50m absent(sum(nonexistent{job="testjob", instance="testinstance"}))
Expand Down Expand Up @@ -1162,6 +1180,7 @@ load 1m
httpd_handshake_failures_total{instance="127.0.0.1",job="node"} 1+1x15
httpd_log_lines_total{instance="127.0.0.1",job="node"} 1
ssl_certificate_expiry_seconds{job="ingress"} NaN NaN NaN NaN NaN
http_requests_histogram{path="/foo",instance="127.0.0.1",job="httpd"} {{schema:0 sum:1 count:1}}x11

eval instant at 5m absent_over_time(http_requests_total[5m])

Expand Down Expand Up @@ -1205,6 +1224,16 @@ eval instant at 5m absent_over_time({job="ingress"}[4m])
eval instant at 10m absent_over_time({job="ingress"}[4m])
{job="ingress"} 1

eval instant at 10m absent_over_time(http_requests_histogram[5m])

eval instant at 10m absent_over_time(rate(http_requests_histogram[5m])[5m:1m])

eval instant at 20m absent_over_time(http_requests_histogram[5m])
{} 1

eval instant at 20m absent_over_time(rate(http_requests_histogram[5m])[5m:1m])
{} 1

clear

# Testdata for present_over_time()
Expand Down