public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Loki: Escape label-values in context queries (#56614) (#56639)

Browse Source 
(cherry picked from commit 62674604b4)

Co-authored-by: Sven Grossmann <Svennergr@gmail.com>
This commit is contained in:
Grot (@grafanabot)
2022-10-10 14:49:00 +02:00
committed by GitHub
co-authored by Sven Grossmann
parent c258cfb553
commit b8aa31433b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/loki/datasource.ts
+2 -2
View File
@@ -49,7 +49,7 @@ import LanguageProvider from './LanguageProvider';
import { LiveStreams, LokiLiveTarget } from './LiveStreams'; import { LiveStreams, LokiLiveTarget } from './LiveStreams';
import { transformBackendResult } from './backendResultTransformer'; import { transformBackendResult } from './backendResultTransformer';
import { LokiAnnotationsQueryEditor } from './components/AnnotationsQueryEditor'; import { LokiAnnotationsQueryEditor } from './components/AnnotationsQueryEditor';
import { escapeLabelValueInSelector, isRegexSelector } from './languageUtils'; import { escapeLabelValueInExactSelector, escapeLabelValueInSelector, isRegexSelector } from './languageUtils';
import { labelNamesRegex, labelValuesRegex } from './migrations/variableQueryMigrations'; import { labelNamesRegex, labelValuesRegex } from './migrations/variableQueryMigrations';
import { import {
addLabelFormatToQuery, addLabelFormatToQuery,
@@ -577,7 +577,7 @@ export class LokiDatasource
.map((label: string) => { .map((label: string) => {
if (labels.includes(label)) { if (labels.includes(label)) {
// escape backslashes in label as users can't escape them by themselves // escape backslashes in label as users can't escape them by themselves
return `${label}="${row.labels[label].replace(/\\/g, '\\\\')}"`; return `${label}="${escapeLabelValueInExactSelector(row.labels[label])}"`;
} }
return ''; return '';
}) })