fix: grafana not work when endpoint contains dot (open-falcon#924)

* fix: grafana not work when endpoint contains dot

* use go 1.15 instead of 1.8

* inc sleep time to make travis-ci pass

* update goconvey version

* update vendors to fix travis-ci

Author: laiwei

.travis.yml

@@ -3,7 +3,7 @@ sudo: required
 language: go
 
 go:
-  - "1.8"
+  - "1.15"
 
 env:
   - DB_USER=root DB_PASSWORD=test123456 DB_HOST=127.0.0.1 DB_PORT=13306 REDIS_HOST=127.0.0.1 REDIS_PORT=16379 API_PORT=18080 API_HOST=127.0.0.1

docker_test.sh

@@ -14,7 +14,7 @@ docker run --name falcon-mysql -e MYSQL_ROOT_PASSWORD=$DB_PASSWORD -p $DB_PORT:3
 docker run --name falcon-redis -p $REDIS_PORT:6379 -d redis:4-alpine3.8
 
 echo "waiting mysql start..."
-sleep 10
+sleep 15
 for x in `ls ./scripts/mysql/db_schema/*.sql`; do
     echo "- - -" $x ...
     mysql -h $DB_HOST -P$DB_PORT -u$DB_USER -p$DB_PASSWORD < $x
@@ -35,11 +35,13 @@ docker run -itd --name falcon-plus \
 	 -e MYSQL_PORT=$DB_USER:$DB_PASSWORD@tcp\(db.falcon:3306\) \
 	 -e REDIS_PORT=redis.falcon:6379  \
 	 $image_tag
+sleep 15
 
 ## start falcon backend modules, such as graph,api,etc.
-sleep 5
 docker exec falcon-plus sh ctrl.sh start \
 		graph hbs judge transfer nodata aggregator agent gateway api alarm
 
-sleep 5
+echo "sleep 15s waiting for falcon-plus process ready..."
+sleep 15
+
 make test

modules/aggregator/cron/run_test.go

@@ -22,11 +22,11 @@ func Test_expressionValid(t *testing.T) {
 
 	expressionMap := map[string]bool{
 		// true
-		"1210":                                     true,
-		"$#":                                       true,
-		"$(cpu.busy)":                              true,
-		"$(cpu.busy)+$(cpu.idle)-$(cpu.nice)":      true,
-		"$(cpu.busy)>=80":                          true,
+		"1210":                                true,
+		"$#":                                  true,
+		"$(cpu.busy)":                         true,
+		"$(cpu.busy)+$(cpu.idle)-$(cpu.nice)": true,
+		"$(cpu.busy)>=80":                     true,
 		"($(cpu.busy)+$(cpu.idle)-$(cpu.nice))>80": true,
 		"$(qps/module=judge,project=falcon)":       true,
 		"($(cpu.idle)+$(cpu.busy))=100":            true,

modules/api/app/controller/graph/grafana_controller.go

@@ -46,7 +46,7 @@ func repsonseDefault(limit int) (result []APIGrafanaMainQueryOutputs) {
 	for _, h := range enps {
 		result = append(result, APIGrafanaMainQueryOutputs{
 			Expandable: true,
-			Text:       h.Endpoint,
+			Text:       strings.Replace(h.Endpoint, ".", "~", -1), //convert '.' to '~' of endpoint
 		})
 	}
 	return
@@ -62,50 +62,52 @@ func responseHostsRegexp(limit int, regexpKey string) (result []APIGrafanaMainQu
 	for _, h := range enps {
 		result = append(result, APIGrafanaMainQueryOutputs{
 			Expandable: true,
-			Text:       h.Endpoint,
+			Text:       strings.Replace(h.Endpoint, ".", "~", -1), //convert '.' to '~' of endpoint
 		})
 	}
 	return
 }
 
 //for resolve mixed query with endpoint & counter of query string
 func cutEndpointCounterHelp(regexpKey string) (hosts []string, counter string) {
+	//e.g. "{aaa,bbb}#xxx#yyy#zzz#.*" => hosts=[aaa,bbb], counter="xxx\.yyy\.zzz\..*"
 	r, _ := regexp.Compile("^{?([^#}]+)}?#(.+)")
 	matchedList := r.FindAllStringSubmatch(regexpKey, 1)
 	if len(matchedList) != 0 {
 		if len(matchedList[0]) > 1 {
-			//get hosts
-			hostsTmp := matchedList[0][1]
+			//get hosts and convert '~' to '.' of endpoint
+			hostsTmp := strings.Replace(matchedList[0][1], "~", ".", -1)
 			counterTmp := matchedList[0][2]
 			hosts = strings.Split(hostsTmp, ",")
 			counter = strings.Replace(counterTmp, "#", "\\.", -1)
 		}
 	} else {
 		log.Errorf("grafana query inputs error: %v", regexpKey)
 	}
+
 	return
 }
 
 func expandableChecking(counter string, counterSearchKeyWord string) (expsub string, needexp bool) {
-	re := regexp.MustCompile("(\\.\\+|\\.\\*)\\s*$")
-	counterSearchKeyWord = re.ReplaceAllString(counterSearchKeyWord, "")
-	counterSearchKeyWord = strings.Replace(counterSearchKeyWord, "\\.", ".", -1)
-	expCheck := strings.Replace(counter, counterSearchKeyWord, "", -1)
+	terms := strings.Split(counterSearchKeyWord, "\\.")
+	expCheck := ""
+
+	if len(terms) == 1 {
+		expCheck = counter
+	} else {
+		counter_search_prefix := strings.Join(terms[0:len(terms)-1], ".")
+		expCheck = strings.TrimPrefix(counter, counter_search_prefix)
+		expCheck = strings.TrimPrefix(expCheck, ".")
+	}
 	if expCheck == "" {
 		needexp = false
 		expsub = expCheck
 	} else {
-		needexp = true
-		re = regexp.MustCompile("^\\.")
-		expsubArr := strings.Split(re.ReplaceAllString(expCheck, ""), ".")
-		switch len(expsubArr) {
-		case 0:
-			expsub = ""
-		case 1:
-			expsub = expsubArr[0]
+		a := strings.Split(expCheck, ".")
+		expsub = a[0]
+		if len(a) == 1 {
 			needexp = false
-		default:
-			expsub = expsubArr[0]
+		} else {
 			needexp = true
 		}
 	}
@@ -216,6 +218,7 @@ func GrafanaMainQuery(c *gin.Context) {
 	} else if strings.Contains(inputs.Query, "#") && !strings.Contains(inputs.Query, "#select metric") {
 		output = responseCounterRegexp(inputs.Query)
 	}
+	log.Debugf("query response:%v", output)
 	c.JSON(200, output)
 	return
 }