Merge pull request #176 from snyk/fix/reduced-logging

fix: improved logging, better error handling

Author: ivanstanev

config.default.json

@@ -3,9 +3,6 @@
     "name": "kubernetes-monitor",
     "level": "info"
   },
-  "MONITOR": {
-    "INITIAL_REFRESH_MS": 1000
-  },
   "IMAGES_SCANNED_CACHE": {
     "MAX_SIZE": 10000,
     "MAX_AGE_MS": 86400000

src/app.ts

@@ -1,17 +1,13 @@
-import * as config from './common/config';
 import logger = require('./common/logger');
 import { currentClusterName } from './kube-scanner/cluster';
 import { beginWatchingWorkloads } from './kube-scanner/watchers/namespaces';
 
-function safeMonitoring() {
+export function monitor() {
   try {
     logger.info({cluster: currentClusterName}, 'starting to monitor');
     beginWatchingWorkloads();
   } catch (error) {
     logger.error({error}, 'an error occurred while monitoring the cluster');
+    process.exit(1);
   }
 }
-
-export function monitor() {
-  setTimeout(safeMonitoring, config.MONITOR.INITIAL_REFRESH_MS);
-}

src/transmitter/index.ts

@@ -22,7 +22,8 @@ export async function sendDepGraph(...payloads: IDepGraphPayload[]) {
         throw new Error(`${result.statusCode} ${result.statusMessage}`);
       }
     } catch (error) {
-      logger.error({error}, 'could not send the dependency scan result to Homebase');
+      const { dependencyGraph, ...payloadWithoutDepGraph } = payload;
+      logger.error({error, payload: payloadWithoutDepGraph}, 'could not send the dependency scan result to Homebase');
     }
   }
 }
@@ -39,7 +40,7 @@ export async function sendWorkloadMetadata(payload: IWorkloadMetadataPayload) {
         throw new Error(`${result.statusCode} ${result.statusMessage}`);
       }
     } catch (error) {
-      logger.error({error}, 'could not send workload metadata to Homebase');
+      logger.error({error, payload: payload.workloadLocator}, 'could not send workload metadata to Homebase');
     }
 }
 

test/integration/kubernetes.test.ts

@@ -1,8 +1,6 @@
 import { CoreV1Api, KubeConfig } from '@kubernetes/client-node';
-import sleep = require('sleep-promise');
 import setup = require('../setup');
 import * as tap from 'tap';
-import * as config from '../../src/common/config';
 import { getKindConfigPath } from '../helpers/kind';
 import { WorkloadKind } from '../../src/kube-scanner/types';
 import { WorkloadMetadataValidator, WorkloadLocatorValidator } from '../helpers/types';
@@ -51,9 +49,6 @@ tap.test('snyk-monitor container started', async (t) => {
   const k8sApi = kubeConfig.makeApiClient(CoreV1Api);
   console.log('Loaded KinD config!');
 
-  // wait to let the container go through a cycle
-  await sleep(config.MONITOR.INITIAL_REFRESH_MS);
-
   console.log('Querying the snyk-monitor...');
   const response = await k8sApi.listNamespacedPod('snyk-monitor');
   t.ok(response.body.items.length > 0, 'PodList is not empty');