Procházet zdrojové kódy

Updated configuration docs

Torkel Ödegaard před 10 roky
rodič
revize
2d2462fe63

+ 14 - 0
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.
 
+<hr>
+
 <hr>
 ## [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.
+
 

+ 2 - 2
docs/sources/versions.html_fragment

@@ -1,2 +1,2 @@
-<li><a class='version' href='/v2.0'>Version v2.0</a></li>
-<li><a class='version' href='/v1.9'>Version v1.9</a></li>
+<li><a class='version' href='/v2.0'>Version v2.0 (beta)</a></li>
+<li><a class='version' href='/v1.9'>Version v1.9 (stable)</a></li>