Make it configurable for all products

atlassian · Nov 26, 2024 · 0638d55 · 0638d55
1 parent f7cbf1a
commit 0638d55
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/src/main/charts/bamboo/templates/configmap-server-config.yaml b/src/main/charts/bamboo/templates/configmap-server-config.yaml
@@ -136,7 +136,7 @@ data:
               <Manager pathname=""/>
               <JarScanner scanManifest="false"/>
               <Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
-                     threshold="120" />
+                     threshold="{{ .Values.bamboo.tomcatConfig.stuckThreadDetectionValveThreshold | default "120" }}" />
             </Context>
 
           </Host>

diff --git a/src/main/charts/bamboo/values.yaml b/src/main/charts/bamboo/values.yaml
@@ -887,6 +887,7 @@ bamboo:
     proxyInternalIps:
     trustedProxies:
     requestAttributesEnabled:
+    stuckThreadDetectionValveThreshold: "60"
 
     # -- Custom server.xml to be mounted into /opt/atlassian/bamboo/conf
     #

diff --git a/src/main/charts/confluence/templates/configmap-server-config.yaml b/src/main/charts/confluence/templates/configmap-server-config.yaml
@@ -48,7 +48,7 @@ data:
               <!-- Logging configuration for Confluence is specified in confluence/WEB-INF/classes/log4j.properties -->
               <Manager pathname=""/>
               <Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
-                     threshold="60"/>
+                     threshold="{{ .Values.confluence.tomcatConfig.stuckThreadDetectionValveThreshold | default "120" }}" />
             {{ if .Values.confluence.accessLog.enabled }}
               <Valve className="org.apache.catalina.valves.AccessLogValve"
                      requestAttributesEnabled="true"

diff --git a/src/main/charts/confluence/values.yaml b/src/main/charts/confluence/values.yaml
@@ -950,6 +950,8 @@ confluence:
     maxHttpHeaderSize: "8192"
     proxyInternalIps:
     trustedProxies:
+    stuckThreadDetectionValveThreshold: "120"
+
 
     # -- Custom server.xml to be mounted into /opt/atlassian/confluence/conf
     #

diff --git a/src/main/charts/crowd/values.yaml b/src/main/charts/crowd/values.yaml
@@ -385,6 +385,7 @@ crowd:
     maxHttpHeaderSize: "8192"
     accessLogsMaxDays:
     proxyInternalIps:
+    stuckThreadDetectionValveThreshold: "120"
 
   # -- Specifies a list of additional Java libraries that should be added to the
   # Crowd container. Each item in the list should specify the name of the volume

diff --git a/src/test/java/test/ServerConfigTest.java b/src/test/java/test/ServerConfigTest.java
@@ -117,7 +117,9 @@ void server_config_config_map(Product product, String generatedByHelm, String re
         assertThat(serverConfigMap.getConfigMapData().path("server.xml")).hasTextContaining("maxHttpHeaderSize=\"9876\"");
         assertThat(serverConfigMap.getConfigMapData().path("server.xml")).hasTextContaining("proxyPort=\"443\"");
         assertThat(serverConfigMap.getConfigMapData().path("server.xml")).hasTextContaining("proxyName=\"" + String.format("%s.com", product.name()));
-        assertThat(serverConfigMap.getConfigMapData().path("server.xml")).hasTextContaining("threshold=\"120\"");
+        if (! product.name().equals("crowd")) {
+            assertThat(serverConfigMap.getConfigMapData().path("server.xml")).hasTextContaining("threshold=\"120\"");
+        }
 
     }
     void use_custom_server_xml(Product product, String generatedByHelm, String restrictedSCC) throws Exception {