k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						14ccba8924 
					 
					
						
						
							
							Merge pull request  #13886  from a-robinson/logtags  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2015-09-16 05:51:32 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yuqi huang 
							
						 
					 
					
						
						
							
						
						1e2f791f95 
					 
					
						
						
							
							fix the dead link of logging.md  
						
						 
						
						... 
						
						
						
						fix the dead link of logging.md 
						
						
					 
					
						2015-09-16 15:49:36 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Robinson 
							
						 
					 
					
						
						
							
						
						8040f75594 
					 
					
						
						
							
							Update fluentd-gcp to use a new google-fluentd build with my recent  
						
						 
						
						... 
						
						
						
						changes to fluent-plugin-google-cloud to attach Kubernetes metadata to
logs.
Along with this, separate logs from containers in the cluster out from
logs from the daemons running on the node by instantiating two instances
of the output plugin, one which uses the new metadata (for containers)
and one which doesn't (for things like docker and the kubelet). 
						
						
					 
					
						2015-09-15 23:14:43 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Robinson 
							
						 
					 
					
						
						
							
						
						614b1cf3c1 
					 
					
						
						
							
							Replace /varlog with /var/log in the fluentd-gcp config to match the  
						
						 
						
						... 
						
						
						
						recently updated fluent-es config. 
						
						
					 
					
						2015-09-11 16:52:49 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Robinson 
							
						 
					 
					
						
						
							
						
						746dcb8075 
					 
					
						
						
							
							Make fluentd-es output its warning logs and fluentd-gcp mount  
						
						 
						
						... 
						
						
						
						/var/lib/docker read-only. 
						
						
					 
					
						2015-09-10 18:28:27 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carsten Clasohm 
							
						 
					 
					
						
						
							
						
						d093fe0c4b 
					 
					
						
						
							
							add raw flag for GitHub download links  
						
						 
						
						
						
						
					 
					
						2015-09-07 17:43:09 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Robinson 
							
						 
					 
					
						
						
							
						
						b3154a7815 
					 
					
						
						
							
							Remove the garbage log file in the fluentd-gcp that gets filled with  
						
						 
						
						... 
						
						
						
						gunk when installing the google-fluentd agent.
Also let it log things by not redirecting to a file within the container
and only using -q (warning logs only) rather than -qq (error logs only). 
						
						
					 
					
						2015-08-27 21:41:44 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clayton Coleman 
							
						 
					 
					
						
						
							
						
						02dbb95447 
					 
					
						
						
							
							Add TerminationGracePeriodSeconds to API  
						
						 
						
						... 
						
						
						
						Set defaulting for pod spec 
						
						
					 
					
						2015-08-20 11:03:38 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Bailey 
							
						 
					 
					
						
						
							
						
						08e6a43c1d 
					 
					
						
						
							
							Revert "Merge pull request  #9165  from smarterclayton/graceful"  
						
						 
						
						... 
						
						
						
						This reverts commit 4f856b595d , reversing
changes made to d78525a83b .
Conflicts:
	pkg/kubelet/status_manager.go 
						
						
					 
					
						2015-08-18 17:34:49 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clayton Coleman 
							
						 
					 
					
						
						
							
						
						89f1f3b1b8 
					 
					
						
						
							
							Alter graceful deletion to not use TTL  
						
						 
						
						... 
						
						
						
						Avoid TTL by deleting pods immediately when they aren't
