mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-15 10:04:07 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
9232 commits 248 branches 440 tags 657 MiB
Commit graph

9232 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julius Volz 7ff76ed1ab
Merge pull request #9323 from prometheus/feature/use-npm-workspace 
Use npm workspace and integrate codemirror-promql locally
 2021-09-15 12:38:01 +02:00
Julius Volz 47d6471bd7 Add UI linting to CircleCI 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2021-09-15 12:03:45 +02:00
Julius Volz d2c0eac37f Fix linter errors in codemirror-promql module 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2021-09-15 11:48:21 +02:00
Levi Harrison dc2f1993d8
Limit number of alerts or series produced by a rule (#9260) 
* Add limit to rules

Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 09:48:26 +02:00
Julien Pivotto 1ea774f184
Merge pull request #9339 from roidelapluie/remove-double-align 
backfill: Do not align the start of the group since we align every rule.
 2021-09-14 23:46:25 +02:00
Julien Pivotto 2bde71ec5f
Merge pull request #9338 from prometheus/release-2.30 
merge back release 2.30
 2021-09-14 23:46:11 +02:00
Julien Pivotto 691ce066fb backfill: Do not align the start of the group since we align every rule. 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-09-14 23:13:06 +02:00
Augustin Husson 1b740aeb6e Merge branch 'main' into feature/use-npm-workspace 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-14 19:27:44 +02:00
Julius Volz ffe8c7e268
Merge pull request #9284 from prometheus/update-react-and-ts 
Update React 16->17, TypeScript, and some other node deps
 2021-09-14 18:36:12 +02:00
Augustin Husson af7aab7937 add global mock for the matchMedia function 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-14 15:49:46 +02:00
Augustin Husson 05b9a11a62 remove jest.restoreAllMock() call 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-14 15:49:46 +02:00
Augustin Husson c3306e6366 set canvas mock 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-14 15:49:46 +02:00
Julius Volz 5498ca5214 Update React 16->17, TypeScript, and some other node deps 
This updates React, TypeScript, and some other node packages (but not
everything).

A couple of notes:

- `enzyme-adapter-react-16` does not have a React 17 equivalent yet, so I
  switched to the fork `@wojtekmaj/enzyme-adapter-react-17`
- A bunch of tests are still failing because I think in the enzyme testing
  environment, a browser API (`ResizeObserver`) is missing, and maybe for other
  reasons. This needs to be explored + fixed.
- The TypeScript update introduced more stringent rules, which required fixing
  up a bunch of pieces of code a bit.
- The `use-media` package doesn't work with React 17 yet, so I just built our
  own minimal `useMedia` hook instead (just a couple of lines).
- I commented out part of the code in `withStartingIndicator.tsx` because it
  fails the now-stricter lint checks. It needs to be fixed (and not commented
  out).

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2021-09-14 15:46:59 +02:00
Marco Pracucci ffdaf8e346
Merge pull request #10 from grafana/update-upstream 
Update upstream
 2021-09-14 15:37:00 +02:00
Augustin Husson 22fa0aa408
remove app package in codemirror-module (#9322) 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-14 12:33:10 +02:00
Marco Pracucci 8b03492104
Run tests with go 1.16 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
 2021-09-14 11:23:51 +02:00
Ganesh Vernekar 37468d88dc
Cut v2.30.0 (#9329) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-09-14 14:31:09 +05:30
Marco Pracucci 8708b2d086
Update upstream Prometheus 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
 2021-09-14 10:28:19 +02:00
Paweł Szulik f5563bfe95
tests: Move from t.Errorf and others. (Part 2) (#9309) 
* Refactor util tests.

Signed-off-by: Paweł Szulik <paul.szulik@gmail.com>
 2021-09-13 21:19:20 +02:00
Julien Pivotto 2042b91003
Merge pull request #9334 from meehanman/update-storage-typo-dup-to 
Removed Duplication Typo (to to)
 2021-09-13 20:56:45 +02:00
Julien Pivotto 6c24529636
Merge pull request #9324 from JessicaGreben/9288-fix-backfill-bug 
rm overlap, add label builder to fix name bug
 2021-09-13 20:47:10 +02:00
Julien Pivotto 35c88e511f
Merge pull request #9333 from rfratto/expose-useragent-scrape 
Expose scrape.userAgentHeader like remote.UserAgent
 2021-09-13 20:46:33 +02:00
Dean Meehan 5751bfb61f Removed Duplication Typo (to to) 
Signed-off-by: Dean Meehan <dean@dean.technology>
 2021-09-13 19:34:07 +01:00
Robert Fratto daf2887fd4 expose scrape.userAgentHeader like remote.UserAgent 
Signed-off-by: Robert Fratto <robertfratto@gmail.com>
 2021-09-13 14:10:34 -04:00
jessicagreben b0a21f9eab rm overlap, add label builder to fix name bug 
Signed-off-by: jessicagreben <jessicagrebens@gmail.com>
 2021-09-13 10:32:08 -07:00
Ganesh Vernekar 30534e99d9
Take snapshot only after closing the WAL (#9328) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-09-13 18:30:41 +05:30
George Robinson 049b4f4f13
Support customization of template options in TemplateExpander (#9290) 
Signed-off-by: George Robinson <george.robinson@grafana.com>
 2021-09-13 17:19:08 +05:30
Julien Pivotto 46286cb6ab
Merge pull request #9325 from LeviHarrison/fix-repo_sync_golangci-lint 
Repo Sync: Create `.github/workflows` if not present
 2021-09-11 21:23:51 +02:00
Levi Harrison 6c290d212d
Create github workflows dir if not present 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-11 14:08:07 -04:00
Augustin Husson 19f5f44bf9 remove craco, no need for it 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-11 12:10:05 +02:00
Julien Pivotto cad53e8901
Merge pull request #9318 from victorhaggqvist/alert-consistent-margin-bottom 
use consistent margin-bottom for all alert kinds
 2021-09-11 00:54:02 +02:00
Victor Häggqvist 9aaea327a0 use same top and bottom margin for alert filename 
Signed-off-by: Victor Häggqvist <victor@snilius.com>
 2021-09-10 21:21:22 +02:00
Augustin Husson 1e6bd815ad fix license tarball 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-10 17:38:53 +02:00
Augustin Husson 27aec91914 review the UI ci and associated command 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-10 17:18:25 +02:00
Levi Harrison cc77593176
Switch golangci-lint to GitHub Actions (#9232) 
* Added golangci-lint action

Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-10 16:30:18 +02:00
Augustin Husson 5c42b04af7 move to npm workspace 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-10 15:38:20 +02:00
Julien Pivotto 5c5a5dd992
Merge pull request #9320 from LeviHarrison/fix-contributing 
Fix wording in `CONTRIBUTING.md`
 2021-09-09 22:04:28 +02:00
Augustin Husson fa56d1e43b Merge branch 'feature/cleanup-codemirror' into feature/use-npm-workspace 2021-09-09 17:55:50 +02:00
Augustin Husson 29b788a7b5 remove app package in codemirror-module 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-09 17:52:03 +02:00
Ganesh Vernekar 05a816bfb7
Cut v2.30.0-rc.0 (#9316) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-09-09 18:07:07 +05:30
Levi Harrison f3f69ec016
Change channel to prometheus-dev 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-09 08:13:57 -04:00
Levi Harrison 173f4ec79e
Fix wording in CONTRIBUTING.md 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-08 19:54:03 -04:00
Victor Häggqvist 02cedb837d use consistent margin-bottom for all alert kinds 
Signed-off-by: Victor Häggqvist <victor@snilius.com>
 2021-09-08 21:28:49 +02:00
Augustin Husson c83137e757 Merge branch 'main' into update-react-and-ts 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-08 17:28:46 +02:00
Julien Pivotto 0111aa987e
Merge pull request #9312 from fpetkovski/promtool-analyze-compaction 
promtool: add extended flag for tsdb analysis
 2021-09-08 17:27:01 +02:00
Augustin Husson e1d8891a73 add global mock for the matchMedia function 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-08 17:26:24 +02:00
Augustin Husson 2cfdaf915f remove jest.restoreAllMock() call 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-08 17:13:44 +02:00
Ganesh Vernekar 8944520ccc
Fix deletion of old snapshots (#9314) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-09-08 19:53:44 +05:30
Julien Pivotto 48a101be1b
Allow to tune the scrape tolerance (#9283) 
* Allow to tune the scrape tolerance

In most of the classic monitoring use cases, a few milliseconds
difference can be omitted.

In Prometheus, a few millisecond difference can however make a big
difference.

Currently, Prometheus will ignore up to 2 ms difference in the
alignments.

It turns out that for users who can afford a 10ms difference, there is a
lot of resources and disk space to win, as shown in this graph, which
shows the bytes / samples over a production Prometheus server. You can
clearly see the switch from 2ms to 10ms tolerance.

This pull request enables the adjustment of the scrape timestamp
alignment tolerance.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>

* Fix golint

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-09-08 17:27:33 +05:30
Bryan Boreham 2327236bb5
Decrement active_appenders metric when no samples added (#9230) 
* Decrement active_appenders metric when no samples added

Also add a test that the metric is incremented and decremented as
expected with and without samples.

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

* Fix comment

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-09-08 14:49:58 +05:30