diff --git a/charts/moira/README.md b/charts/moira/README.md index 1b88604..10e3f73 100644 --- a/charts/moira/README.md +++ b/charts/moira/README.md @@ -114,6 +114,7 @@ Parameter | Description | Default value `microservices.checker.stopCheckingInterval` | Period for every trigger to cancel forced check if no metrics were received | `30s` `microservices.checker.maxParallelChecks` | Max parallel checks number for local triggers | `0` `microservices.checker.maxParallelRemoteChecks` | Max parallel checks number for remote triggers | `0` +`microservices.checker.setLogLevel` | Adjusting minimal log level with concrete fields | `{}` ### Moira Notifier Parameter | Description | Default value @@ -132,6 +133,7 @@ Parameter | Description | Default value `microservices.notifier.moiraSelfState.lastRemoteCheckDelay` | Max Checker checks perform delay for remote triggers | `300s` `microservices.notifier.moiraSelfState.noticeInterval` | Self state monitor alerting interval | `300s` `microservices.notifier.moiraSelfState.contacts` | Moira administrator contacts | `{}` +`microservices.notifier.setLogLevel` | Adjusting minimal log level with concrete fields | `{}` ### Moira API Parameter | Description | Default value @@ -189,6 +191,7 @@ Parameter | Description | Default value --------- | ----------- | ------------- `telemetry.logger.logLevel` | Log level | `info` `telemetry.logger.logFile` | Log file path | `stdout` +`telemetry.logger.logPrettyFormat` | Enable human-readable console output | `false` ### Profiling server Parameter | Description | Default value diff --git a/charts/moira/templates/api-configmap.yaml b/charts/moira/templates/api-configmap.yaml index 889463f..c671f28 100644 --- a/charts/moira/templates/api-configmap.yaml +++ b/charts/moira/templates/api-configmap.yaml @@ -40,6 +40,7 @@ data: logger: log_level: {{ .Values.telemetry.logger.logLevel }} log_file: {{ .Values.telemetry.logger.logFile }} + log_pretty_format: {{ .Values.telemetry.logger.logPrettyFormat }} telemetry: listen: {{ .Values.telemetry.listen }} graphite: diff --git a/charts/moira/templates/checker-configmap.yaml b/charts/moira/templates/checker-configmap.yaml index 7202245..f9e9ae8 100644 --- a/charts/moira/templates/checker-configmap.yaml +++ b/charts/moira/templates/checker-configmap.yaml @@ -15,6 +15,14 @@ data: max_parallel_remote_checks: {{ .Values.microservices.checker.maxParallelRemoteChecks }} nodata_check_interval: {{ .Values.microservices.checker.nodataCheckInterval }} stop_checking_interval: {{ .Values.microservices.checker.stopCheckingInterval }} + set_log_level: + {{- range $key, $value := .Values.microservices.checker.setLogLevel }} + - {{ $key }}: + {{- range $elem, $elemVal := $value }} + - id: {{ $elemVal.id | quote }} + level: {{ $elemVal.level | quote }} + {{- end }} + {{- end }} redis: master_name: {{ .Values.datasources.redis.masterName }} sentinel_addrs: {{ .Values.datasources.redis.sentinelAddrs }} @@ -35,6 +43,7 @@ data: logger: log_level: {{ .Values.telemetry.logger.logLevel }} log_file: {{ .Values.telemetry.logger.logFile }} + log_pretty_format: {{ .Values.telemetry.logger.logPrettyFormat }} telemetry: listen: {{ .Values.telemetry.listen }} graphite: diff --git a/charts/moira/templates/filter-configmap.yaml b/charts/moira/templates/filter-configmap.yaml index 5e8be55..a0bc00f 100644 --- a/charts/moira/templates/filter-configmap.yaml +++ b/charts/moira/templates/filter-configmap.yaml @@ -25,6 +25,7 @@ data: logger: log_level: {{ .Values.telemetry.logger.logLevel }} log_file: {{ .Values.telemetry.logger.logFile }} + log_pretty_format: {{ .Values.telemetry.logger.logPrettyFormat }} telemetry: listen: {{ .Values.telemetry.listen }} graphite: diff --git a/charts/moira/templates/notifier-configmap.yaml b/charts/moira/templates/notifier-configmap.yaml index ba6bdb5..689e363 100644 --- a/charts/moira/templates/notifier-configmap.yaml +++ b/charts/moira/templates/notifier-configmap.yaml @@ -36,6 +36,14 @@ data: {{ $elem }}: {{ $elemVal | quote }} {{- end }} {{- end }} + set_log_level: + {{- range $key, $value := .Values.microservices.notifier.setLogLevel }} + - {{ $key }}: + {{- range $elem, $elemVal := $value }} + - id: {{ $elemVal.id | quote }} + level: {{ $elemVal.level | quote }} + {{- end }} + {{- end }} redis: master_name: {{ .Values.datasources.redis.masterName }} sentinel_addrs: {{ .Values.datasources.redis.sentinelAddrs }} @@ -56,6 +64,7 @@ data: logger: log_level: {{ .Values.telemetry.logger.logLevel }} log_file: {{ .Values.telemetry.logger.logFile }} + log_pretty_format: {{ .Values.telemetry.logger.logPrettyFormat }} telemetry: listen: {{ .Values.telemetry.listen }} graphite: diff --git a/charts/moira/values.yaml b/charts/moira/values.yaml index a4f963c..09dfae6 100644 --- a/charts/moira/values.yaml +++ b/charts/moira/values.yaml @@ -72,6 +72,12 @@ microservices: # Is related with remote triggers (see remote section) # Equals to the number of processor cores found on Moira host by default or when variable is defined as 0 maxParallelRemoteChecks: 0 + # Adjusting minimal log level with concrete fields + # setLogLevel: + # triggers: + # - id: "111" + # level: "debug" + setLogLevel: {} notifier: # Soft timeout to start retrying to send notification after single failed attempt senderTimeout: "10s" @@ -121,6 +127,15 @@ microservices: # type: telegram # value: Moira Selfstate contacts: {} + # Adjusting minimal log level with concrete fields + # setLogLevel: + # triggers: + # - id: "111" + # level: "debug" + # subscriptions: + # - id: "999" + # level: "warn" + setLogLevel: {} api: # API local network address. Default is ':8081' so api will be available at http://moira.company.com:8081/api listen: ":8081" @@ -210,6 +225,8 @@ telemetry: logLevel: "info" # Log file path logFile: "stdout" + # Enable human-readable console output + logPrettyFormat: false # Profiling server pprof: # If true, profiling server will be enabled diff --git a/docs/index.yaml b/docs/index.yaml index 78d6376..bf08b93 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -2,9 +2,9 @@ apiVersion: v1 entries: moira: - apiVersion: v1 - created: "2020-05-23T20:30:44.0950045+05:00" + created: "2021-02-25T12:57:16.092297188+04:00" description: Moira is a real-time alerting tool, based on Graphite data. - digest: 83fdd19ff2262b593614139a58604823365cac840748deda53d8a6bf16bc0c66 + digest: ab776baf9ac89ad70a00b552fb2f0a8e872dd0999404e1388b2ad86426d3962b home: https://moira.readthedocs.io icon: https://avatars1.githubusercontent.com/u/15890491 keywords: @@ -25,4 +25,4 @@ entries: urls: - https://moira-alert.github.io/helmcharts/moira-2.6.0.tgz version: 2.6.0 -generated: "2020-05-23T20:30:44.0919692+05:00" +generated: "2021-02-25T12:57:16.089383919+04:00" diff --git a/docs/moira-2.6.0.tgz b/docs/moira-2.6.0.tgz index 6fe33f4..c7a3c76 100644 Binary files a/docs/moira-2.6.0.tgz and b/docs/moira-2.6.0.tgz differ