fix: rename to logsFilter

Author: bietkul

plugins/logs/dao.go

@@ -94,7 +94,7 @@ func (es *elasticsearch) indexRecord(ctx context.Context, rec record) {
 	}
 }
 
-type logsConfig struct {
+type logsFilter struct {
 	Offset    int
 	StartDate string
 	EndDate   string
@@ -103,12 +103,12 @@ type logsConfig struct {
 	Indices   []string
 }
 
-func (es *elasticsearch) getRawLogs(ctx context.Context, logsConfig logsConfig) ([]byte, error) {
+func (es *elasticsearch) getRawLogs(ctx context.Context, logsFilter logsFilter) ([]byte, error) {
 	switch util.GetVersion() {
 	case 6:
-		return es.getRawLogsES6(ctx, logsConfig)
+		return es.getRawLogsES6(ctx, logsFilter)
 	default:
-		return es.getRawLogsES7(ctx, logsConfig)
+		return es.getRawLogsES7(ctx, logsFilter)
 	}
 }
 

plugins/logs/dao_es6.go

@@ -10,35 +10,35 @@ import (
 	es6 "gopkg.in/olivere/elastic.v6"
 )
 
-func (es *elasticsearch) getRawLogsES6(ctx context.Context, logsConfig logsConfig) ([]byte, error) {
+func (es *elasticsearch) getRawLogsES6(ctx context.Context, logsFilter logsFilter) ([]byte, error) {
 	duration := es6.NewRangeQuery("timestamp").
-		From(logsConfig.StartDate).
-		To(logsConfig.EndDate)
+		From(logsFilter.StartDate).
+		To(logsFilter.EndDate)
 
 	query := es6.NewBoolQuery().Filter(duration)
 	// apply category filter
-	if logsConfig.Filter == "search" {
+	if logsFilter.Filter == "search" {
 		filters := es6.NewTermQuery("category.keyword", "search")
 		query.Filter(filters)
-	} else if logsConfig.Filter == "delete" {
+	} else if logsFilter.Filter == "delete" {
 		filters := es6.NewMatchQuery("request.method.keyword", "DELETE")
 		query.Filter(filters)
-	} else if logsConfig.Filter == "success" {
+	} else if logsFilter.Filter == "success" {
 		filters := es6.NewRangeQuery("response.code").Gte(200).Lte(299)
 		query.Filter(filters)
-	} else if logsConfig.Filter == "error" {
+	} else if logsFilter.Filter == "error" {
 		filters := es6.NewRangeQuery("response.code").Gte(400)
 		query.Filter(filters)
 	} else {
 		query.Filter(es6.NewMatchAllQuery())
 	}
 	// apply index filtering logic
-	util.GetIndexFilterQueryEs6(query, logsConfig.Filter)
+	util.GetIndexFilterQueryEs6(query, logsFilter.Filter)
 
 	response, err := util.GetClient6().Search(es.indexName).
 		Query(query).
-		From(logsConfig.Offset).
-		Size(logsConfig.Size).
+		From(logsFilter.Offset).
+		Size(logsFilter.Size).
 		SortWithInfo(es6.SortInfo{Field: "timestamp", UnmappedType: "date", Ascending: false}).
 		Do(ctx)
 	if err != nil {
@@ -54,17 +54,17 @@ func (es *elasticsearch) getRawLogsES6(ctx context.Context, logsConfig logsConfi
 		}
 		rawIndices, ok := source["indices"]
 		if !ok {
-			log.Println(logTag, ": unable to find ", logsConfig.Indices, " in log record")
+			log.Println(logTag, ": unable to find ", logsFilter.Indices, " in log record")
 		}
 		logIndices, err := util.ToStringSlice(rawIndices)
 		if err != nil {
 			log.Errorln(logTag, ":", err)
 			continue
 		}
 
-		if len(logsConfig.Indices) == 0 {
+		if len(logsFilter.Indices) == 0 {
 			hits = append(hits, hit.Source)
-		} else if util.IsSubset(logsConfig.Indices, logIndices) {
+		} else if util.IsSubset(logsFilter.Indices, logIndices) {
 			hits = append(hits, hit.Source)
 		}
 	}

plugins/logs/dao_es7.go

@@ -8,36 +8,36 @@ import (
 	es7 "github.com/olivere/elastic/v7"
 )
 
-func (es *elasticsearch) getRawLogsES7(ctx context.Context, logsConfig logsConfig) ([]byte, error) {
+func (es *elasticsearch) getRawLogsES7(ctx context.Context, logsFilter logsFilter) ([]byte, error) {
 	duration := es7.NewRangeQuery("timestamp").
-		From(logsConfig.StartDate).
-		To(logsConfig.EndDate)
+		From(logsFilter.StartDate).
+		To(logsFilter.EndDate)
 
 	query := es7.NewBoolQuery().Filter(duration)
 	// apply category filter
-	if logsConfig.Filter == "search" {
+	if logsFilter.Filter == "search" {
 		filters := es7.NewTermQuery("category.keyword", "search")
 		query.Filter(filters)
-	} else if logsConfig.Filter == "delete" {
+	} else if logsFilter.Filter == "delete" {
 		filters := es7.NewMatchQuery("request.method.keyword", "DELETE")
 		query.Filter(filters)
-	} else if logsConfig.Filter == "success" {
+	} else if logsFilter.Filter == "success" {
 		filters := es7.NewRangeQuery("response.code").Gte(200).Lte(299)
 		query.Filter(filters)
-	} else if logsConfig.Filter == "error" {
+	} else if logsFilter.Filter == "error" {
 		filters := es7.NewRangeQuery("response.code").Gte(400)
 		query.Filter(filters)
 	} else {
 		query.Filter(es7.NewMatchAllQuery())
 	}
 
 	// apply index filtering logic
-	util.GetIndexFilterQueryEs7(query, logsConfig.Indices...)
+	util.GetIndexFilterQueryEs7(query, logsFilter.Indices...)
 
 	response, err := util.GetClient7().Search(es.indexName).
 		Query(query).
-		From(logsConfig.Offset).
-		Size(logsConfig.Size).
+		From(logsFilter.Offset).
+		Size(logsFilter.Size).
 		SortWithInfo(es7.SortInfo{Field: "timestamp", UnmappedType: "date", Ascending: false}).
 		Do(ctx)
 	if err != nil {

plugins/logs/handlers.go

@@ -104,7 +104,7 @@ func (l *Logs) getLogs() http.HandlerFunc {
 
 		filter := req.URL.Query().Get("filter")
 
-		raw, err := l.es.getRawLogs(req.Context(), logsConfig{
+		raw, err := l.es.getRawLogs(req.Context(), logsFilter{
 			Offset:    parsedOffset,
 			StartDate: rangeParams.StartDate,
 			EndDate:   rangeParams.EndDate,

plugins/logs/service.go

@@ -3,7 +3,7 @@ package logs
 import "context"
 
 type logsService interface {
-	getRawLogs(ctx context.Context, logsConfig logsConfig) ([]byte, error)
+	getRawLogs(ctx context.Context, logsFilter logsFilter) ([]byte, error)
 	indexRecord(ctx context.Context, r record)
 	rolloverIndexJob(alias string)
 }