From 19123444a139908f6729a60f3727eebe2a1ccdcd Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 25 Mar 2020 22:30:22 -0700
Subject: [PATCH] Chore: move specific DataQuery props to loki/tsdb (#23086)

---
 packages/grafana-data/src/types/datasource.ts        | 7 -------
 public/app/plugins/datasource/loki/types.ts          | 1 +
 public/app/plugins/datasource/opentsdb/datasource.ts | 2 +-
 public/app/plugins/datasource/opentsdb/types.ts      | 4 +++-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/grafana-data/src/types/datasource.ts b/packages/grafana-data/src/types/datasource.ts
index cbe639e2dbb..1d588ad8872 100644
--- a/packages/grafana-data/src/types/datasource.ts
+++ b/packages/grafana-data/src/types/datasource.ts
@@ -391,13 +391,6 @@ export interface DataQuery {
    * For non mixed scenarios this is undefined.
    */
   datasource?: string | null;
-
-  metric?: any;
-
-  /**
-   * For limiting result lines.
-   */
-  maxLines?: number;
 }
 
 export interface DataQueryError {
diff --git a/public/app/plugins/datasource/loki/types.ts b/public/app/plugins/datasource/loki/types.ts
index 76b9421526f..9b1fe667bf0 100644
--- a/public/app/plugins/datasource/loki/types.ts
+++ b/public/app/plugins/datasource/loki/types.ts
@@ -42,6 +42,7 @@ export interface LokiQuery extends DataQuery {
   reverse?: boolean;
   legendFormat?: string;
   valueWithRefId?: boolean;
+  maxLines?: number;
 }
 
 export interface LokiOptions extends DataSourceJsonData {
diff --git a/public/app/plugins/datasource/opentsdb/datasource.ts b/public/app/plugins/datasource/opentsdb/datasource.ts
index 38148755dbd..e1fff43daad 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.ts
+++ b/public/app/plugins/datasource/opentsdb/datasource.ts
@@ -38,7 +38,7 @@ export default class OpenTsDatasource extends DataSourceApi<OpenTsdbQuery, OpenT
   }
 
   // Called once per panel (graph)
-  query(options: DataQueryRequest) {
+  query(options: DataQueryRequest<OpenTsdbQuery>) {
     const start = this.convertToTSDBTime(options.rangeRaw.from, false, options.timezone);
     const end = this.convertToTSDBTime(options.rangeRaw.to, true, options.timezone);
     const qs: any[] = [];
diff --git a/public/app/plugins/datasource/opentsdb/types.ts b/public/app/plugins/datasource/opentsdb/types.ts
index 0fa868ee750..4a5cf58eb47 100644
--- a/public/app/plugins/datasource/opentsdb/types.ts
+++ b/public/app/plugins/datasource/opentsdb/types.ts
@@ -1,6 +1,8 @@
 import { DataQuery, DataSourceJsonData } from '@grafana/data';
 
-export interface OpenTsdbQuery extends DataQuery {}
+export interface OpenTsdbQuery extends DataQuery {
+  metric?: any;
+}
 
 export interface OpenTsdbOptions extends DataSourceJsonData {
   tsdbVersion: number;