scheduled, and letting the Kubelet delete them otherwise.
Ensure the Kubelet uses pod.Spec.TerminationGracePeriodSeconds
when no pod.DeletionGracePeriodSeconds is available. 
						
						
					 
					
						2015-08-18 09:08:43 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Robinson 
							
						 
					 
					
						
						
							
						
						7430181d65 
					 
					
						
						
							
							Collect more of the VM's log files (monit, salt) in fluentd-gcp.  
						
						 
						
						
						
						
					 
					
						2015-08-05 00:21:47 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eric Paris 
							
						 
					 
					
						
						
							
						
						024208e39f 
					 
					
						
						
							
							Fix trailing whitespace in all docs  
						
						 
						
						
						
						
					 
					
						2015-07-30 20:41:30 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eric Paris 
							
						 
					 
					
						
						
							
						
						4cbca2e63c 
					 
					
						
						
							
							Make munger begin/end less generic  
						
						 
						
						... 
						
						
						
						Just force the beginMungeTag() endMungeTag() macros on users, by hiding
it under the covers. It really simplies things for users. 
						
						
					 
					
						2015-07-30 20:41:30 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Robinson 
							
						 
					 
					
						
						
							
						
						9e18c29e9f 
					 
					
						
						
							
							Make fluentd-gcp collect etcd's logs on the master.  
						
						 
						
						
						
						
					 
					
						2015-07-30 22:20:57 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						180798cfa4 
					 
					
						
						
							
							Use example syncer tags instead of hard-coded examples in doc  
						
						 
						
						
						
						
					 
					
						2015-07-27 14:48:41 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Oppenheimer 
							
						 
					 
					
						
						
							
						
						50e95a031b 
					 
					
						
						
							
							Absolutize links that leave the docs/ tree to go anywhere other than  
						
						 
						
						... 
						
						
						
						to examples/ or back to docs/ 
						
						
					 
					
						2015-07-20 00:25:07 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Satnam Singh 
							
						 
					 
					
						
						
							
						
						e5c162e5c2 
					 
					
						
						
							
							Fix console output for Getting Started Logging  
						
						 
						
						
						
						
					 
					
						2015-07-18 22:37:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Hockin 
							
						 
					 
					
						
						
							
						
						33f1862830 
					 
					
						
						
							
							Run gendocs  
						
						 
						
						
						
						
					 
					
						2015-07-17 15:35:43 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Smith 
							
						 
					 
					
						
						
							
						
						f7873d2a1f 
					 
					
						
						
							
							apply changes  
						
						 
						
						
						
						
					 
					
						2015-07-17 11:04:46 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Hockin 
							
						 
					 
					
						
						
							
						
						542e13d2d3 
					 
					
						
						
							
							Better scary message  
						
						 
						
						
						
						
					 
					
						2015-07-17 09:28:49 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Hockin 
							
						 
					 
					
						
						
							
						
						f7512d007b 
					 
					
						
						
							
							Add munger to verify kubectl -f targets, fix docs  
						
						 
						
						
						
						
					 
					
						2015-07-16 15:39:45 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Hockin 
							
						 
					 
					
						
						
							
						
						39b86908a1 
					 
					
						
						
							
							Run gendocs  
						
						 
						
						
						
						
					 
					
						2015-07-14 17:28:47 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Hockin 
							
						 
					 
					
						
						
							
						
						79f9cd7c83 
					 
					
						
						
							
							Run gendocs  
						
						 
						
						
						
						
					 
					
						2015-07-14 15:28:59 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Smith 
							
						 
					 
					
						
						
							
						
						2c333e4bc2 
					 
					
						
						
							
							move admin related docs into docs/admin  
						
						 
						
						
						
						
					 
					
						2015-07-13 18:24:11 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Smith 
							
						 
					 
					
						
						
							
						
						821e08fded 
					 
					
						
						
							
							Apply mungedocs changes  
						
						 
						
						
						
						
					 
					
						2015-07-13 17:48:40 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Hockin 
							
						 
					 
					
						
						
							
						
						fffc64e733 
					 
					
						
						
							
							Run gendocs and munges  
						
						 
						
						
						
						
					 
					
						2015-07-13 11:27:48 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ed Costello 
							
						 
					 
					
						
						
							
						
						98e9f1eeae 
					 
					
						
						
							
							Copy edits for typos  
						
						 
						
						
						
						
					 
					
						2015-07-12 22:03:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Smith 
							
						 
					 
					
						
						
							
						
						c03a788c67 
					 
					
						
						
							
							Auto-fixed docs  
						
						 
						
						
						
						
					 
					
						2015-07-10 10:54:47 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Satnam Singh 
							
						 
					 
					
						
						
							
						
						70afc829c6 
					 
					
						
						
							
							Update logging getting started guides to reflect namespace change  
						
						 
						
						
						
						
					 
					
						2015-07-09 01:12:13 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chao Xu 
							
						 
					 
					
						
						
							
						
						1cca74c20d 
					 
					
						
						
							
							REASON to STATUS  
						
						 
						
						
						
						
					 
					
						2015-07-08 11:20:49 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								RichieEscarez 
							
						 
					 
					
						
						
							
						
						899145da10 
					 
					
						
						
							
							Replaced (or defined first instance of) GKE/GCE with Google Container Engine/Google Compute Engine  
						
						 
						
						... 
						
						
						
						Fixes  #10354  
						
						
					 
					
						2015-06-26 13:30:41 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Satnam Singh 
							
						 
					 
					
						
						
							
						
						20d095291f 
					 
					
						
						
							
							Rename Google Cloud Logging doc apppripriately  
						
						 
						
						
						
						
					 
					
						2015-06-23 14:28:46 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Satnam Singh 
							
						 
					 
					
						
						
							
						
						90caacbfd7 
					 
					
						
						
							
							Update logging docs  
						
						 
						
						
						
						
					 
					
						2015-06-23 11:28:34 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ed Costello 
							
						 
					 
					
						
						
							
						
						05714d416b 
					 
					
						
						
							
							Copy edits for spelling errors and typos  
						
						 
						
						... 
						
						
						
						Signed-off-by: Ed Costello <epc@epcostello.com > 
						
						
					 
					
						2015-06-12 18:47:28 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Scott Konzem 
							
						 
					 
					
						
						
							
						
						1cff55f874 
					 
					
						
						
							
							Fix misspellings in documentation  
						
						 
						
						
						
						
					 
					
						2015-06-05 11:35:17 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeff Lowdermilk 
							
						 
					 
					
						
						
							
						
						553f9f822b 
					 
					
						
						
							
							Add ga-beacon analytics to gendocs scripts  
						
						 
						
						... 
						
						
						
						hack/run-gendocs.sh puts ga-beacon analytics link into all md files,
