Skip to content

Open-source status page, incident response and uptime monitoring

🗃️ add id and status in TB (#1249)

Thibault Le Ouayb302a29af2a5
diff --git a/apps/checker/go.mod b/apps/checker/go.mod
index 04cb0ec74..3ff61b142 100644
--- a/apps/checker/go.mod
+++ b/apps/checker/go.mod
@@ -5,6 +5,7 @@ go 1.24.0
require (
github.com/cenkalti/backoff/v4 v4.3.0
github.com/gin-gonic/gin v1.9.1
+ github.com/google/uuid v1.6.0
github.com/rs/zerolog v1.32.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/otel v1.34.0
@@ -27,7 +28,6 @@ require (
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.19.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
- github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
diff --git a/apps/checker/handlers/checker.go b/apps/checker/handlers/checker.go
index 61db5c239..5237f2033 100644
--- a/apps/checker/handlers/checker.go
+++ b/apps/checker/handlers/checker.go
@@ -8,6 +8,7 @@ import (
"github.com/cenkalti/backoff/v4"
"github.com/gin-gonic/gin"
+ "github.com/google/uuid"
"github.com/rs/zerolog/log"
"github.com/openstatushq/openstatus/apps/checker"
@@ -23,6 +24,7 @@ func (s statusCode) IsSuccessful() bool {
}
type PingData struct {
+ ID string `json:"id"`
WorkspaceID string `json:"workspaceId"`
MonitorID string `json:"monitorId"`
URL string `json:"url"`
@@ -33,6 +35,7 @@ type PingData struct {
Assertions string `json:"assertions"`
Body string `json:"body,omitempty"`
Trigger string `json:"trigger,omitempty"`
+ RequestStatus string `json:"requestStatus,omitempty"`
Latency int64 `json:"latency"`
CronTimestamp int64 `json:"cronTimestamp"`
Timestamp int64 `json:"timestamp"`
@@ -111,7 +114,26 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
return fmt.Errorf("error while parsing headers %s: %w", req.URL, err)
}
+ id, err := uuid.NewV7()
+ if err != nil {
+ return fmt.Errorf("error while generating uuid %w", err)
+ }
+
+ var requestStatus = ""
+ switch req.Status {
+ case "active":
+ requestStatus = "success"
+ break
+ case "error":
+ requestStatus = "error"
+ break
+ case "degraded":
+ requestStatus = "degraded"
+ break
+ }
+
data := PingData{
+ ID: id.String(),
Latency: res.Latency,
StatusCode: res.Status,
MonitorID: req.MonitorID,
@@ -124,6 +146,7 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
Headers: string(headersAsString),
Body: string(res.Body),
Trigger: trigger,
+ RequestStatus: requestStatus,
}
statusCode := statusCode(res.Status)
@@ -209,6 +232,7 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
CronTimestamp: req.CronTimestamp,
Latency: res.Latency,
})
+ data.RequestStatus = "error"
}
// it's degraded
if isSuccessfull && req.DegradedAfter > 0 && res.Latency > req.DegradedAfter && req.Status != "degraded" {
@@ -220,6 +244,7 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
CronTimestamp: req.CronTimestamp,
Latency: res.Latency,
})
+ data.RequestStatus = "degraded"
}
// it's active
if isSuccessfull && req.DegradedAfter == 0 && req.Status != "active" {
@@ -231,6 +256,7 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
CronTimestamp: req.CronTimestamp,
Latency: res.Latency,
})
+ data.RequestStatus = "success"
}
// it's active
if isSuccessfull && res.Latency < req.DegradedAfter && req.DegradedAfter != 0 && req.Status != "active" {
@@ -241,6 +267,7 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
StatusCode: res.Status,
CronTimestamp: req.CronTimestamp,
})
+ data.RequestStatus = "success"
}
if err := h.TbClient.SendEvent(ctx, data, dataSourceName); err != nil {
@@ -251,7 +278,14 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
}
if err := backoff.Retry(op, backoff.WithMaxRetries(backoff.NewExponentialBackOff(), 3)); err != nil {
- if err := h.TbClient.SendEvent(ctx, PingData{
+ id, e := uuid.NewV7()
+ if e != nil {
+ log.Ctx(ctx).Error().Err(e).Msg("failed to send event to tinybird")
+ return
+ }
+
+ data := PingData{
+ ID: id.String(),
URL: req.URL,
Region: h.Region,
Message: err.Error(),
@@ -263,7 +297,10 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
Assertions: assertionAsString,
Body: "",
Trigger: trigger,
- }, dataSourceName); err != nil {
+ RequestStatus: "error",
+ }
+
+ if err := h.TbClient.SendEvent(ctx, data, dataSourceName); err != nil {
log.Ctx(ctx).Error().Err(err).Msg("failed to send event to tinybird")
}
diff --git a/apps/checker/handlers/tcp.go b/apps/checker/handlers/tcp.go
index f2c2a1f55..5f6233ad2 100644
--- a/apps/checker/handlers/tcp.go
+++ b/apps/checker/handlers/tcp.go
@@ -9,6 +9,7 @@ import (
"github.com/cenkalti/backoff/v4"
"github.com/gin-gonic/gin"
+ "github.com/google/uuid"
"github.com/openstatushq/openstatus/apps/checker"
otelOS "github.com/openstatushq/openstatus/apps/checker/pkg/otel"
"github.com/openstatushq/openstatus/apps/checker/request"
@@ -17,11 +18,13 @@ import (
// Only used for Tinybird.
type TCPData struct {
- Timing string `json:"timing"`
- ErrorMessage string `json:"errorMessage"`
- Region string `json:"region"`
- Trigger string `json:"trigger"`
- URI string `json:"uri"`
+ ID string `json:"id"`
+ Timing string `json:"timing"`
+ ErrorMessage string `json:"errorMessage"`
+ Region string `json:"region"`
+ Trigger string `json:"trigger"`
+ URI string `json:"uri"`
+ RequestStatus string `json:"requestStatus,omitempty"`
RequestId int64 `json:"requestId,omitempty"`
WorkspaceID int64 `json:"workspaceId"`
@@ -102,7 +105,27 @@ func (h Handler) TCPHandler(c *gin.Context) {
latency := res.TCPDone - res.TCPStart
+ var requestStatus = ""
+ switch req.Status {
+ case "active":
+ requestStatus = "success"
+ break
+ case "error":
+ requestStatus = "error"
+ break
+ case "degraded":
+ requestStatus = "degraded"
+ break
+ }
+
+
+ id, err := uuid.NewV7()
+ if err != nil {
+ return fmt.Errorf("error while generating uuid %w", err)
+ }
+
data := TCPData{
+ ID: id.String(),
WorkspaceID: workspaceId,
Timestamp: res.TCPStart,
Error: 0,
@@ -114,6 +137,7 @@ func (h Handler) TCPHandler(c *gin.Context) {
CronTimestamp: req.CronTimestamp,
Trigger: trigger,
URI: req.URI,
+ RequestStatus: requestStatus,
}
response = checker.TCPResponse{
@@ -127,7 +151,7 @@ func (h Handler) TCPHandler(c *gin.Context) {
JobType: "tcp",
}
- if req.DegradedAfter == 0 && req.Status != "active" {
+ if req.DegradedAfter == 0 && req.Status != "active" {
checker.UpdateStatus(ctx, checker.UpdateData{
MonitorId: req.MonitorID,
Status: "active",
@@ -135,6 +159,7 @@ func (h Handler) TCPHandler(c *gin.Context) {
CronTimestamp: req.CronTimestamp,
Latency: latency,
})
+ data.RequestStatus = "success"
}
if (req.DegradedAfter > 0 && latency < req.DegradedAfter) && req.Status != "active" {
@@ -145,9 +170,11 @@ func (h Handler) TCPHandler(c *gin.Context) {
CronTimestamp: req.CronTimestamp,
Latency: latency,
})
+ data.RequestStatus = "success"
+
}
- if req.DegradedAfter > 0 && latency > req.DegradedAfter && req.Status != "degraded" {
+ if req.DegradedAfter > 0 && latency > req.DegradedAfter && req.Status != "degraded" {
checker.UpdateStatus(ctx, checker.UpdateData{
MonitorId: req.MonitorID,
Status: "degraded",
@@ -155,6 +182,8 @@ func (h Handler) TCPHandler(c *gin.Context) {
CronTimestamp: req.CronTimestamp,
Latency: latency,
})
+ data.RequestStatus = "degraded"
+
}
if err := h.TbClient.SendEvent(ctx, data, dataSourceName); err != nil {
@@ -165,7 +194,14 @@ func (h Handler) TCPHandler(c *gin.Context) {
}
if err := backoff.Retry(op, backoff.WithMaxRetries(backoff.NewExponentialBackOff(), 3)); err != nil {
- if err := h.TbClient.SendEvent(ctx, TCPData{
+
+ id, e := uuid.NewV7()
+ if e != nil {
+ log.Ctx(ctx).Error().Err(e).Msg("failed to send event to tinybird")
+ return
+ }
+ data := TCPData{
+ ID: id.String(),
WorkspaceID: workspaceId,
CronTimestamp: req.CronTimestamp,
ErrorMessage: err.Error(),
@@ -174,7 +210,9 @@ func (h Handler) TCPHandler(c *gin.Context) {
Error: 1,
Trigger: trigger,
URI: req.URI,
- }, dataSourceName); err != nil {
+ RequestStatus: "error",
+ }
+ if err := h.TbClient.SendEvent(ctx, data, dataSourceName); err != nil {
log.Ctx(ctx).Error().Err(err).Msg("failed to send event to tinybird")
}
checker.UpdateStatus(ctx, checker.UpdateData{