Rename users

This commit renames users to elasticsearch-users.

x-pack/docs/build.gradle

@@ -146,7 +146,7 @@ integTestCluster {
     setting 'xpack.monitoring.exporters._local.enabled', 'false'
     setting 'xpack.license.self_generated.type', 'trial'
     setupCommand 'setupTestAdmin',
-            'bin/users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
+            'bin/elasticsearch-users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
     waitCondition = waitWithAuth
 }
 

x-pack/docs/en/commands/users-command.asciidoc

@@ -5,15 +5,15 @@
 <titleabbrev>users</titleabbrev>
 ++++
 
-If you use file-based user authentication, the `users` command enables you to
-add and remove users, assign user roles, and manage passwords.
+If you use file-based user authentication, the `elasticsearch-users` command
+enables you to add and remove users, assign user roles, and manage passwords.
 
 [float]
 === Synopsis
 
 [source,shell]
 --------------------------------------------------
-bin/x-pack/users
+bin/elasticsearch-users
 ([useradd <username>] [-p <password>] [-r <roles>]) |
 ([list] <username>) |
 ([passwd <username>] [-p <password>]) |
@@ -38,9 +38,9 @@ Passwords must be at least 6 characters long.
 For more information, see {xpack-ref}/file-realm.html[File-based User Authentication].
 
 TIP: To ensure that {es} can read the user and role information at startup, run
-`users useradd` as the same user you use to run {es}. Running the command as
-root or some other user updates the permissions for the `users` and `users_roles`
-files and prevents {es} from accessing them.
+`elasticsearch-users useradd` as the same user you use to run {es}. Running the
+command as root or some other user updates the permissions for the `users` and
+`users_roles` files and prevents {es} from accessing them.
 
 [float]
 === Parameters
@@ -95,7 +95,7 @@ password for this user is `theshining`, and this user is associated with the
 
 [source,shell]
 -------------------------------------------------------------------
-bin/x-pack/users useradd jacknich -p theshining -r network,monitoring
+bin/elasticsearch-users useradd jacknich -p theshining -r network,monitoring
 -------------------------------------------------------------------
 
 The following example lists the users that are registered with the `file` realm
@@ -103,7 +103,7 @@ on the local node:
 
 [source, shell]
 ----------------------------------
-bin/x-pack/users list
+bin/elasticsearch-users list
 rdeniro        : admin
 alpacino       : power_user
 jacknich       : monitoring,network
@@ -116,7 +116,7 @@ The following example resets the `jacknich` user's password:
 
 [source,shell]
 --------------------------------------------------
-bin/x-pack/users passwd jachnich
+bin/elasticsearch-users passwd jachnich
 --------------------------------------------------
 
 Since the `-p` parameter was omitted, the command prompts you to enter and
@@ -127,12 +127,12 @@ The following example removes the `network` and `monitoring` roles from the
 
 [source,shell]
 ------------------------------------------------------------
-bin/x-pack/users roles jacknich -r network,monitoring -a user
+bin/elasticsearch-users roles jacknich -r network,monitoring -a user
 ------------------------------------------------------------
 
 The following example deletes the `jacknich` user:
 
 [source,shell]
 --------------------------------------------------
-bin/x-pack/users userdel jacknich
+bin/elasticsearch-users userdel jacknich
 --------------------------------------------------

x-pack/docs/en/security/authentication/file-realm.asciidoc

@@ -109,7 +109,7 @@ Puppet or Chef).
 ==============================
 
 While it is possible to modify these files directly using any standard text
-editor, we strongly recommend using the {ref}/users-command.html[`bin/x-pack/users`]
+editor, we strongly recommend using the {ref}/users-command.html[`bin/elasticsearch-users`]
 command-line tool to apply the required changes.
 
 [float]

x-pack/docs/en/security/reference/files.asciidoc

@@ -6,10 +6,10 @@ The {security} uses the following files:
 * `CONFIG_DIR/x-pack/roles.yml` defines the roles in use on the cluster
   (read more <<roles-management-file, here>>).
 
-* `CONFIG_DIR/x-pack/users` defines the users and their hashed passwords for
+* `CONFIG_DIR/elasticsearch-users` defines the users and their hashed passwords for
   the <<file-realm,`file` realm>>.
 
-* `CONFIG_DIR/x-pack/users_roles` defines the user roles assignment for the
+* `CONFIG_DIR/elasticsearch-users_roles` defines the user roles assignment for the
   the <<file-realm, `file` realm>>.
 
 * `CONFIG_DIR/x-pack/role_mapping.yml` defines the role assignments for a

