diff --git a/src/CodeGeneration/ApiGenerator/Configuration/CodeConfiguration.cs b/src/CodeGeneration/ApiGenerator/Configuration/CodeConfiguration.cs index d301e421a2b..3ba0221c34f 100644 --- a/src/CodeGeneration/ApiGenerator/Configuration/CodeConfiguration.cs +++ b/src/CodeGeneration/ApiGenerator/Configuration/CodeConfiguration.cs @@ -43,10 +43,35 @@ public static class CodeConfiguration "ml.set_upgrade_mode.json", "ml.find_file_structure.json", "monitoring.bulk.json", - "ml.estimate_memory_usage.json" + "ml.estimate_memory_usage.json", + + "ccr.pause_auto_follow_pattern.json", + "ccr.resume_auto_follow_pattern.json", + "data_frame_transform_deprecated.delete_transform.json", + "data_frame_transform_deprecated.get_transform.json", + "data_frame_transform_deprecated.get_transform_stats.json", + "data_frame_transform_deprecated.preview_transform.json", + "data_frame_transform_deprecated.put_transform.json", + "data_frame_transform_deprecated.start_transform.json", + "data_frame_transform_deprecated.stop_transform.json", + "data_frame_transform_deprecated.update_transform.json", + "enrich.delete_policy.json", + "enrich.execute_policy.json", + "enrich.get_policy.json", + "enrich.put_policy.json", + "enrich.stats.json", + "slm.execute_retention.json", + "slm.get_stats.json", + "transform.delete_transform.json", + "transform.get_transform.json", + "transform.get_transform_stats.json", + "transform.preview_transform.json", + "transform.put_transform.json", + "transform.start_transform.json", + "transform.stop_transform.json", + "transform.update_transform.json", }; - /// /// Scan all nest source code files for Requests and look for the [MapsApi(filename)] attribute. /// The class name minus Request is used as the canonical .NET name for the API. diff --git a/src/CodeGeneration/ApiGenerator/Configuration/Overrides/GlobalOverrides.cs b/src/CodeGeneration/ApiGenerator/Configuration/Overrides/GlobalOverrides.cs index 32031626694..bc2135d1c33 100644 --- a/src/CodeGeneration/ApiGenerator/Configuration/Overrides/GlobalOverrides.cs +++ b/src/CodeGeneration/ApiGenerator/Configuration/Overrides/GlobalOverrides.cs @@ -4,7 +4,10 @@ namespace ApiGenerator.Configuration.Overrides { public class GlobalOverrides : EndpointOverridesBase { - public IDictionary> ObsoleteEnumMembers { get; set; } = new Dictionary>(); + public IDictionary> ObsoleteEnumMembers { get; set; } = new Dictionary>() + { + { "VersionType", new Dictionary() { { "force", "Force is no longer accepted by the server as of 7.5.0 and will result in an error when used" } } } + }; public override IDictionary ObsoleteQueryStringParams { get; set; } = new Dictionary { @@ -39,7 +42,9 @@ public class GlobalOverrides : EndpointOverridesBase "parent", //can be removed once https://github.com/elastic/elasticsearch/pull/41098 is in "copy_settings", //this still needs a PR? "source", // allows the body to be specified as a request param, we do not want to advertise this with a strongly typed method - "timestamp" + "timestamp", + "time", + "bytes" }; } } diff --git a/src/CodeGeneration/ApiGenerator/Domain/RestApiSpec.cs b/src/CodeGeneration/ApiGenerator/Domain/RestApiSpec.cs index 9f1f42c2c34..2136a5cda36 100644 --- a/src/CodeGeneration/ApiGenerator/Domain/RestApiSpec.cs +++ b/src/CodeGeneration/ApiGenerator/Domain/RestApiSpec.cs @@ -3,6 +3,7 @@ using System.Collections.ObjectModel; using System.Linq; using ApiGenerator.Domain.Specification; +using Microsoft.CodeAnalysis.CSharp.Syntax; namespace ApiGenerator.Domain { @@ -48,26 +49,41 @@ string CreateName(string name, string methodName, string @namespace) } var urlParameterEnums = ( - from e in Endpoints.Values - from para in e.Url.Params.Values - where para.Options != null && para.Options.Any() + from e in Endpoints.Values + from para in e.Url.Params.Values + where para.Options != null && para.Options.Any() + let name = CreateName(para.ClsName, e.CsharpNames.MethodName, e.CsharpNames.Namespace) + where name != "Time" select new EnumDescription { - Name = CreateName(para.ClsName, e.CsharpNames.MethodName, e.CsharpNames.Namespace), + Name = name, Options = para.Options }).ToList(); var urlPartEnums = ( - from e in Endpoints.Values - from part in e.Url.Parts - where part.Options != null && part.Options.Any() + from e in Endpoints.Values + from part in e.Url.Parts + where part.Options != null && part.Options.Any() select new EnumDescription { Name = CreateName(part.Name.ToPascalCase(), e.CsharpNames.MethodName, e.CsharpNames.Namespace), Options = part.Options }).ToList(); - _enumDescriptions = urlPartEnums.Concat(urlParameterEnums).DistinctBy(e => e.Name).ToList(); + _enumDescriptions = urlPartEnums + .Concat(urlParameterEnums) + .DistinctBy(e => e.Name) + .ToList(); + + //TODO can be removed in 8.x + var versionType = _enumDescriptions.FirstOrDefault(f => f.Name == "VersionType"); + if (versionType != null) + { + var options = new List(versionType.Options); + options.Add("force"); + versionType.Options = options; + } + return _enumDescriptions; } } diff --git a/src/CodeGeneration/ApiGenerator/Domain/Specification/UrlInformation.cs b/src/CodeGeneration/ApiGenerator/Domain/Specification/UrlInformation.cs index 849847d0e40..68c1444f32a 100644 --- a/src/CodeGeneration/ApiGenerator/Domain/Specification/UrlInformation.cs +++ b/src/CodeGeneration/ApiGenerator/Domain/Specification/UrlInformation.cs @@ -74,13 +74,13 @@ public IReadOnlyCollection PathsWithDeprecations public IReadOnlyCollection Parts => Paths.SelectMany(p => p.Parts).DistinctBy(p => p.Name).ToList(); - + public bool IsPartless => !Parts.Any(); private static readonly string[] DocumentApiParts = { "index", "id" }; public bool IsDocumentApi => IsADocumentRoute(Parts); - + public static bool IsADocumentRoute(IReadOnlyCollection parts) => parts.Count() == DocumentApiParts.Length && parts.All(p => DocumentApiParts.Contains(p.Name)); diff --git a/src/CodeGeneration/ApiGenerator/Generator/ApiEndpointFactory.cs b/src/CodeGeneration/ApiGenerator/Generator/ApiEndpointFactory.cs index 201942a28a5..3718b76cb23 100644 --- a/src/CodeGeneration/ApiGenerator/Generator/ApiEndpointFactory.cs +++ b/src/CodeGeneration/ApiGenerator/Generator/ApiEndpointFactory.cs @@ -94,6 +94,16 @@ private static void PatchOfficialSpec(JObject original, string jsonFile) if (pathsOverride != null) original.SelectToken("*.url.paths").Replace(pathsOverride); + var paramsOverride = patchedJson.SelectToken("*.params"); + + var originalParams = original.SelectToken("*.url.params") as JObject; + originalParams?.Merge(paramsOverride, new JsonMergeSettings + { + MergeArrayHandling = MergeArrayHandling.Union + }); + + if (paramsOverride != null) originalParams?.Replace(originalParams); + void ReplaceOptions(string path) { var optionsOverrides = patchedJson.SelectToken(path); diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/_common.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/_common.json index 69a1f8fb8ce..1505db774f0 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/_common.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/_common.json @@ -1,6 +1,8 @@ { - "description": "Parameters that are accepted by all API endpoints.", - "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html", + "documentation" : { + "description": "Parameters that are accepted by all API endpoints.", + "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html" + }, "params": { "pretty": { "type": "boolean", diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.aliases.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.aliases.json index 0f49d3a8b74..d37273cfd41 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.aliases.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.aliases.json @@ -36,10 +36,6 @@ "type":"boolean", "description":"Return local information, do not retrieve the state from master node (default: false)" }, - "master_timeout":{ - "type":"time", - "description":"Explicit operation timeout for connection to master node" - }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.count.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.count.json index 807e108e788..8cfaddf8db8 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.count.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.count.json @@ -32,14 +32,6 @@ "type":"string", "description":"a short version of the Accept header, e.g. json, yaml" }, - "local":{ - "type":"boolean", - "description":"Return local information, do not retrieve the state from master node (default: false)" - }, - "master_timeout":{ - "type":"time", - "description":"Explicit operation timeout for connection to master node" - }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.fielddata.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.fielddata.json index a3d05537f81..9fbde4736b5 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.fielddata.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.fielddata.json @@ -49,14 +49,6 @@ "pb" ] }, - "local":{ - "type":"boolean", - "description":"Return local information, do not retrieve the state from master node (default: false)" - }, - "master_timeout":{ - "type":"time", - "description":"Explicit operation timeout for connection to master node" - }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.health.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.health.json index e7989ef5f96..7e79b7cc2c9 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.health.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.health.json @@ -20,14 +20,6 @@ "type":"string", "description":"a short version of the Accept header, e.g. json, yaml" }, - "local":{ - "type":"boolean", - "description":"Return local information, do not retrieve the state from master node (default: false)" - }, - "master_timeout":{ - "type":"time", - "description":"Explicit operation timeout for connection to master node" - }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" @@ -41,6 +33,19 @@ "type":"list", "description":"Comma-separated list of column names or column aliases to sort by" }, + "time":{ + "type":"enum", + "description":"The unit in which to display time values", + "options":[ + "d (Days)", + "h (Hours)", + "m (Minutes)", + "s (Seconds)", + "ms (Milliseconds)", + "micros (Microseconds)", + "nanos (Nanoseconds)" + ] + }, "ts":{ "type":"boolean", "description":"Set to false to disable timestamping", diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.indices.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.indices.json index f4aa15344c5..60a98412c31 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.indices.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.indices.json @@ -78,6 +78,19 @@ "type":"list", "description":"Comma-separated list of column names or column aliases to sort by" }, + "time":{ + "type":"enum", + "description":"The unit in which to display time values", + "options":[ + "d (Days)", + "h (Hours)", + "m (Minutes)", + "s (Seconds)", + "ms (Milliseconds)", + "micros (Microseconds)", + "nanos (Nanoseconds)" + ] + }, "v":{ "type":"boolean", "description":"Verbose mode. Display column headers", diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.nodes.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.nodes.json index 10e9aea80fa..7fd96f8b387 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.nodes.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.nodes.json @@ -16,6 +16,23 @@ ] }, "params":{ + "bytes":{ + "type":"enum", + "description":"The unit in which to display byte values", + "options":[ + "b", + "k", + "kb", + "m", + "mb", + "g", + "gb", + "t", + "tb", + "p", + "pb" + ] + }, "format":{ "type":"string", "description":"a short version of the Accept header, e.g. json, yaml" @@ -45,6 +62,19 @@ "type":"list", "description":"Comma-separated list of column names or column aliases to sort by" }, + "time":{ + "type":"enum", + "description":"The unit in which to display time values", + "options":[ + "d (Days)", + "h (Hours)", + "m (Minutes)", + "s (Seconds)", + "ms (Milliseconds)", + "micros (Microseconds)", + "nanos (Nanoseconds)" + ] + }, "v":{ "type":"boolean", "description":"Verbose mode. Display column headers", diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.pending_tasks.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.pending_tasks.json index 31de2e00569..3ea0896ccf3 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.pending_tasks.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.pending_tasks.json @@ -41,6 +41,19 @@ "type":"list", "description":"Comma-separated list of column names or column aliases to sort by" }, + "time":{ + "type":"enum", + "description":"The unit in which to display time values", + "options":[ + "d (Days)", + "h (Hours)", + "m (Minutes)", + "s (Seconds)", + "ms (Milliseconds)", + "micros (Microseconds)", + "nanos (Nanoseconds)" + ] + }, "v":{ "type":"boolean", "description":"Verbose mode. Display column headers", diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.recovery.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.recovery.json index 3cd49044382..64c102d0897 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.recovery.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.recovery.json @@ -21,7 +21,7 @@ "parts":{ "index":{ "type":"list", - "description":"A comma-separated list of index names to limit the returned information" + "description":"Comma-separated list or wildcard expression of index names to limit the returned information" } } } @@ -32,6 +32,11 @@ "type":"string", "description":"a short version of the Accept header, e.g. json, yaml" }, + "active_only":{ + "type":"boolean", + "description":"If `true`, the response only includes ongoing shard recoveries", + "default":false + }, "bytes":{ "type":"enum", "description":"The unit in which to display byte values", @@ -49,9 +54,10 @@ "pb" ] }, - "master_timeout":{ - "type":"time", - "description":"Explicit operation timeout for connection to master node" + "detailed":{ + "type":"boolean", + "description":"If `true`, the response includes detailed information about shard recoveries", + "default":false }, "h":{ "type":"list", @@ -62,10 +68,27 @@ "description":"Return help information", "default":false }, + "index":{ + "type":"list", + "description":"Comma-separated list or wildcard expression of index names to limit the returned information" + }, "s":{ "type":"list", "description":"Comma-separated list of column names or column aliases to sort by" }, + "time":{ + "type":"enum", + "description":"The unit in which to display time values", + "options":[ + "d (Days)", + "h (Hours)", + "m (Minutes)", + "s (Seconds)", + "ms (Milliseconds)", + "micros (Microseconds)", + "nanos (Nanoseconds)" + ] + }, "v":{ "type":"boolean", "description":"Verbose mode. Display column headers", diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.shards.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.shards.json index 6315570e4e9..6eb170ac4a7 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.shards.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.shards.json @@ -70,6 +70,19 @@ "type":"list", "description":"Comma-separated list of column names or column aliases to sort by" }, + "time":{ + "type":"enum", + "description":"The unit in which to display time values", + "options":[ + "d (Days)", + "h (Hours)", + "m (Minutes)", + "s (Seconds)", + "ms (Milliseconds)", + "micros (Microseconds)", + "nanos (Nanoseconds)" + ] + }, "v":{ "type":"boolean", "description":"Verbose mode. Display column headers", diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.snapshots.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.snapshots.json index e720f53d430..9bca1038726 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.snapshots.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.snapshots.json @@ -54,6 +54,19 @@ "type":"list", "description":"Comma-separated list of column names or column aliases to sort by" }, + "time":{ + "type":"enum", + "description":"The unit in which to display time values", + "options":[ + "d (Days)", + "h (Hours)", + "m (Minutes)", + "s (Seconds)", + "ms (Milliseconds)", + "micros (Microseconds)", + "nanos (Nanoseconds)" + ] + }, "v":{ "type":"boolean", "description":"Verbose mode. Display column headers", diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.tasks.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.tasks.json index 20e846ce651..1c04b05c985 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.tasks.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.tasks.json @@ -49,6 +49,19 @@ "type":"list", "description":"Comma-separated list of column names or column aliases to sort by" }, + "time":{ + "type":"enum", + "description":"The unit in which to display time values", + "options":[ + "d (Days)", + "h (Hours)", + "m (Minutes)", + "s (Seconds)", + "ms (Milliseconds)", + "micros (Microseconds)", + "nanos (Nanoseconds)" + ] + }, "v":{ "type":"boolean", "description":"Verbose mode. Display column headers", diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/create.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/create.json index 0a96ebf5ecd..171f3da44d3 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/create.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/create.json @@ -83,8 +83,7 @@ "options":[ "internal", "external", - "external_gte", - "force" + "external_gte" ], "description":"Specific version type" }, diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/index.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/index.json index 6796c0bc3eb..7ecd7a0e927 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/index.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/index.json @@ -10,8 +10,8 @@ { "path":"/{index}/_doc/{id}", "methods":[ - "POST", - "PUT" + "PUT", + "POST" ], "parts":{ "id":{ @@ -60,8 +60,8 @@ { "path":"/{index}/{type}/{id}", "methods":[ - "POST", - "PUT" + "PUT", + "POST" ], "parts":{ "id":{ @@ -96,8 +96,7 @@ "index", "create" ], - "default":"index", - "description":"Explicit operation type" + "description":"Explicit operation type. Defaults to `index` for requests with an explicit document ID, and to `create`for requests without an explicit document ID" }, "refresh":{ "type":"enum", @@ -125,8 +124,7 @@ "options":[ "internal", "external", - "external_gte", - "force" + "external_gte" ], "description":"Specific version type" }, diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html index 017ff8b408d..6467ec8e781 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html @@ -18,9 +18,9 @@ - - - + + + @@ -28,7 +28,7 @@ - elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/api at v7.4.0 · elastic/elasticsearch · GitHub + elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/api at 7.5 · elastic/elasticsearch · GitHub @@ -40,7 +40,8 @@ - + + @@ -51,7 +52,8 @@ - + + @@ -69,23 +71,24 @@ - + + - + - + - + - + @@ -123,7 +126,7 @@
@@ -150,10 +153,9 @@
  • Code review
  • Project management
  • Integrations
  • -
  • Actions -
  • Package registry - -
  • Security +
  • Actions
  • +
  • Packages
  • +
  • Security
  • Team management
  • Social coding
  • Documentation
  • @@ -259,7 +261,7 @@

    Conne aria-autocomplete="list" aria-controls="jump-to-results" aria-label="Search" - data-jump-to-suggestions-path="/_graphql/GetSuggestedNavigationDestinations#csrf-token=8Sl+lMe5SJHcV4LWQq5DhPaGvjRn8JALdPrp3RC2z3ELW1r3qRumbxQd3NExBBktRTx1g5NiYRTne5U24F9vbA==" + data-jump-to-suggestions-path="/_graphql/GetSuggestedNavigationDestinations#csrf-token=8jUGvJ3mmME47NSqhCP/JiaTXnIYPfiiETFuz+9qU7PjykEPQ37uK29nGrQOaGeNbmOX4DWuY3P5Aco8JwnB+Q==" spellcheck="false" autocomplete="off" > @@ -275,8 +277,8 @@

    Conne
    - - + +
    @@ -316,8 +318,8 @@

    Conne
    - - + +
    @@ -348,8 +350,8 @@

    Conne
    - - + +
    @@ -384,15 +386,15 @@

    Conne

    - Sign in - Sign up @@ -429,7 +431,8 @@

    Conne -
    + +
    +
    + + + + Pull request + + + + Compare + + - + This branch is 4249 commits ahead, 4885 commits behind master. +
    + +
    Fetching latest commit… @@ -588,8 +605,8 @@

    - - Permalink + + Permalink @@ -602,7 +619,7 @@

    - + @@ -610,7 +627,7 @@

    - + @@ -620,7 +637,7 @@

    ....
    Failed to load latest commit information.
    - _common.json + _common.json @@ -636,7 +653,7 @@

    - bulk.json + bulk.json @@ -652,7 +669,7 @@

    - cat.aliases.json + cat.aliases.json @@ -668,7 +685,7 @@

    - cat.allocation.json + cat.allocation.json @@ -684,7 +701,7 @@

    - cat.count.json + cat.count.json @@ -700,7 +717,7 @@

    - cat.fielddata.json + cat.fielddata.json @@ -716,7 +733,7 @@

    - cat.health.json + cat.health.json @@ -732,7 +749,7 @@

    - cat.help.json + cat.help.json @@ -748,7 +765,7 @@

    - cat.indices.json + cat.indices.json @@ -764,7 +781,7 @@

    - cat.master.json + cat.master.json @@ -780,7 +797,7 @@

    - cat.nodeattrs.json + cat.nodeattrs.json @@ -796,7 +813,7 @@

    - cat.nodes.json + cat.nodes.json @@ -812,7 +829,7 @@

    - cat.pending_tasks.json + cat.pending_tasks.json @@ -828,7 +845,7 @@

    - cat.plugins.json + cat.plugins.json @@ -844,7 +861,7 @@

    - cat.recovery.json + cat.recovery.json @@ -860,7 +877,7 @@

    - cat.repositories.json + cat.repositories.json @@ -876,7 +893,7 @@

    - cat.segments.json + cat.segments.json @@ -892,7 +909,7 @@

    - cat.shards.json + cat.shards.json @@ -908,7 +925,7 @@

    - cat.snapshots.json + cat.snapshots.json @@ -924,7 +941,7 @@

    - cat.tasks.json + cat.tasks.json @@ -940,7 +957,7 @@

    - cat.templates.json + cat.templates.json @@ -956,7 +973,7 @@

    - cat.thread_pool.json + cat.thread_pool.json @@ -972,7 +989,7 @@

    - clear_scroll.json + clear_scroll.json @@ -988,7 +1005,7 @@

    - cluster.allocation_explain.json + cluster.allocation_explain.json @@ -1004,7 +1021,7 @@

    - cluster.get_settings.json + cluster.get_settings.json @@ -1020,7 +1037,7 @@

    - cluster.health.json + cluster.health.json @@ -1036,7 +1053,7 @@

    - cluster.pending_tasks.json + cluster.pending_tasks.json @@ -1052,7 +1069,7 @@

    - cluster.put_settings.json + cluster.put_settings.json @@ -1068,7 +1085,7 @@

    - cluster.remote_info.json + cluster.remote_info.json @@ -1084,7 +1101,7 @@

    - cluster.reroute.json + cluster.reroute.json @@ -1100,7 +1117,7 @@

    - cluster.state.json + cluster.state.json @@ -1116,7 +1133,7 @@

    - cluster.stats.json + cluster.stats.json @@ -1132,7 +1149,7 @@

    - count.json + count.json @@ -1148,7 +1165,7 @@

    - create.json + create.json @@ -1164,7 +1181,7 @@

    - delete.json + delete.json @@ -1180,7 +1197,7 @@

    - delete_by_query.json + delete_by_query.json @@ -1196,7 +1213,7 @@

    - delete_by_query_rethrottle.json + delete_by_query_rethrottle.json @@ -1212,7 +1229,7 @@

    - delete_script.json + delete_script.json @@ -1228,7 +1245,7 @@

    - exists.json + exists.json @@ -1244,7 +1261,7 @@

    - exists_source.json + exists_source.json @@ -1260,7 +1277,7 @@

    - explain.json + explain.json @@ -1276,7 +1293,7 @@

    - field_caps.json + field_caps.json @@ -1292,7 +1309,7 @@

    - get.json + get.json @@ -1308,7 +1325,7 @@

    - get_script.json + get_script.json @@ -1324,7 +1341,7 @@

    - get_source.json + get_source.json @@ -1340,7 +1357,7 @@

    - index.json + index.json @@ -1356,7 +1373,7 @@

    - indices.analyze.json + indices.analyze.json @@ -1372,7 +1389,7 @@

    - indices.clear_cache.json + indices.clear_cache.json @@ -1388,7 +1405,7 @@

    - indices.clone.json + indices.clone.json @@ -1404,7 +1421,7 @@

    - indices.close.json + indices.close.json @@ -1420,7 +1437,7 @@

    - indices.create.json + indices.create.json @@ -1436,7 +1453,7 @@

    - indices.delete.json + indices.delete.json @@ -1452,7 +1469,7 @@

    - indices.delete_alias.json + indices.delete_alias.json @@ -1468,7 +1485,7 @@

    - indices.delete_template.json + indices.delete_template.json @@ -1484,7 +1501,7 @@

    - indices.exists.json + indices.exists.json @@ -1500,7 +1517,7 @@

    - indices.exists_alias.json + indices.exists_alias.json @@ -1516,7 +1533,7 @@

    - indices.exists_template.json + indices.exists_template.json @@ -1532,7 +1549,7 @@

    - indices.exists_type.json + indices.exists_type.json @@ -1548,7 +1565,7 @@

    - indices.flush.json + indices.flush.json @@ -1564,7 +1581,7 @@

    - indices.flush_synced.json + indices.flush_synced.json @@ -1580,7 +1597,7 @@

    - indices.forcemerge.json + indices.forcemerge.json @@ -1596,7 +1613,7 @@

    - indices.get.json + indices.get.json @@ -1612,7 +1629,7 @@

    - indices.get_alias.json + indices.get_alias.json @@ -1628,7 +1645,7 @@

    - indices.get_field_mapping.json + indices.get_field_mapping.json @@ -1644,7 +1661,7 @@

    - indices.get_mapping.json + indices.get_mapping.json @@ -1660,7 +1677,7 @@

    - indices.get_settings.json + indices.get_settings.json @@ -1676,7 +1693,7 @@

    - indices.get_template.json + indices.get_template.json @@ -1692,7 +1709,7 @@

    - indices.get_upgrade.json + indices.get_upgrade.json @@ -1708,7 +1725,7 @@

    - indices.open.json + indices.open.json @@ -1724,7 +1741,7 @@

    - indices.put_alias.json + indices.put_alias.json @@ -1740,7 +1757,7 @@

    - indices.put_mapping.json + indices.put_mapping.json @@ -1756,7 +1773,7 @@

    - indices.put_settings.json + indices.put_settings.json @@ -1772,7 +1789,7 @@

    - indices.put_template.json + indices.put_template.json @@ -1788,7 +1805,7 @@

    - indices.recovery.json + indices.recovery.json @@ -1804,7 +1821,7 @@

    - indices.refresh.json + indices.refresh.json @@ -1820,7 +1837,7 @@

    - indices.rollover.json + indices.rollover.json @@ -1836,7 +1853,7 @@

    - indices.segments.json + indices.segments.json @@ -1852,7 +1869,7 @@

    - indices.shard_stores.json + indices.shard_stores.json @@ -1868,7 +1885,7 @@

    - indices.shrink.json + indices.shrink.json @@ -1884,7 +1901,7 @@

    - indices.split.json + indices.split.json @@ -1900,7 +1917,7 @@

    - indices.stats.json + indices.stats.json @@ -1916,7 +1933,7 @@

    - indices.update_aliases.json + indices.update_aliases.json @@ -1932,7 +1949,7 @@

    - indices.upgrade.json + indices.upgrade.json @@ -1948,7 +1965,7 @@

    - indices.validate_query.json + indices.validate_query.json @@ -1964,7 +1981,7 @@

    - info.json + info.json @@ -1980,7 +1997,7 @@

    - ingest.delete_pipeline.json + ingest.delete_pipeline.json @@ -1996,7 +2013,7 @@

    - ingest.get_pipeline.json + ingest.get_pipeline.json @@ -2012,7 +2029,7 @@

    - ingest.processor_grok.json + ingest.processor_grok.json @@ -2028,7 +2045,7 @@

    - ingest.put_pipeline.json + ingest.put_pipeline.json @@ -2044,7 +2061,7 @@

    - ingest.simulate.json + ingest.simulate.json @@ -2060,7 +2077,7 @@

    - mget.json + mget.json @@ -2076,7 +2093,7 @@

    - msearch.json + msearch.json @@ -2092,7 +2109,7 @@

    - msearch_template.json + msearch_template.json @@ -2108,7 +2125,7 @@

    - mtermvectors.json + mtermvectors.json @@ -2124,7 +2141,7 @@

    - nodes.hot_threads.json + nodes.hot_threads.json @@ -2140,7 +2157,7 @@

    - nodes.info.json + nodes.info.json @@ -2156,7 +2173,7 @@

    - nodes.reload_secure_settings.json + nodes.reload_secure_settings.json @@ -2172,7 +2189,7 @@

    - nodes.stats.json + nodes.stats.json @@ -2188,7 +2205,7 @@

    - nodes.usage.json + nodes.usage.json @@ -2204,7 +2221,7 @@

    - ping.json + ping.json @@ -2220,7 +2237,7 @@

    - put_script.json + put_script.json @@ -2236,7 +2253,7 @@

    - rank_eval.json + rank_eval.json @@ -2252,7 +2269,7 @@

    - reindex.json + reindex.json @@ -2268,7 +2285,7 @@

    - reindex_rethrottle.json + reindex_rethrottle.json @@ -2284,7 +2301,7 @@

    - render_search_template.json + render_search_template.json @@ -2300,7 +2317,7 @@

    - scripts_painless_execute.json + scripts_painless_execute.json @@ -2316,7 +2333,7 @@

    - scroll.json + scroll.json @@ -2332,7 +2349,7 @@

    - search.json + search.json @@ -2348,7 +2365,7 @@

    - search_shards.json + search_shards.json @@ -2364,7 +2381,7 @@

    - search_template.json + search_template.json @@ -2380,7 +2397,7 @@

    - snapshot.cleanup_repository.json + snapshot.cleanup_repository.json @@ -2396,7 +2413,7 @@

    - snapshot.create.json + snapshot.create.json @@ -2412,7 +2429,7 @@

    - snapshot.create_repository.json + snapshot.create_repository.json @@ -2428,7 +2445,7 @@

    - snapshot.delete.json + snapshot.delete.json @@ -2444,7 +2461,7 @@

    - snapshot.delete_repository.json + snapshot.delete_repository.json @@ -2460,7 +2477,7 @@

    - snapshot.get.json + snapshot.get.json @@ -2476,7 +2493,7 @@

    - snapshot.get_repository.json + snapshot.get_repository.json @@ -2492,7 +2509,7 @@

    - snapshot.restore.json + snapshot.restore.json @@ -2508,7 +2525,7 @@

    - snapshot.status.json + snapshot.status.json @@ -2524,7 +2541,7 @@

    - snapshot.verify_repository.json + snapshot.verify_repository.json @@ -2540,7 +2557,7 @@

    - tasks.cancel.json + tasks.cancel.json @@ -2556,7 +2573,7 @@

    - tasks.get.json + tasks.get.json @@ -2572,7 +2589,7 @@

    - tasks.list.json + tasks.list.json @@ -2588,7 +2605,7 @@

    - termvectors.json + termvectors.json @@ -2604,7 +2621,7 @@

    - update.json + update.json @@ -2620,7 +2637,7 @@

    - update_by_query.json + update_by_query.json @@ -2636,7 +2653,7 @@

    - update_by_query_rethrottle.json + update_by_query_rethrottle.json @@ -2653,6 +2670,7 @@

    + @@ -2670,7 +2688,7 @@