mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 06:59:40 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
9256 commits 243 branches 444 tags 649 MiB
Commit graph

9256 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julius Volz 62906c1b4f
Merge pull request #8883 from roidelapluie/puppetdb-sd 
Add PuppetDB service discovery
 2021-09-16 17:41:31 +02:00
Julien Pivotto 8920024323 Add PuppetDB service discovery 
We have been Puppet user for 10 years and we are users of
https://github.com/camptocamp/prometheus-puppetdb-sd

However, that file_sd implementation contains business logic and
assumptions around e.g. the modules which you are using.

This pull request adds a simple PuppetDB service discovery, which will
enable more use cases than the upstream sd.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-09-16 16:54:26 +02:00
Julius Volz 447d9401fc
Merge pull request #9239 from LeviHarrison/promql-trig-functions 
PromQL: Add trigonometric functions
 2021-09-16 14:11:40 +02:00
Julius Volz 6c9ded2854
Merge pull request #9344 from prometheus/fix-eslint-warning-cmp 
fix eslint warning for codemirror-promql
 2021-09-16 12:05:39 +02:00
Darshan Chaudhary 1f688657bf
Call delete on head if interval overlaps (#9151) 
* Call delete on head if interval overlaps

Signed-off-by: darshanime <deathbullet@gmail.com>

* Garbage collect tombstones during head gc

Signed-off-by: darshanime <deathbullet@gmail.com>

* Truncate tombstones before min time during head gc

Signed-off-by: darshanime <deathbullet@gmail.com>

* Lock less by deleting all keys in a single pass

Signed-off-by: darshanime <deathbullet@gmail.com>

* Pass map to DeleteTombstones

Signed-off-by: darshanime <deathbullet@gmail.com>

* Create new slice to replace old one

Signed-off-by: darshanime <deathbullet@gmail.com>
 2021-09-16 12:20:03 +05:30
Levi Harrison 2c7bec758d Tabs to spaces 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 23:02:26 -04:00
Levi Harrison ed220c1ae7 Add grammar 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 23:02:25 -04:00
Levi Harrison 4ac4e2ca4b Remove parenthesis 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:10 -04:00
Levi Harrison 6faca22eec Add inverse hyperbolic functions 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:10 -04:00
Levi Harrison 74faea64dd Removed specification of pi digits 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:10 -04:00
Levi Harrison 9c54ee0a6e Changed function comment 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:10 -04:00
Levi Harrison 53d88fd147 Added hyperbolic trig functions 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:10 -04:00
Levi Harrison a8ad569db8 Change spaces to tabs 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:10 -04:00
Levi Harrison ecc29d38b8 Fixed pi definition 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:10 -04:00
Levi Harrison 51bb3d4a27 Changed radian wording 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:10 -04:00
Levi Harrison 535d8904f7 Link to docs for special cases 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:10 -04:00
Levi Harrison 9fc7ba33aa Remove atan2() 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:10 -04:00
Levi Harrison f1d94cc5f6 Split and shortened tests 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:10 -04:00
Levi Harrison d5ecdc4597 Remove variadic 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:10 -04:00
Levi Harrison e5a44964ff Added docs 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:09 -04:00
Levi Harrison 814cd5844d Added tests 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:09 -04:00
Levi Harrison 309e020c0a Added functions 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 22:47:09 -04:00
Julien Pivotto bd217c58a7
Backfill: Do not query after --end (#9340) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-09-15 16:02:41 +02:00
Augustin Husson e52204e556 fix eslint warning for codemirror-promql 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2021-09-15 13:38:48 +02:00
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