Skip to content

Commit c64991a

Browse files
ramanan-raviramanan-ravi
committed
Merge branch 'main' into release-2.5
# Conflicts: # deepfence_agent/plugins/yara-rules
2 parents 3b0d423 + 57eaef7 commit c64991a

306 files changed

Lines changed: 2249 additions & 410 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export IMAGE_REPOSITORY?=quay.io/deepfenceio
1818
export DF_IMG_TAG?=latest
1919
export STEAMPIPE_IMG_TAG?=0.23.x
2020
export IS_DEV_BUILD?=false
21-
export VERSION?=v2.5.2
21+
export VERSION?=v2.5.3
2222
export AGENT_BINARY_BUILD=$(DEEPFENCE_FARGATE_DIR)/build
2323
export AGENT_BINARY_BUILD_RELATIVE=deepfence_agent/agent-binary/build
2424
export AGENT_BINARY_DIST=$(DEEPFENCE_FARGATE_DIR)/dist

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ docker run -dit \
9696
-e http_proxy="" \
9797
-e https_proxy="" \
9898
-e no_proxy="" \
99-
quay.io/deepfenceio/deepfence_agent_ce:2.5.2
99+
quay.io/deepfenceio/deepfence_agent_ce:2.5.3
100100
```
101101

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

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

‎deepfence_agent/plugins/cloud-scanner‎

‎deepfence_agent/plugins/yara-rules‎

‎deepfence_frontend/apps/dashboard/api-spec-original.json‎

Lines changed: 221 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"name": "Apache 2.0",
1414
"url": "https://www.apache.org/licenses/LICENSE-2.0"
1515
},
16-
"version": "v2.5.0"
16+
"version": "v2.5.3"
1717
},
1818
"externalDocs": {
1919
"description": "Deepfence Community",
@@ -786,6 +786,62 @@
786786
"security": [{ "bearer_token": [] }]
787787
}
788788
},
789+
"/deepfence/complete/containerimage": {
790+
"post": {
791+
"tags": ["Completion"],
792+
"summary": "Get Completion for Container Image fields",
793+
"description": "Complete Container Image info",
794+
"operationId": "completeContainerImageInfo",
795+
"requestBody": {
796+
"content": {
797+
"application/json": {
798+
"schema": {
799+
"$ref": "#/components/schemas/CompletionCompletionNodeFieldReq"
800+
}
801+
}
802+
}
803+
},
804+
"responses": {
805+
"200": {
806+
"description": "OK",
807+
"content": {
808+
"application/json": {
809+
"schema": {
810+
"$ref": "#/components/schemas/CompletionCompletionNodeFieldRes"
811+
}
812+
}
813+
}
814+
},
815+
"400": {
816+
"description": "Bad Request",
817+
"content": {
818+
"application/json": {
819+
"schema": { "$ref": "#/components/schemas/ApiDocsBadRequestResponse" }
820+
}
821+
}
822+
},
823+
"401": { "description": "Unauthorized" },
824+
"403": { "description": "Forbidden" },
825+
"404": {
826+
"description": "Not Found",
827+
"content": {
828+
"application/json": {
829+
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
830+
}
831+
}
832+
},
833+
"500": {
834+
"description": "Internal Server Error",
835+
"content": {
836+
"application/json": {
837+
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
838+
}
839+
}
840+
}
841+
},
842+
"security": [{ "bearer_token": [] }]
843+
}
844+
},
789845
"/deepfence/complete/host": {
790846
"post": {
791847
"tags": ["Completion"],
@@ -845,8 +901,8 @@
845901
"/deepfence/complete/kubernetes-cluster": {
846902
"post": {
847903
"tags": ["Completion"],
848-
"summary": "Get Completion for Kubernetes Cluster fields",
849-
"description": "Complete Kubernetes Cluster info",
904+
"summary": "Get Completion for kubernetes cluster fields",
905+
"description": "Complete kubernetes cluster info",
850906
"operationId": "completeKubernetesClusterInfo",
851907
"requestBody": {
852908
"content": {
@@ -1499,6 +1555,51 @@
14991555
"security": [{ "bearer_token": [] }]
15001556
}
15011557
},
1558+
"/deepfence/database/info": {
1559+
"get": {
1560+
"tags": ["Settings"],
1561+
"summary": "Get Database Info",
1562+
"description": "get database updated at info",
1563+
"operationId": "databaseInfo",
1564+
"responses": {
1565+
"200": {
1566+
"description": "OK",
1567+
"content": {
1568+
"application/json": {
1569+
"schema": { "$ref": "#/components/schemas/ModelDatabaseInfoResponse" }
1570+
}
1571+
}
1572+
},
1573+
"400": {
1574+
"description": "Bad Request",
1575+
"content": {
1576+
"application/json": {
1577+
"schema": { "$ref": "#/components/schemas/ApiDocsBadRequestResponse" }
1578+
}
1579+
}
1580+
},
1581+
"401": { "description": "Unauthorized" },
1582+
"403": { "description": "Forbidden" },
1583+
"404": {
1584+
"description": "Not Found",
1585+
"content": {
1586+
"application/json": {
1587+
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
1588+
}
1589+
}
1590+
},
1591+
"500": {
1592+
"description": "Internal Server Error",
1593+
"content": {
1594+
"application/json": {
1595+
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
1596+
}
1597+
}
1598+
}
1599+
},
1600+
"security": [{ "bearer_token": [] }]
1601+
}
1602+
},
15021603
"/deepfence/database/malware": {
15031604
"put": {
15041605
"tags": ["Settings"],
@@ -1715,6 +1816,100 @@
17151816
"security": [{ "bearer_token": [] }]
17161817
}
17171818
},
1819+
"/deepfence/deepfence-communication/message": {
1820+
"get": {
1821+
"tags": ["Settings"],
1822+
"summary": "Get Deepfence communication messages",
1823+
"description": "Get Deepfence communication messages",
1824+
"operationId": "getDeepfenceCommunicationMessages",
1825+
"responses": {
1826+
"200": {
1827+
"description": "OK",
1828+
"content": {
1829+
"application/json": {
1830+
"schema": {
1831+
"type": "array",
1832+
"items": { "$ref": "#/components/schemas/ModelDeepfenceCommunication" }
1833+
}
1834+
}
1835+
}
1836+
},
1837+
"400": {
1838+
"description": "Bad Request",
1839+
"content": {
1840+
"application/json": {
1841+
"schema": { "$ref": "#/components/schemas/ApiDocsBadRequestResponse" }
1842+
}
1843+
}
1844+
},
1845+
"401": { "description": "Unauthorized" },
1846+
"403": { "description": "Forbidden" },
1847+
"404": {
1848+
"description": "Not Found",
1849+
"content": {
1850+
"application/json": {
1851+
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
1852+
}
1853+
}
1854+
},
1855+
"500": {
1856+
"description": "Internal Server Error",
1857+
"content": {
1858+
"application/json": {
1859+
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
1860+
}
1861+
}
1862+
}
1863+
},
1864+
"security": [{ "bearer_token": [] }]
1865+
}
1866+
},
1867+
"/deepfence/deepfence-communication/message/{id}/read": {
1868+
"put": {
1869+
"tags": ["Settings"],
1870+
"summary": "Mark Deepfence communication message read",
1871+
"description": "Mark Deepfence communication message read",
1872+
"operationId": "markDeepfenceCommunicationRead",
1873+
"parameters": [
1874+
{
1875+
"name": "id",
1876+
"in": "path",
1877+
"required": true,
1878+
"schema": { "type": "integer" }
1879+
}
1880+
],
1881+
"responses": {
1882+
"204": { "description": "No Content" },
1883+
"400": {
1884+
"description": "Bad Request",
1885+
"content": {
1886+
"application/json": {
1887+
"schema": { "$ref": "#/components/schemas/ApiDocsBadRequestResponse" }
1888+
}
1889+
}
1890+
},
1891+
"401": { "description": "Unauthorized" },
1892+
"403": { "description": "Forbidden" },
1893+
"404": {
1894+
"description": "Not Found",
1895+
"content": {
1896+
"application/json": {
1897+
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
1898+
}
1899+
}
1900+
},
1901+
"500": {
1902+
"description": "Internal Server Error",
1903+
"content": {
1904+
"application/json": {
1905+
"schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
1906+
}
1907+
}
1908+
}
1909+
},
1910+
"security": [{ "bearer_token": [] }]
1911+
}
1912+
},
17181913
"/deepfence/diagnosis/agent-logs": {
17191914
"post": {
17201915
"tags": ["Diagnosis"],
@@ -14641,6 +14836,29 @@
1464114836
"vulnerability_scan_status": { "type": "string" }
1464214837
}
1464314838
},
14839+
"ModelDatabaseInfoResponse": {
14840+
"type": "object",
14841+
"properties": {
14842+
"malware_rules_updated_at": { "type": "string", "format": "date-time" },
14843+
"posture_controls_updated_at": { "type": "string", "format": "date-time" },
14844+
"secrets_rules_updated_at": { "type": "string", "format": "date-time" },
14845+
"vulnerability_db_updated_at": { "type": "string", "format": "date-time" }
14846+
}
14847+
},
14848+
"ModelDeepfenceCommunication": {
14849+
"type": "object",
14850+
"properties": {
14851+
"button_content": { "type": "string" },
14852+
"content": { "type": "string" },
14853+
"created_at": { "type": "string", "format": "date-time" },
14854+
"id": { "type": "integer" },
14855+
"link": { "type": "string" },
14856+
"link_title": { "type": "string" },
14857+
"read": { "type": "boolean" },
14858+
"title": { "type": "string" },
14859+
"updated_at": { "type": "string", "format": "date-time" }
14860+
}
14861+
},
1464414862
"ModelDeleteIntegrationReq": {
1464514863
"required": ["integration_ids"],
1464614864
"type": "object",

0 commit comments

Comments
 (0)