Merge pull request #1449 from snyk/staging

RELEASE

Author: KatieArmstr

config.default.json

@@ -22,5 +22,6 @@
   "SERVICE_ACCOUNT_API_TOKEN": "",
   "DEFAULT_KUBERNETES_UPSTREAM_URL": "https://api.snyk.io/v2/kubernetes-upstream",
   "MAX_RETRY_BACKOFF_DURATION_SECONDS": 300,
-  "USE_KEEPALIVE": true
+  "USE_KEEPALIVE": true,
+  "SYSDIG_POLLING_INTERVAL_MINS": 30
 }

snyk-monitor/README.md

@@ -218,7 +218,7 @@ helm upgrade --install snyk-monitor snyk-charts/snyk-monitor \
 
 > NOTE: The above command should be executed after installing Sysdig. This will upgrade or install the snyk monitor, to allow the detection of Sysdig in the cluster.
 
-The snyk-monitor will now collect data from Sysdig every 4 hours.
+The snyk-monitor will now collect data from Sysdig every 30 mins.
 
 ## Setting up proxying ##
 

snyk-monitor/templates/deployment.yaml

@@ -187,6 +187,8 @@ spec:
             value: {{ quote .Values.skopeo.compression.level }}
           - name: SNYK_WORKERS_COUNT
             value: {{ quote .Values.workers.count }}
+          - name: SNYK_SYSDIG_POLLING_INTERVAL_MINS
+            value: {{ quote .Values.sysdig.pollingIntervalMins }}
           {{- if .Values.sysdig.enabled }}
           - name: SNYK_SYSDIG_RISK_SPOTLIGHT_TOKEN
             valueFrom:

snyk-monitor/values.yaml

@@ -157,6 +157,8 @@ workers:
 sysdig:
   enabled: false
   secretName: sysdig-eve-secret
+  # The minumum pollingIntervalMins is 30
+  pollingIntervalMins: 30
 
 strategy:
   type: RollingUpdate

src/common/config.ts

@@ -47,6 +47,11 @@ config.EXCLUDED_NAMESPACES = loadExcludedNamespaces();
 config.WORKERS_COUNT = Number(config.WORKERS_COUNT) || 10;
 config.SKOPEO_COMPRESSION_LEVEL = Number(config.SKOPEO_COMPRESSION_LEVEL) || 6;
 
+// 30 mins minimum
+if (config.SYSDIG_POLLING_INTERVAL_MINS < 30) {
+  config.SYSDIG_POLLING_INTERVAL_MINS = 30;
+}
+
 // return Sysdig v2 endpoint information
 if (
   config.SYSDIG_RISK_SPOTLIGHT_TOKEN &&

src/common/types.ts

@@ -22,6 +22,7 @@ export interface Config {
   SERVICE_ACCOUNT_API_TOKEN: string;
   DEFAULT_KUBERNETES_UPSTREAM_URL: string;
   MAX_RETRY_BACKOFF_DURATION_SECONDS: number;
+  SYSDIG_POLLING_INTERVAL_MINS: number;
 
   // ----------------------------------------
   // Properties injected by Helm (via environment variables) or manually set in code:

src/index.ts

@@ -100,7 +100,7 @@ async function setupSysdigIntegration(): Promise<void> {
     }
   }, initialInterval).unref();
 
-  const interval: number = 4 * 60 * 60 * 1000; // 4 hours in milliseconds
+  const interval: number = config.SYSDIG_POLLING_INTERVAL_MINS * 60 * 1000; // change to milliseconds
   setInterval(async () => {
     try {
       if (sysdigVersion == sysdigV1) {