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

prevent sparklines handler crashing when no configured metrics subsystem (#905)

Browse Source
This commit is contained in:
Michael Quigley 2025-03-03 18:20:20 -05:00
parent 9c7cb65213
commit 6361a3ced3
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 80 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/controller.go
View File

@ -70,7 +70,7 @@ func Run(inCfg *config.Config) error {
api.MetadataConfigurationHandler = newConfigurationHandler(cfg) api.MetadataConfigurationHandler = newConfigurationHandler(cfg)
api.MetadataClientVersionCheckHandler = metadata.ClientVersionCheckHandlerFunc(clientVersionCheckHandler) api.MetadataClientVersionCheckHandler = metadata.ClientVersionCheckHandlerFunc(clientVersionCheckHandler)
api.MetadataGetAccountDetailHandler = newAccountDetailHandler() api.MetadataGetAccountDetailHandler = newAccountDetailHandler()
api.MetadataGetSparklinesHandler = newSparklinesHandler() api.MetadataGetSparklinesHandler = newSparklinesHandler(cfg)
if cfg.Metrics != nil && cfg.Metrics.Influx != nil { if cfg.Metrics != nil && cfg.Metrics.Influx != nil {
api.MetadataGetAccountMetricsHandler = newGetAccountMetricsHandler(cfg.Metrics.Influx) api.MetadataGetAccountMetricsHandler = newGetAccountMetricsHandler(cfg.Metrics.Influx)
api.MetadataGetEnvironmentMetricsHandler = newGetEnvironmentMetricsHandler(cfg.Metrics.Influx) api.MetadataGetEnvironmentMetricsHandler = newGetEnvironmentMetricsHandler(cfg.Metrics.Influx)

12
controller/sparklines.go
View File

@ -2,6 +2,7 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti/zrok/controller/config"
"github.com/openziti/zrok/controller/store" "github.com/openziti/zrok/controller/store"
"github.com/openziti/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti/zrok/rest_server_zrok/operations/metadata" "github.com/openziti/zrok/rest_server_zrok/operations/metadata"
@ -10,13 +11,17 @@ import (
) )
type sparklinesHandler struct { type sparklinesHandler struct {
cfg *config.Config
} }
func newSparklinesHandler() *sparklinesHandler { func newSparklinesHandler(cfg *config.Config) *sparklinesHandler {
return &sparklinesHandler{} return &sparklinesHandler{cfg: cfg}
} }
func (h *sparklinesHandler) Handle(params metadata.GetSparklinesParams, principal *rest_model_zrok.Principal) middleware.Responder { func (h *sparklinesHandler) Handle(params metadata.GetSparklinesParams, principal *rest_model_zrok.Principal) middleware.Responder {
out := &metadata.GetSparklinesOKBody{}
if h.cfg.Metrics != nil && h.cfg.Metrics.Influx != nil {
trx, err := str.Begin() trx, err := str.Begin()
if err != nil { if err != nil {
logrus.Errorf("error beginning transaction: %v", err) logrus.Errorf("error beginning transaction: %v", err)
@ -24,8 +29,6 @@ func (h *sparklinesHandler) Handle(params metadata.GetSparklinesParams, principa
} }
defer func() { _ = trx.Rollback() }() defer func() { _ = trx.Rollback() }()
out := &metadata.GetSparklinesOKBody{}
if len(params.Body.Environments) > 0 { if len(params.Body.Environments) > 0 {
if envs, err := str.FindEnvironmentsForAccount(int(principal.ID), trx); err == nil { if envs, err := str.FindEnvironmentsForAccount(int(principal.ID), trx); err == nil {
var selectedEnvs []*store.Environment var selectedEnvs []*store.Environment
@ -102,6 +105,7 @@ func (h *sparklinesHandler) Handle(params metadata.GetSparklinesParams, principa
return metadata.NewGetSparklinesInternalServerError() return metadata.NewGetSparklinesInternalServerError()
} }
} }
}
return metadata.NewGetSparklinesOK().WithPayload(out) return metadata.NewGetSparklinesOK().WithPayload(out)
} }