Implement snooze functionality for administrative monitors with… by LakshyaBagani · Pull Request #26244 · jenkinsci/jenkins

LakshyaBagani · 2026-02-02T11:46:46Z

Fixes #16641

Testing done

Automated Testing:

Created core/src/test/java/hudson/model/AdministrativeMonitorTest.java with 8 new unit tests covering:
Snooze expiry logic (testSnoozeExpiry).
Cleanup of expired monitors (testCleanupRemovesOnlyThisMonitor).
Persistence of snoozed state across restarts (testSnoozePersistence).
Isolation between multiple monitors (testMultipleMonitorsIndependent).
Validation of duration input (negative, zero, excessive duration checks).

Ran mvn test -Dtest=AdministrativeMonitorTest (Passed: 8/8 tests).
Ran mvn clean verify to ensure no regressions in established tests.

Manual Verification:

Verified Internationalization:
Checked core/src/main/resources/hudson/model/Messages.properties for presence of Snooze, Snooze.duration.label, etc.

Verified Accessibility:
Inspected Jelly files (BuiltInNodeMigration, ControllerExecutorsAgents, ControllerExecutorsNoAgents) to ensure <label>, id, aria-label, and title attributes were correctly added to input fields.

Verified Javadoc:
Confirmed AdministrativeMonitor.java Javadoc formatting matches master branch (no diff noise).

Screenshots (UI changes only)

Before

After

Proposed changelog entries

Allow administrative monitors to be snoozed for a specific duration (up to 1 year).

Proposed changelog category

/label rfe

Proposed upgrade guidelines

N/A

Submitter checklist

The issue, if it exists, is well-described.
The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood.
There is automated testing or an explanation as to why this change has no tests.
New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
UI changes do not introduce regressions when enforcing the current default rules of Content Security Policy Plugin. In particular, new or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives.
For dependency updates, there are links to external changelogs and, if possible, full differentials.
For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@timja @mawinter69 @MarkEWaite

mawinter69

Do we really need minute precision for this? It will be hard to know how many minutes you have to enter when you want to snooze for a couple of days or even weeks. Hours or even days might be sufficient. Maybe instead use an input with a datetime picker.

Having the input field next to the button doesn't look that good. Already in your screenshot the placeholder is cut off. Might be worth to check if using a dialog where you choose the snooze time is better. There you could easily provide a drop down with some predefined values and a custom value.

You could just do some javascript that does a post to the doSnooze method and on success just hides the message. That would avoid a page reload.

mawinter69 · 2026-02-02T14:20:47Z

core/src/main/resources/hudson/model/Messages.properties


 UserPreferencesProperty.DisplayName=Preferences
+
+snooze=Snooze


That is not accessible from jelly files. You can see in your screenshot that the values are not used.

You are right the previous package mismatch caused the translation lookup to fail. I have now moved the form into a dedicated t:snooze taglib at lib/hudson/snooze.jelly with its own snooze.properties file in the same folder

mawinter69 · 2026-02-02T14:21:13Z

core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly

+        <f:submit name="yes" value="${%Manage}"/>
+        <f:submit name="no" value="${%Dismiss}"/>
+      </form>
+      <form method="post" action="${rootURL}/${it.url}/snooze" style="display: inline-flex; gap: 0.5rem; align-items: center;">


Looks identical in all 3 places. So that might be better placed in a taglib for easy reuse.

Refactored the duplicate code into a reusable t:snooze tag in lib/hudson.

mawinter69 · 2026-02-02T14:22:37Z

core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly

+        <f:submit name="yes" value="${%Manage}"/>
+        <f:submit name="no" value="${%Dismiss}"/>
+      </form>
+      <form method="post" action="${rootURL}/${it.url}/snooze" style="display: inline-flex; gap: 0.5rem; align-items: center;">


Would prefer that this is defined in a css file

I have replaced the inline styles with core utility classes.

mawinter69 · 2026-02-02T14:33:01Z

core/src/main/java/hudson/model/AdministrativeMonitor.java

