forked from TrueCloudLab/frostfs-s3-gw
[#199] Add metrics for HTTP endpoint status
Signed-off-by: Marina Biryukova <m.biryukova@yadro.com>
This commit is contained in:
parent
c66c09765d
commit
69227b4845
5 changed files with 79 additions and 10 deletions
|
@ -455,6 +455,7 @@ func (a *App) Serve(ctx context.Context) {
|
||||||
a.log.Info(logs.StartingServer, zap.String("address", a.servers[i].Address()))
|
a.log.Info(logs.StartingServer, zap.String("address", a.servers[i].Address()))
|
||||||
|
|
||||||
if err := srv.Serve(a.servers[i].Listener()); err != nil && err != http.ErrServerClosed {
|
if err := srv.Serve(a.servers[i].Listener()); err != nil && err != http.ErrServerClosed {
|
||||||
|
a.metrics.MarkUnhealthy(a.servers[i].Address())
|
||||||
a.log.Fatal(logs.ListenAndServe, zap.Error(err))
|
a.log.Fatal(logs.ListenAndServe, zap.Error(err))
|
||||||
}
|
}
|
||||||
}(i)
|
}(i)
|
||||||
|
@ -560,9 +561,11 @@ func (a *App) initServers(ctx context.Context) {
|
||||||
}
|
}
|
||||||
srv, err := newServer(ctx, serverInfo)
|
srv, err := newServer(ctx, serverInfo)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
a.metrics.MarkUnhealthy(serverInfo.Address)
|
||||||
a.log.Warn(logs.FailedToAddServer, append(fields, zap.Error(err))...)
|
a.log.Warn(logs.FailedToAddServer, append(fields, zap.Error(err))...)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
a.metrics.MarkHealthy(serverInfo.Address)
|
||||||
|
|
||||||
a.servers = append(a.servers, srv)
|
a.servers = append(a.servers, srv)
|
||||||
a.log.Info(logs.AddServer, fields...)
|
a.log.Info(logs.AddServer, fields...)
|
||||||
|
|
|
@ -84,3 +84,19 @@ func (m *AppMetrics) Statistic() *APIStatMetrics {
|
||||||
func (m *AppMetrics) Gather() ([]*dto.MetricFamily, error) {
|
func (m *AppMetrics) Gather() ([]*dto.MetricFamily, error) {
|
||||||
return m.gate.Gather()
|
return m.gate.Gather()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *AppMetrics) MarkHealthy(endpoint string) {
|
||||||
|
if !m.isEnabled() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
m.gate.HTTPServer.MarkHealthy(endpoint)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *AppMetrics) MarkUnhealthy(endpoint string) {
|
||||||
|
if !m.isEnabled() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
m.gate.HTTPServer.MarkUnhealthy(endpoint)
|
||||||
|
}
|
||||||
|
|
|
@ -134,6 +134,16 @@ var appMetricsDesc = map[string]map[string]Description{
|
||||||
VariableLabels: []string{"direction"},
|
VariableLabels: []string{"direction"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
serverSubsystem: {
|
||||||
|
httpHealthMetric: Description{
|
||||||
|
Type: dto.MetricType_GAUGE,
|
||||||
|
Namespace: namespace,
|
||||||
|
Subsystem: serverSubsystem,
|
||||||
|
Name: httpHealthMetric,
|
||||||
|
Help: "HTTP Server endpoint health",
|
||||||
|
VariableLabels: []string{"endpoint"},
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
type Description struct {
|
type Description struct {
|
||||||
|
|
|
@ -16,11 +16,12 @@ type StatisticScraper interface {
|
||||||
}
|
}
|
||||||
|
|
||||||
type GateMetrics struct {
|
type GateMetrics struct {
|
||||||
registry prometheus.Registerer
|
registry prometheus.Registerer
|
||||||
State *StateMetrics
|
State *StateMetrics
|
||||||
Pool *poolMetricsCollector
|
Pool *poolMetricsCollector
|
||||||
Billing *billingMetrics
|
Billing *billingMetrics
|
||||||
Stats *APIStatMetrics
|
Stats *APIStatMetrics
|
||||||
|
HTTPServer *httpServerMetrics
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewGateMetrics(scraper StatisticScraper) *GateMetrics {
|
func NewGateMetrics(scraper StatisticScraper) *GateMetrics {
|
||||||
|
@ -38,12 +39,16 @@ func NewGateMetrics(scraper StatisticScraper) *GateMetrics {
|
||||||
statsMetric := newAPIStatMetrics()
|
statsMetric := newAPIStatMetrics()
|
||||||
registry.MustRegister(statsMetric)
|
registry.MustRegister(statsMetric)
|
||||||
|
|
||||||
|
serverMetric := newHTTPServerMetrics()
|
||||||
|
registry.MustRegister(serverMetric)
|
||||||
|
|
||||||
return &GateMetrics{
|
return &GateMetrics{
|
||||||
registry: registry,
|
registry: registry,
|
||||||
State: stateMetric,
|
State: stateMetric,
|
||||||
Pool: poolMetric,
|
Pool: poolMetric,
|
||||||
Billing: billingMetric,
|
Billing: billingMetric,
|
||||||
Stats: statsMetric,
|
Stats: statsMetric,
|
||||||
|
HTTPServer: serverMetric,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,6 +57,7 @@ func (g *GateMetrics) Unregister() {
|
||||||
g.registry.Unregister(g.Pool)
|
g.registry.Unregister(g.Pool)
|
||||||
g.Billing.Unregister()
|
g.Billing.Unregister()
|
||||||
g.registry.Unregister(g.Stats)
|
g.registry.Unregister(g.Stats)
|
||||||
|
g.registry.Unregister(g.HTTPServer)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *GateMetrics) Handler() http.Handler {
|
func (g *GateMetrics) Handler() http.Handler {
|
||||||
|
|
34
metrics/http.go
Normal file
34
metrics/http.go
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
package metrics
|
||||||
|
|
||||||
|
import "github.com/prometheus/client_golang/prometheus"
|
||||||
|
|
||||||
|
const (
|
||||||
|
serverSubsystem = "server"
|
||||||
|
httpHealthMetric = "health"
|
||||||
|
)
|
||||||
|
|
||||||
|
type httpServerMetrics struct {
|
||||||
|
endpointHealth *prometheus.GaugeVec
|
||||||
|
}
|
||||||
|
|
||||||
|
func newHTTPServerMetrics() *httpServerMetrics {
|
||||||
|
return &httpServerMetrics{
|
||||||
|
endpointHealth: mustNewGaugeVec(appMetricsDesc[serverSubsystem][httpHealthMetric]),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *httpServerMetrics) Collect(ch chan<- prometheus.Metric) {
|
||||||
|
m.endpointHealth.Collect(ch)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *httpServerMetrics) Describe(desc chan<- *prometheus.Desc) {
|
||||||
|
m.endpointHealth.Describe(desc)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *httpServerMetrics) MarkHealthy(endpoint string) {
|
||||||
|
m.endpointHealth.WithLabelValues(endpoint).Set(float64(1))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *httpServerMetrics) MarkUnhealthy(endpoint string) {
|
||||||
|
m.endpointHealth.WithLabelValues(endpoint).Set(float64(0))
|
||||||
|
}
|
Loading…
Reference in a new issue