Merge branch 'master' into issue-18417

Author: mawinter69

core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy

@@ -38,8 +38,8 @@ f.section(title: _("Administrative monitors"), description: _("blurb")) {
                     div(class: "jenkins-checkbox-help-wrapper") {
                         f.checkbox(name: "administrativeMonitor",
                                 title: am.displayName,
-                                checked: instance.isMonitorEnabled(am.id),
-                                json: am.id)
+                                checked: instance.isMonitorEnabled(am.@id),
+                                json: am.@id)
                         if (am.isSecurity()) {
                             span(style: 'margin-left: 0.5rem', class: 'jenkins-badge', _("Security"))
                         }

test/src/test/java/jenkins/management/AdministrativeMonitorsConfigurationTest.java

@@ -0,0 +1,63 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2026, Jenkins project contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.management;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+
+import hudson.ExtensionList;
+import hudson.util.DoubleLaunchChecker;
+import org.htmlunit.html.HtmlForm;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.jvnet.hudson.test.Issue;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
+
+@WithJenkins
+class AdministrativeMonitorsConfigurationTest {
+
+    private JenkinsRule j;
+
+    @BeforeEach
+    void setUp(JenkinsRule rule) {
+        j = rule;
+    }
+
+    @Issue("#26285")
+    @Test
+    void globalConfigurationRoundTripKeepsDoubleLaunchCheckerEnabled() throws Exception {
+        DoubleLaunchChecker monitor = ExtensionList.lookupSingleton(DoubleLaunchChecker.class);
+        assertThat(monitor.id, is(DoubleLaunchChecker.class.getName()));
+        assertThat(monitor.getId(), not(monitor.id));
+        assertThat(monitor.isEnabled(), is(true));
+
+        HtmlForm form = j.createWebClient().goTo("configure").getFormByName("config");
+        j.submit(form);
+
+        assertThat(monitor.isEnabled(), is(true));
+    }
+}