Merge branch 'main' into renovate/github.com-grafana-grafana-plugin-sdk-go-0.x

Author: alyssajoyner

package-lock.json

@@ -43,7 +43,7 @@
     "@types/jest": "^29.5.13",
     "@types/lodash": "^4.17.21",
     "@types/node": "^24.8.0",
-    "@types/react": "18.3.27",
+    "@types/react": "18.3.28",
     "@types/react-dom": "18.3.7",
     "@types/react-router-dom": "^5.3.3",
     "@types/semver": "^7.7.1",
@@ -55,7 +55,7 @@
     "css-loader": "^7.1.2",
     "eslint": "^9.0.0",
     "eslint-config-prettier": "^10.0.0",
-    "eslint-plugin-jsdoc": "^62.0.0",
+    "eslint-plugin-jsdoc": "^62.5.2",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-webpack-plugin": "^5.0.0",
@@ -68,7 +68,7 @@
     "prettier": "^3.8.1",
     "replace-in-file-webpack-plugin": "^1.0.6",
     "sass": "1.97.3",
-    "sass-loader": "16.0.6",
+    "sass-loader": "16.0.7",
     "style-loader": "4.0.0",
     "swc-loader": "^0.2.6",
     "terser-webpack-plugin": "^5.3.16",
@@ -86,10 +86,10 @@
   },
   "dependencies": {
     "@emotion/css": "11.13.5",
-    "@grafana/data": "12.4.0-21771025861",
-    "@grafana/runtime": "12.4.0-21771025861",
-    "@grafana/schema": "12.4.0-21771025861",
-    "@grafana/ui": "12.4.0-21771025861",
+    "@grafana/data": "12.4.0-21888037580",
+    "@grafana/runtime": "12.4.0-21888037580",
+    "@grafana/schema": "12.4.0-21888037580",
+    "@grafana/ui": "12.4.0-21888037580",
     "js-sql-parser": "^1.6.0",
     "pgsql-ast-parser": "^12.0.1",
     "semver": "^7.7.3",

package.json

@@ -148,10 +148,22 @@ func LoadSettings(ctx context.Context, config backend.DataSourceInstanceSettings
 
 	// Deprecated: Replaced with DialTimeout for v4. Deserializes "timeout" field for old v3 configs.
 	if jsonData["timeout"] != nil {
-		settings.DialTimeout = jsonData["timeout"].(string)
+		if val, ok := jsonData["timeout"].(string); !ok {
+			if val, ok := jsonData["timeout"].(float64); ok {
+				settings.DialTimeout = fmt.Sprintf("%d", int64(val))
+			}
+		} else {
+			settings.DialTimeout = val
+		}
 	}
 	if jsonData["dialTimeout"] != nil {
-		settings.DialTimeout = jsonData["dialTimeout"].(string)
+		if val, ok := jsonData["dialTimeout"].(string); !ok {
+			if val, ok := jsonData["dialTimeout"].(float64); ok {
+				settings.DialTimeout = fmt.Sprintf("%d", int64(val))
+			}
+		} else {
+			settings.DialTimeout = val
+		}
 	}
 
 	if jsonData["queryTimeout"] != nil {

pkg/plugin/settings.go

@@ -216,6 +216,69 @@ func TestLoadSettings(t *testing.T) {
 				wantErr: nil,
 				testCtx: ctx,
 			},
+			{
+				name: "should accept numeric dialTimeout and queryTimeout values",
+				args: args{
+					config: backend.DataSourceInstanceSettings{
+						JSONData:                []byte(`{"host": "test", "port": 443, "dialTimeout": 15, "queryTimeout": 120}`),
+						DecryptedSecureJSONData: map[string]string{},
+					},
+				},
+				wantSettings: Settings{
+					Host:            "test",
+					Port:            443,
+					ConnMaxLifetime: "5",
+					DialTimeout:     "15",
+					MaxIdleConns:    "25",
+					MaxOpenConns:    "50",
+					QueryTimeout:    "120",
+					EnableRowLimit:  false,
+				},
+				wantErr: nil,
+				testCtx: ctx,
+			},
+			{
+				name: "should accept numeric timeout value (v3 deprecated field)",
+				args: args{
+					config: backend.DataSourceInstanceSettings{
+						JSONData:                []byte(`{"server": "test", "port": 443, "timeout": 25}`),
+						DecryptedSecureJSONData: map[string]string{},
+					},
+				},
+				wantSettings: Settings{
+					Host:            "test",
+					Port:            443,
+					ConnMaxLifetime: "5",
+					DialTimeout:     "25",
+					MaxIdleConns:    "25",
+					MaxOpenConns:    "50",
+					QueryTimeout:    "60",
+					EnableRowLimit:  false,
+				},
+				wantErr: nil,
+				testCtx: ctx,
+			},
+			{
+				name: "should accept numeric timeout values with floating point precision",
+				args: args{
+					config: backend.DataSourceInstanceSettings{
+						JSONData:                []byte(`{"host": "test", "port": 443, "dialTimeout": 10.5, "queryTimeout": 60.7}`),
+						DecryptedSecureJSONData: map[string]string{},
+					},
+				},
+				wantSettings: Settings{
+					Host:            "test",
+					Port:            443,
+					ConnMaxLifetime: "5",
+					DialTimeout:     "10",
+					MaxIdleConns:    "25",
+					MaxOpenConns:    "50",
+					QueryTimeout:    "60",
+					EnableRowLimit:  false,
+				},
+				wantErr: nil,
+				testCtx: ctx,
+			},
 		}
 		for _, tt := range tests {
 			t.Run(tt.name, func(t *testing.T) {

pkg/plugin/settings_test.go

@@ -6,7 +6,7 @@ import { ServerAndEncryptionSection } from './ServerAndEncryptionSection';
 import { css } from '@emotion/css';
 import { LeftSidebar } from './LeftSidebar';
 import { CONTAINER_MIN_WIDTH } from './constants';
-import { trackInfluxDBConfigV2FeedbackButtonClicked } from './tracking';
+import { trackClickhouseConfigV2FeedbackButtonClicked } from './tracking';
 import { AdditionalSettingsSection } from './AdditionalSettingsSection';
 import { DatabaseCredentialsSection } from './DatabaseCredentialsSection';
 import { TLSSSLSettingsSection } from './TLSSSLSettingsSection';
@@ -35,7 +35,7 @@ export const ConfigEditor: React.FC<ConfigEditorProps> = (props) => {
               <TextLink
                 href="https://docs.google.com/forms/d/e/1FAIpQLSd5YOYxfW-CU0tQnfFA08fkymGlmZ8XcFRMniE5lScIsmdt5w/viewform"
                 external
-                onClick={trackInfluxDBConfigV2FeedbackButtonClicked}
+                onClick={trackClickhouseConfigV2FeedbackButtonClicked}
               >
                 Share your thoughts
               </TextLink>{' '}

src/views/config-v2/CHConfigEditor.tsx

@@ -1,7 +1,7 @@
 import { Protocol } from 'types/config';
 
 /**
- * Creates a set of test props for the InfluxDB V2 config page for use in tests.
+ * Creates a set of test props for the Clickhouse V2 config page for use in tests.
  * This function allows you to override default properties for specific test cases.
  */
 export const createTestProps = (overrides: { options?: object; mocks?: object }) => ({

src/views/config-v2/helpers.ts

@@ -2,7 +2,7 @@ import { reportInteraction } from '@grafana/runtime';
 import { TimeUnit } from 'types/queryBuilder';
 
 // Feedback form
-export const trackInfluxDBConfigV2FeedbackButtonClicked = () => {
+export const trackClickhouseConfigV2FeedbackButtonClicked = () => {
   reportInteraction('clickhouse_config_v2_feedback_button_clicked');
 };