Merge branch 'loglevel' into 'master'

GONRG-10103: add global log level to services

See merge request !533

devops/gc/deploy/README.md

@@ -32,19 +32,20 @@ First you need to set variables in **values.yaml** file using any code editor. S
 | Name | Description | Type | Default |Required |
 |------|-------------|------|---------|---------|
 **global.domain** | your domain for the external endpoint, ex `example.com` | string | - | yes
-**global.onPremEnabled** | whether on-prem is enabled | boolean | false | yes
-**global.limitsEnabled** | whether CPU and memory limits are enabled | boolean | true | yes
+**global.onPremEnabled** | whether on-prem is enabled | boolean | `false` | yes
+**global.limitsEnabled** | whether CPU and memory limits are enabled | boolean | `true` | yes
+**global.logLevel** | severity of logging level | string | `ERROR` | yes
 
 ### Configmap variables
 
 | Name | Description | Type | Default |Required |
 |------|-------------|------|---------|---------|
-**data.logLevel** | logging level | string | INFO | yes
+**data.logLevel** | logging severity level for this service only  | string | - | yes, only if differs from the `global.logLevel`
 **data.entitlementsHost** | entitlements service host address | string | `http://entitlements` | yes
 **data.registerHost** | register service host address | string | `http://register` | yes
 **data.partitionHost** | partition service host address | string | `http://partition` | yes
 **data.redisNotificationHost** | The host for redis instance. If empty, helm installs an internal redis instance | string | `redis-notification` | yes
-**data.redisNotificationPort** | The port for redis instance | digit | 6379 | yes
+**data.redisNotificationPort** | The port for redis instance | digit | `6379` | yes
 
 ### Deployment variables
 
@@ -68,7 +69,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
 **conf.rabbitmqSecretName** | secret for rabbitmq | string | `rabbitmq-secret` | yes
 **conf.openidSecretName** | secret for openid | string | `notification-keycloak-secret` | yes
 **conf.notificationRedisSecretName** | Notification redis secret | string | `notification-redis-secret` | yes
-**conf.redisSSL** | Redis  host ssl config. External redis configuration only if true | string | false | no
+**conf.redisSSL** | Redis  host ssl config. External redis configuration only if true | string | `false` | no
 
 ### Istio variables
 

devops/gc/deploy/templates/configmap.yaml

@@ -6,7 +6,7 @@ metadata:
   name: {{ .Values.conf.configmap  | quote}}
   namespace: {{ .Release.Namespace  | quote}}
 data:
-  LOG_LEVEL: {{ .Values.data.logLevel  | quote}}
+  LOG_LEVEL: {{ .Values.data.logLevel | default .Values.global.logLevel | quote }}
   ENTITLEMENTS_HOST: {{ .Values.data.entitlementsHost  | quote}}
   REGISTER_HOST: {{ .Values.data.registerHost  | quote}}
   PARTITION_HOST: {{ .Values.data.partitionHost  | quote}}

devops/gc/deploy/values.yaml

@@ -2,10 +2,11 @@ global:
   domain: ""
   onPremEnabled: false
   limitsEnabled: true
+  logLevel: "ERROR"
 
 data:
   #Configmaps
-  logLevel: "ERROR"
+  logLevel: ""
   entitlementsHost: "http://entitlements"
   registerHost: "http://register"
   partitionHost: "http://partition"