Merge "Granular logging control"

devstack/files/monasca-persister/python/persister-logging.conf

@@ -0,0 +1,50 @@
+[loggers]
+keys = root, kafka, influxdb, cassandra
+
+[handlers]
+keys = console, file
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = DEBUG
+formatter = default
+handlers = console, file
+
+[logger_kafka]
+qualname = kafka
+level = DEBUG
+formatter = default
+handlers = console, file
+propagate = 0
+
+[logger_influxdb]
+qualname = influxdb
+level = DEBUG
+formatter = default
+handlers = console, file
+propagate = 0
+
+[logger_cassandra]
+qualname = cassandra
+level = DEBUG
+formatter = default
+handlers = console, file
+propagate = 0
+
+[handler_console]
+class = logging.StreamHandler
+args = (sys.stderr,)
+level = DEBUG
+formatter = generic
+
+[handler_file]
+class = logging.handlers.RotatingFileHandler
+level = DEBUG
+formatter = generic
+# store up to 5*100MB of logs
+args = ('/var/log/monasca/persister/persister.log', 'a', 104857600, 5)
+
+[formatter_generic]
+format = %(asctime)s %(levelname)s [%(name)s][%(threadName)s] %(message)s

devstack/files/monasca-persister/python/persister.conf

@@ -1,6 +1,5 @@
 [DEFAULT]
-log_file = persister.log
-log_dir = /var/log/monasca/persister
+log_config_append=/etc/monasca/persister-logging.conf
 
 # Default log level is WARNING
 # Show debugging output in logs (sets DEBUG log level output)

devstack/plugin.sh

@@ -1239,6 +1239,7 @@ function install_monasca_persister_python {
     sudo chown root:monasca /etc/monasca
 
     sudo cp -f "${MONASCA_API_DIR}"/devstack/files/monasca-persister/python/persister.conf /etc/monasca/persister.conf
+    sudo cp -f "${MONASCA_API_DIR}"/devstack/files/monasca-persister/python/persister-logging.conf /etc/monasca/persister-logging.conf
 
     sudo chown mon-persister:monasca /etc/monasca/persister.conf
 
@@ -1325,6 +1326,7 @@ function clean_monasca_persister_python {
     sudo rm /etc/systemd/system/monasca-persister.service
 
     sudo rm /etc/monasca/persister.conf
+    sudo rm /etc/monasca/persister-logging.conf
 
     sudo rm /etc/monasca/persister-config.yml