x-pack/docs/en/security/troubleshooting.asciidoc

@@ -58,8 +58,8 @@ authorization exception.
 *Resolution:*
 
 . Verify that the role names associated with the users match the roles defined
-in the `roles.yml` file. You can use the `users` tool to list all the users. Any
-unknown roles are marked with `*`.
+in the `roles.yml` file. You can use the `elasticsearch-users` tool to list all
+the users. Any unknown roles are marked with `*`.
 +
 --
 [source, shell]
@@ -117,20 +117,21 @@ role mappings.
 
 *Symptoms:*
 
-* The `users` command fails with the following message:
+* The `elasticsearch-users` command fails with the following message:
 `ERROR: extra arguments [...] were provided`.
 
 *Resolution:*
 
-This error occurs when the `users` tool is parsing the input and finds
-unexpected arguments. This can happen when there are special characters used in
-some of the arguments. For example, on Windows systems the `,` character is
-considered a parameter separator; in other words `-r role1,role2` is translated
-to `-r role1 role2` and the `users` tool only recognizes `role1` as an expected
-parameter. The solution here is to quote the parameter: `-r "role1,role2"`.
+This error occurs when the `elasticsearch-users` tool is parsing the input and
+finds unexpected arguments. This can happen when there are special characters
+used in some of the arguments. For example, on Windows systems the `,` character
+is considered a parameter separator; in other words `-r role1,role2` is
+translated to `-r role1 role2` and the `elasticsearch-users` tool only
+recognizes `role1` as an expected parameter. The solution here is to quote the
+parameter: `-r "role1,role2"`.
 
 For more information about this command, see
-{ref}/users-command.html[Users Command].
+{ref}/users-command.html[`elasticsearch-users` command].
 
 [[trouble-shoot-active-directory]]
 === Users are frequently locked out of Active Directory

x-pack/plugin/build.gradle

