Checking dasStatsPublisherEnabled at webapp startup and set dasStatsPublisherEnabled, metering and monitoring url to application object
Signed-off-by: gayangunarathne <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0c64d226 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0c64d226 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0c64d226 Branch: refs/heads/stratos-4.1.x Commit: 0c64d22653d706542f3f7d7b7f99195cab660cad Parents: ff1e1bd Author: Thanuja <[email protected]> Authored: Fri Nov 6 16:38:53 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Fri Nov 6 18:54:34 2015 +0530 ---------------------------------------------------------------------- .../console/app.js | 15 ++++++++++++++- .../console/applications_form.jag | 5 ++--- .../console/controllers/login/login.jag | 20 +++++--------------- .../src/main/conf/cartridge-config.properties | 1 + 4 files changed, 22 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0c64d226/components/org.apache.stratos.manager.console/console/app.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/app.js b/components/org.apache.stratos.manager.console/console/app.js index 7a4b3c0..6eada1d 100644 --- a/components/org.apache.stratos.manager.console/console/app.js +++ b/components/org.apache.stratos.manager.console/console/app.js @@ -19,7 +19,12 @@ * */ -var caramel = require('caramel'); +var caramel = require('caramel'), + carbon = require('carbon'), + server = new carbon.server.Server(), + conf = carbon.server.loadConfig('thrift-client-config.xml'), + dasConfig = conf. *::['config']. *::['das'], + dasStatsPublisherEnabled = false; caramel.configs({ context: '/console', @@ -29,3 +34,11 @@ caramel.configs({ return 'theme0'; } }); + +for (var i = 0; i < dasConfig.node.length(); i++) { + dasStatsPublisherEnabled = dasConfig.node[i].statsPublisherEnabled.text(); + if (dasStatsPublisherEnabled == true) { + break; + } +} +application.put("dasStatsPublisherEnabled",dasStatsPublisherEnabled); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/0c64d226/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 a68f8fd..64baf5d 100644 --- a/components/org.apache.stratos.manager.console/console/applications_form.jag +++ b/components/org.apache.stratos.manager.console/console/applications_form.jag @@ -36,10 +36,9 @@ var log = new Log("apachestratos.applications_form"), editorDeploymentPolicies = applicationPolicyData = applicationJSON = '', isEdit = isForm = false, userPermissions = session.get('PERMISSIONS'), - dasStatsPublisherEnabled = session.get('DAS_STATS_PUBLISHER_ENABLED'), + dasStatsPublisherEnabled = application.get("dasStatsPublisherEnabled"); meteringDashboardUrl = ''; - //create left menu var leftMenu = menuGenerator(context, menuJson.menu, userPermissions); @@ -113,7 +112,7 @@ switch (formtype) { } if (dasStatsPublisherEnabled) { - meteringDashboardUrl = session.get('METERING_DASHBOARD_URL'); + meteringDashboardUrl = application.get("meteringDashboardUrl"); } var caramelData = { breadcrumbPathLevelOne: breadcrumbPathLevelOne, http://git-wip-us.apache.org/repos/asf/stratos/blob/0c64d226/components/org.apache.stratos.manager.console/console/controllers/login/login.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/login/login.jag b/components/org.apache.stratos.manager.console/console/controllers/login/login.jag index ef495f9..f3d85f1 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/login/login.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/login/login.jag @@ -25,17 +25,7 @@ var log = new Log("controller.login"), server = new carbon.server.Server(), conf = carbon.server.loadConfig('carbon.xml'), offset = conf. *::['Ports']. *::['Offset'].text(), - hostName = conf. *::['HostName'].text().toString(), - conf = carbon.server.loadConfig('thrift-client-config.xml'), - dasConfig = conf. *::['config']. *::['das'], - dasStatsPublisherEnabled = false; - -for (var i = 0; i < dasConfig.node.length(); i++) { - dasStatsPublisherEnabled = dasConfig.node[i].statsPublisherEnabled.text(); - if (dasStatsPublisherEnabled == true) { - break; - } -} + hostName = conf. *::['HostName'].text().toString(); if (hostName === null || hostName === '') { hostName = 'localhost'; @@ -45,6 +35,10 @@ var httpPort = 9763 + parseInt(offset, 10), httpsPort = 9443 + parseInt(offset, 10); var meteringDashboardUrl = process.getProperty("das.metering.dashboard.url"); +var monitoringDashboardUrl = process.getProperty("das.monitoring.dashboard.url"); + +application.put("meteringDashboardUrl", meteringDashboardUrl); +application.put("monitoringDashboardUrl", monitoringDashboardUrl); process.setProperty('server.host', hostName); process.setProperty('http.port', httpPort.toString()); @@ -72,10 +66,6 @@ try { session.put("TENANT_DOMAIN", userObject.domain); session.put("ROLE_ARRAY", roles); session.put("TENANT_ID", userObject.tenantId); - session.put("DAS_STATS_PUBLISHER_ENABLED", dasStatsPublisherEnabled); - if (dasStatsPublisherEnabled) { - session.put("METERING_DASHBOARD_URL", meteringDashboardUrl); - } try { //get all user permission http://git-wip-us.apache.org/repos/asf/stratos/blob/0c64d226/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 a3fd8ee..6ce37c0 100644 --- a/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties +++ b/products/stratos/modules/distribution/src/main/conf/cartridge-config.properties @@ -23,6 +23,7 @@ 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 puppet.ip=127.0.0.1 puppet.hostname=puppet.stratos.apache.org puppet.dns.available=false
