Commit Graph

32 Commits (046a69dd8f75d456d2f98de1d6ef03661ed138a3)

Author SHA1 Message Date
Philip O'Toole 86cf0888df Add unit test for 'cluster dir' configuration 2015-01-29 16:41:34 -08:00
Philip O'Toole 5a53de4d93 Remove obsolete configuration options 2015-01-29 16:36:27 -08:00
Philip O'Toole 29d7decdf9 Remove ignored 'level' option from logging config 2015-01-29 14:12:56 -08:00
Philip O'Toole 3c3792f670 Push "joinURLs" into config file
Command-line still take precedence.
2015-01-26 17:53:56 -08:00
Cory LaNou fdd4fd6eaa merge convflict 2015-01-11 16:57:46 -07:00
Cory LaNou d9c0728e74 Test_Collectd -> TestCollectd 2015-01-10 20:09:19 -07:00
Ben Johnson d9411c3d84 Merge branch 'master' of https://github.com/influxdb/influxdb into join
Conflicts:
	cmd/influxd/config.go
	cmd/influxd/run.go
2015-01-10 09:10:21 -07:00
Cory LaNou 1148bf7dc3 more test coverage, responding to comments 2015-01-09 20:12:18 -07:00
Cory LaNou 413f5d162c tests for collectd config 2015-01-09 10:44:11 -07:00
Philip O'Toole c64624abff Merge branch 'master' into graphite_distinct_servers
Conflicts:
	cmd/influxd/config.go
2015-01-08 12:31:21 -08:00
Philip O'Toole 1c19ae61cf Move Graphite config to top-level of config 2015-01-08 12:28:10 -08:00
Philip O'Toole 50b494503d Tigthen up config of Graphite Parser 2015-01-08 12:23:48 -08:00
Philip O'Toole 5a4e2a15fb Move Graphite control into "input plugins" section 2015-01-08 11:25:43 -08:00
Philip O'Toole 9e7f6ca3f0 Provide default NameSeparator for Graphite config 2015-01-07 16:15:39 -08:00
Philip O'Toole 85b3408115 Integrate remaining review feedback 2015-01-07 00:02:58 -08:00
Ben Johnson 70d84a9a2e Merge branch 'master' of https://github.com/influxdb/influxdb into join
Conflicts:
	cmd/influxd/run.go
	handler.go
	server.go
2015-01-06 17:25:34 -07:00
Ben Johnson 50a0826026 Add broker snapshot/restore and CLI join. 2015-01-06 17:21:32 -07:00
Cory LaNou 0334dc5b50 seperator -> separator 2015-01-06 09:57:44 -07:00
Cory LaNou a94254d1a3 Graphite endpoint updates from comments
Added ability to specifiy a seperator for a metric_path.
Default is "."

Added ability to specify position of name from metric_path
Options are "first" or "last".
Defaults to the first position.

Normalized the graphite.Metric struct to only have a Value.

 Changes to be committed:
	modified:   cmd/influxd/config.go
	modified:   cmd/influxd/config_test.go
	modified:   cmd/influxd/run.go
	modified:   graphite/graphite.go
	modified:   graphite/graphite_test.go
2015-01-05 20:14:43 -07:00
Philip O'Toole 2c6e2a8a76 Add config flag to control authentication 2015-01-05 16:03:05 -08:00
Cory LaNou a7a22cc52d fixing bad merge 2015-01-02 10:09:11 -06:00
Cory LaNou 897e1c8969 merge conflict 2015-01-02 09:58:31 -06:00
Cory LaNou b52437f00a Initial incorporation of fixes from pull request #1276
Changes to be committed:
	modified:   cmd/influxd/config.go
	modified:   cmd/influxd/config_test.go
	modified:   cmd/influxd/run.go
	renamed:    graphite.go -> graphite/graphite.go
	renamed:    graphite_test.go -> graphite/graphite_test.go
2015-01-02 09:57:04 -06:00
Cory LaNou 5fbdd4b1cb Wiring graphite end point back up
Graphite server now understands how to use the WriteSeries

Added ability for series information to be passed in the graphite name.

Format is:

	key.value.key.value.metric 50 <timestamp>\n

Example:

	region.us-west.hostname.server01.cpu .09323432 1419958066\n

Added test coverage for the Graphite endpoint.  Need to figure out
how to test a successful listenAndServe.

Need to add tests around new configuration for default values
when not specified for graphite servers.

Changes to be committed:
modified:   cmd/influxd/config.go
modified:   cmd/influxd/config_test.go
modified:   cmd/influxd/run.go
modified:   graphite.go
new file:   graphite_test.go
2015-01-02 09:56:46 -06:00
Cory LaNou 2303a0f014 merge conflict 2014-12-31 15:47:10 -06:00
Cory LaNou 84980c97d2 Initial incorporation of fixes from pull request #1276
Changes to be committed:
	modified:   cmd/influxd/config.go
	modified:   cmd/influxd/config_test.go
	modified:   cmd/influxd/run.go
	renamed:    graphite.go -> graphite/graphite.go
	renamed:    graphite_test.go -> graphite/graphite_test.go
2014-12-31 15:37:58 -06:00
Ben Johnson 7db96f795a Remove magic number. 2014-12-31 13:50:34 -07:00
Ben Johnson dbb089488f Create cluster on initial run. 2014-12-31 12:42:53 -07:00
Ben Johnson 70d561aa6f Refactor main/run. 2014-12-30 15:46:50 -07:00
Cory LaNou 2905ebc864 Wiring graphite end point back up
Graphite server now understands how to use the WriteSeries

Added ability for series information to be passed in the graphite name.

Format is:

	key.value.key.value.metric 50 <timestamp>\n

Example:

	region.us-west.hostname.server01.cpu .09323432 1419958066\n

Added test coverage for the Graphite endpoint.  Need to figure out
how to test a successful listenAndServe.

Need to add tests around new configuration for default values
when not specified for graphite servers.

Changes to be committed:
modified:   cmd/influxd/config.go
modified:   cmd/influxd/config_test.go
modified:   cmd/influxd/run.go
modified:   graphite.go
new file:   graphite_test.go
2014-12-30 16:46:33 -06:00
Philip O'Toole d08588aad2 Remove test of obsolete config param 2014-11-25 13:41:57 -08:00
Ben Johnson ccb0e6b6a1 Refactor configuration into main. 2014-10-20 23:32:47 -06:00