Fix health check

Author: nineinchnick

pkg/trino/models/settings.go

@@ -22,18 +22,19 @@ func (s *TrinoDatasourceSettings) Load(config backend.DataSourceInstanceSettings
 	if len(opts.Headers) != 0 {
 		return errors.New("Custom headers are not supported and must be not set")
 	}
-	if len(opts.CustomOptions) != 0 {
-		return errors.New("Custom options are not supported and must be not set")
-	}
 	log.DefaultLogger.Info("Loading Trino data source settings")
 	s.URL, err = url.Parse(config.URL)
 	if err != nil {
 		return err
 	}
-	if opts.BasicAuth.Password != "" {
-		s.URL.User = url.UserPassword(opts.BasicAuth.User, opts.BasicAuth.Password)
+	if opts.BasicAuth != nil {
+		if opts.BasicAuth.Password != "" {
+			s.URL.User = url.UserPassword(opts.BasicAuth.User, opts.BasicAuth.Password)
+		} else {
+			s.URL.User = url.User(opts.BasicAuth.User)
+		}
 	} else {
-		s.URL.User = url.User(opts.BasicAuth.User)
+		s.URL.User = url.User("grafana")
 	}
 	s.Opts = opts
 	return nil

src/datasource.ts

@@ -15,17 +15,19 @@ export class DataSource extends DataSourceWithBackend<TrinoQuery, TrinoDataSourc
         .fetch({
           url: '/api/ds/query',
           method: 'POST',
+          requestId: 'A',
           data: {
             from: '5m',
             to: 'now',
             queries: [
               {
                 refId: 'A',
+                key: 'A',
                 intervalMs: 1,
                 maxDataPoints: 1,
                 datasource: this.getRef(),
-                rawSql: 'SELECT 1',
-                format: 'table',
+                rawSQL: 'SELECT 1',
+                format: 0,
               },
             ],
           },

src/types.ts

@@ -27,16 +27,19 @@ export const SelectableFormatOptions: Array<SelectableValue<FormatOptions>> = [
 
 export const defaultQuery: Partial<TrinoQuery> = {
   rawSQL: `SELECT
-  $__timeEpoch(<time_column>),
-  <value column> as value,
-  <series name column> as metric
+  $__timeGroup(time_column, '1h'),
+  value_column as value,
+  series_column as metric
 FROM
-  <catalog name>.<schema name>.<table name>
+  catalog_name.schema_name.table_name
 WHERE
   $__timeFilter(time_column)
+GROUP BY
+  1, 3
 ORDER BY
-  <time_column> ASC`,
-  format: FormatOptions.Table,
+  1
+`,
+  format: FormatOptions.TimeSeries,
 };
 
 /**