rsyslog: Add missing logging sources for gnocchi services

Currently only the log file of gnocchi-api is captured by rsyslog and
logs files of the other services like gnocchi-statsd are not. This
change fixes the missing logging sources so that all service logs are
captured by rsyslog.

Change-Id: I408c52de048551bc74afa540e3430d1d9f119b8a

deployment/gnocchi/gnocchi-metricd-container-puppet.yaml

@@ -14,6 +14,11 @@ parameters:
     type: string
     tags:
       - role_specific
+  GnocchiMetricdLoggingSource:
+    type: json
+    default:
+      tag: openstack.gnocchi.metricd
+      file: /var/log/containers/gnocchi/gnocchi-metricd.log
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -121,7 +126,12 @@ outputs:
           - gnocchi::metricd::workers: {get_param: GnocchiMetricdWorkers}
             gnocchi::metricd::metric_processing_delay: {get_param: MetricProcessingDelay}
       monitoring_subscription: {get_param: MonitoringSubscriptionGnocchiMetricd}
-      service_config_settings: {get_attr: [GnocchiServiceBase, role_data, service_config_settings]}
+      service_config_settings:
+        map_merge:
+          - get_attr: [GnocchiServiceBase, role_data, service_config_settings]
+          - rsyslog:
+              tripleo_logging_sources_gnocchi_metricd:
+                - {get_param: GnocchiMetricdLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: gnocchi

deployment/gnocchi/gnocchi-statsd-container-puppet.yaml

@@ -14,6 +14,11 @@ parameters:
     type: string
     tags:
       - role_specific
+  GnocchiStatsdLoggingSource:
+    type: json
+    default:
+      tag: openstack.gnocchi.statsd
+      file: /var/log/containers/gnocchi/gnocchi-statsd.log
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -113,7 +118,12 @@ outputs:
           proto: 'udp'
       monitoring_subscription: {get_param: MonitoringSubscriptionGnocchiStatsd}
       config_settings: {get_attr: [GnocchiServiceBase, role_data, config_settings]}
-      service_config_settings: {get_attr: [GnocchiServiceBase, role_data, service_config_settings]}
+      service_config_settings:
+        map_merge:
+          - get_attr: [GnocchiServiceBase, role_data, service_config_settings]
+          - rsyslog:
+              tripleo_logging_sources_gnocchi_statsd:
+                - {get_param: GnocchiStatsdLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: gnocchi