Skip to content

Commit ec2ba5c

Browse files
skom-c8yskom-c8y
authored
Merge pull request #91 from yta-c8y/26.102.0.562363
Update for latest release of Apama 26.x
2 parents 717c2d6 + a80bab0 commit ec2ba5c

File tree

20 files changed

+91
-132
lines changed

20 files changed

+91
-132
lines changed

‎StreamingAnalytics/LimitedBandwidth/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ filter events to reduce the frequency of messages sent to the cloud.
66
The EPL file in this sample ([ThinEdgeIoExample.mon](project/monitors/ThinEdgeIoExample.mon)) collates temperature, pressure and vibration events, averages them and sends a measurement combining those averages at 5 second intervals to thin-edge.io via
77
MQTT.
88

9-
## COPYRIGHT NOTICE
9+
## Copyright notice
1010

11-
Copyright (c) 2022-2023 Cumulocity GmbH, Duesseldorf, Germany and/or its affiliates and/or their licensors.
11+
Copyright (c) 2022-2025 Cumulocity GmbH, Duesseldorf, Germany and/or its affiliates and/or their licensors.
1212
Use, reproduction, transfer, publication or disclosure is prohibited except as specifically provided for in your License Agreement with Cumulocity GmbH.
1313

1414
## Prerequisites
@@ -41,14 +41,14 @@ Zip the project located in the `LimitedBandwidth` directory of this repository.
4141
- **Description**: apama-limited-bandwidth (or something else if you choose)
4242
- **Device Filter Type**: (leave empty)
4343
- **Software Type**: apama
44-
- **Version**: 1.0::apama
44+
- **Version**: 1.0
4545
- **SOFTWARE FILE**: select the **Upload a binary** option and either drag and drop the project zip file created previously, or use the file chooser to navigate to it in your file system.
4646
4. Click the **Add software** button.
4747
5. Now return to the **Devices** menu option and then select **All devices**.
4848
6. In the list of devices, select the thin-edge device installed previously.
4949
7. In the sub-menu for the device, select the **Software** option.
5050
8. Click the **Install software** button in the bottom left; the apama-limited-bandwidth project should be listed.
51-
9. Click the drop-down arrow on the right and check the 1.0::apama radio button. Then, click **Install**.
51+
9. Click the drop-down arrow on the right and check the 1.0 radio button. Then, click **Install**.
5252
10. Finally, click the Apply changes button in the lower right of the panel.
5353
11. Copy the `demo_publisher.py` script in the `LimitedBandwidth` directory to the
5454
`/etc/tedge/apama/project` directory on the thin-edge device. Execute the script to send some fake

‎StreamingAnalytics/LimitedBandwidth/demo_publisher.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
)
3030
args = parser.parse_args()
3131

32-
mqttClient = mqtt.Client("Demo-measurements")
32+
mqttClient = mqtt.Client(mqtt.CallbackAPIVersion.VERSION1, "Demo-measurements")
3333

3434
def on_publish(_client, _userdata, _result):
3535
print("data published")

‎StreamingAnalytics/LimitedBandwidth/project/config/CorrelatorConfig.yaml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
1-
###############################################################################
2-
# $Copyright (c) 2016, 2022 Cumulocity GmbH, Duesseldorf, Germany and/or its affiliates and/or their licensors.$
3-
# Use, reproduction, transfer, publication or disclosure is prohibited except as specifically provided for in your License Agreement with Cumulocity GmbH.
4-
###############################################################################
1+
# This is a YAML file for configuring the correlator.
52

6-
#To set the default log file and level for an EPL package, monitor, or event, specify
3+
# To set the default log file and level for an EPL package, monitor, or event, specify
74
# logging details in the eplLogging section of the YAML configuration file.
8-
#For example:
9-
#eplLogging:
10-
# com.myCompany.Client:
11-
# file: apama/Client.log
12-
# level: DEBUG
13-
# com.myCompany.Internal: { level: ERROR }
5+
# For example:
6+
# eplLogging:
7+
# com.myCompany.Client:
8+
# file: apama/Client.log
9+
# level: DEBUG
10+
# com.myCompany.Internal: { level: ERROR }
1411

15-
16-
#See the information on setting log files and log levels in a YAML configuration file in the documentation for more
12+
# See the information on setting log files and log levels in a YAML configuration file in the documentation for more
1713
# information about the supported options.
18-
#To enable use of this file when you launch this project from Designer, edit the project's run/launch configuration,
19-
#open the correlator, and tick the "Configuration" checkbox next to the textbox that names this .yaml file.

‎StreamingAnalytics/LowLatencyCommandAndControl/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ sensor values over a 10 second window. If the average temperature
44
exceeds a threshold (80 in this example) then an alert is sent to the
55
cloud and a shutdown is initiated.
66

7-
## COPYRIGHT NOTICE
7+
## Copyright notice
88

9-
Copyright (c) 2022-2023 Cumulocity GmbH, Duesseldorf, Germany and/or its affiliates and/or their licensors.
9+
Copyright (c) 2022-2025 Cumulocity GmbH, Duesseldorf, Germany and/or its affiliates and/or their licensors.
1010
Use, reproduction, transfer, publication or disclosure is prohibited except as specifically provided for in your License Agreement with Cumulocity GmbH.
1111

