From 6ddc0a2526c5a0cef841a3ad3df245f7010133a6 Mon Sep 17 00:00:00 2001 From: Drew Johnston Date: Fri, 1 Aug 2025 15:23:56 -0600 Subject: [PATCH 1/2] Remove RawEncodedTimJson from MongoDB and the Deduplicator connectors --- jikkou/kafka-connectors-values.yaml | 7 ------- jikkou/kafka-topics-values.yaml | 2 -- mongo/create_indexes.js | 8 -------- 3 files changed, 17 deletions(-) diff --git a/jikkou/kafka-connectors-values.yaml b/jikkou/kafka-connectors-values.yaml index 1ae0fbd..e970341 100644 --- a/jikkou/kafka-connectors-values.yaml +++ b/jikkou/kafka-connectors-values.yaml @@ -118,9 +118,6 @@ apps: - topicName: topic.OdeBsmJson collectionName: OdeBsmJson generateTimestamp: true - - topicName: topic.OdeRawEncodedTIMJson - collectionName: OdeRawEncodedTIMJson - generateTimestamp: true geojsonconverter_duplicated: name: geojsonconverter-duplicated connectors: @@ -155,10 +152,6 @@ apps: collectionName: OdeTimJson generateTimestamp: true connectorName: DeduplicatedOdeTimJson - - topicName: topic.DeduplicatedOdeRawEncodedTIMJson - collectionName: OdeRawEncodedTIMJson - generateTimestamp: true - connectorName: DeduplicatedOdeRawEncodedTIMJson - topicName: topic.DeduplicatedOdeBsmJson collectionName: OdeBsmJson generateTimestamp: true diff --git a/jikkou/kafka-topics-values.yaml b/jikkou/kafka-topics-values.yaml index 625969b..21a60c2 100644 --- a/jikkou/kafka-topics-values.yaml +++ b/jikkou/kafka-topics-values.yaml @@ -182,8 +182,6 @@ apps: retentionMs: 43200000 - topicName: topic.DeduplicatedOdeTimJson retentionMs: 43200000 - - topicName: topic.DeduplicatedOdeRawEncodedTIMJson - retentionMs: 43200000 - topicName: topic.DeduplicatedOdeBsmJson retentionMs: 43200000 - topicName: topic.DeduplicatedProcessedBsm diff --git a/mongo/create_indexes.js b/mongo/create_indexes.js index 5d0cf41..ad6c91d 100644 --- a/mongo/create_indexes.js +++ b/mongo/create_indexes.js @@ -75,14 +75,6 @@ const odeCollections = [ {name: "OdeTimJson", "timeField": "recordGeneratedAt", rsuIP:"metadata.originIp", expireTime: expireSeconds}, {name: "OdeTimBroadcastJson", ttlField: "recordGeneratedAt", "timeField": "metadata.odeReceivedAt", intersectionField: null, rsuIP:"metadata.originIp", expireTime: expireSeconds}, {name: "OdeTIMCertExpirationTimeJson", ttlField: "recordGeneratedAt", "timeField": "metadata.odeReceivedAt", intersectionField: null, rsuIP:"metadata.originIp", expireTime: expireSeconds}, - - // Ode Raw ASN - {name: "OdeRawEncodedBSMJson", ttlField: "recordGeneratedAt", "timeField": "metadata.odeReceivedAt", intersectionField: null, rsuIP:"metadata.originIp", expireTime: ttlExpireSeconds}, - {name: "OdeRawEncodedMAPJson", ttlField: "recordGeneratedAt", "timeField": "metadata.odeReceivedAt", intersectionField: null, rsuIP:"metadata.originIp", expireTime: ttlExpireSeconds}, - {name: "OdeRawEncodedSPATJson", ttlField: "recordGeneratedAt", "timeField": "metadata.odeReceivedAt", intersectionField: null, rsuIP:"metadata.originIp", expireTime: ttlExpireSeconds}, - {name: "OdeRawEncodedSRMJson", ttlField: "recordGeneratedAt", "timeField": "metadata.odeReceivedAt", intersectionField: null, rsuIP:"metadata.originIp", expireTime: ttlExpireSeconds}, - {name: "OdeRawEncodedSSMJson", ttlField: "recordGeneratedAt", "timeField": "metadata.odeReceivedAt", intersectionField: null, rsuIP:"metadata.originIp", expireTime: ttlExpireSeconds}, - {name: "OdeRawEncodedTIMJson", ttlField: "recordGeneratedAt", "timeField": "metadata.odeReceivedAt", intersectionField: null, rsuIP:"metadata.originIp", expireTime: ttlExpireSeconds}, ]; // GeoJson Converter Data From 87fbe05072f1ce3d5c1468e3a596a170e9cef0ff Mon Sep 17 00:00:00 2001 From: Drew Johnston Date: Fri, 1 Aug 2025 15:28:19 -0600 Subject: [PATCH 2/2] Remove OdeRawEncoded connectors --- jikkou/kafka-connectors-values.yaml | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/jikkou/kafka-connectors-values.yaml b/jikkou/kafka-connectors-values.yaml index e970341..e0b5f6b 100644 --- a/jikkou/kafka-connectors-values.yaml +++ b/jikkou/kafka-connectors-values.yaml @@ -46,15 +46,6 @@ apps: ode: name: jpo-ode connectors: - - topicName: topic.OdeRawEncodedBSMJson - collectionName: OdeRawEncodedBSMJson - generateTimestamp: true - - topicName: topic.OdeRawEncodedMAPJson - collectionName: OdeRawEncodedMAPJson - generateTimestamp: true - - topicName: topic.OdeRawEncodedSPATJson - collectionName: OdeRawEncodedSPATJson - generateTimestamp: true - topicName: topic.OdeSpatJson collectionName: OdeSpatJson generateTimestamp: true @@ -67,42 +58,24 @@ apps: - topicName: topic.OdeTIMCertExpirationTimeJson collectionName: OdeTIMCertExpirationTimeJson generateTimestamp: true - - topicName: topic.OdeRawEncodedPSMJson - collectionName: OdeRawEncodedPSMJson - generateTimestamp: true - topicName: topic.OdePsmJson collectionName: OdePsmJson generateTimestamp: true - - topicName: topic.OdeRawEncodedSRMJson - collectionName: OdeRawEncodedSRMJson - generateTimestamp: true - topicName: topic.OdeSrmJson collectionName: OdeSrmJson generateTimestamp: true - - topicName: topic.OdeRawEncodedSSMJson - collectionName: OdeRawEncodedSSMJson - generateTimestamp: true - topicName: topic.OdeSsmJson collectionName: OdeSsmJson generateTimestamp: true - topicName: topic.OdeDriverAlertJson collectionName: OdeDriverAlertJson generateTimestamp: true - - topicName: topic.OdeRawEncodedSDSMJson - collectionName: OdeRawEncodedSDSMJson - generateTimestamp: true - topicName: topic.OdeSdsmJson collectionName: OdeSdsmJson generateTimestamp: true - - topicName: topic.OdeRawEncodedRTCMJson - collectionName: OdeRawEncodedRTCMJson - generateTimestamp: true - topicName: topic.OdeRtcmJson collectionName: OdeRtcmJson generateTimestamp: true - - topicName: topic.OdeRawEncodedRSMJson - collectionName: OdeRawEncodedRSMJson - generateTimestamp: true - topicName: topic.OdeRsmJson collectionName: OdeRsmJson generateTimestamp: true