From 01c04c9f36efb8f75f24079af4d97bf36df08587 Mon Sep 17 00:00:00 2001 From: lcawl Date: Thu, 7 Nov 2024 11:45:03 -0800 Subject: [PATCH 1/4] Add shared serverless attributes --- shared/attributes.asciidoc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 8753c2d9eda5..8755f3468deb 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -185,6 +185,7 @@ Elastic Cloud :es-serverless: Elasticsearch on serverless :serverless-short: serverless :serverless-docs: https://docs.elastic.co/serverless +:es3: Elasticsearch Serverless :cloud: https://www.elastic.co/guide/en/cloud/current :ess-utm-params: ?page=docs&placement=docs-body :ess-baymax: {ess-utm-params} @@ -259,6 +260,20 @@ Kibana app and UI names :data-sources-caps: Data Views :data-source-cap: Data view :data-sources-cap: Data views +:project-settings: Project settings +:manage-app: Management +:index-manage-app: Index Management +:data-views-app: Data Views +:rules-app: Rules +:saved-objects-app: Saved Objects +:tags-app: Tags +:api-keys-app: API keys +:transforms-app: Transforms +:connectors-app: Connectors +:files-app: Files +:reports-app: Reports +:maps-app: Maps +:alerts-app: Alerts // Use data-source-cap instead of Data-source // Use data-sources-cap instead of Data-sources // Use data-sources-caps instead of Data-Sources From 0a08b6fcaf5df78900bef6a51c20532d082d79dc Mon Sep 17 00:00:00 2001 From: lcawl Date: Thu, 7 Nov 2024 11:51:38 -0800 Subject: [PATCH 2/4] Add customrole feature flag --- shared/versions/stack/master.asciidoc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index c4815f808e02..a55cf5eb69ff 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -71,4 +71,10 @@ Synthetics //// API URLs //// -:api-kibana: https://www.elastic.co/docs/api/doc/kibana \ No newline at end of file +:api-kibana: https://www.elastic.co/docs/api/doc/kibana + +//// +Feature flags +//// + +:serverlessCustomRoles: true \ No newline at end of file From a2d2024a4cd6ed2d1b7c5b9a70fd562a69a546ee Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 7 Nov 2024 15:07:00 -0600 Subject: [PATCH 3/4] add serverless-specific solution attributes --- shared/attributes.asciidoc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 8755f3468deb..90a5e788999c 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -181,11 +181,13 @@ Elastic Cloud :ess: Elasticsearch Service :ece: Elastic Cloud Enterprise :eck: Elastic Cloud on Kubernetes -:serverless-full: Elastic Cloud serverless -:es-serverless: Elasticsearch on serverless -:serverless-short: serverless -:serverless-docs: https://docs.elastic.co/serverless -:es3: Elasticsearch Serverless +:serverless-full: Elastic Cloud Serverless +:serverless-short: Serverless +:es-serverless: Elasticsearch Serverless +:es3: Elasticsearch Serverless +:obs-serverless: Elastic Observability Serverless +:sec-serverless: Elastic Security Serverless +:serverless-docs: https://docs.elastic.co/serverless :cloud: https://www.elastic.co/guide/en/cloud/current :ess-utm-params: ?page=docs&placement=docs-body :ess-baymax: {ess-utm-params} From 81dfb6ebf6bf98860dbe7686a19866f80f9c9d3c Mon Sep 17 00:00:00 2001 From: lcawl Date: Thu, 7 Nov 2024 15:43:12 -0800 Subject: [PATCH 4/4] Sync es3 and es-serverless --- shared/attributes.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 90a5e788999c..f3b1925adb82 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -184,7 +184,7 @@ Elastic Cloud :serverless-full: Elastic Cloud Serverless :serverless-short: Serverless :es-serverless: Elasticsearch Serverless -:es3: Elasticsearch Serverless +:es3: {es-serverless} :obs-serverless: Elastic Observability Serverless :sec-serverless: Elastic Security Serverless :serverless-docs: https://docs.elastic.co/serverless