Merge branch 'master' into feature/JENKINS-75675

Author: dukhlov

core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java

@@ -66,6 +66,11 @@ public boolean isActivated() {
         return true;
     }
 
+    @Override
+    public boolean isActivationFake() {
+        return true;
+    }
+
     @Restricted(DoNotUse.class) // WebOnly
     @RestrictedSince("2.235")
     public HttpResponse doTest(StaplerRequest2 request, @QueryParameter boolean testWithContext) {

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

@@ -160,6 +160,11 @@ public boolean isEnabled() {
      */
     public abstract boolean isActivated();
 
+    @Restricted(NoExternalUse.class)
+    public boolean isActivationFake() {
+        return false;
+    }
+
     /**
      * Returns true if this monitor is security related.
      *
@@ -186,8 +191,7 @@ public void doDisable(StaplerRequest2 req, StaplerResponse2 rsp) throws IOExcept
      * By default {@link Jenkins#ADMINISTER}, but {@link Jenkins#SYSTEM_READ} or {@link Jenkins#MANAGE} are also supported.
      * <p>
      *     Changing this permission check to return {@link Jenkins#SYSTEM_READ} will make the active
-     *     administrative monitor appear on {@code manage.jelly} and on the globally visible
-     *     {@link jenkins.management.AdministrativeMonitorsDecorator} to users without Administer permission.
+     *     administrative monitor appear on {@link ManageJenkinsAction} to users without Administer permission.
      *     {@link #doDisable(StaplerRequest2, StaplerResponse2)} will still always require Administer permission.
      * </p>
      * <p>

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

@@ -625,6 +625,19 @@ public final boolean isOnline() {
         return !isOffline();
     }
 
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Uses {@link #getChannel()} to check the connection.
+     * A connected agent may still be offline for scheduling if marked temporarily offline.
+     * @return {@code true} if the agent is connected, {@code false} otherwise.
+     * @see #isOffline()
+     */
+    @Override
+    public boolean isConnected() {
+        return getChannel() != null;
+    }
+
     /**
      * This method is called to determine whether manual launching of the agent is allowed at this point in time.
      * @return {@code true} if manual launching of the agent is allowed at this point in time.

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

@@ -26,11 +26,11 @@
 
 import hudson.Extension;
 import hudson.Util;
+import hudson.util.HudsonIsLoading;
+import hudson.util.HudsonIsRestarting;
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Optional;
-import jenkins.management.AdministrativeMonitorsDecorator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import jenkins.management.Badge;
 import jenkins.model.Jenkins;
 import jenkins.model.ModelObjectWithContextMenu;
@@ -50,6 +50,9 @@
  */
 @Extension(ordinal = 998) @Symbol("manageJenkins")
 public class ManageJenkinsAction implements RootAction, StaplerFallback, ModelObjectWithContextMenu {
+
+    private static final Logger LOGGER = Logger.getLogger(ManageJenkinsAction.class.getName());
+
     @Override
     public String getIconFileName() {
         if (Jenkins.get().hasAnyPermission(Jenkins.MANAGE, Jenkins.SYSTEM_READ))
@@ -98,28 +101,36 @@ public void addContextMenuItem(ContextMenu menu, String url, String icon, String
         menu.add("manage/" + url, icon, iconXml, text, post, requiresConfirmation, badge, message);
     }
 
+    /** Unlike {@link Jenkins#getActiveAdministrativeMonitors} this checks for activation lazily. */
     @Override
     public Badge getBadge() {
-        Jenkins jenkins = Jenkins.get();
-        AdministrativeMonitorsDecorator decorator = jenkins.getExtensionList(PageDecorator.class)
-                .get(AdministrativeMonitorsDecorator.class);
-
-        if (decorator == null) {
+        if (!(AdministrativeMonitor.hasPermissionToDisplay())) {
             return null;
         }
 
-        Collection<AdministrativeMonitor> activeAdministrativeMonitors = Optional.ofNullable(decorator.getMonitorsToDisplay()).orElse(Collections.emptyList());
-        boolean anySecurity = activeAdministrativeMonitors.stream().anyMatch(AdministrativeMonitor::isSecurity);
-
-        if (activeAdministrativeMonitors.isEmpty()) {
+        var app = Jenkins.get().getServletContext().getAttribute("app");
+        if (app instanceof HudsonIsLoading || app instanceof HudsonIsRestarting) {
             return null;
         }
 
-        int size = activeAdministrativeMonitors.size();
-        String tooltip = size > 1 ? Messages.ManageJenkinsAction_notifications(size) : Messages.ManageJenkinsAction_notification(size);
+        if (Jenkins.get().administrativeMonitors.stream().anyMatch(m -> m.isSecurity() && isActive(m))) {
+            return new Badge("1+", Messages.ManageJenkinsAction_notifications(),
+                    Badge.Severity.DANGER);
+        } else if (Jenkins.get().administrativeMonitors.stream().anyMatch(m -> !m.isSecurity() && isActive(m))) {
+            return new Badge("1+", Messages.ManageJenkinsAction_notifications(),
+                    Badge.Severity.WARNING);
+        } else {
+            return null;
+        }
+    }
 
-        return new Badge(String.valueOf(size),
-                tooltip,
-                anySecurity ? Badge.Severity.DANGER : Badge.Severity.WARNING);
+    private static boolean isActive(AdministrativeMonitor m) {
+        try {
+            return !m.isActivationFake() && m.hasRequiredPermission() && m.isEnabled() && m.isActivated();
+        } catch (Throwable x) {
+            LOGGER.log(Level.WARNING, null, x);
+            return false;
+        }
     }
+
 }

core/src/main/java/jenkins/diagnostics/URICheckEncodingMonitor.java

@@ -31,6 +31,11 @@ public boolean isActivated() {
         return true;
     }
 
+    @Override
+    public boolean isActivationFake() {
+        return true;
+    }
+
     @Override
     public String getDisplayName() {
         return Messages.URICheckEncodingMonitor_DisplayName();