extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-08-09 00:04:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

consolidated configuration; 'zrok metrics' and 'zrok ctrl' share config (#269)

Browse Source
This commit is contained in:
Michael Quigley
2023-03-13 14:19:38 -04:00
parent ee01b0dc00
commit d54fefb0fe
22 changed files with 88 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controller/controller.go
View File

@ -2,6 +2,8 @@ package controller
import (
"context"
"github.com/openziti/zrok/controller/config"
"github.com/sirupsen/logrus"
"github.com/go-openapi/loads"
influxdb2 "github.com/influxdata/influxdb-client-go/v2"
@ -13,11 +15,11 @@ import (
"github.com/pkg/errors"
)
var cfg *Config
var cfg *config.Config
var str *store.Store
var idb influxdb2.Client
func Run(inCfg *Config) error {
func Run(inCfg *config.Config) error {
cfg = inCfg
swaggerSpec, err := loads.Embedded(rest_server_zrok.SwaggerJSON, rest_server_zrok.FlatSwaggerJSON)
@ -62,8 +64,10 @@ func Run(inCfg *Config) error {
return errors.Wrap(err, "error opening store")
}
if cfg.Influx != nil {
idb = influxdb2.NewClient(cfg.Influx.Url, cfg.Influx.Token)
if cfg.Metrics != nil && cfg.Metrics.Influx != nil {
idb = influxdb2.NewClient(cfg.Metrics.Influx.Url, cfg.Metrics.Influx.Token)
} else {
logrus.Warn("skipping influx client; no configuration")
}
ctx, cancel := context.WithCancel(context.Background())