Merge branch 'main' of github.com:data-observe/datav into panel-edit

Author: Germiniku

README.md

@@ -30,7 +30,7 @@ It can help users quickly create online observability scenarios such as monitori
 
 ## Roadmap to V1.0
 
-Till now, we have implemented the UI part of Datav, which can aslo be used as an alternative to Grafana.
+Till now, we have implemented the UI part of Datav, which can also be used as an alternative to Grafana.
 
 We are now still working on the observability part, and it will be released in [V1.0](https://github.com/data-observe/datav/milestone/7).
 
@@ -48,7 +48,7 @@ We are now still working on the observability part, and it will be released in [
 
 6. **Modern UI design**: supports large data screens, and is perfectly compatible with mobile devices.
 
-7. **Programmability**: powerful programmability and developer-friendly for customizations, e.g Datav agent support use webassembly to develop your own plugins and data process pipleines.
+7. **Programmability**: powerful programmability and developer-friendly for customizations, e.g Datav agent support use webassembly to develop your own plugins and data process pipelines.
 
 8. **Community**: comes with a permissive open-source license, extensive documentation, and rapid community support response.
 

query/go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/golang/snappy v0.0.4
 	github.com/gosimple/slug v1.9.0
 	github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac
+	github.com/lib/pq v1.10.9
 	github.com/lithammer/shortuuid/v3 v3.0.5
 	github.com/mattn/go-sqlite3 v1.14.17
 	github.com/spf13/cobra v1.6.1
@@ -58,7 +59,6 @@ require (
 	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/lib/pq v1.10.9 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect

query/internal/plugins/builtin/plugins.go

@@ -1,6 +1,7 @@
 package builtin
 
 import (
+	_ "github.com/DataObserve/datav/query/internal/plugins/builtin/datav"
 	_ "github.com/DataObserve/datav/query/internal/plugins/builtin/mysql"
 	_ "github.com/DataObserve/datav/query/internal/plugins/builtin/postgresql"
 )

query/internal/plugins/external/clickhouse/clickhouse.go

@@ -1,9 +1,7 @@
 package clickhouse
 
 import (
-	"reflect"
 	"sync"
-	"time"
 
 	ch "github.com/ClickHouse/clickhouse-go/v2"
 	pluginUtils "github.com/DataObserve/datav/query/internal/plugins/utils"
@@ -43,46 +41,14 @@ func (p *ClickHousePlugin) Query(c *gin.Context, ds *models.Datasource) models.P
 	}
 	defer rows.Close()
 
-	columns := rows.Columns()
-	columnTypes := rows.ColumnTypes()
-	types := make(map[string]string)
-	data := make([][]interface{}, 0)
-	for rows.Next() {
-		v := make([]interface{}, len(columns))
-		for i := range v {
-			t := columnTypes[i].ScanType()
-			v[i] = reflect.New(t).Interface()
+	colorlog.RootLogger.Info("Query from clickhouse", "query", query)
 
-			tp := t.String()
-			if tp == "time.Time" {
-				types[columns[i]] = "time"
-			}
-		}
-
-		err = rows.Scan(v...)
-		if err != nil {
-			colorlog.RootLogger.Info("Error scan clickhouse :", "error", err, "ds_id", ds.Id)
-			continue
-		}
-
-		for i, v0 := range v {
-			v1, ok := v0.(*time.Time)
-			if ok {
-				v[i] = v1.Unix()
-			}
-		}
-
-		data = append(data, v)
+	res, err := pluginUtils.ConvertDbRowsToPluginData(rows)
+	if err != nil {
+		return models.GenPluginResult(models.PluginStatusError, err.Error(), nil)
 	}
 
-	return models.PluginResult{
-		Status: models.PluginStatusSuccess,
-		Error:  "",
-		Data: models.PluginResultData{
-			Columns:     columns,
-			Data:        data,
-			ColumnTypes: types,
-		}}
+	return models.GenPluginResult(models.PluginStatusSuccess, "", res)
 }
 
 func (p *ClickHousePlugin) TestDatasource(c *gin.Context) models.PluginResult {

query/internal/plugins/utils/clickhouse.go

@@ -3,9 +3,12 @@ package pluginUtils
 import (
 	"context"
 	"net"
+	"reflect"
 	"strings"
 	"time"
 
+	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
+
 	ch "github.com/ClickHouse/clickhouse-go/v2"
 	"github.com/DataObserve/datav/query/pkg/models"
 	"github.com/gin-gonic/gin"
@@ -78,3 +81,42 @@ func TestClickhouseDatasource(c *gin.Context) models.PluginResult {
 
 	return models.GenPluginResult(models.PluginStatusSuccess, "", nil)
 }
+
+func ConvertDbRowsToPluginData(rows driver.Rows) (*models.PluginResultData, error) {
+	columns := rows.Columns()
+	columnTypes := rows.ColumnTypes()
+	types := make(map[string]string)
+	data := make([][]interface{}, 0)
+	for rows.Next() {
+		v := make([]interface{}, len(columns))
+		for i := range v {
+			t := columnTypes[i].ScanType()
+			v[i] = reflect.New(t).Interface()
+
+			tp := t.String()
+			if tp == "time.Time" {
+				types[columns[i]] = "time"
+			}
+		}
+
+		err := rows.Scan(v...)
+		if err != nil {
+			return nil, err
+		}
+
+		for i, v0 := range v {
+			v1, ok := v0.(*time.Time)
+			if ok {
+				v[i] = v1.Unix()
+			}
+		}
+
+		data = append(data, v)
+	}
+
+	return &models.PluginResultData{
+		Columns:     columns,
+		Data:        data,
+		ColumnTypes: types,
+	}, nil
+}

query/pkg/config/config.go

@@ -99,7 +99,7 @@ type Config struct {
 		DisablePanels      []string `yaml:"disable_panels"`
 		DisableDatasources []string `yaml:"disable_datasources"`
 	}
-	Observability
+	Observability Observability
 }
 
 type Observability struct {

query/pkg/models/plugin.go

@@ -1,10 +1,6 @@
 package models
 
 import (
-	"reflect"
-	"time"
-
-	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
 	"github.com/gin-gonic/gin"
 )
 
@@ -54,42 +50,3 @@ func GenPluginResult(status, err string, data interface{}) PluginResult {
 		Data:   data,
 	}
 }
-
-func ConvertDbRowsToPluginData(rows driver.Rows) (*PluginResultData, error) {
-	columns := rows.Columns()
-	columnTypes := rows.ColumnTypes()
-	types := make(map[string]string)
-	data := make([][]interface{}, 0)
-	for rows.Next() {
-		v := make([]interface{}, len(columns))
-		for i := range v {
-			t := columnTypes[i].ScanType()
-			v[i] = reflect.New(t).Interface()
-
-			tp := t.String()
-			if tp == "time.Time" {
-				types[columns[i]] = "time"
-			}
-		}
-
-		err := rows.Scan(v...)
-		if err != nil {
-			return nil, err
-		}
-
-		for i, v0 := range v {
-			v1, ok := v0.(*time.Time)
-			if ok {
-				v[i] = v1.Unix()
-			}
-		}
-
-		data = append(data, v)
-	}
-
-	return &PluginResultData{
-		Columns:     columns,
-		Data:        data,
-		ColumnTypes: types,
-	}, nil
-}

ui/src/components/input/InputWithTips.tsx

@@ -0,0 +1,45 @@
+// Copyright 2023 Datav.io Team
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Box, Input, Popover, PopoverBody, PopoverContent, PopoverTrigger, useDisclosure } from "@chakra-ui/react"
+import React from "react"
+
+const InputWithTips = ({ value, onChange, onConfirm=null, width, children, placeholder = "Enter....", variant = "flushed", size = "md" }) => {
+    const { isOpen, onToggle, onClose } = useDisclosure()
+    return (<>
+        <Input value={value} onChange={e => onChange(e.currentTarget.value)} width={width} size={size} variant={variant} placeholder={placeholder} onFocus={onToggle} onBlur={onToggle} onKeyDown={e => {
+            if (onConfirm && e.key === 'Enter') {
+                onConfirm()
+            }
+        }} />
+        <Popover
+            returnFocusOnClose={false}
+            isOpen={isOpen}
+            onClose={onClose}
+            placement='bottom'
+            closeOnBlur={false}
+            autoFocus={false}
+        >
+            <PopoverTrigger>
+                <Box position="absolute" top="40px"></Box>
+            </PopoverTrigger>
+            <PopoverContent width={width}>
+                <PopoverBody>
+                    {children}
+                </PopoverBody>
+            </PopoverContent>
+        </Popover>
+    </>)
+}
+
+export default InputWithTips

ui/src/types/format.ts

@@ -1,4 +1,5 @@
 export enum DataFormat {
     TimeSeries = "timeseries",
     Table = "table",
+    Logs = "logs"
 }

ui/src/views/dashboard/plugins/built-in/datasource/datav/DatasourceEditor.tsx

@@ -14,6 +14,7 @@ import { Datasource } from "types/datasource"
 import React from "react";
 import FormItem from "components/form/Item";
 import { Input, Text } from "@chakra-ui/react";
+import { isEmpty } from "utils/validate";
 interface Props {
     datasource: Datasource
     onChange: any
@@ -27,7 +28,7 @@ const DatasourceEditor = ({ datasource, onChange }: Props) => {
         return
     }
 
-    if (!datasource.data) {
+    if (isEmpty(datasource.data)) {
         onChange(d => { d.data = defaultData})
         return 
     }