Updated thermostat demo

6 years ago · 3c5bce7d20
3 changed files with 234 additions and 173 deletions
--- a/application/src/main/data/json/demo/dashboards/thermostats.json
+++ b/application/src/main/data/json/demo/dashboards/thermostats.json
@ -219,8 +219,8 @@
            "defaultPageSize": 10,
            "defaultSortOrder": "-createdTime",
            "enableSelectColumnDisplay": false,
-            "enableStatusFilter": true,
-            "alarmsTitle": "Alarms"
+            "alarmsTitle": "Alarms",
+            "enableFilter": true
          },
          "title": "New Alarms table",
          "dropShadow": true,
@ -234,6 +234,9 @@
          "showLegend": false,
          "alarmSource": {
            "type": "entity",
+            "name": "alarms",
+            "entityAliasId": "68a058e1-fdda-8482-715b-3ae4a488568e",
+            "filterId": null,
            "dataKeys": [
              {
                "name": "createdTime",
@ -275,9 +278,7 @@
                "settings": {},
                "_hash": 0.7977920750136249
              }
-            ],
-            "entityAliasId": "ce27a9d0-93bf-b7a4-054d-d0369a8cf813",
-            "name": "alarms"
+            ]
          },
          "alarmSearchStatus": "ANY",
          "alarmsPollingInterval": 5,
@ -1031,7 +1032,8 @@
            "markerImageFunction": "var res;\nif(dsData[dsIndex].active !== \"true\"){\n\tvar res = {\n\t    url: images[0],\n\t    size: 48\n\t}\n} else {\n    var res = {\n\t    url: images[1],\n\t    size: 48\n\t}\n}\nreturn res;",
            "useLabelFunction": true,
            "provider": "openstreet-map",
-            "draggableMarker": true
+            "draggableMarker": true,
+            "editablePolygon": true
          },
          "title": "New Markers Placement - OpenStreetMap",
          "dropShadow": true,
@ -1062,61 +1064,6 @@
          "displayTimewindow": true
        },
        "id": "0a430429-9078-9ae6-2b67-e4a15a2bf8bf"
-      },
-      "f4bb2f2d-0164-60bc-f3e8-9b1e7b5a59b3": {
-        "isSystemType": true,
-        "bundleAlias": "input_widgets",
-        "typeAlias": "update_double_timeseries",
-        "type": "latest",
-        "title": "New widget",
-        "sizeX": 7.5,
-        "sizeY": 3,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "12ae98c7-1ea2-52cf-64d5-763e9d993547",
-              "dataKeys": [
-                {
-                  "name": "temperature",
-                  "type": "timeseries",
-                  "label": "temperature",
-                  "color": "#2196f3",
-                  "settings": {},
-                  "_hash": 0.4164505192982848
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "realtime": {
-              "timewindowMs": 60000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "showResultMessage": true,
-            "showLabel": true
-          },
-          "title": "New Update double timeseries",
-          "dropShadow": true,
-          "enableFullscreen": false,
-          "widgetStyle": {},
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "useDashboardTimewindow": true,
-          "showLegend": false,
-          "actions": {}
-        },
-        "row": 0,
-        "col": 0,
-        "id": "f4bb2f2d-0164-60bc-f3e8-9b1e7b5a59b3"
      }
    },
    "states": {
@ -1215,12 +1162,6 @@
                "sizeY": 6,
                "row": 6,
                "col": 0
-              },
-              "f4bb2f2d-0164-60bc-f3e8-9b1e7b5a59b3": {
-                "sizeX": 7.5,
-                "sizeY": 3,
-                "row": 12,
-                "col": 0
              }
            },
            "gridSettings": {
@ -1257,16 +1198,6 @@
          "stateEntityParamName": null,
          "defaultStateEntity": null
        }
