瀏覽代碼

telemetry viewer fix to support deploymentType

Jason Rivard 2 年之前
父節點
當前提交
54e190f272

+ 8 - 0
data-service/src/main/java/password/pwm/receiver/SummaryBean.java

@@ -26,6 +26,7 @@ import password.pwm.PwmAboutProperty;
 import password.pwm.bean.TelemetryPublishBean;
 import password.pwm.config.PwmSetting;
 import password.pwm.svc.stats.Statistic;
+import password.pwm.util.java.StringUtil;
 import password.pwm.util.java.TimeDuration;
 
 import java.time.Duration;
@@ -143,6 +144,7 @@ public class SummaryBean
                 .appServerCount( appServerCount )
                 .osCount( osCount )
                 .dbCount( dbCount )
+                .deploymentCount( deploymentCount )
                 .javaCount( javaCount )
                 .appVersionCount( appVersionCount )
                 .build();
@@ -156,6 +158,11 @@ public class SummaryBean
 
     private static void incrementCounterMap( final Map<String, Integer> map, final String key, final int count )
     {
+        if ( map == null || StringUtil.isEmpty( key ) )
+        {
+            return;
+        }
+
         if ( map.containsKey( key ) )
         {
             map.put( key, map.get( key ) + count );
@@ -203,6 +210,7 @@ public class SummaryBean
         private String osName;
         private String osVersion;
         private String servletName;
+        private String deploymentType;
         private String dbVendor;
         private String javaVm;
         private String platform;

+ 2 - 1
data-service/src/main/webapp/WEB-INF/jsp/telemetry-viewer.jsp

@@ -57,13 +57,14 @@
     <br/>
     <br/>
 
+    <%--
     <form method="get">
         <label>Servers that have sent data in last number of days
             <input type="number" name="days" id="days" value="30" max="3650" min="1">
         </label>
         <button type="submit">Update</button>
     </form>
-
+    --%>
     <h2>Versions</h2>
     <table class="sortable">
         <tr>