Added all keystone log files to fluentd

Add all the keystone log files to fluentd, so
fluentd is aware of all the keystone log files

Added the new parameters to the exclusion ones

Depends-On: Ifd5fbf6509addf4a564ff83c4551525c9a139ff4
Depends-On: Id1d58637967ffb0e9bd0a83c3cbca699432f5378
Change-Id: I48c957496f7fb36d2128c545d5bcd1499e9e9bf6

docker/services/keystone.yaml

@@ -15,6 +15,31 @@ parameters:
     default:
       tag: openstack.keystone
       path: /var/log/containers/keystone/keystone.log
+  KeystoneErrorLoggingSource:
+    type: json
+    default:
+      tag: openstack.keystone.error
+      path: /var/log/containers/httpd/keystone/error_log
+  KeystoneAdminAccessLoggingSource:
+    type: json
+    default:
+      tag: openstack.keystone.admin.access
+      path: /var/log/containers/httpd/keystone/keystone_wsgi_admin_access.log
+  KeystoneAdminErrorLoggingSource:
+    type: json
+    default:
+      tag: openstack.keystone.admin.error
+      path: /var/log/containers/httpd/keystone/keystone_wsgi_admin_error.log
+  KeystoneMainAcccessLoggingSource:
+    type: json
+    default:
+      tag: openstack.keystone.main.access
+      path: /var/log/containers/httpd/keystone/keystone_wsgi_main_access.log
+  KeystoneMainErrorLoggingSource:
+    type: json
+    default:
+      tag: openstack.keystone.wsgi.main.error
+      path: /var/log/containers/httpd/keystone/keystone_wsgi_main_error.log
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -104,6 +129,11 @@ outputs:
                 - keystone
               tripleo_fluentd_sources_keystone:
                 - {get_param: KeystoneLoggingSource}
+                - {get_param: KeystoneErrorLoggingSource}
+                - {get_param: KeystoneAdminAccessLoggingSource}
+                - {get_param: KeystoneAdminErrorLoggingSource}
+                - {get_param: KeystoneMainAcccessLoggingSource}
+                - {get_param: KeystoneMainErrorLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: keystone

puppet/services/keystone.yaml

@@ -154,6 +154,31 @@ parameters:
     default:
       tag: openstack.keystone
       path: /var/log/keystone/keystone.log
+  KeystoneErrorLoggingSource:
+    type: json
+    default:
+      tag: openstack.keystone.error
+      path: /var/log/httpd/keystone/error_log
+  KeystoneAdminAccessLoggingSource:
+    type: json
+    default:
+      tag: openstack.keystone.admin.access
+      path: /var/log/httpd/keystone/keystone_wsgi_admin_access.log
+  KeystoneAdminErrorLoggingSource:
+    type: json
+    default:
+      tag: openstack.keystone.admin.error
+      path: /var/log/httpd/keystone/keystone_wsgi_admin_error.log
+  KeystoneMainAcccessLoggingSource:
+    type: json
+    default:
+      tag: openstack.keystone.main.access
+      path: /var/log/httpd/keystone/keystone_wsgi_main_access.log
+  KeystoneMainErrorLoggingSource:
+    type: json
+    default:
+      tag: openstack.keystone.wsgi.main.error
+      path: /var/log/httpd/keystone/keystone_wsgi_main_error.log
   EnableInternalTLS:
     type: boolean
     default: false
@@ -532,6 +557,11 @@ outputs:
             - keystone
           tripleo_fluentd_sources_keystone:
             - {get_param: KeystoneLoggingSource}
+            - {get_param: KeystoneErrorLoggingSource}
+            - {get_param: KeystoneAdminAccessLoggingSource}
+            - {get_param: KeystoneAdminErrorLoggingSource}
+            - {get_param: KeystoneMainAcccessLoggingSource}
+            - {get_param: KeystoneMainErrorLoggingSource}
         mysql:
           keystone::db::mysql::password: {get_param: AdminToken}
           keystone::db::mysql::user: keystone

tools/yaml-validate.py

@@ -125,6 +125,11 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description',
                                    'HeatApiLoggingSource': ['default'],
                                    'HeatEngineLoggingSource': ['default'],
                                    'KeystoneLoggingSource': ['default'],
+                                   'KeystoneErrorLoggingSource': ['default'],
+                                   'KeystoneAdminAccessLoggingSource': ['default'],
+                                   'KeystoneAdminErrorLoggingSource': ['default'],
+                                   'KeystoneMainAcccessLoggingSource': ['default'],
+                                   'KeystoneMainErrorLoggingSource': ['default'],
                                    'MongoDbLoggingSource': ['default'],
                                    'NeutronApiLoggingSource': ['default'],
                                    'NeutronDhcpAgentLoggingSource': ['default'],