Updated install docs

docs/sources/installation/debian.md

@@ -13,11 +13,10 @@ Description | Download
 .deb for Debian-based Linux | [grafana_2.0.0-beta3_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.0.0-beta3_amd64.deb)
 
 ## Install
-To install the package
 
     $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.0.0-beta3_amd64.deb
     $ sudo apt-get install -y adduser libfontconfig
-    $ sudo dpkg -i grafana_latest_amd64.deb
+    $ sudo dpkg -i grafana_2.0.0-beta3_amd64.deb
 
 ## Package details
 
@@ -35,12 +34,19 @@ To install the package
 - This will start the grafana-server process as the `grafana` user (created during package install)
 - Default http port is `3000`, and default user is admin/admin
 
-## Start the server (via systemd)
+To configure Grafana server to start at boot time:
+
+    $ sudo update-rc.d grafana-server defaults 95 10
 
+## Start the server (via systemd)
     $ systemctl daemon-reload
     $ systemctl start grafana-server
     $ systemctl status grafana-server
 
+Enable the systemd service (so grafana starts at boot)
+
+    sudo systemctl enable grafana-server.service
+
 ## Environment file
 
 The systemd service file and init.d script both use the file located at `/etc/default/grafana-server` for
@@ -49,7 +55,12 @@ variables.
 
 ### Logging
 
-By default grafana will log to ``/var/log/grafana`
+By default grafana will log to `/var/log/grafana`
+
+### Database
+
+The default configuration specifies a sqlite3 database located at `/var/lib/grafana/grafana.db`. Please backup
+this database before upgrades. You can also use mysql or postgres as the Grafana database.
 
 ## Configuration
 

docs/sources/installation/index.md

@@ -15,20 +15,17 @@ to build one your self, read [build from source](../project/building_from_source
 - [Installing on Mac OS X](mac.md)
 - [Installing on Windows](windows.md)
 - [Installing on Docker](docker.md)
-
-
-# Dependencies
-There are no dependencies with the default configuration. You can switch from a sqlite3 database to mysql or postgres but
-that is optional. For small to medium setups sqlite3 should suffice.
-
-## Install using provisioning
-If you prefer to install grafana via Puppet, Ansible, Docker or Chef. [This page](provisioning) has compiled a
-list of repositories for different provisioning systems
+- [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](provisioning.md)
 
 ## Configuration
 
 The backend web server has a number of configuration options. Go the [Configuration](configuration) page for details
 on all those options.
 
+## Adding data sources
+
+- [Graphite](../datasources/graphite.md)
+- [InfluxDB](../datasources/influxdb.md)
+- [OpenTSDB](../datasources/opentsdb.md)
 
 

docs/sources/installation/mac.md

@@ -0,0 +1,12 @@
+---
+page_title: Installing on Mac OS X
+page_description: Grafana Installation guide for Mac OS X
+page_keywords: grafana, installation, mac, osx, guide
+---
+
+# Installing on Mac
+
+There are currently no binary build for Mac. But read the [build from source](../project/building_from_source)
+page for instructions on how to build it yourself.
+
+

docs/sources/installation/rpm.md

@@ -17,7 +17,7 @@ To install the package
 
     $ wget https://grafanarel.s3.amazonaws.com/builds/grafana-2.0.0_beta3-1.x86_64.rpm
     $ sudo yum install initscripts fontconfig
-    $ sudo rpm -Uvh grafana-latest-1.x86_64.rpm
+    $ sudo rpm -Uvh grafana-2.0.0_beta3-1.x86_64.rpm
 
 ## Package details
 
@@ -34,7 +34,7 @@ To install the package
 - Start grafana by `sudo service grafana-server start`
 - This will start the grafana-server process as the `grafana` user (created during package install)
 - Default http port is `3000`, and default user is admin/admin
-- To configure grafana server to start at boot time: `sudo `
+- To configure grafana server to start at boot time: `sudo /sbin/chkconfig --add grafana-server`
 
 ## Start the server (via systemd)
 
@@ -42,6 +42,10 @@ To install the package
     $ systemctl start grafana-server
     $ systemctl status grafana-server
 
+### Enable the systemd service (so grafana starts at boot)
+
+    sudo systemctl enable grafana-server.service
+
 ## Environment file
 
 The systemd service file and init.d script both use the file located at `/etc/sysconfig/grafana-server` for
@@ -50,7 +54,12 @@ variables.
 
 ### Logging
 
-By default grafana will log to /var/log/grafana
+By default grafana will log to `/var/log/grafana`
+
+### Database
+
+The default configuration specifies a sqlite3 database located at `/var/lib/grafana/grafana.db`. Please backup
+this database before upgrades. You can also use mysql or postgres as the Grafana database.
 
 ## Configuration
 

docs/sources/installation/windows.md

@@ -0,0 +1,12 @@
+---
+page_title: Installing on Windows
+page_description: Grafana Installation guide for Windows
+page_keywords: grafana, installation, windows guide
+---
+
+# Installing on Windows
+
+There are currently no binary build for Windows. But read the [build from source](../project/building_from_source)
+page for instructions on how to build it yourself.
+
+