openshift / cluster-monitoring-operator

Manage the OpenShift monitoring stack
Apache License 2.0
247 stars 363 forks source link

OCPBUGS-38289: fix(prometheus): avoid passing the cluster-wide proxy config to a remote endpoint when noProxy will prevent the proxuying anyway #2441

Closed machine424 closed 1 month ago

machine424 commented 2 months ago

Also

docs: hide PrometheusK8sConfig.RemoteWrite.ProxyURL from docs until its usage is clarified

openshift-ci-robot commented 2 months ago

@machine424: This pull request references Jira Issue OCPBUGS-38289, which is invalid:

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2441): >Also > >docs: hide PrometheusK8sConfig.RemoteWrite.ProxyURL from docs until its usage is clarified > > > > >* [ ] I added CHANGELOG entry for this change. >* [ ] No user facing changes, so no entry in CHANGELOG was needed. > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
machine424 commented 2 months ago

/jira refresh

openshift-ci-robot commented 2 months ago

@machine424: This pull request references Jira Issue OCPBUGS-38289, which is valid. The bug has been moved to the POST state.

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

Requesting review from QA contact: /cc @juzhao

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2441#issuecomment-2298162288): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
simonpasquier commented 2 months ago

otherwise lgtm!

machine424 commented 2 months ago

I think this is ready now.

openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: machine424, 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](https://github.com/openshift/cluster-monitoring-operator/blob/master/OWNERS)~~ [machine424,simonpasquier] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
simonpasquier commented 2 months ago

/retest-required

openshift-ci-robot commented 2 months ago

/retest-required

Remaining retests: 0 against base HEAD 86aa090d6f63f02185fce79a6f1136848627ee4d and 2 for PR HEAD 55cbb5e9350dc86505012883da038871cd83e5e1 in total

openshift-ci[bot] commented 2 months ago

@machine424: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-ovn-single-node 55cbb5e9350dc86505012883da038871cd83e5e1 link false /test e2e-aws-ovn-single-node

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
simonpasquier commented 1 month ago

/skip /retest-required

openshift-ci-robot commented 1 month ago

@machine424: Jira Issue OCPBUGS-38289: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-38289 has been moved to the MODIFIED state.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2441): >Also > >docs: hide PrometheusK8sConfig.RemoteWrite.ProxyURL from docs until its usage is clarified > > > > >* [ ] I added CHANGELOG entry for this change. >* [ ] No user facing changes, so no entry in CHANGELOG was needed. > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-bot commented 1 month ago

[ART PR BUILD NOTIFIER]

Distgit: cluster-monitoring-operator This PR has been included in build cluster-monitoring-operator-container-v4.18.0-202408221511.p0.g70ff2dc.assembly.stream.el9. All builds following this will include this PR.

machine424 commented 1 month ago

/cherrypick release-4.17 release-4.16

openshift-cherrypick-robot commented 1 month ago

@machine424: #2441 failed to apply on top of branch "release-4.17":

Applying: docs: clarify PrometheusK8sConfig.RemoteWrite.ProxyURL doc
Using index info to reconstruct a base tree...
M   Documentation/api.md
Falling back to patching base and 3-way merge...
Auto-merging Documentation/api.md
CONFLICT (content): Merge conflict in Documentation/api.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 docs: clarify PrometheusK8sConfig.RemoteWrite.ProxyURL doc
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](https://github.com/openshift/cluster-monitoring-operator/pull/2441#issuecomment-2312711563): >/cherrypick release-4.17 release-4.16 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.