Cron Job logging fix

Fortify-Labs · Dec 26, 2020 · e4bdebc · e4bdebc
1 parent 870f969
commit e4bdebc
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 29 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -22,11 +22,6 @@ jobs:
           # a pull request then we can checkout the head.
           fetch-depth: 2
 
-      # If this run was triggered by a pull request event, then checkout
-      # the head of the pull request instead of the merge commit.
-      - run: git checkout HEAD^2
-        if: ${{ github.event_name == 'pull_request' }}
-
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1

diff --git a/devops/kubernetes/package-lock.json b/devops/kubernetes/package-lock.json
diff --git a/devops/kubernetes/package.json b/devops/kubernetes/package.json
@@ -20,13 +20,13 @@
   },
   "dependencies": {
     "cdk8s": "^1.0.0-beta.5",
-    "constructs": "^3.2.76",
+    "constructs": "^3.2.80",
     "dotenv": "^8.2.0",
     "rename-cli": "^6.2.1"
   },
   "devDependencies": {
     "@types/jest": "^26.0.19",
-    "@types/node": "^14.14.14",
+    "@types/node": "^14.14.16",
     "cdk8s-cli": "^1.0.0-beta.5",
     "jest": "^26.6.3",
     "rimraf": "^3.0.2",

diff --git a/devops/kubernetes/src/charts/fluentd/configs/kubernetes.conf b/devops/kubernetes/src/charts/fluentd/configs/kubernetes.conf
@@ -1,6 +1,6 @@
-<match fluent.**>
+<label @FLUENT_LOG>
   @type null
-</match>
+</label>
 
 <source>
   @type tail
@@ -191,13 +191,35 @@
   ca_file "#{ENV['KUBERNETES_CA_FILE']}"
 </filter>
 
-# Fixes json fields for Elasticsearch
+# Parse docker JSON logs
 <filter kubernetes.**>
   @id filter_parser
   @type parser
   key_name log
   reserve_data true
   remove_key_name_field true
+
+  <parse>
+    @type multi_format
+    <pattern>
+      format json
+    </pattern>
+    <pattern>
+      format none
+    </pattern>
+  </parse>
+</filter>
+
+# Parse application JSON logs
+<filter kubernetes.**>
+  @id filter_parser_second
+  @type parser
+  key_name log
+  reserve_data true
+  remove_key_name_field true
+
+  emit_invalid_record_to_error false
+
   <parse>
     @type multi_format
     <pattern>

diff --git a/devops/kubernetes/src/charts/fluentd/fluentd.ts b/devops/kubernetes/src/charts/fluentd/fluentd.ts
@@ -16,14 +16,14 @@ export class FluentdConstruct extends Construct {
 		new KubeServiceAccount(this, "service-account", {
 			metadata: {
 				name: "fluentd",
-				namespace: "kube-system",
+				namespace: "logs",
 			},
 		});
 
 		new KubeClusterRole(this, "cluster-role", {
 			metadata: {
 				name: "fluentd",
-				namespace: "kube-system",
+				namespace: "logs",
 			},
 			rules: [
 				{
@@ -47,7 +47,7 @@ export class FluentdConstruct extends Construct {
 				{
 					kind: "ServiceAccount",
 					name: "fluentd",
-					namespace: "kube-system",
+					namespace: "logs",
 				},
 			],
 		});
@@ -58,7 +58,7 @@ export class FluentdConstruct extends Construct {
 		new KubeConfigMap(this, "configs", {
 			metadata: {
 				name: "fluentd-configs",
-				namespace: "kube-system",
+				namespace: "logs",
 			},
 			binaryData: readdirSync(directory).reduce<Record<string, string>>(
 				(acc, file) => {
@@ -75,7 +75,7 @@ export class FluentdConstruct extends Construct {
 		new KubeDaemonSet(this, "daemon-set", {
 			metadata: {
 				name: "fluentd",
-				namespace: "kube-system",
+				namespace: "logs",
 				labels: {
 					"k8s-app": "fluentd-logging",
 					version: "v1",
@@ -151,11 +151,11 @@ export class FluentdConstruct extends Construct {
 								],
 								resources: {
 									limits: {
-										memory: "200Mi",
+										memory: "400Mi",
 									},
 									requests: {
 										cpu: "100m",
-										memory: "200Mi",
+										memory: "400Mi",
 									},
 								},
 								volumeMounts: [

diff --git a/devops/kubernetes/src/cronjob.ts b/devops/kubernetes/src/cronjob.ts
@@ -46,6 +46,13 @@ export class FortifyCronJob extends Construct {
 			value: JOBS_SENTRY_DSN,
 		});
 
+		if (!env.find((envvar) => envvar.name === "NODE_ENV")) {
+			env.push({
+				name: "NODE_ENV",
+				value: "production",
+			});
+		}
+
 		const image =
 			options.image ??
 			(REGISTRY ?? "") +

diff --git a/services/jobs/package-lock.json b/services/jobs/package-lock.json
diff --git a/services/jobs/package.json b/services/jobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jobs",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Job scripts and one off scripts",
   "author": {
     "name": "Thomas Kosiewski"

diff --git a/services/jobs/src/index.ts b/services/jobs/src/index.ts
@@ -41,7 +41,7 @@ yargs
 				const healthCheck = container.get(HealthCheck);
 				await healthCheck.start();
 
-				logger.info(argv);
+				logger.info("arguments", argv);
 
 				if (container.isBound(argv.script)) {
 					const fortifyScript = container.get<FortifyScript>(