Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: sets edc log level #1596

Merged
merged 10 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/tractusx-connector-azure-vault/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
| controlplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
| controlplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
| controlplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
| controlplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
| controlplane.logs.level | string | `"DEBUG"` | Defines the log granularity of the default Console Monitor. |
| controlplane.nodeSelector | object | `{}` | [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes |
| controlplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
| controlplane.podAnnotations | object | `{}` | additional annotations for the pod |
Expand Down Expand Up @@ -227,7 +227,7 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
| dataplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
| dataplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
| dataplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
| dataplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
| dataplane.logs.level | string | `"DEBUG"` | Defines the log granularity of the default Console Monitor. |
| dataplane.nodeSelector | object | `{}` | [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes |
| dataplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
| dataplane.podAnnotations | object | `{}` | additional annotations for the pod |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,3 @@ data:
opentelemetry.properties: |-
{{- .Values.controlplane.opentelemetry | nindent 4 }}

logging.properties: |-
{{- .Values.controlplane.logging | nindent 4 }}
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,3 @@ data:
opentelemetry.properties: |-
{{- .Values.dataplane.opentelemetry | nindent 4 }}

logging.properties: |-
{{- .Values.dataplane.logging | nindent 4 }}
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ spec:
image: "tractusx/edc-controlplane-postgresql-azure-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
{{- end }}
imagePullPolicy: {{ .Values.controlplane.image.pullPolicy }}
args: [ --log-level={{ .Values.controlplane.logs.level | required ".Values.controlplane.logs.level is required" }} ]
ports:
{{- range $key,$value := .Values.controlplane.endpoints }}
- name: {{ $key }}
Expand Down Expand Up @@ -321,9 +322,6 @@ spec:
- name: "configuration"
mountPath: "/app/opentelemetry.properties"
subPath: "opentelemetry.properties"
- name: "configuration"
mountPath: "/app/logging.properties"
subPath: "logging.properties"
{{- if .Values.customCaCerts }}
- name: custom-cacerts
mountPath: /opt/java/openjdk/lib/security/cacerts
Expand All @@ -341,8 +339,6 @@ spec:
items:
- key: "opentelemetry.properties"
path: "opentelemetry.properties"
- key: "logging.properties"
path: "logging.properties"
{{- if .Values.customCaCerts }}
- name: custom-cacertificates
configMap:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ spec:
image: "tractusx/edc-dataplane-azure-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
{{- end }}
imagePullPolicy: {{ .Values.dataplane.image.pullPolicy }}
args: [ --log-level={{ .Values.dataplane.logs.level | required ".Values.dataplane.logs.level is required" }} ]
ports:
{{- range $key,$value := .Values.dataplane.endpoints }}
- name: {{ $key }}
Expand Down Expand Up @@ -304,9 +305,6 @@ spec:
- name: "configuration"
mountPath: "/app/opentelemetry.properties"
subPath: "opentelemetry.properties"
- name: "configuration"
mountPath: "/app/logging.properties"
subPath: "logging.properties"
{{- if .Values.customCaCerts }}
- name: custom-cacerts
mountPath: /opt/java/openjdk/lib/security/cacerts
Expand All @@ -324,8 +322,6 @@ spec:
items:
- key: "opentelemetry.properties"
path: "opentelemetry.properties"
- key: "logging.properties"
path: "logging.properties"
{{- if .Values.customCaCerts }}
- name: custom-cacertificates
configMap:
Expand Down
26 changes: 10 additions & 16 deletions charts/tractusx-connector-azure-vault/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ controlplane:
# -- Defines if the JVM should wait with starting the application until someone connected to the debugging port.
suspendOnStart: false

logs:
# -- Defines the log granularity of the default Console Monitor.
level: DEBUG

livenessProbe:
# -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
enabled: true
Expand Down Expand Up @@ -323,14 +327,7 @@ controlplane:
opentelemetry: |-
otel.javaagent.enabled=false
otel.javaagent.debug=false
# -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
logging: |-
.level=INFO
org.eclipse.edc.level=ALL
handlers=java.util.logging.ConsoleHandler
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n


# -- [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
nodeSelector: {}
Expand Down Expand Up @@ -360,6 +357,10 @@ dataplane:
# -- Defines if the JVM should wait with starting the application until someone connected to the debugging port.
suspendOnStart: false

logs:
# -- Defines the log granularity of the default Console Monitor.
level: DEBUG

livenessProbe:
# -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
enabled: true
Expand Down Expand Up @@ -568,14 +569,7 @@ dataplane:
opentelemetry: |-
otel.javaagent.enabled=false
otel.javaagent.debug=false
# -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
logging: |-
.level=INFO
org.eclipse.edc.level=ALL
handlers=java.util.logging.ConsoleHandler
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n


# -- [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
nodeSelector: {}
Expand Down
2 changes: 1 addition & 1 deletion charts/tractusx-connector-memory/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.8.0-r
| runtime.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
| runtime.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
| runtime.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
| runtime.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
| runtime.logs.level | string | `"DEBUG"` | Defines the log granularity of the default Console Monitor. |
| runtime.nodeSelector | object | `{}` | [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes |
| runtime.podAnnotations | object | `{}` | additional annotations for the pod |
| runtime.podLabels | object | `{}` | additional labels for the pod |
Expand Down
34 changes: 0 additions & 34 deletions charts/tractusx-connector-memory/templates/configmap-runtime.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ spec:
{{- end }}

imagePullPolicy: {{ .Values.runtime.image.pullPolicy }}
args: [ --log-level={{ .Values.runtime.logs.level | required ".Values.runtime.logs.level is required" }} ]
ports:
{{- range $key,$value := .Values.runtime.endpoints }}
- name: {{ $key }}
Expand Down Expand Up @@ -336,9 +337,6 @@ spec:
{{- end }}
{{- end }}
volumeMounts:
- name: "configuration"
mountPath: "/app/logging.properties"
subPath: "logging.properties"
{{- if .Values.customCaCerts }}
- name: custom-cacerts
mountPath: /opt/java/openjdk/lib/security/cacerts
Expand All @@ -347,12 +345,6 @@ spec:
- name: "tmp"
mountPath: "/tmp"
volumes:
- name: "configuration"
configMap:
name: {{ include "txdc.fullname" . }}-runtime
items:
- key: "logging.properties"
path: "logging.properties"
{{- if .Values.customCaCerts }}
- name: custom-cacertificates
configMap:
Expand Down
12 changes: 4 additions & 8 deletions charts/tractusx-connector-memory/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ runtime:
# -- Defines if the JVM should wait with starting the application until someone connected to the debugging port.
suspendOnStart: false

logs:
# -- Defines the log granularity of the default Console Monitor.
level: DEBUG

livenessProbe:
# -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
enabled: true
Expand Down Expand Up @@ -338,14 +342,6 @@ runtime:
# -- targetAverageUtilization of memory provided to a pod
targetMemoryUtilizationPercentage: 80

# -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
logging: |-
.level=INFO
org.eclipse.edc.level=ALL
handlers=java.util.logging.ConsoleHandler
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n

# -- [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
nodeSelector: {}
Expand Down
4 changes: 2 additions & 2 deletions charts/tractusx-connector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.8.0-rc3 \
| controlplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
| controlplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
| controlplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
| controlplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
| controlplane.logs.level | string | `"DEBUG"` | Defines the log granularity of the default Console Monitor. |
| controlplane.nodeSelector | object | `{}` | [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes |
| controlplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
| controlplane.podAnnotations | object | `{}` | additional annotations for the pod |
Expand Down Expand Up @@ -224,7 +224,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.8.0-rc3 \
| dataplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
| dataplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
| dataplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
| dataplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
| dataplane.logs.level | string | `"DEBUG"` | Defines the log granularity of the default Console Monitor. |
| dataplane.nodeSelector | object | `{}` | [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes |
| dataplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
| dataplane.podAnnotations | object | `{}` | additional annotations for the pod |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,3 @@ data:
opentelemetry.properties: |-
{{- .Values.controlplane.opentelemetry | nindent 4 }}

logging.properties: |-
{{- .Values.controlplane.logging | nindent 4 }}
2 changes: 0 additions & 2 deletions charts/tractusx-connector/templates/configmap-dataplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,3 @@ data:
opentelemetry.properties: |-
{{- .Values.dataplane.opentelemetry | nindent 4 }}

logging.properties: |-
{{- .Values.dataplane.logging | nindent 4 }}
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ spec:
image: "tractusx/edc-controlplane-postgresql-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
{{- end }}
imagePullPolicy: {{ .Values.controlplane.image.pullPolicy }}
args: [ --log-level={{ .Values.controlplane.logs.level | required ".Values.controlplane.logs.level is required" }} ]
ports:
{{- range $key,$value := .Values.controlplane.endpoints }}
- name: {{ $key }}
Expand Down Expand Up @@ -141,6 +142,7 @@ spec:
{{- end }}
{{- end }}


########################
## ID CONFIGURATION ##
########################
Expand Down Expand Up @@ -319,9 +321,6 @@ spec:
- name: "configuration"
mountPath: "/app/opentelemetry.properties"
subPath: "opentelemetry.properties"
- name: "configuration"
mountPath: "/app/logging.properties"
subPath: "logging.properties"
{{- if .Values.customCaCerts }}
- name: custom-cacerts
mountPath: /opt/java/openjdk/lib/security/cacerts
Expand All @@ -339,8 +338,6 @@ spec:
items:
- key: "opentelemetry.properties"
path: "opentelemetry.properties"
- key: "logging.properties"
path: "logging.properties"
{{- if .Values.customCaCerts }}
- name: custom-cacertificates
configMap:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ spec:
image: "tractusx/edc-dataplane-hashicorp-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
{{- end }}
imagePullPolicy: {{ .Values.dataplane.image.pullPolicy }}
args: [ --log-level={{ .Values.dataplane.logs.level | required ".Values.dataplane.logs.level is required" }} ]
ports:
{{- range $key,$value := .Values.dataplane.endpoints }}
- name: {{ $key }}
Expand Down Expand Up @@ -298,9 +299,6 @@ spec:
- name: "configuration"
mountPath: "/app/opentelemetry.properties"
subPath: "opentelemetry.properties"
- name: "configuration"
mountPath: "/app/logging.properties"
subPath: "logging.properties"
{{- if .Values.customCaCerts }}
- name: custom-cacerts
mountPath: /opt/java/openjdk/lib/security/cacerts
Expand All @@ -318,8 +316,6 @@ spec:
items:
- key: "opentelemetry.properties"
path: "opentelemetry.properties"
- key: "logging.properties"
path: "logging.properties"
{{- if .Values.customCaCerts }}
- name: custom-cacertificates
configMap:
Expand Down
Loading
Loading