From dd00621fb62c3615d191d3c038bf9d226c31952d Mon Sep 17 00:00:00 2001 From: Ed Howard Date: Sat, 16 Oct 2021 20:59:51 -0400 Subject: [PATCH 1/9] Updates related to testenv attributes in asciidoc files --- .../gradle/internal/doc/RestTestsFromSnippetsTask.groovy | 1 + docs/reference/ilm/index-rollover.asciidoc | 2 +- docs/reference/ingest/enrich.asciidoc | 1 - docs/reference/snapshot-restore/register-repository.asciidoc | 2 +- docs/reference/sql/endpoints/odbc.asciidoc | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/doc/RestTestsFromSnippetsTask.groovy b/build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/doc/RestTestsFromSnippetsTask.groovy index 4b789b2c85e8c..09dec5cf4d2b1 100644 --- a/build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/doc/RestTestsFromSnippetsTask.groovy +++ b/build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/doc/RestTestsFromSnippetsTask.groovy @@ -268,6 +268,7 @@ class RestTestsFromSnippetsTask extends SnippetsTask { switch (test.testEnv) { case 'basic': case 'gold': + case 'gold+': case 'platinum': case 'enterprise': current.println(" - xpack") diff --git a/docs/reference/ilm/index-rollover.asciidoc b/docs/reference/ilm/index-rollover.asciidoc index 85e8c87ec902d..46a4f72cce0d6 100644 --- a/docs/reference/ilm/index-rollover.asciidoc +++ b/docs/reference/ilm/index-rollover.asciidoc @@ -1,4 +1,5 @@ [[index-rollover]] +[testenv="basic"] === Rollover When indexing time series data like logs or metrics, you can't write to a single index indefinitely. @@ -40,7 +41,6 @@ On each rollover, the new index becomes the write index. [discrete] [role="xpack"] -[testenv="basic"] [[ilm-automatic-rollover]] === Automatic rollover diff --git a/docs/reference/ingest/enrich.asciidoc b/docs/reference/ingest/enrich.asciidoc index 051d4bebcd6d1..303857aea9d86 100644 --- a/docs/reference/ingest/enrich.asciidoc +++ b/docs/reference/ingest/enrich.asciidoc @@ -80,7 +80,6 @@ properties to help streamline them: -- [role="xpack"] -[testenv="basic"] [[enrich-setup]] === Set up an enrich processor diff --git a/docs/reference/snapshot-restore/register-repository.asciidoc b/docs/reference/snapshot-restore/register-repository.asciidoc index c3616a0bc0a7e..320939c3aa8c6 100644 --- a/docs/reference/snapshot-restore/register-repository.asciidoc +++ b/docs/reference/snapshot-restore/register-repository.asciidoc @@ -1,4 +1,5 @@ [[snapshots-register-repository]] +[testenv="basic"] == Register a snapshot repository ++++ Register a repository @@ -192,7 +193,6 @@ be registered in the `path.repo` setting. [discrete] [role="xpack"] -[testenv="basic"] [[snapshots-source-only-repository]] === Source only repository diff --git a/docs/reference/sql/endpoints/odbc.asciidoc b/docs/reference/sql/endpoints/odbc.asciidoc index a7c583ce17543..ba26443217c67 100644 --- a/docs/reference/sql/endpoints/odbc.asciidoc +++ b/docs/reference/sql/endpoints/odbc.asciidoc @@ -1,7 +1,7 @@ :odbc: {es-sql} ODBC Driver +[testenv="platinum"] [role="xpack"] -[testenv="platinum"] [[sql-odbc]] == SQL ODBC From d6a348b183cc6b9da3a645fea3f060a0d905a066 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Wed, 27 Oct 2021 12:19:31 -0400 Subject: [PATCH 2/9] Remove gold+ testenv values --- .../gradle/internal/doc/RestTestsFromSnippetsTask.groovy | 1 - docs/reference/commands/certgen.asciidoc | 2 -- docs/reference/commands/certutil.asciidoc | 2 -- docs/reference/commands/croneval.asciidoc | 2 -- docs/reference/commands/saml-metadata.asciidoc | 2 -- docs/reference/commands/service-tokens-command.asciidoc | 2 -- docs/reference/commands/setup-passwords.asciidoc | 2 -- docs/reference/commands/syskeygen.asciidoc | 2 -- docs/reference/commands/users-command.asciidoc | 2 -- docs/reference/ilm/index-rollover.asciidoc | 1 - docs/reference/ingest/enrich.asciidoc | 3 --- docs/reference/snapshot-restore/register-repository.asciidoc | 2 -- docs/reference/sql/endpoints/odbc.asciidoc | 1 - .../docs/en/security/auditing/auditing-search-queries.asciidoc | 2 -- 14 files changed, 26 deletions(-) diff --git a/build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/doc/RestTestsFromSnippetsTask.groovy b/build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/doc/RestTestsFromSnippetsTask.groovy index 09dec5cf4d2b1..4b789b2c85e8c 100644 --- a/build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/doc/RestTestsFromSnippetsTask.groovy +++ b/build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/doc/RestTestsFromSnippetsTask.groovy @@ -268,7 +268,6 @@ class RestTestsFromSnippetsTask extends SnippetsTask { switch (test.testEnv) { case 'basic': case 'gold': - case 'gold+': case 'platinum': case 'enterprise': current.println(" - xpack") diff --git a/docs/reference/commands/certgen.asciidoc b/docs/reference/commands/certgen.asciidoc index 78f5901312d07..98e47f5a624e7 100644 --- a/docs/reference/commands/certgen.asciidoc +++ b/docs/reference/commands/certgen.asciidoc @@ -1,5 +1,3 @@ -[role="xpack"] -[testenv="gold+"] [[certgen]] == elasticsearch-certgen diff --git a/docs/reference/commands/certutil.asciidoc b/docs/reference/commands/certutil.asciidoc index caf39e1f062c9..83798f4fc8fda 100644 --- a/docs/reference/commands/certutil.asciidoc +++ b/docs/reference/commands/certutil.asciidoc @@ -1,5 +1,3 @@ -[role="xpack"] -[testenv="gold+"] [[certutil]] == elasticsearch-certutil diff --git a/docs/reference/commands/croneval.asciidoc b/docs/reference/commands/croneval.asciidoc index f066444e3bbd6..5f2a22cd4cb9c 100644 --- a/docs/reference/commands/croneval.asciidoc +++ b/docs/reference/commands/croneval.asciidoc @@ -1,5 +1,3 @@ -[role="xpack"] -[testenv="gold+"] [[elasticsearch-croneval]] == elasticsearch-croneval diff --git a/docs/reference/commands/saml-metadata.asciidoc b/docs/reference/commands/saml-metadata.asciidoc index 9c6f2133be949..8c145f541d930 100644 --- a/docs/reference/commands/saml-metadata.asciidoc +++ b/docs/reference/commands/saml-metadata.asciidoc @@ -1,5 +1,3 @@ -[role="xpack"] -[testenv="gold+"] [[saml-metadata]] == elasticsearch-saml-metadata diff --git a/docs/reference/commands/service-tokens-command.asciidoc b/docs/reference/commands/service-tokens-command.asciidoc index 7959a1149c808..2ddf8391ee986 100644 --- a/docs/reference/commands/service-tokens-command.asciidoc +++ b/docs/reference/commands/service-tokens-command.asciidoc @@ -1,5 +1,3 @@ -[role="xpack"] -[testenv="gold+"] [[service-tokens-command]] == elasticsearch-service-tokens diff --git a/docs/reference/commands/setup-passwords.asciidoc b/docs/reference/commands/setup-passwords.asciidoc index 7a443b492d470..928f324764c16 100644 --- a/docs/reference/commands/setup-passwords.asciidoc +++ b/docs/reference/commands/setup-passwords.asciidoc @@ -1,5 +1,3 @@ -[role="xpack"] -[testenv="gold+"] [[setup-passwords]] == elasticsearch-setup-passwords diff --git a/docs/reference/commands/syskeygen.asciidoc b/docs/reference/commands/syskeygen.asciidoc index a42bb3b6bd7c6..cac0f5edaee4d 100644 --- a/docs/reference/commands/syskeygen.asciidoc +++ b/docs/reference/commands/syskeygen.asciidoc @@ -1,5 +1,3 @@ -[role="xpack"] -[testenv="gold+"] [[syskeygen]] == elasticsearch-syskeygen diff --git a/docs/reference/commands/users-command.asciidoc b/docs/reference/commands/users-command.asciidoc index dca812db06ffd..79cb708686ad3 100644 --- a/docs/reference/commands/users-command.asciidoc +++ b/docs/reference/commands/users-command.asciidoc @@ -1,5 +1,3 @@ -[role="xpack"] -[testenv="gold+"] [[users-command]] == elasticsearch-users diff --git a/docs/reference/ilm/index-rollover.asciidoc b/docs/reference/ilm/index-rollover.asciidoc index 46a4f72cce0d6..46cde70d3f69b 100644 --- a/docs/reference/ilm/index-rollover.asciidoc +++ b/docs/reference/ilm/index-rollover.asciidoc @@ -40,7 +40,6 @@ This is the active index that handles all write requests. On each rollover, the new index becomes the write index. [discrete] -[role="xpack"] [[ilm-automatic-rollover]] === Automatic rollover diff --git a/docs/reference/ingest/enrich.asciidoc b/docs/reference/ingest/enrich.asciidoc index 303857aea9d86..ca7854ca96ef3 100644 --- a/docs/reference/ingest/enrich.asciidoc +++ b/docs/reference/ingest/enrich.asciidoc @@ -1,5 +1,3 @@ -[role="xpack"] -[testenv="basic"] [[ingest-enriching-data]] == Enrich your data @@ -79,7 +77,6 @@ properties to help streamline them: * They are <> for fast retrieval. -- -[role="xpack"] [[enrich-setup]] === Set up an enrich processor diff --git a/docs/reference/snapshot-restore/register-repository.asciidoc b/docs/reference/snapshot-restore/register-repository.asciidoc index 320939c3aa8c6..34d92980cf3fd 100644 --- a/docs/reference/snapshot-restore/register-repository.asciidoc +++ b/docs/reference/snapshot-restore/register-repository.asciidoc @@ -1,5 +1,4 @@ [[snapshots-register-repository]] -[testenv="basic"] == Register a snapshot repository ++++ Register a repository @@ -192,7 +191,6 @@ NOTE: URLs using the `ftp`, `http`, `https`, or `jar` protocols do not need to be registered in the `path.repo` setting. [discrete] -[role="xpack"] [[snapshots-source-only-repository]] === Source only repository diff --git a/docs/reference/sql/endpoints/odbc.asciidoc b/docs/reference/sql/endpoints/odbc.asciidoc index ba26443217c67..7134cf37729fc 100644 --- a/docs/reference/sql/endpoints/odbc.asciidoc +++ b/docs/reference/sql/endpoints/odbc.asciidoc @@ -1,7 +1,6 @@ :odbc: {es-sql} ODBC Driver [testenv="platinum"] -[role="xpack"] [[sql-odbc]] == SQL ODBC diff --git a/x-pack/docs/en/security/auditing/auditing-search-queries.asciidoc b/x-pack/docs/en/security/auditing/auditing-search-queries.asciidoc index 3e0e7314a9176..259a3a37b8bb1 100644 --- a/x-pack/docs/en/security/auditing/auditing-search-queries.asciidoc +++ b/x-pack/docs/en/security/auditing/auditing-search-queries.asciidoc @@ -1,5 +1,3 @@ -[role="xpack"] -[testenv="gold+"] [[auditing-search-queries]] === Auditing search queries From 926748014e256dcbc5a1e45a3fe503572633d163 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Wed, 27 Oct 2021 12:21:21 -0400 Subject: [PATCH 3/9] Remove unneeded testenv="basic" attribute --- docs/reference/ilm/index-rollover.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/reference/ilm/index-rollover.asciidoc b/docs/reference/ilm/index-rollover.asciidoc index 46cde70d3f69b..9c69ad968041c 100644 --- a/docs/reference/ilm/index-rollover.asciidoc +++ b/docs/reference/ilm/index-rollover.asciidoc @@ -1,5 +1,4 @@ [[index-rollover]] -[testenv="basic"] === Rollover When indexing time series data like logs or metrics, you can't write to a single index indefinitely. From 8bd3f4333f252f3455d176c3ad0c94b1c2e50071 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Wed, 27 Oct 2021 12:21:54 -0400 Subject: [PATCH 4/9] Fix whitespace --- docs/reference/sql/endpoints/odbc.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/reference/sql/endpoints/odbc.asciidoc b/docs/reference/sql/endpoints/odbc.asciidoc index 7134cf37729fc..33a7f4d0cfb47 100644 --- a/docs/reference/sql/endpoints/odbc.asciidoc +++ b/docs/reference/sql/endpoints/odbc.asciidoc @@ -1,6 +1,5 @@ :odbc: {es-sql} ODBC Driver [testenv="platinum"] - [[sql-odbc]] == SQL ODBC From 7e6352dde6af9e580c2682bdfd94e4c505d489d0 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Wed, 27 Oct 2021 12:22:19 -0400 Subject: [PATCH 5/9] Fix whitespace --- docs/reference/sql/endpoints/odbc.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/reference/sql/endpoints/odbc.asciidoc b/docs/reference/sql/endpoints/odbc.asciidoc index 33a7f4d0cfb47..d628749224fb1 100644 --- a/docs/reference/sql/endpoints/odbc.asciidoc +++ b/docs/reference/sql/endpoints/odbc.asciidoc @@ -1,4 +1,5 @@ :odbc: {es-sql} ODBC Driver + [testenv="platinum"] [[sql-odbc]] == SQL ODBC From 5eac53b780ca5fab6966b4b10dfa7e52a0577bb6 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Wed, 27 Oct 2021 12:25:08 -0400 Subject: [PATCH 6/9] Revert "Remove unneeded testenv="basic" attribute" This reverts commit 926748014e256dcbc5a1e45a3fe503572633d163. --- docs/reference/ilm/index-rollover.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/reference/ilm/index-rollover.asciidoc b/docs/reference/ilm/index-rollover.asciidoc index 9c69ad968041c..46cde70d3f69b 100644 --- a/docs/reference/ilm/index-rollover.asciidoc +++ b/docs/reference/ilm/index-rollover.asciidoc @@ -1,4 +1,5 @@ [[index-rollover]] +[testenv="basic"] === Rollover When indexing time series data like logs or metrics, you can't write to a single index indefinitely. From d3ca56d591fe3b76601fa633933b89b248e62218 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Wed, 27 Oct 2021 12:26:48 -0400 Subject: [PATCH 7/9] Re-add basic attribute --- docs/reference/snapshot-restore/register-repository.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/reference/snapshot-restore/register-repository.asciidoc b/docs/reference/snapshot-restore/register-repository.asciidoc index 34d92980cf3fd..ce40973e625de 100644 --- a/docs/reference/snapshot-restore/register-repository.asciidoc +++ b/docs/reference/snapshot-restore/register-repository.asciidoc @@ -1,4 +1,5 @@ [[snapshots-register-repository]] +[testenv="basic"] == Register a snapshot repository ++++ Register a repository From d63629b15ab07f87bca4d0002bc79278ca224483 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Wed, 27 Oct 2021 12:28:05 -0400 Subject: [PATCH 8/9] Re-add basic attribute --- docs/reference/ingest/enrich.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/reference/ingest/enrich.asciidoc b/docs/reference/ingest/enrich.asciidoc index ca7854ca96ef3..ce0bbd941d385 100644 --- a/docs/reference/ingest/enrich.asciidoc +++ b/docs/reference/ingest/enrich.asciidoc @@ -1,4 +1,5 @@ [[ingest-enriching-data]] +[testenv="basic"] == Enrich your data You can use the <> to add data from your From 747b1d48208e264e22971c4cdaaecc5c32b0d394 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Wed, 27 Oct 2021 12:29:19 -0400 Subject: [PATCH 9/9] Cleanup --- docs/reference/ingest/enrich.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/ingest/enrich.asciidoc b/docs/reference/ingest/enrich.asciidoc index ce0bbd941d385..8bbfe7086723f 100644 --- a/docs/reference/ingest/enrich.asciidoc +++ b/docs/reference/ingest/enrich.asciidoc @@ -1,5 +1,5 @@ -[[ingest-enriching-data]] [testenv="basic"] +[[ingest-enriching-data]] == Enrich your data You can use the <> to add data from your