-      },
-      "ce27a9d0-93bf-b7a4-054d-d0369a8cf813": {
-        "id": "ce27a9d0-93bf-b7a4-054d-d0369a8cf813",
-        "alias": "Thermostat-alarm",
-        "filter": {
-          "type": "entityName",
-          "resolveMultiple": false,
-          "entityType": "ASSET",
-          "entityNameFilter": "Thermostat Alarms"
-        }
      }
    },
    "timewindow": {
@ -1301,7 +1232,8 @@
      "showDashboardTimewindow": true,
      "showDashboardExport": true,
      "toolbarAlwaysOpen": true
-    }
+    },
+    "filters": {}
  },
  "name": "Thermostats"
 }
--- a/application/src/main/data/json/demo/rule_chains/thermostat_alarms.json
+++ b/application/src/main/data/json/demo/rule_chains/thermostat_alarms.json
@ -1,6 +1,8 @@
 {
  "ruleChain": {
-    "additionalInfo": null,
+    "additionalInfo": {
+      "description": ""
+    },
    "name": "Thermostat Alarms",
    "firstRuleNodeId": null,
    "root": false,
@ -8,131 +10,126 @@
    "configuration": null
  },
  "metadata": {
-    "firstNodeIndex": 5,
+    "firstNodeIndex": 6,
    "nodes": [
      {
        "additionalInfo": {
-          "layoutX": 929,
-          "layoutY": 67
+          "layoutX": 822,
+          "layoutY": 294
        },
-        "type": "org.thingsboard.rule.engine.action.TbCreateAlarmNode",
-        "name": "Create Temp Alarm",
+        "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
+        "name": "Save Timeseries",
        "debugMode": false,
        "configuration": {
-          "alarmType": "High Temperature",
-          "alarmDetailsBuildJs": "var details = {};\nif (metadata.prevAlarmDetails) {\n    details = JSON.parse(metadata.prevAlarmDetails);\n}\ndetails.triggerValue = msg.temperature;\nreturn details;",
-          "severity": "MAJOR",
-          "propagate": true,
-          "useMessageAlarmData": false,
-          "relationTypes": [
-            "ToAlarmPropagationAsset"
-          ]
+          "defaultTTL": 0
        }
      },
      {
        "additionalInfo": {
-          "layoutX": 930,
-          "layoutY": 201
+          "description": null,
+          "layoutX": 824,
+          "layoutY": 221
        },
-        "type": "org.thingsboard.rule.engine.action.TbClearAlarmNode",
-        "name": "Clear Temp Alarm",
+        "type": "org.thingsboard.rule.engine.telemetry.TbMsgAttributesNode",
+        "name": "Save Client Attributes",
        "debugMode": false,
        "configuration": {
-          "alarmType": "High Temperature",
-          "alarmDetailsBuildJs": "var details = {};\nif (metadata.prevAlarmDetails) {\n    details = JSON.parse(metadata.prevAlarmDetails);\n}\nreturn details;"
+          "scope": "SERVER_SCOPE",
+          "notifyDevice": null
        }
      },
      {
        "additionalInfo": {
-          "layoutX": 930,
-          "layoutY": 131
+          "layoutX": 494,
+          "layoutY": 309
        },
-        "type": "org.thingsboard.rule.engine.action.TbCreateAlarmNode",
-        "name": "Create Humidity Alarm",
+        "type": "org.thingsboard.rule.engine.filter.TbMsgTypeSwitchNode",
+        "name": "Message Type Switch",
        "debugMode": false,
        "configuration": {
-          "alarmType": "Low Humidity",
-          "alarmDetailsBuildJs": "var details = {};\nif (metadata.prevAlarmDetails) {\n    details = JSON.parse(metadata.prevAlarmDetails);\n}\ndetails.triggerValue = msg.humidity;\nreturn details;",
-          "severity": "MINOR",
-          "propagate": true,
-          "useMessageAlarmData": false,
-          "relationTypes": [
-            "ToAlarmPropagationAsset"
-          ]
+          "version": 0
        }
      },
      {
        "additionalInfo": {
-          "layoutX": 929,
-          "layoutY": 275
+          "layoutX": 824,
+          "layoutY": 383
        },
-        "type": "org.thingsboard.rule.engine.action.TbClearAlarmNode",
-        "name": "Clear Humidity Alarm",
+        "type": "org.thingsboard.rule.engine.action.TbLogNode",
+        "name": "Log RPC from Device",
        "debugMode": false,
        "configuration": {
-          "alarmType": "Low Humidity",
-          "alarmDetailsBuildJs": "var details = {};\nif (metadata.prevAlarmDetails) {\n    details = JSON.parse(metadata.prevAlarmDetails);\n}\nreturn details;"
+          "jsScript": "return '\\nIncoming message:\\n' + JSON.stringify(msg) + '\\nIncoming metadata:\\n' + JSON.stringify(metadata);"
        }
      },
      {
        "additionalInfo": {
-          "layoutX": 586,
-          "layoutY": 148
+          "layoutX": 823,
+          "layoutY": 444
        },
-        "type": "org.thingsboard.rule.engine.filter.TbJsSwitchNode",
-        "name": "Check Alarms",
+        "type": "org.thingsboard.rule.engine.action.TbLogNode",
+        "name": "Log Other",
        "debugMode": false,
        "configuration": {
-          "jsScript": "var relations = [];\nif(metadata[\"ss_alarmTemperature\"] === \"true\"){\n    if(msg.temperature > metadata[\"ss_thresholdTemperature\"]){\n        relations.push(\"NewTempAlarm\");\n    } else {\n        relations.push(\"ClearTempAlarm\");\n    }\n}\nif(metadata[\"ss_alarmHumidity\"] === \"true\"){\n    if(msg.humidity < metadata[\"ss_thresholdHumidity\"]){\n        relations.push(\"NewHumidityAlarm\");\n    } else {\n        relations.push(\"ClearHumidityAlarm\");\n    }\n}\n\nreturn relations;"
+          "jsScript": "return '\\nIncoming message:\\n' + JSON.stringify(msg) + '\\nIncoming metadata:\\n' + JSON.stringify(metadata);"
        }
      },
      {
        "additionalInfo": {
-          "layoutX": 321,
-          "layoutY": 149
+          "layoutX": 822,
+          "layoutY": 507
        },
-        "type": "org.thingsboard.rule.engine.metadata.TbGetAttributesNode",
-        "name": "Fetch Configuration",
+        "type": "org.thingsboard.rule.engine.rpc.TbSendRPCRequestNode",
+        "name": "RPC Call Request",
        "debugMode": false,
        "configuration": {
-          "clientAttributeNames": [],
-          "sharedAttributeNames": [],
-          "serverAttributeNames": [
-            "alarmTemperature",
-            "thresholdTemperature",
-            "alarmHumidity",
-            "thresholdHumidity"
-          ],
-          "latestTsKeyNames": [],
-          "tellFailureIfAbsent": false,
-          "getLatestValueWithTs": false
+          "timeoutInSeconds": 60
+        }
+      },
+      {
+        "additionalInfo": {
+          "description": "",
+          "layoutX": 209,
+          "layoutY": 307
+        },
+        "type": "org.thingsboard.rule.engine.profile.TbDeviceProfileNode",
+        "name": "Device Profile Node",
+        "debugMode": false,
+        "configuration": {
+          "persistAlarmRulesState": false,
+          "fetchAlarmRulesStateOnStart": false
        }
      }
    ],
    "connections": [
      {
-        "fromIndex": 4,
-        "toIndex": 0,
-        "type": "NewTempAlarm"
+        "fromIndex": 2,
+        "toIndex": 4,
+        "type": "Other"
      },
      {
-        "fromIndex": 4,
+        "fromIndex": 2,
        "toIndex": 1,
-        "type": "ClearTempAlarm"
+        "type": "Post attributes"
      },
      {
-        "fromIndex": 4,
-        "toIndex": 2,
-        "type": "NewHumidityAlarm"
+        "fromIndex": 2,
+        "toIndex": 0,
+        "type": "Post telemetry"
      },
      {
-        "fromIndex": 4,
+        "fromIndex": 2,
        "toIndex": 3,
-        "type": "ClearHumidityAlarm"
+        "type": "RPC Request from Device"
      },
      {
-        "fromIndex": 5,
-        "toIndex": 4,
+        "fromIndex": 2,
+        "toIndex": 5,
+        "type": "RPC Request to Device"
+      },
+      {
+        "fromIndex": 6,
+        "toIndex": 2,
        "type": "Success"
      }
    ],
--- a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
@ -28,12 +28,21 @@ import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.DeviceProfileProvisionType;
+import org.thingsboard.server.common.data.DeviceProfileType;
+import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
-import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
-import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
 import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.device.profile.AlarmCondition;
+import org.thingsboard.server.common.data.device.profile.AlarmRule;
+import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileConfiguration;
+import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileAlarm;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
+import org.thingsboard.server.common.data.device.profile.DisabledDeviceProfileProvisionConfiguration;
+import org.thingsboard.server.common.data.device.profile.SimpleAlarmConditionSpec;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
@ -42,19 +51,29 @@ import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BooleanDataEntry;
 import org.thingsboard.server.common.data.kv.DoubleDataEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
-import org.thingsboard.server.common.data.relation.EntityRelation;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.query.BooleanFilterPredicate;
+import org.thingsboard.server.common.data.query.DynamicValue;
+import org.thingsboard.server.common.data.query.DynamicValueSourceType;
+import org.thingsboard.server.common.data.query.EntityKey;
+import org.thingsboard.server.common.data.query.EntityKeyType;
+import org.thingsboard.server.common.data.query.EntityKeyValueType;
+import org.thingsboard.server.common.data.query.FilterPredicateValue;
+import org.thingsboard.server.common.data.query.KeyFilter;
+import org.thingsboard.server.common.data.query.NumericFilterPredicate;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
+import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
-import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.device.DeviceCredentialsService;
 import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.exception.DataValidationException;
-import org.thingsboard.server.dao.relation.RelationService;
+import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
 import org.thingsboard.server.dao.tenant.TenantService;
@ -62,6 +81,8 @@ import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.widget.WidgetsBundleService;

 import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;

@Service
@Profile("install")
@ -96,12 +117,6 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
    @Autowired
    private CustomerService customerService;

-    @Autowired
-    private RelationService relationService;
-
-    @Autowired
-    private AssetService assetService;
-
    @Autowired
    private DeviceService deviceService;

@ -114,6 +129,9 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
    @Autowired
    private DeviceCredentialsService deviceCredentialsService;

+    @Autowired
+    private RuleChainService ruleChainService;
+
    @Bean
    protected BCryptPasswordEncoder passwordEncoder() {
        return new BCryptPasswordEncoder();
@ -245,19 +263,133 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
        createDevice(demoTenant.getId(), null, defaultDeviceProfile.getId(), "Raspberry Pi Demo Device", "RASPBERRY_PI_DEMO_TOKEN", "Demo device that is used in " +
                "Raspberry Pi GPIO control sample application");

-        Asset thermostatAlarms = new Asset();
-        thermostatAlarms.setTenantId(demoTenant.getId());
-        thermostatAlarms.setName("Thermostat Alarms");
-        thermostatAlarms.setType("AlarmPropagationAsset");
-        thermostatAlarms = assetService.saveAsset(thermostatAlarms);
-
-        DeviceProfile thermostatDeviceProfile = this.deviceProfileService.findOrCreateDeviceProfile(demoTenant.getId(), "thermostat");
-
-        DeviceId t1Id = createDevice(demoTenant.getId(), null, thermostatDeviceProfile.getId(), "Thermostat T1", "T1_TEST_TOKEN", "Demo device for Thermostats dashboard").getId();
-        DeviceId t2Id = createDevice(demoTenant.getId(), null, thermostatDeviceProfile.getId(), "Thermostat T2", "T2_TEST_TOKEN", "Demo device for Thermostats dashboard").getId();
-
-        relationService.saveRelation(thermostatAlarms.getTenantId(), new EntityRelation(thermostatAlarms.getId(), t1Id, "ToAlarmPropagationAsset"));
-        relationService.saveRelation(thermostatAlarms.getTenantId(), new EntityRelation(thermostatAlarms.getId(), t2Id, "ToAlarmPropagationAsset"));
+        DeviceProfile thermostatDeviceProfile = new DeviceProfile();
+        thermostatDeviceProfile.setTenantId(demoTenant.getId());
+        thermostatDeviceProfile.setDefault(false);
+        thermostatDeviceProfile.setName("thermostat");
+        thermostatDeviceProfile.setType(DeviceProfileType.DEFAULT);
+        thermostatDeviceProfile.setTransportType(DeviceTransportType.DEFAULT);
+        thermostatDeviceProfile.setProvisionType(DeviceProfileProvisionType.DISABLED);
+        thermostatDeviceProfile.setDescription("Thermostat device profile");
+        thermostatDeviceProfile.setDefaultRuleChainId(ruleChainService.findTenantRuleChains(
+                demoTenant.getId(), new PageLink(1, 0, "Thermostat Alarms")).getData().get(0).getId());
+
+        DeviceProfileData deviceProfileData = new DeviceProfileData();
+        DefaultDeviceProfileConfiguration configuration = new DefaultDeviceProfileConfiguration();
+        DefaultDeviceProfileTransportConfiguration transportConfiguration = new DefaultDeviceProfileTransportConfiguration();
+        DisabledDeviceProfileProvisionConfiguration provisionConfiguration = new DisabledDeviceProfileProvisionConfiguration(null);
+        deviceProfileData.setConfiguration(configuration);
+        deviceProfileData.setTransportConfiguration(transportConfiguration);
+        deviceProfileData.setProvisionConfiguration(provisionConfiguration);
+        thermostatDeviceProfile.setProfileData(deviceProfileData);
+
+        DeviceProfileAlarm highTemperature = new DeviceProfileAlarm();
+        highTemperature.setId("highTemperatureAlarmID");
+        highTemperature.setAlarmType("High Temperature");
+        AlarmRule temperatureRule = new AlarmRule();
+        AlarmCondition temperatureCondition = new AlarmCondition();
+        temperatureCondition.setSpec(new SimpleAlarmConditionSpec());
+
+        KeyFilter alarmTemperatureAttributeFilter = new KeyFilter();
+        alarmTemperatureAttributeFilter.setKey(new EntityKey(EntityKeyType.ATTRIBUTE, "alarmTemperature"));
+        alarmTemperatureAttributeFilter.setValueType(EntityKeyValueType.BOOLEAN);
+        BooleanFilterPredicate alarmTemperatureAttributePredicate = new BooleanFilterPredicate();
+        alarmTemperatureAttributePredicate.setOperation(BooleanFilterPredicate.BooleanOperation.EQUAL);
+        alarmTemperatureAttributePredicate.setValue(new FilterPredicateValue<>(Boolean.TRUE));
+        alarmTemperatureAttributeFilter.setPredicate(alarmTemperatureAttributePredicate);
+
+        KeyFilter temperatureTimeseriesFilter = new KeyFilter();
+        temperatureTimeseriesFilter.setKey(new EntityKey(EntityKeyType.TIME_SERIES, "temperature"));
+        temperatureTimeseriesFilter.setValueType(EntityKeyValueType.NUMERIC);
+        NumericFilterPredicate temperatureTimeseriesFilterPredicate = new NumericFilterPredicate();
+        temperatureTimeseriesFilterPredicate.setOperation(NumericFilterPredicate.NumericOperation.GREATER);
+        FilterPredicateValue<Double> temperatureTimeseriesPredicateValue =
+                new FilterPredicateValue<>(25.0, null,
+                        new DynamicValue<>(DynamicValueSourceType.CURRENT_DEVICE, "thresholdTemperature"));
+        temperatureTimeseriesFilterPredicate.setValue(temperatureTimeseriesPredicateValue);
+        temperatureTimeseriesFilter.setPredicate(temperatureTimeseriesFilterPredicate);
+        temperatureCondition.setCondition(Arrays.asList(alarmTemperatureAttributeFilter, temperatureTimeseriesFilter));
+        temperatureRule.setAlarmDetails("Current temperature = ${temperature}");
+        temperatureRule.setCondition(temperatureCondition);
+        highTemperature.setCreateRules(new LinkedHashMap<>(Collections.singletonMap(AlarmSeverity.MAJOR, temperatureRule)));
+
+        AlarmRule clearTemperatureRule = new AlarmRule();
+        AlarmCondition clearTemperatureCondition = new AlarmCondition();
+        clearTemperatureCondition.setSpec(new SimpleAlarmConditionSpec());
+
+        KeyFilter clearTemperatureTimeseriesFilter = new KeyFilter();
+        clearTemperatureTimeseriesFilter.setKey(new EntityKey(EntityKeyType.TIME_SERIES, "temperature"));
+        clearTemperatureTimeseriesFilter.setValueType(EntityKeyValueType.NUMERIC);
+        NumericFilterPredicate clearTemperatureTimeseriesFilterPredicate = new NumericFilterPredicate();
+        clearTemperatureTimeseriesFilterPredicate.setOperation(NumericFilterPredicate.NumericOperation.LESS_OR_EQUAL);
+        FilterPredicateValue<Double> clearTemperatureTimeseriesPredicateValue =
+                new FilterPredicateValue<>(25.0, null,
+                        new DynamicValue<>(DynamicValueSourceType.CURRENT_DEVICE, "thresholdTemperature"));
+
+        clearTemperatureTimeseriesFilterPredicate.setValue(clearTemperatureTimeseriesPredicateValue);
+        clearTemperatureTimeseriesFilter.setPredicate(clearTemperatureTimeseriesFilterPredicate);
+        clearTemperatureCondition.setCondition(Collections.singletonList(clearTemperatureTimeseriesFilter));
+        clearTemperatureRule.setCondition(clearTemperatureCondition);
+        clearTemperatureRule.setAlarmDetails("Current temperature = ${temperature}");
+        highTemperature.setClearRule(clearTemperatureRule);
+
+        DeviceProfileAlarm lowHumidity = new DeviceProfileAlarm();
+        lowHumidity.setId("lowHumidityAlarmID");
+        lowHumidity.setAlarmType("Low Humidity");
+        AlarmRule humidityRule = new AlarmRule();
+        AlarmCondition humidityCondition = new AlarmCondition();
+        humidityCondition.setSpec(new SimpleAlarmConditionSpec());
+
+        KeyFilter alarmHumidityAttributeFilter = new KeyFilter();
+        alarmHumidityAttributeFilter.setKey(new EntityKey(EntityKeyType.ATTRIBUTE, "alarmHumidity"));
+        alarmHumidityAttributeFilter.setValueType(EntityKeyValueType.BOOLEAN);
+        BooleanFilterPredicate alarmHumidityAttributePredicate = new BooleanFilterPredicate();
+        alarmHumidityAttributePredicate.setOperation(BooleanFilterPredicate.BooleanOperation.EQUAL);
+        alarmHumidityAttributePredicate.setValue(new FilterPredicateValue<>(Boolean.TRUE));
+        alarmHumidityAttributeFilter.setPredicate(alarmHumidityAttributePredicate);
+
+        KeyFilter humidityTimeseriesFilter = new KeyFilter();
+        humidityTimeseriesFilter.setKey(new EntityKey(EntityKeyType.TIME_SERIES, "humidity"));
+        humidityTimeseriesFilter.setValueType(EntityKeyValueType.NUMERIC);
+        NumericFilterPredicate humidityTimeseriesFilterPredicate = new NumericFilterPredicate();
+        humidityTimeseriesFilterPredicate.setOperation(NumericFilterPredicate.NumericOperation.LESS);
+        FilterPredicateValue<Double> humidityTimeseriesPredicateValue =
+                new FilterPredicateValue<>(60.0, null,
+                        new DynamicValue<>(DynamicValueSourceType.CURRENT_DEVICE, "thresholdHumidity"));
+        humidityTimeseriesFilterPredicate.setValue(humidityTimeseriesPredicateValue);
+        humidityTimeseriesFilter.setPredicate(humidityTimeseriesFilterPredicate);
+        humidityCondition.setCondition(Arrays.asList(alarmHumidityAttributeFilter, humidityTimeseriesFilter));
+
+        humidityRule.setCondition(humidityCondition);
+        humidityRule.setAlarmDetails("Current humidity = ${humidity}");
+        lowHumidity.setCreateRules(new LinkedHashMap<>(Collections.singletonMap(AlarmSeverity.MINOR, humidityRule)));
+
+        AlarmRule clearHumidityRule = new AlarmRule();
+        AlarmCondition clearHumidityCondition = new AlarmCondition();
+        clearHumidityCondition.setSpec(new SimpleAlarmConditionSpec());
+
+        KeyFilter clearHumidityTimeseriesFilter = new KeyFilter();
+        clearHumidityTimeseriesFilter.setKey(new EntityKey(EntityKeyType.TIME_SERIES, "humidity"));
+        clearHumidityTimeseriesFilter.setValueType(EntityKeyValueType.NUMERIC);
+        NumericFilterPredicate clearHumidityTimeseriesFilterPredicate = new NumericFilterPredicate();
+        clearHumidityTimeseriesFilterPredicate.setOperation(NumericFilterPredicate.NumericOperation.GREATER_OR_EQUAL);
+        FilterPredicateValue<Double> clearHumidityTimeseriesPredicateValue =
+                new FilterPredicateValue<>(60.0, null,
+                        new DynamicValue<>(DynamicValueSourceType.CURRENT_DEVICE, "thresholdHumidity"));
+
+        clearHumidityTimeseriesFilterPredicate.setValue(clearHumidityTimeseriesPredicateValue);
+        clearHumidityTimeseriesFilter.setPredicate(clearHumidityTimeseriesFilterPredicate);
+        clearHumidityCondition.setCondition(Collections.singletonList(clearHumidityTimeseriesFilter));
+        clearHumidityRule.setCondition(clearHumidityCondition);
+        clearHumidityRule.setAlarmDetails("Current humidity = ${humidity}");
+        lowHumidity.setClearRule(clearHumidityRule);
+
+        deviceProfileData.setAlarms(Arrays.asList(highTemperature, lowHumidity));
+
+        DeviceProfile savedThermostatDeviceProfile = deviceProfileService.saveDeviceProfile(thermostatDeviceProfile);
+
+        DeviceId t1Id = createDevice(demoTenant.getId(), null, savedThermostatDeviceProfile.getId(), "Thermostat T1", "T1_TEST_TOKEN", "Demo device for Thermostats dashboard").getId();
+        DeviceId t2Id = createDevice(demoTenant.getId(), null, savedThermostatDeviceProfile.getId(), "Thermostat T2", "T2_TEST_TOKEN", "Demo device for Thermostats dashboard").getId();

        attributesService.save(demoTenant.getId(), t1Id, DataConstants.SERVER_SCOPE,
                Arrays.asList(new BaseAttributeKvEntry(System.currentTimeMillis(), new DoubleDataEntry("latitude", 37.3948)),