Skip to content

Commit 4c2d870

Browse files
author
Cairry
committed
🚀 Optimized log format
1 parent dad817d commit 4c2d870

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

‎alert/eval/query.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,29 @@ func metrics(ctx *ctx.Context, datasourceId, datasourceType string, rule models.
3131

3232
cli, err := pools.GetClient(datasourceId)
3333
if err != nil {
34-
logc.Errorf(ctx.Ctx, err.Error())
34+
logc.Errorf(ctx.Ctx, "获取数据源客户端失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, err)
3535
return nil
3636
}
3737

3838
switch datasourceType {
3939
case provider.PrometheusDsProvider:
4040
resQuery, err = cli.(provider.PrometheusProvider).Query(rule.PrometheusConfig.PromQL)
4141
if err != nil {
42-
logc.Error(ctx.Ctx, err.Error())
42+
logc.Errorf(ctx.Ctx, "Prometheus查询失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, PromQL: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, rule.PrometheusConfig.PromQL, err)
4343
return nil
4444
}
4545

4646
externalLabels = cli.(provider.PrometheusProvider).GetExternalLabels()
4747
case provider.VictoriaMetricsDsProvider:
4848
resQuery, err = cli.(provider.VictoriaMetricsProvider).Query(rule.PrometheusConfig.PromQL)
4949
if err != nil {
50-
logc.Error(ctx.Ctx, err.Error())
50+
logc.Errorf(ctx.Ctx, "VictoriaMetrics查询失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, PromQL: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, rule.PrometheusConfig.PromQL, err)
5151
return nil
5252
}
5353

5454
externalLabels = cli.(provider.VictoriaMetricsProvider).GetExternalLabels()
5555
default:
56-
logc.Errorf(ctx.Ctx, fmt.Sprintf("Unsupported metrics type, type: %s", datasourceType))
56+
logc.Errorf(ctx.Ctx, "不支持的指标类型, 规则ID: %s, 规则名称: %s, 数据源ID: %s, 类型: %s", rule.RuleId, rule.RuleName, datasourceId, datasourceType)
5757
return nil
5858
}
5959

@@ -84,7 +84,7 @@ func metrics(ctx *ctx.Context, datasourceId, datasourceType string, rule models.
8484
fingerprintLabels["severity"] = ruleExpr.Severity
8585
operator, value, err := tools.ProcessRuleExpr(ruleExpr.Expr)
8686
if err != nil {
87-
logc.Errorf(ctx.Ctx, err.Error())
87+
logc.Errorf(ctx.Ctx, "处理规则表达式失败, 规则ID: %s, 规则名称: %s, 表达式: %s, 错误: %v", rule.RuleId, rule.RuleName, ruleExpr.Expr, err)
8888
continue
8989
}
9090

@@ -205,7 +205,7 @@ func logs(ctx *ctx.Context, datasourceId, datasourceType string, rule models.Ale
205205
pools := ctx.Redis.ProviderPools()
206206
cli, err := pools.GetClient(datasourceId)
207207
if err != nil {
208-
logc.Errorf(ctx.Ctx, err.Error())
208+
logc.Errorf(ctx.Ctx, "获取数据源客户端失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, err)
209209
return []string{}
210210
}
211211

@@ -221,14 +221,14 @@ func logs(ctx *ctx.Context, datasourceId, datasourceType string, rule models.Ale
221221
}
222222
log, count, err = cli.(provider.LokiProvider).Query(queryOptions)
223223
if err != nil {
224-
logc.Error(ctx.Ctx, err.Error())
224+
logc.Errorf(ctx.Ctx, "Loki查询失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, LogQL: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, rule.LokiConfig.LogQL, err)
225225
return []string{}
226226
}
227227

228228
externalLabels = cli.(provider.LokiProvider).GetExternalLabels()
229229
operator, value, err := tools.ProcessRuleExpr(rule.LogEvalCondition)
230230
if err != nil {
231-
logc.Errorf(ctx.Ctx, err.Error())
231+
logc.Errorf(ctx.Ctx, "处理日志规则表达式失败, 规则ID: %s, 规则名称: %s, 表达式: %s, 错误: %v", rule.RuleId, rule.RuleName, rule.LogEvalCondition, err)
232232
return []string{}
233233
}
234234

@@ -250,14 +250,14 @@ func logs(ctx *ctx.Context, datasourceId, datasourceType string, rule models.Ale
250250
}
251251
log, count, err = cli.(provider.AliCloudSlsDsProvider).Query(queryOptions)
252252
if err != nil {
253-
logc.Error(ctx.Ctx, err.Error())
253+
logc.Errorf(ctx.Ctx, "AliCloudSLS查询失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, LogQL: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, rule.AliCloudSLSConfig.LogQL, err)
254254
return []string{}
255255
}
256256

257257
externalLabels = cli.(provider.AliCloudSlsDsProvider).GetExternalLabels()
258258
operator, value, err := tools.ProcessRuleExpr(rule.LogEvalCondition)
259259
if err != nil {
260-
logc.Errorf(ctx.Ctx, err.Error())
260+
logc.Errorf(ctx.Ctx, "处理日志规则表达式失败, 规则ID: %s, 规则名称: %s, 表达式: %s, 错误: %v", rule.RuleId, rule.RuleName, rule.LogEvalCondition, err)
261261
return []string{}
262262
}
263263

@@ -279,14 +279,14 @@ func logs(ctx *ctx.Context, datasourceId, datasourceType string, rule models.Ale
279279
}
280280
log, count, err = cli.(provider.ElasticSearchDsProvider).Query(queryOptions)
281281
if err != nil {
282-
logc.Error(ctx.Ctx, err.Error())
282+
logc.Errorf(ctx.Ctx, "ElasticSearch查询失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, 索引: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, rule.ElasticSearchConfig.Index, err)
283283
return []string{}
284284
}
285285

286286
externalLabels = cli.(provider.ElasticSearchDsProvider).GetExternalLabels()
287287
operator, value, err := tools.ProcessRuleExpr(rule.LogEvalCondition)
288288
if err != nil {
289-
logc.Errorf(ctx.Ctx, err.Error())
289+
logc.Errorf(ctx.Ctx, "处理日志规则表达式失败, 规则ID: %s, 规则名称: %s, 表达式: %s, 错误: %v", rule.RuleId, rule.RuleName, rule.LogEvalCondition, err)
290290
return []string{}
291291
}
292292

@@ -307,14 +307,14 @@ func logs(ctx *ctx.Context, datasourceId, datasourceType string, rule models.Ale
307307
}
308308
log, count, err = cli.(provider.VictoriaLogsProvider).Query(queryOptions)
309309
if err != nil {
310-
logc.Error(ctx.Ctx, err.Error())
310+
logc.Errorf(ctx.Ctx, "VictoriaLogs查询失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, LogQL: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, rule.VictoriaLogsConfig.LogQL, err)
311311
return []string{}
312312
}
313313

314314
externalLabels = cli.(provider.VictoriaLogsProvider).GetExternalLabels()
315315
operator, value, err := tools.ProcessRuleExpr(rule.LogEvalCondition)
316316
if err != nil {
317-
logc.Errorf(ctx.Ctx, err.Error())
317+
logc.Errorf(ctx.Ctx, "处理日志规则表达式失败, 规则ID: %s, 规则名称: %s, 表达式: %s, 错误: %v", rule.RuleId, rule.RuleName, rule.LogEvalCondition, err)
318318
return []string{}
319319
}
320320

@@ -331,14 +331,14 @@ func logs(ctx *ctx.Context, datasourceId, datasourceType string, rule models.Ale
331331
}
332332
log, count, err = cli.(provider.ClickHouseProvider).Query(queryOptions)
333333
if err != nil {
334-
logc.Error(ctx.Ctx, err.Error())
334+
logc.Errorf(ctx.Ctx, "ClickHouse查询失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, LogQL: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, rule.ClickHouseConfig.LogQL, err)
335335
return []string{}
336336
}
337337

338338
externalLabels = cli.(provider.ClickHouseProvider).GetExternalLabels()
339339
operator, value, err := tools.ProcessRuleExpr(rule.LogEvalCondition)
340340
if err != nil {
341-
logc.Errorf(ctx.Ctx, err.Error())
341+
logc.Errorf(ctx.Ctx, "处理日志规则表达式失败, 规则ID: %s, 规则名称: %s, 表达式: %s, 错误: %v", rule.RuleId, rule.RuleName, rule.LogEvalCondition, err)
342342
return []string{}
343343
}
344344

@@ -421,7 +421,7 @@ func traces(ctx *ctx.Context, datasourceId, datasourceType string, rule models.A
421421

422422
cli, err := pools.GetClient(datasourceId)
423423
if err != nil {
424-
logc.Errorf(ctx.Ctx, err.Error())
424+
logc.Errorf(ctx.Ctx, "获取Jaeger数据源客户端失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, err)
425425
return []string{}
426426
}
427427

@@ -433,7 +433,7 @@ func traces(ctx *ctx.Context, datasourceId, datasourceType string, rule models.A
433433
}
434434
queryRes, err = cli.(provider.JaegerDsProvider).Query(queryOptions)
435435
if err != nil {
436-
logc.Error(ctx.Ctx, err.Error())
436+
logc.Errorf(ctx.Ctx, "Jaeger查询失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, 服务: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, rule.JaegerConfig.Service, err)
437437
return []string{}
438438
}
439439

@@ -475,7 +475,7 @@ func cloudWatch(ctx *ctx.Context, datasourceId, datasourceType string, rule mode
475475
pools := ctx.Redis.ProviderPools()
476476
cfg, err := pools.GetClient(datasourceId)
477477
if err != nil {
478-
logc.Errorf(ctx.Ctx, err.Error())
478+
logc.Errorf(ctx.Ctx, "获取CloudWatch数据源客户端失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, err)
479479
return []string{}
480480
}
481481

@@ -537,20 +537,20 @@ func kubernetesEvent(ctx *ctx.Context, datasourceId, datasourceType string, rule
537537
var externalLabels map[string]interface{}
538538
datasourceObj, err := ctx.DB.Datasource().GetInstance(datasourceId)
539539
if err != nil {
540-
logc.Error(ctx.Ctx, err.Error())
540+
logc.Errorf(ctx.Ctx, "获取数据源实例失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, err)
541541
return []string{}
542542
}
543543

544544
pools := ctx.Redis.ProviderPools()
545545
cli, err := pools.GetClient(datasourceId)
546546
if err != nil {
547-
logc.Errorf(ctx.Ctx, err.Error())
547+
logc.Errorf(ctx.Ctx, "获取Kubernetes数据源客户端失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, err)
548548
return []string{}
549549
}
550550

551551
k8sEvent, err := cli.(provider.KubernetesClient).GetWarningEvent(rule.KubernetesConfig.Reason, rule.KubernetesConfig.Scope)
552552
if err != nil {
553-
logc.Error(ctx.Ctx, err.Error())
553+
logc.Errorf(ctx.Ctx, "获取Kubernetes警告事件失败, 规则ID: %s, 规则名称: %s, 数据源ID: %s, 资源: %s, 错误: %v", rule.RuleId, rule.RuleName, datasourceId, rule.KubernetesConfig.Resource, err)
554554
return []string{}
555555
}
556556

0 commit comments

Comments
 (0)