1212
## Prerequisites
@@ -33,14 +33,14 @@ Zip the project located in the `LowLatencyCommandAndControl` directory of this r
3333
- **Description**: apama-low-latency (or something else if you choose)
3434
- **Device Filter Type**: (leave empty)
3535
- **Software Type**: apama
36-
- **Version**: 1.0::apama
36+
- **Version**: 1.0
3737
- **SOFTWARE FILE**: select the **Upload a binary** option and either drag and drop the project zip file created previously or use the file chooser to navigate to it in your file system.
3838
4. Click the **Add software** button.
3939
5. Now return to the **Devices** menu option and then select **All devices**.
4040
6. In the list of devices, select the thin-edge device installed previously.
4141
7. In the sub-menu for the device, select the **Software** option.
4242
8. Click the **Install software** button in the bottom left; the apama-low-latency project should be listed.
43-
9. Click the drop-down arrow on the right and check the 1.0::apama radio button. Then, click **Install**.
43+
9. Click the drop-down arrow on the right and check the 1.0 radio button. Then, click **Install**.
4444
10. Finally, click the **Apply changes** button in the lower right of the panel.
4545
11. Copy the `test_publisher.py` script in the `LowLatencyCommandAndControl` directory to the
4646
`/etc/tedge/apama/project` directory on the thin-edge device. Execute the script to send some fake

‎StreamingAnalytics/LowLatencyCommandAndControl/project/arguments.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ correlator:
99
runtime: ${correlator.runtimeType}
1010
runtimeCacheDir: ${correlator.dataDir}
1111
javaApplicationSupport: ${correlator.javaApplicationSupport}
12-
jmsConfigDir: ${correlator.jmsConfigDir}
13-
distMemStoreConfigDir: ${correlator.distMemStoreConfigDir}
1412
inputLogFile: ${correlator.inputLogFile}
1513
logFile: ${correlator.logFile}
1614

‎StreamingAnalytics/LowLatencyCommandAndControl/project/bundle_instance_files/Automatic_onApplicationInitialized/AutomaticOnApplicationInitialized.evt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
# Use, reproduction, transfer, publication or disclosure is prohibited except as specifically provided for in your License Agreement with Cumulocity GmbH.
44
#
55

6-
# This event should be sent after all monitors are injected; Eclipse will send event files after injections, so the ordering relative to other evt files is unimportant.
6+
# This event should be sent after all monitors are injected; ordering relative to other evt files is unimportant.
77
com.apama.connectivity.ApplicationInitialized()

‎StreamingAnalytics/LowLatencyCommandAndControl/project/config/CorrelatorConfig.yaml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
1-
###############################################################################
2-
# $Copyright (c) 2016, 2022 Cumulocity GmbH, Duesseldorf, Germany and/or its affiliates and/or their licensors.$
3-
# Use, reproduction, transfer, publication or disclosure is prohibited except as specifically provided for in your License Agreement with Cumulocity GmbH.
4-
###############################################################################
1+
# This is a YAML file for configuring the correlator.
52

6-
#To set the default log file and level for an EPL package, monitor, or event, specify
3+
# To set the default log file and level for an EPL package, monitor, or event, specify
74
# logging details in the eplLogging section of the YAML configuration file.
8-
#For example:
9-
#eplLogging:
10-
# com.myCompany.Client:
11-
# file: apama/Client.log
12-
# level: DEBUG
13-
# com.myCompany.Internal: { level: ERROR }
5+
# For example:
6+
# eplLogging:
7+
# com.myCompany.Client:
8+
# file: apama/Client.log
9+
# level: DEBUG
10+
# com.myCompany.Internal: { level: ERROR }
1411

15-
16-
#See the information on setting log files and log levels in a YAML configuration file in the documentation for more
12+
# See the information on setting log files and log levels in a YAML configuration file in the documentation for more
1713
# information about the supported options.
18-
#To enable use of this file when you launch this project from Designer, edit the project's run/launch configuration,
19-
#open the correlator, and tick the "Configuration" checkbox next to the textbox that names this .yaml file.

‎StreamingAnalytics/LowLatencyCommandAndControl/project/correlator.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ correlator.dataDir=${PARENT_DIR}/data
99
correlator.logFile=${correlator.logsDir}/correlator_${correlator.name}.log
1010
correlator.logLevel=INFO
1111
correlator.runtimeType=interpreted
12-
correlator.distMemStoreConfigDir=
13-
correlator.jmsConfigDir=
1412
correlator.javaApplicationSupport=false
1513
correlator.inputLogFile=${PARENT_DIR}/logs/defaultCorrelator_${$}{START_TIME}_${$}{ID}.input.log
1614
correlator.JVMHeapMb=512

‎StreamingAnalytics/LowLatencyCommandAndControl/test_publisher.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
)
3030
args = parser.parse_args()
3131

32-
mqttClient = mqtt.Client("Low-latency")
32+
mqttClient = mqtt.Client(mqtt.CallbackAPIVersion.VERSION1, "Low-latency")
3333

3434
def on_publish(_client, _userdata, _result): # create function for callback
3535
print("data published")

0 commit comments

Comments
 (0)