From c47d0c56cad0748416a9e48e9b1e9dfe68950e68 Mon Sep 17 00:00:00 2001
From: Witold Bedyk <witold.bedyk@est.fujitsu.com>
Date: Thu, 23 Jun 2016 14:45:26 +0200
Subject: [PATCH] Update monasca-log-agent in devstack plugin

* adds batch support
* refactor

https://github.com/FujitsuEnablingSoftwareTechnologyGmbH/logstash-output-monasca_log_api.git

Change-Id: I18836667bd1305a3cd68c4d5a22c0565aa71e134
---
 .../keystone/create_monasca_log_service.py    |   2 +-
 devstack/files/monasca-log-agent/agent.conf   |   8 ++--
 .../logstash-output-monasca_log_api-0.3.3.gem | Bin 12288 -> 0 bytes
 .../logstash-output-monasca_log_api-0.5.gem   | Bin 0 -> 14336 bytes
 .../monasca-log-persister/persister.conf      |  15 ------
 devstack/plugin.sh                            |  43 ++++++++++--------
 6 files changed, 30 insertions(+), 38 deletions(-)
 delete mode 100644 devstack/files/monasca-log-agent/logstash-output-monasca_log_api-0.3.3.gem
 create mode 100644 devstack/files/monasca-log-agent/logstash-output-monasca_log_api-0.5.gem

diff --git a/devstack/files/keystone/create_monasca_log_service.py b/devstack/files/keystone/create_monasca_log_service.py
index 7928f03f..e4d10587 100644
--- a/devstack/files/keystone/create_monasca_log_service.py
+++ b/devstack/files/keystone/create_monasca_log_service.py
@@ -86,7 +86,7 @@ def main(argv):
 
     key = client.Client(token=token, endpoint=url, cacert=cacert)
 
-    monasca_log_url = 'http://' + service_host + ':5607/v2.0'
+    monasca_log_url = 'http://' + service_host + ':5607/v3.0'
 
     if not add_service_endpoint(key, 'logs', 'Monasca log service', 'logs', monasca_log_url, 'RegionOne'):
         return 1
diff --git a/devstack/files/monasca-log-agent/agent.conf b/devstack/files/monasca-log-agent/agent.conf
index 9a393128..a8c781b4 100644
--- a/devstack/files/monasca-log-agent/agent.conf
+++ b/devstack/files/monasca-log-agent/agent.conf
@@ -16,8 +16,8 @@
 #
 input {
   file {
+    add_field => { "dimensions" => { "service" => "system" }}
     path => "/var/log/syslog"
-    type => "syslog"
     tags => ["syslog"]
   }
 }
