From 78d3828ca992b88ee20d78c9ffa6a7eb29bcc34b Mon Sep 17 00:00:00 2001 From: Michael Insel Date: Mon, 10 Aug 2020 17:54:27 +0200 Subject: [PATCH] Doc: Add Redis password configuration settings This adds the Redis password authentication to the documentation. --- doc/03-Configuration.md | 1 + icingadb.ini | 1 + main.go | 13 +++++++------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/03-Configuration.md b/doc/03-Configuration.md index cc0f0d63..ab995ce6 100644 --- a/doc/03-Configuration.md +++ b/doc/03-Configuration.md @@ -14,6 +14,7 @@ Option | Description -------------------------|----------------------------------------------- host | **Optional.** Redis host. Defaults to `127.0.0.1`. port | **Optional.** Redis port. Defaults to `6380`. +password | **Optional.** Redis password. Not set by default. pool\_size | **Optional.** Maximum number of socket connections. Defaults to `64`. ### MySQL Configuration diff --git a/icingadb.ini b/icingadb.ini index ec81038a..4d2a65df 100644 --- a/icingadb.ini +++ b/icingadb.ini @@ -1,6 +1,7 @@ [redis] host="127.0.0.1" ;port=6380 +;password="icingadb" [mysql] host="127.0.0.1" diff --git a/main.go b/main.go index 40aea7e5..523dc879 100644 --- a/main.go +++ b/main.go @@ -5,6 +5,12 @@ package main import ( "flag" "fmt" + "os" + "os/signal" + "regexp" + "sync" + "syscall" + "github.com/Icinga/icingadb/config" "github.com/Icinga/icingadb/configobject" "github.com/Icinga/icingadb/configobject/configsync" @@ -64,11 +70,6 @@ import ( "github.com/Icinga/icingadb/prometheus" "github.com/Icinga/icingadb/supervisor" log "github.com/sirupsen/logrus" - "os" - "os/signal" - "regexp" - "sync" - "syscall" ) var gitVersion = regexp.MustCompile(`\A(.+)-\d+-g([A-Fa-f0-9]+)\z`) @@ -104,7 +105,7 @@ func main() { mysqlInfo := config.GetMysqlInfo() metricsInfo := config.GetMetricsInfo() - redisConn := connection.NewRDBWrapper(redisInfo.Host+":"+redisInfo.Port, redisInfo.Password,redisInfo.PoolSize) + redisConn := connection.NewRDBWrapper(redisInfo.Host+":"+redisInfo.Port, redisInfo.Password, redisInfo.PoolSize) mysqlConn, err := connection.NewDBWrapper( mysqlInfo.User+":"+mysqlInfo.Password+"@tcp("+mysqlInfo.Host+":"+mysqlInfo.Port+")/"+mysqlInfo.Database,