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

Elasticsearch: Fix impossibility to perform non-logs queries after importing queries from loki or prometheus in explore (#31518)

Browse Source 
* Chore: remove isLogsQuery flag from ES datasource

* Minore chores

* Update public/app/plugins/datasource/elasticsearch/datasource.ts

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
This commit is contained in:
Giordano Ricci
2021-03-02 09:10:41 +00:00
committed by GitHub
parent a2fe6ef92c
commit 3cf0103782
9 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/features/alerting/getAlertingValidationMessage.test.ts
View File

@@ -28,8 +28,8 @@ describe('getAlertingValidationMessage', () => {
getInstanceSettings: (() => {}) as any,
};
const targets: ElasticsearchQuery[] = [
{ refId: 'A', query: '@hostname:$hostname', isLogsQuery: false },
{ refId: 'B', query: '@instance:instance', isLogsQuery: false },
{ refId: 'A', query: '@hostname:$hostname' },
{ refId: 'B', query: '@instance:instance' },
];
const transformations: DataTransformerConfig[] = [];
@@ -95,8 +95,8 @@ describe('getAlertingValidationMessage', () => {
},
};
const targets: ElasticsearchQuery[] = [
{ refId: 'A', query: '@hostname:$hostname', isLogsQuery: false },
{ refId: 'B', query: '@instance:$instance', isLogsQuery: false },
{ refId: 'A', query: '@hostname:$hostname' },
{ refId: 'B', query: '@instance:$instance' },
];
const transformations: DataTransformerConfig[] = [];
@@ -124,8 +124,8 @@ describe('getAlertingValidationMessage', () => {
},
};
const targets: ElasticsearchQuery[] = [
{ refId: 'A', query: '@hostname:hostname', isLogsQuery: false },
{ refId: 'B', query: '@instance:instance', isLogsQuery: false },
{ refId: 'A', query: '@hostname:hostname' },
{ refId: 'B', query: '@instance:instance' },
];
const transformations: DataTransformerConfig[] = [];
@@ -153,8 +153,8 @@ describe('getAlertingValidationMessage', () => {
},
};
const targets: ElasticsearchQuery[] = [
{ refId: 'A', query: '@hostname:hostname', isLogsQuery: false },
{ refId: 'B', query: '@instance:instance', isLogsQuery: false },
{ refId: 'A', query: '@hostname:hostname' },
{ refId: 'B', query: '@instance:instance' },
];
const transformations: DataTransformerConfig[] = [{ id: 'A', options: null }];