diff --git a/core/src/main/java/jenkins/telemetry/Telemetry.java b/core/src/main/java/jenkins/telemetry/Telemetry.java
index 1f60e319f9..de081c1695 100644
--- a/core/src/main/java/jenkins/telemetry/Telemetry.java
+++ b/core/src/main/java/jenkins/telemetry/Telemetry.java
@@ -130,6 +130,11 @@ public abstract class Telemetry implements ExtensionPoint {
return ExtensionList.lookup(Telemetry.class);
}
+ @Restricted(NoExternalUse.class) // called by jelly
+ public static boolean isAnyTrialActive() {
+ return all().stream().anyMatch(Telemetry::isActivePeriod);
+ }
+
/**
* @since 2.147
* @return whether to collect telemetry
diff --git a/core/src/main/resources/hudson/model/UsageStatistics/global.groovy b/core/src/main/resources/hudson/model/UsageStatistics/global.groovy
index 5506a37a67..7254eb283a 100644
--- a/core/src/main/resources/hudson/model/UsageStatistics/global.groovy
+++ b/core/src/main/resources/hudson/model/UsageStatistics/global.groovy
@@ -8,7 +8,7 @@ def f=namespace(lib.FormTagLib)
f.section(title: _("Usage Statistics")) {
if (UsageStatistics.DISABLED) {
- span(class: "jenkins-not-applicable") {
+ div(class: "jenkins-not-applicable jenkins-description") {
raw(_("disabledBySystemProperty"))
}
} else if (FIPS140.useCompliantAlgorithms()) {
diff --git a/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.jelly b/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.jelly
index a1bef14d4e..2d01661a17 100644
--- a/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.jelly
+++ b/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.jelly
@@ -1,14 +1,14 @@
For any project, it's critical to know how the software is used, but tracking usage data is inherently difficult in open-source projects.
Anonymous usage statistics address this need.
When enabled, Jenkins periodically sends information to the Jenkins project.
The Jenkins project uses this information to set development priorities.
-
Jenkins reports the following general usage statistics:
- The following trials defined on this instance are active now or in the future: -
+
- Start date: ${collector.start}
- End date: ${collector.end}
-
${%There are currently no active trials.}
++ The following trials defined on this instance are active now or in the future: +
+
+ Start date: ${collector.start}
+
+ End date: ${collector.end}
+