github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,259 Commits
252 Branches
442 Tags
627 MiB
Commit Graph

1809 Commits (a6b085ee5abea79d61e915c4bfb6fbc5e5e3e2ee)

Author SHA1 Message Date
Bryan Boreham 3fd24d1cd7
Merge pull request #13999 from bboreham/extract-promqltest 
[Test] Extract most PromQL test code into separate packages
 2024-05-09 13:23:11 +01:00
Bryan Boreham 8fd96241ab test: add promqltest package references 
To packages outside of promql.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-05-08 16:08:04 +01:00
Arthur Silva Sens df05132f19 Prepare v2.52.0 release 
Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>
 2024-05-08 07:37:25 -03:00
Arthur Silva Sens 2e323af50f
Merge branch 'main' into resolve-conflicts-2.52 
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
 2024-05-03 14:36:38 -03:00
Arthur Silva Sens 48e6e16943
Prepare v2.52.0-rc.1 release (#14050) 
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
 2024-05-03 17:31:50 +00:00
AVejahat 56fd8a1e4a
bugfix: add missing comma in vector/matrix array (#14047) 
* bugfix: Add missing comma when encoding JSON results in web API

---------

Signed-off-by: Amir Vejahat <amir.vejahat.av@gmail.com>
Co-authored-by: Arthur Silva Sens <arthur.sens@coralogix.com>
 2024-05-03 14:07:49 -03:00
Arthur Silva Sens 650f4d7a72
Merge remote-tracking branch 'origin/main' into resolve-conflicts-2.52 2024-05-02 10:47:45 -03:00
Arthur Silva Sens f170a014f3
Merge pull request #13969 from prometheus/prepare-v2.52 
Prepare v2.52.0-rc.0 release
 2024-04-30 09:18:30 -03:00
Bryan Boreham 5c8ffaa77c bugfix: API: encode empty Vector/Matrix as [] 
If the underlying data is `nil` the default encoding
will render `"null"` which is not accepted by
(some) Prometheus client libraries.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-04-29 19:08:10 +01:00
Bryan Boreham 00247b5d87 test: API: check empty responses 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-04-29 19:08:10 +01:00
Bryan Boreham e0a00f45db refactor: API: separate typed and unsafe marshalling 
The typed versions are used when we call from one marshaller to another.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-04-29 19:08:10 +01:00
Bryan Boreham 66a1c3daad refactor: API: be explicit that we marshal empty objects 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-04-29 19:08:10 +01:00
Bryan Boreham c8aed6b0ec tests: API: Let nil expected response mean skip check 
When we want to check just the json encoding.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-04-29 19:08:10 +01:00
Bryan Boreham 5a339ba359 tests: API: Use jsoniter when encoding 
So that tests use the same encoding as the api.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-04-29 19:08:10 +01:00
Bryan Boreham 2c4a36376d tests: API: simplify check of error response 
Since we already use require.JSONEq in similar cases.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-04-29 19:08:10 +01:00
Neeraj Gartia 99f9d32499
UTF-8: updates UI parser to support UTF-8 characters (#13590) 
Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>
 2024-04-29 11:14:01 +02:00
Arthur Silva Sens 9195d51469
Prepare v2.52 release 
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
 2024-04-24 17:19:43 -03:00
dependabot[bot] 41ea62acba
build(deps): bump @forevolve/bootstrap-dark in /web/ui 
Bumps [@forevolve/bootstrap-dark](https://github.com/ForEvolve/bootstrap-dark) from 2.1.1 to 4.0.2.
- [Release notes](https://github.com/ForEvolve/bootstrap-dark/releases)
- [Commits](https://github.com/ForEvolve/bootstrap-dark/compare/v2.1.1...v4.0.2)

---
updated-dependencies:
- dependency-name: "@forevolve/bootstrap-dark"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-20 10:24:21 +00:00
Julius Volz 5827772f69 Merge branch 'main' into mantine-ui 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-19 14:03:25 +02:00
Julius Volz e8bbe191d4 Build both old & new UI into Prometheus, allow choosing via feature flag 
This keeps the old "react-app" directory in its existing location (to make
it easier to merge changes from the main branch), but separates it from the
npm workspaces setup. Thus it now needs to be npm-installed/built/linted
separately. This is a bit hacky, but should only be needed temporarily,
until the old UI can be removed.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-18 15:08:40 +02:00
Julius Volz a057601771 Fix a few Mantine UI lint errors 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-18 15:04:14 +02:00
Julius Volz 54dc1455d7 Merge branch 'main' into mantine-ui 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-15 10:00:16 +02:00
Julius Volz 5524a03d29 Remove files erroneously added to old React app 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-15 09:59:52 +02:00
Bryan Boreham e1dd8e72df
Merge branch 'main' into merge-2.51.2-into-main 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-04-10 15:05:52 +01:00
Bryan Boreham b4c0ab52c3 Cut release 2.51.2 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-04-10 11:08:16 +01:00
Julius Volz 50118dc174 Change icon for state multiselect 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-09 12:50:22 +02:00
Julius Volz 1049c90cb5 Clean up file hierarchy a bit, add some more comments 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-09 12:36:53 +02:00
Matthieu MOREL d496687c8e golangci-lint: enable usestdlibvars linter 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2024-04-08 19:26:23 +00:00
Julius Volz b778c0a249 Change /graph to /query as default homepage in Go backend 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-03 16:39:27 +02:00
Julius Volz cdc4bf0ebc Various tiny code cleanups 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-03 16:15:50 +02:00
Julius Volz 0cc6645c2d Some improvements to completion info tooltip for new CM version 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-03 14:50:29 +02:00
Julius Volz a1f36de67c Add missing alerts page redux slice file 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-03 14:49:21 +02:00
Julius Volz 719b31f1b5 Show rules page as collapsed accordion instead of rules table 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-03 14:48:59 +02:00
Julius Volz 8165a6e337 Better color for "unknown" health badge 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-03 14:48:01 +02:00
Julius Volz c2eb4007bb Better top nav page titles, clickable Prometheus brand logo 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-03 14:47:38 +02:00
Julius Volz b40a029599 More timestamp handling fixes/improvements 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-03 14:46:55 +02:00
Julius Volz 3c44f43815 Add state filtering to alerts page 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-03 14:46:17 +02:00
Julius Volz 2be782df77 Various query page improvements 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-03 14:45:35 +02:00
Julius Volz 684698b827 Remove unused old multiselect code 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-03 14:44:16 +02:00
Julius Volz 1f5605fe63 Time formatting / parsing improvements 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-03 14:43:56 +02:00
Julius Volz 70221fc4a0 Build initial targets page 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-04-03 14:43:03 +02:00
Bryan Boreham e1a5886c88
Merge branch 'main' into merge-2.51-into-main 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-03-28 10:00:25 +00:00
Bryan Boreham 855b5ac4b8
Cut release 2.51.1 (#13853) 
* Cut release 2.51.1

Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-03-28 09:23:45 +00:00
Björn Rabenstein 7ba218fbd0
Merge pull request #13791 from bboreham/merge-2.51.0 
Merge 2.51.0 into main
 2024-03-19 19:15:25 +01:00
Erlan Zholdubai uulu 742196b6c4
add context cancellation check at get series result iteration (#13766) 
* add context cancellation check at get series iteration
* add warnings and closer on error
* add test

---------

Signed-off-by: Erlan Zholdubai uulu <erlanz@amazon.com>
 2024-03-19 18:37:43 +01:00
Bryan Boreham 0630e49c0d
Merge branch 'main' into merge-2.51.0 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-03-19 11:56:14 +01:00
Bryan Boreham c05c15512a
Cut v2.51.0 (#13787) 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-03-19 10:49:40 +00:00
Julius Volz a699cbefae Try making /rules timing badges clearer by adding text 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-14 12:21:05 +01:00
Julius Volz 64dabd4379 Use redux-based settings in expression input component 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-14 12:20:19 +01:00
Julius Volz 9fe8a5dba7 Make spacing, shadows, and radius sizes more consistent 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-14 12:19:41 +01:00
Julius Volz 627826783c Add state and label/alertname filter mockups to Alerts page 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-14 12:18:03 +01:00
Julius Volz 2f95bbe570 Improve humanizeDuration() code and output 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-14 12:14:51 +01:00
Julius Volz 00d2a49f4d Better gray tones for "Unknown" health color 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-14 12:13:19 +01:00
Julius Volz 796d1806da Add Settings menu, make menu links left-justified again 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-14 12:07:13 +01:00
Julius Volz 121d92209d Make Status menu wide enough for new icon size 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-14 12:05:26 +01:00
Julius Volz dee41028f7 Fix path prefix handling for "/" 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-14 12:04:50 +01:00
Julius Volz 143917cfe0 Nav link size cleanups 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-14 12:04:24 +01:00
Julius Volz e29ad4a83b Add "Scroll to Top" component 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-14 12:02:45 +01:00
Julius Volz 6ff7857313 Add codeicon font for autocompletion icons 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-14 12:00:40 +01:00
Bartlomiej Plotka 312e3fd728
Merge pull request #13713 from charleskorn/query-engine-interface 
rules: allow using alternative PromQL engines for rule evaluation by callers using Prometheus as a lib.
 2024-03-13 14:45:42 +01:00
Charles Korn 26262a1eb7
Remove unnecessary `SetQueryLogger` method on `QueryEngine` interface 
Signed-off-by: Charles Korn <charles.korn@grafana.com>
 2024-03-12 22:01:01 +11:00
guoguangwu 1cccdbaedb chore: use constant instead of numeric literal 
Signed-off-by: guoguangwu <guoguangwug@gmail.com>
 2024-03-12 17:19:50 +08:00
Bryan Boreham 8d53e7ba90
Cut v2.51.0-rc.0 (#13729) 
* Cherry-pick [BUGFIX] Azure SD: Fix 'error: parameter virtualMachineScaleSetName cannot be empty' (#13702)

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-03-11 13:35:44 +00:00
Julius Volz ebb468cedf Add graphing component stub 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-08 17:44:21 +01:00
Julius Volz 9093e0ab91 Cleanups in DataTable code 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-08 17:43:38 +01:00
Julius Volz b17dae1dab Increase range input width 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-08 16:05:45 +01:00
Julius Volz d9768a70b6 Add missing response type file 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-08 16:02:00 +01:00
Julius Volz d5a1e71f6c Make time and range input controls prettier 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-08 16:01:41 +01:00
Julius Volz 2b12ff7ce8 Fix query_format path 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-08 15:19:43 +01:00
Julius Volz d2f913ac1e Implement initial time check and fetching of metric names 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-08 15:15:49 +01:00
Julius Volz 33a753c2f8 Implement pathPrefix handling 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-08 14:06:05 +01:00
Julius Volz 5fea050fed Refactor API fetching code, handle all possible errors correctly 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-07 21:05:12 +01:00
Björn Rabenstein 9acae57937
Merge pull request #13681 from krajorama/native-latency-histograms 
Add native histograms to latency/duration metrics
 2024-03-07 20:46:43 +01:00
Julius Volz 92195e3fb6 Implement expression formatting 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-07 17:45:14 +01:00
Julius Volz 074b4eb36e Smaller font size for data table 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-07 17:44:45 +01:00
Julius Volz 124f36e670 Add back removing panels via menu 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-07 16:59:47 +01:00
Julius Volz 1e523b204d Improve query panel / data table layout and spacing 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-07 16:59:25 +01:00
Julius Volz 2bb14c5787 Lots of more progress on the new Mantine UI 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-03-07 13:16:54 +01:00
Bryan Boreham 25f200bf85 API tests: fix flaky TestEndpoints 
When a limit is specified, the API may return arbitrary rows, so don't
check specific response values.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-03-06 09:59:18 +00:00
Charles Korn 4e77e8e5ef
Allow using alternative PromQL engines for rule evaluation 
Signed-off-by: Charles Korn <charles.korn@grafana.com>
 2024-03-06 14:54:33 +11:00
György Krajcsovits 4d4d822c36 Add native histograms to latency/duration metrics 
Dogfood native histograms.
Allow dependent projects to migrate to native histograms.

I took the defaults from client_golang.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
 2024-03-01 14:44:38 +01:00
Kartikay 8736772053
web/api: add limit param on series, labels, label-values (#13396) 
Support limit parameter in queries to restrict output data to the specified size, on the following endpoints:

/api/v1/series
/api/v1/labels
/api/v1/label/:name:/values

Signed-off-by: Pranshu Srivastava <rexagod@gmail.com>
Signed-off-by: Kartikay <kartikay_2101ce32@iitp.ac.in>
 2024-02-29 15:31:13 +00:00
Manik Rana ab9b770aea
ui (histograms): Add native histogram chart to Table view (#13658) 
* feat: initial add histogram table

Signed-off-by: Manik Rana <manikrana54@gmail.com>

* feat: add x-axis scale toggle

Signed-off-by: Manik Rana <manikrana54@gmail.com>

* refac: adjust histogram summary styles

Signed-off-by: Manik Rana <manikrana54@gmail.com>

* feat: initial add histogram table

Signed-off-by: Manik Rana <manikrana54@gmail.com>

* feat: add x-axis scale toggle

Signed-off-by: Manik Rana <manikrana54@gmail.com>

* refac: adjust histogram summary styles

Signed-off-by: Manik Rana <manikrana54@gmail.com>

* chore: remove unused code

Signed-off-by: Manik Rana <manikrana54@gmail.com>

* tests: test for HistogramChart instead of HistogramString

Signed-off-by: Manik Rana <manikrana54@gmail.com>

* fix: remove histogramChart from a test

Signed-off-by: Manik Rana <manikrana54@gmail.com>

* chore: rename style classes

Signed-off-by: Manik Rana <manikrana54@gmail.com>

* refac: suppress test errors

Signed-off-by: Manik Rana <manikrana54@gmail.com>

---------

Signed-off-by: Manik Rana <manikrana54@gmail.com>
 2024-02-29 14:21:15 +01:00
machine424 f477e0539a
Move from golang.org/x/exp/slices into slices now that we only support Go >= 1.21 
Prevent adding back golang.org/x/exp/slices.

Signed-off-by: machine424 <ayoubmrini424@gmail.com>
 2024-02-28 14:54:53 +01:00
Bryan Boreham d2817e9c91
Merge pull request #12304 from bboreham/labels-symboltable 
Labels: reduce memory by de-duplicating strings in SymbolTables
 2024-02-26 14:06:27 +00:00
Bryan Boreham 518ab179fb Merge branch 'release-2.50' into merge-2.50.1 2024-02-26 11:50:06 +00:00
Bryan Boreham 9ba13de220 scraping: pass a Builder to get Target labels 
This saves memory allocations from making a new Builder every time.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-02-26 11:45:25 +00:00
Bryan Boreham eff3a13e19 model/textparse: parsers take a labels SymbolTable 
This allows strings to be interned to save memory.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-02-26 11:45:25 +00:00
Bryan Boreham e537d6d1c1 Cut 2.50.1 with metadata api bugfix 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-02-26 10:00:21 +00:00
ismail simsek eecaa71ff1 Fix: metadata API using wrong field names (#13633) 
Fix is to add json tags to `Metadata` struct. Absence of these tags
causes Go to use the field name, which starts with an upper-case
letter and breaks the protocol.

Extend tests to verify the JSON response.

Signed-off-by: ismail simsek <ismailsimsek09@gmail.com>
 2024-02-26 09:54:39 +00:00
ismail simsek 2507469291
Fix: metadata API using wrong field names (#13633) 
Fix is to add json tags to `Metadata` struct. Absence of these tags
causes Go to use the field name, which starts with an upper-case
letter and breaks the protocol.

Extend tests to verify the JSON response.

Signed-off-by: ismail simsek <ismailsimsek09@gmail.com>
 2024-02-26 09:53:39 +00:00
Julius Volz 89ecb3a3f2 Add input field to /graph page. 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-02-23 17:38:25 +01:00
Julius Volz 128b6461e9 Start working on /alerts page, factor out rule definition display 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-02-23 17:37:56 +01:00
Julius Volz 65cc7b058e Remove index.css from initial default app 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-02-23 14:21:20 +01:00
Julius Volz ce1ca6481e Better navbar icon sizes 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-02-23 14:19:46 +01:00
Manik Rana 08832e2db8
histogram: add UI tests for rendering histogram (#13631) 
* histogram: add tests for rendering histograms

Signed-off-by: Manik Rana <manikrana54@gmail.com>

* histogram: add tests for rendering histograms

Signed-off-by: Manik Rana <manikrana54@gmail.com>

* chore: remove unused import

Signed-off-by: Manik Rana <manikrana54@gmail.com>

---------

Signed-off-by: Manik Rana <manikrana54@gmail.com>
 2024-02-23 11:31:39 +01:00
Augustin Husson 9738e48a7d
Merge pull request #13629 from prometheus/release-2.50 
merge back release 2.50
 2024-02-22 11:07:52 +01:00
Augustin Husson 814b920e8a
Cut v2.50.0 (#13612) 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2024-02-22 10:21:59 +01:00
Julius Volz 096acdce7e Fix npm workspaces build for Mantine UI 
Thanks to input by @nexucis :)

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-02-21 22:36:27 +01:00
Julius Volz cc38c1426a Attempt to integrate Mantine UI into npm workspaces + Prometheus binary 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-02-21 11:14:35 +01:00
Julius Volz d6a347e5de Implement several status pages and other general aspects 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-02-21 11:13:48 +01:00
Augustin Husson 93591ec5cc
Cut v2.50.0-rc.1 (#13602) 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2024-02-19 14:15:03 +01:00
Bryan Boreham aba0071480
Merge pull request #13589 from bboreham/trace_id 
Standardise exemplar label as "trace_id"
 2024-02-19 09:34:04 +00:00
Julius Volz dfabda7507 Add scaffold for new Mantine-based UI 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-02-17 12:29:47 +01:00
Owen Williams a28d7865ad UTF-8: Add support for parsing UTF8 metric and label names 
This adds support for the new grammar of `{"metric_name", "l1"="val"}` to promql and some of the exposition formats.
This grammar will also be valid for non-UTF-8 names.
UTF-8 names will not be considered valid unless model.NameValidationScheme is changed.

This does not update the go expfmt parser in text_parse.go, which will be addressed by https://github.com/prometheus/common/issues/554/.

Part of https://github.com/prometheus/prometheus/issues/13095

Signed-off-by: Owen Williams <owen.williams@grafana.com>
 2024-02-15 14:34:37 -05:00
Bryan Boreham c0e36e6bb3 Standardise exemplar label as "trace_id" 
This is consistent with the OpenTelemetry standard, and an example in OpenMetrics.

https://github.com/open-telemetry/opentelemetry-specification/blob/89aa01348139/specification/metrics/data-model.md#exemplars
https://github.com/OpenObservability/OpenMetrics/blob/138654493130/specification/OpenMetrics.md#exemplars-1

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-02-15 14:20:08 +00:00
Augustin Husson 452f4c96b7
Cut v2.50.0-rc.0 (#13465) 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2024-02-13 10:21:23 +01:00
Bryan Boreham 39af788dbd Tests: use replacement DeepEquals using go-cmp 
Use DeepEqual replacement using go-cmp, which is more flexible.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-02-08 19:30:20 +00:00
Bryan Boreham 98c4889029
Merge pull request #9298 from Creatone/creatone/use-testify 
tests: Move from t.Errorf and others.
 2024-02-04 16:27:57 +01:00
Faustas Butkus 6feffeb92e
promql: add histogram_avg function (#13467) 
Add histogram_avg function

---------

Signed-off-by: Faustas Butkus <faustas.butkus@gmail.com>
Signed-off-by: Björn Rabenstein <github@rabenste.in>
Co-authored-by: Björn Rabenstein <github@rabenste.in>
 2024-02-01 18:28:42 +01:00
Bryan Boreham 16e68c01e4 tests: remove err from message when testify prints it already 
For instance `require.NoError` will print the unexpected error; we don't
need to include it in the message.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-02-01 14:18:01 +00:00
Paweł Szulik 6e9cca8158 Refactor web tests to use testify. 
Signed-off-by: Paweł Szulik <paul.szulik@gmail.com>
 2024-02-01 13:51:31 +00:00
Leegin 19efd0a675
api: Serialize discovered labels into JSON directly in dropped targets (#13484) 
Converted maps into labels.Labels to avoid a lot of copying of data which leads to very high memory consumption while opening the /service-discovery endpoint in the Prometheus UI

Signed-off-by: Leegin <114397475+Leegin-darknight@users.noreply.github.com>
 2024-01-29 10:20:20 +00:00
Leegin e3040bfabc
api: Serialize discovered and target labels into JSON directly (#13469) 
Converted maps into labels.Labels to avoid a lot of copying of data which leads to very high memory consumption while opening the /service-discovery endpoint in the Prometheus UI

Signed-off-by: Leegin <114397475+Leegin-darknight@users.noreply.github.com>
 2024-01-29 10:19:02 +00:00
Yury Molodov a598ddfbc4
ui/fix: correct url handling for stacked graphs (#13460) 
Signed-off-by: Yury Moladau <yurymolodov@gmail.com>
 2024-01-26 09:25:23 +01:00
Augustin Husson 52fa5863a2
Merge branch 'main' into nexucis/merge-back 2024-01-25 13:31:16 +01:00
Filip Petkovski 583f3e587c
Optimize histogram iterators (#13340) 
Optimize histogram iterators

Histogram iterators allocate new objects in the AtHistogram and
AtFloatHistogram methods, which makes calculating rates over long
ranges expensive.

In #13215 we allowed an existing object to be reused
when converting an integer histogram to a float histogram. This commit follows
the same idea and allows injecting an existing object in the AtHistogram and
AtFloatHistogram methods. When the injected value is nil, iterators allocate
new histograms, otherwise they populate and return the injected object.

The commit also adds a CopyTo method to Histogram and FloatHistogram which
is used in the BufferedIterator to overwrite items in the ring instead of making
new copies.

Note that a specialized HPoint pool is needed for all of this to work 
(`matrixSelectorHPool`).

---------

Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
 2024-01-23 17:02:14 +01:00
tyltr f97fa2736c remove obsolete build tag 
Signed-off-by: tyltr <tylitianrui@126.com>
 2024-01-17 22:26:32 +08:00
bwplotka 216b5edb41 Cut 2.49.1 web package. 
Signed-off-by: bwplotka <bwplotka@gmail.com>
 2024-01-15 16:44:33 +00:00
Bartlomiej Plotka db3544c552
Merge branch 'main' into merge-2.49.0-back 
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
 2024-01-15 12:38:36 +01:00
Ayoub Mrini ace9c8a3da
promtool: allow setting multiple matchers to "promtool tsdb dump" command. (#13296) 
Conditions are ANDed inside the same matcher but matchers are ORed

Including unit tests for "promtool tsdb dump".

Refactor some matchers scraping utils.

Signed-off-by: machine424 <ayoubmrini424@gmail.com>
 2024-01-15 10:29:53 +00:00
bwplotka cf50f85faa Cut 2.49.0 
Signed-off-by: bwplotka <bwplotka@gmail.com>
 2024-01-15 09:55:35 +00:00
bwplotka abbcdc61f5 Cut 2.49.0-rc.2 
Signed-off-by: bwplotka <bwplotka@gmail.com>
 2024-01-08 09:49:30 +00:00
Bartlomiej Plotka d4a6bc03f2 Merge pull request #13371 from kevinmingtarja/fix-isHeatmapData 
ui: fix handling of scalar and string in isHeatmapData
 2024-01-08 09:42:46 +00:00
Bartlomiej Plotka 775d955919
Merge pull request #13371 from kevinmingtarja/fix-isHeatmapData 
ui: fix handling of scalar and string in isHeatmapData
 2024-01-07 19:59:20 +01:00
Kevin Mingtarja 40941d450b Fix handling of scalar and string in isHeatmapData 
Signed-off-by: Kevin Mingtarja <kevin.mingtarja@gmail.com>
 2024-01-04 02:48:54 +07:00
Kevin Mingtarja c126c21baa Fix DataTableProps['data'] for resultType string 
Signed-off-by: Kevin Mingtarja <kevin.mingtarja@gmail.com>
 2024-01-04 01:51:56 +07:00
bwplotka 20b4ef5d58 Cut v2.49.0-rc.1 
Signed-off-by: bwplotka <bwplotka@gmail.com>
 2023-12-19 19:23:43 +00:00
Bryan Boreham 8065bef172 Move metric type definitions to common/model 
They are used in multiple repos, so common is a better place for them.
Several packages now don't depend on `model/textparse`, e.g.
`storage/remote`.

Also remove `metadata` struct from `api.go`, since it was identical to
a struct in the `metadata` package.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-12-19 18:56:54 +00:00
Bryan Boreham 99c17b4319
Merge pull request #13177 from bboreham/less-madness 
scrape: consistent function names for metadata
 2023-12-19 17:51:52 +00:00
machine424 ea97086484
ui: create a reproduction for https://github.com/prometheus/prometheus/issues/13292 
Signed-off-by: machine424 <ayoubmrini424@gmail.com>
 2023-12-15 18:04:29 +01:00
Bartlomiej Plotka c4c8d59c14
Cut 2.49.0-rc.0 (#13270) 
* Cut 2.49.0-rc.0

Signed-off-by: bwplotka <bwplotka@gmail.com>

* Removed the duplicate.

Signed-off-by: bwplotka <bwplotka@gmail.com>

---------

Signed-off-by: bwplotka <bwplotka@gmail.com>
 2023-12-12 10:12:08 +00:00
Björn Rabenstein db915b07cb
Merge pull request #13215 from fpetkovski/float-histogram-reuse 
Enable reusing memory when converting between histogram types
 2023-12-09 22:44:46 +01:00
Bartlomiej Plotka 91a383f52c
Merge pull request #13059 from zenador/add-mad-function 
Add mad_over_time function
 2023-12-08 11:53:22 +00:00
Filip Petkovski 10a82f87fd
Enable reusing memory when converting between histogram types 
The 'ToFloat' method on integer histograms currently allocates new memory
each time it is called.

This commit adds an optional *FloatHistogram parameter that can be used
to reuse span and bucket slices. It is up to the caller to make sure the
input float histogram is not used anymore after the call.

Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
 2023-12-08 10:22:59 +01:00
dependabot[bot] 48b1818ee8
build(deps-dev): bump @types/node from 17.0.45 to 20.10.4 in /web/ui (#13260) 
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.45 to 20.10.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  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>
 2023-12-08 09:19:48 +00:00
Bartlomiej Plotka bc4f8366c5
Upgraded npm dependencies pre 2.49-rc.0 (#13256) 
Signed-off-by: bwplotka <bwplotka@gmail.com>
 2023-12-07 14:43:15 +00:00
dependabot[bot] b9960d6d8d
build(deps-dev): bump @babel/traverse from 7.19.3 to 7.23.3 in /web/ui (#13137) 
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.19.3 to 7.23.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.3/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-12-07 11:44:57 +00:00
Matthieu MOREL 9c4782f1cc
golangci-lint: enable testifylint linter (#13254) 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2023-12-07 11:35:01 +00:00
Julien Pivotto 6e8e16c050
Merge pull request #13227 from prometheus/release-2.48 
Merge release-2.48 back into main
 2023-12-01 16:09:02 +01:00
Jeanette Tan 9bf4cc993e Add mad_over_time function 
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
 2023-12-01 01:22:58 +08:00
Alexander Trost 5051a993ab promql: add sort_by_label and sort_by_label_desc functions 
This adds functions to sort a vector by its label value.

Based on https://github.com/prometheus/prometheus/pull/1533

Signed-off-by: Alexander Trost <galexrt@googlemail.com>
 2023-11-28 14:40:07 +01:00
dependabot[bot] 8d058884a0
build(deps): bump sanitize-html from 2.10.0 to 2.11.0 in /web/ui (#12513) 
Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 2.10.0 to 2.11.0.
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.10.0...2.11.0)

---
updated-dependencies:
- dependency-name: sanitize-html
  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>
 2023-11-28 12:49:34 +01:00
Yury Molodov 2e205ee95c
ui: heatmap visualization for histogram buckets (#13096) 
ui: heatmap visualization for histogram buckets

Signed-off-by: Yury Moladau <yurymolodov@gmail.com>

---------

Signed-off-by: Yury Moladau <yurymolodov@gmail.com>
 2023-11-24 22:44:48 +01:00
Bryan Boreham 34676a240e scrape: consistent function names for metadata 
Too confusing to have `MetadataList` and `ListMetadata`, etc.
I standardised on the ones which are in an interface.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-11-23 09:08:02 +00:00
Levi Harrison 41c7253333 Release 2.48.0 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2023-11-15 15:15:57 -05:00
Bryan Boreham 41758972e4
web/api: optimize labelnames/values with 1 set of matchers (#12888) 
* web/api: optimize labelnames/values with 1 set of matchers

If there is exactly one set of matchers provided, we can skip adding
the results to a map and getting them back out again.

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

---------

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-11-13 19:28:48 +01:00
Jacob Baungård Hansen 80d2f992ae
codemirror-promql: Add request header to client (#13118) 
With this commit we make it possible to adjust the request headers sent
to Prometheus by the codemirror-promql extension. This enables
customizing the headers sent, without re-implementing the Prometheus
client completely.

Signed-off-by: Jacob Baungard Hansen <jacobbaungard@redhat.com>
 2023-11-10 11:22:32 +01:00
Matthieu MOREL 05fba53e57 web : use Go standard package 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2023-11-08 06:37:59 +00:00
beorn7 5dca994f64 Merge branch 'release-2.48' into beorn7/release 2023-11-02 19:58:33 +01:00