Commit Graph

4342 Commits

Author SHA1 Message Date
Max U 46f9eb8dd9 hopefully fix weird commits 2018-06-26 14:39:49 -07:00
Max U 3deeea7a8a Merge branch 'plugin/reader' of github.com:influxdata/telegraf into plugin/reader 2018-06-26 14:19:38 -07:00
Max U 05b0153b0c Revert "more condensing"
This reverts commit 7fa27f400d.
2018-06-26 14:01:27 -07:00
Max U 5529d51df7 Merge branch 'master' of github.com:influxdata/telegraf into plugin/reader 2018-06-26 14:00:07 -07:00
Max U 5bcb5413a9 prevent merge conflict 2018-06-26 13:55:40 -07:00
Max U 7fa27f400d more condensing 2018-06-26 13:19:53 -07:00
Max U 885e78968f more condensing 2018-06-26 13:19:53 -07:00
Max U 001658af30 condense telegraf.conf 2018-06-26 13:18:43 -07:00
Max U 41c174dc29 condense telegraf.conf 2018-06-26 13:18:43 -07:00
Max U e450b266ec remove comments 2018-06-26 13:10:46 -07:00
Max U bacee88ac0 remove comments 2018-06-26 13:10:46 -07:00
Max U a931eb1c90 update DATA_FORMATS_INPUT.MD to include grok 2018-06-26 12:06:35 -07:00
Max U 64c8559e90 update DATA_FORMATS_INPUT.MD to include grok 2018-06-26 12:06:35 -07:00
Max U bf7220d2ce add test file to docker spin up 2018-06-26 11:53:40 -07:00
Max U 16119293e9 add test file to docker spin up 2018-06-26 11:53:40 -07:00
Max U bbd68b3820 docker will spin up 2018-06-26 11:26:43 -07:00
Max U 7845d4a466 docker will spin up 2018-06-26 11:26:43 -07:00
Max U 79d9ea4761 add docker-image spin up for reader 2018-06-26 10:26:48 -07:00
Max U 3d0647d6d9 add docker-image spin up for reader 2018-06-26 10:26:48 -07:00
Max U cc406299ba allow for import from plugins/all 2018-06-25 15:52:43 -07:00
Max U fb4a272a45 allow for import from plugins/all 2018-06-25 15:52:43 -07:00
Max U 9c845950a7 add grok as a top level parser, still need README 2018-06-25 15:32:27 -07:00
Max U e1e6a08f39 add grok as a top level parser, still need README 2018-06-25 15:32:27 -07:00
Max U f40371e361 add init function to reader 2018-06-25 10:15:32 -07:00
Max U 95edfcbf99 add init function to reader 2018-06-25 10:15:32 -07:00
Max U 36a23ea1ba Merge branch 'master' into plugin/reader 2018-06-25 09:54:49 -07:00
Max U 6101471ae1 Merge branch 'master' into plugin/reader 2018-06-25 09:54:49 -07:00
Max U 554b960339 add setparser to reader 2018-06-25 09:53:35 -07:00
Max U fdf1b9b351 add setparser to reader 2018-06-25 09:53:35 -07:00
Daniel Nelson 23523ffd10
Document path tag in tail input 2018-06-21 18:02:34 -07:00
Daniel Nelson 96e601f405 Document path tag in tail input 2018-06-21 18:02:34 -07:00
Daniel Nelson 523d761f34
Update changelog 2018-06-21 17:59:31 -07:00
Daniel Nelson e7076e4032 Update changelog 2018-06-21 17:59:31 -07:00
JongHyok Lee 3f28add025 Added path tag to tail input plugin (#4292) 2018-06-21 17:55:54 -07:00
JongHyok Lee b895147fdc Added path tag to tail input plugin (#4292) 2018-06-21 17:55:54 -07:00
Daniel Nelson ee6e4b0afd
Run windows tests with -short 2018-06-21 17:46:58 -07:00
Daniel Nelson dcaa94ab75 Run windows tests with -short 2018-06-21 17:46:58 -07:00
Max U 542c030dc8 knock more errors from test files 2018-06-21 16:23:06 -07:00
Max U 071b7b9731 knock more errors from test files 2018-06-21 16:23:06 -07:00
Max U 504d978446 clean up some test cases 2018-06-21 16:12:26 -07:00
Max U 563e8e8f54 clean up some test cases 2018-06-21 16:12:26 -07:00
Max U ec7f13111f add more test files 2018-06-21 16:06:36 -07:00
Max U 823ba0a7e0 add more test files 2018-06-21 16:06:36 -07:00
Patrick Hemmer 16454e25ba Fix postfix input handling of multi-level queues (#4333) 2018-06-21 16:01:38 -07:00
Patrick Hemmer cef6be8d7e Fix postfix input handling of multi-level queues (#4333) 2018-06-21 16:01:38 -07:00
Max U 4e24a1bbe3 add grok as a top level parser 2018-06-21 15:56:20 -07:00
Max U ab0bf5748b add grok as a top level parser 2018-06-21 15:56:20 -07:00
Daniel Nelson 2a1feb6db9
Update changelog 2018-06-21 14:20:35 -07:00
Daniel Nelson 797263369f Update changelog 2018-06-21 14:20:35 -07:00
Ayrdrie 61e197d254 Add support for comma in logparser timestamp format (#4311) 2018-06-21 14:19:15 -07:00