Skip to content

Commit

Permalink
Version 0.38-alpha.
Browse files Browse the repository at this point in the history
  • Loading branch information
riclolsen committed Sep 8, 2024
1 parent 35d189d commit 2b9dff0
Show file tree
Hide file tree
Showing 12 changed files with 132 additions and 12 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.37-alpha).
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.38-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.
Expand Down Expand Up @@ -89,7 +89,7 @@ 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.37-alpha)
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.38-alpha)
- [RedHat/Rocky Linux Installer](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
- [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)
Expand Down
4 changes: 2 additions & 2 deletions index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.37-alpha).
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.38-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.
Expand Down Expand Up @@ -89,7 +89,7 @@ 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.37-alpha)
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.38-alpha)
- [RedHat/Rocky Linux Installer](docs/install.md#rhel94-and-compatible-systems-automated-installation)
- [Install Guide](docs/install.md)
- [Docker Demo](demo-docker/README.md)
Expand Down
12 changes: 12 additions & 0 deletions platform-windows/create_services.bat
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,18 @@ nssm set JSON_SCADA_iec101server AppRotateOnline 1
nssm set JSON_SCADA_iec101server AppRotateBytes 10000000
nssm set JSON_SCADA_iec101server Start SERVICE_DEMAND_START

rem nssm install JSON_SCADA_iccpclient "C:\json-scada\bin\iccpclient.exe" 1 1
rem nssm set JSON_SCADA_iccpclient AppStdout C:\json-scada\log\iccpclient.log
rem nssm set JSON_SCADA_iccpclient AppRotateOnline 1
rem nssm set JSON_SCADA_iccpclient AppRotateBytes 10000000
rem nssm set JSON_SCADA_iccpclient Start SERVICE_DEMAND_START

rem nssm install JSON_SCADA_iccpserver "C:\json-scada\bin\iccpserver.exe" 1 1
rem nssm set JSON_SCADA_iccpserver AppStdout C:\json-scada\log\iccpserver.log
rem nssm set JSON_SCADA_iccpserver AppRotateOnline 1
rem nssm set JSON_SCADA_iccpserver AppRotateBytes 10000000
rem nssm set JSON_SCADA_iccpserver Start SERVICE_DEMAND_START

nssm install JSON_SCADA_dnp3client "C:\json-scada\bin\Dnp3Client.exe" 1 2
nssm set JSON_SCADA_dnp3client AppStdout C:\json-scada\log\dnp3client.log
nssm set JSON_SCADA_dnp3client AppRotateOnline 1
Expand Down
20 changes: 16 additions & 4 deletions platform-windows/json-scada.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ RequestExecutionLevel admin

;--------------------------------

!define VERSION "v.0.37"
!define VERSION_ "0.37.0.0"
!define VERSION "v.0.38"
!define VERSION_ "0.38.0.0"

Function .onInit
System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexJsonScadaInstall") i .r1 ?e'
Expand Down Expand Up @@ -127,6 +127,8 @@ SetRegView 64
nsExec::Exec 'net stop JSON_SCADA_iec101server'
nsExec::Exec 'net stop JSON_SCADA_iec104client'
nsExec::Exec 'net stop JSON_SCADA_iec104server'
nsExec::Exec 'net stop JSON_SCADA_iccpclient'
nsExec::Exec 'net stop JSON_SCADA_iccpserver'
nsExec::Exec 'net stop JSON_SCADA_iec61850client'
nsExec::Exec 'net stop JSON_SCADA_plctags'
nsExec::Exec 'net stop JSON_SCADA_dnp3client'
Expand Down Expand Up @@ -245,7 +247,7 @@ SetRegView 64
File /a "..\platform-windows\nssm.exe"
File /a "..\platform-windows\sounder.exe"
File /a "..\platform-windows\vc_redist.x64.exe"
File /a "..\platform-windows\dotnet-runtime-8.0.7-win-x64.exe"
File /a "..\platform-windows\dotnet-runtime-8.0.8-win-x64.exe"
File /a "..\platform-windows\OPC Core Components Redistributable (x64) 3.00.108.msi"
;File /a "..\platform-windows\gbda_aut.dll"
;File /a "..\platform-windows\gbhda_aw.dll"
Expand All @@ -264,7 +266,7 @@ SetRegView 64
Sleep 1000
ExecWait '"$INSTDIR\platform-windows\vc_redist.x64.exe" /install /passive /quiet'
Sleep 1000
ExecWait '"$INSTDIR\platform-windows\dotnet-runtime-8.0.7-win-x64.exe" /install /passive /quiet'
ExecWait '"$INSTDIR\platform-windows\dotnet-runtime-8.0.8-win-x64.exe" /install /passive /quiet'
Sleep 1000
ExecWait 'msiexec /i "$INSTDIR\platform-windows\OPC Core Components Redistributable (x64) 3.00.108.msi" /qn'
Sleep 1000
Expand Down Expand Up @@ -623,6 +625,11 @@ Section "Uninstall"
ExecWait `"${SC}" delete "JSON_SCADA_iec104client"`
ClearErrors

ExecWait `"${SC}" stop "JSON_SCADA_iccpclient"`
Sleep 50
ExecWait `"${SC}" delete "JSON_SCADA_iccpclient"`
ClearErrors

ExecWait `"${SC}" stop "JSON_SCADA_iec61850client"`
Sleep 50
ExecWait `"${SC}" delete "JSON_SCADA_iec61850client"`
Expand Down Expand Up @@ -673,6 +680,11 @@ Section "Uninstall"
ExecWait `"${SC}" delete "JSON_SCADA_iec104server"`
ClearErrors

ExecWait `"${SC}" stop "JSON_SCADA_iccpserver"`
Sleep 50
ExecWait `"${SC}" delete "JSON_SCADA_iccpserver"`
ClearErrors

ExecWait `"${SC}" stop "JSON_SCADA_opcuaserver"`
Sleep 50
ExecWait `"${SC}" delete "JSON_SCADA_opcuaserver"`
Expand Down
33 changes: 33 additions & 0 deletions platform-windows/release_notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,39 @@ Inkscape+SAGE:

-------------------------------------------------------------------

Notes for version 0.38:

* Default login credentials: username=admin password=jsonscada.
* Metabase credentials: [email protected] password=jsonscada123.
* Various enhancements related to user/role rights (RBAC).
* DNP3 Client: added passive connection modes.
* Fixed problem with timezone on Display Viewer/Replay.
* Enhancements on Admin UI for protocol connections.
* Fixed problem with dbname on mongoose connection options in server_realtime_auth.
* IEC104 Client/Server: allow for multiple TLS certificates for peers.
* Fixed invalidate data from inactive connections on cs_data_processor.
* NPM packages updated.
* MongoDB Community Server updated to 7.0.14.
* MongoDB Compass updated to 1.44.3.
* Grafana updated to 11.2.0.
* Nodejs runtime updated to 20.17.0.
* Dotnet runtime updated to 8.0.8.
* Telegraf runtime updated to 1.31.3.
* Chromium updated to 128.0.6613.120.
* Nginx updated to 1.26.2.

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.37:

* Default login credentials: username=admin password=jsonscada.
Expand Down
3 changes: 3 additions & 0 deletions platform-windows/start_services.bat
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,15 @@ REM nssm start JSON_SCADA_mongowr

REM SELECT PROTOCOLS TO START
nssm start JSON_SCADA_iec104client
rem nssm start JSON_SCADA_iec101client
rem nssm start JSON_SCADA_iccpclient
nssm start JSON_SCADA_mqttsparkplugclient
rem nssm start JSON_SCADA_plc4xclient
nssm start JSON_SCADA_telegraf_listener
net start JSON_SCADA_telegraf_runtime
REM nssm start JSON_SCADA_iec104server
REM nssm start JSON_SCADA_iec101server
REM nssm start JSON_SCADA_iccpserver
REM nssm start JSON_SCADA_iec101client
REM nssm start JSON_SCADA_dnp3client
nssm start JSON_SCADA_opcuaclient
Expand Down
2 changes: 2 additions & 0 deletions platform-windows/stop_services.bat
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ nssm stop JSON_SCADA_opcdaclient
nssm stop JSON_SCADA_iec61850client
nssm stop JSON_SCADA_i104m
nssm stop JSON_SCADA_plctags
nssm stop JSON_SCADA_iccpclient
net stop JSON_SCADA_telegraf_runtime
nssm stop JSON_SCADA_telegraf_listener
nssm stop JSON_SCADA_mqttsparkplugclient
Expand All @@ -41,6 +42,7 @@ REM STOP PROTOCOL SERVERS
nssm stop JSON_SCADA_iec104server
nssm stop JSON_SCADA_iec101server
nssm stop JSON_SCADA_opcuaserver
nssm stop JSON_SCADA_iccpserver
ping -n 2

REM STOP OTHER PROCESSES
Expand Down
2 changes: 1 addition & 1 deletion src/htdocs/i18n/messages_i18n-en_us.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
var Msg =
{
NomeProduto: '{json:scada}',
VersaoProduto: '0.37',
VersaoProduto: '0.38',

NomeVisorTelas: 'Display Viewer',
NomeVisorEventos: 'Events Viewer',
Expand Down
2 changes: 1 addition & 1 deletion src/htdocs/i18n/messages_i18n-pt_br.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
var Msg =
{
NomeProduto: '{json:scada}',
VersaoProduto: '0.37',
VersaoProduto: '0.38',

NomeVisorTelas: 'Visor de Telas',
NomeVisorEventos: 'Visor de Eventos',
Expand Down
2 changes: 1 addition & 1 deletion src/htdocs/i18n/messages_i18n-uk_ua.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
var Msg =
{
NomeProduto: '{json:scada}',
VersaoProduto: '0.37',
VersaoProduto: '0.38',

NomeVisorTelas: 'Перегляд ',
NomeVisorEventos: 'Події',
Expand Down
2 changes: 1 addition & 1 deletion src/htdocs/i18n/messages_i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
var Msg =
{
NomeProduto: '{json:scada}',
VersaoProduto: '0.37',
VersaoProduto: '0.38',

NomeVisorTelas: 'Display Viewer',
NomeVisorEventos: 'Events Viewer',
Expand Down
58 changes: 58 additions & 0 deletions src/htdocs/release_notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,64 @@ Inkscape+SAGE:

-------------------------------------------------------------------

Notes for version 0.38:

* Default login credentials: username=admin password=jsonscada.
* Metabase credentials: [email protected] password=jsonscada123.
* Various enhancements related to user/role rights (RBAC).
* DNP3 Client: added passive connection modes.
* Fixed problem with timezone on Display Viewer/Replay.
* Enhancements on Admin UI for protocol connections.
* Fixed problem with dbname on mongoose connection options in server_realtime_auth.
* IEC104 Client/Server: allow for multiple TLS certificates for peers.
* Fixed invalidate data from inactive connections on cs_data_processor.
* NPM packages updated.
* MongoDB Community Server updated to 7.0.14.
* MongoDB Compass updated to 1.44.3.
* Grafana updated to 11.2.0.
* Nodejs runtime updated to 20.17.0.
* Dotnet runtime updated to 8.0.8.
* Telegraf runtime updated to 1.31.3.
* Chromium updated to 128.0.6613.120.
* Nginx updated to 1.26.2.

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.37:

* Default login credentials: username=admin password=jsonscada.
* Metabase credentials: [email protected] password=jsonscada123.
* New OPC-DA Client driver.
* OPC-UA Server: create branches from groups1/2/3, handle arrays and date types, fix errors.
* Fix measurements with alias from EON nodes on MQTT/Sparkplug driver.
* Fix environment variables on nodejs processes.
* Dotnet projects targets 8.0 version, updated Mongodb drivers.
* Grafana updated to 11.1.3.
* Nodejs runtime updated to 20.16.0.
* MongoDB Compass updated to 1.43.5.

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.36:

* Default login credentials: username=admin password=jsonscada.
Expand Down

0 comments on commit 2b9dff0

Please sign in to comment.