From 5b06115be88c86b53159b1616cfbac91d827195c Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Tue, 27 Apr 2021 11:13:23 +0000
Subject: [PATCH] Finish removing Monasca Log Transformer

This service was disabled in the Wallaby release and all
references to it can now be removed.

Change-Id: I482640dd63959143732d86fcffb320cc94611247
---
 ansible/inventory/all-in-one            |  3 ---
 ansible/inventory/multinode             |  3 ---
 ansible/monasca_cleanup.yml             |  1 -
 ansible/roles/monasca/defaults/main.yml | 17 -----------------
 ansible/site.yml                        |  1 -
 tests/templates/inventory.j2            |  3 ---
 6 files changed, 28 deletions(-)

diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one
index 66e17b40e6..69167e2d04 100644
--- a/ansible/inventory/all-in-one
+++ b/ansible/inventory/all-in-one
@@ -415,9 +415,6 @@ monasca
 [monasca-grafana:children]
 monasca
 
-[monasca-log-transformer:children]
-monasca
-
 [monasca-log-persister:children]
 monasca
 
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index 63247ff37e..9bbc69242d 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -423,9 +423,6 @@ monasca
 [monasca-grafana:children]
 monasca
 
-[monasca-log-transformer:children]
-monasca
-
 [monasca-log-persister:children]
 monasca
 
diff --git a/ansible/monasca_cleanup.yml b/ansible/monasca_cleanup.yml
index 300fd641bc..8efb510150 100644
--- a/ansible/monasca_cleanup.yml
+++ b/ansible/monasca_cleanup.yml
@@ -3,7 +3,6 @@
   hosts:
     - monasca-api
     - monasca-grafana
-    - monasca-log-transformer
     - monasca-log-persister
     - monasca-log-metrics
     - monasca-thresh
diff --git a/ansible/roles/monasca/defaults/main.yml b/ansible/roles/monasca/defaults/main.yml
index 480d13947e..34b8dc0ed5 100644
--- a/ansible/roles/monasca/defaults/main.yml
+++ b/ansible/roles/monasca/defaults/main.yml
@@ -20,15 +20,6 @@ monasca_services:
         mode: "http"
         external: true
         port: "{{ monasca_api_port }}"
-  # NOTE(dszumski): We can remove log_transformer and all other references after the
-  # Wallaby release
-  monasca-log-transformer:
-    container_name: monasca_log_transformer
-    group: monasca-log-transformer
-    enabled: false
-    image: "{{ monasca_logstash_image_full }}"
-    volumes: "{{ monasca_log_transformer_default_volumes + monasca_log_transformer_extra_volumes }}"
-    dimensions: "{{ monasca_log_transformer_dimensions }}"
   monasca-log-persister:
     container_name: monasca_log_persister
     group: monasca-log-persister
@@ -264,7 +255,6 @@ monasca_grafana_image_full: "{{ monasca_grafana_image }}:{{ monasca_grafana_tag
 monasca_agent_dimensions: "{{ default_container_dimensions }}"
 monasca_api_dimensions: "{{ default_container_dimensions }}"
 monasca_log_api_dimensions: "{{ default_container_dimensions }}"
-monasca_log_transformer_dimensions: "{{ default_container_dimensions }}"
 monasca_log_persister_dimensions: "{{ default_container_dimensions }}"
 monasca_log_metrics_dimensions: "{{ default_container_dimensions }}"
 monasca_thresh_dimensions: "{{ default_container_dimensions }}"
@@ -294,12 +284,6 @@ monasca_api_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla"
-monasca_log_transformer_default_volumes:
-  - "{{ node_config_directory }}/monasca-log-transformer/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
-  - "kolla_logs:/var/log/kolla"
-  - "monasca_log_transformer_data:/var/lib/logstash"
 monasca_log_persister_default_volumes:
   - "{{ node_config_directory }}/monasca-log-persister/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
@@ -339,7 +323,6 @@ monasca_agent_collector_extra_volumes: "{{ monasca_extra_volumes }}"
 monasca_agent_statsd_extra_volumes: "{{ monasca_extra_volumes }}"
 monasca_agent_forwarder_extra_volumes: "{{ monasca_extra_volumes }}"
 monasca_api_extra_volumes: "{{ monasca_extra_volumes }}"
-monasca_log_transformer_extra_volumes: "{{ monasca_extra_volumes }}"
 monasca_log_persister_extra_volumes: "{{ monasca_extra_volumes }}"
 monasca_log_metrics_extra_volumes: "{{ monasca_extra_volumes }}"
 monasca_thresh_extra_volumes: "{{ monasca_extra_volumes }}"
diff --git a/ansible/site.yml b/ansible/site.yml
index dc0be8eb26..59f4a415a3 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -883,7 +883,6 @@
     - monasca-agent-statsd
     - monasca-api
     - monasca-grafana
-    - monasca-log-transformer
     - monasca-log-persister
     - monasca-log-metrics
     - monasca-thresh
diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2
index bef80fbb80..e257af810f 100644
--- a/tests/templates/inventory.j2
+++ b/tests/templates/inventory.j2
@@ -486,9 +486,6 @@ monasca
 [monasca-grafana:children]
 monasca
 
-[monasca-log-transformer:children]
-monasca
-
 [monasca-log-persister:children]
 monasca