Merge branch 'main' into release-2.5

# Conflicts: # product-docs/ThreatMapper
deepfence · Nov 14, 2024 · d753968 · d753968
2 parents 16d0e47 + d3e1779
commit d753968
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/product-docs/SecretScanner b/product-docs/SecretScanner
diff --git a/product-docs/ThreatMapper b/product-docs/ThreatMapper
diff --git a/product-docs/ThreatStryker-docs b/product-docs/ThreatStryker-docs
diff --git a/product-docs/YaraHunter b/product-docs/YaraHunter
+3 −3		go.mod
+6 −6		go.sum
+1 −0		output/publish-to-console.go
+13 −0		docs/docs/cloudscanner/aws.md
+15 −15		docs/static/files/v2.4/docker-compose-poc.yml
+15 −15		docs/static/files/v2.4/docker-compose.yml
+1 −1		docs/static/files/v2.4/start-agent.sh
+1 −1		docs/static/files/v2.4/start-podman-agent.sh
+10 −10		docs/versioned_docs/version-v2.4/cloudscanner/aws.md
+3 −3		docs/versioned_docs/version-v2.4/cloudscanner/azure.md
+5 −5		docs/versioned_docs/version-v2.4/cloudscanner/gcp.md
+7 −7		docs/versioned_docs/version-v2.4/console/kubernetes.md
+2 −2		docs/versioned_docs/version-v2.4/sensors/aws-ecs.md
+3 −3		docs/versioned_docs/version-v2.4/sensors/aws-fargate.md
+1 −1		docs/versioned_docs/version-v2.4/sensors/docker.md
+7 −7		docs/versioned_docs/version-v2.4/sensors/kubernetes.md
+2 −2		docs/versioned_docs/version-v2.4/tips/sensor-agent-not-start.md
+2 −2		go.mod
+5 −6		go.sum
+1 −0		pkg/threatintel/threatintel.go
+1 −0		pkg/threatintel/utils.go