Skip to content

Allow _cat indices & aliases to use indices options #53248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 13, 2020
Merged

Allow _cat indices & aliases to use indices options #53248

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8159e80
Allow _cat indices & aliases to use indices options
gwbrown Mar 6, 2020
a06ddb5
Add "hidden" expand_wildcards option to YAML spec
gwbrown Mar 10, 2020
8308cf1
Update Get Alias API expand_wildcards default in spec
gwbrown Mar 10, 2020
3737634
Add expand_wildcards to _cat indices & aliases spec
gwbrown Mar 10, 2020
5fa1c2b
Merge branch 'master' into hidden/fix-cat-requests
gwbrown Mar 11, 2020
f0dc362
Integration tests with security
gwbrown Mar 11, 2020
7c305bc
YAML tests for _cat/indices with hidden indices/aliases
gwbrown Mar 11, 2020
1a3736b
YAML tests for _cat/aliases with hidden indices/aliases
gwbrown Mar 11, 2020
b5ae669
Merge branch 'master' into hidden/fix-cat-requests
gwbrown Mar 11, 2020
d1af586
Remove a couple checks that don't work with security enabled
gwbrown Mar 12, 2020
748cb8b
Merge branch 'master' into hidden/fix-cat-requests
gwbrown Mar 12, 2020
641f4e3
Doh - this won't work on 7.7 until this PR is backported
gwbrown Mar 12, 2020
c50bd38
Fix redundant "all,hidden" to either "all" or "open,hidden"
gwbrown Mar 12, 2020
fa8c95b
Remove accidental hidden setting
gwbrown Mar 12, 2020
7baa865
Fix issue with test when security is enabled
gwbrown Mar 12, 2020
ddd8a5b
Merge branch 'master' into hidden/fix-cat-requests
gwbrown Mar 12, 2020
37ef19a
Relocate CatIndicesWithSecurityIT
gwbrown Mar 12, 2020
52bf3b6
Merge branch 'master' into hidden/fix-cat-requests
elasticmachine Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/cat.aliases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,18 @@
"type":"boolean",
"description":"Verbose mode. Display column headers",
"default":false
},
"expand_wildcards":{
"type":"enum",
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
"default": ["all", "hidden"],
"description":"Whether to expand wildcard expression to concrete indices that are open, closed or both."
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/cat.indices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,18 @@
"type":"boolean",
"description":"If set to true segment stats will include stats for segments that are not currently loaded into memory",
"default":false
},
"expand_wildcards":{
"type":"enum",
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
"default": "all",
"description":"Whether to expand wildcard expression to concrete indices that are open, closed or both."
}
}
}
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/cluster.health.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/cluster.state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/count.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/field_caps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.clear_cache.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.close.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_alias.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.flush.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.forcemerge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
3 changes: 2 additions & 1 deletion rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_alias.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,11 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
"default":"all",
"default": ["all", "hidden"],
"description":"Whether to expand wildcard expression to concrete indices that are open, closed or both."
},
"local":{
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_field_mapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_mapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_upgrade.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.open.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_mapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.refresh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.segments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.shard_stores.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.stats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.upgrade.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/indices.validate_query.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/rank_eval.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/search.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/search_shards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/search_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"options":[
"open",
"closed",
"hidden",
"none",
"all"
],
Expand Down
Loading