Merge pull request #4 from mattttt/trent-docs

added pages, touched up some images and content  in data-sources section

docs/mkdocs.yml

@@ -36,24 +36,25 @@ pages:
 - ['installation/configuration.md', 'Installation', 'Configuration']
 - ['installation/ldap.md', 'Installation', 'LDAP Integration']
 - ['installation/provisioning.md', 'Installation', 'Provisioning']
-- ['installation/performance.md', 'Installation', 'Performance tips']
+- ['installation/performance.md', 'Installation', 'Performance Tips']
 - ['installation/troubleshooting.md', 'Installation', 'Troubleshooting']
 - ['installation/migrating_to2.md', 'Installation', 'Migrating from v1.x to v2.x']
 
-- ['guides/gettingstarted.md', 'User Guides', 'Getting started']
+- ['guides/basic_concepts.md', 'User Guides', 'Basic Concepts']
+- ['guides/gettingstarted.md', 'User Guides', 'Getting Started']
 - ['guides/whats-new-in-v2.md', 'User Guides', "What's New in Grafana v2.0"]
 - ['guides/whats-new-in-v2-1.md', 'User Guides', "What's New in Grafana v2.1"]
 - ['guides/screencasts.md', 'User Guides', 'Screencasts']
 
 - ['reference/graph.md', 'Reference', 'Graph Panel']
 - ['reference/singlestat.md', 'Reference', 'Singlestat Panel']
-- ['reference/dashlist.md', 'Reference', 'Dashboard list Panel']
+- ['reference/dashlist.md', 'Reference', 'Dashboard List Panel']
 - ['reference/sharing.md', 'Reference', 'Sharing']
 - ['reference/annotations.md', 'Reference', 'Annotations']
-- ['reference/timerange.md', 'Reference', 'Time range controls']
+- ['reference/timerange.md', 'Reference', 'Time Range Controls']
 - ['reference/search.md', 'Reference', 'Dashboard Search']
-- ['reference/templating.md', 'Reference', 'Templated dashboards']
-- ['reference/scripting.md', 'Reference', 'Scripted dashboards']
+- ['reference/templating.md', 'Reference', 'Templated Dashboards']
+- ['reference/scripting.md', 'Reference', 'Scripted Dashboards']
 - ['reference/playlist.md', 'Reference', 'Playlist']
 - ['reference/export_import.md', 'Reference', 'Import & Export']
 - ['reference/admin.md', 'Reference', 'Administration']
@@ -65,7 +66,7 @@ pages:
 - ['datasources/opentsdb.md', 'Data Sources', 'OpenTSDB']
 - ['datasources/kairosdb.md', 'Data Sources', 'KairosDB']
 
-- ['project/building_from_source.md', 'Project', 'Building from source']
+- ['project/building_from_source.md', 'Project', 'Building from Source']
 - ['project/cla.md', 'Project', 'Contributor License Agreement']
 
 - ['jsearch.md', '**HIDDEN**']

docs/sources/datasources/graphite.md

@@ -11,13 +11,15 @@ change function parameters and much more. The editor can handle all types of gra
 queries through the use of query references.
 
 ## Adding the data source to Grafana
-Open the side menu by clicking the the Grafana icon in the top header. In the side menu under the `Dashboards` link you
-should find a link named `Data Sources`. If this link is missing in the side menu it means that your current
-user does not have the `Admin` role for the current organization.
+![](/img/v2/add_Graphite.jpg)
 
-![](/img/v2/add_datasource_graphite.png)
+1. Open the side menu by clicking the the Grafana icon in the top header. 
+2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.    
 
-Now click the `Add new` link in the top header.
+    > NOTE: If this link is missing in the side menu it means that your current user does not have the `Admin` role for the current organization.
+
+3. Click the `Add new` link in the top header.
+4. Select `Graphite` from the dropdown. (Graphite is selected by default)
 
 Name | Description
 ------------ | -------------

docs/sources/datasources/influxdb.md

@@ -13,13 +13,15 @@ them as different data sources.
 InfluxDB 0.9 is rapidly evolving and we continue to track its API. InfluxDB 0.8 is no longer maintained by InfluxDB Inc, but we provide support as a convenience to existing users.
 
 ## Adding the data source to Grafana
-Open the side menu by clicking the the Grafana icon in the top header. In the side menu under the `Dashboards` link you
-should find a link named `Data Sources`. If this link is missing in the side menu it means that your current
-user does not have the `Admin` role for the current organization.
+![](/img/v2/add_Influx.jpg)
 
-![](/img/v2/add_datasource_influxdb.png)
+1. Open the side menu by clicking the the Grafana icon in the top header. 
+2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.    
 
-Now click the `Add new` link in the top header.
+    > NOTE: If this link is missing in the side menu it means that your current user does not have the `Admin` role for the current organization.
+
+3. Click the `Add new` link in the top header.
+4. Select `InfluxDB 0.9.x` or `InfluxDB 0.8.x` from the dropdown.
 
 Name | Description
 ------------ | -------------

