diff --git a/docker-compose.yml b/docker-compose.yml
index a97a7ca40..b28200039 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -133,16 +133,12 @@ services:
# which can cause problems on some workstations.
# For production deployments, the default should be used.
EXTRA_JAVA_OPTIONS: "-Xmx2g"
- ALPINE_DATABASE_MODE: "external"
ALPINE_DATABASE_URL: "jdbc:postgresql://dt-postgres:5432/dtrack"
- ALPINE_DATABASE_DRIVER: "org.postgresql.Driver"
ALPINE_DATABASE_USERNAME: "dtrack"
ALPINE_DATABASE_PASSWORD: "dtrack"
ALPINE_METRICS_ENABLED: "true"
ALPINE_SECRET_KEY_PATH: "/var/run/secrets/secret.key"
KAFKA_BOOTSTRAP_SERVERS: "dt-redpanda:29092"
- KAFKA_NUM_STREAM_THREADS: "12" # Default number of input partitions is 12
- KAFKA_STREAMS_METRICS_RECORDING_LEVEL: "DEBUG"
INTEGRITY_CHECK_ENABLED: "true"
ports:
- "127.0.0.1:8080:8080"
@@ -237,8 +233,6 @@ services:
# REPO_META_ANALYSIS_TOPICS_RETENTION_MS: "43200000" # 12h
# VULN_ANALYSIS_TOPICS_PARTITIONS: "3"
# VULN_ANALYSIS_TOPICS_RETENTION_MS: "43200000" # 12h
- # VULN_ANALYSIS_RESULT_TOPIC_PARTITIONS: "3"
- # VULN_ANALYSIS_RESULT_TOPIC_RETENTION_MS: "43200000" # 12h
# VULN_MIRROR_TOPICS_PARTITIONS: "3"
# VULN_MIRROR_TOPICS_RETENTION_MS: "43200000" # 12h
volumes:
@@ -302,6 +296,8 @@ services:
- topicName: dtrack.vuln-analysis.result
keyProtoType: org.dependencytrack.vulnanalysis.v1.ScanKey
valueProtoType: org.dependencytrack.vulnanalysis.v1.ScanResult
+ - topicName: dtrack.vuln-analysis.result.processed
+ valueProtoType: org.dependencytrack.vulnanalysis.v1.ScanResult
- topicName: dtrack.vulnerability
valueProtoType: org.cyclonedx.v1_4.Bom
fileSystem:
diff --git a/docs/reference/topics.md b/docs/reference/topics.md
index cbd618f3b..6945d0a33 100644
--- a/docs/reference/topics.md
+++ b/docs/reference/topics.md
@@ -2,7 +2,6 @@
| Name | Partitions | Config |
|:--------------------------------------------------------------------------------------------------|:-----------|:------------------------------------------------------------------------------------|
-| `dtrack-apiserver-processed-vuln-scan-result-by-scan-token-repartition`1A | 3 | |
| `dtrack.notification.analyzer` | 3 | |
| `dtrack.notification.bom` | 3 | |
| `dtrack.notification.configuration` | 3 | |
@@ -17,26 +16,27 @@
| `dtrack.notification.repository` | 3 | |
| `dtrack.notification.vex` | 3 | |
| `dtrack.notification.project-vuln-analysis-complete` 3 | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
-| `dtrack.repo-meta-analysis.component`1B | 3 | |
+| `dtrack.repo-meta-analysis.component`1A | 3 | |
| `dtrack.repo-meta-analysis.result` | 3 | |
-| `dtrack.vuln-analysis.component`1C | 3 | |
-| `dtrack.vuln-analysis.result`1A | 3 | |
-| `dtrack.vuln-analysis.scanner.result`1C | 3 | |
+| `dtrack.vuln-analysis.component`1B | 3 | |
+| `dtrack.vuln-analysis.result` | 3 | |
+| `dtrack.vuln-analysis.result.processed` | 3 | |
+| `dtrack.vuln-analysis.scanner.result`1B | 3 | |
| `dtrack.vulnerability` | 3 | `cleanup.policy=compact` |
| `dtrack.vulnerability.digest`2 | 1 | `cleanup.policy=compact` |
| `dtrack.vulnerability.mirror.command`2 | 1 | |
| `dtrack.vulnerability.mirror.state`2 | 1 | `cleanup.policy=compact` |
-| `hyades-repository-meta-analyzer-command-by-purl-coordinates-repartition`1B | 3 | |
-| `hyades-vulnerability-analyzer-completed-scans-table-changelog`1C | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
-| `hyades-vulnerability-analyzer-expected-scanner-results-last-update-store-changelog`1C | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
-| `hyades-vulnerability-analyzer-expected-scanner-results-table-changelog`1C | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
-| `hyades-vulnerability-analyzer-ossindex-batch-store-changelog`1D | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
-| `hyades-vulnerability-analyzer-ossindex-retry-store-changelog`1D | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
+| `hyades-repository-meta-analyzer-command-by-purl-coordinates-repartition`1A | 3 | |
+| `hyades-vulnerability-analyzer-completed-scans-table-changelog`1B | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
+| `hyades-vulnerability-analyzer-expected-scanner-results-last-update-store-changelog`1B | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
+| `hyades-vulnerability-analyzer-expected-scanner-results-table-changelog`1B | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
+| `hyades-vulnerability-analyzer-ossindex-batch-store-changelog`1C | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
+| `hyades-vulnerability-analyzer-ossindex-retry-store-changelog`1C | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
| `hyades-vulnerability-analyzer-scan-task-internal-repartition` | 3 | |
-| `hyades-vulnerability-analyzer-scan-task-ossindex-repartition`1D | 3 | |
-| `hyades-vulnerability-analyzer-scan-task-snyk-repartition`1E | 3 | |
-| `hyades-vulnerability-analyzer-snyk-batch-store-changelog`1E | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
-| `hyades-vulnerability-analyzer-snyk-retry-store-changelog`1E | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
+| `hyades-vulnerability-analyzer-scan-task-ossindex-repartition`1C | 3 | |
+| `hyades-vulnerability-analyzer-scan-task-snyk-repartition`1D | 3 | |
+| `hyades-vulnerability-analyzer-snyk-batch-store-changelog`1D | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
+| `hyades-vulnerability-analyzer-snyk-retry-store-changelog`1D | 3 | `cleanup.policy=compact`
`segment.bytes=67108864`
`max.compaction.lag.ms=0` |
*1X The topic is subject to [co-partitioning requirements](#co-partitioning-requirements)*
*2 The partition number of this topic should not be changed*
diff --git a/scripts/create-topics.sh b/scripts/create-topics.sh
index fb6413de4..15a421908 100644
--- a/scripts/create-topics.sh
+++ b/scripts/create-topics.sh
@@ -69,13 +69,13 @@ done
vuln_analysis_topics=(
"${KAFKA_TOPIC_PREFIX:-}dtrack.vuln-analysis.component"
"${KAFKA_TOPIC_PREFIX:-}dtrack.vuln-analysis.scanner.result"
+ "${KAFKA_TOPIC_PREFIX:-}dtrack.vuln-analysis.result"
+ "${KAFKA_TOPIC_PREFIX:-}dtrack.vuln-analysis.result.processed"
)
for topic_name in "${vuln_analysis_topics[@]}"; do
create_topic "$topic_name" "${VULN_ANALYSIS_TOPICS_PARTITIONS:-3}" "retention.ms=${VULN_ANALYSIS_TOPICS_RETENTION_MS:-43200000}"
done
-create_topic "${KAFKA_TOPIC_PREFIX:-}dtrack.vuln-analysis.result" "${VULN_ANALYSIS_RESULT_TOPIC_PARTITIONS:-3}" "retention.ms=${VULN_ANALYSIS_RESULT_TOPIC_RETENTION_MS:-43200000}"
-
create_topic "${KAFKA_TOPIC_PREFIX:-}dtrack.vulnerability.mirror.command" "1" "retention.ms=${VULN_MIRROR_TOPICS_RETENTION_MS:-43200000}"
create_topic "${KAFKA_TOPIC_PREFIX:-}dtrack.vulnerability.mirror.state" "1" "cleanup.policy=compact segment.bytes=67108864 max.compaction.lag.ms=0"
create_topic "${KAFKA_TOPIC_PREFIX:-}dtrack.vulnerability.digest" "1" "cleanup.policy=compact segment.bytes=134217728"