flows au bon endroit

.devcontainer/compose.yml

@@ -10,7 +10,7 @@ services:
       - dev_net
 
   nodered:
-    image: nodered/node-red:4.1
+    build: ./nodered
     container_name: nodered
     ports:
       - "1880:1880"
@@ -19,8 +19,7 @@ services:
     environment:
       TZ: Europe/Paris
     volumes:
-    - ./nodered-data:/data
+      - nodered:/data
-    - ./nodered-flows/flows.json:/data/flows.json
 
   rabbitmq:
     image: rabbitmq:4.1.4-management
@@ -51,4 +50,5 @@ networks:
   dev_net:
 
 volumes:
+  nodered:
   rabbitmq:

.devcontainer/devcontainer.json

@@ -5,6 +5,7 @@
   ],
   "service": "dev",
   "workspaceFolder": "/workspace",
+  "postStartCommand": "cmake -S . -B build -DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
   "customizations": {
     "vscode": {
       "settings": {

.devcontainer/nodered/Dockerfile

@@ -0,0 +1,7 @@
+FROM nodered/node-red:4.1
+
+# Installer FlowFuse Dashboard
+RUN npm install --unsafe-perm @flowfuse/node-red-dashboard
+
+# Copier votre flux si nécessaire
+COPY flows.json /data/flows.json

.devcontainer/nodered/flows.json

@@ -0,0 +1,124 @@
+[
+    {
+        "id": "b5dc1ebb90703c45",
+        "type": "ui-text",
+        "z": "41526b8c80d5a5f7",
+        "g": "cc2c8bd885d00eb5",
+        "group": "d7c1d71a4dcf42ce",
+        "order": 5,
+        "width": "2",
+        "height": "1",
+        "name": "",
+        "label": "max",
+        "format": "{{msg.payload}}",
+        "layout": "row-right",
+        "style": false,
+        "font": "",
+        "fontSize": 16,
+        "color": "#717171",
+        "wrapText": false,
+        "className": "",
+        "value": "payload",
+        "valueType": "msg",
+        "x": 850,
+        "y": 700,
+        "wires": []
+    },
+    {
+        "id": "d7c1d71a4dcf42ce",
+        "type": "ui-group",
+        "name": "Réservoir",
+        "page": "5e9c1f56ed1b2af5",
+        "width": 6,
+        "height": 1,
+        "order": 1,
+        "showTitle": true,
+        "className": "",
+        "visible": "true",
+        "disabled": "false",
+        "groupType": "default"
+    },
+    {
+        "id": "5e9c1f56ed1b2af5",
+        "type": "ui-page",
+        "name": "Tableau de bord",
+        "ui": "15f54ff2469ec593",
+        "path": "/page1",
+        "icon": "home",
+        "layout": "grid",
+        "theme": "64cdf126ed34d37d",
+        "breakpoints": [
+            {
+                "name": "Default",
+                "px": "0",
+                "cols": "3"
+            },
+            {
+                "name": "Tablet",
+                "px": "576",
+                "cols": "6"
+            },
+            {
+                "name": "Small Desktop",
+                "px": "768",
+                "cols": "9"
+            },
+            {
+                "name": "Desktop",
+                "px": "1024",
+                "cols": "12"
+            }
+        ],
+        "order": 1,
+        "className": "",
+        "visible": true,
+        "disabled": false
+    },
+    {
+        "id": "15f54ff2469ec593",
+        "type": "ui-base",
+        "name": "My Dashboard",
+        "path": "/dashboard",
+        "appIcon": "",
+        "includeClientData": true,
+        "acceptsClientConfig": [
+            "ui-notification",
+            "ui-control"
+        ],
+        "showPathInSidebar": false,
+        "headerContent": "page",
+        "navigationStyle": "default",
+        "titleBarStyle": "default",
+        "showReconnectNotification": true,
+        "notificationDisplayTime": 1,
+        "showDisconnectNotification": true,
+        "allowInstall": false
+    },
+    {
+        "id": "64cdf126ed34d37d",
+        "type": "ui-theme",
+        "name": "Default Theme",
+        "colors": {
+            "surface": "#ffffff",
+            "primary": "#813d9c",
+            "bgPage": "#eeeeee",
+            "groupBg": "#ffffff",
+            "groupOutline": "#cccccc"
+        },
+        "sizes": {
+            "density": "default",
+            "pagePadding": "12px",
+            "groupGap": "12px",
+            "groupBorderRadius": "4px",
+            "widgetGap": "12px"
+        }
+    },
+    {
+        "id": "d55adf124e9ef5ad",
+        "type": "global-config",
+        "env": [],
+        "modules": {
+            "@flowfuse/node-red-dashboard": "1.29.0"
+        }
+    }
+]

.vscode/launch.json

@@ -2,10 +2,10 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Debug geii_exporter",
+            "name": "Debug pompes",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/build/geii_exporter",
+            "program": "${workspaceFolder}/build/pompes",
             "args": [],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
@@ -23,4 +23,3 @@
         }
     ]
 }
-

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.15)
-project(geii_exporter LANGUAGES CXX)
+project(pompes LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -9,7 +9,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic")
 
 # Executable principal
-add_executable(geii_exporter
+add_executable(pompes
     main.cpp
 )
 
@@ -45,7 +45,7 @@ find_package(prometheus-cpp REQUIRED)
 # -------------------------------
 # Lien des bibliothèques
 # -------------------------------
-target_link_libraries(geii_exporter
+target_link_libraries(pompes
     prometheus-cpp::core
     prometheus-cpp::pull
     ${CURL_LIBRARIES}