From 256f92d2556a2d4a777f23b3b64907eaf990a91a Mon Sep 17 00:00:00 2001
From: Martin Magr <mmagr@redhat.com>
Date: Thu, 1 Oct 2020 15:31:05 +0200
Subject: [PATCH] Add possibility to set logging source for Horizon

This patch adds HorizonLoggingSource parameter to enable fluentd to tail logs
from Horizon.

To keep consistency with other services the default value is set as single log located
in appropriate log directory, but we also need to enable customer to pass multiple
horizon log files also used by httpd.

Change-Id: I0161e6d9c76424b301e48b73f1d7b4b071af0676
(cherry picked from commit f2fc8c8fafd1c29c8ddfa0c78b875cb9f48291a7)
---
 deployment/horizon/horizon-container-puppet.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml
index c72683e1ed..32943274ab 100644
--- a/deployment/horizon/horizon-container-puppet.yaml
+++ b/deployment/horizon/horizon-container-puppet.yaml
@@ -133,6 +133,11 @@ parameters:
                  of hashes, and the hashes should have two items each (name, display)
                  containing Keystone domain name and a human-readable description of
                  the domain respectively.
+  HorizonLoggingSource:
+    type: json
+    default:
+      tag: openstack.horizon
+      file: /var/log/containers/horizon/horizon.log
 
 parameter_groups:
 - label: deprecated
@@ -234,6 +239,14 @@ outputs:
           - {}
       ansible_group_vars:
         keystone_enable_member: true
+      service_config_settings:
+        rsyslog:
+          tripleo_logging_sources_horizon:
+            yaql:
+              expression: $.data.sources.flatten()
+              data:
+                sources:
+                  - {get_param: HorizonLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: horizon