feat: add applogers for the admin ui plugin

GluuFederation · Feb 24, 2022 · 5208e19 · 5208e19
1 parent 2ad5a6a
commit 5208e19
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 0 deletions.
diff --git a/automation/janssen_helm_chart/analyze_chart.py b/automation/janssen_helm_chart/analyze_chart.py
@@ -58,6 +58,7 @@ def clean_keys(values_dict: {}, parent_key="", second_parent_key="") -> None:
 clean_keys(non_janssen_keys)
 clean_keys(non_janssen_keys["global"], parent_key="global")
 clean_keys(non_janssen_keys["global"]["istio"], parent_key="global", second_parent_key="istio")
+clean_keys(non_janssen_keys["global"]["config-api"], parent_key="global", second_parent_key="config-api")
 clean_keys(non_janssen_keys["config"], parent_key="config")
 clean_keys(non_janssen_keys["nginx-ingress"]["ingress"], parent_key="nginx-ingress", second_parent_key="ingress")
 yaml.dump(main_values_file_parser, main_values_file)

diff --git a/automation/janssen_helm_chart/non_janssen.yaml b/automation/janssen_helm_chart/non_janssen.yaml
@@ -17,6 +17,8 @@ global:
   cnObTransportKeyPassPhrase: None
   cnObTransportAlias: None
   cnObTransportTrustStore: None
+  config-api:
+    adminUiappLoggers: None
   istio:
     ingress: None
   oxpassport: None

diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/configmaps.yaml b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/configmaps.yaml
@@ -96,6 +96,14 @@ data:
   | toJson
   | replace "configApiLogTarget" "config_api_log_target"
   | replace "configApiLogLevel" "config_api_log_level"
+  | replace "persistenceLogTarget" "persistence_log_target"
+  | replace "persistenceLogLevel" "persistence_log_level"
+  | replace "persistenceDurationLogTarget" "persistence_duration_log_target"
+  | replace "persistenceDurationLogLevel" "persistence_duration_log_level"
+  | replace "ldapStatsLogTarget" "ldap_stats_log_target"
+  | replace "ldapStatsLogLevel" "ldap_stats_log_level"
+  | replace "scriptLogTarget" "script_log_target"
+  | replace "scriptLogLevel" "script_log_level"
   | squote
   }}
   {{- end }}
@@ -180,6 +188,14 @@ data:
   # ADMIN-UI
   ADMIN_UI_JWKS: {{ cat "http://" ( index .Values "global" "auth-server" "authServerServiceName" ) ":8080/jans-auth/restv1/jwks" | quote | nospace }}
   CN_CONFIG_API_PLUGINS: "admin-ui,scim"
+  CN_ADMIN_UI_PLUGIN_LOGGERS: {{ index .Values "global" "config-api" "adminUiappLoggers"
+  | toJson
+  | replace "adminUiLogTarget" "admin_ui_log_target"
+  | replace "adminUiLogLevel" "admin_ui_log_level"
+  | replace "adminUiAuditLogTarget" "admin_ui_audit_log_target"
+  | replace "adminUiAuditLogLevel" "admin_ui_audit_log_level"
+  | squote
+  }}
   {{- end }}
 ---
 

diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/values.yaml b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/values.yaml
@@ -866,6 +866,31 @@ global:
       configApiLogTarget: "STDOUT"
       # -- configapi.log level
       configApiLogLevel: "INFO"
+      # -- config-api_persistence.log target
+      persistenceLogTarget: "FILE"
+      # -- jans-auth_persistence.log level
+      persistenceLogLevel: "INFO"
+      # -- config-api_persistence_duration.log target
+      persistenceDurationLogTarget: "FILE"
+      # -- config-api_persistence_duration.log level
+      persistenceDurationLogLevel: "INFO"
+      # -- config-api_persistence_ldap_statistics.log target
+      ldapStatsLogTarget: "FILE"
+      # -- config-api_persistence_ldap_statistics.log level
+      ldapStatsLogLevel: "INFO"
+      # -- config-api_script.log target
+      scriptLogTarget: "FILE"
+      # -- config-api_script.log level
+      scriptLogLevel: "INFO"
+    adminUiappLoggers:
+      # -- config-api admin-ui plugin log level
+      adminUiLogTarget: "FILE"
+      # -- config-api admin-ui plugin log target
+      adminUiLogLevel: "INFO"
+      # -- config-api admin-ui plugin audit log target
+      adminUiAuditLogTarget: "FILE"
+      # -- config-api admin-ui plugin audit log level
+      adminUiAuditLogLevel: "INFO"
   # -- Fully qualified domain name to be used for Gluu installation. This address will be used to reach Gluu services.
   fqdn: demoexample.gluu.org
   fido2: