Skip to content

Commit 01f4273

Browse files
committed
Merge branch 'master' into delvedor/emit-typescript
2 parents 338caf1 + 546cdb0 commit 01f4273

File tree

375 files changed

+2807
-253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

375 files changed

+2807
-253
lines changed

specification/specs/aggregations/AggregationContainer.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ class AggregationContainer {
33
aggs: Dictionary<string, AggregationContainer>;
44
avg: AverageAggregation;
55
avg_bucket: AverageBucketAggregation;
6+
boxplot: BoxplotAggregation;
67
bucket_script: BucketScriptAggregation;
78
bucket_selector: BucketSelectorAggregation;
89
bucket_sort: BucketSortAggregation;
@@ -58,4 +59,6 @@ class AggregationContainer {
5859
value_count: ValueCountAggregation;
5960
weighted_avg: WeightedAverageAggregation;
6061
median_absolute_deviation: MedianAbsoluteDeviationAggregation;
62+
string_stats: StringStatsAggregation;
63+
top_metrics: TopMetricsAggregation;
6164
}

specification/specs/aggregations/bucket/geo_hash_grid/GeoHashGridAggregation.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ class GeoHashGridAggregation {
33
precision: GeoHashPrecision;
44
shard_size: integer;
55
size: integer;
6+
bounds: BoundingBox;
67
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class FormattableMetricAggregation {
2+
format: string;
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class BoxplotAggregation {
2+
compression: double;
3+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
class StringStatsAggregation {
2+
field: Field;
3+
missing: any;
4+
script: Script;
5+
show_distribution: boolean;
6+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class TopMetricsAggregation {
2+
metrics: TopMetricsValue[];
3+
size: integer;
4+
sort: Sort[];
5+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class TopMetricsValue {
2+
field: Field;
3+
}

specification/specs/analysis/analyzers/CustomAnalyzer.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ class CustomAnalyzer extends AnalyzerBase {
22
char_filter: string[];
33
filter: string[];
44
position_offset_gap: integer;
5+
position_increment_gap: integer;
56
tokenizer: string;
67
}

specification/specs/analysis/languages/Language.ts

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,26 @@ enum Language {
1111
Danish = 9,
1212
Dutch = 10,
1313
English = 11,
14-
Finnish = 12,
15-
French = 13,
16-
Galician = 14,
17-
German = 15,
18-
Greek = 16,
19-
Hindi = 17,
20-
Hungarian = 18,
21-
Indonesian = 19,
22-
Irish = 20,
23-
Italian = 21,
24-
Latvian = 22,
25-
Norwegian = 23,
26-
Persian = 24,
27-
Portuguese = 25,
28-
Romanian = 26,
29-
Russian = 27,
30-
Sorani = 28,
31-
Spanish = 29,
32-
Swedish = 30,
33-
Turkish = 31,
34-
Thai = 32
14+
Estonian = 12,
15+
Finnish = 13,
16+
French = 14,
17+
Galician = 15,
18+
German = 16,
19+
Greek = 17,
20+
Hindi = 18,
21+
Hungarian = 19,
22+
Indonesian = 20,
23+
Irish = 21,
24+
Italian = 22,
25+
Latvian = 23,
26+
Norwegian = 24,
27+
Persian = 25,
28+
Portuguese = 26,
29+
Romanian = 27,
30+
Russian = 28,
31+
Sorani = 29,
32+
Spanish = 30,
33+
Swedish = 31,
34+
Turkish = 32,
35+
Thai = 33
3536
}

specification/specs/analysis/token_filters/synonym/SynonymGraphTokenFilter.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ class SynonymGraphTokenFilter extends TokenFilterBase {
55
synonyms: string[];
66
synonyms_path: string;
77
tokenizer: string;
8+
updateable: boolean;
89
}

specification/specs/analysis/token_filters/synonym/SynonymTokenFilter.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ class SynonymTokenFilter extends TokenFilterBase {
55
synonyms: string[];
66
synonyms_path: string;
77
tokenizer: string;
8+
updateable: boolean;
89
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
class NoriTokenizer extends TokenizerBase {
22
decompound_mode: NoriDecompoundMode;
3+
discard_punctuation: boolean;
34
user_dictionary: string;
45
user_dictionary_rules: string[];
56
}

specification/specs/analysis/tokenizers/n_gram/EdgeNGramTokenizer.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ class EdgeNGramTokenizer extends TokenizerBase {
22
max_gram: integer;
33
min_gram: integer;
44
token_chars: TokenChar[];
5+
custom_token_chars: string;
56
}

specification/specs/analysis/tokenizers/n_gram/NGramTokenizer.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ class NGramTokenizer extends TokenizerBase {
22
max_gram: integer;
33
min_gram: integer;
44
token_chars: TokenChar[];
5+
custom_token_chars: string;
56
}

specification/specs/analysis/tokenizers/n_gram/TokenChar.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ enum TokenChar {
33
digit = 1,
44
whitespace = 2,
55
punctuation = 3,
6-
symbol = 4
6+
symbol = 4,
7+
custom = 5
78
}

specification/specs/cat/cat_aliases/CatAliasesRequest.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
@rest_spec_name("cat.aliases")
22
class CatAliasesRequest extends RequestBase {
3+
@request_parameter()
4+
expand_wildcards: ExpandWildcards;
35
@request_parameter()
46
format: string;
57
@request_parameter()

specification/specs/cat/cat_aliases/cat.aliases.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,18 @@
5353
"type":"boolean",
5454
"description":"Verbose mode. Display column headers",
5555
"default":false
56+
},
57+
"expand_wildcards":{
58+
"type":"enum",
59+
"options":[
60+
"open",
61+
"closed",
62+
"hidden",
63+
"none",
64+
"all"
65+
],
66+
"default": "all",
67+
"description":"Whether to expand wildcard expression to concrete indices that are open, closed or both."
5668
}
5769
}
5870
}

specification/specs/cat/cat_allocation/CatAllocationRecord.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
class CatAllocationRecord implements ICatRecord {
2-
diskAvail: string;
3-
diskRatio: string;
4-
diskUsed: string;
2+
'disk.avail': string;
3+
'disk.indices': string;
4+
'disk.percent': string;
5+
disk_ratio: string;
6+
'disk.total': string;
7+
'disk.used': string;
8+
host: string;
59
ip: string;
610
node: string;
711
shards: string;
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
class CatDataFrameAnalyticsRecord implements ICatRecord {
2+
assignment_explanation: string;
3+
create_time: string;
4+
description: string;
5+
dest_index: string;
6+
failure_reason: string;
7+
id: string;
8+
model_memory_limit: string;
9+
'node.address': string;
10+
'node.ephemeral_id': string;
11+
'node.id': string;
12+
'node.name': string;
13+
progress: string;
14+
source_index: string;
15+
state: string;
16+
type: string;
17+
version: string;
18+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@rest_spec_name("cat.ml_data_frame_analytics")
2+
class CatDataFrameAnalyticsRequest extends RequestBase {
3+
@request_parameter()
4+
allow_no_match: boolean;
5+
@request_parameter()
6+
bytes: Bytes;
7+
@request_parameter()
8+
format: string;
9+
@request_parameter()
10+
headers: string[];
11+
@request_parameter()
12+
help: boolean;
13+
@request_parameter()
14+
sort_by_columns: string[];
15+
@request_parameter()
16+
verbose: boolean;
17+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class CatDataFrameAnalyticsResponse extends ResponseBase {
2+
records: CatDataFrameAnalyticsRecord[];
3+
}
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
{
2+
"cat.ml_data_frame_analytics":{
3+
"documentation":{
4+
"url":"http://www.elastic.co/guide/en/elasticsearch/reference/current/cat-dfanalytics.html",
5+
"description": "Gets configuration and usage information about data frame analytics jobs."
6+
},
7+
"stability":"stable",
8+
"url":{
9+
"paths":[
10+
{
11+
"path":"/_cat/ml/data_frame/analytics",
12+
"methods":[
13+
"GET"
14+
]
15+
},
16+
{
17+
"path":"/_cat/ml/data_frame/analytics/{id}",
18+
"methods":[
19+
"GET"
20+
],
21+
"parts":{
22+
"id":{
23+
"type":"string",
24+
"description":"The ID of the data frame analytics to fetch"
25+
}
26+
}
27+
}
28+
]
29+
},
30+
"params":{
31+
"allow_no_match":{
32+
"type":"boolean",
33+
"required":false,
34+
"description":"Whether to ignore if a wildcard expression matches no configs. (This includes `_all` string or when no configs have been specified)"
35+
},
36+
"bytes":{
37+
"type":"enum",
38+
"description":"The unit in which to display byte values",
39+
"options":[
40+
"b",
41+
"k",
42+
"kb",
43+
"m",
44+
"mb",
45+
"g",
46+
"gb",
47+
"t",
48+
"tb",
49+
"p",
50+
"pb"
51+
]
52+
},
53+
"format":{
54+
"type":"string",
55+
"description":"a short version of the Accept header, e.g. json, yaml"
56+
},
57+
"h":{
58+
"type":"list",
59+
"description":"Comma-separated list of column names to display"
60+
},
61+
"help":{
62+
"type":"boolean",
63+
"description":"Return help information",
64+
"default":false
65+
},
66+
"s":{
67+
"type":"list",
68+
"description":"Comma-separated list of column names or column aliases to sort by"
69+
},
70+
"time":{
71+
"type":"enum",
72+
"description":"The unit in which to display time values",
73+
"options":[
74+
"d",
75+
"h",
76+
"m",
77+
"s",
78+
"ms",
79+
"micros",
80+
"nanos"
81+
]
82+
},
83+
"v":{
84+
"type":"boolean",
85+
"description":"Verbose mode. Display column headers",
86+
"default":false
87+
}
88+
}
89+
}
90+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
class CatDatafeedsRecord implements ICatRecord {
2+
assignment_explanation: string;
3+
'buckets.count': string;
4+
id: string;
5+
'node.address': string;
6+
'node.ephemeral_id': string;
7+
'node.id': string;
8+
'node.name': string;
9+
'search.bucket_avg': string;
10+
'search.count': string;
11+
'search.exp_avg_hour': string;
12+
'search.time': string;
13+
state: DatafeedState;
14+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
@rest_spec_name("cat.ml_datafeeds")
2+
class CatDatafeedsRequest extends RequestBase {
3+
@request_parameter()
4+
allow_no_datafeeds: boolean;
5+
@request_parameter()
6+
format: string;
7+
@request_parameter()
8+
headers: string[];
9+
@request_parameter()
10+
help: boolean;
11+
@request_parameter()
12+
sort_by_columns: string[];
13+
@request_parameter()
14+
verbose: boolean;
15+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class CatDatafeedsResponse extends ResponseBase {
2+
records: CatDatafeedsRecord[];
3+
}

0 commit comments

Comments
 (0)