diff --git a/docs/sources/auth/generic-oauth.md b/docs/sources/auth/generic-oauth.md index df43e80fb2e..efb4464bd01 100644 --- a/docs/sources/auth/generic-oauth.md +++ b/docs/sources/auth/generic-oauth.md @@ -206,9 +206,10 @@ allowed_organizations = allow_sign_up = true client_id = client_secret = .my.centrify.com/OAuth2/Authorize/ token_url = https://.my.centrify.com/OAuth2/Token/ + api_url = https://.my.centrify.com/OAuth2/UserInfo/ ``` ## Set up OAuth2 with non-compliant providers diff --git a/docs/sources/features/datasources/_index.md b/docs/sources/features/datasources/_index.md index d1c0382bbaa..efe85d28033 100644 --- a/docs/sources/features/datasources/_index.md +++ b/docs/sources/features/datasources/_index.md @@ -21,20 +21,20 @@ The query language and capabilities of each data source are obviously very diffe The following data sources are officially supported: -* [Graphite]({{< relref "graphite.md" >}}) -* [Prometheus]({{< relref "prometheus.md" >}}) -* [InfluxDB]({{< relref "influxdb.md" >}}) -* [Elasticsearch]({{< relref "elasticsearch.md" >}}) -* [Google Stackdriver]({{< relref "stackdriver.md" >}}) * [AWS CloudWatch]({{< relref "cloudwatch.md" >}}) * [Azure Monitor]({{< relref "azuremonitor.md" >}}) +* [Elasticsearch]({{< relref "elasticsearch.md" >}}) +* [Google Stackdriver]({{< relref "stackdriver.md" >}}) +* [Graphite]({{< relref "graphite.md" >}}) +* [InfluxDB]({{< relref "influxdb.md" >}}) * [Loki]({{< relref "loki.md" >}}) -* [MySQL]({{< relref "mysql.md" >}}) -* [PostgreSQL]({{< relref "postgres.md" >}}) * [Microsoft SQL Server (MSSQL)]({{< relref "mssql.md" >}}) -* [OpenTSDB]({{< relref "opentsdb.md" >}}) -* [Testdata]({{< relref "testdata.md" >}}) * [Mixed]({{< relref "mixed.md" >}}) +* [MySQL]({{< relref "mysql.md" >}}) +* [OpenTSDB]({{< relref "opentsdb.md" >}}) +* [PostgreSQL]({{< relref "postgres.md" >}}) +* [Prometheus]({{< relref "prometheus.md" >}}) +* [Testdata]({{< relref "testdata.md" >}}) ## Data source plugins diff --git a/docs/sources/guides/getting_started.md b/docs/sources/guides/getting_started.md index 043a8e63158..f410cff231a 100644 --- a/docs/sources/guides/getting_started.md +++ b/docs/sources/guides/getting_started.md @@ -47,7 +47,7 @@ After you have configuered your data source you are ready to save and test. Watch the 10min [beginners guide to building dashboards](https://www.youtube.com/watch?v=sKNZMtoSHN4&index=7&list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2) to get a quick intro to setting up Dashboards and Panels. -## Basic Concepts +## Basic concepts Read the [Basic Concepts](/guides/basic_concepts) document to get a crash course in key Grafana concepts. @@ -67,7 +67,7 @@ The image above shows you the top header for a Dashboard. 6. Save dashboard: The current Dashboard will be saved with the current Dashboard name. 7. Settings: Manage Dashboard settings and features such as Templating and Annotations. -## Dashboards, Panels, the building blocks of Grafana... +## Dashboards, panels, the building blocks of Grafana... Dashboards are at the core of what Grafana is all about. Dashboards are composed of individual Panels arranged on a grid. Grafana ships with a variety of Panels. Grafana makes it easy to construct the right queries, and customize the display properties so that you can create the perfect Dashboard for your need. Each Panel can interact with data from any configured Grafana Data Source (currently Graphite, Prometheus, Elasticsearch, InfluxDB, OpenTSDB, MySQL, PostgreSQL, Microsoft SQL Server and AWS Cloudwatch). The [Basic Concepts](/guides/basic_concepts) guide explores these key ideas in detail.