openshift / cluster-monitoring-operator

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

MON-3778, OLS-117: Add OLS metrics to telemetry whitelist #2300

Closed bparees closed 6 months ago

bparees commented 6 months ago

did not see other changelog entries for this sort of change, let me know if one is needed

https://github.com/openshift/lightspeed-operator/pull/86 is the PR that is introducing the recording rules.

openshift-ci-robot commented 6 months ago

@bparees: This pull request references OLS-117 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2300): > > >* [ ] I added CHANGELOG entry for this change. >* [x] No user facing changes, so no entry in CHANGELOG was needed. > >did not see other changelog entries for this sort of change, let me know if one is 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.
bparees commented 6 months ago

the failure in https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-monitoring-operator/2300/pull-ci-openshift-cluster-monitoring-operator-master-versions/1777435969033605120 does not seem related to this pr

bparees commented 6 months ago

/hold

going to change this to a recording rule

openshift-ci-robot commented 6 months ago

@bparees: This pull request references OLS-117 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2300): > > >* [ ] I added CHANGELOG entry for this change. >* [x] No user facing changes, so no entry in CHANGELOG was needed. > >did not see other changelog entries for this sort of change, let me know if one is needed > >https://github.com/openshift/lightspeed-operator/pull/86 is the PR that is introducing the recording rules. > 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-ci[bot] commented 6 months ago

@bparees: all tests passed!

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/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
simonpasquier commented 6 months ago

/cc @jan--f /cc @simonpasquier

jan--f commented 6 months ago

/lgtm

openshift-ci[bot] commented 6 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, jan--f

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)~~ [jan--f] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
bparees commented 6 months ago

/hold cancel /cherry-pick release-4.16 /cherry-pick release-4.15

openshift-cherrypick-robot commented 6 months ago

@bparees: once the present PR merges, I will cherry-pick it on top of release-4.16 in a new PR and assign it to you.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2300#issuecomment-2047754825): >/hold cancel >/cherry-pick release-4.16 >/cherry-pick release-4.15 > 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/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
openshift-cherrypick-robot commented 6 months ago

@bparees: new pull request created: #2311

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2300#issuecomment-2047754825): >/hold cancel >/cherry-pick release-4.16 >/cherry-pick release-4.15 > 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/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
openshift-cherrypick-robot commented 6 months ago

@bparees: #2300 failed to apply on top of branch "release-4.15":

Applying: OLS-117: Add OLS metrics to telemetry whitelist
Using index info to reconstruct a base tree...
M   Documentation/data-collection.md
M   Documentation/sample-metrics.md
M   Documentation/telemetry/telemeter_query
M   manifests/0000_50_cluster-monitoring-operator_04-config.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/0000_50_cluster-monitoring-operator_04-config.yaml
Auto-merging Documentation/telemetry/telemeter_query
CONFLICT (content): Merge conflict in Documentation/telemetry/telemeter_query
Auto-merging Documentation/sample-metrics.md
CONFLICT (content): Merge conflict in Documentation/sample-metrics.md
Auto-merging Documentation/data-collection.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 OLS-117: Add OLS metrics to telemetry whitelist
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/2300#issuecomment-2047754825): >/hold cancel >/cherry-pick release-4.16 >/cherry-pick release-4.15 > 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/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
openshift-bot commented 6 months ago

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-monitoring-operator-container-v4.16.0-202404101645.p0.gfe093ae.assembly.stream.el9 for distgit cluster-monitoring-operator. All builds following this will include this PR.