diff --git a/ui-ngx/src/app/modules/home/pages/api-usage/api_usage_json.raw b/ui-ngx/src/app/modules/home/pages/api-usage/api_usage_json.raw
index 0a037e80bb..44b0b04b02 100644
--- a/ui-ngx/src/app/modules/home/pages/api-usage/api_usage_json.raw
+++ b/ui-ngx/src/app/modules/home/pages/api-usage/api_usage_json.raw
@@ -1,5 +1,6 @@
 {
   "title": "Api Usage",
+  "image": null,
   "configuration": {
     "description": "",
     "widgets": {
@@ -675,7 +676,7 @@
               "filterId": null,
               "dataKeys": [
                 {
-                  "name": "emailApiState",
+                  "name": "alarmApiState",
                   "type": "timeseries",
                   "label": "apiState",
                   "color": "#2196f3",
@@ -688,7 +689,7 @@
                   "postFuncBody": null
                 },
                 {
-                  "name": "emailLimit",
+                  "name": "createdAlarmsLimit",
                   "type": "timeseries",
                   "label": "limit",
                   "color": "#4caf50",
@@ -701,7 +702,7 @@
                   "postFuncBody": null
                 },
                 {
-                  "name": "emailCount",
+                  "name": "createdAlarmsCount",
                   "type": "timeseries",
                   "label": "count",
                   "color": "#f44336",
@@ -714,7 +715,7 @@
                   "postFuncBody": null
                 },
                 {
-                  "name": "emailApiState",
+                  "name": "alarmApiState",
                   "type": "timeseries",
                   "label": "apiStateClass",
                   "color": "#ffc107",
@@ -727,7 +728,7 @@
                   "postFuncBody": "return value ? value.toLowerCase() : '';"
                 },
                 {
-                  "name": "emailApiState",
+                  "name": "alarmApiState",
                   "type": "timeseries",
                   "label": "cardId",
                   "color": "#607d8b",
@@ -740,7 +741,7 @@
                   "postFuncBody": "return (Math.random()*100000).toFixed(0);"
                 },
                 {
-                  "name": "emailApiState",
+                  "name": "alarmApiState",
                   "type": "timeseries",
                   "label": "title",
                   "color": "#9c27b0",
@@ -750,10 +751,10 @@
                   "decimals": null,
                   "funcBody": null,
                   "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.email}\";"
+                  "postFuncBody": "return \"{i18n:api-usage.alarm}\";"
                 },
                 {
-                  "name": "emailApiState",
+                  "name": "alarmApiState",
                   "type": "timeseries",
                   "label": "unit",
                   "color": "#8bc34a",
@@ -763,7 +764,7 @@
                   "decimals": null,
                   "funcBody": null,
                   "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.messages}\";"
+                  "postFuncBody": "return \"{i18n:api-usage.alarms-created}\";"
                 }
               ]
             }
@@ -781,7 +782,7 @@
             "cardHtml": "<div class='card ${apiStateClass}'>\n    <img src=\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\" onload=\"initializeCard_${cardId:0}(event);\">\n    <script type=\"text/javascript\">\n        function initializeCard_${cardId:0}(e) {\n            \n            function toShortNumber(number) {\n                var rounder = Math.pow(10, 1);\n                var powers = [\n                  {key: 'Q', value: Math.pow(10, 15)},\n                  {key: 'T', value: Math.pow(10, 12)},\n                  {key: 'B', value: Math.pow(10, 9)},\n                  {key: 'M', value: Math.pow(10, 6)},\n                  {key: 'K', value: 1000}\n                ];\n                \n                var key = '';\n                \n                for (var i = 0; i < powers.length; i++) {\n                    var reduced = number / powers[i].value;\n                    reduced = Math.round(reduced * rounder) / rounder;\n                    if (reduced >= 1) {\n                        number = reduced;\n                        key = powers[i].key;\n                        break;\n                    }\n                }\n                return number + key;\n            }\n            \n            var imgTag = e.target;\n            var parentTag = imgTag.parentNode;\n            var count = \"${count:0}\";\n            var limit = \"${limit:0}\";\n            count = count.length > 0 ? parseInt(count, 10) : 0;\n            limit = limit.length > 0 ? parseInt(limit, 10) : 0;\n            var percentElement = $('#api-usage-percent', parentTag);\n            var valueElement = $('#api-usage-value', parentTag);\n            var barElement = $('#api-usage-bar', parentTag);\n            if (Number.isFinite(limit) && limit > 0) {\n                var percent = Math.min(100, ((count / limit) * 100));\n                barElement.width(percent + '%');\n                percent = percent.toFixed(2);\n                percentElement.text(percent + '%');\n                valueElement.text(toShortNumber(count) + ' / ' + toShortNumber(limit));\n            } else {\n                barElement.width('0%');\n                percentElement.text('');\n                valueElement.text(toShortNumber(count) + ' / ∞');\n            }\n        }\n    </script>\n    <div class='content'>\n        <div class='column'>\n            <div class='title-row'>\n                <div class='title'>${title}</div>\n                <div class='state'>${apiState}</div>\n            </div>    \n            <div class='bar-container'>\n                <div class=\"unit\">${unit}</div>\n                <div class='bar'>\n                    <div class=\"bar-fill\" id=\"api-usage-bar\"></div>\n                </div>    \n                <div class='bar-labels'>\n                    <div id=\"api-usage-percent\"></div>\n                    <div style=\"flex: 1;\"></div>\n                    <div id=\"api-usage-value\"></div>\n                </div>\n            </div>    \n        </div>\n    </div>\n    <div role=\"separator\" class=\"mat-divider mat-divider-horizontal\" aria-orientation=\"horizontal\"></div>\n    <div class='action-row'>\n        <button id=\"email_messages_details\" class=\"mat-focus-indicator mat-button mat-button-base mat-primary\">\n            <span class=\"mat-button-wrapper\">{i18n:api-usage.view-details}</span>\n            <span class=\"mat-ripple mat-button-ripple\"></span>\n            <span class=\"mat-button-focus-overlay\"></span>\n        </button>\n    </div> \n</div>",
             "cardCss": ".card {\n   width: 100%;\n   height: 100%;\n   box-sizing: border-box;\n   display: flex;\n   flex-direction: column;\n}\n\n.card > img {\n    height: 0;\n}\n\n.card .content {\n   flex: 1;    \n   padding: 13px 13px 0;\n   display: flex;\n   box-sizing: border-box;\n}\n\n.card .content .column {\n   display: flex;\n   flex-direction: column;    \n   justify-content: space-around;\n   flex: 1;\n}\n\n.card .content .title-row {\n    display: flex;\n    flex-direction: row;\n    padding-bottom: 10px;\n}\n\n.card .title {\n    flex: 1;\n    font-size: 20px;\n    font-weight: 400;\n    color: #666666;\n}\n\n.card .state {\n    text-transform: uppercase;\n    font-size: 20px;\n    font-weight: bold;\n}\n\n.card.enabled .state {\n    color: #00B260;\n}\n\n.card.warning .state {\n    color: #FFAD6F;\n}\n\n.card.disabled .state {\n    color: #F73243;\n}\n\n.card .bar-container {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n}\n\n.card .bar {\n    flex: 1;\n    max-height: 30px;\n    margin-top: 3.5px;\n    margin-bottom: 4px;\n    background-color: #F0F0F0;\n    border: 1px solid #DADCDB;\n    border-radius: 2px;\n    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .2);\n}\n\n.card.enabled .bar {\n    border-color: #00B260;\n    background-color: #F0FBF7;\n}\n\n.card.warning .bar {\n    border-color: #FFAD6F;\n    background-color: #FFFAF6;\n}\n\n.card.disabled .bar {\n    border-color: #F73243;\n    background-color: #FFF0F0;\n}\n\n.card .bar .bar-fill {\n    background-color: #F0F0F0;\n    border-radius: 2px;\n    height: 100%;\n    width: 0%;\n}\n\n.card.enabled .bar-fill {\n    background-color: #00C46C;\n}\n\n.card.warning .bar-fill {\n    background-color: #FFD099;\n}\n\n.card.disabled .bar-fill {\n    background-color: #FF9494;\n}\n\n.card .bar-labels {\n    height: 20px;\n    font-size: 16px;\n    color: #666;\n    display: flex;\n    flex-direction: row;\n}\n\n\n.card .mat-button {\n    text-transform: uppercase;\n}\n\n.card .mat-button-wrapper {\n    pointer-events: none;\n}\n\n.card .action-row {\n    display: flex;\n    flex-direction: row;\n    justify-content: flex-end;\n    padding: 8px 0;\n}\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n  .card .title {\n      font-size: 12px;\n  }\n  .card .state {\n      font-size: 12px;\n  }\n  .card .unit {\n      font-size: 8px;\n  }\n  .card .bar-labels {\n      font-size: 8px;\n  }\n  .card .mat-button {\n      font-size: 8px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1599px) {\n  .card .title {\n      font-size: 14px;\n  }\n  .card .state {\n      font-size: 14px;\n  }\n  .card .unit {\n      font-size: 10px;\n  }\n  .card .bar-labels {\n      font-size: 10px;\n  }\n  .card .mat-button {\n      font-size: 10px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1600px) and (max-width: 1919px) {\n  .card .title {\n      font-size: 16px;\n  }\n  .card .state {\n      font-size: 16px;\n  }\n  .card .unit {\n      font-size: 12px;\n  }\n  .card .bar-labels {\n      font-size: 12px;\n  }\n  .card .mat-button {\n      font-size: 12px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}    \n\n\n"
           },
-          "title": "Email messages",
+          "title": "Alarm created",
           "dropShadow": true,
           "enableFullscreen": false,
           "widgetStyle": {
@@ -799,9 +800,14 @@
                 "name": "email_messages_details",
                 "icon": "insert_chart",
                 "type": "openDashboardState",
-                "targetDashboardStateId": "email_messages",
+                "targetDashboardStateId": "alarms_created",
                 "setEntityId": false,
                 "stateEntityParamName": null,
+                "openInSeparateDialog": null,
+                "dialogTitle": null,
+                "dialogHideDashboardToolbar": true,
+                "dialogWidth": null,
+                "dialogHeight": null,
                 "openRightLayout": false,
                 "id": "946ba769-84ac-1507-6baa-94701de8967b"
               }
@@ -816,164 +822,6 @@
         "col": 0,
         "id": "a151ae60-0326-6116-d818-9070dda8e9c7"
       },
