From 255c9a7f951d4eb53f957b0e285ab78408237622 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Tue, 12 Sep 2023 14:53:41 -0400 Subject: [PATCH] [DOCS] Move x-pack docs to `docs/reference` dir (#99209) **Problem:** For historical reasons, source files for the Elasticsearch Guide's security, watcher, and Logstash API docs are housed in the `x-pack/docs` directory. This can confuse new contributors who expect Elasticsearch Guide docs to be located in `docs/reference`. **Solution:** - Move the security, watcher, and Logstash API doc source files to the `docs/reference` directory - Update doc snippet tests to use security Rel: https://github.com/elastic/platform-docs-team/issues/208 --- docs/build.gradle | 252 +++++++++++++++++- docs/reference/ccr/getting-started.asciidoc | 2 +- .../set-up-a-data-stream.asciidoc | 2 +- docs/reference/docs/reindex.asciidoc | 14 +- docs/reference/index.asciidoc | 4 +- .../anomaly-detection/apis/put-job.asciidoc | 2 +- .../apis/put-dfanalytics.asciidoc | 4 +- .../cluster/remote-clusters-api-key.asciidoc | 2 +- .../cluster/remote-clusters-cert.asciidoc | 2 +- docs/reference/rest-api/defs.asciidoc | 2 +- docs/reference/rest-api/index.asciidoc | 6 +- docs/reference/rest-api/info.asciidoc | 2 +- .../logstash/delete-pipeline.asciidoc | 0 .../rest-api/logstash/get-pipeline.asciidoc | 0 .../rest-api/logstash/index.asciidoc | 0 .../rest-api/logstash/put-pipeline.asciidoc | 0 .../reference}/rest-api/security.asciidoc | 0 .../security/activate-user-profile.asciidoc | 0 .../rest-api/security/authenticate.asciidoc | 0 .../security/bulk-update-api-keys.asciidoc | 0 .../security/change-password.asciidoc | 0 .../security/clear-api-key-cache.asciidoc | 0 .../rest-api/security/clear-cache.asciidoc | 0 .../security/clear-privileges-cache.asciidoc | 0 .../security/clear-roles-cache.asciidoc | 0 .../clear-service-token-caches.asciidoc | 0 .../security/create-api-keys.asciidoc | 0 .../create-cross-cluster-api-key.asciidoc | 0 .../security/create-role-mappings.asciidoc | 0 .../rest-api/security/create-roles.asciidoc | 0 .../security/create-service-token.asciidoc | 0 .../rest-api/security/create-users.asciidoc | 0 .../delegate-pki-authentication.asciidoc | 0 .../security/delete-app-privileges.asciidoc | 0 .../security/delete-role-mappings.asciidoc | 0 .../rest-api/security/delete-roles.asciidoc | 0 .../security/delete-service-token.asciidoc | 0 .../rest-api/security/delete-users.asciidoc | 0 .../security/disable-user-profile.asciidoc | 0 .../rest-api/security/disable-users.asciidoc | 0 .../security/enable-user-profile.asciidoc | 0 .../rest-api/security/enable-users.asciidoc | 0 .../rest-api/security/enroll-kibana.asciidoc | 0 .../rest-api/security/enroll-node.asciidoc | 0 .../rest-api/security/get-api-keys.asciidoc | 0 .../security/get-app-privileges.asciidoc | 0 .../security/get-builtin-privileges.asciidoc | 0 .../security/get-role-mappings.asciidoc | 0 .../rest-api/security/get-roles.asciidoc | 0 .../security/get-service-accounts.asciidoc | 0 .../security/get-service-credentials.asciidoc | 0 .../rest-api/security/get-settings.asciidoc | 0 .../rest-api/security/get-tokens.asciidoc | 0 .../security/get-user-privileges.asciidoc | 0 .../security/get-user-profile.asciidoc | 0 .../rest-api/security/get-users.asciidoc | 0 .../rest-api/security/grant-api-keys.asciidoc | 0 .../has-privileges-user-profile.asciidoc | 0 .../rest-api/security/has-privileges.asciidoc | 0 .../security/invalidate-api-keys.asciidoc | 0 .../security/invalidate-tokens.asciidoc | 0 .../security/oidc-authenticate-api.asciidoc | 0 .../security/oidc-logout-api.asciidoc | 0 .../oidc-prepare-authentication-api.asciidoc | 0 .../security/put-app-privileges.asciidoc | 0 .../rest-api/security/query-api-key.asciidoc | 0 .../security/role-mapping-resources.asciidoc | 0 .../security/saml-authenticate-api.asciidoc | 0 .../saml-complete-logout-api.asciidoc | 0 .../security/saml-invalidate-api.asciidoc | 0 .../security/saml-logout-api.asciidoc | 0 .../saml-prepare-authentication-api.asciidoc | 0 .../security/saml-sp-metadata.asciidoc | 0 .../reference}/rest-api/security/ssl.asciidoc | 0 .../security/suggest-user-profile.asciidoc | 0 .../rest-api/security/update-api-key.asciidoc | 0 .../update-cross-cluster-api-key.asciidoc | 0 .../security/update-settings.asciidoc | 0 .../update-user-profile-data.asciidoc | 0 docs/reference/rest-api/usage.asciidoc | 6 +- .../reference}/rest-api/watcher.asciidoc | 0 .../rest-api/watcher/ack-watch.asciidoc | 0 .../rest-api/watcher/activate-watch.asciidoc | 0 .../watcher/deactivate-watch.asciidoc | 0 .../rest-api/watcher/delete-watch.asciidoc | 0 .../rest-api/watcher/execute-watch.asciidoc | 0 .../rest-api/watcher/get-settings.asciidoc | 0 .../rest-api/watcher/get-watch.asciidoc | 0 .../rest-api/watcher/put-watch.asciidoc | 0 .../rest-api/watcher/query-watches.asciidoc | 0 .../rest-api/watcher/start.asciidoc | 0 .../rest-api/watcher/stats.asciidoc | 0 .../reference}/rest-api/watcher/stop.asciidoc | 0 .../rest-api/watcher/update-settings.asciidoc | 0 .../auditing/auditing-search-queries.asciidoc | 0 .../auditing/enable-audit-logging.asciidoc | 0 .../security/auditing/event-types.asciidoc | 0 .../security/auditing/ignore-policy.asciidoc | 0 .../security/auditing/index.asciidoc | 0 .../security/auditing/output-logfile.asciidoc | 0 .../active-directory-realm.asciidoc | 0 .../authentication/anonymous-access.asciidoc | 0 .../authentication/built-in-users.asciidoc | 0 ...onfiguring-active-directory-realm.asciidoc | 0 .../configuring-file-realm.asciidoc | 0 .../configuring-kerberos-realm.asciidoc | 0 .../configuring-ldap-realm.asciidoc | 0 .../configuring-native-realm.asciidoc | 0 .../configuring-pki-realm.asciidoc | 0 .../authentication/custom-realm.asciidoc | 0 .../authentication/file-realm.asciidoc | 0 .../authentication/internal-users.asciidoc | 0 .../authentication/jwt-realm.asciidoc | 0 .../authentication/kerberos-realm.asciidoc | 0 .../authentication/ldap-realm.asciidoc | 0 .../authentication/native-realm.asciidoc | 0 .../authentication/oidc-guide.asciidoc | 0 .../authentication/oidc-realm.asciidoc | 0 .../security/authentication/overview.asciidoc | 0 .../authentication/pki-realm.asciidoc | 0 .../authentication/realm-chains.asciidoc | 0 .../security/authentication/realms.asciidoc | 0 ...emote-clusters-privileges-api-key.asciidoc | 0 .../remote-clusters-privileges-cert.asciidoc | 0 .../authentication/saml-guide.asciidoc | 0 .../authentication/saml-realm.asciidoc | 0 .../authentication/security-domain.asciidoc | 0 .../authentication/service-accounts.asciidoc | 0 .../token-authentication-services.asciidoc | 0 .../authentication/user-cache.asciidoc | 0 .../authentication/user-lookup.asciidoc | 0 .../authentication/user-profile.asciidoc | 0 .../authorization/alias-privileges.asciidoc | 0 .../authorization/built-in-roles.asciidoc | 0 ...figuring-authorization-delegation.asciidoc | 0 .../custom-authorization.asciidoc | 0 .../document-level-security.asciidoc | 0 ...field-and-document-access-control.asciidoc | 0 .../field-level-security.asciidoc | 0 .../authorization/images/authorization.png | Bin .../authorization/managing-roles.asciidoc | 0 .../authorization/mapping-roles.asciidoc | 0 .../security/authorization/overview.asciidoc | 0 .../authorization/privileges.asciidoc | 0 .../authorization/role-restriction.asciidoc | 0 .../authorization/role-templates.asciidoc | 0 .../authorization/run-as-privilege.asciidoc | 0 .../authorization/set-security-user.asciidoc | 0 .../ccs-clients-integrations/hadoop.asciidoc | 0 .../ccs-clients-integrations/http.asciidoc | 0 .../ccs-clients-integrations/index.asciidoc | 0 .../monitoring.asciidoc | 0 .../configuring-stack-security.asciidoc | 0 .../reference}/security/enroll-nodes.asciidoc | 0 .../security/es-security-principles.asciidoc | 0 .../security/fips-140-compliance.asciidoc | 0 .../reference}/security/fips-java17.asciidoc | 0 .../security/images/assign-role.jpg | Bin .../security/images/create-logstash-user.jpg | Bin .../security/images/create-reader-role.jpg | Bin .../security/images/create-user.jpg | Bin .../security/images/create-writer-role.jpg | Bin .../images/elastic-security-overview.png | Bin .../security/images/kibana-login.jpg | Bin .../images/management-builtin-users.jpg | Bin .../security/images/management-roles.jpg | Bin .../security/images/management-users.jpg | Bin .../reference}/security/images/nexus.png | Bin .../reference}/security/index.asciidoc | 0 .../reference}/security/limitations.asciidoc | 0 .../configure-operator-privileges.asciidoc | 0 .../operator-privileges/index.asciidoc | 0 .../operator-only-functionality.asciidoc | 0 ...perator-only-snapshot-and-restore.asciidoc | 0 .../security/reference/files.asciidoc | 0 .../change-passwords-native-users.asciidoc | 0 .../enabling-cipher-suites.asciidoc | 0 .../security-basic-setup-https.asciidoc | 0 .../security-basic-setup.asciidoc | 0 .../security-minimal-setup.asciidoc | 0 .../securing-communications/tls-ad.asciidoc | 0 .../securing-communications/tls-http.asciidoc | 0 .../securing-communications/tls-ldap.asciidoc | 0 .../tls-versions-jdk.asciidoc | 0 .../update-tls-certificates.asciidoc | 0 .../security-manual-configuration.asciidoc | 0 .../security/troubleshooting.asciidoc | 0 .../security/using-ip-filtering.asciidoc | 0 docs/reference/setup/add-nodes.asciidoc | 2 +- .../setup/install/targz-start.asciidoc | 2 +- .../setup/install/zip-windows-start.asciidoc | 2 +- docs/reference/sql/security.asciidoc | 2 +- .../transform/apis/update-transform.asciidoc | 2 +- docs/reference/troubleshooting.asciidoc | 2 +- docs/reference/upgrade.asciidoc | 2 +- .../reference}/watcher/actions.asciidoc | 0 .../reference}/watcher/actions/email.asciidoc | 0 .../reference}/watcher/actions/index.asciidoc | 0 .../reference}/watcher/actions/jira.asciidoc | 0 .../watcher/actions/logging.asciidoc | 0 .../watcher/actions/pagerduty.asciidoc | 0 .../reference}/watcher/actions/slack.asciidoc | 0 .../watcher/actions/webhook.asciidoc | 0 .../reference}/watcher/condition.asciidoc | 0 .../watcher/condition/always.asciidoc | 0 .../watcher/condition/array-compare.asciidoc | 0 .../watcher/condition/compare.asciidoc | 0 .../watcher/condition/never.asciidoc | 0 .../watcher/condition/script.asciidoc | 0 .../watcher/customizing-watches.asciidoc | 0 .../watcher/encrypting-data.asciidoc | 0 .../watcher/example-watches.asciidoc | 0 .../example-watch-clusterstatus.asciidoc | 0 .../watching-time-series-data.asciidoc | 0 .../watcher/getting-started.asciidoc | 0 .../watcher/how-watcher-works.asciidoc | 0 .../watcher/images/action-throttling.jpg | Bin .../images/slack-add-webhook-integration.jpg | Bin .../watcher/images/slack-copy-webhook-url.jpg | Bin .../watcher/images/watch-execution.jpg | Bin .../images/watcher-kibana-dashboard.png | Bin .../reference}/watcher/images/watcher.graffle | Bin .../reference}/watcher/index.asciidoc | 0 .../reference}/watcher/input.asciidoc | 0 .../reference}/watcher/input/chain.asciidoc | 0 .../reference}/watcher/input/http.asciidoc | 0 .../reference}/watcher/input/search.asciidoc | 0 .../reference}/watcher/input/simple.asciidoc | 0 .../watcher/java/ack-watch.asciidoc | 0 .../watcher/java/activate-watch.asciidoc | 0 .../watcher/java/deactivate-watch.asciidoc | 0 .../watcher/java/delete-watch.asciidoc | 0 .../watcher/java/execute-watch.asciidoc | 0 .../watcher/java/get-watch.asciidoc | 0 .../watcher/java/put-watch.asciidoc | 0 .../reference}/watcher/java/service.asciidoc | 0 .../reference}/watcher/java/stats.asciidoc | 0 .../reference}/watcher/limitations.asciidoc | 0 .../watcher/managing-watches.asciidoc | 0 .../reference}/watcher/transform.asciidoc | 0 .../watcher/transform/chain.asciidoc | 0 .../watcher/transform/script.asciidoc | 0 .../watcher/transform/search.asciidoc | 0 .../reference}/watcher/trigger.asciidoc | 0 .../watcher/trigger/schedule.asciidoc | 0 .../watcher/trigger/schedule/cron.asciidoc | 0 .../watcher/trigger/schedule/daily.asciidoc | 0 .../watcher/trigger/schedule/hourly.asciidoc | 0 .../trigger/schedule/interval.asciidoc | 0 .../watcher/trigger/schedule/monthly.asciidoc | 0 .../watcher/trigger/schedule/weekly.asciidoc | 0 .../watcher/trigger/schedule/yearly.asciidoc | 0 .../watcher/troubleshooting.asciidoc | 0 .../smoketest/DocsClientYamlTestSuiteIT.java | 73 +++++ x-pack/docs/build.gradle | 20 +- 255 files changed, 367 insertions(+), 40 deletions(-) rename {x-pack/docs/en => docs/reference}/rest-api/logstash/delete-pipeline.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/logstash/get-pipeline.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/logstash/index.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/logstash/put-pipeline.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/activate-user-profile.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/authenticate.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/bulk-update-api-keys.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/change-password.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/clear-api-key-cache.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/clear-cache.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/clear-privileges-cache.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/clear-roles-cache.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/clear-service-token-caches.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/create-api-keys.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/create-cross-cluster-api-key.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/create-role-mappings.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/create-roles.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/create-service-token.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/create-users.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/delegate-pki-authentication.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/delete-app-privileges.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/delete-role-mappings.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/delete-roles.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/delete-service-token.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/delete-users.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/disable-user-profile.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/disable-users.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/enable-user-profile.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/enable-users.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/enroll-kibana.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/enroll-node.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/get-api-keys.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/get-app-privileges.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/get-builtin-privileges.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/get-role-mappings.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/get-roles.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/get-service-accounts.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/get-service-credentials.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/get-settings.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/get-tokens.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/get-user-privileges.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/get-user-profile.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/get-users.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/grant-api-keys.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/has-privileges-user-profile.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/has-privileges.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/invalidate-api-keys.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/invalidate-tokens.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/oidc-authenticate-api.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/oidc-logout-api.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/oidc-prepare-authentication-api.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/put-app-privileges.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/query-api-key.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/role-mapping-resources.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/saml-authenticate-api.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/saml-complete-logout-api.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/saml-invalidate-api.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/saml-logout-api.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/saml-prepare-authentication-api.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/saml-sp-metadata.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/ssl.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/suggest-user-profile.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/update-api-key.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/update-cross-cluster-api-key.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/update-settings.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/security/update-user-profile-data.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher/ack-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher/activate-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher/deactivate-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher/delete-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher/execute-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher/get-settings.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher/get-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher/put-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher/query-watches.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher/start.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher/stats.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher/stop.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/rest-api/watcher/update-settings.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/auditing/auditing-search-queries.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/auditing/enable-audit-logging.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/auditing/event-types.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/auditing/ignore-policy.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/auditing/index.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/auditing/output-logfile.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/active-directory-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/anonymous-access.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/built-in-users.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/configuring-active-directory-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/configuring-file-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/configuring-kerberos-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/configuring-ldap-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/configuring-native-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/configuring-pki-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/custom-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/file-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/internal-users.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/jwt-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/kerberos-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/ldap-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/native-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/oidc-guide.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/oidc-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/overview.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/pki-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/realm-chains.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/realms.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/remote-clusters-privileges-api-key.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/remote-clusters-privileges-cert.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/saml-guide.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/saml-realm.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/security-domain.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/service-accounts.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/token-authentication-services.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/user-cache.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/user-lookup.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authentication/user-profile.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/alias-privileges.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/built-in-roles.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/configuring-authorization-delegation.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/custom-authorization.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/document-level-security.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/field-and-document-access-control.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/field-level-security.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/images/authorization.png (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/managing-roles.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/mapping-roles.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/overview.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/privileges.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/role-restriction.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/role-templates.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/run-as-privilege.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/authorization/set-security-user.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/ccs-clients-integrations/hadoop.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/ccs-clients-integrations/http.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/ccs-clients-integrations/index.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/ccs-clients-integrations/monitoring.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/configuring-stack-security.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/enroll-nodes.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/es-security-principles.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/fips-140-compliance.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/fips-java17.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/images/assign-role.jpg (100%) rename {x-pack/docs/en => docs/reference}/security/images/create-logstash-user.jpg (100%) rename {x-pack/docs/en => docs/reference}/security/images/create-reader-role.jpg (100%) rename {x-pack/docs/en => docs/reference}/security/images/create-user.jpg (100%) rename {x-pack/docs/en => docs/reference}/security/images/create-writer-role.jpg (100%) rename {x-pack/docs/en => docs/reference}/security/images/elastic-security-overview.png (100%) rename {x-pack/docs/en => docs/reference}/security/images/kibana-login.jpg (100%) rename {x-pack/docs/en => docs/reference}/security/images/management-builtin-users.jpg (100%) rename {x-pack/docs/en => docs/reference}/security/images/management-roles.jpg (100%) rename {x-pack/docs/en => docs/reference}/security/images/management-users.jpg (100%) rename {x-pack/docs/en => docs/reference}/security/images/nexus.png (100%) rename {x-pack/docs/en => docs/reference}/security/index.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/limitations.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/operator-privileges/configure-operator-privileges.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/operator-privileges/index.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/operator-privileges/operator-only-functionality.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/operator-privileges/operator-only-snapshot-and-restore.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/reference/files.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/securing-communications/change-passwords-native-users.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/securing-communications/enabling-cipher-suites.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/securing-communications/security-basic-setup-https.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/securing-communications/security-basic-setup.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/securing-communications/security-minimal-setup.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/securing-communications/tls-ad.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/securing-communications/tls-http.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/securing-communications/tls-ldap.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/securing-communications/tls-versions-jdk.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/securing-communications/update-tls-certificates.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/security-manual-configuration.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/troubleshooting.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/security/using-ip-filtering.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/actions.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/actions/email.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/actions/index.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/actions/jira.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/actions/logging.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/actions/pagerduty.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/actions/slack.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/actions/webhook.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/condition.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/condition/always.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/condition/array-compare.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/condition/compare.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/condition/never.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/condition/script.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/customizing-watches.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/encrypting-data.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/example-watches.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/example-watches/example-watch-clusterstatus.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/example-watches/watching-time-series-data.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/getting-started.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/how-watcher-works.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/images/action-throttling.jpg (100%) rename {x-pack/docs/en => docs/reference}/watcher/images/slack-add-webhook-integration.jpg (100%) rename {x-pack/docs/en => docs/reference}/watcher/images/slack-copy-webhook-url.jpg (100%) rename {x-pack/docs/en => docs/reference}/watcher/images/watch-execution.jpg (100%) rename {x-pack/docs/en => docs/reference}/watcher/images/watcher-kibana-dashboard.png (100%) rename {x-pack/docs/en => docs/reference}/watcher/images/watcher.graffle (100%) rename {x-pack/docs/en => docs/reference}/watcher/index.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/input.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/input/chain.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/input/http.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/input/search.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/input/simple.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/java/ack-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/java/activate-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/java/deactivate-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/java/delete-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/java/execute-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/java/get-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/java/put-watch.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/java/service.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/java/stats.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/limitations.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/managing-watches.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/transform.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/transform/chain.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/transform/script.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/transform/search.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/trigger.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/trigger/schedule.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/trigger/schedule/cron.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/trigger/schedule/daily.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/trigger/schedule/hourly.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/trigger/schedule/interval.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/trigger/schedule/monthly.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/trigger/schedule/weekly.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/trigger/schedule/yearly.asciidoc (100%) rename {x-pack/docs/en => docs/reference}/watcher/troubleshooting.asciidoc (100%) diff --git a/docs/build.gradle b/docs/build.gradle index 446bb85e2ac16..33e6cc6080a95 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -24,6 +24,9 @@ ext.docsFileTree = fileTree(projectDir) { exclude 'README.asciidoc' // Broken code snippet tests exclude 'reference/graph/explore.asciidoc' + // These files simply don't pass yet. We should figure out how to fix them. + exclude 'reference/watcher/reference/actions.asciidoc' + exclude 'reference/rest-api/security/ssl.asciidoc' if (BuildParams.inFipsJvm) { // We don't support this component in FIPS 140 exclude 'reference/ingest/processors/attachment.asciidoc' @@ -48,7 +51,13 @@ tasks.named("buildRestTests").configure { 'reference/ml/anomaly-detection/apis/post-data.asciidoc', 'reference/ml/anomaly-detection/apis/revert-snapshot.asciidoc', 'reference/ml/anomaly-detection/apis/update-snapshot.asciidoc', - 'reference/ml/anomaly-detection/apis/update-job.asciidoc' + 'reference/ml/anomaly-detection/apis/update-job.asciidoc', + 'reference/security/authentication/user-cache.asciidoc', + 'reference/security/authorization/run-as-privilege.asciidoc', + 'reference/security/ccs-clients-integrations/http.asciidoc', + 'reference/rest-api/watcher/put-watch.asciidoc', + 'reference/rest-api/watcher/stats.asciidoc', + 'reference/watcher/example-watches/watching-time-series-data.asciidoc' ] } @@ -74,7 +83,6 @@ testClusters.matching { it.name == "yamlRestTest"}.configureEach { // enable regexes in painless so our tests don't complain about example snippets that use them setting 'script.painless.regex.enabled', 'true' - setting 'xpack.security.enabled', 'false' setting 'path.repo', "${buildDir}/cluster/shared/repo" Closure configFile = { extraConfigFile it, file("src/test/cluster/config/$it") @@ -101,6 +109,42 @@ testClusters.matching { it.name == "yamlRestTest"}.configureEach { requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0") + extraConfigFile 'op-jwks.json', project(':x-pack:test:idp-fixture').file("oidc/op-jwks.json") + extraConfigFile 'idp-docs-metadata.xml', project(':x-pack:test:idp-fixture').file("idp/shibboleth-idp/metadata/idp-docs-metadata.xml") + extraConfigFile 'testClient.crt', project(':x-pack:plugin:security').file("src/test/resources/org/elasticsearch/xpack/security/action/pki_delegation/testClient.crt") + setting 'xpack.security.enabled', 'true' + setting 'xpack.security.authc.api_key.enabled', 'true' + setting 'xpack.security.authc.token.enabled', 'true' + // disable the ILM history for doc tests to avoid potential lingering tasks that'd cause test flakiness + setting 'indices.lifecycle.history_index_enabled', 'false' + setting 'xpack.license.self_generated.type', 'trial' + setting 'xpack.security.authc.realms.file.file.order', '0' + setting 'xpack.security.authc.realms.native.native.order', '1' + setting 'xpack.security.authc.realms.oidc.oidc1.order', '2' + setting 'xpack.security.authc.realms.oidc.oidc1.op.issuer', 'http://127.0.0.1:8080' + setting 'xpack.security.authc.realms.oidc.oidc1.op.authorization_endpoint', "http://127.0.0.1:8080/c2id-login" + setting 'xpack.security.authc.realms.oidc.oidc1.op.token_endpoint', "http://127.0.0.1:8080/c2id/token" + setting 'xpack.security.authc.realms.oidc.oidc1.op.jwkset_path', 'op-jwks.json' + setting 'xpack.security.authc.realms.oidc.oidc1.rp.redirect_uri', 'https://my.fantastic.rp/cb' + setting 'xpack.security.authc.realms.oidc.oidc1.rp.client_id', 'elasticsearch-rp' + keystore 'xpack.security.authc.realms.oidc.oidc1.rp.client_secret', 'b07efb7a1cf6ec9462afe7b6d3ab55c6c7880262aa61ac28dded292aca47c9a2' + setting 'xpack.security.authc.realms.oidc.oidc1.rp.response_type', 'id_token' + setting 'xpack.security.authc.realms.oidc.oidc1.claims.principal', 'sub' + setting 'xpack.security.authc.realms.pki.pki1.order', '3' + setting 'xpack.security.authc.realms.pki.pki1.certificate_authorities', '[ "testClient.crt" ]' + setting 'xpack.security.authc.realms.pki.pki1.delegation.enabled', 'true' + setting 'xpack.security.authc.realms.saml.saml1.order', '4' + setting 'xpack.security.authc.realms.saml.saml1.sp.logout', 'https://kibana.org/logout' + setting 'xpack.security.authc.realms.saml.saml1.idp.entity_id', 'https://my-idp.org' + setting 'xpack.security.authc.realms.saml.saml1.idp.metadata.path', 'idp-docs-metadata.xml' + setting 'xpack.security.authc.realms.saml.saml1.sp.entity_id', 'https://kibana.org' + setting 'xpack.security.authc.realms.saml.saml1.sp.acs', 'https://kibana.org/api/security/saml/callback' + setting 'xpack.security.authc.realms.saml.saml1.attributes.principal', 'uid' + setting 'xpack.security.authc.realms.saml.saml1.attributes.name', 'urn:oid:2.5.4.3' + + user username: 'test_admin' + user username: 'test_user' + // build the cluster with all plugins project.rootProject.subprojects.findAll { it.parent.path == ':plugins' }.each { subproj -> /* Skip repositories. We just aren't going to be able to test them so it @@ -1653,6 +1697,210 @@ setups['setup-snapshots'] = setups['setup-repository'] + ''' body: | #atomic_red_data# ''' + + setups['my_inactive_watch'] = ''' + - do: + watcher.put_watch: + id: "my_watch" + active: false + body: > + { + "trigger": { + "schedule": { + "hourly": { + "minute": [ 0, 5 ] + } + } + }, + "input": { + "simple": { + "payload": { + "send": "yes" + } + } + }, + "condition": { + "always": {} + }, + "actions": { + "test_index": { + "index": { + "index": "test" + } + } + } + } + - match: { _id: "my_watch" } +''' + + setups['my_active_watch'] = setups['my_inactive_watch'].replace( + 'active: false', 'active: true') + + setups['role_mapping'] = ''' + - do: + security.put_role_mapping: + name: "mapping1" + body: > + { + "enabled": true, + "roles": [ "user" ], + "rules": { "field": { "username": "*" } } + } +''' + + setups['admin_role'] = ''' + - do: + security.put_role: + name: "my_admin_role" + body: > + { + "cluster": ["all"], + "indices": [ + {"names": ["index1", "index2" ], "privileges": ["all"], "field_security" : {"grant" : [ "title", "body" ]}} + ], + "run_as": [ "other_user" ], + "metadata" : {"version": 1} + } +''' + setups['jacknich_user'] = ''' + - do: + security.put_user: + username: "jacknich" + body: > + { + "password" : "l0ng-r4nd0m-p@ssw0rd", + "roles" : [ "admin", "other_role1" ], + "full_name" : "Jack Nicholson", + "email" : "jacknich@example.com", + "metadata" : { "intelligence" : 7 } + } + - do: + security.activate_user_profile: + body: > + { + "grant_type": "password", + "username": "jacknich", + "password" : "l0ng-r4nd0m-p@ssw0rd" + } +''' + setups['app0102_privileges'] = ''' + - do: + security.put_privileges: + body: > + { + "myapp": { + "read": { + "application": "myapp", + "name": "read", + "actions": [ + "data:read/*", + "action:login" ], + "metadata": { + "description": "Read access to myapp" + } + } + } + } +''' + setups['service_token42'] = ''' + - do: + security.create_service_token: + namespace: elastic + service: fleet-server + name: token42 +''' + setups['user_profiles'] = ''' + - do: + security.put_user: + username: "jacknich" + body: > + { + "password" : "l0ng-r4nd0m-p@ssw0rd", + "roles" : [ "admin", "other_role1" ], + "full_name" : "Jack Nicholson", + "email" : "jacknich@example.com" + } + - do: + security.put_user: + username: "jackrea" + body: > + { + "password" : "l0ng-r4nd0m-p@ssw0rd", + "roles" : [ "admin" ], + "full_name" : "Jack Reacher", + "email" : "jackrea@example.com" + } + - do: + security.put_user: + username: "jackspa" + body: > + { + "password" : "l0ng-r4nd0m-p@ssw0rd", + "roles" : [ "user" ], + "full_name" : "Jack Sparrow", + "email" : "jackspa@example.com" + } + - do: + security.activate_user_profile: + body: > + { + "grant_type": "password", + "username": "jacknich", + "password" : "l0ng-r4nd0m-p@ssw0rd" + } + - do: + security.activate_user_profile: + body: > + { + "grant_type": "password", + "username": "jackrea", + "password" : "l0ng-r4nd0m-p@ssw0rd" + } + - do: + security.activate_user_profile: + body: > + { + "grant_type": "password", + "username": "jackspa", + "password" : "l0ng-r4nd0m-p@ssw0rd" + } + # jacknich + - do: + security.update_user_profile_data: + uid: "u_79HkWkwmnBH5gqFKwoxggWPjEBOur1zLPXQPEl1VBW0_0" + body: > + { + "labels": { + "direction": "north" + }, + "data": { + "app1": { + "key1": "value1" + } + } + } + # jackrea + - do: + security.update_user_profile_data: + uid: "u_P_0BMHgaOK3p7k-PFWUCbw9dQ-UFjt01oWJ_Dp2PmPc_0" + body: > + { + "labels": { + "direction": "west" + } + } + # jackspa + - do: + security.update_user_profile_data: + uid: "u_8RKO7AKfEbSiIHZkZZ2LJy2MUSDPWDr3tMI_CkIGApU_0" + body: > + { + "labels": { + "direction": "south" + } + } +''' + // fake data used by the correlation bucket agg buildRestTests.setups['correlate_latency'] = ''' - do: diff --git a/docs/reference/ccr/getting-started.asciidoc b/docs/reference/ccr/getting-started.asciidoc index 837268fd9eb23..d6c455b510dad 100644 --- a/docs/reference/ccr/getting-started.asciidoc +++ b/docs/reference/ccr/getting-started.asciidoc @@ -159,7 +159,7 @@ cluster with cluster alias `leader`. connected to. ==== -include::../../../x-pack/docs/en/security/authentication/remote-clusters-privileges-cert.asciidoc[tag=configure-ccr-privileges] +include::{es-repo-dir}/security/authentication/remote-clusters-privileges-cert.asciidoc[tag=configure-ccr-privileges] [[ccr-getting-started-follower-index]] ==== Create a follower index to replicate a specific index diff --git a/docs/reference/data-streams/set-up-a-data-stream.asciidoc b/docs/reference/data-streams/set-up-a-data-stream.asciidoc index ade63e2ea43d9..144146b897ef0 100644 --- a/docs/reference/data-streams/set-up-a-data-stream.asciidoc +++ b/docs/reference/data-streams/set-up-a-data-stream.asciidoc @@ -261,7 +261,7 @@ PUT _data_stream/my-data-stream [[secure-data-stream]] === Secure the data stream -include::{xes-repo-dir}/security/authorization/alias-privileges.asciidoc[tag=data-stream-security] +include::{es-repo-dir}/security/authorization/alias-privileges.asciidoc[tag=data-stream-security] For an example, see <>. diff --git a/docs/reference/docs/reindex.asciidoc b/docs/reference/docs/reindex.asciidoc index 97d77cf91376c..48b055f4e0fa2 100644 --- a/docs/reference/docs/reindex.asciidoc +++ b/docs/reference/docs/reindex.asciidoc @@ -984,9 +984,9 @@ POST _reindex -------------------------------------------------- // TEST[setup:host] // TEST[s/^/PUT my-index-000001\n/] -// TEST[s/otherhost:9200",/\${host}"/] -// TEST[s/"username": "user",//] -// TEST[s/"password": "pass"//] +// TEST[s/otherhost:9200",/\${host}",/] +// TEST[s/"username": "user",/"username": "test_admin",/] +// TEST[s/"password": "pass"/"password": "x-pack-test-password"/] The `host` parameter must contain a scheme, host, port (e.g. `https://otherhost:9200`), and optional path (e.g. `https://otherhost:9200/proxy`). @@ -1025,7 +1025,7 @@ POST _reindex // TEST[setup:host] // TEST[s/^/PUT my-index-000001\n/] // TEST[s/otherhost:9200",/\${host}",/] -// TEST[s/API_KEY_VALUE" /\93116930-2ecb-4161-aa5e-4f3586c87ac6"/] +// TEST[s/"headers": \{[^}]*\}/"username": "test_admin", "password": "x-pack-test-password"/] Remote hosts have to be explicitly allowed in `elasticsearch.yml` using the `reindex.remote.whitelist` property. It can be set to a comma delimited list @@ -1064,7 +1064,8 @@ POST _reindex { "source": { "remote": { - "host": "http://otherhost:9200" + "host": "http://otherhost:9200", + ... }, "index": "source", "size": 10, @@ -1082,6 +1083,7 @@ POST _reindex // TEST[setup:host] // TEST[s/^/PUT source\n/] // TEST[s/otherhost:9200/\${host}/] +// TEST[s/\.\.\./"username": "test_admin", "password": "x-pack-test-password"/] It is also possible to set the socket read timeout on the remote connection with the `socket_timeout` field and the connection timeout with the @@ -1096,6 +1098,7 @@ POST _reindex "source": { "remote": { "host": "http://otherhost:9200", + ..., "socket_timeout": "1m", "connect_timeout": "10s" }, @@ -1114,6 +1117,7 @@ POST _reindex // TEST[setup:host] // TEST[s/^/PUT source\n/] // TEST[s/otherhost:9200/\${host}/] +// TEST[s/\.\.\.,/"username": "test_admin", "password": "x-pack-test-password",/] [[reindex-ssl]] ===== Configuring SSL parameters diff --git a/docs/reference/index.asciidoc b/docs/reference/index.asciidoc index e3d84c91c4d28..828a3e4d1d01d 100644 --- a/docs/reference/index.asciidoc +++ b/docs/reference/index.asciidoc @@ -63,9 +63,9 @@ include::high-availability.asciidoc[] include::snapshot-restore/index.asciidoc[] -include::{xes-repo-dir}/security/index.asciidoc[] +include::security/index.asciidoc[] -include::{xes-repo-dir}/watcher/index.asciidoc[] +include::watcher/index.asciidoc[] include::commands/index.asciidoc[] diff --git a/docs/reference/ml/anomaly-detection/apis/put-job.asciidoc b/docs/reference/ml/anomaly-detection/apis/put-job.asciidoc index 134cb98f50390..97120ff1873ae 100644 --- a/docs/reference/ml/anomaly-detection/apis/put-job.asciidoc +++ b/docs/reference/ml/anomaly-detection/apis/put-job.asciidoc @@ -536,4 +536,4 @@ The API returns the following results: ---- // TESTRESPONSE[s/"job_version" : "8.4.0"/"job_version" : $body.job_version/] // TESTRESPONSE[s/1656087283340/$body.$_path/] -// TESTRESPONSE[s/"authorization" : \{[^}]*\},//] +// TESTRESPONSE[s/"superuser"/"_es_test_root"/] diff --git a/docs/reference/ml/df-analytics/apis/put-dfanalytics.asciidoc b/docs/reference/ml/df-analytics/apis/put-dfanalytics.asciidoc index 2c3ee51b0d8c7..f11166f9c1a60 100644 --- a/docs/reference/ml/df-analytics/apis/put-dfanalytics.asciidoc +++ b/docs/reference/ml/df-analytics/apis/put-dfanalytics.asciidoc @@ -704,7 +704,7 @@ The API returns the following result: ---- // TESTRESPONSE[s/1656364565517/$body.$_path/] // TESTRESPONSE[s/"version" : "8.4.0"/"version": $body.version/] -// TESTRESPONSE[s/"authorization" : \{[^}]*\},//] +// TESTRESPONSE[s/"superuser"/"_es_test_root"/] [[ml-put-dfanalytics-example-r]] @@ -777,7 +777,7 @@ The API returns the following result: ---- // TESTRESPONSE[s/1656364845151/$body.$_path/] // TESTRESPONSE[s/"version" : "8.4.0"/"version": $body.version/] -// TESTRESPONSE[s/"authorization" : \{[^}]*\},//] +// TESTRESPONSE[s/"superuser"/"_es_test_root"/] // TESTRESPONSE[s/-3578554885299300212/$body.$_path/] diff --git a/docs/reference/modules/cluster/remote-clusters-api-key.asciidoc b/docs/reference/modules/cluster/remote-clusters-api-key.asciidoc index 9451c8ba50aae..a8fb195e7728d 100644 --- a/docs/reference/modules/cluster/remote-clusters-api-key.asciidoc +++ b/docs/reference/modules/cluster/remote-clusters-api-key.asciidoc @@ -192,4 +192,4 @@ remote cluster earlier. include::remote-clusters-connect.asciidoc[] :!trust-mechanism: -include::../../../../x-pack/docs/en/security/authentication/remote-clusters-privileges-api-key.asciidoc[leveloffset=+1] \ No newline at end of file +include::{es-repo-dir}/security/authentication/remote-clusters-privileges-api-key.asciidoc[leveloffset=+1] \ No newline at end of file diff --git a/docs/reference/modules/cluster/remote-clusters-cert.asciidoc b/docs/reference/modules/cluster/remote-clusters-cert.asciidoc index 36dbde331f484..11d71955cfe60 100644 --- a/docs/reference/modules/cluster/remote-clusters-cert.asciidoc +++ b/docs/reference/modules/cluster/remote-clusters-cert.asciidoc @@ -80,4 +80,4 @@ generate certificates for all nodes simplifies this task. include::remote-clusters-connect.asciidoc[] :!trust-mechanism: -include::../../../../x-pack/docs/en/security/authentication/remote-clusters-privileges-cert.asciidoc[leveloffset=+1] \ No newline at end of file +include::{es-repo-dir}/security/authentication/remote-clusters-privileges-cert.asciidoc[leveloffset=+1] \ No newline at end of file diff --git a/docs/reference/rest-api/defs.asciidoc b/docs/reference/rest-api/defs.asciidoc index 681ab746c193c..a80d4a42eb30d 100644 --- a/docs/reference/rest-api/defs.asciidoc +++ b/docs/reference/rest-api/defs.asciidoc @@ -8,4 +8,4 @@ to {security-features}. * <> -include::{xes-repo-dir}/rest-api/security/role-mapping-resources.asciidoc[] +include::{es-repo-dir}/rest-api/security/role-mapping-resources.asciidoc[] diff --git a/docs/reference/rest-api/index.asciidoc b/docs/reference/rest-api/index.asciidoc index 59555517e4971..1da39333db43e 100644 --- a/docs/reference/rest-api/index.asciidoc +++ b/docs/reference/rest-api/index.asciidoc @@ -77,7 +77,7 @@ include::{es-repo-dir}/ilm/apis/ilm-api.asciidoc[] include::{es-repo-dir}/ingest/apis/index.asciidoc[] include::info.asciidoc[] include::{es-repo-dir}/licensing/index.asciidoc[] -include::{xes-repo-dir}/rest-api/logstash/index.asciidoc[] +include::{es-repo-dir}/rest-api/logstash/index.asciidoc[] include::{es-repo-dir}/ml/common/apis/index.asciidoc[] include::{es-repo-dir}/ml/anomaly-detection/apis/index.asciidoc[] include::{es-repo-dir}/ml/df-analytics/apis/index.asciidoc[] @@ -92,12 +92,12 @@ include::{es-repo-dir}/scripting/apis/script-apis.asciidoc[] include::{es-repo-dir}/search.asciidoc[] include::{es-repo-dir}/search-application/apis/index.asciidoc[] include::{es-repo-dir}/searchable-snapshots/apis/searchable-snapshots-apis.asciidoc[] -include::{xes-repo-dir}/rest-api/security.asciidoc[] +include::{es-repo-dir}/rest-api/security.asciidoc[] include::{es-repo-dir}/snapshot-restore/apis/snapshot-restore-apis.asciidoc[] include::{es-repo-dir}/slm/apis/slm-api.asciidoc[] include::{es-repo-dir}/sql/apis/sql-apis.asciidoc[] include::{es-repo-dir}/synonyms/apis/synonyms-apis.asciidoc[] include::{es-repo-dir}/transform/apis/index.asciidoc[] include::usage.asciidoc[] -include::{xes-repo-dir}/rest-api/watcher.asciidoc[] +include::{es-repo-dir}/rest-api/watcher.asciidoc[] include::defs.asciidoc[] diff --git a/docs/reference/rest-api/info.asciidoc b/docs/reference/rest-api/info.asciidoc index 31daa86d2c423..ec424ca20d324 100644 --- a/docs/reference/rest-api/info.asciidoc +++ b/docs/reference/rest-api/info.asciidoc @@ -127,7 +127,7 @@ Example response: }, "security" : { "available" : true, - "enabled" : false + "enabled" : true }, "slm" : { "available" : true, diff --git a/x-pack/docs/en/rest-api/logstash/delete-pipeline.asciidoc b/docs/reference/rest-api/logstash/delete-pipeline.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/logstash/delete-pipeline.asciidoc rename to docs/reference/rest-api/logstash/delete-pipeline.asciidoc diff --git a/x-pack/docs/en/rest-api/logstash/get-pipeline.asciidoc b/docs/reference/rest-api/logstash/get-pipeline.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/logstash/get-pipeline.asciidoc rename to docs/reference/rest-api/logstash/get-pipeline.asciidoc diff --git a/x-pack/docs/en/rest-api/logstash/index.asciidoc b/docs/reference/rest-api/logstash/index.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/logstash/index.asciidoc rename to docs/reference/rest-api/logstash/index.asciidoc diff --git a/x-pack/docs/en/rest-api/logstash/put-pipeline.asciidoc b/docs/reference/rest-api/logstash/put-pipeline.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/logstash/put-pipeline.asciidoc rename to docs/reference/rest-api/logstash/put-pipeline.asciidoc diff --git a/x-pack/docs/en/rest-api/security.asciidoc b/docs/reference/rest-api/security.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security.asciidoc rename to docs/reference/rest-api/security.asciidoc diff --git a/x-pack/docs/en/rest-api/security/activate-user-profile.asciidoc b/docs/reference/rest-api/security/activate-user-profile.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/activate-user-profile.asciidoc rename to docs/reference/rest-api/security/activate-user-profile.asciidoc diff --git a/x-pack/docs/en/rest-api/security/authenticate.asciidoc b/docs/reference/rest-api/security/authenticate.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/authenticate.asciidoc rename to docs/reference/rest-api/security/authenticate.asciidoc diff --git a/x-pack/docs/en/rest-api/security/bulk-update-api-keys.asciidoc b/docs/reference/rest-api/security/bulk-update-api-keys.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/bulk-update-api-keys.asciidoc rename to docs/reference/rest-api/security/bulk-update-api-keys.asciidoc diff --git a/x-pack/docs/en/rest-api/security/change-password.asciidoc b/docs/reference/rest-api/security/change-password.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/change-password.asciidoc rename to docs/reference/rest-api/security/change-password.asciidoc diff --git a/x-pack/docs/en/rest-api/security/clear-api-key-cache.asciidoc b/docs/reference/rest-api/security/clear-api-key-cache.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/clear-api-key-cache.asciidoc rename to docs/reference/rest-api/security/clear-api-key-cache.asciidoc diff --git a/x-pack/docs/en/rest-api/security/clear-cache.asciidoc b/docs/reference/rest-api/security/clear-cache.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/clear-cache.asciidoc rename to docs/reference/rest-api/security/clear-cache.asciidoc diff --git a/x-pack/docs/en/rest-api/security/clear-privileges-cache.asciidoc b/docs/reference/rest-api/security/clear-privileges-cache.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/clear-privileges-cache.asciidoc rename to docs/reference/rest-api/security/clear-privileges-cache.asciidoc diff --git a/x-pack/docs/en/rest-api/security/clear-roles-cache.asciidoc b/docs/reference/rest-api/security/clear-roles-cache.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/clear-roles-cache.asciidoc rename to docs/reference/rest-api/security/clear-roles-cache.asciidoc diff --git a/x-pack/docs/en/rest-api/security/clear-service-token-caches.asciidoc b/docs/reference/rest-api/security/clear-service-token-caches.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/clear-service-token-caches.asciidoc rename to docs/reference/rest-api/security/clear-service-token-caches.asciidoc diff --git a/x-pack/docs/en/rest-api/security/create-api-keys.asciidoc b/docs/reference/rest-api/security/create-api-keys.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/create-api-keys.asciidoc rename to docs/reference/rest-api/security/create-api-keys.asciidoc diff --git a/x-pack/docs/en/rest-api/security/create-cross-cluster-api-key.asciidoc b/docs/reference/rest-api/security/create-cross-cluster-api-key.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/create-cross-cluster-api-key.asciidoc rename to docs/reference/rest-api/security/create-cross-cluster-api-key.asciidoc diff --git a/x-pack/docs/en/rest-api/security/create-role-mappings.asciidoc b/docs/reference/rest-api/security/create-role-mappings.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/create-role-mappings.asciidoc rename to docs/reference/rest-api/security/create-role-mappings.asciidoc diff --git a/x-pack/docs/en/rest-api/security/create-roles.asciidoc b/docs/reference/rest-api/security/create-roles.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/create-roles.asciidoc rename to docs/reference/rest-api/security/create-roles.asciidoc diff --git a/x-pack/docs/en/rest-api/security/create-service-token.asciidoc b/docs/reference/rest-api/security/create-service-token.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/create-service-token.asciidoc rename to docs/reference/rest-api/security/create-service-token.asciidoc diff --git a/x-pack/docs/en/rest-api/security/create-users.asciidoc b/docs/reference/rest-api/security/create-users.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/create-users.asciidoc rename to docs/reference/rest-api/security/create-users.asciidoc diff --git a/x-pack/docs/en/rest-api/security/delegate-pki-authentication.asciidoc b/docs/reference/rest-api/security/delegate-pki-authentication.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/delegate-pki-authentication.asciidoc rename to docs/reference/rest-api/security/delegate-pki-authentication.asciidoc diff --git a/x-pack/docs/en/rest-api/security/delete-app-privileges.asciidoc b/docs/reference/rest-api/security/delete-app-privileges.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/delete-app-privileges.asciidoc rename to docs/reference/rest-api/security/delete-app-privileges.asciidoc diff --git a/x-pack/docs/en/rest-api/security/delete-role-mappings.asciidoc b/docs/reference/rest-api/security/delete-role-mappings.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/delete-role-mappings.asciidoc rename to docs/reference/rest-api/security/delete-role-mappings.asciidoc diff --git a/x-pack/docs/en/rest-api/security/delete-roles.asciidoc b/docs/reference/rest-api/security/delete-roles.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/delete-roles.asciidoc rename to docs/reference/rest-api/security/delete-roles.asciidoc diff --git a/x-pack/docs/en/rest-api/security/delete-service-token.asciidoc b/docs/reference/rest-api/security/delete-service-token.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/delete-service-token.asciidoc rename to docs/reference/rest-api/security/delete-service-token.asciidoc diff --git a/x-pack/docs/en/rest-api/security/delete-users.asciidoc b/docs/reference/rest-api/security/delete-users.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/delete-users.asciidoc rename to docs/reference/rest-api/security/delete-users.asciidoc diff --git a/x-pack/docs/en/rest-api/security/disable-user-profile.asciidoc b/docs/reference/rest-api/security/disable-user-profile.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/disable-user-profile.asciidoc rename to docs/reference/rest-api/security/disable-user-profile.asciidoc diff --git a/x-pack/docs/en/rest-api/security/disable-users.asciidoc b/docs/reference/rest-api/security/disable-users.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/disable-users.asciidoc rename to docs/reference/rest-api/security/disable-users.asciidoc diff --git a/x-pack/docs/en/rest-api/security/enable-user-profile.asciidoc b/docs/reference/rest-api/security/enable-user-profile.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/enable-user-profile.asciidoc rename to docs/reference/rest-api/security/enable-user-profile.asciidoc diff --git a/x-pack/docs/en/rest-api/security/enable-users.asciidoc b/docs/reference/rest-api/security/enable-users.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/enable-users.asciidoc rename to docs/reference/rest-api/security/enable-users.asciidoc diff --git a/x-pack/docs/en/rest-api/security/enroll-kibana.asciidoc b/docs/reference/rest-api/security/enroll-kibana.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/enroll-kibana.asciidoc rename to docs/reference/rest-api/security/enroll-kibana.asciidoc diff --git a/x-pack/docs/en/rest-api/security/enroll-node.asciidoc b/docs/reference/rest-api/security/enroll-node.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/enroll-node.asciidoc rename to docs/reference/rest-api/security/enroll-node.asciidoc diff --git a/x-pack/docs/en/rest-api/security/get-api-keys.asciidoc b/docs/reference/rest-api/security/get-api-keys.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/get-api-keys.asciidoc rename to docs/reference/rest-api/security/get-api-keys.asciidoc diff --git a/x-pack/docs/en/rest-api/security/get-app-privileges.asciidoc b/docs/reference/rest-api/security/get-app-privileges.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/get-app-privileges.asciidoc rename to docs/reference/rest-api/security/get-app-privileges.asciidoc diff --git a/x-pack/docs/en/rest-api/security/get-builtin-privileges.asciidoc b/docs/reference/rest-api/security/get-builtin-privileges.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/get-builtin-privileges.asciidoc rename to docs/reference/rest-api/security/get-builtin-privileges.asciidoc diff --git a/x-pack/docs/en/rest-api/security/get-role-mappings.asciidoc b/docs/reference/rest-api/security/get-role-mappings.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/get-role-mappings.asciidoc rename to docs/reference/rest-api/security/get-role-mappings.asciidoc diff --git a/x-pack/docs/en/rest-api/security/get-roles.asciidoc b/docs/reference/rest-api/security/get-roles.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/get-roles.asciidoc rename to docs/reference/rest-api/security/get-roles.asciidoc diff --git a/x-pack/docs/en/rest-api/security/get-service-accounts.asciidoc b/docs/reference/rest-api/security/get-service-accounts.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/get-service-accounts.asciidoc rename to docs/reference/rest-api/security/get-service-accounts.asciidoc diff --git a/x-pack/docs/en/rest-api/security/get-service-credentials.asciidoc b/docs/reference/rest-api/security/get-service-credentials.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/get-service-credentials.asciidoc rename to docs/reference/rest-api/security/get-service-credentials.asciidoc diff --git a/x-pack/docs/en/rest-api/security/get-settings.asciidoc b/docs/reference/rest-api/security/get-settings.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/get-settings.asciidoc rename to docs/reference/rest-api/security/get-settings.asciidoc diff --git a/x-pack/docs/en/rest-api/security/get-tokens.asciidoc b/docs/reference/rest-api/security/get-tokens.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/get-tokens.asciidoc rename to docs/reference/rest-api/security/get-tokens.asciidoc diff --git a/x-pack/docs/en/rest-api/security/get-user-privileges.asciidoc b/docs/reference/rest-api/security/get-user-privileges.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/get-user-privileges.asciidoc rename to docs/reference/rest-api/security/get-user-privileges.asciidoc diff --git a/x-pack/docs/en/rest-api/security/get-user-profile.asciidoc b/docs/reference/rest-api/security/get-user-profile.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/get-user-profile.asciidoc rename to docs/reference/rest-api/security/get-user-profile.asciidoc diff --git a/x-pack/docs/en/rest-api/security/get-users.asciidoc b/docs/reference/rest-api/security/get-users.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/get-users.asciidoc rename to docs/reference/rest-api/security/get-users.asciidoc diff --git a/x-pack/docs/en/rest-api/security/grant-api-keys.asciidoc b/docs/reference/rest-api/security/grant-api-keys.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/grant-api-keys.asciidoc rename to docs/reference/rest-api/security/grant-api-keys.asciidoc diff --git a/x-pack/docs/en/rest-api/security/has-privileges-user-profile.asciidoc b/docs/reference/rest-api/security/has-privileges-user-profile.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/has-privileges-user-profile.asciidoc rename to docs/reference/rest-api/security/has-privileges-user-profile.asciidoc diff --git a/x-pack/docs/en/rest-api/security/has-privileges.asciidoc b/docs/reference/rest-api/security/has-privileges.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/has-privileges.asciidoc rename to docs/reference/rest-api/security/has-privileges.asciidoc diff --git a/x-pack/docs/en/rest-api/security/invalidate-api-keys.asciidoc b/docs/reference/rest-api/security/invalidate-api-keys.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/invalidate-api-keys.asciidoc rename to docs/reference/rest-api/security/invalidate-api-keys.asciidoc diff --git a/x-pack/docs/en/rest-api/security/invalidate-tokens.asciidoc b/docs/reference/rest-api/security/invalidate-tokens.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/invalidate-tokens.asciidoc rename to docs/reference/rest-api/security/invalidate-tokens.asciidoc diff --git a/x-pack/docs/en/rest-api/security/oidc-authenticate-api.asciidoc b/docs/reference/rest-api/security/oidc-authenticate-api.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/oidc-authenticate-api.asciidoc rename to docs/reference/rest-api/security/oidc-authenticate-api.asciidoc diff --git a/x-pack/docs/en/rest-api/security/oidc-logout-api.asciidoc b/docs/reference/rest-api/security/oidc-logout-api.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/oidc-logout-api.asciidoc rename to docs/reference/rest-api/security/oidc-logout-api.asciidoc diff --git a/x-pack/docs/en/rest-api/security/oidc-prepare-authentication-api.asciidoc b/docs/reference/rest-api/security/oidc-prepare-authentication-api.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/oidc-prepare-authentication-api.asciidoc rename to docs/reference/rest-api/security/oidc-prepare-authentication-api.asciidoc diff --git a/x-pack/docs/en/rest-api/security/put-app-privileges.asciidoc b/docs/reference/rest-api/security/put-app-privileges.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/put-app-privileges.asciidoc rename to docs/reference/rest-api/security/put-app-privileges.asciidoc diff --git a/x-pack/docs/en/rest-api/security/query-api-key.asciidoc b/docs/reference/rest-api/security/query-api-key.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/query-api-key.asciidoc rename to docs/reference/rest-api/security/query-api-key.asciidoc diff --git a/x-pack/docs/en/rest-api/security/role-mapping-resources.asciidoc b/docs/reference/rest-api/security/role-mapping-resources.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/role-mapping-resources.asciidoc rename to docs/reference/rest-api/security/role-mapping-resources.asciidoc diff --git a/x-pack/docs/en/rest-api/security/saml-authenticate-api.asciidoc b/docs/reference/rest-api/security/saml-authenticate-api.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/saml-authenticate-api.asciidoc rename to docs/reference/rest-api/security/saml-authenticate-api.asciidoc diff --git a/x-pack/docs/en/rest-api/security/saml-complete-logout-api.asciidoc b/docs/reference/rest-api/security/saml-complete-logout-api.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/saml-complete-logout-api.asciidoc rename to docs/reference/rest-api/security/saml-complete-logout-api.asciidoc diff --git a/x-pack/docs/en/rest-api/security/saml-invalidate-api.asciidoc b/docs/reference/rest-api/security/saml-invalidate-api.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/saml-invalidate-api.asciidoc rename to docs/reference/rest-api/security/saml-invalidate-api.asciidoc diff --git a/x-pack/docs/en/rest-api/security/saml-logout-api.asciidoc b/docs/reference/rest-api/security/saml-logout-api.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/saml-logout-api.asciidoc rename to docs/reference/rest-api/security/saml-logout-api.asciidoc diff --git a/x-pack/docs/en/rest-api/security/saml-prepare-authentication-api.asciidoc b/docs/reference/rest-api/security/saml-prepare-authentication-api.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/saml-prepare-authentication-api.asciidoc rename to docs/reference/rest-api/security/saml-prepare-authentication-api.asciidoc diff --git a/x-pack/docs/en/rest-api/security/saml-sp-metadata.asciidoc b/docs/reference/rest-api/security/saml-sp-metadata.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/saml-sp-metadata.asciidoc rename to docs/reference/rest-api/security/saml-sp-metadata.asciidoc diff --git a/x-pack/docs/en/rest-api/security/ssl.asciidoc b/docs/reference/rest-api/security/ssl.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/ssl.asciidoc rename to docs/reference/rest-api/security/ssl.asciidoc diff --git a/x-pack/docs/en/rest-api/security/suggest-user-profile.asciidoc b/docs/reference/rest-api/security/suggest-user-profile.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/suggest-user-profile.asciidoc rename to docs/reference/rest-api/security/suggest-user-profile.asciidoc diff --git a/x-pack/docs/en/rest-api/security/update-api-key.asciidoc b/docs/reference/rest-api/security/update-api-key.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/update-api-key.asciidoc rename to docs/reference/rest-api/security/update-api-key.asciidoc diff --git a/x-pack/docs/en/rest-api/security/update-cross-cluster-api-key.asciidoc b/docs/reference/rest-api/security/update-cross-cluster-api-key.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/update-cross-cluster-api-key.asciidoc rename to docs/reference/rest-api/security/update-cross-cluster-api-key.asciidoc diff --git a/x-pack/docs/en/rest-api/security/update-settings.asciidoc b/docs/reference/rest-api/security/update-settings.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/update-settings.asciidoc rename to docs/reference/rest-api/security/update-settings.asciidoc diff --git a/x-pack/docs/en/rest-api/security/update-user-profile-data.asciidoc b/docs/reference/rest-api/security/update-user-profile-data.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/security/update-user-profile-data.asciidoc rename to docs/reference/rest-api/security/update-user-profile-data.asciidoc diff --git a/docs/reference/rest-api/usage.asciidoc b/docs/reference/rest-api/usage.asciidoc index 14a92eca519f4..9594669b6d41f 100644 --- a/docs/reference/rest-api/usage.asciidoc +++ b/docs/reference/rest-api/usage.asciidoc @@ -38,7 +38,7 @@ include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=master-timeout] ------------------------------------------------------------ GET /_xpack/usage ------------------------------------------------------------ -// TEST[s/usage/usage?filter_path=-watcher.execution.actions.logging*/] +// TEST[s/usage/usage?filter_path=-watcher.execution.actions.index*\,-watcher.execution.actions.logging*/] // This response filter removes watcher logging results if they are included // to avoid errors in the CI builds. @@ -47,7 +47,8 @@ GET /_xpack/usage { "security" : { "available" : true, - "enabled" : false + "enabled" : true, + ... }, "monitoring" : { "available" : true, @@ -475,6 +476,7 @@ GET /_xpack/usage } } ------------------------------------------------------------ +// TESTRESPONSE[s/"security" : \{[^\}]*\},/"security" : $body.$_path,/] // TESTRESPONSE[s/"detectors" : \{[^\}]*\},/"detectors" : $body.$_path,/] // TESTRESPONSE[s/"model_size" : \{[^\}]*\},/"model_size" : $body.$_path,/] // TESTRESPONSE[s/"eql" : \{[^\}]*\},/"eql" : $body.$_path,/] diff --git a/x-pack/docs/en/rest-api/watcher.asciidoc b/docs/reference/rest-api/watcher.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher.asciidoc rename to docs/reference/rest-api/watcher.asciidoc diff --git a/x-pack/docs/en/rest-api/watcher/ack-watch.asciidoc b/docs/reference/rest-api/watcher/ack-watch.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher/ack-watch.asciidoc rename to docs/reference/rest-api/watcher/ack-watch.asciidoc diff --git a/x-pack/docs/en/rest-api/watcher/activate-watch.asciidoc b/docs/reference/rest-api/watcher/activate-watch.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher/activate-watch.asciidoc rename to docs/reference/rest-api/watcher/activate-watch.asciidoc diff --git a/x-pack/docs/en/rest-api/watcher/deactivate-watch.asciidoc b/docs/reference/rest-api/watcher/deactivate-watch.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher/deactivate-watch.asciidoc rename to docs/reference/rest-api/watcher/deactivate-watch.asciidoc diff --git a/x-pack/docs/en/rest-api/watcher/delete-watch.asciidoc b/docs/reference/rest-api/watcher/delete-watch.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher/delete-watch.asciidoc rename to docs/reference/rest-api/watcher/delete-watch.asciidoc diff --git a/x-pack/docs/en/rest-api/watcher/execute-watch.asciidoc b/docs/reference/rest-api/watcher/execute-watch.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher/execute-watch.asciidoc rename to docs/reference/rest-api/watcher/execute-watch.asciidoc diff --git a/x-pack/docs/en/rest-api/watcher/get-settings.asciidoc b/docs/reference/rest-api/watcher/get-settings.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher/get-settings.asciidoc rename to docs/reference/rest-api/watcher/get-settings.asciidoc diff --git a/x-pack/docs/en/rest-api/watcher/get-watch.asciidoc b/docs/reference/rest-api/watcher/get-watch.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher/get-watch.asciidoc rename to docs/reference/rest-api/watcher/get-watch.asciidoc diff --git a/x-pack/docs/en/rest-api/watcher/put-watch.asciidoc b/docs/reference/rest-api/watcher/put-watch.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher/put-watch.asciidoc rename to docs/reference/rest-api/watcher/put-watch.asciidoc diff --git a/x-pack/docs/en/rest-api/watcher/query-watches.asciidoc b/docs/reference/rest-api/watcher/query-watches.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher/query-watches.asciidoc rename to docs/reference/rest-api/watcher/query-watches.asciidoc diff --git a/x-pack/docs/en/rest-api/watcher/start.asciidoc b/docs/reference/rest-api/watcher/start.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher/start.asciidoc rename to docs/reference/rest-api/watcher/start.asciidoc diff --git a/x-pack/docs/en/rest-api/watcher/stats.asciidoc b/docs/reference/rest-api/watcher/stats.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher/stats.asciidoc rename to docs/reference/rest-api/watcher/stats.asciidoc diff --git a/x-pack/docs/en/rest-api/watcher/stop.asciidoc b/docs/reference/rest-api/watcher/stop.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher/stop.asciidoc rename to docs/reference/rest-api/watcher/stop.asciidoc diff --git a/x-pack/docs/en/rest-api/watcher/update-settings.asciidoc b/docs/reference/rest-api/watcher/update-settings.asciidoc similarity index 100% rename from x-pack/docs/en/rest-api/watcher/update-settings.asciidoc rename to docs/reference/rest-api/watcher/update-settings.asciidoc diff --git a/x-pack/docs/en/security/auditing/auditing-search-queries.asciidoc b/docs/reference/security/auditing/auditing-search-queries.asciidoc similarity index 100% rename from x-pack/docs/en/security/auditing/auditing-search-queries.asciidoc rename to docs/reference/security/auditing/auditing-search-queries.asciidoc diff --git a/x-pack/docs/en/security/auditing/enable-audit-logging.asciidoc b/docs/reference/security/auditing/enable-audit-logging.asciidoc similarity index 100% rename from x-pack/docs/en/security/auditing/enable-audit-logging.asciidoc rename to docs/reference/security/auditing/enable-audit-logging.asciidoc diff --git a/x-pack/docs/en/security/auditing/event-types.asciidoc b/docs/reference/security/auditing/event-types.asciidoc similarity index 100% rename from x-pack/docs/en/security/auditing/event-types.asciidoc rename to docs/reference/security/auditing/event-types.asciidoc diff --git a/x-pack/docs/en/security/auditing/ignore-policy.asciidoc b/docs/reference/security/auditing/ignore-policy.asciidoc similarity index 100% rename from x-pack/docs/en/security/auditing/ignore-policy.asciidoc rename to docs/reference/security/auditing/ignore-policy.asciidoc diff --git a/x-pack/docs/en/security/auditing/index.asciidoc b/docs/reference/security/auditing/index.asciidoc similarity index 100% rename from x-pack/docs/en/security/auditing/index.asciidoc rename to docs/reference/security/auditing/index.asciidoc diff --git a/x-pack/docs/en/security/auditing/output-logfile.asciidoc b/docs/reference/security/auditing/output-logfile.asciidoc similarity index 100% rename from x-pack/docs/en/security/auditing/output-logfile.asciidoc rename to docs/reference/security/auditing/output-logfile.asciidoc diff --git a/x-pack/docs/en/security/authentication/active-directory-realm.asciidoc b/docs/reference/security/authentication/active-directory-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/active-directory-realm.asciidoc rename to docs/reference/security/authentication/active-directory-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/anonymous-access.asciidoc b/docs/reference/security/authentication/anonymous-access.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/anonymous-access.asciidoc rename to docs/reference/security/authentication/anonymous-access.asciidoc diff --git a/x-pack/docs/en/security/authentication/built-in-users.asciidoc b/docs/reference/security/authentication/built-in-users.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/built-in-users.asciidoc rename to docs/reference/security/authentication/built-in-users.asciidoc diff --git a/x-pack/docs/en/security/authentication/configuring-active-directory-realm.asciidoc b/docs/reference/security/authentication/configuring-active-directory-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/configuring-active-directory-realm.asciidoc rename to docs/reference/security/authentication/configuring-active-directory-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/configuring-file-realm.asciidoc b/docs/reference/security/authentication/configuring-file-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/configuring-file-realm.asciidoc rename to docs/reference/security/authentication/configuring-file-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/configuring-kerberos-realm.asciidoc b/docs/reference/security/authentication/configuring-kerberos-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/configuring-kerberos-realm.asciidoc rename to docs/reference/security/authentication/configuring-kerberos-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/configuring-ldap-realm.asciidoc b/docs/reference/security/authentication/configuring-ldap-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/configuring-ldap-realm.asciidoc rename to docs/reference/security/authentication/configuring-ldap-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/configuring-native-realm.asciidoc b/docs/reference/security/authentication/configuring-native-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/configuring-native-realm.asciidoc rename to docs/reference/security/authentication/configuring-native-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/configuring-pki-realm.asciidoc b/docs/reference/security/authentication/configuring-pki-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/configuring-pki-realm.asciidoc rename to docs/reference/security/authentication/configuring-pki-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/custom-realm.asciidoc b/docs/reference/security/authentication/custom-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/custom-realm.asciidoc rename to docs/reference/security/authentication/custom-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/file-realm.asciidoc b/docs/reference/security/authentication/file-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/file-realm.asciidoc rename to docs/reference/security/authentication/file-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/internal-users.asciidoc b/docs/reference/security/authentication/internal-users.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/internal-users.asciidoc rename to docs/reference/security/authentication/internal-users.asciidoc diff --git a/x-pack/docs/en/security/authentication/jwt-realm.asciidoc b/docs/reference/security/authentication/jwt-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/jwt-realm.asciidoc rename to docs/reference/security/authentication/jwt-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/kerberos-realm.asciidoc b/docs/reference/security/authentication/kerberos-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/kerberos-realm.asciidoc rename to docs/reference/security/authentication/kerberos-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/ldap-realm.asciidoc b/docs/reference/security/authentication/ldap-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/ldap-realm.asciidoc rename to docs/reference/security/authentication/ldap-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/native-realm.asciidoc b/docs/reference/security/authentication/native-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/native-realm.asciidoc rename to docs/reference/security/authentication/native-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/oidc-guide.asciidoc b/docs/reference/security/authentication/oidc-guide.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/oidc-guide.asciidoc rename to docs/reference/security/authentication/oidc-guide.asciidoc diff --git a/x-pack/docs/en/security/authentication/oidc-realm.asciidoc b/docs/reference/security/authentication/oidc-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/oidc-realm.asciidoc rename to docs/reference/security/authentication/oidc-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/overview.asciidoc b/docs/reference/security/authentication/overview.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/overview.asciidoc rename to docs/reference/security/authentication/overview.asciidoc diff --git a/x-pack/docs/en/security/authentication/pki-realm.asciidoc b/docs/reference/security/authentication/pki-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/pki-realm.asciidoc rename to docs/reference/security/authentication/pki-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/realm-chains.asciidoc b/docs/reference/security/authentication/realm-chains.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/realm-chains.asciidoc rename to docs/reference/security/authentication/realm-chains.asciidoc diff --git a/x-pack/docs/en/security/authentication/realms.asciidoc b/docs/reference/security/authentication/realms.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/realms.asciidoc rename to docs/reference/security/authentication/realms.asciidoc diff --git a/x-pack/docs/en/security/authentication/remote-clusters-privileges-api-key.asciidoc b/docs/reference/security/authentication/remote-clusters-privileges-api-key.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/remote-clusters-privileges-api-key.asciidoc rename to docs/reference/security/authentication/remote-clusters-privileges-api-key.asciidoc diff --git a/x-pack/docs/en/security/authentication/remote-clusters-privileges-cert.asciidoc b/docs/reference/security/authentication/remote-clusters-privileges-cert.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/remote-clusters-privileges-cert.asciidoc rename to docs/reference/security/authentication/remote-clusters-privileges-cert.asciidoc diff --git a/x-pack/docs/en/security/authentication/saml-guide.asciidoc b/docs/reference/security/authentication/saml-guide.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/saml-guide.asciidoc rename to docs/reference/security/authentication/saml-guide.asciidoc diff --git a/x-pack/docs/en/security/authentication/saml-realm.asciidoc b/docs/reference/security/authentication/saml-realm.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/saml-realm.asciidoc rename to docs/reference/security/authentication/saml-realm.asciidoc diff --git a/x-pack/docs/en/security/authentication/security-domain.asciidoc b/docs/reference/security/authentication/security-domain.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/security-domain.asciidoc rename to docs/reference/security/authentication/security-domain.asciidoc diff --git a/x-pack/docs/en/security/authentication/service-accounts.asciidoc b/docs/reference/security/authentication/service-accounts.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/service-accounts.asciidoc rename to docs/reference/security/authentication/service-accounts.asciidoc diff --git a/x-pack/docs/en/security/authentication/token-authentication-services.asciidoc b/docs/reference/security/authentication/token-authentication-services.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/token-authentication-services.asciidoc rename to docs/reference/security/authentication/token-authentication-services.asciidoc diff --git a/x-pack/docs/en/security/authentication/user-cache.asciidoc b/docs/reference/security/authentication/user-cache.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/user-cache.asciidoc rename to docs/reference/security/authentication/user-cache.asciidoc diff --git a/x-pack/docs/en/security/authentication/user-lookup.asciidoc b/docs/reference/security/authentication/user-lookup.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/user-lookup.asciidoc rename to docs/reference/security/authentication/user-lookup.asciidoc diff --git a/x-pack/docs/en/security/authentication/user-profile.asciidoc b/docs/reference/security/authentication/user-profile.asciidoc similarity index 100% rename from x-pack/docs/en/security/authentication/user-profile.asciidoc rename to docs/reference/security/authentication/user-profile.asciidoc diff --git a/x-pack/docs/en/security/authorization/alias-privileges.asciidoc b/docs/reference/security/authorization/alias-privileges.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/alias-privileges.asciidoc rename to docs/reference/security/authorization/alias-privileges.asciidoc diff --git a/x-pack/docs/en/security/authorization/built-in-roles.asciidoc b/docs/reference/security/authorization/built-in-roles.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/built-in-roles.asciidoc rename to docs/reference/security/authorization/built-in-roles.asciidoc diff --git a/x-pack/docs/en/security/authorization/configuring-authorization-delegation.asciidoc b/docs/reference/security/authorization/configuring-authorization-delegation.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/configuring-authorization-delegation.asciidoc rename to docs/reference/security/authorization/configuring-authorization-delegation.asciidoc diff --git a/x-pack/docs/en/security/authorization/custom-authorization.asciidoc b/docs/reference/security/authorization/custom-authorization.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/custom-authorization.asciidoc rename to docs/reference/security/authorization/custom-authorization.asciidoc diff --git a/x-pack/docs/en/security/authorization/document-level-security.asciidoc b/docs/reference/security/authorization/document-level-security.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/document-level-security.asciidoc rename to docs/reference/security/authorization/document-level-security.asciidoc diff --git a/x-pack/docs/en/security/authorization/field-and-document-access-control.asciidoc b/docs/reference/security/authorization/field-and-document-access-control.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/field-and-document-access-control.asciidoc rename to docs/reference/security/authorization/field-and-document-access-control.asciidoc diff --git a/x-pack/docs/en/security/authorization/field-level-security.asciidoc b/docs/reference/security/authorization/field-level-security.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/field-level-security.asciidoc rename to docs/reference/security/authorization/field-level-security.asciidoc diff --git a/x-pack/docs/en/security/authorization/images/authorization.png b/docs/reference/security/authorization/images/authorization.png similarity index 100% rename from x-pack/docs/en/security/authorization/images/authorization.png rename to docs/reference/security/authorization/images/authorization.png diff --git a/x-pack/docs/en/security/authorization/managing-roles.asciidoc b/docs/reference/security/authorization/managing-roles.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/managing-roles.asciidoc rename to docs/reference/security/authorization/managing-roles.asciidoc diff --git a/x-pack/docs/en/security/authorization/mapping-roles.asciidoc b/docs/reference/security/authorization/mapping-roles.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/mapping-roles.asciidoc rename to docs/reference/security/authorization/mapping-roles.asciidoc diff --git a/x-pack/docs/en/security/authorization/overview.asciidoc b/docs/reference/security/authorization/overview.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/overview.asciidoc rename to docs/reference/security/authorization/overview.asciidoc diff --git a/x-pack/docs/en/security/authorization/privileges.asciidoc b/docs/reference/security/authorization/privileges.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/privileges.asciidoc rename to docs/reference/security/authorization/privileges.asciidoc diff --git a/x-pack/docs/en/security/authorization/role-restriction.asciidoc b/docs/reference/security/authorization/role-restriction.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/role-restriction.asciidoc rename to docs/reference/security/authorization/role-restriction.asciidoc diff --git a/x-pack/docs/en/security/authorization/role-templates.asciidoc b/docs/reference/security/authorization/role-templates.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/role-templates.asciidoc rename to docs/reference/security/authorization/role-templates.asciidoc diff --git a/x-pack/docs/en/security/authorization/run-as-privilege.asciidoc b/docs/reference/security/authorization/run-as-privilege.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/run-as-privilege.asciidoc rename to docs/reference/security/authorization/run-as-privilege.asciidoc diff --git a/x-pack/docs/en/security/authorization/set-security-user.asciidoc b/docs/reference/security/authorization/set-security-user.asciidoc similarity index 100% rename from x-pack/docs/en/security/authorization/set-security-user.asciidoc rename to docs/reference/security/authorization/set-security-user.asciidoc diff --git a/x-pack/docs/en/security/ccs-clients-integrations/hadoop.asciidoc b/docs/reference/security/ccs-clients-integrations/hadoop.asciidoc similarity index 100% rename from x-pack/docs/en/security/ccs-clients-integrations/hadoop.asciidoc rename to docs/reference/security/ccs-clients-integrations/hadoop.asciidoc diff --git a/x-pack/docs/en/security/ccs-clients-integrations/http.asciidoc b/docs/reference/security/ccs-clients-integrations/http.asciidoc similarity index 100% rename from x-pack/docs/en/security/ccs-clients-integrations/http.asciidoc rename to docs/reference/security/ccs-clients-integrations/http.asciidoc diff --git a/x-pack/docs/en/security/ccs-clients-integrations/index.asciidoc b/docs/reference/security/ccs-clients-integrations/index.asciidoc similarity index 100% rename from x-pack/docs/en/security/ccs-clients-integrations/index.asciidoc rename to docs/reference/security/ccs-clients-integrations/index.asciidoc diff --git a/x-pack/docs/en/security/ccs-clients-integrations/monitoring.asciidoc b/docs/reference/security/ccs-clients-integrations/monitoring.asciidoc similarity index 100% rename from x-pack/docs/en/security/ccs-clients-integrations/monitoring.asciidoc rename to docs/reference/security/ccs-clients-integrations/monitoring.asciidoc diff --git a/x-pack/docs/en/security/configuring-stack-security.asciidoc b/docs/reference/security/configuring-stack-security.asciidoc similarity index 100% rename from x-pack/docs/en/security/configuring-stack-security.asciidoc rename to docs/reference/security/configuring-stack-security.asciidoc diff --git a/x-pack/docs/en/security/enroll-nodes.asciidoc b/docs/reference/security/enroll-nodes.asciidoc similarity index 100% rename from x-pack/docs/en/security/enroll-nodes.asciidoc rename to docs/reference/security/enroll-nodes.asciidoc diff --git a/x-pack/docs/en/security/es-security-principles.asciidoc b/docs/reference/security/es-security-principles.asciidoc similarity index 100% rename from x-pack/docs/en/security/es-security-principles.asciidoc rename to docs/reference/security/es-security-principles.asciidoc diff --git a/x-pack/docs/en/security/fips-140-compliance.asciidoc b/docs/reference/security/fips-140-compliance.asciidoc similarity index 100% rename from x-pack/docs/en/security/fips-140-compliance.asciidoc rename to docs/reference/security/fips-140-compliance.asciidoc diff --git a/x-pack/docs/en/security/fips-java17.asciidoc b/docs/reference/security/fips-java17.asciidoc similarity index 100% rename from x-pack/docs/en/security/fips-java17.asciidoc rename to docs/reference/security/fips-java17.asciidoc diff --git a/x-pack/docs/en/security/images/assign-role.jpg b/docs/reference/security/images/assign-role.jpg similarity index 100% rename from x-pack/docs/en/security/images/assign-role.jpg rename to docs/reference/security/images/assign-role.jpg diff --git a/x-pack/docs/en/security/images/create-logstash-user.jpg b/docs/reference/security/images/create-logstash-user.jpg similarity index 100% rename from x-pack/docs/en/security/images/create-logstash-user.jpg rename to docs/reference/security/images/create-logstash-user.jpg diff --git a/x-pack/docs/en/security/images/create-reader-role.jpg b/docs/reference/security/images/create-reader-role.jpg similarity index 100% rename from x-pack/docs/en/security/images/create-reader-role.jpg rename to docs/reference/security/images/create-reader-role.jpg diff --git a/x-pack/docs/en/security/images/create-user.jpg b/docs/reference/security/images/create-user.jpg similarity index 100% rename from x-pack/docs/en/security/images/create-user.jpg rename to docs/reference/security/images/create-user.jpg diff --git a/x-pack/docs/en/security/images/create-writer-role.jpg b/docs/reference/security/images/create-writer-role.jpg similarity index 100% rename from x-pack/docs/en/security/images/create-writer-role.jpg rename to docs/reference/security/images/create-writer-role.jpg diff --git a/x-pack/docs/en/security/images/elastic-security-overview.png b/docs/reference/security/images/elastic-security-overview.png similarity index 100% rename from x-pack/docs/en/security/images/elastic-security-overview.png rename to docs/reference/security/images/elastic-security-overview.png diff --git a/x-pack/docs/en/security/images/kibana-login.jpg b/docs/reference/security/images/kibana-login.jpg similarity index 100% rename from x-pack/docs/en/security/images/kibana-login.jpg rename to docs/reference/security/images/kibana-login.jpg diff --git a/x-pack/docs/en/security/images/management-builtin-users.jpg b/docs/reference/security/images/management-builtin-users.jpg similarity index 100% rename from x-pack/docs/en/security/images/management-builtin-users.jpg rename to docs/reference/security/images/management-builtin-users.jpg diff --git a/x-pack/docs/en/security/images/management-roles.jpg b/docs/reference/security/images/management-roles.jpg similarity index 100% rename from x-pack/docs/en/security/images/management-roles.jpg rename to docs/reference/security/images/management-roles.jpg diff --git a/x-pack/docs/en/security/images/management-users.jpg b/docs/reference/security/images/management-users.jpg similarity index 100% rename from x-pack/docs/en/security/images/management-users.jpg rename to docs/reference/security/images/management-users.jpg diff --git a/x-pack/docs/en/security/images/nexus.png b/docs/reference/security/images/nexus.png similarity index 100% rename from x-pack/docs/en/security/images/nexus.png rename to docs/reference/security/images/nexus.png diff --git a/x-pack/docs/en/security/index.asciidoc b/docs/reference/security/index.asciidoc similarity index 100% rename from x-pack/docs/en/security/index.asciidoc rename to docs/reference/security/index.asciidoc diff --git a/x-pack/docs/en/security/limitations.asciidoc b/docs/reference/security/limitations.asciidoc similarity index 100% rename from x-pack/docs/en/security/limitations.asciidoc rename to docs/reference/security/limitations.asciidoc diff --git a/x-pack/docs/en/security/operator-privileges/configure-operator-privileges.asciidoc b/docs/reference/security/operator-privileges/configure-operator-privileges.asciidoc similarity index 100% rename from x-pack/docs/en/security/operator-privileges/configure-operator-privileges.asciidoc rename to docs/reference/security/operator-privileges/configure-operator-privileges.asciidoc diff --git a/x-pack/docs/en/security/operator-privileges/index.asciidoc b/docs/reference/security/operator-privileges/index.asciidoc similarity index 100% rename from x-pack/docs/en/security/operator-privileges/index.asciidoc rename to docs/reference/security/operator-privileges/index.asciidoc diff --git a/x-pack/docs/en/security/operator-privileges/operator-only-functionality.asciidoc b/docs/reference/security/operator-privileges/operator-only-functionality.asciidoc similarity index 100% rename from x-pack/docs/en/security/operator-privileges/operator-only-functionality.asciidoc rename to docs/reference/security/operator-privileges/operator-only-functionality.asciidoc diff --git a/x-pack/docs/en/security/operator-privileges/operator-only-snapshot-and-restore.asciidoc b/docs/reference/security/operator-privileges/operator-only-snapshot-and-restore.asciidoc similarity index 100% rename from x-pack/docs/en/security/operator-privileges/operator-only-snapshot-and-restore.asciidoc rename to docs/reference/security/operator-privileges/operator-only-snapshot-and-restore.asciidoc diff --git a/x-pack/docs/en/security/reference/files.asciidoc b/docs/reference/security/reference/files.asciidoc similarity index 100% rename from x-pack/docs/en/security/reference/files.asciidoc rename to docs/reference/security/reference/files.asciidoc diff --git a/x-pack/docs/en/security/securing-communications/change-passwords-native-users.asciidoc b/docs/reference/security/securing-communications/change-passwords-native-users.asciidoc similarity index 100% rename from x-pack/docs/en/security/securing-communications/change-passwords-native-users.asciidoc rename to docs/reference/security/securing-communications/change-passwords-native-users.asciidoc diff --git a/x-pack/docs/en/security/securing-communications/enabling-cipher-suites.asciidoc b/docs/reference/security/securing-communications/enabling-cipher-suites.asciidoc similarity index 100% rename from x-pack/docs/en/security/securing-communications/enabling-cipher-suites.asciidoc rename to docs/reference/security/securing-communications/enabling-cipher-suites.asciidoc diff --git a/x-pack/docs/en/security/securing-communications/security-basic-setup-https.asciidoc b/docs/reference/security/securing-communications/security-basic-setup-https.asciidoc similarity index 100% rename from x-pack/docs/en/security/securing-communications/security-basic-setup-https.asciidoc rename to docs/reference/security/securing-communications/security-basic-setup-https.asciidoc diff --git a/x-pack/docs/en/security/securing-communications/security-basic-setup.asciidoc b/docs/reference/security/securing-communications/security-basic-setup.asciidoc similarity index 100% rename from x-pack/docs/en/security/securing-communications/security-basic-setup.asciidoc rename to docs/reference/security/securing-communications/security-basic-setup.asciidoc diff --git a/x-pack/docs/en/security/securing-communications/security-minimal-setup.asciidoc b/docs/reference/security/securing-communications/security-minimal-setup.asciidoc similarity index 100% rename from x-pack/docs/en/security/securing-communications/security-minimal-setup.asciidoc rename to docs/reference/security/securing-communications/security-minimal-setup.asciidoc diff --git a/x-pack/docs/en/security/securing-communications/tls-ad.asciidoc b/docs/reference/security/securing-communications/tls-ad.asciidoc similarity index 100% rename from x-pack/docs/en/security/securing-communications/tls-ad.asciidoc rename to docs/reference/security/securing-communications/tls-ad.asciidoc diff --git a/x-pack/docs/en/security/securing-communications/tls-http.asciidoc b/docs/reference/security/securing-communications/tls-http.asciidoc similarity index 100% rename from x-pack/docs/en/security/securing-communications/tls-http.asciidoc rename to docs/reference/security/securing-communications/tls-http.asciidoc diff --git a/x-pack/docs/en/security/securing-communications/tls-ldap.asciidoc b/docs/reference/security/securing-communications/tls-ldap.asciidoc similarity index 100% rename from x-pack/docs/en/security/securing-communications/tls-ldap.asciidoc rename to docs/reference/security/securing-communications/tls-ldap.asciidoc diff --git a/x-pack/docs/en/security/securing-communications/tls-versions-jdk.asciidoc b/docs/reference/security/securing-communications/tls-versions-jdk.asciidoc similarity index 100% rename from x-pack/docs/en/security/securing-communications/tls-versions-jdk.asciidoc rename to docs/reference/security/securing-communications/tls-versions-jdk.asciidoc diff --git a/x-pack/docs/en/security/securing-communications/update-tls-certificates.asciidoc b/docs/reference/security/securing-communications/update-tls-certificates.asciidoc similarity index 100% rename from x-pack/docs/en/security/securing-communications/update-tls-certificates.asciidoc rename to docs/reference/security/securing-communications/update-tls-certificates.asciidoc diff --git a/x-pack/docs/en/security/security-manual-configuration.asciidoc b/docs/reference/security/security-manual-configuration.asciidoc similarity index 100% rename from x-pack/docs/en/security/security-manual-configuration.asciidoc rename to docs/reference/security/security-manual-configuration.asciidoc diff --git a/x-pack/docs/en/security/troubleshooting.asciidoc b/docs/reference/security/troubleshooting.asciidoc similarity index 100% rename from x-pack/docs/en/security/troubleshooting.asciidoc rename to docs/reference/security/troubleshooting.asciidoc diff --git a/x-pack/docs/en/security/using-ip-filtering.asciidoc b/docs/reference/security/using-ip-filtering.asciidoc similarity index 100% rename from x-pack/docs/en/security/using-ip-filtering.asciidoc rename to docs/reference/security/using-ip-filtering.asciidoc diff --git a/docs/reference/setup/add-nodes.asciidoc b/docs/reference/setup/add-nodes.asciidoc index 0be2d8c643a9f..e65dd0ba7af1f 100644 --- a/docs/reference/setup/add-nodes.asciidoc +++ b/docs/reference/setup/add-nodes.asciidoc @@ -37,7 +37,7 @@ To add a node to a cluster running on multiple machines, you must also set the rest of its cluster. ==== -include::../../../x-pack/docs/en/security/enroll-nodes.asciidoc[] +include::{es-repo-dir}/security/enroll-nodes.asciidoc[] For more information about discovery and shard allocation, refer to <> and <>. diff --git a/docs/reference/setup/install/targz-start.asciidoc b/docs/reference/setup/install/targz-start.asciidoc index 294f0e1541fbc..79c4131a57030 100644 --- a/docs/reference/setup/install/targz-start.asciidoc +++ b/docs/reference/setup/install/targz-start.asciidoc @@ -53,4 +53,4 @@ symbolic link. :slash: / -include::../../../../x-pack/docs/en/security/enroll-nodes.asciidoc[] \ No newline at end of file +include::{es-repo-dir}/security/enroll-nodes.asciidoc[] \ No newline at end of file diff --git a/docs/reference/setup/install/zip-windows-start.asciidoc b/docs/reference/setup/install/zip-windows-start.asciidoc index 29356d398c808..60edbb9ec704c 100644 --- a/docs/reference/setup/install/zip-windows-start.asciidoc +++ b/docs/reference/setup/install/zip-windows-start.asciidoc @@ -47,4 +47,4 @@ To stop {es}, press `Ctrl-C`. :slash: \ -include::../../../../x-pack/docs/en/security/enroll-nodes.asciidoc[] \ No newline at end of file +include::{es-repo-dir}/security/enroll-nodes.asciidoc[] \ No newline at end of file diff --git a/docs/reference/sql/security.asciidoc b/docs/reference/sql/security.asciidoc index 7847787025910..b57179742700c 100644 --- a/docs/reference/sql/security.asciidoc +++ b/docs/reference/sql/security.asciidoc @@ -44,7 +44,7 @@ APIs to view or edit a role defined in `roles.yml`. This example configures a role that can run SQL in JDBC querying the `test` index: -include::{xes-repo-dir}/rest-api/security/create-roles.asciidoc[tag=sql-queries-permission] +include::{es-repo-dir}/rest-api/security/create-roles.asciidoc[tag=sql-queries-permission] [discrete] [[sql-role-file-example]] diff --git a/docs/reference/transform/apis/update-transform.asciidoc b/docs/reference/transform/apis/update-transform.asciidoc index 8768aaaff1530..57a27b4efae76 100644 --- a/docs/reference/transform/apis/update-transform.asciidoc +++ b/docs/reference/transform/apis/update-transform.asciidoc @@ -341,4 +341,4 @@ When the {transform} is updated, you receive the updated configuration: ---- // TESTRESPONSE[s/"version" : "8.4.0"/"version" : $body.version/] // TESTRESPONSE[s/"create_time" : 1656113450613/"create_time" : $body.create_time/] -// TESTRESPONSE[s/"authorization" : \{[^}]*\},//] +// TESTRESPONSE[s/"superuser"/"_es_test_root"/] diff --git a/docs/reference/troubleshooting.asciidoc b/docs/reference/troubleshooting.asciidoc index edd73ba393c38..e5ad75e048c1b 100644 --- a/docs/reference/troubleshooting.asciidoc +++ b/docs/reference/troubleshooting.asciidoc @@ -125,7 +125,7 @@ include::monitoring/troubleshooting.asciidoc[] include::transform/troubleshooting.asciidoc[leveloffset=+1] -include::../../x-pack/docs/en/watcher/troubleshooting.asciidoc[] +include::watcher/troubleshooting.asciidoc[] include::troubleshooting/troubleshooting-searches.asciidoc[] diff --git a/docs/reference/upgrade.asciidoc b/docs/reference/upgrade.asciidoc index ecd3b2de72a32..8f6d095971ff1 100644 --- a/docs/reference/upgrade.asciidoc +++ b/docs/reference/upgrade.asciidoc @@ -52,7 +52,7 @@ the REST API. [[upgrade-fips-java17]] === FIPS Compliance and Java 17 -include::{xes-repo-dir}/security/fips-java17.asciidoc[] +include::{es-repo-dir}/security/fips-java17.asciidoc[] include::upgrade/archived-settings.asciidoc[] diff --git a/x-pack/docs/en/watcher/actions.asciidoc b/docs/reference/watcher/actions.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/actions.asciidoc rename to docs/reference/watcher/actions.asciidoc diff --git a/x-pack/docs/en/watcher/actions/email.asciidoc b/docs/reference/watcher/actions/email.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/actions/email.asciidoc rename to docs/reference/watcher/actions/email.asciidoc diff --git a/x-pack/docs/en/watcher/actions/index.asciidoc b/docs/reference/watcher/actions/index.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/actions/index.asciidoc rename to docs/reference/watcher/actions/index.asciidoc diff --git a/x-pack/docs/en/watcher/actions/jira.asciidoc b/docs/reference/watcher/actions/jira.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/actions/jira.asciidoc rename to docs/reference/watcher/actions/jira.asciidoc diff --git a/x-pack/docs/en/watcher/actions/logging.asciidoc b/docs/reference/watcher/actions/logging.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/actions/logging.asciidoc rename to docs/reference/watcher/actions/logging.asciidoc diff --git a/x-pack/docs/en/watcher/actions/pagerduty.asciidoc b/docs/reference/watcher/actions/pagerduty.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/actions/pagerduty.asciidoc rename to docs/reference/watcher/actions/pagerduty.asciidoc diff --git a/x-pack/docs/en/watcher/actions/slack.asciidoc b/docs/reference/watcher/actions/slack.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/actions/slack.asciidoc rename to docs/reference/watcher/actions/slack.asciidoc diff --git a/x-pack/docs/en/watcher/actions/webhook.asciidoc b/docs/reference/watcher/actions/webhook.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/actions/webhook.asciidoc rename to docs/reference/watcher/actions/webhook.asciidoc diff --git a/x-pack/docs/en/watcher/condition.asciidoc b/docs/reference/watcher/condition.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/condition.asciidoc rename to docs/reference/watcher/condition.asciidoc diff --git a/x-pack/docs/en/watcher/condition/always.asciidoc b/docs/reference/watcher/condition/always.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/condition/always.asciidoc rename to docs/reference/watcher/condition/always.asciidoc diff --git a/x-pack/docs/en/watcher/condition/array-compare.asciidoc b/docs/reference/watcher/condition/array-compare.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/condition/array-compare.asciidoc rename to docs/reference/watcher/condition/array-compare.asciidoc diff --git a/x-pack/docs/en/watcher/condition/compare.asciidoc b/docs/reference/watcher/condition/compare.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/condition/compare.asciidoc rename to docs/reference/watcher/condition/compare.asciidoc diff --git a/x-pack/docs/en/watcher/condition/never.asciidoc b/docs/reference/watcher/condition/never.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/condition/never.asciidoc rename to docs/reference/watcher/condition/never.asciidoc diff --git a/x-pack/docs/en/watcher/condition/script.asciidoc b/docs/reference/watcher/condition/script.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/condition/script.asciidoc rename to docs/reference/watcher/condition/script.asciidoc diff --git a/x-pack/docs/en/watcher/customizing-watches.asciidoc b/docs/reference/watcher/customizing-watches.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/customizing-watches.asciidoc rename to docs/reference/watcher/customizing-watches.asciidoc diff --git a/x-pack/docs/en/watcher/encrypting-data.asciidoc b/docs/reference/watcher/encrypting-data.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/encrypting-data.asciidoc rename to docs/reference/watcher/encrypting-data.asciidoc diff --git a/x-pack/docs/en/watcher/example-watches.asciidoc b/docs/reference/watcher/example-watches.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/example-watches.asciidoc rename to docs/reference/watcher/example-watches.asciidoc diff --git a/x-pack/docs/en/watcher/example-watches/example-watch-clusterstatus.asciidoc b/docs/reference/watcher/example-watches/example-watch-clusterstatus.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/example-watches/example-watch-clusterstatus.asciidoc rename to docs/reference/watcher/example-watches/example-watch-clusterstatus.asciidoc diff --git a/x-pack/docs/en/watcher/example-watches/watching-time-series-data.asciidoc b/docs/reference/watcher/example-watches/watching-time-series-data.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/example-watches/watching-time-series-data.asciidoc rename to docs/reference/watcher/example-watches/watching-time-series-data.asciidoc diff --git a/x-pack/docs/en/watcher/getting-started.asciidoc b/docs/reference/watcher/getting-started.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/getting-started.asciidoc rename to docs/reference/watcher/getting-started.asciidoc diff --git a/x-pack/docs/en/watcher/how-watcher-works.asciidoc b/docs/reference/watcher/how-watcher-works.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/how-watcher-works.asciidoc rename to docs/reference/watcher/how-watcher-works.asciidoc diff --git a/x-pack/docs/en/watcher/images/action-throttling.jpg b/docs/reference/watcher/images/action-throttling.jpg similarity index 100% rename from x-pack/docs/en/watcher/images/action-throttling.jpg rename to docs/reference/watcher/images/action-throttling.jpg diff --git a/x-pack/docs/en/watcher/images/slack-add-webhook-integration.jpg b/docs/reference/watcher/images/slack-add-webhook-integration.jpg similarity index 100% rename from x-pack/docs/en/watcher/images/slack-add-webhook-integration.jpg rename to docs/reference/watcher/images/slack-add-webhook-integration.jpg diff --git a/x-pack/docs/en/watcher/images/slack-copy-webhook-url.jpg b/docs/reference/watcher/images/slack-copy-webhook-url.jpg similarity index 100% rename from x-pack/docs/en/watcher/images/slack-copy-webhook-url.jpg rename to docs/reference/watcher/images/slack-copy-webhook-url.jpg diff --git a/x-pack/docs/en/watcher/images/watch-execution.jpg b/docs/reference/watcher/images/watch-execution.jpg similarity index 100% rename from x-pack/docs/en/watcher/images/watch-execution.jpg rename to docs/reference/watcher/images/watch-execution.jpg diff --git a/x-pack/docs/en/watcher/images/watcher-kibana-dashboard.png b/docs/reference/watcher/images/watcher-kibana-dashboard.png similarity index 100% rename from x-pack/docs/en/watcher/images/watcher-kibana-dashboard.png rename to docs/reference/watcher/images/watcher-kibana-dashboard.png diff --git a/x-pack/docs/en/watcher/images/watcher.graffle b/docs/reference/watcher/images/watcher.graffle similarity index 100% rename from x-pack/docs/en/watcher/images/watcher.graffle rename to docs/reference/watcher/images/watcher.graffle diff --git a/x-pack/docs/en/watcher/index.asciidoc b/docs/reference/watcher/index.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/index.asciidoc rename to docs/reference/watcher/index.asciidoc diff --git a/x-pack/docs/en/watcher/input.asciidoc b/docs/reference/watcher/input.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/input.asciidoc rename to docs/reference/watcher/input.asciidoc diff --git a/x-pack/docs/en/watcher/input/chain.asciidoc b/docs/reference/watcher/input/chain.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/input/chain.asciidoc rename to docs/reference/watcher/input/chain.asciidoc diff --git a/x-pack/docs/en/watcher/input/http.asciidoc b/docs/reference/watcher/input/http.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/input/http.asciidoc rename to docs/reference/watcher/input/http.asciidoc diff --git a/x-pack/docs/en/watcher/input/search.asciidoc b/docs/reference/watcher/input/search.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/input/search.asciidoc rename to docs/reference/watcher/input/search.asciidoc diff --git a/x-pack/docs/en/watcher/input/simple.asciidoc b/docs/reference/watcher/input/simple.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/input/simple.asciidoc rename to docs/reference/watcher/input/simple.asciidoc diff --git a/x-pack/docs/en/watcher/java/ack-watch.asciidoc b/docs/reference/watcher/java/ack-watch.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/java/ack-watch.asciidoc rename to docs/reference/watcher/java/ack-watch.asciidoc diff --git a/x-pack/docs/en/watcher/java/activate-watch.asciidoc b/docs/reference/watcher/java/activate-watch.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/java/activate-watch.asciidoc rename to docs/reference/watcher/java/activate-watch.asciidoc diff --git a/x-pack/docs/en/watcher/java/deactivate-watch.asciidoc b/docs/reference/watcher/java/deactivate-watch.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/java/deactivate-watch.asciidoc rename to docs/reference/watcher/java/deactivate-watch.asciidoc diff --git a/x-pack/docs/en/watcher/java/delete-watch.asciidoc b/docs/reference/watcher/java/delete-watch.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/java/delete-watch.asciidoc rename to docs/reference/watcher/java/delete-watch.asciidoc diff --git a/x-pack/docs/en/watcher/java/execute-watch.asciidoc b/docs/reference/watcher/java/execute-watch.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/java/execute-watch.asciidoc rename to docs/reference/watcher/java/execute-watch.asciidoc diff --git a/x-pack/docs/en/watcher/java/get-watch.asciidoc b/docs/reference/watcher/java/get-watch.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/java/get-watch.asciidoc rename to docs/reference/watcher/java/get-watch.asciidoc diff --git a/x-pack/docs/en/watcher/java/put-watch.asciidoc b/docs/reference/watcher/java/put-watch.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/java/put-watch.asciidoc rename to docs/reference/watcher/java/put-watch.asciidoc diff --git a/x-pack/docs/en/watcher/java/service.asciidoc b/docs/reference/watcher/java/service.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/java/service.asciidoc rename to docs/reference/watcher/java/service.asciidoc diff --git a/x-pack/docs/en/watcher/java/stats.asciidoc b/docs/reference/watcher/java/stats.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/java/stats.asciidoc rename to docs/reference/watcher/java/stats.asciidoc diff --git a/x-pack/docs/en/watcher/limitations.asciidoc b/docs/reference/watcher/limitations.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/limitations.asciidoc rename to docs/reference/watcher/limitations.asciidoc diff --git a/x-pack/docs/en/watcher/managing-watches.asciidoc b/docs/reference/watcher/managing-watches.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/managing-watches.asciidoc rename to docs/reference/watcher/managing-watches.asciidoc diff --git a/x-pack/docs/en/watcher/transform.asciidoc b/docs/reference/watcher/transform.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/transform.asciidoc rename to docs/reference/watcher/transform.asciidoc diff --git a/x-pack/docs/en/watcher/transform/chain.asciidoc b/docs/reference/watcher/transform/chain.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/transform/chain.asciidoc rename to docs/reference/watcher/transform/chain.asciidoc diff --git a/x-pack/docs/en/watcher/transform/script.asciidoc b/docs/reference/watcher/transform/script.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/transform/script.asciidoc rename to docs/reference/watcher/transform/script.asciidoc diff --git a/x-pack/docs/en/watcher/transform/search.asciidoc b/docs/reference/watcher/transform/search.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/transform/search.asciidoc rename to docs/reference/watcher/transform/search.asciidoc diff --git a/x-pack/docs/en/watcher/trigger.asciidoc b/docs/reference/watcher/trigger.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/trigger.asciidoc rename to docs/reference/watcher/trigger.asciidoc diff --git a/x-pack/docs/en/watcher/trigger/schedule.asciidoc b/docs/reference/watcher/trigger/schedule.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/trigger/schedule.asciidoc rename to docs/reference/watcher/trigger/schedule.asciidoc diff --git a/x-pack/docs/en/watcher/trigger/schedule/cron.asciidoc b/docs/reference/watcher/trigger/schedule/cron.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/trigger/schedule/cron.asciidoc rename to docs/reference/watcher/trigger/schedule/cron.asciidoc diff --git a/x-pack/docs/en/watcher/trigger/schedule/daily.asciidoc b/docs/reference/watcher/trigger/schedule/daily.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/trigger/schedule/daily.asciidoc rename to docs/reference/watcher/trigger/schedule/daily.asciidoc diff --git a/x-pack/docs/en/watcher/trigger/schedule/hourly.asciidoc b/docs/reference/watcher/trigger/schedule/hourly.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/trigger/schedule/hourly.asciidoc rename to docs/reference/watcher/trigger/schedule/hourly.asciidoc diff --git a/x-pack/docs/en/watcher/trigger/schedule/interval.asciidoc b/docs/reference/watcher/trigger/schedule/interval.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/trigger/schedule/interval.asciidoc rename to docs/reference/watcher/trigger/schedule/interval.asciidoc diff --git a/x-pack/docs/en/watcher/trigger/schedule/monthly.asciidoc b/docs/reference/watcher/trigger/schedule/monthly.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/trigger/schedule/monthly.asciidoc rename to docs/reference/watcher/trigger/schedule/monthly.asciidoc diff --git a/x-pack/docs/en/watcher/trigger/schedule/weekly.asciidoc b/docs/reference/watcher/trigger/schedule/weekly.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/trigger/schedule/weekly.asciidoc rename to docs/reference/watcher/trigger/schedule/weekly.asciidoc diff --git a/x-pack/docs/en/watcher/trigger/schedule/yearly.asciidoc b/docs/reference/watcher/trigger/schedule/yearly.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/trigger/schedule/yearly.asciidoc rename to docs/reference/watcher/trigger/schedule/yearly.asciidoc diff --git a/x-pack/docs/en/watcher/troubleshooting.asciidoc b/docs/reference/watcher/troubleshooting.asciidoc similarity index 100% rename from x-pack/docs/en/watcher/troubleshooting.asciidoc rename to docs/reference/watcher/troubleshooting.asciidoc diff --git a/docs/src/yamlRestTest/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java b/docs/src/yamlRestTest/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java index 3754ca0339989..36e3a2cb5e2a9 100644 --- a/docs/src/yamlRestTest/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java +++ b/docs/src/yamlRestTest/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java @@ -19,8 +19,11 @@ import org.elasticsearch.Version; import org.elasticsearch.client.Request; import org.elasticsearch.client.RestClient; +import org.elasticsearch.common.settings.SecureString; +import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.CollectionUtils; import org.elasticsearch.common.util.Maps; +import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.core.Strings; import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.yaml.ClientYamlDocsTestClient; @@ -46,10 +49,12 @@ import java.util.List; import java.util.Map; +import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg; +import static org.hamcrest.Matchers.is; //The default 20 minutes timeout isn't always enough, but Darwin CI hosts are incredibly slow... @TimeoutSuite(millis = 40 * TimeUnits.MINUTE) @@ -222,6 +227,74 @@ protected boolean isXpackInfoTest() { return testName != null && (testName.contains("/info/") || testName.contains("\\info\\")); } + private static final String USER_TOKEN = basicAuthHeaderValue("test_admin", new SecureString("x-pack-test-password".toCharArray())); + + /** + * All tests run as a an administrative user but use es-shield-runas-user to become a less privileged user. + */ + @Override + protected Settings restClientSettings() { + return Settings.builder().put(ThreadContext.PREFIX + ".Authorization", USER_TOKEN).build(); + } + + /** + * Deletes users after every test just in case any test adds any. + */ + @After + public void deleteUsers() throws Exception { + ClientYamlTestResponse response = getAdminExecutionContext().callApi("security.get_user", emptyMap(), emptyList(), emptyMap()); + @SuppressWarnings("unchecked") + Map users = (Map) response.getBody(); + for (String user : users.keySet()) { + Map metadataMap = (Map) ((Map) users.get(user)).get("metadata"); + Boolean reserved = metadataMap == null ? null : (Boolean) metadataMap.get("_reserved"); + if (reserved == null || reserved == false) { + logger.warn("Deleting leftover user {}", user); + getAdminExecutionContext().callApi("security.delete_user", singletonMap("username", user), emptyList(), emptyMap()); + } + } + } + + /** + * Re-enables watcher after every test just in case any test disables it. + */ + @After + public void reenableWatcher() throws Exception { + if (isWatcherTest()) { + assertBusy(() -> { + ClientYamlTestResponse response = getAdminExecutionContext().callApi("watcher.stats", emptyMap(), emptyList(), emptyMap()); + String state = (String) response.evaluate("stats.0.watcher_state"); + + switch (state) { + case "stopped": + ClientYamlTestResponse startResponse = getAdminExecutionContext().callApi( + "watcher.start", + emptyMap(), + emptyList(), + emptyMap() + ); + boolean isAcknowledged = (boolean) startResponse.evaluate("acknowledged"); + assertThat(isAcknowledged, is(true)); + throw new AssertionError("waiting until stopped state reached started state"); + case "stopping": + throw new AssertionError("waiting until stopping state reached stopped state to start again"); + case "starting": + throw new AssertionError("waiting until starting state reached started state"); + case "started": + // all good here, we are done + break; + default: + throw new AssertionError("unknown state[" + state + "]"); + } + }); + } + } + + protected boolean isWatcherTest() { + String testName = getTestName(); + return testName != null && (testName.contains("watcher/") || testName.contains("watcher\\")); + } + /** * Compares the results of running two analyzers against many random * strings. The goal is to figure out if two anlayzers are "the same" by diff --git a/x-pack/docs/build.gradle b/x-pack/docs/build.gradle index 7ae1ec73d32c2..f3624c2b41894 100644 --- a/x-pack/docs/build.gradle +++ b/x-pack/docs/build.gradle @@ -5,16 +5,16 @@ apply plugin: 'elasticsearch.rest-resources' * `// CONSOLE` and `// TESTRESPONSE` but have yet to be converted. Try and * only remove entries from this list. When it is empty we'll remove it * entirely and have a party! There will be cake and everything.... */ -tasks.named("buildRestTests").configure { - expectedUnconvertedCandidates = [ - 'en/rest-api/watcher/put-watch.asciidoc', - 'en/security/authentication/user-cache.asciidoc', - 'en/security/authorization/run-as-privilege.asciidoc', - 'en/security/ccs-clients-integrations/http.asciidoc', - 'en/rest-api/watcher/stats.asciidoc', - 'en/watcher/example-watches/watching-time-series-data.asciidoc', - ] -} +// tasks.named("buildRestTests").configure { +// expectedUnconvertedCandidates = [ +// 'en/rest-api/watcher/put-watch.asciidoc', +// 'en/security/authentication/user-cache.asciidoc', +// 'en/security/authorization/run-as-privilege.asciidoc', +// 'en/security/ccs-clients-integrations/http.asciidoc', +// 'en/rest-api/watcher/stats.asciidoc', +// 'en/watcher/example-watches/watching-time-series-data.asciidoc', +// ] +// } dependencies { yamlRestTestImplementation(testArtifact(project(xpackModule('core'))))