fix incompatible cherry-pick change

tespkg · Sep 24, 2024 · 192453d · 192453d
1 parent a1cb7b6
commit 192453d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pkg/tsdb/mysql/mysql.go b/pkg/tsdb/mysql/mysql.go
@@ -51,9 +51,9 @@ func ProvideService(cfg *setting.Cfg, httpClientProvider httpclient.Provider) *S
 func newInstanceSettings(cfg *setting.Cfg, httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
 	return func(settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		jsonData := sqleng.JsonData{
-			MaxOpenConns:            cfg.SqlDatasourceMaxOpenConnsDefault,
-			MaxIdleConns:            cfg.SqlDatasourceMaxIdleConnsDefault,
-			ConnMaxLifetime:         cfg.SqlDatasourceMaxConnLifetimeDefault,
+			MaxOpenConns:            0,
+			MaxIdleConns:            2,
+			ConnMaxLifetime:         14400,
 			SecureDSProxy:           false,
 			AllowCleartextPasswords: false,
 		}

diff --git a/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx
@@ -36,9 +36,9 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<My
     };
   };
 
-  const WIDTH_SHORT = 15;
-  const WIDTH_MEDIUM = 25;
-  const WIDTH_LONG = 40;
+  const mediumWidth = 20;
+  const shortWidth = 15;
+  const longWidth = 40;
 
   return (
     <>
@@ -130,7 +130,7 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps<My
           ></InlineSwitch>
         </InlineField>
         <InlineField
-          labelWidth={WIDTH_MEDIUM}
+          labelWidth={mediumWidth}
           tooltip={
             <span>
               Allows using the cleartext client side plugin if required by an account, such as one defined with the PAM