Global dismiss will disable for all users

mawinter69 · mawinter69 · commit 4ae70e81bb81 · 2026-02-09T20:36:58.000+01:00
diff --git a/core/src/main/java/hudson/model/AdministrativeMonitor.java b/core/src/main/java/hudson/model/AdministrativeMonitor.java
@@ -124,30 +124,42 @@ public final String getSearchUrl() {
     }
 
     /**
-     * Mark this monitor as disabled, to prevent this from showing up in the UI.
+     * Mark this monitor as disabled for the user, to prevent this from showing up in the UI.
      *
      * <p>
-     * This is a per-user setting if security is enabled. This means that it should not be used to disable
-     * the monitor programmatically.
+     * This is a per-user setting if security is enabled. Use {@link #disableGlobally(boolean)}
+     * to disable the monitor for all users.
      * </p>
      */
     public void disable(boolean value) throws IOException {
-        AbstractCIBase jenkins = Jenkins.get();
         User user = User.current();
 
         if (user != null) {
             AdministrativeMonitorsProperty property = AdministrativeMonitorsProperty.get(user);
             property.disableMonitor(id, value);
         } else {
-            Set<String> set = jenkins.getDisabledAdministrativeMonitors();
-            if (value) {
-                set.add(id);
-            } else {
-                set.remove(id);
-            }
-            jenkins.setDisabledAdministrativeMonitors(set);
-            jenkins.save();
+            disableGlobally(value);
+        }
+    }
+
+    /**
+     * Mark this monitor as disabled globally, to prevent this from showing up in the UI for all users.
+     *
+     * <p>
+     * This is a global setting. A monitor that is disabled globally will not show up in the UI for any user,
+     * regardless of their per-user setting.
+     * </p>
+     */
+    public void disableGlobally(boolean value) throws IOException {
+        AbstractCIBase jenkins = Jenkins.get();
+        Set<String> set = jenkins.getDisabledAdministrativeMonitors();
+        if (value) {
+            set.add(id);
+        } else {
+            set.remove(id);
         }
+        jenkins.setDisabledAdministrativeMonitors(set);
+        jenkins.save();
     }
 
     /**
@@ -157,18 +169,28 @@ public void disable(boolean value) throws IOException {
      * This flag implements the ability for the admin to say "no, thank you" to the monitor that
      * he wants to ignore.
      * </p>
-     * <p>
-     * This is a per-user setting if security is enabled. This means that it should not be used to decide if some
-     * check should be performed or not.
-     * If such behavior is desired, implementers should provide their own configuration mechanism.
-     * </p>
+     * @return true if this monitor is enabled, false if disabled globally or by the user.
      */
     public boolean isEnabled() {
         User user = User.current();
+        boolean enabledGlobally = isEnabledGlobally();
         if (user != null) {
             AdministrativeMonitorsProperty property = AdministrativeMonitorsProperty.get(user);
-            return property.isMonitorEnabled(id);
+            return property.isMonitorEnabled(id) && enabledGlobally;
         }
+        return enabledGlobally;
+    }
+
+    /**
+     * Returns true if this monitor is enabled globally, regardless of per-user settings.
+     *
+     * <p>
+     *     Monitors that want to avoid execution should use this check.
+     * </p>
+     *
+     * @return true if enabled globally, false otherwise.
+     */
+    public boolean isEnabledGlobally() {
         return !Jenkins.get().getDisabledAdministrativeMonitors().contains(id);
     }
 
