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: do not use backend-mode when keepCookies is used (#49222)

Browse Source
This commit is contained in:
Gábor Farkas 2022-05-19 14:26:54 +02:00 committed by GitHub
parent 78e22aac59
commit 0355772e36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,6 +105,7 @@ export class LokiDatasource
private streams = new LiveStreams(); private streams = new LiveStreams();
languageProvider: LanguageProvider; languageProvider: LanguageProvider;
maxLines: number; maxLines: number;
useBackendMode: boolean;
constructor( constructor(
private instanceSettings: DataSourceInstanceSettings<LokiOptions>, private instanceSettings: DataSourceInstanceSettings<LokiOptions>,
@ -116,6 +117,9 @@ export class LokiDatasource
this.languageProvider = new LanguageProvider(this); this.languageProvider = new LanguageProvider(this);
const settingsData = instanceSettings.jsonData || {}; const settingsData = instanceSettings.jsonData || {};
this.maxLines = parseInt(settingsData.maxLines ?? '0', 10) || DEFAULT_MAX_LINES; this.maxLines = parseInt(settingsData.maxLines ?? '0', 10) || DEFAULT_MAX_LINES;
const keepCookiesUsed = (settingsData.keepCookies ?? []).length > 0;
// only use backend-mode when keep-cookies is not used
this.useBackendMode = !keepCookiesUsed && (config.featureToggles.lokiBackendMode ?? false);
} }
_request(apiUrl: string, data?: any, options?: Partial<BackendSrvRequest>): Observable<Record<string, any>> { _request(apiUrl: string, data?: any, options?: Partial<BackendSrvRequest>): Observable<Record<string, any>> {
@ -168,7 +172,7 @@ export class LokiDatasource
...this.getRangeScopedVars(request.range), ...this.getRangeScopedVars(request.range),
}; };
if (config.featureToggles.lokiBackendMode) { if (this.useBackendMode) {
// we "fix" the loki queries to have `.queryType` and not have `.instant` and `.range` // we "fix" the loki queries to have `.queryType` and not have `.instant` and `.range`
const fixedRequest = { const fixedRequest = {
...request, ...request,

1
public/app/plugins/datasource/loki/types.ts
View File

@ -57,6 +57,7 @@ export interface LokiOptions extends DataSourceJsonData {
maxLines?: string; maxLines?: string;
derivedFields?: DerivedFieldConfig[]; derivedFields?: DerivedFieldConfig[];
alertmanager?: string; alertmanager?: string;
keepCookies?: string[];
} }
export interface LokiStats { export interface LokiStats {