[APM] Remove mentions of apm_user

docs/apm/apm-app-users.asciidoc

@@ -125,9 +125,9 @@ Here are two examples:
 <titleabbrev>Create an annotation user</titleabbrev>
 ++++
 
-NOTE: By default, the `apm_user` built-in role provides access to Observability annotations.
-You only need to create an annotation user if the default annotation index
-defined in <<apm-settings-kb,`xpack.observability.annotations.index`>> has been customized.
+NOTE: By default, the `viewer` and `editor` built-in roles provide read access to Observability annotations.
+You only need to create an annotation user to write to the annotations index
+(<<apm-settings-kb,`xpack.observability.annotations.index`>>).
 
 [[apm-app-annotation-user]]
 ==== Annotation user

x-pack/plugins/apm/dev_docs/local_setup.md

@@ -16,22 +16,25 @@ To access an Elasticsearch instance that has live data you have three options:
 **Start Elasticsearch & Kibana**
 
 Elasticsearch:
+
 ```
 yarn es snapshot
 ```
+
 Kibana:
+
 ```
 yarn start
 ```
 
-
 **Run Synthtrace**
+
 ```
 node packages/elastic-apm-synthtrace/src/scripts/run packages/elastic-apm-synthtrace/src/scripts/examples/01_simple_trace.ts \
   --local
 ```
 
-The `--local` flag is a shortcut to specifying `--target` and `--kibana`.  It autodiscovers the current kibana basepath and installs the appropiate APM package.
+The `--local` flag is a shortcut to specifying `--target` and `--kibana`. It autodiscovers the current kibana basepath and installs the appropiate APM package.
 
 **Connect Kibana to ES**
 Update `config/kibana.dev.yml` with:
@@ -61,7 +64,9 @@ node packages/elastic-apm-synthtrace/src/scripts/run packages/elastic-apm-syntht
 ## 3. Local ES Cluster
 
 ### Start Elasticsearch and APM data generators
+
 _Docker Compose is required_
+
 ```
 git clone git@github.com:elastic/apm-integration-testing.git
 cd apm-integration-testing/
@@ -80,16 +85,16 @@ elasticsearch.password: changeme
 
 # Setup default APM users
 
-APM behaves differently depending on which the role and permissions a logged in user has. To create the users run:
+APM behaves differently depending on which role and permissions a logged in user has. To create APM users run:
 
 ```sh
-node x-pack/plugins/apm/scripts/create_apm_users_and_roles.js --username admin --password changeme --kibana-url http://localhost:5601 --role-suffix <github-username-or-something-unique>
+node x-pack/plugins/apm/scripts/create_apm_users.js --username admin --password changeme --kibana-url http://localhost:5601
 ```
 
 This will create:
 
- - **apm_read_user**: Read only user
- - **apm_power_user**: Read+write user.
+- **viewer_user**: User with `viewer` role (read-only)
+- **editor_user**: User with `editor` role (read/write)
 
 # Debugging Elasticsearch queries
 

x-pack/plugins/apm/dev_docs/testing.md

@@ -18,47 +18,47 @@ open target/coverage/jest/index.html
 
 ## API Tests
 
-API tests are separated in two suites:
+| Option    | Description                                     |
+| --------- | ----------------------------------------------- |
+| --basic   | Run tests with basic license                    |
+| --trial   | Run tests with trial license                    |
+| --server  | Only start ES and Kibana                        |
+| --runner  | Only run tests                                  |
+| --grep    | Specify the spec files to run                   |
+| --inspect | Add --inspect-brk flag to the ftr for debugging |
+| --times   | Repeat the test n number of times               |
 
-- a basic license test suite [default]
-- a trial license test suite (the equivalent of gold+)
+The API tests are located in [`x-pack/test/apm_api_integration/`](/x-pack/test/apm_api_integration/).
 
-### Run tests with [--trial] license
+### Start server and run test in a single process
 
 ```
-node scripts/test/api [--trial] [--help]
+node scripts/test/api [--trial/--basic] [--help]
 ```
 
-The above command will initiate an Elasticsearch instance on http://localhost:9220 and a kibana instance on http://localhost:5620 and will run the api test against these environments.
+The above command will start an ES instance on http://localhost:9220, a Kibana instance on http://localhost:5620 and run the api tests.
 Once the tests finish, the instances will be terminated.
 
-### Start test server
-
-```
-node scripts/test/api --server
-```
+### Start server and run test in separate processes
 
-Start Elasticsearch and Kibana instances.
+```sh
 
-### Run all tests
+# start server
+node scripts/test/api --server --basic
 
