diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java index ae41c47d341d..1759397d0b6d 100644 --- a/core/src/main/java/hudson/model/Computer.java +++ b/core/src/main/java/hudson/model/Computer.java @@ -90,6 +90,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -1161,6 +1162,17 @@ public String getSearchUrl() { return r; } + @Restricted(NoExternalUse.class) + public Map getMonitoringData() { + Map r = new LinkedHashMap<>(); + for (NodeMonitor monitor : NodeMonitor.getAll()) { + if (monitor.getColumnCaption() != null) { + r.put(monitor, monitor.data(this)); + } + } + return r; + } + /** * Gets the system properties of the JVM on this computer. * If this is the master, it returns the system property of the master computer. diff --git a/core/src/main/resources/hudson/model/Computer/index.jelly b/core/src/main/resources/hudson/model/Computer/index.jelly index 12d875f991d5..2b93c52fe3ee 100644 --- a/core/src/main/resources/hudson/model/Computer/index.jelly +++ b/core/src/main/resources/hudson/model/Computer/index.jelly @@ -69,7 +69,19 @@ THE SOFTWARE.

${%title.no_manual_launch(it.retentionStrategy.descriptor.displayName)}

- + + + + + + + + + +
${m.key.columnCaption}
+
+ +

${%Labels}

diff --git a/war/src/main/scss/components/_table.scss b/war/src/main/scss/components/_table.scss index 0fe184f65f83..5ac54d12d927 100644 --- a/war/src/main/scss/components/_table.scss +++ b/war/src/main/scss/components/_table.scss @@ -183,6 +183,10 @@ } } + &--auto-width { + width: auto !important; + } + &--small { --table-padding: 0.2rem;