floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add param refresh for index api of elastic

This commit is contained in:
liugq 2022-03-31 09:52:57 +08:00
parent 30f2b38bc1
commit 4fe61e21f9
8 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
console.yml
View File

@ -73,5 +73,23 @@ pipeline:
queues:
type: metadata
category: elasticsearch
consumer:
group: metadata
when:
cluster_available: [ "default" ]
- name: activity_ingest
auto_start: true
keep_running: true
processor:
- activity:
bulk_size_in_mb: 10
bulk_max_docs_count: 5000
fetch_max_messages: 1000
elasticsearch: "default"
queues:
category: elasticsearch
activity: true
consumer:
group: activity
when:
cluster_available: [ "default" ]

2
plugin/api/gateway/instance.go
View File

@ -225,7 +225,7 @@ func (h *GatewayAPI) getInstanceStatus(w http.ResponseWriter, req *http.Request,
})
if err != nil {
log.Error(err)
//result[gid.(string)] = util.MapStr{}
result[gid.(string)] = util.MapStr{}
continue
}
var resMap = util.MapStr{}

4
plugin/api/index_management/common_command.go
View File

@ -45,7 +45,7 @@ func (h *APIHandler) HandleAddCommonCommandAction(w http.ResponseWriter, req *ht
h.WriteJSON(w, resBody, http.StatusOK)
return
}
_, err = esClient.Index(indexName,"", reqParams.ID, reqParams)
_, err = esClient.Index(indexName,"", reqParams.ID, reqParams, "wait_for")
if err != nil {
log.Error(err)
resBody["error"] = err.Error()
@ -90,7 +90,7 @@ func (h *APIHandler) HandleSaveCommonCommandAction(w http.ResponseWriter, req *h
h.WriteJSON(w, resBody, http.StatusInternalServerError)
return
}
_, err = esClient.Index(indexName,"", reqParams.ID, reqParams)
_, err = esClient.Index(indexName,"", reqParams.ID, reqParams, "wait_for")
if err != nil {
log.Error(err)
resBody["error"] = err.Error()

4
plugin/api/index_management/document.go
View File

@ -37,7 +37,7 @@ func (handler APIHandler) HandleAddDocumentAction(w http.ResponseWriter, req *ht
docID = util.GetUUID()
}
docType := handler.GetParameter(req, "_type")
insertRes, err := client.Index(indexName, docType, docID, reqBody)
insertRes, err := client.Index(indexName, docType, docID, reqBody, "wait_for")
if err != nil {
resBody["error"] = err
handler.WriteJSON(w, resBody, http.StatusOK)
@ -83,7 +83,7 @@ func (handler APIHandler) HandleUpdateDocumentAction(w http.ResponseWriter, req
}
}
insertRes, err := client.Index(indexName, typ, docID, reqBody)
insertRes, err := client.Index(indexName, typ, docID, reqBody, "wait_for")
if err != nil {
resBody["error"] = err.Error()
handler.WriteJSON(w, resBody, http.StatusOK)

4
plugin/api/index_management/rebuild.go
View File

@ -78,7 +78,7 @@ func reindex(esName string, body *model.Reindex, typ string) (string, error) {
body.Status = model.ReindexStatusRunning
body.CreatedAt = time.Now()
_, err = client.Index(orm.GetIndexName(body), typ, body.ID, body)
_, err = client.Index(orm.GetIndexName(body), typ, body.ID, body, "wait_for")
if err != nil {
return "", err
}
@ -166,7 +166,7 @@ func SyncRebuildResult(esName string) error {
}
source["status"] = status
source["task_source"] = doc.Source
_, err := client.Index(orm.GetIndexName(model.Reindex{}), "", esRes.Hits.Hits[idMap[doc.ID]].ID, source)
_, err := client.Index(orm.GetIndexName(model.Reindex{}), "", esRes.Hits.Hits[idMap[doc.ID]].ID, source, "")
return err
}
return nil

12
service/alerting/destination.go
View File

@ -157,7 +157,7 @@ func CreateDestination(w http.ResponseWriter, req *http.Request, ps httprouter.P
esClient := elastic.GetClient(esConfig.ID)
indexRes, err := esClient.Index(orm.GetIndexName(alerting.Config{}), "", destId, IfaceMap{
DESTINATION_FIELD: toSaveDest,
})
}, "wait_for")
if err != nil {
writeError(w, err)
return
@ -205,7 +205,7 @@ func UpdateDestination(w http.ResponseWriter, req *http.Request, ps httprouter.P
esClient := elastic.GetClient(config.ID)
indexRes, err := esClient.Index(orm.GetIndexName(alerting.Config{}), "", destinationId, IfaceMap{
DESTINATION_FIELD: toSaveDest,
})
}, "wait_for")
if err != nil {
writeError(w, err)
return
@ -284,7 +284,7 @@ func CreateEmailAccount(w http.ResponseWriter, req *http.Request, ps httprouter.
esClient := elastic.GetClient(config.ID)
indexRes, err := esClient.Index(orm.GetIndexName(alerting.Config{}), "", util.GetUUID(), IfaceMap{
EMAIL_ACCOUNT_FIELD: emailAccount,
})
},"wait_for")
if err != nil {
writeError(w, err)
return
@ -327,7 +327,7 @@ func UpdateEmailAccount(w http.ResponseWriter, req *http.Request, ps httprouter.
esClient := elastic.GetClient(config.ID)
indexRes, err := esClient.Index(orm.GetIndexName(alerting.Config{}),"", emailAccountId, IfaceMap{
EMAIL_ACCOUNT_FIELD: emailAccount,
})
}, "wait_for")
if err != nil {
writeError(w, err)
return
@ -469,7 +469,7 @@ func CreateEmailGroup(w http.ResponseWriter, req *http.Request, ps httprouter.Pa
esClient := elastic.GetClient(config.ID)
indexRes, err := esClient.Index(orm.GetIndexName(alerting.Config{}), "", util.GetUUID(), IfaceMap{
EMAIL_GROUP_FIELD: emailGroup,
})
},"wait_for")
if err != nil {
writeError(w, err)
return
@ -501,7 +501,7 @@ func UpdateEmailGroup(w http.ResponseWriter, req *http.Request, ps httprouter.Pa
esClient := elastic.GetClient(config.ID)
indexRes, err := esClient.Index( orm.GetIndexName(alerting.Config{}), "", emailGroupId, IfaceMap{
EMAIL_GROUP_FIELD: emailGroup,
})
}, "wait_for")
if err != nil {
writeError(w, err)
return

6
service/alerting/monitor.go
View File

@ -346,7 +346,7 @@ func CreateMonitor(w http.ResponseWriter, req *http.Request, ps httprouter.Param
indexRes, err := esClient.Index(indexName,"",util.GetUUID(),IfaceMap{
"cluster_id": id,
MONITOR_FIELD: monitor,
})
},"wait_for")
if err != nil {
writeError(w, err)
return
@ -426,7 +426,7 @@ func DeleteMonitor(w http.ResponseWriter, req *http.Request, ps httprouter.Param
}
source := util.MapStr(getRes.Source)
source.Put("monitor.status", "DELETED")
indexRes, err := esClient.Index(indexName, "", monitorId, source)
indexRes, err := esClient.Index(indexName, "", monitorId, source, "wait_for")
if err != nil {
writeError(w, err)
return
@ -490,7 +490,7 @@ func UpdateMonitor(w http.ResponseWriter, req *http.Request, ps httprouter.Param
indexRes, err := esClient.Index(indexName, "", monitorId, IfaceMap{
"cluster_id": getRes.Source["cluster_id"],
MONITOR_FIELD: monitor,
})
}, "wait_for")
if err != nil {
writeError(w, err)
return

6
service/alerting/schedule.go
View File

@ -356,7 +356,7 @@ func saveAlertInfo(alertItem *alerting.Alert) error {
if alertItem.State == ALERT_COMPLETED {
return nil
}
_, err = esClient.Index(indexName,"", util.GetUUID(), alertItem)
_, err = esClient.Index(indexName,"", util.GetUUID(), alertItem, "")
return err
}
currentState := queryValue(resBody.Hits.Hits[0].Source, "state", "").(string)
@ -369,13 +369,13 @@ func saveAlertInfo(alertItem *alerting.Alert) error {
source["state"] = ALERT_COMPLETED
}
}
esClient.Index( getAlertIndexName(INDEX_ALERT_HISTORY), "", alertItem.Id, source)
esClient.Index( getAlertIndexName(INDEX_ALERT_HISTORY), "", alertItem.Id, source, "")
_,err = esClient.Delete(indexName, "", resBody.Hits.Hits[0].ID)
return err
}
alertItem.StartTime = int64(queryValue(resBody.Hits.Hits[0].Source, "start_time", 0).(float64))
_, err = esClient.Index(indexName, "", alertItem.Id, alertItem )
_, err = esClient.Index(indexName, "", alertItem.Id, alertItem, "" )
return err
}