Skip to content

Commit df65339

Browse files
riclolsenriclolsen
committed
Version 0.50-alpha.
1 parent 51bd829 commit df65339

Some content is hidden

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

44 files changed

+501
-107
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.49-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.50-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.49-alpha)
93+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.50-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/kor1-PergolaGrid.svg

Lines changed: 3 additions & 3 deletions
Loading

‎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.49-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.50-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.49-alpha)
93+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.50-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-linux/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ cd ../mongofw
118118
npm install
119119
cd ../mongowr
120120
npm install
121+
cd ../camera-onvif
122+
npm install
121123

122124
cd ../AdminUI
123125
npm install

‎platform-mac/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ cd ../mongofw
118118
npm install
119119
cd ../mongowr
120120
npm install
121+
cd ../camera-onvif
122+
npm install
121123

122124
cd ../AdminUI
123125
npm install

‎platform-nix-idx/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ cd ../mongofw
125125
npm install
126126
cd ../mongowr
127127
npm install
128+
cd ../camera-onvif
129+
npm install
128130

129131
cd ../AdminUI
130132
npm install

‎platform-windows/build.bat

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,17 @@ go env -w GO111MODULE=auto
9898
set GOBIN=c:\json-scada\bin
9999
cd %SRCPATH%\calculations
100100
go mod tidy
101-
go build
101+
go build -ldflags="-s -w"
102102
copy /Y calculations.exe %BINPATH%
103103

104104
cd %SRCPATH%\i104m
105105
go mod tidy
106-
go build
106+
go build -ldflags="-s -w"
107107
copy /Y i104m.exe %BINPATH%
108108

109109
cd %SRCPATH%\plc4x-client
110110
go mod tidy
111-
go build
111+
go build -ldflags="-s -w"
112112
copy /Y plc4x-client.exe %BINPATH%
113113

114114
cd %SRCPATH%\cs_data_processor
@@ -163,10 +163,13 @@ call %NPM% install
163163
cd %SRCPATH%\backup-mongo
164164
call %NPM% install
165165

166-
cd %SRCPATH\mongofw
166+
cd %SRCPATH%\mongofw
167167
call %NPM% install
168168

169-
cd %SRCPATH\mongowr
169+
cd %SRCPATH%\mongowr
170+
call %NPM% install
171+
172+
cd %SRCPATH%\camera-onvif
170173
call %NPM% install
171174

172175
cd %SRCPATH%\log-io\ui

‎platform-windows/buildupd.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,19 @@ set GOBIN=c:\json-scada\bin
9999
cd %SRCPATH%\calculations
100100
go get -u ./...
101101
go mod tidy
102-
go build
102+
go build -ldflags="-s -w"
103103
copy /Y calculations.exe %BINPATH%
104104

105105
cd %SRCPATH%\i104m
106106
go get -u ./...
107107
go mod tidy
108-
go build
108+
go build -ldflags="-s -w"
109109
copy /Y i104m.exe %BINPATH%
110110

111111
cd %SRCPATH%\plc4x-client
112112
go get -u ./...
113113
go mod tidy
114-
go build
114+
go build -ldflags="-s -w"
115115
copy /Y plc4x-client.exe %BINPATH%
116116

117117
cd %SRCPATH%\cs_data_processor

‎platform-windows/json-scada.nsi

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ RequestExecutionLevel admin
2020

2121
;--------------------------------
2222

23-
!define VERSION "v.0.49"
24-
!define VERSION_ "0.49.0.0"
23+
!define VERSION "v.0.50"
24+
!define VERSION_ "0.50.0.0"
2525

2626
Function .onInit
2727
System::Call 'keexrnel32::CreateMutexA(p0, i1, t "MutexJsonScadaInstall")?e'
@@ -164,9 +164,11 @@ SetRegView 64
164164
var /GLOBAL NAVGRAFAN
165165
var /GLOBAL NAVMETABA
166166
var /GLOBAL HTTPSRV
167+
var /GLOBAL HTTPSSRV
167168

