Skip to content

Commit

Permalink
[Console] Autocompletion of component_templates (#91180)
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/plugins/console/server/lib/spec_definitions/json/generated/cluster.get_component_template.json
#	src/plugins/console/server/lib/spec_definitions/json/generated/cluster.put_component_template.json
#	src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.put_component_template.json
  • Loading branch information
joxley-elastic authored and alisonelizabeth committed Feb 25, 2021
1 parent 9b1dc95 commit 24d46ad
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"cluster.get_component_template": {
"url_params": {
"flat_settings": "__flag__",
"master_timeout": "",
"local": "__flag__"
},
Expand All @@ -11,6 +12,5 @@
"_component_template",
"_component_template/{name}"
],
"documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html"
}
"documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/getting-component-templates.html" }
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
"cluster.put_component_template": {
"url_params": {
"create": "__flag__",
"timeout": "",
"master_timeout": ""
},
"methods": [
"PUT",
"POST"
"PUT"
],
"patterns": [
"_component_template/{name}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
<<<<<<< HEAD
"cluster.put_component_template": {
"data_autocomplete_rules": {
"settings": {
Expand All @@ -14,6 +15,17 @@
"mappings": {
"__scope_link": "put_mapping"
}
=======
"indices.put_template": {
"data_autocomplete_rules": {
"template": {},
"aliases": {},
"settings": {},
"mappings": {},
"version": 0,
"_meta": {},
"allow_auto_create": false
>>>>>>> 06d966eca57... [Console] Autocompletion of component_templates (#91180)
}
}
}

0 comments on commit 24d46ad

Please sign in to comment.