Monitoring database should not be configurable

CHANGELOG.md

@@ -11,6 +11,7 @@
 - [#2163](https://github.com/influxdb/influxdb/pull/2163): Fix up paths for default data and run storage.
 - [#2164](https://github.com/influxdb/influxdb/pull/2164): Append STDOUT/STDERR in initscript.
 - [#2165](https://github.com/influxdb/influxdb/pull/2165): Better name for config section for stats and diags.
+- [#2165](https://github.com/influxdb/influxdb/pull/2165): Monitoring database and retention policy are not configurable.
 
 ## v0.9.0-rc19 [2015-04-01]
 

cmd/influxd/config.go

@@ -127,10 +127,8 @@ type Config struct {
 	} `toml:"logging"`
 
 	Monitoring struct {
-		Enabled         bool     `toml:"enabled"`
-		Database        string   `toml:"database"`
-		RetentionPolicy string   `toml:"retention-policy"`
-		WriteInterval   Duration `toml:"write-interval"`
+		Enabled       bool     `toml:"enabled"`
+		WriteInterval Duration `toml:"write-interval"`
 	} `toml:"monitoring"`
 
 	ContinuousQuery struct {
@@ -196,8 +194,6 @@ func NewConfig() (*Config, error) {
 	c.ReportingDisabled = false
 
 	c.Monitoring.Enabled = false
-	c.Monitoring.Database = "_internal"
-	c.Monitoring.RetentionPolicy = "default"
 	c.Monitoring.WriteInterval = Duration(1 * time.Minute)
 
 	// Detect hostname (or set to localhost).

cmd/influxd/config_test.go

@@ -191,10 +191,8 @@ enabled = true
 write-tracing = true
 raft-tracing = true
 
-[statistics]
+[monitoring]
 enabled = true
-database = "_internal"
-retention-policy = "default"
 write-interval = "1m"
 
 # Configure the admin server

cmd/influxd/main.go

@@ -33,7 +33,9 @@ var (
 
 // Various constants used by the main package.
 const (
-	messagingClientFile string = "messaging"
+	messagingClientFile       string = "messaging"
+	monitoringDatabase        string = "_influxdb"
+	monitoringRetentionPolicy string = "default"
 )
 
 func main() {

cmd/influxd/run.go

@@ -189,8 +189,8 @@ func Run(config *Config, join, version string) (*messaging.Broker, *influxdb.Ser
 
 		// Start up self-monitoring if enabled.
 		if config.Monitoring.Enabled {
-			database := config.Monitoring.Database
-			policy := config.Monitoring.RetentionPolicy
+			database := monitoringDatabase
+			policy := monitoringRetentionPolicy
 			interval := time.Duration(config.Monitoring.WriteInterval)
 
 			// Ensure database exists.

etc/config.sample.toml

@@ -99,6 +99,4 @@ raft-tracing = false # If true, enables detailed logging of Raft consensus.
 # queried like any other data.
 [monitoring]
 enabled = false
-database = "_internal"         # The database to which the data is written.
-retention-policy = "default"   # The retention policy within the database.
 write-interval = "1m"          # Period between writing the data.