Skip to content

Commit 9b82319

Browse files
committed
Version 0.35-alpha.
1 parent 84cb12b commit 9b82319

File tree

10 files changed

+76
-46
lines changed

10 files changed

+76
-46
lines changed

README.md

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

8484
* [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
85-
* [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.34-alpha)
85+
* [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.35-alpha)
8686
* [RedHat/Rocky Linux Installer](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
8787
* [Docker Demo](https://github.com/riclolsen/json-scada/blob/master/demo-docker/README.md)
8888
* [Schema Documentation](https://github.com/riclolsen/json-scada/blob/master/docs/schema.md)
@@ -152,7 +152,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
152152
- [x] Windows Installer
153153
- [x] Online Demo
154154
- [x] Docker Demo (docker-compose.yaml scripts)
155-
- [x] Install Script for RedHat/Rocky 9.4 Linux
155+
- [x] Install Script for RedHat/Rocky 9.4 Linux x86-64 and arm64
156156
- [ ] Linux Image / VM
157157
- [x] Supervisor (Linux process manager) examples
158158
- [ ] InfluxDB Integration

index.md

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

8484
* [Generic Install Guide](docs/install.md)
85-
* [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.34-alpha)
85+
* [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.35-alpha)
8686
* [RedHat/Rocky Linux Installer](docs/install.md#rhel94-and-compatible-systems-automated-installation)
8787
* [Install Guide](docs/install.md)
8888
* [Docker Demo](demo-docker/README.md)
@@ -152,7 +152,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
152152
- [x] Windows Installer
153153
- [x] Online Demo
154154
- [x] Docker Demo (docker-compose.yaml scripts)
155-
- [x] Install Script for RedHat/Rocky 9.4 Linux
155+
- [x] Install Script for RedHat/Rocky 9.4 Linux x86-64 and arm64
156156
- [ ] Linux Image / VM
157157
- [x] Supervisor (Linux process manager) examples
158158
- [ ] InfluxDB Integration

platform-windows/create_services.bat

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,31 @@ echo Please execute it as administrator.
44
@echo off
55
if not "%1"=="am_admin" (powershell start -verb runas '%0' am_admin & exit /b)
66

7-
rem Create services, they will run in background independently of a logged user
7+
REM Create services, they will run in background independently of a logged user
88

99
cd \json-scada\bin
1010

11-
rem POSTGRESQL
11+
REM POSTGRESQL
1212
C:\json-scada\platform-windows\postgresql-runtime\bin\pg_ctl.exe register -N JSON_SCADA_postgresql -D "C:\json-scada\platform-windows\postgresql-data"
1313
nssm set JSON_SCADA_postgresql Start SERVICE_AUTO_START
1414

15-
rem GRAFANA (connected to local postgresql)
15+
REM GRAFANA (connected to local postgresql)
1616
nssm install JSON_SCADA_grafana "C:\json-scada\platform-windows\grafana-runtime\bin\grafana-server.exe"
1717
nssm set JSON_SCADA_grafana AppDirectory "C:\json-scada\platform-windows\grafana-runtime\bin"
1818
nssm set JSON_SCADA_grafana AppEnvironmentExtra GF_SERVER_DOMAIN="127.0.0.1" GF_SERVER_ROOT_URL="%(protocol)s://%(domain)s:80/grafana/" GF_SERVER_SERVE_FROM_SUB_PATH="false" GF_AUTH_PROXY_ENABLED="true" GF_AUTH_PROXY_ENABLE_LOGIN_TOKEN="true" GF_AUTH_DISABLE_SIGNOUT_MENU="true" GF_AUTH_PROXY_WHITELIST="127.0.0.1" GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION="true" GF_SERVER_HTTP_ADDR="127.0.0.1" GF_SERVER_ENFORCE_DOMAIN="true" GF_SERVER_ENABLE_GZIP="true" GF_ANALYTICS_REPORTING_ENABLED="false" GF_ANALYTICS_CHECK_FOR_UPDATES="false" GF_SECURITY_ALLOW_EMBEDDING="true" GF_DATABASE_TYPE="postgres" GF_DATABASE_NAME="grafanaappdb" GF_DATABASE_HOST="127.0.0.1" GF_DATABASE_USER="postgres" GF_DATABASE_PASSWORD=""
1919
REM nssm set JSON_SCADA_grafana AppStdout "C:\json-scada\log\grafana-stdout.log"
2020
REM nssm set JSON_SCADA_grafana AppStderr "C:\json-scada\log\grafana-stderr.log"
21-
nssm set JSON_SCADA_grafana Start SERVICE_AUTO_START
21+
nssm set JSON_SCADA_grafana Start SERVICE_DELAYED_AUTO_START
2222

23-
rem METABASE (connected to local postgresql)
23+
REM METABASE (connected to local postgresql)
2424
nssm install JSON_SCADA_metabase "C:\json-scada\platform-windows\jdk-runtime\bin\java" -jar "C:\json-scada\platform-windows\metabase-runtime\metabase.jar"
2525
nssm set JSON_SCADA_metabase AppDirectory "C:\json-scada\platform-windows\metabase-runtime"
2626
nssm set JSON_SCADA_metabase AppEnvironmentExtra MB_JETTY_PORT="3001" MB_DB_TYPE="postgres" MB_DB_DBNAME="metabaseappdb" MB_DB_PORT="5432" MB_DB_USER="postgres" MB_DB_PASS="" MB_DB_HOST="localhost" MB_CHECK_FOR_UPDATES="false"
27-
rem the next option is for Metabase pro/enterprise only
28-
rem nssm set JSON_SCADA_metabase AppEnvironmentExtra MB_JWT_ENABLED="true"
27+
REM the next option is for Metabase pro/enterprise only
28+
REM nssm set JSON_SCADA_metabase AppEnvironmentExtra MB_JWT_ENABLED="true"
2929
nssm set JSON_SCADA_metabase Start SERVICE_DELAYED_AUTO_START
3030

31-
rem MONGODB
31+
REM MONGODB
3232
nssm install JSON_SCADA_mongodb "C:\json-scada\platform-windows\mongodb-runtime\bin\mongod.exe" --config "c:\json-scada\platform-windows\mongodb-conf\mongod.cfg"
3333
nssm set JSON_SCADA_mongodb Start SERVICE_AUTO_START
3434

@@ -60,8 +60,8 @@ REM CHOOSE ONE: server_realtime (no user control) or server_realtime_auth (token
6060
REM nssm install JSON_SCADA_server_realtime "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\server_realtime\index.js" NOAUTH
6161
REM nssm set JSON_SCADA_server_realtime AppDirectory "C:\json-scada\src\server_realtime"
6262
REM nssm set JSON_SCADA_server_realtime Start SERVICE_AUTO_START
63-
rem Use environment variables to connect (for reading) to PostgreSQL historian (https://www.postgresql.org/docs/current/libpq-envars.html)
64-
rem nssm set JSON_SCADA_server_realtime AppEnvironmentExtra PGHOSTADDR=127.0.0.1 PGPORT=5432 PGDATABASE=json_scada PGUSER=json_scada PGPASSWORD=json_scada
63+
REM Use environment variables to connect (for reading) to PostgreSQL historian (https://www.postgresql.org/docs/current/libpq-envars.html)
64+
REM nssm set JSON_SCADA_server_realtime AppEnvironmentExtra PGHOSTADDR=127.0.0.1 PGPORT=5432 PGDATABASE=json_scada PGUSER=json_scada PGPASSWORD=json_scada
6565

6666
REM CREATE A RANDOM SECRET FOR JWT ENCRYPTION
6767
setlocal EnableDelayedExpansion
@@ -82,19 +82,19 @@ nssm set JSON_SCADA_server_realtime_auth AppStdout C:\json-scada\log\server_real
8282
nssm set JSON_SCADA_server_realtime_auth AppRotateOnline 1
8383
nssm set JSON_SCADA_server_realtime_auth AppRotateBytes 10000000
8484

85-
rem Use environment variables to connect (for reading) to PostgreSQL historian (https://www.postgresql.org/docs/current/libpq-envars.html)
86-
rem nssm set JSON_SCADA_server_realtime_auth AppEnvironmentExtra PGHOSTADDR=127.0.0.1 PGPORT=5432 PGDATABASE=json_scada PGUSER=json_scada PGPASSWORD=json_scada
85+
REM Use environment variables to connect (for reading) to PostgreSQL historian (https://www.postgresql.org/docs/current/libpq-envars.html)
86+
REM nssm set JSON_SCADA_server_realtime_auth AppEnvironmentExtra PGHOSTADDR=127.0.0.1 PGPORT=5432 PGDATABASE=json_scada PGUSER=json_scada PGPASSWORD=json_scada
8787

8888
nssm install JSON_SCADA_demo_simul "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\demo_simul\index.js"
8989
nssm set JSON_SCADA_demo_simul AppDirectory "C:\json-scada\src\demo_simul"
9090
nssm set JSON_SCADA_demo_simul Start SERVICE_DEMAND_START
9191

92-
rem Service to send protocol data updates on mongodb to another JSON-SCADA instance (one-way via UDP)
92+
REM Service to send protocol data updates on mongodb to another JSON-SCADA instance (one-way via UDP)
9393
nssm install JSON_SCADA_mongofw "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\mongofw\index.js"
9494
nssm set JSON_SCADA_mongofw AppDirectory "C:\json-scada\src\mongofw"
9595
nssm set JSON_SCADA_mongofw Start SERVICE_DEMAND_START
9696

97-
rem Service to receive protocol data updates from another JSON-SCADA instance (one-way via UDP)
97+
REM Service to receive protocol data updates from another JSON-SCADA instance (one-way via UDP)
9898
nssm install JSON_SCADA_mongowr "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\mongowr\index.js"
9999
nssm set JSON_SCADA_mongowr AppDirectory "C:\json-scada\src\mongowr"
100100
nssm set JSON_SCADA_mongowr Start SERVICE_DEMAND_START
@@ -106,17 +106,17 @@ nssm set JSON_SCADA_alarm_beep AppRotateOnline 1
106106
nssm set JSON_SCADA_alarm_beep AppRotateBytes 10000000
107107
nssm set JSON_SCADA_alarm_beep Start SERVICE_AUTO_START
108108

109-
rem WARNING! This service has no security access control, use with care.
109+
REM WARNING! This service has no security access control, use with care.
110110
nssm install JSON_SCADA_config_server_excel "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\config_server_for_excel\index.js"
111111
nssm set JSON_SCADA_config_server_excel AppDirectory "C:\json-scada\src\config_server_for_excel"
112112
nssm set JSON_SCADA_config_server_excel Start SERVICE_DEMAND_START
113113
nssm set JSON_SCADA_config_server_excel AppEnvironmentExtra JS_CSEXCEL_IP_BIND=0.0.0.0 JS_CSEXCEL_HTTP_PORT=10001
114114
rem JS_CSEXCEL_IP_BIND=127.0.0.1 to enable just local access
115115

116-
rem For use with OSHMI HMI Shell
117-
rem nssm install JSON_SCADA_shell_api "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\shell-api\shell-api.js"
118-
rem nssm set JSON_SCADA_shell_api AppDirectory "C:\json-scada\src\shell-api"
119-
rem nssm set JSON_SCADA_shell_api Start SERVICE_AUTO_START
116+
REM Just for use with OSHMI HMI Shell
117+
REM nssm install JSON_SCADA_shell_api "C:\json-scada\platform-windows\nodejs-runtime\node.exe" "C:\json-scada\src\shell-api\shell-api.js"
118+
REM nssm set JSON_SCADA_shell_api AppDirectory "C:\json-scada\src\shell-api"
119+
REM nssm set JSON_SCADA_shell_api Start SERVICE_AUTO_START
120120

121121
nssm install JSON_SCADA_process_rtdata "C:\json-scada\sql\process_pg_rtdata.bat"
122122
nssm set JSON_SCADA_process_rtdata AppDirectory "C:\json-scada\sql"
@@ -127,8 +127,8 @@ rem nssm set JSON_SCADA_process_rtdata AppEnvironmentExtra PGHOSTADDR=127.0.0.1
127127
nssm install JSON_SCADA_process_hist "C:\json-scada\sql\process_pg_hist.bat"
128128
nssm set JSON_SCADA_process_hist AppDirectory "C:\json-scada\sql"
129129
nssm set JSON_SCADA_process_hist Start SERVICE_AUTO_START
130-
rem Use environment variables to connect (for writing) to PostgreSQL historian (https://www.postgresql.org/docs/current/libpq-envars.html)
131-
rem nssm set JSON_SCADA_process_hist AppEnvironmentExtra PGHOSTADDR=127.0.0.1 PGPORT=5432 PGDATABASE=json_scada PGUSER=json_scada PGPASSWORD=json_scada
130+
REM Use environment variables to connect (for writing) to PostgreSQL historian (https://www.postgresql.org/docs/current/libpq-envars.html)
131+
REM nssm set JSON_SCADA_process_hist AppEnvironmentExtra PGHOSTADDR=127.0.0.1 PGPORT=5432 PGDATABASE=json_scada PGUSER=json_scada PGPASSWORD=json_scada
132132

133133
nssm install JSON_SCADA_php "c:\json-scada\platform-windows\nginx_php-runtime\php\php-cgi.exe" -b 127.0.0.1:9000 -c c:\json-scada\conf\php.ini
134134
nssm set JSON_SCADA_php Start SERVICE_AUTO_START
@@ -228,14 +228,16 @@ nssm install JSON_SCADA_log_io_server "C:\json-scada\platform-windows\nodejs-run
228228
nssm set JSON_SCADA_log_io_server AppDirectory "C:\json-scada\src\log-io"
229229
nssm set JSON_SCADA_log_io_server AppEnvironmentExtra LOGIO_SERVER_UI_BUILD_PATH=C:\json-scada\src\log-io\ui\build
230230
nssm set JSON_SCADA_log_io_server Start SERVICE_AUTO_START
231-
rem set LOGIO_SERVER_UI_BUILD_PATH=C:\json-scada\src\log-io\ui\build
232-
233-
cd \json-scada\platform-windows\telegraf-runtime
231+
REM set LOGIO_SERVER_UI_BUILD_PATH=C:\json-scada\src\log-io\ui\build
234232

235233
REM service for telegraf runtime
236234
reg delete "HKLM\SYSTEM\CurrentControlSet\Services\EventLog\Application\JSON_SCADA_telegraf_runtime" /f
237-
C:\json-scada\platform-windows\telegraf-runtime\telegraf --service-name JSON_SCADA_telegraf_runtime --service-display-name JSON_SCADA_telegraf_runtime --config C:\json-scada\conf\telegraf.conf service install
238-
239-
rem Create scheduled task for log rotation (alternative log rotator), configure with logrotate.conf
240-
rem Should stop services to force log file to close. See https://sourceforge.net/p/logrotatewin/wiki/LogRotate/
241-
rem SCHTASKS /CREATE /SC DAILY /TN "MyTasks\JSON-SCADA logrotate task" /TR "C:\json-scada\bin\logrotate C:\json-scada\platform-windows\logrotate.conf" /ST 04:00
235+
nssm install JSON_SCADA_telegraf_runtime "C:\json-scada\platform-windows\telegraf-runtime\telegraf.exe" "--config C:\json-scada\conf\telegraf.conf"
236+
nssm set JSON_SCADA_telegraf_runtime AppDirectory "C:\json-scada\platform-windows\telegraf-runtime"
237+
nssm set JSON_SCADA_telegraf_runtime Start SERVICE_AUTO_START
238+
REM cd \json-scada\platform-windows\telegraf-runtime
239+
REM c:\json-scada\platform-windows\telegraf-runtime\telegraf --service-display-name JSON_SCADA_telegraf_runtime --service-name JSON_SCADA_telegraf_runtime --config C:\json-scada\conf\telegraf.conf service install
240+
241+
REM Create scheduled task for log rotation (alternative log rotator), configure with logrotate.conf
242+
REM Should stop services to force log file to close. See https://sourceforge.net/p/logrotatewin/wiki/LogRotate/
243+
REM SCHTASKS /CREATE /SC DAILY /TN "MyTasks\JSON-SCADA logrotate task" /TR "C:\json-scada\bin\logrotate C:\json-scada\platform-windows\logrotate.conf" /ST 04:00

platform-windows/json-scada.nsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ RequestExecutionLevel admin
1717

1818
;--------------------------------
1919

20-
!define VERSION "v.0.34"
21-
!define VERSION_ "0.34.0.0"
20+
!define VERSION "v.0.35"
21+
!define VERSION_ "0.35.0.0"
2222

2323
Function .onInit
2424
System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexJsonScadaInstall") i .r1 ?e'
@@ -52,7 +52,7 @@ VIProductVersion ${VERSION_}
5252
VIAddVersionKey ProductName "JSON SCADA"
5353
VIAddVersionKey Comments "SCADA IIoT Software"
5454
VIAddVersionKey CompanyName "Ricardo Olsen"
55-
VIAddVersionKey LegalCopyright "Copyright 2020-2023 Ricardo L. Olsen"
55+
VIAddVersionKey LegalCopyright "Copyright 2020-2024 Ricardo L. Olsen"
5656
VIAddVersionKey FileDescription "JSON SCADA Installer"
5757
VIAddVersionKey FileVersion ${VERSION}
5858
VIAddVersionKey ProductVersion ${VERSION}
@@ -244,7 +244,7 @@ SetRegView 64
244244
File /a "..\platform-windows\nssm.exe"
245245
File /a "..\platform-windows\sounder.exe"
246246
File /a "..\platform-windows\vc_redist.x64.exe"
247-
File /a "..\platform-windows\dotnet-runtime-6.0.29-win-x64.exe"
247+
File /a "..\platform-windows\dotnet-runtime-6.0.31-win-x64.exe"
248248

249249
; Visual C redist: needed for timescaledb
250250
;ReadRegStr $0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Major"
@@ -258,7 +258,7 @@ SetRegView 64
258258
Sleep 1000
259259
Exec '"$INSTDIR\platform-windows\vc_redist.x64.exe" /install /passive /quiet'
260260
Sleep 1000
261-
Exec '"$INSTDIR\platform-windows\dotnet-runtime-6.0.29-win-x64.exe" /install /passive /quiet'
261+
Exec '"$INSTDIR\platform-windows\dotnet-runtime-6.0.31-win-x64.exe" /install /passive /quiet'
262262

263263
SetOutPath $INSTDIR\platform-windows\nodejs-runtime
264264
File /a /r "..\platform-windows\nodejs-runtime\*.*"

platform-windows/release_notes.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,34 @@ Inkscape+SAGE:
132132

133133
-------------------------------------------------------------------
134134

135+
Notes for version 0.35:
136+
137+
* Default login credentials: username=admin password=jsonscada.
138+
* Metabase credentials: [email protected] password=jsonscada123.
139+
* Added timeseries 'hist' collection on MongoDB for historical archival.
140+
* Fixed Telegraf service creation.
141+
* Optimized mongo inserts and updates on cs_data_processor.
142+
* Optimizations on Mongofw/Mongowr one-way replication processes.
143+
* Inkscape+SAGE: new build based on 1.2-dev.
144+
* PostgreSQL updated to 16.3-2.
145+
* TimescaleDB updated to 2.15.2.
146+
* Telegraf runtime updated to 1.31.0.
147+
* Nodejs runtime updated to 20.14.0.
148+
* Dotnet runtime updated to 6.0.31.
149+
* Chromium updated to 126.0.6478.57.
150+
151+
Requirements and recommendations:
152+
153+
* Windows 10/11 64 bits or Server >=2019, Windows PowerShell. At least 20GB of free space in the "C:" drive.
154+
* Administrative rights. corporate Windows policies may cause problems with the creation of services and the opening of TCP ports.
155+
* Free TCP ports 6688, 6689, 27017, 5432, 80, 8080, 3000, 3001, 9000. Other ports may be required for optional services and protocols.
156+
* If the server already has MongoDB, PostgreSQL, Grafana, Metabase, Nginx or another webserver, please uninstall, disable or watch out for possible conflicts.
157+
* Do not update previously installed JSON-SCADA. Please uninstall previous JSON-SCADA versions before installing a new version.
158+
* If using VirtualBox configure "paravirtualization interface"=KVM, otherwise Nodejs errors may occur.
159+
* MongoDB requires AVX instructions on x86 CPU.
160+
161+
-------------------------------------------------------------------
162+
135163
Notes for version 0.34:
136164

137165
* Default login credentials: username=admin password=jsonscada.

src/htdocs/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.34',
7+
VersaoProduto: '0.35',
88

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

src/htdocs/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.34',
7+
VersaoProduto: '0.35',
88

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

src/htdocs/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.34',
7+
VersaoProduto: '0.35',
88

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

src/htdocs/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.34',
7+
VersaoProduto: '0.35',
88

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

src/mongofw/customized_module.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ async function backfillDequeue(db, Redundancy, MongoStatus) {
231231
if (backfillArr.length === 0) return
232232
const result = await db
233233
.collection(BackfillDataCollectionName)
234-
.insertMany(backfillArr)
235-
Log.log('Backfill: Inserted ' + result.insertedCount + ' documents.')
234+
.insertMany(backfillArr, { ordered: false, writeConcern: { w: 0 } })
235+
// Log.log('Backfill: Inserted ' + result.insertedCount + ' documents.')
236236
}
237237

238238
// dequeue changes and send via UDP

0 commit comments

Comments
 (0)