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

Dev 851 log path wildcard #857

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Dev 851 log path wildcard #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23a20e9
update node exporter
zgyzgyhero Dec 10, 2024
4951805
fix node exporter chan
zgyzgyhero Dec 10, 2024
58f981d
update log metric fail rate expr
zgyzgyhero Dec 12, 2024
ab97cdd
更新标准正则和标准json模板的新增失败率配置
Alexaa123 Dec 13, 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
21 changes: 15 additions & 6 deletions monitor-agent/node_exporter/collector/monitor_log_metric_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ type logMetricMonitorNeObj struct {
TailLastUnixTime int64 `json:"-"`
DestroyChan chan int `json:"-"`
TailDataCancelChan chan int `json:"-"`
MultiPathNum int `json:"-"`
}

type logMetricGroupNeObj struct {
Expand Down Expand Up @@ -359,7 +360,7 @@ func (c *logMetricMonitorNeObj) start() {
}
if reopenFlag {
level.Info(monitorLogger).Log("log_metric -> reopen", fmt.Sprintf("path:%s,serviceGroup:%s", c.Path, c.ServiceGroup))
time.Sleep(2 * time.Second)
time.Sleep(500 * time.Millisecond)
go c.start()
}
}
Expand Down Expand Up @@ -398,6 +399,7 @@ func (c *logMetricMonitorNeObj) startMultiPath() {
level.Warn(monitorLogger).Log("log_metric -> startMultiPath_cannotMatchAnyFile", fmt.Sprintf("path:%s,serviceGroup:%s", c.Path, c.ServiceGroup))
return
}
c.MultiPathNum = len(pathList)
go c.startHandleTailData()
var destroyChanList []chan int
for _, targetFilePath := range pathList {
Expand Down Expand Up @@ -484,8 +486,9 @@ func (c *logMetricMonitorNeObj) new(input *logMetricMonitorNeObj) {

// 把所有正则初始化
func (c *logMetricMonitorNeObj) update(input *logMetricMonitorNeObj) {
level.Info(monitorLogger).Log("do updateLogMetricMonitorNeObj", c.Path)
c.Lock.Lock()
level.Info(monitorLogger).Log("updateLogMetricMonitorNeObj", c.Path)
level.Info(monitorLogger).Log("start updateLogMetricMonitorNeObj", c.Path)
newJsonConfigList := []*logMetricJsonNeObj{}
var err error
for _, jsonObj := range input.JsonConfig {
Expand Down Expand Up @@ -537,11 +540,15 @@ func (c *logMetricMonitorNeObj) update(input *logMetricMonitorNeObj) {
c.TargetEndpoint = input.TargetEndpoint
c.ServiceGroup = input.ServiceGroup
c.MetricGroupConfig = newMetricGroupList
level.Info(monitorLogger).Log("MetricGroupConfig: ", fmt.Sprintf("len:%d", len(c.MetricGroupConfig)))
level.Info(monitorLogger).Log("updateLogMetricMonitorNeObj_MetricGroupConfig: ", fmt.Sprintf("len:%d", len(c.MetricGroupConfig)))
c.Lock.Unlock()
if strings.Contains(c.Path, "*") {
c.DestroyChan <- 1
time.Sleep(2 * time.Second)
if c.MultiPathNum > 0 {
level.Info(monitorLogger).Log("start_updateLogMetricMonitorNeObj_destroy_*: ", c.Path)
c.DestroyChan <- 1
level.Info(monitorLogger).Log("end_updateLogMetricMonitorNeObj_destroy_*: ", c.Path)
}
time.Sleep(500 * time.Millisecond)
go c.startMultiPath()
}
}
Expand Down Expand Up @@ -679,7 +686,9 @@ func LogMetricMonitorHandleAction(requestParamBuff []byte) error {
if len(deletePathMap) > 0 && len(tmpLogMetricObjJobs) > 0 {
for _, existJob := range tmpLogMetricObjJobs {
if _, ok := deletePathMap[existJob.Path]; ok {
existJob.ReOpenHandlerChan <- 1
if !strings.Contains(existJob.Path, "*") {
existJob.ReOpenHandlerChan <- 1
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions monitor-server/services/db/log_metric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,8 +590,8 @@ func getLogMetricRatePromExpr(metric, metricPrefix, aggType, serviceGroup, sucRe
if metric == "req_fail_rate" {
//result = fmt.Sprintf("100-100*((sum(%s{key=\"%sreq_suc_count\",agg=\"%s\",service_group=\"%s\",retcode=\"%s\",code=\"$t_code\"}) by (service_group,code))/(sum(%s{key=\"%sreq_count\",agg=\"%s\",service_group=\"%s\",code=\"$t_code\"}) by (service_group,code)) > 0 or vector(1))",
// models.LogMetricName, metricPrefix, aggType, serviceGroup, sucRetCode, models.LogMetricName, metricPrefix, aggType, serviceGroup)
result = fmt.Sprintf("100-100*((sum(%s{key=\"%sreq_suc_count\",agg=\"%s\",service_group=\"%s\",retcode=\"%s\",code=\"$t_code\"}) by (service_group,code) > 0 or (sum(%s{key=\"%sreq_suc_count\",agg=\"%s\",service_group=\"%s\",retcode=\"%s\",code=\"$t_code\"}) by (service_group,code) + 1))/(sum(%s{key=\"%sreq_count\",agg=\"%s\",service_group=\"%s\",code=\"$t_code\"}) by (service_group,code) > 0 or (sum(%s{key=\"%sreq_count\",agg=\"%s\",service_group=\"%s\",code=\"$t_code\"}) by (service_group,code) + 1)))",
models.LogMetricName, metricPrefix, aggType, serviceGroup, sucRetCode, models.LogMetricName, metricPrefix, aggType, serviceGroup, sucRetCode, models.LogMetricName, metricPrefix, aggType, serviceGroup, models.LogMetricName, metricPrefix, aggType, serviceGroup)
result = fmt.Sprintf("100*((sum(%s{key=\"%sreq_suc_count\",agg=\"%s\",service_group=\"%s\",retcode!=\"%s\",code=\"$t_code\"}) by (service_group,code))/(sum(%s{key=\"%sreq_count\",agg=\"%s\",service_group=\"%s\",code=\"$t_code\"}) by (service_group,code) > 0 or (sum(%s{key=\"%sreq_count\",agg=\"%s\",service_group=\"%s\",code=\"$t_code\"}) by (service_group,code) + 1)))",
models.LogMetricName, metricPrefix, aggType, serviceGroup, sucRetCode, models.LogMetricName, metricPrefix, aggType, serviceGroup, models.LogMetricName, metricPrefix, aggType, serviceGroup)

}
return
Expand Down
20 changes: 10 additions & 10 deletions monitor-ui/src/views/monitor-config/log-template-config/json-regex.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,10 @@ import Vue from 'vue'
import {thresholdList, lastList} from '@/assets/config/common-config.js'

const initRangeConfigMap = {
req_suc_rate: {
operator: '<',
threshold: '90',
time: '60',
req_fail_rate: {
operator: '>',
threshold: '10',
time: '0',
time_unit: 's'
},
req_costtime_avg: {
Expand Down Expand Up @@ -332,7 +332,7 @@ export default {
<i-switch value={params.row.auto_alarm}
on-on-change={val => {
if (!val) {
const key = ['req_suc_rate', 'req_costtime_avg'].includes(params.row.metric) ? params.row.metric : 'other'
const key = ['req_fail_rate', 'req_costtime_avg'].includes(params.row.metric) ? params.row.metric : 'other'
Vue.set(this.configInfo.metric_list[params.index], 'range_config', cloneDeep(initRangeConfigMap[key]))
}
this.configInfo.metric_list[params.index].auto_alarm = val
Expand Down Expand Up @@ -520,8 +520,8 @@ export default {
'code'
],
color_group: '#20a162',
auto_alarm: true,
range_config: cloneDeep(initRangeConfigMap.req_suc_rate)
auto_alarm: false,
range_config: cloneDeep(initRangeConfigMap.other)
},
{
log_param_name: 'code',
Expand All @@ -539,13 +539,13 @@ export default {
log_param_name: 'code',
metric: 'req_fail_rate',
display_name: this.$t('m_failure_rate'),
agg_type: '100-100*{req_suc_count}/{req_count}',
agg_type: '100*{req_fail_count_detail}/{req_count}',
tag_config: [
'code'
],
color_group: '#7c1823',
auto_alarm: false,
range_config: cloneDeep(initRangeConfigMap.other)
auto_alarm: true,
range_config: cloneDeep(initRangeConfigMap.req_fail_rate)
},
{
log_param_name: 'code',
Expand Down
20 changes: 10 additions & 10 deletions monitor-ui/src/views/monitor-config/log-template-config/standard-regex.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ import Vue from 'vue'
import {thresholdList, lastList} from '@/assets/config/common-config.js'

const initRangeConfigMap = {
req_suc_rate: {
operator: '<',
threshold: '90',
time: '60',
req_fail_rate: {
operator: '>',
threshold: '10',
time: '0',
time_unit: 's'
},
req_costtime_avg: {
Expand Down Expand Up @@ -285,7 +285,7 @@ export default {
<i-switch value={params.row.auto_alarm}
on-on-change={val => {
if (!val) {
const key = ['req_suc_rate', 'req_costtime_avg'].includes(params.row.metric) ? params.row.metric : 'other'
const key = ['req_fail_rate', 'req_costtime_avg'].includes(params.row.metric) ? params.row.metric : 'other'
Vue.set(this.configInfo.metric_list[params.index], 'range_config', cloneDeep(initRangeConfigMap[key]))
}
this.configInfo.metric_list[params.index].auto_alarm = val
Expand Down Expand Up @@ -456,8 +456,8 @@ export default {
'code'
],
color_group: '#20a162',
auto_alarm: true,
range_config: cloneDeep(initRangeConfigMap.req_suc_rate)
auto_alarm: false,
range_config: cloneDeep(initRangeConfigMap.other)
},
{
log_param_name: 'code',
Expand All @@ -475,13 +475,13 @@ export default {
log_param_name: 'code',
metric: 'req_fail_rate',
display_name: this.$t('m_failure_rate'),
agg_type: '100-100*{req_suc_count}/{req_count}',
agg_type: '100*{req_fail_count_detail}/{req_count}',
tag_config: [
'code'
],
color_group: '#7c1823',
auto_alarm: false,
range_config: cloneDeep(initRangeConfigMap.other)
auto_alarm: true,
range_config: cloneDeep(initRangeConfigMap.req_fail_rate)
},
{
log_param_name: 'code',
Expand Down