mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
GE issue 1268 (#33049)
* Updated sentence format. * Added new placeholder page for Enterprise License information, added links also adjusted weights. * Created new folder license and moved 4 files to here. * Added aliases. * link fixes and such Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
This commit is contained in:
achatterjee-grafana
GitHub
parent
8edeae416e
commit
79a4a86ee2
@ -9,9 +9,9 @@ weight = 150
|
||||
|
||||
Grafana Enterprise is a commercial edition of Grafana that includes additional features not found in the open source version.
|
||||
|
||||
Building on everything you already know and love about Grafana, Grafana Enterprise includes [exclusive datasource plugins]({{< relref "#enterprise-plugins">}}) and [additional features]({{< relref "#enterprise-features">}}). On top of that you get 24x7x365 support and training from the core Grafana team.
|
||||
Building on everything you already know and love about Grafana open source, Grafana Enterprise includes [exclusive datasource plugins]({{< relref "#enterprise-plugins">}}) and [additional features]({{< relref "#enterprise-features">}}). On top of that you get 24x7x365 support and training from the core Grafana team.
|
||||
|
||||
[Learn more about Grafana Enterprise.](https://grafana.com/enterprise)
|
||||
To learn more about Grafana Enterprise, refer to [our product page.](https://grafana.com/enterprise)
|
||||
|
||||
## Authentication
|
||||
|
||||
|
||||
15
docs/sources/enterprise/license/_index.md
Normal file
15
docs/sources/enterprise/license/_index.md
Normal file
@ -0,0 +1,15 @@
|
||||
+++
|
||||
title = "Grafana Enterprise license"
|
||||
description = "Enterprise license"
|
||||
keywords = ["grafana", "licensing", "enterprise"]
|
||||
weight = 100
|
||||
+++
|
||||
|
||||
# Grafana Enterprise license
|
||||
|
||||
To run Grafana Enterprise, you need a valid license. Contact a Grafana Labs representative](https://grafana.com/contact?about=grafana-enterprise) to obtain the license. For information on how to activate your license, refer to [Activate an Enterprise license]({{< relref "./activate-license.md" >}}).
|
||||
|
||||
See also:
|
||||
|
||||
- [License expiration]({{< relref "./license-expiration.md" >}})
|
||||
- [License restrictions]({{< relref "./license-restrictions.md" >}})
|
||||
@ -2,6 +2,7 @@
|
||||
title = "Activate an Enterprise license"
|
||||
description = "Activate an Enterprise license"
|
||||
keywords = ["grafana", "licensing", "enterprise"]
|
||||
aliases = ["/docs/grafana/latest/enterprise/activate-license"]
|
||||
weight = 100
|
||||
+++
|
||||
|
||||
@ -13,10 +14,10 @@ Follow these steps to activate your Grafana Enterprise license:
|
||||
|
||||
To download your Grafana Enterprise license:
|
||||
|
||||
1. Log in to your [Grafana Cloud Account](https://grafana.com).
|
||||
1. Go to your **Org Profile**.
|
||||
1. Go to the section for Grafana Enterprise licenses in the side menu.
|
||||
1. At the bottom of the license details page there is **Download Token** link that will download the *license.jwt* file containing your license to your computer.
|
||||
1. Log in to your [Grafana Cloud Account](https://grafana.com).
|
||||
1. Go to your **Org Profile**.
|
||||
1. Go to the section for Grafana Enterprise licenses in the side menu.
|
||||
1. At the bottom of the license details page there is **Download Token** link that will download the *license.jwt* file containing your license to your computer.
|
||||
|
||||
## Step 2. Add your license to a Grafana instance
|
||||
|
||||
@ -24,13 +25,12 @@ There are three different ways to add the license to a Grafana instance:
|
||||
|
||||
### Upload the license file through the Grafana Server Administrator page
|
||||
|
||||
This is the preferred option for single instance installations of
|
||||
Grafana Enterprise.
|
||||
This is the preferred option for single instance installations of Grafana Enterprise.
|
||||
|
||||
1. Sign in as a Grafana server admin.
|
||||
1. Navigate to **Server Admin > Upgrade** within Grafana.
|
||||
1. Click **Upload license token file**.
|
||||
1. Select your license file, and upload it.
|
||||
1. Sign in as a Grafana server admin.
|
||||
1. Navigate to **Server Admin > Upgrade** within Grafana.
|
||||
1. Click **Upload license token file**.
|
||||
1. Select your license file, and upload it.
|
||||
|
||||
### Place the license.jwt file in Grafana's data folder
|
||||
|
||||
@ -60,9 +60,9 @@ There are three different ways to add the license to a Grafana instance:
|
||||
|
||||
## Step 3. Ensure that the license file's root URL matches the root_url configuration option
|
||||
|
||||
Update the [`root_url`]({{< relref "../administration/configuration/#root-url" >}}) in your configuration. It should be the URL that users type in their browsers to access the frontend, not the node hostname(s).
|
||||
Update the [`root_url`]({{< relref "../../administration/configuration/#root-url" >}}) in your configuration. It should be the URL that users type in their browsers to access the frontend, not the node hostname(s).
|
||||
|
||||
This is important, because as part of the validation checks at startup, Grafana compares the license URL to the [`root_url`]({{< relref "../administration/configuration/#root-url" >}}) in your configuration.
|
||||
This is important, because as part of the validation checks at startup, Grafana compares the license URL to the [`root_url`]({{< relref "../../administration/configuration/#root-url" >}}) in your configuration.
|
||||
|
||||
In your configuration file:
|
||||
|
||||
@ -79,7 +79,4 @@ GF_SERVER_ROOT_URL=https://grafana.blah.com/
|
||||
|
||||
## Step 4. Restart Grafana
|
||||
|
||||
To finalize the installation of Grafana Enterprise, restart Grafana to
|
||||
enable all Grafana Enterprise features. Refer to [restart Grafana]({{< relref "../installation/restart-grafana.md" >}})
|
||||
topic for more information.
|
||||
|
||||
To finalize the installation of Grafana Enterprise, restart Grafana to enable all Grafana Enterprise features. Refer to [restart Grafana]({{< relref "../../installation/restart-grafana.md" >}}) for more information.
|
||||
@ -2,7 +2,8 @@
|
||||
title = "License expiration"
|
||||
description = ""
|
||||
keywords = ["grafana", "licensing"]
|
||||
weight = 120
|
||||
aliases = ["/docs/grafana/latest/enterprise/license-expiration"]
|
||||
weight = 200
|
||||
+++
|
||||
|
||||
# License expiration
|
||||
@ -13,7 +14,7 @@ If your license has expired, most of Grafana keeps working as normal. Some enter
|
||||
|
||||
## Update your license
|
||||
|
||||
1. Locate your current `license.jwt` file. In a standard installation it is stored inside Grafana's data directory, which on a typical Linux installation is in `/var/lib/grafana/data`. This location might be overridden in the ini file [Configuration]({{< relref "../administration/configuration.md" >}}).
|
||||
1. Locate your current `license.jwt` file. In a standard installation it is stored inside the Grafana data directory, which on a typical Linux installation is in `/var/lib/grafana/data`. This location might be overridden in the ini file [Configuration]({{< relref "../../administration/configuration.md" >}}).
|
||||
|
||||
```ini
|
||||
[enterprise]
|
||||
@ -25,7 +26,7 @@ If your license has expired, most of Grafana keeps working as normal. Some enter
|
||||
2. Log in to your [Grafana Cloud Account](https://grafana.com/login) and make sure you're in the correct organization in the dropdown at the top of the page.
|
||||
3. Under the **Grafana Enterprise** section in the menu bar to the left, choose licenses and download the currently valid license with which you want to run Grafana. If you cannot see a valid license on Grafana.com, please contact your account manager at Grafana Labs to renew your subscription.
|
||||
4. Replace the current `license.jwt`-file with the one you've just downloaded.
|
||||
5. [Restart Grafana]({{< relref "../installation/restart-grafana.md" >}}).
|
||||
5. [Restart Grafana]({{< relref "../../installation/restart-grafana.md" >}}).
|
||||
|
||||
## If your license expires
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
title = "License restrictions"
|
||||
description = "Grafana Enterprise license restrictions"
|
||||
keywords = ["grafana", "licensing", "enterprise"]
|
||||
weight = 110
|
||||
aliases = ["/docs/grafana/latest/enterprise/license-restrictions"]
|
||||
weight = 300
|
||||
+++
|
||||
|
||||
# License restrictions
|
||||
@ -22,7 +23,7 @@ In the context of licensing, each user is classified as either a viewer or an ed
|
||||
- An editor is a user who has permission to edit and save a dashboard. Examples of editors are as follows:
|
||||
- Grafana server administrators.
|
||||
- Users who are assigned an organizational role of Editor or Admin.
|
||||
- Users that have been granted Admin or Edit permissions at the dashboard or folder level. Refer to [Dashboard and folder permissions]({{< relref "../permissions/dashboard-folder-permissions.md" >}}.
|
||||
- Users that have been granted Admin or Edit permissions at the dashboard or folder level. Refer to [Dashboard and folder permissions]({{< relref "../../permissions/dashboard-folder-permissions.md" >}}.
|
||||
- A viewer is a user with the Viewer role, which does not permit the user to save a dashboard.
|
||||
|
||||
Restrictions are applied separately for viewers and editors.
|
||||
@ -37,9 +38,9 @@ Given a limit of three sessions, the longest inactive session is signed out of w
|
||||
|
||||
### Usage billing
|
||||
|
||||
You can request Grafana Labs to turn on usage billing to allow an unlimited number of active users. When usage billing is enabled, Grafana does not enforce active user limits. Instead, we charge for active users above the limit, according to your customer contract.
|
||||
You can request Grafana Labs to turn on usage billing to allow an unlimited number of active users. When usage billing is enabled, Grafana does not enforce active user limits. Instead, we charge for active users above the limit, according to your customer contract.
|
||||
|
||||
Usage billing must be agreed upon with Grafana Labs, and it is only available if Grafana Enterprise is configured to [automatically refresh its license]({{< relref "enterprise-configuration.md#auto_refresh_license" >}}).
|
||||
Usage billing must be agreed upon with Grafana Labs, and it is only available if Grafana Enterprise is configured to [automatically refresh its license]({{< relref "../enterprise-configuration.md#auto_refresh_license" >}}).
|
||||
|
||||
## Expiration date
|
||||
|
||||
@ -21,4 +21,4 @@ This section discusses the hardware and software requirements as well as the pro
|
||||
For upgrade instructions, refer to [Upgrade Grafana]({{< relref "upgrading.md" >}}).
|
||||
To restart Grafana, refer to [Restart Grafana]({{< relref "restart-grafana.md" >}}).
|
||||
|
||||
To install Grafana Enterprise, refer to the instructions for installing Grafana on your system. Then, refer to [Activate an Enterprise license]({{< relref "../enterprise/activate-license.md" >}}).
|
||||
To install Grafana Enterprise, refer to the instructions for installing Grafana on your system. Then, refer to [Activate an Enterprise license]({{< relref "../enterprise/license/activate-license.md" >}}).
|
||||
|
||||
@ -192,7 +192,7 @@ After the number of Viewers or Editors has reached its license limit, only Admin
|
||||
|
||||
Grafana Enterprise license tokens update automatically on a daily basis, which means you no longer need to manually update your license, and the process for adding additional users to a license is smoother than it was before.
|
||||
|
||||
Refer to [Licensing restrictions]({{< relref "../enterprise/license-restrictions.md" >}}) for more information.
|
||||
Refer to [Licensing restrictions]({{< relref "../enterprise/license/license-restrictions.md" >}}) for more information.
|
||||
|
||||
### Export usage insights to Loki
|
||||
|
||||
|
||||
@ -145,7 +145,7 @@ Each Grafana Enterprise user will be limited to three concurrent user sessions.
|
||||
|
||||
A new session is created when you sign in to Grafana from a different device or a different browser. Multiple windows and tabs in the same browser are all part of the same session, so having many Grafana tabs open will not cause any issues.
|
||||
|
||||
For more information on Grafana Enterprise licensing and restrictions, refer to [License restrictions]({{< relref "../enterprise/license-restrictions.md" >}}).
|
||||
For more information on Grafana Enterprise licensing and restrictions, refer to [License restrictions]({{< relref "../enterprise/license/license-restrictions.md" >}}).
|
||||
|
||||
## Breaking changes
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user