Renaming metering and monitoring dashboard json file names, title and urls
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/30c2c6ab Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/30c2c6ab Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/30c2c6ab Branch: refs/heads/stratos-4.1.x Commit: 30c2c6abd1327d3f400d46d569b86acf253efd5a Parents: 12110f4 Author: Thanuja <[email protected]> Authored: Wed Nov 11 15:50:04 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Thu Nov 12 15:07:27 2015 +0530 ---------------------------------------------------------------------- .../console/applications_form.jag | 2 +- .../Dashboard/artifact.xml | 2 +- .../Dashboard/metering-dashboard.json | 229 ++++++++++++++++ .../Dashboard/stratos-metering-dashboard.json | 229 ---------------- .../Dashboard/artifact.xml | 2 +- .../Dashboard/monitoring-dashboard.json | 225 +++++++++++++++ .../Dashboard/stratos-monitoring-dashboard.json | 274 ------------------- .../src/main/conf/cartridge-config.properties | 4 +- 8 files changed, 459 insertions(+), 508 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/30c2c6ab/components/org.apache.stratos.manager.console/console/applications_form.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/applications_form.jag b/components/org.apache.stratos.manager.console/console/applications_form.jag index 64baf5d..755ea7f 100644 --- a/components/org.apache.stratos.manager.console/console/applications_form.jag +++ b/components/org.apache.stratos.manager.console/console/applications_form.jag @@ -36,7 +36,7 @@ var log = new Log("apachestratos.applications_form"), editorDeploymentPolicies = applicationPolicyData = applicationJSON = '', isEdit = isForm = false, userPermissions = session.get('PERMISSIONS'), - dasStatsPublisherEnabled = application.get("dasStatsPublisherEnabled"); + dasStatsPublisherEnabled = application.get("dasStatsPublisherEnabled"), meteringDashboardUrl = ''; //create left menu http://git-wip-us.apache.org/repos/asf/stratos/blob/30c2c6ab/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/Dashboard/artifact.xml ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/Dashboard/artifact.xml b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/Dashboard/artifact.xml index bd6d164..7b50b23 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/Dashboard/artifact.xml +++ b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/Dashboard/artifact.xml @@ -20,5 +20,5 @@ --> <artifact name="Dashboard" version="1.0.0" type="dashboards/dashboard" serverRole="DataAnalyticsServer"> - <file>stratos-metering-dashboard.json</file> + <file>metering-dashboard.json</file> </artifact> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/30c2c6ab/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/Dashboard/metering-dashboard.json ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/Dashboard/metering-dashboard.json b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/Dashboard/metering-dashboard.json new file mode 100644 index 0000000..7cf8d6b --- /dev/null +++ b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/Dashboard/metering-dashboard.json @@ -0,0 +1,229 @@ +{ + "id": "metering-dashboard", + "title": "Metering Dashboard", + "description": "This dashboard is to show metering data.", + "permissions": { + "viewers": [ + "Internal/everyone" + ], + "editors": [ + "Internal/everyone" + ] + }, + "pages": [ + { + "id": "member-status", + "title": "Member Status", + "layout": { + "id": "single-column", + "title": "Single Column", + "description": "This is a layout generated through single-column.io", + "thumbnail": "store://layout/single-column/index.png", + "url": "store://layout/single-column/index.hbs", + "content": "<!--\n\n Licensed to the Apache Software Foundation (ASF) under one\n or more contributor license agreements. See the NOTICE file\n distributed with this work for additional information\n regarding copyright ownership. The ASF licenses this file\n to you under the Apache License, Version 2.0 (the\n \"License\"); you may not use this file except in compliance\n with the License. You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing,\n software distributed under the License is distributed on an\n \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n KIND, either express or implied. See the License for the\n specific language governing permissions and limitations\n under the License.\n\n-->\n<div class=\"container\">\n<div class=\"row\">\n <div id=\"a\" class=\"col-md-12 ues-component-box\"></div>\n <div id=\"b\" class=\"col-md-12 ues-component-box\"></div >\n <div id=\"c\" class=\"col-md-12 >ues-component-box\"></div>\n</div>\n</div>\n" + }, + "isanon": false, + "content": { + "default": { + "a": [ + { + "id": "ehng97cyk3kxogvi", + "content": { + "id": "Member_Status_Filter", + "title": "", + "type": "gadget", + "thumbnail": "store://gadget/Member_Status_Filter/index.png", + "data": { + "url": "store://gadget/Member_Status_Filter/index.xml" + }, + "styles": { + "title": "", + "height": "100", + "borders": false, + "titlePosition": "left" + }, + "notify": { + "member-status-filter": { + "type": "address", + "description": "This notifies time interval" + }, + "cancel": { + "type": "boolean", + "description": "This notifies cancellation of state selection" + } + }, + "settings": {} + } + } + ], + "b": [ + { + "id": "q1pf6m8s5bq08uxr", + "content": { + "id": "Member_Count", + "title": "Member Count", + "type": "gadget", + "thumbnail": "local://store/carbon.super/gadget/usa-business-revenue/index.png", + "data": { + "url": "local://store/carbon.super/gadget/Member_Count/index.xml" + }, + "listen": { + "member-status-filter": { + "type": "address", + "description": "Used to filter based on state", + "on": [ + { + "from": "ehng97cyk3kxogvi", + "event": "member-status-filter" + } + ] + }, + "auto-update": { + "type": "boolean", + "description": "Used to filter based on state", + "on": [] + } + }, + "styles": { + "title": "", + "height": "400", + "borders": true, + "titlePosition": "left" + }, + "settings": {} + } + } + ], + "c": [ + { + "id": "qf9lnn9oiv1pds4i", + "content": { + "id": "Member_Update", + "title": "Member Status", + "type": "gadget", + "thumbnail": "local://store/carbon.super/gadget/usa-business-revenue/index.png", + "data": { + "url": "local://store/carbon.super/gadget/Member_Status/index.xml" + }, + "listen": { + "member-status-filter": { + "type": "address", + "description": "Used to filter based on state", + "on": [ + { + "from": "ehng97cyk3kxogvi", + "event": "member-status-filter" + } + ] + }, + "auto-update": { + "type": "boolean", + "description": "Used to filter based on state", + "on": [] + } + }, + "styles": { + "title": "", + "height": "800", + "borders": true, + "titlePosition": "left" + }, + "settings": {} + } + } + ] + }, + "anon": {} + } + }, + { + "id": "member-details", + "title": "Member Details", + "layout": { + "id": "single-column", + "title": "Single Column", + "description": "This is a layout generated through single-column.io", + "thumbnail": "store://layout/single-column/index.png", + "url": "store://layout/single-column/index.hbs", + "content": "<!--\n\n Licensed to the Apache Software Foundation (ASF) under one\n or more contributor license agreements. See the NOTICE file\n distributed with this work for additional information\n regarding copyright ownership. The ASF licenses this file\n to you under the Apache License, Version 2.0 (the\n \"License\"); you may not use this file except in compliance\n with the License. You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing,\n software distributed under the License is distributed on an\n \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n KIND, either express or implied. See the License for the\n specific language governing permissions and limitations\n under the License.\n\n-->\n<div class=\"container\">\n<div class=\"row\">\n <div id=\"a\" class=\"col-md-12 ues-component-box\"></div>\n <div id=\"b\" class=\"col-md-12 ues-component-box\"></div >\n <div id=\"c\" class=\"col-md-12 >ues-component-box\"></div>\n</div>\n</div>\n" + }, + "isanon": false, + "content": { + "default": { + "a": [ + { + "id": "8zgl65uoackgldi", + "content": { + "id": "Member_Details_Filter", + "title": "", + "type": "gadget", + "thumbnail": "store://gadget/Member_Details_Filter/index.png", + "data": { + "url": "store://gadget/Member_Details_Filter/index.xml" + }, + "styles": { + "title": "", + "height": "100", + "borders": false, + "titlePosition": "left" + }, + "notify": { + "member-details-filter": { + "type": "address", + "description": "This notifies applicationId and clusterId" + } + }, + "cancel": { + "type": "boolean", + "description": "This notifies cancellation of state selection" + }, + "settings": {} + } + } + ], + "b": [ + { + "id": "hoqfz4b6z91nstt9", + "content": { + "id": "Member_Details", + "title": "Member Details", + "type": "gadget", + "thumbnail": "local://store/carbon.super/gadget/usa-business-revenue/index.png", + "data": { + "url": "local://store/carbon.super/gadget/Member_Information/index.xml" + }, + "listen": { + "member-details-filter": { + "type": "address", + "description": "Used to filter based on state", + "on": [ + { + "from": "8zgl65uoackgldi", + "event": "member-details-filter" + } + ] + }, + "auto-update": { + "type": "boolean", + "description": "Used to filter based on state" + } + }, + "styles": { + "title": "", + "height": "800", + "borders": true, + "titlePosition": "left" + }, + "settings": {} + } + } + ] + }, + "anon": {} + } + } + ], + "landing": "member-status", + "isanon": false, + "isUserCustom": false +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/30c2c6ab/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/Dashboard/stratos-metering-dashboard.json ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/Dashboard/stratos-metering-dashboard.json b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/Dashboard/stratos-metering-dashboard.json deleted file mode 100644 index 42b436c..0000000 --- a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/Dashboard/stratos-metering-dashboard.json +++ /dev/null @@ -1,229 +0,0 @@ -{ - "id": "stratos-metering-dashboard", - "title": "Stratos Metering Dashboard", - "description": "This dashboard is to show metering data.", - "permissions": { - "viewers": [ - "Internal/everyone" - ], - "editors": [ - "Internal/everyone" - ] - }, - "pages": [ - { - "id": "member-status", - "title": "Member Status", - "layout": { - "id": "single-column", - "title": "Single Column", - "description": "This is a layout generated through single-column.io", - "thumbnail": "store://layout/single-column/index.png", - "url": "store://layout/single-column/index.hbs", - "content": "<!--\n\n Licensed to the Apache Software Foundation (ASF) under one\n or more contributor license agreements. See the NOTICE file\n distributed with this work for additional information\n regarding copyright ownership. The ASF licenses this file\n to you under the Apache License, Version 2.0 (the\n \"License\"); you may not use this file except in compliance\n with the License. You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing,\n software distributed under the License is distributed on an\n \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n KIND, either express or implied. See the License for the\n specific language governing permissions and limitations\n under the License.\n\n-->\n<div class=\"container\">\n<div class=\"row\">\n <div id=\"a\" class=\"col-md-12 ues-component-box\"></div>\n <div id=\"b\" class=\"col-md-12 ues-component-box\"></div >\n <div id=\"c\" class=\"col-md-12 >ues-component-box\"></div>\n</div>\n</div>\n" - }, - "isanon": false, - "content": { - "default": { - "a": [ - { - "id": "ehng97cyk3kxogvi", - "content": { - "id": "Member_Status_Filter", - "title": "", - "type": "gadget", - "thumbnail": "store://gadget/Member_Status_Filter/index.png", - "data": { - "url": "store://gadget/Member_Status_Filter/index.xml" - }, - "styles": { - "title": "", - "height": "100", - "borders": false, - "titlePosition": "left" - }, - "notify": { - "member-status-filter": { - "type": "address", - "description": "This notifies time interval" - }, - "cancel": { - "type": "boolean", - "description": "This notifies cancellation of state selection" - } - }, - "settings": {} - } - } - ], - "b": [ - { - "id": "q1pf6m8s5bq08uxr", - "content": { - "id": "Member_Count", - "title": "Member Count", - "type": "gadget", - "thumbnail": "local://store/carbon.super/gadget/usa-business-revenue/index.png", - "data": { - "url": "local://store/carbon.super/gadget/Member_Count/index.xml" - }, - "listen": { - "member-status-filter": { - "type": "address", - "description": "Used to filter based on state", - "on": [ - { - "from": "ehng97cyk3kxogvi", - "event": "member-status-filter" - } - ] - }, - "auto-update": { - "type": "boolean", - "description": "Used to filter based on state", - "on": [] - } - }, - "styles": { - "title": "", - "height": "400", - "borders": true, - "titlePosition": "left" - }, - "settings": {} - } - } - ], - "c": [ - { - "id": "qf9lnn9oiv1pds4i", - "content": { - "id": "Member_Update", - "title": "Member Status", - "type": "gadget", - "thumbnail": "local://store/carbon.super/gadget/usa-business-revenue/index.png", - "data": { - "url": "local://store/carbon.super/gadget/Member_Status/index.xml" - }, - "listen": { - "member-status-filter": { - "type": "address", - "description": "Used to filter based on state", - "on": [ - { - "from": "ehng97cyk3kxogvi", - "event": "member-status-filter" - } - ] - }, - "auto-update": { - "type": "boolean", - "description": "Used to filter based on state", - "on": [] - } - }, - "styles": { - "title": "", - "height": "800", - "borders": true, - "titlePosition": "left" - }, - "settings": {} - } - } - ] - }, - "anon": {} - } - }, - { - "id": "member-details", - "title": "Member Details", - "layout": { - "id": "single-column", - "title": "Single Column", - "description": "This is a layout generated through single-column.io", - "thumbnail": "store://layout/single-column/index.png", - "url": "store://layout/single-column/index.hbs", - "content": "<!--\n\n Licensed to the Apache Software Foundation (ASF) under one\n or more contributor license agreements. See the NOTICE file\n distributed with this work for additional information\n regarding copyright ownership. The ASF licenses this file\n to you under the Apache License, Version 2.0 (the\n \"License\"); you may not use this file except in compliance\n with the License. You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing,\n software distributed under the License is distributed on an\n \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n KIND, either express or implied. See the License for the\n specific language governing permissions and limitations\n under the License.\n\n-->\n<div class=\"container\">\n<div class=\"row\">\n <div id=\"a\" class=\"col-md-12 ues-component-box\"></div>\n <div id=\"b\" class=\"col-md-12 ues-component-box\"></div >\n <div id=\"c\" class=\"col-md-12 >ues-component-box\"></div>\n</div>\n</div>\n" - }, - "isanon": false, - "content": { - "default": { - "a": [ - { - "id": "8zgl65uoackgldi", - "content": { - "id": "Member_Details_Filter", - "title": "", - "type": "gadget", - "thumbnail": "store://gadget/Member_Details_Filter/index.png", - "data": { - "url": "store://gadget/Member_Details_Filter/index.xml" - }, - "styles": { - "title": "", - "height": "100", - "borders": false, - "titlePosition": "left" - }, - "notify": { - "member-details-filter": { - "type": "address", - "description": "This notifies applicationId and clusterId" - } - }, - "cancel": { - "type": "boolean", - "description": "This notifies cancellation of state selection" - }, - "settings": {} - } - } - ], - "b": [ - { - "id": "hoqfz4b6z91nstt9", - "content": { - "id": "Member_Details", - "title": "Member Details", - "type": "gadget", - "thumbnail": "local://store/carbon.super/gadget/usa-business-revenue/index.png", - "data": { - "url": "local://store/carbon.super/gadget/Member_Information/index.xml" - }, - "listen": { - "member-details-filter": { - "type": "address", - "description": "Used to filter based on state", - "on": [ - { - "from": "8zgl65uoackgldi", - "event": "member-details-filter" - } - ] - }, - "auto-update": { - "type": "boolean", - "description": "Used to filter based on state" - } - }, - "styles": { - "title": "", - "height": "800", - "borders": true, - "titlePosition": "left" - }, - "settings": {} - } - } - ] - }, - "anon": {} - } - } - ], - "landing": "member-status", - "isanon": false, - "isUserCustom": false -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/30c2c6ab/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/artifact.xml ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/artifact.xml b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/artifact.xml index c6119ae..63d8e2d 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/artifact.xml +++ b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/artifact.xml @@ -20,5 +20,5 @@ --> <artifact name="Dashboard" version="1.0.0" type="dashboards/dashboard" serverRole="DataAnalyticsServer"> - <file>stratos-monitoring-dashboard.json</file> + <file>monitoring-dashboard.json</file> </artifact> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/30c2c6ab/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/monitoring-dashboard.json ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/monitoring-dashboard.json b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/monitoring-dashboard.json new file mode 100644 index 0000000..b6675cb --- /dev/null +++ b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/monitoring-dashboard.json @@ -0,0 +1,225 @@ +{ + "id": "monitoring-dashboard", + "title": "Monitoring Dashboard", + "description": "This dashboard helps to monitor health stats.", + "permissions": { + "viewers": [ + "Internal/everyone" + ], + "editors": [ + "Internal/everyone" + ] + }, + "pages": [ + { + "id": "health-stats", + "title": "Health Stats", + "layout": { + "id": "single-column", + "title": "Single Column", + "description": "This is a layout generated through single-column.io", + "thumbnail": "store://layout/single-column/index.png", + "url": "store://layout/single-column/index.hbs", + "content": "<div class=\"container\">\n<div class=\"row\">\n <div id=\"a\" class=\"col-md-12 ues-component-box\"></div>\n <div id=\"b\" class=\"col-md-12 ues-component-box\"></div>\n <div id=\"c\" class=\"col-md-12 ues-component-box\"></div>\n</div>\n</div>\n" + }, + "isanon": false, + "content": { + "default": { + "a": [ + { + "id": "8nfqbaxvjc8cwhfr", + "content": { + "id": "Health_Stats_Filter", + "title": "", + "type": "gadget", + "thumbnail": "store://gadget/Health_Stats_Filter/index.png", + "data": { + "url": "store://gadget/Health_Stats_Filter/index.xml" + }, + "styles": { + "height": "150", + "borders": false, + "titlePosition": "left", + "title": "" + }, + "notify": { + "health-stats-filter": { + "type": "address", + "description": "This notifies time interval" + }, + "cancel": { + "type": "boolean", + "description": "This notifies cancellation of state selection" + } + }, + "locale_titles": { + "en-US": "" + }, + "settings": {} + } + }, + { + "id": "8wnyg587eaznz5mi", + "content": { + "id": "Memory_Usage", + "title": "Memory Usage", + "type": "gadget", + "thumbnail": "local://images/gadgetIcon.png", + "data": { + "url": "local://store/carbon.super/gadget/Memory_Usage/index.xml" + }, + "listen": { + "health-stats-filter": { + "type": "address", + "description": "Used to filter based on state", + "on": [ + { + "from": "8nfqbaxvjc8cwhfr", + "event": "health-stats-filter" + } + ] + }, + "auto-update": { + "type": "boolean", + "description": "Used to filter based on state", + "on": [] + } + }, + "styles": { + "height": "400", + "borders": true, + "titlePosition": "left", + "title": "Memory Usage" + }, + "settings": {}, + "locale_titles": { + "en-US": "Memory Usage" + } + } + } + ], + "b": [ + { + "id": "hhy2fj8wgu1bgldi", + "content": { + "id": "Load_Average", + "title": "Load Average", + "type": "gadget", + "thumbnail": "local://images/gadgetIcon.png", + "data": { + "url": "local://store/carbon.super/gadget/Load_Average/index.xml" + }, + "listen": { + "health-stats-filter": { + "type": "address", + "description": "Used to filter based on state", + "on": [ + { + "from": "8nfqbaxvjc8cwhfr", + "event": "health-stats-filter" + } + ] + }, + "auto-update": { + "type": "boolean", + "description": "Used to filter based on state", + "on": [] + } + }, + "styles": { + "height": "400", + "borders": true, + "titlePosition": "left", + "title": "Load Average" + }, + "settings": {}, + "locale_titles": { + "en-US": "Load Average" + } + } + }, + { + "id": "3rlgpdhg2e29", + "content": { + "id": "In_Flight_Request", + "title": "In Flight Request", + "type": "gadget", + "thumbnail": "local://images/gadgetIcon.png", + "data": { + "url": "local://store/carbon.super/gadget/In_Flight_Request/index.xml" + }, + "listen": { + "health-stats-filter": { + "type": "address", + "description": "Used to filter based on state", + "on": [] + }, + "auto-update": { + "type": "boolean", + "description": "Used to filter based on state", + "on": [] + } + }, + "styles": { + "height": "400", + "borders": true, + "titlePosition": "left", + "title": "In-Flight Request" + }, + "settings": {}, + "locale_titles": { + "en-US": "In-Flight Request" + } + } + } + ], + "c": [ + { + "id": "a7jevl0wisc680k9", + "content": { + "id": "Scaling_Details", + "title": "Scaling Details", + "type": "gadget", + "thumbnail": "local://images/gadgetIcon.png", + "data": { + "url": "local://store/carbon.super/gadget/Scaling_Details/index.xml" + }, + "listen": { + "health-stats-filter": { + "type": "address", + "description": "Used to filter based on state", + "on": [ + { + "from": "8nfqbaxvjc8cwhfr", + "event": "health-stats-filter" + } + ] + }, + "auto-update": { + "type": "boolean", + "description": "Used to filter based on state", + "on": [] + } + }, + "styles": { + "height": "600", + "borders": true, + "titlePosition": "left", + "title": "Cluster Instances" + }, + "settings": {}, + "locale_titles": { + "en-US": "Cluster Instances" + } + } + } + ] + }, + "anon": {} + } + } + ], + "landing": "health-stats", + "isanon": false, + "isUserCustom": false +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/30c2c6ab/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/stratos-monitoring-dashboard.json ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/stratos-monitoring-dashboard.json b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/stratos-monitoring-dashboard.json deleted file mode 100644 index 545b004..0000000 --- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/stratos-monitoring-dashboard.json +++ /dev/null @@ -1,274 +0,0 @@ -{ - "id": "stratos-monitoring-dashboard", - "title": "Stratos Monitoring Dashboard", - "description": "This dashboard helps to monitor health stats.", - "permissions": { - "viewers": [ - "Internal/everyone" - ], - "editors": [ - "Internal/everyone" - ] - }, - "pages": [ - { - "id": "health-stats", - "title": "Health Stats", - "layout": { - "id": "single-column", - "title": "Single Column", - "description": "This is a layout generated through single-column.io", - "thumbnail": "store://layout/single-column/index.png", - "url": "store://layout/single-column/index.hbs", - "content": "<div class=\"container\">\n<div class=\"row\">\n <div id=\"a\" class=\"col-md-12 ues-component-box\"></div>\n <div id=\"b\" class=\"col-md-12 ues-component-box\"></div>\n <div id=\"c\" class=\"col-md-12 ues-component-box\"></div>\n</div>\n</div>\n" - }, - "content": { - "a": [ - { - "id": "np79atkpuq8h0k9", - "content": { - "id": "Health_Stats_Filter", - "title": "Health Stats Filter", - "type": "gadget", - "thumbnail": "store://gadget/Health_Stats_Filter/index.png", - "data": { - "url": "store://gadget/Health_Stats_Filter/index.xml" - }, - "styles": { - "title": "", - "height": "150", - "borders": false, - "titlePosition": "left" - }, - "notify": { - "health-stats-filter": { - "type": "address", - "description": "This notifies time interval" - }, - "cancel": { - "type": "boolean", - "description": "This notifies cancellation of state selection" - } - }, - "options": {}, - "settings": {} - } - }, - { - "id": "8wnyg587eaznz5mi", - "content": { - "id": "Memory_Usage", - "title": "Memory Usage", - "type": "gadget", - "thumbnail": "local://images/gadgetIcon.png", - "data": { - "url": "local://store/carbon.super/gadget/Memory_Usage/index.xml" - }, - "listen": { - "health-stats-filter": { - "type": "address", - "description": "Used to filter based on state", - "on": [ - { - "from": "np79atkpuq8h0k9", - "event": "health-stats-filter" - } - ] - }, - "auto-update": { - "type": "boolean", - "description": "Used to filter based on state", - "on": [] - } - }, - "styles": { - "title": "Memory Usage", - "height": "400", - "borders": true, - "titlePosition": "left" - }, - "options": { - "dataSource": { - "type": "STRING", - "title": "Data Source", - "value": "/portal/gadgets/bar-chart/datasource/dataFile4.jag", - "options": [], - "required": false - }, - "updateGraph": { - "type": "STRING", - "title": "Update Interval (s)", - "value": "5", - "options": [], - "required": false - } - }, - "settings": {} - } - } - ], - "b": [ - { - "id": "hhy2fj8wgu1bgldi", - "content": { - "id": "Load_Average", - "title": "Load Average", - "type": "gadget", - "thumbnail": "local://images/gadgetIcon.png", - "data": { - "url": "local://store/carbon.super/gadget/Load_Average/index.xml" - }, - "listen": { - "health-stats-filter": { - "type": "address", - "description": "Used to filter based on state", - "on": [ - { - "from": "np79atkpuq8h0k9", - "event": "health-stats-filter" - } - ] - }, - "auto-update": { - "type": "boolean", - "description": "Used to filter based on state", - "on": [] - } - }, - "styles": { - "title": "Load Average", - "height": "400", - "borders": true, - "titlePosition": "left" - }, - "options": { - "dataSource": { - "type": "STRING", - "title": "Data Source", - "value": "/portal/gadgets/bar-chart/datasource/dataFile4.jag", - "options": [], - "required": false - }, - "updateGraph": { - "type": "STRING", - "title": "Update Interval (s)", - "value": "5", - "options": [], - "required": false - } - }, - "settings": {} - } - }, - { - "id": "3rlgpdhg2e29", - "content": { - "id": "In_Flight_Request", - "title": "In Flight Request", - "type": "gadget", - "thumbnail": "local://images/gadgetIcon.png", - "data": { - "url": "local://store/carbon.super/gadget/In_Flight_Request/index.xml" - }, - "listen": { - "health-stats-filter": { - "type": "address", - "description": "Used to filter based on state", - "on": [ - { - "from": "np79atkpuq8h0k9", - "event": "health-stats-filter" - } - ] - }, - "auto-update": { - "type": "boolean", - "description": "Used to filter based on state", - "on": [] - } - }, - "styles": { - "title": "In-Flight Request", - "height": "400", - "borders": true, - "titlePosition": "left" - }, - "options": { - "dataSource": { - "type": "STRING", - "title": "Data Source", - "value": "/portal/gadgets/bar-chart/datasource/dataFile4.jag", - "options": [], - "required": false - }, - "updateGraph": { - "type": "STRING", - "title": "Update Interval (s)", - "value": "5", - "options": [], - "required": false - } - }, - "settings": {} - } - } - ], - "c": [ - { - "id": "a7jevl0wisc680k9", - "content": { - "id": "Scaling_Details", - "title": "Scaling Details", - "type": "gadget", - "thumbnail": "local://images/gadgetIcon.png", - "data": { - "url": "local://store/carbon.super/gadget/Scaling_Details/index.xml" - }, - "listen": { - "health-stats-filter": { - "type": "address", - "description": "Used to filter based on state", - "on": [ - { - "from": "np79atkpuq8h0k9", - "event": "health-stats-filter" - } - ] - }, - "auto-update": { - "type": "boolean", - "description": "Used to filter based on state", - "on": [] - } - }, - "styles": { - "title": "Cluster Instances", - "height": "600", - "borders": true, - "titlePosition": "left" - }, - "options": { - "dataSource": { - "type": "STRING", - "title": "Data Source", - "value": "/portal/gadgets/bar-chart/datasource/dataFile4.jag", - "options": [], - "required": false - }, - "updateGraph": { - "type": "STRING", - "title": "Update Interval (s)", - "value": "5", - "options": [], - "required": false - } - }, - "settings": {} - } - } - ] - } - } - ], - "landing": "health-stats" -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/30c2c6ab/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties b/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties index 6ce37c0..e4bd8c4 100644 --- a/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties +++ b/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties @@ -22,8 +22,8 @@ autoscaler.service.url=https://localhost:9443/services/AutoscalerService/ cloud.controller.service.url=https://localhost:9443/services/CloudControllerService/ stratos.manager.service.url=https://localhost:9443/services/StratosManagerService/ -das.metering.dashboard.url=https://localhost:9444/portal/dashboards/stratos-metering-dashboard -das.monitoring.dashboard.url=https://localhost:9444/portal/dashboards/stratos-monitoring-dashboard +das.metering.dashboard.url=https://localhost:9444/portal/dashboards/metering-dashboard +das.monitoring.dashboard.url=https://localhost:9444/portal/dashboards/monitoring-dashboard puppet.ip=127.0.0.1 puppet.hostname=puppet.stratos.apache.org puppet.dns.available=false