+# run tests
+node scripts/test/api --runner --basic
 ```
-node scripts/test/api --runner
-```
-
-Run all tests. The test server needs to be running, see [Start Test Server](#start-test-server).
 
 ### Update snapshots (from Kibana root)
 
-To update snapshots append `--updateSnapshots` to the `functional_test_runner` command
+To update snapshots append `--updateSnapshots` to the `--runner` command:
 
 ```
-node scripts/functional_test_runner --config x-pack/test/apm_api_integration/[basic | trial]/config.ts --quiet --updateSnapshots
+node scripts/test/api --runner --basic --updateSnapshots
 ```
 
-The test server needs to be running, see [Start Test Server](#start-test-server).
-
-The API tests are located in [`x-pack/test/apm_api_integration/`](/x-pack/test/apm_api_integration/).
+(The test server needs to be running)
 
 **API Test tips**
 

x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/comparison.ts

@@ -30,7 +30,7 @@ describe('Comparison feature flag', () => {
   });
 
   beforeEach(() => {
-    cy.loginAsPowerUser();
+    cy.loginAsEditorUser();
   });
 
   describe('when comparison feature is enabled', () => {

x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.spec.ts

@@ -32,7 +32,7 @@ describe('Infrastracture feature flag', () => {
   });
 
   beforeEach(() => {
-    cy.loginAsPowerUser();
+    cy.loginAsEditorUser();
   });
 
   describe('when infrastracture feature is disabled', () => {

x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/integration_settings/integration_policy.spec.ts

@@ -56,7 +56,7 @@ describe('when navigating to integration page', () => {
   beforeEach(() => {
     const integrationsPath = '/app/integrations/browse';
 
-    cy.loginAsPowerUser();
+    cy.loginAsEditorUser();
     cy.visit(integrationsPath);
 
     // open integration policy form

x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts

@@ -10,7 +10,7 @@ const apmIndicesSaveURL = '/internal/apm/settings/apm-indices/save';
 describe('No data screen', () => {
   describe('bypass no data screen on settings pages', () => {
     beforeEach(() => {
-      cy.loginAsPowerUser();
+      cy.loginAsEditorUser();
     });
 
     before(() => {
@@ -29,7 +29,7 @@ describe('No data screen', () => {
         headers: {
           'kbn-xsrf': true,
         },
-        auth: { user: 'apm_power_user', pass: 'changeme' },
+        auth: { user: 'editor_user', pass: 'changeme' },
       });
     });
 
@@ -57,7 +57,7 @@ describe('No data screen', () => {
           metric: '',
         },
         headers: { 'kbn-xsrf': true },
-        auth: { user: 'apm_power_user', pass: 'changeme' },
+        auth: { user: 'editor_user', pass: 'changeme' },
       });
     });
   });

x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/rules/error_count.spec.ts

@@ -37,7 +37,7 @@ describe('Rules', () => {
     describe('when created from APM', () => {
       describe('when created from Service Inventory', () => {
         before(() => {
-          cy.loginAsPowerUser();
+          cy.loginAsEditorUser();
           deleteAllRules();
         });
 
@@ -68,7 +68,7 @@ describe('Rules', () => {
 
     describe('when created from Stack management', () => {
       before(() => {
-        cy.loginAsPowerUser();
+        cy.loginAsEditorUser();
         deleteAllRules();
       });
 

x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/settings/agent_configurations.spec.ts

@@ -72,7 +72,7 @@ describe('Agent configuration', () => {
   });
 
   beforeEach(() => {
-    cy.loginAsPowerUser();
+    cy.loginAsEditorUser();
     cy.visit(agentConfigHref);
   });
 

x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/settings/custom_links.spec.ts

@@ -9,7 +9,7 @@ const basePath = '/app/apm/settings/custom-links';
 
 describe('Custom links', () => {
   beforeEach(() => {
-    cy.loginAsPowerUser();
+    cy.loginAsEditorUser();
   });
 
   it('shows empty message and create button', () => {

x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/deep_links.spec.ts

@@ -7,7 +7,7 @@
 
 describe('APM deep links', () => {
   before(() => {
-    cy.loginAsReadOnlyUser();
+    cy.loginAsViewerUser();
   });
   it('navigates to apm links on search elastic', () => {
     cy.visit('/');

x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/dependencies.spec.ts

@@ -31,7 +31,7 @@ describe('Dependencies', () => {
   });
 
   beforeEach(() => {
-    cy.loginAsReadOnlyUser();
+    cy.loginAsViewerUser();
   });
 
   describe('top-level dependencies page', () => {

x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/errors/error_details.spec.ts

@@ -23,7 +23,7 @@ const errorDetailsPageHref = url.format({
 
 describe('Error details', () => {
   beforeEach(() => {
-    cy.loginAsReadOnlyUser();
+    cy.loginAsViewerUser();
   });
 
   describe('when data is loaded', () => {

x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/errors/errors_page.spec.ts

@@ -25,7 +25,7 @@ const nodeServiceErrorsPageHref = url.format({
 
 describe('Errors page', () => {
   beforeEach(() => {
-    cy.loginAsReadOnlyUser();
+    cy.loginAsViewerUser();
   });
 
   describe('when data is loaded', () => {

x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/home.spec.ts

@@ -38,7 +38,7 @@ describe.skip('Home page', () => {
   });
 
   beforeEach(() => {
-    cy.loginAsReadOnlyUser();
+    cy.loginAsViewerUser();
   });
 
   it('Redirects to service page with comparisonEnabled, environment, rangeFrom, rangeTo and offset added to the URL', () => {

x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/header_filters/header_filters.spec.ts

@@ -35,7 +35,7 @@ describe('Service inventory - header filters', () => {
   });
 
   beforeEach(() => {
-    cy.loginAsReadOnlyUser();
+    cy.loginAsViewerUser();
   });
 
   describe('Filtering by kuerybar', () => {

x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/service_inventory.spec.ts

@@ -44,7 +44,7 @@ const mainAliasNames = mainApiRequestsToIntercept.map(
 
 describe('When navigating to the service inventory', () => {
   before(async () => {
-    cy.loginAsReadOnlyUser();
+    cy.loginAsViewerUser();
     cy.visit(serviceInventoryHref);
 
     const { rangeFrom, rangeTo } = timeRange;
@@ -90,7 +90,7 @@ describe('When navigating to the service inventory', () => {
         }
       );
 
-      cy.loginAsReadOnlyUser();
+      cy.loginAsViewerUser();
       cy.visit(serviceInventoryHref);
     });
 

x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/aws_lambda/aws_lamba.spec.ts

@@ -37,7 +37,7 @@ describe('Service overview - aws lambda', () => {
   });
 
   beforeEach(() => {
-    cy.loginAsReadOnlyUser();
+    cy.loginAsViewerUser();
   });
 
   it('displays a cold start rate chart and not a transaction breakdown chart', () => {

x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/errors_table.spec.ts

@@ -32,7 +32,7 @@ describe('Errors table', () => {
   });
 
   beforeEach(() => {
-    cy.loginAsReadOnlyUser();
+    cy.loginAsViewerUser();
   });
 
   it('errors table is populated', () => {

x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/header_filters.spec.ts

@@ -71,7 +71,7 @@ describe('Service overview - header filters', () => {
 
   describe('Filtering by transaction type', () => {
     beforeEach(() => {
-      cy.loginAsReadOnlyUser();
+      cy.loginAsViewerUser();
     });
     it('changes url when selecting different value', () => {
       cy.visit(serviceOverviewHref);
@@ -119,7 +119,7 @@ describe('Service overview - header filters', () => {
 
   describe('Filtering by kuerybar', () => {
     beforeEach(() => {
-      cy.loginAsReadOnlyUser();
+      cy.loginAsViewerUser();
     });
     it('filters by transaction.name', () => {
       cy.visit(

x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/instances_table.spec.ts

@@ -38,7 +38,7 @@ const apisToIntercept = [
 
 describe('Instances table', () => {
   beforeEach(() => {
-    cy.loginAsReadOnlyUser();
+    cy.loginAsViewerUser();
   });
 
   // describe('when data is not loaded', () => {

x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/service_overview.spec.ts

@@ -101,7 +101,7 @@ describe('Service Overview', () => {
 
   describe('renders', () => {
     before(() => {
-      cy.loginAsReadOnlyUser();
+      cy.loginAsViewerUser();
       cy.visit(baseUrl);
     });
 
@@ -121,7 +121,7 @@ describe('Service Overview', () => {
 
   describe('transactions', () => {
     beforeEach(() => {
-      cy.loginAsReadOnlyUser();
+      cy.loginAsViewerUser();
       cy.visit(baseUrl);
     });
 
@@ -174,7 +174,7 @@ describe('Service Overview', () => {
 
   describe('when RUM service', () => {
     before(() => {
-      cy.loginAsReadOnlyUser();
+      cy.loginAsViewerUser();
       cy.visit(
         url.format({
           pathname: '/app/apm/services/opbeans-rum/overview',
@@ -203,7 +203,7 @@ describe('Service Overview', () => {
 
   describe('Calls APIs', () => {
     beforeEach(() => {
-      cy.loginAsReadOnlyUser();
+      cy.loginAsViewerUser();
       cy.visit(baseUrl);
       apiRequestsToIntercept.map(({ endpoint, aliasName }) => {
         cy.intercept('GET', endpoint).as(aliasName);

x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/time_comparison.spec.ts

@@ -65,7 +65,7 @@ describe.skip('Service overview: Time Comparison', () => {
   });
 
   beforeEach(() => {
-    cy.loginAsReadOnlyUser();
+    cy.loginAsViewerUser();
   });
 
   it('enables by default the time comparison feature with Last 24 hours selected', () => {