From cdc220027348adfdc635a9fe3ca195ed2b808697 Mon Sep 17 00:00:00 2001 From: Christopher Moyer <35463610+chri2547@users.noreply.github.com> Date: Tue, 6 Sep 2022 16:47:47 -0500 Subject: [PATCH] restructures aws marketplace docs (#54810) --- .../administration/enterprise-licensing/_index.md | 1 + .../activate-aws-marketplace-license/_index.md | 1 + .../index.md} | 5 +++-- .../index.md} | 9 +++++---- .../index.md} | 11 ++++++----- .../index.md} | 1 + .../index.md} | 1 + 7 files changed, 18 insertions(+), 11 deletions(-) rename docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/{activate-license-on-ecs.md => activate-license-on-ecs/index.md} (95%) rename docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/{activate-license-on-eks.md => activate-license-on-eks/index.md} (91%) rename docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/{activate-license-on-instance-outside-aws.md => activate-license-on-instance-outside-aws/index.md} (89%) rename docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/{manage-license-in-aws-marketplace.md => manage-license-in-aws-marketplace/index.md} (91%) rename docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/{transfer-ge-license.md => transfer-ge-license/index.md} (92%) diff --git a/docs/sources/administration/enterprise-licensing/_index.md b/docs/sources/administration/enterprise-licensing/_index.md index 1287693d5c0..67f7fdaf8c3 100644 --- a/docs/sources/administration/enterprise-licensing/_index.md +++ b/docs/sources/administration/enterprise-licensing/_index.md @@ -7,6 +7,7 @@ aliases: - /docs/grafana/latest/enterprise/license/license-expiration/ - /docs/grafana/latest/enterprise/license-restrictions/ - /docs/grafana/latest/enterprise/license/license-restrictions/ + - /docs/grafana/latest/administration/enterprise-licensing/ description: Activate and manage a Grafana Enterprise license keywords: - grafana diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/_index.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/_index.md index 51522c763de..6646f468cc8 100644 --- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/_index.md +++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/_index.md @@ -3,6 +3,7 @@ aliases: - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/ - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/about-ge-license-through-aws/ - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/about-ge-license-through-aws/ + - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/ description: Activate your Grafana Enterprise license purchased in AWS Marketplace to take advantage of Grafana Enterprise observability features keywords: - grafana diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md similarity index 95% rename from docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs.md rename to docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md index c2b51c9b07b..6b2bdd9f31a 100644 --- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs.md +++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md @@ -2,6 +2,7 @@ aliases: - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-ecs/ - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-ecs/ + - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/ description: Activate a Grafana Enterprise license from AWS Marketplace on ECS keywords: - grafana @@ -44,7 +45,7 @@ Grafana requires that you configure a database to hold dashboards, users, and ot ### Before you begin - Ensure that you have a supported Grafana database available. - - For a list of supported databases, refer to [Supported databases]({{< relref "../../../setup-grafana/installation/#supported-databases" >}}). + - For a list of supported databases, refer to [Supported databases]({{< relref "../../../../setup-grafana/installation/#supported-databases" >}}). - For information about creating a database, refer to [Creating an Amazon RDS DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CreateDBInstance.html). - Review the information required to connect to the RDS DB instance. For more information, refer to [Connecting to an Amazon RDS DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_CommonTasks.Connect.html). @@ -52,7 +53,7 @@ To configure Grafana for high availability: 1. In AWS ECS, use environment variables to update the `database` parameters. - For a list of database parameters, refer to [Configuration]({{< relref "../../../setup-grafana/configure-grafana/#database" >}}). + For a list of database parameters, refer to [Configuration]({{< relref "../../../../setup-grafana/configure-grafana/#database" >}}). 1. Create a revision of the task definition for the ECS Task that runs Grafana Enterprise. diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md similarity index 91% rename from docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks.md rename to docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md index e42882af795..65900e4295a 100644 --- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks.md +++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md @@ -2,6 +2,7 @@ aliases: - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-eks/ - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-eks/ + - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/ description: Activate a Grafana Enterprise license from AWS Marketplace on EKS keywords: - grafana @@ -46,7 +47,7 @@ Grafana requires that you configure a database to hold dashboards, users, and ot ### Before you begin - Ensure that you have a supported Grafana database available. - - For a list of supported databases, refer to [Supported databases]({{< relref "../../../setup-grafana/installation/#supported-databases" >}}). + - For a list of supported databases, refer to [Supported databases]({{< relref "../../../../setup-grafana/installation/#supported-databases" >}}). - For information about creating a database, refer to [Creating an Amazon RDS DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CreateDBInstance.html). - Review the information required to connect to the RDS DB instance. For more information, refer to [Connecting to an Amazon RDS DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_CommonTasks.Connect.html). @@ -78,7 +79,7 @@ To configure Grafana for high availability, choose **one** of the following opti value: [database password] ``` -For more information on Grafana High Availability setup, refer to [Set up Grafana for high availability]({{< relref "../../../setup-grafana/set-up-for-high-availability/" >}}). +For more information on Grafana High Availability setup, refer to [Set up Grafana for high availability]({{< relref "../../../../setup-grafana/set-up-for-high-availability/" >}}). ## Task 3: Configure Grafana Enterprise to validate its license with AWS @@ -95,7 +96,7 @@ In this task, you configure Grafana Enterprise to validate the license with AWS For more information about AWS license permissions, refer to [Actions, resources, and condition keys for AWS License Manager](https://docs.aws.amazon.com/service-authorization/latest/reference/list_awslicensemanager.html). -1. Choose **one** of the following options to update the [license_validation_type]({{< relref "../../../setup-grafana/configure-grafana/enterprise-configuration/#license_validation_type" >}}) configuration to `aws`: +1. Choose **one** of the following options to update the [license_validation_type]({{< relref "../../../../setup-grafana/configure-grafana/enterprise-configuration/#license_validation_type" >}}) configuration to `aws`: - **Option 1:** Use `kubectl edit configmap grafana` to edit `grafana.ini` add the following section to the configuration: @@ -121,6 +122,6 @@ To restart Grafana on a Kubernetes cluster, 1. After you update the service, navigate to your Grafana instance, sign in with Grafana Admin credentials, and navigate to the Statistics and Licensing page to validate that your license is active. -For more information about restarting Grafana, refer to [Restart Grafana]({{< relref "../../../setup-grafana/restart-grafana/" >}}). +For more information about restarting Grafana, refer to [Restart Grafana]({{< relref "../../../../setup-grafana/restart-grafana/" >}}). > If you experience issues when you update the EKS cluster, refer to [Amazon EKS troubleshooting](https://docs.aws.amazon.com/eks/latest/userguide/troubleshooting.html). diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/index.md similarity index 89% rename from docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws.md rename to docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/index.md index 12696216169..e8a95877534 100644 --- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws.md +++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/index.md @@ -2,6 +2,7 @@ aliases: - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/ - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/ + - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/ description: Activate a Grafana Enterprise license from AWS on an instance deployed outside of AWS keywords: @@ -31,9 +32,9 @@ To activate a Grafana Enterprise license from AWS on a Grafana Enterprise instan To install Grafana, refer to the documentation specific to your implementation. -- [Install Grafana]({{< relref "../../../setup-grafana/installation/" >}}). -- [Run Grafana Docker image]({{< relref "../../../setup-grafana/installation/docker/" >}}). -- [Deploy Grafana on Kubernetes]({{< relref "../../../setup-grafana/installation/kubernetes/#deploy-grafana-enterprise-on-kubernetes" >}}). +- [Install Grafana]({{< relref "../../../../setup-grafana/installation/" >}}). +- [Run Grafana Docker image]({{< relref "../../../../setup-grafana/installation/docker/" >}}). +- [Deploy Grafana on Kubernetes]({{< relref "../../../../setup-grafana/installation/kubernetes/#deploy-grafana-enterprise-on-kubernetes" >}}). ## Task 2: Create an AWS IAM user with access to your Grafana Enterprise license @@ -106,7 +107,7 @@ To retrieve your license, Grafana Enterprise requires access to your AWS account In this task you configure Grafana Enterprise to validate the license with AWS instead of Grafana Labs. -Choose one of the following options to update the [license_validation_type]({{< relref "../../../setup-grafana/configure-grafana/enterprise-configuration/#license_validation_type" >}}) configuration to `aws`: +Choose one of the following options to update the [license_validation_type]({{< relref "../../../../setup-grafana/configure-grafana/enterprise-configuration/#license_validation_type" >}}) configuration to `aws`: - **Option 1:** In the `[enterprise]` section of the grafana.ini configuration file, add `license_validation_type=aws`. @@ -127,4 +128,4 @@ Choose one of the following options to update the [license_validation_type]({{< To activate Grafana Enterprise features, start (or restart) Grafana. -For information about restarting Grafana, refer to [Restart Grafana]({{< relref "../../../setup-grafana/restart-grafana/" >}}). +For information about restarting Grafana, refer to [Restart Grafana]({{< relref "../../../../setup-grafana/restart-grafana/" >}}). diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md similarity index 91% rename from docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace.md rename to docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md index 7dc43828a97..9e1849a44b0 100644 --- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace.md +++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md @@ -2,6 +2,7 @@ aliases: - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/manage-license-in-aws-marketplace/ - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/manage-license-in-aws-marketplace/ + - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/ description: Manage your Grafana Enterprise license in AWS Marketplace keywords: - grafana diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license/index.md similarity index 92% rename from docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license.md rename to docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license/index.md index a7ec2bfc919..338b4849a8c 100644 --- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license.md +++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license/index.md @@ -2,6 +2,7 @@ aliases: - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/transfer-ge-license/ - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/transfer-ge-license/ + - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license/ description: Transfer your AWS Marketplace Grafana Enterprise license keywords: - grafana