Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add metrics for size of ingested data #548

Merged
merged 2 commits into from
Oct 30, 2024
Merged

Add metrics for size of ingested data #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d71f021
Add metrics for size of ingested data
zhuoyuan-liu Oct 24, 2024
d92852d
Use node UUID istead of ID in database
zhuoyuan-liu Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions tls/handlers/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ const (
RequestPath = "path"
RequestMethod = "method"
StatusCode = "status_code"
Environment = "osctrl_env"
RequestType = "type"
)

var (
Expand All @@ -14,8 +16,14 @@ var (
Help: "The duration of requests",
Buckets: []float64{0.0005, 0.001, 0.005, 0.01, 0.025, 0.05, 0.1, 0.5, 1, 5},
}, []string{RequestMethod, RequestPath, StatusCode})
requestSize = prometheus.NewHistogramVec(prometheus.HistogramOpts{
Name: "osctrl_tls_request_size_bytes",
Help: "The size of requests",
Buckets: []float64{100, 1000, 10000, 100000, 1000000},
}, []string{Environment, RequestType})
)

func RegisterMetrics(reg prometheus.Registerer) {
reg.MustRegister(requestDuration)
reg.MustRegister(requestSize)
}
12 changes: 12 additions & 0 deletions tls/handlers/post.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ func (h *HandlersTLS) ConfigHandler(w http.ResponseWriter, r *http.Request) {
h.Inc(metricConfigErr)
log.Err(err).Msg("error with ingested config")
}
requestSize.WithLabelValues(string(env.UUID), "ConfigHandler").Observe(float64(len(body)))
log.Info().Msgf("node UUID: %s in %s environment ingested %d bytes for ConfigHandler endpoint", node.UUID, env.Name, len(body))
response = []byte(env.Configuration)
} else {
response = types.ConfigResponse{NodeInvalid: true}
Expand Down Expand Up @@ -250,6 +252,8 @@ func (h *HandlersTLS) LogHandler(w http.ResponseWriter, r *http.Request) {
h.Inc(metricLogErr)
log.Err(err).Msg("error with ingested log")
}
requestSize.WithLabelValues(string(env.UUID), "LogHandler").Observe(float64(len(body)))
log.Info().Msgf("node UUID: %s in %s environment ingested %d bytes for LogHandler endpoint", node.UUID, env.Name, len(body))
// Process logs and update metadata
go h.Logs.ProcessLogs(t.Data, t.LogType, env.Name, utils.GetIP(r), len(body), (*h.EnvsMap)[env.Name].DebugHTTP)
} else {
Expand Down Expand Up @@ -310,6 +314,8 @@ func (h *HandlersTLS) QueryReadHandler(w http.ResponseWriter, r *http.Request) {
h.Inc(metricReadErr)
log.Err(err).Msg("error with ingested query-read")
}
requestSize.WithLabelValues(string(env.UUID), "QueryRead").Observe(float64(len(body)))
log.Info().Msgf("node UUID: %s in %s environment ingested %d bytes for QueryReadHandler endpoint", node.UUID, env.Name, len(body))
ip := utils.GetIP(r)
if err := h.Nodes.RecordIPAddress(ip, node); err != nil {
h.Inc(metricReadErr)
Expand Down Expand Up @@ -391,6 +397,8 @@ func (h *HandlersTLS) QueryWriteHandler(w http.ResponseWriter, r *http.Request)
h.Inc(metricWriteErr)
log.Err(err).Msg("error with ingested query-write")
}
requestSize.WithLabelValues(string(env.UUID), "QueryWrite").Observe(float64(len(body)))
log.Info().Msgf("node UUID: %s in %s environment ingested %d bytes for QueryWriteHandler endpoint", node.UUID, env.Name, len(body))
ip := utils.GetIP(r)
if err := h.Nodes.RecordIPAddress(ip, node); err != nil {
h.Inc(metricWriteErr)
Expand Down Expand Up @@ -630,6 +638,8 @@ func (h *HandlersTLS) CarveInitHandler(w http.ResponseWriter, r *http.Request) {
h.Inc(metricInitErr)
log.Err(err).Msg("error with ingested carve-init")
}
requestSize.WithLabelValues(string(env.UUID), "CarveInit").Observe(float64(len(body)))
log.Info().Msgf("node UUID: %s in %s environment ingested %d bytes for CarveInitHandler endpoint", node.UUID, env.Name, len(body))
ip := utils.GetIP(r)
if err := h.Nodes.RecordIPAddress(ip, node); err != nil {
h.Inc(metricInitErr)
Expand Down Expand Up @@ -703,6 +713,8 @@ func (h *HandlersTLS) CarveBlockHandler(w http.ResponseWriter, r *http.Request)
h.Inc(metricInitErr)
log.Err(err).Msg("error with ingested carve-block")
}
requestSize.WithLabelValues(string(env.UUID), "CarveBlock").Observe(float64(len(body)))
log.Info().Msgf("node %d in %s environment ingested %d bytes for CarveBlockHandler endpoint", carve.NodeID, env.Name, len(body))
blockCarve = true
// Process received block
go h.ProcessCarveBlock(t, env.Name, carve.UUID, env.ID)
Expand Down
Loading