Merge pull request #197 from json-scada/master

Version 0.46-alpha
riclolsen · Jan 13, 2025 · 3798c8e · 3798c8e
2 parents a89bb5d + 7877e13
commit 3798c8e
Show file tree

Hide file tree

Showing 27 changed files with 3,017 additions and 2,660 deletions.
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - MongoDB as the real-time core database, persistence layer, config store, SOE historian.
 - Event-based realtime async data processing with MongoDB Change Streams.
 - Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
-- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.45-alpha).
+- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.46-alpha).
 - Unlimited tags, servers, and users.
 - Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
 - Modular distributed architecture. Lightweight redundant data acquisition nodes can connect securely over TLS to the database server. E.g. a Raspberry PI can be a data acquisition node.
@@ -90,8 +90,10 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 ## Documentation
 
 - [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
-- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.45-alpha)
-- [RedHat/Rocky Linux Installer](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
+- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.46-alpha)
+- [RedHat/Rocky Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
+- [Ubuntu Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#ubuntu-2404-scripted-installation)
+- [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
 - [Docker Demo](https://github.com/riclolsen/json-scada/blob/master/demo-docker/README.md)
 - [Schema Documentation](https://github.com/riclolsen/json-scada/blob/master/docs/schema.md)
 - [Config File](https://github.com/riclolsen/json-scada/blob/master/conf/README.md)
@@ -169,6 +171,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - [x] Online Demo
 - [x] Docker Demo (docker-compose.yaml scripts)
 - [x] Install Script for RedHat/Rocky 9.4 Linux x86-64 and arm64
+- [x] Install Script for Ubuntu 24.04 Linux x86-64 and arm64
 - [ ] Linux Image / VM
 - [x] Supervisor (Linux process manager) examples
 - [x] Project IDX Configuration

diff --git a/index.md b/index.md
@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - MongoDB as the real-time core database, persistence layer, config store, SOE historian.
 - Event-based realtime async data processing with MongoDB Change Streams.
 - Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
-- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.45-alpha).
+- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.46-alpha).
 - Unlimited tags, servers, and users.
 - Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
 - Modular distributed architecture. Lightweight redundant data acquisition nodes can connect securely over TLS to the database server. E.g. a Raspberry PI can be a data acquisition node.
@@ -90,9 +90,10 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 ## Documentation
 
 - [Generic Install Guide](docs/install.md)
-- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.45-alpha)
-- [RedHat/Rocky Linux Installer](docs/install.md#rhel94-and-compatible-systems-automated-installation)
-- [Install Guide](docs/install.md)
+- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.46-alpha)
+- [RedHat/Rocky Linux Installer Script](docs/install.md#rhel94-and-compatible-systems-automated-installation)
+- [Ubuntu Linux Installer Script](docs/install.md#ubuntu-2404-scripted-installation)
+- [Generic Install Guide](docs/install.md)
 - [Docker Demo](demo-docker/README.md)
 - [Schema Documentation](docs/schema.md)
 - [Config File](conf/README.md)
@@ -171,6 +172,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - [x] Online Demo
 - [x] Docker Demo (docker-compose.yaml scripts)
 - [x] Install Script for RedHat/Rocky 9.4 Linux x86-64 and arm64
+- [x] Install Script for Ubuntu 24.04 Linux x86-64 and arm64
 - [ ] Linux Image / VM
 - [x] Supervisor (Linux process manager) examples
 - [x] Project IDX Configuration

diff --git a/platform-nix-idx/demo_connections.json b/platform-nix-idx/demo_connections.json
@@ -1 +1 @@
-{"_id":{"$oid":"5ff3512268d80d68205b403f"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1003,"name":"OPCClient1","description":"OPC Client 1","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcua.demo-this.com:51210/UA/SampleServer"],"configFileName":"/home/user/json-scada/conf/Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null}
+{"_id":{"$oid":"5ff3512268d80d68205b403f"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1003,"name":"OPCUA1","description":"OPC Client 1","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcua.demo-this.com:51210/UA/SampleServer"],"configFileName":"/home/user/json-scada/conf/Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null, "giInterval": 300,"hoursShift": 0,"topics": []}
diff --git a/platform-nix-idx/supervisord.conf b/platform-nix-idx/supervisord.conf
@@ -54,7 +54,7 @@ stdout_capture_maxbytes=10MB   ; number of bytes in 'capturemode' (default 0)
 
 [program:cs_custom_processor]
 ; args: instance# loglevel
-command=/usr/bin/node /home/user/json-scada/src/cs_data_processor/cs_custom_processor.js 1 1
+command=/usr/bin/node /home/user/json-scada/src/cs_custom_processor/cs_custom_processor.js 1 1
 autostart=true
 numprocs=1                     ; number of processes copies to start (def 1)
 directory=/home/user/json-scada/src/cs_custom_processor/                ; directory to cwd to before exec (def no cwd)

diff --git a/platform-rhel9/supervisord.conf b/platform-rhel9/supervisord.conf
@@ -69,6 +69,21 @@ stderr_logfile_maxbytes=1MB    ; max # logfile bytes b4 rotation (default 50MB)
 stderr_logfile_backups=0       ; # of stderr logfile backups (0 means none, default 10)
 stderr_capture_maxbytes=1MB    ; number of bytes in 'capturemode' (default 0)
 
+[program:cs_custom_processor]
+command=/usr/bin/node /home/jsonscada/json-scada/src/cs_custom_processor/cs_custom_processor.js
+;process_name=%(program_name)s ; process_name expr (default %(program_name)s)
+numprocs=1                     ; number of processes copies to start (def 1)
+directory=/home/jsonscada/json-scada/src/cs_custom_processor/    ; directory to cwd to before exec (def no cwd)
+user=jsonscada                    ; setuid to this UNIX account to run the program
+stdout_logfile=/home/jsonscada/json-scada/log/cs_custom_processor.log    ; stdout log path, NONE for none;
+stdout_logfile_maxbytes=1MB    ; max # logfile bytes b4 rotation (default 50MB)
+stdout_logfile_backups=0       ; # of stdout logfile backups (0 means none, default 10)
+stdout_capture_maxbytes=1MB    ; number of bytes in 'capturemode' (default 0)
+stderr_logfile=/home/jsonscada/json-scada/log/cs_custom_processor.err    ; stderr log path, NONE for none;
+stderr_logfile_maxbytes=1MB    ; max # logfile bytes b4 rotation (default 50MB)
+stderr_logfile_backups=0       ; # of stderr logfile backups (0 means none, default 10)
+stderr_capture_maxbytes=1MB    ; number of bytes in 'capturemode' (default 0)
+
 [program:calculations]
 command=/home/jsonscada/json-scada/bin/calculations
 ;process_name=%(program_name)s ; process_name expr (default %(program_name)s)

diff --git a/platform-ubuntu-2404/supervisord.conf b/platform-ubuntu-2404/supervisord.conf
@@ -73,6 +73,21 @@ stderr_logfile_maxbytes=1MB    ; max # logfile bytes b4 rotation (default 50MB)
 stderr_logfile_backups=0       ; # of stderr logfile backups (0 means none, default 10)
 stderr_capture_maxbytes=1MB    ; number of bytes in 'capturemode' (default 0)
 
+[program:cs_custom_processor]
+command=/usr/bin/node /home/jsonscada/json-scada/src/cs_custom_processor/cs_custom_processor.js
+;process_name=%(program_name)s ; process_name expr (default %(program_name)s)
+numprocs=1                     ; number of processes copies to start (def 1)
+directory=/home/jsonscada/json-scada/src/cs_custom_processor/    ; directory to cwd to before exec (def no cwd)
+user=jsonscada                    ; setuid to this UNIX account to run the program
+stdout_logfile=/home/jsonscada/json-scada/log/cs_custom_processor.log    ; stdout log path, NONE for none;
+stdout_logfile_maxbytes=1MB    ; max # logfile bytes b4 rotation (default 50MB)
+stdout_logfile_backups=0       ; # of stdout logfile backups (0 means none, default 10)
+stdout_capture_maxbytes=1MB    ; number of bytes in 'capturemode' (default 0)
+stderr_logfile=/home/jsonscada/json-scada/log/cs_custom_processor.err    ; stderr log path, NONE for none;
+stderr_logfile_maxbytes=1MB    ; max # logfile bytes b4 rotation (default 50MB)
+stderr_logfile_backups=0       ; # of stderr logfile backups (0 means none, default 10)
+stderr_capture_maxbytes=1MB    ; number of bytes in 'capturemode' (default 0)
+
 [program:calculations]
 command=/home/jsonscada/json-scada/bin/calculations
 ;process_name=%(program_name)s ; process_name expr (default %(program_name)s)

diff --git a/platform-windows/json-scada.nsi b/platform-windows/json-scada.nsi
@@ -20,8 +20,8 @@ RequestExecutionLevel admin
 
 ;--------------------------------
 
-!define VERSION "v.0.45"
-!define VERSION_ "0.45.0.0"
+!define VERSION "v.0.46"
+!define VERSION_ "0.46.0.0"
 
 Function .onInit
  System::Call 'keexrnel32::CreateMutexA(p0, i1, t "MutexJsonScadaInstall")?e'

diff --git a/platform-windows/release_notes.txt b/platform-windows/release_notes.txt
@@ -135,19 +135,47 @@ Inkscape+SAGE:
 
 -------------------------------------------------------------------
 
+Notes for version 0.46:
+
+* NPM packages updated.
+* PostgreSQL ingestion: fixed errors when inserting/updating JSON data.
+* Events Viewer: limit overflow of columns with ellipsis.
+* Update Metabase to version 0.52.5.
+* Chromium updated to version 131.0.6778.265.
+* Grafana updated to 11.4.0.
+
+To quickly run the system after installed, open the JSON-SCADA desktop folder and:
+
+* On the JSON-SCADA desktop folder: execute "_Start_Services".
+* On the JSON-SCADA desktop folder: execute "_JSON SCADA WEB".
+* Default login credentials: username=admin password=jsonscada.
+* Metabase credentials: username=json@scada.com password=jsonscada123.
+
+Requirements and recommendations:
+
+* Windows 10/11 64 bits or Server >=2019, Windows PowerShell. At least 20GB of free space in the "C:" drive.
+* Administrative rights. Corporate Windows policies may cause problems with the creation of services and the opening of TCP ports.
+* Free TCP ports 6688, 6689, 27017, 5432, 80, 8080, 3000, 3001, 9000. Other ports may be required for optional services and protocols.
+* If the server already has MongoDB, PostgreSQL, Grafana, Metabase, Nginx or another webserver, please uninstall, disable or watch out for possible conflicts.
+* Do not update previously installed JSON-SCADA. Please uninstall previous JSON-SCADA versions before installing a new version.
+* If using VirtualBox configure "paravirtualization interface"=KVM, otherwise Nodejs errors may occur.
+* MongoDB requires AVX instructions on x86 CPU.
+
+-------------------------------------------------------------------
+
 Notes for version 0.45:
 
 * OPC-UA Client: improved performance, auto tagging and data types handling.
 * Tabular Viewer: selectable dark/light theme.
 * Viewers: better table alignment, improved feedback for commands.
+* Updated Excel worksheet config and service. 
 
 To quickly run the system after installed, open the JSON-SCADA desktop folder and:
 
 * On the JSON-SCADA desktop folder: execute "_Start_Services".
 * On the JSON-SCADA desktop folder: execute "_JSON SCADA WEB".
 * Default login credentials: username=admin password=jsonscada.
 * Metabase credentials: username=json@scada.com password=jsonscada123.
-* Updated Excel worksheet config and service. 
 
 Requirements and recommendations:
 

diff --git a/src/AdminUI/package-lock.json b/src/AdminUI/package-lock.json
diff --git a/src/AdminUI/public/i18n/messages_i18n-en_us.js b/src/AdminUI/public/i18n/messages_i18n-en_us.js
@@ -1,10 +1,10 @@
 // Internationalization Messages
-// {json:scada} - Copyright (c) 2008-2024 - Ricardo L. Olsen
+// {json:scada} - Copyright (c) 2008-2025 - Ricardo L. Olsen
 
 var Msg =
 {
 NomeProduto: '{json:scada}',
-VersaoProduto: '0.45',
+VersaoProduto: '0.46',
 
 NomeVisorTelas:       'Display Viewer',
 NomeVisorEventos:     'Events Viewer',

diff --git a/src/AdminUI/public/i18n/messages_i18n-pt_br.js b/src/AdminUI/public/i18n/messages_i18n-pt_br.js
@@ -1,10 +1,10 @@
 // Internationalization Messages
-// {json:scada} - Copyright (c) 2008-2024 - Ricardo L. Olsen
+// {json:scada} - Copyright (c) 2008-2025 - Ricardo L. Olsen
 
 var Msg =
 {
 NomeProduto: '{json:scada}',
-VersaoProduto: '0.45',
+VersaoProduto: '0.46',
 
 NomeVisorTelas:       'Visor de Telas',
 NomeVisorEventos:     'Visor de Eventos',

diff --git a/src/AdminUI/public/i18n/messages_i18n-uk_ua.js b/src/AdminUI/public/i18n/messages_i18n-uk_ua.js
@@ -1,10 +1,10 @@
 // Internationalization Messages
-// {json:scada} - Copyright (c) 2008-2024 - Ricardo L. Olsen
+// {json:scada} - Copyright (c) 2008-2025 - Ricardo L. Olsen
 
 var Msg =
 {
 NomeProduto: '{json:scada}',
-VersaoProduto: '0.45',
+VersaoProduto: '0.46',
 
 NomeVisorTelas: 'Перегляд ',
 NomeVisorEventos: 'Події',

diff --git a/src/AdminUI/public/i18n/messages_i18n.js b/src/AdminUI/public/i18n/messages_i18n.js
@@ -1,10 +1,10 @@
 // Internationalization Messages
-// {json:scada} - Copyright (c) 2008-2024 - Ricardo L. Olsen
+// {json:scada} - Copyright (c) 2008-2025 - Ricardo L. Olsen
 
 var Msg =
 {
 NomeProduto: '{json:scada}',
-VersaoProduto: '0.45',
+VersaoProduto: '0.46',
 
 NomeVisorTelas:       'Display Viewer',
 NomeVisorEventos:     'Events Viewer',
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"_id":{"$oid":"5ff3512268d80d68205b403f"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1003,"name":"OPCClient1","description":"OPC Client 1","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcua.demo-this.com:51210/UA/SampleServer"],"configFileName":"/home/user/json-scada/conf/Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null}
		{"_id":{"$oid":"5ff3512268d80d68205b403f"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1003,"name":"OPCUA1","description":"OPC Client 1","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcua.demo-this.com:51210/UA/SampleServer"],"configFileName":"/home/user/json-scada/conf/Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null, "giInterval": 300,"hoursShift": 0,"topics": []}