fix csv2bufr, fix stack

wmo-im · Sep 13, 2023 · 22b359a · 22b359a
1 parent efc00ca
commit 22b359a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git a/docker-compose.monitoring.yml b/docker-compose.monitoring.yml
@@ -59,19 +59,19 @@ services:
     command:
       - '--config.file=/etc/prometheus/prometheus.yml'
       - '--storage.tsdb.retention.time=10d'
-  # cadvisor to monitor our containers!
-  cadvisor:
-    image: gcr.io/cadvisor/cadvisor:v0.45.0
-    container_name: cadvisor
-    volumes:
-      - /:/rootfs:ro
-      - /var/run:/var/run:ro
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-      - /sys:/sys:ro
-      - /var/lib/docker/:/var/lib/docker:ro
-      - /dev/disk:/dev/disk/:ro
-    depends_on:
-      - wis2box-management
+  # uncomment cadvisor to monitor our containers
+  # cadvisor:
+  #  image: gcr.io/cadvisor/cadvisor:v0.45.0
+  #  container_name: cadvisor
+  #  volumes:
+  #    - /:/rootfs:ro
+  #    - /var/run:/var/run:ro
+  #    - /var/run/docker.sock:/var/run/docker.sock:ro
+  #    - /sys:/sys:ro
+  #    - /var/lib/docker/:/var/lib/docker:ro
+  #    - /dev/disk:/dev/disk/:ro
+  #  depends_on:
+  #    - wis2box-management
   # Grafana, graphical monitoring dashboards for wis2box using data from loki and prometheus
   grafana:
     <<: *logging

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
 
   wis2box-api:
     container_name: wis2box-api
-    image: ghcr.io/wmo-im/wis2box-api:1.0b5
+    image: wmoim/wis2box-api:wis2box-1.0b5
     restart: always
     env_file:
       - default.env

diff --git a/tests/data/data-mappings.yml b/tests/data/data-mappings.yml
@@ -18,11 +18,6 @@ data:
                   file-pattern: '^.*\.bufr4$' 
     rou.rnimh.data.core.weather.surface-based-observations.synop:
         plugins:
-            csv:
-                - plugin: wis2box.data.csv2bufr.ObservationDataCSV2BUFR
-                  template: /data/wis2box/aws_default_mappings.json
-                  notify: true
-                  file-pattern: '^.*.csv$'
             txt:
                 - plugin: wis2box.data.synop2bufr.ObservationDataSYNOP2BUFR
                   notify: true
@@ -34,7 +29,7 @@ data:
         plugins:
             csv:
                 - plugin: wis2box.data.csv2bufr.ObservationDataCSV2BUFR
-                  template: synop_bufr.json
+                  template: synop_bufr
                   notify: true
                   file-pattern: '^WIGOS_(\d-\d+-\d+-\w+)_.*\.csv$'
             bufr4:

diff --git a/wis2box-management/wis2box/data/csv2bufr.py b/wis2box-management/wis2box/data/csv2bufr.py
@@ -76,7 +76,7 @@ def transform(self, input_data: Union[Path, bytes],
         # execute process
         inputs = {
             "data": input_bytes.decode(),
-            "mapping": self.mappings['bufr4'],
+            "template": self.template,
             "channel": self.topic_hierarchy,
             "notify": self.enable_notification
         }