RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-27 00:53:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,948 Commits 243 Branches 444 Tags 653 MiB
a8133f3e87
Commit Graph

13948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryan Boreham
a8133f3e87 TSDB: Simplify benchmark regexps 
Several regexps were coded like `"^.*$"`, which is an unnatural
formulation nobody is likely to use. Inside `NewMatcher`, `^` and `$`
are added anyway, which makes the form in the benchmark redundant.

It even printed it out in the expected way.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-09-16 17:48:05 +01:00
Augustin Husson
6febfbb3be
put back feature flag 'delayed-compaction' and 'old-ui' (#14909) 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2024-09-16 15:46:28 +02:00
Julien
f007659f03
Merge pull request #14531 from prometheus/dependabot/go_modules/github.com/go-zookeeper/zk-1.0.4 
build(deps): bump github.com/go-zookeeper/zk from 1.0.3 to 1.0.4
 2024-09-16 14:30:42 +02:00
Julius Volz
d67ba3ed30
Merge pull request #14908 from roidelapluie/fix14889 
Explain, vector-to-vector: Do not compute results for set operators
 2024-09-16 12:20:49 +02:00
Julien
ac01dc9035 Explain, vector-to-vector: Do not compute results for set operators 
Set operators are not displayed:
31ce9dacf4/web/ui/mantine-ui/src/pages/query/ExplainViews/BinaryExpr/VectorVector.tsx (L364)

Therefore, do not compute results for them.

Fixes #14889

Signed-off-by: Julien <roidelapluie@o11y.eu>
 2024-09-16 11:38:35 +02:00
Julien
31ce9dacf4
Merge pull request #14901 from roidelapluie/prebuiltui 
makefile: Add support for skipping UI build when prebuilt assets are provided
 2024-09-16 10:12:31 +02:00
Julius Volz
62bd893b80
Merge pull request #14907 from prometheus/julius/new-ui-improvements 
UI improvements: Factor out common styles, fix tree node line rendering, always show full badge contents (no ellipsis)
 2024-09-16 09:00:38 +02:00
Julius Volz
50af7d589b Fix tree line drawing by using a callback ref 
In a non-dev build (no initial double-renders), the tree lines would not be
rendered correctly from the parent of a binop to its first child, because the
first child would be rendered before the parent, and the parent's ref hadn't
been set yet at that time. Switched from a normal ref to a callback-based ref
with explicit React state update to make sure that the child gets to know about
the parent's (later) rendered div element.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-16 08:42:20 +02:00
Arthur Silva Sens
e8fa1312a7
Merge pull request #14903 from jan--f/drop-agent-ff-docs 
docs/feature_flags.md: drop `agent` feature flag
 2024-09-14 15:02:10 +02:00
Jan Fajerski
722f33225c docs/feature_flags.md: drop agent feature flag 
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
 2024-09-14 14:03:59 +02:00
Julius Volz
0180cf31aa Factor out common icon and card styles 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-13 14:44:04 +02:00
Julius Volz
0757fbbecc Make sure that alert element table headers are not wrapped 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-13 14:41:24 +02:00
Julius Volz
a7c1a951df Add general Mantine overrides CSS file 
...initially fixing the ellipsis overflow text cut-off in badges.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-13 14:40:29 +02:00
Julius Volz
b93ed7bd17
Merge pull request #14898 from prometheus/fix-targets-page-coloring 
Fix border color for target pools with one target that is failing
 2024-09-13 09:21:54 +02:00
Julius Volz
73e94dc9f7
Merge pull request #14899 from SuperSandro2000/patch-1 
ui: drop readme from template
 2024-09-13 09:05:00 +02:00
Julien
9126bbbed0 makefile: Add support for skipping UI build when prebuilt assets are provided 
This commit introduces the ability to skip the UI build in the Makefile by
providing prebuilt UI assets, addressing the needs of users who may not have npm
installed or who do not want to go through the front-end build process.

To achieve this, we added the `PREBUILT_ASSETS_STATIC_DIR` environment variable.
If this variable is set, the Makefile will skip the UI build and related tasks,
such as bundling npm licenses. Instead, it will use the prebuilt assets from
the specified directory.

We already publish prebuilt UI assets as part of our release artifacts
(e.g., `prometheus-web-ui-3.0.0-beta.0.tar.gz`). Users can download this tarball,
extract it, and point the `PREBUILT_ASSETS_STATIC_DIR` to the extracted folder.
This reduces build complexity, especially for users who don't have a development
environment for front-end builds.

For example, you can use the command:
`make PREBUILT_ASSETS_STATIC_DIR=static build`
where `static` refers to the directory containing the prebuilt UI files.
This change simplifies the build process while still allowing users to use a
prebuilt UI if desired.

This solution is particularly useful for users who don't need to modify the UI
and prefer to use the prebuilt version that we provide with each release.

Signed-off-by: Julien <roidelapluie@o11y.eu>
 2024-09-12 12:20:24 +02:00
George Krajcsovits
5aa3d8260a
TSDB: OOO native histograms: prep for multiple ooo head chunks (#14850) 
* tsdb: mmapCurrentOOOHeadChunk prepare for multiple ooo chunks

Currently float samples can only create a single ooo head chunk, but
native histograms can result in multiple due to counter resets, etc.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* tsdb: getOOOSeriesChunks prepare for multiple ooo chunks

Currently float samples can only create a single ooo head chunk, but
native histograms can result in multiple due to counter resets, etc.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

---------

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
 2024-09-11 23:55:39 +01:00
Arve Knudsen
4f81e077b3
Upgrade github.com/googleapis/enterprise-certificate-proxy to v0.3.4 (#14897) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2024-09-11 11:47:12 +02:00
Sandro
65743bf9bd
ui: drop template readme 
Signed-off-by: Sandro <sandro.jaeckel@gmail.com>
 2024-09-11 11:15:51 +02:00
Julius Volz
dfec29d8e5 Fix border color for target pools with one target that is failing 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-11 10:23:57 +02:00
Nathan Baulch
50cd453c8f
chore: Fix typos (#14868) 
* Fix typos

---------

Signed-off-by: Nathan Baulch <nathan.baulch@gmail.com>
 2024-09-10 22:32:03 +02:00
dependabot[bot]
54772a2c8f
Bump actions/upload-artifact from 4.3.4 to 4.4.0 (#14775) 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.4 to 4.4.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](0b2256b8c0...50769540e7)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  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>
 2024-09-10 22:14:29 +02:00
Julius Volz
4e1716610e
Merge pull request #14896 from jan--f/release-3.0-beta.0 
Cut release 3.0 beta.0
 2024-09-10 21:39:51 +02:00
Jan Fajerski
91608c002f Merge branch 'main' into release-3.0-beta.0 
Conflicts:
	scrape/scrape_test.go
          Pick both changes.
 2024-09-10 20:51:20 +02:00
Julius Volz
8472d23a1b
Merge pull request #14853 from fionaliao/release-3.0.0-beta 
Prepare release 3.0.0-beta.0
 2024-09-10 20:13:23 +02:00
Fiona Liao
24b256b7ae Add test-flags to try and get CI to pass 
Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
 2024-09-10 19:01:03 +02:00
Julius Volz
ad652de29a
Merge pull request #14895 from prometheus/fix-limit-ratio-explain 
Fix HTML rendering for aggregator Explain view
 2024-09-10 18:05:51 +02:00
Fiona Liao
1ac1e00999 Fix ENHANCEMENT typo 
Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
 2024-09-10 17:01:09 +01:00
Fiona Liao
5580e27e23 Merge branch 'release-3.0' into release-3.0.0-beta 
Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
 2024-09-10 16:58:20 +01:00
Fiona Liao
da6b3195d2
Update CHANGELOG.md 
Co-authored-by: Julien <291750+roidelapluie@users.noreply.github.com>
Signed-off-by: Fiona Liao <fiona.y.liao@gmail.com>
 2024-09-10 16:49:06 +01:00
Julius Volz
7fa4bd46c7
Merge pull request #14892 from jan--f/test-enable_npm-action 
test: pass enable_npm to setup_environment
 2024-09-10 17:13:43 +02:00
Julius Volz
ee808cda8b Fix HTML rendering for aggregator Explain view 
Follow-up to https://github.com/prometheus/prometheus/pull/14893

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-10 17:09:34 +02:00
Julius Volz
1bd10ac5d2
Merge pull request #14893 from roidelapluie/bottomkui 
Explain: Use param scalars in aggregations description
 2024-09-10 17:02:39 +02:00
Julien
3782da7bbc Explain: Use param scalars in aggregations description 
Signed-off-by: Julien <roidelapluie@o11y.eu>
 2024-09-10 16:40:33 +02:00
Jan Fajerski
341a1c1056 ci test: pass enable_npm to setup_environment 
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
 2024-09-10 16:37:52 +02:00
Julien
8d3da31f87
Merge pull request #14885 from prometheus/superq/update_promci_2 
Update promci action
 2024-09-10 15:48:43 +02:00
Björn Rabenstein
8114f9a281
Merge pull request #14821 from charleskorn/nh-negative-multiplication-division 
promql: correctly handle unary negation of native histograms and add tests for multiplication and division of native histograms by negative scalars
 2024-09-10 15:23:00 +02:00
Julien
8d580976cb Bump promci 
Signed-off-by: Julien <roidelapluie@o11y.eu>
 2024-09-10 15:21:38 +02:00
Björn Rabenstein
482f1f608c
Merge pull request #14880 from prometheus/njpm/fix-utf8-config 
fix(utf8): propagate validationScheme config to scraping options
 2024-09-10 14:17:44 +02:00
Jan Fajerski
3ce285e0a3
Merge pull request #14891 from roidelapluie/fix-lookback-delta 
Mantine UI: Use actual lookback delta in explain
 2024-09-10 13:18:59 +02:00
Fiona Liao
1d2b08bf17 Rollback old react app version 
Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
 2024-09-10 12:11:04 +01:00
Julien
be6d443947 Mantine UI: Use actual lookback delta in explain 
Signed-off-by: Julien <roidelapluie@o11y.eu>
 2024-09-10 13:01:57 +02:00
Julius Volz
bde5092471
Merge pull request #14882 from prometheus/new-ui-help-button 
Bring back documentation link in the form of an action button
 2024-09-10 12:54:00 +02:00
Julius Volz
7741134c0d
Merge pull request #14888 from roidelapluie/fix-discovered-alertmanagers 
Mantine UI: Fix 404 on /discovered-alertmanagers
 2024-09-10 12:39:12 +02:00
Julien
8aab6458b8 Mantine UI: Move /discovered-alertmanagers to /alertmanager-discovery 
Signed-off-by: Julien <roidelapluie@o11y.eu>
 2024-09-10 12:12:21 +02:00
Fiona Liao
d33cdb9fbe Revert "Try manually updating react-app deps" 
This reverts commit e1c2c51412.

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
 2024-09-10 10:42:07 +01:00
Fiona Liao
e1c2c51412 Try manually updating react-app deps 
Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
 2024-09-10 10:38:13 +01:00
Fiona Liao
63a842ef43 Fix npm deps 
Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
 2024-09-10 10:34:23 +01:00
Fiona Liao
1314c02a5f Add additional changelog entries 
Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
 2024-09-10 10:30:20 +01:00
Fiona Liao
80d92f8c91 Organise CHANGELOG 
Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
 2024-09-10 10:25:02 +01:00