+        String duration = req.getParameter("duration");
+        long durationMs;
+        try {
+            if ("custom".equals(duration)) {


Isn't that always true as the 'duration' field has a default of custom and there is no code that will ever change this?

I included that for future flexibility, but you are right it is redundant since the current UI only sends custom. I will simplify the logic to handle the custom path directly and remove the unnecessary check.

mawinter69 · 2026-02-02T14:37:41Z

core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly

+        <f:submit name="no" value="${%Dismiss}"/>
+      </form>
+      <form method="post" action="${rootURL}/${it.url}/snooze" style="display: inline-flex; gap: 0.5rem; align-items: center;">
+        <j:if test="${h.isCrumbEncoded()}">


Why is this needed?

I manually added the CSRF crumb logic to ensure the snooze action was secure, but I have since realized this is redundant as Jenkins global JavaScript automatically injects crumbs into all POST forms. I will remove these lines along with the manual flex styling to keep the implementation clean and consistent with the existing patterns in the codebase.

mawinter69

You might want to take a look at #23859 where I implemented token expiration. This also has a dialog with a select for preset expirations and a custom input field for a date select.

mawinter69 · 2026-02-03T18:22:11Z

core/src/main/java/hudson/model/AdministrativeMonitor.java

    }

+    /**
+     * @since 2.549


Please don't set a version yet but write TODO. You don't know how fast your change will be merged. The version will be filled in later automatically.

mawinter69 · 2026-02-03T18:24:56Z

core/src/main/resources/lib/hudson/snoozeForm.js

Please use the built-in support for dialogs. See https://weekly.ci.jenkins.io/design-library/dialogs/ how to use it

mawinter69 · 2026-02-03T18:33:17Z

core/src/main/resources/lib/hudson/snoozeForm.jelly

+          <label for="snooze-duration-${it.id}" class="jenkins-form-label" style="display:block; margin-bottom: 5px;">
+            ${%snooze.duration.label}
+          </label>
+          <select id="snooze-duration-${it.id}" name="durationPreset" 


The select will not be styled like other selects in Jenkins

mawinter69 · 2026-02-03T18:39:25Z

core/src/main/resources/lib/hudson/snoozeForm.jelly

+  </button>
+
+  <dialog id="snooze-dialog-${it.id}" class="snooze-dialog">
+    <form id="snooze-form-${it.id}" method="post" 


Use <f:form

mawinter69 · 2026-02-03T18:42:34Z

core/src/main/resources/lib/hudson/snoozeForm.jelly

+          </select>
+        </div>
+
+        <div class="jenkins-form-item">


That could be just <f:number ...

mawinter69 · 2026-02-03T18:44:27Z

core/src/main/java/hudson/model/AbstractCIBase.java

+    private final Map<String, Long> snoozedAdministrativeMonitors = new HashMap<>();
+
+    /**
+     * @since 2.549


mawinter69 · 2026-02-03T18:44:31Z

core/src/main/java/hudson/model/AbstractCIBase.java

+    }
+
+    /**
+     * @since 2.549


mawinter69 · 2026-02-03T18:44:36Z

core/src/main/java/hudson/model/AdministrativeMonitor.java

+    }
+
+    /**
+     * @since 2.549


mawinter69 · 2026-02-03T18:44:40Z

core/src/main/java/hudson/model/AdministrativeMonitor.java

    }

    /**
+     * @since 2.549


mawinter69 · 2026-02-03T18:46:52Z

core/src/main/resources/lib/hudson/snoozeForm.jelly

+            <input type="number" id="snooze-minutes-${it.id}" name="customMinutes"
+                   placeholder="${%snooze.duration.placeholder}" min="1" max="525600"
+                   class="jenkins-input snooze-custom-input"
+                   style="display: none; width: 100%;"


In general when you want to hide something, set the class jenkins-hidden, to later show it just remove it from the element. That avoids that you need to know which exact value is set for display when it is shown.

mawinter69

Seems you've never really tested this.

mawinter69 · 2026-02-03T19:17:27Z

core/src/main/resources/lib/hudson/snoozeForm.jelly

+    Uses AJAX to avoid page reload.
+  </st:documentation>
+
+  <st:adjunct includes="lib.hudson.snoozeForm"/>


You need to rename the .js and the .css files. What happens now is that the adjunct will also include the snoozeForm.jelly, leading to a duplication of things

mawinter69 · 2026-02-03T19:20:01Z

core/src/main/resources/lib/hudson/snoozeForm.css

By using the built-in dialog support you will most likely not need any css. It will work out of the box also with dark theme or other themes

LakshyaBagani · 2026-02-07T07:16:08Z

Seems you've never really tested this.

I have checked the code and also change the UI as per the requirement

LakshyaBagani · 2026-02-13T05:45:51Z

@mawinter69 any updates on this PR?

LakshyaBagani · 2026-02-17T11:00:03Z

@mawinter69 @MarkEWaite any update on this PR it is open from more than 2 weeks ?

MarkEWaite

Several items that need attention before a detailed review.

MarkEWaite · 2026-02-17T15:03:29Z

core/src/main/java/hudson/model/AbstractCIBase.java

    }

-   /**
+    /**


Please remove this change that is only white space. It wastes maintainer time to see white space changes that will then be reverted by someone else making a white space change to restore consistency.

Suggested change

/**

/**

MarkEWaite · 2026-02-17T15:03:52Z

core/src/main/java/hudson/model/AbstractCIBase.java

     * ============================================================================================================== */

-     /**
+    /**


Please remove this white space change.

MarkEWaite · 2026-02-17T15:04:57Z

core/src/main/java/hudson/model/AdministrativeMonitor.java

    }

+    /**
+     * @since TODO


Please provide a complete Javadoc comment. This is adding a new public API and new public API's need a comment that describes their purpose.

MarkEWaite · 2026-02-17T15:05:43Z

core/src/main/java/hudson/model/AdministrativeMonitor.java

+    }
+
+    /**
+     * @since TODO


Please add a complete Javadoc comment that describes the method, its parameters, and the exception that is thrown.

MarkEWaite · 2026-02-17T15:06:08Z

core/src/main/java/hudson/model/AdministrativeMonitor.java

     *     Form UI elements that change system state, e.g. toggling a feature on or off, need to be hidden from users
     *     lacking Administer permission.
     * </p>
+     *


Please remove this extraneous change

MarkEWaite · 2026-02-17T15:07:42Z

core/src/main/resources/lib/hudson/snooze.js

+/*
+ * The MIT License
+ *
+ * Copyright (c) 2025 Jenkins Contributors


Copyright year should be 2026 as far as I can tell.

Suggested change

* Copyright (c) 2025 Jenkins Contributors

* Copyright (c) 2026 Jenkins Contributors

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

… cleanup and validation

@SInCE

- Replaced custom minutes input with HTML5 date picker for snooze duration - Migrated from custom dialog to Jenkins dialog.form() API - Simplified snoozeForm.jelly by removing inline dialog markup - Renamed snoozeForm.js to snooze.js following Jenkins adjunct naming - Removed snoozeForm.css (now uses built-in Jenkins styles) - Updated doSnooze() to parse date instead of custom minutes - Changed @SInCE version to TODO for new methods

Moved submitButton variable declaration to function scope to avoid multiple redeclarations within the same function.

…ight year - Revert whitespace-only changes in AbstractCIBase.java - Add complete Javadoc for new public API methods (isSnoozed, snooze, doSnooze, getSnoozedAdministrativeMonitors, setSnoozedAdministrativeMonitors) - Remove extraneous blank line in getRequiredPermission Javadoc - Update copyright year from 2025 to 2026 in snooze.js and snoozeForm.properties Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

LakshyaBagani · 2026-02-19T18:06:39Z

@MarkEWaite I ahve made the change as per u said . Please recheck the code and tell me whether I had implemented correctly or not ?

MarkEWaite · 2026-02-19T18:16:05Z

@MarkEWaite I ahve made the change as per u said . Please recheck the code and tell me whether I had implemented correctly or not ?

Please don't force push changes. That breaks the connection between previous review comments and the code.

LakshyaBagani · 2026-02-19T18:25:13Z

@MarkEWaite I ahve made the change as per u said . Please recheck the code and tell me whether I had implemented correctly or not ?

Please don't force push changes. That breaks the connection between previous review comments and the code.

Sorry about that - I had to rebase on latest master and remove an accidentally committed .vscode/settings.json, I will use fixup commits going forward instead of force pushing.

LakshyaBagani · 2026-02-20T20:00:35Z

@MarkEWaite have to check the changes I had changed the javaDocs as u said before ?

LakshyaBagani · 2026-02-26T10:31:14Z

@MarkEWaite @mawinter69 have u found the PR good or it need some changes ?

MarkEWaite · 2026-02-26T10:37:09Z

@LakshyaBagani I am on vacation for two weeks. I will not look at this until after I return

LakshyaBagani · 2026-02-26T10:39:05Z

Thanks for addressing @MarkEWaite

mawinter69 · 2026-02-26T10:55:43Z

I think we should discuss this in the next UX-SIG meeting, while the idea to allow snoozing the monitors is good, it requires an additional button. Monitors can already have several buttons and adding another might be too much for some of them.
This is also in the context of #18321 and #18417
Right now each monitor can decide if it adds a dismiss button and needs to do this on it's own placing this at will (some make it the first some the last I think). And each monitor has implemented that differently, either by using the doDisable endpoint but also frequently by implementing a doAct with different parameters.
Formalizing this and getting a more consistent UI would be good I think. With #18321 and when it really looks like in the repeatables, the snooze could also be just a small icon in the upper right.

LakshyaBagani · 2026-02-26T11:11:19Z

Sounds good. I had love to hear your thoughts on implementing the snooze feature - happy to take this forward and work on it further.

timja · 2026-02-26T14:34:46Z

I think it should be part of dismiss, a dialog pops up and asks you if you want to dismiss forever, for a period of time, and if you want to dismiss just for you or for all users potentially?

LakshyaBagani · 2026-02-27T08:35:46Z

I think it should be part of dismiss, a dialog pops up and asks you if you want to dismiss forever, for a period of time, and if you want to dismiss just for you or for all users potentially?

Interesting idea . If we go with a dialog on dismiss, how would that work for monitors that already have their own custom doAct implementations with different dismiss behaviors would we override those, or would the dialog need to be aware of each monitor's existing logic?

timja · 2026-02-27T09:11:15Z

I think it should be part of dismiss, a dialog pops up and asks you if you want to dismiss forever, for a period of time, and if you want to dismiss just for you or for all users potentially?

Interesting idea . If we go with a dialog on dismiss, how would that work for monitors that already have their own custom doAct implementations with different dismiss behaviors would we override those, or would the dialog need to be aware of each monitor's existing logic?

Some sort of jelly tag would need to be created for admin monitors e.g.

l:adminMonitor

That takes values like:

dismissable
dismissValue - default to something sensible so most don't have to set this
actions - actions (buttons) that people can take
The body would take html content

LakshyaBagani · 2026-02-27T12:43:26Z

I think it should be part of dismiss, a dialog pops up and asks you if you want to dismiss forever, for a period of time, and if you want to dismiss just for you or for all users potentially?

Interesting idea . If we go with a dialog on dismiss, how would that work for monitors that already have their own custom doAct implementations with different dismiss behaviors would we override those, or would the dialog need to be aware of each monitor's existing logic?

Some sort of jelly tag would need to be created for admin monitors e.g.

l:adminMonitor

That takes values like:

dismissable

dismissValue - default to something sensible so most don't have to set this

actions - actions (buttons) that people can take

The body would take html content

That makes sense. I will wait for the UX-SIG discussion before prototyping further. In the meantime, I will look into how the l:adminMonitor tag could work .

timja · 2026-02-27T13:33:04Z

I wouldn't wait for a meeting where it may or may not get discussed.

LakshyaBagani · 2026-02-27T13:38:25Z

I wouldn't wait for a meeting where it may or may not get discussed.

Then I will go ahead and start prototyping the l:adminMonitor tag

comment-ops-bot bot added the rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted label Feb 2, 2026

mawinter69 suggested changes Feb 2, 2026

View reviewed changes

LakshyaBagani requested a review from mawinter69 February 3, 2026 17:11

mawinter69 reviewed Feb 3, 2026

View reviewed changes

mawinter69 suggested changes Feb 3, 2026

View reviewed changes

LakshyaBagani force-pushed the reate-snooze-feature-for-administrativeMonitors branch from da9f705 to 9105aae Compare February 7, 2026 07:15

LakshyaBagani requested a review from mawinter69 February 7, 2026 07:31

MarkEWaite requested changes Feb 17, 2026

View reviewed changes

MarkEWaite requested a review from Copilot February 17, 2026 15:27

Copilot started reviewing on behalf of MarkEWaite February 17, 2026 15:28 View session

Copilot AI reviewed Feb 17, 2026

View reviewed changes

LakshyaBagani and others added 8 commits February 19, 2026 23:31

feat: implement snooze functionality for administrative monitors with…

f8678df

… cleanup and validation

Refactor Snooze to use Dialog, external JS/CSS, and fix CSP/CSRF issues

cac5213

Fix formatting and comments in AdministrativeMonitor.java

011ef7c

Refactor comments for clarity in AdministrativeMonitor

a9737ad

Fix formatting and comments in AdministrativeMonitor

6bb72ef

fix: resolve ESLint no-redeclare error in snooze.js

428527e

Moved submitButton variable declaration to function scope to avoid multiple redeclarations within the same function.

LakshyaBagani force-pushed the reate-snooze-feature-for-administrativeMonitors branch from 89a4e2c to 6ba42fa Compare February 19, 2026 18:02

LakshyaBagani requested a review from MarkEWaite February 19, 2026 18:05


		UserPreferencesProperty.DisplayName=Preferences

		snooze=Snooze

                   }
-                 /**
+                  /**

	* Copyright (c) 2025 Jenkins Contributors
	* Copyright (c) 2026 Jenkins Contributors

Uh oh!

Conversation

LakshyaBagani commented Feb 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Fixes #16641

Testing done

Automated Testing:

Manual Verification:

Screenshots (UI changes only)

Before

After

Proposed changelog entries

Proposed changelog category

Proposed upgrade guidelines

Submitter checklist

Desired reviewers

Uh oh!

mawinter69 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mawinter69 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mawinter69 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LakshyaBagani commented Feb 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

LakshyaBagani commented Feb 13, 2026

Uh oh!

LakshyaBagani commented Feb 17, 2026

Uh oh!

MarkEWaite left a comment

Choose a reason for hiding this comment

Uh oh!

LakshyaBagani commented Feb 2, 2026 •

edited

Loading

LakshyaBagani commented Feb 7, 2026 •

edited

Loading