Browse Source

docs: minor updates, more work to do

Torkel Ödegaard 7 years ago
parent
commit
4f91087d9a

+ 0 - 13
docs/sources/administration/authentication/ldap-sync-grafana-ee.md

@@ -1,13 +0,0 @@
-+++
-title = "LDAP Sync with Grafana EE"
-description = "LDAP Sync with Grafana EE Guide "
-keywords = ["grafana", "configuration", "documentation", "ldap", "enterprise"]
-type = "docs"
-[menu.docs]
-name = "LDAP Sync with Grafana EE"
-identifier = "ldap-sync"
-parent = "authentication"
-weight = 2
-+++
-
-# LDAP Sync with Grafana EE

+ 0 - 2
docs/sources/administration/permissions.md

@@ -52,8 +52,6 @@ This admin flag makes a user a `Super Admin`. This means they can access the `Se
 
 
 ### Dashboard & Folder Permissions
 ### Dashboard & Folder Permissions
 
 
-> Introduced in Grafana v5.0
-
 {{< docs-imagebox img="/img/docs/v50/folder_permissions.png" max-width="500px" class="docs-image--right" >}}
 {{< docs-imagebox img="/img/docs/v50/folder_permissions.png" max-width="500px" class="docs-image--right" >}}
 
 
 For dashboards and dashboard folders there is a **Permissions** page that make it possible to
 For dashboards and dashboard folders there is a **Permissions** page that make it possible to

+ 1 - 1
docs/sources/administration/authentication/anonymous-auth.md → docs/sources/auth/anonymous.md

@@ -4,7 +4,7 @@ description = "Anonymous authentication "
 keywords = ["grafana", "configuration", "documentation", "anonymous"]
 keywords = ["grafana", "configuration", "documentation", "anonymous"]
 type = "docs"
 type = "docs"
 [menu.docs]
 [menu.docs]
-name = "Anonymous Auth"
+name = "Anonymous"
 identifier = "anonymous-auth"
 identifier = "anonymous-auth"
 parent = "authentication"
 parent = "authentication"
 weight = 4
 weight = 4

+ 0 - 0
docs/sources/administration/authentication/auth-proxy.md → docs/sources/auth/auth-proxy.md


+ 2 - 2
docs/sources/administration/authentication/index.md → docs/sources/auth/index.md

@@ -6,5 +6,5 @@ type = "docs"
 name = "Authentication"
 name = "Authentication"
 identifier = "authentication"
 identifier = "authentication"
 parent = "admin"
 parent = "admin"
-weight = 1
-+++
+weight = 3
++++

+ 0 - 0
docs/sources/administration/authentication/ldap.md → docs/sources/auth/ldap.md


+ 0 - 0
docs/sources/administration/authentication/oauth.md → docs/sources/auth/oauth.md


+ 16 - 6
docs/sources/administration/authentication/overview.md → docs/sources/auth/overview.md

@@ -9,20 +9,30 @@ parent = "authentication"
 weight = 1
 weight = 1
 +++
 +++
 
 
-## [auth]
+# Authentication
 
 
-### disable_login_form
+Grafana provides many ways to authenticate users. By default it will use local users & passwords stored in the Grafana
+database.
+
+## Settings
+
+Via the [server ini config file]({{< relref "installation/debian.md" >}}) you can setup many different authentication methods. Auth settings
+are documented below.
+
+### [auth]
+
+#### disable_login_form
 
 
 Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false.
 Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false.
 
 
-### disable_signout_menu
+#### disable_signout_menu
 
 
 Set to true to disable the signout link in the side menu. useful if you use auth.proxy, defaults to false.
 Set to true to disable the signout link in the side menu. useful if you use auth.proxy, defaults to false.
 
 
 <hr>
 <hr>
 
 
-## [auth.basic]
-### enabled
+### [auth.basic]
+#### enabled
 When enabled is `true` (default) the http api will accept basic authentication.
 When enabled is `true` (default) the http api will accept basic authentication.
 
 
-<hr>
+<hr>