168169
# PROTOCOL://IP:PORT
169170
StrCpy $HTTPSRV "http://127.0.0.1"
171+
StrCpy $HTTPSSRV "https://127.0.0.1"
170172
StrCpy $NAVWINCMD "platform-windows\browser-runtime\chrome.exe"
171173
StrCpy $NAVDATDIR "--user-data-dir=$INSTDIR\platform-windows\browser-data"
172174
StrCpy $NAVPREOPT ""
@@ -247,6 +249,7 @@ SetRegView 64
247249
File /a "..\platform-windows\*.bat"
248250
File /a "..\platform-windows\*.ps1"
249251
File /a "..\platform-windows\nssm.exe"
252+
File /a "..\platform-windows\ffmpeg.exe"
250253
File /a "..\platform-windows\sounder.exe"
251254
File /a "..\platform-windows\vc_redist.x64.exe"
252255
File /a "..\platform-windows\dotnet-runtime-8.0.12-win-x64.exe"
@@ -370,6 +373,10 @@ SetRegView 64
370373
#SetOutPath $INSTDIR\src\htdocs-login
371374
#File /a /r "..\src\htdocs-login\*.*"
372375

376+
SetOutPath $INSTDIR\src\camera-onvif
377+
File /a /r "..\src\camera-onvif\*.*"
378+
File /a "..\platform-windows\ffmpeg.exe"
379+
373380
SetOutPath $INSTDIR\src\demo_simul
374381
File /a /r "..\src\demo_simul\*.*"
375382

@@ -507,6 +514,8 @@ SetRegView 64
507514
File /a "..\conf-templates\telegraf.conf"
508515
File /a "..\conf-templates\json-scada-config.xlsm"
509516
File /a "..\conf-templates\log.io-file.json"
517+
File /a "..\conf-templates\nginx.crt"
518+
File /a "..\conf-templates\nginx.key"
510519

511520
; Desktop shortcuts
512521
Delete "$DESKTOP\JSON-SCADA\*.*"
@@ -517,6 +526,7 @@ SetRegView 64
517526
CreateShortCut "$DESKTOP\JSON-SCADA\_Stop_Services.lnk" "$INSTDIR\platform-windows\stop_services.bat"
518527
CreateShortCut "$DESKTOP\JSON-SCADA\Windows Services.lnk" "services.msc"
519528
CreateShortCut "$DESKTOP\JSON-SCADA\_JSON SCADA WEB.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVINDEX $NAVPOSOPT" "$INSTDIR\src\htdocs\images\j-s-256.ico"
529+
CreateShortCut "$DESKTOP\JSON-SCADA\_JSON SCADA WEB HTTPS.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSSRV$NAVINDEX $NAVPOSOPT" "$INSTDIR\src\htdocs\images\j-s-256.ico"
520530
CreateShortCut "$DESKTOP\JSON-SCADA\Chromium Browser.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT $NAVPOSOPT"
521531
CreateShortCut "$DESKTOP\JSON-SCADA\Viewer - Display.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISTEL $NAVPOSOPT" "$INSTDIR\src\htdocs\images\tela.ico"
522532
CreateShortCut "$DESKTOP\JSON-SCADA\Viewer - Events.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISEVE $NAVPOSOPT" "$INSTDIR\src\htdocs\images\chrono.ico"

‎platform-windows/release_notes.txt

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

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

138+
Notes for version 0.50:
139+
140+
* ONVIF/RTSP Camera support.
141+
* Enabled HTTPS server (self-signed) on Nginx demo config.
142+
* Fix mongodb document validation issue.
143+
* MongoDB Compass updated to 1.45.4.
144+
* MongoDB Community Server updated to 8.0.5.
145+
* Grafana updated to 11.5.2.
146+
* Chromium updated to 134.0.6998.89.
147+
* Nodejs runtime updated to 22.14.0.
148+
149+
To quickly run the system after installed, open the JSON-SCADA desktop folder and:
150+
151+
* On the JSON-SCADA desktop folder: execute "_Start_Services".
152+
* On the JSON-SCADA desktop folder: execute "_JSON SCADA WEB".
153+
* Default login credentials: username=admin password=jsonscada.
154+
* Metabase credentials: [email protected] password=jsonscada123.
155+
156+
Requirements and recommendations:
157+
158+
* Windows 10/11 64 bits or Server >=2019, Windows PowerShell. At least 25GB of free space in the "C:" drive.
159+
* Administrative rights. Corporate Windows policies may cause problems with the creation of services and the opening of TCP ports.
160+
* Free TCP ports 6688, 6689, 27017, 5432, 80, 443, 8080, 3000, 3001, 9000, 20000. Other ports may be required for optional services and protocols.
161+
* If the server already has MongoDB, PostgreSQL, Grafana, Metabase, Nginx or another webserver, please uninstall, disable or watch out for possible conflicts.
162+
* Do not update previously installed JSON-SCADA. Please uninstall previous JSON-SCADA versions before installing a new version.
163+
* If using VirtualBox configure "paravirtualization interface"=KVM, otherwise Nodejs errors may occur.
164+
* MongoDB requires AVX instructions on x86 CPU.
165+
166+
-------------------------------------------------------------------
167+
138168
Notes for version 0.49:
139169

