Skip to content

Commit

Permalink
Merge pull request #169 from json-scada/master
Browse files Browse the repository at this point in the history
Version 0.40-alpha.
  • Loading branch information
riclolsen authored Nov 8, 2024
2 parents e795a5e + 75360ce commit 0fce397
Show file tree
Hide file tree
Showing 30 changed files with 1,249 additions and 968 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.39-alpha).
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.40-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.39-alpha)
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.40-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.39-alpha).
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.40-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.39-alpha)
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.40-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
4 changes: 2 additions & 2 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.39"
!define VERSION_ "0.39.0.0"
!define VERSION "v.0.40"
!define VERSION_ "0.40.0.0"

Function .onInit
System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexJsonScadaInstall") i .r1 ?e'
Expand Down
24 changes: 24 additions & 0 deletions platform-windows/release_notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,30 @@ Inkscape+SAGE:

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

Notes for version 0.40:

* ATTENTION: The default SVG folder was moved to "c:\json-scada\svg\".

* Default login credentials: username=admin password=jsonscada.
* Metabase credentials: [email protected] password=jsonscada123.
* Fixed problems with some new AdminUI dialogs. *
* NPM packages updated.
* MongoDB Community Server updated to 8.0.3.
* MongoDB Compass updated to 1.44.6.
* Grafana updated to 11.3.0.

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

* ATTENTION: The default SVG folder was moved to "c:\json-scada\svg\".
Expand Down
2 changes: 1 addition & 1 deletion platform-windows/start_services.bat
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ net start JSON_SCADA_process_hist
REM net start JSON_SCADA_config_server_excel
REM net start JSON_SCADA_alarm_beep

call start_protocols.bat
call \json-scada\platform-windows\start_protocols.bat

ping -n 3 127.0.0.1

Expand Down
2 changes: 1 addition & 1 deletion platform-windows/stop_services.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ net stop JSON_SCADA_alarm_beep
net stop JSON_SCADA_config_server_excel

REM STOP PROTOCOL DRIVERS
call stop_protocols.bat
call \json-scada\platform-windows\stop_protocols.bat
ping -n 2

REM STOP OTHER PROCESSES
Expand Down
Loading

0 comments on commit 0fce397

Please sign in to comment.