Merge pull request #1062 from guardian/aa/log-shipping

Adopt log shipping via DevX logs
guardian · Nov 7, 2023 · 8582036 · 8582036
2 parents b278afd + a81401d
commit 8582036
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 163 deletions.
diff --git a/build.sbt b/build.sbt
@@ -67,7 +67,6 @@ lazy val hq = (project in file("hq"))
       // exclude transitive dependency to avoid a runtime exception:
       // `com.fasterxml.jackson.databind.JsonMappingException: Scala module 2.10.2 requires Jackson Databind version >= 2.10.0 and < 2.11.0`
       "net.logstash.logback" % "logstash-logback-encoder" % "7.3" exclude("com.fasterxml.jackson.core", "jackson-databind"),
-      "com.gu" % "kinesis-logback-appender" % "2.1.0",
       "com.gu" %% "janus-config-tools" % "0.0.5"
     ),
     Assets / pipelineStages := Seq(digest),

diff --git a/cdk/lib/__snapshots__/security-hq.test.ts.snap b/cdk/lib/__snapshots__/security-hq.test.ts.snap
@@ -192,6 +192,11 @@ exports[`HQ stack matches the snapshot 1`] = `
             "PropagateAtLaunch": true,
             "Value": "PROD",
           },
+          {
+            "Key": "SystemdUnit",
+            "PropagateAtLaunch": true,
+            "Value": "security-hq.service",
+          },
         ],
         "TargetGroupARNs": [
           {

diff --git a/cdk/lib/security-hq.ts b/cdk/lib/security-hq.ts
@@ -85,6 +85,9 @@ export class SecurityHQ extends GuStack {
     const domainName = "security-hq.gutools.co.uk";
 
     const ec2App = new GuEc2App(this, {
+      applicationLogging: {
+        enabled: true
+      },
       access: {
         scope: AccessScope.PUBLIC,
       },

diff --git a/hq/app/AppLoader.scala b/hq/app/AppLoader.scala
@@ -1,5 +1,3 @@
-import config.LoggingConfig
-import logging.LogConfig
 import play.api.ApplicationLoader.Context
 import play.api.{Application, ApplicationLoader, Mode}
 
@@ -8,15 +6,6 @@ import scala.concurrent.Future
 
 class AppLoader extends ApplicationLoader {
   override def load(context: Context): Application = {
-    val loggingConfig = LoggingConfig(
-      context.initialConfiguration,
-      sys.env.getOrElse("LOCAL_LOG_SHIPPING", "false").toBoolean
-    )
-
-    LogConfig.initPlayLogging(context)
-    LogConfig.initRemoteLogShipping(loggingConfig)
-    LogConfig.initLocalLogShipping(loggingConfig)
-
     val components = new AppComponents(context)
 
     components.application

diff --git a/hq/app/config/LoggingConfig.scala b/hq/app/config/LoggingConfig.scala
diff --git a/hq/app/logging/LogConfig.scala b/hq/app/logging/LogConfig.scala
diff --git a/sbt b/sbt
@@ -17,10 +17,6 @@ do
       CONF_PARAMS=""
       shift
     fi
-    if [ "$arg" == "--ship-logs" ]; then
-      export LOCAL_LOG_SHIPPING=true
-      shift
-    fi
 done
 
 java $DEBUG_PARAMS \