From 29484f1b6f6e67bbb7192fb9f0633141c699d1a7 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 25 May 2023 10:36:17 +0200 Subject: [PATCH] Add logLevel options to OSM helm chart Change-Id: Ie476bc6b0053a3fb0886ed2191a92c0916908e53 Signed-off-by: garciadeblas --- installers/helm/osm/templates/lcm/lcm-configmap.yaml | 1 + installers/helm/osm/templates/mon/mon-configmap.yaml | 1 + installers/helm/osm/templates/nbi/nbi-configmap.yaml | 1 + installers/helm/osm/templates/pla/pla-configmap.yaml | 1 + installers/helm/osm/templates/pol/pol-configmap.yaml | 1 + installers/helm/osm/templates/ro/ro-configmap.yaml | 1 + installers/helm/osm/values.yaml | 7 +++++++ installers/helm/values/airflow-values.yaml | 2 ++ 8 files changed, 15 insertions(+) diff --git a/installers/helm/osm/templates/lcm/lcm-configmap.yaml b/installers/helm/osm/templates/lcm/lcm-configmap.yaml index 40d74c1d..c976a701 100644 --- a/installers/helm/osm/templates/lcm/lcm-configmap.yaml +++ b/installers/helm/osm/templates/lcm/lcm-configmap.yaml @@ -29,6 +29,7 @@ data: OSMLCM_STORAGE_PATH: "/app/storage" OSMLCM_STORAGE_COLLECTION: "files" OSMLCM_STORAGE_URI: "mongodb://mongodb-k8s:27017/?replicaSet=rs0" + OSMLCM_GLOBAL_LOGLEVEL: {{ .Values.lcm.logLevel | default .Values.global.logLevel | default "INFO" }} {{- with .Values.lcm.config }} {{- . | toYaml | nindent 2 }} {{- end }} diff --git a/installers/helm/osm/templates/mon/mon-configmap.yaml b/installers/helm/osm/templates/mon/mon-configmap.yaml index 06a4545d..c6e506e5 100644 --- a/installers/helm/osm/templates/mon/mon-configmap.yaml +++ b/installers/helm/osm/templates/mon/mon-configmap.yaml @@ -25,6 +25,7 @@ data: OSMMON_DATABASE_URI: "mongodb://mongodb-k8s:27017/?replicaSet=rs0" OSMMON_MESSAGE_HOST: "kafka" OSMMON_MESSAGE_PORT: "9092" + OSMMON_GLOBAL_LOG_LEVEL: {{ .Values.mon.logLevel | default .Values.global.logLevel | default "INFO" }} {{- with .Values.mon.config }} {{- . | toYaml | nindent 2 }} {{- end }} diff --git a/installers/helm/osm/templates/nbi/nbi-configmap.yaml b/installers/helm/osm/templates/nbi/nbi-configmap.yaml index e8dbcaa0..03b8c448 100644 --- a/installers/helm/osm/templates/nbi/nbi-configmap.yaml +++ b/installers/helm/osm/templates/nbi/nbi-configmap.yaml @@ -28,4 +28,5 @@ data: OSMNBI_STORAGE_PATH: "/app/storage" OSMNBI_STORAGE_COLLECTION: "files" OSMNBI_STORAGE_URI: "mongodb://mongodb-k8s:27017/?replicaSet=rs0" + OSMNBI_LOG_LEVEL: {{ .Values.nbi.logLevel | default .Values.global.logLevel | default "INFO" }} {{- end }} \ No newline at end of file diff --git a/installers/helm/osm/templates/pla/pla-configmap.yaml b/installers/helm/osm/templates/pla/pla-configmap.yaml index 9b97ca34..ee557b72 100644 --- a/installers/helm/osm/templates/pla/pla-configmap.yaml +++ b/installers/helm/osm/templates/pla/pla-configmap.yaml @@ -26,5 +26,6 @@ data: OSMPLA_DATABASE_URI: "mongodb://mongodb-k8s:27017/?replicaSet=rs0" OSMPLA_DATABASE_HOST: "mongo" OSMPLA_MESSAGE_HOST: "kafka" + OSMPLA_GLOBAL_LOG_LEVEL: {{ .Values.pla.logLevel | default .Values.global.logLevel | default "INFO" }} {{- end }} {{- end }} \ No newline at end of file diff --git a/installers/helm/osm/templates/pol/pol-configmap.yaml b/installers/helm/osm/templates/pol/pol-configmap.yaml index caa5b419..80dd8565 100644 --- a/installers/helm/osm/templates/pol/pol-configmap.yaml +++ b/installers/helm/osm/templates/pol/pol-configmap.yaml @@ -26,5 +26,6 @@ data: OSMPOL_DATABASE_URI: "mongodb://mongodb-k8s:27017/?replicaSet=rs0" OSMPOL_MESSAGE_HOST: "kafka" OSMPOL_MESSAGE_PORT: "9092" + OSMPOL_GLOBAL_LOG_LEVEL: {{ .Values.pol.logLevel | default .Values.global.logLevel | default "INFO" }} {{- end }} {{- end }} \ No newline at end of file diff --git a/installers/helm/osm/templates/ro/ro-configmap.yaml b/installers/helm/osm/templates/ro/ro-configmap.yaml index 39bb90ba..d8cce025 100644 --- a/installers/helm/osm/templates/ro/ro-configmap.yaml +++ b/installers/helm/osm/templates/ro/ro-configmap.yaml @@ -28,4 +28,5 @@ data: OSMRO_STORAGE_PATH: "/app/storage" OSMRO_STORAGE_COLLECTION: "files" OSMRO_STORAGE_URI: "mongodb://mongodb-k8s:27017/?replicaSet=rs0" + OSMRO_LOG_LEVEL: {{ .Values.ro.logLevel | default .Values.global.logLevel | default "INFO" }} {{- end }} \ No newline at end of file diff --git a/installers/helm/osm/values.yaml b/installers/helm/osm/values.yaml index 65c4406a..1ef77230 100644 --- a/installers/helm/osm/values.yaml +++ b/installers/helm/osm/values.yaml @@ -20,6 +20,7 @@ global: replicaCount: 1 + logLevel: INFO image: repositoryBase: docker.io/opensourcemano @@ -89,6 +90,7 @@ keystone: lcm: enabled: true + logLevel: DEBUG image: {} # repository: opensourcemano/lcm # tag: "13" @@ -104,6 +106,7 @@ lcm: mon: enabled: true + # logLevel: DEBUG service: port: 8662 image: {} @@ -126,6 +129,7 @@ mysql: nbi: enabled: true + logLevel: DEBUG service: type: NodePort port: 9999 @@ -151,6 +155,7 @@ ngui: # pla module is disabled by default unless global.oldServiceAssurance and pla.enabled are set to true pla: enabled: false + # logLevel: DEBUG image: {} # repository: opensourcemano/pla # tag: "13" @@ -159,6 +164,7 @@ pla: # pol module is disabled by default unless global.oldServiceAssurance and pol.enabled are set to true pol: enabled: true + # logLevel: DEBUG image: {} # repository: opensourcemano/pol # tag: "13" @@ -178,6 +184,7 @@ prometheus: ro: enabled: true + # logLevel: DEBUG service: port: 9090 image: {} diff --git a/installers/helm/values/airflow-values.yaml b/installers/helm/values/airflow-values.yaml index e9144189..2bcd44db 100644 --- a/installers/helm/values/airflow-values.yaml +++ b/installers/helm/values/airflow-values.yaml @@ -25,6 +25,8 @@ webserver: extraEnv: | - name: AIRFLOW__API__AUTH_BACKENDS value: 'airflow.api.auth.backend.basic_auth' + - name: AIRFLOW__LOGGING__LOGGING_LEVEL + value: 'INFO' - name: OSMMON_DATABASE_COMMONKEY valueFrom: secretKeyRef: -- 2.25.1