diff --git a/CHANGELOG.md b/CHANGELOG.md index 1adad34d820..95b2faa1411 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - [Issue #581](https://github.com/grafana/grafana/issues/581). InfluxDB: Add continuous query in series results (series typeahead). - [Issue #584](https://github.com/grafana/grafana/issues/584). InfluxDB: Support for alias & alias patterns when using raw query mode - [Issue #394](https://github.com/grafana/grafana/issues/394). InfluxDB: Annotation support +- [Issue #633](https://github.com/grafana/grafana/issues/633). InfluxDB: InfluxDB can now act as a datastore for dashboards - [Issue #610](https://github.com/grafana/grafana/issues/610). InfluxDB: Support for InfluxdB v0.8 list series response schemea (series typeahead) - [Issue #266](https://github.com/grafana/grafana/issues/266). Graphite: New option cacheTimeout to override graphite default memcache timeout - [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) diff --git a/src/config.sample.js b/src/config.sample.js index 25940fbce5e..386d431270b 100644 --- a/src/config.sample.js +++ b/src/config.sample.js @@ -10,8 +10,8 @@ function (Settings) { return new Settings({ // datasources - // Delete the ones you do not want - // grafanaDB: true marks the datasource for use as dashboard storage + // 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) datasources: { graphite: { type: 'graphite', @@ -28,7 +28,7 @@ function (Settings) { // For Basic authentication use: http://username:password@domain.com:9200 elasticsearch: { type: 'elasticsearch', - url: "http://"+window.location.hostname+":9200" + url: "http://"+window.location.hostname+":9200", index: 'grafana-dash', // index for storing dashboards grafanaDB: true, }