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

Loki: Fix Loki with repeated panels and interpolation for Explore (#21685)

Browse Source
This commit is contained in:
Ivana Huckova 2020-01-24 09:50:09 +01:00 committed by GitHub
parent f91a495875
commit e75840737e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-data/src/types/datasource.ts
View File

@ -276,7 +276,7 @@ export abstract class DataSourceApi<
*/
annotationQuery?(options: AnnotationQueryRequest<TQuery>): Promise<AnnotationEvent[]>;
interpolateVariablesInQueries?(queries: TQuery[]): TQuery[];
interpolateVariablesInQueries?(queries: TQuery[], scopedVars: ScopedVars | {}): TQuery[];
}
export interface MetadataInspectorProps<

1
packages/grafana-data/src/types/panel.ts
View File

@ -52,6 +52,7 @@ export interface PanelModel<TOptions = any> {
id: number;
options: TOptions;
pluginVersion?: string;
scopedVars?: ScopedVars;
}
/**

3
public/app/core/utils/explore.ts
View File

@ -88,11 +88,12 @@ export async function getExploreUrl(args: GetExploreUrlArguments) {
const range = timeSrv.timeRangeForUrl();
let state: Partial<ExploreUrlState> = { range };
if (exploreDatasource.interpolateVariablesInQueries) {
const scopedVars = panel.scopedVars || {};
state = {
...state,
datasource: exploreDatasource.name,
context: 'explore',
queries: exploreDatasource.interpolateVariablesInQueries(exploreTargets),
queries: exploreDatasource.interpolateVariablesInQueries(exploreTargets, scopedVars),
};
} else {
state = {

5
public/app/plugins/datasource/elasticsearch/datasource.ts
View File

@ -6,6 +6,7 @@ import {
DataQueryRequest,
DataQueryResponse,
DataFrame,
ScopedVars,
} from '@grafana/data';
import { ElasticResponse } from './elastic_response';
import { IndexPattern } from './index_pattern';
@ -263,14 +264,14 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
});
}
interpolateVariablesInQueries(queries: ElasticsearchQuery[]): ElasticsearchQuery[] {
interpolateVariablesInQueries(queries: ElasticsearchQuery[], scopedVars: ScopedVars): ElasticsearchQuery[] {
let expandedQueries = queries;
if (queries && queries.length > 0) {
expandedQueries = queries.map(query => {
const expandedQuery = {
...query,
datasource: this.name,
query: this.templateSrv.replace(query.query, {}, 'lucene'),
query: this.templateSrv.replace(query.query, scopedVars, 'lucene'),
};
return expandedQuery;
});

4
public/app/plugins/datasource/graphite/datasource.ts
View File

@ -148,14 +148,14 @@ export class GraphiteDatasource extends DataSourceApi<GraphiteQuery, GraphiteOpt
return tags;
}
interpolateVariablesInQueries(queries: GraphiteQuery[]): GraphiteQuery[] {
interpolateVariablesInQueries(queries: GraphiteQuery[], scopedVars: ScopedVars): GraphiteQuery[] {
let expandedQueries = queries;
if (queries && queries.length > 0) {
expandedQueries = queries.map(query => {
const expandedQuery = {
...query,
datasource: this.name,
target: this.templateSrv.replace(query.target),
target: this.templateSrv.replace(query.target, scopedVars),
};
return expandedQuery;
});

8
public/app/plugins/datasource/influxdb/datasource.ts
View File

@ -1,6 +1,6 @@
import _ from 'lodash';
import { dateMath, DataSourceApi, DataSourceInstanceSettings } from '@grafana/data';
import { dateMath, DataSourceApi, DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
import InfluxSeries from './influx_series';
import InfluxQueryModel from './influx_query_model';
import ResponseParser from './response_parser';
@ -167,7 +167,7 @@ export default class InfluxDatasource extends DataSourceApi<InfluxQuery, InfluxO
return false;
}
interpolateVariablesInQueries(queries: InfluxQuery[]): InfluxQuery[] {
interpolateVariablesInQueries(queries: InfluxQuery[], scopedVars: ScopedVars): InfluxQuery[] {
if (!queries || queries.length === 0) {
return [];
}
@ -178,11 +178,11 @@ export default class InfluxDatasource extends DataSourceApi<InfluxQuery, InfluxO
const expandedQuery = {
...query,
datasource: this.name,
measurement: this.templateSrv.replace(query.measurement, null, 'regex'),
measurement: this.templateSrv.replace(query.measurement, scopedVars, 'regex'),
};
if (query.rawQuery) {
expandedQuery.query = this.templateSrv.replace(query.query, null, 'regex');
expandedQuery.query = this.templateSrv.replace(query.query, scopedVars, 'regex');
}
if (query.tags) {

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

@ -35,6 +35,7 @@ import {
DataQueryRequest,
DataQueryResponse,
AnnotationQueryRequest,
ScopedVars,
} from '@grafana/data';
import {
@ -128,7 +129,7 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
.filter(target => target.expr && !target.hide)
.map(target => ({
...target,
expr: this.templateSrv.replace(target.expr, {}, this.interpolateQueryExpr),
expr: this.templateSrv.replace(target.expr, options.scopedVars, this.interpolateQueryExpr),
}));
if (options.exploreMode === ExploreMode.Metrics) {
@ -350,13 +351,13 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
);
};
interpolateVariablesInQueries(queries: LokiQuery[]): LokiQuery[] {
interpolateVariablesInQueries(queries: LokiQuery[], scopedVars: ScopedVars): LokiQuery[] {
let expandedQueries = queries;
if (queries && queries.length) {
expandedQueries = queries.map(query => ({
...query,
datasource: this.name,
expr: this.templateSrv.replace(query.expr, {}, this.interpolateQueryExpr),
expr: this.templateSrv.replace(query.expr, scopedVars, this.interpolateQueryExpr),
}));
}

8
public/app/plugins/datasource/mssql/datasource.ts
View File

@ -1,6 +1,7 @@
import _ from 'lodash';
import ResponseParser from './response_parser';
import { getBackendSrv } from '@grafana/runtime';
import { ScopedVars } from '@grafana/data';
import { TemplateSrv } from 'app/features/templating/template_srv';
import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
//Types
@ -43,14 +44,17 @@ export class MssqlDatasource {
return quotedValues.join(',');
}
interpolateVariablesInQueries(queries: MssqlQueryForInterpolation[]): MssqlQueryForInterpolation[] {
interpolateVariablesInQueries(
queries: MssqlQueryForInterpolation[],
scopedVars: ScopedVars
): MssqlQueryForInterpolation[] {
let expandedQueries = queries;
if (queries && queries.length > 0) {
expandedQueries = queries.map(query => {
const expandedQuery = {
...query,
datasource: this.name,
rawSql: this.templateSrv.replace(query.rawSql, {}, this.interpolateVariable),
rawSql: this.templateSrv.replace(query.rawSql, scopedVars, this.interpolateVariable),
};
return expandedQuery;
});

11
public/app/plugins/datasource/mysql/datasource.ts
View File

@ -2,6 +2,7 @@ import _ from 'lodash';
import ResponseParser from './response_parser';
import MysqlQuery from 'app/plugins/datasource/mysql/mysql_query';
import { getBackendSrv } from '@grafana/runtime';
import { ScopedVars } from '@grafana/data';
import { TemplateSrv } from 'app/features/templating/template_srv';
import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
//Types
@ -27,7 +28,8 @@ export class MysqlDatasource {
interpolateVariable = (value: string, variable: any) => {
if (typeof value === 'string') {
if (variable.multi || variable.includeAll) {
return this.queryModel.quoteLiteral(value);
const result = this.queryModel.quoteLiteral(value);
return result;
} else {
return value;
}
@ -43,14 +45,17 @@ export class MysqlDatasource {
return quotedValues.join(',');
};
interpolateVariablesInQueries(queries: MysqlQueryForInterpolation[]): MysqlQueryForInterpolation[] {
interpolateVariablesInQueries(
queries: MysqlQueryForInterpolation[],
scopedVars: ScopedVars
): MysqlQueryForInterpolation[] {
let expandedQueries = queries;
if (queries && queries.length > 0) {
expandedQueries = queries.map(query => {
const expandedQuery = {
...query,
datasource: this.name,
rawSql: this.templateSrv.replace(query.rawSql, {}, this.interpolateVariable),
rawSql: this.templateSrv.replace(query.rawSql, scopedVars, this.interpolateVariable),
};
return expandedQuery;
});

8
public/app/plugins/datasource/postgres/datasource.ts
View File

@ -2,6 +2,7 @@ import _ from 'lodash';
import ResponseParser from './response_parser';
import PostgresQuery from 'app/plugins/datasource/postgres/postgres_query';
import { getBackendSrv } from '@grafana/runtime';
import { ScopedVars } from '@grafana/data';
import { TemplateSrv } from 'app/features/templating/template_srv';
import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
//Types
@ -49,14 +50,17 @@ export class PostgresDatasource {
return quotedValues.join(',');
};
interpolateVariablesInQueries(queries: PostgresQueryForInterpolation[]): PostgresQueryForInterpolation[] {
interpolateVariablesInQueries(
queries: PostgresQueryForInterpolation[],
scopedVars: ScopedVars
): PostgresQueryForInterpolation[] {
let expandedQueries = queries;
if (queries && queries.length > 0) {
expandedQueries = queries.map(query => {
const expandedQuery = {
...query,
datasource: this.name,
rawSql: this.templateSrv.replace(query.rawSql, {}, this.interpolateVariable),
rawSql: this.templateSrv.replace(query.rawSql, scopedVars, this.interpolateVariable),
};
return expandedQuery;
});

5
public/app/plugins/datasource/prometheus/datasource.ts
View File

@ -18,6 +18,7 @@ import {
DataQueryResponseData,
DataSourceApi,
DataSourceInstanceSettings,
ScopedVars,
} from '@grafana/data';
import { from, merge, Observable, of, forkJoin } from 'rxjs';
import { filter, map, tap } from 'rxjs/operators';
@ -608,14 +609,14 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
: { status: 'error', message: response.error };
}
interpolateVariablesInQueries(queries: PromQuery[]): PromQuery[] {
interpolateVariablesInQueries(queries: PromQuery[], scopedVars: ScopedVars): PromQuery[] {
let expandedQueries = queries;
if (queries && queries.length) {
expandedQueries = queries.map(query => {
const expandedQuery = {
...query,
datasource: this.name,
expr: templateSrv.replace(query.expr, {}, this.interpolateQueryExpr),
expr: templateSrv.replace(query.expr, scopedVars, this.interpolateQueryExpr),
};
return expandedQuery;
});