Skip to content

Feat support es7 #331

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

Open
Taction wants to merge 3 commits into
base: 1.3.8
Choose a base branch
from
Open

Feat support es7 #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e97985
upgrade es to support 7.10
Taction Feb 10, 2022
b8f8b7b
update min es version to 7.x
Taction Feb 11, 2022
c4db4d7
replace template with index_patterns fix support for es8.
Taction Feb 12, 2022
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
19 changes: 8 additions & 11 deletions cloud/src/rasp-cloud/es/es.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"github.com/astaxie/beego"
"github.com/astaxie/beego/logs"
"github.com/olivere/elastic"
"github.com/olivere/elastic/v7"
"rasp-cloud/conf"
"rasp-cloud/environment"
"rasp-cloud/tools"
Expand All @@ -34,8 +34,8 @@ var (
ElasticClient *elastic.Client
Version string
ttlIndexes = make(chan map[string]time.Duration, 1)
minEsVersion = "5.6.0"
maxEsVersion = "7.0.0"
minEsVersion = "7.0.0"
maxEsVersion = "9.0.0"
)

func init() {
Expand Down Expand Up @@ -178,10 +178,10 @@ func CreateEsIndex(index string, alias string, template string) error {
return nil
}

func Insert(index string, docType string, doc interface{}) (err error) {
func Insert(index string, doc interface{}) (err error) {
ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(10*time.Second))
defer cancel()
_, err = ElasticClient.Index().Index(index).Type(docType).BodyJson(doc).Do(ctx)
_, err = ElasticClient.Index().Index(index).BodyJson(doc).Do(ctx)
return
}

Expand All @@ -196,15 +196,13 @@ func BulkInsertAlarm(docType string, docs []map[string]interface{}) (err error)
docType == "crash-alarm" {
bulkService.Add(elastic.NewBulkUpdateRequest().
Index("real-openrasp-" + docType + "-" + appId).
Type(docType).
Id(fmt.Sprint(doc["upsert_id"])).
DocAsUpsert(true).
Doc(doc))
} else {
if appId, ok := doc["app_id"].(string); ok {
bulkService.Add(elastic.NewBulkIndexRequest().
Index("real-openrasp-" + docType + "-" + appId).
Type(docType).
OpType("index").
Doc(doc))
}
Expand Down Expand Up @@ -233,12 +231,11 @@ func BulkInsertAlarm(docType string, docs []map[string]interface{}) (err error)
return err
}

func BulkInsert(index string, docType string, docs []map[string]interface{}) (err error) {
func BulkInsert(index string, docs []map[string]interface{}) (err error) {
bulkService := ElasticClient.Bulk()
for _, doc := range docs {
bulkService.Add(elastic.NewBulkUpdateRequest().
Index(index).
Type(docType).
Id(fmt.Sprint(doc["upsert_id"])).
DocAsUpsert(true).
Doc(doc["content"]))
Expand All @@ -256,10 +253,10 @@ func DeleteIndex(indexName string) error {
return err
}

func DeleteByQuery(index string, docType string, query elastic.Query) error {
func DeleteByQuery(index string, query elastic.Query) error {
ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(15*time.Second))
defer cancel()
_, err := ElasticClient.DeleteByQuery(index).Type(docType).Query(query).ProceedOnVersionConflict().Do(ctx)
_, err := ElasticClient.DeleteByQuery(index).Query(query).ProceedOnVersionConflict().Do(ctx)
if err != nil {
beego.Error("failed to delete by query", err)
return err
Expand Down
Loading