From f050d9c2a8300e3d9744f89ab3bef382e0dbbf5a Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 24 Jul 2017 09:38:09 -0700
Subject: [PATCH] Update the keystone files in logstash worker config

Over time the keystone log file location has evolved in part due to
keystone dropping support for eventlet and relying on wsgi servers to
host keystone. We have gone through the following iterations of log
locations:

  logs/screen-key.txt # Eventlet based log file
  logs/apache/keystone.txt # Apache + wsgi < pike location
  logs/screen-keystone.txt # Apache + uwsgi + system >= pike location

Since eventlet is completely gone at this point we drop all support the
the screen-key.txt log name. We add in support for screen-keystone.txt
which was missing and update the comments around apache/keystone.txt to
indicate it is < pike (so will only be present on older branches and in
grenade jobs).

Change-Id: I8b04a8ee6c6ab45ffac47119df307a86cd3c2c23
---
 .../files/logstash/jenkins-log-client.yaml      | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/modules/openstack_project/files/logstash/jenkins-log-client.yaml b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
index 2df335b554..b7b42d0919 100644
--- a/modules/openstack_project/files/logstash/jenkins-log-client.yaml
+++ b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
@@ -149,12 +149,15 @@ source-files:
     tags:
       - screen
       - oslofmt
-  - name: logs/screen-key.txt
+    # This file is used on branches >= pike.
+  - name: logs/screen-keystone.txt
     tags:
       - screen
       - oslofmt
     # even though keystone is going through apache, it modifies log
-    # format to oslo format
+    # format to oslo format. This file is used on branches < pike.
+    # Note that it is also present on grenade jobs and does not have
+    # a new vs old split.
   - name: logs/apache/keystone.txt
     tags:
       - screen
@@ -350,11 +353,6 @@ source-files:
       - screen
       - oslofmt
     job-filter: '.*grenade.*'
-  - name: logs/new/screen-key.txt
-    tags:
-      - screen
-      - oslofmt
-    job-filter: '.*grenade.*'
   - name: logs/new/screen-n-api.txt
     tags:
       - screen
@@ -476,11 +474,6 @@ source-files:
       - screen
       - oslofmt
     job-filter: '.*grenade.*'
-  - name: logs/old/screen-key.txt
-    tags:
-      - screen
-      - oslofmt
-    job-filter: '.*grenade.*'
   - name: logs/old/screen-n-api.txt
     tags:
       - screen