add probe_src_addr to results table

Author: matthieugouel

Cargo.lock

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.95"
-caracat = "1.3.0"
+caracat = { git = "https://github.com/maxmouchet/caracat" }
 chrono = "0.4.39"
 clap = { version = "4.5.20", features = ["derive"] }
 clap-verbosity-flag = "3.0.0"

Cargo.toml

@@ -32,7 +32,7 @@ fn format_reply(reply: &Reply) -> String {
     output.push(format!("{}", reply.reply_icmp_type));
     output.push(format!("{}", reply.reply_icmp_code));
     output.push(format!("{}", format_mpls_labels(&reply.reply_mpls_labels)));
-    // TODO probe_src_addr
+    output.push(format!("{}", reply.probe_src_addr));
     output.push(format!("{}", reply.probe_dst_addr));
     output.push(format!("{}", reply.probe_id));
     output.push(format!("{}", reply.probe_size));

src/producer.rs

@@ -1,63 +1,66 @@
-    CREATE DATABASE osiris;
-    CREATE TABLE osiris.results_broker
-    (
-        timestamp DateTime64,
-        reply_src_addr IPv6,
-        reply_dst_addr IPv6,
-        reply_id UInt16,
-        reply_size UInt16,
-        reply_ttl UInt8,
-        reply_protocol UInt8,
-        reply_icmp_type UInt8,
-        reply_icmp_code UInt8,
-        reply_mpls_labels Array(Tuple(UInt32, UInt8, UInt8, UInt8)),
-        probe_dst_addr IPv6,
-        probe_id UInt16,
-        probe_size UInt16,
-        probe_protocol UInt8,
-        quoted_ttl UInt8,
-        probe_src_port UInt16,
-        probe_dst_port UInt16,
-        probe_ttl UInt8,
-        rtt UInt16
-    )
-    ENGINE = Kafka()
-    SETTINGS
-        kafka_broker_list = '10.0.0.100:9093',
-        kafka_topic_list = 'results',
-        kafka_group_name = 'clickhouse-results-group',
-        kafka_format = 'CSV';
+CREATE DATABASE osiris;
+CREATE TABLE osiris.results_broker
+(
+    timestamp DateTime64,
+    reply_src_addr IPv6,
+    reply_dst_addr IPv6,
+    reply_id UInt16,
+    reply_size UInt16,
+    reply_ttl UInt8,
+    reply_protocol UInt8,
+    reply_icmp_type UInt8,
+    reply_icmp_code UInt8,
+    reply_mpls_labels Array(Tuple(UInt32, UInt8, UInt8, UInt8)),
+    probe_src_addr IPv6,
+    probe_dst_addr IPv6,
+    probe_id UInt16,
+    probe_size UInt16,
+    probe_protocol UInt8,
+    quoted_ttl UInt8,
+    probe_src_port UInt16,
+    probe_dst_port UInt16,
+    probe_ttl UInt8,
+    rtt UInt16
+)
+ENGINE = Kafka()
+SETTINGS
+    kafka_broker_list = '10.0.0.100:9093',
+    kafka_topic_list = 'results',
+    kafka_group_name = 'clickhouse-results-group',
+    kafka_format = 'CSV';
 
-    CREATE TABLE osiris.results
-    (
-        timestamp DateTime64,
-        reply_src_addr IPv6,
-        reply_dst_addr IPv6,
-        reply_id UInt16,
-        reply_size UInt16,
-        reply_ttl UInt8,
-        reply_protocol UInt8,
-        reply_icmp_type UInt8,
-        reply_icmp_code UInt8,
-        reply_mpls_labels Array(Tuple(UInt32, UInt8, UInt8, UInt8)),
-        probe_dst_addr IPv6,
-        probe_id UInt16,
-        probe_size UInt16,
-        probe_protocol UInt8,
-        quoted_ttl UInt8,
-        probe_src_port UInt16,
-        probe_dst_port UInt16,
-        probe_ttl UInt8,
-        rtt UInt16
-    )
-    ENGINE = MergeTree()
-    ORDER BY (
-        probe_protocol,
-        probe_dst_addr,
-        probe_src_port,
-        probe_dst_port,
-        probe_ttl
-    );
+CREATE TABLE osiris.results
+(
+    timestamp DateTime64,
+    reply_src_addr IPv6,
+    reply_dst_addr IPv6,
+    reply_id UInt16,
+    reply_size UInt16,
+    reply_ttl UInt8,
+    reply_protocol UInt8,
+    reply_icmp_type UInt8,
+    reply_icmp_code UInt8,
+    reply_mpls_labels Array(Tuple(UInt32, UInt8, UInt8, UInt8)),
+    probe_src_addr IPv6,
+    probe_dst_addr IPv6,
+    probe_id UInt16,
+    probe_size UInt16,
+    probe_protocol UInt8,
+    quoted_ttl UInt8,
+    probe_src_port UInt16,
+    probe_dst_port UInt16,
+    probe_ttl UInt8,
+    rtt UInt16
+)
+ENGINE = MergeTree()
+ORDER BY (
+    probe_protocol,
+    probe_src_addr,
+    probe_dst_addr,
+    probe_src_port,
+    probe_dst_port,
+    probe_ttl
+);
 
-    CREATE MATERIALIZED VIEW osiris.results_broker_mv TO osiris.results
-    AS SELECT * FROM osiris.results_broker;
+CREATE MATERIALIZED VIEW osiris.results_broker_mv TO osiris.results
+AS SELECT * FROM osiris.results_broker;