Skip to content

Commit f73424e

Browse files
authored
Merge pull request #230 from json-scada/master
Version 0.54-alpha
2 parents 3ac06fb + 6287f95 commit f73424e

File tree

451 files changed

+133682
-19038
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

451 files changed

+133682
-19038
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
4848
- MongoDB as the real-time core database, persistence layer, config store, SOE historian.
4949
- Event-based realtime async data processing with MongoDB Change Streams.
5050
- Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
51-
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.53-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.54-alpha).
5252
- Unlimited tags, servers, and users.
5353
- Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
5454
- 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,7 +90,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
9090
## Documentation
9191

9292
- [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
93-
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.53-alpha)
93+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.54-alpha)
9494
- [RedHat/Rocky Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
9595
- [Ubuntu Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#ubuntu-2404-scripted-installation)
9696
- [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)

conf-templates/php.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ default_socket_timeout = 60
914914
extension=curl
915915
;extension=ffi
916916
;extension=fileinfo
917-
extension=gd2
917+
extension=gd
918918
;extension=gettext
919919
;extension=gmp
920920
;extension=intl

index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
4848
- MongoDB as the real-time core database, persistence layer, config store, SOE historian.
4949
- Event-based realtime async data processing with MongoDB Change Streams.
5050
- Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
51-
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.53-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.54-alpha).
5252
- Unlimited tags, servers, and users.
5353
- Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
5454
- 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,7 +90,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
9090
## Documentation
9191

9292
- [Generic Install Guide](docs/install.md)
93-
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.53-alpha)
93+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.54-alpha)
9494
- [RedHat/Rocky Linux Installer Script](docs/install.md#rhel94-and-compatible-systems-automated-installation)
9595
- [Ubuntu Linux Installer Script](docs/install.md#ubuntu-2404-scripted-installation)
9696
- [Generic Install Guide](docs/install.md)

platform-windows/build.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ cd %SRCPATH%\dnp3\Dnp3Client\
5858
dotnet publish --no-self-contained --runtime win-x64 -p:PublishReadyToRun=true -c Release -o %BINPATH% Dnp3Client.csproj
5959
dotnet publish --self-contained --runtime win-x64 -p:PublishReadyToRun=true -c Release -o %BINWINPATH% Dnp3Client.csproj
6060

61-
cd %SRCPATH%\libplctag\libplctag.NET\src\libplctag
62-
dotnet build --no-self-contained --runtime win-x64 -c Release -o %BINPATH%
61+
rem cd %SRCPATH%\libplctag\libplctag.NET\src\libplctag
62+
rem dotnet build --no-self-contained --runtime win-x64 -c Release -o %BINPATH%
6363
cd %SRCPATH%\libplctag\PLCTagsClient
6464
dotnet publish --no-self-contained --runtime win-x64 -p:PublishReadyToRun=true -c Release -o %BINPATH% PLCTagsClient.csproj
6565

platform-windows/buildupd.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ cd %SRCPATH%\dnp3\Dnp3Client\
5858
dotnet publish --no-self-contained --runtime win-x64 -p:PublishReadyToRun=true -c Release -o %BINPATH% Dnp3Client.csproj
5959
dotnet publish --self-contained --runtime win-x64 -p:PublishReadyToRun=true -c Release -o %BINWINPATH% Dnp3Client.csproj
6060

61-
cd %SRCPATH%\libplctag\libplctag.NET\src\libplctag
62-
dotnet build --no-self-contained --runtime win-x64 -c Release -o %BINPATH%
61+
rem cd %SRCPATH%\libplctag\libplctag.NET\src\libplctag
62+
rem dotnet build --no-self-contained --runtime win-x64 -c Release -o %BINPATH%
6363
cd %SRCPATH%\libplctag\PLCTagsClient
6464
dotnet publish --no-self-contained --runtime win-x64 -p:PublishReadyToRun=true -c Release -o %BINPATH% PLCTagsClient.csproj
6565

platform-windows/json-scada.nsi

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ RequestExecutionLevel admin
2121

2222
;--------------------------------
2323

24-
!define VERSION "v.0.53"
25-
!define VERSION_ "0.53.0.0"
24+
!define VERSION "v.0.54"
25+
!define VERSION_ "0.54.0.0"
2626

2727
Function .onInit
2828
System::Call 'keexrnel32::CreateMutexA(p0, i1, t "MutexJsonScadaInstall")?e'
@@ -254,14 +254,14 @@ SetRegView 64
254254
File /a "..\platform-windows\ffmpeg.exe"
255255
File /a "..\platform-windows\sounder.exe"
256256
File /a "..\platform-windows\vc_redist.x64.exe"
257-
File /a "..\platform-windows\dotnet-runtime-8.0.16-win-x64.exe"
257+
File /a "..\platform-windows\dotnet-runtime-8.0.18-win-x64.exe"
258258
File /a "..\platform-windows\OPC Core Components Redistributable (x64) 3.00.108.msi"
259259
;File /a "..\platform-windows\gbda_aut.dll"
260260
;File /a "..\platform-windows\gbhda_aw.dll"
261261
;ExecWait `regsvr32 gbda_aut.dll`
262262
;ExecWait `regsvr32 gbhda_aw.dll`
263263

264-
; Visual C redist: needed for timescaledb
264+
; Visual C redist: needed for timescaledb and PHP
265265
;ReadRegStr $0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Major"
266266
;; Check for version 14
267267
;${If} $0 = "14"
@@ -273,7 +273,7 @@ SetRegView 64
273273
Sleep 1000
274274
ExecWait '"$INSTDIR\platform-windows\vc_redist.x64.exe" /install /passive /quiet'
275275
Sleep 1000
276-
ExecWait '"$INSTDIR\platform-windows\dotnet-runtime-8.0.16-win-x64.exe" /install /passive /quiet'
276+
ExecWait '"$INSTDIR\platform-windows\dotnet-runtime-8.0.18-win-x64.exe" /install /passive /quiet'
277277
Sleep 1000
278278
ExecWait 'msiexec /i "$INSTDIR\platform-windows\OPC Core Components Redistributable (x64) 3.00.108.msi" /qn'
279279
Sleep 1000
@@ -286,6 +286,7 @@ SetRegView 64
286286

287287
SetOutPath $INSTDIR\platform-windows\telegraf-runtime
288288
File /a "..\platform-windows\telegraf-runtime\telegraf.exe"
289+
File /a "..\platform-windows\telegraf-runtime\*.conf"
289290

290291
SetOutPath $INSTDIR\docs
291292
File /a /r "..\docs\*.*"

platform-windows/release_notes.txt

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,43 @@ Inkscape+SAGE:
135135

136136
-------------------------------------------------------------------
137137

138+
Notes for version 0.54:
139+
140+
* OPC-UA-Server: now supports multiple connections per instance; improved naming and tree structure.
141+
* OPC-UA-Client: session/connection retry logic improved; faster bulk updates.
142+
* IEC61850 Client: updated libiec61850 version to 1.6.1.
143+
* NPM and Go packages updated.
144+
* C# mongodb drivers updated to version 3.4.2.
145+
* Grafana updated to 12.1.0.
146+
* Metabase updated to version 0.55.10.
147+
* Dotnet runtime updated to 8.0.18.
148+
* MongoDB Compass updated to 1.46.7.
149+
* Chromium updated to 138.0.7204.184.
150+
* Nodejs runtime updated to 22.18.0.
151+
* MongoDB Community Server updated to 8.0.12.
152+
* Telegraf runtime updated to 1.35.3.
153+
* Nginx updated to 1.28.0.
154+
* PHP updated to 8.4.11.
155+
156+
To quickly run the system after installed, open the JSON-SCADA desktop folder and:
157+
158+
* On the JSON-SCADA desktop folder: execute "_Start_Services".
159+
* On the JSON-SCADA desktop folder: execute "_JSON SCADA WEB".
160+
* Default login credentials: username=admin password=jsonscada.
161+
* Metabase credentials: [email protected] password=jsonscada123.
162+
163+
Requirements and recommendations:
164+
165+
* Windows 10/11 64 bits or Server >=2019, Windows PowerShell. At least 12GB RAM and 30GB of free space in the "C:" drive.
166+
* MongoDB requires AVX instructions on x86 CPU. Use a modern x86 CPU with 6 cores or more.
167+
* Administrative rights. Corporate Windows policies may cause problems with the creation of services and the opening of TCP ports.
168+
* Free TCP ports 6688, 6689, 27017, 5432, 80, 443, 8080, 3000, 3001, 9000, 20000. Other ports may be required for optional services and protocols.
169+
* If the server already has MongoDB, PostgreSQL, Grafana, Metabase, Nginx or another webserver, please uninstall, disable or watch out for possible conflicts.
170+
* Do not update previously installed JSON-SCADA. Please uninstall previous JSON-SCADA versions before installing a new version.
171+
* If using VirtualBox configure "paravirtualization interface"=KVM, otherwise Nodejs errors may occur.
172+
173+
-------------------------------------------------------------------
174+
138175
Notes for version 0.53:
139176

140177
* Inkscape updated to 1.4.2 with SCADA extension.

0 commit comments

Comments
 (0)