From 4b348fa4a7a708f38a287362ad2ea89f4e6d120f Mon Sep 17 00:00:00 2001 From: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Date: Wed, 21 Jul 2021 16:01:13 -0400 Subject: [PATCH] Added Pro and Advanced (#37073) --- docs/sources/auth/ldap.md | 2 +- docs/sources/auth/saml.md | 2 +- docs/sources/auth/team-sync.md | 2 +- docs/sources/enterprise/reporting.md | 2 +- docs/sources/enterprise/team-sync.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/sources/auth/ldap.md b/docs/sources/auth/ldap.md index 6a27a768827..9aabb28809c 100644 --- a/docs/sources/auth/ldap.md +++ b/docs/sources/auth/ldap.md @@ -11,7 +11,7 @@ weight = 300 The LDAP integration in Grafana allows your Grafana users to login with their LDAP credentials. You can also specify mappings between LDAP group memberships and Grafana Organization user roles. -> [Enhanced LDAP authentication]({{< relref "../enterprise/enhanced_ldap.md" >}}) is available in [Grafana Cloud](https://grafana.com/docs/grafana-cloud/) and [Grafana Enterprise]({{< relref "../enterprise" >}}). +> [Enhanced LDAP authentication]({{< relref "../enterprise/enhanced_ldap.md" >}}) is available in [Grafana Cloud Pro and Advanced](https://grafana.com/docs/grafana-cloud/) and in [Grafana Enterprise]({{< relref "../enterprise" >}}). ## Supported LDAP Servers diff --git a/docs/sources/auth/saml.md b/docs/sources/auth/saml.md index a257440d5df..923715756a5 100644 --- a/docs/sources/auth/saml.md +++ b/docs/sources/auth/saml.md @@ -10,4 +10,4 @@ weight = 1100 The SAML authentication integration allows your Grafana users to log in by using an external SAML Identity Provider (IdP). To enable this, Grafana becomes a Service Provider (SP) in the authentication flow, interacting with the IdP to exchange user information. -> SAML authentication integration is available in Grafana Cloud and in Enterprise v6.3 or later. For more information, refer to [SAML authentication]({{< relref "../enterprise/saml.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}). +> SAML authentication integration is available in Grafana Cloud Pro and Advanced and in Grafana Enterprise. For more information, refer to [SAML authentication]({{< relref "../enterprise/saml.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}). diff --git a/docs/sources/auth/team-sync.md b/docs/sources/auth/team-sync.md index 3468812370c..e717420b014 100644 --- a/docs/sources/auth/team-sync.md +++ b/docs/sources/auth/team-sync.md @@ -19,4 +19,4 @@ This mechanism allows Grafana to remove an existing synchronized user from a tea
-> Team Sync is available in Grafana Enterprise Cloud and Grafana Enterprise. For more information, refer to [Team sync]({{< relref "../enterprise/team-sync.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}). +> Team Sync is available in Grafana Enterprise Cloud Pro and Advanced and in Grafana Enterprise. For more information, refer to [Team sync]({{< relref "../enterprise/team-sync.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}). diff --git a/docs/sources/enterprise/reporting.md b/docs/sources/enterprise/reporting.md index 67afaedfa8b..563ab008325 100644 --- a/docs/sources/enterprise/reporting.md +++ b/docs/sources/enterprise/reporting.md @@ -8,7 +8,7 @@ weight = 800 # Reporting -Reporting allows you to automatically generate PDFs from any of your dashboards and have Grafana email them to interested parties on a schedule. This is available in Grafana Cloud and in Grafana Enterprise. +Reporting allows you to automatically generate PDFs from any of your dashboards and have Grafana email them to interested parties on a schedule. This is available in Grafana Cloud Pro and Advanced and in Grafana Enterprise. > If you have [Fine-grained access Control]({{< relref "../enterprise/access-control/_index.md" >}}) enabled, for some actions you would need to have relevant permissions. Refer to specific guides to understand what permissions are required. diff --git a/docs/sources/enterprise/team-sync.md b/docs/sources/enterprise/team-sync.md index 1628c732ec6..f719d636e10 100644 --- a/docs/sources/enterprise/team-sync.md +++ b/docs/sources/enterprise/team-sync.md @@ -12,7 +12,7 @@ weight = 1000 Team sync lets you set up synchronization between your auth providers teams and teams in Grafana. This enables LDAP, OAuth, or SAML users who are members of certain teams or groups to automatically be added or removed as members of certain teams in Grafana. -> Only available in Grafana Enterprise. +> Available in Grafana Cloud Pro and Advanced and in Grafana Enterprise. Grafana keeps track of all synchronized users in teams, and you can see which users have been synchronized in the team members list, see `LDAP` label in screenshot. This mechanism allows Grafana to remove an existing synchronized user from a team when its group membership changes. This mechanism also enables you to manually add a user as member of a team, and it will not be removed when the user signs in. This gives you flexibility to combine LDAP group memberships and Grafana team memberships.