Skip to content

Commit 35bf4d6

Browse files
nscuronscuro
committed
Add dtrack.vuln-analysis.result.processed topic
As introduced in DependencyTrack/hyades-apiserver#637 Also removes Kafka Streams related environment variables for API server from `docker-compose.yml` Signed-off-by: nscuro <[email protected]>
1 parent e28787a commit 35bf4d6

File tree

3 files changed

+19
-23
lines changed

3 files changed

+19
-23
lines changed

‎docker-compose.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,12 @@ services:
133133
# which can cause problems on some workstations.
134134
# For production deployments, the default should be used.
135135
EXTRA_JAVA_OPTIONS: "-Xmx2g"
136-
ALPINE_DATABASE_MODE: "external"
137136
ALPINE_DATABASE_URL: "jdbc:postgresql://dt-postgres:5432/dtrack"
138-
ALPINE_DATABASE_DRIVER: "org.postgresql.Driver"
139137
ALPINE_DATABASE_USERNAME: "dtrack"
140138
ALPINE_DATABASE_PASSWORD: "dtrack"
141139
ALPINE_METRICS_ENABLED: "true"
142140
ALPINE_SECRET_KEY_PATH: "/var/run/secrets/secret.key"
143141
KAFKA_BOOTSTRAP_SERVERS: "dt-redpanda:29092"
144-
KAFKA_NUM_STREAM_THREADS: "12" # Default number of input partitions is 12
145-
KAFKA_STREAMS_METRICS_RECORDING_LEVEL: "DEBUG"
146142
INTEGRITY_CHECK_ENABLED: "true"
147143
ports:
148144
- "127.0.0.1:8080:8080"
@@ -237,8 +233,6 @@ services:
237233
# REPO_META_ANALYSIS_TOPICS_RETENTION_MS: "43200000" # 12h
238234
# VULN_ANALYSIS_TOPICS_PARTITIONS: "3"
239235
# VULN_ANALYSIS_TOPICS_RETENTION_MS: "43200000" # 12h
240-
# VULN_ANALYSIS_RESULT_TOPIC_PARTITIONS: "3"
241-
# VULN_ANALYSIS_RESULT_TOPIC_RETENTION_MS: "43200000" # 12h
242236
# VULN_MIRROR_TOPICS_PARTITIONS: "3"
243237
# VULN_MIRROR_TOPICS_RETENTION_MS: "43200000" # 12h
244238
volumes:
@@ -302,6 +296,8 @@ services:
302296
- topicName: dtrack.vuln-analysis.result
303297
keyProtoType: org.dependencytrack.vulnanalysis.v1.ScanKey
304298
valueProtoType: org.dependencytrack.vulnanalysis.v1.ScanResult
299+
- topicName: dtrack.vuln-analysis.result.processed
300+
valueProtoType: org.dependencytrack.vulnanalysis.v1.ScanResult
305301
- topicName: dtrack.vulnerability
306302
valueProtoType: org.cyclonedx.v1_4.Bom
307303
fileSystem:

