diff --git a/build.sbt b/build.sbt index 2614483a9..5ceb81b5e 100644 --- a/build.sbt +++ b/build.sbt @@ -253,8 +253,6 @@ lazy val root = (project in file("root")) (scheduler / Universal / packageBin).value -> s"${(scheduler / name).value}/${(scheduler / Universal / packageBin).value.getName}", (app / baseDirectory).value / "pluto-message-ingestion/target/pluto-message-ingestion.zip" -> "pluto-message-ingestion/pluto-message-ingestion.zip", (app / baseDirectory).value / "conf/riff-raff.yaml" -> "riff-raff.yaml", - (app / baseDirectory).value / "fluentbit/td-agent-bit.conf" -> "media-atom-maker/fluentbit/td-agent-bit.conf", - (app / baseDirectory).value / "fluentbit/parsers.conf" -> "media-atom-maker/fluentbit/parsers.conf", (uploader / Compile / resourceManaged).value / "media-atom-pipeline.yaml" -> "media-atom-pipeline-cloudformation/media-atom-pipeline.yaml" ) ) diff --git a/conf/riff-raff.yaml b/conf/riff-raff.yaml index 4f0e38901..e48470e17 100644 --- a/conf/riff-raff.yaml +++ b/conf/riff-raff.yaml @@ -12,7 +12,7 @@ deployments: app: media-atom-maker parameters: amiTags: - Recipe: editorial-tools-focal-java8-ARM + Recipe: editorial-tools-focal-java8-ARM-WITH-cdk-base AmigoStage: PROD media-atom-maker: type: autoscaling diff --git a/fluentbit/parsers.conf b/fluentbit/parsers.conf deleted file mode 100644 index 700e23ec1..000000000 --- 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 da8287d33..000000000 --- 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=APP_NAME.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 * - # To be replaced with the actual value by the CFN - Add app APP_NAME - Add stage STACK_STAGE - Add stack STACK_NAME - 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