Merge pull request #252 from ess-dmsc/ECDC-2630_rename_EFU_topics

Ecdc 2630 rename efu topics
ess-dmsc · Aug 9, 2021 · a44a3ee · a44a3ee
2 parents 5e69f14 + d827f27
commit a44a3ee
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 23 deletions.
diff --git 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"
-}
+}
diff --git 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",
@@ -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"
-}
+}
diff --git 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",
@@ -160,7 +160,7 @@
         {
          "id": "KafkaTopicConfig/KafkaTopic",
          "type": "text",
-         "value": "NMX_monitor"
+         "value": "nmx_monitor"
         },
         {
          "id": "KafkaTopicConfig/KafkaFF",
@@ -235,4 +235,4 @@
  ],
  "id": "Engine",
  "type": "stem"
-}
+}
diff --git 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"
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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",

diff --git 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
@@ -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",