d1ced85d7a
Bump k8s.io/* from 0.20.5 to 0.21.0 ( #8714 )
...
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
2021-04-13 10:00:00 +02:00
5bce801a09
Rename discovery/dockerswarm to discovery/moby ( #8691 )
...
This makes it clear that the dockerswarm package does more than docker
swarm, but does also docker.
I have picked moby as it is the upstream name: https://mobyproject.org/
There is no user-facing change, except in the case of a bad
configuration. Previously, a user who would have a bad docker sd config
would see an error like:
> field xx not found in type dockerswarm.plain
Now that error would be turned into:
> field xx not found in type moby.plain
While not perfect, it should at not be confusing between docker and
dockerswarm.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2021-04-13 09:33:54 +02:00
a06dcd7771
Update Makefile.common
...
* Bump promu to latest release.
* Bump golangci-lint to latest release.
* Add nolint to intentional error.
Signed-off-by: Ben Kochie <superq@gmail.com>
2021-04-13 09:33:45 +02:00
9781e51f59
Correct spelling of "iterable" ( #8713 )
...
Signed-off-by: Christian Simon <simon@swine.de>
2021-04-12 21:43:42 +01:00
5a0a09cf48
Update support link ( #8711 )
...
Simplify "I need help" wording and links
* Point directly prometheus.io/community.
* Add link to commercial support page.
Signed-off-by: Ben Kochie <superq@gmail.com>
2021-04-12 21:42:06 +01:00
057c0784a4
Merge pull request #8709 from fenggw-fnst/work
...
Fix golint issue caused by typo
2021-04-12 09:59:27 +02:00
7985c4e6af
Fix golint issue caused by typo
...
Signed-off-by: Guangwen Feng <fenggw-fnst@cn.fujitsu.com>
2021-04-12 09:57:41 +08:00
f4db4ac7a3
move @types deps to dev-deps ( #8706 )
...
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2021-04-11 11:35:06 +02:00
a124d56ac2
Revert "Changelog: Add hyperlinks to PRs"
...
Signed-off-by: beorn7 <beorn@grafana.com>
2021-04-07 17:06:45 +02:00
f3505da306
bump cm-promql + light improvement when building the PromQL extension ( #8700 )
...
* bump cm-promql to v0.14.1
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
* enhancement a bit the way to build the codemirror PromQL extension
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2021-04-07 12:34:04 +02:00
431ea75a11
remove redundant type conversion ( #8692 )
...
Signed-off-by: Christina Jing (荆丽娜) <jinglina_lc@inspur.com>
2021-04-05 17:00:48 +05:30
51df756893
Merge pull request #8690 from conorevans/conorevans/changelog-include-links
...
Changelog: Add hyperlinks to PRs
2021-04-05 12:40:47 +02:00
00b53ef098
double space to single space
...
Signed-off-by: Conor Evans <coevans@tcd.ie>
2021-04-04 21:43:19 +02:00
5833cf2fdf
prefix tsdb to tsdb PR
...
Signed-off-by: Conor Evans <coevans@tcd.ie>
2021-04-04 21:41:00 +02:00
f4f1beb620
hyperlink tsdb/common PRs too
...
Signed-off-by: Conor Evans <coevans@tcd.ie>
2021-04-04 21:38:52 +02:00
7d7e3473f8
revert URL that got caught in the crossfire
...
Signed-off-by: Conor Evans <coevans@tcd.ie>
2021-04-04 21:09:47 +02:00
245f89b9b3
find sole entry with 4 back-to-back PRs and hyperlink to all
...
Signed-off-by: Conor Evans <coevans@tcd.ie>
2021-04-04 21:05:24 +02:00
60b9fe60ca
handle multiple PR links back-to-back
...
Signed-off-by: Conor Evans <coevans@tcd.ie>
2021-04-04 21:03:05 +02:00
ec73888381
Add hyperlinks to CHANGELOG
...
Signed-off-by: Conor Evans <coevans@tcd.ie>
2021-04-04 20:56:51 +02:00
785f52c215
Add hyperlinks to CHANGELOG
...
Signed-off-by: Conor Evans <coevans@tcd.ie>
2021-04-04 20:47:16 +02:00
ae73a6296a
Merge pull request #8683 from cuirunxing-hub/main
...
typos correct
2021-04-02 20:14:55 +02:00
57bc2e94e2
typos correct
...
Signed-off-by: cuirunxing-hub <cuirunxing@inspur.com>
2021-04-02 09:03:00 +08:00
731545ad34
Add documentation for recording rule backfiller ( #8674 )
...
* add docs for rule backfiller
Signed-off-by: jessicagreben <jessicagrebens@gmail.com>
2021-04-01 22:38:00 +02:00
a2c5678423
Merge pull request #8680 from prometheus/release-2.26
...
Release 2.26 to main
2021-04-01 14:20:14 +02:00
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
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
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
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
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
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
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
288e5b3260
Merge pull request #8672 from roidelapluie/merge-2.19
...
Merge 2.19 to main
2021-03-30 12:19:34 +02:00
9383c367b3
Merge pull request #8671 from prometheus/superq/sync_sum
...
Update yq checksum
2021-03-30 09:52:24 +02:00
549e4ac638
Merge remote-tracking branch 'origin/release-2.19' into main
2021-03-30 09:47:54 +02:00
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
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
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
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
b253056163
Implement Docker discovery ( #8629 )
...
* Implement Docker discovery
Signed-off-by: Robert Jacob <xperimental@solidproject.de>
2021-03-29 22:30:23 +02:00
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
896c828bb5
close writer after flush
...
Signed-off-by: jessicagreben <jessicagrebens@gmail.com>
2021-03-29 06:45:12 -07:00
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
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
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
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
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
ca847ff026
Merge pull request #8660 from prometheus/superq/sync_typo
...
Fix typo in repo sync
2021-03-28 13:02:15 +02:00
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
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
0f74bea24e
Merge pull request #8658 from prometheus/superq/yaml_sync
...
Sync CircleCI Orb version
2021-03-27 17:27:02 +01:00
Bogdan Drutu