From 30f765e689a99c34f889504b85e048e672c72b18 Mon Sep 17 00:00:00 2001
From: David Furey <david.furey@guardian.co.uk>
Date: Fri, 17 Nov 2023 10:04:23 +0000
Subject: [PATCH] Switch to DevX logs

remove fluentbit config etc. and switch to the WITH-cdk-base Amigo recipe
---
 build.sbt                   |  4 +--
 fluentbit/parsers.conf      |  4 ---
 fluentbit/td-agent-bit.conf | 66 -------------------------------------
 riff-raff.yaml              |  2 +-
 4 files changed, 2 insertions(+), 74 deletions(-)
 delete mode 100644 fluentbit/parsers.conf
 delete mode 100644 fluentbit/td-agent-bit.conf

diff --git a/build.sbt b/build.sbt
index 4c686bbfeee..9e7d5e44242 100644
--- a/build.sbt
+++ b/build.sbt
@@ -25,9 +25,7 @@ riffRaffUploadManifestBucket := Option("riffraff-builds")
 riffRaffArtifactResources := {
     Seq(
         (Debian / packageBin).value -> s"${name.value}/${name.value}_1.0_all.deb",
-        baseDirectory.value / "riff-raff.yaml" -> "riff-raff.yaml",
-        baseDirectory.value / "fluentbit/td-agent-bit.conf" -> "facia-tool/fluentbit/td-agent-bit.conf",
-        baseDirectory.value / "fluentbit/parsers.conf" -> "facia-tool/fluentbit/parsers.conf"
+        baseDirectory.value / "riff-raff.yaml" -> "riff-raff.yaml"
     )
 }
 
diff --git a/fluentbit/parsers.conf b/fluentbit/parsers.conf
deleted file mode 100644
index 700e23ec162..00000000000
--- a/fluentbit/parsers.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# https://docs.fluentbit.io/manual/pipeline/filters/parser
-[PARSER]
-  Name systemd_json
-  Format json
diff --git a/fluentbit/td-agent-bit.conf b/fluentbit/td-agent-bit.conf
deleted file mode 100644
index bb61300e33f..00000000000
--- a/fluentbit/td-agent-bit.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-[SERVICE]
-  Parsers_File parsers.conf
-
-# https://docs.fluentbit.io/manual/pipeline/inputs/systemd
-[INPUT]
-  Name systemd
-  Systemd_Filter _SYSTEMD_UNIT=facia-tool.service
-  Strip_Underscores true
-
-# https://docs.fluentbit.io/manual/pipeline/filters/record-modifier
-# Drop all systemd fields - we only want the message
-[FILTER]
-  Name record_modifier
-  Match *
-  Allowlist_key MESSAGE
-
-# https://docs.fluentbit.io/manual/pipeline/filters/modify
-# Lowercase MESSAGE field for consistency
-[FILTER]
-  Name modify
-  Match *
-  Rename MESSAGE message
-
-# https://docs.fluentbit.io/manual/pipeline/filters/parser
-# Attempt to parse the message field, in case the app is logging structured data
-[FILTER]
-  Name parser
-  Match *
-  Key_Name message
-  Parser systemd_json
-
-# https://docs.fluentbit.io/manual/pipeline/filters/multiline-stacktrace
-# Attempt to group up log lines which are split over multiple lines
-[FILTER]
-  name multiline
-  match *
-  multiline.parser java
-  multiline.key_content message
-
-# https://docs.fluentbit.io/manual/pipeline/filters/aws-metadata
-# Add useful AWS metadata
-[FILTER]
-  Name aws
-  Match *
-  az true
-  ec2_instance_id true
-  ami_id true
-
-# https://docs.fluentbit.io/manual/pipeline/filters/modify
-# Add app identity fields
-[FILTER]
-  Name modify
-  Match *
-  Add app facia-tool
-  # To be replaced with the actual value by the CFN
-  Add stage STACK_STAGE
-  Add stack cms-fronts
-  Rename ec2_instance_id instanceId
-
-# https://docs.fluentbit.io/manual/pipeline/outputs/kinesis
-[OUTPUT]
-  Name kinesis_streams
-  Match *
-  region eu-west-1
-  # To be replaced with the actual value by the CFN
-  stream STACK_STREAM
diff --git a/riff-raff.yaml b/riff-raff.yaml
index 5d23a6c29f5..1953b7f3dbe 100644
--- a/riff-raff.yaml
+++ b/riff-raff.yaml
@@ -11,7 +11,7 @@ deployments:
     app: facia-tool
     parameters:
       amiTags:
-        Recipe: editorial-tools-focal-java8-ARM
+        Recipe: editorial-tools-focal-java8-ARM-WITH-cdk-base
         AmigoStage: PROD
         BuiltBy: amigo
       amiEncrypted: true