From 68b2d48fd5b5cb0f4c7f912ce77c1bf88a85b39b Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 29 Dec 2017 19:37:46 +0000
Subject: [PATCH] Add ironic inspector to fluentd log collection

Previously ironic inspector logs were not being collected, as they are
stored in /var/log/kolla/ironic-inspector/ rather than
/var/log/kolla/ironic/. This change modifies the fluentd input
configuration to use the correct directory.

Also adds the ironic-inspector service to the fluentd programname
rewrite rule.

Change-Id: Ie5d67f395e4c32fef992e674f2d53dbd6a17f238
---
 .../roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2  | 2 +-
 .../roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2  | 2 +-
 ansible/roles/common/templates/conf/input/00-global.conf.j2     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2 b/ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2
index d998ef630b..2f4268364f 100644
--- a/ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2
+++ b/ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2
@@ -28,7 +28,7 @@
     rewriterule25 programname ^(zun-api|zun-compute)$ openstack_python
     rewriterule26 programname ^(kuryr-server)$ openstack_python
     rewriterule27 programname ^(gnocchi-api|gnocchi-statsd|gnocchi-metricd|gnocchi-upgrade)$ openstack_python
-    rewriterule28 programname ^(ironic-api|ironic-conductor)$ openstack_python
+    rewriterule28 programname ^(ironic-api|ironic-conductor|ironic-inspector)$ openstack_python
     rewriterule29 programname ^(panko-api|panko-dbsync)$ openstack_python
     rewriterule30 programname ^(tacker-server|tacker-conductor)$ openstack_python
     rewriterule31 programname ^(vitrage-collector|vitrage-ml|vitrage-notifier|vitrage-graph)$ openstack_python
diff --git a/ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2 b/ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2
index 7d93201ceb..189bd75e81 100644
--- a/ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2
+++ b/ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2
@@ -138,7 +138,7 @@
   </rule>
   <rule>
     key     programname
-    pattern ^(ironic-api|ironic-conductor)$
+    pattern ^(ironic-api|ironic-conductor|ironic-inspector)$
     tag openstack_python
   </rule>
   <rule>
diff --git a/ansible/roles/common/templates/conf/input/00-global.conf.j2 b/ansible/roles/common/templates/conf/input/00-global.conf.j2
index 5ddcc6e6fd..cd1e4ac173 100644
--- a/ansible/roles/common/templates/conf/input/00-global.conf.j2
+++ b/ansible/roles/common/templates/conf/input/00-global.conf.j2
@@ -14,6 +14,7 @@
     ( 'heat', enable_heat ),
     ( 'horizon', enable_horizon ),
     ( 'ironic', enable_ironic ),
+    ( 'ironic-inspector', enable_ironic ),
     ( 'karbor', enable_karbor ),
     ( 'keystone', enable_keystone ),
     ( 'kuryr', enable_kuryr ),