Merge pull request #1188 from shangmin-001/shangmin01

[PDR-14800][feat]logkit-pro支持.gzip格式文件采集

Author: redHJ

reader/extract/reader.go

@@ -57,10 +57,10 @@ func NewReader(meta *reader.Meta, path string, opt Opts) (*Reader, error) {
 			return nil, err
 		}
 		tp = "tar"
-	} else if strings.HasSuffix(path, ".gz") {
+	} else if strings.HasSuffix(path, ".gz") || strings.HasSuffix(path, ".gzip") {
 		rd, err = NewGZ(path, opt)
 		if err != nil {
-			log.Errorf("New .gz err %v", err)
+			log.Errorf("New .gz or .gzip err %v", err)
 			return nil, err
 		}
 		tp = "gz"
@@ -303,8 +303,8 @@ type GZ struct {
 }
 
 func NewGZ(path string, opt Opts) (*GZ, error) {
-	if !strings.HasSuffix(path, ".gz") {
-		return nil, fmt.Errorf("%s is not .gz format", path)
+	if !(strings.HasSuffix(path, ".gz") || strings.HasSuffix(path, ".gzip")) {
+		return nil, fmt.Errorf("%s is not .gz  or .gzip format", path)
 	}
 	f, err := os.Open(path)
 	if err != nil {

reader/read.go

@@ -0,0 +1 @@
+package reader

reader/utils.go

@@ -144,7 +144,7 @@ func getTags(tagFile string) (tags map[string]interface{}, err error) {
 }
 
 func CompressedFile(path string) bool {
-	if strings.HasSuffix(path, ".gz") || strings.HasSuffix(path, ".tar") || strings.HasSuffix(path, ".zip") {
+	if strings.HasSuffix(path, ".gzip") || strings.HasSuffix(path, ".gz") || strings.HasSuffix(path, ".tar") || strings.HasSuffix(path, ".zip") {
 		return true
 	}
 	return false

sender/sender.go

@@ -9,6 +9,7 @@ import (
 	. "github.com/qiniu/logkit/utils/models"
 )
 
+
 // Sender send data to pandora, prometheus such different destinations
 type Sender interface {
 	Name() string