Chore: move specific DataQuery props to loki/tsdb (#23086)

packages/grafana-data/src/types/datasource.ts

@@ -391,13 +391,6 @@ export interface DataQuery {
    * For non mixed scenarios this is undefined.
    * For non mixed scenarios this is undefined.
    */
    */
   datasource?: string | null;
   datasource?: string | null;
-
-  metric?: any;
-
-  /**
-   * For limiting result lines.
-   */
-  maxLines?: number;
 }
 }
 
 
 export interface DataQueryError {
 export interface DataQueryError {

public/app/plugins/datasource/loki/types.ts

@@ -42,6 +42,7 @@ export interface LokiQuery extends DataQuery {
   reverse?: boolean;
   reverse?: boolean;
   legendFormat?: string;
   legendFormat?: string;
   valueWithRefId?: boolean;
   valueWithRefId?: boolean;
+  maxLines?: number;
 }
 }
 
 
 export interface LokiOptions extends DataSourceJsonData {
 export interface LokiOptions extends DataSourceJsonData {

public/app/plugins/datasource/opentsdb/datasource.ts

@@ -38,7 +38,7 @@ export default class OpenTsDatasource extends DataSourceApi<OpenTsdbQuery, OpenT
   }
   }
 
 
   // Called once per panel (graph)
   // Called once per panel (graph)
-  query(options: DataQueryRequest) {
+  query(options: DataQueryRequest<OpenTsdbQuery>) {
     const start = this.convertToTSDBTime(options.rangeRaw.from, false, options.timezone);
     const start = this.convertToTSDBTime(options.rangeRaw.from, false, options.timezone);
     const end = this.convertToTSDBTime(options.rangeRaw.to, true, options.timezone);
     const end = this.convertToTSDBTime(options.rangeRaw.to, true, options.timezone);
     const qs: any[] = [];
     const qs: any[] = [];

public/app/plugins/datasource/opentsdb/types.ts

 import { DataQuery, DataSourceJsonData } from '@grafana/data';
 import { DataQuery, DataSourceJsonData } from '@grafana/data';
 
 
-export interface OpenTsdbQuery extends DataQuery {}
+export interface OpenTsdbQuery extends DataQuery {
+  metric?: any;
+}
 
 
 export interface OpenTsdbOptions extends DataSourceJsonData {
 export interface OpenTsdbOptions extends DataSourceJsonData {
   tsdbVersion: number;
   tsdbVersion: number;