mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-09 23:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
13946 commits 245 branches 436 tags 650 MiB
Commit graph

1012 commits

Author SHA1 Message Date
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
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
Julius Volz 0180cf31aa Factor out common icon and card styles
Some checks failed
CI / Go tests (push) Has been cancelled
Details
CI / More Go tests (push) Has been cancelled
Details
CI / Go tests with previous Go version (push) Has been cancelled
Details
CI / UI tests (push) Has been cancelled
Details
CI / Go tests on Windows (push) Has been cancelled
Details
CI / Mixins tests (push) Has been cancelled
Details
CI / Build Prometheus for common architectures (0) (push) Has been cancelled
Details
CI / Build Prometheus for common architectures (1) (push) Has been cancelled
Details
CI / Build Prometheus for common architectures (2) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (0) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (1) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (10) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (11) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (2) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (3) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (4) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (5) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (6) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (7) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (8) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (9) (push) Has been cancelled
Details
CI / Check generated parser (push) Has been cancelled
Details
CI / golangci-lint (push) Has been cancelled
Details
CI / fuzzing (push) Has been cancelled
Details
CI / codeql (push) Has been cancelled
Details
CI / Report status of build Prometheus for all architectures (push) Has been cancelled
Details
CI / Publish main branch artifacts (push) Has been cancelled
Details
CI / Publish release artefacts (push) Has been cancelled
Details
CI / Publish UI on npm Registry (push) Has been cancelled
Details 
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
Some checks failed
CI / Go tests (push) Has been cancelled
Details
CI / More Go tests (push) Has been cancelled
Details
CI / Go tests with previous Go version (push) Has been cancelled
Details
CI / UI tests (push) Has been cancelled
Details
CI / Go tests on Windows (push) Has been cancelled
Details
CI / Mixins tests (push) Has been cancelled
Details
CI / Build Prometheus for common architectures (0) (push) Has been cancelled
Details
CI / Build Prometheus for common architectures (1) (push) Has been cancelled
Details
CI / Build Prometheus for common architectures (2) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (0) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (1) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (10) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (11) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (2) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (3) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (4) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (5) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (6) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (7) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (8) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (9) (push) Has been cancelled
Details
CI / Check generated parser (push) Has been cancelled
Details
CI / golangci-lint (push) Has been cancelled
Details
CI / fuzzing (push) Has been cancelled
Details
CI / codeql (push) Has been cancelled
Details
Scorecards supply-chain security / Scorecards analysis (push) Has been cancelled
Details
CI / Report status of build Prometheus for all architectures (push) Has been cancelled
Details
CI / Publish main branch artifacts (push) Has been cancelled
Details
CI / Publish release artefacts (push) Has been cancelled
Details
CI / Publish UI on npm Registry (push) Has been cancelled
Details 
Fix border color for target pools with one target that is failing
 2024-09-13 09:21:54 +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)
Some checks failed
CI / Go tests with previous Go version (push) Waiting to run
Details
CI / UI tests (push) Waiting to run
Details
CI / Go tests on Windows (push) Waiting to run
Details
CI / Mixins tests (push) Waiting to run
Details
CI / Build Prometheus for common architectures (0) (push) Waiting to run
Details
CI / Build Prometheus for common architectures (1) (push) Waiting to run
Details
CI / Build Prometheus for common architectures (2) (push) Waiting to run
Details
CI / Build Prometheus for all architectures (0) (push) Waiting to run
Details
CI / Build Prometheus for all architectures (1) (push) Waiting to run
Details
CI / Build Prometheus for all architectures (10) (push) Waiting to run
Details
CI / Build Prometheus for all architectures (11) (push) Waiting to run
Details
CI / Build Prometheus for all architectures (2) (push) Waiting to run
Details
CI / Build Prometheus for all architectures (3) (push) Waiting to run
Details
CI / Build Prometheus for all architectures (4) (push) Waiting to run
Details
CI / Build Prometheus for all architectures (5) (push) Waiting to run
Details
CI / Build Prometheus for all architectures (6) (push) Waiting to run
Details
CI / Build Prometheus for all architectures (7) (push) Waiting to run
Details
CI / Build Prometheus for all architectures (8) (push) Waiting to run
Details
CI / Build Prometheus for all architectures (9) (push) Waiting to run
Details
CI / Report status of build Prometheus for all architectures (push) Blocked by required conditions
Details
CI / Check generated parser (push) Waiting to run
Details
CI / golangci-lint (push) Waiting to run
Details
CI / fuzzing (push) Waiting to run
Details
CI / codeql (push) Waiting to run
Details
CI / Publish main branch artifacts (push) Blocked by required conditions
Details
CI / Publish release artefacts (push) Blocked by required conditions
Details
CI / Publish UI on npm Registry (push) Blocked by required conditions
Details
Scorecards supply-chain security / Scorecards analysis (push) Waiting to run
Details
Push README to Docker Hub / Push README to Docker Hub (push) Has been cancelled
Details
Push README to Docker Hub / Push README to quay.io (push) Has been cancelled
Details 
* Fix typos

---------

Signed-off-by: Nathan Baulch <nathan.baulch@gmail.com>
 2024-09-10 22:32:03 +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 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
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 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
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 a2bf2bf4ef Change npm deps to 0.3xx 
Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
 2024-09-10 10:16:45 +01:00