‎docs/reference/topics.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
| Name | Partitions | Config |
44
|:--------------------------------------------------------------------------------------------------|:-----------|:------------------------------------------------------------------------------------|
5-
| `dtrack-apiserver-processed-vuln-scan-result-by-scan-token-repartition`<sup>1A</sup> | 3 | |
65
| `dtrack.notification.analyzer` | 3 | |
76
| `dtrack.notification.bom` | 3 | |
87
| `dtrack.notification.configuration` | 3 | |
@@ -17,26 +16,27 @@
1716
| `dtrack.notification.repository` | 3 | |
1817
| `dtrack.notification.vex` | 3 | |
1918
| `dtrack.notification.project-vuln-analysis-complete` <sup>3</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
20-
| `dtrack.repo-meta-analysis.component`<sup>1B</sup> | 3 | |
19+
| `dtrack.repo-meta-analysis.component`<sup>1A</sup> | 3 | |
2120
| `dtrack.repo-meta-analysis.result` | 3 | |
22-
| `dtrack.vuln-analysis.component`<sup>1C</sup> | 3 | |
23-
| `dtrack.vuln-analysis.result`<sup>1A</sup> | 3 | |
24-
| `dtrack.vuln-analysis.scanner.result`<sup>1C</sup> | 3 | |
21+
| `dtrack.vuln-analysis.component`<sup>1B</sup> | 3 | |
22+
| `dtrack.vuln-analysis.result` | 3 | |
23+
| `dtrack.vuln-analysis.result.processed` | 3 | |
24+
| `dtrack.vuln-analysis.scanner.result`<sup>1B</sup> | 3 | |
2525
| `dtrack.vulnerability` | 3 | `cleanup.policy=compact` |
2626
| `dtrack.vulnerability.digest`<sup>2</sup> | 1 | `cleanup.policy=compact` |
2727
| `dtrack.vulnerability.mirror.command`<sup>2</sup> | 1 | |
2828
| `dtrack.vulnerability.mirror.state`<sup>2</sup> | 1 | `cleanup.policy=compact` |
29-
| `hyades-repository-meta-analyzer-command-by-purl-coordinates-repartition`<sup>1B</sup> | 3 | |
30-
| `hyades-vulnerability-analyzer-completed-scans-table-changelog`<sup>1C</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
31-
| `hyades-vulnerability-analyzer-expected-scanner-results-last-update-store-changelog`<sup>1C</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
32-
| `hyades-vulnerability-analyzer-expected-scanner-results-table-changelog`<sup>1C</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
33-
| `hyades-vulnerability-analyzer-ossindex-batch-store-changelog`<sup>1D</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
34-
| `hyades-vulnerability-analyzer-ossindex-retry-store-changelog`<sup>1D</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
29+
| `hyades-repository-meta-analyzer-command-by-purl-coordinates-repartition`<sup>1A</sup> | 3 | |
30+
| `hyades-vulnerability-analyzer-completed-scans-table-changelog`<sup>1B</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
31+
| `hyades-vulnerability-analyzer-expected-scanner-results-last-update-store-changelog`<sup>1B</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
32+
| `hyades-vulnerability-analyzer-expected-scanner-results-table-changelog`<sup>1B</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
33+
| `hyades-vulnerability-analyzer-ossindex-batch-store-changelog`<sup>1C</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
34+
| `hyades-vulnerability-analyzer-ossindex-retry-store-changelog`<sup>1C</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
3535
| `hyades-vulnerability-analyzer-scan-task-internal-repartition` | 3 | |
36-
| `hyades-vulnerability-analyzer-scan-task-ossindex-repartition`<sup>1D</sup> | 3 | |
37-
| `hyades-vulnerability-analyzer-scan-task-snyk-repartition`<sup>1E</sup> | 3 | |
38-
| `hyades-vulnerability-analyzer-snyk-batch-store-changelog`<sup>1E</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
39-
| `hyades-vulnerability-analyzer-snyk-retry-store-changelog`<sup>1E</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
36+
| `hyades-vulnerability-analyzer-scan-task-ossindex-repartition`<sup>1C</sup> | 3 | |
37+
| `hyades-vulnerability-analyzer-scan-task-snyk-repartition`<sup>1D</sup> | 3 | |
38+
| `hyades-vulnerability-analyzer-snyk-batch-store-changelog`<sup>1D</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
39+
| `hyades-vulnerability-analyzer-snyk-retry-store-changelog`<sup>1D</sup> | 3 | `cleanup.policy=compact`<br/>`segment.bytes=67108864`<br/>`max.compaction.lag.ms=0` |
4040

4141
*<sup>1X</sup> The topic is subject to [co-partitioning requirements](#co-partitioning-requirements)*
4242
*<sup>2</sup> The partition number of this topic should not be changed*

‎scripts/create-topics.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ done
6969
vuln_analysis_topics=(
7070
"${KAFKA_TOPIC_PREFIX:-}dtrack.vuln-analysis.component"
7171
"${KAFKA_TOPIC_PREFIX:-}dtrack.vuln-analysis.scanner.result"
72+
"${KAFKA_TOPIC_PREFIX:-}dtrack.vuln-analysis.result"
73+
"${KAFKA_TOPIC_PREFIX:-}dtrack.vuln-analysis.result.processed"
7274
)
7375
for topic_name in "${vuln_analysis_topics[@]}"; do
7476
create_topic "$topic_name" "${VULN_ANALYSIS_TOPICS_PARTITIONS:-3}" "retention.ms=${VULN_ANALYSIS_TOPICS_RETENTION_MS:-43200000}"
7577
done
7678

77-
create_topic "${KAFKA_TOPIC_PREFIX:-}dtrack.vuln-analysis.result" "${VULN_ANALYSIS_RESULT_TOPIC_PARTITIONS:-3}" "retention.ms=${VULN_ANALYSIS_RESULT_TOPIC_RETENTION_MS:-43200000}"
78-
7979
create_topic "${KAFKA_TOPIC_PREFIX:-}dtrack.vulnerability.mirror.command" "1" "retention.ms=${VULN_MIRROR_TOPICS_RETENTION_MS:-43200000}"
8080
create_topic "${KAFKA_TOPIC_PREFIX:-}dtrack.vulnerability.mirror.state" "1" "cleanup.policy=compact segment.bytes=67108864 max.compaction.lag.ms=0"
8181
create_topic "${KAFKA_TOPIC_PREFIX:-}dtrack.vulnerability.digest" "1" "cleanup.policy=compact segment.bytes=134217728"

0 commit comments

Comments
 (0)