From 526377ba035baaacff0e074fa064daa80d276674 Mon Sep 17 00:00:00 2001 From: manasvinibs Date: Thu, 23 Jun 2022 19:29:26 +0000 Subject: [PATCH] [Deprecation] Deprecate master_timeout in favor of cluster_manager_timeout As part of the meta issue opensearch-project/OpenSearch#2589 to track the plan and progress of applying inclusive naming across OpenSearch Repositories. Issue - https://github.com/opensearch-project/OpenSearch-Dashboards/issues/1685 Signed-off-by: Manasvini B Suryanarayana --- .../test/fixtures/cluster_health_autocomplete.json | 1 + .../test/fixtures/cluster_health_spec.json | 4 ++++ .../json/generated/cat.allocation.json | 3 ++- .../json/generated/cat.indices.json | 3 ++- .../json/generated/cat.nodeattrs.json | 1 + .../spec_definitions/json/generated/cat.nodes.json | 3 ++- .../json/generated/cat.pending_tasks.json | 1 + .../json/generated/cat.plugins.json | 1 + .../json/generated/cat.repositories.json | 1 + .../json/generated/cat.shards.json | 3 ++- .../json/generated/cat.snapshots.json | 1 + .../json/generated/cat.templates.json | 1 + .../json/generated/cat.thread_pool.json | 1 + .../cluster.delete_component_template.json | 3 ++- .../json/generated/cluster.get_settings.json | 1 + .../json/generated/cluster.health.json | 1 + .../json/generated/cluster.pending_tasks.json | 3 ++- .../json/generated/cluster.put_settings.json | 1 + .../json/generated/cluster.reroute.json | 1 + .../json/generated/cluster.state.json | 3 ++- .../json/generated/delete_script.json | 3 ++- .../json/generated/get_script.json | 3 ++- .../json/generated/indices.clone.json | 1 + .../json/generated/indices.close.json | 1 + .../json/generated/indices.create.json | 4 ++-- .../json/generated/indices.delete_alias.json | 3 ++- .../json/generated/indices.delete_template.json | 3 ++- .../json/generated/indices.get.json | 4 ++-- .../json/generated/indices.get_mapping.json | 6 ++---- .../json/generated/indices.get_settings.json | 1 + .../json/generated/indices.get_template.json | 2 +- .../json/generated/indices.put_alias.json | 3 ++- .../json/generated/indices.put_mapping.json | 14 ++++---------- .../json/generated/indices.put_settings.json | 1 + .../json/generated/indices.put_template.json | 3 +-- .../json/generated/indices.rollover.json | 2 +- .../json/generated/indices.shrink.json | 1 + .../json/generated/indices.split.json | 1 + .../json/generated/indices.update_aliases.json | 3 ++- .../json/generated/ingest.delete_pipeline.json | 1 + .../json/generated/ingest.get_pipeline.json | 3 ++- .../json/generated/ingest.put_pipeline.json | 1 + .../json/generated/put_script.json | 1 + .../generated/snapshot.cleanup_repository.json | 1 + .../json/generated/snapshot.create.json | 1 + .../json/generated/snapshot.create_repository.json | 1 + .../json/generated/snapshot.delete.json | 3 ++- .../json/generated/snapshot.delete_repository.json | 1 + .../json/generated/snapshot.get.json | 1 + .../json/generated/snapshot.get_repository.json | 1 + .../json/generated/snapshot.restore.json | 1 + .../json/generated/snapshot.status.json | 1 + .../json/generated/snapshot.verify_repository.json | 1 + .../json/overrides/cluster.health.json | 1 + 54 files changed, 78 insertions(+), 37 deletions(-) diff --git a/packages/osd-spec-to-console/test/fixtures/cluster_health_autocomplete.json b/packages/osd-spec-to-console/test/fixtures/cluster_health_autocomplete.json index a7334198cc7f..4a49ad089e2c 100644 --- a/packages/osd-spec-to-console/test/fixtures/cluster_health_autocomplete.json +++ b/packages/osd-spec-to-console/test/fixtures/cluster_health_autocomplete.json @@ -14,6 +14,7 @@ ], "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "timeout": "", "wait_for_active_shards": "", "wait_for_nodes": "", diff --git a/packages/osd-spec-to-console/test/fixtures/cluster_health_spec.json b/packages/osd-spec-to-console/test/fixtures/cluster_health_spec.json index 31e504f2a668..3975d505c2f9 100644 --- a/packages/osd-spec-to-console/test/fixtures/cluster_health_spec.json +++ b/packages/osd-spec-to-console/test/fixtures/cluster_health_spec.json @@ -57,6 +57,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster manager node" + }, "timeout":{ "type":"time", "description":"Explicit operation timeout" diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.allocation.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.allocation.json index 57b782e94618..ce6062953693 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.allocation.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.allocation.json @@ -5,7 +5,7 @@ "bytes": [ "b", "k", - "osd", + "kb", "m", "mb", "g", @@ -17,6 +17,7 @@ ], "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "h": [], "help": "__flag__", "s": [], diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json index c930cce0b863..90b524835911 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json @@ -5,7 +5,7 @@ "bytes": [ "b", "k", - "osd", + "kb", "m", "mb", "g", @@ -17,6 +17,7 @@ ], "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "h": [], "health": [ "green", diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodeattrs.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodeattrs.json index 84c1d13dbf6c..f32564e2a3f9 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodeattrs.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodeattrs.json @@ -4,6 +4,7 @@ "format": "", "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "h": [], "help": "__flag__", "s": [], diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodes.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodes.json index ae22f88c8567..3b9b17a35da7 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodes.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.nodes.json @@ -4,7 +4,7 @@ "bytes": [ "b", "k", - "osd", + "kb", "m", "mb", "g", @@ -18,6 +18,7 @@ "full_id": "__flag__", "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "h": [], "help": "__flag__", "s": [], diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.pending_tasks.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.pending_tasks.json index c2e1731e5230..bda19fc9c9d6 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.pending_tasks.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.pending_tasks.json @@ -4,6 +4,7 @@ "format": "", "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "h": [], "help": "__flag__", "s": [], diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.plugins.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.plugins.json index 9e2699a41ae8..3eee2d4f4eb7 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.plugins.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.plugins.json @@ -4,6 +4,7 @@ "format": "", "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "h": [], "help": "__flag__", "s": [], diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.repositories.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.repositories.json index 8e0e417fa5d4..160b5b3b931d 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.repositories.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.repositories.json @@ -4,6 +4,7 @@ "format": "", "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "h": [], "help": "__flag__", "s": [], diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.shards.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.shards.json index 6aa7fe8e4663..bde4b18dc795 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.shards.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.shards.json @@ -5,7 +5,7 @@ "bytes": [ "b", "k", - "osd", + "kb", "m", "mb", "g", @@ -17,6 +17,7 @@ ], "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "h": [], "help": "__flag__", "s": [], diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.snapshots.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.snapshots.json index b055aa585b6f..32301e4d5b01 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.snapshots.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.snapshots.json @@ -4,6 +4,7 @@ "format": "", "ignore_unavailable": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "h": [], "help": "__flag__", "s": [], diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.templates.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.templates.json index d68b52655241..d1cde662d617 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.templates.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.templates.json @@ -4,6 +4,7 @@ "format": "", "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "h": [], "help": "__flag__", "s": [], diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.thread_pool.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.thread_pool.json index a6c75370334c..1f654a68dec4 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.thread_pool.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.thread_pool.json @@ -12,6 +12,7 @@ ], "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "h": [], "help": "__flag__", "s": [], diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_component_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_component_template.json index 145c366683dc..896c35e03ad4 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_component_template.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.delete_component_template.json @@ -2,7 +2,8 @@ "cluster.delete_component_template": { "url_params": { "timeout": "", - "master_timeout": "" + "master_timeout": "", + "cluster_manager_timeout": "" }, "methods": [ "DELETE" diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_settings.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_settings.json index 10427fa913f5..a3e1aef327d3 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_settings.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_settings.json @@ -3,6 +3,7 @@ "url_params": { "flat_settings": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "timeout": "", "include_defaults": "__flag__" }, diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.health.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.health.json index 02e5daeba1b3..3bf13ecc3b48 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.health.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.health.json @@ -15,6 +15,7 @@ ], "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "timeout": "", "wait_for_active_shards": "", "wait_for_nodes": "", diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.pending_tasks.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.pending_tasks.json index 68bb48c9c207..a455ac5c433d 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.pending_tasks.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.pending_tasks.json @@ -2,7 +2,8 @@ "cluster.pending_tasks": { "url_params": { "local": "__flag__", - "master_timeout": "" + "master_timeout": "", + "cluster_manager_timeout": "" }, "methods": [ "GET" diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.put_settings.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.put_settings.json index 01965a331b07..24e9b7ba0b79 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.put_settings.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.put_settings.json @@ -3,6 +3,7 @@ "url_params": { "flat_settings": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "timeout": "" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.reroute.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.reroute.json index f0408c040d57..93234442c052 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.reroute.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.reroute.json @@ -6,6 +6,7 @@ "retry_failed": "__flag__", "metric": [], "master_timeout": "", + "cluster_manager_timeout": "", "timeout": "" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.state.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.state.json index c77b14e4e911..681b442bc460 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.state.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.state.json @@ -3,6 +3,7 @@ "url_params": { "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "flat_settings": "__flag__", "wait_for_metadata_version": "", "wait_for_timeout": "", @@ -28,8 +29,8 @@ "metrics": [ "_all", "blocks", - "master_node", "cluster_manager_node", + "master_node", "metadata", "nodes", "routing_nodes", diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/delete_script.json b/src/plugins/console/server/lib/spec_definitions/json/generated/delete_script.json index 88d64b9920ff..30d3f5fe2fb5 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/delete_script.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/delete_script.json @@ -2,7 +2,8 @@ "delete_script": { "url_params": { "timeout": "", - "master_timeout": "" + "master_timeout": "", + "cluster_manager_timeout": "" }, "methods": [ "DELETE" diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/get_script.json b/src/plugins/console/server/lib/spec_definitions/json/generated/get_script.json index 685155e5b8d8..3abbb0c412f7 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/get_script.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/get_script.json @@ -1,7 +1,8 @@ { "get_script": { "url_params": { - "master_timeout": "" + "master_timeout": "", + "cluster_manager_timeout": "" }, "methods": [ "GET" diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clone.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clone.json index 90d8a4e9d482..3d7f20b37ffa 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clone.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clone.json @@ -3,6 +3,7 @@ "url_params": { "timeout": "", "master_timeout": "", + "cluster_manager_timeout": "", "wait_for_active_shards": "" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.close.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.close.json index 2a390fe00548..03ff1d0d8263 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.close.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.close.json @@ -3,6 +3,7 @@ "url_params": { "timeout": "", "master_timeout": "", + "cluster_manager_timeout": "", "ignore_unavailable": "__flag__", "allow_no_indices": "__flag__", "expand_wildcards": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json index 76f60474a5b7..798f3f1362f0 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json @@ -1,10 +1,10 @@ { "indices.create": { "url_params": { - "include_type_name": "__flag__", "wait_for_active_shards": "", "timeout": "", - "master_timeout": "" + "master_timeout": "", + "cluster_manager_timeout": "" }, "methods": [ "PUT" diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_alias.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_alias.json index deb73655b4da..c3ef2677c614 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_alias.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_alias.json @@ -2,7 +2,8 @@ "indices.delete_alias": { "url_params": { "timeout": "", - "master_timeout": "" + "master_timeout": "", + "cluster_manager_timeout": "" }, "methods": [ "DELETE" diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_template.json index 7acda3fb6094..93901cd31f6b 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_template.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_template.json @@ -2,7 +2,8 @@ "indices.delete_template": { "url_params": { "timeout": "", - "master_timeout": "" + "master_timeout": "", + "cluster_manager_timeout": "" }, "methods": [ "DELETE" diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json index 553a4839616d..98c6070d6c7a 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json @@ -1,7 +1,6 @@ { "indices.get": { "url_params": { - "include_type_name": "__flag__", "local": "__flag__", "ignore_unavailable": "__flag__", "allow_no_indices": "__flag__", @@ -14,7 +13,8 @@ ], "flat_settings": "__flag__", "include_defaults": "__flag__", - "master_timeout": "" + "master_timeout": "", + "cluster_manager_timeout": "" }, "methods": [ "GET" diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json index 584b0ad5a9bb..ee970860b1cf 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json @@ -1,7 +1,6 @@ { "indices.get_mapping": { "url_params": { - "include_type_name": "__flag__", "ignore_unavailable": "__flag__", "allow_no_indices": "__flag__", "expand_wildcards": [ @@ -12,6 +11,7 @@ "all" ], "master_timeout": "", + "cluster_manager_timeout": "", "local": "__flag__" }, "methods": [ @@ -19,9 +19,7 @@ ], "patterns": [ "_mapping", - "{indices}/_mapping", - "_mapping/{type}", - "{indices}/_mapping/{type}" + "{indices}/_mapping" ], "documentation": "https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/indices-get-mapping.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_settings.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_settings.json index e1dab98ca9cc..ac8234f2661d 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_settings.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_settings.json @@ -2,6 +2,7 @@ "indices.get_settings": { "url_params": { "master_timeout": "", + "cluster_manager_timeout": "", "ignore_unavailable": "__flag__", "allow_no_indices": "__flag__", "expand_wildcards": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_template.json index 46d679ce320e..3bff9706e783 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_template.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_template.json @@ -1,9 +1,9 @@ { "indices.get_template": { "url_params": { - "include_type_name": "__flag__", "flat_settings": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "local": "__flag__" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_alias.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_alias.json index c326ec5f4df8..7de417e142cf 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_alias.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_alias.json @@ -2,7 +2,8 @@ "indices.put_alias": { "url_params": { "timeout": "", - "master_timeout": "" + "master_timeout": "", + "cluster_manager_timeout": "" }, "methods": [ "PUT", diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json index d161dfaf54c9..00c4de481a95 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json @@ -1,9 +1,9 @@ { "indices.put_mapping": { "url_params": { - "include_type_name": "__flag__", "timeout": "", "master_timeout": "", + "cluster_manager_timeout": "", "ignore_unavailable": "__flag__", "allow_no_indices": "__flag__", "expand_wildcards": [ @@ -12,21 +12,15 @@ "hidden", "none", "all" - ] + ], + "write_index_only": "__flag__" }, "methods": [ "PUT", "POST" ], "patterns": [ - "{indices}/_mapping", - "{indices}/{type}/_mapping", - "{indices}/_mapping/{type}", - "{indices}/{type}/_mappings", - "{indices}/_mappings/{type}", - "_mappings/{type}", - "{indices}/_mappings", - "_mapping/{type}" + "{indices}/_mapping" ], "documentation": "https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/indices-put-mapping.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_settings.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_settings.json index b81bde62f986..354829fe4217 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_settings.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_settings.json @@ -2,6 +2,7 @@ "indices.put_settings": { "url_params": { "master_timeout": "", + "cluster_manager_timeout": "", "timeout": "", "preserve_existing": "__flag__", "ignore_unavailable": "__flag__", diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_template.json index 79e2d734c63f..26eabc61b8b3 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_template.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_template.json @@ -1,11 +1,10 @@ { "indices.put_template": { "url_params": { - "include_type_name": "__flag__", "order": "", "create": "__flag__", "master_timeout": "", - "flat_settings": "__flag__" + "cluster_manager_timeout": "" }, "methods": [ "PUT", diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.rollover.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.rollover.json index 3cdbfa07b7fe..65f03d45c2e0 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.rollover.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.rollover.json @@ -1,10 +1,10 @@ { "indices.rollover": { "url_params": { - "include_type_name": "__flag__", "timeout": "", "dry_run": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "wait_for_active_shards": "" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shrink.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shrink.json index cac199d9b0a0..149146f1777f 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shrink.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shrink.json @@ -4,6 +4,7 @@ "copy_settings": "__flag__", "timeout": "", "master_timeout": "", + "cluster_manager_timeout": "", "wait_for_active_shards": "" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.split.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.split.json index 2331487becdc..043ab87977b5 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.split.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.split.json @@ -4,6 +4,7 @@ "copy_settings": "__flag__", "timeout": "", "master_timeout": "", + "cluster_manager_timeout": "", "wait_for_active_shards": "" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.update_aliases.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.update_aliases.json index 097c3c8ec9a4..958b4cb31d42 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.update_aliases.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.update_aliases.json @@ -2,7 +2,8 @@ "indices.update_aliases": { "url_params": { "timeout": "", - "master_timeout": "" + "master_timeout": "", + "cluster_manager_timeout": "" }, "methods": [ "POST" diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.delete_pipeline.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.delete_pipeline.json index 9340854d9fd5..1f23de8e3562 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.delete_pipeline.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.delete_pipeline.json @@ -2,6 +2,7 @@ "ingest.delete_pipeline": { "url_params": { "master_timeout": "", + "cluster_manager_timeout": "", "timeout": "" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.get_pipeline.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.get_pipeline.json index df442f3c72a6..e22f9fdcbf19 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.get_pipeline.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.get_pipeline.json @@ -1,7 +1,8 @@ { "ingest.get_pipeline": { "url_params": { - "master_timeout": "" + "master_timeout": "", + "cluster_manager_timeout": "" }, "methods": [ "GET" diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.put_pipeline.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.put_pipeline.json index 7bf882902252..b713907c8d31 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.put_pipeline.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ingest.put_pipeline.json @@ -2,6 +2,7 @@ "ingest.put_pipeline": { "url_params": { "master_timeout": "", + "cluster_manager_timeout": "", "timeout": "" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/put_script.json b/src/plugins/console/server/lib/spec_definitions/json/generated/put_script.json index 1de476ad8feb..22c30d646ebb 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/put_script.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/put_script.json @@ -3,6 +3,7 @@ "url_params": { "timeout": "", "master_timeout": "", + "cluster_manager_timeout": "", "context": "" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.cleanup_repository.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.cleanup_repository.json index da6c33ff6972..372caf0acd62 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.cleanup_repository.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.cleanup_repository.json @@ -2,6 +2,7 @@ "snapshot.cleanup_repository": { "url_params": { "master_timeout": "", + "cluster_manager_timeout": "", "timeout": "" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.create.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.create.json index 1e90cfa4cdb6..f8d761818d4c 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.create.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.create.json @@ -2,6 +2,7 @@ "snapshot.create": { "url_params": { "master_timeout": "", + "cluster_manager_timeout": "", "wait_for_completion": "__flag__" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.create_repository.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.create_repository.json index 95e0cc4a5678..26cc40b4f03a 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.create_repository.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.create_repository.json @@ -2,6 +2,7 @@ "snapshot.create_repository": { "url_params": { "master_timeout": "", + "cluster_manager_timeout": "", "timeout": "", "verify": "__flag__" }, diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.delete.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.delete.json index 679d72c782d9..9dacf2d4899f 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.delete.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.delete.json @@ -1,7 +1,8 @@ { "snapshot.delete": { "url_params": { - "master_timeout": "" + "master_timeout": "", + "cluster_manager_timeout": "" }, "methods": [ "DELETE" diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.delete_repository.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.delete_repository.json index ef5e5117e94f..0dada65c0b98 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.delete_repository.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.delete_repository.json @@ -2,6 +2,7 @@ "snapshot.delete_repository": { "url_params": { "master_timeout": "", + "cluster_manager_timeout": "", "timeout": "" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.get.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.get.json index a582656ce029..1fb5560fa122 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.get.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.get.json @@ -2,6 +2,7 @@ "snapshot.get": { "url_params": { "master_timeout": "", + "cluster_manager_timeout": "", "ignore_unavailable": "__flag__", "verbose": "__flag__" }, diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.get_repository.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.get_repository.json index dbae1687dc90..8b0f366331f2 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.get_repository.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.get_repository.json @@ -2,6 +2,7 @@ "snapshot.get_repository": { "url_params": { "master_timeout": "", + "cluster_manager_timeout": "", "local": "__flag__" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.restore.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.restore.json index 972fce7b39ce..f4c9b5c3cff3 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.restore.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.restore.json @@ -2,6 +2,7 @@ "snapshot.restore": { "url_params": { "master_timeout": "", + "cluster_manager_timeout": "", "wait_for_completion": "__flag__" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.status.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.status.json index 19fb493c695e..956c1631db30 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.status.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.status.json @@ -2,6 +2,7 @@ "snapshot.status": { "url_params": { "master_timeout": "", + "cluster_manager_timeout": "", "ignore_unavailable": "__flag__" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.verify_repository.json b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.verify_repository.json index 253c7e988505..6ad3c482628a 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.verify_repository.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/snapshot.verify_repository.json @@ -2,6 +2,7 @@ "snapshot.verify_repository": { "url_params": { "master_timeout": "", + "cluster_manager_timeout": "", "timeout": "" }, "methods": [ diff --git a/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.health.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.health.json index 949b897b29ff..e254406e7040 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.health.json +++ b/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.health.json @@ -15,6 +15,7 @@ ], "local": "__flag__", "master_timeout": "", + "cluster_manager_timeout": "", "timeout": "", "wait_for_active_shards": "", "wait_for_nodes": "",