mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-11-04 07:49:35 +00:00 
			
		
		
		
	Collect more of the VM's log files (monit, salt) in fluentd-es.
This commit is contained in:
		@@ -1,7 +1,7 @@
 | 
			
		||||
.PHONY:	build push
 | 
			
		||||
 | 
			
		||||
IMAGE = fluentd-elasticsearch
 | 
			
		||||
TAG = 1.7
 | 
			
		||||
TAG = 1.8
 | 
			
		||||
 | 
			
		||||
build:	
 | 
			
		||||
	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
 | 
			
		||||
 
 | 
			
		||||
@@ -78,6 +78,22 @@
 | 
			
		||||
  tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')}
 | 
			
		||||
</match>
 | 
			
		||||
 | 
			
		||||
<source>
 | 
			
		||||
  type tail
 | 
			
		||||
  format none
 | 
			
		||||
  path /varlog/monit.log
 | 
			
		||||
  pos_file /varlog/gcp-monit.log.pos
 | 
			
		||||
  tag monit
 | 
			
		||||
</source>
 | 
			
		||||
 | 
			
		||||
<source>
 | 
			
		||||
  type tail
 | 
			
		||||
  format none
 | 
			
		||||
  path /varlog/salt/minion
 | 
			
		||||
  pos_file /varlog/gcp-salt.pos
 | 
			
		||||
  tag salt
 | 
			
		||||
</source>
 | 
			
		||||
 | 
			
		||||
<source>
 | 
			
		||||
  type tail
 | 
			
		||||
  format none
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ metadata:
 | 
			
		||||
spec:
 | 
			
		||||
  containers:
 | 
			
		||||
  - name: fluentd-elasticsearch
 | 
			
		||||
    image: gcr.io/google_containers/fluentd-elasticsearch:1.7
 | 
			
		||||
    image: gcr.io/google_containers/fluentd-elasticsearch:1.8
 | 
			
		||||
    resources:
 | 
			
		||||
      limits:
 | 
			
		||||
        cpu: 100m
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user