diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-04 14:28:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-04 14:28:24 +0000 |
| commit | 705226de74b9b290546b257a0b0cad1dfe6d78cc (patch) | |
| tree | 35c04f8f387636b5577d63d53da3c86ca5187ece /ansible | |
| parent | fbedc6145d088d08950ee216f94550da5282b71c (diff) | |
| parent | 504852d528ef7b56060fa11388849ead912c3152 (diff) | |
| download | kolla-705226de74b9b290546b257a0b0cad1dfe6d78cc.tar.gz kolla-705226de74b9b290546b257a0b0cad1dfe6d78cc.zip | |
Merge "add grafana log in heka"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/common/tasks/config.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/common/templates/cron-logrotate-grafana.conf.j2 | 3 | ||||
| -rw-r--r-- | ansible/roles/common/templates/cron.json.j2 | 1 | ||||
| -rw-r--r-- | ansible/roles/common/templates/heka-grafana.toml.j2 | 18 | ||||
| -rw-r--r-- | ansible/roles/common/templates/heka.json.j2 | 7 |
5 files changed, 31 insertions, 0 deletions
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index f6f1ac4a0..aefdfca6c 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -30,6 +30,7 @@ - { name: "elasticsearch", enabled: "{{ enable_elasticsearch }}" } - { name: "global", enabled: "yes" } - { name: "gnocchi", enabled: "{{ enable_gnocchi }}" } + - { name: "grafana", enabled: "{{ enable_grafana }}" } - { name: "haproxy", enabled: "{{ enable_haproxy }}" } - { name: "horizon", enabled: "{{ enable_horizon }}" } - { name: "keepalived", enabled: "{{ enable_haproxy }}" } @@ -78,6 +79,7 @@ - { name: "glance", enabled: "{{ enable_glance }}" } - { name: "global", enabled: "yes" } - { name: "gnocchi", enabled: "{{ enable_gnocchi }}" } + - { name: "grafana", enabled: "{{ enable_grafana }}" } - { name: "haproxy", enabled: "{{ enable_haproxy }}" } - { name: "heat", enabled: "{{ enable_heat }}" } - { name: "iscsid", enabled: "{{ enable_iscsid }}" } diff --git a/ansible/roles/common/templates/cron-logrotate-grafana.conf.j2 b/ansible/roles/common/templates/cron-logrotate-grafana.conf.j2 new file mode 100644 index 000000000..2a3a0889a --- /dev/null +++ b/ansible/roles/common/templates/cron-logrotate-grafana.conf.j2 @@ -0,0 +1,3 @@ +"/var/log/kolla/grafana/*.log" +{ +} diff --git a/ansible/roles/common/templates/cron.json.j2 b/ansible/roles/common/templates/cron.json.j2 index 295ca660b..b9fc0d1df 100644 --- a/ansible/roles/common/templates/cron.json.j2 +++ b/ansible/roles/common/templates/cron.json.j2 @@ -8,6 +8,7 @@ ( 'elasticsearch', enable_elasticsearch ), ( 'glance', enable_glance ), ( 'gnocchi', enable_gnocchi ), + ( 'grafana', enable_grafana ), ( 'haproxy', enable_haproxy ), ( 'heat', enable_heat ), ( 'iscsid', enable_iscsid ), diff --git a/ansible/roles/common/templates/heka-grafana.toml.j2 b/ansible/roles/common/templates/heka-grafana.toml.j2 new file mode 100644 index 000000000..7565c083e --- /dev/null +++ b/ansible/roles/common/templates/heka-grafana.toml.j2 @@ -0,0 +1,18 @@ +[grafana_log_decoder] +type = "SandboxDecoder" +filename = "lua_decoders/os_grafana_log.lua" + +[grafana_log_splitter] +type = "RegexSplitter" +delimiter = '\n\n(=[^=]+====)' +delimiter_eol = false +deliver_incomplete_final = true + +[grafana_logstreamer_input] +type = "LogstreamerInput" +decoder = "grafana_log_decoder" +splitter = "grafana_log_splitter" +log_directory = "/var/log/kolla" +file_match = 'grafana/(?P<Service>grafana.*)\.log\.?(?P<Seq>\d*)$' +priority = ["^Seq"] +differentiator = ["Service"] diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2 index d94409c77..a49258e4a 100644 --- a/ansible/roles/common/templates/heka.json.j2 +++ b/ansible/roles/common/templates/heka.json.j2 @@ -30,6 +30,13 @@ "optional": {{ (not enable_gnocchi | bool) | string | lower }} }, { + "source": "{{ container_config_directory }}/heka-grafana.toml", + "dest": "/etc/heka/heka-grafana.toml", + "owner": "heka", + "perm": "0600", + "optional": {{ (not enable_grafana | bool) | string | lower }} + }, + { "source": "{{ container_config_directory }}/heka-barbican.toml", "dest": "/etc/heka/heka-barbican.toml", "owner": "heka", |