From 22198f02765543f8e1eb5e1a78bc9b43dfa18619 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 08 十月 2019 10:56:40 +0800
Subject: [PATCH] fix EsApi
---
EsApi.go | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/EsApi.go b/EsApi.go
index ef7fdc6..150aa50 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -585,7 +585,11 @@
}
//缁煎悎缁熻
-func StatisticsComprehensive(serverIp string, serverPort string, indexName string) (total int, err error){
+func StatisticsComprehensive(serverIp string, serverPort string, indexName string, isAlarm bool) (total int, err error){
+ isAlarmStr := ""
+ if isAlarm == true {
+ isAlarmStr = `,{"term":{"isAlarm":1}}`
+ }
url := "http://" + serverIp + ":" + serverPort +
"/" + indexName + "/_search"
DSLJson := `{
@@ -595,13 +599,16 @@
"filter":[{
"range":{
"picDate":{
- "gte":"now+8H/d"
+ "gte":"now+8h/d"
}
}
- }]
+ }
+ `+isAlarmStr+`
+ ]
}
}
}`
+ //fmt.Println(DSLJson)
buf, err := EsReq("POST",url,[]byte(DSLJson))
if err != nil {
return total, err
@@ -620,6 +627,7 @@
//fmt.Println(total)
return total,nil
}
+
//瀹炴椂鎶ヨ浠诲姟姣旂巼
func RealTimeAlarmTaskRate(serverIp string, serverPort string, indexName string) (sources []map[string]interface{},err error){
url := "http://" + serverIp + ":" + serverPort +
--
Gitblit v1.8.0