hack/verify-gendocs.sh verifies presence of link. 
						
						
					 
					
						2015-05-15 18:56:38 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Young 
							
						 
					 
					
						
						
							
						
						379b614024 
					 
					
						
						
							
							simple typo  
						
						 
						
						
						
						
					 
					
						2015-03-14 14:49:31 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Hockin 
							
						 
					 
					
						
						
							
						
						47141f05c7 
					 
					
						
						
							
							standard config opt names: logging  
						
						 
						
						
						
						
					 
					
						2014-11-25 17:41:53 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								John Asmuth 
							
						 
					 
					
						
						
							
						
						5de0c303c3 
					 
					
						
						
							
							fixed more typos  
						
						 
						
						
						
						
					 
					
						2014-11-24 12:51:13 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								John Asmuth 
							
						 
					 
					
						
						
							
						
						9565c170c4 
					 
					
						
						
							
							fix typo  
						
						 
						
						
						
						
					 
					
						2014-11-22 13:53:45 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Satnam Singh 
							
						 
					 
					
						
						
							
						
						39212f5e2e 
					 
					
						
						
							
							Flunentd to GCP logging node level configuration  
						
						 
						
						
						
						
					 
					
						2014-10-20 18:05:00 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Satnam Singh 
							
						 
					 
					
						
						
							
						
						b7722a631d 
					 
					
						
						
							
							Adjust test in salt file to use boolean value  
						
						 
						
						
						
						
					 
					
						2014-10-20 15:52:28 -07:00