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 2083460: Set timeout across Grafana components #1654

Merged

Conversation

arajkumar
Copy link
Contributor

@arajkumar arajkumar commented May 2, 2022

This commit sets timeout value across Grafana components
e.g. data source proxy and router. By default 120s is set as a
timeout and can be overridden using a jsonnet variable grafanaTimeout
during build time.

Signed-off-by: Arunprasad Rajkumar arajkuma@redhat.com

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 2, 2022

@arajkumar: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

WIP: increase grafana timeouts

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 openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 2, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 2, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 2, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 10, 2022

@arajkumar: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

WIP: increase grafana timeouts

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.

@arajkumar arajkumar changed the title WIP: increase grafana timeouts Bug 2070596: Set timeout across Grafana components May 10, 2022
@openshift-ci openshift-ci bot added bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels May 10, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 10, 2022

@arajkumar: This pull request references Bugzilla bug 2070596, which is invalid:

  • expected the bug to target the "4.10.z" release, but it targets "---" instead
  • expected Bugzilla bug 2070596 to depend on a bug targeting a release in 4.11.0 and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but no dependents were found

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

In response to this:

Bug 2070596: Set timeout across Grafana components

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.

@arajkumar arajkumar changed the title Bug 2070596: Set timeout across Grafana components Bug 2083460: Set timeout across Grafana components May 10, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 10, 2022

@arajkumar: This pull request references Bugzilla bug 2083460, which is invalid:

  • expected dependent Bugzilla bug 2070596 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is CLOSED (WONTFIX) instead

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

In response to this:

Bug 2083460: Set timeout across Grafana components

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.

@arajkumar arajkumar marked this pull request as ready for review May 10, 2022 07:25
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 10, 2022
@openshift-ci openshift-ci bot requested a review from simonpasquier May 10, 2022 07:26
@arajkumar
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 10, 2022

@arajkumar: This pull request references Bugzilla bug 2083460, which is invalid:

  • expected dependent Bugzilla bug 2070596 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is CLOSED (CANTFIX) instead

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

In response to this:

/bugzilla refresh

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.

@arajkumar
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 10, 2022

@arajkumar: An error was encountered querying GitHub for users with public email (juzhao@redhat.com) for bug 2083460 on the Bugzilla server at https://bugzilla.redhat.com. No known errors were detected, please see the full error message for details.

Full error message. non-200 OK status code: 403 Forbidden body: "{\n \"documentation_url\": \"https://docs.github.com/en/free-pro-team@latest/rest/overview/resources-in-the-rest-api#secondary-rate-limits\",\n \"message\": \"You have exceeded a secondary rate limit. Please wait a few minutes before you try again.\"\n}\n"

Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

/bugzilla refresh

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.

@arajkumar
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 10, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 10, 2022

@arajkumar: This pull request references Bugzilla bug 2083460, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.10.z) matches configured target release for branch (4.10.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 2070596 is in the state CLOSED (CURRENTRELEASE), which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 2070596 targets the "4.11.0" release, which is one of the valid target releases: 4.11.0
  • bug has dependents

Requesting review from QA contact:
/cc @juzhao

In response to this:

/bugzilla refresh

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 openshift-ci bot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label May 10, 2022
@openshift-ci openshift-ci bot requested a review from juzhao May 10, 2022 07:40
@jan--f
Copy link
Contributor

jan--f commented May 11, 2022

Nicely done, thank you!
/lgtm
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label May 11, 2022
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

6 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@jan--f
Copy link
Contributor

jan--f commented May 12, 2022

/hold
Until @juzhao had a chance to look at this.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 12, 2022
@arajkumar
Copy link
Contributor Author

ping @juzhao to validate the fix.

@juzhao
Copy link
Contributor

juzhao commented May 19, 2022

@arajkumar just one question, I see the annotations haproxy.router.openshift.io/timeout: 120s in assets/grafana/route.yaml file, but not find in grafana route

# oc -n openshift-monitoring exec -c cluster-monitoring-operator cluster-monitoring-operator-7f99575896-whls2 -- cat assets/grafana/route.yaml
apiVersion: v1
kind: Route
metadata:
  annotation:
    haproxy.router.openshift.io/timeout: 120s
  name: grafana
  namespace: openshift-monitoring


# oc -n openshift-monitoring get route grafana -oyaml
apiVersion: route.openshift.io/v1
kind: Route
metadata:
  annotations:
    openshift.io/host.generated: "true"
  creationTimestamp: "2022-05-19T04:36:55Z"
  name: grafana

@juzhao
Copy link
Contributor

juzhao commented May 19, 2022

tested with the PR, all grafana dashboards are loaded without timeout error
/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 19, 2022
@juzhao
Copy link
Contributor

juzhao commented May 19, 2022

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label May 19, 2022
@juzhao
Copy link
Contributor

juzhao commented May 19, 2022

@jan--f we can remove the /hold label

This commit sets timeout value across Grafana components
e.g. data source proxy and router. By default 120s is set as a
timeout and can be overridden using a jsonnet variable `grafanaTimeout`
during build time.

Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>
@arajkumar
Copy link
Contributor Author

@juzhao looks like a typo :'(

annotation should be replaced with annotations!

Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 19, 2022
@arajkumar
Copy link
Contributor Author

/skip

We also need #1671 as this PR updates Route annotation field.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 19, 2022

@arajkumar: The following tests 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-single-node 5c9dcae link false /test e2e-aws-single-node
ci/prow/versions 5c9dcae link false /test versions

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@arajkumar
Copy link
Contributor Author

/skip

@jan--f
Copy link
Contributor

jan--f commented May 19, 2022

/unhold
/lgtm
Thanks everyone, once #1671 merges we'll get the backport lined up as well and everything should make it into the next 4.10 z-stream release.

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels May 19, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 19, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: arajkumar, 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:

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 a5febd0 into openshift:release-4.10 May 19, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 19, 2022

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

Bugzilla bug 2083460 has been moved to the MODIFIED state.

In response to this:

Bug 2083460: Set timeout across Grafana components

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/severity-low Referenced Bugzilla bug's severity is low 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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants