extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-08-19 04:06:18 +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

4
controller/environmentDetail.go
View File

@@ -41,11 +41,13 @@ func (h *environmentDetailHandler) Handle(params metadata.GetEnvironmentDetailPa
return metadata.NewGetEnvironmentDetailInternalServerError()
}
var sparkData map[string][]int64
if cfg.Influx != nil {
if cfg.Metrics != nil && cfg.Metrics.Influx != nil {
sparkData, err = sparkDataForShares(shrs)
if err != nil {
logrus.Errorf("error querying spark data for shares for user '%v': %v", principal.Email, err)
}
} else {
logrus.Debug("skipping spark data for shares; no influx configuration")
}
for _, shr := range shrs {
feEndpoint := ""