IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update getTimeRangeParams to return start & end instead of from & to (#36268)

Browse Source
This commit is contained in:
Ivana Huckova 2021-06-29 12:06:42 -04:00 committed by GitHub
parent c3e26657e9
commit abb1c10776
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/loki/datasource.ts
View File

@ -289,7 +289,7 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
getTimeRangeParams() { getTimeRangeParams() {
const timeRange = this.timeSrv.timeRange(); 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[]> { async importQueries(queries: DataQuery[], originDataSource: DataSourceApi): Promise<LokiQuery[]> {

6
public/app/plugins/datasource/loki/language_provider.ts
View File

@ -442,7 +442,7 @@ export default class LokiLanguageProvider extends LanguageProvider {
*/ */
fetchSeriesLabels = async (match: string): Promise<Record<string, string[]>> => { fetchSeriesLabels = async (match: string): Promise<Record<string, string[]>> => {
const url = '/loki/api/v1/series'; 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); const cacheKey = this.generateCacheKey(url, start, end, match);
let value = this.seriesCache.get(cacheKey); 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>>> => { fetchSeries = async (match: string): Promise<Array<Record<string, string>>> => {
const url = '/loki/api/v1/series'; 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 }; const params = { match, start, end };
return await this.request(url, params); return await this.request(url, params);
}; };
@ -489,7 +489,7 @@ export default class LokiLanguageProvider extends LanguageProvider {
async fetchLabelValues(key: string): Promise<string[]> { async fetchLabelValues(key: string): Promise<string[]> {
const url = `/loki/api/v1/label/${key}/values`; const url = `/loki/api/v1/label/${key}/values`;
const rangeParams = this.datasource.getTimeRangeParams(); const rangeParams = this.datasource.getTimeRangeParams();
const { from: start, to: end } = rangeParams; const { start, end } = rangeParams;
const cacheKey = this.generateCacheKey(url, start, end, key); const cacheKey = this.generateCacheKey(url, start, end, key);
const params = { start, end }; const params = { start, end };