docs/sources/datasources/kairosdb.md

@@ -8,7 +8,7 @@ page_keywords: grafana, kairosdb, documentation
 Grafana v2.1 brings initial support for KairosDB Datasources. While the process of adding the datasource is similar to adding a Graphite or OpenTSDB datasource type, Kairos DB does have a few different options for building queries.
 
 ## Adding the data source to Grafana
-![](/img/v2/add_kairosDB.jpg)
+![](/img/v2/add_KairosDB.jpg)
 
 1. Open the side menu by clicking the the Grafana icon in the top header. 
 2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.    

docs/sources/datasources/opentsdb.md

@@ -7,7 +7,7 @@ page_keywords: grafana, opentsdb, documentation
 # OpenTSDB Guide
 The newest release of Grafana adds additional functionality when using an OpenTSDB Data source.
 
-![](/img/v2/add_openTSDB.jpg)
+![](/img/v2/add_OpenTSDB.jpg)
 
 1. Open the side menu by clicking the the Grafana icon in the top header. 
 2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.    

docs/sources/guides/basic_concepts.md

-## Basic Concepts
+----
+page_title: Graphite query guide
+page_description: Graphite query guide
+page_keywords: grafana, graphite, metrics, query, documentation
+---
+
+# Basic Concepts
 
 This document is a “bottom up” introduction to basic concepts in Grafana, and can be used as a starting point to get familiar with core features. 
 
-### Data Source
+### ** Data Source **
 Grafana supports many different storage backends for your time series data (Data Source). Each Data Source has a specific Query Editor that is customized for the features and capabilities that the particular Data Source exposes. 
 
 For more details please refer to [Data Sources](/datasources/graphite/)
 
-### Organization
+### ** Organization **
 Grafana supports multiple organizations in order to support a wide variety of deployment models, including using a single Grafana instance to provide service to multiple potentially untrusted Organizations.
 
 In many cases, Grafana will be deployed with a single Organization.
@@ -20,12 +26,12 @@ All Dashboards are owned by a particular Organization.
 
 For more details please refer to [Admin](/reference/admin/)
 
-### User
+### ** User **
 A User is a named account in Grafana. A user can belong to one or more Organizations, and can be assigned different levels of privileges through roles. 
 
 Grafana supports a wide variety of internal and external ways for Users to authenticate themselves.  For more details please refer to [User Auth](/reference/http_api/#users)
 
-### Row
+### ** Row **
 A Row is a logical divider within a Dashboard, and is used to group Panels together.
 
 Rows are always 12 “units” wide. These units are automatically scaled dependent on the horizontal resolution of your browser. You can control the relative width of Panels within a row by setting their own width.
@@ -36,7 +42,7 @@ We utilize a unit abstraction so that Grafana looks great on all screens both sm
 
 Utilize the [Repeating Row functionality](/reference/templating/#utilizing-template-variables-with-repeating-panels-and-repeating-rows) to dynamically create or remove entire Rows (that can be filled with Panels), based on the Template variables selected.
 
-### Panel
+### ** Panel **
 The Panel is the basic visualization building block in Grafana. Each Panel provides a Query Editor (dependent on the Data Source selected in the panel) that allows you to extract the perfect signal to display on the Panel by utilizing the [Query Editor](/datasources/opentsdb/#query-editor)
 
 There are a wide variety of styling and formatting options that each Panel exposes to allow you to create the perfect picture.
@@ -53,7 +59,7 @@ The time range on Panels is normally what is set in the [Dashboard time picker](
 
 Utilize the [Repeating Panel](/reference/templating/#utilizing-template-variables-with-repeating-panels-and-repeating-rows) functionality to dynamically create or remove Panels based on the [Templating Variables](/reference/templating/#utilizing-template-variables-with-repeating-panels-and-repeating-rows) selected.
 
-### Query Editor
+### ** Query Editor **
 The Query Editor exposes capabilities of your Data Source and allows you to query the metrics that it contains. 
 
 Use the Query Editor to build one or more queries (for one or more series) in your time series database. The panel will instantly update allowing you to effectively explore your data in real time and build a perfect query for that particular Panel.
@@ -61,7 +67,7 @@ Use the Query Editor to build one or more queries (for one or more series) in yo
 You can utilize [Template variables]((/reference/templating/#utilizing-template-variables-with-repeating-panels-and-repeating-rows)) in the Query Editor within the queries themselves. This provides a powerful way to explore data dynamically based on the Templating variables selected on the Dashboard.
 Grafana allows you to reference queries in the Query Editor by the row that they’re on. If you add a second query to graph, you can reference the first query simply by typing in #A. This provides an easy and convenient way to build compounded queries.
 
-### Dashboard
+### ** Dashboard **
 The Dashboard is where it all comes together. Dashboards can be thought of as of a set of one or more Panels organized and arranged into one or more Rows.
 
 The time period for the Dashboard can be controlled by the [Dashboard time picker](/reference/timerange/) in the upper right of the Dashboard.