@@ -105,7 +105,7 @@ integTestCluster {
   keystoreSetting 'xpack.security.transport.ssl.keystore.secure_password', 'keypass'
   distribution = 'zip' // this is important since we use the reindex module in ML
 
-  setupCommand 'setupTestUser', 'bin/users', 'useradd', 'x_pack_rest_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+  setupCommand 'setupTestUser', 'bin/elasticsearch-users', 'useradd', 'x_pack_rest_user', '-p', 'x-pack-test-password', '-r', 'superuser'
 
   extraConfigFile nodeKeystore.name, nodeKeystore
 

x-pack/qa/audit-tests/build.gradle

@@ -25,7 +25,7 @@ integTestCluster {
   setting 'xpack.license.self_generated.type', 'trial'
   setting 'logger.level', 'DEBUG'
   setupCommand 'setupDummyUser',
-               'bin/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+               'bin/elasticsearch-users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
   waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')
     ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow",

x-pack/qa/core-rest-tests-with-security/build.gradle

@@ -28,7 +28,7 @@ integTestCluster {
   setting 'xpack.ml.enabled', 'false'
   setting 'xpack.license.self_generated.type', 'trial'
   setupCommand 'setupDummyUser',
-               'bin/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+               'bin/elasticsearch-users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
   waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')
     ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow",

x-pack/qa/full-cluster-restart/build.gradle

@@ -147,7 +147,7 @@ subprojects {
       numBwcNodes = 2
       numNodes = 2
       clusterName = 'full-cluster-restart'
-      String usersCli = version.before('6.3.0') ? 'bin/x-pack/users' : 'bin/users'
+      String usersCli = version.before('6.3.0') ? 'bin/x-pack/users' : 'bin/elasticsearch-users'
       setupCommand 'setupTestUser', usersCli, 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
       waitCondition = waitWithAuth
 
@@ -196,7 +196,7 @@ subprojects {
       clusterName = 'full-cluster-restart'
       dataDir = { nodeNum -> oldClusterTest.nodes[nodeNum].dataDir }
       cleanShared = false // We want to keep snapshots made by the old cluster!
-      setupCommand 'setupTestUser', 'bin/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+      setupCommand 'setupTestUser', 'bin/elasticsearch-users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
       waitCondition = waitWithAuth
 
       // debug logging for testRecovery see https://github.com/elastic/x-pack-elasticsearch/issues/2691

x-pack/qa/ml-native-tests/build.gradle

@@ -66,7 +66,7 @@ integTestCluster {
   keystoreSetting 'xpack.security.transport.ssl.keystore.secure_password', 'keypass'
 
   setupCommand 'setupDummyUser',
-          'bin/users', 'useradd', 'x_pack_rest_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+          'bin/elasticsearch-users', 'useradd', 'x_pack_rest_user', '-p', 'x-pack-test-password', '-r', 'superuser'
 
   extraConfigFile nodeKeystore.name, nodeKeystore
 

x-pack/qa/multi-cluster-search-security/build.gradle

@@ -21,7 +21,7 @@ remoteClusterTestCluster {
   setting 'xpack.ml.enabled', 'false'
   setting 'xpack.license.self_generated.type', 'trial'
   setupCommand 'setupDummyUser',
-          'bin/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+          'bin/elasticsearch-users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
   waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')
     ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow",
@@ -48,7 +48,7 @@ mixedClusterTestCluster {
   setting 'xpack.ml.enabled', 'false'
   setting 'xpack.license.self_generated.type', 'trial'
   setupCommand 'setupDummyUser',
-          'bin/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+          'bin/elasticsearch-users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
   waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')
     ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow",

x-pack/qa/multi-node/build.gradle

@@ -13,8 +13,8 @@ integTestCluster {
   setting 'xpack.monitoring.enabled', 'false'
   setting 'xpack.ml.enabled', 'false'
   extraConfigFile 'roles.yml', 'roles.yml'
-  setupCommand 'setup-test-user', 'bin/users', 'useradd', 'test-user', '-p', 'x-pack-test-password', '-r', 'test'
-  setupCommand 'setup-super-user', 'bin/users', 'useradd', 'super-user', '-p', 'x-pack-super-password', '-r', 'superuser'
+  setupCommand 'setup-test-user', 'bin/elasticsearch-users', 'useradd', 'test-user', '-p', 'x-pack-test-password', '-r', 'test'
+  setupCommand 'setup-super-user', 'bin/elasticsearch-users', 'useradd', 'super-user', '-p', 'x-pack-super-password', '-r', 'superuser'
   waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')
     ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow",

x-pack/qa/reindex-tests-with-security/build.gradle

@@ -25,7 +25,7 @@ integTestCluster {
     can_not_see_hidden_fields_user: 'can_not_see_hidden_fields',
   ].each { String user, String role ->
     setupCommand 'setupUser#' + user,
-                 'bin/users', 'useradd', user, '-p', 'x-pack-test-password', '-r', role
+                 'bin/elasticsearch-users', 'useradd', user, '-p', 'x-pack-test-password', '-r', role
   }
   waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')

x-pack/qa/rolling-upgrade/build.gradle

@@ -125,7 +125,7 @@ subprojects {
       if (version.before('6.3.0')) {
         plugin xpackProject('plugin').path
       }
-      String usersCli = version.before('6.3.0') ? 'bin/x-pack/users' : 'bin/users'
+      String usersCli = version.before('6.3.0') ? 'bin/x-pack/users' : 'bin/elasticsearch-users'
       setupCommand 'setupTestUser', usersCli, 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
       bwcVersion = version
       numBwcNodes = 2
@@ -171,7 +171,7 @@ subprojects {
 
     configure(extensions.findByName("${baseName}#mixedClusterTestCluster")) {
       dependsOn oldClusterTestRunner, "${baseName}#oldClusterTestCluster#node1.stop"
-      setupCommand 'setupTestUser', 'bin/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+      setupCommand 'setupTestUser', 'bin/elasticsearch-users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
       clusterName = 'rolling-upgrade'
       unicastTransportUri = { seedNode, node, ant -> oldClusterTest.nodes.get(0).transportUri() }
       minimumMasterNodes = { 2 }
@@ -209,7 +209,7 @@ subprojects {
 
     configure(extensions.findByName("${baseName}#upgradedClusterTestCluster")) {
       dependsOn(mixedClusterTestRunner, "${baseName}#oldClusterTestCluster#node0.stop")
-      setupCommand 'setupTestUser', 'bin/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+      setupCommand 'setupTestUser', 'bin/elasticsearch-users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
       clusterName = 'rolling-upgrade'
       unicastTransportUri = { seedNode, node, ant -> mixedClusterTest.nodes.get(0).transportUri() }
       minimumMasterNodes = { 2 }

x-pack/qa/saml-idp-tests/build.gradle

@@ -52,7 +52,7 @@ integTestCluster {
   extraConfigFile 'idp-metadata.xml', idpFixtureProject.file("src/main/resources/provision/generated/idp-metadata.xml")
 
   setupCommand 'setupTestAdmin',
-            'bin/users', 'useradd', "test_admin", '-p', 'x-pack-test-password', '-r', "superuser"
+            'bin/elasticsearch-users', 'useradd', "test_admin", '-p', 'x-pack-test-password', '-r', "superuser"
 
   waitCondition = { node, ant ->
         File tmpFile = new File(node.cwd, 'wait.success')

x-pack/qa/security-client-tests/build.gradle

@@ -23,9 +23,9 @@ integTestCluster {
   setting 'xpack.ml.enabled', 'false'
   setting 'xpack.license.self_generated.type', 'trial'
   setupCommand 'setupDummyUser',
-               'bin/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+               'bin/elasticsearch-users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
   setupCommand 'setupTransportClientUser',
-               'bin/users', 'useradd', 'transport', '-p', 'x-pack-test-password', '-r', 'transport_client'
+               'bin/elasticsearch-users', 'useradd', 'transport', '-p', 'x-pack-test-password', '-r', 'transport_client'
   waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')
     ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow",

x-pack/qa/security-example-spi-extension/build.gradle

@@ -37,7 +37,7 @@ integTestCluster {
   distribution = 'zip'
 
   setupCommand 'setupDummyUser',
-               'bin/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+               'bin/elasticsearch-users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
   waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')
     ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow",

x-pack/qa/security-migrate-tests/build.gradle

@@ -18,7 +18,7 @@ integTestCluster {
     bob: 'actual_role'
   ].each { String user, String role ->
     setupCommand 'setupUser#' + user,
-                 'bin/users', 'useradd', user, '-p', 'x-pack-test-password', '-r', role
+                 'bin/elasticsearch-users', 'useradd', user, '-p', 'x-pack-test-password', '-r', role
   }
   waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')

x-pack/qa/security-setup-password-tests/build.gradle

@@ -13,7 +13,7 @@ integTestRunner {
 
 integTestCluster {
     setupCommand 'setupTestAdmin',
-            'bin/users', 'useradd', "test_admin", '-p', 'x-pack-test-password', '-r', "superuser"
+            'bin/elasticsearch-users', 'useradd', "test_admin", '-p', 'x-pack-test-password', '-r', "superuser"
     setting 'xpack.security.enabled', 'true'
     setting 'xpack.license.self_generated.type', 'trial'
     waitCondition = { node, ant ->

x-pack/qa/smoke-test-graph-with-security/build.gradle

@@ -16,11 +16,11 @@ integTestCluster {
   dependsOn copyGraphRestTests
   extraConfigFile 'roles.yml', 'roles.yml'
   setupCommand 'setupTestAdminUser',
-               'bin/users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
+               'bin/elasticsearch-users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
   setupCommand 'setupGraphExplorerUser',
-               'bin/users', 'useradd', 'graph_explorer', '-p', 'x-pack-test-password', '-r', 'graph_explorer'
+               'bin/elasticsearch-users', 'useradd', 'graph_explorer', '-p', 'x-pack-test-password', '-r', 'graph_explorer'
   setupCommand 'setupPowerlessUser',
-               'bin/users', 'useradd', 'no_graph_explorer', '-p', 'x-pack-test-password', '-r', 'no_graph_explorer'
+               'bin/elasticsearch-users', 'useradd', 'no_graph_explorer', '-p', 'x-pack-test-password', '-r', 'no_graph_explorer'
   setting 'xpack.license.self_generated.type', 'trial'
   setting 'xpack.security.enabled', 'true'
   waitCondition = { node, ant ->

x-pack/qa/smoke-test-ml-with-security/build.gradle

@@ -96,13 +96,13 @@ integTestCluster {
   dependsOn copyMlRestTests
   extraConfigFile 'roles.yml', 'roles.yml'
   setupCommand 'setupTestAdminUser',
-               'bin/users', 'useradd', 'x_pack_rest_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+               'bin/elasticsearch-users', 'useradd', 'x_pack_rest_user', '-p', 'x-pack-test-password', '-r', 'superuser'
   setupCommand 'setupMlAdminUser',
-               'bin/users', 'useradd', 'ml_admin', '-p', 'x-pack-test-password', '-r', 'minimal,machine_learning_admin'
+               'bin/elasticsearch-users', 'useradd', 'ml_admin', '-p', 'x-pack-test-password', '-r', 'minimal,machine_learning_admin'
   setupCommand 'setupMlUserUser',
-               'bin/users', 'useradd', 'ml_user', '-p', 'x-pack-test-password', '-r', 'minimal,machine_learning_user'
+               'bin/elasticsearch-users', 'useradd', 'ml_user', '-p', 'x-pack-test-password', '-r', 'minimal,machine_learning_user'
   setupCommand 'setupPowerlessUser',
-               'bin/users', 'useradd', 'no_ml', '-p', 'x-pack-test-password', '-r', 'minimal'
+               'bin/elasticsearch-users', 'useradd', 'no_ml', '-p', 'x-pack-test-password', '-r', 'minimal'
   setting 'xpack.license.self_generated.type', 'trial'
   setting 'xpack.security.enabled', 'true'
   waitCondition = { node, ant ->

x-pack/qa/smoke-test-plugins-ssl/build.gradle

@@ -188,9 +188,9 @@ integTestCluster {
   extraConfigFile clientKeyStore.name, clientKeyStore
 
   setupCommand 'setupTestUser',
-               'bin/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+               'bin/elasticsearch-users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
   setupCommand 'setupMonitoringUser',
-               'bin/users', 'useradd', 'monitoring_agent', '-p', 'x-pack-test-password', '-r', 'remote_monitoring_agent'
+               'bin/elasticsearch-users', 'useradd', 'monitoring_agent', '-p', 'x-pack-test-password', '-r', 'remote_monitoring_agent'
 
   waitCondition = { NodeInfo node, AntBuilder ant ->
     File tmpFile = new File(node.cwd, 'wait.success')

x-pack/qa/smoke-test-plugins/build.gradle

@@ -17,7 +17,7 @@ project.rootProject.subprojects.findAll { it.path.startsWith(':plugins:') }.each
 integTestCluster {
   setting 'xpack.security.enabled', 'true'
   setupCommand 'setupDummyUser',
-               'bin/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
+               'bin/elasticsearch-users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
   waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')
     ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow",

x-pack/qa/smoke-test-security-with-mustache/build.gradle

@@ -13,7 +13,7 @@ integTestCluster {
   setting 'xpack.security.enabled', 'true'
   setting 'xpack.license.self_generated.type', 'trial'
   setupCommand 'setupDummyUser',
-          'bin/users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
+          'bin/elasticsearch-users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
   waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')
     ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow",

x-pack/qa/smoke-test-watcher-with-security/build.gradle

@@ -25,13 +25,13 @@ integTestCluster {
   setting 'xpack.license.self_generated.type', 'trial'
   extraConfigFile 'roles.yml', 'roles.yml'
   setupCommand 'setupTestAdminUser',
-               'bin/users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
+               'bin/elasticsearch-users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
   setupCommand 'setupXpackUserForTests',
-               'bin/users', 'useradd', 'x_pack_rest_user', '-p', 'x-pack-test-password', '-r', 'watcher_manager'
+               'bin/elasticsearch-users', 'useradd', 'x_pack_rest_user', '-p', 'x-pack-test-password', '-r', 'watcher_manager'
   setupCommand 'setupWatcherManagerUser',
-               'bin/users', 'useradd', 'watcher_manager', '-p', 'x-pack-test-password', '-r', 'watcher_manager'
+               'bin/elasticsearch-users', 'useradd', 'watcher_manager', '-p', 'x-pack-test-password', '-r', 'watcher_manager'
   setupCommand 'setupPowerlessUser',
-               'bin/users', 'useradd', 'powerless_user', '-p', 'x-pack-test-password', '-r', 'crappy_role'
+               'bin/elasticsearch-users', 'useradd', 'powerless_user', '-p', 'x-pack-test-password', '-r', 'crappy_role'
   waitCondition = { node, ant ->
     File tmpFile = new File(node.cwd, 'wait.success')
     ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow",

x-pack/qa/sql/security/build.gradle

@@ -31,7 +31,7 @@ subprojects {
     /* Setup the one admin user that we run the tests as.
      * Tests use "run as" to get different users. */
     setupCommand 'setupUser#test_admin',
-                'bin/users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
+                'bin/elasticsearch-users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
     // Subprojects override the wait condition to work properly with security
   }
 
@@ -50,6 +50,6 @@ subprojects {
     /* Setup the one admin user that we run the tests as.
      * Tests use "run as" to get different users. */
     setupCommand 'setupUser#test_admin',
-                'bin/users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
+                'bin/elasticsearch-users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
   }
 }

x-pack/qa/vagrant/src/test/resources/packaging/utils/xpack.bash

@@ -31,8 +31,8 @@ verify_xpack_installation() {
         "elasticsearch-sql-cli-$(cat version).jar" # This jar is executable so we pitch it in bin so folks will find it
         'syskeygen'
         'syskeygen.bat'
-        'users'
-        'users.bat'
+        'elasticsearch-users'
+        'elasticsearch-users.bat'
         'x-pack-env'
         'x-pack-env.bat'
         'x-pack-security-env'