commit da68066e69085210e95b750822be8c1602bcd547
author Cedric Hnyda <chnyda@mirantis.com> Mon Nov 13 15:52:59 2017 +0000
committer Gerrit Code Review <gerrit2@44cc31867e31> Mon Nov 13 15:52:59 2017 +0000
tree eacdcb370911ae0c27d614809bb77c3f90f15a44
parent 0aa7a4624c78036fbfa5393032a44e63b2f3cbde
parent 6a3638868247b79b635f625adc9d099d7508db81

Merge "Enable IPv6 in docker containers"

fluentd/label/default_output/file.yml

diff --git a/fluentd/label/default_output/file.yml b/fluentd/label/default_output/file.yml
new file mode 100644
index 0000000..5e0050d
--- /dev/null
+++ b/fluentd/label/default_output/file.yml
@@ -0,0 +1,27 @@
+parameters:
+  _param:
+    fluentd_default_output_file: /var/log/td-agent/default-all.log
+  fluentd:
+    config:
+      dollar: '$'
+      label:
+        default_output:
+          filter:
+            add_general_fields:
+              tag: "**"
+              type: record_transformer
+              enable_ruby: true
+              record:
+                - name: Type
+                  value: log
+                - name: environment_label
+                  value: ${_param:cluster_domain}
+                - name: Hostname
+                  value: ${fluentd:config:dollar}{ hostname }
+                - name: Timestamp
+                  value: ${fluentd:config:dollar}{ time.strftime('%Y-%m-%dT%H:%M:%S%z') }
+          match:
+            everything:
+              tag: '**'
+              type: 'file'
+              path: ${_param:fluentd_default_output_file}

nginx/server/proxy/graphite_web.yml

diff --git a/nginx/server/proxy/graphite_web.yml b/nginx/server/proxy/graphite_web.yml
index 02035cd..2f3e1e8 100644
--- a/nginx/server/proxy/graphite_web.yml
+++ b/nginx/server/proxy/graphite_web.yml
@@ -8,7 +8,7 @@
           type: nginx_proxy
           name: graphite
           proxy:
-            host: mon
+            host: ${_param:stacklight_monitor_hostname}
             port: 80
             protocol: http
           host:

nginx/server/proxy/infra/sphinx.yml

diff --git a/nginx/server/proxy/infra/sphinx.yml b/nginx/server/proxy/infra/sphinx.yml
index 5f733ac..b7bbfc1 100644
--- a/nginx/server/proxy/infra/sphinx.yml
+++ b/nginx/server/proxy/infra/sphinx.yml
@@ -8,7 +8,7 @@
           type: nginx_proxy
           name: sphinx
           proxy:
-            host: prx
+            host: ${_param:openstack_proxy_hostname}
             port: 8090
             protocol: http
           host:

nginx/server/proxy/sensu_web.yml

diff --git a/nginx/server/proxy/sensu_web.yml b/nginx/server/proxy/sensu_web.yml
index e06120d..c250a49 100644
--- a/nginx/server/proxy/sensu_web.yml
+++ b/nginx/server/proxy/sensu_web.yml
@@ -8,7 +8,7 @@
           type: nginx_proxy
           name: sensu
           proxy:
-            host: mon
+            host: ${_param:stacklight_monitor_hostname}
             port: 3000
             protocol: http
           host:

nginx/server/proxy/sphinx_web.yml

diff --git a/nginx/server/proxy/sphinx_web.yml b/nginx/server/proxy/sphinx_web.yml
index 5f733ac..b7bbfc1 100644
--- a/nginx/server/proxy/sphinx_web.yml
+++ b/nginx/server/proxy/sphinx_web.yml
@@ -8,7 +8,7 @@
           type: nginx_proxy
           name: sphinx
           proxy:
-            host: prx
+            host: ${_param:openstack_proxy_hostname}
             port: 8090
             protocol: http
           host: