Skip to content

Commit 997a856

Browse files
committed
Merge branch 'staging/4.3' into release/4.3
2 parents 7b5dacf + cd79c31 commit 997a856

2,321 files changed

Lines changed: 3342 additions & 20172 deletions

File tree

Some content is hidden

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

_config.yml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,28 @@ collections:
8080
output: true
8181

8282
release:
83-
branch: release-4.2
83+
branch: release-4.3
8484
branch_major_next: master
85-
ver: 4.3
86-
ce_ver: 4.3
87-
ce_tag: v4.3
88-
ce_full_ver: 4.3.0
89-
pe_ver: 4.3pe
90-
pe_full_ver: 4.3.0PE
91-
wd_examples_commit: v4.3
85+
# In short form (e.g. 4.3)
86+
ver: 4.3.0.1
87+
# In short form (e.g. 4.3)
88+
ce_ver: 4.3.0.1
89+
# In short form (e.g. v4.3)
90+
ce_tag: v4.3.0.1
91+
# In full form (e.g. 4.3.0, 4.3.0.1)
92+
ce_full_ver: 4.3.0.1
93+
# In short form (e.g. 4.3pe)
94+
pe_ver: 4.3.0.1pe
95+
# In full form (e.g. 4.3.0PE, 4.3.0.1PE)
96+
pe_full_ver: 4.3.0.1PE
97+
# In short form (e.g. v4.3)
98+
wd_examples_commit: v4.3.0.1
9299
# >>> EDGE
93-
edge_ver: 4.2
94-
edge_tag: v4.2
95-
edge_full_ver: 4.2.0EDGE
96-
pe_edge_ver: 4.2pe
97-
pe_edge_full_ver: 4.2.0EDGEPE
100+
edge_ver: 4.3
101+
edge_tag: v4.3
102+
edge_full_ver: 4.3.0EDGE
103+
pe_edge_ver: 4.3pe
104+
pe_edge_full_ver: 4.3.0EDGEPE
98105
# <<< EDGE
99106
ce_flutter_app_ver: 1.8.0
100107
pe_flutter_app_ver: 1.8.0

_data/docs-home.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,10 @@ toc:
8383
path: /docs/user-guide/rule-engine-2-0/nodes/
8484
- title: Data processing & actions
8585
section:
86-
- title: Validate incoming telemetry
87-
path: /docs/user-guide/rule-engine-2-0/tutorials/validate-incoming-telemetry/
88-
- title: Telemetry delta calculation
89-
path: /docs/user-guide/rule-engine-2-0/tutorials/telemetry-delta-validation/
90-
- title: Data function based on telemetry from 2 devices
91-
path: /docs/user-guide/rule-engine-2-0/tutorials/function-based-on-telemetry-from-two-devices/
92-
- title: Transform incoming telemetry
93-
path: /docs/user-guide/rule-engine-2-0/tutorials/transform-incoming-telemetry/
9486
- title: Transform telemetry using previous record
9587
path: /docs/user-guide/rule-engine-2-0/tutorials/transform-telemetry-using-previous-record/
96-
- title: Create and Clear Alarms
97-
path: /docs/user-guide/rule-engine-2-0/tutorials/create-clear-alarms/
9888
- title: Working with Alarm details
9989
path: /docs/user-guide/rule-engine-2-0/tutorials/create-clear-alarms-with-details/
100-
- title: Send email on alarm
101-
path: /docs/user-guide/rule-engine-2-0/tutorials/send-email/
10290
- title: Send email to Customer
10391
path: /docs/user-guide/rule-engine-2-0/tutorials/send-email-to-customer/
10492
- title: Notifications and Alarms on your smartphone using Telegram Bot

_data/guides-data.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -231,37 +231,33 @@
231231
subtitle: Learn how to process data in ThingsBoard.
232232
id: DataProcessing
233233
section:
234-
- path: /docs/user-guide/rule-engine-2-0/tutorials/validate-incoming-telemetry/
234+
- path: /docs/tutorials/validate-incoming-telemetry/
235235
title: Validate incoming telemetry
236236
subtitle: Learn how to configure Rule Engine to discard invalid telemetry readings based on JavaScript filter function.
237237
pe: false
238238
- path: /docs/tutorials/telemetry-delta-calculation/
239239
title: Telemetry delta calculation
240240
subtitle: Learn how to calculate telemetry delta readings using the Calculated fields feature.
241-
pe: true
241+
pe: false
242242
- path: /docs/tutorials/function-based-on-telemetry-from-two-devices/
243243
title: Data function based on telemetry from 2 devices
244244
subtitle: Learn how to generate a new telemetry value based on telemetry readings from multiple devices using the Calculated fields feature.
245-
pe: true
246-
- path: /docs/user-guide/rule-engine-2-0/tutorials/transform-incoming-telemetry/
247-
title: Transform incoming telemetry
248-
subtitle: Learn how to configure Rule Engine to transform incoming telemetry based on JavaScript function before it is stored to the database.
249245
pe: false
250246
- path: /docs/user-guide/rule-engine-2-0/tutorials/transform-telemetry-using-previous-record/
251247
title: Transform telemetry using previous record
252248
subtitle: Learn how to configure Rule Engine to calculate “delta” of the counter readings based on current and previous reading.
253249
pe: false
254-
- path: /docs/user-guide/rule-engine-2-0/tutorials/create-clear-alarms/
250+
- path: /docs/tutorials/create-clear-alarms/
255251
title: Create & clear alarms
256-
subtitle: Learn how to configure Rule Engine to create and clear alarms based on incoming data from devices.
252+
subtitle: Learn how to configure alarm rules to trigger and clear alarms based on incoming device data.
257253
pe: false
258254
- path: /docs/user-guide/rule-engine-2-0/tutorials/create-clear-alarms-with-details/
259255
title: Working with Alarm details
260256
subtitle: Learn how to configure Alarm Details function in Alarm nodes and how to add an Alarm widget to the dashboard.
261257
pe: false
262-
- path: /docs/user-guide/rule-engine-2-0/tutorials/send-email/
258+
- path: /docs/tutorials/send-email/
263259
title: Send email on alarm
264-
subtitle: Learn how to configure Rule Engine to send email when new alarm is created.
260+
subtitle: Learn how to send an email notification when a new alarm is created.
265261
pe: false
266262
- path: /docs/user-guide/rule-engine-2-0/tutorials/send-email-to-customer/
267263
title: Send email to customer

_data/paas-eu/docs-home.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,22 +123,10 @@ toc:
123123
path: /docs/paas/eu/user-guide/rule-engine-2-0/nodes/
124124
- title: Data processing & actions
125125
section:
126-
- title: Validate incoming telemetry
127-
path: /docs/user-guide/rule-engine-2-0/tutorials/validate-incoming-telemetry/
128-
- title: Telemetry delta calculation
129-
path: /docs/user-guide/rule-engine-2-0/tutorials/telemetry-delta-validation/
130-
- title: Data function based on telemetry from 2 devices
131-
path: /docs/user-guide/rule-engine-2-0/tutorials/function-based-on-telemetry-from-two-devices/
132-
- title: Transform incoming telemetry
133-
path: /docs/user-guide/rule-engine-2-0/tutorials/transform-incoming-telemetry/
134126
- title: Transform telemetry using previous record
135127
path: /docs/user-guide/rule-engine-2-0/tutorials/transform-telemetry-using-previous-record/
136-
- title: Create and Clear Alarms
137-
path: /docs/user-guide/rule-engine-2-0/tutorials/create-clear-alarms/
138128
- title: Working with Alarm details
139129
path: /docs/user-guide/rule-engine-2-0/tutorials/create-clear-alarms-with-details/
140-
- title: Send email on alarm
141-
path: /docs/user-guide/rule-engine-2-0/tutorials/send-email/
142130
- title: Send email to Customer
143131
path: /docs/user-guide/rule-engine-2-0/tutorials/send-email-to-customer/
144132
- title: Notifications and Alarms on your smartphone using Telegram Bot

_data/paas-eu/guides-data.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -213,37 +213,33 @@
213213
subtitle: Learn how to process data in ThingsBoard.
214214
id: DataProcessing
215215
section:
216-
- path: /docs/user-guide/rule-engine-2-0/tutorials/validate-incoming-telemetry/
216+
- path: /docs/paas/eu/tutorials/validate-incoming-telemetry/
217217
title: Validate incoming telemetry
218218
subtitle: Learn how to configure Rule Engine to discard invalid telemetry readings based on JavaScript filter function.
219219
pe: false
220220
- path: /docs/paas/eu/tutorials/telemetry-delta-calculation/
221221
title: Telemetry delta calculation
222222
subtitle: Learn how to calculate telemetry delta readings using the Calculated fields feature.
223-
pe: true
223+
pe: false
224224
- path: /docs/paas/eu/tutorials/function-based-on-telemetry-from-two-devices/
225225
title: Data function based on telemetry from 2 devices
226226
subtitle: Learn how to generate a new telemetry value based on telemetry readings from multiple devices using the Calculated fields feature.
227-
pe: true
228-
- path: /docs/user-guide/rule-engine-2-0/tutorials/transform-incoming-telemetry/
229-
title: Transform incoming telemetry
230-
subtitle: Learn how to configure Rule Engine to transform incoming telemetry based on JavaScript function before it is stored to the database.
231227
pe: false
232228
- path: /docs/user-guide/rule-engine-2-0/tutorials/transform-telemetry-using-previous-record/
233229
title: Transform telemetry using previous record
234230
subtitle: Learn how to configure Rule Engine to calculate “delta” of the counter readings based on current and previous reading.
235231
pe: false
236-
- path: /docs/user-guide/rule-engine-2-0/tutorials/create-clear-alarms/
232+
- path: /docs/tutorials/create-clear-alarms/
237233
title: Create & clear alarms
238-
subtitle: Learn how to configure Rule Engine to create and clear alarms based on incoming data from devices.
234+
subtitle: Learn how to configure alarm rules to trigger and clear alarms based on incoming device data.
239235
pe: false
240236
- path: /docs/user-guide/rule-engine-2-0/tutorials/create-clear-alarms-with-details/
241237
title: Working with Alarm details
242238
subtitle: Learn how to configure Alarm Details function in Alarm nodes and how to add an Alarm widget to the dashboard.
243239
pe: false
244-
- path: /docs/user-guide/rule-engine-2-0/tutorials/send-email/
240+
- path: /docs/tutorials/send-email/
245241
title: Send email on alarm
246-
subtitle: Learn how to configure Rule Engine to send email when new alarm is created.
242+
subtitle: Learn how to send an email notification when a new alarm is created.
247243
pe: false
248244
- path: /docs/user-guide/rule-engine-2-0/tutorials/send-email-to-customer/
249245
title: Send email to customer

_data/paas/docs-home.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,22 +123,10 @@ toc:
123123
path: /docs/paas/user-guide/rule-engine-2-0/nodes/
124124
- title: Data processing & actions
125125
section:
126-
- title: Validate incoming telemetry
127-
path: /docs/user-guide/rule-engine-2-0/tutorials/validate-incoming-telemetry/
128-
- title: Telemetry delta calculation
129-
path: /docs/user-guide/rule-engine-2-0/tutorials/telemetry-delta-validation/
130-
- title: Data function based on telemetry from 2 devices
131-
path: /docs/user-guide/rule-engine-2-0/tutorials/function-based-on-telemetry-from-two-devices/
132-
- title: Transform incoming telemetry
133-
path: /docs/user-guide/rule-engine-2-0/tutorials/transform-incoming-telemetry/
134126
- title: Transform telemetry using previous record
135127
path: /docs/user-guide/rule-engine-2-0/tutorials/transform-telemetry-using-previous-record/
136-
- title: Create and Clear Alarms
137-
path: /docs/user-guide/rule-engine-2-0/tutorials/create-clear-alarms/
138128
- title: Working with Alarm details
139129
path: /docs/user-guide/rule-engine-2-0/tutorials/create-clear-alarms-with-details/
140-
- title: Send email on alarm
141-
path: /docs/user-guide/rule-engine-2-0/tutorials/send-email/
142130
- title: Send email to Customer
143131
path: /docs/user-guide/rule-engine-2-0/tutorials/send-email-to-customer/
144132
- title: Notifications and Alarms on your smartphone using Telegram Bot

_data/paas/guides-data.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -213,37 +213,33 @@
213213
subtitle: Learn how to process data in ThingsBoard.
214214
id: DataProcessing
215215
section:
216-
- path: /docs/user-guide/rule-engine-2-0/tutorials/validate-incoming-telemetry/
216+
- path: /docs/paas/tutorials/validate-incoming-telemetry/
217217
title: Validate incoming telemetry
218218
subtitle: Learn how to configure Rule Engine to discard invalid telemetry readings based on JavaScript filter function.
219219
pe: false
220220
- path: /docs/paas/tutorials/telemetry-delta-calculation/
221221
title: Telemetry delta calculation
222222
subtitle: Learn how to calculate telemetry delta readings using the Calculated fields feature.
223-
pe: true
223+
pe: false
224224
- path: /docs/paas/tutorials/function-based-on-telemetry-from-two-devices/
225225
title: Data function based on telemetry from 2 devices
226226
subtitle: Learn how to generate a new telemetry value based on telemetry readings from multiple devices using the Calculated fields feature.
227-
pe: true
228-
- path: /docs/user-guide/rule-engine-2-0/tutorials/transform-incoming-telemetry/
229-
title: Transform incoming telemetry
230-
subtitle: Learn how to configure Rule Engine to transform incoming telemetry based on JavaScript function before it is stored to the database.
231227
pe: false
232228
- path: /docs/user-guide/rule-engine-2-0/tutorials/transform-telemetry-using-previous-record/
233229
title: Transform telemetry using previous record
234230
subtitle: Learn how to configure Rule Engine to calculate “delta” of the counter readings based on current and previous reading.
235231
pe: false
236-
- path: /docs/user-guide/rule-engine-2-0/tutorials/create-clear-alarms/
232+
- path: /docs/tutorials/create-clear-alarms/
237233
title: Create & clear alarms
238-
subtitle: Learn how to configure Rule Engine to create and clear alarms based on incoming data from devices.
234+
subtitle: Learn how to configure alarm rules to trigger and clear alarms based on incoming device data.
239235
pe: false
240236
- path: /docs/user-guide/rule-engine-2-0/tutorials/create-clear-alarms-with-details/
241237
title: Working with Alarm details
242238
subtitle: Learn how to configure Alarm Details function in Alarm nodes and how to add an Alarm widget to the dashboard.
243239
pe: false
244-
- path: /docs/user-guide/rule-engine-2-0/tutorials/send-email/
240+
- path: /docs/tutorials/send-email/
245241
title: Send email on alarm
246-
subtitle: Learn how to configure Rule Engine to send email when new alarm is created.
242+
subtitle: Learn how to send an email notification when a new alarm is created.
247243
pe: false
248244
- path: /docs/user-guide/rule-engine-2-0/tutorials/send-email-to-customer/
249245
title: Send email to customer

0 commit comments

Comments
 (0)