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: add frozen indices search support (#27472)

Browse Source 
* Elasticsearch: Add frozen indices support for alerting
This commit is contained in:
Giordano Ricci
2020-09-18 18:27:25 +01:00
committed by GitHub
parent 590f1407f9
commit 61a3160c34
7 changed files with 112 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/plugins/datasource/elasticsearch/datasource.ts
View File

@@ -52,6 +52,7 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
logLevelField?: string;
dataLinks: DataLinkConfig[];
languageProvider: LanguageProvider;
includeFrozen: boolean;
/** @ngInject */
constructor(
@@ -79,6 +80,7 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
this.logMessageField = settingsData.logMessageField || '';
this.logLevelField = settingsData.logLevelField || '';
this.dataLinks = settingsData.dataLinks || [];
this.includeFrozen = settingsData.includeFrozen ?? false;
if (this.logMessageField === '') {
this.logMessageField = undefined;
@@ -559,11 +561,17 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
}
getMultiSearchUrl() {
const searchParams = new URLSearchParams();
if (this.esVersion >= 70 && this.maxConcurrentShardRequests) {
return `_msearch?max_concurrent_shard_requests=${this.maxConcurrentShardRequests}`;
searchParams.append('max_concurrent_shard_requests', '' + this.maxConcurrentShardRequests);
}
return '_msearch';
if (this.esVersion >= 70 && this.includeFrozen) {
searchParams.append('ignore_throttled', 'false');
}
return (`_msearch?` + searchParams.toString()).replace(/\?+$/, '');
}
metricFindQuery(query: any) {