Skip to content

Commit

Permalink
Merge branch 'main' into release-2.5
Browse files Browse the repository at this point in the history
# Conflicts:
#	deepfence_agent/plugins/yara-rules
  • Loading branch information
ramanan-ravi committed Jan 22, 2025
2 parents 3b0d423 + 57eaef7 commit c64991a
Show file tree
Hide file tree
Showing 306 changed files with 2,249 additions and 410 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export IMAGE_REPOSITORY?=quay.io/deepfenceio
export DF_IMG_TAG?=latest
export STEAMPIPE_IMG_TAG?=0.23.x
export IS_DEV_BUILD?=false
export VERSION?=v2.5.2
export VERSION?=v2.5.3
export AGENT_BINARY_BUILD=$(DEEPFENCE_FARGATE_DIR)/build
export AGENT_BINARY_BUILD_RELATIVE=deepfence_agent/agent-binary/build
export AGENT_BINARY_DIST=$(DEEPFENCE_FARGATE_DIR)/dist
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ docker run -dit \
-e http_proxy="" \
-e https_proxy="" \
-e no_proxy="" \
quay.io/deepfenceio/deepfence_agent_ce:2.5.2
quay.io/deepfenceio/deepfence_agent_ce:2.5.3
```

Note: Image tag `quay.io/deepfenceio/deepfence_agent_ce:2.5.2-multiarch` is supported in amd64 and arm64/v8 architectures.
Note: Image tag `quay.io/deepfenceio/deepfence_agent_ce:2.5.3-multiarch` is supported in amd64 and arm64/v8 architectures.

On a Kubernetes platform, the sensors are installed using [helm chart](https://community.deepfence.io/threatmapper/docs/v2.5/sensors/kubernetes/)

Expand Down
2 changes: 1 addition & 1 deletion deepfence_agent/plugins/yara-rules
Submodule yara-rules updated 1 files
+1 −1 build-timestamp
224 changes: 221 additions & 3 deletions deepfence_frontend/apps/dashboard/api-spec-original.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"name": "Apache 2.0",
"url": "https://www.apache.org/licenses/LICENSE-2.0"
},
"version": "v2.5.0"
"version": "v2.5.3"
},
"externalDocs": {
"description": "Deepfence Community",
Expand Down Expand Up @@ -786,6 +786,62 @@
"security": [{ "bearer_token": [] }]
}
},
"/deepfence/complete/containerimage": {
"post": {
"tags": ["Completion"],
"summary": "Get Completion for Container Image fields",
"description": "Complete Container Image info",
"operationId": "completeContainerImageInfo",
"requestBody": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/CompletionCompletionNodeFieldReq"
}
}
}
},
"responses": {
"200": {
"description": "OK",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/CompletionCompletionNodeFieldRes"
}
}
}
},
"400": {
"description": "Bad Request",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ApiDocsBadRequestResponse" }
}
}
},
"401": { "description": "Unauthorized" },
"403": { "description": "Forbidden" },
"404": {
"description": "Not Found",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
}
}
},
"500": {
"description": "Internal Server Error",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
}
}
}
},
"security": [{ "bearer_token": [] }]
}
},
"/deepfence/complete/host": {
"post": {
"tags": ["Completion"],
Expand Down Expand Up @@ -845,8 +901,8 @@
"/deepfence/complete/kubernetes-cluster": {
"post": {
"tags": ["Completion"],
"summary": "Get Completion for Kubernetes Cluster fields",
"description": "Complete Kubernetes Cluster info",
"summary": "Get Completion for kubernetes cluster fields",
"description": "Complete kubernetes cluster info",
"operationId": "completeKubernetesClusterInfo",
"requestBody": {
"content": {
Expand Down Expand Up @@ -1499,6 +1555,51 @@
"security": [{ "bearer_token": [] }]
}
},
"/deepfence/database/info": {
"get": {
"tags": ["Settings"],
"summary": "Get Database Info",
"description": "get database updated at info",
"operationId": "databaseInfo",
"responses": {
"200": {
"description": "OK",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ModelDatabaseInfoResponse" }
}
}
},
"400": {
"description": "Bad Request",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ApiDocsBadRequestResponse" }
}
}
},
"401": { "description": "Unauthorized" },
"403": { "description": "Forbidden" },
"404": {
"description": "Not Found",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
}
}
},
"500": {
"description": "Internal Server Error",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
}
}
}
},
"security": [{ "bearer_token": [] }]
}
},
"/deepfence/database/malware": {
"put": {
"tags": ["Settings"],
Expand Down Expand Up @@ -1715,6 +1816,100 @@
"security": [{ "bearer_token": [] }]
}
},
"/deepfence/deepfence-communication/message": {
"get": {
"tags": ["Settings"],
"summary": "Get Deepfence communication messages",
"description": "Get Deepfence communication messages",
"operationId": "getDeepfenceCommunicationMessages",
"responses": {
"200": {
"description": "OK",
"content": {
"application/json": {
"schema": {
"type": "array",
"items": { "$ref": "#/components/schemas/ModelDeepfenceCommunication" }
}
}
}
},
"400": {
"description": "Bad Request",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ApiDocsBadRequestResponse" }
}
}
},
"401": { "description": "Unauthorized" },
"403": { "description": "Forbidden" },
"404": {
"description": "Not Found",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
}
}
},
"500": {
"description": "Internal Server Error",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
}
}
}
},
"security": [{ "bearer_token": [] }]
}
},
"/deepfence/deepfence-communication/message/{id}/read": {
"put": {
"tags": ["Settings"],
"summary": "Mark Deepfence communication message read",
"description": "Mark Deepfence communication message read",
"operationId": "markDeepfenceCommunicationRead",
"parameters": [
{
"name": "id",
"in": "path",
"required": true,
"schema": { "type": "integer" }
}
],
"responses": {
"204": { "description": "No Content" },
"400": {
"description": "Bad Request",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ApiDocsBadRequestResponse" }
}
}
},
"401": { "description": "Unauthorized" },
"403": { "description": "Forbidden" },
"404": {
"description": "Not Found",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
}
}
},
"500": {
"description": "Internal Server Error",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
}
}
}
},
"security": [{ "bearer_token": [] }]
}
},
"/deepfence/diagnosis/agent-logs": {
"post": {
"tags": ["Diagnosis"],
Expand Down Expand Up @@ -14641,6 +14836,29 @@
"vulnerability_scan_status": { "type": "string" }
}
},
"ModelDatabaseInfoResponse": {
"type": "object",
"properties": {
"malware_rules_updated_at": { "type": "string", "format": "date-time" },
"posture_controls_updated_at": { "type": "string", "format": "date-time" },
"secrets_rules_updated_at": { "type": "string", "format": "date-time" },
"vulnerability_db_updated_at": { "type": "string", "format": "date-time" }
}
},
"ModelDeepfenceCommunication": {
"type": "object",
"properties": {
"button_content": { "type": "string" },
"content": { "type": "string" },
"created_at": { "type": "string", "format": "date-time" },
"id": { "type": "integer" },
"link": { "type": "string" },
"link_title": { "type": "string" },
"read": { "type": "boolean" },
"title": { "type": "string" },
"updated_at": { "type": "string", "format": "date-time" }
}
},
"ModelDeleteIntegrationReq": {
"required": ["integration_ids"],
"type": "object",
Expand Down
Loading

0 comments on commit c64991a

Please sign in to comment.