From b82f646636ffedc0de464d2b507d7e22ce9825fe Mon Sep 17 00:00:00 2001 From: kongfei Date: Wed, 31 Aug 2022 15:37:34 +0800 Subject: [PATCH] update configurarion in docker --- docker/n9eetc/server.conf | 33 +++++++++++++----------- docker/n9eetc/webapi.conf | 53 +++++++++++++++++++++++++++++++-------- 2 files changed, 62 insertions(+), 24 deletions(-) diff --git a/docker/n9eetc/server.conf b/docker/n9eetc/server.conf index 55338c4e..4f8c680f 100644 --- a/docker/n9eetc/server.conf +++ b/docker/n9eetc/server.conf @@ -11,6 +11,11 @@ BusiGroupLabelKey = "busigroup" # sleep x seconds, then start judge engine EngineDelay = 120 +DisableUsageReport = false + +# config | database +ReaderFrom = "config" + [Log] # log write dir Dir = "logs" @@ -71,7 +76,7 @@ Batch = 5 TemplatesDir = "./etc/template" NotifyConcurrency = 10 # use builtin go code notify -NotifyBuiltinChannels = ["email", "dingtalk", "wecom", "feishu"] +NotifyBuiltinChannels = ["email", "dingtalk", "wecom", "feishu", "mm"] [Alerting.CallScript] # built in sending capability in go code @@ -83,7 +88,8 @@ ScriptPath = "./etc/script/notify.py" Enable = false # use a plugin via `go build -buildmode=plugin -o notify.so` PluginPath = "./etc/script/notify.so" -Caller = "n9eCaller" +# The first letter must be capitalized to be exported +Caller = "N9eCaller" [Alerting.RedisPub] Enable = false @@ -136,7 +142,7 @@ MaxIdleConns = 50 # table prefix TablePrefix = "" # enable auto migrate or not -EnableAutoMigrate = false +# EnableAutoMigrate = false [Reader] # prometheus base url @@ -147,15 +153,8 @@ BasicAuthUser = "" BasicAuthPass = "" # timeout settings, unit: ms Timeout = 30000 -DialTimeout = 10000 -TLSHandshakeTimeout = 30000 -ExpectContinueTimeout = 1000 -IdleConnTimeout = 90000 -# time duration, unit: ms -KeepAlive = 30000 -MaxConnsPerHost = 0 -MaxIdleConns = 100 -MaxIdleConnsPerHost = 10 +DialTimeout = 3000 +MaxIdleConnsPerHost = 100 [WriterOpt] # queue channel count @@ -172,8 +171,8 @@ BasicAuthUser = "" # Basic auth password BasicAuthPass = "" # timeout settings, unit: ms -Timeout = 30000 -DialTimeout = 10000 +Timeout = 10000 +DialTimeout = 3000 TLSHandshakeTimeout = 30000 ExpectContinueTimeout = 1000 IdleConnTimeout = 90000 @@ -182,6 +181,12 @@ KeepAlive = 30000 MaxConnsPerHost = 0 MaxIdleConns = 100 MaxIdleConnsPerHost = 100 +# [[Writers.WriteRelabels]] +# Action = "replace" +# SourceLabels = ["__address__"] +# Regex = "([^:]+)(?::\\d+)?" +# Replacement = "$1:80" +# TargetLabel = "__address__" # [[Writers]] # Url = "http://m3db:7201/api/v1/prom/remote/write" diff --git a/docker/n9eetc/webapi.conf b/docker/n9eetc/webapi.conf index ff1b920c..1a1178d4 100644 --- a/docker/n9eetc/webapi.conf +++ b/docker/n9eetc/webapi.conf @@ -4,12 +4,21 @@ RunMode = "release" # # custom i18n dict config # I18N = "./etc/i18n.json" +# # custom i18n request header key +# I18NHeaderKey = "X-Language" + # metrics descriptions MetricsYamlFile = "./etc/metrics.yaml" BuiltinAlertsDir = "./etc/alerts" BuiltinDashboardsDir = "./etc/dashboards" +# config | api +ClustersFrom = "config" + +# using when ClustersFrom = "api" +ClustersFromAPIs = [] + [[NotifyChannels]] Label = "邮箱" # do not change Key @@ -30,6 +39,11 @@ Label = "飞书机器人" # do not change Key Key = "feishu" +[[NotifyChannels]] +Label = "mm bot" +# do not change Key +Key = "mm" + [[ContactKeys]] Label = "Wecom Robot Token" # do not change Key @@ -45,6 +59,11 @@ Label = "Feishu Robot Token" # do not change Key Key = "feishu_robot_token" +[[ContactKeys]] +Label = "MatterMost Webhook URL" +# do not change Key +Key = "mm_webhook_url" + [Log] # log write dir Dir = "logs" @@ -92,6 +111,13 @@ AccessExpired = 1500 RefreshExpired = 10080 RedisKeyPrefix = "/jwt/" +[ProxyAuth] +# if proxy auth enabled, jwt auth is disabled +Enable = false +# username key in http proxy header +HeaderUserNameKey = "X-User-Name" +DefaultRoles = ["Standard"] + [BasicAuth] user001 = "ccc26da7b9aba533cbb263a36c07dcc5" @@ -121,6 +147,20 @@ Nickname = "cn" Phone = "mobile" Email = "mail" +[OIDC] +Enable = false +RedirectURL = "http://n9e.com/callback" +SsoAddr = "http://sso.example.org" +ClientId = "" +ClientSecret = "" +CoverAttributes = true +DefaultRoles = ["Standard"] + +[OIDC.Attributes] +Nickname = "nickname" +Phone = "phone_number" +Email = "email" + [Redis] # address, ip:port Address = "redis:6379" @@ -145,7 +185,7 @@ MaxIdleConns = 50 # table prefix TablePrefix = "" # enable auto migrate or not -EnableAutoMigrate = false +# EnableAutoMigrate = false [[Clusters]] # Prometheus cluster name @@ -158,14 +198,7 @@ BasicAuthUser = "" BasicAuthPass = "" # timeout settings, unit: ms Timeout = 30000 -DialTimeout = 10000 -TLSHandshakeTimeout = 30000 -ExpectContinueTimeout = 1000 -IdleConnTimeout = 90000 -# time duration, unit: ms -KeepAlive = 30000 -MaxConnsPerHost = 0 -MaxIdleConns = 100 +DialTimeout = 3000 MaxIdleConnsPerHost = 100 [Ibex] @@ -180,4 +213,4 @@ Timeout = 3000 TargetUp = '''max(max_over_time(target_up{ident=~"(%s)"}[%dm])) by (ident)''' LoadPerCore = '''max(max_over_time(system_load_norm_1{ident=~"(%s)"}[%dm])) by (ident)''' MemUtil = '''100-max(max_over_time(mem_available_percent{ident=~"(%s)"}[%dm])) by (ident)''' -DiskUtil = '''max(max_over_time(disk_used_percent{ident=~"(%s)", path="/"}[%dm])) by (ident)''' \ No newline at end of file +DiskUtil = '''max(max_over_time(disk_used_percent{ident=~"(%s)", path="/"}[%dm])) by (ident)'''