From d3dbccd8ac895d03765cc6e4d194f1f978bbb858 Mon Sep 17 00:00:00 2001 From: Morten Jagd Christensen Date: Mon, 9 Aug 2021 14:40:07 +0200 Subject: [PATCH 1/2] rename topics to lower case, remove dashes --- data/profiles/mgcncs/profile.set | 4 ++-- data/profiles/mgmesytec/profile.set | 2 +- data/profiles/nmx/profile.set | 4 ++-- data/profiles/skadi/profile.set | 4 ++-- source/daqlite/Configuration.h | 2 +- source/daqlite/configs/amor.json | 2 +- source/daqlite/configs/dreamoffice.json | 2 +- source/daqlite/configs/lokioffice.json | 2 +- source/daqlite/configs/vipcspec2d.json | 2 +- source/daqlite/configs/vipcspec3d.json | 2 +- source/daqlite/configs/vipdream.json | 2 +- source/daqlite/configs/vipfreia.json | 2 +- source/daqlite/configs/vipfreiatof.json | 2 +- source/daqlite/configs/viploki.json | 2 +- source/daqlite/configs/viplokitof.json | 2 +- source/daqlite/configs/vipnmx.json | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/data/profiles/mgcncs/profile.set b/data/profiles/mgcncs/profile.set index ca5dd769..ba5dd257 100644 --- a/data/profiles/mgcncs/profile.set +++ b/data/profiles/mgcncs/profile.set @@ -50,7 +50,7 @@ { "id": "KafkaTopicConfig/KafkaTopic", "type": "text", - "value": "C-SPEC_detector" + "value": "cspec_detector" }, { "id": "KafkaTopicConfig/KafkaFF", @@ -161,4 +161,4 @@ ], "id": "Engine", "type": "stem" -} \ No newline at end of file +} diff --git a/data/profiles/mgmesytec/profile.set b/data/profiles/mgmesytec/profile.set index 73ab0d7f..d58ad57b 100644 --- a/data/profiles/mgmesytec/profile.set +++ b/data/profiles/mgmesytec/profile.set @@ -50,7 +50,7 @@ { "id": "KafkaTopicConfig/KafkaTopic", "type": "text", - "value": "C-SPEC_detector" + "value": "cspec_detector" }, { "id": "KafkaTopicConfig/KafkaFF", diff --git a/data/profiles/nmx/profile.set b/data/profiles/nmx/profile.set index 05d65dea..ef4cc6d7 100644 --- a/data/profiles/nmx/profile.set +++ b/data/profiles/nmx/profile.set @@ -50,7 +50,7 @@ { "id": "KafkaTopicConfig/KafkaTopic", "type": "text", - "value": "NMX_detector" + "value": "nmx_detector" }, { "id": "KafkaTopicConfig/KafkaFF", @@ -235,4 +235,4 @@ ], "id": "Engine", "type": "stem" -} \ No newline at end of file +} diff --git a/data/profiles/skadi/profile.set b/data/profiles/skadi/profile.set index f7d2cab9..271775bd 100644 --- a/data/profiles/skadi/profile.set +++ b/data/profiles/skadi/profile.set @@ -50,7 +50,7 @@ { "id": "KafkaTopicConfig/KafkaTopic", "type": "text", - "value": "SKADI_detector" + "value": "skadi_detector" }, { "id": "KafkaTopicConfig/KafkaFF", @@ -161,4 +161,4 @@ ], "id": "Engine", "type": "stem" -} \ No newline at end of file +} diff --git a/source/daqlite/Configuration.h b/source/daqlite/Configuration.h index 3aab9e44..97cd2d04 100644 --- a/source/daqlite/Configuration.h +++ b/source/daqlite/Configuration.h @@ -41,7 +41,7 @@ class Configuration { } Geometry; struct { - std::string Topic{"NMX_detector"}; + std::string Topic{"nmx_detector"}; std::string Broker{"172.17.5.38:9092"}; std::string MessageMaxBytes{"10000000"}; std::string FetchMessagMaxBytes{"10000000"}; diff --git a/source/daqlite/configs/amor.json b/source/daqlite/configs/amor.json index 9bce3e95..bcfdfb45 100644 --- a/source/daqlite/configs/amor.json +++ b/source/daqlite/configs/amor.json @@ -1,7 +1,7 @@ { "kafka" : { "broker" : "172.30.242.20:9092", - "topic" : "FREIA_detector", + "topic" : "freia_detector", "message.max.bytes" : "10000000", "fetch.message.max.bytes" : "10000000", diff --git a/source/daqlite/configs/dreamoffice.json b/source/daqlite/configs/dreamoffice.json index 499064f9..5d3eb3a0 100644 --- a/source/daqlite/configs/dreamoffice.json +++ b/source/daqlite/configs/dreamoffice.json @@ -1,7 +1,7 @@ { "kafka" : { "broker" : "172.17.5.38:9092", - "topic" : "DREAM_detector", + "topic" : "dream_detector", "message.max.bytes" : "10000000", "fetch.message.max.bytes" : "10000000", diff --git a/source/daqlite/configs/lokioffice.json b/source/daqlite/configs/lokioffice.json index ee4652d3..a2af30bb 100644 --- a/source/daqlite/configs/lokioffice.json +++ b/source/daqlite/configs/lokioffice.json @@ -1,7 +1,7 @@ { "kafka" : { "broker" : "172.17.5.38:9092", - "topic" : "LOKI_detector", + "topic" : "loki_detector", "message.max.bytes" : "10000000", "fetch.message.max.bytes" : "10000000", diff --git a/source/daqlite/configs/vipcspec2d.json b/source/daqlite/configs/vipcspec2d.json index bcf0ee46..ca16ed0a 100644 --- a/source/daqlite/configs/vipcspec2d.json +++ b/source/daqlite/configs/vipcspec2d.json @@ -1,7 +1,7 @@ { "kafka" : { "broker" : "172.30.242.20:9092", - "topic" : "C-SPEC_detector", + "topic" : "cspec_detector", "message.max.bytes" : "10000000", "fetch.message.max.bytes" : "10000000", diff --git a/source/daqlite/configs/vipcspec3d.json b/source/daqlite/configs/vipcspec3d.json index b690b205..8ea93b0d 100644 --- a/source/daqlite/configs/vipcspec3d.json +++ b/source/daqlite/configs/vipcspec3d.json @@ -1,7 +1,7 @@ { "kafka" : { "broker" : "172.30.242.20:9092", - "topic" : "C-SPEC_detector", + "topic" : "cspec_detector", "message.max.bytes" : "10000000", "fetch.message.max.bytes" : "10000000", diff --git a/source/daqlite/configs/vipdream.json b/source/daqlite/configs/vipdream.json index 75bff2b8..74ffdf5a 100644 --- a/source/daqlite/configs/vipdream.json +++ b/source/daqlite/configs/vipdream.json @@ -1,7 +1,7 @@ { "kafka" : { "broker" : "172.30.242.20:9092", - "topic" : "DREAM_detector", + "topic" : "dream_detector", "message.max.bytes" : "10000000", "fetch.message.max.bytes" : "10000000", diff --git a/source/daqlite/configs/vipfreia.json b/source/daqlite/configs/vipfreia.json index ded3de57..aa06564c 100644 --- a/source/daqlite/configs/vipfreia.json +++ b/source/daqlite/configs/vipfreia.json @@ -1,7 +1,7 @@ { "kafka" : { "broker" : "172.30.242.20:9092", - "topic" : "FREIA_detector", + "topic" : "freia_detector", "message.max.bytes" : "10000000", "fetch.message.max.bytes" : "10000000", diff --git a/source/daqlite/configs/vipfreiatof.json b/source/daqlite/configs/vipfreiatof.json index f9b3ee30..2a40268e 100644 --- a/source/daqlite/configs/vipfreiatof.json +++ b/source/daqlite/configs/vipfreiatof.json @@ -1,7 +1,7 @@ { "kafka" : { "broker" : "172.30.242.20:9092", - "topic" : "FREIA_detector", + "topic" : "freia_detector", "message.max.bytes" : "10000000", "fetch.message.max.bytes" : "10000000", diff --git a/source/daqlite/configs/viploki.json b/source/daqlite/configs/viploki.json index cd5a0adc..7f07fb0a 100644 --- a/source/daqlite/configs/viploki.json +++ b/source/daqlite/configs/viploki.json @@ -1,7 +1,7 @@ { "kafka" : { "broker" : "172.30.242.20:9092", - "topic" : "LOKI_detector", + "topic" : "loki_detector", "message.max.bytes" : "10000000", "fetch.message.max.bytes" : "10000000", diff --git a/source/daqlite/configs/viplokitof.json b/source/daqlite/configs/viplokitof.json index c5bf5601..ff8dcab7 100644 --- a/source/daqlite/configs/viplokitof.json +++ b/source/daqlite/configs/viplokitof.json @@ -1,7 +1,7 @@ { "kafka" : { "broker" : "172.30.242.20:9092", - "topic" : "LOKI_detector", + "topic" : "loki_detector", "message.max.bytes" : "10000000", "fetch.message.max.bytes" : "10000000", diff --git a/source/daqlite/configs/vipnmx.json b/source/daqlite/configs/vipnmx.json index 6e87e1db..1348ceeb 100644 --- a/source/daqlite/configs/vipnmx.json +++ b/source/daqlite/configs/vipnmx.json @@ -1,7 +1,7 @@ { "kafka" : { "broker" : "172.30.242.20:9092", - "topic" : "NMX_detector", + "topic" : "nmx_detector", "message.max.bytes" : "10000000", "fetch.message.max.bytes" : "10000000", From d827f27614b5b998a13e1399322c1fa3fc1a3aa6 Mon Sep 17 00:00:00 2001 From: Morten Jagd Christensen Date: Mon, 9 Aug 2021 14:52:41 +0200 Subject: [PATCH 2/2] rename topics, remove dashes II --- data/profiles/mgmesytec/profile.set | 4 ++-- data/profiles/nmx/profile.set | 2 +- source/daqlite/configs/viploki4amp.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/profiles/mgmesytec/profile.set b/data/profiles/mgmesytec/profile.set index d58ad57b..89ed4865 100644 --- a/data/profiles/mgmesytec/profile.set +++ b/data/profiles/mgmesytec/profile.set @@ -160,7 +160,7 @@ { "id": "KafkaTopicConfig/KafkaTopic", "type": "text", - "value": "C-SPEC_monitor" + "value": "cspec_monitor" }, { "id": "KafkaTopicConfig/KafkaFF", @@ -235,4 +235,4 @@ ], "id": "Engine", "type": "stem" -} \ No newline at end of file +} diff --git a/data/profiles/nmx/profile.set b/data/profiles/nmx/profile.set index ef4cc6d7..ac5bf6a6 100644 --- a/data/profiles/nmx/profile.set +++ b/data/profiles/nmx/profile.set @@ -160,7 +160,7 @@ { "id": "KafkaTopicConfig/KafkaTopic", "type": "text", - "value": "NMX_monitor" + "value": "nmx_monitor" }, { "id": "KafkaTopicConfig/KafkaFF", diff --git a/source/daqlite/configs/viploki4amp.json b/source/daqlite/configs/viploki4amp.json index e99ce45d..43f6cdc2 100644 --- a/source/daqlite/configs/viploki4amp.json +++ b/source/daqlite/configs/viploki4amp.json @@ -1,7 +1,7 @@ { "kafka" : { "broker" : "172.30.242.20:9092", - "topic" : "LOKI_debug", + "topic" : "loki_debug", "message.max.bytes" : "10000000", "fetch.message.max.bytes" : "10000000",