140170
* LDAP/AD user authentication.

‎src/AdminUI/public/i18n/messages_i18n-en_us.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var Msg =
55
{
66
NomeProduto: '{json:scada}',
7-
VersaoProduto: '0.49',
7+
VersaoProduto: '0.50',
88

99
NomeVisorTelas: 'Display Viewer',
1010
NomeVisorEventos: 'Events Viewer',

‎src/AdminUI/public/i18n/messages_i18n-ps_af.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
var Msg = {
55
NomeProduto: '{json:scada}',
6-
VersaoProduto: '0.49',
6+
VersaoProduto: '0.50',
77

88
NomeVisorTelas: 'د نښته کتنې لیدل',
99
NomeVisorEventos: 'د واقعو کتنې لیدل',

‎src/AdminUI/public/i18n/messages_i18n-pt_br.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var Msg =
55
{
66
NomeProduto: '{json:scada}',
7-
VersaoProduto: '0.49',
7+
VersaoProduto: '0.50',
88

99
NomeVisorTelas: 'Visor de Telas',
1010
NomeVisorEventos: 'Visor de Eventos',

‎src/AdminUI/public/i18n/messages_i18n-uk_ua.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var Msg =
55
{
66
NomeProduto: '{json:scada}',
7-
VersaoProduto: '0.49',
7+
VersaoProduto: '0.50',
88

99
NomeVisorTelas: 'Перегляд ',
1010
NomeVisorEventos: 'Події',

‎src/AdminUI/public/i18n/messages_i18n.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var Msg =
55
{
66
NomeProduto: '{json:scada}',
7-
VersaoProduto: '0.49',
7+
VersaoProduto: '0.50',
88

99
NomeVisorTelas: 'Display Viewer',
1010
NomeVisorEventos: 'Events Viewer',

‎src/AdminUI/public/lib/jsmpeg.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/AdminUI/public/release_notes.txt

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

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

138+
Notes for version 0.50:
139+
140+
* ONVIF/RTSP Camera support.
141+
* Enabled HTTPS server (self-signed) on Nginx demo config.
142+
* Fix mongodb document validation issue.
143+
* MongoDB Compass updated to 1.45.4.
144+
* MongoDB Community Server updated to 8.0.5.
145+
* Grafana updated to 11.5.2.
146+
* Chromium updated to 134.0.6998.89.
147+
* Nodejs runtime updated to 22.14.0.
148+
149+
To quickly run the system after installed, open the JSON-SCADA desktop folder and:
150+
151+
* On the JSON-SCADA desktop folder: execute "_Start_Services".
152+
* On the JSON-SCADA desktop folder: execute "_JSON SCADA WEB".
153+
* Default login credentials: username=admin password=jsonscada.
154+
* Metabase credentials: [email protected] password=jsonscada123.
155+
156+
Requirements and recommendations:
157+
158+
* Windows 10/11 64 bits or Server >=2019, Windows PowerShell. At least 25GB of free space in the "C:" drive.
159+
* Administrative rights. Corporate Windows policies may cause problems with the creation of services and the opening of TCP ports.
160+
* Free TCP ports 6688, 6689, 27017, 5432, 80, 443, 8080, 3000, 3001, 9000, 20000. Other ports may be required for optional services and protocols.
161+
* If the server already has MongoDB, PostgreSQL, Grafana, Metabase, Nginx or another webserver, please uninstall, disable or watch out for possible conflicts.
162+
* Do not update previously installed JSON-SCADA. Please uninstall previous JSON-SCADA versions before installing a new version.
163+
* If using VirtualBox configure "paravirtualization interface"=KVM, otherwise Nodejs errors may occur.
164+
* MongoDB requires AVX instructions on x86 CPU.
165+
166+
-------------------------------------------------------------------
167+
138168
Notes for version 0.49:
139169

140170
* LDAP/AD user authentication.

‎src/AdminUI/src/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ import { useI18n } from 'vue-i18n'
8080
import { useRouter } from 'vue-router'
8181
import { STORAGE_KEY } from './i18n'
8282
83-
const version = ref('v0.49-alpha')
83+
const version = ref('v0.50-alpha')
8484
const router = useRouter()
8585
const theme = ref('dark')
8686
const vuetifyTheme = useTheme()

0 commit comments

Comments
 (0)