Commit graph

8714 commits

Author SHA1 Message Date
cuirunxing-hub 57bc2e94e2 typos correct
Signed-off-by: cuirunxing-hub <cuirunxing@inspur.com>
2021-04-02 09:03:00 +08:00
Bartlomiej Plotka a2c5678423
Merge pull request #8680 from prometheus/release-2.26
Release 2.26 to main
2021-04-01 14:20:14 +02:00
Bartlomiej Plotka f93b95d16e
Merge release-2.26.0 branch to main. (#8678)
* Cut 2.26.0-rc.0 release. (#8640)

* Cut 2.26.0-rc.0

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Addressed comments.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Addressed comments.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Curate 2.26 changelog

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

* bump codemirror-promql to v0.14.0 (#8653)

Signed-off-by: Augustin Husson <husson.augustin@gmail.com>

* fix: Wrap text in CodeMirror expression editor (#8665)

Fixes https://github.com/prometheus/prometheus/issues/8663

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Quick documentation of the exemplars feature on the disabled features (#8655)

page.

Signed-off-by: Callum Styan <callumstyan@gmail.com>

* Cut 2.26.0 (#8676)

* Cut 2.26.0-rc.1

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Moved to full release.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu>
Co-authored-by: Augustin Husson <husson.augustin@gmail.com>
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Co-authored-by: Callum Styan <callumstyan@gmail.com>
2021-03-31 18:16:37 +01:00
Ben Kochie 4ceb9911d4
Merge pull request #8675 from prometheus/superq/null_orb
Don't sync if no orb is used
2021-03-31 15:30:49 +02:00
Bartlomiej Plotka 3cafc58827
Cut 2.26.0 (#8676)
* Cut 2.26.0-rc.1

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Moved to full release.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
2021-03-31 11:12:23 +01:00
Callum Styan 8b62f06e92
Quick documentation of the exemplars feature on the disabled features (#8655)
page.

Signed-off-by: Callum Styan <callumstyan@gmail.com>
2021-03-31 08:58:59 +01:00
Ben Kochie 968d7f326c
Don't sync if no orb is used
Don't sync the Prometheus CircleCI orb version if it's not used by the
repo's config.

Signed-off-by: Ben Kochie <superq@gmail.com>
2021-03-31 09:05:59 +02:00
Julien Pivotto 0414534499
Merge pull request #6947 from prometheus/document-global-labels
Add new "globalUrl" field to /api/v1/targets docs
2021-03-30 22:41:47 +02:00
Julien Pivotto 763a0d805c
Merge pull request #8649 from roidelapluie/expand-external-labels
Add environment variable expansion in external label values
2021-03-30 22:01:40 +02:00
Julien Pivotto 288e5b3260
Merge pull request #8672 from roidelapluie/merge-2.19
Merge 2.19 to main
2021-03-30 12:19:34 +02:00
Ben Kochie 9383c367b3
Merge pull request #8671 from prometheus/superq/sync_sum
Update yq checksum
2021-03-30 09:52:24 +02:00
Julien Pivotto 549e4ac638 Merge remote-tracking branch 'origin/release-2.19' into main 2021-03-30 09:47:54 +02:00
Ben Kochie 18c5fce892
Update yq checksum
Use the correct release checksum, not the testing one.

Signed-off-by: Ben Kochie <superq@gmail.com>
2021-03-30 09:16:15 +02:00
Julien Pivotto e635ca834b Add environment variable expansion in external label values
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-30 01:36:28 +02:00
Julien Pivotto d680880b31
Fix main branch tests (#8669)
I merged #8629 without noticing that circle ci did not run here.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-30 00:00:38 +02:00
Julien Pivotto 29c65de359
Ignore k8s' updateUnfinishedWorkLoop go routine in goleak tests (#8598)
This go routing uses a ticker to stop. This is prompt to create false
positives in tests failures. It is also unexported so let's threat that
as a k8s internal. Therefore, let's ignore it in goleak.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-29 23:43:09 +02:00
Robert Jacob b253056163
Implement Docker discovery (#8629)
* Implement Docker discovery

Signed-off-by: Robert Jacob <xperimental@solidproject.de>
2021-03-29 22:30:23 +02:00
Björn Rabenstein 9549a15c6f
Merge pull request #7675 from JessicaGreben/jg/11-retroactive-rule-eval
Add rule importer to backfill
2021-03-29 19:09:21 +02:00
jessicagreben 896c828bb5 close writer after flush
Signed-off-by: jessicagreben <jessicagrebens@gmail.com>
2021-03-29 06:45:12 -07:00
Ben Kochie bbc096cace
Merge pull request #8666 from prometheus/superq/sync_path
Fix writing of yq in repo_sync
2021-03-29 15:38:48 +02:00
Ben Kochie 651a560254
Fix writing of yq in repo_sync
Make sure binary path exists before writing.

Signed-off-by: Ben Kochie <superq@gmail.com>
2021-03-29 13:18:47 +02:00
Julius Volz 2043c60f11
fix: Wrap text in CodeMirror expression editor (#8665)
Fixes https://github.com/prometheus/prometheus/issues/8663

Signed-off-by: Julius Volz <julius.volz@gmail.com>
2021-03-29 12:48:04 +02:00
Augustin Husson 49559380eb
bump codemirror-promql to v0.14.0 (#8653)
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2021-03-29 10:29:04 +02:00
jessicagreben d89a1d999f add log with start/end times, close blocks before end of func
Signed-off-by: jessicagreben <jessicagrebens@gmail.com>
2021-03-28 12:13:58 -07:00
Ben Kochie ca847ff026
Merge pull request #8660 from prometheus/superq/sync_typo
Fix typo in repo sync
2021-03-28 13:02:15 +02:00
Levi Harrison 054e9d1985
Change Error Messages in TSDB Status Page (#8659)
* Changed error wording

Signed-off-by: Levi Harrison <git@leviharrison.dev>

* Added another test and moved both into the correct suite

Signed-off-by: Levi Harrison <git@leviharrison.dev>
2021-03-28 11:11:00 +02:00
Ben Kochie f55a3be90d
Fix typo in repo sync
Use correct curl option for downloading yq binary.

Signed-off-by: Ben Kochie <superq@gmail.com>
2021-03-28 10:37:40 +02:00
Ben Kochie 0f74bea24e
Merge pull request #8658 from prometheus/superq/yaml_sync
Sync CircleCI Orb version
2021-03-27 17:27:02 +01:00
Ben Kochie e73930e3d5
Sync CircleCI Orb version
Add sync of the Prometheus CircleCI Orb version to the sync script.
* Add `yq` to the repo sync CI job.

NOTE: This will re-format the down-stream yaml config, it does not
preserve whitespace and enforces some indenting rules. It does preserve
comments.

Signed-off-by: Ben Kochie <superq@gmail.com>
2021-03-27 16:58:20 +01:00
Julien Pivotto 1e054746d0
Merge pull request #8651 from roidelapluie/cl-release-2.26
Curate 2.26 changelog
2021-03-26 23:24:38 +01:00
Levi Harrison b3feb2c2ae
Add 16w and 26w time range steps (#8656)
* Added 16w and 26w time range steps

Signed-off-by: Levi Harrison <git@leviharrison.dev>

* Fixed indentation

Signed-off-by: Levi Harrison <git@leviharrison.dev>
2021-03-26 21:46:29 +01:00
Levi Harrison 1b4e4aa81a
Fix Blank TSDB Status Page (#8654)
* Check response and return alternate page if no statistics

Signed-off-by: Levi Harrison <git@leviharrison.dev>

* Added tests for alternate page

Signed-off-by: Levi Harrison <git@leviharrison.dev>

* Change error handling in unixToTime

Signed-off-by: Levi Harrison <git@leviharrison.dev>
2021-03-26 20:47:54 +01:00
Julien Pivotto cceab6defa
Merge pull request #8643 from roidelapluie/scaleway-read-secret-from-file
Scaleway SD: Add the ability to read token from file
2021-03-26 15:32:25 +01:00
Julien Pivotto 36e4c29348 Curate 2.26 changelog
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-26 08:43:50 +01:00
Ben Kochie f0c1d33b3a
Merge pull request #8644 from prometheus/superq/repo_sync_log
Update sync script
2021-03-25 13:01:47 +01:00
Ben Kochie a2bbe3e3bf
Update sync script
Add some more color to the sync script
* Make color vars for easy use.
* Add green to existing PR message.
* Add red to failure message.

Update repo finder
* Don't included archived or fork repos.
* Use orgs API endpoint.
* Only sync public repos.

Signed-off-by: Ben Kochie <superq@gmail.com>
2021-03-25 12:41:27 +01:00
Julien Pivotto 5a6d244b00 Scaleway SD: Add the ability to read token from file
Prometheus adds the ability to read secrets from files. This add
this feature for the scaleway service discovery.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-25 00:52:33 +01:00
Julien Pivotto 9dceeea5e7
Merge pull request #8642 from andrewsomething/do-sd-vpc
digitalocean_sd: Expose vpc for use in relabeling.
2021-03-24 23:19:41 +01:00
Andrew Starr-Bochicchio da8a8585f5 Add vpc label to docs.
Signed-off-by: Andrew Starr-Bochicchio <a.starr.b@gmail.com>
2021-03-24 17:05:16 -04:00
Andrew Starr-Bochicchio 0858657516 digitalocean_sd: Expose vpc for use in relabelling.
Signed-off-by: Andrew Starr-Bochicchio <a.starr.b@gmail.com>
2021-03-24 17:00:30 -04:00
Bartlomiej Plotka 1cbcf1b0ad
Cut 2.26.0-rc.0 release. (#8640)
* Cut 2.26.0-rc.0

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Addressed comments.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Addressed comments.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
2021-03-24 15:33:24 +00:00
Bryan Boreham c7a62b95ce
GetRef() now returns the label set (#8641)
The purpose of GetRef() is to allow Append() to be called without
the caller needing to copy the labels. To avoid a race where a series
is removed from TSDB between the calls to GetRef() and Append(), we
return TSDB's copy of the labels.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2021-03-24 15:24:58 +00:00
Ben Kochie b524ca8447
Update react deps (#8637)
* Bump all yarn deps (rm yarn.lock ; yarn)

Signed-off-by: Ben Kochie <superq@gmail.com>
2021-03-24 10:44:24 +00:00
Ben Kochie f0bccba1c3
Update Go modules for 2.26 (#8636)
* Update Go modules for 2.26

Bump all Go modules to the latest upstream.

Signed-off-by: Ben Kochie <superq@gmail.com>

* Fix promtool for new client_golang

LabelValues now requires a list of string matchers.

Signed-off-by: Ben Kochie <superq@gmail.com>
2021-03-24 09:41:12 +00:00
Julius Volz faacb619c0
Add new codemirror-promql-based expression editor (#8634)
* Add new codemirror-promql-based expression editor

This adds advanced autocompletion, syntax highlighting, and linting
for PromQL.

Fixes https://github.com/prometheus/prometheus/issues/6160
Fixes https://github.com/prometheus/prometheus/issues/5421

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Group new editor options and float them left

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Improve history autocompletion handling

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Only show info tooltips for unabbreviated completion items

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Rename "new editor" to "experimental editor"

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Add path prefix support

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Revert accidental check-in of go.sum changes

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Remove spurious console.log

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Fix completion item type icon styling

Signed-off-by: Julius Volz <julius.volz@gmail.com>
2021-03-23 23:55:52 +01:00
Julien Pivotto c7e525bc6b
Merge pull request #8633 from roidelapluie/update-common
Error on duration overflow
2021-03-23 12:57:54 +01:00
Julien Pivotto 01995f9d8e Error on duration overflow
Fix #8526

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-23 09:22:38 +01:00
Dustin Hooten 0d8db52954
Feature: Add collapse/expand all button to target page for react ui (#8486)
* Feature: Add collapse/expand all button to target page for react ui

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* update local storage key to prevent bad state

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* PR feedback

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* split big state object into smaller ones

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>

* fix duplication typo

Signed-off-by: Dustin Hooten <dustinhooten@gmail.com>
2021-03-22 11:54:12 +01:00
Julien Pivotto c0c36b1155
Improve promql-negative-offset docs (#8631)
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-03-22 10:16:43 +01:00
Julien Pivotto 31a518faab
Merge pull request #8626 from roidelapluie/go-to-am-api-v2
Switch to alertmanager api v2
2021-03-21 19:37:57 +01:00