修改框架查询influxdb的时间单位

epoch=ms，与以前虚拟机监控时间单位进行统一

pkg/apis/monitor/unifiedmonitor_const.go

@@ -11,6 +11,18 @@ var (
 	UNIFIED_MONITOR_GROUPBY_OPT_VALUE = map[string][]string{
 		"fill": {"linear", "none", "previous", "0"},
 	}
+
+	MEASUREMENT_TAG_KEYWORD = map[string]string{
+		"cpu":       "host",
+		"disk":      "device",
+		"mem":       "host",
+		"net":       "host",
+		"netstat":   "host",
+		"vm_cpu":    "vm_name",
+		"vm_diskio": "vm_name",
+		"vm_mem":    "vm_name",
+		"vm_netio":  "vm_name",
+	}
 )
 
 type MetricFunc struct {

pkg/monitor/models/datasource.go

@@ -18,7 +18,6 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"strings"
 	"time"
 
 	"golang.org/x/sync/errgroup"
@@ -280,10 +279,14 @@ func getAttributesOnMeasurement(database, tp string, output *monitor.InfluxMeasu
 }
 
 func getTagValue(database string, output *monitor.InfluxMeasurement, db *influxdb.SInfluxdb) error {
-
-	dbRtn, err := db.Query(fmt.Sprintf("SHOW TAG VALUES ON %s FROM %s WITH KEY IN (%s)", database, output.Measurement, strings.Join(output.TagKey, ",")))
+	if len(output.TagKey) == 0 {
+		return nil
+	}
+	tagKeyStr := jsonutils.NewStringArray(output.TagKey).String()
+	tagKeyStr = tagKeyStr[1 : len(tagKeyStr)-1]
+	dbRtn, err := db.Query(fmt.Sprintf("SHOW TAG VALUES ON %s FROM %s WITH KEY IN (%s)", database, output.Measurement, tagKeyStr))
 	if err != nil {
-		return errors.Wrap(err, "SHOW MEASUREMENTS")
+		return err
 	}
 	res := dbRtn[0][0]
 	tagValue := make(map[string][]string, 0)

pkg/monitor/models/unifiedmonitor.go

@@ -17,6 +17,7 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/auth"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	mq "yunion.io/x/onecloud/pkg/monitor/metricquery"
+	"yunion.io/x/onecloud/pkg/monitor/tsdb"
 	"yunion.io/x/onecloud/pkg/monitor/validators"
 )
 
@@ -154,10 +155,22 @@ func (self *SUnifiedMonitorManager) PerformQuery(ctx context.Context, userCred m
 			return jsonutils.NewDict(), err
 		}
 	}
+
+	var groupByTag = make([]string, 0)
+	for _, query := range inputQuery.MetricQuery {
+		for _, group := range query.Model.GroupBy {
+			if group.Type == "tag" {
+				groupByTag = append(groupByTag, group.Params[0])
+			}
+		}
+	}
+
 	rtn, err := doQuery(*inputQuery)
 	if err != nil {
 		return jsonutils.NewDict(), err
 	}
+
+	setSerieRowName(&rtn.Series, groupByTag)
 	return jsonutils.Marshal(rtn), nil
 }
 
@@ -234,3 +247,46 @@ func setDataSourceId(query *monitor.AlertQuery) {
 	datasource, _ := DataSourceManager.GetDefaultSource()
 	query.DataSourceId = datasource.Id
 }
+
+func setSerieRowName(series *tsdb.TimeSeriesSlice, groupTag []string) {
+	//Add rowname，The front end displays the curve according to rowname
+	var index, unknownIndex = 1, 1
+	for i, serie := range *series {
+		//setRowName by groupTag
+		if len(groupTag) != 0 {
+			for key, val := range serie.Tags {
+
+				if strings.Contains(strings.Join(groupTag, ","), key) {
+					serie.RawName = fmt.Sprintf("%s", val)
+					(*series)[i] = serie
+					break
+				}
+			}
+			continue
+		}
+
+		//sep measurement set RowName by spe param
+		measurement := strings.Split(serie.Name, ".")[0]
+		if key, ok := monitor.MEASUREMENT_TAG_KEYWORD[measurement]; ok {
+			serie.RawName = serie.Tags[key]
+			(*series)[i] = serie
+			continue
+		}
+
+		//other condition set RowName
+		for key, val := range serie.Tags {
+			if strings.Contains(key, "id") {
+				serie.RawName = fmt.Sprintf("%d: %s", index, val)
+				(*series)[i] = serie
+				index++
+				break
+			}
+		}
+		if serie.RawName == "" {
+			serie.RawName = fmt.Sprintf("unknown-%d", unknownIndex)
+			(*series)[i] = serie
+			unknownIndex++
+		}
+	}
+
+}

pkg/monitor/tsdb/driver/influxdb/influxdb.go

@@ -175,7 +175,7 @@ func (e *InfluxdbExecutor) createRequest(dsInfo *tsdb.DataSource, query string)
 
 	params := req.URL.Query()
 	params.Set("db", dsInfo.Database)
-	params.Set("epoch", "s")
+	params.Set("epoch", "ms")
 
 	req.Header.Set("Content-type", "application/x-www-form-urlencoded")