From c1f28802bd298742c621c50f9ab459df06a91594 Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Mon, 3 Aug 2020 11:16:37 +0200 Subject: [PATCH 1/2] Adjust searchable snapshot license --- docs/reference/searchable-snapshots/apis/clear-cache.asciidoc | 2 +- docs/reference/searchable-snapshots/apis/get-stats.asciidoc | 2 +- .../reference/searchable-snapshots/apis/mount-snapshot.asciidoc | 2 +- .../searchable-snapshots/apis/repository-stats.asciidoc | 2 +- .../apis/searchable-snapshots-apis.asciidoc | 2 +- .../main/java/org/elasticsearch/license/XPackLicenseState.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/reference/searchable-snapshots/apis/clear-cache.asciidoc b/docs/reference/searchable-snapshots/apis/clear-cache.asciidoc index 56f4887321837..bd599d9beff38 100644 --- a/docs/reference/searchable-snapshots/apis/clear-cache.asciidoc +++ b/docs/reference/searchable-snapshots/apis/clear-cache.asciidoc @@ -1,5 +1,5 @@ [role="xpack"] -[testenv="platinum"] +[testenv="enterprise"] [[searchable-snapshots-api-clear-cache]] === Clear cache API ++++ diff --git a/docs/reference/searchable-snapshots/apis/get-stats.asciidoc b/docs/reference/searchable-snapshots/apis/get-stats.asciidoc index 5d30d731d17b2..ca2ffa4b99d00 100644 --- a/docs/reference/searchable-snapshots/apis/get-stats.asciidoc +++ b/docs/reference/searchable-snapshots/apis/get-stats.asciidoc @@ -1,5 +1,5 @@ [role="xpack"] -[testenv="platinum"] +[testenv="enterprise"] [[searchable-snapshots-api-stats]] === Searchable snapshot statistics API ++++ diff --git a/docs/reference/searchable-snapshots/apis/mount-snapshot.asciidoc b/docs/reference/searchable-snapshots/apis/mount-snapshot.asciidoc index 0eb6787ff092a..c9f882953d3c0 100644 --- a/docs/reference/searchable-snapshots/apis/mount-snapshot.asciidoc +++ b/docs/reference/searchable-snapshots/apis/mount-snapshot.asciidoc @@ -1,5 +1,5 @@ [role="xpack"] -[testenv="platinum"] +[testenv="enterprise"] [[searchable-snapshots-api-mount-snapshot]] === Mount snapshot API ++++ diff --git a/docs/reference/searchable-snapshots/apis/repository-stats.asciidoc b/docs/reference/searchable-snapshots/apis/repository-stats.asciidoc index ef54b36108c20..a8a3693afa085 100644 --- a/docs/reference/searchable-snapshots/apis/repository-stats.asciidoc +++ b/docs/reference/searchable-snapshots/apis/repository-stats.asciidoc @@ -1,5 +1,5 @@ [role="xpack"] -[testenv="platinum"] +[testenv="enterprise"] [[searchable-snapshots-repository-stats]] === Searchable snapshot repository statistics API ++++ diff --git a/docs/reference/searchable-snapshots/apis/searchable-snapshots-apis.asciidoc b/docs/reference/searchable-snapshots/apis/searchable-snapshots-apis.asciidoc index 6c4f84f70e476..65d82855178c9 100644 --- a/docs/reference/searchable-snapshots/apis/searchable-snapshots-apis.asciidoc +++ b/docs/reference/searchable-snapshots/apis/searchable-snapshots-apis.asciidoc @@ -1,5 +1,5 @@ [role="xpack"] -[testenv="platinum"] +[testenv="enterprise"] [[searchable-snapshots-apis]] == Searchable snapshots APIs diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/XPackLicenseState.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/XPackLicenseState.java index ba4c2dde5369d..753ae5de3b44c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/XPackLicenseState.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/XPackLicenseState.java @@ -98,7 +98,7 @@ public enum Feature { ANALYTICS(OperationMode.MISSING, true), - SEARCHABLE_SNAPSHOTS(OperationMode.PLATINUM, true); + SEARCHABLE_SNAPSHOTS(OperationMode.ENTERPRISE, true); final OperationMode minimumOperationMode; final boolean needsActive; From b4ed74a10c00661221f28144598a18d49190f58f Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Mon, 3 Aug 2020 11:31:01 +0200 Subject: [PATCH 2/2] fix docs runner --- .../elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy index e271ff1a58750..2baf6f2b3b131 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy @@ -266,6 +266,7 @@ class RestTestsFromSnippetsTask extends SnippetsTask { case 'basic': case 'gold': case 'platinum': + case 'enterprise': current.println(" - xpack") break; default: