Merge pull request #121 from Onlineberatung/CARITAS-297-add-site24x7

feat: CARITAS-297-add-site24x7
Onlineberatung · Nov 7, 2024 · 20d6138 · 20d6138
2 parents 1ac7e5f + 905a9d9
commit 20d6138
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/templates/userservice/userservice-deployment.yaml b/templates/userservice/userservice-deployment.yaml
@@ -491,6 +491,18 @@ spec:
                 configMapKeyRef:
                   key: SPRING_SLEUTH_SAMPLER_PERCENTAGE
                   name: userservice-{{ .Release.Name }}-env
+          {{ - if .Values.global.site24x7Enabled }}
+            - name: SITE247_LICENSE_KEY
+              valueFrom:
+                secretKeyRef:
+                  key: SITE247_LICENSE_KEY
+                  name: userservice-secret-{{ .Release.Name }}-env
+            - name: JAVA_TOOL_OPTIONS
+              valueFrom:
+                configMapKeyRef:
+                  key: JAVA_TOOL_OPTIONS
+                  name: userservice-{{ .Release.Name }}-env
+          {{ - end }}
           image: {{ .Values.userServiceImageName }}:{{ .Values.userServiceImageVersion }}
           imagePullPolicy: Always
           name: userservice
@@ -522,6 +534,10 @@ spec:
           volumeMounts:
             - mountPath: /import
               name: userservice-import
+          {{ - if .Values.global.site24x7Enabled }}
+            - mountPath: /site24x7Files/
+              name: site24x7-files
+          {{ - end }}
         - name: set-masterkey
           image: badouralix/curl-jq
           env:
@@ -572,4 +588,7 @@ spec:
       restartPolicy: Always
       volumes:
         - name: userservice-import
-          emptyDir: {}
+          emptyDir: {}
+        - name: site24x7-files
+          configMap:
+            name: site24x7-files-{{ .Release.Name }}-configmap
diff --git a/templates/userservice/userservice-env-configmap.yaml b/templates/userservice/userservice-env-configmap.yaml
@@ -105,6 +105,9 @@ data:
   {{- end }}
   SPRING_SLEUTH_WEB_ENABLED: {{ .Values.zipkin.enabled | default false | quote }}
   SPRING_SLEUTH_SAMPLER_PERCENTAGE: {{ .Values.zipkin.samplerPercentage | default "1.0" | quote }}
+  {{ - if .Values.global.site24x7Enabled }}
+  JAVA_TOOL_OPTIONS: "-javaagent:/opt/apm/apminsight-javaagent.jar -Dapminsight.application.name=userservice-{{ .Release.Name }} -Dapminsight.log.dir=/home/apm"
+  {{ - end }}
 kind: ConfigMap
 metadata:
   labels:

diff --git a/templates/userservice/userservice-secret.yaml b/templates/userservice/userservice-secret.yaml
@@ -20,3 +20,5 @@ data:
   ROCKET_SYSTEMUSER_PASSWORD: {{ .Values.rocketSystemuserPassword | b64enc | quote }}
   {{- $mongourl := printf "mongodb://%s:%s@mongodb.%s:27017/rocketchat?retryWrites=false" .Values.global.rocketchatMongoUsername .Values.global.rocketchatMongoPassword .Release.Namespace }}
   ROCKET_CHAT_MONGO_URL: {{ $mongourl | b64enc | quote }}
+  SITE247_LICENSE_KEY: {{ .Values.site24x7LicenseKey | b64enc | quote }}
+
diff --git a/values.yaml b/values.yaml
@@ -14,6 +14,7 @@ global:
   useExternalMariaDb: false
   settingMainTenantSubdomainForSingleDomainMultitenancy: "not-needed"
   migrationToolEnabled: false
+  site24x7Enabled: false
 
   # Secrets MariaDB
   mysqlRootPassword: "root"
@@ -310,4 +311,7 @@ weblate:
 migration:
   weblate:
     useCustomResourcesPath: true
-    customResourcesPath: "resources/weblate/"
+    customResourcesPath: "resources/weblate/"
+
+# site24x7
+site24x7LicenseKey: "key"