From 2d2462fe63eca6c9d8169daf66d741d6d19d429c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 30 Mar 2015 09:22:58 +0200 Subject: [PATCH] Updated configuration docs --- docs/sources/installation/configuration.md | 14 ++++++++++++++ docs/sources/versions.html_fragment | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index a442ee58dc3..d89ed953fa4 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -59,6 +59,8 @@ google or github oauth authentication (for the callback url to be correct). The path to the directory where the frontend files (html & js & css). Default to `public` which is why the Grafana binary needs to be executed with working directory set to the installation path. +
+
## [database] @@ -205,4 +207,16 @@ Set to true if you host Grafana behind HTTPs only. Defaults to `false`. ### session_life_time How long sessions lasts in seconds. Defaults to `86400` (24 hours). +## [analytics] + +### reporting-enabled +When enabled Grafana will send anonymous usage statistics to stats.grafana.org. +No ip addresses are being tracked, only simple counters to track running instances, +versions, dashboard & error counts. It is very helpful to us, please leave this +enabled. Counters are sent every 24 hours. + +### google_analytics_ua_id +If you want to track Grafana usage via Google analytics specify *your* Univeral Analytics ID +here. By defualt this feature is disabled. + diff --git a/docs/sources/versions.html_fragment b/docs/sources/versions.html_fragment index 00ee000a0f0..83e8ba8a4bb 100644 --- a/docs/sources/versions.html_fragment +++ b/docs/sources/versions.html_fragment @@ -1,2 +1,2 @@ -
  • Version v2.0
    • -
  • Version v1.9
    • +
  • Version v2.0 (beta)
    • +
  • Version v1.9 (stable)