From ef9766eb963bcd028f564fc362d3247d61cca9e3 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 21 Jun 2016 16:29:17 +0200
Subject: [PATCH] docs(3.1): initial post about whats new in 3.1

---
 conf/defaults.ini                          |  2 +-
 docs/sources/guides/whats-new-in-v3-1.md   | 68 ++++++++++++++++++++++
 docs/sources/installation/configuration.md | 13 +++++
 3 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 docs/sources/guides/whats-new-in-v3-1.md

diff --git a/conf/defaults.ini b/conf/defaults.ini
index ea70f095ee1..c087fcf1ab1 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -251,7 +251,7 @@ templates_pattern = emails/*.html
 # Use space to separate multiple modes, e.g. "console file"
 mode = console, file
 
-# Either "trace", "debug", "info", "warn", "error", "critical", default is "info"
+# Either "debug", "info", "warn", "error", "critical", default is "info"
 level = info
 
 # For "console" mode only
diff --git a/docs/sources/guides/whats-new-in-v3-1.md b/docs/sources/guides/whats-new-in-v3-1.md
new file mode 100644
index 00000000000..9613cc1682c
--- /dev/null
+++ b/docs/sources/guides/whats-new-in-v3-1.md
@@ -0,0 +1,68 @@
+---
+page_title: What's New in Grafana v3.1
+page_description: What's new in Grafana v3.1
+page_keywords: grafana, new, changes, features, documentation
+---
+
+# What's New in Grafana v3.1
+
+## Dashboard Export & Import
+
+The export feature is now accessed from the share menu.
+
+<img src="/img/v31/export_menu.png">
+
+Dashboards exported from Grafana 3.1 are now more portable and easier for others to import than before.
+The export process extracts information data source types used by panels and adds these to a new `inputs`
+section in the dashboard json. So when you or another person tries to import the dashboard they will be asked to
+select data source and optional metrix prefix options.
+
+<img src="/img/v31/import_step1.png">
+
+The above screenshot shows the new import modal that gives you 3 options for how to import a dashboard.
+One notable new addition here is the ability to import directly from Dashboards shared on [Grafana.net](https://grafana.net).
+
+The next step in the import process:
+
+<img src="/img/v31/import_step2.png">
+
+Here you can change the name of the dashboard and also pick what data sources you want the dashboard to use. The above screenshot
+shows a CollectD dashboard for Graphite that requires a metric prefix be specified.
+
+## Discover Dashboards
+
+On [Grafana.net](https://grafana.net) you can now browse & search for dashboards. We have already added a few but
+more are being uploaded every day. To import a dashboard just copy the dashboard url and head back to Grafana,
+then Dashboard Search -> Import -> Paste Grafana.net Dashboard URL.
+
+<img src="/img/v31/gnet_dashboards_list.png">
+
+## Constant template variables
+
+We added a new template variable named constant that makes it easier to share and export dashboard that have custom prefixes.
+
+## Dashboard Urls
+Having current time range and template variable value always sync with the URL makes it possible to always copy your current
+Grafana url to share with a colleague without having to use the Share modal.
+
+## Internal metrics
+
+Do you want metrics about viewing metrics? Ofc you do! In this release we added support for sending metrics about Grafana to graphite.
+You can configure interval and server in the config file.
+
+## Logging
+
+Switched logging framework to log15 to enable key value per logging and filtering based on different log levels.
+Its now possible to configure different log levels for different modules.
+
+### Breaking changes
+- **Logging** format have been changed to improve log filtering.
+- **Graphite PNG** Graphite PNG support dropped from Graph panel (use Grafana native PNG instead).
+- **Migration** No longer possible to migrate dashboards from 1.x (Stored in ES or Influx 0.8).
+
+## CHANGELOG
+
+For a detailed list and link to github issues for everything included
+in the 3.1 release please view the
+[CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
+file.
diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index de2055a2ae4..0c2bd7366e7 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -446,6 +446,19 @@ Grafana backend index those json dashboards which will make them appear in regul
 ### path
 The full path to a directory containing your json dashboards.
 
+## [log]
+
+### mode
+Either "console", "file", "syslog". Default is console and  file
+Use space to separate multiple modes, e.g. "console file"
+
+### level
+Either "debug", "info", "warn", "error", "critical", default is "info"
+
+### filter
+optional settings to set different levels for specific loggers.
+Ex `filters = sqlstore:debug`
+
 ## [metrics]
 
 ### enabled