mirror of
https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz
synced 2025-08-12 19:49:06 +08:00
chore: remove rules dependency in CH reader (#5396)
This commit is contained in:
parent
932b7ddc69
commit
3ee51770fd
@ -53,7 +53,6 @@ import (
|
|||||||
"go.signoz.io/signoz/pkg/query-service/interfaces"
|
"go.signoz.io/signoz/pkg/query-service/interfaces"
|
||||||
"go.signoz.io/signoz/pkg/query-service/model"
|
"go.signoz.io/signoz/pkg/query-service/model"
|
||||||
v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
|
v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
|
||||||
"go.signoz.io/signoz/pkg/query-service/rules"
|
|
||||||
"go.signoz.io/signoz/pkg/query-service/telemetry"
|
"go.signoz.io/signoz/pkg/query-service/telemetry"
|
||||||
"go.signoz.io/signoz/pkg/query-service/utils"
|
"go.signoz.io/signoz/pkg/query-service/utils"
|
||||||
)
|
)
|
||||||
@ -3420,36 +3419,6 @@ func countPanelsInDashboard(data map[string]interface{}) model.DashboardsInfo {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *ClickHouseReader) GetAlertsInfo(ctx context.Context) (*model.AlertsInfo, error) {
|
|
||||||
alertsInfo := model.AlertsInfo{}
|
|
||||||
// fetch alerts from rules db
|
|
||||||
query := "SELECT data FROM rules"
|
|
||||||
var alertsData []string
|
|
||||||
err := r.localDB.Select(&alertsData, query)
|
|
||||||
if err != nil {
|
|
||||||
zap.L().Error("Error in processing sql query", zap.Error(err))
|
|
||||||
return &alertsInfo, err
|
|
||||||
}
|
|
||||||
for _, alert := range alertsData {
|
|
||||||
var rule rules.GettableRule
|
|
||||||
err = json.Unmarshal([]byte(alert), &rule)
|
|
||||||
if err != nil {
|
|
||||||
zap.L().Error("invalid rule data", zap.Error(err))
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if rule.AlertType == "LOGS_BASED_ALERT" {
|
|
||||||
alertsInfo.LogsBasedAlerts = alertsInfo.LogsBasedAlerts + 1
|
|
||||||
} else if rule.AlertType == "METRIC_BASED_ALERT" {
|
|
||||||
alertsInfo.MetricBasedAlerts = alertsInfo.MetricBasedAlerts + 1
|
|
||||||
} else if rule.AlertType == "TRACES_BASED_ALERT" {
|
|
||||||
alertsInfo.TracesBasedAlerts = alertsInfo.TracesBasedAlerts + 1
|
|
||||||
}
|
|
||||||
alertsInfo.TotalAlerts = alertsInfo.TotalAlerts + 1
|
|
||||||
}
|
|
||||||
|
|
||||||
return &alertsInfo, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ClickHouseReader) GetSavedViewsInfo(ctx context.Context) (*model.SavedViewsInfo, error) {
|
func (r *ClickHouseReader) GetSavedViewsInfo(ctx context.Context) (*model.SavedViewsInfo, error) {
|
||||||
savedViewsInfo := model.SavedViewsInfo{}
|
savedViewsInfo := model.SavedViewsInfo{}
|
||||||
savedViews, err := explorer.GetViews()
|
savedViews, err := explorer.GetViews()
|
||||||
|
@ -73,7 +73,6 @@ type Reader interface {
|
|||||||
LiveTailLogsV3(ctx context.Context, query string, timestampStart uint64, idStart string, client *v3.LogsLiveTailClient)
|
LiveTailLogsV3(ctx context.Context, query string, timestampStart uint64, idStart string, client *v3.LogsLiveTailClient)
|
||||||
|
|
||||||
GetDashboardsInfo(ctx context.Context) (*model.DashboardsInfo, error)
|
GetDashboardsInfo(ctx context.Context) (*model.DashboardsInfo, error)
|
||||||
GetAlertsInfo(ctx context.Context) (*model.AlertsInfo, error)
|
|
||||||
GetSavedViewsInfo(ctx context.Context) (*model.SavedViewsInfo, error)
|
GetSavedViewsInfo(ctx context.Context) (*model.SavedViewsInfo, error)
|
||||||
GetTotalSpans(ctx context.Context) (uint64, error)
|
GetTotalSpans(ctx context.Context) (uint64, error)
|
||||||
GetTotalLogs(ctx context.Context) (uint64, error)
|
GetTotalLogs(ctx context.Context) (uint64, error)
|
||||||
|
@ -2,6 +2,7 @@ package rules
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
@ -9,6 +10,7 @@ import (
|
|||||||
"github.com/jmoiron/sqlx"
|
"github.com/jmoiron/sqlx"
|
||||||
"go.signoz.io/signoz/pkg/query-service/auth"
|
"go.signoz.io/signoz/pkg/query-service/auth"
|
||||||
"go.signoz.io/signoz/pkg/query-service/common"
|
"go.signoz.io/signoz/pkg/query-service/common"
|
||||||
|
"go.signoz.io/signoz/pkg/query-service/model"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -43,6 +45,9 @@ type RuleDB interface {
|
|||||||
|
|
||||||
// GetAllPlannedMaintenance fetches the maintenance definitions from db
|
// GetAllPlannedMaintenance fetches the maintenance definitions from db
|
||||||
GetAllPlannedMaintenance(ctx context.Context) ([]PlannedMaintenance, error)
|
GetAllPlannedMaintenance(ctx context.Context) ([]PlannedMaintenance, error)
|
||||||
|
|
||||||
|
// used for internal telemetry
|
||||||
|
GetAlertsInfo(ctx context.Context) (*model.AlertsInfo, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
type StoredRule struct {
|
type StoredRule struct {
|
||||||
@ -295,3 +300,33 @@ func (r *ruleDB) EditPlannedMaintenance(ctx context.Context, maintenance Planned
|
|||||||
|
|
||||||
return "", nil
|
return "", nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *ruleDB) GetAlertsInfo(ctx context.Context) (*model.AlertsInfo, error) {
|
||||||
|
alertsInfo := model.AlertsInfo{}
|
||||||
|
// fetch alerts from rules db
|
||||||
|
query := "SELECT data FROM rules"
|
||||||
|
var alertsData []string
|
||||||
|
err := r.Select(&alertsData, query)
|
||||||
|
if err != nil {
|
||||||
|
zap.L().Error("Error in processing sql query", zap.Error(err))
|
||||||
|
return &alertsInfo, err
|
||||||
|
}
|
||||||
|
for _, alert := range alertsData {
|
||||||
|
var rule GettableRule
|
||||||
|
err = json.Unmarshal([]byte(alert), &rule)
|
||||||
|
if err != nil {
|
||||||
|
zap.L().Error("invalid rule data", zap.Error(err))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if rule.AlertType == "LOGS_BASED_ALERT" {
|
||||||
|
alertsInfo.LogsBasedAlerts = alertsInfo.LogsBasedAlerts + 1
|
||||||
|
} else if rule.AlertType == "METRIC_BASED_ALERT" {
|
||||||
|
alertsInfo.MetricBasedAlerts = alertsInfo.MetricBasedAlerts + 1
|
||||||
|
} else if rule.AlertType == "TRACES_BASED_ALERT" {
|
||||||
|
alertsInfo.TracesBasedAlerts = alertsInfo.TracesBasedAlerts + 1
|
||||||
|
}
|
||||||
|
alertsInfo.TotalAlerts = alertsInfo.TotalAlerts + 1
|
||||||
|
}
|
||||||
|
|
||||||
|
return &alertsInfo, nil
|
||||||
|
}
|
||||||
|
@ -25,6 +25,7 @@ import (
|
|||||||
"go.signoz.io/signoz/pkg/query-service/interfaces"
|
"go.signoz.io/signoz/pkg/query-service/interfaces"
|
||||||
"go.signoz.io/signoz/pkg/query-service/model"
|
"go.signoz.io/signoz/pkg/query-service/model"
|
||||||
v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
|
v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
|
||||||
|
"go.signoz.io/signoz/pkg/query-service/telemetry"
|
||||||
"go.signoz.io/signoz/pkg/query-service/utils/labels"
|
"go.signoz.io/signoz/pkg/query-service/utils/labels"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -112,6 +113,8 @@ func NewManager(o *ManagerOptions) (*Manager, error) {
|
|||||||
|
|
||||||
db := NewRuleDB(o.DBConn)
|
db := NewRuleDB(o.DBConn)
|
||||||
|
|
||||||
|
telemetry.GetInstance().SetAlertsInfoCallback(db.GetAlertsInfo)
|
||||||
|
|
||||||
m := &Manager{
|
m := &Manager{
|
||||||
tasks: map[string]Task{},
|
tasks: map[string]Task{},
|
||||||
rules: map[string]Rule{},
|
rules: map[string]Rule{},
|
||||||
|
@ -185,6 +185,12 @@ type Telemetry struct {
|
|||||||
patTokenUser bool
|
patTokenUser bool
|
||||||
countUsers int8
|
countUsers int8
|
||||||
mutex sync.RWMutex
|
mutex sync.RWMutex
|
||||||
|
|
||||||
|
alertsInfoCallback func(ctx context.Context) (*model.AlertsInfo, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Telemetry) SetAlertsInfoCallback(callback func(ctx context.Context) (*model.AlertsInfo, error)) {
|
||||||
|
a.alertsInfoCallback = callback
|
||||||
}
|
}
|
||||||
|
|
||||||
func createTelemetry() {
|
func createTelemetry() {
|
||||||
@ -310,7 +316,7 @@ func createTelemetry() {
|
|||||||
telemetry.SendEvent(TELEMETRY_EVENT_HEART_BEAT, data, user.Email, false, false)
|
telemetry.SendEvent(TELEMETRY_EVENT_HEART_BEAT, data, user.Email, false, false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
alertsInfo, err := telemetry.reader.GetAlertsInfo(context.Background())
|
alertsInfo, err := telemetry.alertsInfoCallback(context.Background())
|
||||||
if err == nil {
|
if err == nil {
|
||||||
dashboardsInfo, err := telemetry.reader.GetDashboardsInfo(context.Background())
|
dashboardsInfo, err := telemetry.reader.GetDashboardsInfo(context.Background())
|
||||||
if err == nil {
|
if err == nil {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user