diff --git a/charts/drill/Chart.yaml b/charts/drill/Chart.yaml index e991a23..77f8565 100644 --- a/charts/drill/Chart.yaml +++ b/charts/drill/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: drill -version: 1.3.2 +version: 1.3.3 appVersion: 1.21.1 description: Helm Charts for deploying Apache Drill Clusters on Kubernetes icon: https://raw.githubusercontent.com/wearefrank/charts/master/charts/drill/icon.svg diff --git a/charts/drill/templates/configmap.override.yaml b/charts/drill/templates/configmap.override.yaml index fa62591..371bde2 100644 --- a/charts/drill/templates/configmap.override.yaml +++ b/charts/drill/templates/configmap.override.yaml @@ -1,7 +1,6 @@ {{/* -ConfigMap for generating override.conf files +ConfigMap for generating drill-override.conf and logback.xml files */}} -{{- if (not .Values.drill.overrideConfiguration.existingConfigMap) -}} apiVersion: v1 kind: ConfigMap metadata: @@ -9,6 +8,7 @@ metadata: labels: {{- include "drill.labels" . | nindent 4 }} data: + {{- if (not .Values.drill.overrideConfiguration.existingConfigMap) -}} drill-override.conf: |- drill.exec: { cluster-id: "{{ include "drill.fullname" . }}", @@ -16,6 +16,7 @@ data: http.port: 8047 } {{- toString .Values.drill.overrideConfiguration.drill | nindent 4 }} + {{- end -}} {{- with .Values.drill.overrideConfiguration.drillMetastore }} drill-metastore-override.conf: |- {{- toString . | nindent 4 }} @@ -32,31 +33,32 @@ data: storage-plugins-override.conf: |- {{- toString . | nindent 4 }} {{- end }} + {{- if .Values.drill.overrideLogging.enabled -}} logback.xml: |- - /var/lib/drill/log/drill.log + {{ .Values.drill.overrideLogging.filePath | default "/var/lib/drill/log/drill.log" }} - /var/lib/drill/log/drill.%i.log - 1 - 9 + {{ .Values.drill.overrideLogging.fileNamePattern | default "/var/lib/drill/log/drill.%i.log" }} + {{ .Values.drill.overrideLogging.minIndex | default 1 }} + {{ .Values.drill.overrideLogging.maxIndex | default 9 }} - 5MB + {{ .Values.drill.overrideLogging.maxFileSize | default "10MB" }} - %date [%thread] %-5level %logger{35} - %msg%n + {{ .Values.drill.overrideLogging.pattern | default "%date [%thread] %-5level %logger{35} - %msg%n" }} - + - - - + {{- range .Values.drill.overrideLogging.loggers }} + + {{- end }} -{{- end -}} \ No newline at end of file + {{- end -}} \ No newline at end of file diff --git a/charts/drill/values.yaml b/charts/drill/values.yaml index 75e2b51..5517fee 100644 --- a/charts/drill/values.yaml +++ b/charts/drill/values.yaml @@ -275,6 +275,11 @@ securityContext: { } ## ``` ## ## For more options refer to the [Apache Drill documentation](https://drill.apache.org/docs/configuration-options-introduction/). +## +## Additionally, this section allows you to override the default logging configuration for Apache Drill. +## By default, Apache Drill uses a built-in logging configuration, but you can customize it by enabling drill.overrideLogging. +## You can specify custom logging settings such as file paths, log rotation policies, logging levels, and more. +## ## @descriptionEnd ## drill: @@ -325,6 +330,58 @@ drill: ## password: changeit ## users: [ ] + overrideLogging: + ## @param drill.overrideLogging.enabled [boolean] Set to true to override the default logging configuration + ## This will create a custom logback.xml file for Drill. + ## + enabled: false + + ## @param drill.overrideLogging.filePath [string] The file path where logs will be written. + ## Default is `/var/lib/drill/log/drill.log`. + ## + filePath: "/var/lib/drill/log/drill.log" + + ## @param drill.overrideLogging.fileNamePattern [string] The pattern for log file rotation. + ## Default is `/var/lib/drill/log/drill.%i.log`. + ## + fileNamePattern: "/var/lib/drill/log/drill.%i.log" + + ## @param drill.overrideLogging.minIndex [integer] The minimum index for log file rotation. + ## Default is `1`. + ## + minIndex: 1 + + ## @param drill.overrideLogging.maxIndex [integer] The maximum index for log file rotation. + ## Default is `9`. + ## + maxIndex: 9 + + ## @param drill.overrideLogging.maxFileSize [string] The maximum size for each log file before rotation. + ## Default is `10MB`. + ## + maxFileSize: "10MB" + + ## @param drill.overrideLogging.pattern [string] The logging pattern used in log messages. + ## Default is `%date [%thread] %-5level %logger{35} - %msg%n`. + ## + pattern: "%date [%thread] %-5level %logger{35} - %msg%n" + + ## @param drill.overrideLogging.rootLevel [string] The logging level for the root logger. + ## Default is `debug`. + ## + rootLevel: "debug" + + ## @param drill.overrideLogging.loggers [array] Additional loggers to configure with specific levels. + ## Each logger should have a `name` and `level`. + ## e.g. + ## loggers: + ## - name: org.apache.drill + ## level: trace + ## - name: org.apache.calcite + ## level: trace + ## + loggers: [] + ## @param extraVolumes Optionally specify extra list of additional volumes for Drill pods ##