@@ -34,12 +34,12 @@ filter {
 
 output {
   monasca_log_api {
-    monasca_log_api => "http://127.0.0.1:5607"
-    keystone_api => "http://127.0.0.1:35357/v3"
+    monasca_log_api_url => "http://127.0.0.1:5607/v3.0"
+    keystone_api_url => "http://127.0.0.1:35357/v3"
     project_name => "mini-mon"
     username => "monasca-agent"
     password => "password"
     domain_id => "default"
-    dimensions => "hostname: devstack"
+    dimensions => [ "hostname:devstack" ]
   }
 }
diff --git a/devstack/files/monasca-log-agent/logstash-output-monasca_log_api-0.3.3.gem b/devstack/files/monasca-log-agent/logstash-output-monasca_log_api-0.3.3.gem
deleted file mode 100644
index 65c1cb94393a37bc1398b245770f10571fba5d44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
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
Ve*)~k_xKxuzY+Kwf&WDa{2xpU{-6K=

diff --git a/devstack/files/monasca-log-agent/logstash-output-monasca_log_api-0.5.gem b/devstack/files/monasca-log-agent/logstash-output-monasca_log_api-0.5.gem
new file mode 100644
index 0000000000000000000000000000000000000000..75a1c370c4142a9ea08066cdba2d05c1e0eda59b
GIT binary patch
literal 14336
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

literal 0
HcmV?d00001

diff --git a/devstack/files/monasca-log-persister/persister.conf b/devstack/files/monasca-log-persister/persister.conf
index 81dc6062..7a1e261c 100644
--- a/devstack/files/monasca-log-persister/persister.conf
+++ b/devstack/files/monasca-log-persister/persister.conf
@@ -50,27 +50,12 @@ filter {
         }
     }
 
-    if "application_type" in [log] {
-        mutate {
-            add_field => {
-                application_type => "%{[log][application_type]}"
-            }
-        }
-    } else {
-        mutate {
-            add_field => {
-                application_type => ""
-            }
-        }
-    }
-
     mutate {
         add_field => {
             message => "%{[log][message]}"
             log_level => "%{[log][level]}"
             tenant => "%{[meta][tenantId]}"
             region => "%{[meta][region]}"
-            path => "%{[log][path]}"
         }
         remove_field => ["@version", "host", "type", "tags" ,"_index_date", "meta", "log"]
     }
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index e0f6fbdc..4c23b8e5 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -22,6 +22,8 @@ set -o xtrace
 ERREXIT=$(set +o | grep errexit)
 set -o errexit
 
+PLUGIN_FILES="$MONASCA_BASE"/monasca-log-api/devstack/files
+
 function pre_install_monasca_log {
 :
 }
@@ -60,7 +62,7 @@ function install_monasca_log_api {
 
     sudo useradd --system -g monasca mon-log-api || true
 
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/monasca-log-api/monasca-log-api.conf /etc/init/monasca-log-api.conf
+    sudo cp -f "${PLUGIN_FILES}"/monasca-log-api/monasca-log-api.conf /etc/init/monasca-log-api.conf
     sudo chown root:root /etc/init/monasca-log-api.conf
     sudo chmod 0744 /etc/init/monasca-log-api.conf
 
@@ -76,7 +78,7 @@ function install_monasca_log_api {
     sudo chown root:monasca /etc/monasca
     sudo chmod 0755 /etc/monasca
 
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/monasca-log-api/log-api-config.conf /etc/monasca/log-api-config.conf
+    sudo cp -f "${PLUGIN_FILES}"/monasca-log-api/log-api-config.conf /etc/monasca/log-api-config.conf
     sudo chown mon-log-api:root /etc/monasca/log-api-config.conf
     sudo chmod 0660 /etc/monasca/log-api-config.conf
 
@@ -89,7 +91,7 @@ function install_monasca_log_api {
     fi
     sudo ln -sf /etc/monasca/log-api-config.conf /etc/log-api-config.conf
 
-    sudo cp  -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/monasca-log-api/log-api-config.ini /etc/monasca/log-api-config.ini
+    sudo cp  -f "${PLUGIN_FILES}"/monasca-log-api/log-api-config.ini /etc/monasca/log-api-config.ini
     sudo chown mon-log-api:root /etc/monasca/log-api-config.ini
     sudo chmod 0660 /etc/monasca/log-api-config.ini
 
@@ -114,9 +116,12 @@ function install_logstash {
 }
 
 function install_logstash_monasca_output_plugin {
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/monasca-log-agent/logstash-output-monasca_log_api-0.3.3.gem /opt/logstash/logstash-output-monasca_log_api-0.3.3.gem
-    sudo /opt/logstash/bin/plugin install /opt/logstash/logstash-output-monasca_log_api-0.3.3.gem
-    sudo rm -f /opt/logstash/logstash-output-monasca_log_api-0.3.3.gem
+    local monasca_log_agent_version=0.5
+    local ls_plugin_filename=logstash-output-monasca_log_api-${monasca_log_agent_version}.gem
+    sudo cp -f "${PLUGIN_FILES}"/monasca-log-agent/${ls_plugin_filename} \
+        /opt/logstash/${ls_plugin_filename}
+    sudo /opt/logstash/bin/plugin install /opt/logstash/${ls_plugin_filename}
+    sudo rm -f /opt/logstash/${ls_plugin_filename}
 }
 
 function install_monasca_elasticsearch {
@@ -145,7 +150,7 @@ function install_monasca_elasticsearch {
     sudo chown elastic:elastic /var/data/elasticsearch
     sudo chmod 750 /var/data/elasticsearch
 
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/elasticsearch/elasticsearch.yml /opt/elasticsearch/config/elasticsearch.yml
+    sudo cp -f "${PLUGIN_FILES}"/elasticsearch/elasticsearch.yml /opt/elasticsearch/config/elasticsearch.yml
     sudo chown elastic:elastic /opt/elasticsearch/config/elasticsearch.yml
     sudo chmod 0640 /opt/elasticsearch/config/elasticsearch.yml
 
@@ -154,7 +159,7 @@ function install_monasca_elasticsearch {
         sudo sed -i "s/network.publish_host: 127\.0\.0\.1/network.publish_host: ${SERVICE_HOST}/g" /opt/elasticsearch/config/elasticsearch.yml
     fi
 
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/elasticsearch/elasticsearch.conf /etc/init/elasticsearch.conf
+    sudo cp -f "${PLUGIN_FILES}"/elasticsearch/elasticsearch.conf /etc/init/elasticsearch.conf
     sudo chown elastic:elastic /etc/init/elasticsearch.conf
     sudo chmod 0640 /etc/init/elasticsearch.conf
 
@@ -175,7 +180,7 @@ function add_log_api_service {
     pip_install python-keystoneclient
 
     unset PIP_VIRTUAL_ENV
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/keystone/create_monasca_log_service.py /usr/local/bin/create_monasca_log_service.py
+    sudo cp -f "${PLUGIN_FILES}"/keystone/create_monasca_log_service.py /usr/local/bin/create_monasca_log_service.py
     sudo chmod 0700 /usr/local/bin/create_monasca_log_service.py
 
     if [[ ${SERVICE_HOST} ]]; then
@@ -198,7 +203,7 @@ function configure_log_persister {
     sudo chown root:monasca /etc/monasca/log
     sudo chmod 0755 /etc/monasca/log
 
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/monasca-log-persister/persister.conf /etc/monasca/log/persister.conf
+    sudo cp -f "${PLUGIN_FILES}"/monasca-log-persister/persister.conf /etc/monasca/log/persister.conf
     sudo chown mon-persister:monasca /etc/monasca/log/persister.conf
     sudo chmod 0640 /etc/monasca/log/persister.conf
 
@@ -215,7 +220,7 @@ function configure_log_persister {
     sudo chown mon-persister:monasca /var/log/monasca/monasca-log-persister
     sudo chmod 0750 /var/log/monasca/monasca-log-persister
 
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/monasca-log-persister/monasca-log-persister.conf /etc/init/monasca-log-persister.conf
+    sudo cp -f "${PLUGIN_FILES}"/monasca-log-persister/monasca-log-persister.conf /etc/init/monasca-log-persister.conf
     sudo chown mon-persister:monasca /etc/init/monasca-log-persister.conf
     sudo chmod 0640 /etc/init/monasca-log-persister.conf
 
@@ -231,7 +236,7 @@ function configure_log_transformer {
     sudo chown mon-transformer:monasca /var/log/monasca/monasca-log-transformer
     sudo chmod 0750 /var/log/monasca/monasca-log-transformer
 
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/monasca-log-transformer/transformer.conf /etc/monasca/log/transformer.conf
+    sudo cp -f "${PLUGIN_FILES}"/monasca-log-transformer/transformer.conf /etc/monasca/log/transformer.conf
     sudo chown mon-transformer:monasca /etc/monasca/log/transformer.conf
     sudo chmod 0640 /etc/monasca/log/transformer.conf
 
@@ -242,7 +247,7 @@ function configure_log_transformer {
         sudo sed -i "s/bootstrap_servers => \"127\.0\.0\.1:9092\"/bootstrap_servers => \"${SERVICE_HOST}:9092\"/g" /etc/monasca/log/transformer.conf
     fi
 
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/monasca-log-transformer/monasca-log-transformer.conf /etc/init/monasca-log-transformer.conf
+    sudo cp -f "${PLUGIN_FILES}"/monasca-log-transformer/monasca-log-transformer.conf /etc/init/monasca-log-transformer.conf
     sudo chown mon-transformer:monasca /etc/init/monasca-log-transformer.conf
     sudo chmod 0640 /etc/init/monasca-log-transformer.conf
 
@@ -264,7 +269,7 @@ function install_kibana {
     sudo ln -sf /opt/kibana-${KIBANA_VERSION} /opt/kibana
 
     sudo mkdir -p /opt/kibana/config || true
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/kibana/kibana.yml /opt/kibana/config/kibana.yml
+    sudo cp -f "${PLUGIN_FILES}"/kibana/kibana.yml /opt/kibana/config/kibana.yml
 
     if [[ ${SERVICE_HOST} ]]; then
         # set bind host ip address
@@ -275,7 +280,7 @@ function install_kibana {
     sudo chown kibana:kibana /var/log/kibana
     sudo chmod 0750 /var/log/kibana
 
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/kibana/kibana.conf /etc/init/kibana.conf
+    sudo cp -f "${PLUGIN_FILES}"/kibana/kibana.conf /etc/init/kibana.conf
     sudo chown kibana:kibana /etc/init/kibana.conf
     sudo chmod 0640 /etc/init/kibana.conf
 
@@ -312,16 +317,18 @@ function configure_log_agent {
     sudo chown mon-log-agent:monasca /etc/monasca/monasca-log-agent
     sudo chmod 0750 /etc/monasca/monasca-log-agent
 
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/monasca-log-agent/agent.conf /etc/monasca/monasca-log-agent/agent.conf
+    sudo cp -f "${PLUGIN_FILES}"/monasca-log-agent/agent.conf /etc/monasca/monasca-log-agent/agent.conf
     sudo chown mon-log-agent:monasca /etc/monasca/monasca-log-agent/agent.conf
     sudo chmod 0640 /etc/monasca/monasca-log-agent/agent.conf
 
     if [[ ${SERVICE_HOST} ]]; then
         # set log api ip address
-        sudo sed -i "s/monasca_log_api => \"http:\/\/127\.0\.0\.1:5607\"/monasca_log_api => \"http:\/\/${SERVICE_HOST}:5607\"/g" /etc/monasca/monasca-log-agent/agent.conf
+        sudo sed -i \
+            "s/monasca_log_api_url => \"http:\/\/127\.0\.0\.1:5607/monasca_log_api_url => \"http:\/\/${SERVICE_HOST}:5607/g" \
+            /etc/monasca/monasca-log-agent/agent.conf
     fi
 
-    sudo cp -f "${MONASCA_BASE}"/monasca-log-api/devstack/files/monasca-log-agent/monasca-log-agent.conf /etc/init/monasca-log-agent.conf
+    sudo cp -f "${PLUGIN_FILES}"/monasca-log-agent/monasca-log-agent.conf /etc/init/monasca-log-agent.conf
     sudo chown mon-log-agent:monasca /etc/init/monasca-log-agent.conf
     sudo chmod 0640 /etc/init/monasca-log-agent.conf