Gunnar
							
						 
						
							 
							
							
							
							
								
							
							
								85db54c2f2 
								
							 
						 
						
							
							
								
								Add note about docker socket permissions ( #4724 )  
							
							 
							
							
							
						 
						
							2018-09-21 12:39:37 -07:00  
						
					 
				
					
						
							
							
								 
								Daniel Nelson
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								61e5d500ba 
								
							 
						 
						
							
							
								
								Add metric requirements to docker README  
							
							 
							
							
							
						 
						
							2018-08-27 13:06:27 -07:00  
						
					 
				
					
						
							
							
								 
								Greg
							
						 
						
							 
							
							
							
							
								
							
							
								019d265167 
								
							 
						 
						
							
							
								
								Add dev/telegraf.conf for docker, exec, and procstat input ( #4460 )  
							
							 
							
							
							
						 
						
							2018-07-27 18:39:37 -07:00  
						
					 
				
					
						
							
							
								 
								Greg
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								6e245b5483 
								
							 
						 
						
							
							
								
								Update docker input plugin to use new library ( #4440 )  
							
							 
							
							
							
						 
						
							2018-07-25 17:10:28 -06:00  
						
					 
				
					
						
							
							
								 
								Mathevet julien
							
						 
						
							 
							
							
							
							
								
							
							
								4c2786298d 
								
							 
						 
						
							
							
								
								Exclude cached memory on docker input plugin ( #4383 )  
							
							 
							
							
							
						 
						
							2018-07-17 17:02:03 -06:00  
						
					 
				
					
						
							
							
								 
								Greg
							
						 
						
							 
							
							
							
							
								
							
							
								0da94a1b3c 
								
							 
						 
						
							
							
								
								Fix incorrect container name gathered in docker input ( #4391 )  
							
							 
							
							
							
						 
						
							2018-07-12 18:41:49 -07:00  
						
					 
				
					
						
							
							
								 
								Daniel Nelson
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								c98b58dacc 
								
							 
						 
						
							
							
								
								Update docker input documentation for container status  
							
							 
							
							
							
						 
						
							2018-06-18 15:38:21 -07:00  
						
					 
				
					
						
							
							
								 
								prashanthjbabu
							
						 
						
							 
							
							
							
							
								
							
							
								98d86df797 
								
							 
						 
						
							
							
								
								Add container status tag to docker input ( #4259 )  
							
							 
							
							
							
						 
						
							2018-06-18 15:33:14 -07:00  
						
					 
				
					
						
							
							
								 
								Daniel Nelson
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								de355b76d6 
								
							 
						 
						
							
							
								
								Simplify testing with TLS ( #4095 )  
							
							 
							
							
							
						 
						
							2018-05-04 16:33:23 -07:00  
						
					 
				
					
						
							
							
								 
								Daniel Nelson
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9f4752ba12 
								
							 
						 
						
							
							
								
								Add docker input server version ( #4035 )  
							
							 
							
							
							
						 
						
							2018-04-23 15:09:04 -07:00  
						
					 
				
					
						
							
							
								 
								Daniel Nelson
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								971debb582 
								
							 
						 
						
							
							
								
								Add filters for container state to docker input ( #3950 )  
							
							 
							
							
							
						 
						
							2018-03-30 13:17:48 -07:00  
						
					 
				
					
						
							
							
								 
								Jacob McCann
							
						 
						
							 
							
							
							
							
								
							
							
								7ab0d50116 
								
							 
						 
						
							
							
								
								Add container health metrics to docker input ( #3666 )  
							
							 
							
							
							
						 
						
							2018-01-12 17:43:51 -08:00  
						
					 
				
					
						
							
							
								 
								Daniel Nelson
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								cbbdf1043b 
								
							 
						 
						
							
							
								
								Use current time if container read time is zero value ( #3437 )  
							
							 
							
							
							
						 
						
							2017-11-07 11:41:53 -08:00  
						
					 
				
					
						
							
							
								 
								Aditya C S
							
						 
						
							 
							
							
							
							
								
							
							
								d9fa916711 
								
							 
						 
						
							
							
								
								Update docker plugin README ( #3404 )  
							
							 
							
							
							
						 
						
							2017-10-30 12:26:39 -07:00  
						
					 
				
					
						
							
							
								 
								Daniel Nelson
							
						 
						
							 
							
							
							
							
								
							
							
								fa25e123d8 
								
							 
						 
						
							
							
								
								Fix container name filters in docker input ( #3331 )  
							
							 
							
							
							
						 
						
							2017-10-12 15:50:09 -07:00  
						
					 
				
					
						
							
							
								 
								Aditya C S
							
						 
						
							 
							
							
							
							
								
							
							
								dd4299e925 
								
							 
						 
						
							
							
								
								Collect Docker Swarm service metrics in docker input plugin ( #3141 )  
							
							 
							
							
							
						 
						
							2017-10-03 14:36:26 -07:00  
						
					 
				
					
						
							
							
								 
								Daniel Nelson
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								ad4a5aa7a0 
								
							 
						 
						
							
							
								
								Document how to exclude kubernetes annotation  
							
							 
							
							
							
						 
						
							2017-09-29 14:07:19 -07:00  
						
					 
				
					
						
							
							
								 
								Seva Poliakov
							
						 
						
							 
							
							
							
							
								
							
							
								92af42a847 
								
							 
						 
						
							
							
								
								Remove tag_env duplicate from docker README ( #3109 )  
							
							 
							
							
							
						 
						
							2017-08-09 10:21:22 -07:00  
						
					 
				
					
						
							
							
								 
								Daniel Nelson
							
						 
						
							 
							
							
							
							
								
							
							
								f0bd69d904 
								
							 
						 
						
							
							
								
								Add tls options to docker input ( #3063 )  
							
							 
							
							
							
						 
						
							2017-07-27 17:18:44 -07:00  
						
					 
				
					
						
							
							
								 
								Daniel Nelson
							
						 
						
							 
							
							
							
							
								
							
							
								d6cf9f4f30 
								
							 
						 
						
							
							
								
								Fix docker memory and cpu reporting in Windows ( #3043 )  
							
							 
							
							
							
						 
						
							2017-07-27 15:12:29 -07:00  
						
					 
				
					
						
							
							
								 
								Yann Cézard
							
						 
						
							 
							
							
							
							
								
							
							
								681d20083a 
								
							 
						 
						
							
							
								
								Only report cpu usage for online cpus in docker input ( #3035 )  
							
							 
							
							
							
						 
						
							2017-07-21 14:25:17 -07:00  
						
					 
				
					
						
							
							
								 
								Matteo Cerutti
							
						 
						
							 
							
							
							
							
								
							
							
								4b3b16ef1a 
								
							 
						 
						
							
							
								
								Add wildcard support for container inclusion/exclusion ( #2793 )  
							
							 
							
							
							
						 
						
							2017-06-08 13:17:31 -07:00  
						
					 
				
					
						
							
							
								 
								rsingh2411
							
						 
						
							 
							
							
							
							
								
							
							
								93e638d63e 
								
							 
						 
						
							
							
								
								Add Docker container environment variables as tags. Only whitelisted  #2580  ( #2581 )  
							
							 
							
							
							
						 
						
							2017-05-18 16:58:34 -07:00  
						
					 
				
					
						
							
							
								 
								Zack Zatkin-Gold
							
						 
						
							 
							
							
							
							
								
							
							
								dd537b3382 
								
							 
						 
						
							
							
								
								Fix telegraf example arguments ( #2788 )  
							
							 
							
							... 
							
							
							
							Many of the examples provided within documentation are using a single
dash for the command line arguments, but the telegraf executable
explicitly has two dashes.
There are also some inconsistencies with the ordering of the command
line argument examples.  I've ordered them so that the examples will
show: config, config-directory, input-filter, test 
							
						 
						
							2017-05-12 15:22:29 -07:00  
						
					 
				
					
						
							
							
								 
								Patrick Hemmer
							
						 
						
							 
							
							
							
							
								
							
							
								06baf7cf78 
								
							 
						 
						
							
							
								
								use AddError everywhere ( #2372 )  
							
							 
							
							
							
						 
						
							2017-04-24 11:13:26 -07:00  
						
					 
				
					
						
							
							
								 
								Shakeel Sorathia
							
						 
						
							 
							
							
							
							
								
							
							
								35e4390168 
								
							 
						 
						
							
							
								
								Docker: optionally add labels as tags ( #2425 )  
							
							 
							
							
							
						 
						
							2017-04-03 13:43:15 -07:00  
						
					 
				
					
						
							
							
								 
								Cameron Sparr
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								81408f9da7 
								
							 
						 
						
							
							
								
								switch out deprecated docker client library  
							
							 
							
							... 
							
							
							
							closes  #2071  
							
						 
						
							2017-02-22 10:55:00 +00:00  
						
					 
				
					
						
							
							
								 
								Cameron Sparr
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								285be648c4 
								
							 
						 
						
							
							
								
								Godeps update  
							
							 
							
							... 
							
							
							
							closes  #2356  
							
						 
						
							2017-02-02 09:52:06 +00:00  
						
					 
				
					
						
							
							
								 
								Cameron Sparr
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								b762546fa7 
								
							 
						 
						
							
							
								
								docker: check type when totalling blkio & net metrics  
							
							 
							
							... 
							
							
							
							closes  #2027  
							
						 
						
							2016-12-21 12:18:38 +00:00  
						
					 
				
					
						
							
							
								 
								Alex Sherwin
							
						 
						
							 
							
							
							
							
								
							
							
								3a45d8851d 
								
							 
						 
						
							
							
								
								fixes   #1987  custom docker repos with non-standard port ( #2018 )  
							
							 
							
							... 
							
							
							
							* fixed parsing of docker image name/version
now accounts for custom docker repo's which contain a colon for a non-default port
* 1978: modifying docker test case to have a custom repo with non-standard port
* using a temp var to store index, ran gofmt
* fixes  #1987 , renaming iterator to 'i' 
							
						 
						
							2016-12-16 13:53:16 +00:00  
						
					 
				
					
						
							
							
								 
								Cameron Sparr
							
						 
						
							 
							
							
							
							
								
							
							
								c7834209d2 
								
							 
						 
						
							
							
								
								Major Logging Overhaul  
							
							 
							
							... 
							
							
							
							in this commit:
- centralize logging output handler.
- set global Info/Debug/Error log levels based on config file or flags.
- remove per-plugin debug arg handling.
- add a I!, D!, or E! to every log message.
- add configuration option to specify where to send logs.
closes  #1786  
							
						 
						
							2016-10-03 17:13:03 +01:00  
						
					 
				
					
						
							
							
								 
								Ross McDonald
							
						 
						
							 
							
							
							
							
								
							
							
								6b25a73629 
								
							 
						 
						
							
							
								
								Add container state metrics to docker plugin ( #1791 )  
							
							 
							
							... 
							
							
							
							* Add container state metrics to docker plugin.
* Update changelog. 
							
						 
						
							2016-09-21 10:37:49 +01:00  
						
					 
				
					
						
							
							
								 
								aaron jheng
							
						 
						
							 
							
							
							
							
								
							
							
								49ea4e9f39 
								
							 
						 
						
							
							
								
								[Docker Plugin] add server hostname for each docker measurements ( #1599 )  
							
							 
							
							... 
							
							
							
							* add server hostname for each docker measurements
* update CHANGELOG
* move feature to v1.1
* tweak docker_engine_host tag 
							
						 
						
							2016-09-06 08:37:46 +01:00  
						
					 
				
					
						
							
							
								 
								Pierre Fersing
							
						 
						
							 
							
							
							
							
								
							
							
								0462af164e 
								
							 
						 
						
							
							
								
								Added option "total/perdevice" to Docker input ( #1525 )  
							
							 
							
							... 
							
							
							
							Like cpu plugin, add two option "total" and "perdevice" to send network
and diskio metrics either per device and/or the sum of all devices. 
							
						 
						
							2016-07-21 16:50:12 +01:00  
						
					 
				
					
						
							
							
								 
								Cameron Sparr
							
						 
						
							 
							
							
							
							
								
							
							
								191608041f 
								
							 
						 
						
							
							
								
								Strip container_version from container_image tag  
							
							 
							
							... 
							
							
							
							closes  #1413  
							
						 
						
							2016-07-19 17:57:40 +01:00  
						
					 
				
					
						
							
							
								 
								Zdenek Styblik
							
						 
						
							 
							
							
							
							
								
							
							
								39df2635bd 
								
							 
						 
						
							
							
								
								Fix crash in Docker input plugin -  Fixes   #1195  
							
							 
							
							... 
							
							
							
							Commit fixes crash in Docker input plugin caused by the fact that return value
might be nil when error occurs.
closes  #1195  
							
						 
						
							2016-05-18 11:27:06 +01:00  
						
					 
				
					
						
							
							
								 
								Cameron Sparr
							
						 
						
							 
							
							
							
							
								
							
							
								bb254fc2b9 
								
							 
						 
						
							
							
								
								Default docker timeout in case one is not defined in config  
							
							 
							
							
							
						 
						
							2016-05-10 14:18:55 -07:00  
						
					 
				
					
						
							
							
								 
								Jörg Thalheim
							
						 
						
							 
							
							
							
							
								
							
							
								5deb22a539 
								
							 
						 
						
							
							
								
								docker: add container_id also to per cpu stats  
							
							 
							
							... 
							
							
							
							currently this field exists only for total cpu usage
closes  #1168  
							
						 
						
							2016-05-09 16:43:27 -07:00  
						
					 
				
					
						
							
							
								 
								Jörg Thalheim
							
						 
						
							 
							
							
							
							
								
							
							
								219bf93566 
								
							 
						 
						
							
							
								
								docker: add container_id to blkio metrics  
							
							 
							
							... 
							
							
							
							all container metrics except blkio have this field
closes  #1150  
							
						 
						
							2016-05-04 09:28:13 -06:00  
						
					 
				
					
						
							
							
								 
								Cameron Sparr
							
						 
						
							 
							
							
							
							
								
							
							
								c114849a31 
								
							 
						 
						
							
							
								
								Use a timeout for docker list & stat cmds  
							
							 
							
							... 
							
							
							
							closes  #1133  
							
						 
						
							2016-05-01 10:26:46 -06:00  
						
					 
				
					
						
							
							
								 
								Cameron Sparr
							
						 
						
							 
							
							
							
							
								
							
							
								7828bc09cf 
								
							 
						 
						
							
							
								
								Fixup docker blkio container name & docker doc  
							
							 
							
							
							
						 
						
							2016-04-18 16:20:46 -06:00  
						
					 
				
					
						
							
							
								 
								Cameron Sparr
							
						 
						
							 
							
							
							
							
								
							
							
								36d330fea0 
								
							 
						 
						
							
							
								
								docker plugin schema refactor  
							
							 
							
							... 
							
							
							
							- renaming cont_name and cont_image to container_name and
container_image.
- cont_id is now a field, called container_id
- docker_cpu, docker_mem, docker_net measurements have been renamed to
  docker_container_cpu, docker_container_mem, and docker_container_net
closes  #1014 
closes  #1052  
							
						 
						
							2016-04-18 15:16:59 -06:00  
						
					 
				
					
						
							
							
								 
								Sergio Jimenez
							
						 
						
							 
							
							
							
							
								
							
							
								e19c474a92 
								
							 
						 
						
							
							
								
								input(docker): Cleanup  
							
							 
							
							... 
							
							
							
							* Removed leftovers, unused code
closes  #957 
fixes  #645  
							
						 
						
							2016-04-06 12:01:36 -06:00  
						
					 
				
					
						
							
							
								 
								Sergio Jimenez
							
						 
						
							 
							
							
							
							
								
							
							
								9f68a32934 
								
							 
						 
						
							
							
								
								fix(): Last link on README  
							
							 
							
							
							
						 
						
							2016-04-06 11:55:30 -06:00  
						
					 
				
					
						
							
							
								 
								Sergio Jimenez
							
						 
						
							 
							
							
							
							
								
							
							
								5c688daff1 
								
							 
						 
						
							
							
								
								input(docker): Updated README  
							
							 
							
							... 
							
							
							
							* Replaced links to fsouza/go-dockerclient by docker/engine-api 
							
						 
						
							2016-04-06 11:55:30 -06:00  
						
					 
				
					
						
							
							
								 
								Sergio Jimenez
							
						 
						
							 
							
							
							
							
								
							
							
								fd1f05c8e0 
								
							 
						 
						
							
							
								
								input(docker): Fixed io sectors/io_time recursive  
							
							 
							
							... 
							
							
							
							* On engine-api sectors_recursive and io_time_recursive have no Op 
							
						 
						
							2016-04-06 11:55:30 -06:00  
						
					 
				
					
						
							
							
								 
								Sergio Jimenez
							
						 
						
							 
							
							
							
							
								
							
							
								708cbf937f 
								
							 
						 
						
							
							
								
								input(docker): Fixed tests to work with engine-api  
							
							 
							
							... 
							
							
							
							* Modified tests to work with engine-api 
							
						 
						
							2016-04-06 11:55:30 -06:00  
						
					 
				
					
						
							
							
								 
								Sergio Jimenez
							
						 
						
							 
							
							
							
							
								
							
							
								32213cad01 
								
							 
						 
						
							
							
								
								input(docker): docker/engine-api  
							
							 
							
							... 
							
							
							
							* Made required changes to get it to compile
* First manual tests looking good, still unit tests need fixing
* Made go linter happier 
							
						 
						
							2016-04-06 11:55:30 -06:00  
						
					 
				
					
						
							
							
								 
								Thibault Cohen
							
						 
						
							 
							
							
							
							
								
							
							
								1c76d5d096 
								
							 
						 
						
							
							
								
								Improve docker input plugin  
							
							 
							
							... 
							
							
							
							closes  #754  
							
						 
						
							2016-03-07 11:24:32 +01:00  
						
					 
				
					
						
							
							
								 
								Cameron Sparr
							
						 
						
							 
							
							
							
							
								
							
							
								a97c93abe4 
								
							 
						 
						
							
							
								
								add usage_percent into docker readme  
							
							 
							
							... 
							
							
							
							closes  #726  
							
						 
						
							2016-02-26 15:12:37 +00:00