From abb1c107767e8011b44078f1212ce59cf718374c Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Tue, 29 Jun 2021 12:06:42 -0400
Subject: [PATCH] Update getTimeRangeParams to return start & end instead of
 from & to (#36268)

---
 public/app/plugins/datasource/loki/datasource.ts        | 2 +-
 public/app/plugins/datasource/loki/language_provider.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index c20b9bce56d..7a185884b37 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -289,7 +289,7 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
 
   getTimeRangeParams() {
     const timeRange = this.timeSrv.timeRange();
-    return { from: timeRange.from.valueOf() * NS_IN_MS, to: timeRange.to.valueOf() * NS_IN_MS };
+    return { start: timeRange.from.valueOf() * NS_IN_MS, end: timeRange.to.valueOf() * NS_IN_MS };
   }
 
   async importQueries(queries: DataQuery[], originDataSource: DataSourceApi): Promise<LokiQuery[]> {
diff --git a/public/app/plugins/datasource/loki/language_provider.ts b/public/app/plugins/datasource/loki/language_provider.ts
index 9df235d0bdf..6cfc87c77f4 100644
--- a/public/app/plugins/datasource/loki/language_provider.ts
+++ b/public/app/plugins/datasource/loki/language_provider.ts
@@ -442,7 +442,7 @@ export default class LokiLanguageProvider extends LanguageProvider {
    */
   fetchSeriesLabels = async (match: string): Promise<Record<string, string[]>> => {
     const url = '/loki/api/v1/series';
-    const { from: start, to: end } = this.datasource.getTimeRangeParams();
+    const { start, end } = this.datasource.getTimeRangeParams();
 
     const cacheKey = this.generateCacheKey(url, start, end, match);
     let value = this.seriesCache.get(cacheKey);
@@ -464,7 +464,7 @@ export default class LokiLanguageProvider extends LanguageProvider {
    */
   fetchSeries = async (match: string): Promise<Array<Record<string, string>>> => {
     const url = '/loki/api/v1/series';
-    const { from: start, to: end } = this.datasource.getTimeRangeParams();
+    const { start, end } = this.datasource.getTimeRangeParams();
     const params = { match, start, end };
     return await this.request(url, params);
   };
@@ -489,7 +489,7 @@ export default class LokiLanguageProvider extends LanguageProvider {
   async fetchLabelValues(key: string): Promise<string[]> {
     const url = `/loki/api/v1/label/${key}/values`;
     const rangeParams = this.datasource.getTimeRangeParams();
-    const { from: start, to: end } = rangeParams;
+    const { start, end } = rangeParams;
 
     const cacheKey = this.generateCacheKey(url, start, end, key);
     const params = { start, end };