diff --git a/core/src/main/java/hudson/util/DoubleLaunchChecker.java b/core/src/main/java/hudson/util/DoubleLaunchChecker.java
@@ -95,7 +95,7 @@ protected void execute() {
         File timestampFile = new File(home, ".owner");
 
         long t = timestampFile.lastModified();
-        if (t != 0 && lastWriteTime != 0 && t != lastWriteTime) {
+        if (t != 0 && lastWriteTime != 0 && t != lastWriteTime && isEnabledGlobally()) {
             try {
                 collidingId = Files.readString(Util.fileToPath(timestampFile), Charset.defaultCharset());
             } catch (IOException e) {
diff --git a/core/src/main/java/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor.java b/core/src/main/java/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor.java
@@ -91,8 +91,7 @@ public OperatingSystemEndOfLifeAdminMonitor() throws IOException {
     }
 
     private void fillOperatingSystemList() throws IOException {
-        if (Jenkins.getInstanceOrNull() != null) {
-            /* If not enabled, do not read the data files or perform any checks */
+        if (Jenkins.getInstanceOrNull() != null && !isEnabledGlobally()) {
             LOGGER.log(Level.FINEST, "Operating system end of life monitor is not enabled, reading no data");
             return;
         }
diff --git a/core/src/main/java/jenkins/user/AdministrativeMonitorsProperty.java b/core/src/main/java/jenkins/user/AdministrativeMonitorsProperty.java
@@ -15,6 +15,7 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import jenkins.model.Jenkins;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
@@ -68,6 +69,10 @@ public boolean isMonitorEnabled(String monitorId) {
         }
     }
 
+    public boolean isMonitorGloballyDisabled(String monitorId) {
+        return Jenkins.get().getDisabledAdministrativeMonitors().contains(monitorId);
+    }
+
     public void disableMonitor(String monitorId, boolean enabled) throws IOException {
         synchronized (dismissedMonitors) {
             if (enabled) {
diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy
@@ -29,26 +29,24 @@ import hudson.model.AdministrativeMonitor
 f = namespace(lib.FormTagLib)
 st = namespace("jelly:stapler")
 
-div(class: "${app.useSecurity ? 'jenkins-hidden' : null}") {
-    f.section(title: _("Administrative monitors"), description: _("blurb")) {
-        f.advanced(title: _("Administrative monitors")) {
-            f.entry() {
-                for (AdministrativeMonitor am : new ArrayList<>(AdministrativeMonitor.all())
-                        .sort({ o1, o2 -> o1.getDisplayName() <=> o2.getDisplayName() })) {
-                    div(style: "margin-bottom: 0.625rem") {
-                        div(class: "jenkins-checkbox-help-wrapper") {
-                            f.checkbox(name: "administrativeMonitor",
-                                    title: am.displayName,
-                                    checked: instance.isMonitorEnabled(am.id),
-                                    json: am.id)
-                            if (am.isSecurity()) {
-                                span(style: 'margin-left: 0.5rem', class: 'jenkins-badge', _("Security"))
-                            }
-                        }
-                        div(class: "jenkins-checkbox__description") {
-                            st.include(it: am, page: "description", optional: true)
+f.section(title: _("Administrative monitors"), description: _("blurb")) {
+    f.advanced(title: _("Administrative monitors")) {
+        f.entry() {
+            for (AdministrativeMonitor am : new ArrayList<>(AdministrativeMonitor.all())
+                    .sort({ o1, o2 -> o1.getDisplayName() <=> o2.getDisplayName() })) {
+                div(style: "margin-bottom: 0.625rem") {
+                    div(class: "jenkins-checkbox-help-wrapper") {
+                        f.checkbox(name: "administrativeMonitor",
+                                title: am.displayName,
+                                checked: instance.isMonitorEnabled(am.id),
+                                json: am.id)
+                        if (am.isSecurity()) {
+                            span(style: 'margin-left: 0.5rem', class: 'jenkins-badge', _("Security"))
                         }
                     }
+                    div(class: "jenkins-checkbox__description") {
+                        st.include(it: am, page: "description", optional: true)
+                    }
                 }
             }
         }
diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.properties b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.properties
@@ -2,4 +2,4 @@ blurb = Administrative monitors are warnings shown to Jenkins administrators \
   about the state of the Jenkins instance. It is generally strongly \
   recommended to keep all administrative monitors enabled, but if you are \
   not interested in specific warnings, uncheck them here to permanently \
-  hide them.
+  hide them for all administrators.
diff --git a/core/src/main/resources/jenkins/user/AdministrativeMonitorsProperty/config.jelly b/core/src/main/resources/jenkins/user/AdministrativeMonitorsProperty/config.jelly
@@ -7,7 +7,11 @@
         <div class="jenkins-!-margin-bottom-1">
           <div class="jenkins-checkbox-help-wrapper">
             <j:set var="readOnlyMode" value="${!am.hasRequiredPermission()}"/>
-            <f:checkbox name="administrativeMonitor" title="${am.displayName}" json="${am.id}" checked="${instance.isMonitorEnabled(am.id)}"/>
+            <f:checkbox name="administrativeMonitor" title="${am.displayName}" json="${am.id}"
+                        checked="${instance.isMonitorEnabled(am.id)}"/>
+            <j:if test="${instance.isMonitorGloballyDisabled(am.id)}">
+              <sup style="margin-left: 0.1rem" class="jenkins-!-warning-color" tooltip="${%This monitor is globally disabled}">*</sup>
+            </j:if>
             <j:if test="${am.security}">
               <span style="margin-left: 0.5rem" class="jenkins-badge">${%Security}</span>
             </j:if>
diff --git a/core/src/main/resources/jenkins/user/AdministrativeMonitorsProperty/config.properties b/core/src/main/resources/jenkins/user/AdministrativeMonitorsProperty/config.properties
@@ -2,4 +2,7 @@ blurb = Administrative monitors are warnings shown to Jenkins administrators \
   about the state of the Jenkins instance. It is generally strongly \
   recommended to keep all administrative monitors enabled, but if you are \
   not interested in specific warnings, uncheck them here to permanently \
-  hide them.
+  hide them for yourself. Some monitors are only shown when you have the \
+  <em>Administer</em> permission, while other are also accessible with \
+  <em>Manage</em> or <em>SystemRead</em> permissions. You can disable only \
+  the monitors that are accessible with your permissions.
diff --git a/test/src/test/java/hudson/diagnosis/HudsonHomeDiskUsageMonitorTest.java b/test/src/test/java/hudson/diagnosis/HudsonHomeDiskUsageMonitorTest.java

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,7 @@ public OperatingSystemEndOfLifeAdminMonitor() throws IOException {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`private void fillOperatingSystemList() throws IOException {`
`94`		`- if (Jenkins.getInstanceOrNull() != null) {`
`95`		`- /* If not enabled, do not read the data files or perform any checks */`
	`94`	`+ if (Jenkins.getInstanceOrNull() != null && !isEnabledGlobally()) {`
`96`	`95`	`LOGGER.log(Level.FINEST, "Operating system end of life monitor is not enabled, reading no data");`
`97`	`96`	`return;`
`98`	`97`	`}`