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

[JENKINS-66177] Ability to disable Java 11 monitor #5628

Merged
merged 1 commit into from Jul 27, 2021

Conversation

amuniz
Copy link
Member

@amuniz amuniz commented Jul 20, 2021

See JENKINS-66177.

Proposed changelog entries

  • JENKINS-66177: ability to disable Java 11 administrative monitor with a system property

Proposed upgrade guidelines

N/A

Submitter checklist

  • (If applicable) Jira issue is well described
  • Changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developer, depending on the change). Examples
    • Fill-in the Proposed changelog entries section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
  • Appropriate autotests or explanation to why this change has no tests
  • For dependency updates: links to external changelogs and, if possible, full diffs

Desired reviewers

@mention

Maintainer checklist

Before the changes are marked as ready-for-merge:

  • There are at least 2 approvals for the pull request and no outstanding requests for change
  • Conversations in the pull request are over OR it is explicit that a reviewer does not block the change
  • Changelog entries in the PR title and/or Proposed changelog entries are correct
  • Proper changelog labels are set so that the changelog can be generated automatically
  • If the change needs additional upgrade steps from users, upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the PR title. (example)
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

@batmat batmat requested a review from timja July 20, 2021 07:48
Copy link
Member

@batmat batmat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems reasonably well-limited scope.

@@ -46,9 +47,11 @@
@Symbol("javaVersionRecommendation")
public class JavaVersionRecommendationAdminMonitor extends AdministrativeMonitor {

private static Boolean disabled = SystemProperties.getBoolean(JavaVersionRecommendationAdminMonitor.class.getName() + ".disabled", false);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR to jenkins.io to add to docs?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@timja timja added the rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted label Jul 20, 2021
@batmat
Copy link
Member

batmat commented Jul 20, 2021

Given the approvals, and the fact Tim was the submitter of the Java 11 admin monitor PR in the first place, I am moving this forward and marking this PR as ready-for-merge.

We will hence merge this in 24 hours if nobody objects in the meantime.

Thank you

@batmat batmat added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Jul 20, 2021
@basil
Copy link
Member

basil commented Jul 20, 2021

I seem to recall disabling previous administrative monitors in the UI and/or Groovy initialization scripts rather than with system properties. If that is indeed a precedent, it seems that it would be ideal to do it that way for a more consistent and polished user experience. However, I don't feel strongly about this. I don't intend to rain on the parade, and this comment is non-blocking.

@timja
Copy link
Member

timja commented Jul 20, 2021

I seem to recall disabling previous administrative monitors in the UI and/or Groovy initialization scripts rather than with system properties. If that is indeed a precedent, it seems that it would be ideal to do it that way for a more consistent and polished user experience. However, I don't feel strongly about this. I don't intend to rain on the parade, and this comment is non-blocking.

That's for users to disable, I assume this is for distributors.

i.e. CloudBees

@basil
Copy link
Member

basil commented Jul 20, 2021

That's for users to disable, I assume this is for distributors. i.e. CloudBees

Fair enough, but in that case they should say so explicitly. Nothing in the PR description or the Jira issue indicates that this is meant to be consumed by OEM distributors rather than end users.

@amuniz
Copy link
Member Author

amuniz commented Jul 22, 2021

Yes, this is mainly for distributors. However I can also think about other usages, ie. company X uses a plugin (which might be home made) which is not Java 11 compatible yet, so they don't want Jenkins administrators to even see this monitor to avoid confusion. A sysadmin can set this property at upgrade time and move on.

@timja
Copy link
Member

timja commented Jul 22, 2021

However I can also think about other usages, ie. company X uses a plugin (which might be home made) which is not Java 11 compatible yet, so they don't want Jenkins administrators to even see this monitor to avoid confusion. A sysadmin can set this property at upgrade time and move on.

they can also use the standard supported approach which is the XML file / jcasc.

@timja timja merged commit 0b0085d into jenkinsci:master Jul 27, 2021
bmunozm pushed a commit to bmunozm/jenkins that referenced this pull request Aug 10, 2021
renjugokulam pushed a commit to shivagowda/jenkins that referenced this pull request Aug 18, 2021
renjugokulam added a commit to shivagowda/jenkins that referenced this pull request Aug 18, 2021
[JENKINS-66177] Ability to disable Java 11 monitor (jenkinsci#5628)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted
Projects
None yet
4 participants