Showing
6 changed files
with
68 additions
and
76 deletions
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | "ruleChain": { | 2 | "ruleChain": { |
| 3 | "additionalInfo": null, | 3 | "additionalInfo": null, |
| 4 | "name": "Thermostat Alarms", | 4 | "name": "Thermostat Alarms", |
| 5 | + "type": "SYSTEM", | ||
| 5 | "firstRuleNodeId": null, | 6 | "firstRuleNodeId": null, |
| 6 | "root": false, | 7 | "root": false, |
| 7 | "debugMode": false, | 8 | "debugMode": false, |
| @@ -15,49 +15,49 @@ | @@ -15,49 +15,49 @@ | ||
| 15 | -- | 15 | -- |
| 16 | 16 | ||
| 17 | CREATE TABLE IF NOT EXISTS thingsboard.edge ( | 17 | CREATE TABLE IF NOT EXISTS thingsboard.edge ( |
| 18 | - id timeuuid, | ||
| 19 | - tenant_id timeuuid, | ||
| 20 | - customer_id timeuuid, | ||
| 21 | - name text, | ||
| 22 | - search_text text, | ||
| 23 | - configuration text, | ||
| 24 | - additional_info text, | ||
| 25 | - PRIMARY KEY (id, tenant_id) | 18 | + id timeuuid, |
| 19 | + tenant_id timeuuid, | ||
| 20 | + customer_id timeuuid, | ||
| 21 | + name text, | ||
| 22 | + search_text text, | ||
| 23 | + configuration text, | ||
| 24 | + additional_info text, | ||
| 25 | + PRIMARY KEY (id, tenant_id) | ||
| 26 | ); | 26 | ); |
| 27 | 27 | ||
| 28 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_tenant_and_name AS | 28 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_tenant_and_name AS |
| 29 | - SELECT * | ||
| 30 | - from thingsboard.edge | ||
| 31 | - WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL | ||
| 32 | - PRIMARY KEY ( tenant_id, name, id, customer_id, type) | ||
| 33 | - WITH CLUSTERING ORDER BY ( name ASC, id DESC, customer_id DESC); | 29 | + SELECT * |
| 30 | + from thingsboard.edge | ||
| 31 | + WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL | ||
| 32 | + PRIMARY KEY ( tenant_id, name, id, customer_id, type) | ||
| 33 | + WITH CLUSTERING ORDER BY ( name ASC, id DESC, customer_id DESC); | ||
| 34 | 34 | ||
| 35 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_tenant_and_search_text AS | 35 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_tenant_and_search_text AS |
| 36 | - SELECT * | ||
| 37 | - from thingsboard.edge | ||
| 38 | - WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 39 | - PRIMARY KEY ( tenant_id, search_text, id, customer_id, type) | ||
| 40 | - WITH CLUSTERING ORDER BY ( search_text ASC, id DESC, customer_id DESC); | 36 | + SELECT * |
| 37 | + from thingsboard.edge | ||
| 38 | + WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 39 | + PRIMARY KEY ( tenant_id, search_text, id, customer_id, type) | ||
| 40 | + WITH CLUSTERING ORDER BY ( search_text ASC, id DESC, customer_id DESC); | ||
| 41 | 41 | ||
| 42 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_tenant_by_type_and_search_text AS | 42 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_tenant_by_type_and_search_text AS |
| 43 | - SELECT * | ||
| 44 | - from thingsboard.edge | ||
| 45 | - WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 46 | - PRIMARY KEY ( tenant_id, type, search_text, id, customer_id) | ||
| 47 | - WITH CLUSTERING ORDER BY ( type ASC, search_text ASC, id DESC, customer_id DESC); | 43 | + SELECT * |
| 44 | + from thingsboard.edge | ||
| 45 | + WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 46 | + PRIMARY KEY ( tenant_id, type, search_text, id, customer_id) | ||
| 47 | + WITH CLUSTERING ORDER BY ( type ASC, search_text ASC, id DESC, customer_id DESC); | ||
| 48 | 48 | ||
| 49 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_customer_and_search_text AS | 49 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_customer_and_search_text AS |
| 50 | - SELECT * | ||
| 51 | - from thingsboard.edge | ||
| 52 | - WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 53 | - PRIMARY KEY ( customer_id, tenant_id, search_text, id, type ) | ||
| 54 | - WITH CLUSTERING ORDER BY ( tenant_id DESC, search_text ASC, id DESC ); | 50 | + SELECT * |
| 51 | + from thingsboard.edge | ||
| 52 | + WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 53 | + PRIMARY KEY ( customer_id, tenant_id, search_text, id, type ) | ||
| 54 | + WITH CLUSTERING ORDER BY ( tenant_id DESC, search_text ASC, id DESC ); | ||
| 55 | 55 | ||
| 56 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_customer_by_type_and_search_text AS | 56 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_customer_by_type_and_search_text AS |
| 57 | - SELECT * | ||
| 58 | - from thingsboard.edge | ||
| 59 | - WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 60 | - PRIMARY KEY ( customer_id, tenant_id, type, search_text, id ) | ||
| 61 | - WITH CLUSTERING ORDER BY ( tenant_id DESC, type ASC, search_text ASC, id DESC ); | 57 | + SELECT * |
| 58 | + from thingsboard.edge | ||
| 59 | + WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 60 | + PRIMARY KEY ( customer_id, tenant_id, type, search_text, id ) | ||
| 61 | + WITH CLUSTERING ORDER BY ( tenant_id DESC, type ASC, search_text ASC, id DESC ); | ||
| 62 | 62 | ||
| 63 | -- VOBA ADD changes for the MATERIALIZED view for DEVICE ASSET ENTITY_VIEW RULE_CHAIN | 63 | -- VOBA ADD changes for the MATERIALIZED view for DEVICE ASSET ENTITY_VIEW RULE_CHAIN |
| @@ -456,6 +456,7 @@ audit-log: | @@ -456,6 +456,7 @@ audit-log: | ||
| 456 | "rule_chain": "${AUDIT_LOG_MASK_RULE_CHAIN:W}" | 456 | "rule_chain": "${AUDIT_LOG_MASK_RULE_CHAIN:W}" |
| 457 | "alarm": "${AUDIT_LOG_MASK_ALARM:W}" | 457 | "alarm": "${AUDIT_LOG_MASK_ALARM:W}" |
| 458 | "entity_view": "${AUDIT_LOG_MASK_ENTITY_VIEW:W}" | 458 | "entity_view": "${AUDIT_LOG_MASK_ENTITY_VIEW:W}" |
| 459 | + "edge": "${AUDIT_LOG_MASK_EDGE:W}" | ||
| 459 | sink: | 460 | sink: |
| 460 | # Type of external sink. possible options: none, elasticsearch | 461 | # Type of external sink. possible options: none, elasticsearch |
| 461 | type: "${AUDIT_LOG_SINK_TYPE:none}" | 462 | type: "${AUDIT_LOG_SINK_TYPE:none}" |
| @@ -67,10 +67,6 @@ public class RuleChain extends SearchTextBasedWithAdditionalInfo<RuleChainId> im | @@ -67,10 +67,6 @@ public class RuleChain extends SearchTextBasedWithAdditionalInfo<RuleChainId> im | ||
| 67 | this.type = ruleChain.getType(); | 67 | this.type = ruleChain.getType(); |
| 68 | this.firstRuleNodeId = ruleChain.getFirstRuleNodeId(); | 68 | this.firstRuleNodeId = ruleChain.getFirstRuleNodeId(); |
| 69 | this.root = ruleChain.isRoot(); | 69 | this.root = ruleChain.isRoot(); |
| 70 | - | ||
| 71 | - // TODO: VOBA - check that this is needed | ||
| 72 | - // this.debugMode = ruleChain.isDebugMode(); | ||
| 73 | - | ||
| 74 | this.assignedEdges = ruleChain.getAssignedEdges(); | 70 | this.assignedEdges = ruleChain.getAssignedEdges(); |
| 75 | this.setConfiguration(ruleChain.getConfiguration()); | 71 | this.setConfiguration(ruleChain.getConfiguration()); |
| 76 | } | 72 | } |
| @@ -727,47 +727,47 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_view_by_tenant_and_ent | @@ -727,47 +727,47 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_view_by_tenant_and_ent | ||
| 727 | WITH CLUSTERING ORDER BY (entity_id DESC, customer_id DESC, search_text ASC, id DESC); | 727 | WITH CLUSTERING ORDER BY (entity_id DESC, customer_id DESC, search_text ASC, id DESC); |
| 728 | 728 | ||
| 729 | CREATE TABLE IF NOT EXISTS thingsboard.edge ( | 729 | CREATE TABLE IF NOT EXISTS thingsboard.edge ( |
| 730 | - id timeuuid, | ||
| 731 | - tenant_id timeuuid, | ||
| 732 | - customer_id timeuuid, | ||
| 733 | - name text, | ||
| 734 | - search_text text, | ||
| 735 | - configuration text, | ||
| 736 | - additional_info text, | ||
| 737 | - PRIMARY KEY (id, tenant_id) | 730 | + id timeuuid, |
| 731 | + tenant_id timeuuid, | ||
| 732 | + customer_id timeuuid, | ||
| 733 | + name text, | ||
| 734 | + search_text text, | ||
| 735 | + configuration text, | ||
| 736 | + additional_info text, | ||
| 737 | + PRIMARY KEY (id, tenant_id) | ||
| 738 | ); | 738 | ); |
| 739 | 739 | ||
| 740 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_tenant_and_name AS | 740 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_tenant_and_name AS |
| 741 | - SELECT * | ||
| 742 | - from thingsboard.edge | ||
| 743 | - WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL | ||
| 744 | - PRIMARY KEY ( tenant_id, name, id, customer_id, type) | ||
| 745 | - WITH CLUSTERING ORDER BY ( name ASC, id DESC, customer_id DESC); | 741 | + SELECT * |
| 742 | + from thingsboard.edge | ||
| 743 | + WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL | ||
| 744 | + PRIMARY KEY ( tenant_id, name, id, customer_id, type) | ||
| 745 | + WITH CLUSTERING ORDER BY ( name ASC, id DESC, customer_id DESC); | ||
| 746 | 746 | ||
| 747 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_tenant_and_search_text AS | 747 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_tenant_and_search_text AS |
| 748 | - SELECT * | ||
| 749 | - from thingsboard.edge | ||
| 750 | - WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 751 | - PRIMARY KEY ( tenant_id, search_text, id, customer_id, type) | ||
| 752 | - WITH CLUSTERING ORDER BY ( search_text ASC, id DESC, customer_id DESC); | 748 | + SELECT * |
| 749 | + from thingsboard.edge | ||
| 750 | + WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 751 | + PRIMARY KEY ( tenant_id, search_text, id, customer_id, type) | ||
| 752 | + WITH CLUSTERING ORDER BY ( search_text ASC, id DESC, customer_id DESC); | ||
| 753 | 753 | ||
| 754 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_tenant_by_type_and_search_text AS | 754 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_tenant_by_type_and_search_text AS |
| 755 | - SELECT * | ||
| 756 | - from thingsboard.edge | ||
| 757 | - WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 758 | - PRIMARY KEY ( tenant_id, type, search_text, id, customer_id) | ||
| 759 | - WITH CLUSTERING ORDER BY ( type ASC, search_text ASC, id DESC, customer_id DESC); | 755 | + SELECT * |
| 756 | + from thingsboard.edge | ||
| 757 | + WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 758 | + PRIMARY KEY ( tenant_id, type, search_text, id, customer_id) | ||
| 759 | + WITH CLUSTERING ORDER BY ( type ASC, search_text ASC, id DESC, customer_id DESC); | ||
| 760 | 760 | ||
| 761 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_customer_and_search_text AS | 761 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_customer_and_search_text AS |
| 762 | - SELECT * | ||
| 763 | - from thingsboard.edge | ||
| 764 | - WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 765 | - PRIMARY KEY ( customer_id, tenant_id, search_text, id, type ) | ||
| 766 | - WITH CLUSTERING ORDER BY ( tenant_id DESC, search_text ASC, id DESC ); | 762 | + SELECT * |
| 763 | + from thingsboard.edge | ||
| 764 | + WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 765 | + PRIMARY KEY ( customer_id, tenant_id, search_text, id, type ) | ||
| 766 | + WITH CLUSTERING ORDER BY ( tenant_id DESC, search_text ASC, id DESC ); | ||
| 767 | 767 | ||
| 768 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_customer_by_type_and_search_text AS | 768 | CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.edge_by_customer_by_type_and_search_text AS |
| 769 | - SELECT * | ||
| 770 | - from thingsboard.edge | ||
| 771 | - WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 772 | - PRIMARY KEY ( customer_id, tenant_id, type, search_text, id ) | ||
| 773 | - WITH CLUSTERING ORDER BY ( tenant_id DESC, type ASC, search_text ASC, id DESC ); | 769 | + SELECT * |
| 770 | + from thingsboard.edge | ||
| 771 | + WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND type IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL | ||
| 772 | + PRIMARY KEY ( customer_id, tenant_id, type, search_text, id ) | ||
| 773 | + WITH CLUSTERING ORDER BY ( tenant_id DESC, type ASC, search_text ASC, id DESC ); |
| @@ -31,12 +31,6 @@ | @@ -31,12 +31,6 @@ | ||
| 31 | <md-button ng-click="onUnassignFromCustomer({event: $event})" | 31 | <md-button ng-click="onUnassignFromCustomer({event: $event})" |
| 32 | ng-show="!isEdit && dashboardScope === 'customer' && customerId != dashboard.publicCustomerId" | 32 | ng-show="!isEdit && dashboardScope === 'customer' && customerId != dashboard.publicCustomerId" |
| 33 | class="md-raised md-primary">{{ 'dashboard.unassign-from-customer' | translate }}</md-button> | 33 | class="md-raised md-primary">{{ 'dashboard.unassign-from-customer' | translate }}</md-button> |
| 34 | -<!--<md-button ng-click="onManageAssignedEdges({event: $event})"--> | ||
| 35 | - <!--ng-show="!isEdit && dashboardScope === 'tenant'"--> | ||
| 36 | - <!--class="md-raised md-primary">{{ 'dashboard.manage-assigned-edges' | translate }}</md-button>--> | ||
| 37 | -<!--<md-button ng-click="onUnassignFromEdge({event: $event})"--> | ||
| 38 | - <!--ng-show="!isEdit && dashboardScope === 'customer' && customerId != dashboard.publicCustomerId"--> | ||
| 39 | - <!--class="md-raised md-primary">{{ 'dashboard.unassign-from-customer' | translate }}</md-button>--> | ||
| 40 | <md-button ng-click="onDeleteDashboard({event: $event})" | 34 | <md-button ng-click="onDeleteDashboard({event: $event})" |
| 41 | ng-show="!isEdit && dashboardScope === 'tenant'" | 35 | ng-show="!isEdit && dashboardScope === 'tenant'" |
| 42 | class="md-raised md-primary">{{ 'dashboard.delete' | translate }}</md-button> | 36 | class="md-raised md-primary">{{ 'dashboard.delete' | translate }}</md-button> |