mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 06:04:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
8868 commits 243 branches 444 tags 649 MiB
Commit graph

8868 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julien Pivotto 6368227f0c
Merge pull request #8443 from liguozhong/remote_storage 
[remote storage] remove sendWriteRequestWithBackoff() "s" and "req" param
 2021-02-04 23:28:14 +01:00
Nándor István Krácser 509000269a
remote_write: allow passing along custom HTTP headers (#8416) 
* remote_write: allow passing along custom HTTP headers

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>

* add warning

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>

* remote_write: add header valadtion

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>

* extend tests for bad remote write headers

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>

* remote_write: add note about the authorization header

Signed-off-by: Nandor Kracser <bonifaido@gmail.com>
 2021-02-04 14:18:13 -07:00
Marcelo E. Magallon 75d86c6747 Update golangci-lint to 1.36.0 
In the previous version, 1.18.0, the "megacheck" linter paid attention
to the '//lint:ignore' comment, but that is no longer there.

Newer version pay attention to '//nolint:<linter>,<linter>,...'
comments, optionally followed by a "second" comment introduced by '//'.

Update the directives to use this style.

This is related to prometheus/blackbox_exporter#738 and
prometheus/blackbox_exporter#745.

Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
 2021-02-04 08:53:33 -06:00
fuling 4a407210f5 [remote storage] remove sendWriteRequestWithBackoff() "s" and "req" param 
Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>
 2021-02-04 21:38:32 +08:00
misha c2c5aeb16b Add optional name property to testgroup for better test failure output 
Signed-off-by: misha <DL-OTTCloudPlatform-Nova@bskyb.internal>
 2021-02-04 10:07:22 +00:00
Julien Pivotto 7db09551b0
Merge pull request #8441 from codesome/remove-empty-test 
Remove empty test
 2021-02-04 07:46:32 +01:00
Ganesh Vernekar ed8d31b059
Remove empty test 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2021-02-04 11:53:32 +05:30
Julien Pivotto 67edfc6054
Merge pull request #8436 from codesome/timestamp-at-mod-fix 
Fix timestamp() function for @ modifier
 2021-02-03 16:33:55 +01:00
Julien Pivotto c1f8bd9944
Merge pull request #8432 from roidelapluie/backfillpanic 
backfill: move checkErr before we close the mmaped file
 2021-02-03 16:32:35 +01:00
Ganesh Vernekar b18fde996e
Fix timestamp() function for @ modifier 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2021-02-03 19:13:12 +05:30
Julien Pivotto 41247b6950
Merge pull request #8431 from phith0n/missing-ui-on-windows 
fix: UI error while compiling on Windows
 2021-02-01 22:30:57 +01:00
Julien Pivotto 894354a03c
Merge pull request #6018 from simonpasquier/delete-remote-makefile-common-branch 
scripts/sync_makefiles.sh: delete merged branch
 2021-02-01 21:46:16 +01:00
Julien Pivotto 9334269f2b backfill: move checkErr before we close the mmaped file 
When printing the error, we still need access to the mmapped byte array
of the file. Therefore, we make sure that we run it before closing the
file.

I could have done something more complex like a defer, or not closing
the file, knowing that we would exit the program anyway. However, I
think that in case we extend this in the future, or this is copy/paster
elsewhere, we should continue closing the file. As it is small enough, I
went for the solution to call the function 3 times instead of playing
with a defer.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-02-01 21:18:42 +01:00
phith0n 3825f5837e fix #4596 
Signed-off-by: phith0n <phith0n.ph2f@gmail.com>
 2021-02-02 01:13:48 +08:00
Julien Pivotto b353afcc1b
Merge pull request #8430 from Boulet-/typo 
Typo on plural in checkRules/checkDuplicates
 2021-02-01 17:12:56 +01:00
Jeremy Albinet 4a1f2c097e Typo on plural in checkRules/checkDuplicates 
Signed-off-by: Jeremy Albinet <jalbinet@synthesio.com>
 2021-02-01 15:43:05 +01:00
Björn Rabenstein 9f281cdee5
Merge pull request #8422 from prometheus/beorn7/maintainers 
Update MAINTAINERS.md
 2021-02-01 15:05:26 +01:00
ravilr adc8807851
Update remote-write alert rules mixin (#8423) 
Signed-off-by: ravilr <raviprasad_lr@yahoo.com>
 2021-01-31 20:07:49 +00:00
alex-petrov-vt 91eef5e3bf
Added warnings into react Panel on the Graph page (#8427) 
Signed-off-by: Alex Petrov <alex.petrov.vt@gmail.com>
 2021-01-31 13:48:32 +01:00
beorn7 fac3a4eef5 Avoid minor logical ambiguity 
Signed-off-by: beorn7 <beorn@grafana.com>
 2021-01-29 19:41:35 +01:00
beorn7 00c11bb5f8 Change main/default maintainer from @brian-brazil to @roidelapluie 
Signed-off-by: beorn7 <beorn@grafana.com>
 2021-01-29 19:40:57 +01:00
Chris Marchbanks 275f7e7766
Log recoverable remote write errors as warnings (#8412) 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2021-01-27 09:38:34 -07:00
Alfred Krohmer fc8004eeec
EC2 SD: fix error handling of NewSessionWithOptions (#8356) 
Last change in 4efca5a introduced a problem where NewDiscovery would
just return a nil value, which is not handled well and didn't allow for
fixing configuration issues at runtime without a reload.

Signed-off-by: Alfred Krohmer <alfred.krohmer@logmein.com>
 2021-01-26 11:27:30 +00:00
Julien Pivotto 02ee690e3c
Merge pull request #8407 from roidelapluie/deprecate-alertmanager-timeout-flag 
Deprecate --alertmanager.timeout
 2021-01-25 23:55:34 +01:00
Goutham Veeramachaneni e572e77d90
Increase the buckets for compaction duration (#8342) 
We're seeing compactions that are taking hours in Cortex which this is
missing. I know while it is not common in Prometheus, I am pretty sure
there are setups where compaction takes longer than 512s. On our own
Prometheus the average compaction duration is 566s.

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2021-01-25 18:12:18 +00:00
Julien Pivotto 2316062d4e Deprecate --alertmanager.timeout 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-25 12:36:13 +01:00
Ganesh Vernekar b5dfa2414b
Fix flaky TestAtModifier (#8401) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2021-01-24 20:23:30 +05:30
kevinForMyself db445844d3
Fix garbage collection about t.droppedSeries in QueueManager.SeriesReset. (#8387) 
* Fix memory leak about t.droppedSeries in QueueManager.SeriesReset.

Signed-off-by: kevinForMyself <zise_2001@163.com>

* Fix garbage collection about t.droppedSeries in QueueManager.SeriesReset

Signed-off-by: kevinForMyself <zise_2001@163.com>
 2021-01-22 08:03:10 -07:00
Ganesh Vernekar a7e446cf2d
Link blog post on TSDB queries in tsdb/README.md (#8391) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2021-01-21 17:14:40 +05:30
Marco Pracucci d8c17025df
Fix TSDB head struct dump on querier error (#8379) 
* Fix TSDB head struct dump on querier error

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Added mint/maxt to RangeHead.String()

Signed-off-by: Marco Pracucci <marco@pracucci.com>
 2021-01-21 16:07:29 +05:30
Julien Pivotto 82330b96ee
Merge pull request #8384 from prometheus/beorn7/release-2.24 
Merge release-2.24 forward into main branch
 2021-01-20 12:37:17 +01:00
Ganesh Vernekar 9199fcb8d1
'@ <timestamp>' modifier (#8121) 
This commit adds `@ <timestamp>` modifier as per this design doc: https://docs.google.com/document/d/1uSbD3T2beM-iX4-Hp7V074bzBRiRNlqUdcWP6JTDQSs/edit.

An example query:

```
rate(process_cpu_seconds_total[1m]) 
  and
topk(7, rate(process_cpu_seconds_total[1h] @ 1234))
```

which ranks based on last 1h rate and w.r.t. unix timestamp 1234 but actually plots the 1m rate.

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2021-01-20 16:27:39 +05:30
beorn7 2344b2c514 Merge branch 'master' into beorn7/release-2.24 2021-01-20 02:20:24 +01:00
beorn7 94d70e76cd Merge branch 'master' into beorn7/release-2.24 2021-01-20 02:09:25 +01:00
beorn7 e448727485 Cut v2.24.1 
Signed-off-by: beorn7 <beorn@grafana.com>
 2021-01-19 22:48:10 +01:00
beorn7 806a799195 Update exporter-toolkit dependency to 0.5.1 
Signed-off-by: beorn7 <beorn@grafana.com>
 2021-01-19 22:21:20 +01:00
Julien Pivotto b7fe028740
Merge pull request #8373 from hs0210/work 
Fix a typo in docs/configuration/configuration.md
 2021-01-18 08:24:05 +01:00
Hu Shuai 2d8738c947 Fix a typo in docs/configuration/configuration.md 
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
 2021-01-18 10:14:47 +08:00
Julien Pivotto c83e4a7b1c
Merge pull request #8370 from prometheus/superq/force_security.md 
Enforce SECURITY.md updates
 2021-01-16 22:12:03 +01:00
Ben Kochie 2fd1243b0e
Enforce SECURITY.md updates 
Add SECURITY.md to the enforced repo sync updates.

Signed-off-by: Ben Kochie <superq@gmail.com>
 2021-01-16 20:07:55 +01:00
Julien Pivotto e483cff61f
Merge pull request #8249 from prometheus/add-codeql 
Add CodeQL Security Scanning
 2021-01-15 10:13:16 +01:00
Julien Pivotto 5bd7145e55
Merge pull request #8327 from roidelapluie/tlsexemple 
https: Add example configuration file
 2021-01-15 09:50:52 +01:00
Li Zhijian 9602933db2
Cleanup tempfiles in tests (#8179) 
* test: cleanup tempdir for TestBlockWriter

Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>

* test: cleanup tempdir for TestLogPartialWrite

Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
 2021-01-15 13:49:57 +05:30
Julien Pivotto 08c259cda6 https: Add example configuration file 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-15 01:37:50 +01:00
Julien Pivotto b82d76faec
Merge pull request #8363 from roidelapluie/toolkit-update 
Update exporter-toolkit to 0.5.0
 2021-01-14 01:08:18 +01:00
Julien Pivotto ac2626757c Update exporter-toolkit to 0.5.0 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-13 21:49:54 +01:00
Nguyen Le Vu Long fbe960f2c1
fix: remove pre-2.21 tmp blocks on start (#8353) 
* fix: remove pre-2.21 tmp blocks on start

Signed-off-by: Nguyen Le Vu Long <vulongvn98@gmail.com>

* fix: commenting

Signed-off-by: Nguyen Le Vu Long <vulongvn98@gmail.com>
 2021-01-09 10:02:26 +01:00
Julien Pivotto fd022965c0
Add SECURITY.md file (#8292) 
* Add SECURITY.md file

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-09 09:58:53 +01:00
Julien Pivotto 34656bbf8e
PromQL parser: fastpath for non-empty matchers and metric name (#8345) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2021-01-07 11:38:38 +01:00
Guangwen Feng 2df1a482da
Fix misspelled word in comment (#8348) 
Signed-off-by: Guangwen Feng <fenggw-fnst@cn.fujitsu.com>
 2021-01-07 10:01:08 +00:00