Fiona Liao 500fcac03a Update CHANGELOG for beta 
Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
 2024-09-10 10:14:47 +01:00
dependabot[bot] 1b281f074e
Bump @types/node from 22.5.2 to 22.5.4 in /web/ui (#14873) 
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.5.2 to 22.5.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: indirect
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-09-10 09:05:21 +02:00
Julius Volz c1080990ac Bring back documentation link in the form of an action button 
IMO this looks nicer than adding it as a normal page nav link as in
https://github.com/prometheus/prometheus/pull/14878

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-09 18:55:32 +02:00
Julius Volz 785d595855 ui build: create requires web/ui/static dir ad hoc 
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
 2024-09-09 18:30:00 +02:00
Jan Fajerski fa318711f4 Merge branch 'main' into 3.0-main-sync-24-09-09 
Conflicts:
	cmd/prometheus/main.go
	docs/command-line/prometheus.md
	docs/feature_flags.md
	web/ui/build_ui.sh
	web/web.go
    Resolved by dropping the UTF-8 feature flag and adding the
    `auto-reload-config` feature flag.
    For the new web ui pick all changes from `main`.
 2024-09-09 15:44:22 +02:00
Julius Volz 11f344e4d3 Move AM discovery page from "Monitoring status" -> "Server status" 
Seems to at least make more sense to me like that.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-09 14:32:27 +02:00
Julius Volz e2be869a7a Slightly improve navbar wrapping for long status title + narrow window 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-09 11:59:36 +02:00
Julius Volz 306d357635 Revert back to normal font for recording rule titles 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-09 11:54:41 +02:00
Julius Volz 7e0cba568e Make annotations display on /alerts page consistent with /rules 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-09 11:50:46 +02:00
Julius Volz adf6c105a7 Show alert annotations on /rules page 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-09 11:46:42 +02:00
Julius Volz 5956d482e8 Remove a few unneeded comments and component props 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-09 11:19:47 +02:00
Julius Volz d7bacf96c7 Remove commented-out and unused allowLineBreaks settings for binop explain 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-09 11:19:02 +02:00
Julius Volz ff41d45bae Make status page timestamps consistent and use local time 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-09 11:13:22 +02:00
Julius Volz a0463f5501 Update UI docs to mention both old + new UIs
Some checks failed
CI / Go tests (push) Has been cancelled
Details
CI / More Go tests (push) Has been cancelled
Details
CI / Go tests with previous Go version (push) Has been cancelled
Details
CI / UI tests (push) Has been cancelled
Details
CI / Go tests on Windows (push) Has been cancelled
Details
CI / Mixins tests (push) Has been cancelled
Details
CI / Build Prometheus for common architectures (0) (push) Has been cancelled
Details
CI / Build Prometheus for common architectures (1) (push) Has been cancelled
Details
CI / Build Prometheus for common architectures (2) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (0) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (1) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (10) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (11) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (2) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (3) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (4) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (5) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (6) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (7) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (8) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (9) (push) Has been cancelled
Details
CI / Check generated parser (push) Has been cancelled
Details
CI / golangci-lint (push) Has been cancelled
Details
CI / fuzzing (push) Has been cancelled
Details
CI / codeql (push) Has been cancelled
Details
CI / Report status of build Prometheus for all architectures (push) Has been cancelled
Details
CI / Publish main branch artifacts (push) Has been cancelled
Details
CI / Publish release artefacts (push) Has been cancelled
Details
CI / Publish UI on npm Registry (push) Has been cancelled
Details 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-09 11:02:32 +02:00
Julius Volz 0c9a2c95bf Make "npm run start" from web/ui start the new UI 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-09 11:02:15 +02:00
Julius Volz d23872ef30 Graph range vector selectors as instant vector selectors with notice 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-08 21:11:06 +02:00
Julius Volz 1f1ca37fd7 Select root of tree by default in tree view 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-08 20:53:59 +02:00
Julius Volz cdcd43af5b Fix a lot of styling in tree view and binop explain view 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-08 20:53:44 +02:00
Julius Volz 52a6e32fd0 Update all CodeMirror dependencies 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-08 17:06:21 +02:00
Julius Volz 0ac38a5fd6 Update mantine-ui package version to latest release 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-08 15:17:49 +02:00
Julius Volz 8b4291537b Clarify explain view, add tree view close button, fix callback bug 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-08 15:17:00 +02:00
Julius Volz 7e0cd2e0b4 Improve binop explain view styling 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-08 15:16:02 +02:00
Julius Volz d9fdb50a61 Remove file that was erroneously added to old UI 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-07 18:00:35 +02:00
Julius Volz 89bfe813a9 Update UI tools Go version again to match rest of Prometheus 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-06 22:08:09 +02:00
Julius Volz 9b27e0d915 Only switch dir temporarily in build_ui.sh 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-06 21:40:29 +02:00
Julius Volz 5c88aa4fea Add commented-out Prometheus demo server as alternative to vite proxy config 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-06 21:22:26 +02:00
Julius Volz ee4a06be37 Make new UI tools Go version the same as rest of Prometheus 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-06 20:59:49 +02:00
Julius Volz ae131e7d86 Install prettier deps for modules and old React app 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-06 20:48:55 +02:00
Julius Volz 5fd860f806 Complete building tree view and implement "Explain" tab 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2024-09-06 20:38:10 +02:00