Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1885235: bump Prometheus to v2.22.0 #61

Merged
merged 84 commits into from Oct 20, 2020

Conversation

simonpasquier
Copy link

This update is to fix the issue with mixing k8s.io/klog v1 and v2.

It also works around a problem with timers in Go >= 1.14 that introduced a degradation with the compression of data on disk (see prometheus#7976 for details but users reported that block sizes increased up to 50% compared to previous versions). The other changes compared to v2.21.0 are lightweight and the update seems reasonably safe.

weastel and others added 30 commits August 24, 2020 01:04
Signed-off-by: Drumil Patel <drumilpatel720@gmail.com>
…tions (prometheus#7860)

Signed-off-by: Vijay Samuel <vjsamuel@ebay.com>
We're using Prometheus behind a reverse proxy which authenticates everything based on cookies.
Without this attribute the cookie is not send with the request for the manifest.json

Signed-off-by: Stefan Bueringer <sbueringer@gmail.com>
Signed-off-by: johncming <johncming@yahoo.com>
…t directory (prometheus#7850)

* web: Close and exhaust all response bodies in tests

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

* Remove empty snapshot directory

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

* Fix lint

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
…metheus#7871)

* Update the storage.md to fix typo, and some grammar/format issue

Signed-off-by: Luke Chen <showuon@gmail.com>
The documentation referenced "data volume containers", which were
superseded by named volume support in Docker several years ago.

There were to bind-mounting examples in the docs that are effectively
doing the same thing, but the description of the second was somewhat
erroneous.

Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
Signed-off-by: Jaga Santagostino <jagasantagostino@gmail.com>
Signed-off-by: johncming <johncming@yahoo.com>
…ion section (prometheus#7875)

Signed-off-by: Luke Chen <showuon@gmail.com>
…s#6477)

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
* Unnecessary go routine spawn.
* Remove unnecessary local variable creation.

Signed-off-by: iurii <iurii@coins.ph>
Co-authored-by: iurii <iurii@coins.ph>
Signed-off-by: johncming <johncming@yahoo.com>
Upgrade to promu 0.6.0.

Signed-off-by: Ben Kochie <superq@gmail.com>
…us#7881)

This should make the `NewReadClient()` exported outside the `remote` package

Signed-off-by: Anand Sanmukhani <asanmukh@redhat.com>
Signed-off-by: Drumil Patel <drumilpatel720@gmail.com>
`promtool update rules` is no longer available after Prometheus 2.5.
Document this to avoid confusion such as in prometheus#6988.

Signed-off-by: Christian Hoffmann <mail@hoffmann-christian.info>
)

Signed-off-by: zhulongcheng <zhulongcheng.dev@gmail.com>
The collapse all option as suggested in the corresponding issue
has been implemented in this PR.

Signed-off-by: Deepjyoti Mondal <djmdeveloper060796@gmail.com>
Update `ALERTS` example be more meta-syntactic.

Signed-off-by: Justin Walz <justin.walz10@gmail.com>
Signed-off-by: BurtonQin <bobbqqin@gmail.com>
* Fix EQL when using = inside braces.

Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>

* EQL => EQLC and ASSIGN => EQL

Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>

* Aligned yacc code.

Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>
The remote read client needs to use the nethttp.Transport wrapper in
order for spans to be instrumented properly.

Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
* Default to bigger remote_write sends

Raise the default MaxSamplesPerSend to amortise the cost of remote
calls across more samples. Lower MaxShards to keep the expected max
memory usage within reason.

Signed-off-by: Bryan Boreham <bryan@weave.works>

* Change default Capacity to 2500

To maintain ratio with MaxSamplesPerSend

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Signed-off-by: Luke Chen <showuon@gmail.com>
* web: Remove APIv2

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
Signed-off-by: venkatbvc <chalapathirao@gmail.com>
roidelapluie and others added 14 commits October 7, 2020 18:32
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
Introduce timestamp tolerance in scrapes
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
v2.22.0

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@openshift-ci-robot openshift-ci-robot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Oct 19, 2020
@openshift-ci-robot
Copy link

@simonpasquier: This pull request references Bugzilla bug 1885235, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1885235: bump Prometheus to v2.22.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 19, 2020
@paulfantom
Copy link

/retest
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 20, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: paulfantom, simonpasquier

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [paulfantom,simonpasquier]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 38968c3 into openshift:master Oct 20, 2020
@openshift-ci-robot
Copy link

@simonpasquier: All pull requests linked via external trackers have merged:

Bugzilla bug 1885235 has been moved to the MODIFIED state.

In response to this:

Bug 1885235: bump Prometheus to v2.22.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@simonpasquier simonpasquier deleted the aos-bump-v2.22.0 branch October 20, 2020 12:29
@simonpasquier
Copy link
Author

/cherry-pick release-4.6

@openshift-cherrypick-robot

@simonpasquier: #61 failed to apply on top of branch "release-4.6":

Applying: Update prombench workflows to incorporate new naming convention
Applying: Export members of EvalNodeHelper to facilitate usage in external functions (#7860)
Applying: Fix Experimental UI for cookie based authentication (#7827)
Applying: web/api/v1: rename http status code. (#7864)
Applying: web: Close and exhaust all response bodies in tests + cleanup snapshot directory (#7850)
Applying: Update the storage.md to fix typo, and some grammar/format issue (#7871)
Applying: docs: minor corrections to the docker documentation (#6869)
Applying: add key to StatusWithStatusIndicator component in loop (#6879)
Applying: tsdb/chunks: remove un-used code. (#6944)
Applying: Referring to configuration.md, to have a Generic placeholders definition section (#7875)
Applying: Refactor WAL.Segments method to be part of the wal package (#6477)
Applying: Unnecessary go routine spawn. (#7879)
Applying: tsdb: remove redundant fields. (#7869)
Applying: Bump promu version (#7880)
Applying: Rename `remote.newReadClient()` to `remote.NewReadClient()` (#7881)
Applying: docs: add promtool version in rule migration cmd (#6989)
Applying: tsdb: sync temporary checkpoint directory before rename (#7004)
Applying: Fixes #6127 : Add Collapse All button (#6957)
Applying: Update alerting_rules.md (#7252)
Applying: rules: Remove redundant RLock to avoid double RLock (#7183)
Applying: Use ASSIGN when using = inside braces (#7911)
Applying: Fix missing remote read spans (#7914)
Using index info to reconstruct a base tree...
M	storage/remote/client.go
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Default to bigger remote_write sends (#5267)
Applying: tsdb: remove duplicate values set to reduce memory usage(map overhead) (#7915)
Applying: update the protoc version to 3.12.3 in readme.md (#7931)
Applying: web: Remove APIv2 (#7935)
Applying: Updating storage.md for retention.size (#7942)
Applying: RELEASE.md: add instructions for React dep updates (#6831)
Applying: Add the "assets" make target and change directory note in readme (#7908)
Applying: ui: clarify alert state toggle via checkbox icon (#7936)
Applying: tsdb/fileutil: Use FcntlFstore from golang.org/x/sys/unix (#7949)
Applying: tsdb/chunks/head_chunks_test.go: Fix typo (#7953)
Applying: Unnecessary go routine spawn. (#7951)
Applying: Ensure alert rules are marked as restored in unit tests (#7661)
Applying: Add tsdb startup duration metric (#7737)
Applying: Eureka: Fix service discovery when compiled in 32-bit (#7961)
Applying: Vendor prometheus/common v0.14.0
Applying: Remove unused deps
Applying: update the doc link in internal_arthitecture.md (#7966)
Applying: Refactor vars to avoid test failures in storage/remote with -count > 1 (#7934)
Applying: Add a rule_group_samples metric (#7977)
Applying: React UI: Implement missing TSDB head stats section (#7876)
Applying: Encode and Decode method for tombstones (#7967)
Applying: Fix callback function bind with object as parameter (#7984)
Applying: Scrape: Test that deduplicated targets are started (#7975)
Applying: Fix magic number in docs (#7998)
Applying: Add UserAgent header to Eureka client (#8006)
Applying: Gracefully handle unknown WAL record types. (#8004)
Applying: Add UserAgent to Hetzner Robot SD (#8008)
Applying: Introduce timestamp tolerance in scrapes
Applying: Move the tolerance logic in the loop function.
Applying: Fix comment
Applying: Don't do literal regex matching optimisation when case insensitive. (#8013)
Applying: Bump Kubernetes dependencies
Applying: cmd/prometheus: support k8s.io/klog/v2
Applying: Simplify logic
Applying: cmd/prometheus: Issue a warning on 32 bit archs (#8012)
Using index info to reconstruct a base tree...
M	cmd/prometheus/main.go
Falling back to patching base and 3-way merge...
Auto-merging cmd/prometheus/main.go
Applying: promql: Organize legacy tests into appropriate files (#7989)
Applying: Add an experimental, hidden flag
Applying: Better description
Applying: fix few typo (#8023)
Applying: Adjust flag
Applying: Adjust comment
Applying: Add context
Applying: Specify the removal
Applying: Fix wordings
Applying: Fixes #7982. Increase maxErrMsgLen value remote_write api (#8017)
Applying: *: Update go dependencies
error: patch failed: vendor/github.com/gophercloud/gophercloud/CHANGELOG.md:1
error: vendor/github.com/gophercloud/gophercloud/CHANGELOG.md: patch does not apply
.git/rebase-apply/patch:10177: new blank line at EOF.
+
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Using index info to reconstruct a base tree...
Patch failed at 0068 *: Update go dependencies
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet