tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'rc'

pull/13556/head
Igor Kulikov 1 year ago
parent
02672b37ac a736f5d212
commit
14fc71b550
72 changed files with 122 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      application/pom.xml
  2. 2
      application/src/main/data/json/system/scada_symbols/horizontal-connector-hp.svg
  3. 2
      application/src/main/data/json/system/scada_symbols/long-horizontal-connector-hp.svg
  4. 2
      application/src/main/data/json/system/scada_symbols/long-vertical-connector-hp.svg
  5. 2
      application/src/main/data/json/system/scada_symbols/vertical-connector-hp.svg
  6. 17
      application/src/main/data/upgrade/basic/schema_update.sql
  7. 2
      common/actor/pom.xml
  8. 2
      common/cache/pom.xml
  9. 2
      common/cluster-api/pom.xml
  10. 2
      common/coap-server/pom.xml
  11. 2
      common/dao-api/pom.xml
  12. 2
      common/data/pom.xml
  13. 7
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AbstractEntityFields.java
  14. 4
      common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java
  15. 2
      common/discovery-api/pom.xml
  16. 2
      common/edge-api/pom.xml
  17. 2
      common/edqs/pom.xml
  18. 2
      common/message/pom.xml
  19. 2
      common/pom.xml
  20. 2
      common/proto/pom.xml
  21. 2
      common/queue/pom.xml
  22. 2
      common/script/pom.xml
  23. 2
      common/script/remote-js-client/pom.xml
  24. 2
      common/script/script-api/pom.xml
  25. 2
      common/stats/pom.xml
  26. 2
      common/transport/coap/pom.xml
  27. 2
      common/transport/http/pom.xml
  28. 2
      common/transport/lwm2m/pom.xml
  29. 2
      common/transport/mqtt/pom.xml
  30. 2
      common/transport/pom.xml
  31. 2
      common/transport/snmp/pom.xml
  32. 2
      common/transport/transport-api/pom.xml
  33. 2
      common/util/pom.xml
  34. 2
      common/version-control/pom.xml
  35. 2
      dao/pom.xml
  36. 12
      dao/src/main/resources/sql/schema-entities-idx-psql-addon.sql
  37. 2
      edqs/pom.xml
  38. 2
      monitoring/pom.xml
  39. 2
      msa/black-box-tests/pom.xml
  40. 2
      msa/edqs/pom.xml
  41. 2
      msa/js-executor/pom.xml
  42. 2
      msa/monitoring/pom.xml
  43. 2
      msa/pom.xml
  44. 2
      msa/tb-node/pom.xml
  45. 2
      msa/tb/pom.xml
  46. 2
      msa/transport/coap/pom.xml
  47. 2
      msa/transport/http/pom.xml
  48. 2
      msa/transport/lwm2m/pom.xml
  49. 2
      msa/transport/mqtt/pom.xml
  50. 2
      msa/transport/pom.xml
  51. 2
      msa/transport/snmp/pom.xml
  52. 2
      msa/vc-executor-docker/pom.xml
  53. 2
      msa/vc-executor/pom.xml
  54. 2
      msa/web-ui/pom.xml
  55. 4
      netty-mqtt/pom.xml
  56. 2
      pom.xml
  57. 2
      rest-client/pom.xml
  58. 2
      rule-engine/pom.xml
  59. 2
      rule-engine/rule-engine-api/pom.xml
  60. 2
      rule-engine/rule-engine-components/pom.xml
  61. 2
      tools/pom.xml
  62. 2
      transport/coap/pom.xml
  63. 2
      transport/http/pom.xml
  64. 2
      transport/lwm2m/pom.xml
  65. 2
      transport/mqtt/pom.xml
  66. 2
      transport/pom.xml
  67. 2
      transport/snmp/pom.xml
  68. 2
      ui-ngx/pom.xml
  69. 4
      ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts
  70. 14
      ui-ngx/src/app/shared/models/limited-api.models.ts
  71. 7
      ui-ngx/src/assets/locale/locale.constant-en_US.json
  72. 6
      ui-ngx/src/styles.scss

2
application/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>thingsboard</artifactId>
</parent>
<artifactId>application</artifactId>

2
application/src/main/data/json/system/scada_symbols/horizontal-connector-hp.svg
View File

@ -7,7 +7,7 @@
"tags": [
{
"tag": "arrow",
"stateRenderFunction": "var arrow = ctx.values.arrow;\nif (arrow) {\n element.show();\n var arrowDirection = ctx.values.arrowDirection;\n var direticon = element.remember('direticon');\n var angle = arrowDirection ? 0 : 180;\n if (!direticon) {\n element.transform({rotate: angle});\n } else {\n ctx.api.transform({rotate: angle, originY: 100});\n element.remember('direticon', false);\n }\n} else {\n element.hide();\n}",
"stateRenderFunction": "var arrow = ctx.values.arrow;\nif (arrow) {\n element.show();\n element.stroke(ctx.properties.lineColor).fill(ctx.properties.lineColor);\n var arrowDirection = ctx.values.arrowDirection;\n var direticon = element.remember('direticon');\n var angle = arrowDirection ? 0 : 180;\n if (!direticon) {\n element.transform({rotate: angle});\n } else {\n ctx.api.transform({rotate: angle, originY: 100});\n element.remember('direticon', false);\n }\n} else {\n element.hide();\n}",
"actions": null
},
{

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

2
application/src/main/data/json/system/scada_symbols/long-horizontal-connector-hp.svg
View File

@ -7,7 +7,7 @@
"tags": [
{
"tag": "arrow",
"stateRenderFunction": "var arrow = ctx.values.arrow;\nif (arrow) {\n element.show();\n var arrowDirection = ctx.values.arrowDirection;\n var direticon = element.remember('direticon');\n var angle = arrowDirection ? 0 : 180;\n if (!direticon) {\n element.transform({rotate: angle});\n } else {\n ctx.api.transform({rotate: angle, originY: 100});\n element.remember('direticon', false);\n }\n} else {\n element.hide();\n}",
"stateRenderFunction": "var arrow = ctx.values.arrow;\nif (arrow) {\n element.show();\n element.stroke(ctx.properties.lineColor).fill(ctx.properties.lineColor);\n var arrowDirection = ctx.values.arrowDirection;\n var direticon = element.remember('direticon');\n var angle = arrowDirection ? 0 : 180;\n if (!direticon) {\n element.transform({rotate: angle});\n } else {\n ctx.api.transform({rotate: angle, originY: 100});\n element.remember('direticon', false);\n }\n} else {\n element.hide();\n}",
"actions": null
},
{

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

2
application/src/main/data/json/system/scada_symbols/long-vertical-connector-hp.svg
View File

@ -7,7 +7,7 @@
"tags": [
{
"tag": "arrow",
"stateRenderFunction": "var arrow = ctx.values.arrow;\nif (arrow) {\n element.show();\n var arrowDirection = ctx.values.arrowDirection;\n var direticon = element.remember('direticon');\n var angle = arrowDirection ? 0 : 180;\n if (!direticon) {\n element.transform({rotate: angle});\n } else {\n ctx.api.transform({rotate: angle, originY: 100});\n element.remember('direticon', false);\n }\n} else {\n element.hide();\n}",
"stateRenderFunction": "var arrow = ctx.values.arrow;\nif (arrow) {\n element.show();\n element.stroke(ctx.properties.lineColor).fill(ctx.properties.lineColor);\n var arrowDirection = ctx.values.arrowDirection;\n var direticon = element.remember('direticon');\n var angle = arrowDirection ? 0 : 180;\n if (!direticon) {\n element.transform({rotate: angle});\n } else {\n ctx.api.transform({rotate: angle, originY: 100});\n element.remember('direticon', false);\n }\n} else {\n element.hide();\n}",
"actions": null
},
{

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

2
application/src/main/data/json/system/scada_symbols/vertical-connector-hp.svg
View File

@ -7,7 +7,7 @@
"tags": [
{
"tag": "arrow",
"stateRenderFunction": "var arrow = ctx.values.arrow;\nif (arrow) {\n element.show();\n var arrowDirection = ctx.values.arrowDirection;\n var direticon = element.remember('direticon');\n var angle = arrowDirection ? 0 : 180;\n if (!direticon) {\n element.transform({rotate: angle});\n } else {\n ctx.api.transform({rotate: angle, originY: 100});\n element.remember('direticon', false);\n }\n} else {\n element.hide();\n}",
"stateRenderFunction": "var arrow = ctx.values.arrow;\nif (arrow) {\n element.show();\n element.stroke(ctx.properties.lineColor).fill(ctx.properties.lineColor);\n var arrowDirection = ctx.values.arrowDirection;\n var direticon = element.remember('direticon');\n var angle = arrowDirection ? 0 : 180;\n if (!direticon) {\n element.transform({rotate: angle});\n } else {\n ctx.api.transform({rotate: angle, originY: 100});\n element.remember('direticon', false);\n }\n} else {\n element.hide();\n}",
"actions": null
},
{

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

17
application/src/main/data/upgrade/basic/schema_update.sql
View File

@ -14,6 +14,8 @@
-- limitations under the License.
--
-- UPDATE TENANT PROFILE CASSANDRA RATE LIMITS START
UPDATE tenant_profile
SET profile_data = jsonb_set(
profile_data,
@ -42,3 +44,18 @@ SET profile_data = jsonb_set(
)
WHERE profile_data -> 'configuration' ? 'cassandraQueryTenantRateLimitsConfiguration';
-- UPDATE TENANT PROFILE CASSANDRA RATE LIMITS END
-- UPDATE NOTIFICATION RULE CASSANDRA RATE LIMITS START
UPDATE notification_rule
SET trigger_config = REGEXP_REPLACE(
trigger_config,
'"CASSANDRA_QUERIES"',
'"CASSANDRA_WRITE_QUERIES_CORE","CASSANDRA_READ_QUERIES_CORE","CASSANDRA_WRITE_QUERIES_RULE_ENGINE","CASSANDRA_READ_QUERIES_RULE_ENGINE","CASSANDRA_WRITE_QUERIES_MONOLITH","CASSANDRA_READ_QUERIES_MONOLITH"',
'g'
)
WHERE trigger_type = 'RATE_LIMITS'
AND trigger_config LIKE '%"CASSANDRA_QUERIES"%';
-- UPDATE NOTIFICATION RULE CASSANDRA RATE LIMITS END

2
common/actor/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/cache/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/cluster-api/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/coap-server/pom.xml
View File

@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/dao-api/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/data/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

7
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AbstractEntityFields.java
View File

@ -63,7 +63,12 @@ public class AbstractEntityFields implements EntityFields {
}
protected UUID checkId(UUID id) {
return id != null && !id.equals(EntityId.NULL_UUID) ? id : null;
return id == null || id.equals(EntityId.NULL_UUID) ? null : id;
}
@Override
public UUID getCustomerId() {
return checkId(customerId);
}
}

4
common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java
View File

@ -38,11 +38,11 @@ public enum LimitedApi {
CASSANDRA_READ_QUERIES_MONOLITH(
RateLimitUtil.merge(
DefaultTenantProfileConfiguration::getCassandraReadQueryTenantCoreRateLimits,
DefaultTenantProfileConfiguration::getCassandraReadQueryTenantRuleEngineRateLimits), "Telemetry read queries", true),
DefaultTenantProfileConfiguration::getCassandraReadQueryTenantRuleEngineRateLimits), "Monolith telemetry Cassandra read queries", true),
CASSANDRA_WRITE_QUERIES_MONOLITH(
RateLimitUtil.merge(
DefaultTenantProfileConfiguration::getCassandraWriteQueryTenantCoreRateLimits,
DefaultTenantProfileConfiguration::getCassandraWriteQueryTenantRuleEngineRateLimits), "Telemetry write queries", true),
DefaultTenantProfileConfiguration::getCassandraWriteQueryTenantRuleEngineRateLimits), "Monolith telemetry Cassandra write queries", true),
EDGE_EVENTS(DefaultTenantProfileConfiguration::getEdgeEventRateLimits, "Edge events", true),
EDGE_EVENTS_PER_EDGE(DefaultTenantProfileConfiguration::getEdgeEventRateLimitsPerEdge, "Edge events per edge", false),
EDGE_UPLINK_MESSAGES(DefaultTenantProfileConfiguration::getEdgeUplinkMessagesRateLimits, "Edge uplink messages", true),

2
common/discovery-api/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/edge-api/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/edqs/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/message/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>thingsboard</artifactId>
</parent>
<artifactId>common</artifactId>

2
common/proto/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/queue/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/script/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/script/remote-js-client/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard.common</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>script</artifactId>
</parent>
<groupId>org.thingsboard.common.script</groupId>

2
common/script/script-api/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard.common</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>script</artifactId>
</parent>
<groupId>org.thingsboard.common.script</groupId>

2
common/stats/pom.xml
View File

@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/transport/coap/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard.common</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.common.transport</groupId>

2
common/transport/http/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard.common</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.common.transport</groupId>

2
common/transport/lwm2m/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard.common</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.common.transport</groupId>

2
common/transport/mqtt/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard.common</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.common.transport</groupId>

2
common/transport/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/transport/snmp/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>org.thingsboard.common</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>

2
common/transport/transport-api/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard.common</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.common.transport</groupId>

2
common/util/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
common/version-control/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>common</artifactId>
</parent>
<groupId>org.thingsboard.common</groupId>

2
dao/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>thingsboard</artifactId>
</parent>
<artifactId>dao</artifactId>

12
dao/src/main/resources/sql/schema-entities-idx-psql-addon.sql
View File

@ -22,19 +22,19 @@
-- That why we need to define DESC index explicitly as (ts DESC NULLS LAST)
CREATE INDEX IF NOT EXISTS idx_rule_node_debug_event_main
ON rule_node_debug_event (tenant_id ASC, entity_id ASC, ts DESC NULLS LAST) WITH (FILLFACTOR=95);
ON rule_node_debug_event (tenant_id ASC, entity_id ASC, ts DESC NULLS LAST);
CREATE INDEX IF NOT EXISTS idx_rule_chain_debug_event_main
ON rule_chain_debug_event (tenant_id ASC, entity_id ASC, ts DESC NULLS LAST) WITH (FILLFACTOR=95);
ON rule_chain_debug_event (tenant_id ASC, entity_id ASC, ts DESC NULLS LAST);
CREATE INDEX IF NOT EXISTS idx_stats_event_main
ON stats_event (tenant_id ASC, entity_id ASC, ts DESC NULLS LAST) WITH (FILLFACTOR=95);
ON stats_event (tenant_id ASC, entity_id ASC, ts DESC NULLS LAST);
CREATE INDEX IF NOT EXISTS idx_lc_event_main
ON lc_event (tenant_id ASC, entity_id ASC, ts DESC NULLS LAST) WITH (FILLFACTOR=95);
ON lc_event (tenant_id ASC, entity_id ASC, ts DESC NULLS LAST);
CREATE INDEX IF NOT EXISTS idx_error_event_main
ON error_event (tenant_id ASC, entity_id ASC, ts DESC NULLS LAST) WITH (FILLFACTOR=95);
ON error_event (tenant_id ASC, entity_id ASC, ts DESC NULLS LAST);
CREATE INDEX IF NOT EXISTS idx_cf_debug_event_main
ON cf_debug_event (tenant_id ASC, entity_id ASC, ts DESC NULLS LAST) WITH (FILLFACTOR=95);
ON cf_debug_event (tenant_id ASC, entity_id ASC, ts DESC NULLS LAST);

2
edqs/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>thingsboard</artifactId>
</parent>
<artifactId>edqs</artifactId>

2
monitoring/pom.xml
View File

@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>thingsboard</artifactId>
</parent>

2
msa/black-box-tests/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>msa</artifactId>
</parent>
<groupId>org.thingsboard.msa</groupId>

2
msa/edqs/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>msa</artifactId>
</parent>
<groupId>org.thingsboard.msa</groupId>

2
msa/js-executor/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>msa</artifactId>
</parent>
<groupId>org.thingsboard.msa</groupId>

2
msa/monitoring/pom.xml
View File

@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>msa</artifactId>
</parent>

2
msa/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>thingsboard</artifactId>
</parent>
<artifactId>msa</artifactId>

2
msa/tb-node/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>msa</artifactId>
</parent>
<groupId>org.thingsboard.msa</groupId>

2
msa/tb/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>msa</artifactId>
</parent>
<groupId>org.thingsboard.msa</groupId>

2
msa/transport/coap/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard.msa</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.msa.transport</groupId>

2
msa/transport/http/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard.msa</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.msa.transport</groupId>

2
msa/transport/lwm2m/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard.msa</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.msa.transport</groupId>

2
msa/transport/mqtt/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard.msa</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.msa.transport</groupId>

2
msa/transport/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>msa</artifactId>
</parent>
<groupId>org.thingsboard.msa</groupId>

2
msa/transport/snmp/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>org.thingsboard.msa</groupId>
<artifactId>transport</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
</parent>
<groupId>org.thingsboard.msa.transport</groupId>

2
msa/vc-executor-docker/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>msa</artifactId>
</parent>
<groupId>org.thingsboard.msa</groupId>

2
msa/vc-executor/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>msa</artifactId>
</parent>
<groupId>org.thingsboard.msa</groupId>

2
msa/web-ui/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>msa</artifactId>
</parent>
<groupId>org.thingsboard.msa</groupId>

4
netty-mqtt/pom.xml
View File

@ -19,11 +19,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>thingsboard</artifactId>
</parent>
<artifactId>netty-mqtt</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<packaging>jar</packaging>
<name>Netty MQTT Client</name>

2
pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.thingsboard</groupId>
<artifactId>thingsboard</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<packaging>pom</packaging>
<name>Thingsboard</name>

2
rest-client/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>thingsboard</artifactId>
</parent>
<artifactId>rest-client</artifactId>

2
rule-engine/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>thingsboard</artifactId>
</parent>
<artifactId>rule-engine</artifactId>

2
rule-engine/rule-engine-api/pom.xml
View File

@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>rule-engine</artifactId>
</parent>
<groupId>org.thingsboard.rule-engine</groupId>

2
rule-engine/rule-engine-components/pom.xml
View File

@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>rule-engine</artifactId>
</parent>
<groupId>org.thingsboard.rule-engine</groupId>

2
tools/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>thingsboard</artifactId>
</parent>
<artifactId>tools</artifactId>

2
transport/coap/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.transport</groupId>

2
transport/http/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.transport</groupId>

2
transport/lwm2m/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.transport</groupId>

2
transport/mqtt/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>
<groupId>org.thingsboard.transport</groupId>

2
transport/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>thingsboard</artifactId>
</parent>
<artifactId>transport</artifactId>

2
transport/snmp/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>transport</artifactId>
</parent>

2
ui-ngx/pom.xml
View File

@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.thingsboard</groupId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.0-RC</version>
<artifactId>thingsboard</artifactId>
</parent>
<groupId>org.thingsboard</groupId>

4
ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts
View File

@ -47,10 +47,10 @@ export class EditorPanelComponent implements OnInit {
tinyMceOptions: Partial<EditorOptions> = {
base_url: '/assets/tinymce',
suffix: '.min',
plugins: ['link', 'table', 'image', 'imagetools', 'lists'],
plugins: ['link', 'table', 'image', 'imagetools', 'lists', 'fullscreen'],
menubar: 'edit insert view format',
toolbar: ['fontfamily fontsize | bold italic underline strikethrough forecolor backcolor',
'alignleft aligncenter alignright alignjustify | bullist | link table image'],
'alignleft aligncenter alignright alignjustify | bullist | link table image | fullscreen'],
toolbar_mode: 'sliding',
height: 400,
autofocus: false,

14
ui-ngx/src/app/shared/models/limited-api.models.ts
View File

@ -22,7 +22,12 @@ export enum LimitedApi {
REST_REQUESTS_PER_TENANT = 'REST_REQUESTS_PER_TENANT',
REST_REQUESTS_PER_CUSTOMER = 'REST_REQUESTS_PER_CUSTOMER',
WS_UPDATES_PER_SESSION = 'WS_UPDATES_PER_SESSION',
CASSANDRA_QUERIES = 'CASSANDRA_QUERIES',
CASSANDRA_WRITE_QUERIES_CORE = 'CASSANDRA_WRITE_QUERIES_CORE',
CASSANDRA_READ_QUERIES_CORE = 'CASSANDRA_READ_QUERIES_CORE',
CASSANDRA_WRITE_QUERIES_RULE_ENGINE = 'CASSANDRA_WRITE_QUERIES_RULE_ENGINE',
CASSANDRA_READ_QUERIES_RULE_ENGINE = 'CASSANDRA_READ_QUERIES_RULE_ENGINE',
CASSANDRA_WRITE_QUERIES_MONOLITH = 'CASSANDRA_WRITE_QUERIES_MONOLITH',
CASSANDRA_READ_QUERIES_MONOLITH = 'CASSANDRA_READ_QUERIES_MONOLITH',
TRANSPORT_MESSAGES_PER_TENANT = 'TRANSPORT_MESSAGES_PER_TENANT',
TRANSPORT_MESSAGES_PER_DEVICE = 'TRANSPORT_MESSAGES_PER_DEVICE',
TRANSPORT_MESSAGES_PER_GATEWAY = 'TRANSPORT_MESSAGES_PER_GATEWAY',
@ -42,7 +47,12 @@ export const LimitedApiTranslationMap = new Map<LimitedApi, string>(
[LimitedApi.REST_REQUESTS_PER_TENANT, 'api-limit.rest-api-requests'],
[LimitedApi.REST_REQUESTS_PER_CUSTOMER, 'api-limit.rest-api-requests-per-customer'],
[LimitedApi.WS_UPDATES_PER_SESSION, 'api-limit.ws-updates-per-session'],
[LimitedApi.CASSANDRA_QUERIES, 'api-limit.cassandra-queries'],
[LimitedApi.CASSANDRA_WRITE_QUERIES_CORE, 'api-limit.cassandra-write-queries-core'],
[LimitedApi.CASSANDRA_READ_QUERIES_CORE, 'api-limit.cassandra-read-queries-core'],
[LimitedApi.CASSANDRA_WRITE_QUERIES_RULE_ENGINE, 'api-limit.cassandra-write-queries-rule-engine'],
[LimitedApi.CASSANDRA_READ_QUERIES_RULE_ENGINE, 'api-limit.cassandra-read-queries-rule-engine'],
[LimitedApi.CASSANDRA_WRITE_QUERIES_MONOLITH, 'api-limit.cassandra-write-queries-monolith'],
[LimitedApi.CASSANDRA_READ_QUERIES_MONOLITH, 'api-limit.cassandra-read-queries-monolith'],
[LimitedApi.TRANSPORT_MESSAGES_PER_TENANT, 'api-limit.transport-messages'],
[LimitedApi.TRANSPORT_MESSAGES_PER_DEVICE, 'api-limit.transport-messages-per-device'],
[LimitedApi.TRANSPORT_MESSAGES_PER_GATEWAY, 'api-limit.transport-messages-per-gateway'],

7
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -924,7 +924,12 @@
"view-statistics": "View statistics"
},
"api-limit": {
"cassandra-queries": "Cassandra queries",
"cassandra-write-queries-core": "Rest API Cassandra write queries",
"cassandra-read-queries-core": "Rest API and WS telemetry Cassandra read queries",
"cassandra-write-queries-rule-engine": "Rule Engine telemetry Cassandra write queries",
"cassandra-read-queries-rule-engine": "Rule Engine telemetry Cassandra read queries",
"cassandra-write-queries-monolith": "Monolith telemetry Cassandra write queries",
"cassandra-read-queries-monolith": "Monolith telemetry Cassandra read queries",
"entity-version-creation": "Entity version creation",
"entity-version-load": "Entity version load",
"notification-requests": "Notification requests",

6
ui-ngx/src/styles.scss
View File

@ -1292,6 +1292,12 @@ pre.tb-highlight {
background: rgba(0, 0, 0, 0.06);
}
}
&.tox-fullscreen {
mat-sidenav.tb-site-sidenav {
z-index: 1;
}
}
}
/***************

Write Preview
Loading…
Cancel
Save