From d6814587ad731653e5fcebb97c1f67cbb591ab23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 1 Aug 2014 11:34:57 +0200
Subject: [PATCH] Update changelog and config sample

---
 CHANGELOG.md         |  1 +
 src/config.sample.js | 66 +++++++++++++++++++++++++++++++++++---------
 2 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c41f7bb135e..e2062f6d811 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - [Issue #610](https://github.com/grafana/grafana/issues/610). InfluxDB: Support for InfluxdB v0.8 list series response schemea (series typeahead)
 - [Issue #525](https://github.com/grafana/grafana/issues/525). InfluxDB: Enhanced series aliasing (legend names) with pattern replacements
 - [Issue #266](https://github.com/grafana/grafana/issues/266). Graphite: New option cacheTimeout to override graphite default memcache timeout
+- [Issue #344](https://github.com/grafana/grafana/issues/344). Graphite: Annotations can now be fetched from non default datasources
 - [Issue #606](https://github.com/grafana/grafana/issues/606). General: New global option in config.js to specify admin password (useful to hinder users from accidentally make changes)
 - [Issue #201](https://github.com/grafana/grafana/issues/201). Annotations: Elasticsearch datasource support for events
 - [Issue #631](https://github.com/grafana/grafana/issues/631). Search: max_results config.js option & scroll in search results (To show more or all dashboards)
diff --git a/src/config.sample.js b/src/config.sample.js
index 386d431270b..9bce1540fa4 100644
--- a/src/config.sample.js
+++ b/src/config.sample.js
@@ -9,31 +9,71 @@ function (Settings) {
 
   return new Settings({
 
-    // datasources
-    // Delete the ones you do not want, you can add multiple of the same type
-    // grafanaDB: true marks the datasource for use as dashboard storage (only supported by elasticsearch and influxdb datasources)
+    /* Data sources
+    * ========================================================
+    * Datasources are used to fetch metrics, annotations, and serve as dashboard storage
+    *  - You can have multiple of the same type.
+    *  - grafanaDB: true    marks it for use for dashboard storage
+    *  - default: true      marks the datasource as the default metric source (if you have multiple)
+    *  - basic authentication: use url syntax http://username:password@domain:port
+    */
+
+    // InfluxDB example setup (the InfluxDB databases specified need to exist)
+    /*
     datasources: {
-      graphite: {
-        type: 'graphite',
-        url: "http://my.graphite.server.com:8080",
-        default: true
-      },
       influxdb: {
         type: 'influxdb',
         url: "http://my_influxdb_server:8086/db/database_name",
         username: 'admin',
-        password: 'admin'
+        password: 'admin',
+      },
+      grafana: {
+        type: 'influxdb',
+        url: "http://my_influxdb_server:8086/db/grafana",
+        username: 'admin',
+        password: 'admin',
+        grafanaDB: true
+      },
+    },
+    */
+
+    // Graphite & Elasticsearch example setup
+    /*
+    datasources: {
+      graphite: {
+        type: 'graphite',
+        url: "http://my.graphite.server.com:8080",
       },
-      // elasticsearch, used for storing and loading dashboards, annotations
-      // For Basic authentication use: http://username:password@domain.com:9200
       elasticsearch: {
         type: 'elasticsearch',
-        url: "http://"+window.location.hostname+":9200",
-        index: 'grafana-dash',  // index for storing dashboards
+        url: "http://my.elastic.server.com:9200",
+        index: 'grafana-dash',
         grafanaDB: true,
       }
     },
+    */
 
+    // OpenTSDB & Elasticsearch example setup
+    /*
+    datasources: {
+      opentsdb: {
+        type: 'opentsdb',
+        url: "http://opentsdb.server:4242",
+      },
+      elasticsearch: {
+        type: 'elasticsearch',
+        url: "http://my.elastic.server.com:9200",
+        index: 'grafana-dash',
+        grafanaDB: true,
+      }
+    },
+    */
+
+    /* Global configuration options
+    * ========================================================
+    */
+
+    // specify the limit for dashboard search results
     search: {
       max_results: 20
     },