Skip to content

Commit ac51a88

Browse files
riclolsenriclolsen
committed
Version 0.32-alpha.
1 parent ef4b936 commit ac51a88

28 files changed

+15145
-36
lines changed

‎README.md

+2-2
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.31-alpha).
51+
* Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.32-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.
@@ -83,7 +83,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
8383
## Documentation
8484

8585
* [Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
86-
* [Windows installer](https://github.com/riclolsen/json-scada/releases/tag/V0.31-alpha)
86+
* [Windows installer](https://github.com/riclolsen/json-scada/releases/tag/V0.32-alpha)
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)
8989
* [Config File](https://github.com/riclolsen/json-scada/blob/master/conf/README.md)

‎conf-templates/nginx_http.conf

+9-1
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,16 @@
6868
proxy_set_header Host $host;
6969
proxy_set_header X-Real-IP $remote_addr;
7070
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
71-
}
71+
}
7272

73+
# reverse proxy, redirect metabase requests (pass it to nodejs server_realtime_auth that redirects to metabase)
74+
location /metabase/ {
75+
proxy_pass http://127.0.0.1:8080/metabase/;
76+
proxy_set_header Host $host;
77+
proxy_set_header X-Real-IP $remote_addr;
78+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
79+
}
80+
7381
# reverse proxy, redirect log.io requests (pass it to nodejs server_realtime_auth that redirects to log.io server)
7482
location /log-io/ {
7583
proxy_pass http://127.0.0.1:8080/log-io/;

‎conf-templates/nginx_https.conf

+8
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,14 @@
8787
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
8888
# }
8989

90+
# # reverse proxy, redirect metabase requests (pass it to nodejs server_realtime_auth that redirects to metabase)
91+
# location /metabase/ {
92+
# proxy_pass http://127.0.0.1:8080/metabase/;
93+
# proxy_set_header Host $host;
94+
# proxy_set_header X-Real-IP $remote_addr;
95+
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
96+
# }
97+
9098
# # reverse proxy, redirect log.io requests (pass it to nodejs server_realtime_auth that redirects to log.io server)
9199
# location /log-io/ {
92100
# proxy_pass http://127.0.0.1:8080/log-io/;

‎index.md

+2-2
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.31-alpha).
51+
* Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.32-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.
@@ -83,7 +83,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
8383
## Documentation
8484

8585
* [Install Guide](docs/install.md)
86-
* [Windows installer](https://github.com/riclolsen/json-scada/releases/tag/V0.31-alpha)
86+
* [Windows installer](https://github.com/riclolsen/json-scada/releases/tag/V0.32-alpha)
8787
* [Docker Demo](demo-docker/README.md)
8888
* [Schema Documentation](docs/schema.md)
8989
* [Config File](conf/README.md)

‎platform-windows/create_services.bat

+12-3
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,27 @@ rem Create services, they will run in background independently of a logged user
88

99
cd \json-scada\bin
1010

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

15+
rem GRAFANA (connected to local postgresql)
1416
nssm install JSON_SCADA_grafana "C:\json-scada\platform-windows\grafana-runtime\bin\grafana-server.exe"
1517
nssm set JSON_SCADA_grafana AppDirectory "C:\json-scada\platform-windows\grafana-runtime\bin"
16-
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="true" 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"
17-
rem example of using postgresql to host grafana config (necessary for multiple web servers):
18-
rem nssm set JSON_SCADA_grafana AppEnvironmentExtra GF_DATABASE_TYPE="postgres" GF_DATABASE_HOST="127.0.0.1" GF_DATABASE_USER="postgres" GF_DATABASE_PASSWORD="pwd"
18+
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="true" 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"
2121
nssm set JSON_SCADA_grafana Start SERVICE_AUTO_START
2222

23+
rem METABASE (connected to local postgresql)
24+
nssm install JSON_SCADA_metabase "C:\json-scada\platform-windows\jdk-runtime\bin\java" -jar "C:\json-scada\platform-windows\metabase-runtime\metabase.jar"
25+
nssm set JSON_SCADA_metabase AppDirectory "C:\json-scada\platform-windows\metabase-runtime"
26+
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"
29+
nssm set JSON_SCADA_metabase Start SERVICE_DELAYED_AUTO_START
30+
31+
rem MONGODB
2332
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"
2433
nssm set JSON_SCADA_mongodb Start SERVICE_AUTO_START
2534

‎platform-windows/initial_setup.bat

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ ping -n 2 127.0.0.1
1313
call postgresql-start.bat
1414
ping -n 18 127.0.0.1
1515
postgresql-runtime\bin\psql -U postgres -h localhost -f ..\sql\create_tables.sql template1
16+
postgresql-runtime\bin\psql -U postgres -h localhost -f ..\sql\metabaseappdb.sql metabaseappdb
17+
postgresql-runtime\bin\psql -U postgres -h localhost -f ..\sql\grafanaappdb.sql grafanaappdb
1618

1719
call create_services.bat
1820
ping -n 10 127.0.0.1

‎platform-windows/json-scada.nsi

+25-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; json-scada.nsi
22
; {json:scada} installer script
3-
; Copyright 2020-2023 - Ricardo L. Olsen
3+
; Copyright 2020-2024 - Ricardo L. Olsen
44

55
; NSIS (Nullsoft Scriptable Install System) - http://nsis.sourceforge.net/Main_Page
66

@@ -17,8 +17,8 @@ RequestExecutionLevel admin
1717

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

20-
!define VERSION "v.0.31"
21-
!define VERSION_ "0.31.0.0"
20+
!define VERSION "v.0.32"
21+
!define VERSION_ "0.32.0.0"
2222

2323
Function .onInit
2424
System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexJsonScadaInstall") i .r1 ?e'
@@ -109,6 +109,7 @@ SetRegView 64
109109

110110
; Closes all processes
111111
nsExec::Exec 'net stop JSON_SCADA_grafana'
112+
nsExec::Exec 'net stop JSON_SCADA_metabase'
112113
nsExec::Exec 'net stop JSON_SCADA_mongodb'
113114
nsExec::Exec 'net stop JSON_SCADA_calculations'
114115
nsExec::Exec 'net stop JSON_SCADA_cs_data_processor'
@@ -153,6 +154,7 @@ SetRegView 64
153154
var /GLOBAL NAVVISANO
154155
var /GLOBAL NAVVISTEL
155156
var /GLOBAL NAVGRAFAN
157+
var /GLOBAL NAVMETABA
156158
var /GLOBAL HTTPSRV
157159

158160
# PROTOCOL://IP:PORT
@@ -169,6 +171,7 @@ SetRegView 64
169171
StrCpy $NAVVISANO "/tabular.html?SELMODULO=ALARMS_VIEWER"
170172
StrCpy $NAVVISTEL "/display.html"
171173
StrCpy $NAVGRAFAN "/grafana"
174+
StrCpy $NAVMETABA "/metabase"
172175

173176
; write reg info
174177
WriteRegStr HKLM SOFTWARE\JSON_SCADA "Install_Dir" "$INSTDIR"
@@ -197,6 +200,8 @@ SetRegView 64
197200
CreateDirectory "$INSTDIR\src"
198201
; CreateDirectory "$INSTDIR\Opc.Ua.CertificateGenerator"
199202
CreateDirectory "$INSTDIR\platform-windows"
203+
CreateDirectory "$INSTDIR\platform-windows\jdk-runtime"
204+
CreateDirectory "$INSTDIR\platform-windows\metabase-runtime"
200205
CreateDirectory "$INSTDIR\platform-windows\grafana-runtime"
201206
CreateDirectory "$INSTDIR\platform-windows\browser-runtime"
202207
CreateDirectory "$INSTDIR\platform-windows\browser-data"
@@ -236,7 +241,7 @@ SetRegView 64
236241
File /a "..\platform-windows\nssm.exe"
237242
File /a "..\platform-windows\sounder.exe"
238243
File /a "..\platform-windows\vc_redist.x64.exe"
239-
File /a "..\platform-windows\dotnet-runtime-6.0.24-win-x64.exe"
244+
File /a "..\platform-windows\dotnet-runtime-6.0.29-win-x64.exe"
240245

241246
; Visual C redist: needed for timescaledb
242247
;ReadRegStr $0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Major"
@@ -250,7 +255,7 @@ SetRegView 64
250255
Sleep 1000
251256
Exec '"$INSTDIR\platform-windows\vc_redist.x64.exe" /install /passive /quiet'
252257
Sleep 1000
253-
Exec '"$INSTDIR\platform-windows\dotnet-runtime-6.0.24-win-x64.exe" /install /passive /quiet'
258+
Exec '"$INSTDIR\platform-windows\dotnet-runtime-6.0.29-win-x64.exe" /install /passive /quiet'
254259

255260
SetOutPath $INSTDIR\platform-windows\nodejs-runtime
256261
File /a /r "..\platform-windows\nodejs-runtime\*.*"
@@ -260,6 +265,12 @@ SetRegView 64
260265

261266
SetOutPath $INSTDIR\docs
262267
File /a /r "..\docs\*.*"
268+
269+
SetOutPath $INSTDIR\platform-windows\jdk-runtime
270+
File /a /r "..\platform-windows\jdk-runtime\*.*"
271+
272+
SetOutPath $INSTDIR\platform-windows\metabase-runtime
273+
File /a /r "..\platform-windows\metabase-runtime\metabase.jar"
263274

264275
SetOutPath $INSTDIR\platform-windows\grafana-runtime
265276
File /a /r "..\platform-windows\grafana-runtime\*.*"
@@ -288,6 +299,8 @@ SetRegView 64
288299
SetOutPath $INSTDIR\sql
289300
File /a "..\sql\*.bat"
290301
File /a "..\sql\create_tables.sql"
302+
File /a "..\sql\metabaseappdb.sql"
303+
File /a "..\sql\grafanaappdb.sql"
291304
File /a "..\sql\*.md"
292305

293306
SetOutPath $INSTDIR\platform-windows\nginx_php-runtime
@@ -472,6 +485,7 @@ SetRegView 64
472485
CreateShortCut "$DESKTOP\JSON-SCADA\Viewer - Tabular.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISTAB $NAVPOSOPT" "$INSTDIR\src\htdocs\images\tabular.ico"
473486
CreateShortCut "$DESKTOP\JSON-SCADA\Viewer - Alarms.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVVISANO $NAVPOSOPT" "$INSTDIR\src\htdocs\images\firstaid.ico"
474487
CreateShortCut "$DESKTOP\JSON-SCADA\Viewer - Grafana.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVGRAFAN $NAVPOSOPT" "$INSTDIR\src\htdocs\images\grafana.ico"
488+
CreateShortCut "$DESKTOP\JSON-SCADA\Viewer - Metabase.lnk" "$INSTDIR\$NAVWINCMD" " $NAVDATDIR $NAVPREOPT --app=$HTTPSRV$NAVMETABA $NAVPOSOPT" "$INSTDIR\src\htdocs\images\metabase.ico"
475489
CreateShortCut "$DESKTOP\JSON-SCADA\Excel Config Spreadsheet.lnk" "$INSTDIR\conf\json-scada-config.xlsm"
476490
CreateShortCut "$DESKTOP\JSON-SCADA\Compass (Mongodb GUI Client).lnk" "$INSTDIR\platform-windows\mongodb-compass-runtime\MongoDBCompass.exe"
477491
CreateShortCut "$DESKTOP\JSON-SCADA\Inkscape SAGE (SVG Editor).lnk" "$INSTDIR\platform-windows\inkscape-runtime\bin\inkscape.exe"
@@ -645,6 +659,11 @@ Section "Uninstall"
645659
ExecWait `"${SC}" delete "JSON_SCADA_grafana"`
646660
ClearErrors
647661

662+
ExecWait `"${SC}" stop "JSON_SCADA_metabase"`
663+
Sleep 50
664+
ExecWait `"${SC}" delete "JSON_SCADA_metabase"`
665+
ClearErrors
666+
648667
ExecWait `"${SC}" stop "JSON_SCADA_mongodb"`
649668
Sleep 50
650669
ExecWait `"${SC}" delete "JSON_SCADA_mongodb"`
@@ -691,6 +710,7 @@ Section "Uninstall"
691710
Sleep 5000
692711
ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\sql\\%'" CALL TERMINATE`
693712
Sleep 1000
713+
ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\jdk-runtime\\bin\\%'" CALL TERMINATE`
694714
ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\grafana-runtime\\bin\\%'" CALL TERMINATE`
695715
ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\nginx_php-runtime\\php\\%'" CALL TERMINATE`
696716
ExecWait `wmic PROCESS WHERE "COMMANDLINE LIKE '%c:\\json-scada\\platform-windows\\nginx_php-runtime\\%'" CALL TERMINATE`

‎platform-windows/release_notes.txt

+29-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{json:scada}
22

3-
© 2008-2023 Ricardo L. Olsen
3+
© 2008-2024 Ricardo L. Olsen
44
(https://www.linkedin.com/in/ricardo-olsen/)
55

66
This program is free software: you can redistribute it and/or modify
@@ -129,6 +129,34 @@ See official repo:
129129

130130
Inkscape+SAGE:
131131
* See http://wiki.inkscape.org/wiki/index.php/Compiling_Inkscape_on_Windows_with_MSYS2.
132+
133+
-------------------------------------------------------------------
134+
135+
Notes for version 0.32:
136+
137+
* Default login credentials: username=admin password=jsonscada.
138+
* Enhancements and bug fixes on IEC61850 controls.
139+
* Added processing of NDATA messages of MQTT/Sparkplug.
140+
* Added Metabase 0.49.10 connected to the local PostgreSQL. Credentials: [email protected] password=jsonscada123.
141+
* Added OpenJDK 22.0.1.
142+
* Telegraf runtime updated to 1.30.2.
143+
* MongoDB Community Server updated to 7.0.9.
144+
* MongoDB Compass updated to 1.44.0.
145+
* Grafana updated to 9.5.18, now connect to local PostgreSQL.
146+
* Dotnet runtime updated to 6.0.29.
147+
* Nodejs runtime updated to 20.13.1.
148+
* Npm packages updated.
149+
* Chromium updated to 124.0.6367.202.
150+
151+
Requirements and recommendations:
152+
153+
* Windows 10/11 64 bits or Server >=2016, Windows PowerShell. At least 15GB 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, 9000. Other ports may be required for optional services and protocols.
156+
* If the server already has MongoDB, PostgreSQL, Grafana, 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+
132160
-------------------------------------------------------------------
133161

134162
Notes for version 0.31:

‎platform-windows/remove_services.bat

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ rem Remove service without confimation
2525

2626
sc delete JSON_SCADA_postgresql
2727
nssm remove JSON_SCADA_grafana confirm
28+
nssm remove JSON_SCADA_metabase confirm
2829
nssm remove JSON_SCADA_mongodb confirm
2930
nssm remove JSON_SCADA_cs_data_processor confirm
3031
nssm remove JSON_SCADA_cs_custom_processor confirm

‎platform-windows/start_services.bat

+10-5
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ cd \json-scada\platform-windows
1010

1111
nssm start JSON_SCADA_log_io_server
1212
net start JSON_SCADA_postgresql
13-
nssm start JSON_SCADA_grafana
1413
nssm start JSON_SCADA_mongodb
14+
15+
ping -n 5 127.0.0.1
16+
1517
nssm start JSON_SCADA_log_io_file
1618
nssm start JSON_SCADA_cs_data_processor
1719
nssm start JSON_SCADA_cs_custom_processor
@@ -24,9 +26,6 @@ REM nssm start JSON_SCADA_config_server_excel
2426
REM nssm start JSON_SCADA_alarm_beep
2527
REM nssm start JSON_SCADA_shell_api
2628

27-
nssm start JSON_SCADA_php
28-
nssm start JSON_SCADA_nginx
29-
3029
REM SELECT PROTOCOLS TO START
3130
nssm start JSON_SCADA_iec104client
3231
nssm start JSON_SCADA_mqttsparkplugclient
@@ -40,4 +39,10 @@ nssm start JSON_SCADA_opcuaclient
4039
REM nssm start JSON_SCADA_iec61850client
4140
REM nssm start JSON_SCADA_i104m
4241
REM nssm start JSON_SCADA_plctags
43-
REM nssm start JSON_SCADA_opcuaserver
42+
REM nssm start JSON_SCADA_opcuaserver
43+
44+
nssm start JSON_SCADA_grafana
45+
nssm start JSON_SCADA_metabase
46+
47+
nssm start JSON_SCADA_php
48+
nssm start JSON_SCADA_nginx

‎platform-windows/stop_services.bat

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ nssm stop JSON_SCADA_process_rtdata
4646
nssm stop JSON_SCADA_process_hist
4747
ping -n 3
4848

49-
REM STOP GRAFANA AND DATABASE SERVERS
49+
REM STOP GRAFANA/METABASE AND DATABASE SERVERS
5050
nssm stop JSON_SCADA_grafana
51+
nssm stop JSON_SCADA_metabase
5152
nssm stop JSON_SCADA_mongodb
5253
net stop JSON_SCADA_postgresql
5354

‎sql/create_tables.sql

+14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11

22
-- psql -h 127.0.0.1 -U postgres -w -f create_tables.sql
33

4+
CREATE DATABASE "grafanaappdb"
5+
WITH OWNER "postgres"
6+
ENCODING 'UTF8'
7+
-- LC_COLLATE = 'en-US.UTF8' -- can cause errors sometimes
8+
-- LC_CTYPE = 'en-US.UTF8'
9+
TEMPLATE template0;
10+
11+
CREATE DATABASE "metabaseappdb"
12+
WITH OWNER "postgres"
13+
ENCODING 'UTF8'
14+
-- LC_COLLATE = 'en-US.UTF8' -- can cause errors sometimes
15+
-- LC_CTYPE = 'en-US.UTF8'
16+
TEMPLATE template0;
17+
418
CREATE DATABASE "json_scada"
519
WITH OWNER "postgres"
620
ENCODING 'UTF8'

0 commit comments

Comments
 (0)