GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-10-10 03:46:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: add log comment for prom queries (#4819)

Browse Source
This commit is contained in:
Srikanth Chekuri 2024-04-05 21:11:53 +05:30 committed by GitHub
parent b480ff1e48
commit d98265f345
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -203,4 +203,4 @@ require (
k8s.io/utils v0.0.0-20230711102312-30195339c3c7 // indirect
)
replace github.com/prometheus/prometheus => github.com/SigNoz/prometheus v1.9.79-0.1
replace github.com/prometheus/prometheus => github.com/SigNoz/prometheus v1.10.1

4
go.sum
View File

@ -96,8 +96,8 @@ github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/SigNoz/govaluate v0.0.0-20240203125216-988004ccc7fd h1:Bk43AsDYe0fhkbj57eGXx8H3ZJ4zhmQXBnrW523ktj8=
github.com/SigNoz/govaluate v0.0.0-20240203125216-988004ccc7fd/go.mod h1:nxRcH/OEdM8QxzH37xkGzomr1O0JpYBRS6pwjsWW6Pc=
github.com/SigNoz/prometheus v1.9.79-0.1 h1:RjsOw7oXVKx7IDA+/sRXW2x5pnw60/tT9MMuEz3+8DU=
github.com/SigNoz/prometheus v1.9.79-0.1/go.mod h1:MffmFu2qFILQrOHehx3D0XjYtaZMVfI+Ppeiv98x4Ww=
github.com/SigNoz/prometheus v1.10.1 h1:2LKRtPDMgSJpgDRDy0GUQiXi+yhDNqcbptuEon4Wpls=
github.com/SigNoz/prometheus v1.10.1/go.mod h1:MffmFu2qFILQrOHehx3D0XjYtaZMVfI+Ppeiv98x4Ww=
github.com/SigNoz/signoz-otel-collector v0.88.17 h1:XN3PwlI94LUOTXjXCPaVgQnGNdXnz7p40GKVWhOjlkQ=
github.com/SigNoz/signoz-otel-collector v0.88.17/go.mod h1:PThU+A6SgzEotT3ngKN4WVGWW0+eS7F1a2Rnq11aZZA=
github.com/SigNoz/zap_otlp v0.1.0 h1:T7rRcFN87GavY8lDGZj0Z3Xv6OhJA6Pj3I9dNPmqvRc=

9
pkg/query-service/app/clickhouseReader/wrapper.go
View File

@ -2,8 +2,7 @@ package clickhouseReader
import (
"context"
"fmt"
"strings"
"encoding/json"
"github.com/ClickHouse/clickhouse-go/v2"
"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
@ -37,11 +36,7 @@ func (c clickhouseConnWrapper) logComment(ctx context.Context) context.Context {
return ctx
}
logComment := ""
for k, v := range logCommentKVs {
logComment += fmt.Sprintf("%s=%s, ", k, v)
}
logComment = strings.TrimSuffix(logComment, ", ")
logComment, _ := json.Marshal(logCommentKVs)
ctx = clickhouse.Context(ctx, clickhouse.WithSettings(clickhouse.Settings{
"log_comment": logComment,

7
pkg/query-service/rules/promRuleTask.go
View File

@ -335,6 +335,13 @@ func (g *PromRuleTask) Eval(ctx context.Context, ts time.Time) {
rule.SetEvaluationTimestamp(t)
}(time.Now())
kvs := map[string]string{
"alertID": rule.ID(),
"source": "alerts",
"client": "query-service",
}
ctx = context.WithValue(ctx, "log_comment", kvs)
_, err := rule.Eval(ctx, ts, g.opts.Queriers)
if err != nil {
rule.SetHealth(HealthBad)