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

feature/logs #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
3 changes: 3 additions & 0 deletions charts/moira/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions charts/moira/templates/api-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions charts/moira/templates/checker-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions charts/moira/templates/filter-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions charts/moira/templates/notifier-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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:
Expand Down
17 changes: 17 additions & 0 deletions charts/moira/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Binary file modified docs/moira-2.6.0.tgz
Binary file not shown.