github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6396 from ArtfulCoder/master_logging

Browse Source 
Enable log collection from master.
This commit is contained in:
Zach Loafman
2015-04-02 18:50:30 -07:00
parent d69e7163a5 39bb6d3777
commit de67b96ff7
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cluster/saltbase/salt/top.sls
View File

@@ -14,11 +14,10 @@ base:
- cadvisor - cadvisor
- kubelet - kubelet
- kube-proxy - kube-proxy
{% if pillar.get('enable_node_logging', '').lower() == 'true' %} {% if pillar.get('enable_node_logging', '').lower() == 'true' and pillar['logging_destination'] is defined %}
{% if pillar['logging_destination'] is defined and pillar['logging_destination'] == 'elasticsearch' %} {% if pillar['logging_destination'] == 'elasticsearch' %}
- fluentd-es - fluentd-es
{% endif %} {% elif pillar['logging_destination'] == 'gcp' %}
{% if pillar['logging_destination'] is defined and pillar['logging_destination'] == 'gcp' %}
- fluentd-gcp - fluentd-gcp
{% endif %} {% endif %}
{% endif %} {% endif %}
@@ -57,6 +56,13 @@ base:
- kubelet - kubelet
{% endif %} {% endif %}
{% if pillar.get('enable_node_logging', '').lower() == 'true' and pillar['logging_destination'] is defined %}
{% if pillar['logging_destination'] == 'elasticsearch' %}
- fluentd-es
{% elif pillar['logging_destination'] == 'gcp' %}
- fluentd-gcp
{% endif %}
{% endif %}
'roles:kubernetes-pool-vsphere': 'roles:kubernetes-pool-vsphere':
- match: grain - match: grain