IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-14 15:15:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Elasticsearch: Add log highlight processing on backend (#63924)

Browse Source 
* Elasticsearch: Add highlight for logs

* Fix running of queries trough backend only when shouldRunTroughBackend

* Fix incorrect json in test string

* Address feedback

* Keep order of words same
This commit is contained in:
Ivana Huckova
2023-03-09 13:34:53 +01:00
committed by GitHub
parent cb8e01214d
commit bd0fa79542
6 changed files with 206 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/core/logsModel.ts
+3 -1
View File
@@ -421,7 +421,9 @@ export function logSeriesToLogsModel(logSeries: DataFrame[], queries: DataQuery[
const hasUnescapedContent = !!message.match(/\\n|\\t|\\r/);
const searchWords = series.meta && series.meta.searchWords ? series.meta.searchWords : [];
// Data sources that set up searchWords on backend use meta.custom.searchWords
// Data sources that set up searchWords trough frontend can use meta.searchWords
const searchWords = series.meta?.custom?.searchWords ?? series.meta?.searchWords ?? [];
const entry = hasAnsi ? ansicolor.strip(message) : message;
const labels = getLabelsForFrameRow(info, j);