-      "2503a391-5692-0614-85e6-f179c5ee0dc9": {
-        "isSystemType": true,
-        "bundleAlias": "cards",
-        "typeAlias": "html_value_card",
-        "type": "latest",
-        "title": "New widget",
-        "sizeX": 7.5,
-        "sizeY": 3,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "smsApiState",
-                  "type": "timeseries",
-                  "label": "apiState",
-                  "color": "#2196f3",
-                  "settings": {},
-                  "_hash": 0.8830669138660703,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "smsLimit",
-                  "type": "timeseries",
-                  "label": "limit",
-                  "color": "#4caf50",
-                  "settings": {},
-                  "_hash": 0.5463603803546802,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "smsCount",
-                  "type": "timeseries",
-                  "label": "count",
-                  "color": "#f44336",
-                  "settings": {},
-                  "_hash": 0.5564241862015964,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "smsApiState",
-                  "type": "timeseries",
-                  "label": "apiStateClass",
-                  "color": "#ffc107",
-                  "settings": {},
-                  "_hash": 0.8737107059960671,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return value ? value.toLowerCase() : '';"
-                },
-                {
-                  "name": "smsApiState",
-                  "type": "timeseries",
-                  "label": "cardId",
-                  "color": "#607d8b",
-                  "settings": {},
-                  "_hash": 0.051659774305067296,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return (Math.random()*100000).toFixed(0);"
-                },
-                {
-                  "name": "smsApiState",
-                  "type": "timeseries",
-                  "label": "title",
-                  "color": "#9c27b0",
-                  "settings": {},
-                  "_hash": 0.286155312985084,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.sms}\";"
-                },
-                {
-                  "name": "smsApiState",
-                  "type": "timeseries",
-                  "label": "unit",
-                  "color": "#8bc34a",
-                  "settings": {},
-                  "_hash": 0.39363366156190605,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.messages}\";"
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "realtime": {
-              "timewindowMs": 60000
-            }
-          },
-          "showTitle": false,
-          "backgroundColor": "#fff",
-          "color": "#666666",
-          "padding": "0",
-          "settings": {
-            "cardHtml": "<div class='card ${apiStateClass}'>\n    <img src=\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\" onload=\"initializeCard_${cardId:0}(event);\">\n    <script type=\"text/javascript\">\n        function initializeCard_${cardId:0}(e) {\n            \n            function toShortNumber(number) {\n                var rounder = Math.pow(10, 1);\n                var powers = [\n                  {key: 'Q', value: Math.pow(10, 15)},\n                  {key: 'T', value: Math.pow(10, 12)},\n                  {key: 'B', value: Math.pow(10, 9)},\n                  {key: 'M', value: Math.pow(10, 6)},\n                  {key: 'K', value: 1000}\n                ];\n                \n                var key = '';\n                \n                for (var i = 0; i < powers.length; i++) {\n                    var reduced = number / powers[i].value;\n                    reduced = Math.round(reduced * rounder) / rounder;\n                    if (reduced >= 1) {\n                        number = reduced;\n                        key = powers[i].key;\n                        break;\n                    }\n                }\n                return number + key;\n            }\n            \n            var imgTag = e.target;\n            var parentTag = imgTag.parentNode;\n            var count = \"${count:0}\";\n            var limit = \"${limit:0}\";\n            count = count.length > 0 ? parseInt(count, 10) : 0;\n            limit = limit.length > 0 ? parseInt(limit, 10) : 0;\n            var percentElement = $('#api-usage-percent', parentTag);\n            var valueElement = $('#api-usage-value', parentTag);\n            var barElement = $('#api-usage-bar', parentTag);\n            if (Number.isFinite(limit) && limit > 0) {\n                var percent = Math.min(100, ((count / limit) * 100));\n                barElement.width(percent + '%');\n                percent = percent.toFixed(2);\n                percentElement.text(percent + '%');\n                valueElement.text(toShortNumber(count) + ' / ' + toShortNumber(limit));\n            } else {\n                barElement.width('0%');\n                percentElement.text('');\n                valueElement.text(toShortNumber(count) + ' / ∞');\n            }\n        }\n    </script>\n    <div class='content'>\n        <div class='column'>\n            <div class='title-row'>\n                <div class='title'>${title}</div>\n                <div class='state'>${apiState}</div>\n            </div>    \n            <div class='bar-container'>\n                <div class=\"unit\">${unit}</div>\n                <div class='bar'>\n                    <div class=\"bar-fill\" id=\"api-usage-bar\"></div>\n                </div>    \n                <div class='bar-labels'>\n                    <div id=\"api-usage-percent\"></div>\n                    <div style=\"flex: 1;\"></div>\n                    <div id=\"api-usage-value\"></div>\n                </div>\n            </div>    \n        </div>\n    </div>\n    <div role=\"separator\" class=\"mat-divider mat-divider-horizontal\" aria-orientation=\"horizontal\"></div>\n    <div class='action-row'>\n        <button id=\"sms_messages_details\" class=\"mat-focus-indicator mat-button mat-button-base mat-primary\">\n            <span class=\"mat-button-wrapper\">{i18n:api-usage.view-details}</span>\n            <span class=\"mat-ripple mat-button-ripple\"></span>\n            <span class=\"mat-button-focus-overlay\"></span>\n        </button>\n    </div> \n</div>",
-            "cardCss": ".card {\n   width: 100%;\n   height: 100%;\n   box-sizing: border-box;\n   display: flex;\n   flex-direction: column;\n}\n\n.card > img {\n    height: 0;\n}\n\n.card .content {\n   flex: 1;    \n   padding: 13px 13px 0;\n   display: flex;\n   box-sizing: border-box;\n}\n\n.card .content .column {\n   display: flex;\n   flex-direction: column;    \n   justify-content: space-around;\n   flex: 1;\n}\n\n.card .content .title-row {\n    display: flex;\n    flex-direction: row;\n    padding-bottom: 10px;\n}\n\n.card .title {\n    flex: 1;\n    font-size: 20px;\n    font-weight: 400;\n    color: #666666;\n}\n\n.card .state {\n    text-transform: uppercase;\n    font-size: 20px;\n    font-weight: bold;\n}\n\n.card.enabled .state {\n    color: #00B260;\n}\n\n.card.warning .state {\n    color: #FFAD6F;\n}\n\n.card.disabled .state {\n    color: #F73243;\n}\n\n.card .bar-container {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n}\n\n.card .bar {\n    flex: 1;\n    max-height: 30px;\n    margin-top: 3.5px;\n    margin-bottom: 4px;\n    background-color: #F0F0F0;\n    border: 1px solid #DADCDB;\n    border-radius: 2px;\n    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .2);\n}\n\n.card.enabled .bar {\n    border-color: #00B260;\n    background-color: #F0FBF7;\n}\n\n.card.warning .bar {\n    border-color: #FFAD6F;\n    background-color: #FFFAF6;\n}\n\n.card.disabled .bar {\n    border-color: #F73243;\n    background-color: #FFF0F0;\n}\n\n.card .bar .bar-fill {\n    background-color: #F0F0F0;\n    border-radius: 2px;\n    height: 100%;\n    width: 0%;\n}\n\n.card.enabled .bar-fill {\n    background-color: #00C46C;\n}\n\n.card.warning .bar-fill {\n    background-color: #FFD099;\n}\n\n.card.disabled .bar-fill {\n    background-color: #FF9494;\n}\n\n.card .bar-labels {\n    height: 20px;\n    font-size: 16px;\n    color: #666;\n    display: flex;\n    flex-direction: row;\n}\n\n\n.card .mat-button {\n    text-transform: uppercase;\n}\n\n.card .mat-button-wrapper {\n    pointer-events: none;\n}\n\n.card .action-row {\n    display: flex;\n    flex-direction: row;\n    justify-content: flex-end;\n    padding: 8px 0;\n}\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n  .card .title {\n      font-size: 12px;\n  }\n  .card .state {\n      font-size: 12px;\n  }\n  .card .unit {\n      font-size: 8px;\n  }\n  .card .bar-labels {\n      font-size: 8px;\n  }\n  .card .mat-button {\n      font-size: 8px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1599px) {\n  .card .title {\n      font-size: 14px;\n  }\n  .card .state {\n      font-size: 14px;\n  }\n  .card .unit {\n      font-size: 10px;\n  }\n  .card .bar-labels {\n      font-size: 10px;\n  }\n  .card .mat-button {\n      font-size: 10px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1600px) and (max-width: 1919px) {\n  .card .title {\n      font-size: 16px;\n  }\n  .card .state {\n      font-size: 16px;\n  }\n  .card .unit {\n      font-size: 12px;\n  }\n  .card .bar-labels {\n      font-size: 12px;\n  }\n  .card .mat-button {\n      font-size: 12px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}    \n\n\n"
-          },
-          "title": "SMS messages",
-          "dropShadow": true,
-          "enableFullscreen": false,
-          "widgetStyle": {
-            "cursor": "default"
-          },
-          "titleStyle": {
-            "fontSize": "20px",
-            "fontWeight": 400
-          },
-          "useDashboardTimewindow": true,
-          "showLegend": false,
-          "actions": {
-            "elementClick": [
-              {
-                "name": "sms_messages_details",
-                "icon": "insert_chart",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "sms_messages",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openRightLayout": false,
-                "id": "73a35536-96a3-47dd-95bb-b1d9119d0ea2"
-              }
-            ]
-          },
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "2503a391-5692-0614-85e6-f179c5ee0dc9"
-      },
       "68e16e98-0420-f72c-4848-41dedffd3904": {
         "isSystemType": true,
         "bundleAlias": "charts",
@@ -1625,9 +1473,9 @@
               "filterId": null,
               "dataKeys": [
                 {
-                  "name": "emailCountHourly",
+                  "name": "createdAlarmsCountHourly",
                   "type": "timeseries",
-                  "label": "{i18n:api-usage.email-messages}",
+                  "label": "{i18n:api-usage.alarms-created}",
                   "color": "#d35a00",
                   "settings": {
                     "excludeFromStacking": false,
@@ -1638,7 +1486,7 @@
                     "fillLines": false,
                     "showPoints": false,
                     "showPointShape": "circle",
-                    "pointShapeFormatter": "",
+                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
                     "showPointsLineWidth": 5,
                     "showPointsRadius": 3,
                     "showSeparateAxis": false,
@@ -1712,7 +1560,7 @@
               "showLabels": true
             }
           },
-          "title": "{i18n:api-usage.email-messages-hourly-activity}",
+          "title": "{i18n:api-usage.alarms-created-hourly-activity}",
           "dropShadow": true,
           "enableFullscreen": true,
           "titleStyle": {
@@ -1728,9 +1576,14 @@
                 "name": "{i18n:api-usage.view-details}",
                 "icon": "insert_chart",
                 "type": "openDashboardState",
-                "targetDashboardStateId": "email_messages",
+                "targetDashboardStateId": "alarms_created",
                 "setEntityId": false,
                 "stateEntityParamName": null,
+                "openInSeparateDialog": null,
+                "dialogTitle": null,
+                "dialogHideDashboardToolbar": true,
+                "dialogWidth": null,
+                "dialogHeight": null,
                 "openRightLayout": false,
                 "id": "371882f9-ea23-3abc-fca8-9449c5dfdd6b"
               }
@@ -1771,6 +1624,41 @@
               "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
               "filterId": null,
               "dataKeys": [
+                {
+                  "name": "emailCountHourly",
+                  "type": "timeseries",
+                  "label": "{i18n:api-usage.email-messages}",
+                  "color": "#4caf50",
+                  "settings": {
+                    "excludeFromStacking": false,
+                    "hideDataByDefault": false,
+                    "disableDataHiding": false,
+                    "removeFromLegend": false,
+                    "showLines": false,
+                    "fillLines": false,
+                    "showPoints": false,
+                    "showPointShape": "circle",
+                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
+                    "showPointsLineWidth": 5,
+                    "showPointsRadius": 3,
+                    "showSeparateAxis": false,
+                    "axisPosition": "left",
+                    "thresholds": [
+                      {
+                        "thresholdValueSource": "predefinedValue"
+                      }
+                    ],
+                    "comparisonSettings": {
+                      "showValuesForComparison": true
+                    }
+                  },
+                  "_hash": 0.1348755140779876,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                },
                 {
                   "name": "smsCountHourly",
                   "type": "timeseries",
@@ -1859,7 +1747,7 @@
               "showLabels": true
             }
           },
-          "title": "{i18n:api-usage.sms-messages-hourly-activity}",
+          "title": "{i18n:api-usage.notifications-hourly-activity}",
           "dropShadow": true,
           "enableFullscreen": true,
           "titleStyle": {
@@ -1875,9 +1763,14 @@
                 "name": "{i18n:api-usage.view-details}",
                 "icon": "insert_chart",
                 "type": "openDashboardState",
-                "targetDashboardStateId": "sms_messages",
+                "targetDashboardStateId": "notifications",
                 "setEntityId": false,
                 "stateEntityParamName": null,
+                "openInSeparateDialog": null,
+                "dialogTitle": null,
+                "dialogHideDashboardToolbar": true,
+                "dialogWidth": null,
+                "dialogHeight": null,
                 "openRightLayout": false,
                 "id": "49aefac0-ec5e-d6f3-f39c-8744759f4b19"
               }
@@ -3071,9 +2964,9 @@
               "filterId": null,
               "dataKeys": [
                 {
-                  "name": "emailCountHourly",
+                  "name": "createdAlarmsCountHourly",
                   "type": "timeseries",
-                  "label": "{i18n:api-usage.email-messages}",
+                  "label": "{i18n:api-usage.alarms-created}",
                   "color": "#d35a00",
                   "settings": {
                     "excludeFromStacking": false,
@@ -3084,7 +2977,7 @@
                     "fillLines": false,
                     "showPoints": false,
                     "showPointShape": "circle",
-                    "pointShapeFormatter": "",
+                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
                     "showPointsLineWidth": 5,
                     "showPointsRadius": 3,
                     "showSeparateAxis": false,
@@ -3159,7 +3052,7 @@
               "showLabels": true
             }
           },
-          "title": "{i18n:api-usage.email-messages-daily-activity}",
+          "title": "{i18n:api-usage.alarms-created-daily-activity}",
           "dropShadow": true,
           "enableFullscreen": true,
           "titleStyle": {
@@ -3206,9 +3099,9 @@
               "filterId": null,
               "dataKeys": [
                 {
-                  "name": "emailCount",
+                  "name": "createdAlarmsCount",
                   "type": "timeseries",
-                  "label": "{i18n:api-usage.email-messages}",
+                  "label": "{i18n:api-usage.alarms-created}",
                   "color": "#d35a00",
                   "settings": {
                     "excludeFromStacking": false,
@@ -3219,7 +3112,7 @@
                     "fillLines": false,
                     "showPoints": false,
                     "showPointShape": "circle",
-                    "pointShapeFormatter": "",
+                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
                     "showPointsLineWidth": 5,
                     "showPointsRadius": 3,
                     "showSeparateAxis": false,
@@ -3294,7 +3187,7 @@
               "showLabels": true
             }
           },
-          "title": "{i18n:api-usage.sms-messages-monthly-activity}",
+          "title": "{i18n:api-usage.alarms-created-monthly-activity}",
           "dropShadow": true,
           "enableFullscreen": true,
           "titleStyle": {
@@ -4027,6 +3920,452 @@
           "displayTimewindow": true
         },
         "id": "a669cf86-e715-efa4-dd9a-b839abf499e9"
+      },
+      "292eaded-4775-36f7-c896-98d57bdda936": {
+        "isSystemType": true,
+        "bundleAlias": "cards",
+        "typeAlias": "html_value_card",
+        "type": "latest",
+        "title": "New widget",
+        "sizeX": 7.5,
+        "sizeY": 3,
+        "config": {
+          "datasources": [
+            {
+              "type": "entity",
+              "name": null,
+              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+              "filterId": null,
+              "dataKeys": [
+                {
+                  "name": "emailApiState",
+                  "type": "timeseries",
+                  "label": "apiState",
+                  "color": "#2196f3",
+                  "settings": {},
+                  "_hash": 0.8830669138660703,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                },
+                {
+                  "name": "emailLimit",
+                  "type": "timeseries",
+                  "label": "limit",
+                  "color": "#4caf50",
+                  "settings": {},
+                  "_hash": 0.5463603803546802,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                },
+                {
+                  "name": "emailCount",
+                  "type": "timeseries",
+                  "label": "count",
+                  "color": "#f44336",
+                  "settings": {},
+                  "_hash": 0.5564241862015964,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                },
+                {
+                  "name": "transportApiState",
+                  "type": "timeseries",
+                  "label": "cardId",
+                  "color": "#607d8b",
+                  "settings": {},
+                  "_hash": 0.051659774305067296,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": true,
+                  "postFuncBody": "return (Math.random()*100000).toFixed(0);"
+                },
+                {
+                  "name": "smsApiState",
+                  "type": "timeseries",
+                  "label": "apiStatePoint",
+                  "color": "#e91e63",
+                  "settings": {},
+                  "_hash": 0.2969682764607864,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                },
+                {
+                  "name": "smsLimit",
+                  "type": "timeseries",
+                  "label": "pointsLimit",
+                  "color": "#9c27b0",
+                  "settings": {},
+                  "_hash": 0.22082255831864894,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                },
+                {
+                  "name": "smsCount",
+                  "type": "timeseries",
+                  "label": "pointsCount",
+                  "color": "#8bc34a",
+                  "settings": {},
+                  "_hash": 0.6340356364819146,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                },
+                {
+                  "name": "transportApiState",
+                  "type": "timeseries",
+                  "label": "title",
+                  "color": "#3f51b5",
+                  "settings": {},
+                  "_hash": 0.6894070537030252,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": true,
+                  "postFuncBody": "return \"{i18n:api-usage.notifications}\";"
+                }
+              ]
+            }
+          ],
+          "timewindow": {
+            "realtime": {
+              "timewindowMs": 60000
+            }
+          },
+          "showTitle": false,
+          "backgroundColor": "#fff",
+          "color": "#666666",
+          "padding": "0",
+          "settings": {
+            "cardCss": ".card {\n   width: 100%;\n   height: 100%;\n   box-sizing: border-box;\n   display: flex;\n   flex-direction: column;\n}\n\n.card > img {\n    height: 0;\n}\n\n.card .content {\n   flex: 1;    \n   padding: 13px 13px 0;\n   display: flex;\n   box-sizing: border-box;\n}\n\n.card .content .column {\n   display: flex;\n   flex-direction: column;    \n   justify-content: space-around;\n   flex: 1;\n}\n\n.card .content .title-row {\n    display: flex;\n    flex-direction: row;\n    padding-bottom: 10px;\n}\n\n.card .title {\n    flex: 1;\n    font-size: 20px;\n    font-weight: 400;\n    color: #666666;\n}\n\n.card .state {\n    text-transform: uppercase;\n    font-size: 20px;\n    font-weight: bold;\n}\n\n.card.enabled .state {\n    color: #00B260;\n}\n\n.card.warning .state {\n    color: #FFAD6F;\n}\n\n.card.disabled .state {\n    color: #F73243;\n}\n\n.card .bars-row {\n    flex: 1;\n    display: flex;\n    flex-direction: row;\n}\n\n.card .bar-column {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n}\n\n.card .bar-container {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n}\n\n.card .bar {\n    flex: 1;\n    max-height: 30px;\n    margin-top: 3.5px;\n    margin-bottom: 4px;\n    background-color: #F0F0F0;\n    border: 1px solid #DADCDB;\n    border-radius: 2px;\n    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .2);\n}\n\n.card.enabled .bar {\n    border-color: #00B260;\n    background-color: #F0FBF7;\n}\n\n.card.warning .bar {\n    border-color: #FFAD6F;\n    background-color: #FFFAF6;\n}\n\n.card.disabled .bar {\n    border-color: #F73243;\n    background-color: #FFF0F0;\n}\n\n.card .bar .bar-fill {\n    background-color: #F0F0F0;\n    border-radius: 2px;\n    height: 100%;\n    width: 0%;\n}\n\n.card.enabled .bar-fill {\n    background-color: #00C46C;\n}\n\n.card.warning .bar-fill {\n    background-color: #FFD099;\n}\n\n.card.disabled .bar-fill {\n    background-color: #FF9494;\n}\n\n.card .bar-labels {\n    height: 20px;\n    font-size: 16px;\n    color: #666;\n    display: flex;\n    flex-direction: row;\n}\n\n.card .mat-button {\n    text-transform: uppercase;\n}\n\n.card .mat-button-wrapper {\n    pointer-events: none;\n}\n\n.card .action-row {\n    display: flex;\n    flex-direction: row;\n    justify-content: flex-end;\n    padding: 8px 0;\n}\n\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n  .card .title {\n      font-size: 12px;\n  }\n  .card .state {\n      font-size: 12px;\n  }\n  .card .unit {\n      font-size: 8px;\n  }\n  .card .bar-labels {\n      font-size: 6px;\n  }\n  .card .mat-button {\n      font-size: 8px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1599px) {\n  .card .title {\n      font-size: 14px;\n  }\n  .card .state {\n      font-size: 14px;\n  }\n  .card .unit {\n      font-size: 10px;\n  }\n  .card .bar-labels {\n      font-size: 8px;\n  }\n  .card .mat-button {\n      font-size: 10px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1600px) and (max-width: 1919px) {\n  .card .title {\n      font-size: 16px;\n  }\n  .card .state {\n      font-size: 16px;\n  }\n  .card .unit {\n      font-size: 12px;\n  }\n  .card .bar-labels {\n      font-size: 12px;\n  }\n  .card .mat-button {\n      font-size: 12px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}    \n\n",
+            "cardHtml": "<div class='card'>\n    <img src=\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\" onload=\"initializeCard_${cardId:0}(event);\">\n    <script type=\"text/javascript\">\n        function initializeCard_${cardId:0}(e) {\n\n            function toShortNumber(number) {\n                var rounder = Math.pow(10, 1);\n                var powers = [\n                    {key: 'Q', value: Math.pow(10, 15)},\n                    {key: 'T', value: Math.pow(10, 12)},\n                    {key: 'B', value: Math.pow(10, 9)},\n                    {key: 'M', value: Math.pow(10, 6)},\n                    {key: 'K', value: 1000}\n                ];\n\n                var key = '';\n\n                for (var i = 0; i < powers.length; i++) {\n                    var reduced = number / powers[i].value;\n                    reduced = Math.round(reduced * rounder) / rounder;\n                    if (reduced >= 1) {\n                        number = reduced;\n                        key = powers[i].key;\n                        break;\n                    }\n                }\n                return number + key;\n            }\n\n            var imgTag = e.target;\n            var parentTag = imgTag.parentNode;\n            var count = \"${count:0}\";\n            var limit = \"${limit:0}\";\n            count = count.length > 0 ? parseInt(count, 10) : 0;\n            limit = limit.length > 0 ? parseInt(limit, 10) : 0;\n            var percentElement = $('#api-usage-percent', parentTag);\n            var valueElement = $('#api-usage-value', parentTag);\n            var barElement = $('#api-usage-bar', parentTag);\n            if (Number.isFinite(limit) && limit > 0) {\n                var percent = Math.min(100, ((count / limit) * 100));\n                barElement.width(percent + '%');\n                percent = percent.toFixed(2);\n                percentElement.text(percent + '%');\n                valueElement.text(toShortNumber(count) + ' / ' + toShortNumber(limit));\n            } else {\n                barElement.width('0%');\n                percentElement.text('');\n                valueElement.text(toShortNumber(count) + ' / ∞');\n            }\n            var pointsCount = \"${pointsCount:0}\";\n            var pointsLimit = \"${pointsLimit:0}\";\n            pointsCount = pointsCount.length > 0 ? parseInt(pointsCount, 10) : 0;\n            pointsLimit = pointsLimit.length > 0 ? parseInt(pointsLimit, 10) : 0;\n            var pointsPercentElement = $('#api-usage-percent2', parentTag);\n            var pointsValueElement = $('#api-usage-value2', parentTag);\n            var pointsBarElement = $('#api-usage-bar2', parentTag);\n            if (Number.isFinite(pointsLimit) && pointsLimit > 0) {\n                var percent = Math.min(100, ((pointsCount / pointsLimit) * 100));\n                pointsBarElement.width(percent + '%');\n                percent = percent.toFixed(2);\n                pointsPercentElement.text(percent + '%');\n                pointsValueElement.text(toShortNumber(pointsCount) + ' / ' + toShortNumber(pointsLimit));\n            } else {\n                pointsBarElement.width('0%');\n                pointsPercentElement.text('');\n                pointsValueElement.text(toShortNumber(pointsCount) + ' / ∞');\n            }\n            var apiState = \"${apiState}\";\n            var apiStatePoint = \"${apiStatePoint}\";\n            var currentState;\n            if (apiState === 'DISABLED' || apiStatePoint === 'DISABLED') {\n                currentState = 'DISABLED';\n            } else if (apiState === 'WARNING' || apiStatePoint === 'WARNING') {\n                currentState = 'WARNING';\n            } else {\n                currentState = 'ENABLED';\n            }\n            var stateTitle = $('#api-state', parentTag);\n            stateTitle.text(currentState);\n            parentTag.classList.add(currentState.toLowerCase());\n        }\n    </script>\n    <div class='content'>\n        <div class='column'>\n            <div class='title-row'>\n                <div class='title'>\n                    <span>${title}</span>\n                </div>\n                <div id=\"api-state\" class='state'></div>\n            </div>\n            <div class=\"bars-row\">\n                <div class=\"bar-column\" style=\"margin-right: 10px;\">\n                    <div class='bar-container'>\n                        <div class=\"unit\">{i18n:api-usage.email}</div>\n                        <div class='bar'>\n                            <div class=\"bar-fill\" id=\"api-usage-bar\"></div>\n                        </div>\n                        <div class='bar-labels'>\n                            <div id=\"api-usage-percent\"></div>\n                            <div style=\"flex: 1;\"></div>\n                            <div id=\"api-usage-value\"></div>\n                        </div>\n                    </div>\n                </div>\n                <div class=\"bar-column\" style=\"margin-left: 10px;\">\n                    <div class='bar-container'>\n                        <div class=\"unit\">{i18n:api-usage.sms}</div>\n                        <div class='bar'>\n                            <div class=\"bar-fill\" id=\"api-usage-bar2\"></div>\n                        </div>\n                        <div class='bar-labels'>\n                            <div id=\"api-usage-percent2\"></div>\n                            <div style=\"flex: 1;\"></div>\n                            <div id=\"api-usage-value2\"></div>\n                        </div>\n                    </div>\n                </div>\n            </div>\n        </div>\n    </div>\n    <div role=\"separator\" class=\"mat-divider mat-divider-horizontal\" aria-orientation=\"horizontal\"></div>\n    <div class='action-row'>\n        <button id=\"transport_details\" class=\"mat-focus-indicator mat-button mat-button-base mat-primary\">\n            <span class=\"mat-button-wrapper\">{i18n:api-usage.view-details}</span>\n            <span class=\"mat-ripple mat-button-ripple\"></span>\n            <span class=\"mat-button-focus-overlay\"></span>\n        </button>\n    </div>\n</div>"
+          },
+          "title": "Notifications (Email/SMS)",
+          "dropShadow": true,
+          "enableFullscreen": false,
+          "widgetStyle": {
+            "cursor": "default"
+          },
+          "titleStyle": {
+            "fontSize": "20px",
+            "fontWeight": 400
+          },
+          "useDashboardTimewindow": true,
+          "showLegend": false,
+          "actions": {
+            "elementClick": [
+              {
+                "name": "transport_details",
+                "icon": "insert_chart",
+                "type": "openDashboardState",
+                "targetDashboardStateId": "notifications",
+                "setEntityId": false,
+                "stateEntityParamName": null,
+                "openInSeparateDialog": null,
+                "dialogTitle": null,
+                "dialogHideDashboardToolbar": true,
+                "dialogWidth": null,
+                "dialogHeight": null,
+                "openRightLayout": false,
+                "id": "46b7cefe-e1f2-67c1-4055-3a214520f869"
+              }
+            ]
+          },
+          "showTitleIcon": false,
+          "iconColor": "rgba(0, 0, 0, 0.87)",
+          "iconSize": "24px",
+          "titleTooltip": ""
+        },
+        "row": 0,
+        "col": 0,
+        "id": "292eaded-4775-36f7-c896-98d57bdda936"
+      },
+      "b3571a36-2106-1122-7d58-0d38bbb0e9c8": {
+        "isSystemType": true,
+        "bundleAlias": "charts",
+        "typeAlias": "timeseries_bars_flot",
+        "type": "timeseries",
+        "title": "New widget",
+        "sizeX": 8,
+        "sizeY": 5,
+        "config": {
+          "datasources": [
+            {
+              "type": "entity",
+              "name": null,
+              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+              "filterId": null,
+              "dataKeys": [
+                {
+                  "name": "emailCountHourly",
+                  "type": "timeseries",
+                  "label": "{i18n:api-usage.email-messages}",
+                  "color": "#d35a00",
+                  "settings": {
+                    "excludeFromStacking": false,
+                    "hideDataByDefault": false,
+                    "disableDataHiding": false,
+                    "removeFromLegend": false,
+                    "showLines": false,
+                    "fillLines": false,
+                    "showPoints": false,
+                    "showPointShape": "circle",
+                    "pointShapeFormatter": "",
+                    "showPointsLineWidth": 5,
+                    "showPointsRadius": 3,
+                    "showSeparateAxis": false,
+                    "axisPosition": "left",
+                    "thresholds": [
+                      {
+                        "thresholdValueSource": "predefinedValue"
+                      }
+                    ],
+                    "comparisonSettings": {
+                      "showValuesForComparison": true
+                    }
+                  },
+                  "_hash": 0.0661644137210089,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                }
+              ]
+            }
+          ],
+          "timewindow": {
+            "hideInterval": false,
+            "hideAggregation": false,
+            "hideAggInterval": false,
+            "selectedTab": 1,
+            "history": {
+              "historyType": 0,
+              "timewindowMs": 2592000000,
+              "interval": 86400000
+            },
+            "aggregation": {
+              "type": "SUM",
+              "limit": 1000
+            }
+          },
+          "showTitle": true,
+          "backgroundColor": "#fff",
+          "color": "rgba(0, 0, 0, 0.87)",
+          "padding": "8px",
+          "settings": {
+            "shadowSize": 4,
+            "fontColor": "#545454",
+            "fontSize": 10,
+            "xaxis": {
+              "showLabels": true,
+              "color": "#545454"
+            },
+            "yaxis": {
+              "showLabels": true,
+              "color": "#545454",
+              "min": 0,
+              "tickDecimals": 0,
+              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
+            },
+            "grid": {
+              "color": "#545454",
+              "tickColor": "#DDDDDD",
+              "verticalLines": true,
+              "horizontalLines": true,
+              "outlineWidth": 1
+            },
+            "stack": false,
+            "tooltipIndividual": false,
+            "defaultBarWidth": 1800000,
+            "barAlignment": "left",
+            "timeForComparison": "months",
+            "xaxisSecond": {
+              "axisPosition": "top",
+              "showLabels": true
+            }
+          },
+          "title": "{i18n:api-usage.email-messages-daily-activity}",
+          "dropShadow": true,
+          "enableFullscreen": true,
+          "titleStyle": {
+            "fontSize": "16px",
+            "fontWeight": 400
+          },
+          "widgetStyle": {},
+          "useDashboardTimewindow": false,
+          "showLegend": true,
+          "actions": {},
+          "displayTimewindow": true,
+          "showTitleIcon": false,
+          "iconColor": "rgba(0, 0, 0, 0.87)",
+          "iconSize": "24px",
+          "titleTooltip": "",
+          "legendConfig": {
+            "direction": "column",
+            "position": "bottom",
+            "sortDataKeys": false,
+            "showMin": false,
+            "showMax": false,
+            "showAvg": false,
+            "showTotal": true
+          }
+        },
+        "row": 0,
+        "col": 0,
+        "id": "b3571a36-2106-1122-7d58-0d38bbb0e9c8"
+      },
+      "aa875b7f-e7c8-7529-1ae7-f456211b59cc": {
+        "isSystemType": true,
+        "bundleAlias": "charts",
+        "typeAlias": "timeseries_bars_flot",
+        "type": "timeseries",
+        "title": "New widget",
+        "sizeX": 8,
+        "sizeY": 5,
+        "config": {
+          "datasources": [
+            {
+              "type": "entity",
+              "name": null,
+              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+              "filterId": null,
+              "dataKeys": [
+                {
+                  "name": "emailCount",
+                  "type": "timeseries",
+                  "label": "{i18n:api-usage.email-messages}",
+                  "color": "#d35a00",
+                  "settings": {
+                    "excludeFromStacking": false,
+                    "hideDataByDefault": false,
+                    "disableDataHiding": false,
+                    "removeFromLegend": false,
+                    "showLines": false,
+                    "fillLines": false,
+                    "showPoints": false,
+                    "showPointShape": "circle",
+                    "pointShapeFormatter": "",
+                    "showPointsLineWidth": 5,
+                    "showPointsRadius": 3,
+                    "showSeparateAxis": false,
+                    "axisPosition": "left",
+                    "thresholds": [
+                      {
+                        "thresholdValueSource": "predefinedValue"
+                      }
+                    ],
+                    "comparisonSettings": {
+                      "showValuesForComparison": true
+                    }
+                  },
+                  "_hash": 0.0661644137210089,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                }
+              ]
+            }
+          ],
+          "timewindow": {
+            "hideInterval": false,
+            "hideAggregation": false,
+            "hideAggInterval": false,
+            "selectedTab": 1,
+            "history": {
+              "historyType": 0,
+              "timewindowMs": 31536000000,
+              "interval": 1000
+            },
+            "aggregation": {
+              "type": "NONE",
+              "limit": 1000
+            }
+          },
+          "showTitle": true,
+          "backgroundColor": "#fff",
+          "color": "rgba(0, 0, 0, 0.87)",
+          "padding": "8px",
+          "settings": {
+            "shadowSize": 4,
+            "fontColor": "#545454",
+            "fontSize": 10,
+            "xaxis": {
+              "showLabels": true,
+              "color": "#545454"
+            },
+            "yaxis": {
+              "showLabels": true,
+              "color": "#545454",
+              "min": 0,
+              "tickDecimals": 0,
+              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
+            },
+            "grid": {
+              "color": "#545454",
+              "tickColor": "#DDDDDD",
+              "verticalLines": true,
+              "horizontalLines": true,
+              "outlineWidth": 1
+            },
+            "stack": false,
+            "tooltipIndividual": false,
+            "defaultBarWidth": 900000000,
+            "barAlignment": "left",
+            "timeForComparison": "months",
+            "xaxisSecond": {
+              "axisPosition": "top",
+              "showLabels": true
+            }
+          },
+          "title": "{i18n:api-usage.email-messages-monthly-activity}",
+          "dropShadow": true,
+          "enableFullscreen": true,
+          "titleStyle": {
+            "fontSize": "16px",
+            "fontWeight": 400
+          },
+          "widgetStyle": {},
+          "useDashboardTimewindow": false,
+          "showLegend": true,
+          "actions": {},
+          "displayTimewindow": true,
+          "showTitleIcon": false,
+          "iconColor": "rgba(0, 0, 0, 0.87)",
+          "iconSize": "24px",
+          "titleTooltip": "",
+          "legendConfig": {
+            "direction": "column",
+            "position": "bottom",
+            "sortDataKeys": false,
+            "showMin": false,
+            "showMax": false,
+            "showAvg": false,
+            "showTotal": true
+          }
+        },
+        "row": 0,
+        "col": 0,
+        "id": "aa875b7f-e7c8-7529-1ae7-f456211b59cc"
       }
     },
     "states": {
@@ -4071,7 +4410,7 @@
                 "col": 16,
                 "mobileHeight": 3
               },
-              "2503a391-5692-0614-85e6-f179c5ee0dc9": {
+              "292eaded-4775-36f7-c896-98d57bdda936": {
                 "sizeX": 4,
                 "sizeY": 2,
                 "row": 0,
@@ -4261,72 +4600,6 @@
           }
         }
       },
-      "email_messages": {
-        "name": "{i18n:api-usage.email-messages}",
-        "root": false,
-        "layouts": {
-          "main": {
-            "widgets": {
-              "4b798823-b97d-9d6a-59dc-fcafd897fc23": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 0,
-                "col": 0
-              },
-              "6a981580-7490-19dd-f937-b64cbf67a982": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 6,
-                "col": 0
-              }
-            },
-            "gridSettings": {
-              "backgroundColor": "#eeeeee",
-              "color": "rgba(0,0,0,0.870588)",
-              "columns": 24,
-              "margin": 10,
-              "backgroundSizeMode": "100%",
-              "autoFillHeight": true,
-              "backgroundImageUrl": null,
-              "mobileAutoFillHeight": false,
-              "mobileRowHeight": 70
-            }
-          }
-        }
-      },
-      "sms_messages": {
-        "name": "{i18n:api-usage.sms-messages}",
-        "root": false,
-        "layouts": {
-          "main": {
-            "widgets": {
-              "7302df65-1b0c-579e-bbdb-145126ae3392": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 0,
-                "col": 0
-              },
-              "fdb385e7-14fe-fc9f-ebdc-b400f26fc66b": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 6,
-                "col": 0
-              }
-            },
-            "gridSettings": {
-              "backgroundColor": "#eeeeee",
-              "color": "rgba(0,0,0,0.870588)",
-              "columns": 24,
-              "margin": 10,
-              "backgroundSizeMode": "100%",
-              "autoFillHeight": true,
-              "backgroundImageUrl": null,
-              "mobileAutoFillHeight": false,
-              "mobileRowHeight": 70
-            }
-          }
-        }
-      },
       "rule_engine_statistics": {
         "name": "{i18n:api-usage.rule-engine-statistics}",
         "root": false,
@@ -4367,6 +4640,84 @@
             }
           }
         }
