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: Remove empty annotations tags (#32359)

Browse Source 
* Loki - filter labels with empty values

Signed-off-by: Conor Evans <coevans@tcd.ie>

* Apply prettier change

Signed-off-by: Conor Evans <coevans@tcd.ie>

* Apply Piotr's suggestion - swap map/filter statements

Signed-off-by: Conor Evans <coevans@tcd.ie>
This commit is contained in:
Conor Evans 2021-03-26 14:16:31 +01:00 committed by GitHub
parent 8bb56fabe0
commit 3af573ea96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,7 +469,9 @@ describe('LokiDatasource', () => {
}, },
{ {
stream: { stream: {
label: '', // empty value gets filtered
label2: 'value2', label2: 'value2',
label3: ' ', // whitespace value gets trimmed then filtered
}, },
values: [['1549024057498000000', 'hello 2']], values: [['1549024057498000000', 'hello 2']],
}, },

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

@ -511,7 +511,13 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
const tags: string[] = []; const tags: string[] = [];
for (const field of frame.fields) { for (const field of frame.fields) {
if (field.labels) { if (field.labels) {
tags.push.apply(tags, [...new Set(Object.values(field.labels).map((label: string) => label.trim()))]); tags.push.apply(tags, [
...new Set(
Object.values(field.labels)
.map((label: string) => label.trim())
.filter((label: string) => label !== '')
),
]);
} }
} }
const view = new DataFrameView<{ ts: string; line: string }>(frame); const view = new DataFrameView<{ ts: string; line: string }>(frame);