From 380418f35197bf34fc689a97b2cd9e6b02781dc7 Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Mon, 24 Sep 2018 17:06:32 +0000
Subject: [PATCH] Update Monasca Log Persister config
* Make number of threads configurable
* Improve naming
* Update path and log options for Logstash 2.4
* Use the correct logs directory
Partially-Implements: blueprint monasca-roles
Change-Id: I09388de4d31740f2786393c957201bd037572226
---
.../templates/monasca-log-persister/log-persister.conf.j2 | 4 +++-
.../monasca-log-persister/monasca-log-persister.json.j2 | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ansible/roles/monasca/templates/monasca-log-persister/log-persister.conf.j2 b/ansible/roles/monasca/templates/monasca-log-persister/log-persister.conf.j2
index 31b08d3c5f..6eb9219b4c 100644
--- a/ansible/roles/monasca/templates/monasca-log-persister/log-persister.conf.j2
+++ b/ansible/roles/monasca/templates/monasca-log-persister/log-persister.conf.j2
@@ -4,7 +4,9 @@ input {
kafka {
zk_connect => "{{ monasca_zookeeper_servers }}"
topic_id => "{{ monasca_transformed_logs_topic }}"
- group_id => "transformer-logstash-consumer"
+ group_id => "log_persister"
+ consumer_id => "log_persister_{{ ansible_hostname }}"
+ consumer_threads => "{{ monasca_log_pipeline_threads }}"
}
}
diff --git a/ansible/roles/monasca/templates/monasca-log-persister/monasca-log-persister.json.j2 b/ansible/roles/monasca/templates/monasca-log-persister/monasca-log-persister.json.j2
index 3eb19fa42d..fa99a35d20 100644
--- a/ansible/roles/monasca/templates/monasca-log-persister/monasca-log-persister.json.j2
+++ b/ansible/roles/monasca/templates/monasca-log-persister/monasca-log-persister.json.j2
@@ -1,5 +1,5 @@
{
- "command": "/usr/share/logstash/bin/logstash --log-in-json --log /var/log/kolla/monasca/monasca-log-persister.log -f /etc/logstash/conf.d/log-persister.conf",
+ "command": "/opt/logstash/bin/logstash --log-in-json --log /var/log/kolla/logstash/monasca-log-persister.log -f /etc/logstash/conf.d/log-persister.conf",
"config_files": [
{
"source": "{{ container_config_directory }}/log-persister.conf",
@@ -16,7 +16,7 @@
],
"permissions": [
{
- "path": "/var/log/kolla/monasca",
+ "path": "/var/log/kolla/logstash",
"owner": "logstash:kolla",
"recurse": true
}