v1.5.7

RELEASE.md

@@ -1,24 +1,34 @@
 # Release Notes
 
+## v1.5.7
+
+- Update MCP to 1.4.2: fixes database locked error
+- deployment-examples: change data path
+- sh-services script improvements
+
 ## v1.5.6
+
 - Update SIO to r240318
 - Update .env editing for better understanding (add banners and more)
 - Remove SIO images when disk is full
 
 ## v1.5.5
+
 - Initial version of on-demand analytics sample
 - Sighthound REST API Gateway - Docker Compose Updates
 - Fix MCPEvents logic
 - Update SIO version
 - sh-services: bug fix: ensure folders are created before interacting with them
 
 ## v1.5.4
+
 - Add more sio examples and rename them
 - Fix MCPEvents example
 - Update SIO to r231204 that fixes hanging issue
 - sh-services: add rabbitmq check fn
 
 ## v1.5.3 
+
 - Add Aqueduct API and UI examples
 - Refine Aqueduct runner example
 - Add fakeRTSP example configuration

VERSION

@@ -1 +1 @@
-v1.5.6
+v1.5.7

deployment-examples/SIOOnDemandAnalytics/docker-compose.yml

@@ -10,6 +10,10 @@ services:
     restart: unless-stopped
     ports:
       - "8554:554"
+    volumes:
+      # A local folder we can drop videos into and have those references via RTSP URI
+      # Keep in mind, the videos need to be H264 MKV to be properly served by the server
+      - ${DEMO_VIDEO-./videos}:/mnt/data
 
   # The actual analytics container
   analytics:

deployment-examples/StandaloneSIOWithExtension/docker-compose-rtsp.yml

@@ -10,6 +10,10 @@ services:
     restart: unless-stopped
     ports:
       - "8554:554"
+    volumes:
+      # A local folder we can drop videos into and have those references via RTSP URI
+      # Keep in mind, the videos need to be H264 MKV to be properly served by the server
+      - ${DEMO_VIDEO-./videos}:/mnt/data
 
 
   analytics:

deployment-examples/VideoStreamsConsumer/docker-compose.yml

@@ -10,6 +10,10 @@ services:
     restart: unless-stopped
     ports:
       - "8554:554"
+    volumes:
+      # A local folder we can drop videos into and have those references via RTSP URI
+      # Keep in mind, the videos need to be H264 MKV to be properly served by the server
+      - ${DEMO_VIDEO-./videos}:/mnt/data
 
   # AMQP broker to receive analytics data
   rabbitmq_svc:

deployment-examples/VideoStreamsRecorder/docker-compose.yml

@@ -10,6 +10,10 @@ services:
     restart: unless-stopped
     ports:
       - "8554:554"
+    volumes:
+      # A local folder we can drop videos into and have those references via RTSP URI
+      # Keep in mind, the videos need to be H264 MKV to be properly served by the server
+      - ${DEMO_VIDEO-./videos}:/mnt/data
 
   # AMQP broker to receive analytics data
   rabbitmq_svc:

scripts/sh-services

@@ -252,7 +252,7 @@ function merge() {
     local service=$1
     local service_full_path="${SERVICES_PATH}/${service}"
     touch "${service_full_path}/.env"
-    env_files_to_merge="${service_full_path}/.env"
+    env_files_to_merge=""
 
     # Check for .env files
     mkdir -p "${service_full_path}"/conf
@@ -377,22 +377,36 @@ function edit() {
     touch "${service_full_path}/conf/0001-edit.env"
     # Remove comments and duplicates from the edit file
     remove_comments_and_duplicates "${service_full_path}/conf/0001-edit.env"
+    # Add Header
+    cat <<EOF >"${service_full_path}/conf/0001-edit.env.tmp" 
+# ATTENTION
+#
+# You are editing the ${service}/conf/0001-edit.env file
+# In this file, you will find the uncommented lines corresponding to the current changes
+# And below you will find commented lines corresponding to the current variables set on the .env file
+#
+# After you close this file, your changes will be stored at: "${service_full_path}/.env"
+#
+# Current changes:
+EOF
+    cat "${service_full_path}/conf/0001-edit.env" >> "${service_full_path}/conf/0001-edit.env.tmp"
+    mv "${service_full_path}/conf/0001-edit.env.tmp" "${service_full_path}/conf/0001-edit.env"
     # Add the .env as commented lines to the edit
+    cat <<EOF >>"${service_full_path}/conf/0001-edit.env"
+
+# Uncomment any of these lines to apply:
+
+EOF
+    remove_comments_and_duplicates "${service_full_path}/.env"
     sed 's/^/# /' "${service_full_path}/.env" >>"${service_full_path}/conf/0001-edit.env"
     # Edit the edit file
     EDITOR=$(set_text_editor)
     if [ $? != 0 ]; then
         echo "Invalid editor selected: $EDITOR"
     fi
-    read -rep "Do you want to edit the Docker Compose main configuration: ${service}/conf/0001-edit.env (will be merged into ${service}/.env)? (y/n)" answer
-            if [[ $answer == [yY] ]]; then
-                set -e
-                $EDITOR "${service_full_path}/conf/0001-edit.env"
-                set +e
-                echo -e "Contents from ${service_full_path}/conf/0001-edit.env were merged with the default values, the outcome is stored at ${service_full_path}/.env (used by docker-compose)\n"
-            else
-                echo "Skipping edit\n"
-            fi
+    set -e
+    $EDITOR "${service_full_path}/conf/0001-edit.env"
+    set +e
     merge "${service}" > /dev/null
     # Look for files ending in json or yml in conf
     for file in "${service_full_path}"/conf/*.{json,yml}; do

services/amqp-stats/conf/default.env

@@ -1,5 +1,5 @@
 AMQP_STATS_DOCKER_IMAGE=us-central1-docker.pkg.dev/ext-edge-analytics/docker/amqp-stats
-AMQP_STATS_DOCKER_TAG=1.2.3
+AMQP_STATS_DOCKER_TAG=1.4.1
 AMQP_STATS_CONTAINER_NAME=amqp-stats
 SERVICE_GROUP=-dev
-CONTENT=message,stats
+CONFIGURATION=stats,separator

services/mcp/conf/default.env

@@ -1,5 +1,5 @@
 MCP_DOCKER_IMAGE=us-central1-docker.pkg.dev/ext-edge-analytics/docker/mcp
-MCP_DOCKER_TAG=1.3.2
+MCP_DOCKER_TAG=1.4.2
 MCP_CONTAINER_NAME=mcp
 SERVICE_GROUP=-dev
 SIO_LICENSE_PATH=/data/sighthound/license/sighthound-license.json