Merge "Add stacks into sphinx docs"
diff --git a/docker/client/init.sls b/docker/client/init.sls
index 8e0ca58..f628ddc 100644
--- a/docker/client/init.sls
+++ b/docker/client/init.sls
@@ -2,20 +2,22 @@
{%- if client.get('enabled') %}
include:
- {%- if client.network is defined %}
+ {%- if pillar.docker.client.network is defined %}
- docker.client.network
{%- endif %}
+ {%- if pillar.docker.client.container is defined %}
- docker.client.container
- {%- if client.compose is defined %}
+ {%- endif %}
+ {%- if pillar.docker.client.compose is defined %}
- docker.client.compose
{%- endif %}
- {%- if client.stack is defined %}
+ {%- if pillar.docker.client.stack is defined %}
- docker.client.stack
{%- endif %}
- {%- if client.registry is defined %}
+ {%- if pillar.docker.client.registry is defined %}
- docker.client.registry
{%- endif %}
- {%- if client.service is defined %}
+ {%- if pillar.docker.client.service is defined %}
- docker.client.service
{%- endif %}
diff --git a/docker/meta/fluentd.yml b/docker/meta/fluentd.yml
new file mode 100644
index 0000000..0bde54c
--- /dev/null
+++ b/docker/meta/fluentd.yml
@@ -0,0 +1,42 @@
+{%- if pillar.get('fluentd', {}).get('agent', {}).get('enabled', False) %}
+{%- set positiondb = pillar.fluentd.agent.dir.positiondb %}
+agent:
+ config:
+ label:
+ docker:
+ input:
+ container:
+ type: tail
+ tag: temp.docker.container.*
+ path: /var/lib/docker/containers/*/*-json.log
+ path_key: log_path
+ pos_file: {{ positiondb }}/docker.container.pos
+ parser:
+ type: json
+ time_format: '%Y-%m-%dT%H:%M:%S.%NZ'
+ keep_time_key: false
+ filter:
+ enrich:
+ tag: 'temp.docker.container.**'
+ type: record_transformer
+ enable_ruby: true
+ record:
+ - name: severity_label
+ value: INFO
+ - name: Severity
+ value: 6
+ - name: programname
+ value: docker
+ match:
+ cast_service_tag:
+ tag: 'temp.docker.container.**'
+ type: rewrite_tag_filter
+ rule:
+ - name: log_path
+ regexp: '^.*\/(.*)-json\.log$'
+ result: docker.container.$1
+ push_to_default:
+ tag: 'docker.container.*'
+ type: relabel
+ label: default_output
+{%- endif %}
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index a1c25d8..2127589 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -1,6 +1,8 @@
parameters:
docker:
_support:
+ fluentd:
+ enabled: true
telegraf:
enabled: true
collectd: