Merge "Optimize kitchen tests for Travis CI"
diff --git a/README.rst b/README.rst
index cde94d3..cbf35a8 100644
--- a/README.rst
+++ b/README.rst
@@ -245,6 +245,7 @@
enabled: true
type: nginx_proxy
proxy:
+ request_buffer: false
buffer:
number: 8
size: 16
diff --git a/nginx/files/proxy.conf b/nginx/files/proxy.conf
index 845d781..eb3c06c 100644
--- a/nginx/files/proxy.conf
+++ b/nginx/files/proxy.conf
@@ -70,6 +70,10 @@
proxy_buffering off;
{%- endif %}
+ {%- if not site.proxy.get('request_buffer', True) %}
+ proxy_request_buffering off;
+ {%- endif %}
+
proxy_http_version 1.1;
{%- if site.proxy.get('headers', True) %}
diff --git a/nginx/meta/fluentd.yml b/nginx/meta/fluentd.yml
index 6d4b0ec..44e15f2 100644
--- a/nginx/meta/fluentd.yml
+++ b/nginx/meta/fluentd.yml
@@ -1,57 +1,60 @@
-config:
- dollar: '$'
- label:
- nginx:
- input:
- access_log:
- type: tail
- tag: nginx.access
- path: /var/log/nginx/access.log
- pos_file: /var/log/td-agent/tmp/nginx.access.pos
- parser:
- type: regexp
- time_format: '%d/%b/%Y:%H:%M:%S %z'
- time_key: Timestamp
- keep_time_key: false
- format: '/^(?<http_client_ip_address>[^ ]*) - (?<http_user>[^ ]*) \[(?<Timestamp>[^\]]*)\] "(?<http_method>\S+) (?<http_url>[^ ]*) \S*" (?<http_status>[^ ]*) (?<http_response_size>[^ ]*) "(?<http_referer>[^\"]*)" "(?<http_agent>[^\"]*)"$/'
- error_log:
- type: tail
- tag: nginx.error
- path: /var/log/nginx/error.log
- pos_file: /var/log/td-agent/tmp/nginx.error.pos
- parser:
- type: regexp
- time_format: '%Y/%m/%d %H:%M:%S'
- time_key: Timestamp
- keep_time_key: false
- format: '/^(?<Timestamp>[^ ]+ [^ ]+) \[(?<orig_severity_label>.*)\] (?<Pid>[^\#]*)\#(?<tid>[^:]*): (?<Payload>.*)$/'
- filter:
- add_severity_access:
- tag: nginx.access
- type: record_transformer
- record:
- - name: severity_label
- value: INFO
- - name: Severity
- value: 6
- unify_severity_error:
- tag: nginx.error
- type: record_transformer
- enable_ruby: true
- remove_keys: orig_severity_label
- record:
- - name: severity_label
- value: ${ {'debug'=>'DEBUG','info'=>'INFO','notice'=>'NOTICE','warn'=>'WARNING','error'=>'ERROR','crit'=>'CRITICAL','alert'=>'ALERT','emerg'=>'EMERGENCY'}[record['orig_severity_label']] }
- - name: Severity
- value: ${ {'debug'=>7,'info'=>6,'notice'=>5,'warn'=>4,'error'=>3,'crit'=>2,'alert'=>1,'emerg'=>0}[record['orig_severity_label']].to_i }
- enrich_fields:
- tag: nginx.*
- type: record_transformer
- record:
- - name: programname
- value: nginx
- match:
- push_to_default:
- tag: nginx.*
- type: relabel
- label: default_output
+{%- if pillar.get('fluentd', {}).get('agent') %}
+agent:
+ config:
+ dollar: '$'
+ label:
+ nginx:
+ input:
+ access_log:
+ type: tail
+ tag: nginx.access
+ path: /var/log/nginx/access.log
+ pos_file: {{ pillar.fluentd.agent.dir.positiondb }}/nginx.access.pos
+ parser:
+ type: regexp
+ time_format: '%d/%b/%Y:%H:%M:%S %z'
+ time_key: Timestamp
+ keep_time_key: false
+ format: '/^(?<http_client_ip_address>[^ ]*) - (?<http_user>[^ ]*) \[(?<Timestamp>[^\]]*)\] "(?<http_method>\S+) (?<http_url>[^ ]*) \S*" (?<http_status>[^ ]*) (?<http_response_size>[^ ]*) "(?<http_referer>[^\"]*)" "(?<http_agent>[^\"]*)"$/'
+ error_log:
+ type: tail
+ tag: nginx.error
+ path: /var/log/nginx/error.log
+ pos_file: {{ pillar.fluentd.agent.dir.positiondb }}/nginx.error.pos
+ parser:
+ type: regexp
+ time_format: '%Y/%m/%d %H:%M:%S'
+ time_key: Timestamp
+ keep_time_key: false
+ format: '/^(?<Timestamp>[^ ]+ [^ ]+) \[(?<orig_severity_label>.*)\] (?<Pid>[^\#]*)\#(?<tid>[^:]*): (?<Payload>.*)$/'
+ filter:
+ add_severity_access:
+ tag: nginx.access
+ type: record_transformer
+ record:
+ - name: severity_label
+ value: INFO
+ - name: Severity
+ value: 6
+ unify_severity_error:
+ tag: nginx.error
+ type: record_transformer
+ enable_ruby: true
+ remove_keys: orig_severity_label
+ record:
+ - name: severity_label
+ value: ${ {'debug'=>'DEBUG','info'=>'INFO','notice'=>'NOTICE','warn'=>'WARNING','error'=>'ERROR','crit'=>'CRITICAL','alert'=>'ALERT','emerg'=>'EMERGENCY'}[record['orig_severity_label']] }
+ - name: Severity
+ value: ${ {'debug'=>7,'info'=>6,'notice'=>5,'warn'=>4,'error'=>3,'crit'=>2,'alert'=>1,'emerg'=>0}[record['orig_severity_label']].to_i }
+ enrich_fields:
+ tag: nginx.*
+ type: record_transformer
+ record:
+ - name: programname
+ value: nginx
+ match:
+ push_to_default:
+ tag: nginx.*
+ type: relabel
+ label: default_output
+{%- endif %}
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 29fb975..4ee4e0f 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -124,7 +124,7 @@
}
salt_run() {
- [ -e ${VEN_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
+ [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
salt-call ${SALT_OPTS} $*
}