+      },
+      "notifications": {
+        "name": "{i18n:api-usage.notifications-email-sms}",
+        "root": false,
+        "layouts": {
+          "main": {
+            "widgets": {
+              "7302df65-1b0c-579e-bbdb-145126ae3392": {
+                "sizeX": 12,
+                "sizeY": 6,
+                "row": 0,
+                "col": 12
+              },
+              "fdb385e7-14fe-fc9f-ebdc-b400f26fc66b": {
+                "sizeX": 12,
+                "sizeY": 6,
+                "row": 6,
+                "col": 12
+              },
+              "b3571a36-2106-1122-7d58-0d38bbb0e9c8": {
+                "sizeX": 12,
+                "sizeY": 6,
+                "row": 0,
+                "col": 0
+              },
+              "aa875b7f-e7c8-7529-1ae7-f456211b59cc": {
+                "sizeX": 12,
+                "sizeY": 6,
+                "row": 6,
+                "col": 0
+              }
+            },
+            "gridSettings": {
+              "backgroundColor": "#eeeeee",
+              "color": "rgba(0,0,0,0.870588)",
+              "columns": 24,
+              "margin": 10,
+              "backgroundSizeMode": "100%",
+              "autoFillHeight": true,
+              "backgroundImageUrl": null,
+              "mobileAutoFillHeight": false,
+              "mobileRowHeight": 70
+            }
+          }
+        }
+      },
+      "alarms_created": {
+        "name": "{i18n:api-usage.alarms-created}",
+        "root": false,
+        "layouts": {
+          "main": {
+            "widgets": {
+              "4b798823-b97d-9d6a-59dc-fcafd897fc23": {
+                "sizeX": 24,
+                "sizeY": 6,
+                "row": 0,
+                "col": 0
+              },
+              "6a981580-7490-19dd-f937-b64cbf67a982": {
+                "sizeX": 24,
+                "sizeY": 6,
+                "row": 6,
+                "col": 0
+              }
+            },
+            "gridSettings": {
+              "backgroundColor": "#eeeeee",
+              "color": "rgba(0,0,0,0.870588)",
+              "columns": 24,
+              "margin": 10,
+              "backgroundSizeMode": "100%",
+              "autoFillHeight": true,
+              "backgroundImageUrl": null,
+              "mobileAutoFillHeight": false,
+              "mobileRowHeight": 70
+            }
+          }
+        }
       }
     },
     "entityAliases": {
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index e26e2d672c..c68098b8d0 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -470,12 +470,16 @@
     },
     "api-usage": {
         "api-usage": "Api Usage",
+        "alarm": "Alarm",
+        "alarms-created": "Alarms created",
+        "alarms-created-daily-activity": "Alarms created daily activity",
+        "alarms-created-hourly-activity": "Alarms created hourly activity",
+        "alarms-created-monthly-activity": "Alarms created monthly activity",
         "data-points": "Data points",
         "data-points-storage-days": "Data points storage days",
         "email": "Email",
         "email-messages": "Email messages",
         "email-messages-daily-activity": "Email messages daily activity",
-        "email-messages-hourly-activity": "Email messages hourly activity",
         "email-messages-monthly-activity": "Email messages monthly activity",
         "exceptions": "Exceptions",
         "executions": "Executions",
@@ -487,6 +491,9 @@
         "javascript-functions-monthly-activity": "JavaScript functions monthly activity",
         "latest-error": "Latest Error",
         "messages": "Messages",
+        "notifications": "Notifications",
+        "notifications-email-sms": "Notifications (Email/SMS)",
+        "notifications-hourly-activity": "Notifications hourly activity",
         "permanent-failures": "${entityName} Permanent Failures",
         "permanent-timeouts": "${entityName} Permanent Timeouts",
         "processing-failures": "${entityName} Processing Failures",
@@ -504,7 +511,6 @@
         "sms": "SMS",
         "sms-messages": "SMS messages",
         "sms-messages-daily-activity": "SMS messages daily activity",
-        "sms-messages-hourly-activity": "SMS messages hourly activity",
         "sms-messages-monthly-activity": "SMS messages monthly activity",
         "successful": "${entityName} Successful",
         "telemetry": "Telemetry",