Skip to content

Commit 0f729ef

Browse files
riclolsenriclolsen
authored
Merge pull request #193 from json-scada/master
Version 0.45-alpha
2 parents 06bf08c + 709c3f2 commit 0f729ef

Some content is hidden

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

65 files changed

+7504
-2700
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.44-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.45-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.44-alpha)
93+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.45-alpha)
9494
- [RedHat/Rocky Linux Installer](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
9595
- [Docker Demo](https://github.com/riclolsen/json-scada/blob/master/demo-docker/README.md)
9696
- [Schema Documentation](https://github.com/riclolsen/json-scada/blob/master/docs/schema.md)

‎conf-templates/config_viewers.js

+18-12
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
//
3535
//var EventsViewer_Notific = 1; // 0: disable desktop notifications, 1=enable desktop notifications
3636
//
37+
// var EventsViewer_PanicModePriorityLimit = 1; // limit priorities shown in panic mode (up to)
38+
//
3739
//// locale and time zone for date/time formatting (leave empty for browser defaults)
3840
//// see https://developer.mozilla.org/pt-BR/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleString
3941
//var EventsViewer_LocaleTime = ""; // locale for time format e.g "en-US"
@@ -53,21 +55,17 @@
5355
// }
5456
//
5557
//// Tabular Viewer ----------------------------------------------------------------------------------
56-
//var TabularViewer_ToolbarColor = '#AA9E97'; // toolbar color
57-
//
5858
//var TabularViewer_Font = 'Segoe UI,Source Sans Pro,calibri,consolas,arial,helvetica'; // font
5959
//
60-
//var TabularViewer_TableColor = '#DCDCEE'; // table background color
61-
//var TabularViewer_GridColor = '#ECECEE'; // table grid color
62-
//
63-
//var TabularViewer_AlmTxtColor = 'mediumblue'; // alarmed color
64-
//var TabularViewer_FailTxtColor = 'white'; // failed value color
65-
//var TabularViewer_AckTxtColor = '484848'; // acknowledged alarm color
60+
//var TabularViewer_GridColor = '#BBBBBB'; // table grid color
6661
//
67-
//var TabularViewer_LineColor = '#DCDCEE'; // line color
62+
//var TabularViewer_AlmTxtColor = 'rgb(37, 132, 211)'; // alarmed color
63+
//var TabularViewer_FailTxtColor = '#AAAAAA'; // failed value color
64+
//var TabularViewer_AckTxtColor = 'rgb(17, 91, 151)'; // acknowledged alarm color
6865
//
6966
//var TabularViewer_RefreshTime = 3; // refresh time (seconds)
7067
//
68+
//
7169
//// locale and time zone for date/time formatting (leave empty for browser defaults)
7270
//// see https://developer.mozilla.org/pt-BR/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleString
7371
//var TabularViewer_LocaleDateTime = ""; // locale for time format e.g "en-US"
@@ -76,14 +74,21 @@
7674
// // weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric', fractionalSecondDigits: 3, timeZone: 'America/New_York'
7775
//};
7876
//
77+
//// use this to create custom buttons that can select a set of group1 filters on Alarms Viewer
78+
//var TabularViewer_CustomFiltersSelectors = [
79+
// { name: 'Test1', group1List: ['KAW2', 'KOR1'] },
80+
// { name: 'Test2', group1List: ['KIK3', 'KNH2'] },
81+
//];
82+
//
83+
//
7984
//// Screen Viewer ---------------------------------------------------------------------------------
8085
//
8186
//var ScreenViewer_RefreshTime = 3; // refresh time in seconds (digital changes triggers a faster refresh)
8287
//
8388
//// SVG Screen dimensions (must match <svg> tag dimensions on SVG screens)
84-
//// <svg width="2400" height="1500">
85-
//var ScreenViewer_SVGMaxWidth = 2400; // default SVG screen width in pixels
86-
//var ScreenViewer_SVGMaxHeight = 1500; // default SVG screen height in pixels
89+
//// <svg width="3840" height="2160">
90+
//var ScreenViewer_SVGMaxWidth = 3840; // default SVG screen width in pixels
91+
//var ScreenViewer_SVGMaxHeight = 2160; // default SVG screen height in pixels
8792
//
8893
//var ScreenViewer_Background = '#DDDDDD'; // background color for Inkscape SAGE SVG screens
8994
//var ScreenViewer_ToolbarColor = 'lightslategray'; // toolbar color
@@ -177,6 +182,7 @@
177182
//
178183
//var ScreenViewer_SlideShowInterval = 10; // slide show time in seconds
179184
//var ScreenViewer_EnableTimeMachine = 1; // 1 = enable time machine, 0 = disable time machine
185+
//var ScreenViewer_SecurityCardScale = 1.0; // scale to represent an annotation security card
180186
//
181187
//// Command dialog
182188
//var CommandDialog_Background = 'wheat'; // background color

‎conf-templates/json-scada-config.xlsm

65.5 KB
Binary file not shown.

‎conf-templates/kaw2.svg

+3-3
Loading

‎demo-docker/mongo_seed/files/demo_connections.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{"_id":{"$oid":"5f108e3e3d8adfd3eccb206e"},"protocolDriver":"IEC60870-5-104_SERVER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1001,"name":"IEC104DIST","description":"Demo distribution of IEC 104","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"0.0.0.0:2404","ipAddresses":[],"localLinkAddress":1.0,"remoteLinkAddress":2.0,"giInterval":null,"testCommandInterval":0.0,"timeSyncInterval":0.0,"sizeOfCOT":2.0,"sizeOfCA":2.0,"sizeOfIOA":3.0,"k":12.0,"w":8.0,"t0":10.0,"t1":15.0,"t2":10.0,"t3":20.0,"serverModeMultiActive":true,"maxClientConnections":20.0,"maxQueueSize":5000.0,"stats":null}
22
{"_id":{"$oid":"5f1090143d8adfd3eccb206f"},"protocolDriver":"IEC60870-5-104","protocolDriverInstanceNumber":1,"protocolConnectionNumber":61,"name":"IEC104DEMO","description":"Demo via IEC60870-5-104","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"","ipAddresses":["129.153.76.210:2404","150.230.171.172:2404"],"localLinkAddress":2.0,"remoteLinkAddress":1.0,"giInterval":250.0,"testCommandInterval":60.0,"timeSyncInterval":650.0,"sizeOfCOT":2.0,"sizeOfCA":2.0,"sizeOfIOA":3.0,"k":12.0,"w":8.0,"t0":10.0,"t1":15.0,"t2":10.0,"t3":20.0,"stats":null}
3-
{"_id":{"$oid":"5ff3512268d80d68205b403f"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1003,"name":"OPCClient1","description":"OPC Client 1","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcua.demo-this.com:51210/UA/SampleServer"],"configFileName":"c:\\json-scada\\conf\\Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null}
3+
{"_id":{"$oid":"5ff3512268d80d68205b403f"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1003,"name":"OPCUA1","description":"OPC Client 1","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcua.demo-this.com:51210/UA/SampleServer"],"configFileName":"c:\\json-scada\\conf\\Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null, "giInterval": 300,"hoursShift": 0,"topics": []}
4+
{"_id":{"$oid":"6773eb87695a6bf138194e45"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1004,"name":"OPCUA2","description":"OPC Client 2","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcuademo.sterfive.com:26543"],"configFileName":"c:\\json-scada\\conf\\Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null, "giInterval": 300,"hoursShift": 0,"topics": []}
45
{"_id":{"$oid":"606c93aa46fda805647cce53"},"protocolDriver":"MQTT-SPARKPLUG-B","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1200,"name":"MQTT-BROKER","description":"MQTT Demo","enabled":true,"commandsEnabled":true,"autoCreateTags":true,"endpointURLs":["mqtt://broker.hivemq.com:1883"],"topics":["spBv1.0/Edge Nodes/#","spBv1.0/Axxela/#","testtopic/munich/$.*~"],"groupId":"","edgeNodeId":"","deviceId":"","scadaHostId":"","username":"","password":"","useSecurity":false,"chainValidation":true,"rootCertFilePath":"","localCertFilePath":"","privateKeyFilePath":"","pfxFilePath":"","passphrase":"","allowTLSv10":false,"allowTLSv11":false,"allowTLSv12":true,"allowTLSv13":true,"cipherList":"","publishTopicRoot":"","topicsAsFiles":[],"topicsScripted":[],"clientId":"","stats":null}
56
{"_id":{"$oid":"60da25c2040e43523c8f4f57"},"protocolDriver":"OPC-UA_SERVER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":123,"name":"OPC-UA DIST","description":"Test distribution of OPC-UA","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"0.0.0.0:4840","ipAddresses":[],"groupId":"UA/Test","topics":["KOR1","KAW2"],"stats":null}
67
{"_id":{"$oid":"6053887ea2e672638cc751d4"},"protocolDriver":"TELEGRAF-LISTENER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":2001,"name":"TELEGRAFDEMO","description":"TELEGRAF Demo","enabled": true,"commandsEnabled":false,"ipAddresses":["127.0.0.1"],"ipAddressLocalBind":"0.0.0.0:51920","stats":null}

‎demo-docker/mongo_seed/files/demo_connections_linux.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{"_id":{"$oid":"5f108e3e3d8adfd3eccb206e"},"protocolDriver":"IEC60870-5-104_SERVER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1001,"name":"IEC104DIST","description":"Demo distribution of IEC 104","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"0.0.0.0:2404","ipAddresses":[],"localLinkAddress":1.0,"remoteLinkAddress":2.0,"giInterval":null,"testCommandInterval":0.0,"timeSyncInterval":0.0,"sizeOfCOT":2.0,"sizeOfCA":2.0,"sizeOfIOA":3.0,"k":12.0,"w":8.0,"t0":10.0,"t1":15.0,"t2":10.0,"t3":20.0,"serverModeMultiActive":true,"maxClientConnections":20.0,"maxQueueSize":5000.0,"stats":null}
22
{"_id":{"$oid":"5f1090143d8adfd3eccb206f"},"protocolDriver":"IEC60870-5-104","protocolDriverInstanceNumber":1,"protocolConnectionNumber":61,"name":"IEC104DEMO","description":"Demo via IEC60870-5-104","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"","ipAddresses":["129.153.76.210:2404","150.230.171.172:2404"],"localLinkAddress":2.0,"remoteLinkAddress":1.0,"giInterval":250.0,"testCommandInterval":60.0,"timeSyncInterval":650.0,"sizeOfCOT":2.0,"sizeOfCA":2.0,"sizeOfIOA":3.0,"k":12.0,"w":8.0,"t0":10.0,"t1":15.0,"t2":10.0,"t3":20.0,"stats":null}
3-
{"_id":{"$oid":"5ff3512268d80d68205b403f"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1003,"name":"OPCClient1","description":"OPC Client 1","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcua.demo-this.com:51210/UA/SampleServer"],"configFileName":"../conf/Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null}
3+
{"_id":{"$oid":"5ff3512268d80d68205b403f"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1003,"name":"OPCUA1","description":"OPC Client 1","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcua.demo-this.com:51210/UA/SampleServer"],"configFileName":"../conf/Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null, "giInterval": 300,"hoursShift": 0,"topics": []}
4+
{"_id":{"$oid":"6773eb87695a6bf138194e45"},"protocolDriver":"OPC-UA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1004,"name":"OPCUA2","description":"OPC Client 2","enabled":true,"commandsEnabled":true,"endpointURLs":["opc.tcp://opcuademo.sterfive.com:26543"],"configFileName":"../conf/Opc.Ua.DefaultClient.Config.xml","autoCreateTags":true,"useSecurity":false,"stats":null, "giInterval": 300,"hoursShift": 0,"topics": []}
45
{"_id":{"$oid":"606c93aa46fda805647cce53"},"protocolDriver":"MQTT-SPARKPLUG-B","protocolDriverInstanceNumber":1,"protocolConnectionNumber":1200,"name":"MQTT-BROKER","description":"MQTT Demo","enabled":true,"commandsEnabled":true,"autoCreateTags":true,"endpointURLs":["mqtt://broker.hivemq.com:1883"],"topics":["spBv1.0/Edge Nodes/#","spBv1.0/Axxela/#","testtopic/munich/$.*~"],"groupId":"","edgeNodeId":"","deviceId":"","scadaHostId":"","username":"","password":"","useSecurity":false,"chainValidation":true,"rootCertFilePath":"","localCertFilePath":"","privateKeyFilePath":"","pfxFilePath":"","passphrase":"","allowTLSv10":false,"allowTLSv11":false,"allowTLSv12":true,"allowTLSv13":true,"cipherList":"","publishTopicRoot":"","topicsAsFiles":[],"topicsScripted":[],"clientId":"","stats":null}
56
{"_id":{"$oid":"60da25c2040e43523c8f4f57"},"protocolDriver":"OPC-UA_SERVER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":123,"name":"OPC-UA DIST","description":"Test distribution of OPC-UA","enabled":true,"commandsEnabled":true,"ipAddressLocalBind":"0.0.0.0:4840","ipAddresses":[],"groupId":"UA/Test","topics":["KOR1","KAW2"],"stats":null}
67
{"_id":{"$oid":"6053887ea2e672638cc751d4"},"protocolDriver":"TELEGRAF-LISTENER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":2001,"name": "TELEGRAFDEMO","description":"TELEGRAF Demo","enabled": true,"commandsEnabled":false,"ipAddresses":[],"ipAddressLocalBind":"0.0.0.0:51920","stats":null}

0 commit comments

Comments
 (0)