Skip to content

Fixes the ES endpoint to asks license #11297

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

Closed
wants to merge 1 commit into from
Closed

Fixes the ES endpoint to asks license #11297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions docs/static/monitoring/troubleshooting.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ disabled for security reasons. To resume monitoring:
--
[source, sh]
---------------------------------------------------------------
PUT _xpack/security/user/logstash_system/_password
PUT _security/user/logstash_system/_password
{
"password": "newpassword"
}
Expand All @@ -30,7 +30,7 @@ PUT _xpack/security/user/logstash_system/_password
--
[source, sh]
---------------------------------------------------------------
PUT _xpack/security/user/logstash_system/_enable
PUT _security/user/logstash_system/_enable
---------------------------------------------------------------
//CONSOLE
--
12 changes: 6 additions & 6 deletions docs/static/security/logstash.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ management], also add `manage_ilm` for cluster and `manage` and `manage_ilm` for
+
[source, sh]
---------------------------------------------------------------
POST _xpack/security/role/logstash_writer
POST _security/role/logstash_writer
{
"cluster": ["manage_index_templates", "monitor", "manage_ilm"], <1>
"indices": [
Expand All @@ -71,7 +71,7 @@ the `user` API:
+
[source, sh]
---------------------------------------------------------------
POST _xpack/security/user/logstash_internal
POST _security/user/logstash_internal
{
"password" : "x-pack-test-password",
"roles" : [ "logstash_writer"],
Expand Down Expand Up @@ -121,7 +121,7 @@ privileges for the Logstash indices. You can create roles from the
+
[source, sh]
---------------------------------------------------------------
POST _xpack/security/role/logstash_reader
POST _security/role/logstash_reader
{
"indices": [
{
Expand All @@ -142,7 +142,7 @@ also assign the `logstash_admin` role. You can create and manage users from the
+
[source, sh]
---------------------------------------------------------------
POST _xpack/security/user/logstash_user
POST _security/user/logstash_user
{
"password" : "x-pack-test-password",
"roles" : [ "logstash_reader", "logstash_admin"], <1>
Expand Down Expand Up @@ -215,7 +215,7 @@ password API:

[source,js]
---------------------------------------------------------------------
PUT _xpack/security/user/logstash_system/_password
PUT _security/user/logstash_system/_password
{
"password": "t0p.s3cr3t"
}
Expand All @@ -236,7 +236,7 @@ You can enable the user through the `user` API:

[source,js]
---------------------------------------------------------------------
PUT _xpack/security/user/logstash_system/_enable
PUT _security/user/logstash_system/_enable
---------------------------------------------------------------------
// CONSOLE

Expand Down
2 changes: 1 addition & 1 deletion x-pack/qa/integration/support/elasticsearch/api/actions/update_password.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module Actions
# Update the password of the specified user
def update_password(arguments={})
method = HTTP_PUT
path = Utils.__pathify '_xpack/security/user/',
path = Utils.__pathify '_security/user/',
Utils.__escape(arguments[:user]),
'/_password'
params = {}
Expand Down
4 changes: 2 additions & 2 deletions x-pack/qa/integration/support/helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ def elasticsearch(options = {})
end

def start_es_xpack_trial
if elasticsearch_client.perform_request(:get, '_xpack/license').body['license']['type'] != 'trial'
resp = elasticsearch_client.perform_request(:post, '_xpack/license/start_trial', "acknowledge" => true)
if elasticsearch_client.perform_request(:get, '_license').body['license']['type'] != 'trial'
resp = elasticsearch_client.perform_request(:post, '_license/start_trial', "acknowledge" => true)
if resp.body["trial_was_started"] != true
raise "Trial not started: #{resp.body}"
end
Expand Down