diff --git a/backend/prome/prome.go b/backend/prome/prome.go index 21e4d7a8..19d8ba22 100644 --- a/backend/prome/prome.go +++ b/backend/prome/prome.go @@ -243,7 +243,7 @@ func (pd *PromeDataSource) processWrite(payload []byte) { time.Sleep(time.Millisecond * 100) } if !sendOk { - logger.Warningf("send prome finally fail: %v", err) + logger.Errorf("send prome finally fail: %v", err) } else { logger.Infof("send to prome %s ok", cc.url.String()) } diff --git a/etc/alert_rule/linux_host b/etc/alert_rule/linux_host index aa33bdde..bebebe39 100644 --- a/etc/alert_rule/linux_host +++ b/etc/alert_rule/linux_host @@ -36,7 +36,7 @@ { "optr": ">", "func": "all", - "metric": "node_load1", + "metric": "system_cpu_load1", "params": [], "threshold": 16 } diff --git a/http/router_ts_data.go b/http/router_ts_data.go index 030c3660..cd104259 100644 --- a/http/router_ts_data.go +++ b/http/router_ts_data.go @@ -27,13 +27,17 @@ func PushSeries(c *gin.Context) { var err error if encoding := r.Header.Get("Content-Encoding"); encoding == "gzip" { if reader, err = gzip.NewReader(r.Body); err != nil { - logger.Error(err) + message := fmt.Sprintf("error: get gzip reader occur error: %v", err) + logger.Warning(message) + c.String(200, message) return } defer reader.Close() } else if encoding == "deflate" { if reader, err = zlib.NewReader(r.Body); err != nil { - logger.Error(err) + message := fmt.Sprintf("error: get zlib reader occur error: %v", err) + logger.Warning(message) + c.String(200, message) return } defer reader.Close() @@ -41,7 +45,9 @@ func PushSeries(c *gin.Context) { b, err := ioutil.ReadAll(reader) if err != nil { - logger.Error(err) + message := fmt.Sprintf("error: ioutil occur error: %v", err) + logger.Warning(message) + c.String(200, message) return } @@ -66,14 +72,13 @@ func PushSeries(c *gin.Context) { } if err = trans.Push(metricPoints); err != nil { - logger.Debugf("error: trans.push %+v err:%v", req.Samples, err) + logger.Warningf("error: trans.push %+v err:%v", req.Samples, err) c.String(200, "error: "+err.Error()) } else { c.String(200, "success: received %d points", len(metricPoints)) } - } else { - logger.Debugf("error: trans.push %+v Content-Type(%s) not equals application/x-protobuf", req.Samples) + logger.Warningf("error: trans.push %+v Content-Type(%s) not equals application/x-protobuf", req.Samples) c.String(200, "error: Content-Type(%s) not equals application/x-protobuf") } }