July 2013 - rhq-commits - Fedora mailing-lists

[rhq] Branch 'feature/bundle-group' - 59 commits - .classpath etc/dev-utils etc/rhq-ircBot modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins pom.xml
by Jay Shaughnessy 31 Jul '13

31 Jul '13

.classpath | 1 etc/dev-utils/TestLdapSettings.java | 738 ----- etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks |binary modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java | 5 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties | 2 modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties | 2 modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java | 123 modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditorException.java | 21 modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java | 122 modules/common/cassandra-util/src/test/resources/cassandra.yaml | 690 +++++ modules/core/dbutils/pom.xml | 6 modules/core/dbutils/src/main/scripts/dbsetup/authz-data.xml | 28 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 67 modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java | 3 modules/enterprise/gui/coregui/pom.xml | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 29 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java | 311 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java | 155 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/LineMetricGraph.java | 158 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 115 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java | 79 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java | 258 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 33 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 204 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 308 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java | 27 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java | 399 --- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java | 186 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java | 237 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java | 167 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java | 213 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 389 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java | 307 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java | 222 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 12 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 10 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 10 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 10 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 10 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 10 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 10 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 10 modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js | 4 modules/enterprise/server/appserver/pom.xml | 11 modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 11 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java | 6 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java | 6 modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml | 28 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 362 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java | 12 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java | 7 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 185 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java | 15 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java | 49 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/helper/LinkDeserializer.java | 28 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java | 18 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java | 83 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandler.java | 17 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java | 90 modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java | 153 - modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 5 modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageResultSetFuture.java | 76 modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java | 110 modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageStateListener.java | 20 modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/ListPagedResult.java | 6 modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/SimplePagedResult.java | 11 modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java | 35 modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/ClusterMonitorTest.java | 92 modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsBaselineCalculatorTest.java | 14 modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java | 17 modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 7 modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/TimeoutTest.java | 5 modules/enterprise/server/server-metrics/src/test/resources/log4j.properties | 2 modules/helpers/ldap-tool/pom.xml | 85 modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java | 1289 ++++++++++ modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java | 5 modules/integration-tests/rest-api/pom.xml | 11 modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ContentTest.java | 8 modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java | 337 +- modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java | 4 modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkDeserializer.java | 18 modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkSerializer.java | 53 modules/plugins/cassandra/pom.xml | 9 modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 151 + modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 3 modules/plugins/rhq-storage/pom.xml | 139 + modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/InternodeAuthConfUpdateException.java | 22 modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 275 +- modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java | 81 modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 31 modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java | 361 ++ modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java | 41 modules/plugins/rhq-storage/src/test/resources/cassandra.yaml | 690 +++++ modules/plugins/rhq-storage/src/test/resources/log4j.xml | 40 pom.xml | 4 106 files changed, 7960 insertions(+), 2959 deletions(-) New commits: commit d7bf4998586c6daba79a166f2cc2440f27d259be Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jul 31 17:10:54 2013 -0400 Add new perms to out-of-box roles, start db-upgrade step for fine-grained bundle perm work diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/authz-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/authz-data.xml index 681bd66..ecc7d4a 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/authz-data.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/authz-data.xml @@ -43,13 +43,19 @@ <table name="RHQ_PERMISSION">  + (explicitly add resource perms, even though they are implied by MANAGE_INVENTORY) + (explicitly add bundle perms, even though they are implied by MANAGE_BUNDLE) --> <data ROLE_ID="1" OPERATION="0"/>  <data ROLE_ID="1" OPERATION="1"/>  <data ROLE_ID="1" OPERATION="2"/>  - <data ROLE_ID="1" OPERATION="12"/>  + <data ROLE_ID="1" OPERATION="12"/>  <data ROLE_ID="1" OPERATION="15"/>  <data ROLE_ID="1" OPERATION="17"/>  + <data ROLE_ID="1" OPERATION="18"/>  + <data ROLE_ID="1" OPERATION="19"/>  + <data ROLE_ID="1" OPERATION="20"/>  + <data ROLE_ID="1" OPERATION="21"/>  + <data ROLE_ID="1" OPERATION="22"/>   <data ROLE_ID="1" OPERATION="3"/>  <data ROLE_ID="1" OPERATION="4"/>  @@ -63,12 +69,22 @@ <data ROLE_ID="1" OPERATION="13"/>  <data ROLE_ID="1" OPERATION="14"/>  <data ROLE_ID="1" OPERATION="16"/>  +  + <data ROLE_ID="1" OPERATION="23"/>  + <data ROLE_ID="1" OPERATION="24"/>  + <data ROLE_ID="1" OPERATION="25"/>  + <data ROLE_ID="1" OPERATION="26"/>  + <data ROLE_ID="1" OPERATION="27"/>  -  <data ROLE_ID="2" OPERATION="1"/>  <data ROLE_ID="2" OPERATION="12"/>  <data ROLE_ID="2" OPERATION="17"/>  + <data ROLE_ID="2" OPERATION="19"/>  + <data ROLE_ID="2" OPERATION="20"/>  + <data ROLE_ID="2" OPERATION="21"/>  + <data ROLE_ID="2" OPERATION="22"/>   <data ROLE_ID="2" OPERATION="3"/>  <data ROLE_ID="2" OPERATION="4"/>  @@ -82,6 +98,12 @@ <data ROLE_ID="2" OPERATION="13"/>  <data ROLE_ID="2" OPERATION="14"/>  <data ROLE_ID="2" OPERATION="16"/>  +  + <data ROLE_ID="2" OPERATION="23"/>  + <data ROLE_ID="2" OPERATION="24"/>  + <data ROLE_ID="2" OPERATION="25"/>  + <data ROLE_ID="2" OPERATION="26"/>  + <data ROLE_ID="2" OPERATION="27"/>  </table> </dbsetup> diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index bb5fa50..25cdfec 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -2079,6 +2079,73 @@ <schema-javaTask className="StorageNodeAddressUpgradeTask" /> </schemaSpec> + <schemaSpec version="2.135"> +  + +  + <schema-directSQL> + <statement desc="Inserting MANAGE_BUNDLE_GROUPS permission for 'Super User' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (1, 18) + </statement> + <statement desc="Inserting CREATE_BUNDLES permission for 'Super User' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (1, 19) + </statement> + <statement desc="Inserting DELETE_BUNDLES permission for 'Super User' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (1, 20) + </statement> + <statement desc="Inserting DEPLOY_BUNDLES permission for 'Super User' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (1, 21) + </statement> + <statement desc="Inserting VIEW_BUNDLES permission for 'Super User' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (1, 22) + </statement> + <statement desc="Inserting ASSIGN_BUNDLES_TO_GROUP permission for 'Super User' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (1, 23) + </statement> + <statement desc="Inserting UNASSIGN_BUNDLES_FROM_GROUP permission for 'Super User' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (1, 24) + </statement> + <statement desc="Inserting CREATE_BUNDLES_IN_GROUP permission for 'Super User' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (1, 25) + </statement> + <statement desc="Inserting DELETE_BUNDLES_FROM_GROUP permission for 'Super User' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (1, 26) + </statement> + <statement desc="Inserting VIEW_BUNDLES_IN_GROUP permission for 'Super User' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (1, 27) + </statement> + +  + <statement desc="Inserting CREATE_BUNDLES permission for 'All Resources' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (2, 19) + </statement> + <statement desc="Inserting DELETE_BUNDLES permission for 'All Resources' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (2, 20) + </statement> + <statement desc="Inserting DEPLOY_BUNDLES permission for 'All Resources' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (2, 21) + </statement> + <statement desc="Inserting VIEW_BUNDLES permission for 'All Resources' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (2, 22) + </statement> + <statement desc="Inserting ASSIGN_BUNDLES_TO_GROUP permission for 'All Resources' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (2, 23) + </statement> + <statement desc="Inserting UNASSIGN_BUNDLES_FROM_GROUP permission for 'All Resources' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (2, 24) + </statement> + <statement desc="Inserting CREATE_BUNDLES_IN_GROUP permission for 'All Resources' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (2, 25) + </statement> + <statement desc="Inserting DELETE_BUNDLES_FROM_GROUP permission for 'All Resources' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (2, 26) + </statement> + <statement desc="Inserting VIEW_BUNDLES_IN_GROUP permission for 'All Resources' role"> + INSERT INTO RHQ_PERMISSION (ROLE_ID, OPERATION) VALUES (2, 27) + </statement> + </schema-directSQL> + </schemaSpec> + </dbupgrade> </target> </project> commit 4b5ce46db93610cc198fd2442027992db72ee36a Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jul 31 17:09:56 2013 -0400 Fix issues when performing dbsetup-upgrade with defaults diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 483688f..d7e2d65 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -280,9 +280,9 @@ if (project.getProperty('storage-schema')) { if (project.getProperty('db') == 'dev') { self.log('PERFORMING STORAGE NODE SETUP TO LATEST SCHEMA') - username = project.getProperty('rhq.dev.cassandra.username') ?: "cassandra" - password = project.getProperty('rhq.dev.cassandra.password') ?: "cassandra" - seeds = project.getProperty('rhq.dev.cassandra.seeds') ?: "127.0.0.1|7199|9142" + username = project.getProperty('rhq.dev.cassandra.username') ?: "rhqadmin" + password = project.getProperty('rhq.dev.cassandra.password') ?: "rhqadmin" + seeds = project.getProperty('rhq.dev.cassandra.seeds') ?: "127.0.0.1|7299|9142" schemaManager = new SchemaManager(username, password, seeds) commit a3f58e21fe5e48819fa89c12e2d6ffb66dab08d4 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jul 31 17:09:02 2013 -0400 Fix issue when using -Ditest.use-external-storage-node diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java index a86c49e..6001450 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java @@ -26,7 +26,6 @@ package org.rhq.cassandra.ccm.arquillian; import java.io.File; -import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; @@ -115,7 +114,7 @@ public class CCMSuiteDeploymentExtension implements LoadableExtension { SchemaManager schemaManager; ClusterInitService clusterInitService = new ClusterInitService(); - List<StorageNode> nodes = Collections.emptyList(); + List<StorageNode> nodes = null; if (!Boolean.valueOf(System.getProperty("itest.use-external-storage-node", "false"))) { @@ -148,7 +147,7 @@ public class CCMSuiteDeploymentExtension implements LoadableExtension { } } else { try { - String seed = System.getProperty("rhq.cassandra.seeds", "127.0.0.1|7199|9042"); + String seed = System.getProperty("rhq.cassandra.seeds", "127.0.0.1|7299|9042"); schemaManager = new SchemaManager("rhqadmin", "rhqadmin", seed); } catch (Exception e) { commit 2355432987c8498e90cb0002f21079b1bc37300c Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 31 13:36:33 2013 -0400 fix check for determining whether or not read repair is needed when adding nodes diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index ee0f406..1c96e27 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -866,19 +866,21 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN List<StorageNode> storageNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, StorageNode.class).setParameter("operationMode", OperationMode.NORMAL).getResultList(); - int clusterSize = storageNodes.size(); + // The previous cluster size will be the current size - 1 since we currently only + // support deploying one node at a time. + int previousClusterSize = storageNodes.size() - 1; boolean isReadRepairNeeded; - if (clusterSize >= 4) { + if (previousClusterSize >= 4) { // At 4 nodes we increase the RF to 3. We are not increasing the RF beyond // that for additional nodes; so, there is no need to run repair if we are // expanding from a 4 node cluster since the RF remains the same. isReadRepairNeeded = false; - } else if (clusterSize == 1) { + } else if (previousClusterSize == 1) { // The RF will increase since we are going from a single to a multi-node // cluster; therefore, we want to run repair. isReadRepairNeeded = true; - } else if (clusterSize == 2) { + } else if (previousClusterSize == 2) { if (storageNodes.size() > 3) { // If we go from 2 to > 3 nodes we will increase the RF to 3; therefore // we want to run repair. @@ -888,7 +890,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN // to run repair. isReadRepairNeeded = false; } - } else if (clusterSize == 3) { + } else if (previousClusterSize == 3) { // We are increasing the cluster size > 3 which means the RF will be // updated to 3; therefore, we want to run repair. isReadRepairNeeded = true; commit c1963ab6528a823f547814b8d0a574ce4552b15a Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 30 16:41:18 2013 -0400 update itest diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties index 774a831..588fb3d 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties @@ -13,7 +13,7 @@ heap_new=-Xmn${HEAP_NEWSIZE} heap_dump_on_OOMError="-XX:+HeapDumpOnOutOfMemoryError" -heap_dump_dir="" +heap_dump_dir= thread_stack_size=-Xss180k commit 6c7eeff519bdecacf17a3ccced43e7815e5d5dbe Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Jul 31 11:05:43 2013 -0400 i)ensure jdk 6+ versions and ii)reuse userDN between the steps. diff --git a/modules/helpers/ldap-tool/pom.xml b/modules/helpers/ldap-tool/pom.xml index 770f22c..91416d5 100644 --- a/modules/helpers/ldap-tool/pom.xml +++ b/modules/helpers/ldap-tool/pom.xml @@ -60,6 +60,16 @@ </execution> </executions> </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> <plugin> <artifactId>maven-release-plugin</artifactId> diff --git a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java index 89b0698..bc322ab 100644 --- a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java +++ b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java @@ -57,10 +57,10 @@ import javax.swing.border.TitledBorder; * LDAP calls during auth/authz operations. * * The specific LDAP logic below needs to mirror the latest RHQ code and allow the user - * to test our their configuration without requring a specific RHQ/JON build as a dependency. + * to test our their configuration without requiring a specific RHQ/JON build as a dependency. * * NOTE: To avoid a runtime dependency on specific versions of RHQ or JON, the small implementation - * methods were copied into this class with minimatl changes for logging and ui messaging. The + * methods were copied into this class with minimal changes for logging and ui messaging. The * definitive implementation for each 'copied' method can be found in LDAPGroupManagerBean. * * @author Simeon Pinder @@ -85,6 +85,7 @@ public class TestLdapSettings extends JFrame { private JMenuBar menuBar; private String advdb = "**Verbose:debug ----"; private static final String BASEDN_DELIMITER = ";"; + private String userDN; private static final long serialVersionUID = 1L; int textBoxWidth = 20; @@ -419,7 +420,7 @@ public class TestLdapSettings extends JFrame { } // testing a valid user involves a filtered ldap search // using the loginProperty, and optionally searchFilter - String userDN = ""; + userDN = ""; if (proceed) { // default loginProperty to cn if it's not set if (loginProperty.isEmpty()) { @@ -895,9 +896,8 @@ public class TestLdapSettings extends JFrame { // Load any search filter String groupSearchFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); String groupMemberFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_MEMBER.getInternalName()); - String userDn = (String) systemConfig.get(Context.SECURITY_PRINCIPAL); - String testUserDN = userDn; + String testUserDN = userDN; String ldapServer = (String) systemConfig.get(Context.PROVIDER_URL); Properties env = getProperties(ldapServer); commit a29233274b8c623dc83073e97fb8a7a079ded87d Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Jul 31 07:02:29 2013 -0400 i)Fix issue with authz validation in TestLdapSettings ii)Remove old TestLdapSettings source. diff --git a/etc/dev-utils/TestLdapSettings.java b/etc/dev-utils/TestLdapSettings.java deleted file mode 100644 index 2e29b3d..0000000 --- a/etc/dev-utils/TestLdapSettings.java +++ /dev/null @@ -1,738 +0,0 @@ -package com.test; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import javax.naming.CompositeName; -import javax.naming.Context; -import javax.naming.NamingEnumeration; -import javax.naming.directory.Attribute; -import javax.naming.directory.Attributes; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; -import javax.naming.ldap.InitialLdapContext; -import javax.swing.Box; -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.JTextField; -import javax.swing.border.LineBorder; -import javax.swing.border.TitledBorder; - -//import org.rhq.enterprise.server.util.security.UntrustedSSLSocketFactory; - -/* Is a development test tool that allows the user to simulate the RHQ server side - * LDAP calls during auth/authz operations. - * - * @author Simeon Pinder - */ -public class TestLdapSettings extends JFrame { - //shared fields - private JTextArea testResults; - private JCheckBox ssl; - private JTextField testUserNameValue; - private JTextField testUserPasswordValue; - private HashMap<String, JTextField> fieldMappings; - private String[] keys; - private JCheckBox enableLdapReferral; - private JCheckBox enableVerboseDebugging; - private JCheckBox enableVerboseGroupParsing; - private String advdb = "**Verbose:debug ----"; - - private static final long serialVersionUID = 1L; - int textBoxWidth = 20; - - public static void main(String args[]) { - new TestLdapSettings(); - } - - // Configure window properties - private TestLdapSettings() { - - setTitle("Check LDAP Settings: Simulates LDAP checks/queries of RHQ LDAP integration"); - getContentPane().setLayout(new BorderLayout()); - // top panel definition - JPanel top = new JPanel(); - top.setLayout(new BoxLayout(top, BoxLayout.Y_AXIS)); - top.setBorder(LineBorder.createGrayLineBorder()); - keys = new String[] { "URL:", "Search Filter:", - "Search Base:","Login Property", - "Username:", "Group Search Filter:", - "Password:", "Group Member Filter:", - }; - fieldMappings = loadUiFields(top, keys); - - //add the two checkboxes for additiona debugging options - enableLdapReferral= new JCheckBox("[follow] ldap referrals"); - enableLdapReferral.setSelected(false); - enableVerboseDebugging= new JCheckBox("more verbose logging"); - enableVerboseDebugging.setSelected(false); - enableVerboseGroupParsing= new JCheckBox("more detailed group parsing"); - enableVerboseGroupParsing.setSelected(false); - //put into row display - JPanel advancedDebugRegion = new JPanel(); - advancedDebugRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); - LineBorder advancedBorder = new LineBorder(Color.BLACK, 2); - TitledBorder debugBorder = new TitledBorder(advancedBorder, "Debug:"); - advancedDebugRegion.setBorder(debugBorder); - advancedDebugRegion.add(enableLdapReferral); - advancedDebugRegion.add(enableVerboseDebugging); - advancedDebugRegion.add(enableVerboseGroupParsing); - top.add(advancedDebugRegion); - - ssl = new JCheckBox("SSL:"); - ssl.setEnabled(false); - top.add(ssl); - // test user auth region - JPanel testUserRegion = new JPanel(); - testUserRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); - LineBorder border = new LineBorder(Color.BLUE, 2); - TitledBorder tBorder = new TitledBorder(border, "Authentication/Authorization Check Credentials: (insert valid ldap user assigned to group)"); - testUserRegion.setBorder(tBorder); - JLabel testUserName = new JLabel("Test UserName:"); - testUserNameValue = new JTextField(textBoxWidth); - JLabel testUserPassword = new JLabel("Test Password:"); - testUserPasswordValue = new JTextField(textBoxWidth); - testUserRegion.add(testUserName); - testUserRegion.add(testUserNameValue); - testUserRegion.add(testUserPassword); - testUserRegion.add(testUserPasswordValue); - top.add(testUserRegion); - - // center - JPanel center = new JPanel(); - center.setLayout(new BoxLayout(center, BoxLayout.X_AXIS)); - // build center panel - buildCenterPanel(center); - - // final component layout - getContentPane().add(top, BorderLayout.NORTH); - getContentPane().add(center, BorderLayout.CENTER); - this.setSize(720, 700); - addWindowListener(new WindowAdapter() { - public void windowClosing(WindowEvent e) { - System.exit(0); - } - }); - setVisible(true); - } - - // define the center display panel. - private void buildCenterPanel(JPanel center) { - // First element is Test Button - JButton test = new JButton("Test Settings"); - center.add(test); - // second is large text box that display ldap queries - testResults = new JTextArea("(click button to test settings values: simulates 4 separate checks showing ldap filters used)", - 40, 40); - JScrollPane jsp = new JScrollPane(testResults); - center.add(jsp); - test.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - testResults.setText("");//clear out empty msg - //trim spaces from all fields - String ldapServer = fieldMappings.get(keys[0]).getText().trim(); - String searchFilter = fieldMappings.get(keys[1]).getText().trim(); - String searchBase = fieldMappings.get(keys[2]).getText().trim(); - String loginProperty = fieldMappings.get(keys[3]).getText().trim(); - String bindUserName = fieldMappings.get(keys[4]).getText().trim(); - String groupSearchFilter = fieldMappings.get(keys[5]).getText().trim(); - String bindPassword = fieldMappings.get(keys[6]).getText().trim(); - String groupMemberFilter = fieldMappings.get(keys[7]).getText().trim(); - String testUserName = testUserNameValue.getText().trim(); - String testUserPassword = testUserPasswordValue.getText().trim(); - // validate initial required elements - String msg = null; - boolean proceed = true; - //valid required details set. - if (ldapServer.isEmpty() || bindUserName.isEmpty() - || bindPassword.isEmpty() || searchBase.isEmpty()) { - msg ="STEP-1:FAIL: "+ keys[0] + ", " + keys[2] + ", " + keys[4] + ", " - + keys[6] + " cannot be empty to proceed."; - log(msg); - proceed = false; - } - Properties env; - InitialLdapContext ctx = null; - if (proceed) {// attempt initial ldap bind from RHQ server - msg = "STEP-1:TESTING: Attempting to bind to server:" + ldapServer - + "\n with user '" + bindUserName - + "' and password entered."; - log(msg); - env = getProperties(ldapServer); - env.setProperty(Context.SECURITY_PRINCIPAL, bindUserName); - env.setProperty(Context.SECURITY_CREDENTIALS, bindPassword); - env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); - try { - ctx = new InitialLdapContext(env, null); - msg = "STEP-1:PASS: LDAP bind credentials are correct. Successfully connected to '" - + ldapServer - + "'.\n This means the LDAP Bind credentials for the RHQ Server authentication/authorization requests to ldap server " - + "are correct."; - if(enableVerboseDebugging.isSelected()){ - msg+="\n"+advdb+" LDAP simple authentication bind successful."; - } - log(msg); - proceed = true; - } catch (Exception ex) { - msg = "STEP-1:FAIL: Unable to connect to the LDAP server with credentials specified.\n"; - msg+="Exception:"+ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - proceed = false; - } - } - if (proceed) {// retrieve test credentials to test run auth - // load search controls - SearchControls searchControls = getSearchControls(); - // validating searchFilter and test user/pass creds - proceed = true; - if (testUserName.isEmpty() || (testUserPassword.isEmpty())) { - msg = "STEP-2:FAIL: Test Username/Password fields cannot be empty for this step."; - log(msg); - proceed = false; - } - // testing a valid user involves a filtered ldap search - // using the loginProperty, and optionally searchFilter - String userDN = ""; - if (proceed) { - // default loginProperty to cn if it's not set - if (loginProperty.isEmpty()) { - loginProperty = "cn"; - if(enableVerboseDebugging.isSelected()){ - String mesg = "As you have not specified a login property, defaulting to 'cn'"; - log(advdb+" "+msg); - } - } - String filter; - if (!searchFilter.isEmpty()) { - filter = "(&(" + loginProperty + "=" + testUserName - + ")" + "(" + searchFilter + "))"; - } else { - filter = "(" + loginProperty + "=" + testUserName - + ")"; - } - if(enableVerboseDebugging.isSelected()){ - log(advdb+" The searchfilter is optionally appended to login property for additional shared attribute across users."); - } - msg = "STEP-2:TESTING: To validate the test user the following LDAP filtered component will be used to find matching users:\n"; - msg += filter; - log(msg); - // test out the search on the target ldap server - try { - String[] baseDNs = searchBase.split(";"); - for (int x = 0; x < baseDNs.length; x++) { - NamingEnumeration answer = ctx.search( - baseDNs[x], filter, searchControls); - if(enableVerboseDebugging.isSelected()){ - log(advdb+" this search was excuted against DN component '"+baseDNs[x]+"'."); - } - // boolean ldapApiNpeFound = false; - if (!answer.hasMoreElements()) { - msg="STEP-2:WARN Unable to locate a matching users for the filter'"+filter+ - "'. Please check your loginProperty. Usually 'cn' or 'uid'"; - log(msg); - continue; - } - // Going with the first match - SearchResult si = (SearchResult) answer.next(); - - // Construct the UserDN - userDN = null; - - try { - userDN = si.getNameInNamespace(); - } catch (UnsupportedOperationException use) { - userDN = new CompositeName(si.getName()).get(0); - if (si.isRelative()) { - userDN += "," + baseDNs[x]; - } - } - - msg = "STEP-2:PASS: The test user '" - + testUserName - + "' was succesfully located, and the following userDN will be used in authorization check:\n"; - msg += userDN; - log(msg); - - ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, userDN); - ctx.addToEnvironment(Context.SECURITY_CREDENTIALS,testUserPassword); - ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION,"simple"); - - // if successful then verified that user and pw - // are valid ldap credentials - ctx.reconnect(null); - msg = "STEP-2:PASS: The user '" - + testUserName - + "' was succesfully authenticated using userDN '" - + userDN + "' and password provided.\n" - +"*Note: the loginProperty must match the loginProperty listed in dn: for the user. It is the DN that RHQ will lookup and use."; - log(msg); - } - } catch (Exception ex) { - msg = "STEP-2:FAIL: There was an error while searching for or authenticating the user '" - + testUserName + "'\n"; - msg += ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - proceed=false; - } - try { - ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, bindUserName); - ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, bindPassword); - ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION, "simple"); - ctx.reconnect(null); - } catch (Exception ex) { - msg = "STEP-2:WARN: There was an error when switching back to the bind user '" - + bindUserName + "'\n"; - msg += ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - } - - } - // with authentication completed, now check authorization. - // validate filter components to list all available groups - proceed = false; - if (!groupSearchFilter.isEmpty()) { - Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); - String filter = String - .format("(%s)", groupSearchFilter); - msg = "STEP-3:TESTING: This ldap filter " - + filter - + " will be used to locate ALL available LDAP groups"; - log(msg); - try { - String[] baseDNs = searchBase.split(";"); - for (int x = 0; x < baseDNs.length; x++) { - if(enableVerboseDebugging.isSelected()){ - log(advdb+" this search was excuted against DN component '"+baseDNs[x]+"'."); - } - NamingEnumeration answer = ctx.search( - baseDNs[x], filter, searchControls); - - if(enableVerboseGroupParsing.isSelected()){//in this mode report initial state of Enumeration results - log(advdb+" LDAP Group Search/Enumeration found "+((answer.hasMore())? " SOME ":" NO ")+" matching group(s)."); - } - - boolean ldapApiEnumerationBugEncountered = false; - while ((!ldapApiEnumerationBugEncountered) - && answer.hasMoreElements()) { - // We use the first match - SearchResult si = null; - try { - si = (SearchResult) answer.next(); - } catch (NullPointerException npe) { - if(enableVerboseDebugging.isSelected()){ - log(advdb+" NullPtr exception detected. If known LDAP api enum npe ignore: "+npe.getMessage()+"."); - } - ldapApiEnumerationBugEncountered = true; - break; - } - Map<String, String> entry = new HashMap<String, String>(); - if(enableVerboseDebugging.isSelected()||enableVerboseGroupParsing.isSelected()){ - Attributes attributeContainer = si.getAttributes(); - NamingEnumeration<? extends Attribute> attributes = attributeContainer.getAll(); - String attributesReturned = " "; - while(attributes.hasMore()){ - attributesReturned+=attributes.next().getID()+","; - } - String dbugMesg="\n"+advdb+" Group search LDAP ("+attributeContainer.size()+") attributes located for group '"+si.getName()+"' are ["+ - attributesReturned.substring(0, attributesReturned.length()-1)+"]."; - //directly update here to shorten messages for lots of groups - testResults.setText(testResults.getText() + dbugMesg); - - //additionally parse attribute ids and values for illegal ldap characters - if(enableVerboseGroupParsing.isSelected()){ - attributes = attributeContainer.getAll(); - String currentAttributeId =""; - String currentValue =""; - //spinder: 3/17/11: should we bail on first bad data or display them all? - while(attributes.hasMore()){ - boolean badData = false; - Attribute att = attributes.next(); - currentAttributeId =att.getID(); - if(containsIllegalLdap(currentAttributeId)){ - log(advdb+" LDAP Group: bad atrribute data detected for group '"+si.getName()+"' for attribute '"+currentAttributeId+"'."); - badData=true; - } - if(att.getAll()!=null){ - NamingEnumeration<?> enumer = att.getAll(); - while(enumer.hasMore()){ - currentValue = enumer.next()+""; - if(containsIllegalLdap(currentValue)){ - log(advdb+" LDAP Group: bad data detected for group '"+si.getName()+"' with attribute '"+currentAttributeId+"' and value:"+currentValue); - badData=true; - } - } - } - if(badData){ - log(advdb+"** LDAP Group: Some bad LDAP data detected for group '"+si.getName()+"'."); - } - } - } - } - - Attribute commonNameAttr = si.getAttributes() - .get("cn"); - if(commonNameAttr!=null){ - String name = (String) commonNameAttr.get(); - name = name.trim(); - Attribute desc = si.getAttributes().get( - "description"); - String description = desc != null ? (String) desc - .get() - : ""; - description = description.trim(); - entry.put("id", name); - entry.put("name", name); - entry.put("description", description); - ret.add(entry); - }else{//unable to retrieve details for specific group. - log(advdb+" There was an error retrieving 'cn' attribute for group '"+si.getName()+"'. Not adding to returned list of groups. "); - } - } - } - msg = "STEP-3:TESTING: Using Group Search Filter '" + filter - + "', " + ret.size() - + " ldap group(s) were located.\n"; - if (ret.size() > 0) { - HashMap<String, String>[] ldapLists = new HashMap[ret.size()]; - ret.toArray(ldapLists); - if(enableVerboseGroupParsing.isSelected()){//in this mode go beyond the first ten results. - msg += "STEP-3:PASS: Listing 'all' of the ldap groups located: \n"; - for (int i = 0; i < ret.size(); i++) { - msg += ldapLists[i] + "\n"; - } - }else{//otherwise only show first 10[subset of available groups] - msg += "STEP-3:PASS: Listing a few(<=10) of the ldap groups located: \n"; - for (int i = 0; (i < ret.size() && i < 10); i++) { - msg += ldapLists[i] + "\n"; - } - } - proceed = true;// then can proceed to next step. - } - log(msg); - } catch (Exception ex) { - msg = "STEP-3:FAIL: There was an error searching with the groupFilter supplied: " - + groupSearchFilter + "'\n"; - msg += ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - proceed=false; - } - } else { - msg = "STEP-3:FAIL: Group Search Filter: cannot be empty to proceed."; - log(msg); - proceed=false; - } - // retrieve lists of authorized groups available for the - if (proceed) { - // check groupMember - if (!groupMemberFilter.isEmpty()) { - Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); - String filter = String.format("(&(%s)(%s=%s))", - groupSearchFilter, groupMemberFilter, - LDAPStringUtil.encodeForFilter(userDN)); - msg = "STEP-4:TESTING: about to do ldap search with filter \n'" - + filter - + "'\n to locate groups that test user IS authorized to access."; - log(msg); - try { - String[] baseDNs = searchBase.split(";"); - for (int x = 0; x < baseDNs.length; x++) { - NamingEnumeration answer = ctx.search( - baseDNs[x], filter, searchControls); - boolean ldapApiEnumerationBugEncountered = false; - //BZ:582471- ldap api bug change - while ((!ldapApiEnumerationBugEncountered) - && answer.hasMoreElements()) { - // We use the first match - SearchResult si = null; - try { - si = (SearchResult) answer.next(); - } catch (NullPointerException npe) { - ldapApiEnumerationBugEncountered = true; - break; - } - Map<String, String> entry = new HashMap<String, String>(); - String name = (String) si - .getAttributes().get("cn") - .get(); - name = name.trim(); - Attribute desc = si.getAttributes() - .get("description"); - String description = desc != null ? (String) desc - .get() - : ""; - description = description.trim(); - entry.put("id", name); - entry.put("name", name); - entry.put("description", description); - ret.add(entry); - } - } - msg = "STEP-4:TESTING: Using Group Search Filter '" - + filter + "', " + ret.size() - + " ldap group(s) were located.\n"; - if (ret.size() > 0) { - HashMap<String, String>[] ldapLists = new HashMap[ret - .size()]; - ret.toArray(ldapLists); - msg += "STEP-4:PASS: Listing a few of the ldap groups located: \n"; - // iterate over first ten or less to demonstrate retrieve - for (int i = 0; (i < ret.size() && i < 10); i++) { - msg += ldapLists[i] + "\n"; - } - proceed = true;// then can proceed to next - // step. - }else{ - msg+="STEP-4:WARN: With current settings, test user is not authorized for any groups. Is this correct?"; - } - log(msg); - } catch (Exception ex) { - msg = "STEP-4:FAIL: There was an error searching with the groupFilter supplied: " - + groupSearchFilter + "'\n"; - msg += ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - proceed=false; - } - - } else { - msg = "STEP-4:FAIL: Group Member Filter must be non-empty to proceed with simulating authorization check for test user."; - log(msg); - } - } - if(proceed){ - msg="COMPLETED:PASS: The current settings, for successful steps, should be correct to enter into your RHQ server."; - msg+="\n\n\n\n When you encounter failures, warnings or other unexpected results you should use an external "; - msg+="LDAP search utility to check that the generated filters return the expected LDAP results."; - log(msg); - } - } - } - - private boolean containsIllegalLdap(String currentValue) { - boolean invalidData = false; - if((currentValue!=null)&&(!currentValue.trim().isEmpty())){ - //TODO: spinder 3/17/11: need to figure out regex to filter/detect bad data in returned ldap. Giving up for now. -// String regex = "(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)[/,+\"><;=#]|(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)\$?!\\|[/,+\"><;=#]| $|(?<=^\$ )|^"; -// regex = "(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)[/,+\\\"><;=#]|(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)\\\$?!\\\\|[/,+\\\"><;=#]| $|(?<=^\\\$ )|^"; -// System.out.println("++++++++ CURR VAL:"+currentValue+":INV-CHeck:"+currentValue.matches(",+\"\\<;\n=/")+":NEWCHECK:"+(currentValue.matches(regex))); -// if(currentValue.matches(",+\"\\<;\n=/")){ -// invalidData=true; -// } -// String badList = ",+\"\\<;\n="; - String badList = "+\"\\<;\n"; - for(char car :currentValue.toCharArray()){ - for(char c :badList.toCharArray()){ - if(car == c){ - invalidData=true; - } - } - } - - } - return invalidData; - } - - private String appendStacktraceToMsg(String msg, Exception ex) { - String moreVerbose = ""; - moreVerbose+=advdb+" Exception type:"+ex.getClass()+"\n"; - moreVerbose+=advdb+" Exception stack trace reference:"+ex.getStackTrace()+"\n"; - if(ex.getStackTrace()!=null){ - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - ex.printStackTrace(pw); - moreVerbose+=advdb+" stack trace reference:"+sw.toString(); - } - msg+="\n"+moreVerbose; - return msg; - } - }); - } - - // throw the label and fields together, two to a row. - private HashMap<String, JTextField> loadUiFields(JPanel top, - String[] componentKeys) { - HashMap<String, JTextField> mappings = new HashMap<String, JTextField>(); - for (int i = 0; i < componentKeys.length; i++) { - String firstLabelKey = componentKeys[i]; - String secondLabelKey = componentKeys[++i]; - // locate second key - JPanel row = new JPanel(); - row.setLayout(new FlowLayout(FlowLayout.LEFT)); - JLabel label1 = new JLabel(firstLabelKey); - label1.setSize(textBoxWidth, 5); - JTextField value1 = new JTextField(textBoxWidth); - JLabel label2 = new JLabel(secondLabelKey); - JTextField value2 = new JTextField(textBoxWidth); - row.add(label1); - row.add(value1); - row.add(Box.createRigidArea(new Dimension(0, 5))); - row.add(label2); - row.add(value2); - mappings.put(firstLabelKey, value1); - mappings.put(secondLabelKey, value2); - top.add(row); - } - - return mappings; - } - - private Properties getProperties(String contentProvider) { - Properties env = new Properties(); - env.setProperty(Context.INITIAL_CONTEXT_FACTORY, - "com.sun.jndi.ldap.LdapCtxFactory"); - env.setProperty(Context.PROVIDER_URL, contentProvider); - if(!enableLdapReferral.isSelected()){ - env.setProperty(Context.REFERRAL, "ignore"); - }else{ - String msg="**---- You have chosen to tell LDAP servers to [FOLLOW] context referrals. Default is [IGNORE] referrals. --**"; - log(msg); - env.setProperty(Context.REFERRAL, "follow"); - } - -// // Setup SSL if requested -// String protocol = ssl.isSelected()? "ssl":""; -// if ((protocol != null) && protocol.equals("ssl")) { -// String ldapSocketFactory = env -// .getProperty("java.naming.ldap.factory.socket"); -// if (ldapSocketFactory == null) { -// env.put("java.naming.ldap.factory.socket", -// UntrustedSSLSocketFactory.class.getName()); -// } -// env.put(Context.SECURITY_PROTOCOL, "ssl"); -// } - - return env; - } - - private String delineate() { - String line = "-"; - for (int i = 0; i < 30; i++) { - line += "-"; - } - return line; - } - - private void log(String msg) { - String message = "\n" + delineate() + "\n"; - message += msg; - message += "\n" + delineate() + "\n\n"; - testResults.setText(testResults.getText() + message); - } - - private SearchControls getSearchControls() { - int scope = SearchControls.SUBTREE_SCOPE; - int timeLimit = 0; - long countLimit = 0; - String[] returnedAttributes = null; - boolean returnObject = false; - boolean deference = false; - SearchControls constraints = new SearchControls(scope, countLimit, - timeLimit, returnedAttributes, returnObject, deference); - return constraints; - } -} - -class LDAPStringUtil { - - /** - * <p>Encode a string so that it can be used in an LDAP search filter.</p> - * - * <p>The following table shows the characters that are encoded and their - * encoded version.</p> - * - * <table> - * <tr><th align="center">Character</th><th>Encoded As</th></tr> - * <tr><td align="center">*</td><td>\2a</td></tr> - * <tr><td align="center">(</td><td>\28</td></tr> - * <tr><td align="center">)</td><td>\29</td></tr> - * <tr><td align="center">\</td><td>\5c</td></tr> - * <tr><td align="center"><code>null</code></td><td>\00</td></tr> - * </table> - * - * <p>In addition to encoding the above characters, any non-ASCII character - * (any character with a hex value greater then <code>0x7f</code>) is also - * encoded and rewritten as a UTF-8 character or sequence of characters in - * hex notation.</p> - * - * @param filterString a string that is to be encoded - * @return the encoded version of <code>filterString</code> suitable for use - * in a LDAP search filter - * @see <a href="http://tools.ietf.org/html/rfc4515">RFC 4515</a> - */ - public static String encodeForFilter(final String filterString) { - if (filterString != null && filterString.length() > 0) { - StringBuilder encString = new StringBuilder(filterString.length()); - for (int i = 0; i < filterString.length(); i++) { - char ch = filterString.charAt(i); - switch (ch) { - case '*': // encode a wildcard * character - encString.append("\\2a"); - break; - case '(': // encode a open parenthesis ( character - encString.append("\\28"); - break; - case ')': // encode a close parenthesis ) character - encString.append("\\29"); - break; - case '\\': // encode a backslash \ character - encString.append("\\5c"); - break; - case '\u0000': // encode a null character - encString.append("\\00"); - break; - default: - if (ch <= 0x7f) { // an ASCII character - encString.append(ch); - } else if (ch >= 0x80) { // encode to UTF-8 - try { - byte[] utf8bytes = String.valueOf(ch).getBytes("UTF8"); - for (byte b : utf8bytes) { - encString.append(String.format("\\%02x", b)); - } - } catch (UnsupportedEncodingException e) { - // ignore - } - } - } - } - return encString.toString(); - } - return filterString; - } - -} - diff --git a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java index f3aee15..89b0698 100644 --- a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java +++ b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java @@ -895,7 +895,9 @@ public class TestLdapSettings extends JFrame { // Load any search filter String groupSearchFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); String groupMemberFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_MEMBER.getInternalName()); - String testUserDN=userName; + String userDn = (String) systemConfig.get(Context.SECURITY_PRINCIPAL); + + String testUserDN = userDn; String ldapServer = (String) systemConfig.get(Context.PROVIDER_URL); Properties env = getProperties(ldapServer); commit 71cff59023452b91967370821cfa6aeee5a049d6 Author: Simeon Pinder <spinder(a)redhat.com> Date: Tue Jul 30 19:07:57 2013 -0400 Make warning to users more prominent and accessible. diff --git a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java index b9667ea..f3aee15 100644 --- a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java +++ b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java @@ -39,6 +39,9 @@ import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JFrame; import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; import javax.swing.JPanel; import javax.swing.JPasswordField; import javax.swing.JScrollPane; @@ -79,6 +82,7 @@ public class TestLdapSettings extends JFrame { private JCheckBox iterativeVerboseLogging; private JCheckBox enablePosixGroups; private JCheckBox enable32xFeatures; + private JMenuBar menuBar; private String advdb = "**Verbose:debug ----"; private static final String BASEDN_DELIMITER = ";"; @@ -95,10 +99,10 @@ public class TestLdapSettings extends JFrame { final String warnMessage = "<html>***WARNING: Depending upon<br>" + "i)how the ldap server is configured <br>" + "ii)client query paging settings <br>" + - " enabling <b>'more detailed logging'</b>,<br>" + - " <b>'more group parsing'</b> AND/OR <b>'also log to console'</b> may cause the console to hang/freeze <br>" + + " enabling <b>'more verbose logging'</b>,<br>" + + " <b>'more detailed group parsing'</b> AND/OR <b>'also log to console'</b> may cause the console to hang/freeze <br>" + " as the LDAP tool continues to parse large query results. If that occurs it is <br>" + - " suggested that you kill tool and re-run with 'also log to console' so that the console logs<br>" + + " suggested that you stop this tool and re-run your queries with <b>'also log to console'</b> so that the console logs<br>" + " will show which dataset is causing the delay and then you should modify your search|group|member<br>" + " filters accordingly to <b>return smaller results</b> and/or <b>consume larger payloads</b>.<br>" + "***WARNING</html>"; @@ -108,6 +112,12 @@ public class TestLdapSettings extends JFrame { setTitle("Check LDAP Settings: Simulates LDAP checks/queries of RHQ LDAP integration"); getContentPane().setLayout(new BorderLayout()); + menuBar = new JMenuBar(); + JMenu menu = new JMenu("View ***Warning"); + JMenuItem menuItem = new JMenuItem(warnMessage); + menu.add(menuItem); + menuBar.add(menu); + setJMenuBar(menuBar); // top panel definition top = new JPanel(); top.setLayout(new BoxLayout(top, BoxLayout.Y_AXIS)); commit 6363bfd5135c7444aa0798509bb53e6948b1b573 Author: Simeon Pinder <spinder(a)redhat.com> Date: Tue Jul 30 17:27:46 2013 -0400 Move under org.rhq like other components. diff --git a/.classpath b/.classpath index e5e7a21..386316a 100644 --- a/.classpath +++ b/.classpath @@ -215,6 +215,7 @@ <classpathentry kind="src" path="modules/plugins/rhq-storage/src/main/java"/> <classpathentry kind="src" path="modules/enterprise/server/data-migration/src/main/java"/> <classpathentry kind="src" path="modules/enterprise/server/data-migration/src/test/java"/> + <classpathentry kind="src" path="modules/helpers/ldap-tool/src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.2.3/httpclient-4.2.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.2.3/httpclient-4.2.3-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/commons-io/commons-io/2.1/commons-io-2.1.jar" sourcepath="M2_REPO/commons-io/commons-io/2.1/commons-io-2.1-sources.jar"/> diff --git a/modules/helpers/ldap-tool/pom.xml b/modules/helpers/ldap-tool/pom.xml index 28f8678..770f22c 100644 --- a/modules/helpers/ldap-tool/pom.xml +++ b/modules/helpers/ldap-tool/pom.xml @@ -19,6 +19,7 @@ <properties> <executable.name>TestLdapSettings</executable.name> <tool.version>1.0.1</tool.version> + <test.package>org.rhq</test.package> </properties> <name>RHQ ldap test tool</name> @@ -33,8 +34,8 @@ <configuration> <archive> <manifest> - <packageName>com.test</packageName> - <mainClass>com.test.TestLdapSettings</mainClass> + <packageName>${test.package}</packageName> + <mainClass>${test.package}.TestLdapSettings</mainClass> </manifest> </archive> </configuration> diff --git a/modules/helpers/ldap-tool/src/main/java/com/test/TestLdapSettings.java b/modules/helpers/ldap-tool/src/main/java/com/test/TestLdapSettings.java deleted file mode 100644 index 75ff277..0000000 --- a/modules/helpers/ldap-tool/src/main/java/com/test/TestLdapSettings.java +++ /dev/null @@ -1,1285 +0,0 @@ -package com.test; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import javax.naming.Context; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attribute; -import javax.naming.directory.Attributes; -import javax.naming.directory.InvalidSearchFilterException; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; -import javax.naming.ldap.Control; -import javax.naming.ldap.InitialLdapContext; -import javax.naming.ldap.PagedResultsControl; -import javax.naming.ldap.PagedResultsResponseControl; -import javax.swing.Box; -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JPasswordField; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.JTextField; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.LineBorder; -import javax.swing.border.TitledBorder; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - -//import org.rhq.enterprise.server.util.security.UntrustedSSLSocketFactory; - -/* Is a development test tool that allows the user to simulate the RHQ server side - * LDAP calls during auth/authz operations. - * - * The specific LDAP logic below needs to mirror the latest RHQ code and allow the user - * to test our their configuration without requring a specific RHQ/JON build as a dependency. - * - * NOTE: To avoid a runtime dependency on specific versions of RHQ or JON, the small implementation - * methods were copied into this class with minimatl changes for logging and ui messaging. The - * definitive implementation for each 'copied' method can be found in LDAPGroupManagerBean. - * - * @author Simeon Pinder - */ -public class TestLdapSettings extends JFrame { - //shared fields - private JTextArea testResults; - private JCheckBox showPasswords; - private JCheckBox ssl; - private JLabel groupPageSizeName; - private JTextField groupMemberQueryValue; - private JTextField testUserNameValue; - private JTextField testUserPasswordValue; - private HashMap<String, JTextField> fieldMappings; - private String[] keys; - private JCheckBox enableLdapReferral; - private JCheckBox enableVerboseDebugging; - private JCheckBox enableVerboseGroupParsing; - private JCheckBox iterativeVerboseLogging; - private JCheckBox enablePosixGroups; - private JCheckBox enable32xFeatures; - private String advdb = "**Verbose:debug ----"; - private static final String BASEDN_DELIMITER = ";"; - - private static final long serialVersionUID = 1L; - int textBoxWidth = 20; - private static JPanel top = null; - private static JPanel testUserRegion = null; - private static Properties env=null; - - public static void main(String args[]) { - new TestLdapSettings(); - } - //After enabling support for Query parsing, we need to warn users of the effects. - final String warnMessage = "<html>***WARNING: Depending upon<br>" + - "i)how the ldap server is configured <br>" + - "ii)client query paging settings <br>" + - " enabling <b>'more detailed logging'</b>,<br>" + - " <b>'more group parsing'</b> AND/OR <b>'also log to console'</b> may cause the console to hang/freeze <br>" + - " as the LDAP tool continues to parse large query results. If that occurs it is <br>" + - " suggested that you kill tool and re-run with 'also log to console' so that the console logs<br>" + - " will show which dataset is causing the delay and then you should modify your search|group|member<br>" + - " filters accordingly to <b>return smaller results</b> and/or <b>consume larger payloads</b>.<br>" + - "***WARNING</html>"; - - // Configure window properties - private TestLdapSettings() { - - setTitle("Check LDAP Settings: Simulates LDAP checks/queries of RHQ LDAP integration"); - getContentPane().setLayout(new BorderLayout()); - // top panel definition - top = new JPanel(); - top.setLayout(new BoxLayout(top, BoxLayout.Y_AXIS)); - top.setBorder(LineBorder.createGrayLineBorder()); - //define checkbox here as it's checked when generating UI. - showPasswords = new JCheckBox("show passwords:"); - showPasswords.setSelected(false); - - keys = new String[] { "URL:", "Search Filter:", - "Search Base:","Login Property", - "Username:", "Group Search Filter:", - "Password:", "Group Member Filter:", - }; - fieldMappings = loadUiFields(top, keys); - - //add the two checkboxes for additiona debugging options - enableLdapReferral= new JCheckBox("[follow] ldap referrals"); - enableLdapReferral.setSelected(false); - enableVerboseDebugging= new JCheckBox("more verbose logging"); - enableVerboseDebugging.setSelected(false); - enableVerboseDebugging.setToolTipText(warnMessage); - enableVerboseGroupParsing= new JCheckBox("more detailed group parsing"); - enableVerboseGroupParsing.setSelected(false); - enableVerboseGroupParsing.setToolTipText("*Take care when using this mode with a large number of groups* Every group discovered is parsed/listed."); - iterativeVerboseLogging= new JCheckBox("also log to console"); - iterativeVerboseLogging.setSelected(false); - iterativeVerboseLogging.setToolTipText("This mode is useful when the test tool is having difficulty returning results from large queries."); - iterativeVerboseLogging.setToolTipText(warnMessage); - enablePosixGroups= new JCheckBox("is Posix Group"); - enablePosixGroups.setSelected(false); - enablePosixGroups.setEnabled(false); - - //put into 3.2.x functionality row - JPanel jon32xRegion = new JPanel(); - jon32xRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); - LineBorder jon32xLineBorder = new LineBorder(Color.BLACK, 2); - TitledBorder jon32xBorder = new TitledBorder(jon32xLineBorder, "JON 3.2.x/RHQ 4.8.x specific features:"); - jon32xRegion.setBorder(jon32xBorder); - enable32xFeatures= new JCheckBox("enable JON 3.2.x/RHQ 4.8.x features"); - enable32xFeatures.setToolTipText("This enables features not available before RHQ 4.8.x/JON 3.2.x."); - enable32xFeatures.setSelected(false); - enable32xFeatures.addItemListener(new ItemListener() { - @Override - public void itemStateChanged(ItemEvent e) { - if(enable32xFeatures.isSelected()){ - groupPageSizeName.setEnabled(true); - groupMemberQueryValue.setEnabled(true); - groupMemberQueryValue.setEditable(true); - groupMemberQueryValue.setText("1000"); - enablePosixGroups.setEnabled(true); - }else{ - groupMemberQueryValue.setText(""); - groupPageSizeName.setEnabled(false); - groupMemberQueryValue.setEnabled(false); - groupMemberQueryValue.setEditable(false); - enablePosixGroups.setEnabled(false); - enablePosixGroups.setSelected(false); - } - } - }); - - jon32xRegion.add(enable32xFeatures); - groupPageSizeName = new JLabel("Group Query Page Size:"); - groupPageSizeName.setEnabled(false); - groupMemberQueryValue = new JTextField(10); - groupMemberQueryValue.setText("1000"); - groupMemberQueryValue.setEditable(false); - jon32xRegion.add(groupPageSizeName); - jon32xRegion.add(groupMemberQueryValue); - jon32xRegion.add(enablePosixGroups); - top.add(jon32xRegion); - - //put into row display - JPanel advancedDebugRegion = new JPanel(); - advancedDebugRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); - LineBorder advancedBorder = new LineBorder(Color.BLACK, 2); - TitledBorder debugBorder = new TitledBorder(advancedBorder, "Debug: **Warning --<hover HERE>**"); - advancedDebugRegion.setBorder(debugBorder); - advancedDebugRegion.add(enableLdapReferral); - advancedDebugRegion.add(enableVerboseDebugging); - advancedDebugRegion.add(enableVerboseGroupParsing); - advancedDebugRegion.add(iterativeVerboseLogging); - advancedDebugRegion.setToolTipText(warnMessage); - top.add(advancedDebugRegion); - - JPanel securityPanel = new JPanel(); - securityPanel.setLayout(new FlowLayout(FlowLayout.LEFT)); - showPasswords.addItemListener(new ItemListener() { - @Override - public void itemStateChanged(ItemEvent e) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - //store off existing value - String existingValue = ""; - String existingTestUserPass = ""; - JTextField current = fieldMappings.get("Password:"); - if(current instanceof JPasswordField){ - JPasswordField pass = ((JPasswordField)current); - if(pass!=null){ - char[] charArray = pass.getPassword(); - if(charArray.length>0){ - existingValue = new String(charArray); - } - } - }else{ - existingValue = current.getText(); - } - //save off test user password as well - if(testUserPasswordValue instanceof JPasswordField){ - JPasswordField pass = ((JPasswordField)testUserPasswordValue); - if(pass!=null){ - char[] charArray = pass.getPassword(); - if(charArray.length>0){ - existingTestUserPass = new String(charArray); - } - } - }else{ - existingTestUserPass=testUserPasswordValue.getText(); - } - - JTextField updatedContainer = null; - if(showPasswords.isSelected()){ - updatedContainer = new JTextField(textBoxWidth); - updatedContainer.setText(existingValue); - testUserPasswordValue = new JTextField(textBoxWidth); - testUserPasswordValue.setText(existingTestUserPass); - }else{ - updatedContainer = new JPasswordField(textBoxWidth); - updatedContainer.setText(existingValue); - testUserPasswordValue = new JPasswordField(textBoxWidth); - testUserPasswordValue.setText(existingTestUserPass); - } - //locate the JPanel and rebuild it Should be at index 3 - JPanel passwordRow = (JPanel) top.getComponent(3); -// JTextField jf = (JTextField) passwordRow.getComponent(1); - //store off existing components - Component[] existing = new Component[passwordRow.getComponentCount()]; - for(int i=0; i<passwordRow.getComponentCount();i++){ - existing[i] = passwordRow.getComponent(i); - } - passwordRow.removeAll(); - for(int j=0;j<existing.length;j++){ - if(j==1){//insert new JTextField instead - passwordRow.add(updatedContainer); - }else{ - passwordRow.add(existing[j]); - } - } - //reload testUserRegion - //store off existing components - Component[] existingTest = new Component[testUserRegion.getComponentCount()]; - for(int i=0; i<testUserRegion.getComponentCount();i++){ - existingTest[i] = testUserRegion.getComponent(i); - } - testUserRegion.removeAll(); - for(int j=0;j<existingTest.length;j++){ - if(j==3){//insert new JTextField instead - testUserRegion.add(testUserPasswordValue); - }else{ - testUserRegion.add(existingTest[j]); - } - } - - top.revalidate(); - top.repaint(); - } - }); - } - }); - securityPanel.add(showPasswords); - ssl = new JCheckBox("SSL:"); - ssl.setEnabled(false); - securityPanel.add(ssl); - top.add(securityPanel); - - // test user auth region - testUserRegion = new JPanel(); - testUserRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); - LineBorder border = new LineBorder(Color.BLUE, 2); - TitledBorder tBorder = new TitledBorder(border, "Authentication/Authorization Check Credentials: (insert valid ldap user assigned to group)"); - testUserRegion.setBorder(tBorder); - JLabel testUserName = new JLabel("Test UserName:"); - testUserNameValue = new JTextField(textBoxWidth); - JLabel testUserPassword = new JLabel("Test Password:"); -// testUserPasswordValue = new JTextField(textBoxWidth); - testUserPasswordValue = new JPasswordField(textBoxWidth); - testUserRegion.add(testUserName); - testUserRegion.add(testUserNameValue); - testUserRegion.add(testUserPassword); - testUserRegion.add(testUserPasswordValue); - top.add(testUserRegion); - - // center - JPanel center = new JPanel(); - center.setLayout(new BoxLayout(center, BoxLayout.X_AXIS)); - // build center panel - buildCenterPanel(center); - - // final component layout - getContentPane().add(top, BorderLayout.NORTH); - getContentPane().add(center, BorderLayout.CENTER); - this.setSize(720, 700); - addWindowListener(new WindowAdapter() { - public void windowClosing(WindowEvent e) { - System.exit(0); - } - }); - setVisible(true); - } - - // define the center display panel. - private void buildCenterPanel(JPanel center) { - // First element is Test Button - JButton test = new JButton("Test Settings"); - center.add(test); - // second is large text box that display ldap queries - testResults = new JTextArea("(click button to test settings values: simulates 4 separate checks showing ldap filters used)", - 40, 40); - JScrollPane jsp = new JScrollPane(testResults); - center.add(jsp); - test.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - testResults.setText("");//clear out empty msg - //trim spaces from all fields - String ldapServer = fieldMappings.get(keys[0]).getText().trim(); - String searchFilter = fieldMappings.get(keys[1]).getText().trim(); - String searchBase = fieldMappings.get(keys[2]).getText().trim(); - String loginProperty = fieldMappings.get(keys[3]).getText().trim(); - String bindUserName = fieldMappings.get(keys[4]).getText().trim(); - String groupSearchFilter = fieldMappings.get(keys[5]).getText().trim(); - String bindPassword = fieldMappings.get(keys[6]).getText().trim(); - String groupMemberFilter = fieldMappings.get(keys[7]).getText().trim(); - String groupMemberQuerySize = groupMemberQueryValue.getText().trim(); - String testUserName = testUserNameValue.getText().trim(); - String testUserPassword = testUserPasswordValue.getText().trim(); - // validate initial required elements - String msg = null; - boolean proceed = true; - //valid required details set. - if (ldapServer.isEmpty() || bindUserName.isEmpty() - || bindPassword.isEmpty() || searchBase.isEmpty()) { - msg ="STEP-1:FAIL: "+ keys[0] + ", " + keys[2] + ", " + keys[4] + ", " - + keys[6] + " cannot be empty to proceed."; - log(msg); - proceed = false; - } - env = null; - InitialLdapContext ctx = null; - if (proceed) {// attempt initial ldap bind from RHQ server - msg = "STEP-1:TESTING: Attempting to bind to server:" + ldapServer - + "\n with user '" + bindUserName - + "' and password entered."; - log(msg); - env = getProperties(ldapServer); - env.setProperty(Context.SECURITY_PRINCIPAL, bindUserName); - env.setProperty(Context.SECURITY_CREDENTIALS, bindPassword); - env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); - //put the rest of the LDAP properties into the Properties instance for use later. - //there still needs to be separate variables since some are for UI validation. - env.setProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), groupSearchFilter); - env.setProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), groupMemberFilter); - env.setProperty(SystemSetting.LDAP_BASE_DN.getInternalName(), searchBase); - env.setProperty(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName(), loginProperty); - env.setProperty(SystemSetting.LDAP_BIND_DN.getInternalName(), bindUserName); - env.setProperty(SystemSetting.LDAP_BIND_PW.getInternalName(), bindPassword); - env.setProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.getInternalName(), groupMemberQuerySize); - - for(Object key :env.keySet()){ - System.out.println(key+"="+env.getProperty(key+"")); - } - - try { - ctx = new InitialLdapContext(env, null); - msg = "STEP-1:PASS: LDAP bind credentials are correct. Successfully connected to '" - + ldapServer - + "'.\n This means the LDAP Bind credentials for the RHQ Server authentication/authorization requests to ldap server " - + "are correct."; - if(enableVerboseDebugging.isSelected()){ - msg+="\n"+advdb+" LDAP simple authentication bind successful."; - } - log(msg); - proceed = true; - } catch (Exception ex) { - msg = "STEP-1:FAIL: Unable to connect to the LDAP server with credentials specified.\n"; - msg+="Exception:"+ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - proceed = false; - } - } - if (proceed) {// retrieve test credentials to test run auth - // load search controls - SearchControls searchControls = getSearchControls(); - // validating searchFilter and test user/pass creds - proceed = true; - if (testUserName.isEmpty() || (testUserPassword.isEmpty())) { - msg = "STEP-2:FAIL: Test Username/Password fields cannot be empty for this step."; - log(msg); - proceed = false; - } - // testing a valid user involves a filtered ldap search - // using the loginProperty, and optionally searchFilter - String userDN = ""; - if (proceed) { - // default loginProperty to cn if it's not set - if (loginProperty.isEmpty()) { - loginProperty = "cn"; - if(enableVerboseDebugging.isSelected()){ - String mesg = "As you have not specified a login property, defaulting to 'cn'"; - log(advdb+" "+msg); - } - } - String filter; - if (!searchFilter.isEmpty()) { - filter = "(&(" + loginProperty + "=" + testUserName - + ")" + "(" + searchFilter + "))"; - } else { - filter = "(" + loginProperty + "=" + testUserName - + ")"; - } - if(enableVerboseDebugging.isSelected()){ - log(advdb+" The searchfilter is optionally appended to login property for additional shared attribute across users."); - } - msg = "STEP-2:TESTING: To validate the test user the following LDAP filtered component will be used to find matching users:\n"; - msg += filter; - log(msg); - // test out the search on the target ldap server - try { - String[] baseDNs = searchBase.split(";"); - for (int x = 0; x < baseDNs.length; x++) { - NamingEnumeration answer = ctx.search( - baseDNs[x], filter, searchControls); - if(enableVerboseDebugging.isSelected()){ - log(advdb+" this search was excuted against DN component '"+baseDNs[x]+"'."); - } - // boolean ldapApiNpeFound = false; - if (!answer.hasMoreElements()) { - msg="STEP-2:WARN Unable to locate a matching users for the filter'"+filter+ - "'. Please check your loginProperty. Usually 'cn' or 'uid'"; - log(msg); - continue; - } - // Going with the first match - SearchResult si = (SearchResult) answer.next(); - - // Construct the UserDN - userDN = si.getName() + "," + baseDNs[x]; - msg = "STEP-2:PASS: The test user '" - + testUserName - + "' was succesfully located, and the following userDN will be used in authorization check:\n"; - msg += userDN; - log(msg); - - ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, userDN); - ctx.addToEnvironment(Context.SECURITY_CREDENTIALS,testUserPassword); - ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION,"simple"); - - // if successful then verified that user and pw - // are valid ldap credentials - ctx.reconnect(null); - msg = "STEP-2:PASS: The user '" - + testUserName - + "' was succesfully authenticated using userDN '" - + userDN + "' and password provided.\n" - +"*Note: the loginProperty must match the loginProperty listed in dn: for the user. It is the DN that RHQ will lookup and use."; - log(msg); - } - } catch (Exception ex) { - msg = "STEP-2:FAIL: There was an error while searching for or authenticating the user '" - + testUserName + "'\n"; - msg += ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - proceed=false; - } - } - // with authentication completed, now check authorization. - // validate filter components to list all available groups - proceed = false; - if (!groupSearchFilter.isEmpty()) { - Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); - String filter = null; - - if (groupSearchFilter.startsWith("(") && groupSearchFilter.endsWith(")")){ - filter = groupSearchFilter; // RFC 2254 does not allow for ((expression)) - }else{ - filter = String - .format("(%s)", groupSearchFilter); - } - msg = "STEP-3:TESTING: This ldap filter " - + filter - + " will be used to locate ALL available LDAP groups"; - log(msg); - - Properties systemConfig = populateProperties(env); - - ret = buildGroup(systemConfig, filter); - msg = "STEP-3:TESTING: Using Group Search Filter '" - + filter + "', " + ret.size() - + " ldap group(s) were located.\n"; - if (ret.size() > 0) { - HashMap<String, String>[] ldapLists = new HashMap[ret - .size()]; - ret.toArray(ldapLists); - // in this mode go beyond the first ten results. - if (enableVerboseGroupParsing.isSelected()) { - msg += "STEP-3:PASS: Listing 'all' of the ldap groups located: \n"; - for (int i = 0; i < ret.size(); i++) { - msg += ldapLists[i] + "\n"; - } - } else {// otherwise only show first 10[subset of - // available groups] - msg += "STEP-3:PASS: Listing a few(<=10) of the ldap groups located: \n"; - for (int i = 0; (i < ret.size() && i < 10); i++) { - msg += ldapLists[i] + "\n"; - } - } - proceed = true;// then can proceed to next step. - } - log(msg); - } else { - msg = "STEP-3:FAIL: Group Search Filter: cannot be empty to proceed."; - log(msg); - proceed=false; - } - // retrieve lists of authorized groups available for the - if (proceed) { - // check groupMember - if (!groupMemberFilter.isEmpty()) { -// Map<String, String> userDetails = new HashMap<String, String>(); -// userDetails = findLdapUserDetails(userDN); - Set<String> userDetails = findAvailableGroupsFor(testUserName); - - if(!userDetails.isEmpty()){ - proceed=true; - } - } else { - msg = "STEP-4:FAIL: Group Member Filter must be non-empty to proceed with simulating authorization check for test user."; - log(msg); - } - } - if(proceed){ - msg="COMPLETED:PASS: The current settings, for successful steps, should be correct to enter into your RHQ server."; - msg+="\n\n\n\n When you encounter failures, warnings or other unexpected results you should use an external "; - msg+="LDAP search utility to check that the generated filters return the expected LDAP results."; - log(msg); - } - } - } - }); - } - - private String appendStacktraceToMsg(String msg, Exception ex) { - String moreVerbose = ""; - moreVerbose+=advdb+" Exception type:"+ex.getClass()+"\n"; - moreVerbose+=advdb+" Exception stack trace reference:"+ex.getStackTrace()+"\n"; - if(ex.getStackTrace()!=null){ - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - ex.printStackTrace(pw); - moreVerbose+=advdb+" stack trace reference:"+sw.toString(); - } - msg+="\n"+moreVerbose; - return msg; - } - - private boolean containsIllegalLdap(String currentValue) { - boolean invalidData = false; - if((currentValue!=null)&&(!currentValue.trim().isEmpty())){ - //TODO: spinder 3/17/11: need to figure out regex to filter/detect bad data in returned ldap. Giving up for now. -// String regex = "(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)[/,+\"><;=#]|(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)\$?!\\|[/,+\"><;=#]| $|(?<=^\$ )|^"; -// regex = "(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)[/,+\\\"><;=#]|(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)\\\$?!\\\\|[/,+\\\"><;=#]| $|(?<=^\\\$ )|^"; -// System.out.println("++++++++ CURR VAL:"+currentValue+":INV-CHeck:"+currentValue.matches(",+\"\\<;\n=/")+":NEWCHECK:"+(currentValue.matches(regex))); -// if(currentValue.matches(",+\"\\<;\n=/")){ -// invalidData=true; -// } -// String badList = ",+\"\\<;\n="; - String badList = "+\"\\<;\n"; - for(char car :currentValue.toCharArray()){ - for(char c :badList.toCharArray()){ - if(car == c){ - invalidData=true; - } - } - } - - } - return invalidData; - } - /** - * @throws NamingException - * @see org.jboss.security.auth.spi.UsernamePasswordLoginModule#validatePassword(java.lang.String,java.lang.String) - */ - protected Set<Map<String, String>> buildGroup(Properties systemConfig, String filter) { - Set<Map<String, String>> groupDetailsMap = new HashSet<Map<String, String>>(); - // Load our LDAP specific properties - // Load the BaseDN - String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); - - // Load the LoginProperty - String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); - if (loginProperty == null) { - // Use the default - loginProperty = "cn"; - } - // Load any information we may need to bind - String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); - String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); - if (bindDN != null) { - systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); - systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); - systemConfig.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); - } - try { - InitialLdapContext ctx = new InitialLdapContext(systemConfig, null); - SearchControls searchControls = getSearchControls(); - /*String filter = "(&(objectclass=groupOfUniqueNames)(uniqueMember=uid=" + userName - + ",ou=People, dc=rhndev, dc=redhat, dc=com))";*/ - - //modify the search control to only include the attributes we will use - String[] attributes = { "cn", "description" }; - searchControls.setReturningAttributes(attributes); - - //BZ:964250: add rfc 2696 - //default to 1000 results. System setting page size from UI should be non-negative integer > 0. - //additionally as system settings are modifiable via CLI which may not have param checking enabled do some - //more checking. - int defaultPageSize = 1000; - // only if they're enabled in the UI. - if (enable32xFeatures.isSelected()) { - String groupPageSize = systemConfig.getProperty( - SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE - .getInternalName(), "" + defaultPageSize); - if ((groupPageSize != null) - && (!groupPageSize.trim().isEmpty())) { - int passedInPageSize = -1; - try { - passedInPageSize = Integer - .valueOf(groupPageSize.trim()); - if (passedInPageSize > 0) { - defaultPageSize = passedInPageSize; - if(enableVerboseDebugging.isSelected()){ - log(advdb - + " LDAP Group Query Page Sizing of '"+defaultPageSize+"' is being requested from server."); - } - } - } catch (NumberFormatException nfe) { - // log issue and do nothing. Go with the default. - String msg = "LDAP Group Page Size passed in '" - + groupPageSize - + "' in is invalid. Defaulting to 1000 results." - + nfe.getMessage(); - log(msg); - } - } - ctx.setRequestControls(new Control[] { new PagedResultsControl( - defaultPageSize, Control.CRITICAL) }); - } - // Loop through each configured base DN. It may be useful - // in the future to allow for a filter to be configured for - // each BaseDN, but for now the filter will apply to all. - String[] baseDNs = baseDN.split(BASEDN_DELIMITER); - - for (int x = 0; x < baseDNs.length; x++) { - if (enableVerboseDebugging.isSelected()) { - log(advdb - + " this search was excuted against DN component '" - + baseDNs[x] + "'."); - } - executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); - - // continually parsing pages of results until we're done. - // only if they're enabled in the UI. - if (enable32xFeatures.isSelected()) { - // handle paged results if they're being used here - byte[] cookie = null; - Control[] controls = ctx.getResponseControls(); - if (controls != null) { - for (Control control : controls) { - if (control instanceof PagedResultsResponseControl) { - PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; - cookie = pagedResult.getCookie(); - } - } - } - - while (cookie != null) { - String msg = "RFC 2696 is supported by the server and we are paging through the results. "+ - groupDetailsMap.size()+" results returned so far."; - if(enableVerboseGroupParsing.isSelected()){ - log(advdb - + msg); - } - // ensure the next requests contains the session/cookie - // details - ctx.setRequestControls(new Control[] { new PagedResultsControl( - defaultPageSize, cookie, Control.CRITICAL) }); - executeGroupSearch(filter, groupDetailsMap, ctx, - searchControls, baseDNs, x); - // empty out cookie - cookie = null; - // test for further iterations - controls = ctx.getResponseControls(); - if (controls != null) { - for (Control control : controls) { - if (control instanceof PagedResultsResponseControl) { - PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; - cookie = pagedResult.getCookie(); - } - } - } - } - } - }//end of for loop - } catch (NamingException e) { - if (e instanceof InvalidSearchFilterException) { - InvalidSearchFilterException fException = (InvalidSearchFilterException) e; - String message = "The ldap group filter defined is invalid "; - log(message); - } - //TODO: check for ldap connection/unavailable/etc. exceptions. - else { - String mesg = "LDAP communication error: " + e.getMessage(); - log(mesg); - } - } catch (IOException iex) { - String msg = "Unexpected LDAP communciation error:" + iex.getMessage(); - log(msg); - } - - return groupDetailsMap; - } - - /** Executes the LDAP group query using the filters, context and search controls, etc. parameters passed in. - * The matching groups located during processing this pages of results are added as new entries to the - * groupDetailsMap passed in. - * - * @param filter - * @param groupDetailsMap - * @param ctx - * @param searchControls - * @param baseDNs - * @param x - * @throws NamingException - */ - private void executeGroupSearch(String filter, Set<Map<String, String>> groupDetailsMap, InitialLdapContext ctx, - SearchControls searchControls, String[] baseDNs, int x) throws NamingException { - //execute search based on controls and context passed in. - NamingEnumeration<SearchResult> answer = ctx.search(baseDNs[x], filter, searchControls); - boolean ldapApiEnumerationBugEncountered = false; - while ((!ldapApiEnumerationBugEncountered) && answer.hasMoreElements()) {//BZ:582471- ldap api bug change - // We use the first match - SearchResult si = null; - try { - si = answer.next(); - } catch (NullPointerException npe) { - if (enableVerboseDebugging.isSelected()) { - log(advdb - + " NullPtr exception detected. If known LDAP api enum npe ignore: " - + npe.getMessage() + "."); - } - ldapApiEnumerationBugEncountered = true; - break; - } - - if (enableVerboseDebugging.isSelected() - || enableVerboseGroupParsing.isSelected()) { - Attributes attributeContainer = si.getAttributes(); - NamingEnumeration<? extends Attribute> attributes = attributeContainer - .getAll(); - String attributesReturned = " "; - while (attributes.hasMore()) { - attributesReturned += attributes.next().getID() + ","; - } - String dbugMesg = "\n" - + advdb - + " Group search LDAP (" - + attributeContainer.size() - + ") attributes located for group '" - + si.getName() - + "' are [" - + attributesReturned.substring(0, - attributesReturned.length() - 1) + "]."; - // directly update here to shorten messages for lots of groups - testResults.setText(testResults.getText() + dbugMesg); - //This flag can be used in the unlikely case that the UI hangs during a test operation.: - if(iterativeVerboseLogging.isSelected()){ - System.out.println(dbugMesg); - } - - // additionally parse attribute ids and values for illegal ldap - // characters - if (enableVerboseGroupParsing.isSelected()) { - attributes = attributeContainer.getAll(); - String currentAttributeId = ""; - String currentValue = ""; - // spinder: 3/17/11: should we bail on first bad data or - // display them all? - while (attributes.hasMore()) { - boolean badData = false; - Attribute att = attributes.next(); - currentAttributeId = att.getID(); - if (containsIllegalLdap(currentAttributeId)) { - log(advdb - + " LDAP Group: bad atrribute data detected for group '" - + si.getName() + "' for attribute '" - + currentAttributeId + "'."); - badData = true; - } - if (att.getAll() != null) { - NamingEnumeration<?> enumer = att.getAll(); - while (enumer.hasMore()) { - currentValue = enumer.next() + ""; - if (containsIllegalLdap(currentValue)) { - log(advdb - + " LDAP Group: bad data detected for group '" - + si.getName() - + "' with attribute '" - + currentAttributeId - + "' and value:" + currentValue); - badData = true; - } - } - } - if (badData) { - log(advdb - + "** LDAP Group: Some bad LDAP data detected for group '" - + si.getName() + "'."); - } - } - } - } - - Map<String, String> entry = new HashMap<String, String>(); - // String name = (String) si.getAttributes().get("cn").get(); - Attribute commonNameAttr = si.getAttributes().get("cn"); - if (commonNameAttr != null) { - String name = (String) commonNameAttr.get(); - name = name.trim(); - Attribute desc = si.getAttributes().get("description"); - String description = desc != null ? (String) desc.get() : ""; - description = description.trim(); - entry.put("id", name); - entry.put("name", name); - entry.put("description", description); - groupDetailsMap.add(entry); - } else {// unable to retrieve details for specific group. - log(advdb - + " There was an error retrieving 'cn' attribute for group '" - + si.getName() - + "'. Not adding to returned list of groups. "); - } - } - } - - public Map<String, String> findLdapUserDetails(String userName) { - // Load our LDAP specific properties - Properties systemConfig = env; - HashMap<String, String> userDetails = new HashMap<String, String>(); - - // Load the BaseDN - String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); - - // Load the LoginProperty - String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); - if (loginProperty == null) { - // Use the default - loginProperty = "cn"; - } - // Load any information we may need to bind - String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); - String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); - - // Load any search filter - String groupSearchFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); - String groupMemberFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_MEMBER.getInternalName()); - String testUserDN=userName; - String ldapServer = (String) systemConfig.get(Context.PROVIDER_URL); - - Properties env = getProperties(ldapServer); - - if (bindDN != null) { - env.setProperty(Context.SECURITY_PRINCIPAL, bindDN); - env.setProperty(Context.SECURITY_CREDENTIALS, bindPW); - env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); - } - - try { - InitialLdapContext ctx = new InitialLdapContext(env, null); - SearchControls searchControls = getSearchControls(); - - String filter = String.format("(&(%s)(%s=%s))", - groupSearchFilter, groupMemberFilter, - testUserDN); - - generateUiLoggingForStep4LdapFilter(userName, filter); - - // Loop through each configured base DN. It may be useful - // in the future to allow for a filter to be configured for - // each BaseDN, but for now the filter will apply to all. - String[] baseDNs = baseDN.split(BASEDN_DELIMITER); - for (int x = 0; x < baseDNs.length; x++) { - NamingEnumeration<SearchResult> answer = ctx.search(baseDNs[x], filter, searchControls); - if (!answer.hasMoreElements()) { //BZ:582471- ldap api bug change - // Nothing found for this DN, move to the next one if we have one. - continue; - } - - // We use the first match - SearchResult si = answer.next(); - //generate the DN - String userDN = null; - try { - userDN = si.getNameInNamespace(); - } catch (UnsupportedOperationException use) { - userDN = si.getName(); - if (userDN.startsWith("\"")) { - userDN = userDN.substring(1, userDN.length()); - } - if (userDN.endsWith("\"")) { - userDN = userDN.substring(0, userDN.length() - 1); - } - userDN = userDN + "," + baseDNs[x]; - } - userDetails.put("dn", userDN); - - // Construct the UserDN - NamingEnumeration<String> keys = si.getAttributes().getIDs(); - while (keys.hasMore()) { - String key = keys.next(); - Attribute value = si.getAttributes().get(key); - if ((value != null) && (value.get() != null)) { - userDetails.put(key, value.get().toString()); - } - } -// return userDetails; - }//end of for loop - generateUiLoggingStep4Authz(filter); - return userDetails; - } catch (Exception ex) { - generateUiLoggingStep4Exception(ex); - } - return userDetails; - } - - public Set<String> findAvailableGroupsFor(String userName) { - // Load our LDAP specific properties - Properties options = env; - String groupFilter = options.getProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), ""); - String groupMember = options.getProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), ""); - String groupUsePosix = options.getProperty(SystemSetting.LDAP_GROUP_USE_POSIX.getInternalName(), "false"); - if (groupUsePosix == null) { - groupUsePosix = Boolean.toString(false);//default to false - } - boolean usePosixGroups = Boolean.valueOf(groupUsePosix); - String userAttribute = getUserAttribute(options, userName, usePosixGroups); - Set<String> ldapSet = new HashSet<String>(); - - if (userAttribute != null && userAttribute.trim().length() > 0) { - //TODO: spinder 4/21/10 put in error/debug logging messages for badly formatted filter combinations - String filter = ""; - //form assumes examples where groupFilter is like 'objectclass=groupOfNames' and groupMember is 'member' - // to produce ldap filter like (&(objectclass=groupOfNames)(member=cn=Administrator,ou=People,dc=test,dc=com)) - // or like (&(objectclass=groupOfNames)(memberUid=Administrator)) for posixGroups. - filter = String.format("(&(%s)(%s=%s))", groupFilter, groupMember, encodeForFilter(userAttribute)); - - Set<Map<String, String>> matched = buildGroup(options, filter); -// log.trace("Located '" + matched.size() + "' LDAP groups for user '" + userName -// + "' using following ldap filter '" + filter + "'."); - - //iterate to extract just the group names. - for (Map<String, String> match : matched) { - ldapSet.add(match.get("id")); - } - } else { -// log.debug("Group lookup will not be performed due to no UserDN found for user " + userName); - } - - return ldapSet; - } - - private void generateUiLoggingStep4Exception(Exception ex) { - String groupSearchFilter = env - .getProperty(SystemSetting.LDAP_GROUP_FILTER - .getInternalName()); - String msg = "STEP-4:FAIL: There was an error searching with the groupFilter supplied: " - + groupSearchFilter + "'\n"; - msg += ex.getMessage(); - if (enableVerboseDebugging.isSelected()) { - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - } - - private void generateUiLoggingStep4Authz(String filter) { - Set<Map<String, String>> groups = buildGroup(env, filter); - String msg = "STEP-4:TESTING: Using Group Search Filter '" - + filter + "', " + groups.size() - + " ldap group(s) were located.\n"; - if (groups.size() > 0) { - HashMap<String, String>[] ldapLists = new HashMap[groups - .size()]; - groups.toArray(ldapLists); - msg += "STEP-4:PASS: Listing a few of the ldap groups located: \n"; - // iterate over first ten or less to demonstrate retrieve - for (int i = 0; (i < groups.size() && i < 10); i++) { - msg += ldapLists[i] + "\n"; - } - }else{ - msg+="STEP-4:WARN: With current settings, test user is not authorized for any groups. Is this correct?"; - } - log(msg); - } - - private void generateUiLoggingForStep4LdapFilter(String userName, - String filter) { - String msg = "STEP-4:TESTING: about to do ldap search with filter \n'" - + filter - + "'\n to locate groups that test user '"+userName+"' IS authorized to access."; - log(msg); - } - - - // throw the label and fields together, two to a row. - private HashMap<String, JTextField> loadUiFields(JPanel top, - String[] componentKeys) { - HashMap<String, JTextField> mappings = new HashMap<String, JTextField>(); - for (int i = 0; i < componentKeys.length; i++) { - String firstLabelKey = componentKeys[i]; - String secondLabelKey = componentKeys[++i]; - // locate second key - JPanel row = new JPanel(); - row.setLayout(new FlowLayout(FlowLayout.LEFT)); - JLabel label1 = new JLabel(firstLabelKey); - label1.setSize(textBoxWidth, 5); -// JTextField value1 = new JTextField(textBoxWidth); - JTextField value1 = null; - if (firstLabelKey.equalsIgnoreCase("Password:")&&(!showPasswords.isSelected())) { - value1 = new JPasswordField(textBoxWidth); - } else { - value1 = new JTextField(textBoxWidth); - } - JLabel label2 = new JLabel(secondLabelKey); - JTextField value2 = new JTextField(textBoxWidth); - row.add(label1); - row.add(value1); - row.add(Box.createRigidArea(new Dimension(0, 5))); - row.add(label2); - row.add(value2); - mappings.put(firstLabelKey, value1); - mappings.put(secondLabelKey, value2); - top.add(row); - } - - return mappings; - } - - private Properties getProperties(String contentProvider) { - Properties env = new Properties(); - env.setProperty(Context.INITIAL_CONTEXT_FACTORY, - "com.sun.jndi.ldap.LdapCtxFactory"); - env.setProperty(Context.PROVIDER_URL, contentProvider); - if(!enableLdapReferral.isSelected()){ - env.setProperty(Context.REFERRAL, "ignore"); - }else{ - String msg="**---- You have chosen to tell LDAP servers to [FOLLOW] context referrals. Default is [IGNORE] referrals. --**"; - log(msg); - env.setProperty(Context.REFERRAL, "follow"); - } - -// // Setup SSL if requested -// String protocol = ssl.isSelected()? "ssl":""; -// if ((protocol != null) && protocol.equals("ssl")) { -// String ldapSocketFactory = env -// .getProperty("java.naming.ldap.factory.socket"); -// if (ldapSocketFactory == null) { -// env.put("java.naming.ldap.factory.socket", -// UntrustedSSLSocketFactory.class.getName()); -// } -// env.put(Context.SECURITY_PROTOCOL, "ssl"); -// } - - return env; - } - - private String delineate() { - String line = "-"; - for (int i = 0; i < 30; i++) { - line += "-"; - } - return line; - } - - /** Takes care of delineating messages and conditional logging contents passed in. - * @param msg - */ - private void log(String msg) { - String message = "\n" + delineate() + "\n"; - message += msg; - message += "\n" + delineate() + "\n\n"; - //This flag can be used in the unlikely case that the UI hangs during a test operation.: - if(iterativeVerboseLogging.isSelected()){ - System.out.println(message); - } - testResults.setText(testResults.getText() + message); - } - - private SearchControls getSearchControls() { - int scope = SearchControls.SUBTREE_SCOPE; - int timeLimit = 0; - long countLimit = 0; - String[] returnedAttributes = null; - boolean returnObject = false; - boolean deference = false; - SearchControls constraints = new SearchControls(scope, countLimit, - timeLimit, returnedAttributes, returnObject, deference); - return constraints; - } - - /** Translate SystemSettings to familiar Properties instance since we're - * passing not one but multiple values. - * - * @param systemSettings - * @return - */ - private Properties populateProperties(Properties existing) { - Properties properties = new Properties(); - if(existing!=null){ - properties = existing; - } - for (SystemSetting entry : SystemSetting.values()) { - if(entry!=null){ - switch(entry){ - case LDAP_BASED_JAAS_PROVIDER: - properties.put(entry.getInternalName(), ""); - break; - } - } - } - return properties; - } - - /**Build/retrieve the user DN. Not usually a property. - * - * @param options - * @param userName - * @param usePosixGroups boolean indicating whether we search for groups with posixGroup format - * @return - */ - private String getUserAttribute(Properties options, String userName, boolean usePosixGroups) { - Map<String, String> details = findLdapUserDetails(userName); - String userAttribute = null; - if (usePosixGroups) {//return just the username as posixGroup member search uses (&(%s)(memberUid=username)) - userAttribute = userName; - } else {//this is the default where group search uses (&(%s)(uniqueMember={userDn})) - userAttribute = details.get("dn"); - } - - return userAttribute; - } - - /** See LDAPStringUtil.encodeForFilter() for original code/source/author/etc. - * <p>Encode a string so that it can be used in an LDAP search filter.</p> - * - * <p>The following table shows the characters that are encoded and their - * encoded version.</p> - * - * <table> - * <tr><th align="center">Character</th><th>Encoded As</th></tr> - * <tr><td align="center">*</td><td>\2a</td></tr> - * <tr><td align="center">(</td><td>\28</td></tr> - * <tr><td align="center">)</td><td>\29</td></tr> - * <tr><td align="center">\</td><td>\5c</td></tr> - * <tr><td align="center"><code>null</code></td><td>\00</td></tr> - * </table> - * - * <p>In addition to encoding the above characters, any non-ASCII character - * (any character with a hex value greater then <code>0x7f</code>) is also - * encoded and rewritten as a UTF-8 character or sequence of characters in - * hex notation.</p> - * - * @param filterString a string that is to be encoded - * @return the encoded version of <code>filterString</code> suitable for use - * in a LDAP search filter - * @see <a href="http://tools.ietf.org/html/rfc4515">RFC 4515</a> - */ - public static String encodeForFilter(final String filterString) { - if (filterString != null && filterString.length() > 0) { - StringBuilder encString = new StringBuilder(filterString.length()); - for (int i = 0; i < filterString.length(); i++) { - char ch = filterString.charAt(i); - switch (ch) { - case '*': // encode a wildcard * character - encString.append("\\2a"); - break; - case '(': // encode a open parenthesis ( character - encString.append("\\28"); - break; - case ')': // encode a close parenthesis ) character - encString.append("\\29"); - break; - case '\\': // encode a backslash \ character - encString.append("\\5c"); - break; - case '\u0000': // encode a null character - encString.append("\\00"); - break; - default: - if (ch <= 0x7f) { // an ASCII character - encString.append(ch); - } else if (ch >= 0x80) { // encode to UTF-8 - try { - byte[] utf8bytes = String.valueOf(ch).getBytes("UTF8"); - for (byte b : utf8bytes) { - encString.append(String.format("\\%02x", b)); - } - } catch (UnsupportedEncodingException e) { - // ignore - } - } - } - } - return encString.toString(); - } - return filterString; - } -} - -//Mock up the upgraded system properties approach to use SystemSetting -enum SystemSetting { - LDAP_BASED_JAAS_PROVIDER("CAM_JAAS_PROVIDER"), - LDAP_NAMING_PROVIDER_URL("CAM_LDAP_NAMING_PROVIDER_URL"), - USE_SSL_FOR_LDAP("CAM_LDAP_PROTOCOL"), - LDAP_LOGIN_PROPERTY("CAM_LDAP_LOGIN_PROPERTY"), - LDAP_FILTER("CAM_LDAP_FILTER"), - LDAP_GROUP_FILTER("CAM_LDAP_GROUP_FILTER"), - LDAP_GROUP_MEMBER("CAM_LDAP_GROUP_MEMBER"), - LDAP_GROUP_QUERY_PAGE_SIZE("CAM_LDAP_GROUP_QUERY_PAGE_SIZE"), - LDAP_BASE_DN("CAM_LDAP_BASE_DN"), - LDAP_BIND_DN("CAM_LDAP_BIND_DN"), - LDAP_BIND_PW("CAM_LDAP_BIND_PW"), - LDAP_NAMING_FACTORY("CAM_LDAP_NAMING_FACTORY_INITIAL"), - LDAP_GROUP_USE_POSIX("CAM_LDAP_GROUP_USE_POSIX"), - ; - - private String internalName; - - private SystemSetting(String name) { - this.internalName = name; - } - - public String getInternalName() { - return internalName; - } - - public static SystemSetting getByInternalName(String internalName) { - for (SystemSetting p : SystemSetting.values()) { - if (p.internalName.equals(internalName)) { - return p; - } - } - return null; - } -} - - diff --git a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java new file mode 100644 index 0000000..b9667ea --- /dev/null +++ b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java @@ -0,0 +1,1277 @@ +package org.rhq; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import javax.naming.Context; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; +import javax.naming.directory.Attributes; +import javax.naming.directory.InvalidSearchFilterException; +import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; +import javax.naming.ldap.Control; +import javax.naming.ldap.InitialLdapContext; +import javax.naming.ldap.PagedResultsControl; +import javax.naming.ldap.PagedResultsResponseControl; +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JPasswordField; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.SwingUtilities; +import javax.swing.border.LineBorder; +import javax.swing.border.TitledBorder; + +//import org.rhq.enterprise.server.util.security.UntrustedSSLSocketFactory; + +/* Is a development test tool that allows the user to simulate the RHQ server side + * LDAP calls during auth/authz operations. + * + * The specific LDAP logic below needs to mirror the latest RHQ code and allow the user + * to test our their configuration without requring a specific RHQ/JON build as a dependency. + * + * NOTE: To avoid a runtime dependency on specific versions of RHQ or JON, the small implementation + * methods were copied into this class with minimatl changes for logging and ui messaging. The + * definitive implementation for each 'copied' method can be found in LDAPGroupManagerBean. + * + * @author Simeon Pinder + */ +public class TestLdapSettings extends JFrame { + //shared fields + private JTextArea testResults; + private JCheckBox showPasswords; + private JCheckBox ssl; + private JLabel groupPageSizeName; + private JTextField groupMemberQueryValue; + private JTextField testUserNameValue; + private JTextField testUserPasswordValue; + private HashMap<String, JTextField> fieldMappings; + private String[] keys; + private JCheckBox enableLdapReferral; + private JCheckBox enableVerboseDebugging; + private JCheckBox enableVerboseGroupParsing; + private JCheckBox iterativeVerboseLogging; + private JCheckBox enablePosixGroups; + private JCheckBox enable32xFeatures; + private String advdb = "**Verbose:debug ----"; + private static final String BASEDN_DELIMITER = ";"; + + private static final long serialVersionUID = 1L; + int textBoxWidth = 20; + private static JPanel top = null; + private static JPanel testUserRegion = null; + private static Properties env=null; + + public static void main(String args[]) { + new TestLdapSettings(); + } + //After enabling support for Query parsing, we need to warn users of the effects. + final String warnMessage = "<html>***WARNING: Depending upon<br>" + + "i)how the ldap server is configured <br>" + + "ii)client query paging settings <br>" + + " enabling <b>'more detailed logging'</b>,<br>" + + " <b>'more group parsing'</b> AND/OR <b>'also log to console'</b> may cause the console to hang/freeze <br>" + + " as the LDAP tool continues to parse large query results. If that occurs it is <br>" + + " suggested that you kill tool and re-run with 'also log to console' so that the console logs<br>" + + " will show which dataset is causing the delay and then you should modify your search|group|member<br>" + + " filters accordingly to <b>return smaller results</b> and/or <b>consume larger payloads</b>.<br>" + + "***WARNING</html>"; + + // Configure window properties + private TestLdapSettings() { + + setTitle("Check LDAP Settings: Simulates LDAP checks/queries of RHQ LDAP integration"); + getContentPane().setLayout(new BorderLayout()); + // top panel definition + top = new JPanel(); + top.setLayout(new BoxLayout(top, BoxLayout.Y_AXIS)); + top.setBorder(LineBorder.createGrayLineBorder()); + //define checkbox here as it's checked when generating UI. + showPasswords = new JCheckBox("show passwords:"); + showPasswords.setSelected(false); + + keys = new String[] { "URL:", "Search Filter:", + "Search Base:","Login Property", + "Username:", "Group Search Filter:", + "Password:", "Group Member Filter:", + }; + fieldMappings = loadUiFields(top, keys); + + //add the two checkboxes for additiona debugging options + enableLdapReferral= new JCheckBox("[follow] ldap referrals"); + enableLdapReferral.setSelected(false); + enableVerboseDebugging= new JCheckBox("more verbose logging"); + enableVerboseDebugging.setSelected(false); + enableVerboseDebugging.setToolTipText(warnMessage); + enableVerboseGroupParsing= new JCheckBox("more detailed group parsing"); + enableVerboseGroupParsing.setSelected(false); + enableVerboseGroupParsing.setToolTipText("*Take care when using this mode with a large number of groups* Every group discovered is parsed/listed."); + iterativeVerboseLogging= new JCheckBox("also log to console"); + iterativeVerboseLogging.setSelected(false); + iterativeVerboseLogging.setToolTipText("This mode is useful when the test tool is having difficulty returning results from large queries."); + iterativeVerboseLogging.setToolTipText(warnMessage); + enablePosixGroups= new JCheckBox("is Posix Group"); + enablePosixGroups.setSelected(false); + enablePosixGroups.setEnabled(false); + + //put into 3.2.x functionality row + JPanel jon32xRegion = new JPanel(); + jon32xRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); + LineBorder jon32xLineBorder = new LineBorder(Color.BLACK, 2); + TitledBorder jon32xBorder = new TitledBorder(jon32xLineBorder, "JON 3.2.x/RHQ 4.8.x specific features:"); + jon32xRegion.setBorder(jon32xBorder); + enable32xFeatures= new JCheckBox("enable JON 3.2.x/RHQ 4.8.x features"); + enable32xFeatures.setToolTipText("This enables features not available before RHQ 4.8.x/JON 3.2.x."); + enable32xFeatures.setSelected(false); + enable32xFeatures.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + if(enable32xFeatures.isSelected()){ + groupPageSizeName.setEnabled(true); + groupMemberQueryValue.setEnabled(true); + groupMemberQueryValue.setEditable(true); + groupMemberQueryValue.setText("1000"); + enablePosixGroups.setEnabled(true); + }else{ + groupMemberQueryValue.setText(""); + groupPageSizeName.setEnabled(false); + groupMemberQueryValue.setEnabled(false); + groupMemberQueryValue.setEditable(false); + enablePosixGroups.setEnabled(false); + enablePosixGroups.setSelected(false); + } + } + }); + + jon32xRegion.add(enable32xFeatures); + groupPageSizeName = new JLabel("Group Query Page Size:"); + groupPageSizeName.setEnabled(false); + groupMemberQueryValue = new JTextField(10); + groupMemberQueryValue.setText("1000"); + groupMemberQueryValue.setEditable(false); + jon32xRegion.add(groupPageSizeName); + jon32xRegion.add(groupMemberQueryValue); + jon32xRegion.add(enablePosixGroups); + top.add(jon32xRegion); + + //put into row display + JPanel advancedDebugRegion = new JPanel(); + advancedDebugRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); + LineBorder advancedBorder = new LineBorder(Color.BLACK, 2); + TitledBorder debugBorder = new TitledBorder(advancedBorder, "Debug: **Warning --<hover HERE>**"); + advancedDebugRegion.setBorder(debugBorder); + advancedDebugRegion.add(enableLdapReferral); + advancedDebugRegion.add(enableVerboseDebugging); + advancedDebugRegion.add(enableVerboseGroupParsing); + advancedDebugRegion.add(iterativeVerboseLogging); + advancedDebugRegion.setToolTipText(warnMessage); + top.add(advancedDebugRegion); + + JPanel securityPanel = new JPanel(); + securityPanel.setLayout(new FlowLayout(FlowLayout.LEFT)); + showPasswords.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + //store off existing value + String existingValue = ""; + String existingTestUserPass = ""; + JTextField current = fieldMappings.get("Password:"); + if(current instanceof JPasswordField){ + JPasswordField pass = ((JPasswordField)current); + if(pass!=null){ + char[] charArray = pass.getPassword(); + if(charArray.length>0){ + existingValue = new String(charArray); + } + } + }else{ + existingValue = current.getText(); + } + //save off test user password as well + if(testUserPasswordValue instanceof JPasswordField){ + JPasswordField pass = ((JPasswordField)testUserPasswordValue); + if(pass!=null){ + char[] charArray = pass.getPassword(); + if(charArray.length>0){ + existingTestUserPass = new String(charArray); + } + } + }else{ + existingTestUserPass=testUserPasswordValue.getText(); + } + + JTextField updatedContainer = null; + if(showPasswords.isSelected()){ + updatedContainer = new JTextField(textBoxWidth); + updatedContainer.setText(existingValue); + testUserPasswordValue = new JTextField(textBoxWidth); + testUserPasswordValue.setText(existingTestUserPass); + }else{ + updatedContainer = new JPasswordField(textBoxWidth); + updatedContainer.setText(existingValue); + testUserPasswordValue = new JPasswordField(textBoxWidth); + testUserPasswordValue.setText(existingTestUserPass); + } + //locate the JPanel and rebuild it Should be at index 3 + JPanel passwordRow = (JPanel) top.getComponent(3); +// JTextField jf = (JTextField) passwordRow.getComponent(1); + //store off existing components + Component[] existing = new Component[passwordRow.getComponentCount()]; + for(int i=0; i<passwordRow.getComponentCount();i++){ + existing[i] = passwordRow.getComponent(i); + } + passwordRow.removeAll(); + for(int j=0;j<existing.length;j++){ + if(j==1){//insert new JTextField instead + passwordRow.add(updatedContainer); + }else{ + passwordRow.add(existing[j]); + } + } + //reload testUserRegion + //store off existing components + Component[] existingTest = new Component[testUserRegion.getComponentCount()]; + for(int i=0; i<testUserRegion.getComponentCount();i++){ + existingTest[i] = testUserRegion.getComponent(i); + } + testUserRegion.removeAll(); + for(int j=0;j<existingTest.length;j++){ + if(j==3){//insert new JTextField instead + testUserRegion.add(testUserPasswordValue); + }else{ + testUserRegion.add(existingTest[j]); + } + } + + top.revalidate(); + top.repaint(); + } + }); + } + }); + securityPanel.add(showPasswords); + ssl = new JCheckBox("SSL:"); + ssl.setEnabled(false); + securityPanel.add(ssl); + top.add(securityPanel); + + // test user auth region + testUserRegion = new JPanel(); + testUserRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); + LineBorder border = new LineBorder(Color.BLUE, 2); + TitledBorder tBorder = new TitledBorder(border, "Authentication/Authorization Check Credentials: (insert valid ldap user assigned to group)"); + testUserRegion.setBorder(tBorder); + JLabel testUserName = new JLabel("Test UserName:"); + testUserNameValue = new JTextField(textBoxWidth); + JLabel testUserPassword = new JLabel("Test Password:"); +// testUserPasswordValue = new JTextField(textBoxWidth); + testUserPasswordValue = new JPasswordField(textBoxWidth); + testUserRegion.add(testUserName); + testUserRegion.add(testUserNameValue); + testUserRegion.add(testUserPassword); + testUserRegion.add(testUserPasswordValue); + top.add(testUserRegion); + + // center + JPanel center = new JPanel(); + center.setLayout(new BoxLayout(center, BoxLayout.X_AXIS)); + // build center panel + buildCenterPanel(center); + + // final component layout + getContentPane().add(top, BorderLayout.NORTH); + getContentPane().add(center, BorderLayout.CENTER); + this.setSize(720, 700); + addWindowListener(new WindowAdapter() { + public void windowClosing(WindowEvent e) { + System.exit(0); + } + }); + setVisible(true); + } + + // define the center display panel. + private void buildCenterPanel(JPanel center) { + // First element is Test Button + JButton test = new JButton("Test Settings"); + center.add(test); + // second is large text box that display ldap queries + testResults = new JTextArea("(click button to test settings values: simulates 4 separate checks showing ldap filters used)", + 40, 40); + JScrollPane jsp = new JScrollPane(testResults); + center.add(jsp); + test.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + testResults.setText("");//clear out empty msg + //trim spaces from all fields + String ldapServer = fieldMappings.get(keys[0]).getText().trim(); + String searchFilter = fieldMappings.get(keys[1]).getText().trim(); + String searchBase = fieldMappings.get(keys[2]).getText().trim(); + String loginProperty = fieldMappings.get(keys[3]).getText().trim(); + String bindUserName = fieldMappings.get(keys[4]).getText().trim(); + String groupSearchFilter = fieldMappings.get(keys[5]).getText().trim(); + String bindPassword = fieldMappings.get(keys[6]).getText().trim(); + String groupMemberFilter = fieldMappings.get(keys[7]).getText().trim(); + String groupMemberQuerySize = groupMemberQueryValue.getText().trim(); + String testUserName = testUserNameValue.getText().trim(); + String testUserPassword = testUserPasswordValue.getText().trim(); + // validate initial required elements + String msg = null; + boolean proceed = true; + //valid required details set. + if (ldapServer.isEmpty() || bindUserName.isEmpty() + || bindPassword.isEmpty() || searchBase.isEmpty()) { + msg ="STEP-1:FAIL: "+ keys[0] + ", " + keys[2] + ", " + keys[4] + ", " + + keys[6] + " cannot be empty to proceed."; + log(msg); + proceed = false; + } + env = null; + InitialLdapContext ctx = null; + if (proceed) {// attempt initial ldap bind from RHQ server + msg = "STEP-1:TESTING: Attempting to bind to server:" + ldapServer + + "\n with user '" + bindUserName + + "' and password entered."; + log(msg); + env = getProperties(ldapServer); + env.setProperty(Context.SECURITY_PRINCIPAL, bindUserName); + env.setProperty(Context.SECURITY_CREDENTIALS, bindPassword); + env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + //put the rest of the LDAP properties into the Properties instance for use later. + //there still needs to be separate variables since some are for UI validation. + env.setProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), groupSearchFilter); + env.setProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), groupMemberFilter); + env.setProperty(SystemSetting.LDAP_BASE_DN.getInternalName(), searchBase); + env.setProperty(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName(), loginProperty); + env.setProperty(SystemSetting.LDAP_BIND_DN.getInternalName(), bindUserName); + env.setProperty(SystemSetting.LDAP_BIND_PW.getInternalName(), bindPassword); + env.setProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.getInternalName(), groupMemberQuerySize); + + try { + ctx = new InitialLdapContext(env, null); + msg = "STEP-1:PASS: LDAP bind credentials are correct. Successfully connected to '" + + ldapServer + + "'.\n This means the LDAP Bind credentials for the RHQ Server authentication/authorization requests to ldap server " + + "are correct."; + if(enableVerboseDebugging.isSelected()){ + msg+="\n"+advdb+" LDAP simple authentication bind successful."; + } + log(msg); + proceed = true; + } catch (Exception ex) { + msg = "STEP-1:FAIL: Unable to connect to the LDAP server with credentials specified.\n"; + msg+="Exception:"+ex.getMessage(); + if(enableVerboseDebugging.isSelected()){ + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + proceed = false; + } + } + if (proceed) {// retrieve test credentials to test run auth + // load search controls + SearchControls searchControls = getSearchControls(); + // validating searchFilter and test user/pass creds + proceed = true; + if (testUserName.isEmpty() || (testUserPassword.isEmpty())) { + msg = "STEP-2:FAIL: Test Username/Password fields cannot be empty for this step."; + log(msg); + proceed = false; + } + // testing a valid user involves a filtered ldap search + // using the loginProperty, and optionally searchFilter + String userDN = ""; + if (proceed) { + // default loginProperty to cn if it's not set + if (loginProperty.isEmpty()) { + loginProperty = "cn"; + if(enableVerboseDebugging.isSelected()){ + String mesg = "As you have not specified a login property, defaulting to 'cn'"; + log(advdb+" "+msg); + } + } + String filter; + if (!searchFilter.isEmpty()) { + filter = "(&(" + loginProperty + "=" + testUserName + + ")" + "(" + searchFilter + "))"; + } else { + filter = "(" + loginProperty + "=" + testUserName + + ")"; + } + if(enableVerboseDebugging.isSelected()){ + log(advdb+" The searchfilter is optionally appended to login property for additional shared attribute across users."); + } + msg = "STEP-2:TESTING: To validate the test user the following LDAP filtered component will be used to find matching users:\n"; + msg += filter; + log(msg); + // test out the search on the target ldap server + try { + String[] baseDNs = searchBase.split(";"); + for (int x = 0; x < baseDNs.length; x++) { + NamingEnumeration answer = ctx.search( + baseDNs[x], filter, searchControls); + if(enableVerboseDebugging.isSelected()){ + log(advdb+" this search was excuted against DN component '"+baseDNs[x]+"'."); + } + // boolean ldapApiNpeFound = false; + if (!answer.hasMoreElements()) { + msg="STEP-2:WARN Unable to locate a matching users for the filter'"+filter+ + "'. Please check your loginProperty. Usually 'cn' or 'uid'"; + log(msg); + continue; + } + // Going with the first match + SearchResult si = (SearchResult) answer.next(); + + // Construct the UserDN + userDN = si.getName() + "," + baseDNs[x]; + msg = "STEP-2:PASS: The test user '" + + testUserName + + "' was succesfully located, and the following userDN will be used in authorization check:\n"; + msg += userDN; + log(msg); + + ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, userDN); + ctx.addToEnvironment(Context.SECURITY_CREDENTIALS,testUserPassword); + ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION,"simple"); + + // if successful then verified that user and pw + // are valid ldap credentials + ctx.reconnect(null); + msg = "STEP-2:PASS: The user '" + + testUserName + + "' was succesfully authenticated using userDN '" + + userDN + "' and password provided.\n" + +"*Note: the loginProperty must match the loginProperty listed in dn: for the user. It is the DN that RHQ will lookup and use."; + log(msg); + } + } catch (Exception ex) { + msg = "STEP-2:FAIL: There was an error while searching for or authenticating the user '" + + testUserName + "'\n"; + msg += ex.getMessage(); + if(enableVerboseDebugging.isSelected()){ + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + proceed=false; + } + } + // with authentication completed, now check authorization. + // validate filter components to list all available groups + proceed = false; + if (!groupSearchFilter.isEmpty()) { + Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); + String filter = null; + + if (groupSearchFilter.startsWith("(") && groupSearchFilter.endsWith(")")){ + filter = groupSearchFilter; // RFC 2254 does not allow for ((expression)) + }else{ + filter = String + .format("(%s)", groupSearchFilter); + } + msg = "STEP-3:TESTING: This ldap filter " + + filter + + " will be used to locate ALL available LDAP groups"; + log(msg); + + Properties systemConfig = populateProperties(env); + + ret = buildGroup(systemConfig, filter); + msg = "STEP-3:TESTING: Using Group Search Filter '" + + filter + "', " + ret.size() + + " ldap group(s) were located.\n"; + if (ret.size() > 0) { + HashMap<String, String>[] ldapLists = new HashMap[ret + .size()]; + ret.toArray(ldapLists); + // in this mode go beyond the first ten results. + if (enableVerboseGroupParsing.isSelected()) { + msg += "STEP-3:PASS: Listing 'all' of the ldap groups located: \n"; + for (int i = 0; i < ret.size(); i++) { + msg += ldapLists[i] + "\n"; + } + } else {// otherwise only show first 10[subset of + // available groups] + msg += "STEP-3:PASS: Listing a few(<=10) of the ldap groups located: \n"; + for (int i = 0; (i < ret.size() && i < 10); i++) { + msg += ldapLists[i] + "\n"; + } + } + proceed = true;// then can proceed to next step. + } + log(msg); + } else { + msg = "STEP-3:FAIL: Group Search Filter: cannot be empty to proceed."; + log(msg); + proceed=false; + } + // retrieve lists of authorized groups available for the + if (proceed) { + // check groupMember + if (!groupMemberFilter.isEmpty()) { +// Map<String, String> userDetails = new HashMap<String, String>(); +// userDetails = findLdapUserDetails(userDN); + Set<String> userDetails = findAvailableGroupsFor(testUserName); + + if(!userDetails.isEmpty()){ + proceed=true; + } + } else { + msg = "STEP-4:FAIL: Group Member Filter must be non-empty to proceed with simulating authorization check for test user."; + log(msg); + } + } + if(proceed){ + msg="COMPLETED:PASS: The current settings, for successful steps, should be correct to enter into your RHQ server."; + msg+="\n\n\n\n When you encounter failures, warnings or other unexpected results you should use an external "; + msg+="LDAP search utility to check that the generated filters return the expected LDAP results."; + log(msg); + } + } + } + }); + } + + private String appendStacktraceToMsg(String msg, Exception ex) { + String moreVerbose = ""; + moreVerbose+=advdb+" Exception type:"+ex.getClass()+"\n"; + moreVerbose+=advdb+" Exception stack trace reference:"+ex.getStackTrace()+"\n"; + if(ex.getStackTrace()!=null){ + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + ex.printStackTrace(pw); + moreVerbose+=advdb+" stack trace reference:"+sw.toString(); + } + msg+="\n"+moreVerbose; + return msg; + } + + private boolean containsIllegalLdap(String currentValue) { + boolean invalidData = false; + if((currentValue!=null)&&(!currentValue.trim().isEmpty())){ + //TODO: spinder 3/17/11: need to figure out regex to filter/detect bad data in returned ldap. Giving up for now. +// String regex = "(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)[/,+\"><;=#]|(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)\$?!\\|[/,+\"><;=#]| $|(?<=^\$ )|^"; +// regex = "(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)[/,+\\\"><;=#]|(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)\\\$?!\\\\|[/,+\\\"><;=#]| $|(?<=^\\\$ )|^"; +// System.out.println("++++++++ CURR VAL:"+currentValue+":INV-CHeck:"+currentValue.matches(",+\"\\<;\n=/")+":NEWCHECK:"+(currentValue.matches(regex))); +// if(currentValue.matches(",+\"\\<;\n=/")){ +// invalidData=true; +// } +// String badList = ",+\"\\<;\n="; + String badList = "+\"\\<;\n"; + for(char car :currentValue.toCharArray()){ + for(char c :badList.toCharArray()){ + if(car == c){ + invalidData=true; + } + } + } + + } + return invalidData; + } + /** + * @throws NamingException + * @see org.jboss.security.auth.spi.UsernamePasswordLoginModule#validatePassword(java.lang.String,java.lang.String) + */ + protected Set<Map<String, String>> buildGroup(Properties systemConfig, String filter) { + Set<Map<String, String>> groupDetailsMap = new HashSet<Map<String, String>>(); + // Load our LDAP specific properties + // Load the BaseDN + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + + // Load the LoginProperty + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); + if (loginProperty == null) { + // Use the default + loginProperty = "cn"; + } + // Load any information we may need to bind + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); + if (bindDN != null) { + systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); + systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); + systemConfig.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + } + try { + InitialLdapContext ctx = new InitialLdapContext(systemConfig, null); + SearchControls searchControls = getSearchControls(); + /*String filter = "(&(objectclass=groupOfUniqueNames)(uniqueMember=uid=" + userName + + ",ou=People, dc=rhndev, dc=redhat, dc=com))";*/ + + //modify the search control to only include the attributes we will use + String[] attributes = { "cn", "description" }; + searchControls.setReturningAttributes(attributes); + + //BZ:964250: add rfc 2696 + //default to 1000 results. System setting page size from UI should be non-negative integer > 0. + //additionally as system settings are modifiable via CLI which may not have param checking enabled do some + //more checking. + int defaultPageSize = 1000; + // only if they're enabled in the UI. + if (enable32xFeatures.isSelected()) { + String groupPageSize = systemConfig.getProperty( + SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE + .getInternalName(), "" + defaultPageSize); + if ((groupPageSize != null) + && (!groupPageSize.trim().isEmpty())) { + int passedInPageSize = -1; + try { + passedInPageSize = Integer + .valueOf(groupPageSize.trim()); + if (passedInPageSize > 0) { + defaultPageSize = passedInPageSize; + if(enableVerboseDebugging.isSelected()){ + log(advdb + + " LDAP Group Query Page Sizing of '"+defaultPageSize+"' is being requested from server."); + } + } + } catch (NumberFormatException nfe) { + // log issue and do nothing. Go with the default. + String msg = "LDAP Group Page Size passed in '" + + groupPageSize + + "' in is invalid. Defaulting to 1000 results." + + nfe.getMessage(); + log(msg); + } + } + ctx.setRequestControls(new Control[] { new PagedResultsControl( + defaultPageSize, Control.CRITICAL) }); + } + // Loop through each configured base DN. It may be useful + // in the future to allow for a filter to be configured for + // each BaseDN, but for now the filter will apply to all. + String[] baseDNs = baseDN.split(BASEDN_DELIMITER); + + for (int x = 0; x < baseDNs.length; x++) { + if (enableVerboseDebugging.isSelected()) { + log(advdb + + " this search was excuted against DN component '" + + baseDNs[x] + "'."); + } + executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); + + // continually parsing pages of results until we're done. + // only if they're enabled in the UI. + if (enable32xFeatures.isSelected()) { + // handle paged results if they're being used here + byte[] cookie = null; + Control[] controls = ctx.getResponseControls(); + if (controls != null) { + for (Control control : controls) { + if (control instanceof PagedResultsResponseControl) { + PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; + cookie = pagedResult.getCookie(); + } + } + } + + while (cookie != null) { + String msg = "RFC 2696 is supported by the server and we are paging through the results. "+ + groupDetailsMap.size()+" results returned so far."; + if(enableVerboseGroupParsing.isSelected()){ + log(advdb + + msg); + } + // ensure the next requests contains the session/cookie + // details + ctx.setRequestControls(new Control[] { new PagedResultsControl( + defaultPageSize, cookie, Control.CRITICAL) }); + executeGroupSearch(filter, groupDetailsMap, ctx, + searchControls, baseDNs, x); + // empty out cookie + cookie = null; + // test for further iterations + controls = ctx.getResponseControls(); + if (controls != null) { + for (Control control : controls) { + if (control instanceof PagedResultsResponseControl) { + PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; + cookie = pagedResult.getCookie(); + } + } + } + } + } + }//end of for loop + } catch (NamingException e) { + if (e instanceof InvalidSearchFilterException) { + InvalidSearchFilterException fException = (InvalidSearchFilterException) e; + String message = "The ldap group filter defined is invalid "; + log(message); + } + //TODO: check for ldap connection/unavailable/etc. exceptions. + else { + String mesg = "LDAP communication error: " + e.getMessage(); + log(mesg); + } + } catch (IOException iex) { + String msg = "Unexpected LDAP communciation error:" + iex.getMessage(); + log(msg); + } + + return groupDetailsMap; + } + + /** Executes the LDAP group query using the filters, context and search controls, etc. parameters passed in. + * The matching groups located during processing this pages of results are added as new entries to the + * groupDetailsMap passed in. + * + * @param filter + * @param groupDetailsMap + * @param ctx + * @param searchControls + * @param baseDNs + * @param x + * @throws NamingException + */ + private void executeGroupSearch(String filter, Set<Map<String, String>> groupDetailsMap, InitialLdapContext ctx, + SearchControls searchControls, String[] baseDNs, int x) throws NamingException { + //execute search based on controls and context passed in. + NamingEnumeration<SearchResult> answer = ctx.search(baseDNs[x], filter, searchControls); + boolean ldapApiEnumerationBugEncountered = false; + while ((!ldapApiEnumerationBugEncountered) && answer.hasMoreElements()) {//BZ:582471- ldap api bug change + // We use the first match + SearchResult si = null; + try { + si = answer.next(); + } catch (NullPointerException npe) { + if (enableVerboseDebugging.isSelected()) { + log(advdb + + " NullPtr exception detected. If known LDAP api enum npe ignore: " + + npe.getMessage() + "."); + } + ldapApiEnumerationBugEncountered = true; + break; + } + + if (enableVerboseDebugging.isSelected() + || enableVerboseGroupParsing.isSelected()) { + Attributes attributeContainer = si.getAttributes(); + NamingEnumeration<? extends Attribute> attributes = attributeContainer + .getAll(); + String attributesReturned = " "; + while (attributes.hasMore()) { + attributesReturned += attributes.next().getID() + ","; + } + String dbugMesg = "\n" + + advdb + + " Group search LDAP (" + + attributeContainer.size() + + ") attributes located for group '" + + si.getName() + + "' are [" + + attributesReturned.substring(0, + attributesReturned.length() - 1) + "]."; + // directly update here to shorten messages for lots of groups + testResults.setText(testResults.getText() + dbugMesg); + //This flag can be used in the unlikely case that the UI hangs during a test operation.: + if(iterativeVerboseLogging.isSelected()){ + System.out.println(dbugMesg); + } + + // additionally parse attribute ids and values for illegal ldap + // characters + if (enableVerboseGroupParsing.isSelected()) { + attributes = attributeContainer.getAll(); + String currentAttributeId = ""; + String currentValue = ""; + // spinder: 3/17/11: should we bail on first bad data or + // display them all? + while (attributes.hasMore()) { + boolean badData = false; + Attribute att = attributes.next(); + currentAttributeId = att.getID(); + if (containsIllegalLdap(currentAttributeId)) { + log(advdb + + " LDAP Group: bad atrribute data detected for group '" + + si.getName() + "' for attribute '" + + currentAttributeId + "'."); + badData = true; + } + if (att.getAll() != null) { + NamingEnumeration<?> enumer = att.getAll(); + while (enumer.hasMore()) { + currentValue = enumer.next() + ""; + if (containsIllegalLdap(currentValue)) { + log(advdb + + " LDAP Group: bad data detected for group '" + + si.getName() + + "' with attribute '" + + currentAttributeId + + "' and value:" + currentValue); + badData = true; + } + } + } + if (badData) { + log(advdb + + "** LDAP Group: Some bad LDAP data detected for group '" + + si.getName() + "'."); + } + } + } + } + + Map<String, String> entry = new HashMap<String, String>(); + // String name = (String) si.getAttributes().get("cn").get(); + Attribute commonNameAttr = si.getAttributes().get("cn"); + if (commonNameAttr != null) { + String name = (String) commonNameAttr.get(); + name = name.trim(); + Attribute desc = si.getAttributes().get("description"); + String description = desc != null ? (String) desc.get() : ""; + description = description.trim(); + entry.put("id", name); + entry.put("name", name); + entry.put("description", description); + groupDetailsMap.add(entry); + } else {// unable to retrieve details for specific group. + log(advdb + + " There was an error retrieving 'cn' attribute for group '" + + si.getName() + + "'. Not adding to returned list of groups. "); + } + } + } + + public Map<String, String> findLdapUserDetails(String userName) { + // Load our LDAP specific properties + Properties systemConfig = env; + HashMap<String, String> userDetails = new HashMap<String, String>(); + + // Load the BaseDN + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + + // Load the LoginProperty + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); + if (loginProperty == null) { + // Use the default + loginProperty = "cn"; + } + // Load any information we may need to bind + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); + + // Load any search filter + String groupSearchFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); + String groupMemberFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_MEMBER.getInternalName()); + String testUserDN=userName; + String ldapServer = (String) systemConfig.get(Context.PROVIDER_URL); + + Properties env = getProperties(ldapServer); + + if (bindDN != null) { + env.setProperty(Context.SECURITY_PRINCIPAL, bindDN); + env.setProperty(Context.SECURITY_CREDENTIALS, bindPW); + env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + } + + try { + InitialLdapContext ctx = new InitialLdapContext(env, null); + SearchControls searchControls = getSearchControls(); + + String filter = String.format("(&(%s)(%s=%s))", + groupSearchFilter, groupMemberFilter, + testUserDN); + + generateUiLoggingForStep4LdapFilter(userName, filter); + + // Loop through each configured base DN. It may be useful + // in the future to allow for a filter to be configured for + // each BaseDN, but for now the filter will apply to all. + String[] baseDNs = baseDN.split(BASEDN_DELIMITER); + for (int x = 0; x < baseDNs.length; x++) { + NamingEnumeration<SearchResult> answer = ctx.search(baseDNs[x], filter, searchControls); + if (!answer.hasMoreElements()) { //BZ:582471- ldap api bug change + // Nothing found for this DN, move to the next one if we have one. + continue; + } + + // We use the first match + SearchResult si = answer.next(); + //generate the DN + String userDN = null; + try { + userDN = si.getNameInNamespace(); + } catch (UnsupportedOperationException use) { + userDN = si.getName(); + if (userDN.startsWith("\"")) { + userDN = userDN.substring(1, userDN.length()); + } + if (userDN.endsWith("\"")) { + userDN = userDN.substring(0, userDN.length() - 1); + } + userDN = userDN + "," + baseDNs[x]; + } + userDetails.put("dn", userDN); + + // Construct the UserDN + NamingEnumeration<String> keys = si.getAttributes().getIDs(); + while (keys.hasMore()) { + String key = keys.next(); + Attribute value = si.getAttributes().get(key); + if ((value != null) && (value.get() != null)) { + userDetails.put(key, value.get().toString()); + } + } +// return userDetails; + }//end of for loop + generateUiLoggingStep4Authz(filter); + return userDetails; + } catch (Exception ex) { + generateUiLoggingStep4Exception(ex); + } + return userDetails; + } + + public Set<String> findAvailableGroupsFor(String userName) { + // Load our LDAP specific properties + Properties options = env; + String groupFilter = options.getProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), ""); + String groupMember = options.getProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), ""); + String groupUsePosix = options.getProperty(SystemSetting.LDAP_GROUP_USE_POSIX.getInternalName(), "false"); + if (groupUsePosix == null) { + groupUsePosix = Boolean.toString(false);//default to false + } + boolean usePosixGroups = Boolean.valueOf(groupUsePosix); + String userAttribute = getUserAttribute(options, userName, usePosixGroups); + Set<String> ldapSet = new HashSet<String>(); + + if (userAttribute != null && userAttribute.trim().length() > 0) { + //TODO: spinder 4/21/10 put in error/debug logging messages for badly formatted filter combinations + String filter = ""; + //form assumes examples where groupFilter is like 'objectclass=groupOfNames' and groupMember is 'member' + // to produce ldap filter like (&(objectclass=groupOfNames)(member=cn=Administrator,ou=People,dc=test,dc=com)) + // or like (&(objectclass=groupOfNames)(memberUid=Administrator)) for posixGroups. + filter = String.format("(&(%s)(%s=%s))", groupFilter, groupMember, encodeForFilter(userAttribute)); + + Set<Map<String, String>> matched = buildGroup(options, filter); +// log.trace("Located '" + matched.size() + "' LDAP groups for user '" + userName +// + "' using following ldap filter '" + filter + "'."); + + //iterate to extract just the group names. + for (Map<String, String> match : matched) { + ldapSet.add(match.get("id")); + } + } else { +// log.debug("Group lookup will not be performed due to no UserDN found for user " + userName); + } + + return ldapSet; + } + + private void generateUiLoggingStep4Exception(Exception ex) { + String groupSearchFilter = env + .getProperty(SystemSetting.LDAP_GROUP_FILTER + .getInternalName()); + String msg = "STEP-4:FAIL: There was an error searching with the groupFilter supplied: " + + groupSearchFilter + "'\n"; + msg += ex.getMessage(); + if (enableVerboseDebugging.isSelected()) { + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + } + + private void generateUiLoggingStep4Authz(String filter) { + Set<Map<String, String>> groups = buildGroup(env, filter); + String msg = "STEP-4:TESTING: Using Group Search Filter '" + + filter + "', " + groups.size() + + " ldap group(s) were located.\n"; + if (groups.size() > 0) { + HashMap<String, String>[] ldapLists = new HashMap[groups + .size()]; + groups.toArray(ldapLists); + msg += "STEP-4:PASS: Listing a few of the ldap groups located: \n"; + // iterate over first ten or less to demonstrate retrieve + for (int i = 0; (i < groups.size() && i < 10); i++) { + msg += ldapLists[i] + "\n"; + } + }else{ + msg+="STEP-4:WARN: With current settings, test user is not authorized for any groups. Is this correct?"; + } + log(msg); + } + + private void generateUiLoggingForStep4LdapFilter(String userName, + String filter) { + String msg = "STEP-4:TESTING: about to do ldap search with filter \n'" + + filter + + "'\n to locate groups that test user '"+userName+"' IS authorized to access."; + log(msg); + } + + + // throw the label and fields together, two to a row. + private HashMap<String, JTextField> loadUiFields(JPanel top, + String[] componentKeys) { + HashMap<String, JTextField> mappings = new HashMap<String, JTextField>(); + for (int i = 0; i < componentKeys.length; i++) { + String firstLabelKey = componentKeys[i]; + String secondLabelKey = componentKeys[++i]; + // locate second key + JPanel row = new JPanel(); + row.setLayout(new FlowLayout(FlowLayout.LEFT)); + JLabel label1 = new JLabel(firstLabelKey); + label1.setSize(textBoxWidth, 5); +// JTextField value1 = new JTextField(textBoxWidth); + JTextField value1 = null; + if (firstLabelKey.equalsIgnoreCase("Password:")&&(!showPasswords.isSelected())) { + value1 = new JPasswordField(textBoxWidth); + } else { + value1 = new JTextField(textBoxWidth); + } + JLabel label2 = new JLabel(secondLabelKey); + JTextField value2 = new JTextField(textBoxWidth); + row.add(label1); + row.add(value1); + row.add(Box.createRigidArea(new Dimension(0, 5))); + row.add(label2); + row.add(value2); + mappings.put(firstLabelKey, value1); + mappings.put(secondLabelKey, value2); + top.add(row); + } + + return mappings; + } + + private Properties getProperties(String contentProvider) { + Properties env = new Properties(); + env.setProperty(Context.INITIAL_CONTEXT_FACTORY, + "com.sun.jndi.ldap.LdapCtxFactory"); + env.setProperty(Context.PROVIDER_URL, contentProvider); + if(!enableLdapReferral.isSelected()){ + env.setProperty(Context.REFERRAL, "ignore"); + }else{ + String msg="**---- You have chosen to tell LDAP servers to [FOLLOW] context referrals. Default is [IGNORE] referrals. --**"; + log(msg); + env.setProperty(Context.REFERRAL, "follow"); + } + +// // Setup SSL if requested +// String protocol = ssl.isSelected()? "ssl":""; +// if ((protocol != null) && protocol.equals("ssl")) { +// String ldapSocketFactory = env +// .getProperty("java.naming.ldap.factory.socket"); +// if (ldapSocketFactory == null) { +// env.put("java.naming.ldap.factory.socket", +// UntrustedSSLSocketFactory.class.getName()); +// } +// env.put(Context.SECURITY_PROTOCOL, "ssl"); +// } + + return env; + } + + private String delineate() { + String line = "-"; + for (int i = 0; i < 30; i++) { + line += "-"; + } + return line; + } + + /** Takes care of delineating messages and conditional logging contents passed in. + * @param msg + */ + private void log(String msg) { + String message = "\n" + delineate() + "\n"; + message += msg; + message += "\n" + delineate() + "\n\n"; + //This flag can be used in the unlikely case that the UI hangs during a test operation.: + if(iterativeVerboseLogging.isSelected()){ + System.out.println(message); + } + testResults.setText(testResults.getText() + message); + } + + private SearchControls getSearchControls() { + int scope = SearchControls.SUBTREE_SCOPE; + int timeLimit = 0; + long countLimit = 0; + String[] returnedAttributes = null; + boolean returnObject = false; + boolean deference = false; + SearchControls constraints = new SearchControls(scope, countLimit, + timeLimit, returnedAttributes, returnObject, deference); + return constraints; + } + + /** Translate SystemSettings to familiar Properties instance since we're + * passing not one but multiple values. + * + * @param systemSettings + * @return + */ + private Properties populateProperties(Properties existing) { + Properties properties = new Properties(); + if(existing!=null){ + properties = existing; + } + for (SystemSetting entry : SystemSetting.values()) { + if(entry!=null){ + switch(entry){ + case LDAP_BASED_JAAS_PROVIDER: + properties.put(entry.getInternalName(), ""); + break; + } + } + } + return properties; + } + + /**Build/retrieve the user DN. Not usually a property. + * + * @param options + * @param userName + * @param usePosixGroups boolean indicating whether we search for groups with posixGroup format + * @return + */ + private String getUserAttribute(Properties options, String userName, boolean usePosixGroups) { + Map<String, String> details = findLdapUserDetails(userName); + String userAttribute = null; + if (usePosixGroups) {//return just the username as posixGroup member search uses (&(%s)(memberUid=username)) + userAttribute = userName; + } else {//this is the default where group search uses (&(%s)(uniqueMember={userDn})) + userAttribute = details.get("dn"); + } + + return userAttribute; + } + + /** See LDAPStringUtil.encodeForFilter() for original code/source/author/etc. + * <p>Encode a string so that it can be used in an LDAP search filter.</p> + * + * <p>The following table shows the characters that are encoded and their + * encoded version.</p> + * + * <table> + * <tr><th align="center">Character</th><th>Encoded As</th></tr> + * <tr><td align="center">*</td><td>\2a</td></tr> + * <tr><td align="center">(</td><td>\28</td></tr> + * <tr><td align="center">)</td><td>\29</td></tr> + * <tr><td align="center">\</td><td>\5c</td></tr> + * <tr><td align="center"><code>null</code></td><td>\00</td></tr> + * </table> + * + * <p>In addition to encoding the above characters, any non-ASCII character + * (any character with a hex value greater then <code>0x7f</code>) is also + * encoded and rewritten as a UTF-8 character or sequence of characters in + * hex notation.</p> + * + * @param filterString a string that is to be encoded + * @return the encoded version of <code>filterString</code> suitable for use + * in a LDAP search filter + * @see <a href="http://tools.ietf.org/html/rfc4515">RFC 4515</a> + */ + public static String encodeForFilter(final String filterString) { + if (filterString != null && filterString.length() > 0) { + StringBuilder encString = new StringBuilder(filterString.length()); + for (int i = 0; i < filterString.length(); i++) { + char ch = filterString.charAt(i); + switch (ch) { + case '*': // encode a wildcard * character + encString.append("\\2a"); + break; + case '(': // encode a open parenthesis ( character + encString.append("\\28"); + break; + case ')': // encode a close parenthesis ) character + encString.append("\\29"); + break; + case '\\': // encode a backslash \ character + encString.append("\\5c"); + break; + case '\u0000': // encode a null character + encString.append("\\00"); + break; + default: + if (ch <= 0x7f) { // an ASCII character + encString.append(ch); + } else if (ch >= 0x80) { // encode to UTF-8 + try { + byte[] utf8bytes = String.valueOf(ch).getBytes("UTF8"); + for (byte b : utf8bytes) { + encString.append(String.format("\\%02x", b)); + } + } catch (UnsupportedEncodingException e) { + // ignore + } + } + } + } + return encString.toString(); + } + return filterString; + } +} + +//Mock up the upgraded system properties approach to use SystemSetting +enum SystemSetting { + LDAP_BASED_JAAS_PROVIDER("CAM_JAAS_PROVIDER"), + LDAP_NAMING_PROVIDER_URL("CAM_LDAP_NAMING_PROVIDER_URL"), + USE_SSL_FOR_LDAP("CAM_LDAP_PROTOCOL"), + LDAP_LOGIN_PROPERTY("CAM_LDAP_LOGIN_PROPERTY"), + LDAP_FILTER("CAM_LDAP_FILTER"), + LDAP_GROUP_FILTER("CAM_LDAP_GROUP_FILTER"), + LDAP_GROUP_MEMBER("CAM_LDAP_GROUP_MEMBER"), + LDAP_GROUP_QUERY_PAGE_SIZE("CAM_LDAP_GROUP_QUERY_PAGE_SIZE"), + LDAP_BASE_DN("CAM_LDAP_BASE_DN"), + LDAP_BIND_DN("CAM_LDAP_BIND_DN"), + LDAP_BIND_PW("CAM_LDAP_BIND_PW"), + LDAP_NAMING_FACTORY("CAM_LDAP_NAMING_FACTORY_INITIAL"), + LDAP_GROUP_USE_POSIX("CAM_LDAP_GROUP_USE_POSIX"), + ; + + private String internalName; + + private SystemSetting(String name) { + this.internalName = name; + } + + public String getInternalName() { + return internalName; + } + + public static SystemSetting getByInternalName(String internalName) { + for (SystemSetting p : SystemSetting.values()) { + if (p.internalName.equals(internalName)) { + return p; + } + } + return null; + } +} + + commit ec33bbd668d34ab132f4fc46a545e2c9e4cb0951 Author: Simeon Pinder <spinder(a)redhat.com> Date: Tue Jul 30 17:11:49 2013 -0400 Move TestLdapSettings to it's own module. diff --git a/modules/helpers/ldap-tool/pom.xml b/modules/helpers/ldap-tool/pom.xml new file mode 100644 index 0000000..28f8678 --- /dev/null +++ b/modules/helpers/ldap-tool/pom.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.rhq</groupId> + <artifactId>rhq-parent</artifactId> + <version>4.9.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> + </parent> + + <groupId>org.rhq.helpers</groupId> + <artifactId>ldap-tool</artifactId> + <packaging>jar</packaging> + <version>4.9.0-SNAPSHOT</version> + + <properties> + <executable.name>TestLdapSettings</executable.name> + <tool.version>1.0.1</tool.version> + </properties> + + <name>RHQ ldap test tool</name> + <description>Executable jar to exercise LDAP settings used by RHQ with external LDAP server.</description> + + <build> + + <plugins> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <packageName>com.test</packageName> + <mainClass>com.test.TestLdapSettings</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <id>tool-finalize</id> + <phase>verify</phase> + <configuration> + <target> + <copy file="${project.build.directory}/${project.build.finalName}.jar" + tofile="${project.build.directory}/${executable.name}.jar"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-release-plugin</artifactId> + <version>2.1</version> + </plugin> + + </plugins> + + </build> + +</project> + + diff --git a/modules/helpers/ldap-tool/src/main/java/com/test/TestLdapSettings.java b/modules/helpers/ldap-tool/src/main/java/com/test/TestLdapSettings.java new file mode 100644 index 0000000..75ff277 --- /dev/null +++ b/modules/helpers/ldap-tool/src/main/java/com/test/TestLdapSettings.java @@ -0,0 +1,1285 @@ +package com.test; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import javax.naming.Context; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; +import javax.naming.directory.Attributes; +import javax.naming.directory.InvalidSearchFilterException; +import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; +import javax.naming.ldap.Control; +import javax.naming.ldap.InitialLdapContext; +import javax.naming.ldap.PagedResultsControl; +import javax.naming.ldap.PagedResultsResponseControl; +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JPasswordField; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.LineBorder; +import javax.swing.border.TitledBorder; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +//import org.rhq.enterprise.server.util.security.UntrustedSSLSocketFactory; + +/* Is a development test tool that allows the user to simulate the RHQ server side + * LDAP calls during auth/authz operations. + * + * The specific LDAP logic below needs to mirror the latest RHQ code and allow the user + * to test our their configuration without requring a specific RHQ/JON build as a dependency. + * + * NOTE: To avoid a runtime dependency on specific versions of RHQ or JON, the small implementation + * methods were copied into this class with minimatl changes for logging and ui messaging. The + * definitive implementation for each 'copied' method can be found in LDAPGroupManagerBean. + * + * @author Simeon Pinder + */ +public class TestLdapSettings extends JFrame { + //shared fields + private JTextArea testResults; + private JCheckBox showPasswords; + private JCheckBox ssl; + private JLabel groupPageSizeName; + private JTextField groupMemberQueryValue; + private JTextField testUserNameValue; + private JTextField testUserPasswordValue; + private HashMap<String, JTextField> fieldMappings; + private String[] keys; + private JCheckBox enableLdapReferral; + private JCheckBox enableVerboseDebugging; + private JCheckBox enableVerboseGroupParsing; + private JCheckBox iterativeVerboseLogging; + private JCheckBox enablePosixGroups; + private JCheckBox enable32xFeatures; + private String advdb = "**Verbose:debug ----"; + private static final String BASEDN_DELIMITER = ";"; + + private static final long serialVersionUID = 1L; + int textBoxWidth = 20; + private static JPanel top = null; + private static JPanel testUserRegion = null; + private static Properties env=null; + + public static void main(String args[]) { + new TestLdapSettings(); + } + //After enabling support for Query parsing, we need to warn users of the effects. + final String warnMessage = "<html>***WARNING: Depending upon<br>" + + "i)how the ldap server is configured <br>" + + "ii)client query paging settings <br>" + + " enabling <b>'more detailed logging'</b>,<br>" + + " <b>'more group parsing'</b> AND/OR <b>'also log to console'</b> may cause the console to hang/freeze <br>" + + " as the LDAP tool continues to parse large query results. If that occurs it is <br>" + + " suggested that you kill tool and re-run with 'also log to console' so that the console logs<br>" + + " will show which dataset is causing the delay and then you should modify your search|group|member<br>" + + " filters accordingly to <b>return smaller results</b> and/or <b>consume larger payloads</b>.<br>" + + "***WARNING</html>"; + + // Configure window properties + private TestLdapSettings() { + + setTitle("Check LDAP Settings: Simulates LDAP checks/queries of RHQ LDAP integration"); + getContentPane().setLayout(new BorderLayout()); + // top panel definition + top = new JPanel(); + top.setLayout(new BoxLayout(top, BoxLayout.Y_AXIS)); + top.setBorder(LineBorder.createGrayLineBorder()); + //define checkbox here as it's checked when generating UI. + showPasswords = new JCheckBox("show passwords:"); + showPasswords.setSelected(false); + + keys = new String[] { "URL:", "Search Filter:", + "Search Base:","Login Property", + "Username:", "Group Search Filter:", + "Password:", "Group Member Filter:", + }; + fieldMappings = loadUiFields(top, keys); + + //add the two checkboxes for additiona debugging options + enableLdapReferral= new JCheckBox("[follow] ldap referrals"); + enableLdapReferral.setSelected(false); + enableVerboseDebugging= new JCheckBox("more verbose logging"); + enableVerboseDebugging.setSelected(false); + enableVerboseDebugging.setToolTipText(warnMessage); + enableVerboseGroupParsing= new JCheckBox("more detailed group parsing"); + enableVerboseGroupParsing.setSelected(false); + enableVerboseGroupParsing.setToolTipText("*Take care when using this mode with a large number of groups* Every group discovered is parsed/listed."); + iterativeVerboseLogging= new JCheckBox("also log to console"); + iterativeVerboseLogging.setSelected(false); + iterativeVerboseLogging.setToolTipText("This mode is useful when the test tool is having difficulty returning results from large queries."); + iterativeVerboseLogging.setToolTipText(warnMessage); + enablePosixGroups= new JCheckBox("is Posix Group"); + enablePosixGroups.setSelected(false); + enablePosixGroups.setEnabled(false); + + //put into 3.2.x functionality row + JPanel jon32xRegion = new JPanel(); + jon32xRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); + LineBorder jon32xLineBorder = new LineBorder(Color.BLACK, 2); + TitledBorder jon32xBorder = new TitledBorder(jon32xLineBorder, "JON 3.2.x/RHQ 4.8.x specific features:"); + jon32xRegion.setBorder(jon32xBorder); + enable32xFeatures= new JCheckBox("enable JON 3.2.x/RHQ 4.8.x features"); + enable32xFeatures.setToolTipText("This enables features not available before RHQ 4.8.x/JON 3.2.x."); + enable32xFeatures.setSelected(false); + enable32xFeatures.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + if(enable32xFeatures.isSelected()){ + groupPageSizeName.setEnabled(true); + groupMemberQueryValue.setEnabled(true); + groupMemberQueryValue.setEditable(true); + groupMemberQueryValue.setText("1000"); + enablePosixGroups.setEnabled(true); + }else{ + groupMemberQueryValue.setText(""); + groupPageSizeName.setEnabled(false); + groupMemberQueryValue.setEnabled(false); + groupMemberQueryValue.setEditable(false); + enablePosixGroups.setEnabled(false); + enablePosixGroups.setSelected(false); + } + } + }); + + jon32xRegion.add(enable32xFeatures); + groupPageSizeName = new JLabel("Group Query Page Size:"); + groupPageSizeName.setEnabled(false); + groupMemberQueryValue = new JTextField(10); + groupMemberQueryValue.setText("1000"); + groupMemberQueryValue.setEditable(false); + jon32xRegion.add(groupPageSizeName); + jon32xRegion.add(groupMemberQueryValue); + jon32xRegion.add(enablePosixGroups); + top.add(jon32xRegion); + + //put into row display + JPanel advancedDebugRegion = new JPanel(); + advancedDebugRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); + LineBorder advancedBorder = new LineBorder(Color.BLACK, 2); + TitledBorder debugBorder = new TitledBorder(advancedBorder, "Debug: **Warning --<hover HERE>**"); + advancedDebugRegion.setBorder(debugBorder); + advancedDebugRegion.add(enableLdapReferral); + advancedDebugRegion.add(enableVerboseDebugging); + advancedDebugRegion.add(enableVerboseGroupParsing); + advancedDebugRegion.add(iterativeVerboseLogging); + advancedDebugRegion.setToolTipText(warnMessage); + top.add(advancedDebugRegion); + + JPanel securityPanel = new JPanel(); + securityPanel.setLayout(new FlowLayout(FlowLayout.LEFT)); + showPasswords.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + //store off existing value + String existingValue = ""; + String existingTestUserPass = ""; + JTextField current = fieldMappings.get("Password:"); + if(current instanceof JPasswordField){ + JPasswordField pass = ((JPasswordField)current); + if(pass!=null){ + char[] charArray = pass.getPassword(); + if(charArray.length>0){ + existingValue = new String(charArray); + } + } + }else{ + existingValue = current.getText(); + } + //save off test user password as well + if(testUserPasswordValue instanceof JPasswordField){ + JPasswordField pass = ((JPasswordField)testUserPasswordValue); + if(pass!=null){ + char[] charArray = pass.getPassword(); + if(charArray.length>0){ + existingTestUserPass = new String(charArray); + } + } + }else{ + existingTestUserPass=testUserPasswordValue.getText(); + } + + JTextField updatedContainer = null; + if(showPasswords.isSelected()){ + updatedContainer = new JTextField(textBoxWidth); + updatedContainer.setText(existingValue); + testUserPasswordValue = new JTextField(textBoxWidth); + testUserPasswordValue.setText(existingTestUserPass); + }else{ + updatedContainer = new JPasswordField(textBoxWidth); + updatedContainer.setText(existingValue); + testUserPasswordValue = new JPasswordField(textBoxWidth); + testUserPasswordValue.setText(existingTestUserPass); + } + //locate the JPanel and rebuild it Should be at index 3 + JPanel passwordRow = (JPanel) top.getComponent(3); +// JTextField jf = (JTextField) passwordRow.getComponent(1); + //store off existing components + Component[] existing = new Component[passwordRow.getComponentCount()]; + for(int i=0; i<passwordRow.getComponentCount();i++){ + existing[i] = passwordRow.getComponent(i); + } + passwordRow.removeAll(); + for(int j=0;j<existing.length;j++){ + if(j==1){//insert new JTextField instead + passwordRow.add(updatedContainer); + }else{ + passwordRow.add(existing[j]); + } + } + //reload testUserRegion + //store off existing components + Component[] existingTest = new Component[testUserRegion.getComponentCount()]; + for(int i=0; i<testUserRegion.getComponentCount();i++){ + existingTest[i] = testUserRegion.getComponent(i); + } + testUserRegion.removeAll(); + for(int j=0;j<existingTest.length;j++){ + if(j==3){//insert new JTextField instead + testUserRegion.add(testUserPasswordValue); + }else{ + testUserRegion.add(existingTest[j]); + } + } + + top.revalidate(); + top.repaint(); + } + }); + } + }); + securityPanel.add(showPasswords); + ssl = new JCheckBox("SSL:"); + ssl.setEnabled(false); + securityPanel.add(ssl); + top.add(securityPanel); + + // test user auth region + testUserRegion = new JPanel(); + testUserRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); + LineBorder border = new LineBorder(Color.BLUE, 2); + TitledBorder tBorder = new TitledBorder(border, "Authentication/Authorization Check Credentials: (insert valid ldap user assigned to group)"); + testUserRegion.setBorder(tBorder); + JLabel testUserName = new JLabel("Test UserName:"); + testUserNameValue = new JTextField(textBoxWidth); + JLabel testUserPassword = new JLabel("Test Password:"); +// testUserPasswordValue = new JTextField(textBoxWidth); + testUserPasswordValue = new JPasswordField(textBoxWidth); + testUserRegion.add(testUserName); + testUserRegion.add(testUserNameValue); + testUserRegion.add(testUserPassword); + testUserRegion.add(testUserPasswordValue); + top.add(testUserRegion); + + // center + JPanel center = new JPanel(); + center.setLayout(new BoxLayout(center, BoxLayout.X_AXIS)); + // build center panel + buildCenterPanel(center); + + // final component layout + getContentPane().add(top, BorderLayout.NORTH); + getContentPane().add(center, BorderLayout.CENTER); + this.setSize(720, 700); + addWindowListener(new WindowAdapter() { + public void windowClosing(WindowEvent e) { + System.exit(0); + } + }); + setVisible(true); + } + + // define the center display panel. + private void buildCenterPanel(JPanel center) { + // First element is Test Button + JButton test = new JButton("Test Settings"); + center.add(test); + // second is large text box that display ldap queries + testResults = new JTextArea("(click button to test settings values: simulates 4 separate checks showing ldap filters used)", + 40, 40); + JScrollPane jsp = new JScrollPane(testResults); + center.add(jsp); + test.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + testResults.setText("");//clear out empty msg + //trim spaces from all fields + String ldapServer = fieldMappings.get(keys[0]).getText().trim(); + String searchFilter = fieldMappings.get(keys[1]).getText().trim(); + String searchBase = fieldMappings.get(keys[2]).getText().trim(); + String loginProperty = fieldMappings.get(keys[3]).getText().trim(); + String bindUserName = fieldMappings.get(keys[4]).getText().trim(); + String groupSearchFilter = fieldMappings.get(keys[5]).getText().trim(); + String bindPassword = fieldMappings.get(keys[6]).getText().trim(); + String groupMemberFilter = fieldMappings.get(keys[7]).getText().trim(); + String groupMemberQuerySize = groupMemberQueryValue.getText().trim(); + String testUserName = testUserNameValue.getText().trim(); + String testUserPassword = testUserPasswordValue.getText().trim(); + // validate initial required elements + String msg = null; + boolean proceed = true; + //valid required details set. + if (ldapServer.isEmpty() || bindUserName.isEmpty() + || bindPassword.isEmpty() || searchBase.isEmpty()) { + msg ="STEP-1:FAIL: "+ keys[0] + ", " + keys[2] + ", " + keys[4] + ", " + + keys[6] + " cannot be empty to proceed."; + log(msg); + proceed = false; + } + env = null; + InitialLdapContext ctx = null; + if (proceed) {// attempt initial ldap bind from RHQ server + msg = "STEP-1:TESTING: Attempting to bind to server:" + ldapServer + + "\n with user '" + bindUserName + + "' and password entered."; + log(msg); + env = getProperties(ldapServer); + env.setProperty(Context.SECURITY_PRINCIPAL, bindUserName); + env.setProperty(Context.SECURITY_CREDENTIALS, bindPassword); + env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + //put the rest of the LDAP properties into the Properties instance for use later. + //there still needs to be separate variables since some are for UI validation. + env.setProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), groupSearchFilter); + env.setProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), groupMemberFilter); + env.setProperty(SystemSetting.LDAP_BASE_DN.getInternalName(), searchBase); + env.setProperty(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName(), loginProperty); + env.setProperty(SystemSetting.LDAP_BIND_DN.getInternalName(), bindUserName); + env.setProperty(SystemSetting.LDAP_BIND_PW.getInternalName(), bindPassword); + env.setProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.getInternalName(), groupMemberQuerySize); + + for(Object key :env.keySet()){ + System.out.println(key+"="+env.getProperty(key+"")); + } + + try { + ctx = new InitialLdapContext(env, null); + msg = "STEP-1:PASS: LDAP bind credentials are correct. Successfully connected to '" + + ldapServer + + "'.\n This means the LDAP Bind credentials for the RHQ Server authentication/authorization requests to ldap server " + + "are correct."; + if(enableVerboseDebugging.isSelected()){ + msg+="\n"+advdb+" LDAP simple authentication bind successful."; + } + log(msg); + proceed = true; + } catch (Exception ex) { + msg = "STEP-1:FAIL: Unable to connect to the LDAP server with credentials specified.\n"; + msg+="Exception:"+ex.getMessage(); + if(enableVerboseDebugging.isSelected()){ + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + proceed = false; + } + } + if (proceed) {// retrieve test credentials to test run auth + // load search controls + SearchControls searchControls = getSearchControls(); + // validating searchFilter and test user/pass creds + proceed = true; + if (testUserName.isEmpty() || (testUserPassword.isEmpty())) { + msg = "STEP-2:FAIL: Test Username/Password fields cannot be empty for this step."; + log(msg); + proceed = false; + } + // testing a valid user involves a filtered ldap search + // using the loginProperty, and optionally searchFilter + String userDN = ""; + if (proceed) { + // default loginProperty to cn if it's not set + if (loginProperty.isEmpty()) { + loginProperty = "cn"; + if(enableVerboseDebugging.isSelected()){ + String mesg = "As you have not specified a login property, defaulting to 'cn'"; + log(advdb+" "+msg); + } + } + String filter; + if (!searchFilter.isEmpty()) { + filter = "(&(" + loginProperty + "=" + testUserName + + ")" + "(" + searchFilter + "))"; + } else { + filter = "(" + loginProperty + "=" + testUserName + + ")"; + } + if(enableVerboseDebugging.isSelected()){ + log(advdb+" The searchfilter is optionally appended to login property for additional shared attribute across users."); + } + msg = "STEP-2:TESTING: To validate the test user the following LDAP filtered component will be used to find matching users:\n"; + msg += filter; + log(msg); + // test out the search on the target ldap server + try { + String[] baseDNs = searchBase.split(";"); + for (int x = 0; x < baseDNs.length; x++) { + NamingEnumeration answer = ctx.search( + baseDNs[x], filter, searchControls); + if(enableVerboseDebugging.isSelected()){ + log(advdb+" this search was excuted against DN component '"+baseDNs[x]+"'."); + } + // boolean ldapApiNpeFound = false; + if (!answer.hasMoreElements()) { + msg="STEP-2:WARN Unable to locate a matching users for the filter'"+filter+ + "'. Please check your loginProperty. Usually 'cn' or 'uid'"; + log(msg); + continue; + } + // Going with the first match + SearchResult si = (SearchResult) answer.next(); + + // Construct the UserDN + userDN = si.getName() + "," + baseDNs[x]; + msg = "STEP-2:PASS: The test user '" + + testUserName + + "' was succesfully located, and the following userDN will be used in authorization check:\n"; + msg += userDN; + log(msg); + + ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, userDN); + ctx.addToEnvironment(Context.SECURITY_CREDENTIALS,testUserPassword); + ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION,"simple"); + + // if successful then verified that user and pw + // are valid ldap credentials + ctx.reconnect(null); + msg = "STEP-2:PASS: The user '" + + testUserName + + "' was succesfully authenticated using userDN '" + + userDN + "' and password provided.\n" + +"*Note: the loginProperty must match the loginProperty listed in dn: for the user. It is the DN that RHQ will lookup and use."; + log(msg); + } + } catch (Exception ex) { + msg = "STEP-2:FAIL: There was an error while searching for or authenticating the user '" + + testUserName + "'\n"; + msg += ex.getMessage(); + if(enableVerboseDebugging.isSelected()){ + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + proceed=false; + } + } + // with authentication completed, now check authorization. + // validate filter components to list all available groups + proceed = false; + if (!groupSearchFilter.isEmpty()) { + Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); + String filter = null; + + if (groupSearchFilter.startsWith("(") && groupSearchFilter.endsWith(")")){ + filter = groupSearchFilter; // RFC 2254 does not allow for ((expression)) + }else{ + filter = String + .format("(%s)", groupSearchFilter); + } + msg = "STEP-3:TESTING: This ldap filter " + + filter + + " will be used to locate ALL available LDAP groups"; + log(msg); + + Properties systemConfig = populateProperties(env); + + ret = buildGroup(systemConfig, filter); + msg = "STEP-3:TESTING: Using Group Search Filter '" + + filter + "', " + ret.size() + + " ldap group(s) were located.\n"; + if (ret.size() > 0) { + HashMap<String, String>[] ldapLists = new HashMap[ret + .size()]; + ret.toArray(ldapLists); + // in this mode go beyond the first ten results. + if (enableVerboseGroupParsing.isSelected()) { + msg += "STEP-3:PASS: Listing 'all' of the ldap groups located: \n"; + for (int i = 0; i < ret.size(); i++) { + msg += ldapLists[i] + "\n"; + } + } else {// otherwise only show first 10[subset of + // available groups] + msg += "STEP-3:PASS: Listing a few(<=10) of the ldap groups located: \n"; + for (int i = 0; (i < ret.size() && i < 10); i++) { + msg += ldapLists[i] + "\n"; + } + } + proceed = true;// then can proceed to next step. + } + log(msg); + } else { + msg = "STEP-3:FAIL: Group Search Filter: cannot be empty to proceed."; + log(msg); + proceed=false; + } + // retrieve lists of authorized groups available for the + if (proceed) { + // check groupMember + if (!groupMemberFilter.isEmpty()) { +// Map<String, String> userDetails = new HashMap<String, String>(); +// userDetails = findLdapUserDetails(userDN); + Set<String> userDetails = findAvailableGroupsFor(testUserName); + + if(!userDetails.isEmpty()){ + proceed=true; + } + } else { + msg = "STEP-4:FAIL: Group Member Filter must be non-empty to proceed with simulating authorization check for test user."; + log(msg); + } + } + if(proceed){ + msg="COMPLETED:PASS: The current settings, for successful steps, should be correct to enter into your RHQ server."; + msg+="\n\n\n\n When you encounter failures, warnings or other unexpected results you should use an external "; + msg+="LDAP search utility to check that the generated filters return the expected LDAP results."; + log(msg); + } + } + } + }); + } + + private String appendStacktraceToMsg(String msg, Exception ex) { + String moreVerbose = ""; + moreVerbose+=advdb+" Exception type:"+ex.getClass()+"\n"; + moreVerbose+=advdb+" Exception stack trace reference:"+ex.getStackTrace()+"\n"; + if(ex.getStackTrace()!=null){ + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + ex.printStackTrace(pw); + moreVerbose+=advdb+" stack trace reference:"+sw.toString(); + } + msg+="\n"+moreVerbose; + return msg; + } + + private boolean containsIllegalLdap(String currentValue) { + boolean invalidData = false; + if((currentValue!=null)&&(!currentValue.trim().isEmpty())){ + //TODO: spinder 3/17/11: need to figure out regex to filter/detect bad data in returned ldap. Giving up for now. +// String regex = "(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)[/,+\"><;=#]|(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)\$?!\\|[/,+\"><;=#]| $|(?<=^\$ )|^"; +// regex = "(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)[/,+\\\"><;=#]|(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)\\\$?!\\\\|[/,+\\\"><;=#]| $|(?<=^\\\$ )|^"; +// System.out.println("++++++++ CURR VAL:"+currentValue+":INV-CHeck:"+currentValue.matches(",+\"\\<;\n=/")+":NEWCHECK:"+(currentValue.matches(regex))); +// if(currentValue.matches(",+\"\\<;\n=/")){ +// invalidData=true; +// } +// String badList = ",+\"\\<;\n="; + String badList = "+\"\\<;\n"; + for(char car :currentValue.toCharArray()){ + for(char c :badList.toCharArray()){ + if(car == c){ + invalidData=true; + } + } + } + + } + return invalidData; + } + /** + * @throws NamingException + * @see org.jboss.security.auth.spi.UsernamePasswordLoginModule#validatePassword(java.lang.String,java.lang.String) + */ + protected Set<Map<String, String>> buildGroup(Properties systemConfig, String filter) { + Set<Map<String, String>> groupDetailsMap = new HashSet<Map<String, String>>(); + // Load our LDAP specific properties + // Load the BaseDN + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + + // Load the LoginProperty + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); + if (loginProperty == null) { + // Use the default + loginProperty = "cn"; + } + // Load any information we may need to bind + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); + if (bindDN != null) { + systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); + systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); + systemConfig.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + } + try { + InitialLdapContext ctx = new InitialLdapContext(systemConfig, null); + SearchControls searchControls = getSearchControls(); + /*String filter = "(&(objectclass=groupOfUniqueNames)(uniqueMember=uid=" + userName + + ",ou=People, dc=rhndev, dc=redhat, dc=com))";*/ + + //modify the search control to only include the attributes we will use + String[] attributes = { "cn", "description" }; + searchControls.setReturningAttributes(attributes); + + //BZ:964250: add rfc 2696 + //default to 1000 results. System setting page size from UI should be non-negative integer > 0. + //additionally as system settings are modifiable via CLI which may not have param checking enabled do some + //more checking. + int defaultPageSize = 1000; + // only if they're enabled in the UI. + if (enable32xFeatures.isSelected()) { + String groupPageSize = systemConfig.getProperty( + SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE + .getInternalName(), "" + defaultPageSize); + if ((groupPageSize != null) + && (!groupPageSize.trim().isEmpty())) { + int passedInPageSize = -1; + try { + passedInPageSize = Integer + .valueOf(groupPageSize.trim()); + if (passedInPageSize > 0) { + defaultPageSize = passedInPageSize; + if(enableVerboseDebugging.isSelected()){ + log(advdb + + " LDAP Group Query Page Sizing of '"+defaultPageSize+"' is being requested from server."); + } + } + } catch (NumberFormatException nfe) { + // log issue and do nothing. Go with the default. + String msg = "LDAP Group Page Size passed in '" + + groupPageSize + + "' in is invalid. Defaulting to 1000 results." + + nfe.getMessage(); + log(msg); + } + } + ctx.setRequestControls(new Control[] { new PagedResultsControl( + defaultPageSize, Control.CRITICAL) }); + } + // Loop through each configured base DN. It may be useful + // in the future to allow for a filter to be configured for + // each BaseDN, but for now the filter will apply to all. + String[] baseDNs = baseDN.split(BASEDN_DELIMITER); + + for (int x = 0; x < baseDNs.length; x++) { + if (enableVerboseDebugging.isSelected()) { + log(advdb + + " this search was excuted against DN component '" + + baseDNs[x] + "'."); + } + executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); + + // continually parsing pages of results until we're done. + // only if they're enabled in the UI. + if (enable32xFeatures.isSelected()) { + // handle paged results if they're being used here + byte[] cookie = null; + Control[] controls = ctx.getResponseControls(); + if (controls != null) { + for (Control control : controls) { + if (control instanceof PagedResultsResponseControl) { + PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; + cookie = pagedResult.getCookie(); + } + } + } + + while (cookie != null) { + String msg = "RFC 2696 is supported by the server and we are paging through the results. "+ + groupDetailsMap.size()+" results returned so far."; + if(enableVerboseGroupParsing.isSelected()){ + log(advdb + + msg); + } + // ensure the next requests contains the session/cookie + // details + ctx.setRequestControls(new Control[] { new PagedResultsControl( + defaultPageSize, cookie, Control.CRITICAL) }); + executeGroupSearch(filter, groupDetailsMap, ctx, + searchControls, baseDNs, x); + // empty out cookie + cookie = null; + // test for further iterations + controls = ctx.getResponseControls(); + if (controls != null) { + for (Control control : controls) { + if (control instanceof PagedResultsResponseControl) { + PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; + cookie = pagedResult.getCookie(); + } + } + } + } + } + }//end of for loop + } catch (NamingException e) { + if (e instanceof InvalidSearchFilterException) { + InvalidSearchFilterException fException = (InvalidSearchFilterException) e; + String message = "The ldap group filter defined is invalid "; + log(message); + } + //TODO: check for ldap connection/unavailable/etc. exceptions. + else { + String mesg = "LDAP communication error: " + e.getMessage(); + log(mesg); + } + } catch (IOException iex) { + String msg = "Unexpected LDAP communciation error:" + iex.getMessage(); + log(msg); + } + + return groupDetailsMap; + } + + /** Executes the LDAP group query using the filters, context and search controls, etc. parameters passed in. + * The matching groups located during processing this pages of results are added as new entries to the + * groupDetailsMap passed in. + * + * @param filter + * @param groupDetailsMap + * @param ctx + * @param searchControls + * @param baseDNs + * @param x + * @throws NamingException + */ + private void executeGroupSearch(String filter, Set<Map<String, String>> groupDetailsMap, InitialLdapContext ctx, + SearchControls searchControls, String[] baseDNs, int x) throws NamingException { + //execute search based on controls and context passed in. + NamingEnumeration<SearchResult> answer = ctx.search(baseDNs[x], filter, searchControls); + boolean ldapApiEnumerationBugEncountered = false; + while ((!ldapApiEnumerationBugEncountered) && answer.hasMoreElements()) {//BZ:582471- ldap api bug change + // We use the first match + SearchResult si = null; + try { + si = answer.next(); + } catch (NullPointerException npe) { + if (enableVerboseDebugging.isSelected()) { + log(advdb + + " NullPtr exception detected. If known LDAP api enum npe ignore: " + + npe.getMessage() + "."); + } + ldapApiEnumerationBugEncountered = true; + break; + } + + if (enableVerboseDebugging.isSelected() + || enableVerboseGroupParsing.isSelected()) { + Attributes attributeContainer = si.getAttributes(); + NamingEnumeration<? extends Attribute> attributes = attributeContainer + .getAll(); + String attributesReturned = " "; + while (attributes.hasMore()) { + attributesReturned += attributes.next().getID() + ","; + } + String dbugMesg = "\n" + + advdb + + " Group search LDAP (" + + attributeContainer.size() + + ") attributes located for group '" + + si.getName() + + "' are [" + + attributesReturned.substring(0, + attributesReturned.length() - 1) + "]."; + // directly update here to shorten messages for lots of groups + testResults.setText(testResults.getText() + dbugMesg); + //This flag can be used in the unlikely case that the UI hangs during a test operation.: + if(iterativeVerboseLogging.isSelected()){ + System.out.println(dbugMesg); + } + + // additionally parse attribute ids and values for illegal ldap + // characters + if (enableVerboseGroupParsing.isSelected()) { + attributes = attributeContainer.getAll(); + String currentAttributeId = ""; + String currentValue = ""; + // spinder: 3/17/11: should we bail on first bad data or + // display them all? + while (attributes.hasMore()) { + boolean badData = false; + Attribute att = attributes.next(); + currentAttributeId = att.getID(); + if (containsIllegalLdap(currentAttributeId)) { + log(advdb + + " LDAP Group: bad atrribute data detected for group '" + + si.getName() + "' for attribute '" + + currentAttributeId + "'."); + badData = true; + } + if (att.getAll() != null) { + NamingEnumeration<?> enumer = att.getAll(); + while (enumer.hasMore()) { + currentValue = enumer.next() + ""; + if (containsIllegalLdap(currentValue)) { + log(advdb + + " LDAP Group: bad data detected for group '" + + si.getName() + + "' with attribute '" + + currentAttributeId + + "' and value:" + currentValue); + badData = true; + } + } + } + if (badData) { + log(advdb + + "** LDAP Group: Some bad LDAP data detected for group '" + + si.getName() + "'."); + } + } + } + } + + Map<String, String> entry = new HashMap<String, String>(); + // String name = (String) si.getAttributes().get("cn").get(); + Attribute commonNameAttr = si.getAttributes().get("cn"); + if (commonNameAttr != null) { + String name = (String) commonNameAttr.get(); + name = name.trim(); + Attribute desc = si.getAttributes().get("description"); + String description = desc != null ? (String) desc.get() : ""; + description = description.trim(); + entry.put("id", name); + entry.put("name", name); + entry.put("description", description); + groupDetailsMap.add(entry); + } else {// unable to retrieve details for specific group. + log(advdb + + " There was an error retrieving 'cn' attribute for group '" + + si.getName() + + "'. Not adding to returned list of groups. "); + } + } + } + + public Map<String, String> findLdapUserDetails(String userName) { + // Load our LDAP specific properties + Properties systemConfig = env; + HashMap<String, String> userDetails = new HashMap<String, String>(); + + // Load the BaseDN + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + + // Load the LoginProperty + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); + if (loginProperty == null) { + // Use the default + loginProperty = "cn"; + } + // Load any information we may need to bind + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); + + // Load any search filter + String groupSearchFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); + String groupMemberFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_MEMBER.getInternalName()); + String testUserDN=userName; + String ldapServer = (String) systemConfig.get(Context.PROVIDER_URL); + + Properties env = getProperties(ldapServer); + + if (bindDN != null) { + env.setProperty(Context.SECURITY_PRINCIPAL, bindDN); + env.setProperty(Context.SECURITY_CREDENTIALS, bindPW); + env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + } + + try { + InitialLdapContext ctx = new InitialLdapContext(env, null); + SearchControls searchControls = getSearchControls(); + + String filter = String.format("(&(%s)(%s=%s))", + groupSearchFilter, groupMemberFilter, + testUserDN); + + generateUiLoggingForStep4LdapFilter(userName, filter); + + // Loop through each configured base DN. It may be useful + // in the future to allow for a filter to be configured for + // each BaseDN, but for now the filter will apply to all. + String[] baseDNs = baseDN.split(BASEDN_DELIMITER); + for (int x = 0; x < baseDNs.length; x++) { + NamingEnumeration<SearchResult> answer = ctx.search(baseDNs[x], filter, searchControls); + if (!answer.hasMoreElements()) { //BZ:582471- ldap api bug change + // Nothing found for this DN, move to the next one if we have one. + continue; + } + + // We use the first match + SearchResult si = answer.next(); + //generate the DN + String userDN = null; + try { + userDN = si.getNameInNamespace(); + } catch (UnsupportedOperationException use) { + userDN = si.getName(); + if (userDN.startsWith("\"")) { + userDN = userDN.substring(1, userDN.length()); + } + if (userDN.endsWith("\"")) { + userDN = userDN.substring(0, userDN.length() - 1); + } + userDN = userDN + "," + baseDNs[x]; + } + userDetails.put("dn", userDN); + + // Construct the UserDN + NamingEnumeration<String> keys = si.getAttributes().getIDs(); + while (keys.hasMore()) { + String key = keys.next(); + Attribute value = si.getAttributes().get(key); + if ((value != null) && (value.get() != null)) { + userDetails.put(key, value.get().toString()); + } + } +// return userDetails; + }//end of for loop + generateUiLoggingStep4Authz(filter); + return userDetails; + } catch (Exception ex) { + generateUiLoggingStep4Exception(ex); + } + return userDetails; + } + + public Set<String> findAvailableGroupsFor(String userName) { + // Load our LDAP specific properties + Properties options = env; + String groupFilter = options.getProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), ""); + String groupMember = options.getProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), ""); + String groupUsePosix = options.getProperty(SystemSetting.LDAP_GROUP_USE_POSIX.getInternalName(), "false"); + if (groupUsePosix == null) { + groupUsePosix = Boolean.toString(false);//default to false + } + boolean usePosixGroups = Boolean.valueOf(groupUsePosix); + String userAttribute = getUserAttribute(options, userName, usePosixGroups); + Set<String> ldapSet = new HashSet<String>(); + + if (userAttribute != null && userAttribute.trim().length() > 0) { + //TODO: spinder 4/21/10 put in error/debug logging messages for badly formatted filter combinations + String filter = ""; + //form assumes examples where groupFilter is like 'objectclass=groupOfNames' and groupMember is 'member' + // to produce ldap filter like (&(objectclass=groupOfNames)(member=cn=Administrator,ou=People,dc=test,dc=com)) + // or like (&(objectclass=groupOfNames)(memberUid=Administrator)) for posixGroups. + filter = String.format("(&(%s)(%s=%s))", groupFilter, groupMember, encodeForFilter(userAttribute)); + + Set<Map<String, String>> matched = buildGroup(options, filter); +// log.trace("Located '" + matched.size() + "' LDAP groups for user '" + userName +// + "' using following ldap filter '" + filter + "'."); + + //iterate to extract just the group names. + for (Map<String, String> match : matched) { + ldapSet.add(match.get("id")); + } + } else { +// log.debug("Group lookup will not be performed due to no UserDN found for user " + userName); + } + + return ldapSet; + } + + private void generateUiLoggingStep4Exception(Exception ex) { + String groupSearchFilter = env + .getProperty(SystemSetting.LDAP_GROUP_FILTER + .getInternalName()); + String msg = "STEP-4:FAIL: There was an error searching with the groupFilter supplied: " + + groupSearchFilter + "'\n"; + msg += ex.getMessage(); + if (enableVerboseDebugging.isSelected()) { + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + } + + private void generateUiLoggingStep4Authz(String filter) { + Set<Map<String, String>> groups = buildGroup(env, filter); + String msg = "STEP-4:TESTING: Using Group Search Filter '" + + filter + "', " + groups.size() + + " ldap group(s) were located.\n"; + if (groups.size() > 0) { + HashMap<String, String>[] ldapLists = new HashMap[groups + .size()]; + groups.toArray(ldapLists); + msg += "STEP-4:PASS: Listing a few of the ldap groups located: \n"; + // iterate over first ten or less to demonstrate retrieve + for (int i = 0; (i < groups.size() && i < 10); i++) { + msg += ldapLists[i] + "\n"; + } + }else{ + msg+="STEP-4:WARN: With current settings, test user is not authorized for any groups. Is this correct?"; + } + log(msg); + } + + private void generateUiLoggingForStep4LdapFilter(String userName, + String filter) { + String msg = "STEP-4:TESTING: about to do ldap search with filter \n'" + + filter + + "'\n to locate groups that test user '"+userName+"' IS authorized to access."; + log(msg); + } + + + // throw the label and fields together, two to a row. + private HashMap<String, JTextField> loadUiFields(JPanel top, + String[] componentKeys) { + HashMap<String, JTextField> mappings = new HashMap<String, JTextField>(); + for (int i = 0; i < componentKeys.length; i++) { + String firstLabelKey = componentKeys[i]; + String secondLabelKey = componentKeys[++i]; + // locate second key + JPanel row = new JPanel(); + row.setLayout(new FlowLayout(FlowLayout.LEFT)); + JLabel label1 = new JLabel(firstLabelKey); + label1.setSize(textBoxWidth, 5); +// JTextField value1 = new JTextField(textBoxWidth); + JTextField value1 = null; + if (firstLabelKey.equalsIgnoreCase("Password:")&&(!showPasswords.isSelected())) { + value1 = new JPasswordField(textBoxWidth); + } else { + value1 = new JTextField(textBoxWidth); + } + JLabel label2 = new JLabel(secondLabelKey); + JTextField value2 = new JTextField(textBoxWidth); + row.add(label1); + row.add(value1); + row.add(Box.createRigidArea(new Dimension(0, 5))); + row.add(label2); + row.add(value2); + mappings.put(firstLabelKey, value1); + mappings.put(secondLabelKey, value2); + top.add(row); + } + + return mappings; + } + + private Properties getProperties(String contentProvider) { + Properties env = new Properties(); + env.setProperty(Context.INITIAL_CONTEXT_FACTORY, + "com.sun.jndi.ldap.LdapCtxFactory"); + env.setProperty(Context.PROVIDER_URL, contentProvider); + if(!enableLdapReferral.isSelected()){ + env.setProperty(Context.REFERRAL, "ignore"); + }else{ + String msg="**---- You have chosen to tell LDAP servers to [FOLLOW] context referrals. Default is [IGNORE] referrals. --**"; + log(msg); + env.setProperty(Context.REFERRAL, "follow"); + } + +// // Setup SSL if requested +// String protocol = ssl.isSelected()? "ssl":""; +// if ((protocol != null) && protocol.equals("ssl")) { +// String ldapSocketFactory = env +// .getProperty("java.naming.ldap.factory.socket"); +// if (ldapSocketFactory == null) { +// env.put("java.naming.ldap.factory.socket", +// UntrustedSSLSocketFactory.class.getName()); +// } +// env.put(Context.SECURITY_PROTOCOL, "ssl"); +// } + + return env; + } + + private String delineate() { + String line = "-"; + for (int i = 0; i < 30; i++) { + line += "-"; + } + return line; + } + + /** Takes care of delineating messages and conditional logging contents passed in. + * @param msg + */ + private void log(String msg) { + String message = "\n" + delineate() + "\n"; + message += msg; + message += "\n" + delineate() + "\n\n"; + //This flag can be used in the unlikely case that the UI hangs during a test operation.: + if(iterativeVerboseLogging.isSelected()){ + System.out.println(message); + } + testResults.setText(testResults.getText() + message); + } + + private SearchControls getSearchControls() { + int scope = SearchControls.SUBTREE_SCOPE; + int timeLimit = 0; + long countLimit = 0; + String[] returnedAttributes = null; + boolean returnObject = false; + boolean deference = false; + SearchControls constraints = new SearchControls(scope, countLimit, + timeLimit, returnedAttributes, returnObject, deference); + return constraints; + } + + /** Translate SystemSettings to familiar Properties instance since we're + * passing not one but multiple values. + * + * @param systemSettings + * @return + */ + private Properties populateProperties(Properties existing) { + Properties properties = new Properties(); + if(existing!=null){ + properties = existing; + } + for (SystemSetting entry : SystemSetting.values()) { + if(entry!=null){ + switch(entry){ + case LDAP_BASED_JAAS_PROVIDER: + properties.put(entry.getInternalName(), ""); + break; + } + } + } + return properties; + } + + /**Build/retrieve the user DN. Not usually a property. + * + * @param options + * @param userName + * @param usePosixGroups boolean indicating whether we search for groups with posixGroup format + * @return + */ + private String getUserAttribute(Properties options, String userName, boolean usePosixGroups) { + Map<String, String> details = findLdapUserDetails(userName); + String userAttribute = null; + if (usePosixGroups) {//return just the username as posixGroup member search uses (&(%s)(memberUid=username)) + userAttribute = userName; + } else {//this is the default where group search uses (&(%s)(uniqueMember={userDn})) + userAttribute = details.get("dn"); + } + + return userAttribute; + } + + /** See LDAPStringUtil.encodeForFilter() for original code/source/author/etc. + * <p>Encode a string so that it can be used in an LDAP search filter.</p> + * + * <p>The following table shows the characters that are encoded and their + * encoded version.</p> + * + * <table> + * <tr><th align="center">Character</th><th>Encoded As</th></tr> + * <tr><td align="center">*</td><td>\2a</td></tr> + * <tr><td align="center">(</td><td>\28</td></tr> + * <tr><td align="center">)</td><td>\29</td></tr> + * <tr><td align="center">\</td><td>\5c</td></tr> + * <tr><td align="center"><code>null</code></td><td>\00</td></tr> + * </table> + * + * <p>In addition to encoding the above characters, any non-ASCII character + * (any character with a hex value greater then <code>0x7f</code>) is also + * encoded and rewritten as a UTF-8 character or sequence of characters in + * hex notation.</p> + * + * @param filterString a string that is to be encoded + * @return the encoded version of <code>filterString</code> suitable for use + * in a LDAP search filter + * @see <a href="http://tools.ietf.org/html/rfc4515">RFC 4515</a> + */ + public static String encodeForFilter(final String filterString) { + if (filterString != null && filterString.length() > 0) { + StringBuilder encString = new StringBuilder(filterString.length()); + for (int i = 0; i < filterString.length(); i++) { + char ch = filterString.charAt(i); + switch (ch) { + case '*': // encode a wildcard * character + encString.append("\\2a"); + break; + case '(': // encode a open parenthesis ( character + encString.append("\\28"); + break; + case ')': // encode a close parenthesis ) character + encString.append("\\29"); + break; + case '\\': // encode a backslash \ character + encString.append("\\5c"); + break; + case '\u0000': // encode a null character + encString.append("\\00"); + break; + default: + if (ch <= 0x7f) { // an ASCII character + encString.append(ch); + } else if (ch >= 0x80) { // encode to UTF-8 + try { + byte[] utf8bytes = String.valueOf(ch).getBytes("UTF8"); + for (byte b : utf8bytes) { + encString.append(String.format("\\%02x", b)); + } + } catch (UnsupportedEncodingException e) { + // ignore + } + } + } + } + return encString.toString(); + } + return filterString; + } +} + +//Mock up the upgraded system properties approach to use SystemSetting +enum SystemSetting { + LDAP_BASED_JAAS_PROVIDER("CAM_JAAS_PROVIDER"), + LDAP_NAMING_PROVIDER_URL("CAM_LDAP_NAMING_PROVIDER_URL"), + USE_SSL_FOR_LDAP("CAM_LDAP_PROTOCOL"), + LDAP_LOGIN_PROPERTY("CAM_LDAP_LOGIN_PROPERTY"), + LDAP_FILTER("CAM_LDAP_FILTER"), + LDAP_GROUP_FILTER("CAM_LDAP_GROUP_FILTER"), + LDAP_GROUP_MEMBER("CAM_LDAP_GROUP_MEMBER"), + LDAP_GROUP_QUERY_PAGE_SIZE("CAM_LDAP_GROUP_QUERY_PAGE_SIZE"), + LDAP_BASE_DN("CAM_LDAP_BASE_DN"), + LDAP_BIND_DN("CAM_LDAP_BIND_DN"), + LDAP_BIND_PW("CAM_LDAP_BIND_PW"), + LDAP_NAMING_FACTORY("CAM_LDAP_NAMING_FACTORY_INITIAL"), + LDAP_GROUP_USE_POSIX("CAM_LDAP_GROUP_USE_POSIX"), + ; + + private String internalName; + + private SystemSetting(String name) { + this.internalName = name; + } + + public String getInternalName() { + return internalName; + } + + public static SystemSetting getByInternalName(String internalName) { + for (SystemSetting p : SystemSetting.values()) { + if (p.internalName.equals(internalName)) { + return p; + } + } + return null; + } +} + + commit 8bac47d3d8425fc0aa0b0781bacfa4efe10cf651 Author: Simeon Pinder <spinder(a)redhat.com> Date: Tue Jul 30 17:07:58 2013 -0400 Load ldap properties in same way as before refactor and deprecate old property load mechanism as does not work well with reusing existing properties. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index 097b993..8a0e321 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -586,7 +586,34 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" } } //now load default/shared LDAP properties as we always have - properties = getProperties(properties); + // Set our default factory name if one is not given + String factoryName = properties.getProperty(SystemSetting.LDAP_NAMING_FACTORY.name()); + properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, factoryName); + + // Setup SSL if requested + String value = properties.getProperty(SystemSetting.USE_SSL_FOR_LDAP.name()); + boolean ldapSsl = "ssl".equalsIgnoreCase(value); + if (ldapSsl) { + String ldapSocketFactory = properties.getProperty("java.naming.ldap.factory.socket"); + if (ldapSocketFactory == null) { + properties.put("java.naming.ldap.factory.socket", UntrustedSSLSocketFactory.class.getName()); + } + properties.put(Context.SECURITY_PROTOCOL, "ssl"); + } + + // Set the LDAP url + String providerUrl = properties.getProperty(SystemSetting.LDAP_NAMING_PROVIDER_URL.name()); + if (providerUrl == null) { + int port = (ldapSsl) ? 636 : 389; + providerUrl = "ldap://localhost:" + port; + } + + properties.setProperty(Context.PROVIDER_URL, providerUrl); + + // Follow referrals automatically + properties.setProperty(Context.REFERRAL, "ignore"); //BZ:582471- active directory query change + + // properties = getProperties(properties); } return properties; } @@ -598,6 +625,7 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" * * @return properties that are to be used when connecting to LDAP server */ + @Deprecated private Properties getProperties(Properties systemConfig) { Properties env = new Properties(systemConfig); // Set our default factory name if one is not given commit f977354b21882b73b2da5ea6dd02784e83d9957a Author: Simeon Pinder <spinder(a)redhat.com> Date: Mon Jul 29 12:02:56 2013 -0400 Include default ldap property settings in initialization as well. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index cd27c32..097b993 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -585,6 +585,8 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" } } } + //now load default/shared LDAP properties as we always have + properties = getProperties(properties); } return properties; } commit 0b2ca875a21f1e7cce3508f46a2e482611846c7f Author: Simeon Pinder <spinder(a)redhat.com> Date: Mon Jul 29 01:32:10 2013 -0400 Fix some deprecated property references. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index 02de558..cd27c32 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -98,7 +98,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { Properties systemConfig = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); //retrieve the filters. - String groupFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); + String groupFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.name()); if ((groupFilter != null) && (!groupFilter.trim().isEmpty())) { String filter; if (groupFilter.startsWith("(") && groupFilter.endsWith(")")) { @@ -116,9 +116,9 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { public Set<String> findAvailableGroupsFor(String userName) { Properties options = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); - String groupFilter = options.getProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), ""); - String groupMember = options.getProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), ""); - String groupUsePosix = options.getProperty(SystemSetting.LDAP_GROUP_USE_POSIX.getInternalName(), "false"); + String groupFilter = options.getProperty(SystemSetting.LDAP_GROUP_FILTER.name(), ""); + String groupMember = options.getProperty(SystemSetting.LDAP_GROUP_MEMBER.name(), ""); + String groupUsePosix = options.getProperty(SystemSetting.LDAP_GROUP_USE_POSIX.name(), "false"); if (groupUsePosix == null) { groupUsePosix = Boolean.toString(false);//default to false } @@ -299,20 +299,20 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { HashMap<String, String> userDetails = new HashMap<String, String>(); // Load the BaseDN - String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.name()); // Load the LoginProperty - String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.name()); if (loginProperty == null) { // Use the default loginProperty = "cn"; } // Load any information we may need to bind - String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); - String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.name()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.name()); // Load any search filter - String searchFilter = (String) systemConfig.get(SystemSetting.LDAP_FILTER.getInternalName()); + String searchFilter = (String) systemConfig.get(SystemSetting.LDAP_FILTER.name()); if (bindDN != null) { systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); @@ -384,17 +384,17 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { Set<Map<String, String>> groupDetailsMap = new HashSet<Map<String, String>>(); //Load our LDAP specific properties // Load the BaseDN - String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.name()); // Load the LoginProperty - String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.name()); if (loginProperty == null) { // Use the default loginProperty = "cn"; } // Load any information we may need to bind - String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); - String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.name()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.name()); if (bindDN != null) { systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); @@ -411,7 +411,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { searchControls.setReturningAttributes(attributes); //detect whether to use Query Page Control - String groupUseQueryPaging = systemConfig.getProperty(SystemSetting.LDAP_GROUP_PAGING.getInternalName(), + String groupUseQueryPaging = systemConfig.getProperty(SystemSetting.LDAP_GROUP_PAGING.name(), "false"); if (groupUseQueryPaging == null) { groupUseQueryPaging = Boolean.toString(false);//default to false @@ -426,7 +426,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { // only if they're enabled in the UI. if (useQueryPaging) { String groupPageSize = systemConfig.getProperty( - SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.getInternalName(), "" +SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" + defaultPageSize); if ((groupPageSize != null) && (!groupPageSize.trim().isEmpty())) { int passedInPageSize = -1; @@ -599,7 +599,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { private Properties getProperties(Properties systemConfig) { Properties env = new Properties(systemConfig); // Set our default factory name if one is not given - String factoryName = env.getProperty(SystemSetting.LDAP_NAMING_FACTORY.getInternalName()); + String factoryName = env.getProperty(SystemSetting.LDAP_NAMING_FACTORY.name()); env.setProperty(Context.INITIAL_CONTEXT_FACTORY, factoryName); // Setup SSL if requested @@ -614,7 +614,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { } // Set the LDAP url - String providerUrl = env.getProperty(RHQConstants.LDAPUrl); + String providerUrl = env.getProperty(SystemSetting.LDAP_NAMING_PROVIDER_URL.name()); if (providerUrl == null) { int port = (ldapSsl) ? 636 : 389; providerUrl = "ldap://localhost:" + port; commit 34ad4a2a2894435c84663c52b06bed9ee231bded Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Jun 19 13:51:17 2013 -0400 Some more doc and cleanup/refactor. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index 4c0c2fc..02de558 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -156,6 +156,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { throw new IllegalArgumentException("Role with id [" + roleId + "] does not exist."); } + //add some code to synch up the current list of ldap groups. Set<LdapGroup> currentGroups = role.getLdapGroups(); List<String> currentGroupNames = new ArrayList<String>(currentGroups.size()); for (LdapGroup group : currentGroups) { @@ -167,10 +168,12 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { newGroupNames.add(group.getName()); } + //figure out which ones are new then add them. List<String> namesOfGroupsToBeAdded = new ArrayList<String>(newGroupNames); namesOfGroupsToBeAdded.removeAll(currentGroupNames); addLdapGroupsToRole(subject, roleId, namesOfGroupsToBeAdded); + //figure out which ones need to be removed. then remove them. List<String> namesOfGroupsToBeRemoved = new ArrayList<String>(currentGroupNames); namesOfGroupsToBeRemoved.removeAll(newGroupNames); int[] idsOfGroupsToBeRemoved = new int[namesOfGroupsToBeRemoved.size()]; @@ -290,11 +293,10 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { } public Map<String, String> findLdapUserDetails(String userName) { + // Load our LDAP specific properties Properties systemConfig = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); HashMap<String, String> userDetails = new HashMap<String, String>(); - // Load our LDAP specific properties - Properties env = getProperties(systemConfig); // Load the BaseDN String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); @@ -312,13 +314,13 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { // Load any search filter String searchFilter = (String) systemConfig.get(SystemSetting.LDAP_FILTER.getInternalName()); if (bindDN != null) { - env.setProperty(Context.SECURITY_PRINCIPAL, bindDN); - env.setProperty(Context.SECURITY_CREDENTIALS, bindPW); - env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); + systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); + systemConfig.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); } try { - InitialLdapContext ctx = new InitialLdapContext(env, null); + InitialLdapContext ctx = new InitialLdapContext(systemConfig, null); SearchControls searchControls = getSearchControls(); // Add the search filter if specified. This only allows for a single search filter.. i.e. foo=bar. commit 34a7e70c60a4032b70ef299dcf1584a084557c9e Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Jun 19 13:36:52 2013 -0400 Use property internal name. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index d80732e..4c0c2fc 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -380,7 +380,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { */ protected Set<Map<String, String>> buildGroup(Properties systemConfig, String filter) { Set<Map<String, String>> groupDetailsMap = new HashSet<Map<String, String>>(); - + //Load our LDAP specific properties // Load the BaseDN String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); @@ -423,7 +423,8 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { int defaultPageSize = 1000; // only if they're enabled in the UI. if (useQueryPaging) { - String groupPageSize = systemConfig.getProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" + String groupPageSize = systemConfig.getProperty( + SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.getInternalName(), "" + defaultPageSize); if ((groupPageSize != null) && (!groupPageSize.trim().isEmpty())) { int passedInPageSize = -1; commit dcd7ed118b33c3de223f4e78b8eec62234dd0a48 Author: Simeon Pinder <spinder(a)redhat.com> Date: Mon Jun 17 12:26:59 2013 -0400 Clean up some deprecated usage of Properties by LDAP, and small refactoring. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index 7473321..d80732e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -94,27 +94,30 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { private SystemManagerLocal systemManager; public Set<Map<String, String>> findAvailableGroups() { - Properties systemConfig = systemManager.getSystemConfiguration(subjectManager.getOverlord()); - Set<Map<String, String>> emptyAvailableGroups = new HashSet<Map<String, String>>(); + //load current system properties + Properties systemConfig = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); //retrieve the filters. - String groupFilter = (String) systemConfig.get(RHQConstants.LDAPGroupFilter); + String groupFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); if ((groupFilter != null) && (!groupFilter.trim().isEmpty())) { String filter; - if (groupFilter.startsWith("(") && groupFilter.endsWith(")")) + if (groupFilter.startsWith("(") && groupFilter.endsWith(")")) { filter = groupFilter; // RFC 2254 does not allow for ((expression)) - else + } else { filter = String.format("(%s)", groupFilter); // not wrapped in (), wrap it + } return buildGroup(systemConfig, filter); } + + Set<Map<String, String>> emptyAvailableGroups = new HashSet<Map<String, String>>(); return emptyAvailableGroups; } public Set<String> findAvailableGroupsFor(String userName) { - Properties options = systemManager.getSystemConfiguration(subjectManager.getOverlord()); - String groupFilter = options.getProperty(RHQConstants.LDAPGroupFilter, ""); - String groupMember = options.getProperty(RHQConstants.LDAPGroupMember, ""); + Properties options = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); + String groupFilter = options.getProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), ""); + String groupMember = options.getProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), ""); String groupUsePosix = options.getProperty(SystemSetting.LDAP_GROUP_USE_POSIX.getInternalName(), "false"); if (groupUsePosix == null) { groupUsePosix = Boolean.toString(false);//default to false @@ -287,26 +290,27 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { } public Map<String, String> findLdapUserDetails(String userName) { - Properties systemConfig = systemManager.getSystemConfiguration(subjectManager.getOverlord()); + Properties systemConfig = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); + HashMap<String, String> userDetails = new HashMap<String, String>(); // Load our LDAP specific properties Properties env = getProperties(systemConfig); // Load the BaseDN - String baseDN = (String) systemConfig.get(RHQConstants.LDAPBaseDN); + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); // Load the LoginProperty - String loginProperty = (String) systemConfig.get(RHQConstants.LDAPLoginProperty); + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); if (loginProperty == null) { // Use the default loginProperty = "cn"; } // Load any information we may need to bind - String bindDN = (String) systemConfig.get(RHQConstants.LDAPBindDN); - String bindPW = (String) systemConfig.get(RHQConstants.LDAPBindPW); + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); // Load any search filter - String searchFilter = (String) systemConfig.get(RHQConstants.LDAPFilter); + String searchFilter = (String) systemConfig.get(SystemSetting.LDAP_FILTER.getInternalName()); if (bindDN != null) { env.setProperty(Context.SECURITY_PRINCIPAL, bindDN); env.setProperty(Context.SECURITY_CREDENTIALS, bindPW); @@ -375,29 +379,27 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { * @see org.jboss.security.auth.spi.UsernamePasswordLoginModule#validatePassword(java.lang.String,java.lang.String) */ protected Set<Map<String, String>> buildGroup(Properties systemConfig, String filter) { - Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); - // Load our LDAP specific properties - Properties env = getProperties(systemConfig); + Set<Map<String, String>> groupDetailsMap = new HashSet<Map<String, String>>(); // Load the BaseDN - String baseDN = (String) systemConfig.get(RHQConstants.LDAPBaseDN); + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); // Load the LoginProperty - String loginProperty = (String) systemConfig.get(RHQConstants.LDAPLoginProperty); + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); if (loginProperty == null) { // Use the default loginProperty = "cn"; } // Load any information we may need to bind - String bindDN = (String) systemConfig.get(RHQConstants.LDAPBindDN); - String bindPW = (String) systemConfig.get(RHQConstants.LDAPBindPW); + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); if (bindDN != null) { - env.setProperty(Context.SECURITY_PRINCIPAL, bindDN); - env.setProperty(Context.SECURITY_CREDENTIALS, bindPW); - env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); + systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); + systemConfig.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); } try { - InitialLdapContext ctx = new InitialLdapContext(env, null); + InitialLdapContext ctx = new InitialLdapContext(systemConfig, null); SearchControls searchControls = getSearchControls(); /*String filter = "(&(objectclass=groupOfUniqueNames)(uniqueMember=uid=" + userName + ",ou=People, dc=rhndev, dc=redhat, dc=com))";*/ @@ -421,8 +423,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { int defaultPageSize = 1000; // only if they're enabled in the UI. if (useQueryPaging) { - Properties options = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); - String groupPageSize = options.getProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" + String groupPageSize = systemConfig.getProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" + defaultPageSize); if ((groupPageSize != null) && (!groupPageSize.trim().isEmpty())) { int passedInPageSize = -1; @@ -445,11 +446,12 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { String[] baseDNs = baseDN.split(BASEDN_DELIMITER); for (int x = 0; x < baseDNs.length; x++) { - executeGroupSearch(filter, ret, ctx, searchControls, baseDNs, x); + executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); // continually parsing pages of results until we're done. // only if they're enabled in the UI. if (useQueryPaging) { + //handle paged results if they're being used here byte[] cookie = null; Control[] controls = ctx.getResponseControls(); @@ -466,7 +468,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { //ensure the next requests contains the session/cookie details ctx.setRequestControls(new Control[] { new PagedResultsControl(defaultPageSize, cookie, Control.CRITICAL) }); - executeGroupSearch(filter, ret, ctx, searchControls, baseDNs, x); + executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); //empty out cookie cookie = null; //test for further iterations @@ -479,6 +481,25 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { } } } + //continually parsing pages of results until we're done. + while (cookie != null) { + //ensure the next requests contains the session/cookie details + ctx.setRequestControls(new Control[] { new PagedResultsControl(defaultPageSize, cookie, + Control.CRITICAL) }); + executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); + //empty out cookie + cookie = null; + //test for further iterations + controls = ctx.getResponseControls(); + if (controls != null) { + for (Control control : controls) { + if (control instanceof PagedResultsResponseControl) { + PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; + cookie = pagedResult.getCookie(); + } + } + } + } } } } @@ -498,32 +519,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { log.error("Unexpected LDAP communciation error:" + iex.getMessage(), iex); throw new LdapCommunicationException(iex); } - - return ret; - } - - /** Translate SystemSettings to familiar Properties instance since we're - * passing not one but multiple values. - * - * @param systemSettings - * @return - */ - private Properties populateProperties(SystemSettings systemSettings) { - Properties properties = null; - if (systemSettings != null) { - properties = new Properties(); - Set<Entry<SystemSetting, String>> entries = systemSettings.entrySet(); - for (Entry<SystemSetting, String> entry : entries) { - SystemSetting key = entry.getKey(); - if (key != null) { - String value = entry.getValue(); - if (value != null) { - properties.put(key.name(), value); - } - } - } - } - return properties; + return groupDetailsMap; } /** Executes the LDAP group query using the filters, context and search controls, etc. parameters passed in. @@ -566,6 +562,30 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { } } + /** Translate SystemSettings to familiar Properties instance since we're + * passing not one but multiple values. + * + * @param systemSettings + * @return + */ + private Properties populateProperties(SystemSettings systemSettings) { + Properties properties = null; + if (systemSettings != null) { + properties = new Properties(); + Set<Entry<SystemSetting, String>> entries = systemSettings.entrySet(); + for (Entry<SystemSetting, String> entry : entries) { + SystemSetting key = entry.getKey(); + if (key != null) { + String value = entry.getValue(); + if (value != null) { + properties.put(key.name(), value); + } + } + } + } + return properties; + } + /** * Load a default set of properties to use when connecting to the LDAP server. If basic authentication is needed, * the caller must set Context.SECURITY_PRINCIPAL, Context.SECURITY_CREDENTIALS and Context.SECURITY_AUTHENTICATION @@ -576,7 +596,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { private Properties getProperties(Properties systemConfig) { Properties env = new Properties(systemConfig); // Set our default factory name if one is not given - String factoryName = env.getProperty(RHQConstants.LDAPFactory); + String factoryName = env.getProperty(SystemSetting.LDAP_NAMING_FACTORY.getInternalName()); env.setProperty(Context.INITIAL_CONTEXT_FACTORY, factoryName); // Setup SSL if requested commit 32327e648f5b7a8f05da633f3aed3abc27adf875 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Jul 31 15:09:45 2013 +0200 [BZ 976827] - Description text area in General properties tab under Alerts -> Definition is not getting set to blank one it has been edited. Instead it displays the previous value that was stored - setting an empty string if descriptionField.getValue() == null diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java index 1f47a81..d501787 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java @@ -175,9 +175,7 @@ public class GeneralPropertiesAlertDefinitionForm extends DynamicForm implements public void saveAlertDefinition() { alertDefinition.setName(nameField.getValue().toString()); Object description = descriptionField.getValue(); - if (null != description) { - alertDefinition.setDescription(description.toString()); - } + alertDefinition.setDescription(null == description ? "" : description.toString()); String prioritySelected = prioritySelection.getValue().toString(); alertDefinition.setPriority(AlertPriority.valueOf(prioritySelected)); commit ac9f0b85670fa41d9d08f3de7455ce8436ec5e73 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 30 17:43:16 2013 -0700 i18n availability summary pie graph. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java index 057a77f..fb8e096 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java @@ -18,14 +18,15 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype; +import java.util.ArrayList; +import java.util.List; + import com.smartgwt.client.widgets.HTMLFlow; + import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; -import java.util.ArrayList; -import java.util.List; - /** * Contains the javascript chart definition for an implementation of the d3 availability chart. This implementation is * just a line that changes color based on availability type: up=green, down=red, orange=disabled, unknown=grey, @@ -48,7 +49,8 @@ public class AvailabilitySummaryPieGraphType { StringBuilder divAndSvgDefs = new StringBuilder(); divAndSvgDefs.append("<div id=\"availSummaryChart\" >"); - divAndSvgDefs.append("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:"+HEIGHT+"px;\" ></svg>"); + divAndSvgDefs.append("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:" + HEIGHT + + "px;\" ></svg>"); divAndSvgDefs.append("</div>"); HTMLFlow graphFlow = new HTMLFlow(divAndSvgDefs.toString()); graphFlow.setWidth(WIDTH); @@ -56,7 +58,8 @@ public class AvailabilitySummaryPieGraphType { return graphFlow; } - public void setAvailabilityData(String upLabel, double upPercent, String downLabel, double downPercent, String disabledLabel, double disabledPercent ){ + public void setAvailabilityData(String upLabel, double upPercent, String downLabel, double downPercent, + String disabledLabel, double disabledPercent) { availabilitySummaries = new ArrayList<AvailabilitySummary>(); availabilitySummaries.add(new AvailabilitySummary(upLabel, upPercent)); availabilitySummaries.add(new AvailabilitySummary(downLabel, downPercent)); @@ -70,8 +73,9 @@ public class AvailabilitySummaryPieGraphType { // loop through the avail intervals for (AvailabilitySummary availabilitySummary : availabilitySummaries) { sb.append("{ \"label\":\"" + availabilitySummary.getLabel() + "\", "); - sb.append(" \"value\": \"" + MeasurementConverterClient.format(availabilitySummary.getValue(), - MeasurementUnits.PERCENTAGE, true) + "\" },"); + sb.append(" \"value\": \"" + + MeasurementConverterClient.format(availabilitySummary.getValue(), MeasurementUnits.PERCENTAGE, + true) + "\" },"); } sb.setLength(sb.length() - 1); } @@ -87,47 +91,50 @@ public class AvailabilitySummaryPieGraphType { public native void drawJsniChart() /*-{ console.log("Draw Availability Summary Pie Chart"); - var w = 100, - h = 100, - r = h/2, - color = $wnd.d3.scale.category10(), - data = this.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilitySummaryPieGraphType::getAvailabilitySummaryJson()(), - vis = $wnd.d3.select("#availSummaryChart svg") - .append("g") - .data(data) - .attr("width", w) - .attr("height", h) - .attr("transform", "translate(" + r + "," + r + ")"), - arc = $wnd.d3.svg.arc() - .outerRadius(r), - pie = $wnd.d3.layout.pie(), - arcs = vis.selectAll("g.slice") - .data(pie) - .enter() - .append("g") - .attr("class", "slice"); + var global = this, + w = 100, + h = 100, + r = h / 2, + color = $wnd.d3.scale.category10(), + data = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilitySummaryPieGraphType::getAvailabilitySummaryJson()(), + vis = $wnd.d3.select("#availSummaryChart svg") + .append("g") + .data(data) + .attr("width", w) + .attr("height", h) + .attr("transform", "translate(" + r + "," + r + ")"), + arc = $wnd.d3.svg.arc() + .outerRadius(r), + pie = $wnd.d3.layout.pie(), + arcs = vis.selectAll("g.slice") + .data(pie) + .enter() + .append("g") + .attr("class", "slice"); arcs.append("path") - .attr("fill", function (d, i) { - return color(i); - }) - .attr("d", arc); + .attr("fill", function (d, i) { + return color(i); + }) + .attr("d", arc); arcs.append("text") - .attr("transform", function (d) { - d.innerRadius = 0; - d.outerRadius = r; - return "translate(" + arc.centroid(d) + ")"; - }) - .attr("text-anchor", "middle") - .text(function (d, i) { - return data[i].value; - }); + .attr("transform", function (d) { + d.innerRadius = 0; + d.outerRadius = r; + return "translate(" + arc.centroid(d) + ")"; + }) + .attr("text-anchor", "middle") + .style("font-size", "9px") + .style("font-family", "Arial, Verdana, sans-serif;") + .attr("fill", "#000") + .text(function (d, i) { + return data[i].value; + }); console.log("done with avail summary pie graph"); }-*/; - private static class AvailabilitySummary { final private String label; final private double value; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java index ce4f8ef..52b0d86 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java @@ -23,6 +23,7 @@ import java.util.LinkedHashMap; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.widgets.IButton; import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.SelectItem; import com.smartgwt.client.widgets.form.fields.events.ChangeEvent; import com.smartgwt.client.widgets.form.fields.events.ChangeHandler; @@ -79,7 +80,7 @@ public class AddToDashboardComponent extends ToolStrip implements Enhanced { addToDashboardButton.disable(); dashboardSelectItem = new SelectItem(); - dashboardSelectItem.setTitle("Dashboards"); + dashboardSelectItem.setTitle(MSG.chart_metrics_add_to_dashboard_label()); dashboardSelectItem.setWidth(300); dashboardSelectItem.setPickListWidth(210); populateDashboardMenu(); @@ -102,7 +103,7 @@ public class AddToDashboardComponent extends ToolStrip implements Enhanced { .getMetricDefinitions()) { if (measurementDefinition.getId() == selectedRecord .getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID)) { - Log.debug("Add to Dashboard -- Storing: " + measurementDefinition.getDisplayName() + Log.info("Add to Dashboard -- Storing: " + measurementDefinition.getDisplayName() + " in " + selectedDashboard.getName()); storeDashboardMetric(selectedDashboard, resource, measurementDefinition); break; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java index cffcfd7..5835f61 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java @@ -40,7 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; /** - * This shows the availability history for a resource. + * This view shows the detail availability data in tabular form and a pie chart for available %. * * @author Jay Shaughnessy * @author John Mazzitelli @@ -49,6 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; public class ResourceMetricAvailabilityView extends EnhancedVLayout { private Resource resource; + private DynamicForm form; private StaticTextItem currentField; private StaticTextItem availTimeField; private StaticTextItem downTimeField; @@ -81,7 +82,7 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { private DynamicForm createSummaryForm() { - DynamicForm form = new DynamicForm(); + form = new DynamicForm(); form.setWidth100(); form.setAutoHeight(); form.setMargin(10); @@ -138,14 +139,13 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { currentTimeField.setShowTitle(false); CanvasItem availPieChartItem = new CanvasItem(); - //@todo: i18n - availPieChartItem.setTitle("Availability"); + availPieChartItem.setTitle(MSG.pie_chart_availability_summary_label()); availPieChartItem.setCanvas(availabilitySummaryPieGraph.createGraphMarker()); availPieChartItem.setRowSpan(3); availPieChartItem.setVAlign(VerticalAlignment.TOP); availPieChartItem.setTitleVAlign(VerticalAlignment.TOP); - availPieChartItem.setHeight(60); - availPieChartItem.setWidth(60); + availPieChartItem.setHeight(AvailabilitySummaryPieGraphType.HEIGHT); + availPieChartItem.setWidth(AvailabilitySummaryPieGraphType.WIDTH); form.setItems(currentField, availPieChartItem, availTimeField, downTimeField, disabledTimeField, failureCountField, disabledCountField, mtbfField, mttrField, unknownField, @@ -164,17 +164,15 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { public void onSuccess(ResourceAvailabilitySummary result) { Log.debug("reloadSummaryData"); - //@todo: i18n availabilitySummaryPieGraph.setAvailabilityData( - "Up", result.getUpPercentage(), - "Down", result.getDownPercentage(), - "Disabled" ,result.getDisabledPercentage() + MSG.pie_chart_availability_summary_up(), result.getUpPercentage(), + MSG.pie_chart_availability_summary_down(), result.getDownPercentage(), + MSG.pie_chart_availability_summary_disabled() ,result.getDisabledPercentage() ); new Timer(){ @Override public void run() { - Log.debug("Run Avail Graph"); availabilitySummaryPieGraph.drawJsniChart(); } }.schedule(150); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 040537d..b800267 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -21,6 +21,7 @@ chart_hover_start_label = Start chart_hover_time_format = %I:%M:%S %p chart_ie_not_supported = Charting is not available for this browser. chart_metrics= Metrics +chart_metrics_add_to_dashboard_label= Dashboards chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. chart_metrics_expand_tooltip= Click here to collapse additional availability detail. chart_metrics_sparkline_header= Chart @@ -460,6 +461,10 @@ filter_from_date = From filter_to_date = To group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource +pie_chart_availability_summary_disabled = Disabled +pie_chart_availability_summary_down = Down +pie_chart_availability_summary_label = Availability +pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = Parent Ancestry for: util_errorHandler_nullException = exception was null util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 2e23eff..d57e8e9 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -49,6 +49,7 @@ chart_hover_date_format = %d.%m.%y chart_hover_time_format = %H:%M:%S ##chart_ie_not_supported = Charting is not available for this browser. ##chart_metrics= Metrics +##chart_metrics_add_to_dashboard_label= Dashboards ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart @@ -479,6 +480,10 @@ filter_from_date = Od filter_to_date = Do group_tree_groupOfResourceType = Skupina: [{0}] group_tree_partialClusterTooltip = {0} z {1} členů skupiny má "{2}" zdroj +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = Původ rodiče pro: util_errorHandler_nullException = výjimka byla null util_monitoringRequestCallback_error_checkServerStatusFailure = Nepodařilo se určit stav přihlašování - zkontrolujte stav serveru. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index b4fe981..93f8426 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -27,6 +27,7 @@ chart_ie_not_supported = Charting ist bei diesem Browser nicht unterstützt ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart +##chart_metrics_add_to_dashboard_label= Dashboards chart_no_data_label = Keine Daten vorhanden ##chart_single_value_label = Value chart_slider_button_bar_day = Tag @@ -458,6 +459,10 @@ filter_from_date = Von filter_to_date = Bis group_tree_groupOfResourceType = Gruppe von [{0}] group_tree_partialClusterTooltip = {0} der {1} Gruppenmitglieder haben eine ''{2}'' Ressource +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_disambiguationReportDecorator_pluginSuffix = ({0} Plugin) util_errorHandler_nullException = Exception war null ##util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index c1a8521..ae2e805 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -28,6 +28,7 @@ ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart +##chart_metrics_add_to_dashboard_label= Dashboards ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -456,6 +457,10 @@ filter_from_date = 開始 filter_to_date = 終了 ##group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {1} の中の {0} グループメンバーが ''{2}'' リソースを持っています +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = 親の先祖 : util_disambiguationReportDecorator_pluginSuffix = ({0} プラグイン) util_errorHandler_nullException = 例外は null でした diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 2958fbe..c61d0d6 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -26,6 +26,7 @@ ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart +##chart_metrics_add_to_dashboard_label= Dashboards ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -413,6 +414,10 @@ favorites_resources = 즐겨찾기 리소스 filter_from_date = 시작 group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {1} 중 {0} 그룹 멤버가 ''{2}'' 자원을 가지고 있습니다. +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = 부모의 조상: util_errorHandler_nullException = 예외는 null이었습니다. util_monitoringRequestCallback_error_checkServerStatusFailure = 로그인 상태를 확인할 수 없습니다 - 서버의 상태를 확인하십시요 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 62f31f5..0d505ec 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -25,6 +25,7 @@ ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart +##chart_metrics_add_to_dashboard_label= Dashboards ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -461,6 +462,10 @@ favorites_resources = Recursos Favoritos ##filter_to_date = To ##group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = Ancestral para: util_errorHandler_nullException = Exce\u00E7\u00E3o nula util_monitoringRequestCallback_error_checkServerStatusFailure = Imposs\u00EDvel verificar o status do login - verifique o status do Servidor. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index eca8c24..ace5cf2 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -25,6 +25,7 @@ ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart +##chart_metrics_add_to_dashboard_label= Dashboards ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -2550,6 +2551,10 @@ favorites_resources = Избранные ресурсы filter_from_date = От filter_to_date = До group_tree_partialClusterTooltip = {0} из {1} членов группы имеют ресурс ''{2}'' +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_errorHandler_nullException = Возникло null исключение util_monitoringRequestCallback_error_checkServerStatusFailure = Не удается определить статус авторизации - проверьте состояние сервера. util_userPerm_loadFailGlobal = Не удается загрузить ваши глобальные полномочия - не предоставлены. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index e71f1fb..287a7f9 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -25,6 +25,7 @@ ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart +##chart_metrics_add_to_dashboard_label= Dashboards ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -451,6 +452,10 @@ favorites_resources = \u8d44\u6e90\u6536\u85cf\u5939 ##filter_to_date = To ##group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = \u9664\u53bb {1},{0}\u7684\u7ec4\u6210\u5458\u62e5\u6709 \u4e00\u4e2a''{2}''\u8d44\u6e90 +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = Parent Ancestry for: util_errorHandler_nullException = \u5f02\u5e38\u662f null util_monitoringRequestCallback_error_checkServerStatusFailure = \u65e0\u6cd5\u786e\u5b9a\u767b\u5f55\u72b6\u6001- \u68c0\u67e5\u670d\u52a1\u5668\u72b6\u6001. commit b6290571f9b6c3f72886ce4ebf85dad38e11698c Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 30 11:42:37 2013 -0700 Fix bug with new metrics database and not much history results in NPE on metrics page. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 82a9d98..bb67587 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -121,9 +121,9 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re metricsTableListGrid.addSelectionChangedHandler(new SelectionChangedHandler() { @Override public void onSelectionChanged(SelectionEvent selectionEvent) { - if(metricsTableListGrid.getSelectedRecords().length > 0){ + if (metricsTableListGrid.getSelectedRecords().length > 0) { addToDashboardComponent.enableAddToDashboardButton(); - }else { + } else { addToDashboardComponent.disableAddToDashboardButton(); } } @@ -304,11 +304,15 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re public void onDataArrived(DataArrivedEvent dataArrivedEvent) { int startRow = dataArrivedEvent.getStartRow(); int endRow = dataArrivedEvent.getEndRow(); + for (int i = startRow; i < endRow; i++) { - if (null != metricsTableView && null != metricsTableView.expandedRows - && metricsTableView.expandedRows.contains(getRecord(i).getAttributeAsInt( - MetricsViewDataSource.FIELD_METRIC_DEF_ID))) { - expandRecord(getRecord(i)); + ListGridRecord listGridRecord = getRecord(i); + if (null != listGridRecord) { + int metricDefinitionId = listGridRecord + .getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); + if (null != metricsTableView && metricsTableView.expandedRows.contains(metricDefinitionId)) { + expandRecord(listGridRecord); + } } } } commit 865522aac13f00413c818ad6714118ffcf913f6f Author: mtho11 <mikecthompson(a)gmail.com> Date: Tue Jul 30 10:59:02 2013 -0700 Change layout of fields in availability detail form of metric page. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index ee06724..3e573dd 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -230,8 +230,6 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { .attr("height", height + margin.top + margin.bottom) .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); - console.error("avail.chartSelection: "+ availChartContext.chartSelection); - svg.selectAll("rect.availBars") .data(availChartContext.data) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java index 23effb0..057a77f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java @@ -18,7 +18,10 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype; +import com.smartgwt.client.widgets.HTMLFlow; +import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; import java.util.ArrayList; import java.util.List; @@ -32,11 +35,27 @@ import java.util.List; */ public class AvailabilitySummaryPieGraphType { + public static final int HEIGHT = 100; + public static final int WIDTH = 100; + private List<AvailabilitySummary> availabilitySummaries; public AvailabilitySummaryPieGraphType() { } + public HTMLFlow createGraphMarker() { + Log.debug("drawGraph marker in AvailabilitySummaryPieGraph"); + + StringBuilder divAndSvgDefs = new StringBuilder(); + divAndSvgDefs.append("<div id=\"availSummaryChart\" >"); + divAndSvgDefs.append("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:"+HEIGHT+"px;\" ></svg>"); + divAndSvgDefs.append("</div>"); + HTMLFlow graphFlow = new HTMLFlow(divAndSvgDefs.toString()); + graphFlow.setWidth(WIDTH); + graphFlow.setHeight(HEIGHT); + return graphFlow; + } + public void setAvailabilityData(String upLabel, double upPercent, String downLabel, double downPercent, String disabledLabel, double disabledPercent ){ availabilitySummaries = new ArrayList<AvailabilitySummary>(); availabilitySummaries.add(new AvailabilitySummary(upLabel, upPercent)); @@ -51,7 +70,8 @@ public class AvailabilitySummaryPieGraphType { // loop through the avail intervals for (AvailabilitySummary availabilitySummary : availabilitySummaries) { sb.append("{ \"label\":\"" + availabilitySummary.getLabel() + "\", "); - sb.append(" \"value\": \"" + availabilitySummary.getValue() * 100 + "\" },"); + sb.append(" \"value\": \"" + MeasurementConverterClient.format(availabilitySummary.getValue(), + MeasurementUnits.PERCENTAGE, true) + "\" },"); } sb.setLength(sb.length() - 1); } @@ -67,26 +87,21 @@ public class AvailabilitySummaryPieGraphType { public native void drawJsniChart() /*-{ console.log("Draw Availability Summary Pie Chart"); - var data = this.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilitySummaryPieGraphType::getAvailabilitySummaryJson()(); - var w = 100, h = 100, - r = 30, - color = $wnd.d3.scale.category10(); - - var vis = $wnd.d3.select("#availSummaryChart svg") + r = h/2, + color = $wnd.d3.scale.category10(), + data = this.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilitySummaryPieGraphType::getAvailabilitySummaryJson()(), + vis = $wnd.d3.select("#availSummaryChart svg") .append("g") .data(data) .attr("width", w) .attr("height", h) - .attr("transform", "translate(" + r + "," + r + ")"); - - var arc = $wnd.d3.svg.arc() - .outerRadius(r); - - var pie = $wnd.d3.layout.pie(); - - var arcs = vis.selectAll("g.slice") + .attr("transform", "translate(" + r + "," + r + ")"), + arc = $wnd.d3.svg.arc() + .outerRadius(r), + pie = $wnd.d3.layout.pie(), + arcs = vis.selectAll("g.slice") .data(pie) .enter() .append("g") @@ -108,7 +123,7 @@ public class AvailabilitySummaryPieGraphType { .text(function (d, i) { return data[i].value; }); - console.warn("done with avail summary pie graph"); + console.log("done with avail summary pie graph"); }-*/; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java index 961ea5a..cffcfd7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java @@ -22,8 +22,9 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitori import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.widgets.HTMLFlow; +import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.CanvasItem; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.StaticTextItem; @@ -49,11 +50,8 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { private Resource resource; private StaticTextItem currentField; - private StaticTextItem availField; private StaticTextItem availTimeField; - private StaticTextItem downField; private StaticTextItem downTimeField; - private StaticTextItem disabledField; private StaticTextItem disabledTimeField; private StaticTextItem failureCountField; private StaticTextItem disabledCountField; @@ -71,29 +69,16 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { availabilitySummaryPieGraph = new AvailabilitySummaryPieGraphType(); setWidth100(); - setHeight(265); + setHeight(165); } @Override protected void onInit() { super.onInit(); - addMember(createGraphMarker()); addMember(createSummaryForm()); } - public HTMLFlow createGraphMarker() { - Log.debug("drawGraph marker in AvailabilitySummaryPieGraph"); - - StringBuilder divAndSvgDefs = new StringBuilder(); - divAndSvgDefs.append("<div id=\"availSummaryChart" - + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:100px;\">"); - divAndSvgDefs.append("</svg></div>"); - HTMLFlow graph = new HTMLFlow(divAndSvgDefs.toString()); - graph.setWidth100(); - graph.setHeight(100); - //addMember(graph); - return graph; - } + private DynamicForm createSummaryForm() { DynamicForm form = new DynamicForm(); @@ -108,28 +93,16 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { currentField.setColSpan(4); // row 2 - availField = new StaticTextItem("avail", MSG.view_resource_monitor_availability_availability()); - availField.setWrapTitle(false); - prepareTooltip(availField, MSG.view_resource_monitor_availability_availability_tooltip()); - availTimeField = new StaticTextItem("availTime", MSG.view_resource_monitor_availability_uptime()); availTimeField.setWrapTitle(false); prepareTooltip(availTimeField, MSG.view_resource_monitor_availability_uptime_tooltip()); // row 3 - downField = new StaticTextItem("down", MSG.view_resource_monitor_availability_down()); - downField.setWrapTitle(false); - prepareTooltip(downField, MSG.view_resource_monitor_availability_down_tooltip()); - downTimeField = new StaticTextItem("downTime", MSG.view_resource_monitor_availability_downtime()); downTimeField.setWrapTitle(false); prepareTooltip(downTimeField, MSG.view_resource_monitor_availability_downtime_tooltip()); // row 4 - disabledField = new StaticTextItem("disabled", MSG.view_resource_monitor_availability_disabled()); - disabledField.setWrapTitle(false); - prepareTooltip(disabledField, MSG.view_resource_monitor_availability_disabled_tooltip()); - disabledTimeField = new StaticTextItem("disabledTime", MSG.view_resource_monitor_availability_disabledTime()); disabledTimeField.setWrapTitle(false); prepareTooltip(disabledTimeField, MSG.view_resource_monitor_availability_disabledTime_tooltip()); @@ -164,7 +137,17 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { currentTimeField.setColSpan(4); currentTimeField.setShowTitle(false); - form.setItems(currentField, availField, availTimeField, downField, downTimeField, disabledField, + CanvasItem availPieChartItem = new CanvasItem(); + //@todo: i18n + availPieChartItem.setTitle("Availability"); + availPieChartItem.setCanvas(availabilitySummaryPieGraph.createGraphMarker()); + availPieChartItem.setRowSpan(3); + availPieChartItem.setVAlign(VerticalAlignment.TOP); + availPieChartItem.setTitleVAlign(VerticalAlignment.TOP); + availPieChartItem.setHeight(60); + availPieChartItem.setWidth(60); + + form.setItems(currentField, availPieChartItem, availTimeField, downTimeField, disabledTimeField, failureCountField, disabledCountField, mtbfField, mttrField, unknownField, currentTimeField); @@ -181,6 +164,7 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { public void onSuccess(ResourceAvailabilitySummary result) { Log.debug("reloadSummaryData"); + //@todo: i18n availabilitySummaryPieGraph.setAvailabilityData( "Up", result.getUpPercentage(), "Down", result.getDownPercentage(), @@ -197,16 +181,10 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { currentField.setValue(MSG.view_resource_monitor_availability_currentStatus_value(result .getCurrent().getName(), TimestampCellFormatter.format(result.getLastChange().getTime()))); - availField.setValue(MeasurementConverterClient.format(result.getUpPercentage(), - MeasurementUnits.PERCENTAGE, true)); availTimeField.setValue(MeasurementConverterClient.format((double) result.getUpTime(), MeasurementUnits.MILLISECONDS, true)); - downField.setValue(MeasurementConverterClient.format(result.getDownPercentage(), - MeasurementUnits.PERCENTAGE, true)); downTimeField.setValue(MeasurementConverterClient.format((double) result.getDownTime(), MeasurementUnits.MILLISECONDS, true)); - disabledField.setValue(MeasurementConverterClient.format(result.getDisabledPercentage(), - MeasurementUnits.PERCENTAGE, true)); disabledTimeField.setValue(MeasurementConverterClient.format((double) result.getDisabledTime(), MeasurementUnits.MILLISECONDS, true)); failureCountField.setValue(result.getFailures()); commit 3c77e8807e7f07b3f309622156637a519ce0ef1b Author: mtho11 <mikecthompson(a)gmail.com> Date: Mon Jul 29 20:07:11 2013 -0700 Availability pie chart for metrics page. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index 811a579..ee06724 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -230,6 +230,8 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { .attr("height", height + margin.top + margin.bottom) .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); + console.error("avail.chartSelection: "+ availChartContext.chartSelection); + svg.selectAll("rect.availBars") .data(availChartContext.data) @@ -329,7 +331,6 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { // Public API draw: function (availChartContext) { "use strict"; - console.log("AvailabilityChart"); drawBars(availChartContext); createHovers(); } @@ -338,7 +339,6 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { }(); - console.log("Avail Data records: "+availChartContext.data.length); if (typeof availChartContext.data !== 'undefined' && availChartContext.data.length > 0) { availabilityGraph.draw(availChartContext); console.log("Availability Chart Drawn"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java new file mode 100644 index 0000000..23effb0 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java @@ -0,0 +1,133 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype; + +import org.rhq.enterprise.gui.coregui.client.util.Log; + +import java.util.ArrayList; +import java.util.List; + +/** + * Contains the javascript chart definition for an implementation of the d3 availability chart. This implementation is + * just a line that changes color based on availability type: up=green, down=red, orange=disabled, unknown=grey, + * empty=grey, warn=yellow. This version of the availability graph shows continuous intervals. + * + * @author Mike Thompson + */ +public class AvailabilitySummaryPieGraphType { + + private List<AvailabilitySummary> availabilitySummaries; + + public AvailabilitySummaryPieGraphType() { + } + + public void setAvailabilityData(String upLabel, double upPercent, String downLabel, double downPercent, String disabledLabel, double disabledPercent ){ + availabilitySummaries = new ArrayList<AvailabilitySummary>(); + availabilitySummaries.add(new AvailabilitySummary(upLabel, upPercent)); + availabilitySummaries.add(new AvailabilitySummary(downLabel, downPercent)); + availabilitySummaries.add(new AvailabilitySummary(disabledLabel, disabledPercent)); + + } + + public String getAvailabilitySummaryJson() { + StringBuilder sb = new StringBuilder("["); + if (null != availabilitySummaries) { + // loop through the avail intervals + for (AvailabilitySummary availabilitySummary : availabilitySummaries) { + sb.append("{ \"label\":\"" + availabilitySummary.getLabel() + "\", "); + sb.append(" \"value\": \"" + availabilitySummary.getValue() * 100 + "\" },"); + } + sb.setLength(sb.length() - 1); + } + + sb.append("]"); + Log.debug(sb.toString()); + return sb.toString(); + } + + /** + * The magic JSNI to draw the charts with d3. + */ + public native void drawJsniChart() /*-{ + console.log("Draw Availability Summary Pie Chart"); + + var data = this.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilitySummaryPieGraphType::getAvailabilitySummaryJson()(); + + var w = 100, + h = 100, + r = 30, + color = $wnd.d3.scale.category10(); + + var vis = $wnd.d3.select("#availSummaryChart svg") + .append("g") + .data(data) + .attr("width", w) + .attr("height", h) + .attr("transform", "translate(" + r + "," + r + ")"); + + var arc = $wnd.d3.svg.arc() + .outerRadius(r); + + var pie = $wnd.d3.layout.pie(); + + var arcs = vis.selectAll("g.slice") + .data(pie) + .enter() + .append("g") + .attr("class", "slice"); + + arcs.append("path") + .attr("fill", function (d, i) { + return color(i); + }) + .attr("d", arc); + + arcs.append("text") + .attr("transform", function (d) { + d.innerRadius = 0; + d.outerRadius = r; + return "translate(" + arc.centroid(d) + ")"; + }) + .attr("text-anchor", "middle") + .text(function (d, i) { + return data[i].value; + }); + console.warn("done with avail summary pie graph"); + + }-*/; + + + private static class AvailabilitySummary { + final private String label; + final private double value; + + private AvailabilitySummary(String label, double value) { + this.label = label; + this.value = value; + } + + private String getLabel() { + return label; + } + + private double getValue() { + return value; + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 09a7bc3..82a9d98 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -305,7 +305,7 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re int startRow = dataArrivedEvent.getStartRow(); int endRow = dataArrivedEvent.getEndRow(); for (int i = startRow; i < endRow; i++) { - if (null != metricsTableView.expandedRows + if (null != metricsTableView && null != metricsTableView.expandedRows && metricsTableView.expandedRows.contains(getRecord(i).getAttributeAsInt( MetricsViewDataSource.FIELD_METRIC_DEF_ID))) { expandRecord(getRecord(i)); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java index 9d6b892..961ea5a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java @@ -20,7 +20,9 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; +import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.StaticTextItem; @@ -31,6 +33,8 @@ import org.rhq.core.domain.resource.composite.ResourceAvailabilitySummary; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilitySummaryPieGraphType; +import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; @@ -58,22 +62,39 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { private StaticTextItem unknownField; private StaticTextItem currentTimeField; + private AvailabilitySummaryPieGraphType availabilitySummaryPieGraph; + public ResourceMetricAvailabilityView(Resource resource) { super(); this.resource = resource; + availabilitySummaryPieGraph = new AvailabilitySummaryPieGraphType(); setWidth100(); - setHeight(165); + setHeight(265); } @Override protected void onInit() { super.onInit(); - + addMember(createGraphMarker()); addMember(createSummaryForm()); } + public HTMLFlow createGraphMarker() { + Log.debug("drawGraph marker in AvailabilitySummaryPieGraph"); + + StringBuilder divAndSvgDefs = new StringBuilder(); + divAndSvgDefs.append("<div id=\"availSummaryChart" + + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:100px;\">"); + divAndSvgDefs.append("</svg></div>"); + HTMLFlow graph = new HTMLFlow(divAndSvgDefs.toString()); + graph.setWidth100(); + graph.setHeight(100); + //addMember(graph); + return graph; + } + private DynamicForm createSummaryForm() { DynamicForm form = new DynamicForm(); form.setWidth100(); @@ -158,6 +179,21 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { @Override public void onSuccess(ResourceAvailabilitySummary result) { + Log.debug("reloadSummaryData"); + + availabilitySummaryPieGraph.setAvailabilityData( + "Up", result.getUpPercentage(), + "Down", result.getDownPercentage(), + "Disabled" ,result.getDisabledPercentage() + ); + new Timer(){ + + @Override + public void run() { + Log.debug("Run Avail Graph"); + availabilitySummaryPieGraph.drawJsniChart(); + } + }.schedule(150); currentField.setValue(MSG.view_resource_monitor_availability_currentStatus_value(result .getCurrent().getName(), TimestampCellFormatter.format(result.getLastChange().getTime()))); @@ -189,6 +225,8 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { currentTimeField.setValue(MSG.view_resource_monitor_availability_currentAsOf(TimestampCellFormatter .format(result.getCurrentTime()))); + + } @Override commit 476581aacd624552d8757c4b82015c3afc6920cb Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 30 16:13:09 2013 -0400 forgot to add test resource file in previous commit diff --git a/modules/plugins/rhq-storage/src/test/resources/cassandra.yaml b/modules/plugins/rhq-storage/src/test/resources/cassandra.yaml new file mode 100644 index 0000000..fd7973b --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/resources/cassandra.yaml @@ -0,0 +1,690 @@ +# Cassandra storage config YAML + +# NOTE: +# See http://wiki.apache.org/cassandra/StorageConfiguration for +# full explanations of configuration directives +# /NOTE + +# The name of the cluster. This is mainly used to prevent machines in +# one logical cluster from joining another. +cluster_name: rhq + +# This defines the number of tokens randomly assigned to this node on the ring +# The more tokens, relative to other nodes, the larger the proportion of data +# that this node will store. You probably want all nodes to have the same number +# of tokens assuming they have equal hardware capability. +# +# If you leave this unspecified, Cassandra will use the default of 1 token for legacy compatibility, +# and will use the initial_token as described below. +# +# Specifying initial_token will override this setting. +# +# If you already have a cluster with 1 token per node, and wish to migrate to +# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations +num_tokens: 256 + +# If you haven't specified num_tokens, or have set it to the default of 1 then +# you should always specify InitialToken when setting up a production +# cluster for the first time, and often when adding capacity later. +# The principle is that each node should be given an equal slice of +# the token ring; see http://wiki.apache.org/cassandra/Operations +# for more details. +# +# If blank, Cassandra will request a token bisecting the range of +# the heaviest-loaded existing node. If there is no load information +# available, such as is the case with a new cluster, it will pick +# a random token, which will lead to hot spots. +#initial_token: + +# See http://wiki.apache.org/cassandra/HintedHandoff +hinted_handoff_enabled: true +# this defines the maximum amount of time a dead host will have hints +# generated. After it has been dead this long, new hints for it will not be +# created until it has been seen alive and gone down again. +max_hint_window_in_ms: 10800000 # 3 hours +# throttle in KB's per second, per delivery thread +hinted_handoff_throttle_in_kb: 1024 +# Number of threads with which to deliver hints; +# Consider increasing this number when you have multi-dc deployments, since +# cross-dc handoff tends to be slower +max_hints_delivery_threads: 2 + +# The following setting populates the page cache on memtable flush and compaction +# WARNING: Enable this setting only when the whole node's data fits in memory. +# Defaults to: false +# populate_io_cache_on_flush: false + +# Authentication backend, implementing IAuthenticator; used to identify users +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator, +# PasswordAuthenticator}. +# +# - AllowAllAuthenticator performs no checks - set it to disable authentication. +# - PasswordAuthenticator relies on username/password pairs to authenticate +# users. It keeps usernames and hashed passwords in system_auth.credentials table. +# Please increase system_auth keyspace replication factor if you use this authenticator. +authenticator: org.apache.cassandra.auth.PasswordAuthenticator + +# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer, +# CassandraAuthorizer}. +# +# - AllowAllAuthorizer allows any action to any user - set it to disable authorization. +# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please +# increase system_auth keyspace replication factor if you use this authorizer. +authorizer: org.apache.cassandra.auth.CassandraAuthorizer + +# Validity period for permissions cache (fetching permissions can be an +# expensive operation depending on the authorizer, CassandraAuthorizer is +# one example). Defaults to 2000, set to 0 to disable. +# Will be disabled automatically for AllowAllAuthorizer. +permissions_validity_in_ms: 2000 + +# The partitioner is responsible for distributing rows (by key) across +# nodes in the cluster. Any IPartitioner may be used, including your +# own as long as it is on the classpath. Out of the box, Cassandra +# provides org.apache.cassandra.dht.{Murmur3Partitioner, RandomPartitioner +# ByteOrderedPartitioner, OrderPreservingPartitioner (deprecated)}. +# +# - RandomPartitioner distributes rows across the cluster evenly by md5. +# This is the default prior to 1.2 and is retained for compatibility. +# - Murmur3Partitioner is similar to RandomPartioner but uses Murmur3_128 +# Hash Function instead of md5. When in doubt, this is the best option. +# - ByteOrderedPartitioner orders rows lexically by key bytes. BOP allows +# scanning rows in key order, but the ordering can generate hot spots +# for sequential insertion workloads. +# - OrderPreservingPartitioner is an obsolete form of BOP, that stores +# - keys in a less-efficient format and only works with keys that are +# UTF8-encoded Strings. +# - CollatingOPP colates according to EN,US rules rather than lexical byte +# ordering. Use this as an example if you need custom collation. +# +# See http://wiki.apache.org/cassandra/Operations for more on +# partitioners and token selection. +partitioner: org.apache.cassandra.dht.Murmur3Partitioner + +# directories where Cassandra should store data on disk. +data_file_directories: + - /Users/jsanda/Development/redhat/rhq/rhq-data/storage-1/data + +# commit log +commitlog_directory: /Users/jsanda/Development/redhat/rhq/rhq-data/storage-1/commit_log + +# policy for data disk failures: +# stop: shut down gossip and Thrift, leaving the node effectively dead, but +# still inspectable via JMX. +# best_effort: stop using the failed disk and respond to requests based on +# remaining available sstables. This means you WILL see obsolete +# data at CL.ONE! +# ignore: ignore fatal errors and let requests fail, as in pre-1.2 Cassandra +disk_failure_policy: stop + +# Maximum size of the key cache in memory. +# +# Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the +# minimum, sometimes more. The key cache is fairly tiny for the amount of +# time it saves, so it's worthwhile to use it at large numbers. +# The row cache saves even more time, but must store the whole values of +# its rows, so it is extremely space-intensive. It's best to only use the +# row cache if you have hot rows or static rows. +# +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is empty to make it "auto" (min(5% of Heap (in MB), 100MB)). Set to 0 to disable key cache. +key_cache_size_in_mb: + +# Duration in seconds after which Cassandra should +# safe the keys cache. Caches are saved to saved_caches_directory as +# specified in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 14400 or 4 hours. +key_cache_save_period: 14400 + +# Number of keys from the key cache to save +# Disabled by default, meaning all keys are going to be saved +# key_cache_keys_to_save: 100 + +# Maximum size of the row cache in memory. +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is 0, to disable row caching. +row_cache_size_in_mb: 0 + +# Duration in seconds after which Cassandra should +# safe the row cache. Caches are saved to saved_caches_directory as specified +# in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 0 to disable saving the row cache. +row_cache_save_period: 0 + +# Number of keys from the row cache to save +# Disabled by default, meaning all keys are going to be saved +# row_cache_keys_to_save: 100 + +# The provider for the row cache to use. +# +# Supported values are: ConcurrentLinkedHashCacheProvider, SerializingCacheProvider +# +# SerializingCacheProvider serialises the contents of the row and stores +# it in native memory, i.e., off the JVM Heap. Serialized rows take +# significantly less memory than "live" rows in the JVM, so you can cache +# more rows in a given memory footprint. And storing the cache off-heap +# means you can use smaller heap sizes, reducing the impact of GC pauses. +# +# It is also valid to specify the fully-qualified class name to a class +# that implements org.apache.cassandra.cache.IRowCacheProvider. +# +# Defaults to SerializingCacheProvider +row_cache_provider: SerializingCacheProvider + +# saved caches +saved_caches_directory: /Users/jsanda/Development/redhat/rhq/rhq-data/storage-1/saved_caches + +# commitlog_sync may be either "periodic" or "batch." +# When in batch mode, Cassandra won't ack writes until the commit log +# has been fsynced to disk. It will wait up to +# commitlog_sync_batch_window_in_ms milliseconds for other writes, before +# performing the sync. +# +# commitlog_sync: batch +# commitlog_sync_batch_window_in_ms: 50 +# +# the other option is "periodic" where writes may be acked immediately +# and the CommitLog is simply synced every commitlog_sync_period_in_ms +# milliseconds. +commitlog_sync: periodic +commitlog_sync_period_in_ms: 10000 + +# The size of the individual commitlog file segments. A commitlog +# segment may be archived, deleted, or recycled once all the data +# in it (potentally from each columnfamily in the system) has been +# flushed to sstables. +# +# The default size is 32, which is almost always fine, but if you are +# archiving commitlog segments (see commitlog_archiving.properties), +# then you probably want a finer granularity of archiving; 8 or 16 MB +# is reasonable. +commitlog_segment_size_in_mb: 32 + +# any class that implements the SeedProvider interface and has a +# constructor that takes a Map<String, String> of parameters will do. +seed_provider: + # Addresses of hosts that are deemed contact points. + # Cassandra nodes use this list of hosts to find each other and learn + # the topology of the ring. You must change this if you are running + # multiple nodes! + - class_name: org.apache.cassandra.locator.SimpleSeedProvider + parameters: + # seeds is actually a comma-delimited list of addresses. + # Ex: "<ip1>,<ip2>,<ip3>" + - seeds: "127.0.0.1" + +# emergency pressure valve: each time heap usage after a full (CMS) +# garbage collection is above this fraction of the max, Cassandra will +# flush the largest memtables. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +# +# RELYING ON THIS AS YOUR PRIMARY TUNING MECHANISM WILL WORK POORLY: +# it is most effective under light to moderate load, or read-heavy +# workloads; under truly massive write load, it will often be too +# little, too late. +flush_largest_memtables_at: 0.75 + +# emergency pressure valve #2: the first time heap usage after a full +# (CMS) garbage collection is above this fraction of the max, +# Cassandra will reduce cache maximum _capacity_ to the given fraction +# of the current _size_. Should usually be set substantially above +# flush_largest_memtables_at, since that will have less long-term +# impact on the system. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +reduce_cache_sizes_at: 0.85 +reduce_cache_capacity_to: 0.6 + +# For workloads with more data than can fit in memory, Cassandra's +# bottleneck will be reads that need to fetch data from +# disk. "concurrent_reads" should be set to (16 * number_of_drives) in +# order to allow the operations to enqueue low enough in the stack +# that the OS and drives can reorder them. +# +# On the other hand, since writes are almost never IO bound, the ideal +# number of "concurrent_writes" is dependent on the number of cores in +# your system; (8 * number_of_cores) is a good rule of thumb. +concurrent_reads: 32 +concurrent_writes: 32 + +# Total memory to use for memtables. Cassandra will flush the largest +# memtable when this much memory is used. +# If omitted, Cassandra will set it to 1/3 of the heap. +# memtable_total_space_in_mb: 2048 + +# Total space to use for commitlogs. Since commitlog segments are +# mmapped, and hence use up address space, the default size is 32 +# on 32-bit JVMs, and 1024 on 64-bit JVMs. +# +# If space gets above this value (it will round up to the next nearest +# segment multiple), Cassandra will flush every dirty CF in the oldest +# segment and remove it. So a small total commitlog space will tend +# to cause more flush activity on less-active columnfamilies. +# commitlog_total_space_in_mb: 4096 + +# This sets the amount of memtable flush writer threads. These will +# be blocked by disk io, and each one will hold a memtable in memory +# while blocked. If you have a large heap and many data directories, +# you can increase this value for better flush performance. +# By default this will be set to the amount of data directories defined. +#memtable_flush_writers: 1 + +# the number of full memtables to allow pending flush, that is, +# waiting for a writer thread. At a minimum, this should be set to +# the maximum number of secondary indexes created on a single CF. +memtable_flush_queue_size: 4 + +# Whether to, when doing sequential writing, fsync() at intervals in +# order to force the operating system to flush the dirty +# buffers. Enable this to avoid sudden dirty buffer flushing from +# impacting read latencies. Almost always a good idea on SSD:s; not +# necessarily on platters. +trickle_fsync: false +trickle_fsync_interval_in_kb: 10240 + +# TCP port, for commands and data +storage_port: 7100 + +# SSL port, for encrypted communication. Unused unless enabled in +# encryption_options +ssl_storage_port: 7101 + +# Address to bind to and tell other Cassandra nodes to connect to. You +# _must_ change this if you want multiple nodes to be able to +# communicate! +# +# Leaving it blank leaves it up to InetAddress.getLocalHost(). This +# will always do the Right Thing *if* the node is properly configured +# (hostname, name resolution, etc), and the Right Thing is to use the +# address associated with the hostname (it might not be). +# +# Setting this to 0.0.0.0 is always wrong. +listen_address: 127.0.0.1 + +# Address to broadcast to other Cassandra nodes +# Leaving this blank will set it to the same value as listen_address +# broadcast_address: 1.2.3.4 + +# Internode authentication backend, implementing IInternodeAuthenticator; +# used to allow/disallow connections from peer nodes. +internode_authenticator: org.rhq.cassandra.auth.RhqInternodeAuthenticator + +# Whether to start the native transport server. +# Currently, only the thrift server is started by default because the native +# transport is considered beta. +# Please note that the address on which the native transport is bound is the +# same as the rpc_address. The port however is different and specified below. +start_native_transport: true +# port for the CQL native transport to listen for clients on +native_transport_port: 9142 +# The minimum and maximum threads for handling requests when the native +# transport is used. The meaning is those is similar to the one of +# rpc_min_threads and rpc_max_threads, though the default differ slightly and +# are the ones below: +# native_transport_min_threads: 16 +native_transport_max_threads: 128 + + +# Whether to start the thrift rpc server. +start_rpc: false +# The address to bind the Thrift RPC service to -- clients connect +# here. Unlike ListenAddress above, you *can* specify 0.0.0.0 here if +# you want Thrift to listen on all interfaces. +# +# Leaving this blank has the same effect it does for ListenAddress, +# (i.e. it will be based on the configured hostname of the node). +rpc_address: 127.0.0.1 +# port for Thrift to listen for clients on +rpc_port: 9160 + +# enable or disable keepalive on rpc connections +rpc_keepalive: true + +# Cassandra provides three out-of-the-box options for the RPC Server: +# +# sync -> One thread per thrift connection. For a very large number of clients, memory +# will be your limiting factor. On a 64 bit JVM, 128KB is the minimum stack size +# per thread, and that will correspond to your use of virtual memory (but physical memory +# may be limited depending on use of stack space). +# +# hsha -> Stands for "half synchronous, half asynchronous." All thrift clients are handled +# asynchronously using a small number of threads that does not vary with the amount +# of thrift clients (and thus scales well to many clients). The rpc requests are still +# synchronous (one thread per active request). +# +# The default is sync because on Windows hsha is about 30% slower. On Linux, +# sync/hsha performance is about the same, with hsha of course using less memory. +# +# Alternatively, can provide your own RPC server by providing the fully-qualified class name +# of an o.a.c.t.TServerFactory that can create an instance of it. +rpc_server_type: sync + +# Uncomment rpc_min|max_thread to set request pool size limits. +# +# Regardless of your choice of RPC server (see above), the number of maximum requests in the +# RPC thread pool dictates how many concurrent requests are possible (but if you are using the sync +# RPC server, it also dictates the number of clients that can be connected at all). +# +# The default is unlimited and thus provide no protection against clients overwhelming the server. You are +# encouraged to set a maximum that makes sense for you in production, but do keep in mind that +# rpc_max_threads represents the maximum number of client requests this server may execute concurrently. +# +# rpc_min_threads: 16 +# rpc_max_threads: 2048 + +# uncomment to set socket buffer sizes on rpc connections +# rpc_send_buff_size_in_bytes: +# rpc_recv_buff_size_in_bytes: + +# uncomment to set socket buffer size for internode communication +# Note that when setting this, the buffer size is limited by net.core.wmem_max +# and when not setting it it is defined by net.ipv4.tcp_wmem +# See: +# /proc/sys/net/core/wmem_max +# /proc/sys/net/core/rmem_max +# /proc/sys/net/ipv4/tcp_wmem +# /proc/sys/net/ipv4/tcp_wmem +# and: man tcp +# internode_send_buff_size_in_bytes: +# internode_recv_buff_size_in_bytes: + +# Frame size for thrift (maximum field length). +thrift_framed_transport_size_in_mb: 15 + +# The max length of a thrift message, including all fields and +# internal thrift overhead. +thrift_max_message_length_in_mb: 16 + +# Set to true to have Cassandra create a hard link to each sstable +# flushed or streamed locally in a backups/ subdirectory of the +# Keyspace data. Removing these links is the operator's +# responsibility. +incremental_backups: false + +# Whether or not to take a snapshot before each compaction. Be +# careful using this option, since Cassandra won't clean up the +# snapshots for you. Mostly useful if you're paranoid when there +# is a data format change. +snapshot_before_compaction: false + +# Whether or not a snapshot is taken of the data before keyspace truncation +# or dropping of column families. The STRONGLY advised default of true +# should be used to provide data safety. If you set this flag to false, you will +# lose data on truncation or drop. +auto_snapshot: true + +# Add column indexes to a row after its contents reach this size. +# Increase if your column values are large, or if you have a very large +# number of columns. The competing causes are, Cassandra has to +# deserialize this much of the row to read a single column, so you want +# it to be small - at least if you do many partial-row reads - but all +# the index data is read for each access, so you don't want to generate +# that wastefully either. +column_index_size_in_kb: 64 + +# Size limit for rows being compacted in memory. Larger rows will spill +# over to disk and use a slower two-pass compaction process. A message +# will be logged specifying the row key. +in_memory_compaction_limit_in_mb: 64 + +# Number of simultaneous compactions to allow, NOT including +# validation "compactions" for anti-entropy repair. Simultaneous +# compactions can help preserve read performance in a mixed read/write +# workload, by mitigating the tendency of small sstables to accumulate +# during a single long running compactions. The default is usually +# fine and if you experience problems with compaction running too +# slowly or too fast, you should look at +# compaction_throughput_mb_per_sec first. +# +# concurrent_compactors defaults to the number of cores. +# Uncomment to make compaction mono-threaded, the pre-0.8 default. +#concurrent_compactors: 1 + +# Multi-threaded compaction. When enabled, each compaction will use +# up to one thread per core, plus one thread per sstable being merged. +# This is usually only useful for SSD-based hardware: otherwise, +# your concern is usually to get compaction to do LESS i/o (see: +# compaction_throughput_mb_per_sec), not more. +multithreaded_compaction: false + +# Throttles compaction to the given total throughput across the entire +# system. The faster you insert data, the faster you need to compact in +# order to keep the sstable count down, but in general, setting this to +# 16 to 32 times the rate you are inserting data is more than sufficient. +# Setting this to 0 disables throttling. Note that this account for all types +# of compaction, including validation compaction. +compaction_throughput_mb_per_sec: 16 + +# Track cached row keys during compaction, and re-cache their new +# positions in the compacted sstable. Disable if you use really large +# key caches. +compaction_preheat_key_cache: true + +# Throttles all outbound streaming file transfers on this node to the +# given total throughput in Mbps. This is necessary because Cassandra does +# mostly sequential IO when streaming data during bootstrap or repair, which +# can lead to saturating the network connection and degrading rpc performance. +# When unset, the default is 200 Mbps or 25 MB/s. +# stream_throughput_outbound_megabits_per_sec: 200 + +# How long the coordinator should wait for read operations to complete +read_request_timeout_in_ms: 20000 +# How long the coordinator should wait for seq or index scans to complete +range_request_timeout_in_ms: 20000 +# How long the coordinator should wait for writes to complete +write_request_timeout_in_ms: 20000 +# How long the coordinator should wait for truncates to complete +# (This can be much longer, because we need to flush all CFs +# to make sure we can clear out anythink in the commitlog that could +# cause truncated data to reappear.) +truncate_request_timeout_in_ms: 60000 +# The default timeout for other, miscellaneous operations +request_timeout_in_ms: 20000 + +# Enable operation timeout information exchange between nodes to accurately +# measure request timeouts, If disabled cassandra will assuming the request +# was forwarded to the replica instantly by the coordinator +# +# Warning: before enabling this property make sure to ntp is installed +# and the times are synchronized between the nodes. +cross_node_timeout: false + +# Enable socket timeout for streaming operation. +# When a timeout occurs during streaming, streaming is retried from the start +# of the current file. This *can* involve re-streaming an important amount of +# data, so you should avoid setting the value too low. +# Default value is 0, which never timeout streams. +# streaming_socket_timeout_in_ms: 0 + +# phi value that must be reached for a host to be marked down. +# most users should never need to adjust this. +# phi_convict_threshold: 8 + +# endpoint_snitch -- Set this to a class that implements +# IEndpointSnitch. The snitch has two functions: +# - it teaches Cassandra enough about your network topology to route +# requests efficiently +# - it allows Cassandra to spread replicas around your cluster to avoid +# correlated failures. It does this by grouping machines into +# "datacenters" and "racks." Cassandra will do its best not to have +# more than one replica on the same "rack" (which may not actually +# be a physical location) +# +# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER, +# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS +# ARE PLACED. +# +# Out of the box, Cassandra provides +# - SimpleSnitch: +# Treats Strategy order as proximity. This improves cache locality +# when disabling read repair, which can further improve throughput. +# Only appropriate for single-datacenter deployments. +# - PropertyFileSnitch: +# Proximity is determined by rack and data center, which are +# explicitly configured in cassandra-topology.properties. +# - GossipingPropertyFileSnitch +# The rack and datacenter for the local node are defined in +# cassandra-rackdc.properties and propagated to other nodes via gossip. If +# cassandra-topology.properties exists, it is used as a fallback, allowing +# migration from the PropertyFileSnitch. +# - RackInferringSnitch: +# Proximity is determined by rack and data center, which are +# assumed to correspond to the 3rd and 2nd octet of each node's +# IP address, respectively. Unless this happens to match your +# deployment conventions (as it did Facebook's), this is best used +# as an example of writing a custom Snitch class. +# - Ec2Snitch: +# Appropriate for EC2 deployments in a single Region. Loads Region +# and Availability Zone information from the EC2 API. The Region is +# treated as the Datacenter, and the Availability Zone as the rack. +# Only private IPs are used, so this will not work across multiple +# Regions. +# - Ec2MultiRegionSnitch: +# Uses public IPs as broadcast_address to allow cross-region +# connectivity. (Thus, you should set seed addresses to the public +# IP as well.) You will need to open the storage_port or +# ssl_storage_port on the public IP firewall. (For intra-Region +# traffic, Cassandra will switch to the private IP after +# establishing a connection.) +# +# You can use a custom Snitch by setting this to the full class name +# of the snitch, which will be assumed to be on your classpath. +endpoint_snitch: SimpleSnitch + +# controls how often to perform the more expensive part of host score +# calculation +dynamic_snitch_update_interval_in_ms: 100 +# controls how often to reset all host scores, allowing a bad host to +# possibly recover +dynamic_snitch_reset_interval_in_ms: 600000 +# if set greater than zero and read_repair_chance is < 1.0, this will allow +# 'pinning' of replicas to hosts in order to increase cache capacity. +# The badness threshold will control how much worse the pinned host has to be +# before the dynamic snitch will prefer other replicas over it. This is +# expressed as a double which represents a percentage. Thus, a value of +# 0.2 means Cassandra would continue to prefer the static snitch values +# until the pinned host was 20% worse than the fastest. +dynamic_snitch_badness_threshold: 0.1 + +# request_scheduler -- Set this to a class that implements +# RequestScheduler, which will schedule incoming client requests +# according to the specific policy. This is useful for multi-tenancy +# with a single Cassandra cluster. +# NOTE: This is specifically for requests from the client and does +# not affect inter node communication. +# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place +# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of +# client requests to a node with a separate queue for each +# request_scheduler_id. The scheduler is further customized by +# request_scheduler_options as described below. +request_scheduler: org.apache.cassandra.scheduler.NoScheduler + +# Scheduler Options vary based on the type of scheduler +# NoScheduler - Has no options +# RoundRobin +# - throttle_limit -- The throttle_limit is the number of in-flight +# requests per client. Requests beyond +# that limit are queued up until +# running requests can complete. +# The value of 80 here is twice the number of +# concurrent_reads + concurrent_writes. +# - default_weight -- default_weight is optional and allows for +# overriding the default which is 1. +# - weights -- Weights are optional and will default to 1 or the +# overridden default_weight. The weight translates into how +# many requests are handled during each turn of the +# RoundRobin, based on the scheduler id. +# +# request_scheduler_options: +# throttle_limit: 80 +# default_weight: 5 +# weights: +# Keyspace1: 1 +# Keyspace2: 5 + +# request_scheduler_id -- An identifer based on which to perform +# the request scheduling. Currently the only valid option is keyspace. +# request_scheduler_id: keyspace + +# index_interval controls the sampling of entries from the primrary +# row index in terms of space versus time. The larger the interval, +# the smaller and less effective the sampling will be. In technicial +# terms, the interval coresponds to the number of index entries that +# are skipped between taking each sample. All the sampled entries +# must fit in memory. Generally, a value between 128 and 512 here +# coupled with a large key cache size on CFs results in the best trade +# offs. This value is not often changed, however if you have many +# very small rows (many to an OS page), then increasing this will +# often lower memory usage without a impact on performance. +index_interval: 128 + +# Enable or disable inter-node encryption +# Default settings are TLS v1, RSA 1024-bit keys (it is imperative that +# users generate their own keys) TLS_RSA_WITH_AES_128_CBC_SHA as the cipher +# suite for authentication, key exchange and encryption of the actual data transfers. +# NOTE: No custom encryption options are enabled at the moment +# The available internode options are : all, none, dc, rack +# +# If set to dc cassandra will encrypt the traffic between the DCs +# If set to rack cassandra will encrypt the traffic between the racks +# +# The passwords used in these options must match the passwords used when generating +# the keystore and truststore. For instructions on generating these files, see: +# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSS… +# +server_encryption_options: + internode_encryption: none + keystore: conf/.keystore + keystore_password: cassandra + truststore: conf/.truststore + truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + # require_client_auth: false + +# enable or disable client/server encryption. +client_encryption_options: + enabled: false + keystore: conf/.keystore + keystore_password: cassandra + # require_client_auth: false + # Set trustore and truststore_password if require_client_auth is true + # truststore: conf/.truststore + # truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + +# internode_compression controls whether traffic between nodes is +# compressed. +# can be: all - all traffic is compressed +# dc - traffic between different datacenters is compressed +# none - nothing is compressed. +internode_compression: none + +# Enable or disable tcp_nodelay for inter-dc communication. +# Disabling it will result in larger (but fewer) network packets being sent, +# reducing overhead from the TCP protocol itself, at the cost of increasing +# latency if you block for cross-datacenter responses. +inter_dc_tcp_nodelay: true commit af4705c8854779ba9354641589cdf2e3f478a712 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 30 14:28:38 2013 -0400 add resource config support for cql and gossip ports in rhq-storage plugin diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties index 1faee9d..2eb5ab5 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties @@ -13,7 +13,7 @@ heap_new="-Xmn64M" heap_dump_on_OOMError="-XX:+HeapDumpOnOutOfMemoryError" -heap_dump_dir="" +heap_dump_dir= thread_stack_size="-Xss180k" diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java index 5276c84..c53c19b 100644 --- a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java @@ -108,7 +108,7 @@ public class ConfigEditor { return (Integer) config.get("native_transport_port"); } - public void setNativeTransportPort(int port) { + public void setNativeTransportPort(Integer port) { config.put("native_transport_port", port); } @@ -116,7 +116,7 @@ public class ConfigEditor { return (Integer) config.get("storage_port"); } - public void setStoragePort(int port) { + public void setStoragePort(Integer port) { config.put("storage_port", port); } diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index dd5b8a2..edaf9f9 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -5,6 +5,12 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.yaml.snakeyaml.error.YAMLException; + +import org.rhq.cassandra.util.ConfigEditor; +import org.rhq.cassandra.util.ConfigEditorException; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PropertySimple; @@ -18,12 +24,16 @@ import org.rhq.core.util.StringUtil; */ public class StorageNodeConfigDelegate implements ConfigurationFacet { + private Log log = LogFactory.getLog(StorageNodeConfigDelegate.class); + private File jvmOptsFile; private File wrapperEnvFile; + private File cassandraYamlFile; public StorageNodeConfigDelegate(File basedir) { File confDir = new File(basedir, "conf"); jvmOptsFile = new File(confDir, "cassandra-jvm.properties"); + cassandraYamlFile = new File(confDir, "cassandra.yaml"); // for windows, config props also get propagated to the wrapper env if (isWindows()) { @@ -60,6 +70,11 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { config.put(new PropertySimple("heapDumpDir", new File(basedir, "bin").getAbsolutePath())); } + ConfigEditor yamlEditor = new ConfigEditor(cassandraYamlFile); + yamlEditor.load(); + config.put(new PropertySimple("cqlPort", yamlEditor.getNativeTransportPort())); + config.put(new PropertySimple("gossipPort", yamlEditor.getStoragePort())); + return config; } @@ -135,6 +150,7 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { Configuration config = configurationUpdateReport.getConfiguration(); updateCassandraJvmProps(config); + updateCassandraYaml(config); if (isWindows()) { updateWrapperEnv(config); @@ -145,6 +161,8 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { configurationUpdateReport.setErrorMessage("No configuration update was applied: " + e.getMessage()); } catch (IOException e) { configurationUpdateReport.setErrorMessageFromThrowable(e); + } catch (ConfigEditorException e) { + configurationUpdateReport.setErrorMessageFromThrowable(e); } } @@ -195,6 +213,43 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { propertiesUpdater.update(properties); } + private void updateCassandraYaml(Configuration newConfig) { + ConfigEditor editor = new ConfigEditor(cassandraYamlFile); + try { + editor.load(); + + PropertySimple cqlPortProperty = newConfig.getSimple("cqlPort"); + if (cqlPortProperty != null) { + editor.setNativeTransportPort(cqlPortProperty.getIntegerValue()); + } + + PropertySimple gossipPortProperty = newConfig.getSimple("gossipPort"); + if (gossipPortProperty != null) { + editor.setStoragePort(gossipPortProperty.getIntegerValue()); + } + + editor.save(); + } catch (ConfigEditorException e) { + if (e.getCause() instanceof YAMLException) { + log.error("Failed to update " + cassandraYamlFile); + log.info("Attempting to restore " + cassandraYamlFile); + try { + editor.restore(); + throw e; + } catch (ConfigEditorException e1) { + log.error("Failed to restore " + cassandraYamlFile + ". A copy of the file prior to any " + + "modifications can be found at " + editor.getBackupFile()); + throw new ConfigEditorException("There was an error updating " + cassandraYamlFile + " and " + + "undoing the changes failed. A copy of the file can be found at " + editor.getBackupFile() + + ". See the agent logs for more details.", e); + } + } else { + log.error("No updates were made to " + cassandraYamlFile + " due to an unexpected error", e); + throw e; + } + } + } + private void updateWrapperEnv(Configuration config) throws IOException { PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(wrapperEnvFile.getAbsolutePath()); Properties properties = propertiesUpdater.loadExistingProperties(); diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index f5a4f6d..84bb832 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -175,6 +175,17 @@ <c:simple-property name="heapDumpDir" displayName="Heap Dump Directory" required="false" description="The directory in which heap dumps will be written."/> </c:group> + <c:group name="Ports"> + <c:simple-property name="cqlPort" + displayName="CQL Port" + type="integer" + description="The port on which to listen for client requests over the native, CQL protocol. + This is a shared, cluster-wide setting."/> + <c:simple-property name="gossipPort" + type="integer" + description="The port used for internode communication. This is a shared, cluster-wide setting."/> + + </c:group> </resource-configuration> <server name="Cassandra Server JVM" diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java index 64d14b2..15861c1 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java @@ -6,17 +6,20 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.Method; import java.util.Properties; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import org.rhq.cassandra.util.ConfigEditor; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.util.file.FileUtil; +import org.rhq.core.util.stream.StreamUtil; /** * @author John Sanda @@ -25,6 +28,8 @@ public class StorageNodeConfigDelegateTest { private File basedir; + private File cassandraYamlFile; + private StorageNodeConfigDelegate configDelegate; @BeforeMethod @@ -33,6 +38,11 @@ public class StorageNodeConfigDelegateTest { basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); FileUtil.purge(basedir, true); configDelegate = new StorageNodeConfigDelegate(basedir); + + cassandraYamlFile = new File(confDir(), "cassandra.yaml"); + InputStream inputStream = getClass().getResourceAsStream("/cassandra.yaml"); + FileOutputStream outputStream = new FileOutputStream(cassandraYamlFile); + StreamUtil.copy(inputStream, outputStream); } @@ -55,13 +65,24 @@ public class StorageNodeConfigDelegateTest { public void updateValidConfig() throws Exception { createDefaultConfig(); - Configuration config = new Configuration(); - config.put(new PropertySimple("minHeapSize", "1024M")); - config.put(new PropertySimple("maxHeapSize", "1024M")); - config.put(new PropertySimple("heapNewSize", "256M")); - config.put(new PropertySimple("threadStackSize", "240")); - config.put(new PropertySimple("heapDumpOnOOMError", true)); - config.put(new PropertySimple("heapDumpDir", confDir())); + Configuration config = Configuration.builder() + .addSimple("minHeapSize", "1024M") + .addSimple("maxHeapSize", "1024M") + .addSimple("heapNewSize", "256M") + .addSimple("threadStackSize", "240") + .addSimple("heapDumpOnOOMError", true) + .addSimple("heapDumpDir", confDir()) + .addSimple("cqlPort", 9595) + .addSimple("gossipPort", 9696) + .build(); +// config.put(new PropertySimple("minHeapSize", "1024M")); +// config.put(new PropertySimple("maxHeapSize", "1024M")); +// config.put(new PropertySimple("heapNewSize", "256M")); +// config.put(new PropertySimple("threadStackSize", "240")); +// config.put(new PropertySimple("heapDumpOnOOMError", true)); +// config.put(new PropertySimple("heapDumpDir", confDir())); +// config.put(new PropertySimple("cqlPort", 9595)); +// config.put(new PropertySimple("gossipPort", 9696)); ConfigurationUpdateReport report = new ConfigurationUpdateReport(config); @@ -78,6 +99,12 @@ public class StorageNodeConfigDelegateTest { "Failed to update property [heap_dump_on_OOMError]"); assertEquals(properties.getProperty("heap_dump_dir"), confDir().getAbsolutePath(), "Failed to update property [heap_dump_dir]"); + + ConfigEditor yamlEditor = new ConfigEditor(cassandraYamlFile); + yamlEditor.load(); + + assertEquals(yamlEditor.getNativeTransportPort(), (Integer) 9595, "Failed to update native_transport_port"); + assertEquals(yamlEditor.getStoragePort(), (Integer) 9696, "Failed to update storage_port"); } @Test commit f19e7d84f953356db55deabebc8fe2ec43d276af Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 30 13:17:15 2013 -0400 make dataFileDirectories property read/write diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java index 9e1f86b..5276c84 100644 --- a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java @@ -88,6 +88,10 @@ public class ConfigEditor { return (List<String>) config.get("data_file_directories"); } + public void setDataFileDirectories(List<String> dirs) { + config.put("data_file_directories", dirs); + } + public String getSavedCachesDirectory() { return (String) config.get("saved_caches_directory"); } diff --git a/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java b/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java index f339b48..9c3cc16 100644 --- a/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java +++ b/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java @@ -1,5 +1,6 @@ package org.rhq.cassandra.util; +import static java.util.Arrays.asList; import static org.testng.Assert.assertEquals; import java.io.File; @@ -88,6 +89,24 @@ public class ConfigEditorTest { assertEquals(editor.getStoragePort(), config.storage_port, "Failed to fetch storage_port"); } + @Test + public void updateDataFilesDirectories() throws Exception { + ConfigEditor editor = new ConfigEditor(configFile); + editor.load(); + editor.setDataFileDirectories(asList("/data/dir1", "/data/dir2", "data/dir3")); + editor.save(); + + Config config = loadConfig(); + + assertEquals(config.data_file_directories, new String[] {"/data/dir1", "/data/dir2", "data/dir3"}, + "Failed to update data_file_directories"); + + editor.load(); + + assertEquals(editor.getDataFileDirectories().toArray(new String[3]), config.data_file_directories, + "Failed to fetch data_file_directories"); + } + private Config loadConfig() throws Exception { FileInputStream inputStream = new FileInputStream(configFile); org.yaml.snakeyaml.constructor.Constructor constructor = commit 9fe2884cd3c6602d045dc4fc1a7c6c8820f9ec83 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 30 12:57:25 2013 -0400 make storagePort and nativeTransportPort read/write properties diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java index 0b4a127..9e1f86b 100644 --- a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java @@ -100,10 +100,18 @@ public class ConfigEditor { params.put("seeds", StringUtil.arrayToString(seeds)); } + public Integer getNativeTransportPort() { + return (Integer) config.get("native_transport_port"); + } + public void setNativeTransportPort(int port) { config.put("native_transport_port", port); } + public Integer getStoragePort() { + return (Integer) config.get("storage_port"); + } + public void setStoragePort(int port) { config.put("storage_port", port); } diff --git a/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java b/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java index cf344e2..f339b48 100644 --- a/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java +++ b/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java @@ -65,6 +65,11 @@ public class ConfigEditorTest { Config config = loadConfig(); assertEquals(config.native_transport_port, (Integer) 9393, "Failed to update native_transport_port"); + + editor.load(); + + assertEquals(editor.getNativeTransportPort(), config.native_transport_port, + "Failed to fetch native_transport_port"); } @Test @@ -77,6 +82,10 @@ public class ConfigEditorTest { Config config = loadConfig(); assertEquals(config.storage_port, (Integer) 6767, "Failed to update storage_port"); + + editor.load(); + + assertEquals(editor.getStoragePort(), config.storage_port, "Failed to fetch storage_port"); } private Config loadConfig() throws Exception { commit 76badf25b9a3932837fb00af3d2bc484b6045a2b Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 30 10:53:24 2013 -0400 adding back support for deploying additional nodes with internode authentication When the user installs a new storage node the following steps occur, * The node is committed into inventory (but not part of storage cluster) * StorageNode entity is created with mode set to INSTALLED * New node is announced to the cluster * Server schedules operation for cluster nodes to update internode auth conf file to include the new node * Server prepares new node for bootstrap * Schedules operation on new node to * Apply cluster settings * Update internode auth conf settings * Restart the node so it bootstraps into cluster * Token ranges will be assigned to node * New node will stream data from other nodes * Server is notified that new node is up and part of the cluster * The operation mode is set to NORMAL * addNodeMaintenance operation is run on each cluster node * Updates replication_factor if necessary * Runs repair if necessary * Deletes old keys * Updates seeds property diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java index 575edc74..f4d3934 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java @@ -56,6 +56,8 @@ import org.rhq.core.domain.resource.Resource; + " FROM StorageNode s " // + "LEFT JOIN FETCH s.resource r " // + " WHERE s.address = :address"), + @NamedQuery(name = StorageNode.QUERY_FIND_ALL_BY_MODE, query = + "SELECT s FROM StorageNode s WHERE s.operationMode = :operationMode"), @NamedQuery(name = StorageNode.QUERY_FIND_ALL_NOT_INSTALLED, query = "SELECT s FROM StorageNode s WHERE NOT s.operationMode = 'INSTALLED'"), @NamedQuery(name = StorageNode.QUERY_FIND_ALL_NORMAL, query = "SELECT s FROM StorageNode s WHERE s.operationMode = 'NORMAL'"), @NamedQuery(name = StorageNode.QUERY_DELETE_BY_ID, query = "" // @@ -91,6 +93,7 @@ public class StorageNode implements Serializable { public static final String QUERY_FIND_ALL = "StorageNode.findAll"; public static final String QUERY_FIND_BY_ADDRESS = "StorageNode.findByAddress"; + public static final String QUERY_FIND_ALL_BY_MODE = "StorageNode.findAllByMode"; public static final String QUERY_FIND_ALL_NOT_INSTALLED = "StorageNode.findAllCloudMembers"; public static final String QUERY_DELETE_BY_ID = "StorageNode.deleteById"; public static final String QUERY_FIND_ALL_NORMAL = "StorageNode.findAllNormalCloudMembers"; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 049cf42..ee0f406 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -24,6 +24,8 @@ */ package org.rhq.enterprise.server.cloud; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -47,6 +49,7 @@ import org.quartz.JobDataMap; import org.quartz.SimpleTrigger; import org.quartz.Trigger; +import org.rhq.cassandra.schema.SchemaManager; import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; @@ -57,6 +60,8 @@ import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.common.JobTrigger; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertyList; +import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; @@ -73,6 +78,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; +import org.rhq.core.util.StringUtil; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.alert.AlertManagerLocal; import org.rhq.enterprise.server.auth.SubjectManagerLocal; @@ -82,6 +88,7 @@ import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal; import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal; import org.rhq.enterprise.server.operation.OperationManagerLocal; +import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; import org.rhq.enterprise.server.rest.reporting.MeasurementConverter; @@ -100,6 +107,14 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private final Log log = LogFactory.getLog(StorageNodeManagerBean.class); + private static final String USERNAME_PROPERTY = "rhq.cassandra.username"; + private static final String PASSWORD_PROPERTY = "rhq.cassandra.password"; + private final static String MAINTENANCE_OPERATION = "addNodeMaintenance"; + private final static String MAINTENANCE_OPERATION_NOTE = "Topology change maintenance."; + private final static String RUN_REPAIR_PROPERTY = "runRepair"; + private final static String UPDATE_SEEDS_LIST = "updateSeedsList"; + private final static String SEEDS_LIST = "seedsList"; + private static final String RHQ_STORAGE_CQL_PORT_PROPERTY = "nativeTransportPort"; private static final String RHQ_STORAGE_JMX_PORT_PROPERTY = "jmxPort"; private static final String RHQ_STORAGE_ADDRESS_PROPERTY = "host"; @@ -139,46 +154,86 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @EJB private StorageNodeManagerLocal storageNodeManger; + @EJB + private ResourceManagerLocal resourceManager; + @Override public void linkResource(Resource resource) { - List<StorageNode> storageNodes = this.getStorageNodes(); - Configuration resourceConfig = resource.getPluginConfiguration(); - String configAddress = resourceConfig.getSimpleValue(RHQ_STORAGE_ADDRESS_PROPERTY); - - if (configAddress != null) { - // TODO Do not add the node to the group until we have verified it has joined the cluster - // StorageNodeMaintenanceJob currently determines if a new node has successfully joined the cluster. - addStorageNodeToGroup(resource); - - boolean storageNodeFound = false; - if (storageNodes != null) { - for (StorageNode storageNode : storageNodes) { - if (configAddress.equals(storageNode.getAddress())) { - storageNode.setResource(resource); - storageNode.setOperationMode(OperationMode.NORMAL); - storageNodeFound = true; - break; - } - } - } + String address = resourceConfig.getSimpleValue(RHQ_STORAGE_ADDRESS_PROPERTY); - if (!storageNodeFound) { - int cqlPort = Integer.parseInt(resourceConfig.getSimpleValue(RHQ_STORAGE_CQL_PORT_PROPERTY)); - int jmxPort = Integer.parseInt(resourceConfig.getSimpleValue(RHQ_STORAGE_JMX_PORT_PROPERTY)); + if (log.isInfoEnabled()) { + log.info("Linking " + resource + " to storage node at " + address); + } + try { + StorageNode storageNode = findStorageNodeByAddress(InetAddress.getByName(address)); - StorageNode storageNode = new StorageNode(); - storageNode.setAddress(configAddress); - storageNode.setCqlPort(cqlPort); - storageNode.setJmxPort(jmxPort); + if (storageNode != null) { + if (log.isInfoEnabled()) { + log.info(storageNode + " is an existing storage node. No cluster maintenance is necessary."); + } storageNode.setResource(resource); storageNode.setOperationMode(OperationMode.NORMAL); + addStorageNodeToGroup(resource); + } else { + storageNode = new StorageNode(); + storageNode.setAddress(address); + storageNode.setCqlPort(Integer.parseInt(resourceConfig.getSimpleValue(RHQ_STORAGE_CQL_PORT_PROPERTY))); + storageNode.setJmxPort(Integer.parseInt(resourceConfig.getSimpleValue(RHQ_STORAGE_JMX_PORT_PROPERTY))); + storageNode.setResource(resource); + storageNode.setOperationMode(OperationMode.INSTALLED); entityManager.persist(storageNode); -// scheduleQuartzJob(storageNodes.size()); + if (log.isInfoEnabled()) { + log.info(storageNode + " is a new storage node and not part of the storage node cluster."); + log.info("Scheduling maintenance operations to bring " + storageNode + " into the cluster..."); + } + + announceNewNode(storageNode); } + } catch (UnknownHostException e) { + throw new RuntimeException("Could not resolve address [" + address + "]. The resource " + resource + + " cannot be linked to a storage node", e); + } + } + + private void announceNewNode(StorageNode newStorageNode) { + if (log.isInfoEnabled()) { + log.info("Announcing " + newStorageNode + " to storage node cluster."); + } + + ResourceGroup storageNodeGroup = getStorageNodeGroup(); + + GroupOperationSchedule schedule = new GroupOperationSchedule(); + schedule.setGroup(storageNodeGroup); + schedule.setHaltOnFailure(false); + schedule.setExecutionOrder(new ArrayList<Resource>(storageNodeGroup.getExplicitResources())); + schedule.setJobTrigger(JobTrigger.createNowTrigger()); + schedule.setSubject(subjectManager.getOverlord()); + schedule.setOperationName("updateKnownNodes"); + + Configuration parameters = new Configuration(); + parameters.put(createPropertyListOfAddresses("ipAddresses", combine(getStorageNodes(), newStorageNode))); + schedule.setParameters(parameters); + + operationManager.scheduleGroupOperation(subjectManager.getOverlord(), schedule); + } + + private List<StorageNode> combine(List<StorageNode> storageNodes, StorageNode storageNode) { + List<StorageNode> newList = new ArrayList<StorageNode>(storageNodes.size() + 1); + newList.addAll(storageNodes); + newList.add(storageNode); + + return newList; + } + + private PropertyList createPropertyListOfAddresses(String propertyName, List<StorageNode> nodes) { + PropertyList list = new PropertyList(propertyName); + for (StorageNode storageNode : nodes) { + list.add(new PropertySimple("address", storageNode.getAddress())); } + return list; } @Override @@ -214,7 +269,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN ResourceGroup group = getStorageNodeGroup(); resourceGroupManager.addResourcesToGroup(subjectManager.getOverlord(), group.getId(), - new int[] {resource.getId()}); + new int[]{resource.getId()}); } @Override @@ -232,6 +287,13 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN } @Override + public void addToStorageNodeGroup(StorageNode storageNode) { + storageNode.setOperationMode(OperationMode.NORMAL); + entityManager.merge(storageNode); + addStorageNodeToGroup(storageNode.getResource()); + } + + @Override public ResourceGroup getStorageNodeGroup() { Subject overlord = subjectManager.getOverlord(); @@ -398,6 +460,19 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return runner.execute(); } + public StorageNode findStorageNodeByAddress(InetAddress address) { + TypedQuery<StorageNode> query = entityManager.<StorageNode> createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS, + StorageNode.class); + query.setParameter("address", address.getHostAddress()); + List<StorageNode> result = query.getResultList(); + + if (result != null && result.size() > 0) { + return result.get(0); + } + + return null; + } + @Override @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS), @RequiredPermission(Permission.MANAGE_INVENTORY) }) @@ -472,19 +547,6 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN entityManager.flush(); } - private StorageNode findStorageNodeByAddress(String address) { - TypedQuery<StorageNode> query = entityManager.<StorageNode> createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS, - StorageNode.class); - query.setParameter("address", address); - List<StorageNode> result = query.getResultList(); - - if (result != null && result.size() > 0) { - return result.get(0); - } - - return null; - } - private StorageNodeLoadComposite.MeasurementAggregateWithUnits getMeasurementAggregateWithUnits(Subject subject, int schedId, MeasurementUnits units, long beginTime, long endTime) { MeasurementAggregate measurementAggregate = measurementManager.getAggregate(subject, schedId, beginTime, @@ -641,63 +703,68 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @Override public boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) { - StorageNode storageNode = findStorageNodeByAddress(storageNodeConfiguration.getStorageNode().getAddress()); + try { + StorageNode storageNode = findStorageNodeByAddress(InetAddress.getByName( + storageNodeConfiguration.getStorageNode().getAddress())); + + if (storageNode != null && storageNode.getResource() != null) { + Configuration parameters = new Configuration(); + parameters.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); + if (storageNodeConfiguration.getHeapSize() != null) { + parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); + } + if (storageNodeConfiguration.getHeapNewSize() != null) { + parameters.setSimpleValue("heapNewSize", storageNodeConfiguration.getHeapNewSize() + ""); + } + if (storageNodeConfiguration.getThreadStackSize() != null) { + parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); + } + parameters.setSimpleValue("restartIfRequired", "false"); - if (storageNode != null && storageNode.getResource() != null) { - Configuration parameters = new Configuration(); - parameters.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); - if (storageNodeConfiguration.getHeapSize() != null) { - parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); - } - if (storageNodeConfiguration.getHeapNewSize() != null) { - parameters.setSimpleValue("heapNewSize", storageNodeConfiguration.getHeapNewSize() + ""); - } - if (storageNodeConfiguration.getThreadStackSize() != null) { - parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); - } - parameters.setSimpleValue("restartIfRequired", "false"); + Resource storageNodeResource = storageNode.getResource(); - Resource storageNodeResource = storageNode.getResource(); + boolean result = runOperationAndWaitForResult(subject, storageNodeResource, UPDATE_CONFIGURATION_OPERATION, + parameters); - boolean result = runOperationAndWaitForResult(subject, storageNodeResource, UPDATE_CONFIGURATION_OPERATION, - parameters); + if (result) { + //2. Update the JMX port + //this is a fast operation compared to the restart + storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); + entityManager.merge(storageNode); - if (result) { - //2. Update the JMX port - //this is a fast operation compared to the restart - storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); - entityManager.merge(storageNode); + //3. Restart the storage node + result = runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, + new Configuration()); - //3. Restart the storage node - result = runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, - new Configuration()); + //4. Update the plugin configuration to talk with the new server + //Up to this point communication with the storage node should not have been affected by the intermediate + //changes + Configuration storageNodePluginConfig = configurationManager.getPluginConfiguration(subject, + storageNodeResource.getId()); - //4. Update the plugin configuration to talk with the new server - //Up to this point communication with the storage node should not have been affected by the intermediate - //changes - Configuration storageNodePluginConfig = configurationManager.getPluginConfiguration(subject, - storageNodeResource.getId()); + String existingJMXPort = storageNodePluginConfig.getSimpleValue("jmxPort"); + String newJMXPort = storageNodeConfiguration.getJmxPort() + ""; - String existingJMXPort = storageNodePluginConfig.getSimpleValue("jmxPort"); - String newJMXPort = storageNodeConfiguration.getJmxPort() + ""; + if (!existingJMXPort.equals(newJMXPort)) { + storageNodePluginConfig.setSimpleValue("jmxPort", newJMXPort); - if (!existingJMXPort.equals(newJMXPort)) { - storageNodePluginConfig.setSimpleValue("jmxPort", newJMXPort); + String existingConnectionURL = storageNodePluginConfig.getSimpleValue("connectorAddress"); + String newConnectionURL = existingConnectionURL.replace(":" + existingJMXPort + "/", ":" + + storageNodeConfiguration.getJmxPort() + "/"); + storageNodePluginConfig.setSimpleValue("connectorAddress", newConnectionURL); - String existingConnectionURL = storageNodePluginConfig.getSimpleValue("connectorAddress"); - String newConnectionURL = existingConnectionURL.replace(":" + existingJMXPort + "/", ":" - + storageNodeConfiguration.getJmxPort() + "/"); - storageNodePluginConfig.setSimpleValue("connectorAddress", newConnectionURL); + configurationManager.updatePluginConfiguration(subject, storageNodeResource.getId(), + storageNodePluginConfig); + } - configurationManager.updatePluginConfiguration(subject, storageNodeResource.getId(), - storageNodePluginConfig); + return result; } - - return result; } - } - return false; + return false; + } catch (UnknownHostException e) { + throw new RuntimeException("Failed to resolve address for " + storageNodeConfiguration, e); + } } @Override @@ -754,4 +821,129 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return successResultFound; } -} + + @Override + public void prepareNewNodesForBootstrap() { + List<StorageNode> newStorageNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE) + .setParameter("operationMode", OperationMode.INSTALLED).getResultList(); + if (newStorageNodes.isEmpty()) { + throw new RuntimeException("Failed to find storage node to bootstrap into cluster."); + } + // Right now, without some user input, we can only reliably bootstrap one node at a + // time. To support bootstrapping multiple nodes concurrently, a mechanism will have + // to be put in place for the user to declare in advance the nodes that are coming + // online. Then we can wait until all declared nodes have been committed into + // inventory and announced to the cluster + StorageNode storageNode = newStorageNodes.get(0); + + if (log.isInfoEnabled()) { + log.info("Preparing to bootstrap " + storageNode + " into cluster..."); + } + + List<StorageNode> existingStorageNodes = getStorageNodes(); + + ResourceOperationSchedule schedule = new ResourceOperationSchedule(); + schedule.setResource(storageNode.getResource()); + schedule.setJobTrigger(JobTrigger.createNowTrigger()); + schedule.setSubject(subjectManager.getOverlord()); + schedule.setOperationName("prepareForBootstrap"); + + Configuration parameters = new Configuration(); + parameters.put(new PropertySimple("cqlPort", existingStorageNodes.get(0).getCqlPort())); + // TODO need to add support for storage_port in cassandra/storage plugins + parameters.put(new PropertySimple("gossipPort", 7100)); + parameters.put(createPropertyListOfAddresses("storageNodeIPAddresses", getStorageNodes())); + + schedule.setParameters(parameters); + + operationManager.scheduleResourceOperation(subjectManager.getOverlord(), schedule); + } + + @Override + public void runAddNodeMaintenance() { + log.info("Preparing to schedule addNodeMaintenance on the storage cluster..."); + + List<StorageNode> storageNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, + StorageNode.class).setParameter("operationMode", OperationMode.NORMAL).getResultList(); + + int clusterSize = storageNodes.size(); + boolean isReadRepairNeeded; + + if (clusterSize >= 4) { + // At 4 nodes we increase the RF to 3. We are not increasing the RF beyond + // that for additional nodes; so, there is no need to run repair if we are + // expanding from a 4 node cluster since the RF remains the same. + isReadRepairNeeded = false; + } else if (clusterSize == 1) { + // The RF will increase since we are going from a single to a multi-node + // cluster; therefore, we want to run repair. + isReadRepairNeeded = true; + } else if (clusterSize == 2) { + if (storageNodes.size() > 3) { + // If we go from 2 to > 3 nodes we will increase the RF to 3; therefore + // we want to run repair. + isReadRepairNeeded = true; + } else { + // If we go from 2 to 3 nodes, we keep the RF at 2 so there is no need + // to run repair. + isReadRepairNeeded = false; + } + } else if (clusterSize == 3) { + // We are increasing the cluster size > 3 which means the RF will be + // updated to 3; therefore, we want to run repair. + isReadRepairNeeded = true; + } else { + // If we cluster size of zero, then something is really screwed up. It + // should always be > 0. + isReadRepairNeeded = storageNodes.size() > 1; + } + + if (isReadRepairNeeded) { + updateTopology(storageNodes); + } + + ResourceGroup storageNodeGroup = getStorageNodeGroup(); + + GroupOperationSchedule schedule = new GroupOperationSchedule(); + schedule.setGroup(storageNodeGroup); + schedule.setHaltOnFailure(false); + schedule.setExecutionOrder(new ArrayList<Resource>(storageNodeGroup.getExplicitResources())); + schedule.setJobTrigger(JobTrigger.createNowTrigger()); + schedule.setSubject(subjectManager.getOverlord()); + schedule.setOperationName(MAINTENANCE_OPERATION); + schedule.setDescription(MAINTENANCE_OPERATION_NOTE); + + Configuration config = new Configuration(); + config.put(createPropertyListOfAddresses(SEEDS_LIST, storageNodes)); + config.put(new PropertySimple(RUN_REPAIR_PROPERTY, isReadRepairNeeded)); + config.put(new PropertySimple(UPDATE_SEEDS_LIST, Boolean.TRUE)); + + schedule.setParameters(config); + + operationManager.scheduleGroupOperation(subjectManager.getOverlord(), schedule); + } + + private boolean updateTopology(List<StorageNode> storageNodes) { + String username = getRequiredStorageProperty(USERNAME_PROPERTY); + String password = getRequiredStorageProperty(PASSWORD_PROPERTY); + SchemaManager schemaManager = new SchemaManager(username, password, storageNodes); + try{ + return schemaManager.updateTopology(false); + } catch (Exception e) { + log.error("An error occurred while applying schema topology changes", e); + } + + return false; + } + + private String getRequiredStorageProperty(String property) { + String value = System.getProperty(property); + if (StringUtil.isEmpty(property)) { + throw new IllegalStateException("The system property [" + property + "] is not set. The RHQ " + + "server will not be able connect to the RHQ storage node(s). This property should be defined " + + "in rhq-server.properties."); + } + return value; + } + +} \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index 15fa85c..00ba9e7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -18,6 +18,7 @@ */ package org.rhq.enterprise.server.cloud; +import java.net.InetAddress; import java.util.List; import javax.ejb.Local; @@ -106,6 +107,8 @@ public interface StorageNodeManagerLocal { */ PageList<Alert> findAllStorageNodeAlerts(Subject subject, StorageNode storageNode); + StorageNode findStorageNodeByAddress(InetAddress address); + /** * Find ids for all resources and sub-resources of Storage Nodes that @@ -170,6 +173,8 @@ public interface StorageNodeManagerLocal { */ boolean storageNodeGroupExists(); + void addToStorageNodeGroup(StorageNode storageNode); + /** * This method assumes the storage node resource group already exists; as such, it should only be called from places * in the code that are after the point(s) where the group has been created. @@ -181,4 +186,8 @@ public interface StorageNodeManagerLocal { void scheduleOperationInNewTransaction(Subject subject, ResourceOperationSchedule schedule); + void prepareNewNodesForBootstrap(); + + void runAddNodeMaintenance(); + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java index 088f13e..5d3b1ae 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java @@ -96,6 +96,7 @@ import org.rhq.enterprise.server.resource.ResourceNotFoundException; import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; import org.rhq.enterprise.server.resource.group.ResourceGroupNotFoundException; import org.rhq.enterprise.server.scheduler.SchedulerLocal; +import org.rhq.enterprise.server.storage.StorageNodeOperationsHandler; import org.rhq.enterprise.server.util.CriteriaQueryGenerator; import org.rhq.enterprise.server.util.CriteriaQueryRunner; @@ -123,6 +124,9 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan @EJB private SubjectManagerLocal subjectManager; + @EJB + private StorageNodeOperationsHandler storageNodeOperationsHandler; + @SuppressWarnings("unchecked") public List<IntegerOptionItem> getResourceNameOptionItems(int groupId) { String queryName = ResourceGroup.QUERY_FIND_RESOURCE_NAMES_BY_GROUP_ID; @@ -917,7 +921,7 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan if (history.getParameters() != null) { history.getParameters().getId(); // eagerly reload the parameters } - + storageNodeOperationsHandler.handleOperationUpdateIfNecessary(history); notifyAlertConditionCacheManager("updateOperationHistory", history); return history; } @@ -1723,6 +1727,7 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan if (!stillInProgress) { groupHistory.setErrorMessage((groupErrorMessage == null) ? null : groupErrorMessage.toString()); groupHistory.setStatus(groupStatus); + storageNodeOperationsHandler.handleGroupOperationUpdateIfNecessary(groupHistory); notifyAlertConditionCacheManager("checkForCompletedGroupOperation", groupHistory); } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java index ec28888..0b404bb 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java @@ -9,7 +9,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.cloud.Server; +import org.rhq.core.domain.cloud.StorageNode; import org.rhq.enterprise.server.auth.SubjectManagerLocal; +import org.rhq.enterprise.server.cloud.StorageNodeManagerLocal; import org.rhq.enterprise.server.cloud.TopologyManagerLocal; import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; @@ -36,6 +38,18 @@ public class StorageClusterMonitor implements StorageStateListener { log.info("Taking server out of maintenance mode"); updateServerMode(Server.OperationMode.NORMAL); } + + StorageNodeManagerLocal storageNodeManager = LookupUtil.getStorageNodeManager(); + StorageNode newClusterNode = storageNodeManager.findStorageNodeByAddress(address); + + if (newClusterNode == null) { + log.error("Did not find storage node with address [" + address.getHostAddress() + "]. This should not " + + "happen."); + } else { + log.info("Adding " + newClusterNode + " to storage cluster and scheduling cluster maintenance..."); + storageNodeManager.addToStorageNodeGroup(newClusterNode); + storageNodeManager.runAddNodeMaintenance(); + } } @Override diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandler.java new file mode 100644 index 0000000..96e8de8 --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandler.java @@ -0,0 +1,17 @@ +package org.rhq.enterprise.server.storage; + +import javax.ejb.Asynchronous; + +import org.rhq.core.domain.operation.GroupOperationHistory; +import org.rhq.core.domain.operation.OperationHistory; + +/** + * @author John Sanda + */ +public interface StorageNodeOperationsHandler { + @Asynchronous + void handleOperationUpdateIfNecessary(OperationHistory operationHistory); + + @Asynchronous + void handleGroupOperationUpdateIfNecessary(GroupOperationHistory operationHistory); +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java new file mode 100644 index 0000000..6da5cca --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java @@ -0,0 +1,90 @@ +package org.rhq.enterprise.server.storage; + +import javax.ejb.Asynchronous; +import javax.ejb.EJB; +import javax.ejb.Stateless; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.core.domain.operation.GroupOperationHistory; +import org.rhq.core.domain.operation.OperationDefinition; +import org.rhq.core.domain.operation.OperationHistory; +import org.rhq.core.domain.operation.OperationRequestStatus; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.enterprise.server.RHQConstants; +import org.rhq.enterprise.server.cloud.StorageNodeManagerLocal; + +/** + * @author John Sanda + */ +@Stateless +public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHandler { + + private final Log log = LogFactory.getLog(StorageNodeOperationsHandlerBean.class); + + private static final String STORAGE_NODE_TYPE_NAME = "RHQ Storage Node"; + private static final String STORAGE_NODE_PLUGIN_NAME = "RHQStorage"; + + @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) + private EntityManager entityManager; + + @EJB + private StorageNodeManagerLocal storageNodeManager; + + @Override + @Asynchronous + public void handleOperationUpdateIfNecessary(OperationHistory operationHistory) { +// if (isStorageNodeOperation(operationHistory.getOperationDefinition())) { +// if (operationHistory.getOperationDefinition().getName().equals("prepareForBootstrap")) { +// ResourceOperationHistory resourceOperationHistory = entityManager.find(ResourceOperationHistory.class, +// operationHistory.getId()); +// if (resourceOperationHistory.getStatus() == OperationRequestStatus.SUCCESS) { +// +// } +// StorageNode storageNode = findStorageNode(resourceOperationHistory.getResource()); +// storageNode.setOperationMode(StorageNode.OperationMode.NORMAL); +// } +// } + } + + private StorageNode findStorageNode(Resource resource) { + for (StorageNode storageNode : storageNodeManager.getStorageNodes()) { + if (storageNode.getResource().getId() == resource.getId()) { + return storageNode; + } + } + return null; + } + + @Override + @Asynchronous + public void handleGroupOperationUpdateIfNecessary(GroupOperationHistory groupOperationHistory) { + if (isStorageNodeOperation(groupOperationHistory.getOperationDefinition())) { + if (groupOperationHistory.getOperationDefinition().getName().equals("updateKnownNodes")) { + if (groupOperationHistory.getStatus() == OperationRequestStatus.SUCCESS) { + log.info("New storage has been successfully announced to the storage node cluster."); + storageNodeManager.prepareNewNodesForBootstrap(); + } else if (groupOperationHistory.getStatus() == OperationRequestStatus.FAILURE) { + log.warn("Failed to announce new storage node to the cluster. It cannot join the cluster until " + + "it has been announced to existing cluster nodes."); + } else if (groupOperationHistory.getStatus() == OperationRequestStatus.CANCELED) { + log.warn("New storage node has not been announced to the cluster. The group operation " + + groupOperationHistory.getOperationDefinition().getName() + " has been canceled. The new node " + + "cannot join the cluster until it has been announced to existing cluster nodes."); + } + } + } + } + + private boolean isStorageNodeOperation(OperationDefinition operationDefinition) { + ResourceType resourceType = operationDefinition.getResourceType(); + return resourceType.getName().equals(STORAGE_NODE_TYPE_NAME) && + resourceType.getPlugin().equals(STORAGE_NODE_PLUGIN_NAME); + } + +} commit 313023782c4bdddf63d1e3773d499717ddaa2687 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Mon Jul 29 14:45:30 2013 +0200 If there is just one group definition in ConfigurationEditor, normal form is used instead SectionStack component. Also the "Jump to Section" navigation is hidden for just one group to save some space on the screen. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java index 779772f..418300f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java @@ -415,17 +415,29 @@ public class ConfigurationEditor extends EnhancedVLayout { EnhancedVLayout layout = new EnhancedVLayout(); List<PropertyGroupDefinition> groupDefinitions = configurationDefinition.getGroupDefinitions(); - if (groupDefinitions.isEmpty()) { - // No prop groups, so we just need a single form for the non-grouped props. + if (groupDefinitions.isEmpty() || groupDefinitions.size() == 1) { + // No or one prop groups, so we just need a single form for the non-grouped props + // and another one if there is just one group List<PropertyDefinition> propertyDefinitions = new ArrayList<PropertyDefinition>( configurationDefinition.getNonGroupedProperties()); - - DynamicForm form = buildPropertiesForm(propertyDefinitions, configuration); - form.setBorder("1px solid #AAA"); - form.validate(); - layout.addMember(form); + if (!propertyDefinitions.isEmpty()) { + DynamicForm form = buildPropertiesForm(propertyDefinitions, configuration); + form.setBorder("1px solid #AAA"); + form.validate(); + layout.addMember(form); + } + if (groupDefinitions.size() == 1) { + propertyDefinitions.addAll(configurationDefinition.getPropertiesInGroup(groupDefinitions.get(0) + .getName())); + DynamicForm groupForm = buildPropertiesForm(propertyDefinitions, configuration); + groupForm.setIsGroup(true); + groupForm.setGroupTitle(groupDefinitions.get(0).getDisplayName()); + groupForm.setBorder("1px solid #AAA"); + groupForm.validate(); + layout.addMember(groupForm); + } } else { - // One or more prop groups, so create a section stack with one section per group. + // Two or more prop groups, so create a section stack with one section per group. final SectionStack sectionStack = new SectionStack(); sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE); sectionStack.setWidth100(); @@ -441,7 +453,6 @@ public class ConfigurationEditor extends EnhancedVLayout { // com.allen_sauer.gwt.log.client.Log.info("building: " + definition.getDisplayName()); sectionStack.addSection(buildGroupSection(definition)); } - this.toolStrip = buildToolStrip(layout, sectionStack); layout.addMember(toolStrip); layout.addMember(sectionStack); commit 33821fe1c902246701d7dd423de3abcff948cdaa Author: Jirka Kremser <jkremser(a)redhat.com> Date: Mon Jul 29 13:19:16 2013 +0200 Adding the newly (6/28/13) issued certificate for accessing the pto calendar (mail.corp.redhat.com domain) to the rhq-ircbot keystore. This one should be valid until 6/28/15. diff --git a/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks b/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks index 3d73cbc..431de7c 100644 Binary files a/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks and b/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks differ commit f8b594d1eb6032d5e8f097c924bb96316b62b483 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Mon Jul 29 12:54:06 2013 +0200 Calling the right setter. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 7d861f1..049cf42 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -310,7 +310,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN if ((scheduleId = scheduleIdsMap.get(totalDiskUsedPercentageMetric)) != null) { StorageNodeLoadComposite.MeasurementAggregateWithUnits totalDiskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); - result.setDataDiskUsedPercentage(totalDiskUsedPercentageAggregateWithUnits); + result.setTotalDiskUsedPercentage(totalDiskUsedPercentageAggregateWithUnits); } if ((scheduleId = scheduleIdsMap.get(freeDiskToDataRatioMetric)) != null) { MeasurementAggregate freeDiskToDataRatioAggregate = measurementManager.getAggregate(subject, @@ -754,4 +754,4 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return successResultFound; } -} \ No newline at end of file +} commit 817d5628d4afbe41c38c9e2d82cdd1a7ef079916 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 28 07:36:07 2013 -0400 override default ring delay to speed up test and hopefully fix jenkins failure diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index ef92510..bd171a4 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -29,6 +29,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileReader; import java.net.InetAddress; +import java.util.Properties; import java.util.Set; import com.google.common.collect.ImmutableSet; @@ -73,6 +74,7 @@ import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; +import org.rhq.core.util.PropertiesFileUpdate; import org.rhq.core.util.stream.StreamUtil; /** @@ -124,6 +126,18 @@ public class StorageNodeComponentITest { deployer.updateFilePerms(); deployer.updateStorageAuthConf(Sets.newHashSet(InetAddress.getByName(address))); + File confDir = new File(basedir, "conf"); + File cassandraJvmPropsFile = new File(confDir, "cassandra-jvm.properties"); + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(cassandraJvmPropsFile.getAbsolutePath()); + Properties properties = propertiesUpdater.loadExistingProperties(); + + String jvmOpts = properties.getProperty("JVM_OPTS"); + jvmOpts = jvmOpts.substring(0, jvmOpts.lastIndexOf("\"")); + jvmOpts = jvmOpts + " -Dcassandra.ring_delay_ms=100\""; + properties.setProperty("JVM_OPTS", jvmOpts); + + propertiesUpdater.update(properties); + File binDir = new File(basedir, "bin"); SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); @@ -261,9 +275,8 @@ public class StorageNodeComponentITest { log.info("Waiting for node to boostrap..."); // When a node goes through bootstrap, StorageService sleeps for RING_DELAY ms // while it determines the ranges of the token ring it will own. RING_DELAY defaults - // to 30 seconds by default. - // TODO Override the default RING_DELAY to speed up tests - Thread.sleep(33000); + // to 30 seconds by default but we are overriding it to be 100 ms. + Thread.sleep(3000); assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The operation failed: " + result.getErrorStackTrace()); commit 9c9ec83b26445713b67526f43c489493613a5abd Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 27 14:08:18 2013 -0400 updating exception handling and logging in prepareForBootstrap diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/InternodeAuthConfUpdateException.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/InternodeAuthConfUpdateException.java new file mode 100644 index 0000000..d1e6e56 --- /dev/null +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/InternodeAuthConfUpdateException.java @@ -0,0 +1,22 @@ +package org.rhq.plugins.storage; + +/** + * @author John Sanda + */ +public class InternodeAuthConfUpdateException extends Exception { + + public InternodeAuthConfUpdateException() { + } + + public InternodeAuthConfUpdateException(String message) { + super(message); + } + + public InternodeAuthConfUpdateException(String message, Throwable cause) { + super(message, cause); + } + + public InternodeAuthConfUpdateException(Throwable cause) { + super(cause); + } +} diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index eb0b9fd..2cb9501 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -29,12 +29,10 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; -import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; @@ -95,6 +93,14 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return new File(pluginConfig.getSimpleValue("baseDir")); } + private File getConfDir() { + return new File(getBasedir(), "conf"); + } + + private File getInternodeAuthConfFile() { + return new File(getConfDir(), "rhq-storage-auth.conf"); + } + @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if (name.equals("addNodeMaintenance")) { @@ -242,56 +248,24 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper ipAddresses.add(propertySimple.getStringValue()); } - if (updateAuthFile(result, ipAddresses)) return result; - - EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); - EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); - emsOperation.invoke(); - - result.setSimpleResult("Successfully updated the set of known nodes."); - - return result; - } - - private boolean updateAuthFile(OperationResult result, Set<String> ipAddresses) { - log.info("Updating known nodes to " + ipAddresses); + try { + updateInternodeAuthConfFile(ipAddresses); - File confDir = new File(getBasedir(), "conf"); - File authFile = new File(confDir, "rhq-storage-auth.conf"); - File authBackupFile = new File(confDir, "." + authFile.getName() + ".bak"); + EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); + EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); + emsOperation.invoke(); - if (authBackupFile.exists()) { - if (log.isDebugEnabled()) { - log.debug(authBackupFile + " already exists. Deleting it now in preparation of creating new backup " + - "for " + authFile.getName()); - } - if (!authBackupFile.delete()) { - String msg = "Failed to delete backup file " + authBackupFile + ". The operation will abort " + - "since " + authFile + " cannot reliably be backed up before making changes. Please delete " + - authBackupFile + " manually and reschedule the operation once the file has been removed."; - log.error(msg); - result.setErrorMessage(msg); - - return true; - } - } + result.setSimpleResult("Successfully updated the set of known nodes."); - try { - StreamUtil.copy(new StringReader(StringUtil.collectionToString(ipAddresses, "\n")), - new FileWriter(authFile), true); - } catch (IOException e) { - log.error("An error occurred while updating " + authFile, e); - try { - log.info("Restoring back up file " + authBackupFile); - FileUtil.copyFile(authBackupFile, authFile); - authBackupFile.delete(); - } catch (IOException e1) { - log.error("Failed to revert backup of " + authFile, e1); - } - result.setErrorMessage("There was an unexpected error while updating " + authFile); - return true; + return result; + } catch (InternodeAuthConfUpdateException e) { + File authFile = getInternodeAuthConfFile(); + log.error("Failed to update set of trusted nodes in " + authFile + " due to the following error(s): " + + ThrowableUtil.getAllMessages(e)) ; + result.setErrorMessage("Failed to update set of trusted nodes in " + authFile + " due to the following " + + "error(s): " + ThrowableUtil.getAllMessages(e)); + return result; } - return false; } private OperationResult prepareForBootstrap(Configuration params) { @@ -326,7 +300,6 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } purgeDir(new File(configEditor.getSavedCachesDirectory())); - log.info("Updating cluster settings"); String address = pluginConfig.getSimpleValue("host"); @@ -344,10 +317,9 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper configEditor.setStoragePort(gossipPort); configEditor.save(); + log.info("Cluster configuration settings have been applied to " + yamlFile); - if (updateAuthFile(result, new HashSet<String>(addresses))) { - return result; - } + updateInternodeAuthConfFile(new HashSet<String>(addresses)); log.info(this + " is ready to be bootstrap. Restarting storage node..."); OperationResult startResult = startNode(); @@ -376,6 +348,11 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } } return result; + } catch (InternodeAuthConfUpdateException e) { + File authFile = getInternodeAuthConfFile(); + result.setErrorMessage("Failed to update " + authFile + " due to the following error(s): " + + ThrowableUtil.getAllMessages(e)); + return result; } } @@ -384,23 +361,18 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper FileUtil.purge(dir, true); } - private File getCommitLogDir(Map yamlConfig) { - return new File((String) yamlConfig.get("commitlog_directory")); - } + private void updateInternodeAuthConfFile(Set<String> ipAddresses) throws InternodeAuthConfUpdateException { + File authFile = getInternodeAuthConfFile(); - private List<File> getDataDirs(Map yamlConfig) { - List<File> dirs = new ArrayList<File>(); - List<String> dirNames = (List<String>) yamlConfig.get("data_file_directories"); + log.info("Updating " + authFile); - for (String dirName : dirNames) { - dirs.add(new File(dirName)); + try { + StreamUtil.copy(new StringReader(StringUtil.collectionToString(ipAddresses, "\n")), + new FileWriter(authFile), true); + } catch (Exception e) { + log.error("An error occurred while trying to update " + authFile, e); + throw new InternodeAuthConfUpdateException("An error occurred while trying to update " + authFile, e); } - - return dirs; - } - - private File getSavedCachesDir(Map yamlConfig) { - return new File((String) yamlConfig.get("saved_caches_directory")); } private OperationResult nodeAdded(Configuration params) { diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index d10e428..ef92510 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -259,6 +259,10 @@ public class StorageNodeComponentITest { params, timeout); log.info("Waiting for node to boostrap..."); + // When a node goes through bootstrap, StorageService sleeps for RING_DELAY ms + // while it determines the ranges of the token ring it will own. RING_DELAY defaults + // to 30 seconds by default. + // TODO Override the default RING_DELAY to speed up tests Thread.sleep(33000); assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The operation failed: " + commit b38c4b5ea27f83caaa15f1cd2d29daa8ec4ac969 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 27 12:49:30 2013 -0400 adding some initial test coverage for prepareForBootstrap operation The prepareForBootstrap method has been refactored to use ConfigEditor but there is still a good bit of clean up to do. diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java index 679a84c..0b4a127 100644 --- a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java @@ -76,6 +76,22 @@ public class ConfigEditor { } } + public File getBackupFile() { + return backupFile; + } + + public String getCommitLogDirectory() { + return (String) config.get("commitlog_directory"); + } + + public List<String> getDataFileDirectories() { + return (List<String>) config.get("data_file_directories"); + } + + public String getSavedCachesDirectory() { + return (String) config.get("saved_caches_directory"); + } + public void setSeeds(String... seeds) { List seedProviderList = (List) config.get("seed_provider"); Map seedProvider = (Map) seedProviderList.get(0); diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index da90f09..bafc8d7 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -36,6 +36,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-util</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>rhq-core-domain</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -89,6 +94,10 @@ <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> <artifactItems> <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-util</artifactId> + </artifactItem> + <artifactItem> <groupId>com.datastax.cassandra</groupId> <artifactId>cassandra-driver-core</artifactId> <version>${cassandra.driver.version}</version> diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 5933093..eb0b9fd 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -26,7 +26,6 @@ package org.rhq.plugins.storage; import java.io.File; -import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; @@ -45,9 +44,10 @@ import org.mc4j.ems.connection.EmsConnection; import org.mc4j.ems.connection.bean.EmsBean; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.connection.bean.operation.EmsOperation; -import org.yaml.snakeyaml.DumperOptions; -import org.yaml.snakeyaml.Yaml; +import org.yaml.snakeyaml.error.YAMLException; +import org.rhq.cassandra.util.ConfigEditor; +import org.rhq.cassandra.util.ConfigEditorException; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.Property; @@ -277,27 +277,18 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } try { - FileUtil.copyFile(authFile, authBackupFile); - } catch (IOException e) { - String msg = "Failed to backup " + authFile + " prior to making updates. The operation will abort due " + - "to unexpected error"; - log.error(msg, e); - result.setErrorMessage(msg + ": " + ThrowableUtil.getRootMessage(e)); - return true; - } - - try { StreamUtil.copy(new StringReader(StringUtil.collectionToString(ipAddresses, "\n")), new FileWriter(authFile), true); } catch (IOException e) { log.error("An error occurred while updating " + authFile, e); try { + log.info("Restoring back up file " + authBackupFile); FileUtil.copyFile(authBackupFile, authFile); + authBackupFile.delete(); } catch (IOException e1) { log.error("Failed to revert backup of " + authFile, e1); } - result.setErrorMessage("There was an unexpected error while updating " + authFile + ". Make sure that " + - "it matches " + authBackupFile + " and then reschedule the operation."); + result.setErrorMessage("There was an unexpected error while updating " + authFile); return true; } return false; @@ -325,74 +316,67 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper String yamlProp = pluginConfig.getSimpleValue("yamlConfiguration"); File yamlFile = new File(yamlProp); - DumperOptions options = new DumperOptions(); - options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); - Yaml yaml = new Yaml(options); - - Map yamlConfig = null; + ConfigEditor configEditor = new ConfigEditor(yamlFile); try { - yamlConfig = (Map) yaml.load(new FileInputStream(yamlFile)); - } catch (FileNotFoundException e) { - log.error("Failed to load " + yamlFile, e); - log.error("Cannot prepare " + this + " for bootstrap. " + yamlFile + " must exist in order to make the " + - "necessary configuration changes."); - result.setErrorMessage("Cannot prepare storage node for bootstrap. It appears that " + yamlFile + - " does not exist. Make sure that it exists so that the necessary configuration changes can be made."); + configEditor.load(); - return result; - } + purgeDir(new File(configEditor.getCommitLogDirectory())); + for (String dir : configEditor.getDataFileDirectories()) { + purgeDir(new File(dir)); + } + purgeDir(new File(configEditor.getSavedCachesDirectory())); - purgeDir(getCommitLogDir(yamlConfig)); - for (File dataDir : getDataDirs(yamlConfig)) { - purgeDir(dataDir); - } - purgeDir(getSavedCachesDir(yamlConfig)); - log.info("Updating cluster settings"); + log.info("Updating cluster settings"); - String address = pluginConfig.getSimpleValue("host"); - List<String> seeds = getAddresses(params.getList("storageNodeIPAddresses")); - // Make sure this node's address is not in the list; otherwise, it - // won't bootstrap properly. - seeds.remove(address); - try { - updateSeedsList(seeds); - } catch (IOException e) { - log.error("Failed to update seeds property in " + yamlFile, e); - result.setErrorMessage("Failed to prepared node for bootstrap due to unexpected error that occurred " + - "while updating seeds property in " + yamlFile + ":\n" + ThrowableUtil.getAllMessages(e)); - return result; - } + String address = pluginConfig.getSimpleValue("host"); + int cqlPort = Integer.parseInt(params.getSimpleValue("cqlPort")); + int gossipPort = Integer.parseInt(params.getSimpleValue("gossipPort")); + List<String> addresses = getAddresses(params.getList("storageNodeIPAddresses")); - if (updateAuthFile(result, new HashSet<String>(seeds))) { - return result; - } + // Make sure this node's address is not in the list; otherwise, it + // won't bootstrap properly. + List<String> seeds = new ArrayList<String>(addresses); + seeds.remove(address); - int cqlPort = Integer.parseInt(params.getSimpleValue("cqlPort")); - int gossipPort = Integer.parseInt(params.getSimpleValue("gossipPort")); + configEditor.setSeeds(seeds.toArray(new String[seeds.size()])); + configEditor.setNativeTransportPort(cqlPort); + configEditor.setStoragePort(gossipPort); - yamlConfig.put("native_transport_port", cqlPort); - yamlConfig.put("storage_port", gossipPort); + configEditor.save(); - try { - yaml.dump(yamlConfig, new FileWriter(yamlFile)); - } catch (IOException e) { - log.error("Could not update cluster settings in " + yamlFile, e); - result.setErrorMessage("Could not update cluster settings in " + yamlFile + ":\n" + - ThrowableUtil.getAllMessages(e)); - return result; - } + if (updateAuthFile(result, new HashSet<String>(addresses))) { + return result; + } - log.info(this + " is ready to be bootstrap. Restarting storage node..."); - OperationResult startResult = startNode(); - if (startResult.getErrorMessage() != null) { - log.error("Failed to restart storage node:\n" + startResult.getErrorMessage()); - result.setErrorMessage("Failed to restart storage node:\n" + startResult.getErrorMessage()); - } else { - result.setSimpleResult("The storage node was succesfully updated is now bootstrapping into the cluster."); - } + log.info(this + " is ready to be bootstrap. Restarting storage node..."); + OperationResult startResult = startNode(); + if (startResult.getErrorMessage() != null) { + log.error("Failed to restart storage node:\n" + startResult.getErrorMessage()); + result.setErrorMessage("Failed to restart storage node:\n" + startResult.getErrorMessage()); + } else { + result.setSimpleResult("The storage node was succesfully updated is now bootstrapping into the cluster."); + } - return result; + return result; + } catch (ConfigEditorException e) { + log.error("There was an error while trying to update " + yamlFile, e); + if (e.getCause() instanceof YAMLException) { + log.info("Attempting to restore " + yamlFile); + try { + configEditor.restore(); + result.setErrorMessage("Failed to update configuration file [" + yamlFile + "]: " + + ThrowableUtil.getAllMessages(e.getCause())); + } catch (ConfigEditorException e1) { + log.error("Failed to restore " + yamlFile + ". A copy of the file prior to any modifications " + + "can be found at " + configEditor.getBackupFile()); + result.setErrorMessage("There was an error updating [" + yamlFile + "] and undoing the changes " + + "Failed. A copy of the file can be found at " + configEditor.getBackupFile() + ". See the " + + "agent logs for more details"); + } + } + return result; + } } private void purgeDir(File dir) { diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index eb4d545..d10e428 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -26,15 +26,25 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; import java.net.InetAddress; import java.util.Set; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import org.apache.cassandra.config.Config; +import org.apache.cassandra.config.SeedProviderDef; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hyperic.sigar.OperatingSystem; import org.testng.annotations.AfterSuite; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import org.yaml.snakeyaml.Loader; +import org.yaml.snakeyaml.TypeDescription; +import org.yaml.snakeyaml.Yaml; import org.rhq.cassandra.CassandraClusterManager; import org.rhq.cassandra.ClusterInitService; @@ -63,12 +73,15 @@ import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; +import org.rhq.core.util.stream.StreamUtil; /** * @author John Sanda */ public class StorageNodeComponentITest { + private final Log log = LogFactory.getLog(StorageNodeComponentITest.class); + private File basedir; private Resource storageNode; @@ -232,7 +245,7 @@ public class StorageNodeComponentITest { } @Test(dependsOnMethods = "restartStorageNode") - public void prepareForBootstrap() { + public void prepareForBootstrap() throws Exception { Configuration params = Configuration.builder().addSimple("cqlPort", 9242).addSimple("gossipPort", 7200) .openList("storageNodeIPAddresses", "storageNodeIPAddresse").addSimples("127.0.0.1", "127.0.0.2") .closeList().build(); @@ -245,10 +258,22 @@ public class StorageNodeComponentITest { OperationServicesResult result = operationsService.invokeOperation(operationContext, "prepareForBootstrap", params, timeout); + log.info("Waiting for node to boostrap..."); + Thread.sleep(33000); + assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The operation failed: " + result.getErrorStackTrace()); assertNodeIsUp("Expected " + storageNode + " to be up after the prepareForBootstrap operation completes."); + + assertThatInternodeAuthConfFileMatches("127.0.0.1", "127.0.0.2"); + + File confDir = new File(basedir, "conf"); + File cassandraYamlFile = new File(confDir, "cassandra.yaml"); + Config config = loadConfig(cassandraYamlFile); + + assertEquals(config.seed_provider.parameters.get("seeds"), "127.0.0.2", "Failed to update seeds " + + "property in " + cassandraYamlFile); } private void assertNodeIsUp(String msg) { @@ -292,4 +317,28 @@ public class StorageNodeComponentITest { return type.getPlugin().equals("RHQStorage") && type.getName().equals("RHQ Storage Node"); } + private void assertThatInternodeAuthConfFileMatches(String... addresses) throws Exception { + File confDir = new File(basedir, "conf"); + File internodeAuthConfFile = new File(confDir, "rhq-storage-auth.conf"); + String contents = StreamUtil.slurp(new FileReader(internodeAuthConfFile)); + + Set<String> expected = ImmutableSet.copyOf(addresses); + Set<String> actual = ImmutableSet.copyOf(contents.split("\n")); + + assertEquals(actual, expected, "Failed to update internode authentication conf file " + + internodeAuthConfFile + "."); + } + + private Config loadConfig(File configFile) throws Exception { + FileInputStream inputStream = new FileInputStream(configFile); + org.yaml.snakeyaml.constructor.Constructor constructor = + new org.yaml.snakeyaml.constructor.Constructor(Config.class); + TypeDescription seedDesc = new TypeDescription(SeedProviderDef.class); + seedDesc.putMapPropertyType("parameters", String.class, String.class); + constructor.addTypeDescription(seedDesc); + Yaml yaml = new Yaml(new Loader(constructor)); + + return (Config) yaml.load(inputStream); + } + } commit ba2427bc9dfc4e4c3ac9d778aa15d6c521535efe Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 27 10:14:18 2013 -0400 initial commit for ConfigEditor which handles updating cassandra.yaml diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java new file mode 100644 index 0000000..679a84c --- /dev/null +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java @@ -0,0 +1,95 @@ +package org.rhq.cassandra.util; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; + +import org.rhq.core.util.StringUtil; +import org.rhq.core.util.file.FileUtil; + +/** + * @author John Sanda + */ +public class ConfigEditor { + + private File configFile; + + private File backupFile; + + private Yaml yaml; + + private Map config; + + public ConfigEditor(File cassandraYamlFile) { + configFile = cassandraYamlFile; + } + + public void load() { + try { + DumperOptions options = new DumperOptions(); + options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + yaml = new Yaml(options); + config = (Map) yaml.load(new FileInputStream(configFile)); + createBackup(); + } catch (FileNotFoundException e) { + throw new ConfigEditorException("Failed to load " + configFile, e); + } + } + + public void save() { + try { + yaml.dump(config, new FileWriter(configFile)); + backupFile.delete(); + yaml = null; + config = null; + backupFile = null; + } catch (Exception e) { + throw new ConfigEditorException("Failed to save changes to " + configFile, e); + } + } + + public void restore() { + try { + FileUtil.copyFile(backupFile, configFile); + backupFile.delete(); + yaml = null; + config = null; + backupFile = null; + } catch (IOException e) { + throw new ConfigEditorException("Failed to restore " + configFile + " from " + backupFile, e); + } + } + + private void createBackup() { + backupFile = new File(configFile.getParent(), "." + configFile.getName() + ".bak"); + try { + FileUtil.copyFile(configFile, backupFile); + } catch (IOException e) { + throw new ConfigEditorException("Failed to create " + backupFile, e); + } + } + + public void setSeeds(String... seeds) { + List seedProviderList = (List) config.get("seed_provider"); + Map seedProvider = (Map) seedProviderList.get(0); + List paramsList = (List) seedProvider.get("parameters"); + Map params = (Map) paramsList.get(0); + params.put("seeds", StringUtil.arrayToString(seeds)); + } + + public void setNativeTransportPort(int port) { + config.put("native_transport_port", port); + } + + public void setStoragePort(int port) { + config.put("storage_port", port); + } + +} diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditorException.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditorException.java new file mode 100644 index 0000000..db9e7ea --- /dev/null +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditorException.java @@ -0,0 +1,21 @@ +package org.rhq.cassandra.util; + +/** + * @author John Sanda + */ +public class ConfigEditorException extends RuntimeException { + + public ConfigEditorException() { + } + + public ConfigEditorException(String message) { + } + + public ConfigEditorException(String message, Throwable cause) { + super(message, cause); + } + + public ConfigEditorException(Throwable cause) { + super(cause); + } +} diff --git a/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java b/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java new file mode 100644 index 0000000..cf344e2 --- /dev/null +++ b/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java @@ -0,0 +1,94 @@ +package org.rhq.cassandra.util; + +import static org.testng.Assert.assertEquals; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.lang.reflect.Method; + +import org.apache.cassandra.config.Config; +import org.apache.cassandra.config.SeedProviderDef; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.yaml.snakeyaml.Loader; +import org.yaml.snakeyaml.TypeDescription; +import org.yaml.snakeyaml.Yaml; + +import org.rhq.core.util.file.FileUtil; +import org.rhq.core.util.stream.StreamUtil; + +/** + * @author John Sanda + */ +public class ConfigEditorTest { + + private File basedir; + + private File configFile; + + @BeforeMethod + public void initTestDir(Method test) throws Exception { + File dir = new File(getClass().getResource(".").toURI()); + basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); + FileUtil.purge(basedir, true); + basedir.mkdirs(); + + configFile = new File(basedir, "cassandra.yaml"); + + InputStream inputStream = getClass().getResourceAsStream("/cassandra.yaml"); + FileOutputStream outputStream = new FileOutputStream(configFile); + StreamUtil.copy(inputStream, outputStream); + } + + @Test + public void updateSeeds() throws Exception { + ConfigEditor editor = new ConfigEditor(configFile); + editor.load(); + editor.setSeeds("127.0.0.1", "127.0.0.2", "127.0.0.3"); + editor.save(); + + Config config = loadConfig(); + + assertEquals(config.seed_provider.parameters.get("seeds"), "127.0.0.1,127.0.0.2,127.0.0.3", + "Failed to update seeds property."); + } + + @Test + public void updateNativeTransportPort() throws Exception { + ConfigEditor editor = new ConfigEditor(configFile); + editor.load(); + editor.setNativeTransportPort(9393); + editor.save(); + + Config config = loadConfig(); + + assertEquals(config.native_transport_port, (Integer) 9393, "Failed to update native_transport_port"); + } + + @Test + public void updateStoragePort() throws Exception { + ConfigEditor editor = new ConfigEditor(configFile); + editor.load(); + editor.setStoragePort(6767); + editor.save(); + + Config config = loadConfig(); + + assertEquals(config.storage_port, (Integer) 6767, "Failed to update storage_port"); + } + + private Config loadConfig() throws Exception { + FileInputStream inputStream = new FileInputStream(configFile); + org.yaml.snakeyaml.constructor.Constructor constructor = + new org.yaml.snakeyaml.constructor.Constructor(Config.class); + TypeDescription seedDesc = new TypeDescription(SeedProviderDef.class); + seedDesc.putMapPropertyType("parameters", String.class, String.class); + constructor.addTypeDescription(seedDesc); + Yaml yaml = new Yaml(new Loader(constructor)); + + return (Config) yaml.load(inputStream); + } + +} diff --git a/modules/common/cassandra-util/src/test/resources/cassandra.yaml b/modules/common/cassandra-util/src/test/resources/cassandra.yaml new file mode 100644 index 0000000..fd7973b --- /dev/null +++ b/modules/common/cassandra-util/src/test/resources/cassandra.yaml @@ -0,0 +1,690 @@ +# Cassandra storage config YAML + +# NOTE: +# See http://wiki.apache.org/cassandra/StorageConfiguration for +# full explanations of configuration directives +# /NOTE + +# The name of the cluster. This is mainly used to prevent machines in +# one logical cluster from joining another. +cluster_name: rhq + +# This defines the number of tokens randomly assigned to this node on the ring +# The more tokens, relative to other nodes, the larger the proportion of data +# that this node will store. You probably want all nodes to have the same number +# of tokens assuming they have equal hardware capability. +# +# If you leave this unspecified, Cassandra will use the default of 1 token for legacy compatibility, +# and will use the initial_token as described below. +# +# Specifying initial_token will override this setting. +# +# If you already have a cluster with 1 token per node, and wish to migrate to +# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations +num_tokens: 256 + +# If you haven't specified num_tokens, or have set it to the default of 1 then +# you should always specify InitialToken when setting up a production +# cluster for the first time, and often when adding capacity later. +# The principle is that each node should be given an equal slice of +# the token ring; see http://wiki.apache.org/cassandra/Operations +# for more details. +# +# If blank, Cassandra will request a token bisecting the range of +# the heaviest-loaded existing node. If there is no load information +# available, such as is the case with a new cluster, it will pick +# a random token, which will lead to hot spots. +#initial_token: + +# See http://wiki.apache.org/cassandra/HintedHandoff +hinted_handoff_enabled: true +# this defines the maximum amount of time a dead host will have hints +# generated. After it has been dead this long, new hints for it will not be +# created until it has been seen alive and gone down again. +max_hint_window_in_ms: 10800000 # 3 hours +# throttle in KB's per second, per delivery thread +hinted_handoff_throttle_in_kb: 1024 +# Number of threads with which to deliver hints; +# Consider increasing this number when you have multi-dc deployments, since +# cross-dc handoff tends to be slower +max_hints_delivery_threads: 2 + +# The following setting populates the page cache on memtable flush and compaction +# WARNING: Enable this setting only when the whole node's data fits in memory. +# Defaults to: false +# populate_io_cache_on_flush: false + +# Authentication backend, implementing IAuthenticator; used to identify users +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator, +# PasswordAuthenticator}. +# +# - AllowAllAuthenticator performs no checks - set it to disable authentication. +# - PasswordAuthenticator relies on username/password pairs to authenticate +# users. It keeps usernames and hashed passwords in system_auth.credentials table. +# Please increase system_auth keyspace replication factor if you use this authenticator. +authenticator: org.apache.cassandra.auth.PasswordAuthenticator + +# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer, +# CassandraAuthorizer}. +# +# - AllowAllAuthorizer allows any action to any user - set it to disable authorization. +# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please +# increase system_auth keyspace replication factor if you use this authorizer. +authorizer: org.apache.cassandra.auth.CassandraAuthorizer + +# Validity period for permissions cache (fetching permissions can be an +# expensive operation depending on the authorizer, CassandraAuthorizer is +# one example). Defaults to 2000, set to 0 to disable. +# Will be disabled automatically for AllowAllAuthorizer. +permissions_validity_in_ms: 2000 + +# The partitioner is responsible for distributing rows (by key) across +# nodes in the cluster. Any IPartitioner may be used, including your +# own as long as it is on the classpath. Out of the box, Cassandra +# provides org.apache.cassandra.dht.{Murmur3Partitioner, RandomPartitioner +# ByteOrderedPartitioner, OrderPreservingPartitioner (deprecated)}. +# +# - RandomPartitioner distributes rows across the cluster evenly by md5. +# This is the default prior to 1.2 and is retained for compatibility. +# - Murmur3Partitioner is similar to RandomPartioner but uses Murmur3_128 +# Hash Function instead of md5. When in doubt, this is the best option. +# - ByteOrderedPartitioner orders rows lexically by key bytes. BOP allows +# scanning rows in key order, but the ordering can generate hot spots +# for sequential insertion workloads. +# - OrderPreservingPartitioner is an obsolete form of BOP, that stores +# - keys in a less-efficient format and only works with keys that are +# UTF8-encoded Strings. +# - CollatingOPP colates according to EN,US rules rather than lexical byte +# ordering. Use this as an example if you need custom collation. +# +# See http://wiki.apache.org/cassandra/Operations for more on +# partitioners and token selection. +partitioner: org.apache.cassandra.dht.Murmur3Partitioner + +# directories where Cassandra should store data on disk. +data_file_directories: + - /Users/jsanda/Development/redhat/rhq/rhq-data/storage-1/data + +# commit log +commitlog_directory: /Users/jsanda/Development/redhat/rhq/rhq-data/storage-1/commit_log + +# policy for data disk failures: +# stop: shut down gossip and Thrift, leaving the node effectively dead, but +# still inspectable via JMX. +# best_effort: stop using the failed disk and respond to requests based on +# remaining available sstables. This means you WILL see obsolete +# data at CL.ONE! +# ignore: ignore fatal errors and let requests fail, as in pre-1.2 Cassandra +disk_failure_policy: stop + +# Maximum size of the key cache in memory. +# +# Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the +# minimum, sometimes more. The key cache is fairly tiny for the amount of +# time it saves, so it's worthwhile to use it at large numbers. +# The row cache saves even more time, but must store the whole values of +# its rows, so it is extremely space-intensive. It's best to only use the +# row cache if you have hot rows or static rows. +# +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is empty to make it "auto" (min(5% of Heap (in MB), 100MB)). Set to 0 to disable key cache. +key_cache_size_in_mb: + +# Duration in seconds after which Cassandra should +# safe the keys cache. Caches are saved to saved_caches_directory as +# specified in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 14400 or 4 hours. +key_cache_save_period: 14400 + +# Number of keys from the key cache to save +# Disabled by default, meaning all keys are going to be saved +# key_cache_keys_to_save: 100 + +# Maximum size of the row cache in memory. +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is 0, to disable row caching. +row_cache_size_in_mb: 0 + +# Duration in seconds after which Cassandra should +# safe the row cache. Caches are saved to saved_caches_directory as specified +# in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 0 to disable saving the row cache. +row_cache_save_period: 0 + +# Number of keys from the row cache to save +# Disabled by default, meaning all keys are going to be saved +# row_cache_keys_to_save: 100 + +# The provider for the row cache to use. +# +# Supported values are: ConcurrentLinkedHashCacheProvider, SerializingCacheProvider +# +# SerializingCacheProvider serialises the contents of the row and stores +# it in native memory, i.e., off the JVM Heap. Serialized rows take +# significantly less memory than "live" rows in the JVM, so you can cache +# more rows in a given memory footprint. And storing the cache off-heap +# means you can use smaller heap sizes, reducing the impact of GC pauses. +# +# It is also valid to specify the fully-qualified class name to a class +# that implements org.apache.cassandra.cache.IRowCacheProvider. +# +# Defaults to SerializingCacheProvider +row_cache_provider: SerializingCacheProvider + +# saved caches +saved_caches_directory: /Users/jsanda/Development/redhat/rhq/rhq-data/storage-1/saved_caches + +# commitlog_sync may be either "periodic" or "batch." +# When in batch mode, Cassandra won't ack writes until the commit log +# has been fsynced to disk. It will wait up to +# commitlog_sync_batch_window_in_ms milliseconds for other writes, before +# performing the sync. +# +# commitlog_sync: batch +# commitlog_sync_batch_window_in_ms: 50 +# +# the other option is "periodic" where writes may be acked immediately +# and the CommitLog is simply synced every commitlog_sync_period_in_ms +# milliseconds. +commitlog_sync: periodic +commitlog_sync_period_in_ms: 10000 + +# The size of the individual commitlog file segments. A commitlog +# segment may be archived, deleted, or recycled once all the data +# in it (potentally from each columnfamily in the system) has been +# flushed to sstables. +# +# The default size is 32, which is almost always fine, but if you are +# archiving commitlog segments (see commitlog_archiving.properties), +# then you probably want a finer granularity of archiving; 8 or 16 MB +# is reasonable. +commitlog_segment_size_in_mb: 32 + +# any class that implements the SeedProvider interface and has a +# constructor that takes a Map<String, String> of parameters will do. +seed_provider: + # Addresses of hosts that are deemed contact points. + # Cassandra nodes use this list of hosts to find each other and learn + # the topology of the ring. You must change this if you are running + # multiple nodes! + - class_name: org.apache.cassandra.locator.SimpleSeedProvider + parameters: + # seeds is actually a comma-delimited list of addresses. + # Ex: "<ip1>,<ip2>,<ip3>" + - seeds: "127.0.0.1" + +# emergency pressure valve: each time heap usage after a full (CMS) +# garbage collection is above this fraction of the max, Cassandra will +# flush the largest memtables. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +# +# RELYING ON THIS AS YOUR PRIMARY TUNING MECHANISM WILL WORK POORLY: +# it is most effective under light to moderate load, or read-heavy +# workloads; under truly massive write load, it will often be too +# little, too late. +flush_largest_memtables_at: 0.75 + +# emergency pressure valve #2: the first time heap usage after a full +# (CMS) garbage collection is above this fraction of the max, +# Cassandra will reduce cache maximum _capacity_ to the given fraction +# of the current _size_. Should usually be set substantially above +# flush_largest_memtables_at, since that will have less long-term +# impact on the system. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +reduce_cache_sizes_at: 0.85 +reduce_cache_capacity_to: 0.6 + +# For workloads with more data than can fit in memory, Cassandra's +# bottleneck will be reads that need to fetch data from +# disk. "concurrent_reads" should be set to (16 * number_of_drives) in +# order to allow the operations to enqueue low enough in the stack +# that the OS and drives can reorder them. +# +# On the other hand, since writes are almost never IO bound, the ideal +# number of "concurrent_writes" is dependent on the number of cores in +# your system; (8 * number_of_cores) is a good rule of thumb. +concurrent_reads: 32 +concurrent_writes: 32 + +# Total memory to use for memtables. Cassandra will flush the largest +# memtable when this much memory is used. +# If omitted, Cassandra will set it to 1/3 of the heap. +# memtable_total_space_in_mb: 2048 + +# Total space to use for commitlogs. Since commitlog segments are +# mmapped, and hence use up address space, the default size is 32 +# on 32-bit JVMs, and 1024 on 64-bit JVMs. +# +# If space gets above this value (it will round up to the next nearest +# segment multiple), Cassandra will flush every dirty CF in the oldest +# segment and remove it. So a small total commitlog space will tend +# to cause more flush activity on less-active columnfamilies. +# commitlog_total_space_in_mb: 4096 + +# This sets the amount of memtable flush writer threads. These will +# be blocked by disk io, and each one will hold a memtable in memory +# while blocked. If you have a large heap and many data directories, +# you can increase this value for better flush performance. +# By default this will be set to the amount of data directories defined. +#memtable_flush_writers: 1 + +# the number of full memtables to allow pending flush, that is, +# waiting for a writer thread. At a minimum, this should be set to +# the maximum number of secondary indexes created on a single CF. +memtable_flush_queue_size: 4 + +# Whether to, when doing sequential writing, fsync() at intervals in +# order to force the operating system to flush the dirty +# buffers. Enable this to avoid sudden dirty buffer flushing from +# impacting read latencies. Almost always a good idea on SSD:s; not +# necessarily on platters. +trickle_fsync: false +trickle_fsync_interval_in_kb: 10240 + +# TCP port, for commands and data +storage_port: 7100 + +# SSL port, for encrypted communication. Unused unless enabled in +# encryption_options +ssl_storage_port: 7101 + +# Address to bind to and tell other Cassandra nodes to connect to. You +# _must_ change this if you want multiple nodes to be able to +# communicate! +# +# Leaving it blank leaves it up to InetAddress.getLocalHost(). This +# will always do the Right Thing *if* the node is properly configured +# (hostname, name resolution, etc), and the Right Thing is to use the +# address associated with the hostname (it might not be). +# +# Setting this to 0.0.0.0 is always wrong. +listen_address: 127.0.0.1 + +# Address to broadcast to other Cassandra nodes +# Leaving this blank will set it to the same value as listen_address +# broadcast_address: 1.2.3.4 + +# Internode authentication backend, implementing IInternodeAuthenticator; +# used to allow/disallow connections from peer nodes. +internode_authenticator: org.rhq.cassandra.auth.RhqInternodeAuthenticator + +# Whether to start the native transport server. +# Currently, only the thrift server is started by default because the native +# transport is considered beta. +# Please note that the address on which the native transport is bound is the +# same as the rpc_address. The port however is different and specified below. +start_native_transport: true +# port for the CQL native transport to listen for clients on +native_transport_port: 9142 +# The minimum and maximum threads for handling requests when the native +# transport is used. The meaning is those is similar to the one of +# rpc_min_threads and rpc_max_threads, though the default differ slightly and +# are the ones below: +# native_transport_min_threads: 16 +native_transport_max_threads: 128 + + +# Whether to start the thrift rpc server. +start_rpc: false +# The address to bind the Thrift RPC service to -- clients connect +# here. Unlike ListenAddress above, you *can* specify 0.0.0.0 here if +# you want Thrift to listen on all interfaces. +# +# Leaving this blank has the same effect it does for ListenAddress, +# (i.e. it will be based on the configured hostname of the node). +rpc_address: 127.0.0.1 +# port for Thrift to listen for clients on +rpc_port: 9160 + +# enable or disable keepalive on rpc connections +rpc_keepalive: true + +# Cassandra provides three out-of-the-box options for the RPC Server: +# +# sync -> One thread per thrift connection. For a very large number of clients, memory +# will be your limiting factor. On a 64 bit JVM, 128KB is the minimum stack size +# per thread, and that will correspond to your use of virtual memory (but physical memory +# may be limited depending on use of stack space). +# +# hsha -> Stands for "half synchronous, half asynchronous." All thrift clients are handled +# asynchronously using a small number of threads that does not vary with the amount +# of thrift clients (and thus scales well to many clients). The rpc requests are still +# synchronous (one thread per active request). +# +# The default is sync because on Windows hsha is about 30% slower. On Linux, +# sync/hsha performance is about the same, with hsha of course using less memory. +# +# Alternatively, can provide your own RPC server by providing the fully-qualified class name +# of an o.a.c.t.TServerFactory that can create an instance of it. +rpc_server_type: sync + +# Uncomment rpc_min|max_thread to set request pool size limits. +# +# Regardless of your choice of RPC server (see above), the number of maximum requests in the +# RPC thread pool dictates how many concurrent requests are possible (but if you are using the sync +# RPC server, it also dictates the number of clients that can be connected at all). +# +# The default is unlimited and thus provide no protection against clients overwhelming the server. You are +# encouraged to set a maximum that makes sense for you in production, but do keep in mind that +# rpc_max_threads represents the maximum number of client requests this server may execute concurrently. +# +# rpc_min_threads: 16 +# rpc_max_threads: 2048 + +# uncomment to set socket buffer sizes on rpc connections +# rpc_send_buff_size_in_bytes: +# rpc_recv_buff_size_in_bytes: + +# uncomment to set socket buffer size for internode communication +# Note that when setting this, the buffer size is limited by net.core.wmem_max +# and when not setting it it is defined by net.ipv4.tcp_wmem +# See: +# /proc/sys/net/core/wmem_max +# /proc/sys/net/core/rmem_max +# /proc/sys/net/ipv4/tcp_wmem +# /proc/sys/net/ipv4/tcp_wmem +# and: man tcp +# internode_send_buff_size_in_bytes: +# internode_recv_buff_size_in_bytes: + +# Frame size for thrift (maximum field length). +thrift_framed_transport_size_in_mb: 15 + +# The max length of a thrift message, including all fields and +# internal thrift overhead. +thrift_max_message_length_in_mb: 16 + +# Set to true to have Cassandra create a hard link to each sstable +# flushed or streamed locally in a backups/ subdirectory of the +# Keyspace data. Removing these links is the operator's +# responsibility. +incremental_backups: false + +# Whether or not to take a snapshot before each compaction. Be +# careful using this option, since Cassandra won't clean up the +# snapshots for you. Mostly useful if you're paranoid when there +# is a data format change. +snapshot_before_compaction: false + +# Whether or not a snapshot is taken of the data before keyspace truncation +# or dropping of column families. The STRONGLY advised default of true +# should be used to provide data safety. If you set this flag to false, you will +# lose data on truncation or drop. +auto_snapshot: true + +# Add column indexes to a row after its contents reach this size. +# Increase if your column values are large, or if you have a very large +# number of columns. The competing causes are, Cassandra has to +# deserialize this much of the row to read a single column, so you want +# it to be small - at least if you do many partial-row reads - but all +# the index data is read for each access, so you don't want to generate +# that wastefully either. +column_index_size_in_kb: 64 + +# Size limit for rows being compacted in memory. Larger rows will spill +# over to disk and use a slower two-pass compaction process. A message +# will be logged specifying the row key. +in_memory_compaction_limit_in_mb: 64 + +# Number of simultaneous compactions to allow, NOT including +# validation "compactions" for anti-entropy repair. Simultaneous +# compactions can help preserve read performance in a mixed read/write +# workload, by mitigating the tendency of small sstables to accumulate +# during a single long running compactions. The default is usually +# fine and if you experience problems with compaction running too +# slowly or too fast, you should look at +# compaction_throughput_mb_per_sec first. +# +# concurrent_compactors defaults to the number of cores. +# Uncomment to make compaction mono-threaded, the pre-0.8 default. +#concurrent_compactors: 1 + +# Multi-threaded compaction. When enabled, each compaction will use +# up to one thread per core, plus one thread per sstable being merged. +# This is usually only useful for SSD-based hardware: otherwise, +# your concern is usually to get compaction to do LESS i/o (see: +# compaction_throughput_mb_per_sec), not more. +multithreaded_compaction: false + +# Throttles compaction to the given total throughput across the entire +# system. The faster you insert data, the faster you need to compact in +# order to keep the sstable count down, but in general, setting this to +# 16 to 32 times the rate you are inserting data is more than sufficient. +# Setting this to 0 disables throttling. Note that this account for all types +# of compaction, including validation compaction. +compaction_throughput_mb_per_sec: 16 + +# Track cached row keys during compaction, and re-cache their new +# positions in the compacted sstable. Disable if you use really large +# key caches. +compaction_preheat_key_cache: true + +# Throttles all outbound streaming file transfers on this node to the +# given total throughput in Mbps. This is necessary because Cassandra does +# mostly sequential IO when streaming data during bootstrap or repair, which +# can lead to saturating the network connection and degrading rpc performance. +# When unset, the default is 200 Mbps or 25 MB/s. +# stream_throughput_outbound_megabits_per_sec: 200 + +# How long the coordinator should wait for read operations to complete +read_request_timeout_in_ms: 20000 +# How long the coordinator should wait for seq or index scans to complete +range_request_timeout_in_ms: 20000 +# How long the coordinator should wait for writes to complete +write_request_timeout_in_ms: 20000 +# How long the coordinator should wait for truncates to complete +# (This can be much longer, because we need to flush all CFs +# to make sure we can clear out anythink in the commitlog that could +# cause truncated data to reappear.) +truncate_request_timeout_in_ms: 60000 +# The default timeout for other, miscellaneous operations +request_timeout_in_ms: 20000 + +# Enable operation timeout information exchange between nodes to accurately +# measure request timeouts, If disabled cassandra will assuming the request +# was forwarded to the replica instantly by the coordinator +# +# Warning: before enabling this property make sure to ntp is installed +# and the times are synchronized between the nodes. +cross_node_timeout: false + +# Enable socket timeout for streaming operation. +# When a timeout occurs during streaming, streaming is retried from the start +# of the current file. This *can* involve re-streaming an important amount of +# data, so you should avoid setting the value too low. +# Default value is 0, which never timeout streams. +# streaming_socket_timeout_in_ms: 0 + +# phi value that must be reached for a host to be marked down. +# most users should never need to adjust this. +# phi_convict_threshold: 8 + +# endpoint_snitch -- Set this to a class that implements +# IEndpointSnitch. The snitch has two functions: +# - it teaches Cassandra enough about your network topology to route +# requests efficiently +# - it allows Cassandra to spread replicas around your cluster to avoid +# correlated failures. It does this by grouping machines into +# "datacenters" and "racks." Cassandra will do its best not to have +# more than one replica on the same "rack" (which may not actually +# be a physical location) +# +# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER, +# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS +# ARE PLACED. +# +# Out of the box, Cassandra provides +# - SimpleSnitch: +# Treats Strategy order as proximity. This improves cache locality +# when disabling read repair, which can further improve throughput. +# Only appropriate for single-datacenter deployments. +# - PropertyFileSnitch: +# Proximity is determined by rack and data center, which are +# explicitly configured in cassandra-topology.properties. +# - GossipingPropertyFileSnitch +# The rack and datacenter for the local node are defined in +# cassandra-rackdc.properties and propagated to other nodes via gossip. If +# cassandra-topology.properties exists, it is used as a fallback, allowing +# migration from the PropertyFileSnitch. +# - RackInferringSnitch: +# Proximity is determined by rack and data center, which are +# assumed to correspond to the 3rd and 2nd octet of each node's +# IP address, respectively. Unless this happens to match your +# deployment conventions (as it did Facebook's), this is best used +# as an example of writing a custom Snitch class. +# - Ec2Snitch: +# Appropriate for EC2 deployments in a single Region. Loads Region +# and Availability Zone information from the EC2 API. The Region is +# treated as the Datacenter, and the Availability Zone as the rack. +# Only private IPs are used, so this will not work across multiple +# Regions. +# - Ec2MultiRegionSnitch: +# Uses public IPs as broadcast_address to allow cross-region +# connectivity. (Thus, you should set seed addresses to the public +# IP as well.) You will need to open the storage_port or +# ssl_storage_port on the public IP firewall. (For intra-Region +# traffic, Cassandra will switch to the private IP after +# establishing a connection.) +# +# You can use a custom Snitch by setting this to the full class name +# of the snitch, which will be assumed to be on your classpath. +endpoint_snitch: SimpleSnitch + +# controls how often to perform the more expensive part of host score +# calculation +dynamic_snitch_update_interval_in_ms: 100 +# controls how often to reset all host scores, allowing a bad host to +# possibly recover +dynamic_snitch_reset_interval_in_ms: 600000 +# if set greater than zero and read_repair_chance is < 1.0, this will allow +# 'pinning' of replicas to hosts in order to increase cache capacity. +# The badness threshold will control how much worse the pinned host has to be +# before the dynamic snitch will prefer other replicas over it. This is +# expressed as a double which represents a percentage. Thus, a value of +# 0.2 means Cassandra would continue to prefer the static snitch values +# until the pinned host was 20% worse than the fastest. +dynamic_snitch_badness_threshold: 0.1 + +# request_scheduler -- Set this to a class that implements +# RequestScheduler, which will schedule incoming client requests +# according to the specific policy. This is useful for multi-tenancy +# with a single Cassandra cluster. +# NOTE: This is specifically for requests from the client and does +# not affect inter node communication. +# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place +# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of +# client requests to a node with a separate queue for each +# request_scheduler_id. The scheduler is further customized by +# request_scheduler_options as described below. +request_scheduler: org.apache.cassandra.scheduler.NoScheduler + +# Scheduler Options vary based on the type of scheduler +# NoScheduler - Has no options +# RoundRobin +# - throttle_limit -- The throttle_limit is the number of in-flight +# requests per client. Requests beyond +# that limit are queued up until +# running requests can complete. +# The value of 80 here is twice the number of +# concurrent_reads + concurrent_writes. +# - default_weight -- default_weight is optional and allows for +# overriding the default which is 1. +# - weights -- Weights are optional and will default to 1 or the +# overridden default_weight. The weight translates into how +# many requests are handled during each turn of the +# RoundRobin, based on the scheduler id. +# +# request_scheduler_options: +# throttle_limit: 80 +# default_weight: 5 +# weights: +# Keyspace1: 1 +# Keyspace2: 5 + +# request_scheduler_id -- An identifer based on which to perform +# the request scheduling. Currently the only valid option is keyspace. +# request_scheduler_id: keyspace + +# index_interval controls the sampling of entries from the primrary +# row index in terms of space versus time. The larger the interval, +# the smaller and less effective the sampling will be. In technicial +# terms, the interval coresponds to the number of index entries that +# are skipped between taking each sample. All the sampled entries +# must fit in memory. Generally, a value between 128 and 512 here +# coupled with a large key cache size on CFs results in the best trade +# offs. This value is not often changed, however if you have many +# very small rows (many to an OS page), then increasing this will +# often lower memory usage without a impact on performance. +index_interval: 128 + +# Enable or disable inter-node encryption +# Default settings are TLS v1, RSA 1024-bit keys (it is imperative that +# users generate their own keys) TLS_RSA_WITH_AES_128_CBC_SHA as the cipher +# suite for authentication, key exchange and encryption of the actual data transfers. +# NOTE: No custom encryption options are enabled at the moment +# The available internode options are : all, none, dc, rack +# +# If set to dc cassandra will encrypt the traffic between the DCs +# If set to rack cassandra will encrypt the traffic between the racks +# +# The passwords used in these options must match the passwords used when generating +# the keystore and truststore. For instructions on generating these files, see: +# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSS… +# +server_encryption_options: + internode_encryption: none + keystore: conf/.keystore + keystore_password: cassandra + truststore: conf/.truststore + truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + # require_client_auth: false + +# enable or disable client/server encryption. +client_encryption_options: + enabled: false + keystore: conf/.keystore + keystore_password: cassandra + # require_client_auth: false + # Set trustore and truststore_password if require_client_auth is true + # truststore: conf/.truststore + # truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + +# internode_compression controls whether traffic between nodes is +# compressed. +# can be: all - all traffic is compressed +# dc - traffic between different datacenters is compressed +# none - nothing is compressed. +internode_compression: none + +# Enable or disable tcp_nodelay for inter-dc communication. +# Disabling it will result in larger (but fewer) network packets being sent, +# reducing overhead from the TCP protocol itself, at the cost of increasing +# latency if you block for cross-datacenter responses. +inter_dc_tcp_nodelay: true commit 9981901120d09f9eaef388ef596f11f297ea55c7 Author: John Sanda <jsanda(a)redhat.com> Date: Fri Jul 26 15:42:46 2013 -0400 add storage node shutdown operation that uses pid file There can be problems with getting the actual, current pid from Sigar, so the storage node plugin will first attempt to get the pid from the pid file which should exist on disk. If that fails, then we will attempt to get the pid from Sigar. This implementation for shutdown does not work for Windows so need to revist it to add in Windows support. We may even consider delegating to rhqtcl. diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 3e55a93..d648ad8 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -246,8 +246,6 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent long pid = process.getPid(); try { - getEmsConnection().close(); - process.kill("KILL"); Configuration pluginConfig = getResourceContext().getPluginConfiguration(); @@ -266,7 +264,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } - private void waitForNodeToGoDown() throws InterruptedException { + protected void waitForNodeToGoDown() throws InterruptedException { if (OperatingSystem.getInstance().getName().equals(OperatingSystem.NAME_MACOSX)) { // See this thread on VMWare forum: http://communities.vmware.com/message/2187972#2187972 // Unfortunately there is no work around for this failure on Mac OSX so the method will silently return on diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 125f4d2..5933093 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -28,6 +28,7 @@ package org.rhq.plugins.storage; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; @@ -39,6 +40,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hyperic.sigar.SigarException; import org.mc4j.ems.connection.EmsConnection; import org.mc4j.ems.connection.bean.EmsBean; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; @@ -54,9 +56,11 @@ import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.pluginapi.inventory.ProcessScanResult; import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.system.ProcessInfo; import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.core.util.file.FileUtil; @@ -105,11 +109,80 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return updateKnownNodes(parameters); } else if (name.equals("prepareForBootstrap")) { return prepareForBootstrap(parameters); + } else if (name.equals("shutdown")) { + return shutdownStorageNode(); } else { return super.invokeOperation(name, parameters); } } + private OperationResult shutdownStorageNode() { + OperationResult result = new OperationResult(); + File binDir = new File(getBasedir(), "bin"); + File pidFile = new File(binDir, "cassandra.pid"); + + try { + if (pidFile.exists()) { + long pid = readPidFile(pidFile); + log.info("Shutting down storage node with pid " + pid); + ProcessInfo process = findProcessInfo(pid); + if (process != null) { + try { + process.kill("KILL"); + waitForNodeToGoDown(); + pidFile.delete(); + result.setSimpleResult("Successfully storage node with pid " + pid); + } catch (SigarException e) { + log.error("Failed to delete storage node with pid " + process.getPid(), e); + result.setErrorMessage("Failed to delete storage node with pid " + pid + ": " + + ThrowableUtil.getAllMessages(e)); + } + } else { + log.warn("Could not find process info for pid " + pid); + result = shutdownUsingNativeProcessInfo(); + } + + } else { + log.warn("Did not find pid file " + pidFile + ". It should not be modified, deleted, or moved."); + result = shutdownUsingNativeProcessInfo(); + } + } catch (FileNotFoundException e) { + log.error("Could not read pid file " + pidFile, e); + result.setErrorMessage("Could not read pid file " + pidFile + ": " + ThrowableUtil.getAllMessages(e)); + } catch (InterruptedException e) { + log.warn("The shutdown operation was cancelled or interrupted. This interruption occurred while trying " + + "to verify that the storage node process has exited."); + result.setErrorMessage("The operation was cancelled or interrupted while trying to verify that the " + + "storage node process has exited."); + } + return result; + } + + private long readPidFile(File pidFile) throws FileNotFoundException { + return Long.parseLong(StreamUtil.slurp(new FileReader(pidFile))); + } + + private ProcessInfo findProcessInfo(long pid) { + List<ProcessScanResult> scanResults = getResourceContext().getNativeProcessesForType(); + + for (ProcessScanResult scanResult : scanResults) { + if (scanResult.getProcessInfo().getPid() == pid) { + return scanResult.getProcessInfo(); + } + } + return null; + } + + private OperationResult shutdownUsingNativeProcessInfo() throws InterruptedException { + log.warn("Could not obtain process info from pid file"); + log.info("Obtaining process info from the system to perform the shutdown"); + + OperationResult result = shutdownNode(); + waitForNodeToGoDown(); + + return result; + } + private OperationResult updateConfiguration(Configuration params) { boolean restartIsRequired = false; @@ -237,7 +310,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper OperationResult result = new OperationResult(); log.info("Stopping storage node"); - OperationResult stopNodeResult = stopNode(); + OperationResult stopNodeResult = shutdownStorageNode(); if (stopNodeResult.getErrorMessage() != null) { log.error("Failed to stop storage node " + this + " Cannot prepare the node for bootstrap which means " + "that the storage node cannot join the cluster. Make sure the storage node is not running and retry " + diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index f0744a4..eb4d545 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -231,6 +231,26 @@ public class StorageNodeComponentITest { assertNodeIsUp("Expected " + storageNode + " to be up after restarting it."); } + @Test(dependsOnMethods = "restartStorageNode") + public void prepareForBootstrap() { + Configuration params = Configuration.builder().addSimple("cqlPort", 9242).addSimple("gossipPort", 7200) + .openList("storageNodeIPAddresses", "storageNodeIPAddresse").addSimples("127.0.0.1", "127.0.0.2") + .closeList().build(); + + OperationManager operationManager = PluginContainer.getInstance().getOperationManager(); + OperationServicesAdapter operationsService = new OperationServicesAdapter(operationManager); + + long timeout = 1000 * 60; + OperationContextImpl operationContext = new OperationContextImpl(storageNode.getId()); + OperationServicesResult result = operationsService.invokeOperation(operationContext, "prepareForBootstrap", + params, timeout); + + assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The operation failed: " + + result.getErrorStackTrace()); + + assertNodeIsUp("Expected " + storageNode + " to be up after the prepareForBootstrap operation completes."); + } + private void assertNodeIsUp(String msg) { executeAvailabilityScan(); @@ -251,7 +271,6 @@ public class StorageNodeComponentITest { private Availability getAvailability() { InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); -// return inventoryManager.getAvailabilityIfKnown(storageNode); return inventoryManager.getCurrentAvailability(storageNode); } commit 9b9c2ccb1e5336cf8630accb13e4118d36698a3a Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Jul 26 14:14:15 2013 +0200 Put the real version in here, as otherwise we have a circular dependency. diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 353f4d9..a227ed4 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -19,7 +19,7 @@ <properties>  - <gwt.version>${gwt.version}</gwt.version> + <gwt.version>2.5.0</gwt.version> <smartgwt.version>3.0</smartgwt.version>  <cassandra.version>1.2.4</cassandra.version> <cassandra.thrift.version>0.7.0</cassandra.thrift.version> - <cassandra.driver.version>1.0.0-rhq-1.2.4</cassandra.driver.version> + <cassandra.driver.version>1.0.2-rhq-1.2.4</cassandra.driver.version> <cassandra.driver.netty.version>3.6.3.Final</cassandra.driver.netty.version> <cassandra.snappy.version>1.0.4.1-rhq-p1</cassandra.snappy.version> <cassandra.snakeyaml.version>1.6</cassandra.snakeyaml.version> commit 5112e60ff848296ecce96d5ae7e363dbea6c0e12 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Jul 25 17:52:00 2013 -0500 Operations are now created in a new transaction. Also, change the way the configuration is updated. The steps for a full configuration update: 1) Invoke config update operation on the plugin 2) Update the JMX port on the storage node entity 3) Restart the storage node server 4) Update the connection settings for the storage node if JMX port changed diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 7a7eda4..7d861f1 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -35,6 +35,8 @@ import java.util.Queue; import javax.ejb.EJB; import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import javax.ejb.TransactionAttributeType; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; @@ -134,6 +136,9 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @EJB private ConfigurationManagerLocal configurationManager; + @EJB + private StorageNodeManagerLocal storageNodeManger; + @Override public void linkResource(Resource resource) { List<StorageNode> storageNodes = this.getStorageNodes(); @@ -658,31 +663,49 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN parameters); if (result) { + //2. Update the JMX port + //this is a fast operation compared to the restart + storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); + entityManager.merge(storageNode); + + //3. Restart the storage node + result = runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, + new Configuration()); + + //4. Update the plugin configuration to talk with the new server + //Up to this point communication with the storage node should not have been affected by the intermediate + //changes Configuration storageNodePluginConfig = configurationManager.getPluginConfiguration(subject, storageNodeResource.getId()); String existingJMXPort = storageNodePluginConfig.getSimpleValue("jmxPort"); - storageNodePluginConfig.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); + String newJMXPort = storageNodeConfiguration.getJmxPort() + ""; - String existingConnectionURL = storageNodePluginConfig.getSimpleValue("connectorAddress"); - String newConnectionURL = existingConnectionURL.replace(":" + existingJMXPort + "/", ":" - + storageNodeConfiguration.getJmxPort() + "/"); - storageNodePluginConfig.setSimpleValue("connectorAddress", newConnectionURL); + if (!existingJMXPort.equals(newJMXPort)) { + storageNodePluginConfig.setSimpleValue("jmxPort", newJMXPort); - configurationManager.updatePluginConfiguration(subject, storageNodeResource.getId(), - storageNodePluginConfig); + String existingConnectionURL = storageNodePluginConfig.getSimpleValue("connectorAddress"); + String newConnectionURL = existingConnectionURL.replace(":" + existingJMXPort + "/", ":" + + storageNodeConfiguration.getJmxPort() + "/"); + storageNodePluginConfig.setSimpleValue("connectorAddress", newConnectionURL); - storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); - entityManager.merge(storageNode); - entityManager.flush(); + configurationManager.updatePluginConfiguration(subject, storageNodeResource.getId(), + storageNodePluginConfig); + } - return runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, null); + return result; } } return false; } + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + public void scheduleOperationInNewTransaction(Subject subject, ResourceOperationSchedule schedule) { + operationManager.scheduleResourceOperation(subject, schedule); + } + private boolean runOperationAndWaitForResult(Subject subject, Resource storageNodeResource, String operationToRun, Configuration parameters) { @@ -696,8 +719,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN newSchedule.setDescription("Run by StorageNodeManagerBean"); newSchedule.setParameters(parameters); - operationManager.scheduleResourceOperation(subject, newSchedule); - entityManager.flush(); + storageNodeManger.scheduleOperationInNewTransaction(subject, newSchedule); //waiting for the operation result then return it int iteration = 0; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index 69b16c4..15fa85c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -28,6 +28,7 @@ import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.criteria.StorageNodeCriteria; +import org.rhq.core.domain.operation.bean.ResourceOperationSchedule; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageList; @@ -178,4 +179,6 @@ public interface StorageNodeManagerLocal { */ ResourceGroup getStorageNodeGroup(); + void scheduleOperationInNewTransaction(Subject subject, ResourceOperationSchedule schedule); + } diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index a42040d..f5a4f6d 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -132,10 +132,10 @@ <operation name="updateConfiguration" description="Updates the node configuration. Will require a separate server restart for the settings to take effect."> <parameters> - <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> - <c:simple-property name="heapSize" type="string" description="The heap size to be used for both -Xms and -Xmx JVM options."/> - <c:simple-property name="heapNewSize" type="string" description="The heap new size to be used be used with -Xmn JVM option."/> - <c:simple-property name="threadStackSize" type="integer" description="The thread stack size. This memory is allocated to each thread off heap. The + <c:simple-property name="jmxPort" type="integer" required="false" description="JMX port JVM option."/> + <c:simple-property name="heapSize" type="string" required="false" description="The heap size to be used for both -Xms and -Xmx JVM options."/> + <c:simple-property name="heapNewSize" type="string" required="false" description="The heap new size to be used be used with -Xmn JVM option."/> + <c:simple-property name="threadStackSize" type="integer" required="false" description="The thread stack size. This memory is allocated to each thread off heap. The value should be an integer that will be interpreted in kilobytes."/> <c:simple-property name="restartIfRequired" type="boolean" required="true" default="false" description="If [true] then restart the server at the end of the update if and if only the updates made require a restart. If [false] the server will not be restarted regardless of the updates made."/> </parameters> commit af85b8b1c687e025ea95898dda6a5c46f127d151 Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Jul 25 14:16:38 2013 -0700 [BZ 988574] - Consolidated Metrics Screen - UXD Redesign diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 969ab8e..353f4d9 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -19,7 +19,7 @@ <properties>  - <gwt.version>2.5.0</gwt.version> + <gwt.version>${gwt.version}</gwt.version> <smartgwt.version>3.0</smartgwt.version>  -  - <dependency> - <groupId>com.googlecode.gflot</groupId> - <artifactId>gflot</artifactId> - <version>2.4.3</version> - <scope>provided</scope> - </dependency> +  <dependency> @@ -245,7 +236,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>2.5.0</version> + <version>${gwt.version}</version> <configuration> <noServer>true</noServer> <inplace>false</inplace> diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java index d11467a..b48a712 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java @@ -114,6 +114,12 @@ public enum IconEnum { STORAGE_NODE("global/StorageNode_16.png", "global/StorageNode_24.png"), ///////////////////////////// + // General + ///////////////////////////// + EXPANDED_ICON("[SKIN]/ListGrid/row_expanded.png"), + COLLAPSED_ICON("[SKIN]/ListGrid/row_collapsed.png"), + + ///////////////////////////// // Resource Specific Tabs ///////////////////////////// CALLTIME("global/Recent_16.png", "global/Recent_24.png"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java index 4cfe199..4ce05d2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java @@ -1202,16 +1202,15 @@ public class Table<DS extends RPCDataSource> extends EnhancedHLayout implements } if (hiddenItem != null) { - Log.debug("Found hidden items"); // Add the hidden item if it exists FormItem[] tmpItems = new FormItem[items.length + 1]; System.arraycopy(items, 0, tmpItems, 0, items.length); tmpItems[items.length] = hiddenItem; items = tmpItems; } - for (FormItem item : items) { - Log.debug(" ******** Form Items sent: " + item.getName() + ": " + item.getValue()); - } +// for (FormItem item : items) { +// Log.debug(" ******** Form Items sent: " + item.getName() + ": " + item.getValue()); +// } super.setItems(items); } @@ -1223,19 +1222,16 @@ public class Table<DS extends RPCDataSource> extends EnhancedHLayout implements @Override public void onKeyPress(KeyPressEvent event) { if (event.getKeyName().equals("Enter")) { - Log.debug("Table.TableFilter Pressed Enter key"); if (null != searchBarItem) { if (searchBarItem.getSearchBar().isFilterEnabled()) { TextItem searchTextItem = searchBarItem.getSearchBar().getSearchTextItem(); String searchBarValue = searchTextItem.getValueAsString(); String hiddenValue = (String) hiddenItem.getValue(); - Log.debug("Table.TableFilter searchBarValue :" + searchBarValue + ", hiddenValue" + hiddenValue); // Only send a fetch request if the user actually changed the search expression. if (!equals(searchBarValue, hiddenValue)) { hiddenItem.setValue(searchBarValue); - Log.debug("Table.TableFilter fetchFilteredTableData"); fetchFilteredTableData(); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java index e75b65a..ace6154 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java @@ -202,6 +202,10 @@ public abstract class AbstractMetricGraph extends VLayout implements HasD3Metric return metricGraphData.getPortalId(); } + public boolean isHideLegend(){ + return metricGraphData.isHideLegend(); + } + public void setGraphListView(AbstractD3GraphListView graphListView) { this.graphListView = graphListView; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java index 2075783..b4f1354 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java @@ -77,7 +77,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { prefs = measurementUserPreferences.getMetricRangePreferences(); Log.debug("ButtonBarDateTimeRangeEditor initialized with start Date: " + new Date(prefs.begin) + " end Date: " + new Date(prefs.end)); - createButtons(); + //createButtons(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java index ecd3b46..5ae392f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java @@ -73,6 +73,7 @@ public class MetricGraphData implements JsonMetricProducer { private MeasurementOOBComposite lastOOB; private Integer chartHeight; private boolean isPortalGraph; + private boolean hideLegend; private MetricGraphData(int portalId) { @@ -249,6 +250,14 @@ public class MetricGraphData implements JsonMetricProducer { return isPortalGraph; } + public boolean isHideLegend() { + return hideLegend; + } + + public void setHideLegend(boolean hideLegend) { + this.hideLegend = hideLegend; + } + public String getChartTitle() { if(definition != null){ @@ -380,8 +389,8 @@ public class MetricGraphData implements JsonMetricProducer { * @see StackedBarMetricGraphImpl */ public boolean showBarAvgTrendLine() { + int numberOfAggBars = 0; for (MeasurementDataNumericHighLowComposite measurement : metricData) { - int numberOfAggBars = 0; boolean noValuesInCurrentBarUndefined = (!Double.isNaN(measurement.getValue()) && !Double.isNaN(measurement.getHighValue()) && !Double.isNaN(measurement.getLowValue())); boolean foundAggregateBar = (measurement.getValue() != measurement.getHighValue() || measurement.getHighValue() != measurement.getLowValue()); // if there exists a even one aggregate bar then I can short circuit this and exit diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java deleted file mode 100644 index 34ca60b..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype; - -import java.util.Date; -import java.util.List; - -import org.rhq.core.domain.measurement.Availability; -import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; -import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.Messages; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AvailabilityGraphType; -import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; - -/** - * This is now old and for demonstration purposes only. - * Contains the javascript chart definition for an implementation of the d3 availability chart. This implementation is - * just a line that changes color based on availability type: up=green, down=red, orange=disabled, unknown=grey, - * empty=grey, warn=yellow. This version of the availability graph shows continuous intervals. - * @deprecated - * @see AvailabilityOverUnderGraphType - * - * @author Mike Thompson - */ -public class AvailabilityLineGraphType implements AvailabilityGraphType { - - private static Messages MSG = CoreGUI.getMessages(); - private List<Availability> availabilityList; - private List<ResourceGroupAvailability> groupAvailabilityList; - private Integer entityId; - - /** - * General constructor for stacked bar graph when you have all the data needed to produce the graph. (This is true - * for all cases but the dashboard portlet). - */ - public AvailabilityLineGraphType(Integer entityId) { - this.entityId = entityId; - } - - public void setAvailabilityList(List<Availability> availabilityList) { - this.availabilityList = availabilityList; - } - - public void setGroupAvailabilityList(List<ResourceGroupAvailability> groupAvailabilityList) { - this.groupAvailabilityList = groupAvailabilityList; - } - - public String getAvailabilityJson() { - StringBuilder sb = new StringBuilder("["); - if (null != availabilityList) { - // loop through the avail intervals - for (Availability availability : availabilityList) { - sb.append("{ \"availType\":\"" + availability.getAvailabilityType() + "\", "); - sb.append(" \"availTypeMessage\":\"" + availability.getAvailabilityType()+ "\", "); - sb.append(" \"availStart\":" + availability.getStartTime() + ", "); - // last record will be null - long endTime = availability.getEndTime() != null ? availability.getEndTime() : (new Date()).getTime(); - sb.append(" \"availEnd\":" + endTime + ", "); - - long availDuration = endTime - availability.getStartTime(); - String availDurationString = MeasurementConverterClient.format((double) availDuration, - MeasurementUnits.MILLISECONDS, true); - sb.append(" \"availDuration\": \"" + availDurationString + "\" },"); - - } - sb.setLength(sb.length() - 1); - - } else if (null != groupAvailabilityList) { - // loop through the group avail down intervals - for (ResourceGroupAvailability groupAvailability : groupAvailabilityList) { - // allows substitution for situations like WARN=MIXED for easier terminology - String availabilityTypeMessage = (groupAvailability.getGroupAvailabilityType().equals(ResourceGroupComposite.GroupAvailabilityType.WARN)) - ? MSG.chart_hover_availability_type_warn() : groupAvailability.getGroupAvailabilityType().name(); - - sb.append("{ \"availType\":\"" + groupAvailability.getGroupAvailabilityType() + "\", "); - sb.append(" \"availTypeMessage\":\"" + availabilityTypeMessage + "\", "); - sb.append(" \"availStart\":" + groupAvailability.getStartTime() + ", "); - // last record will be null - long endTime = groupAvailability.getEndTime() != null ? groupAvailability.getEndTime() : (new Date()) - .getTime(); - sb.append(" \"availEnd\":" + endTime + ", "); - - long availDuration = endTime - groupAvailability.getStartTime(); - String availDurationString = MeasurementConverterClient.format((double) availDuration, - MeasurementUnits.MILLISECONDS, true); - sb.append(" \"availDuration\": \"" + availDurationString + "\" },"); - - } - sb.setLength(sb.length() - 1); - } - - sb.append("]"); - Log.debug(sb.toString()); - return sb.toString(); - } - - /** - * The magic JSNI to draw the charts with d3. - */ - public native void drawJsniChart() /*-{ - console.log("Draw Availability chart"); - - var global = this, - // tidy up all of our interactions with java (via JSNI) thru AvailChartContext class - // NOTE: rhq.js has the javascript object constructors in it. - availChartContext = new $wnd.AvailChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartId()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getAvailabilityJson()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartDateLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartTimeLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverStartLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverEndLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverBarLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverAvailabilityLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverTimeFormat()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverDateFormat()() - ); - - - var availabilityGraph = function () { - "use strict"; - // privates - - var margin = {top: 5, right: 5, bottom: 5, left: 40}, - barOffset = 10, - width = 750 - margin.left - margin.right + barOffset, - height = 20 - margin.top - margin.bottom, - pixelsOffHeight = 0, - svg; - - - function drawBars(availChartContext) { - var xAxisMin = $wnd.d3.min(availChartContext.data, function (d) { - return +d.availStart; - }), - xAxisMax = $wnd.d3.max(availChartContext.data, function (d) { - return +d.availEnd; - }), - - timeScale = $wnd.d3.time.scale() - .range([0, width]) - .domain([xAxisMin, xAxisMax]), - - yScale = $wnd.d3.scale.linear() - .clamp(true) - .rangeRound([height, 0]) - .domain([0, 4]), - - svg = $wnd.d3.select(availChartContext.chartSelection).append("g") - .attr("width", width + margin.left + margin.right) - .attr("height", height + margin.top + margin.bottom) - .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); - - - // The gray bars at the bottom leading up - svg.selectAll("rect.availBars") - .data(availChartContext.data) - .enter().append("rect") - .attr("class", "availBars") - .attr("x", function (d) { - return timeScale(+d.availStart); - }) - .attr("y", function (d) { - return yScale(0); - }) - .attr("height", function (d) { - return height - yScale(4) - pixelsOffHeight; - }) - .attr("width", function (d) { - return timeScale(+d.availEnd) - timeScale(+d.availStart); - }) - - .attr("opacity", ".9") - .attr("fill", function (d) { - if (d.availType === 'DOWN') { - return "#FF1919"; // red - } - else if (d.availType === 'DISABLED') { - return "#FF9933"; // orange - } - else if (d.availType === 'UNKNOWN') { - return "#CCC"; // gray - } - else if (d.availType === 'UP') { - return "#198C19"; // green - } - else if (d.availType === 'WARN') { - return "#FFFF00"; // yellow - } - else if (d.availType === 'EMPTY') { - return "#CCC"; // gray - } - else { - // should not ever happen, but... - console.warn("AvailabilityType not valid."); - return "#000"; //black - } - }); - } - - function createHovers() { - $wnd.jQuery('svg rect.availBars').tipsy({ - gravity: 'n', - html: true, - trigger: 'hover', - title: function () { - var d = this.__data__; - return formatHovers(d); - }, - show: function (e, el) { - el.css({ 'z-index': '990000'}) - } - }); - } - - function formatHovers(d) { - var hoverString, - timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat), - dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat), - availStart = new Date(+d.availStart), - availEnd = new Date(+d.availEnd); - - hoverString = - '<div class="chartHoverEnclosingDiv">' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + d.availTypeMessage + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + d.availDuration + '</span></div>' + - '</div>'; - return hoverString; - - } - - return { - // Public API - draw: function (chartContext) { - "use strict"; - console.info("AvailabilityChart"); - //console.time("availabilityChart"); - - drawBars(availChartContext); - createHovers(); - //console.timeEnd("availabilityChart"); - } - }; // end public closure - - - }(); - - if (availChartContext.data !== undefined && availChartContext.data.length > 0) { - availabilityGraph.draw(availChartContext); - } - - }-*/; - - public String getChartId() { - return String.valueOf(entityId); - } - - public String getChartTimeLabel() { - return MSG.chart_time_label(); - } - - public String getChartDateLabel() { - return MSG.chart_date_label(); - } - - public String getChartHoverAvailabilityLabel() { - return MSG.chart_hover_availability_label(); - } - - public String getChartHoverStartLabel() { - return MSG.chart_hover_start_label(); - } - - public String getChartHoverEndLabel() { - return MSG.chart_hover_end_label(); - } - - public String getChartHoverBarLabel() { - return MSG.chart_hover_bar_label(); - } - - public String getChartHoverTimeFormat() { - return MSG.chart_hover_time_format(); - } - - public String getChartHoverDateFormat() { - return MSG.chart_hover_date_format(); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index 7c5f80a..811a579 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -311,13 +311,6 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { }); } - function timeFormat(formats) { - return function(date) { - var i = formats.length - 1, f = formats[i]; - while (!f[1](date)) f = formats[--i]; - return f[0](date); - } - } function formatHovers(d) { var timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat), @@ -345,11 +338,13 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { }(); - if (availChartContext.data !== undefined && availChartContext.data.length > 0) { + console.log("Avail Data records: "+availChartContext.data.length); + if (typeof availChartContext.data !== 'undefined' && availChartContext.data.length > 0) { availabilityGraph.draw(availChartContext); + console.log("Availability Chart Drawn"); } - }-*/; + }-*/; public String getChartId() { return String.valueOf(entityId); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/LineMetricGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/LineMetricGraph.java deleted file mode 100644 index 079b2ab..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/LineMetricGraph.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype; - -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; - -/** - * Contains the javascript chart definition for a d3 Line graph chart. - * NOTE: this class isn't used just provided as an example as how to create - * other graph types. - * - * @author Mike Thompson - */ -public final class LineMetricGraph extends AbstractMetricGraph { - - /** - * General constructor for stacked bar graph when you have all the data needed to - * produce the graph. (This is true for all cases but the dashboard portlet). - */ - public LineMetricGraph(MetricGraphData metricGraphData) { - setMetricGraphData(metricGraphData); - } - - /** - * The magic JSNI to draw the charts with d3. - */ - public native void drawJsniChart() /*-{ - console.log("Draw Metric Line jsni chart"); - var global = this, - chartId = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getChartId()(), - chartHandle = "#rChart-"+chartId, - chartSelection = chartHandle + " svg", - json = $wnd.jQuery.parseJSON(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getJsonMetrics()()), - yAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getChartTitle()(), - yAxisUnits = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getYAxisUnits()(), - xAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getXAxisTitle()(); - - console.log("chart id: "+chartSelection ); - console.log(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getJsonMetrics()()); - - - function draw(data){ - "use strict"; - - var margin = {top: 10, right: 5, bottom: 30, left: 70}, - width = 400 - margin.left - margin.right, - height = 150 - margin.top - margin.bottom; - - var timeScale = $wnd.d3.time.scale() - .range([0, width]) - .domain($wnd.d3.extent(data, function(d) { return d.x; })); - - var yScale = $wnd.d3.scale.linear() - .rangeRound([height, 0]) - .domain([$wnd.d3.min(data.map(function(x) {return x.low;})), $wnd.d3.max(data.map(function(x){return x.high;}))]); - - var xAxis = $wnd.d3.svg.axis() - .scale(timeScale) - .ticks(5) - .orient("bottom"); - - var yAxis = $wnd.d3.svg.axis() - .scale(yScale) - .ticks(5) - .orient("left"); - - var interpolation = "basis"; - - var line = $wnd.d3.svg.line() - .interpolate(interpolation) - .x(function(d) { return timeScale(d.x); }) - .y(function(d) { return yScale(+d.y); }); - - var highLine = $wnd.d3.svg.line() - .interpolate(interpolation) - .x(function(d) { return timeScale(d.x); }) - .y(function(d) { return yScale(+d.high); }); - - var lowLine = $wnd.d3.svg.line() - .interpolate(interpolation) - .x(function(d) { return timeScale(d.x); }) - .y(function(d) { return yScale(+d.low); }); - - var svg = $wnd.d3.select(chartSelection).append("g") - .attr("width", width + margin.left + margin.right) - .attr("height", height + margin.top + margin.bottom) - .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); - - svg.append("g") - .attr("class", "x axis") - .attr("transform", "translate(0," + height + ")") - .call(xAxis); - - - svg.append("g") - .attr("class", "y axis") - .call(yAxis) - .append("text") - .attr("transform", "rotate(-90)") - .attr("y", -60) - .attr("dy", ".71em") - .style("text-anchor", "end") - .text(yAxisUnits === "NONE" ? "" : yAxisUnits); - - console.log("finished axes"); - - svg.append("path") - .datum(data) - .attr("class", "line") - .attr("fill", "none") - .attr("stroke", "steelblue") - .attr("stroke-width", "2") - .attr("d", line); - - svg.append("path") - .datum(data) - .attr("class", "highLine") - .attr("fill", "none") - .attr("stroke", "red") - .attr("stroke-width", "1.5") - //.attr("stroke-dasharray", "20,10,5,5,5,10") - .attr("stroke-dasharray", "5,5") - .attr("stroke-opacity", ".3") - .attr("d", highLine); - - svg.append("path") - .datum(data) - .attr("class", "lowLine") - .attr("fill", "none") - .attr("stroke", "blue") - .attr("stroke-width", "1.5") - .attr("stroke-dasharray", "5,5") - .attr("stroke-opacity", ".3") - .attr("d", lowLine); - - console.log("finished paths"); - }(data); - - }-*/; - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java index 9058ea5..67552d3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java @@ -73,7 +73,8 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getButtonBarDateTimeFormat()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getChartSingleValueLabel()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getXAxisTimeFormatHours()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getXAxisTimeFormatHoursMinutes()() + global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getXAxisTimeFormatHoursMinutes()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::isHideLegend()() ); @@ -217,8 +218,8 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { .attr("transform", "translate(" + margin.left + "," + (+titleHeight + titleSpace + margin.top) + ")"); legendUnDefined = (typeof min === 'undefined') || (typeof avg === 'undefined') || (typeof peak === 'undefined'); - if (!useSmallCharts() && !legendUnDefined) { - createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits); + if (!(chartContext.hideLegend && !useSmallCharts())) { + createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits); } } @@ -693,7 +694,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { }; // end public closure }(); - if(typeof chartContext.data !== 'undefined' && chartContext.data.length > 0){ + if(typeof chartContext.data !== 'undefined' && chartContext.data !== null && chartContext.data.length > 0){ metricStackedBarGraph.draw(chartContext); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java index 59737ac..a9789c6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java @@ -21,7 +21,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.EnumSet; import java.util.List; import com.google.gwt.core.client.GWT; @@ -35,19 +34,17 @@ import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.measurement.DisplayType; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; -import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; @@ -55,7 +52,7 @@ import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; * Build the Group version of the View that shows the individual graph views. * @author Mike Thompson */ -public final class D3GroupGraphListView extends AbstractD3GraphListView implements AutoRefresh{ +public final class D3GroupGraphListView extends AbstractD3GraphListView implements AutoRefresh { private ResourceGroup resourceGroup; private VLayout graphsVLayout; @@ -75,7 +72,8 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen addMember(buttonBarDateTimeRangeEditor); if (showAvailabilityGraph) { - availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>(new AvailabilityOverUnderGraphType(resourceGroup.getId())); + availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( + new AvailabilityOverUnderGraphType(resourceGroup.getId())); addMember(availabilityGraph); } graphsVLayout = new VLayout(); @@ -89,7 +87,6 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen addMember(graphsVLayout); } - public void redrawGraphs() { this.onDraw(); } @@ -100,68 +97,60 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen private void buildGraphs() { queryAvailability(EntityContext.forGroup(resourceGroup), buttonBarDateTimeRangeEditor.getStartTime(), - buttonBarDateTimeRangeEditor.getEndTime(), null); + buttonBarDateTimeRangeEditor.getEndTime(), null); - ResourceTypeRepository.Cache.getInstance().getResourceTypes(resourceGroup.getResourceType().getId(), - EnumSet.of(ResourceTypeRepository.MetadataType.measurements), - new ResourceTypeRepository.TypeLoadedCallback() { - public void onTypesLoaded(final ResourceType type) { + final ArrayList<MeasurementDefinition> measurementDefinitions = new ArrayList<MeasurementDefinition>(); - final ArrayList<MeasurementDefinition> measurementDefinitions = new ArrayList<MeasurementDefinition>(); + for (MeasurementDefinition def : resourceGroup.getResourceType().getMetricDefinitions()) { + if (def.getDataType() == DataType.MEASUREMENT && def.getDisplayType() == DisplayType.SUMMARY) { + measurementDefinitions.add(def); + } + } - for (MeasurementDefinition def : type.getMetricDefinitions()) { - if (def.getDataType() == DataType.MEASUREMENT && def.getDisplayType() == DisplayType.SUMMARY) { - measurementDefinitions.add(def); - } - } + Collections.sort(measurementDefinitions, new Comparator<MeasurementDefinition>() { + public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { + return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); + } + }); - Collections.sort(measurementDefinitions, new Comparator<MeasurementDefinition>() { - public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { - return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); - } - }); + int[] measDefIdArray = new int[measurementDefinitions.size()]; + for (int i = 0; i < measDefIdArray.length; i++) { + measDefIdArray[i] = measurementDefinitions.get(i).getId(); + } - int[] measDefIdArray = new int[measurementDefinitions.size()]; - for (int i = 0; i < measDefIdArray.length; i++) { - measDefIdArray[i] = measurementDefinitions.get(i).getId(); - } + GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroup(resourceGroup.getId(), measDefIdArray, + buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), 60, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), caught); + loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); + } - GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroup(resourceGroup.getId(), - measDefIdArray, buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), 60, - new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), - caught); - loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); - } - - @Override - public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> result) { - if (result.isEmpty()) { - loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); - } else { - loadingLabel.hide(); - int i = 0; - for (List<MeasurementDataNumericHighLowComposite> data : result) { - buildIndividualGraph(measurementDefinitions.get(i++), data); - } - // There is a weird timing case when availabilityGraph can be null - if (availabilityGraph != null) { - availabilityGraph.setGroupAvailabilityList(groupAvailabilityList); - new Timer(){ - @Override - public void run() { - availabilityGraph.drawJsniChart(); - } - }.schedule(150); - } + @Override + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> result) { + if (result.isEmpty()) { + loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); + } else { + loadingLabel.hide(); + int i = 0; + for (List<MeasurementDataNumericHighLowComposite> data : result) { + buildIndividualGraph(measurementDefinitions.get(i++), data); + } + // There is a weird timing case when availabilityGraph can be null + if (availabilityGraph != null) { + availabilityGraph.setGroupAvailabilityList(groupAvailabilityList); + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); } - } - }); - + }.schedule(150); + } + } } }); + } protected void queryAvailability(final EntityContext groupContext, Long startTime, Long endTime, @@ -197,7 +186,7 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen List<MeasurementDataNumericHighLowComposite> data) { MetricGraphData metricGraphData = MetricGraphData.createForResourceGroup(resourceGroup.getId(), - resourceGroup.getName(), measurementDefinition, data ); + resourceGroup.getName(), measurementDefinition, data); StackedBarMetricGraphImpl graph = GWT.create(StackedBarMetricGraphImpl.class); graph.setMetricGraphData(metricGraphData); @@ -207,11 +196,9 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen graphView.setWidth("95%"); graphView.setHeight(MULTI_CHART_HEIGHT); - if(graphsVLayout != null){ + if (graphsVLayout != null) { graphsVLayout.addMember(graphView); } } - - } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java new file mode 100644 index 0000000..101df60 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java @@ -0,0 +1,79 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table; + + +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; + +/** + * A MultiLine version of the Composite group single metric multiple resource charts. + * + * @author Mike Thompson + */ +public final class CompositeGroupMultiLineGraphListView extends CompositeGroupD3GraphListView +{ + private static final Messages MSG = CoreGUI.getMessages(); + + public CompositeGroupMultiLineGraphListView(int groupId, int defId, boolean isAutogroup) + { + super(groupId, defId, isAutogroup); + } + + + + @Override + public native void drawJsniChart() /*-{ + console.log("Draw nvd3 charts for composite multiline graph"); + var chartId = global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), + chartHandle = "#mChart-"+chartId, + chartSelection = chartHandle + " svg", + yAxisUnits = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getYAxisUnits()(), + xAxisLabel = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTitle()(), + xAxisTimeFormat = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupMultiLineGraphListView::getXAxisTimeFormatHoursMinutes()(); + json = eval(this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getJsonMetrics()()); + + $wnd.nv.addGraph(function() { + var chart = $wnd.nv.models.lineChart(); + + chart.xAxis.axisLabel(xAxisLabel) + .tickFormat(function(d) { return $wnd.d3.time.format(xAxisTimeFormat)(new Date(d)) }); + + chart.yAxis + .axisLabel(yAxisUnits) + .tickFormat($wnd.d3.format('.02f')); + + $wnd.d3.select(chartSelection) + .datum(json) + .transition().duration(300) + .call(chart); + + $wnd.nv.utils.windowResize(chart.update); + + return chart; + }); + + }-*/; + + + + public String getXAxisTimeFormatHoursMinutes() { + return MSG.chart_xaxis_time_format_hours_minutes(); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java new file mode 100644 index 0000000..8ca1ac5 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java @@ -0,0 +1,258 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail; + +import java.util.HashMap; +import java.util.Map; +import java.util.TreeSet; + +import com.google.gwt.http.client.Request; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.RequestCallback; +import com.google.gwt.http.client.RequestException; +import com.google.gwt.http.client.Response; +import com.google.gwt.user.client.History; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.menu.Menu; +import com.smartgwt.client.widgets.menu.MenuItem; +import com.smartgwt.client.widgets.menu.events.ClickHandler; +import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.criteria.DashboardCriteria; +import org.rhq.core.domain.criteria.SubjectCriteria; +import org.rhq.core.domain.dashboard.Dashboard; +import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.measurement.MeasurementSchedule; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resource.graph.ResourceD3GraphPortlet; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; +import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; + +/** + * Utility Class to build menus for linking to the Dashboard. + * @author Jay Shaughnessy + * @author Greg Hinkle + * @author Mike Thompson + */ +public class DashboardLinkUtility { + final static Messages MSG = CoreGUI.getMessages(); + + private DashboardLinkUtility() { + } + + public static MenuItem buildMetricsMenu(final ResourceType resourceType, final Resource resource, String label) { + + MenuItem measurements = new MenuItem(label); + final Menu measurementsSubMenu = new Menu(); + + DashboardCriteria criteria = new DashboardCriteria(); + GWTServiceLookup.getDashboardService().findDashboardsByCriteria(criteria, + new AsyncCallback<PageList<Dashboard>>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_dashboard(), + caught); + } + + public void onSuccess(PageList<Dashboard> result) { + //sort the display items alphabetically + TreeSet<String> ordered = new TreeSet<String>(); + Map<String, MeasurementDefinition> definitionMap = new HashMap<String, MeasurementDefinition>(); + for (MeasurementDefinition m : resourceType.getMetricDefinitions()) { + ordered.add(m.getDisplayName()); + definitionMap.put(m.getDisplayName(), m); + } + + for (String displayName : ordered) { + final MeasurementDefinition def = definitionMap.get(displayName); + //only add menu items for Measurement + if (def.getDataType().equals(DataType.MEASUREMENT)) { + MenuItem defItem = new MenuItem(def.getDisplayName()); + measurementsSubMenu.addItem(defItem); + Menu defSubItem = new Menu(); + defItem.setSubmenu(defSubItem); + + for (final Dashboard d : result) { + MenuItem addToDBItem = new MenuItem(MSG + .view_tree_common_contextMenu_addChartToDashboard(d.getName())); + defSubItem.addItem(addToDBItem); + + addToDBItem.addClickHandler(new ClickHandler() { + + public void onClick(MenuItemClickEvent menuItemClickEvent) { + DashboardPortlet p = new DashboardPortlet(MSG + .view_tree_common_contextMenu_resourceGraph(), ResourceD3GraphPortlet.KEY, + 250); + p.getConfiguration() + .put( + new PropertySimple(ResourceD3GraphPortlet.CFG_RESOURCE_ID, resource + .getId())); + p.getConfiguration().put( + new PropertySimple(ResourceD3GraphPortlet.CFG_DEFINITION_ID, def.getId())); + + d.addPortlet(p); + + GWTServiceLookup.getDashboardService().storeDashboard(d, + new AsyncCallback<Dashboard>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), + caught); + } + + public void onSuccess(Dashboard result) { + CoreGUI + .getMessageCenter() + .notify( + new Message( + MSG.view_tree_common_contextMenu_saveChartToDashboardSuccessful(result + .getName()), Message.Severity.Info)); + } + }); + + } + + }); + + } + + //add new menu item for adding current graphable element to view if on Monitor/Graphs tab + String currentViewPath = History.getToken(); + if (currentViewPath.contains("Monitoring/Metrics")) { + MenuItem addGraphItem = new MenuItem(MSG.common_title_add_graph_to_view()); + defSubItem.addItem(addGraphItem); + + addGraphItem.addClickHandler(new ClickHandler() { + public void onClick(MenuItemClickEvent menuItemClickEvent) { + //generate javascript to call out to. + //Ex. menuLayers.hide();addMetric('${metric.resourceId},${metric.scheduleId}') + if (getScheduleDefinitionId(resource, def.getName()) > -1) { + final String resourceGraphElements = resource.getId() + "," + + getScheduleDefinitionId(resource, def.getName()); + + //Once, the portal-war will be rewritten to GWT and operations performed + //within the iframe + JSF will update the user preferences, the following + //2 lines could be uncommented and the lines below them refactorized + //MeasurementUserPreferences measurementPreferences = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); + //String selectedView = measurementPreferences.getSelectedView(String.valueOf(resource.getId())); + + final int sid = UserSessionManager.getSessionSubject().getId(); + SubjectCriteria c = new SubjectCriteria(); + c.addFilterId(sid); + + GWTServiceLookup.getSubjectService().findSubjectsByCriteria(c, + new AsyncCallback<PageList<Subject>>() { + public void onSuccess(PageList<Subject> result) { + if (result.size() > 0) { + UserPreferences uPreferences = new UserPreferences(result + .get(0)); + MeasurementUserPreferences mPreferences = new MeasurementUserPreferences( + uPreferences); + String selectedView = mPreferences.getSelectedView(String + .valueOf(resource.getId())); + + addNewMetric(String.valueOf(resource.getId()), + selectedView, resourceGraphElements); + } else { + Log.warn("DashboardLinkUtility: Error obtaining subject with id:" + sid); + } + } + + public void onFailure(Throwable caught) { + Log.warn("DashboardLinkUtility: Error obtaining subject with id:" + sid, caught); + } + }); + } + } + }); + } + } + } + + } + }); + measurements.setSubmenu(measurementsSubMenu); + return measurements; + } + + /** Locate the specific schedule definition using the definition identifier. + */ + private static int getScheduleDefinitionId(Resource resource, String definitionName) { + int id = -1; + if (resource.getSchedules() != null) { + boolean located = false; + MeasurementSchedule[] schedules = new MeasurementSchedule[resource.getSchedules().size()]; + resource.getSchedules().toArray(schedules); + for (int i = 0; (!located && i < resource.getSchedules().size()); i++) { + MeasurementSchedule schedule = schedules[i]; + MeasurementDefinition definition = schedule.getDefinition(); + if ((definition != null) && definition.getName().equals(definitionName)) { + located = true; + id = schedule.getId(); + } + } + } + return id; + } + + private static void addNewMetric(String id, String selectedView, String resourceGraphElements) { + //construct portal.war url to access + String baseUrl = "/resource/common/monitor/visibility/IndicatorCharts.do"; + baseUrl += "?id=" + id; + baseUrl += "&view=" + selectedView; + baseUrl += "&action=addChart&metric=" + resourceGraphElements; + final String url = baseUrl; + //initiate HTTP request + final RequestBuilder b = new RequestBuilder(RequestBuilder.GET, baseUrl); + + try { + b.setCallback(new RequestCallback() { + public void onResponseReceived(final Request request, final Response response) { + Log.trace("Successfully submitted request to add graph to view:" + url); + + //kick off a page reload. + String currentViewPath = History.getToken(); + CoreGUI.goToView(currentViewPath, true); + } + + @Override + public void onError(Request request, Throwable t) { + Log.trace("Error adding Metric:" + url, t); + } + }); + b.send(); + } catch (RequestException e) { + Log.warn("Error adding Metric:" + url, e); + } + + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index 2d33d66..ae51195 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -66,9 +66,8 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.ResourceAgentView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.CalltimeView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.ResourceAvailabilityView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.schedules.ResourceSchedulesView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table.MeasurementTableView; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table.MetricsResourceView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.traits.TraitsView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history.ResourceOperationHistoryListView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.schedule.ResourceOperationScheduleListView; @@ -129,10 +128,8 @@ public class ResourceDetailView extends private SubTab summaryActivity; private SubTab summaryTimeline; - private SubTab monitorGraphs; private SubTab monitorMetrics; private SubTab monitorTraits; - private SubTab monitorAvail; private SubTab monitorSched; private SubTab monitorCallTime; private SubTab inventoryChildren; @@ -196,16 +193,11 @@ public class ResourceDetailView extends monitoringTab = new TwoLevelTab(new ViewName("Monitoring", MSG.view_tabs_common_monitoring()), IconEnum.SUSPECT_METRICS); - monitorGraphs = new SubTab(monitoringTab, new ViewName("Graphs", MSG.view_tabs_common_graphs()), null); - - monitorMetrics = new SubTab(monitoringTab, new ViewName("Metrics", "Metrics"), null); + monitorMetrics = new SubTab(monitoringTab, new ViewName("Metrics", MSG.view_tabs_common_metrics()), null); monitorTraits = new SubTab(monitoringTab, new ViewName("Traits", MSG.view_tabs_common_traits()), null); - monitorAvail = new SubTab(monitoringTab, new ViewName("Availability", MSG.view_tabs_common_availability()), - null); monitorSched = new SubTab(monitoringTab, new ViewName("Schedules", MSG.view_tabs_common_schedules()), null); monitorCallTime = new SubTab(monitoringTab, new ViewName("CallTime", MSG.view_tabs_common_calltime()), null); - monitoringTab.registerSubTabs(monitorGraphs, monitorMetrics, monitorTraits, monitorAvail, - monitorSched, monitorCallTime); + monitoringTab.registerSubTabs( monitorMetrics, monitorTraits, monitorSched, monitorCallTime); tabs.add(monitoringTab); eventsTab = new TwoLevelTab(new ViewName("Events", MSG.view_tabs_common_events()), IconEnum.EVENTS); @@ -395,22 +387,14 @@ public class ResourceDetailView extends boolean visibleToIE8 = !BrowserUtility.isBrowserPreIE9(); - viewFactory = (!visibleToIE8) ? null : new ViewFactory() { - @Override - public Canvas createView() { - return createD3GraphListView(); - } - }; - updateSubTab(this.monitoringTab, this.monitorGraphs, visible, visibleToIE8, viewFactory); - // visible = same test as above viewFactory = (!visible) ? null : new ViewFactory() { @Override public Canvas createView() { - return new MeasurementTableView(resource.getId()); + return new MetricsResourceView(resource); } }; - updateSubTab(this.monitoringTab, this.monitorMetrics, visible, true, viewFactory); + updateSubTab(this.monitoringTab, this.monitorMetrics, visible, visibleToIE8, viewFactory); visible = hasMetricsOfType(this.resourceComposite, DataType.TRAIT); viewFactory = (!visible) ? null : new ViewFactory() { @@ -421,13 +405,6 @@ public class ResourceDetailView extends }; updateSubTab(this.monitoringTab, this.monitorTraits, visible, true, viewFactory); - updateSubTab(this.monitoringTab, this.monitorAvail, true, true, new ViewFactory() { - @Override - public Canvas createView() { - return new ResourceAvailabilityView(resourceComposite); - } - }); - updateSubTab(this.monitoringTab, this.monitorSched, hasMetricsOfType(this.resourceComposite, null), true, new ViewFactory() { @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java index 071f831..a3990bb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java @@ -32,11 +32,6 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import com.google.gwt.http.client.Request; -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.RequestCallback; -import com.google.gwt.http.client.RequestException; -import com.google.gwt.http.client.Response; import com.google.gwt.user.client.History; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.DSCallback; @@ -60,17 +55,8 @@ import com.smartgwt.client.widgets.tree.events.DataArrivedHandler; import com.smartgwt.client.widgets.tree.events.NodeContextClickEvent; import com.smartgwt.client.widgets.tree.events.NodeContextClickHandler; -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.criteria.DashboardCriteria; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; -import org.rhq.core.domain.criteria.SubjectCriteria; -import org.rhq.core.domain.dashboard.Dashboard; -import org.rhq.core.domain.dashboard.DashboardPortlet; -import org.rhq.core.domain.measurement.DataType; -import org.rhq.core.domain.measurement.MeasurementDefinition; -import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.operation.OperationDefinition; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; @@ -82,11 +68,9 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.ViewId; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resource.graph.ResourceD3GraphPortlet; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync; @@ -101,8 +85,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; -import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; /** * @author Jay Shaughnessy @@ -562,7 +544,7 @@ public class ResourceTreeView extends EnhancedVLayout { resourceContextMenu.addItem(operations); // Metric graph addition menu - resourceContextMenu.addItem(buildMetricsMenu(resourceType, resource)); + resourceContextMenu.addItem(DashboardLinkUtility.buildMetricsMenu(resourceType, resource, MSG.view_tree_common_contextMenu_measurements())); // Create Child Menu and Manual Import Menu final Set<ResourceType> creatableChildTypes = getCreatableChildTypes(resourceType); @@ -725,190 +707,6 @@ public class ResourceTreeView extends EnhancedVLayout { tree.reloadChildren(refreshNode); } - private MenuItem buildMetricsMenu(final ResourceType type, final Resource resource) { - MenuItem measurements = new MenuItem(MSG.view_tree_common_contextMenu_measurements()); - final Menu measurementsSubMenu = new Menu(); - - DashboardCriteria criteria = new DashboardCriteria(); - GWTServiceLookup.getDashboardService().findDashboardsByCriteria(criteria, - new AsyncCallback<PageList<Dashboard>>() { - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_dashboard(), - caught); - } - - public void onSuccess(PageList<Dashboard> result) { - //sort the display items alphabetically - TreeSet<String> ordered = new TreeSet<String>(); - Map<String, MeasurementDefinition> definitionMap = new HashMap<String, MeasurementDefinition>(); - for (MeasurementDefinition m : type.getMetricDefinitions()) { - ordered.add(m.getDisplayName()); - definitionMap.put(m.getDisplayName(), m); - } - - for (String displayName : ordered) { - final MeasurementDefinition def = definitionMap.get(displayName); - //only add menu items for Measurement - if (def.getDataType().equals(DataType.MEASUREMENT)) { - MenuItem defItem = new MenuItem(def.getDisplayName()); - measurementsSubMenu.addItem(defItem); - Menu defSubItem = new Menu(); - defItem.setSubmenu(defSubItem); - - for (final Dashboard d : result) { - MenuItem addToDBItem = new MenuItem(MSG - .view_tree_common_contextMenu_addChartToDashboard(d.getName())); - defSubItem.addItem(addToDBItem); - - addToDBItem.addClickHandler(new ClickHandler() { - - public void onClick(MenuItemClickEvent menuItemClickEvent) { - DashboardPortlet p = new DashboardPortlet(MSG - .view_tree_common_contextMenu_resourceGraph(), ResourceD3GraphPortlet.KEY, - 250); - p.getConfiguration().put( - new PropertySimple(ResourceD3GraphPortlet.CFG_RESOURCE_ID, resource.getId())); - p.getConfiguration().put( - new PropertySimple(ResourceD3GraphPortlet.CFG_DEFINITION_ID, def.getId())); - - d.addPortlet(p); - - GWTServiceLookup.getDashboardService().storeDashboard(d, - new AsyncCallback<Dashboard>() { - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), - caught); - } - - public void onSuccess(Dashboard result) { - CoreGUI - .getMessageCenter() - .notify( - new Message( - MSG.view_tree_common_contextMenu_saveChartToDashboardSuccessful(result - .getName()), Message.Severity.Info)); - } - }); - - } - - }); - - - }//end dashboard iteration - - //add new menu item for adding current graphable element to view if on Monitor/Graphs tab - String currentViewPath = History.getToken(); - if (currentViewPath.contains("Monitoring/NewGraphs")) { - MenuItem addGraphItem = new MenuItem(MSG.common_title_add_graph_to_view()); - defSubItem.addItem(addGraphItem); - - addGraphItem.addClickHandler(new ClickHandler() { - public void onClick(MenuItemClickEvent menuItemClickEvent) { - //generate javascript to call out to. - //Ex. menuLayers.hide();addMetric('${metric.resourceId},${metric.scheduleId}') - if (getScheduleDefinitionId(resource, def.getName()) > -1) { - final String resourceGraphElements = resource.getId() + "," - + getScheduleDefinitionId(resource, def.getName()); - - //Once, the portal-war will be rewritten to GWT and operations performed - //within the iframe + JSF will update the user preferences, the following - //2 lines could be uncommented and the lines below them refactorized - //MeasurementUserPreferences measurementPreferences = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); - //String selectedView = measurementPreferences.getSelectedView(String.valueOf(resource.getId())); - - final int sid = UserSessionManager.getSessionSubject().getId(); - SubjectCriteria c = new SubjectCriteria(); - c.addFilterId(sid); - - GWTServiceLookup.getSubjectService().findSubjectsByCriteria(c, - new AsyncCallback<PageList<Subject>>() { - public void onSuccess(PageList<Subject> result) { - if (result.size() > 0) { - UserPreferences uPreferences = new UserPreferences(result - .get(0)); - MeasurementUserPreferences mPreferences = new MeasurementUserPreferences( - uPreferences); - String selectedView = mPreferences.getSelectedView(String - .valueOf(resource.getId())); - - addNewMetric(String.valueOf(resource.getId()), - selectedView, resourceGraphElements); - } else { - Log.trace("Error obtaining subject with id:" + sid); - } - } - - public void onFailure(Throwable caught) { - Log.trace("Error obtaining subject with id:" + sid, caught); - } - }); - } - } - }); - } // end add the "add to view" menu item - }//end trait exclusion - }//end measurement def iteration - - } - }); - measurements.setSubmenu(measurementsSubMenu); - return measurements; - } - - private void addNewMetric(String id, String selectedView, String resourceGraphElements) { - //construct portal.war url to access - String baseUrl = "/resource/common/monitor/visibility/IndicatorCharts.do"; - baseUrl += "?id=" + id; - baseUrl += "&view=" + selectedView; - baseUrl += "&action=addChart&metric=" + resourceGraphElements; - final String url = baseUrl; - //initiate HTTP request - final RequestBuilder b = new RequestBuilder(RequestBuilder.GET, baseUrl); - - try { - b.setCallback(new RequestCallback() { - public void onResponseReceived(final Request request, final Response response) { - Log.trace("Successfully submitted request to add graph to view:" + url); - - //kick off a page reload. - String currentViewPath = History.getToken(); - CoreGUI.goToView(currentViewPath, true); - } - - @Override - public void onError(Request request, Throwable t) { - Log.trace("Error adding Metric:" + url, t); - } - }); - b.send(); - } catch (RequestException e) { - Log.trace("Error adding Metric:" + url, e); - } - } - - /** Locate the specific schedule definition using the definition identifier. - */ - private int getScheduleDefinitionId(Resource resource, String definitionName) { - int id = -1; - if (resource.getSchedules() != null) { - boolean located = false; - MeasurementSchedule[] schedules = new MeasurementSchedule[resource.getSchedules().size()]; - resource.getSchedules().toArray(schedules); - for (int i = 0; (!located && i < resource.getSchedules().size()); i++) { - MeasurementSchedule schedule = schedules[i]; - MeasurementDefinition definition = schedule.getDefinition(); - if ((definition != null) && definition.getName().equals(definitionName)) { - located = true; - id = schedule.getId(); - } - } - } - return id; - } private void setRootResource(Resource rootResource) { this.rootResource = rootResource; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java index 65893ce..8b9f327 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -21,7 +21,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitori import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.EnumSet; import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -30,7 +29,6 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Overflow; -import com.smartgwt.client.widgets.form.fields.events.ClickHandler; import com.smartgwt.client.widgets.layout.VLayout; import org.rhq.core.domain.common.EntityContext; @@ -41,16 +39,14 @@ import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite; import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.async.Command; import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; @@ -115,17 +111,17 @@ public class D3GraphListView extends AbstractD3GraphListView { setOverflow(Overflow.HIDDEN); } - @Override protected void onDraw() { super.onDraw(); - Log.debug("D3GraphListView.onDraw() for: " + resource.getName()+ " id: "+ resource.getId()); + Log.debug("D3GraphListView.onDraw() for: " + resource.getName() + " id: " + resource.getId()); destroyMembers(); addMember(buttonBarDateTimeRangeEditor); if (showAvailabilityGraph) { - availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>(new AvailabilityOverUnderGraphType(resource.getId())); + availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( + new AvailabilityOverUnderGraphType(resource.getId())); addMember(availabilityGraph); } @@ -163,8 +159,8 @@ public class D3GraphListView extends AbstractD3GraphListView { @Override public void onSuccess(List<Availability> availList) { - Log.debug("\nSuccessfully queried availability in: " - + (System.currentTimeMillis() - timerStart) + " ms."); + Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + + " ms."); availabilityList = availList; if (countDownLatch != null) { countDownLatch.countDown(); @@ -180,193 +176,179 @@ public class D3GraphListView extends AbstractD3GraphListView { private void queryAndBuildGraphs() { final long startTimer = System.currentTimeMillis(); - if(null != availabilityGraph){ + if (null != availabilityGraph) { queryAvailability(EntityContext.forResource(resource.getId()), buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), null); } - ResourceTypeRepository.Cache.getInstance().getResourceTypes(resource.getResourceType().getId(), - EnumSet.of(ResourceTypeRepository.MetadataType.measurements), - new ResourceTypeRepository.TypeLoadedCallback() { - public void onTypesLoaded(final ResourceType type) { + final ArrayList<MeasurementDefinition> measurementDefinitions = new ArrayList<MeasurementDefinition>(); + final ArrayList<MeasurementDefinition> summaryMeasurementDefinitions = new ArrayList<MeasurementDefinition>(); - final ArrayList<MeasurementDefinition> measurementDefinitions = new ArrayList<MeasurementDefinition>(); - final ArrayList<MeasurementDefinition> summaryMeasurementDefinitions = new ArrayList<MeasurementDefinition>(); + for (MeasurementDefinition def : resource.getResourceType().getMetricDefinitions()) { + if (def.getDataType() == DataType.MEASUREMENT && def.getDisplayType() == DisplayType.SUMMARY) { + summaryMeasurementDefinitions.add(def); + } + measurementDefinitions.add(def); + } - for (MeasurementDefinition def : type.getMetricDefinitions()) { - if (def.getDataType() == DataType.MEASUREMENT && def.getDisplayType() == DisplayType.SUMMARY) { - summaryMeasurementDefinitions.add(def); - } - measurementDefinitions.add(def); - } + Collections.sort(measurementDefinitions, new Comparator<MeasurementDefinition>() { + @Override + public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { + return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); + } + }); + Collections.sort(summaryMeasurementDefinitions, new Comparator<MeasurementDefinition>() { + @Override + public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { + return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); + } + }); + + int[] measDefIdArray = new int[measurementDefinitions.size()]; + for (int i = 0; i < measDefIdArray.length; i++) { + measDefIdArray[i] = measurementDefinitions.get(i).getId(); + } - Collections.sort(measurementDefinitions, new Comparator<MeasurementDefinition>() { - @Override - public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { - return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); - } - }); - Collections.sort(summaryMeasurementDefinitions, new Comparator<MeasurementDefinition>() { - @Override - public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { - return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); - } - }); - - int[] measDefIdArray = new int[measurementDefinitions.size()]; - for (int i = 0; i < measDefIdArray.length; i++) { - measDefIdArray[i] = measurementDefinitions.get(i).getId(); + // setting up a deferred Command to execute after all resource queries have completed (successfully or unsuccessfully) + // we know there are exactly 2 resources + final CountDownLatch countDownLatch = CountDownLatch.create(NUM_ASYNC_CALLS, new Command() { + @Override + /** + * Satisfied only after ALL of the metric queries AND availability have completed + */ + public void execute() { + Log.debug("Total Time for async metrics/avail query: " + (System.currentTimeMillis() - startTimer)); + if (null == metricsDataList || metricsDataList.isEmpty()) { + loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); + } else { + loadingLabel.hide(); + if (useSummaryData) { + buildSummaryGraphs(metricsDataList, summaryMeasurementDefinitions, measurementDefinitions); + } else { + determineGraphsToBuild(metricsDataList, measurementDefinitions, definitionIds); } - - // setting up a deferred Command to execute after all resource queries have completed (successfully or unsuccessfully) - // we know there are exactly 2 resources - final CountDownLatch countDownLatch = CountDownLatch.create(NUM_ASYNC_CALLS, new Command() { - @Override - /** - * Satisfied only after ALL of the metric queries AND availability have completed - */ - public void execute() { - Log.debug("Total Time for async metrics/avail query: " - + (System.currentTimeMillis() - startTimer)); - if (null == metricsDataList || metricsDataList.isEmpty()) { - loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); - } else { - loadingLabel.hide(); - if (useSummaryData) { - buildSummaryGraphs(metricsDataList, summaryMeasurementDefinitions, - measurementDefinitions); - } else { - determineGraphsToBuild(metricsDataList, measurementDefinitions, definitionIds); - } - // There is a weird timing case when availabilityGraph can be null - if (null != availabilityGraph) { - // we only need the first metricData since we are only taking the - // availability data set in there for the dropdowns already - availabilityGraph.setAvailabilityList(availabilityList); - new Timer(){ - @Override - public void run() { - availabilityGraph.drawJsniChart(); - } - }.schedule(150); - } + // There is a weird timing case when availabilityGraph can be null + if (null != availabilityGraph) { + // we only need the first metricData since we are only taking the + // availability data set in there for the dropdowns already + availabilityGraph.setAvailabilityList(availabilityList); + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); } + }.schedule(150); + } + } - } - }); + } + }); - queryMetricData(measDefIdArray, countDownLatch); - queryOOBMetrics(resource, countDownLatch); - // now the countDown latch will run sometime asynchronously + queryMetricData(measDefIdArray, countDownLatch); + queryOOBMetrics(resource, countDownLatch); + // now the countDown latch will run sometime asynchronously + } + private void queryMetricData(final int[] measDefIdArray, final CountDownLatch countDownLatch) { + GWTServiceLookup.getMeasurementDataService().findDataForResource(resource.getId(), measDefIdArray, + buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), 60, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), caught); + loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); + countDownLatch.countDown(); } - private void queryMetricData(final int[] measDefIdArray, final CountDownLatch countDownLatch) { - GWTServiceLookup.getMeasurementDataService().findDataForResource(resource.getId(), measDefIdArray, - buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), 60, - new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), - caught); - loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); - countDownLatch.countDown(); - } - - @Override - public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> metrics) { - metricsDataList = metrics; - Log.debug("Regular Metric graph data queried in: " - + (System.currentTimeMillis() - startTimer + " ms.")); - countDownLatch.countDown(); + @Override + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> metrics) { + metricsDataList = metrics; + countDownLatch.countDown(); - } - }); } + }); + } - private void queryOOBMetrics(final Resource resource, final CountDownLatch countDownLatch) { + private void queryOOBMetrics(final Resource resource, final CountDownLatch countDownLatch) { - final long startTime = System.currentTimeMillis(); + final long startTime = System.currentTimeMillis(); - GWTServiceLookup.getMeasurementDataService().getHighestNOOBsForResource(resource.getId(), 60, + GWTServiceLookup.getMeasurementDataService().getHighestNOOBsForResource(resource.getId(), 60, - new AsyncCallback<PageList<MeasurementOOBComposite>>() { - @Override - public void onSuccess(PageList<MeasurementOOBComposite> measurementOOBComposites) { + new AsyncCallback<PageList<MeasurementOOBComposite>>() { + @Override + public void onSuccess(PageList<MeasurementOOBComposite> measurementOOBComposites) { - measurementOOBCompositeList = measurementOOBComposites; - Log.debug("\nSuccessfully queried "+measurementOOBCompositeList.size() +" OOB records in: " + (System.currentTimeMillis() - startTime) - + " ms."); - countDownLatch.countDown(); - } + measurementOOBCompositeList = measurementOOBComposites; + Log.debug("\nSuccessfully queried " + measurementOOBCompositeList.size() + " OOB records in: " + + (System.currentTimeMillis() - startTime) + " ms."); + countDownLatch.countDown(); + } - @Override - public void onFailure(Throwable caught) { - Log.debug("Error retrieving out of bound metrics for resource [" + resource.getId() + "]:" - + caught.getMessage()); - countDownLatch.countDown(); - } - }); + @Override + public void onFailure(Throwable caught) { + Log.debug("Error retrieving out of bound metrics for resource [" + resource.getId() + "]:" + + caught.getMessage()); + countDownLatch.countDown(); + } + }); - } + } - /** - * Spin through the measurement definitions (in order) checking to see if they are in the - * summary measurement definition set and if so build a graph. - * @param measurementData - * @param summaryMeasurementDefinitions - * @param measurementDefinitions - */ - private void buildSummaryGraphs(List<List<MeasurementDataNumericHighLowComposite>> measurementData, - List<MeasurementDefinition> summaryMeasurementDefinitions, - List<MeasurementDefinition> measurementDefinitions) { - Set<Integer> summaryIds = new TreeSet<Integer>(); - for (MeasurementDefinition summaryMeasurementDefinition : summaryMeasurementDefinitions) { - summaryIds.add(summaryMeasurementDefinition.getId()); - } + /** + * Spin through the measurement definitions (in order) checking to see if they are in the + * summary measurement definition set and if so build a graph. + * @param measurementData + * @param summaryMeasurementDefinitions + * @param measurementDefinitions + */ + private void buildSummaryGraphs(List<List<MeasurementDataNumericHighLowComposite>> measurementData, + List<MeasurementDefinition> summaryMeasurementDefinitions, List<MeasurementDefinition> measurementDefinitions) { + Set<Integer> summaryIds = new TreeSet<Integer>(); + for (MeasurementDefinition summaryMeasurementDefinition : summaryMeasurementDefinitions) { + summaryIds.add(summaryMeasurementDefinition.getId()); + } - int i = 0; - for (MeasurementDefinition measurementDefinition : measurementDefinitions) { - if (summaryIds.contains(measurementDefinition.getId())) { - buildSingleGraph(measurementOOBCompositeList, measurementDefinition, - measurementData.get(i), MULTI_CHART_HEIGHT); - } - i++; - } + int i = 0; + for (MeasurementDefinition measurementDefinition : measurementDefinitions) { + if (summaryIds.contains(measurementDefinition.getId())) { + buildSingleGraph(measurementOOBCompositeList, measurementDefinition, measurementData.get(i), + MULTI_CHART_HEIGHT); + } + i++; + } - } + } - private void determineGraphsToBuild(List<List<MeasurementDataNumericHighLowComposite>> measurementData, - List<MeasurementDefinition> measurementDefinitions, Set<Integer> definitionIds) { - int i = 0; - for (List<MeasurementDataNumericHighLowComposite> metric : measurementData) { - - for (Integer selectedDefinitionId : definitionIds) { - final MeasurementDefinition measurementDefinition = measurementDefinitions.get(i); - final int measurementId = measurementDefinition.getId(); - - if (null != selectedDefinitionId) { - // single graph case - if (measurementId == selectedDefinitionId) { - buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, SINGLE_CHART_HEIGHT); - } - } else { - // multiple graph case - buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, MULTI_CHART_HEIGHT); - } - } - i++; + private void determineGraphsToBuild(List<List<MeasurementDataNumericHighLowComposite>> measurementData, + List<MeasurementDefinition> measurementDefinitions, Set<Integer> definitionIds) { + int i = 0; + for (List<MeasurementDataNumericHighLowComposite> metric : measurementData) { + + for (Integer selectedDefinitionId : definitionIds) { + final MeasurementDefinition measurementDefinition = measurementDefinitions.get(i); + final int measurementId = measurementDefinition.getId(); + + if (null != selectedDefinitionId) { + // single graph case + if (measurementId == selectedDefinitionId) { + buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, + SINGLE_CHART_HEIGHT); } + } else { + // multiple graph case + buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, MULTI_CHART_HEIGHT); } - }); - + } + i++; + } } private void buildSingleGraph(PageList<MeasurementOOBComposite> measurementOOBCompositeList, MeasurementDefinition measurementDefinition, List<MeasurementDataNumericHighLowComposite> data, int height) { MetricGraphData metricGraphData = MetricGraphData.createForResource(resource.getId(), resource.getName(), - measurementDefinition, data, measurementOOBCompositeList ); + measurementDefinition, data, measurementOOBCompositeList); StackedBarMetricGraphImpl graph = GWT.create(StackedBarMetricGraphImpl.class); graph.setMetricGraphData(metricGraphData); graph.setGraphListView(this); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java index 3b4ec1f..65807f9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java @@ -22,6 +22,7 @@ import com.google.gwt.user.client.Timer; import com.smartgwt.client.widgets.HTMLFlow; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.RedrawGraphs; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; @@ -30,7 +31,7 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; * A D3 graph implementation for graphing Resource metrics. * Just the graph only. No avail graph no buttons just he graph. */ -public class MetricD3Graph<T extends AbstractD3GraphListView> extends EnhancedVLayout { +public class MetricD3Graph<T extends AbstractD3GraphListView> extends EnhancedVLayout implements RedrawGraphs{ protected StackedBarMetricGraphImpl graph; private HTMLFlow graphDiv = null; @@ -59,18 +60,18 @@ public class MetricD3Graph<T extends AbstractD3GraphListView> extends EnhancedVL */ private static String getSvgDefs() { return " <defs>" - + " <linearGradient id=\"headerGrad\" x1=\"0%\" y1=\"0%\" x2=\"0%\" y2=\"100%\">" - + " <stop offset=\"0%\" style=\"stop-color:#E6E6E6;stop-opacity:1\"/>" - + " <stop offset=\"100%\" style=\"stop-color:#F0F0F0;stop-opacity:1\"/>" - + " </linearGradient>" - + " <pattern id=\"noDataStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" - + " width=\"6\" height=\"3\">" - + " <path d=\"M 0 0 6 0\" style=\"stroke:#CCCCCC; fill:none;\"/>" - + " </pattern>" - + " <pattern id=\"unknownStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" - + " width=\"6\" height=\"3\">" - + " <path d=\"M 0 0 6 0\" style=\"stroke:#2E9EC2; fill:none;\"/>" - + " </pattern>" + + " <linearGradient id=\"headerGrad\" x1=\"0%\" y1=\"0%\" x2=\"0%\" y2=\"100%\">" + + " <stop offset=\"0%\" style=\"stop-color:#E6E6E6;stop-opacity:1\"/>" + + " <stop offset=\"100%\" style=\"stop-color:#F0F0F0;stop-opacity:1\"/>" + + " </linearGradient>" + + " <pattern id=\"noDataStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" + + " width=\"6\" height=\"3\">" + + " <path d=\"M 0 0 6 0\" style=\"stroke:#CCCCCC; fill:none;\"/>" + + " </pattern>" + + " <pattern id=\"unknownStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" + + " width=\"6\" height=\"3\">" + + " <path d=\"M 0 0 6 0\" style=\"stroke:#2E9EC2; fill:none;\"/>" + + " </pattern>" + "<pattern id=\"diagonalHatchFill\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\" width=\"105\" height=\"105\">" + "<g style=\"fill:none; stroke:black; stroke-width:1\">" + "<path d=\"M0 90 l15,15\"/>" diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java deleted file mode 100644 index 6719070..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java +++ /dev/null @@ -1,399 +0,0 @@ -/* - * RHQ Management Platform - * Copyright 2012, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail; - -import java.util.ArrayList; -import java.util.Date; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.data.SortSpecifier; -import com.smartgwt.client.rpc.RPCResponse; -import com.smartgwt.client.types.Alignment; -import com.smartgwt.client.types.ListGridFieldType; -import com.smartgwt.client.types.SortDirection; -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.fields.FormItem; -import com.smartgwt.client.widgets.form.fields.StaticTextItem; -import com.smartgwt.client.widgets.grid.ListGridField; -import com.smartgwt.client.widgets.grid.ListGridRecord; -import com.smartgwt.client.widgets.layout.Layout; - -import org.rhq.core.domain.criteria.AvailabilityCriteria; -import org.rhq.core.domain.measurement.Availability; -import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.core.domain.resource.composite.ResourceAvailabilitySummary; -import org.rhq.core.domain.resource.composite.ResourceComposite; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.domain.util.PageOrdering; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.ImageManager; -import org.rhq.enterprise.gui.coregui.client.components.table.Table; -import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; -import org.rhq.enterprise.gui.coregui.client.gwt.AvailabilityGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; -import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; - -/** - * This shows the availability history for a resource. - * - * @author Jay Shaughnessy - * @author John Mazzitelli - */ -public class ResourceAvailabilityView extends EnhancedVLayout { - - private ResourceComposite resourceComposite; - private StaticTextItem currentField; - private StaticTextItem availField; - private StaticTextItem availTimeField; - private StaticTextItem downField; - private StaticTextItem downTimeField; - private StaticTextItem disabledField; - private StaticTextItem disabledTimeField; - private StaticTextItem failureCountField; - private StaticTextItem disabledCountField; - private StaticTextItem mtbfField; - private StaticTextItem mttrField; - private StaticTextItem unknownField; - private StaticTextItem currentTimeField; - - public ResourceAvailabilityView(ResourceComposite resourceComposite) { - super(); - - this.resourceComposite = resourceComposite; - - setWidth100(); - setHeight100(); - } - - @Override - protected void onInit() { - super.onInit(); - - addMember(createSummaryForm()); - addMember(createListView()); - } - - private DynamicForm createSummaryForm() { - DynamicForm form = new DynamicForm(); - form.setWidth100(); - form.setAutoHeight(); - form.setMargin(10); - form.setNumCols(4); - - // row 1 - currentField = new StaticTextItem("current", MSG.view_resource_monitor_availability_currentStatus()); - currentField.setWrapTitle(false); - currentField.setColSpan(4); - - // row 2 - availField = new StaticTextItem("avail", MSG.view_resource_monitor_availability_availability()); - availField.setWrapTitle(false); - prepareTooltip(availField, MSG.view_resource_monitor_availability_availability_tooltip()); - - availTimeField = new StaticTextItem("availTime", MSG.view_resource_monitor_availability_uptime()); - availTimeField.setWrapTitle(false); - prepareTooltip(availTimeField, MSG.view_resource_monitor_availability_uptime_tooltip()); - - // row 3 - downField = new StaticTextItem("down", MSG.view_resource_monitor_availability_down()); - downField.setWrapTitle(false); - prepareTooltip(downField, MSG.view_resource_monitor_availability_down_tooltip()); - - downTimeField = new StaticTextItem("downTime", MSG.view_resource_monitor_availability_downtime()); - downTimeField.setWrapTitle(false); - prepareTooltip(downTimeField, MSG.view_resource_monitor_availability_downtime_tooltip()); - - // row 4 - disabledField = new StaticTextItem("disabled", MSG.view_resource_monitor_availability_disabled()); - disabledField.setWrapTitle(false); - prepareTooltip(disabledField, MSG.view_resource_monitor_availability_disabled_tooltip()); - - disabledTimeField = new StaticTextItem("disabledTime", MSG.view_resource_monitor_availability_disabledTime()); - disabledTimeField.setWrapTitle(false); - prepareTooltip(disabledTimeField, MSG.view_resource_monitor_availability_disabledTime_tooltip()); - - // row 5 - failureCountField = new StaticTextItem("failureCount", MSG.view_resource_monitor_availability_numFailures()); - failureCountField.setWrapTitle(false); - prepareTooltip(failureCountField, MSG.view_resource_monitor_availability_numFailures_tooltip()); - - disabledCountField = new StaticTextItem("disabledCount", MSG.view_resource_monitor_availability_numDisabled()); - disabledCountField.setWrapTitle(false); - prepareTooltip(disabledCountField, MSG.view_resource_monitor_availability_numDisabled_tooltip()); - - // row 6 - mtbfField = new StaticTextItem("mtbf", MSG.view_resource_monitor_availability_mtbf()); - mtbfField.setWrapTitle(false); - prepareTooltip(mtbfField, MSG.view_resource_monitor_availability_mtbf_tooltip()); - - mttrField = new StaticTextItem("mttr", MSG.view_resource_monitor_availability_mttr()); - mttrField.setWrapTitle(false); - prepareTooltip(mttrField, MSG.view_resource_monitor_availability_mttr_tooltip()); - - // row 7 - unknownField = new StaticTextItem("unknown"); - unknownField.setWrapTitle(false); - unknownField.setColSpan(4); - unknownField.setShowTitle(false); - - // row 8 - currentTimeField = new StaticTextItem("currentTime"); - currentTimeField.setWrapTitle(false); - currentTimeField.setColSpan(4); - currentTimeField.setShowTitle(false); - - form.setItems(currentField, availField, availTimeField, downField, downTimeField, disabledField, - disabledTimeField, failureCountField, disabledCountField, mtbfField, mttrField, unknownField, - currentTimeField); - - reloadSummaryData(); - - return form; - } - - private void reloadSummaryData() { - GWTServiceLookup.getResourceService().getResourceAvailabilitySummary(resourceComposite.getResource().getId(), - new AsyncCallback<ResourceAvailabilitySummary>() { - - @Override - public void onSuccess(ResourceAvailabilitySummary result) { - - currentField.setValue(MSG.view_resource_monitor_availability_currentStatus_value(result - .getCurrent().getName(), TimestampCellFormatter.format(result.getLastChange().getTime()))); - availField.setValue(MeasurementConverterClient.format(result.getUpPercentage(), - MeasurementUnits.PERCENTAGE, true)); - availTimeField.setValue(MeasurementConverterClient.format((double) result.getUpTime(), - MeasurementUnits.MILLISECONDS, true)); - downField.setValue(MeasurementConverterClient.format(result.getDownPercentage(), - MeasurementUnits.PERCENTAGE, true)); - downTimeField.setValue(MeasurementConverterClient.format((double) result.getDownTime(), - MeasurementUnits.MILLISECONDS, true)); - disabledField.setValue(MeasurementConverterClient.format(result.getDisabledPercentage(), - MeasurementUnits.PERCENTAGE, true)); - disabledTimeField.setValue(MeasurementConverterClient.format((double) result.getDisabledTime(), - MeasurementUnits.MILLISECONDS, true)); - failureCountField.setValue(result.getFailures()); - disabledCountField.setValue(result.getDisabled()); - mtbfField.setValue(MeasurementConverterClient.format((double) result.getMTBF(), - MeasurementUnits.MILLISECONDS, true)); - mttrField.setValue(MeasurementConverterClient.format((double) result.getMTTR(), - MeasurementUnits.MILLISECONDS, true)); - - if (result.getUnknownTime() > 0L) { - unknownField.setValue(MSG.view_resource_monitor_availability_unknown(MeasurementConverterClient - .format((double) result.getUnknownTime(), MeasurementUnits.MILLISECONDS, true))); - } else { - unknownField.setValue(""); - } - - currentTimeField.setValue(MSG.view_resource_monitor_availability_currentAsOf(TimestampCellFormatter - .format(result.getCurrentTime()))); - } - - @Override - public void onFailure(Throwable caught) { - currentField.setValue(MSG.common_label_error()); - CoreGUI.getErrorHandler() - .handleError(MSG.view_resource_monitor_availability_summaryError(), caught); - } - }); - } - - private void prepareTooltip(FormItem item, String tooltip) { - item.setHoverWidth(400); - item.setPrompt(tooltip); - } - - private Table<ListView.DS> createListView() { - ListView listView = new ListView(resourceComposite.getResource().getId()); - return listView; - } - - private class ListView extends Table<ListView.DS> { - - private DS dataSource; - private int resourceId; - - public ListView(int resourceId) { - super(null, new SortSpecifier[] { new SortSpecifier("startTime", SortDirection.DESCENDING) }); - - this.resourceId = resourceId; - - setDataSource(getDataSource()); - } - - @Override - public DS getDataSource() { - if (null == this.dataSource) { - this.dataSource = new DS(resourceId); - } - return this.dataSource; - } - - @Override - public void refresh() { - super.refresh(); - reloadSummaryData(); - } - - @Override - protected void configureTableContents(Layout contents) { - super.configureTableContents(contents); - setAutoHeight(); - } - - @Override - protected void configureTable() { - ArrayList<ListGridField> dataSourceFields = getDataSource().getListGridFields(); - getListGrid().setFields(dataSourceFields.toArray(new ListGridField[dataSourceFields.size()])); - - super.configureTable(); - } - - private class DS extends RPCDataSource<Availability, AvailabilityCriteria> { - - public static final String ATTR_ID = "id"; - public static final String ATTR_AVAILABILITY = "availabilityType"; - public static final String ATTR_START_TIME = "startTime"; - public static final String ATTR_END_TIME = "endTime"; - - public static final String ATTR_DURATION = "duration"; - - private AvailabilityGWTServiceAsync availService = GWTServiceLookup.getAvailabilityService(); - private int resourceId; - - public DS(int resourceId) { - super(); - this.resourceId = resourceId; - addDataSourceFields(); - } - - /** - * The view that contains the list grid which will display this datasource's data will call this - * method to get the field information which is used to control the display of the data. - * - * @return list grid fields used to display the datasource data - */ - public ArrayList<ListGridField> getListGridFields() { - ArrayList<ListGridField> fields = new ArrayList<ListGridField>(6); - - ListGridField startTimeField = new ListGridField(ATTR_START_TIME, MSG.common_title_start()); - startTimeField.setCellFormatter(new TimestampCellFormatter()); - startTimeField.setShowHover(true); - startTimeField.setHoverCustomizer(TimestampCellFormatter.getHoverCustomizer(ATTR_START_TIME)); - startTimeField.setCanSortClientOnly(true); - fields.add(startTimeField); - - ListGridField endTimeField = new ListGridField(ATTR_END_TIME, MSG.common_title_end()); - endTimeField.setCellFormatter(new TimestampCellFormatter()); - endTimeField.setShowHover(true); - endTimeField.setHoverCustomizer(TimestampCellFormatter.getHoverCustomizer(ATTR_END_TIME)); - endTimeField.setCanSortClientOnly(true); - fields.add(endTimeField); - - ListGridField durationField = new ListGridField(ATTR_DURATION, MSG.common_title_duration()); - durationField.setAlign(Alignment.RIGHT); - fields.add(durationField); - - ListGridField availabilityField = new ListGridField(ATTR_AVAILABILITY, MSG.common_title_availability()); - availabilityField.setType(ListGridFieldType.IMAGE); - availabilityField.setAlign(Alignment.CENTER); - fields.add(availabilityField); - - return fields; - } - - @Override - protected AvailabilityCriteria getFetchCriteria(DSRequest request) { - AvailabilityCriteria c = new AvailabilityCriteria(); - c.addFilterResourceId(resourceId); - c.addFilterInitialAvailability(false); - - // This code is unlikely to be necessary as the encompassing view should be using an initial - // sort specifier. But just in case, make sure we set the initial sort. Note that we have to - // manipulate the PageControl directly as per the restrictions on getFetchCriteria() (see jdoc). - PageControl pageControl = getPageControl(request); - if (pageControl.getOrderingFields().isEmpty()) { - pageControl.initDefaultOrderingField("startTime", PageOrdering.DESC); - } - - return c; - } - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, - AvailabilityCriteria criteria) { - - this.availService.findAvailabilityByCriteria(criteria, new AsyncCallback<PageList<Availability>>() { - public void onFailure(Throwable caught) { - // TODO fix message - CoreGUI.getErrorHandler().handleError(MSG.common_label_error(), caught); - response.setStatus(RPCResponse.STATUS_FAILURE); - processResponse(request.getRequestId(), response); - } - - public void onSuccess(final PageList<Availability> result) { - response.setData(buildRecords(result)); - response.setTotalRows(result.size()); - processResponse(request.getRequestId(), response); - } - }); - } - - @Override - public Availability copyValues(Record from) { - return null; - } - - @Override - public ListGridRecord copyValues(Availability from) { - ListGridRecord record = new ListGridRecord(); - - record.setAttribute(ATTR_ID, from.getId()); - record.setAttribute(ATTR_AVAILABILITY, - ImageManager.getAvailabilityIconFromAvailType(from.getAvailabilityType())); - record.setAttribute(ATTR_START_TIME, new Date(from.getStartTime())); - if (null != from.getEndTime()) { - record.setAttribute(ATTR_END_TIME, new Date(from.getEndTime())); - long duration = from.getEndTime() - from.getStartTime(); - record.setAttribute(ATTR_DURATION, - MeasurementConverterClient.format((double) duration, MeasurementUnits.MILLISECONDS, true)); - - } else { - record.setAttribute(ATTR_END_TIME, MSG.common_label_none2()); - long duration = System.currentTimeMillis() - from.getStartTime(); - record.setAttribute(ATTR_DURATION, - MeasurementConverterClient.format((double) duration, MeasurementUnits.MILLISECONDS, true)); - - } - - return record; - } - } - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java new file mode 100644 index 0000000..ce4f8ef --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java @@ -0,0 +1,185 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import java.util.LinkedHashMap; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.IButton; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.form.fields.SelectItem; +import com.smartgwt.client.widgets.form.fields.events.ChangeEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangeHandler; +import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.toolbar.ToolStrip; + +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.criteria.DashboardCriteria; +import org.rhq.core.domain.dashboard.Dashboard; +import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resource.graph.ResourceD3GraphPortlet; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.Enhanced; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; + +/** + * @author Mike Thompson + */ +public class AddToDashboardComponent extends ToolStrip implements Enhanced { + final private Resource resource; + private SelectItem dashboardSelectItem; + private Dashboard selectedDashboard; + private IButton addToDashboardButton; + private LinkedHashMap<String, String> dashboardMenuMap; + private LinkedHashMap<Integer, Dashboard> dashboardMap; + private MetricsTableView.MetricsTableListGrid metricsListGrid; + + public AddToDashboardComponent(Resource resource) { + this.resource = resource; + setPadding(5); + setMembersMargin(15); + setWidth(300); + dashboardMenuMap = new LinkedHashMap<String, String>(); + dashboardMap = new LinkedHashMap<Integer, Dashboard>(); + createToolstrip(); + } + + @Override + protected void onDraw() { + super.onDraw(); + removeMembers(getMembers()); + createToolstrip(); + } + + private void createToolstrip() { + addSpacer(15); + dashboardSelectItem = new SelectItem(); + addToDashboardButton = new IButton(MSG.view_metric_addToDashboard()); + addToDashboardButton.disable(); + + dashboardSelectItem = new SelectItem(); + dashboardSelectItem.setTitle("Dashboards"); + dashboardSelectItem.setWidth(300); + dashboardSelectItem.setPickListWidth(210); + populateDashboardMenu(); + addFormItem(dashboardSelectItem); + addMember(addToDashboardButton); + + dashboardSelectItem.addChangeHandler(new ChangeHandler() { + @Override + public void onChange(ChangeEvent changeEvent) { + Integer selectedDashboardId = Integer.valueOf((String) changeEvent.getValue()); + selectedDashboard = dashboardMap.get(selectedDashboardId); + } + }); + addToDashboardButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() { + @Override + public void onClick(ClickEvent clickEvent) { + ListGridRecord[] selectedRecords = metricsListGrid.getSelectedRecords(); + for (ListGridRecord selectedRecord : selectedRecords) { + for (MeasurementDefinition measurementDefinition : resource.getResourceType() + .getMetricDefinitions()) { + if (measurementDefinition.getId() == selectedRecord + .getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID)) { + Log.debug("Add to Dashboard -- Storing: " + measurementDefinition.getDisplayName() + + " in " + selectedDashboard.getName()); + storeDashboardMetric(selectedDashboard, resource, measurementDefinition); + break; + } + } + } + } + }); + } + + public void disableAddToDashboardButton(){ + addToDashboardButton.disable(); + } + + public void enableAddToDashboardButton(){ + addToDashboardButton.enable(); + } + + + public void populateDashboardMenu() { + dashboardMenuMap.clear(); + dashboardMap.clear(); + + DashboardCriteria criteria = new DashboardCriteria(); + GWTServiceLookup.getDashboardService().findDashboardsByCriteria(criteria, + new AsyncCallback<PageList<Dashboard>>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_dashboard(), + caught); + } + + public void onSuccess(PageList<Dashboard> dashboards) { + for (final Dashboard dashboard : dashboards) { + dashboardMenuMap.put(String.valueOf(dashboard.getId()), + MSG.view_tree_common_contextMenu_addChartToDashboard(dashboard.getName())); + dashboardMap.put(dashboard.getId(), dashboard); + } + selectedDashboard = dashboards.get(0); + dashboardSelectItem.setValueMap(dashboardMenuMap); + dashboardSelectItem.setValue(selectedDashboard.getId()); + } + }); + } + + /** + * The metrics list grid is not available on object creation so we must attach later after it has been initialized. + * @param metricsListGrid + */ + public void setMetricsListGrid(MetricsTableView.MetricsTableListGrid metricsListGrid) { + this.metricsListGrid = metricsListGrid; + } + + + private void storeDashboardMetric(Dashboard dashboard, Resource resource, MeasurementDefinition definition) { + DashboardPortlet dashboardPortlet = new DashboardPortlet(MSG.view_tree_common_contextMenu_resourceGraph(), + ResourceD3GraphPortlet.KEY, 250); + dashboardPortlet.getConfiguration().put( + new PropertySimple(ResourceD3GraphPortlet.CFG_RESOURCE_ID, resource.getId())); + dashboardPortlet.getConfiguration().put( + new PropertySimple(ResourceD3GraphPortlet.CFG_DEFINITION_ID, definition.getId())); + + dashboard.addPortlet(dashboardPortlet); + + GWTServiceLookup.getDashboardService().storeDashboard(dashboard, new AsyncCallback<Dashboard>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), + caught); + } + + public void onSuccess(Dashboard result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_tree_common_contextMenu_saveChartToDashboardSuccessful(result.getName()), + Message.Severity.Info)); + } + }); + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java deleted file mode 100644 index 7022648..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java +++ /dev/null @@ -1,237 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Set; -import java.util.TreeSet; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.types.SelectionStyle; -import com.smartgwt.client.widgets.Window; -import com.smartgwt.client.widgets.events.CloseClickEvent; -import com.smartgwt.client.widgets.events.CloseClickHandler; -import com.smartgwt.client.widgets.grid.ListGrid; -import com.smartgwt.client.widgets.grid.ListGridField; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.criteria.ResourceCriteria; -import org.rhq.core.domain.measurement.MeasurementData; -import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.core.domain.resource.composite.ResourceComposite; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasurementRangeEditor; -import org.rhq.enterprise.gui.coregui.client.components.table.Table; -import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView; -import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView.ChartViewWindow; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; - -/** - * Views a resource's measurements in a tabular view. - * - * @author John Mazzitelli - */ -public class MeasurementTableView extends Table<MetricsTableDataSource> { - - private final int resourceId; - - public MeasurementTableView(int resourceId) { - super(); - this.resourceId = resourceId; - setDataSource(new MetricsTableDataSource(resourceId)); - } - - protected void configureTable() { - ArrayList<ListGridField> fields = getDataSource().getListGridFields(); - setListGridFields(fields.toArray(new ListGridField[0])); - addExtraWidget(new UserPreferencesMeasurementRangeEditor(), true); - addTableAction(MSG.view_measureTable_getLive(), new TableAction() { - @Override - public boolean isEnabled(ListGridRecord[] selection) { - return selection != null && selection.length > 0; - } - - @Override - public void executeAction(ListGridRecord[] selection, Object actionValue) { - if (selection == null || selection.length == 0) { - return; - } - // keyed on metric name - string[0] is the metric label, [1] is the units - final HashMap<String, String[]> scheduleNamesAndUnits = new HashMap<String, String[]>(); - int[] definitionIds = new int[selection.length]; - int i = 0; - for (ListGridRecord record : selection) { - Integer defId = record.getAttributeAsInt(MetricsTableDataSource.FIELD_METRIC_DEF_ID); - definitionIds[i++] = defId.intValue(); - - String name = record.getAttribute(MetricsTableDataSource.FIELD_METRIC_NAME); - String label = record.getAttribute(MetricsTableDataSource.FIELD_METRIC_LABEL); - String units = record.getAttribute(MetricsTableDataSource.FIELD_METRIC_UNITS); - if (units == null || units.length() < 1) { - units = MeasurementUnits.NONE.name(); - } - - scheduleNamesAndUnits.put(name, new String[] { label, units }); - } - - // actually go out and ask the agents for the data - GWTServiceLookup.getMeasurementDataService(60000).findLiveData(resourceId, definitionIds, - new AsyncCallback<Set<MeasurementData>>() { - @Override - public void onSuccess(Set<MeasurementData> result) { - if (result == null) { - result = new HashSet<MeasurementData>(0); - } - ArrayList<ListGridRecord> records = new ArrayList<ListGridRecord>(result.size()); - for (MeasurementData data : result) { - String[] nameAndUnits = scheduleNamesAndUnits.get(data.getName()); - if (nameAndUnits != null) { - double doubleValue; - if (data.getValue() instanceof Number) { - doubleValue = ((Number) data.getValue()).doubleValue(); - } else { - doubleValue = Double.parseDouble(data.getValue().toString()); - } - String value = MeasurementConverterClient.formatToSignificantPrecision( - new double[] { doubleValue }, MeasurementUnits.valueOf(nameAndUnits[1]), true)[0]; - - ListGridRecord record = new ListGridRecord(); - record.setAttribute("name", nameAndUnits[0]); - record.setAttribute("value", value); - records.add(record); - } - } - Collections.sort(records, new Comparator<ListGridRecord>() { - public int compare(ListGridRecord o1, ListGridRecord o2) { - return o1.getAttribute("name").compareTo(o2.getAttribute("name")); - } - }); - showLiveData(records); - } - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_measureTable_getLive_failure(), caught); - } - }); - } - }); - - - addTableAction(MSG.view_measureTable_chartMetricValues(), new TableAction() { - @Override - public boolean isEnabled(ListGridRecord[] selection) { - return selection != null && selection.length > 0; - } - - @Override - public void executeAction(ListGridRecord[] selection, Object actionValue) { - if (selection == null || selection.length == 0) { - return; - } - final TreeSet<Integer> definitionIds = new TreeSet<Integer>(); - for (ListGridRecord record : selection) { - Integer defId = record.getAttributeAsInt(MetricsTableDataSource.FIELD_METRIC_DEF_ID); - definitionIds.add(defId); - } - - ResourceCriteria criteria = new ResourceCriteria(); - criteria.addFilterId(resourceId); - criteria.fetchSchedules(true); - GWTServiceLookup.getResourceService().findResourceCompositesByCriteria(criteria, - new AsyncCallback<PageList<ResourceComposite>>() { - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_inventory_resource_loadFailed(String.valueOf(resourceId)), - Message.Severity.Warning)); - - CoreGUI.goToView(InventoryView.VIEW_ID.getName()); - } - - @Override - public void onSuccess(PageList<ResourceComposite> result) { - if (result.isEmpty()) { - onFailure(new Exception(MSG.view_inventory_resource_loadFailed(String - .valueOf(resourceId)))); - } else { - final ResourceComposite resourceComposite = result.get(0); - - ChartViewWindow window = new ChartViewWindow(""); - final D3GraphListView graphListView = D3GraphListView.createMultipleGraphs( - resourceComposite.getResource(), definitionIds, true); - - window.addItem(graphListView); - window.show(); - refreshTableInfo(); - - } - } - }); - - } - }); - } - - private void showLiveData(ArrayList<ListGridRecord> records) { - final Window liveDataWindow = new Window(); - liveDataWindow.setTitle(MSG.view_measureTable_live_title()); - liveDataWindow.setShowModalMask(true); - liveDataWindow.setShowMinimizeButton(false); - liveDataWindow.setShowMaximizeButton(true); - liveDataWindow.setShowCloseButton(true); - liveDataWindow.setShowResizer(true); - liveDataWindow.setCanDragResize(true); - liveDataWindow.setDismissOnEscape(true); - liveDataWindow.setIsModal(true); - liveDataWindow.setWidth(700); - liveDataWindow.setHeight(425); - liveDataWindow.setAutoCenter(true); - liveDataWindow.centerInPage(); - liveDataWindow.addCloseClickHandler(new CloseClickHandler() { - @Override - public void onCloseClick(CloseClickEvent event) { - liveDataWindow.destroy(); - refreshTableInfo(); - } - }); - - ListGrid liveDataGrid = new ListGrid(); - liveDataGrid.setShowAllRecords(true); - liveDataGrid.setData(records.toArray(new ListGridRecord[records.size()])); - liveDataGrid.setSelectionType(SelectionStyle.NONE); - ListGridField name = new ListGridField("name", MSG.common_title_metric()); - ListGridField value = new ListGridField("value", MSG.common_title_value()); - liveDataGrid.setFields(name, value); - - liveDataWindow.addItem(liveDataGrid); - liveDataWindow.show(); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java new file mode 100644 index 0000000..bcea825 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -0,0 +1,167 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import java.util.List; + +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.types.Overflow; +import com.smartgwt.client.types.VerticalAlignment; +import com.smartgwt.client.widgets.Img; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.events.ClickHandler; + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.resource.Resource; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.IconEnum; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; +import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedHLayout; + +/** + * The consolidated metrics view showing metric graphs and availability data both in graphical and tabular form. + * + * @author Mike Thompson + */ +public class MetricsResourceView extends AbstractD3GraphListView { + + private static final String COLLAPSED_TOOLTIP = MSG.chart_metrics_collapse_tooltip(); + private static final String EXPANDED_TOOLTIP = MSG.chart_metrics_expand_tooltip(); + + private final Resource resource; + private Img expandCollapseArrow; + private final MetricsTableView metricsTableView; + private final ResourceMetricAvailabilityView availabilityDetails; + + public MetricsResourceView(Resource resource) { + super(); + setOverflow(Overflow.AUTO); + setWidth100(); + setHeight100(); + this.resource = resource; + metricsTableView = new MetricsTableView(resource, this); + availabilityDetails = new ResourceMetricAvailabilityView(resource); + } + + + public void redrawGraphs() { + this.onDraw(); + } + + public void refreshGraphs(){ + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); + BrowserUtility.graphSparkLines(); + } + }.schedule(150); + } + + @Override + protected void onDraw() { + super.onDraw(); + Log.debug("MetricResourceView.onDraw() for: " + resource.getName() + " id: " + resource.getId()); + destroyMembers(); + + + addMember(buttonBarDateTimeRangeEditor); + + availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( + new AvailabilityOverUnderGraphType(resource.getId())); + + EnhancedHLayout expandCollapseHLayout = new EnhancedHLayout(); + + //add expand/collapse icon + expandCollapseArrow = new Img(IconEnum.COLLAPSED_ICON.getIcon16x16Path(), 16, 16); + expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP); + expandCollapseArrow.setLayoutAlign(VerticalAlignment.BOTTOM); + expandCollapseArrow.addClickHandler(new ClickHandler() { + private boolean collapsed = true; + + @Override + public void onClick(ClickEvent event) { + collapsed = !collapsed; + if (collapsed) { + expandCollapseArrow.setSrc(IconEnum.COLLAPSED_ICON.getIcon16x16Path()); + expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP); + availabilityDetails.hide(); + } else { + expandCollapseArrow.setSrc(IconEnum.EXPANDED_ICON.getIcon16x16Path()); + expandCollapseArrow.setTooltip(EXPANDED_TOOLTIP); + availabilityDetails.show(); + + } + refreshGraphs(); + } + }); + + + expandCollapseHLayout.addMember(expandCollapseArrow); + expandCollapseHLayout.addMember(availabilityGraph); + addMember(expandCollapseHLayout); + + availabilityDetails.hide(); + addMember(availabilityDetails); + + metricsTableView.setHeight100(); + addMember(metricsTableView); + + + queryAvailability(EntityContext.forResource(resource.getId()), buttonBarDateTimeRangeEditor.getStartTime(), + buttonBarDateTimeRangeEditor.getEndTime(), null); + } + + @Override + protected void queryAvailability(final EntityContext context, Long startTime, Long endTime, CountDownLatch notUsed ) { + + final long timerStart = System.currentTimeMillis(); + + // now return the availability + GWTServiceLookup.getAvailabilityService().getAvailabilitiesForResource(context.getResourceId(), startTime, + endTime, new AsyncCallback<List<Availability>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_availability_loadFailed(), caught); + } + + @Override + public void onSuccess(List<Availability> availList) { + Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + + " ms."); + availabilityGraph.setAvailabilityList(availList); + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); + } + }.schedule(150); + } + }); + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java index 318166d..57e62ab 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java @@ -1,7 +1,13 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; import java.util.ArrayList; +import java.util.Arrays; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Set; +import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.DSRequest; import com.smartgwt.client.data.DSResponse; @@ -11,18 +17,28 @@ import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.criteria.Criteria; +import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.MeasurementSchedule; +import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.measurement.ui.MetricDisplaySummary; import org.rhq.core.domain.measurement.ui.MetricDisplayValue; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.resource.composite.ResourceComposite; +import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; +import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; +import org.rhq.enterprise.gui.coregui.client.util.async.Command; +import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; -import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; /** * A simple data source to read in metric data summaries for a resource. @@ -31,9 +47,13 @@ import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; * we just load them all in at once. * * @author John Mazzitelli + * @author Mike Thompson + * @todo: get rid of this once we have tested the new screen out */ +@Deprecated public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, Criteria> { + public static final String FIELD_SPARKLINE = "sparkline"; public static final String FIELD_METRIC_LABEL = "label"; public static final String FIELD_ALERT_COUNT = "alertCount"; public static final String FIELD_MIN_VALUE = "min"; @@ -44,11 +64,15 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, public static final String FIELD_METRIC_SCHED_ID = "schedId"; public static final String FIELD_METRIC_UNITS = "units"; public static final String FIELD_METRIC_NAME = "name"; - + public static final String FIELD_RESOURCE_ID = "resourceId"; private int resourceId; + private List<MetricDisplaySummary> metricDisplaySummaries; + private List<List<MeasurementDataNumericHighLowComposite>> metricsDataList; + private MeasurementUserPreferences measurementUserPrefs; public MetricsTableDataSource(int resourceId) { this.resourceId = resourceId; + measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); } /** @@ -58,7 +82,25 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, * @return list grid fields used to display the datasource data */ public ArrayList<ListGridField> getListGridFields() { - ArrayList<ListGridField> fields = new ArrayList<ListGridField>(6); + ArrayList<ListGridField> fields = new ArrayList<ListGridField>(7); + + ListGridField sparklineField = new ListGridField(FIELD_SPARKLINE, "chart"); + sparklineField.setCellFormatter(new CellFormatter() { + @Override + public String format(Object value, ListGridRecord record, int rowNum, int colNum) { + if (value == null) { + return ""; + } + String contents = "<span id='sparkline_" + resourceId + "-" + + record.getAttributeAsInt(FIELD_METRIC_DEF_ID) + "' class='dynamicsparkline' width='70' " + + "values='" + record.getAttribute(FIELD_SPARKLINE) + "'></span>"; + return contents; + + } + }); + + sparklineField.setWidth(80); + fields.add(sparklineField); ListGridField nameField = new ListGridField(FIELD_METRIC_LABEL, MSG.common_title_name()); nameField.setWidth("30%"); @@ -101,6 +143,7 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, MeasurementUtility.formatSimpleMetrics(from); ListGridRecord record = new ListGridRecord(); + record.setAttribute(FIELD_SPARKLINE, getCsvMetricsForSparkline()); record.setAttribute(FIELD_METRIC_LABEL, from.getLabel()); record.setAttribute(FIELD_ALERT_COUNT, String.valueOf(from.getAlertCount())); record.setAttribute(FIELD_MIN_VALUE, getMetricStringValue(from.getMinMetric())); @@ -111,9 +154,32 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, record.setAttribute(FIELD_METRIC_SCHED_ID, from.getScheduleId()); record.setAttribute(FIELD_METRIC_UNITS, from.getUnits()); record.setAttribute(FIELD_METRIC_NAME, from.getMetricName()); + record.setAttribute(FIELD_RESOURCE_ID, resourceId); return record; } + private String getCsvMetricsForSparkline() { + StringBuilder sb = new StringBuilder(); + Log.debug("getCsvMetricsForSparkline.metricsDataList: " + metricsDataList.size()); + for (List<MeasurementDataNumericHighLowComposite> measurementData : metricsDataList) { + for (int i = 0; i < measurementData.size(); i++) { + // take the last 20 values + if (i >= measurementData.size() - 20) { + if (!Double.isNaN(measurementData.get(i).getValue())) { + sb.append((int) measurementData.get(i).getValue()); + sb.append(","); + } + } + } + if (sb.toString().endsWith(",")) { + sb.setLength(sb.length() - 1); + } + } + Log.debug("getCsvMetricsForSparkline: " + sb.toString()); + + return sb.toString(); + } + protected String getMetricStringValue(MetricDisplayValue value) { return (value != null) ? value.toString() : ""; } @@ -127,34 +193,54 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, @Override protected void executeFetch(final DSRequest request, final DSResponse response, final Criteria unused) { - // see MetricsTableUIBean for the old JSF class to see where this came from - GWTServiceLookup.getMeasurementScheduleService().findSchedulesForResourceAndType(resourceId, DataType.MEASUREMENT, null, true, new AsyncCallback<ArrayList<MeasurementSchedule>>() { @Override - public void onSuccess(ArrayList<MeasurementSchedule> result) { - int[] schedIds = new int[result.size()]; + public void onSuccess(ArrayList<MeasurementSchedule> measurementSchedules) { + int[] scheduleIds = new int[measurementSchedules.size()]; int i = 0; - for (MeasurementSchedule measurementSchedule : result) { - schedIds[i++] = measurementSchedule.getId(); + for (MeasurementSchedule measurementSchedule : measurementSchedules) { + scheduleIds[i++] = measurementSchedule.getId(); } - UserPreferences prefs = UserSessionManager.getUserPreferences(); - MeasurementUserPreferences mprefs = new MeasurementUserPreferences(prefs); - ArrayList<Long> range = mprefs.getMetricRangePreferences().getBeginEndTimes(); + final CountDownLatch countDownLatch = CountDownLatch.create(2, new Command() { + + @Override + public void execute() { + response.setData(buildRecords(metricDisplaySummaries)); + processResponse(request.getRequestId(), response); + + new Timer() { + + @Override + public void run() { + BrowserUtility.graphSparkLines(); + } + }.schedule(150); + Log.debug("*** Finished CountdownLatch for metrics loaded: " + metricsDataList.size()); + } + }); + + retrieveResourceMetrics(resourceId, countDownLatch); + GWTServiceLookup.getMeasurementChartsService().getMetricDisplaySummariesForResource(resourceId, - schedIds, range.get(0), range.get(1), new AsyncCallback<ArrayList<MetricDisplaySummary>>() { - @Override - public void onSuccess(ArrayList<MetricDisplaySummary> result) { - response.setData(buildRecords(result)); - processResponse(request.getRequestId(), response); - } + scheduleIds, measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, + new AsyncCallback<ArrayList<MetricDisplaySummary>>() { + @Override + public void onSuccess(ArrayList<MetricDisplaySummary> metricDisplaySummaries) { + setMetricDisplaySummaries(metricDisplaySummaries); + countDownLatch.countDown(); + } - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Cannot load metrics", caught); + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError("Cannot load metrics", caught); + countDownLatch.countDown(); + } } - }); + + ); } @Override @@ -163,4 +249,87 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, } }); } + + void setMetricDisplaySummaries(List<MetricDisplaySummary> metricDisplaySummaries) { + this.metricDisplaySummaries = metricDisplaySummaries; + } + + public void retrieveResourceMetrics(final Integer resourceId, final CountDownLatch countDownLatch) { + + ResourceCriteria criteria = new ResourceCriteria(); + criteria.addFilterId(resourceId); + + //locate the resource + GWTServiceLookup.getResourceService().findResourceCompositesByCriteria(criteria, + new AsyncCallback<PageList<ResourceComposite>>() { + @Override + public void onFailure(Throwable caught) { + Log.debug("Error retrieving resource resource composite for resource [" + resourceId + "]:" + + caught.getMessage()); + } + + @Override + public void onSuccess(PageList<ResourceComposite> resourceCompositePageList) { + if (!resourceCompositePageList.isEmpty()) { + final ResourceComposite resourceComposite = resourceCompositePageList.get(0); + final Resource resource = resourceComposite.getResource(); + // Load the fully fetched ResourceType. + ResourceType resourceType = resource.getResourceType(); + ResourceTypeRepository.Cache.getInstance().getResourceTypes(resourceType.getId(), + EnumSet.of(ResourceTypeRepository.MetadataType.measurements), + new ResourceTypeRepository.TypeLoadedCallback() { + public void onTypesLoaded(ResourceType type) { + resource.setResourceType(type); + //metric definitions + Set<MeasurementDefinition> definitions = type.getMetricDefinitions(); + + //build id mapping for measurementDefinition instances Ex. Free Memory -> MeasurementDefinition[100071] + final HashMap<String, MeasurementDefinition> measurementDefMap = new HashMap<String, MeasurementDefinition>(); + for (MeasurementDefinition definition : definitions) { + measurementDefMap.put(definition.getDisplayName(), definition); + } + //bundle definition ids for asynch call. + int[] definitionArrayIds = new int[definitions.size()]; + final String[] displayOrder = new String[definitions.size()]; + measurementDefMap.keySet().toArray(displayOrder); + //sort the charting data ex. Free Memory, Free Swap Space,..System Load + Arrays.sort(displayOrder); + + //organize definitionArrayIds for ordered request on server. + int index = 0; + for (String definitionToDisplay : displayOrder) { + definitionArrayIds[index++] = measurementDefMap.get(definitionToDisplay) + .getId(); + } + + GWTServiceLookup.getMeasurementDataService().findDataForResource(resourceId, + definitionArrayIds, measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, 60, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + Log.warn("Error retrieving recent metrics charting data for resource [" + + resourceId + "]:" + caught.getMessage()); + } + + @Override + public void onSuccess( + List<List<MeasurementDataNumericHighLowComposite>> measurementDataList) { + + if (!measurementDataList.isEmpty()) { + metricsDataList = measurementDataList; + Log.debug("*** Setting metricsDataList.size: " + + metricsDataList.size()); + countDownLatch.countDown(); + } + } + }); + + } + }); + } + } + }); + + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java new file mode 100644 index 0000000..09a7bc3 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -0,0 +1,385 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.types.ExpansionMode; +import com.smartgwt.client.types.SelectionStyle; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.HTMLFlow; +import com.smartgwt.client.widgets.Window; +import com.smartgwt.client.widgets.events.CloseClickEvent; +import com.smartgwt.client.widgets.events.CloseClickHandler; +import com.smartgwt.client.widgets.grid.ListGrid; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.grid.events.DataArrivedEvent; +import com.smartgwt.client.widgets.grid.events.DataArrivedHandler; +import com.smartgwt.client.widgets.grid.events.RecordCollapseEvent; +import com.smartgwt.client.widgets.grid.events.RecordCollapseHandler; +import com.smartgwt.client.widgets.grid.events.RecordExpandEvent; +import com.smartgwt.client.widgets.grid.events.RecordExpandHandler; +import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler; +import com.smartgwt.client.widgets.grid.events.SelectionEvent; +import com.smartgwt.client.widgets.grid.events.SortChangedHandler; +import com.smartgwt.client.widgets.grid.events.SortEvent; +import com.smartgwt.client.widgets.layout.VLayout; + +import org.rhq.core.domain.measurement.MeasurementData; +import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; +import org.rhq.core.domain.resource.Resource; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; +import org.rhq.enterprise.gui.coregui.client.components.table.Table; +import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.RedrawGraphs; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph; +import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; +import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; + +/** + * Views a resource's metrics in a tabular view with sparkline graph and optional detailed d3 graph. + * + * @author John Mazzitelli + * @author Mike Thompson + */ +public class MetricsTableView extends Table<MetricsViewDataSource> implements RedrawGraphs { + + private final Resource resource; + private final AbstractD3GraphListView abstractD3GraphListView; + + private final MeasurementUserPreferences measurementUserPrefs; + private final AddToDashboardComponent addToDashboardComponent; + private MetricsTableListGrid metricsTableListGrid; + + Set<Integer> expandedRows = new HashSet<Integer>(); + + public MetricsTableView(Resource resource, AbstractD3GraphListView abstractD3GraphListView) { + super(); + this.resource = resource; + this.abstractD3GraphListView = abstractD3GraphListView; + measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); + setDataSource(new MetricsViewDataSource(resource)); + addToDashboardComponent = new AddToDashboardComponent(resource); + } + + /** + * Creates this Table's list grid (called by onInit()). Subclasses can override this if they require a custom + * subclass of ListGrid. + * + * @return this Table's list grid (must be an instance of ListGrid) + */ + @Override + protected ListGrid createListGrid() { + metricsTableListGrid = new MetricsTableListGrid(this, resource); + addToDashboardComponent.setMetricsListGrid(metricsTableListGrid); + return metricsTableListGrid; + } + + protected void configureTable() { + ArrayList<ListGridField> fields = getDataSource().getListGridFields(); + setListGridFields(fields.toArray(new ListGridField[0])); + + addTableAction(MSG.view_measureTable_getLive(), new ShowLiveDataTableAction(this)); + addExtraWidget(addToDashboardComponent, false); + addToDashboardComponent.disableAddToDashboardButton(); + metricsTableListGrid.addSelectionChangedHandler(new SelectionChangedHandler() { + @Override + public void onSelectionChanged(SelectionEvent selectionEvent) { + if(metricsTableListGrid.getSelectedRecords().length > 0){ + addToDashboardComponent.enableAddToDashboardButton(); + }else { + addToDashboardComponent.disableAddToDashboardButton(); + } + } + }); + } + + private static class ShowLiveDataTableAction implements TableAction { + private MetricsTableView metricsTableView; + + public ShowLiveDataTableAction(MetricsTableView metricsTableView) { + this.metricsTableView = metricsTableView; + } + + @Override + public boolean isEnabled(ListGridRecord[] selection) { + return selection != null && selection.length > 0; + } + + @Override + public void executeAction(ListGridRecord[] selection, Object actionValue) { + if (selection == null || selection.length == 0) { + return; + } + // keyed on metric name - string[0] is the metric label, [1] is the units + final HashMap<String, String[]> scheduleNamesAndUnits = new HashMap<String, String[]>(); + int[] definitionIds = new int[selection.length]; + int i = 0; + for (ListGridRecord record : selection) { + Integer defId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); + definitionIds[i++] = defId; + + String name = record.getAttribute(MetricsViewDataSource.FIELD_METRIC_NAME); + String label = record.getAttribute(MetricsViewDataSource.FIELD_METRIC_LABEL); + String units = record.getAttribute(MetricsViewDataSource.FIELD_METRIC_UNITS); + if (units == null || units.length() < 1) { + units = MeasurementUnits.NONE.name(); + } + + scheduleNamesAndUnits.put(name, new String[] { label, units }); + } + + // actually go out and ask the agents for the data + GWTServiceLookup.getMeasurementDataService(60000).findLiveData(metricsTableView.resource.getId(), + definitionIds, new AsyncCallback<Set<MeasurementData>>() { + @Override + public void onSuccess(Set<MeasurementData> result) { + if (result == null) { + result = new HashSet<MeasurementData>(0); + } + ArrayList<ListGridRecord> records = new ArrayList<ListGridRecord>(result.size()); + for (MeasurementData data : result) { + String[] nameAndUnits = scheduleNamesAndUnits.get(data.getName()); + if (nameAndUnits != null) { + double doubleValue; + if (data.getValue() instanceof Number) { + doubleValue = ((Number) data.getValue()).doubleValue(); + } else { + doubleValue = Double.parseDouble(data.getValue().toString()); + } + String value = MeasurementConverterClient.formatToSignificantPrecision( + new double[] { doubleValue }, MeasurementUnits.valueOf(nameAndUnits[1]), true)[0]; + + ListGridRecord record = new ListGridRecord(); + record.setAttribute("name", nameAndUnits[0]); + record.setAttribute("value", value); + records.add(record); + } + } + Collections.sort(records, new Comparator<ListGridRecord>() { + public int compare(ListGridRecord o1, ListGridRecord o2) { + return o1.getAttribute("name").compareTo(o2.getAttribute("name")); + } + }); + showLiveData(records); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_measureTable_getLive_failure(), caught); + } + }); + } + + private void showLiveData(ArrayList<ListGridRecord> records) { + final Window liveDataWindow = new Window(); + liveDataWindow.setTitle(MSG.view_measureTable_live_title()); + liveDataWindow.setShowModalMask(true); + liveDataWindow.setShowMinimizeButton(false); + liveDataWindow.setShowMaximizeButton(true); + liveDataWindow.setShowCloseButton(true); + liveDataWindow.setShowResizer(true); + liveDataWindow.setCanDragResize(true); + liveDataWindow.setDismissOnEscape(true); + liveDataWindow.setIsModal(true); + liveDataWindow.setWidth(700); + liveDataWindow.setHeight(425); + liveDataWindow.setAutoCenter(true); + liveDataWindow.centerInPage(); + liveDataWindow.addCloseClickHandler(new CloseClickHandler() { + @Override + public void onCloseClick(CloseClickEvent event) { + liveDataWindow.destroy(); + metricsTableView.refreshTableInfo(); + } + }); + + ListGrid liveDataGrid = new ListGrid(); + liveDataGrid.setShowAllRecords(true); + liveDataGrid.setData(records.toArray(new ListGridRecord[records.size()])); + liveDataGrid.setSelectionType(SelectionStyle.NONE); + ListGridField name = new ListGridField("name", MSG.common_title_metric()); + ListGridField value = new ListGridField("value", MSG.common_title_value()); + liveDataGrid.setFields(name, value); + + liveDataWindow.addItem(liveDataGrid); + liveDataWindow.show(); + } + + } + + @Override + /** + * Redraw Graphs in this context means to refresh the table and redraw open graphs. + */ + public void redrawGraphs() { + Log.debug("MetricsView.redrawGraphs."); + + new Timer() { + + @Override + public void run() { + BrowserUtility.graphSparkLines(); + } + }.schedule(150); + + } + + public class MetricsTableListGrid extends ListGrid { + + private static final int TREEVIEW_DETAIL_CHART_HEIGHT = 205; + private static final int NUM_METRIC_POINTS = 60; + private Resource resource; + final MetricsTableView metricsTableView; + + public MetricsTableListGrid(final MetricsTableView metricsTableView, final Resource resource) { + super(); + this.resource = resource; + this.metricsTableView = metricsTableView; + setCanExpandRecords(true); + setCanExpandMultipleRecords(true); + setExpansionMode(ExpansionMode.DETAIL_FIELD); + + addRecordExpandHandler(new RecordExpandHandler() { + @Override + public void onRecordExpand(RecordExpandEvent recordExpandEvent) { + metricsTableView.expandedRows.add(recordExpandEvent.getRecord().getAttributeAsInt( + MetricsViewDataSource.FIELD_METRIC_DEF_ID)); + redrawGraphs(); + } + + }); + addRecordCollapseHandler(new RecordCollapseHandler() { + @Override + public void onRecordCollapse(RecordCollapseEvent recordCollapseEvent) { + metricsTableView.expandedRows.remove(recordCollapseEvent.getRecord().getAttributeAsInt( + MetricsViewDataSource.FIELD_METRIC_DEF_ID)); + redrawGraphs(); + } + }); + addSortChangedHandler(new SortChangedHandler() { + @Override + public void onSortChanged(SortEvent sortEvent) { + redrawGraphs(); + } + }); + addDataArrivedHandler(new DataArrivedHandler() { + @Override + public void onDataArrived(DataArrivedEvent dataArrivedEvent) { + int startRow = dataArrivedEvent.getStartRow(); + int endRow = dataArrivedEvent.getEndRow(); + for (int i = startRow; i < endRow; i++) { + if (null != metricsTableView.expandedRows + && metricsTableView.expandedRows.contains(getRecord(i).getAttributeAsInt( + MetricsViewDataSource.FIELD_METRIC_DEF_ID))) { + expandRecord(getRecord(i)); + } + } + } + }); + + } + + @Override + protected Canvas getExpansionComponent(final ListGridRecord record) { + final Integer definitionId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); + final Integer resourceId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_RESOURCE_ID); + VLayout vLayout = new VLayout(); + vLayout.setPadding(5); + + final String chartId = "rChart-" + resourceId + "-" + definitionId; + HTMLFlow htmlFlow = new HTMLFlow(MetricD3Graph.createGraphMarkerTemplate(chartId, + TREEVIEW_DETAIL_CHART_HEIGHT)); + vLayout.addMember(htmlFlow); + + int[] definitionArrayIds = new int[1]; + definitionArrayIds[0] = definitionId; + GWTServiceLookup.getMeasurementDataService().findDataForResource(resourceId, definitionArrayIds, + measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, NUM_METRIC_POINTS, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + Log.warn("Error retrieving recent metrics charting data for resource [" + resourceId + "]:" + + caught.getMessage()); + } + + @Override + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> results) { + if (!results.isEmpty()) { + + //load the data results for the given metric definition + List<MeasurementDataNumericHighLowComposite> measurementList = results.get(0); + + MeasurementDefinition measurementDefinition = null; + for (MeasurementDefinition definition : resource.getResourceType().getMetricDefinitions()) { + if (definition.getId() == definitionId) { + measurementDefinition = definition; + break; + } + } + + MetricGraphData metricGraphData = MetricGraphData.createForResource(resourceId, + resource.getName(), measurementDefinition, measurementList, null); + metricGraphData.setHideLegend(true); + + StackedBarMetricGraphImpl graph = GWT.create(StackedBarMetricGraphImpl.class); + graph.setMetricGraphData(metricGraphData); + final MetricD3Graph graphView = new MetricD3Graph(graph, abstractD3GraphListView); + new Timer() { + @Override + public void run() { + graphView.drawJsniChart(); + BrowserUtility.graphSparkLines(); + + } + }.schedule(150); + + } else { + Log.warn("No chart data retrieving for resource [" + resourceId + "-" + definitionId + "]"); + + } + } + }); + + return vLayout; + } + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java new file mode 100644 index 0000000..5c2fe25 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java @@ -0,0 +1,307 @@ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Set; + +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.criteria.Criteria; +import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.measurement.MeasurementSchedule; +import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; +import org.rhq.core.domain.measurement.ui.MetricDisplaySummary; +import org.rhq.core.domain.measurement.ui.MetricDisplayValue; +import org.rhq.core.domain.resource.Resource; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; +import org.rhq.enterprise.gui.coregui.client.util.async.Command; +import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; +import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; + +/** + * A simple data source to read in metric data summaries for a resource. + * This doesn't support paging - everything is returned in one query. Since + * the number of metrics per resource is relatively small (never more than tens of them), + * we just load them all in at once. + * + * @author John Mazzitelli + * @author Mike Thompson + */ +public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, Criteria> { + + private static final int NUMBER_OF_METRIC_POINTS = 60; + public static final String FIELD_SPARKLINE = "sparkline"; + public static final String FIELD_METRIC_LABEL = "label"; + public static final String FIELD_ALERT_COUNT = "alertCount"; + public static final String FIELD_MIN_VALUE = "min"; + public static final String FIELD_MAX_VALUE = "max"; + public static final String FIELD_AVG_VALUE = "avg"; + public static final String FIELD_LAST_VALUE = "last"; + public static final String FIELD_METRIC_DEF_ID = "defId"; + public static final String FIELD_METRIC_SCHED_ID = "schedId"; + public static final String FIELD_METRIC_UNITS = "units"; + public static final String FIELD_METRIC_NAME = "name"; + public static final String FIELD_RESOURCE_ID = "resourceId"; + private final Resource resource; + private List<MetricDisplaySummary> metricDisplaySummaries; + private List<List<MeasurementDataNumericHighLowComposite>> metricsDataList; + private int[] definitionArrayIds; + private final MeasurementUserPreferences measurementUserPrefs; + + public MetricsViewDataSource(Resource resource) { + this.resource = resource; + measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); + } + + /** + * The view that contains the list grid which will display this datasource's data will call this + * method to get the field information which is used to control the display of the data. + * + * @return list grid fields used to display the datasource data + */ + public ArrayList<ListGridField> getListGridFields() { + ArrayList<ListGridField> fields = new ArrayList<ListGridField>(7); + + ListGridField sparklineField = new ListGridField(FIELD_SPARKLINE, MSG.chart_metrics_sparkline_header()); + sparklineField.setCellFormatter(new CellFormatter() { + @Override + public String format(Object value, ListGridRecord record, int rowNum, int colNum) { + if (value == null) { + return ""; + } + String contents = "<span id='sparkline_" + resource.getId() + "-" + + record.getAttributeAsInt(FIELD_METRIC_DEF_ID) + "' class='dynamicsparkline' width='70' " + + "values='" + record.getAttribute(FIELD_SPARKLINE) + "'></span>"; + return contents; + + } + }); + + sparklineField.setWidth(80); + fields.add(sparklineField); + + ListGridField nameField = new ListGridField(FIELD_METRIC_LABEL, MSG.common_title_name()); + nameField.setWidth("30%"); + fields.add(nameField); + + ListGridField minField = new ListGridField(FIELD_MIN_VALUE, MSG.view_resource_monitor_table_min()); + minField.setWidth("15%"); + fields.add(minField); + + ListGridField maxField = new ListGridField(FIELD_MAX_VALUE, MSG.view_resource_monitor_table_max()); + maxField.setWidth("15%"); + fields.add(maxField); + + ListGridField avgField = new ListGridField(FIELD_AVG_VALUE, MSG.view_resource_monitor_table_avg()); + avgField.setWidth("15%"); + fields.add(avgField); + + ListGridField lastField = new ListGridField(FIELD_LAST_VALUE, MSG.view_resource_monitor_table_last()); + lastField.setWidth("15%"); + fields.add(lastField); + + ListGridField alertsField = new ListGridField(FIELD_ALERT_COUNT, MSG.common_title_alerts()); + alertsField.setWidth("10%"); + fields.add(alertsField); + + return fields; + } + + @Override + public MetricDisplaySummary copyValues(Record from) { + // we should never need this method - we only go in one direction + // if we ever need this, just have copyValues store an "object" attribute whose value is "from" + // which this method then just reads out. Since we don't need this now, save memory by not + // keeping the MetricDisplayValue around + return null; + } + + @Override + public ListGridRecord copyValues(MetricDisplaySummary from) { + MeasurementUtility.formatSimpleMetrics(from); + + ListGridRecord record = new ListGridRecord(); + record.setAttribute(FIELD_SPARKLINE, getCsvMetricsForSparkline(from.getDefinitionId())); + record.setAttribute(FIELD_METRIC_LABEL, from.getLabel()); + record.setAttribute(FIELD_ALERT_COUNT, String.valueOf(from.getAlertCount())); + record.setAttribute(FIELD_MIN_VALUE, getMetricStringValue(from.getMinMetric())); + record.setAttribute(FIELD_MAX_VALUE, getMetricStringValue(from.getMaxMetric())); + record.setAttribute(FIELD_AVG_VALUE, getMetricStringValue(from.getAvgMetric())); + record.setAttribute(FIELD_LAST_VALUE, getMetricStringValue(from.getLastMetric())); + record.setAttribute(FIELD_METRIC_DEF_ID, from.getDefinitionId()); + record.setAttribute(FIELD_METRIC_SCHED_ID, from.getScheduleId()); + record.setAttribute(FIELD_METRIC_UNITS, from.getUnits()); + record.setAttribute(FIELD_METRIC_NAME, from.getMetricName()); + record.setAttribute(FIELD_RESOURCE_ID, resource.getId()); + return record; + } + + private String getCsvMetricsForSparkline(int definitionId) { + StringBuilder sb = new StringBuilder(); + List<MeasurementDataNumericHighLowComposite> selectedMetricsList = getMeasurementsForMeasurementDefId(definitionId); + + for (int i = 0; i < selectedMetricsList.size(); i++) { + MeasurementDataNumericHighLowComposite measurementData = selectedMetricsList.get(i); + if (!Double.isNaN(measurementData.getValue())) { + sb.append((int) measurementData.getValue()); + sb.append(","); + } + } + + if (sb.toString().endsWith(",")) { + sb.setLength(sb.length() - 1); + } + + return sb.toString(); + } + + List<MeasurementDataNumericHighLowComposite> getMeasurementsForMeasurementDefId(int definitionId) { + int selectedIndex = 0; + + // find the ordinal position as specified when querying the metrics + for (int i = 0; i < definitionArrayIds.length; i++) { + if (definitionArrayIds[i] == definitionId) { + selectedIndex = i; + break; + } + } + + return metricsDataList.get(selectedIndex); + } + + protected String getMetricStringValue(MetricDisplayValue value) { + return (value != null) ? value.toString() : ""; + } + + @Override + protected Criteria getFetchCriteria(DSRequest request) { + // NOTE: we don't use criterias for this datasource, just return null + return null; + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, final Criteria unused) { + + GWTServiceLookup.getMeasurementScheduleService().findSchedulesForResourceAndType(resource.getId(), + DataType.MEASUREMENT, null, true, new AsyncCallback<ArrayList<MeasurementSchedule>>() { + @Override + public void onSuccess(ArrayList<MeasurementSchedule> measurementSchedules) { + int[] scheduleIds = new int[measurementSchedules.size()]; + int i = 0; + for (MeasurementSchedule measurementSchedule : measurementSchedules) { + scheduleIds[i++] = measurementSchedule.getId(); + } + + final CountDownLatch countDownLatch = CountDownLatch.create(2, new Command() { + + @Override + public void execute() { + response.setData(buildRecords(metricDisplaySummaries)); + processResponse(request.getRequestId(), response); + + new Timer() { + + @Override + public void run() { + BrowserUtility.graphSparkLines(); + } + }.schedule(150); + } + }); + + queryResourceMetrics(resource, measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, countDownLatch); + queryMetricDisplaySummaries(scheduleIds, measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, countDownLatch); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError("Cannot load schedules", caught); + } + }); + } + + private void queryMetricDisplaySummaries(int[] scheduleIds, Long startTime, Long endTime, + final CountDownLatch countDownLatch) { + GWTServiceLookup.getMeasurementChartsService().getMetricDisplaySummariesForResource(resource.getId(), + scheduleIds, startTime, endTime, new AsyncCallback<ArrayList<MetricDisplaySummary>>() { + @Override + public void onSuccess(ArrayList<MetricDisplaySummary> metricDisplaySummaries) { + setMetricDisplaySummaries(metricDisplaySummaries); + countDownLatch.countDown(); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError("Cannot load metrics", caught); + countDownLatch.countDown(); + } + } + + ); + } + + void setMetricDisplaySummaries(List<MetricDisplaySummary> metricDisplaySummaries) { + this.metricDisplaySummaries = metricDisplaySummaries; + } + + public void queryResourceMetrics(final Resource resource, Long startTime, Long endTime, + final CountDownLatch countDownLatch) { + Set<MeasurementDefinition> definitions = resource.getResourceType().getMetricDefinitions(); + + //build id mapping for measurementDefinition instances Ex. Free Memory -> MeasurementDefinition[100071] + final HashMap<String, MeasurementDefinition> measurementDefMap = new HashMap<String, MeasurementDefinition>(); + for (MeasurementDefinition definition : definitions) { + measurementDefMap.put(definition.getDisplayName(), definition); + } + //bundle definition ids for asynch call. + definitionArrayIds = new int[definitions.size()]; + final String[] displayOrder = new String[definitions.size()]; + measurementDefMap.keySet().toArray(displayOrder); + //sort the charting data ex. Free Memory, Free Swap Space,..System Load + Arrays.sort(displayOrder); + + //organize definitionArrayIds for ordered request on server. + int index = 0; + for (String definitionToDisplay : displayOrder) { + definitionArrayIds[index++] = measurementDefMap.get(definitionToDisplay).getId(); + } + + GWTServiceLookup.getMeasurementDataService().findDataForResource(resource.getId(), definitionArrayIds, + startTime, endTime, NUMBER_OF_METRIC_POINTS, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + Log.warn("Error retrieving recent metrics charting data for resource [" + resource.getId() + "]:" + + caught.getMessage()); + } + + @Override + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> measurementDataList) { + + if (null != measurementDataList && !measurementDataList.isEmpty()) { + metricsDataList = measurementDataList; + countDownLatch.countDown(); + } + } + }); + + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java new file mode 100644 index 0000000..9d6b892 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java @@ -0,0 +1,208 @@ +/* + * RHQ Management Platform + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.FormItem; +import com.smartgwt.client.widgets.form.fields.StaticTextItem; + +import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.composite.ResourceAvailabilitySummary; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; + +/** + * This shows the availability history for a resource. + * + * @author Jay Shaughnessy + * @author John Mazzitelli + * @author Mike Thompson + */ +public class ResourceMetricAvailabilityView extends EnhancedVLayout { + + private Resource resource; + private StaticTextItem currentField; + private StaticTextItem availField; + private StaticTextItem availTimeField; + private StaticTextItem downField; + private StaticTextItem downTimeField; + private StaticTextItem disabledField; + private StaticTextItem disabledTimeField; + private StaticTextItem failureCountField; + private StaticTextItem disabledCountField; + private StaticTextItem mtbfField; + private StaticTextItem mttrField; + private StaticTextItem unknownField; + private StaticTextItem currentTimeField; + + public ResourceMetricAvailabilityView(Resource resource) { + super(); + + this.resource = resource; + + setWidth100(); + setHeight(165); + } + + @Override + protected void onInit() { + super.onInit(); + + addMember(createSummaryForm()); + } + + private DynamicForm createSummaryForm() { + DynamicForm form = new DynamicForm(); + form.setWidth100(); + form.setAutoHeight(); + form.setMargin(10); + form.setNumCols(4); + + // row 1 + currentField = new StaticTextItem("current", MSG.view_resource_monitor_availability_currentStatus()); + currentField.setWrapTitle(false); + currentField.setColSpan(4); + + // row 2 + availField = new StaticTextItem("avail", MSG.view_resource_monitor_availability_availability()); + availField.setWrapTitle(false); + prepareTooltip(availField, MSG.view_resource_monitor_availability_availability_tooltip()); + + availTimeField = new StaticTextItem("availTime", MSG.view_resource_monitor_availability_uptime()); + availTimeField.setWrapTitle(false); + prepareTooltip(availTimeField, MSG.view_resource_monitor_availability_uptime_tooltip()); + + // row 3 + downField = new StaticTextItem("down", MSG.view_resource_monitor_availability_down()); + downField.setWrapTitle(false); + prepareTooltip(downField, MSG.view_resource_monitor_availability_down_tooltip()); + + downTimeField = new StaticTextItem("downTime", MSG.view_resource_monitor_availability_downtime()); + downTimeField.setWrapTitle(false); + prepareTooltip(downTimeField, MSG.view_resource_monitor_availability_downtime_tooltip()); + + // row 4 + disabledField = new StaticTextItem("disabled", MSG.view_resource_monitor_availability_disabled()); + disabledField.setWrapTitle(false); + prepareTooltip(disabledField, MSG.view_resource_monitor_availability_disabled_tooltip()); + + disabledTimeField = new StaticTextItem("disabledTime", MSG.view_resource_monitor_availability_disabledTime()); + disabledTimeField.setWrapTitle(false); + prepareTooltip(disabledTimeField, MSG.view_resource_monitor_availability_disabledTime_tooltip()); + + // row 5 + failureCountField = new StaticTextItem("failureCount", MSG.view_resource_monitor_availability_numFailures()); + failureCountField.setWrapTitle(false); + prepareTooltip(failureCountField, MSG.view_resource_monitor_availability_numFailures_tooltip()); + + disabledCountField = new StaticTextItem("disabledCount", MSG.view_resource_monitor_availability_numDisabled()); + disabledCountField.setWrapTitle(false); + prepareTooltip(disabledCountField, MSG.view_resource_monitor_availability_numDisabled_tooltip()); + + // row 6 + mtbfField = new StaticTextItem("mtbf", MSG.view_resource_monitor_availability_mtbf()); + mtbfField.setWrapTitle(false); + prepareTooltip(mtbfField, MSG.view_resource_monitor_availability_mtbf_tooltip()); + + mttrField = new StaticTextItem("mttr", MSG.view_resource_monitor_availability_mttr()); + mttrField.setWrapTitle(false); + prepareTooltip(mttrField, MSG.view_resource_monitor_availability_mttr_tooltip()); + + // row 7 + unknownField = new StaticTextItem("unknown"); + unknownField.setWrapTitle(false); + unknownField.setColSpan(4); + unknownField.setShowTitle(false); + + // row 8 + currentTimeField = new StaticTextItem("currentTime"); + currentTimeField.setWrapTitle(false); + currentTimeField.setColSpan(4); + currentTimeField.setShowTitle(false); + + form.setItems(currentField, availField, availTimeField, downField, downTimeField, disabledField, + disabledTimeField, failureCountField, disabledCountField, mtbfField, mttrField, unknownField, + currentTimeField); + + reloadSummaryData(); + + return form; + } + + private void reloadSummaryData() { + GWTServiceLookup.getResourceService().getResourceAvailabilitySummary(resource.getId(), + new AsyncCallback<ResourceAvailabilitySummary>() { + + @Override + public void onSuccess(ResourceAvailabilitySummary result) { + + currentField.setValue(MSG.view_resource_monitor_availability_currentStatus_value(result + .getCurrent().getName(), TimestampCellFormatter.format(result.getLastChange().getTime()))); + availField.setValue(MeasurementConverterClient.format(result.getUpPercentage(), + MeasurementUnits.PERCENTAGE, true)); + availTimeField.setValue(MeasurementConverterClient.format((double) result.getUpTime(), + MeasurementUnits.MILLISECONDS, true)); + downField.setValue(MeasurementConverterClient.format(result.getDownPercentage(), + MeasurementUnits.PERCENTAGE, true)); + downTimeField.setValue(MeasurementConverterClient.format((double) result.getDownTime(), + MeasurementUnits.MILLISECONDS, true)); + disabledField.setValue(MeasurementConverterClient.format(result.getDisabledPercentage(), + MeasurementUnits.PERCENTAGE, true)); + disabledTimeField.setValue(MeasurementConverterClient.format((double) result.getDisabledTime(), + MeasurementUnits.MILLISECONDS, true)); + failureCountField.setValue(result.getFailures()); + disabledCountField.setValue(result.getDisabled()); + mtbfField.setValue(MeasurementConverterClient.format((double) result.getMTBF(), + MeasurementUnits.MILLISECONDS, true)); + mttrField.setValue(MeasurementConverterClient.format((double) result.getMTTR(), + MeasurementUnits.MILLISECONDS, true)); + + if (result.getUnknownTime() > 0L) { + unknownField.setValue(MSG.view_resource_monitor_availability_unknown(MeasurementConverterClient + .format((double) result.getUnknownTime(), MeasurementUnits.MILLISECONDS, true))); + } else { + unknownField.setValue(""); + } + + currentTimeField.setValue(MSG.view_resource_monitor_availability_currentAsOf(TimestampCellFormatter + .format(result.getCurrentTime()))); + } + + @Override + public void onFailure(Throwable caught) { + currentField.setValue(MSG.common_label_error()); + CoreGUI.getErrorHandler() + .handleError(MSG.view_resource_monitor_availability_summaryError(), caught); + } + }); + } + + private void prepareTooltip(FormItem item, String tooltip) { + item.setHoverWidth(400); + item.setPrompt(tooltip); + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java index 1edd076..94fd1e8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java @@ -26,7 +26,6 @@ import com.smartgwt.client.data.fields.DataSourceTextField; import com.smartgwt.client.widgets.form.fields.events.KeyUpEvent; import com.smartgwt.client.widgets.grid.HoverCustomizer; import com.smartgwt.client.widgets.grid.ListGrid; -import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; import com.smartgwt.client.widgets.grid.events.RecordClickEvent; @@ -89,17 +88,14 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { */ @Override public void onRecordClick(RecordClickEvent event) { - Log.debug("BasicSearchStrategy click"); String kind = event.getRecord().getAttribute(ATTR_KIND); String searchExpression; if (kind.equals("SAVED") || kind.equals("GLOBAL")) { - Log.debug("Saved or Global Search Click"); searchExpression = event.getRecord().getAttribute(ATTR_PATTERN); } else { - Log.debug("Regular Search Click"); searchExpression = event.getRecord().getAttribute(ATTR_NAME); } @@ -112,14 +108,12 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { @Override public void searchFocusHandler() { - Log.debug("focus in BasicSearchStrategy"); String searchExpression = searchBar.getSearchTextItem().getValueAsString(); doSearch(searchExpression); } @Override public void searchKeyUpHandler(KeyUpEvent keyUpEvent) { - Log.debug("Keyup in BasicSearchStrategy: " + keyUpEvent.getKeyName()); String searchExpression = searchBar.getSearchTextItem().getValueAsString(); doSearch(searchExpression); } @@ -131,20 +125,16 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { private void doSearch(String searchExpression) { if (isSearchInProgress) { - Log.debug("Adding pending search [" + searchExpression + "]"); pendingSearchExpression = (null == searchExpression) ? "" : searchExpression; return; } - Log.debug("Search Start"); isSearchInProgress = true; if (null == searchExpression || searchExpression.isEmpty()) { - Log.debug("Empty Search expression"); getSearchSuggestions(SearchSubsystem.RESOURCE, null, 0); } else { - Log.debug("doSearch: " + searchExpression); getSearchSuggestions(SearchSubsystem.RESOURCE, searchBar.getSearchTextItem().getValueAsString(), searchBar .getSearchTextItem().getValueAsString().length()); } @@ -154,7 +144,6 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { final long suggestStart = System.currentTimeMillis(); - Log.debug("Searching for: " + expression); searchService.getTabAwareSuggestions(searchSubsystem, expression, caretPosition, null, new AsyncCallback<List<SearchSuggestion>>() { @@ -179,7 +168,6 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { ds.setFields(idField, valueField); searchBarPickListGrid.setDataSource(ds); - ListGridField[] fields = searchBarPickListGrid.getAllFields(); searchBarPickListGrid.getField(ATTR_VALUE).setShowHover(true); searchBarPickListGrid.getField(ATTR_VALUE).setHoverCustomizer(new HoverCustomizer() { @@ -223,7 +211,7 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { searchBarPickListGrid.setData(new ListGridRecord[] {}); searchBarPickListGrid.fetchData(); } catch (Exception e) { - Log.debug("Caught exception on fetchData: " + e); + Log.info("Caught exception on fetchData: " + e); } long suggestFetchTime = System.currentTimeMillis() - suggestStart; @@ -250,7 +238,6 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { @Override public void onFailure(Throwable caught) { - Log.debug("Search End"); isSearchInProgress = false; pendingSearchExpression = null; CoreGUI.getErrorHandler().handleError(MSG.view_searchBar_suggest_failSuggest(), caught); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java index 10505e9..a069a5d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java @@ -31,5 +31,5 @@ import org.rhq.enterprise.gui.coregui.client.Messages; */ public interface Enhanced { - Messages MSG = CoreGUI.getMessages(); + final static Messages MSG = CoreGUI.getMessages(); } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 5a42502..040537d 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -20,6 +20,10 @@ chart_hover_period_label = Period chart_hover_start_label = Start chart_hover_time_format = %I:%M:%S %p chart_ie_not_supported = Charting is not available for this browser. +chart_metrics= Metrics +chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +chart_metrics_sparkline_header= Chart chart_no_data_label = No Data chart_single_value_label = Value chart_slider_button_bar_day = Day @@ -1816,6 +1820,7 @@ view_messageCenter_messageTime = Time view_messageCenter_messageTitle = Message Center view_messageCenter_noRecentMessages = No Recent Messages view_messageCenter_stackTraceFollows = --- STACK TRACE FOLLOWS --- +view_metric_addToDashboard = Add to Dashboard view_metric_traits = Traits view_metric_viewTraitHistory = Value History for Trait [{0}] view_operationHistoryDetails_dateCompleted = Date Completed @@ -2135,7 +2140,7 @@ view_titleBar_common_updateTagsSuccessful = The tags for [{0}] have been updated view_titleBar_group_failInfo = Failed to get general info on group [{0}] with ID [{1}] view_titleBar_group_summary_collapsedTooltip = Click to show more details for this group view_titleBar_group_summary_expandedTooltip = Click to hide details for this group -view_tree_common_contextMenu_addChartToDashboard = Add chart to dashboard [{0}] +view_tree_common_contextMenu_addChartToDashboard = Add Graph to Dashboard [{0}] view_tree_common_contextMenu_editPluginConfiguration = Edit [{0}] Plugin Configuration view_tree_common_contextMenu_editResourceConfiguration = Edit [{0}] Resource Configuration view_tree_common_contextMenu_groupGraph = Group Metric Graph diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 69c8452..2e23eff 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -48,6 +48,10 @@ chart_hover_date_format = %d.%m.%y ##chart_hover_start_label = Start chart_hover_time_format = %H:%M:%S ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_day = Day @@ -1828,6 +1832,7 @@ view_messageCenter_messageTime = Čas view_messageCenter_messageTitle = Centrum zpráv view_messageCenter_noRecentMessages = Žádné nové zprávy view_messageCenter_stackTraceFollows = --- VÝPIS ZÁSOBNÍKU NÍŽE --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = Vlastnosti view_metric_viewTraitHistory = Historie hodnot pro vlastnost [{0}] view_operationHistoryDetails_dateCompleted = Datum ukončení diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index ddd4686..b4fe981 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -23,6 +23,10 @@ chart_hover_period_label = Zeitraum chart_hover_start_label = Start chart_hover_time_format = %H:%M:%S chart_ie_not_supported = Charting ist bei diesem Browser nicht unterstützt +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart chart_no_data_label = Keine Daten vorhanden ##chart_single_value_label = Value chart_slider_button_bar_day = Tag @@ -1625,6 +1629,7 @@ view_messageCenter_messageTime = Zeitpukt view_messageCenter_messageTitle = Nachrichtencenter view_messageCenter_noRecentMessages = Keine aktuellen Nachrichten view_messageCenter_stackTraceFollows = --- STACK TRACE FOLGT --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = Traits view_metric_viewTraitHistory = Werteverlauf für Trait [{0}] ##view_operationCreateWizard_error_scheduleOperationFailure = Failed to schedule operation execution. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 49cc7e6..c1a8521 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -24,6 +24,10 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -1799,6 +1803,7 @@ view_messageCenter_messageTime = 時間 view_messageCenter_messageTitle = メッセージセンター view_messageCenter_noRecentMessages = 最近のメッセージはありません view_messageCenter_stackTraceFollows = --- スタックトレース --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = トレイト view_metric_viewTraitHistory = トレイト [{0}] のための値の履歴 view_operationHistoryDetails_dateCompleted = 完了日 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 89c10c0..2958fbe 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -22,6 +22,10 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -1539,6 +1543,7 @@ view_messageCenter_messageTime = 시간 view_messageCenter_messageTitle = 메시지 센터 view_messageCenter_noRecentMessages = 최근 메시지는 없습니다 view_messageCenter_stackTraceFollows = --- 스택 추적 --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = 특성 view_metric_viewTraitHistory = 특성 [{0}]에 대한 값 기록 view_operationHistoryDetails_dateCompleted = 완료일 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 26546fb..62f31f5 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -21,6 +21,10 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -1833,6 +1837,7 @@ view_messageCenter_messageTime = Tempo view_messageCenter_messageTitle = Centro de Mensagens view_messageCenter_noRecentMessages = N\u00E3o existem Mensagens Recentes view_messageCenter_stackTraceFollows = --- STACK TRACE FOLLOWS --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = Traits view_metric_viewTraitHistory = Value History for Trait [{0}] view_operationCreateWizard_button_execute = Execute diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 5692d33..eca8c24 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -21,6 +21,10 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -1728,6 +1732,7 @@ #view_messageCenter_messageTitle = Message Center #view_messageCenter_noRecentMessages = No Recent Messages #view_messageCenter_stackTraceFollows = --- STACK TRACE FOLLOWS --- +##view_metric_addToDashboard = Add to Dashboard #view_metric_traits = Traits #view_metric_viewTraitHistory = Value History for Trait [{0}] #view_operationHistoryDetails_dateCompleted = Date Completed diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index f126e51..e71f1fb 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -21,6 +21,10 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -1802,6 +1806,7 @@ view_messageCenter_messageTime = \u65f6\u95f4 view_messageCenter_messageTitle = \u6d88\u606f\u4e2d\u5fc3 view_messageCenter_noRecentMessages = \u65e0\u8fd1\u671f\u6d88\u606f view_messageCenter_stackTraceFollows = --- \u540e\u9762\u662f\u5f02\u5e38\u4fe1\u606f --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = \u7279\u5f81 view_metric_viewTraitHistory = Value History for Trait [{0}] view_operationHistoryDetails_dateCompleted = \u5b8c\u6210\u65e5\u671f diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js index 40c7ca8..ef65e69 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js +++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js @@ -38,9 +38,10 @@ if (!window.console.log) window.console.log = function () { * @param singleValueLabel * @param chartXaxisTimeFormatHours * @param chartXaxisTimeFormatHoursMinutes + * @param showLegend * @constructor */ -var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel, hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { +var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel, hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes, hideLegend) { "use strict"; if (!(this instanceof ChartContext)) { throw new Error("ChartContext function cannot be called as a function.") @@ -78,6 +79,7 @@ var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, char this.buttonBarDateTimeFormat = buttonBarDateTimeFormat; this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; + this.hideLegend = hideLegend; }, /** commit 1d740172121ae51d6a6c183a894710cc58b61619 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 25 18:06:07 2013 +0200 Bug 886126 - Datasource JNDI change takes too long to be propagated to JON server In EAP5, JNDI name is the key of Datasource and Connection Factory managed components. Consequently, there is no way to change the JNDI name of such components without creating a new managed component, which will in the end be discovered by RHQ. So in RHQ, jndi-name config property is now marked as read-only (it will still be required when creating a Datasource or a Connection Factory). diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml index 2b14f5b..9a53a80 100644 --- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml @@ -133,6 +133,7 @@ <!ENTITY datasourceConnectionResourceConfigProps ' <c:simple-property name="jndi-name" + readOnly="true" displayName="JNDI Name" description="The global JNDI Name under which to bind the datasource" type="string"/> @@ -502,7 +503,7 @@ --> <!ENTITY connectionFactoryConnectionResourceConfigProps ' - <c:simple-property required="true" name="jndi-name" displayName="JNDI Name" + <c:simple-property required="true" name="jndi-name" readOnly="true" displayName="JNDI Name" description="The global JNDI name to bind the connection factory under."/> <c:simple-property required="true" name="rar-name" displayName="RAR Name"> commit 8fa51829ab0467d8518b095d303528664c7f58a3 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Jul 25 17:17:27 2013 +0200 Make the parser check its input and bail out if it is not valid. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/helper/LinkDeserializer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/helper/LinkDeserializer.java index e9582d4..f320d09 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/helper/LinkDeserializer.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/helper/LinkDeserializer.java @@ -20,7 +20,11 @@ package org.rhq.enterprise.server.rest.helper; import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.codehaus.jackson.JsonLocation; +import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.JsonProcessingException; import org.codehaus.jackson.map.DeserializationContext; @@ -44,25 +48,47 @@ import org.rhq.enterprise.server.rest.domain.Link; */ public class LinkDeserializer extends JsonDeserializer<Link>{ + Pattern textPattern = Pattern.compile("\\S+"); // Non whitespace; could possibly be narrowed + @Override public Link deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { String tmp = jp.getText(); // { + validate(jp, tmp,"{"); jp.nextToken(); // skip over { to the rel String rel = jp.getText(); + validateText(jp, rel); jp.nextToken(); // skip over { tmp = jp.getText(); + validate(jp, tmp,"{"); jp.nextToken(); // skip over "href" tmp = jp.getText(); -// jp.nextToken(); // skip over : + validate(jp, tmp,"href"); jp.nextToken(); // skip to "http:// ... " String href = jp.getText(); + validateText(jp, href); jp.nextToken(); // skip } tmp = jp.getText(); + validate(jp, tmp, "}"); jp.nextToken(); // skip } + tmp = jp.getText(); + validate(jp, tmp, "}"); Link link = new Link(rel,href); return link; } + + private void validateText(JsonParser jsonParser, String input) throws JsonProcessingException { + Matcher m = textPattern.matcher(input); + if (!m.matches()) { + throw new JsonParseException("Unexpected token: " + input, jsonParser.getTokenLocation()); + } + } + + private void validate(JsonParser jsonParser, String input, String expected) throws JsonProcessingException { + if (!input.equals(expected)) { + throw new JsonParseException("Unexpected token: " + input, jsonParser.getTokenLocation()); + } + } } diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java index 3d39181..7789f9e 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java @@ -18,7 +18,6 @@ */ package org.rhq.modules.integrationTests.restApi; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -219,10 +218,61 @@ public class OperationsTest extends AbstractBase { .when() .delete("/operation/" + draftId); } + } + + @Test + public void testCatchBadLinkSerialization() throws Exception { + + // Test that when we get Links back in bad format, we + // correctly bail out. + + Operation draft = getADraftOperation(_platformId, discoveryDefinitionId); + + int draftId = draft.getId(); + draft.getParams().put("detailedDiscovery",true); + + String jsonWithBadLinkSer = // + "{\n" + + " \"id\": " + draftId + ",\n" + + " \"name\": \"discovery\",\n" + + " \"readyToSubmit\": false,\n" + + " \"resourceId\": " + _platformId + ",\n" + + " \"definitionId\": " + discoveryDefinitionId + ",\n" + + " \"params\": {\n" + + " \"detailedDiscovery\": true\n" + + " },\n" + + " \"links\": [\n" + + " {\n" + + " \"rel\": \"edit\",\n" + + " \"href\": \"http://localhost:7080/rest/operation/" + draftId + "\"\n" + + " }\n" + + " ]\n" + + "}"; + + try { + given() + .contentType(ContentType.JSON) + .pathParam("id", draftId) + .body(jsonWithBadLinkSer) + .log().everything() + .expect() + .statusCode(503) + .log().ifError() + .when() + .put("/operation/{id}"); + } finally { + // delete the draft again + expect() + .statusCode(204) + .when() + .delete("/operation/" + draftId); + } } + + @Test public void testCreateDraftOperationAndScheduleExecution() throws Exception { commit e2e18c6332505611c2b87e81b3369967a0c2a956 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Jul 25 14:57:07 2013 +0200 Add a LinkSerializer to send links in correct format (one could argue not to send links at all). diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java index 57c1a49..3d39181 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java @@ -318,8 +318,6 @@ public class OperationsTest extends AbstractBase { assert draft != null; assert draft.getDefinitionId() == definitionId; - draft.setLinks(new ArrayList<Link>()); // Clean out links TODO - System.out.println("--- Draft created --"); System.out.flush(); diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java index c3f7b2b..c199729 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java @@ -20,11 +20,13 @@ package org.rhq.modules.integrationTests.restApi.d; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * A Link inside objects * @author Heiko W. Rupp */ +@JsonSerialize(using = LinkSerializer.class) @JsonDeserialize(using = LinkDeserializer.class) public class Link { diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkSerializer.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkSerializer.java new file mode 100644 index 0000000..759c8dc --- /dev/null +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkSerializer.java @@ -0,0 +1,53 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.modules.integrationTests.restApi.d; + +import java.io.IOException; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +/** + * Special serializer for Link objects that does not map the classical {rel:abc, href:xyz} scheme, + * but which puts the rel name "at the outside" like { abc : { href : xyz }} to make it easier for + * clients to access the link. + * See also https://bugzilla.redhat.com/show_bug.cgi?id=845244 + * @author Heiko W. Rupp + * @see LinkDeserializer + */ +public class LinkSerializer extends JsonSerializer<Link> { + + @Override + public void serialize(Link link, JsonGenerator jsonGenerator, + SerializerProvider serializerProvider) throws IOException, JsonProcessingException { + + jsonGenerator.writeStartObject(); + jsonGenerator.writeFieldName(link.getRel()); + + jsonGenerator.writeStartObject(); + jsonGenerator.writeFieldName("href"); + jsonGenerator.writeString(link.getHref()); + jsonGenerator.writeEndObject(); + + jsonGenerator.writeEndObject(); + } +} commit 80144152f0d7b919df9cb09de7170250edb26b03 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Jul 25 12:55:54 2013 +0200 BZ 974963 Allow to schedule operations that have no parameters. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java index 5e8e68e..070675e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java @@ -303,12 +303,15 @@ public class OperationsHandlerBean extends AbstractRestBean { // Validate parameters ConfigurationDefinition parameterDefinition = opDef.getParametersConfigurationDefinition(); - List<String> errorMessages = ConfigurationHelper.checkConfigurationWrtDefinition(parameters, parameterDefinition); - - if (errorMessages.size()>0) { - // Configuration is not ok - operation.setReadyToSubmit(false); - throw new BadArgumentException("Validation of parameters failed", StringUtils.getListAsString(errorMessages,", ")); + if (parameterDefinition!=null) { + // There are parameters defined, so lets validate them. + List<String> errorMessages = ConfigurationHelper.checkConfigurationWrtDefinition(parameters, parameterDefinition); + + if (errorMessages.size()>0) { + // Configuration is not ok + operation.setReadyToSubmit(false); + throw new BadArgumentException("Validation of parameters failed", StringUtils.getListAsString(errorMessages,", ")); + } } } diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index 47bfe18..5d7bde5 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -18,7 +18,7 @@ <properties> <surefire-plugin.version>2.10</surefire-plugin.version> - <jackson.version>1.9.5</jackson.version> + <jackson.version>2.0.5</jackson.version> <rest-assured.version>1.8.1</rest-assured.version> </properties> @@ -53,15 +53,14 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> <version>${jackson.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> <version>${jackson.version}</version> <scope>test</scope> </dependency> diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java index 7800e5c..57c1a49 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java @@ -18,6 +18,7 @@ */ package org.rhq.modules.integrationTests.restApi; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -42,7 +43,8 @@ import static org.hamcrest.core.Is.is; */ public class OperationsTest extends AbstractBase { - private int definitionId; + private int discoveryDefinitionId; + private int viewPLDefinitionId; @Before public void setUp() throws Exception { @@ -58,15 +60,20 @@ public class OperationsTest extends AbstractBase { .when() .get("/operation/definitions"); - definitionId = -1; + discoveryDefinitionId = -1; List<Map<String,Object>> list = r.as(List.class); for (Map<String,Object> map : list) { - if (map.get("name").equals("discovery")) { - definitionId = (Integer) map.get("id"); + String name = (String) map.get("name"); + Integer id = (Integer) map.get("id"); + if (name.equals("discovery")) { + discoveryDefinitionId = id; + } + if (name.equals("viewProcessList")) { + viewPLDefinitionId = id; } } - assert definitionId !=-1 : "No discovery operation found"; + assert discoveryDefinitionId !=-1 : "No discovery operation found"; } @Test @@ -76,7 +83,7 @@ public class OperationsTest extends AbstractBase { given() .header(acceptJson) - .pathParam("did",definitionId) + .pathParam("did", discoveryDefinitionId) .expect() .statusCode(200) .body("name",is("discovery")) @@ -92,7 +99,7 @@ public class OperationsTest extends AbstractBase { given() .header(acceptJson) - .pathParam("did",-42) + .pathParam("did", -42) .expect() .statusCode(404) .when() @@ -107,7 +114,7 @@ public class OperationsTest extends AbstractBase { given() .header(acceptJson) - .queryParam("resourceId",42) + .queryParam("resourceId", 42) .expect() .statusCode(404) .when() @@ -134,7 +141,7 @@ public class OperationsTest extends AbstractBase { given() .header(acceptJson) - .pathParam("did",-42) + .pathParam("did", -42) .expect() .statusCode(406) .when() @@ -150,7 +157,7 @@ public class OperationsTest extends AbstractBase { given() .header(acceptJson) .queryParam("resourceId", 42) - .pathParam("definitionId", definitionId) + .pathParam("definitionId", discoveryDefinitionId) .expect() .statusCode(404) .when() @@ -164,7 +171,7 @@ public class OperationsTest extends AbstractBase { given() .header(acceptJson) - .pathParam("definitionId", definitionId) + .pathParam("definitionId", discoveryDefinitionId) .expect() .statusCode(406) .when() @@ -174,20 +181,7 @@ public class OperationsTest extends AbstractBase { @Test public void testCreateDraftOperation() throws Exception { - Operation draft = - given() - .header(acceptJson) - .pathParam("definitionId",definitionId) - .queryParam("resourceId",_platformId) - .expect() - .statusCode(200) - .log().ifError() - .when() - .post("/operation/definition/{definitionId}") - .as(Operation.class); - - assert draft != null; - assert draft.getDefinitionId() == definitionId; + Operation draft = getADraftOperation(_platformId, discoveryDefinitionId); int draftId = draft.getId(); @@ -202,29 +196,17 @@ public class OperationsTest extends AbstractBase { @Test public void testCreateAndUpdateDraftOperation() throws Exception { - Operation draft = - given() - .header(acceptJson) - .pathParam("definitionId",definitionId) - .queryParam("resourceId",_platformId) - .expect() - .statusCode(200) - .log().ifError() - .when() - .post("/operation/definition/{definitionId}") - .as(Operation.class); - - assert draft != null; - assert draft.getDefinitionId() == definitionId; + Operation draft = getADraftOperation(_platformId, discoveryDefinitionId); int draftId = draft.getId(); - draft.getParams().put("detailed",true); + draft.getParams().put("detailedDiscovery",true); try { given() .contentType(ContentType.JSON) .pathParam("id", draftId) .body(draft) + .log().everything() .expect() .statusCode(200) .log().ifError() @@ -246,25 +228,51 @@ public class OperationsTest extends AbstractBase { int platformId = findIdOfARealPlatform(); - Operation draft = + Operation draft = getADraftOperation(platformId, discoveryDefinitionId); + + int draftId = draft.getId(); + + draft.setReadyToSubmit(true); + draft.getParams().put("detailedDiscovery", false); + + // update to schedule + Operation scheduled = given() - .header(acceptJson) - .pathParam("definitionId",definitionId) - .queryParam("resourceId",platformId) + .contentType(ContentType.JSON) + .pathParam("id",draftId) + .body(draft) .expect() .statusCode(200) .log().ifError() .when() - .post("/operation/definition/{definitionId}") + .put("/operation/{id}") .as(Operation.class); - assert draft != null; - assert draft.getDefinitionId() == definitionId; + System.out.println(scheduled.getId()); + String history = findHistoryItem(scheduled); + + String historyId = history.substring(history.lastIndexOf("/")+1); + try { + waitAndCheckStatus(platformId, historyId); + + } finally { + + // Wait until the operation has finished and then delete + waitForTerminationAndDelete(historyId); + + } + } + + @Test + public void testCreateDraftOperationNoParamsAndScheduleExecution() throws Exception { + + int platformId = findIdOfARealPlatform(); + + Operation draft = getADraftOperation(platformId, viewPLDefinitionId); int draftId = draft.getId(); draft.setReadyToSubmit(true); - draft.getParams().put("detailedDiscovery", false); // update to schedule Operation scheduled = @@ -280,6 +288,45 @@ public class OperationsTest extends AbstractBase { .as(Operation.class); System.out.println(scheduled.getId()); + String history = findHistoryItem(scheduled); + + String historyId = history.substring(history.lastIndexOf("/")+1); + try { + waitAndCheckStatus(platformId, historyId); + + } finally { + + // Wait until the operation has finished and then delete + waitForTerminationAndDelete(historyId); + + } + } + + private Operation getADraftOperation(int platformId, int definitionId) { + Operation draft = + given() + .header(acceptJson) + .pathParam("definitionId", definitionId) + .queryParam("resourceId",platformId) + .expect() + .statusCode(200) + .log().ifError() + .when() + .post("/operation/definition/{definitionId}") + .as(Operation.class); + + assert draft != null; + assert draft.getDefinitionId() == definitionId; + + draft.setLinks(new ArrayList<Link>()); // Clean out links TODO + + System.out.println("--- Draft created --"); + System.out.flush(); + + return draft; + } + + private String findHistoryItem(Operation scheduled) { String history = null; List<Link> links = scheduled.getLinks(); for (Link link : links) { @@ -288,76 +335,74 @@ public class OperationsTest extends AbstractBase { } } assert history != null; + return history; + } - String historyId = history.substring(history.lastIndexOf("/")+1); - try { - Thread.sleep(15000); // we need to wait a little as the execution may take time + private void waitAndCheckStatus(int platformId, String historyId) throws InterruptedException { + Thread.sleep(15000); // we need to wait a little as the execution may take time - given() - .pathParam("hid",historyId) - .expect() - .statusCode(200) - .log().ifError() - .when() - .get("/operation/history/{hid}"); + given() + .pathParam("hid", historyId) + .expect() + .statusCode(200) + .log().ifError() + .when() + .get("/operation/history/{hid}"); + + // See if we also find it when we are looking for histories on the resource + Response response = + given() + .queryParam("resourceId", platformId) + .header(acceptJson) + .expect() + .statusCode(200) + .log().ifError() + .when() + .get("/operation/history"); - // See if we also find it when we are looking for histories on the resource + // compare + List<Map<String,Object>> list = response.as(List.class); + boolean found = false; + for (Map<String,Object> map : list) { + if (map.get("jobId").equals(historyId)) { + found = true; + } + } + assert found; + } + + private void waitForTerminationAndDelete(String historyId) throws InterruptedException { + boolean done = false; + int count = 0; + while (!done) { Response response = given() - .queryParam("resourceId",platformId) .header(acceptJson) - .expect() - .statusCode(200) - .log().ifError() + .pathParam("hid", historyId) .when() - .get("/operation/history"); - - // compare - List<Map<String,Object>> list = response.as(List.class); - boolean found = false; - for (Map<String,Object> map : list) { - if (map.get("jobId").equals(historyId)) { - found = true; - } - } - assert found; + .get("/operation/history/{hid}"); - } finally { + JsonPath jsonPath = response.jsonPath(); + String status= jsonPath.getString("status"); + int code = response.statusCode(); - // Wait until the operation has finished and then delete - boolean done = false; - int count = 0; - while (!done) { - Response response = - given() - .header(acceptJson) - .pathParam("hid", historyId) - .when() - .get("/operation/history/{hid}"); - - JsonPath jsonPath = response.jsonPath(); - String status= jsonPath.getString("status"); - int code = response.statusCode(); - - if (code==200 && (status.equals("Success") || status.equals("Failed"))) { - done = true; - } else { - Thread.sleep(2000); - } - count ++; - assert count < 10 :"Waited for 20sec -- something is wrong"; + if (code==200 && (status.equals("Success") || status.equals("Failed"))) { + done = true; + } else { + Thread.sleep(2000); } - - // Delete the history item - given() - .pathParam("hid",historyId) - .expect() - .statusCode(204) - .log().ifError() - .when() - .delete("/operation/history/{hid}"); - + count ++; + assert count < 10 :"Waited for 20sec -- something is wrong"; } + + // Delete the history item + given() + .pathParam("hid", historyId) + .expect() + .statusCode(204) + .log().ifError() + .when() + .delete("/operation/history/{hid}"); } @Test @@ -365,20 +410,7 @@ public class OperationsTest extends AbstractBase { int platformId = findIdOfARealPlatform(); - Operation draft = - given() - .header(acceptJson) - .pathParam("definitionId",definitionId) - .queryParam("resourceId",platformId) - .expect() - .statusCode(200) - .log().ifError() - .when() - .post("/operation/definition/{definitionId}") - .as(Operation.class); - - assert draft != null; - assert draft.getDefinitionId() == definitionId; + Operation draft = getADraftOperation(platformId, discoveryDefinitionId); int draftId = draft.getId(); @@ -423,20 +455,7 @@ public class OperationsTest extends AbstractBase { int platformId = findIdOfARealPlatform(); - Operation draft = - given() - .header(acceptJson) - .pathParam("definitionId",definitionId) - .queryParam("resourceId",platformId) - .expect() - .statusCode(200) - .log().ifError() - .when() - .post("/operation/definition/{definitionId}") - .as(Operation.class); - - assert draft != null; - assert draft.getDefinitionId() == definitionId; + Operation draft = getADraftOperation(platformId, discoveryDefinitionId); int draftId = draft.getId(); diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java index e16213c..c3f7b2b 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java @@ -19,7 +19,7 @@ package org.rhq.modules.integrationTests.restApi.d; -import org.codehaus.jackson.map.annotate.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** * A Link inside objects diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkDeserializer.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkDeserializer.java index 5d45724..c138761 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkDeserializer.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkDeserializer.java @@ -21,19 +21,19 @@ package org.rhq.modules.integrationTests.restApi.d; import java.io.IOException; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonProcessingException; -import org.codehaus.jackson.ObjectCodec; -import org.codehaus.jackson.map.DeserializationContext; -import org.codehaus.jackson.map.JsonDeserializer; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; /** * Custom deserializer for link object that are now in the form { relname : { "href": link}} * * @author Heiko W. Rupp */ -public class LinkDeserializer extends JsonDeserializer<Link>{ +public class LinkDeserializer extends JsonDeserializer<Link> { @Override public Link deserialize(JsonParser jsonParser, @@ -41,8 +41,8 @@ public class LinkDeserializer extends JsonDeserializer<Link>{ ObjectCodec oc = jsonParser.getCodec(); JsonNode node = oc.readTree(jsonParser); - String rel = node.getFieldNames().next(); - String href = node.getElements().next().get("href").getTextValue(); + String rel = node.fieldNames().next(); + String href = node.elements().next().get("href").textValue(); return new Link(rel,href); commit 9e805285971e53b4483db2a6f15e5ae9c81d884f Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 25 16:50:06 2013 +0200 Make CassandraNodeComponent shutdown operation wait for server to go down (unless running on OSX) diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 37aa425..3e55a93 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -68,6 +68,7 @@ import org.rhq.core.pluginapi.util.ProcessExecutionUtility; import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.ProcessInfo; +import org.rhq.core.system.ProcessInfo.ProcessInfoSnapshot; import org.rhq.core.system.SystemInfo; import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; @@ -140,7 +141,6 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent if (isStorageServiceReachable()) { return AvailabilityType.UP; } - return AvailabilityType.DOWN; } finally { long totalTimeMillis = NANOSECONDS.toMillis(System.nanoTime() - start); @@ -190,6 +190,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if (name.equals("shutdown")) { OperationResult operationResult = shutdownNode(); + waitForNodeToGoDown(); return operationResult; } else if (name.equals("start")) { return startNode(); @@ -238,7 +239,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent protected OperationResult stopNode() { ProcessInfo process = getResourceContext().getNativeProcess(); - if (processInfo == null) { + if (process == null) { LOG.warn("Failed to obtain process info. It appears Cassandra is already shutdown."); return new OperationResult("Failed to obtain process info. It appears Cassandra is already shutdown."); } @@ -265,6 +266,39 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } + private void waitForNodeToGoDown() throws InterruptedException { + if (OperatingSystem.getInstance().getName().equals(OperatingSystem.NAME_MACOSX)) { + // See this thread on VMWare forum: http://communities.vmware.com/message/2187972#2187972 + // Unfortunately there is no work around for this failure on Mac OSX so the method will silently return on + // this platform. + return; + } + for (ProcessInfoSnapshot processInfoSnapshot = getProcessInfoSnapshot();; processInfoSnapshot = getProcessInfoSnapshot()) { + if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { + // Process not found, so it died, that's fine + // OR + // Process info says process is no longer running, that's fine as well + break; + } + if (getResourceContext().getComponentInvocationContext().isInterrupted()) { + // Operation canceled or timed out + throw new InterruptedException(); + } + // Process is still running, wait a second and check again + Thread.sleep(SECONDS.toMillis(2)); + } + } + + private ProcessInfoSnapshot getProcessInfoSnapshot() { + ProcessInfoSnapshot processInfoSnapshot = (processInfo == null) ? null : processInfo.freshSnapshot(); + if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { + processInfo = getResourceContext().getNativeProcess(); + // Safe to get prior snapshot here, we've just recreated the process info instance + processInfoSnapshot = (processInfo == null) ? null : processInfo.priorSnaphot(); + } + return processInfoSnapshot; + } + protected OperationResult startNode() { Configuration pluginConfig = getResourceContext().getPluginConfiguration(); String baseDir = pluginConfig.getSimpleValue("baseDir"); commit 127c679b6d152398d4645f3e6dee488f3d043841 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Jul 25 08:51:47 2013 -0500 Add support for updating the JMX Port. The process sends a restart to the resource last to avoid putting the Server in maintenance mode. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 1441785..7a7eda4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -103,7 +103,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private static final String RHQ_STORAGE_ADDRESS_PROPERTY = "host"; private static final int OPERATION_QUERY_TIMEOUT = 20000; - private static final int MAX_ITERATIONS = 6; + private static final int MAX_ITERATIONS = 10; private static final String UPDATE_CONFIGURATION_OPERATION = "updateConfiguration"; private static final String RESTART_OPERATION = "restart"; @@ -639,16 +639,45 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN StorageNode storageNode = findStorageNodeByAddress(storageNodeConfiguration.getStorageNode().getAddress()); if (storageNode != null && storageNode.getResource() != null) { - Resource storageNodeResource = storageNode.getResource(); Configuration parameters = new Configuration(); parameters.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); - parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); - parameters.setSimpleValue("heapNewSize", storageNodeConfiguration.getHeapNewSize() + ""); - parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); - parameters.setSimpleValue("restartIfRequired", "true"); + if (storageNodeConfiguration.getHeapSize() != null) { + parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); + } + if (storageNodeConfiguration.getHeapNewSize() != null) { + parameters.setSimpleValue("heapNewSize", storageNodeConfiguration.getHeapNewSize() + ""); + } + if (storageNodeConfiguration.getThreadStackSize() != null) { + parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); + } + parameters.setSimpleValue("restartIfRequired", "false"); - return runOperationAndWaitForResult(subject, storageNodeResource, UPDATE_CONFIGURATION_OPERATION, + Resource storageNodeResource = storageNode.getResource(); + + boolean result = runOperationAndWaitForResult(subject, storageNodeResource, UPDATE_CONFIGURATION_OPERATION, parameters); + + if (result) { + Configuration storageNodePluginConfig = configurationManager.getPluginConfiguration(subject, + storageNodeResource.getId()); + + String existingJMXPort = storageNodePluginConfig.getSimpleValue("jmxPort"); + storageNodePluginConfig.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); + + String existingConnectionURL = storageNodePluginConfig.getSimpleValue("connectorAddress"); + String newConnectionURL = existingConnectionURL.replace(":" + existingJMXPort + "/", ":" + + storageNodeConfiguration.getJmxPort() + "/"); + storageNodePluginConfig.setSimpleValue("connectorAddress", newConnectionURL); + + configurationManager.updatePluginConfiguration(subject, storageNodeResource.getId(), + storageNodePluginConfig); + + storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); + entityManager.merge(storageNode); + entityManager.flush(); + + return runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, null); + } } return false; diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 41a0c42..125f4d2 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -117,6 +117,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper //update storage node jvm settings Configuration config = new Configuration(); + config.put(new PropertySimple("jmxPort", params.getSimpleValue("jmxPort"))); config.put(new PropertySimple("minHeapSize", params.getSimpleValue("heapSize"))); config.put(new PropertySimple("maxHeapSize", params.getSimpleValue("heapSize"))); config.put(new PropertySimple("heapNewSize", params.getSimpleValue("heapNewSize"))); diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index 1667877..dd5b8a2 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -148,11 +148,17 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { } } - private void updateCassandraJvmProps(Configuration config) throws IOException { + private void updateCassandraJvmProps(Configuration newConfig) throws IOException { PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(jvmOptsFile.getAbsolutePath()); Properties properties = propertiesUpdater.loadExistingProperties(); - String maxHeapSize = config.getSimpleValue("maxHeapSize"); + String jmxPort = newConfig.getSimpleValue("jmxPort"); + if (!StringUtil.isEmpty(jmxPort)) { + validateIntegerArg("jmx_port", jmxPort); + properties.setProperty("jmx_port", jmxPort); + } + + String maxHeapSize = newConfig.getSimpleValue("maxHeapSize"); if (!StringUtil.isEmpty(maxHeapSize)) { validateHeapArg("maxHeapSize", maxHeapSize); // We want min and max heap to be the same @@ -160,19 +166,19 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { properties.setProperty("heap_max", "-Xmx" + maxHeapSize); } - String heapNewSize = config.getSimpleValue("heapNewSize"); + String heapNewSize = newConfig.getSimpleValue("heapNewSize"); if (!StringUtil.isEmpty(heapNewSize)) { validateHeapArg("heapNewSize", heapNewSize); properties.setProperty("heap_new", "-Xmn" + heapNewSize); } - String threadStackSize = config.getSimpleValue("threadStackSize"); + String threadStackSize = newConfig.getSimpleValue("threadStackSize"); if (!StringUtil.isEmpty(threadStackSize)) { - validateStackArg(threadStackSize); + validateIntegerArg("threadStackSize", threadStackSize); properties.setProperty("thread_stack_size", "-Xss" + threadStackSize + "k"); } - PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); + PropertySimple heapDumpOnOMMError = newConfig.getSimple("heapDumpOnOOMError"); if (heapDumpOnOMMError != null) { if (heapDumpOnOMMError.getBooleanValue()) { properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); @@ -181,7 +187,7 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { } } - String heapDumpDir = useForwardSlash(config.getSimpleValue("heapDumpDir")); + String heapDumpDir = useForwardSlash(newConfig.getSimpleValue("heapDumpDir")); if (!StringUtil.isEmpty(heapDumpDir)) { properties.setProperty("heap_dump_dir", heapDumpDir); } @@ -209,7 +215,7 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { String threadStackSize = config.getSimpleValue("threadStackSize"); if (!StringUtil.isEmpty(threadStackSize)) { - validateStackArg(threadStackSize); + validateIntegerArg("threadStackSize", threadStackSize); properties.setProperty("set.thread_stack_size", "-Xss" + threadStackSize + "k"); } @@ -248,11 +254,11 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { } } - private void validateStackArg(String value) { + private void validateIntegerArg(String name, String value) { try { Integer.parseInt(value); } catch (NumberFormatException e) { - throw new IllegalArgumentException(value + " is not a legal value for the property [threadStackSize]"); + throw new IllegalArgumentException(value + " is not a legal value for the property [" + name + "]"); } } diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index aca3ba2..a42040d 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -32,6 +32,7 @@ <c:simple-property name="baseDir" displayName="Base Directory" description="The base directory from which the Cassandra Daemon was launched." required="false"/> <c:simple-property name="yamlConfiguration" displayName="YAML Configuration File" description="YAML Configuration File"/> <c:simple-property name="nativeTransportPort" description="The port on which Cassandra listens for CQL client connections." default="9042" type="integer"/> + <c:simple-property name="jmxPort" description="The JMX port for Cassandra" default="7299" type="integer" readOnly="true"/> <c:simple-property name="host" description="The host on which cassandra listens to CQL client connections" default="localhost"/> <c:simple-property name="clusterName" description="Cluster name" default="localhost"/> <c:simple-property name="authenticator" required="true" default="org.apache.cassandra.auth.AllowAllAuthenticator" description="Cassandra client authenticator"> @@ -131,11 +132,11 @@ <operation name="updateConfiguration" description="Updates the node configuration. Will require a separate server restart for the settings to take effect."> <parameters> + <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> <c:simple-property name="heapSize" type="string" description="The heap size to be used for both -Xms and -Xmx JVM options."/> <c:simple-property name="heapNewSize" type="string" description="The heap new size to be used be used with -Xmn JVM option."/> <c:simple-property name="threadStackSize" type="integer" description="The thread stack size. This memory is allocated to each thread off heap. The value should be an integer that will be interpreted in kilobytes."/> - <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> <c:simple-property name="restartIfRequired" type="boolean" required="true" default="false" description="If [true] then restart the server at the end of the update if and if only the updates made require a restart. If [false] the server will not be restarted regardless of the updates made."/> </parameters> <results> commit 925e8c881487e9e27c7b0801890ef6f95f48a352 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Jul 23 16:43:29 2013 -0500 Move the restart operation to the plugin rather than server bean. This simplifies the interface between the server bean and storage node plugin. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 9416c67..1441785 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -645,21 +645,10 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); parameters.setSimpleValue("heapNewSize", storageNodeConfiguration.getHeapNewSize() + ""); parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); + parameters.setSimpleValue("restartIfRequired", "true"); - boolean updateConfigurationResult = runOperationAndWaitForResult(subject, storageNodeResource, - UPDATE_CONFIGURATION_OPERATION, parameters); - - if (updateConfigurationResult) { - boolean restartResult = runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, - null); - - if (restartResult) { - storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); - entityManager.persist(storageNode); - - return true; - } - } + return runOperationAndWaitForResult(subject, storageNodeResource, UPDATE_CONFIGURATION_OPERATION, + parameters); } return false; diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index d9b35b9..41a0c42 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -111,6 +111,8 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } private OperationResult updateConfiguration(Configuration params) { + boolean restartIsRequired = false; + OperationResult result = new OperationResult("Configuration updated."); //update storage node jvm settings @@ -125,6 +127,31 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper if (!configurationUpdate.getStatus().equals(ConfigurationUpdateStatus.SUCCESS)) { result.setErrorMessage(configurationUpdate.getErrorMessage()); + } else { + if (params.getSimpleValue("heapSize") != null + || params.getSimpleValue("heapNewSize") != null + || params.getSimpleValue("threadStackSize") != null) { + restartIsRequired = true; + } + } + + //restart the server if: + //- requested by the user + //- the updates done require restart + boolean restartIfRequiredConfig = false; + if (params.getSimpleValue("restartIfRequired") != null) { + restartIfRequiredConfig = Boolean.parseBoolean(params.getSimpleValue("restartIfRequired")); + } + + if (restartIfRequiredConfig && restartIsRequired) { + try { + OperationResult restartResult = this.invokeOperation("restart", null); + if (restartResult.getErrorMessage() != null) { + result.setErrorMessage(restartResult.getErrorMessage()); + } + } catch (Exception e) { + result.setErrorMessage(e.getMessage()); + } } return result; diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index cd84de6..aca3ba2 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -136,6 +136,7 @@ <c:simple-property name="threadStackSize" type="integer" description="The thread stack size. This memory is allocated to each thread off heap. The value should be an integer that will be interpreted in kilobytes."/> <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> + <c:simple-property name="restartIfRequired" type="boolean" required="true" default="false" description="If [true] then restart the server at the end of the update if and if only the updates made require a restart. If [false] the server will not be restarted regardless of the updates made."/> </parameters> <results> <c:simple-property name="operationResult" description="Outcome of updating the configuration."/> commit bddfb48623718d3eb99fad6cd1a67bae56a82572 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 25 12:16:39 2013 +0200 CassandraNodeComponent#startNode now starts C* with a short CLASSPATH to allow later discovery on Linux diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 70ba4b2..37aa425 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -47,6 +47,7 @@ import com.datastax.driver.core.Session; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hyperic.sigar.OperatingSystem; import org.hyperic.sigar.SigarException; import org.mc4j.ems.connection.EmsConnection; import org.mc4j.ems.connection.bean.EmsBean; @@ -67,7 +68,6 @@ import org.rhq.core.pluginapi.util.ProcessExecutionUtility; import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.ProcessInfo; -import org.rhq.core.system.ProcessInfo.ProcessInfoSnapshot; import org.rhq.core.system.SystemInfo; import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; @@ -186,16 +186,6 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } - private ProcessInfoSnapshot getProcessInfoSnapshot() { - ProcessInfoSnapshot processInfoSnapshot = (processInfo == null) ? null : processInfo.freshSnapshot(); - if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { - processInfo = getResourceContext().getNativeProcess(); - // Safe to get prior snapshot here, we've just recreated the process info instance - processInfoSnapshot = (processInfo == null) ? null : processInfo.priorSnaphot(); - } - return processInfoSnapshot; - } - @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if (name.equals("shutdown")) { @@ -212,23 +202,6 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent return null; } - private void waitForNodeToGoDown() throws InterruptedException { - for (ProcessInfoSnapshot processInfoSnapshot = getProcessInfoSnapshot();; processInfoSnapshot = getProcessInfoSnapshot()) { - if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { - // Process not found, so it died, that's fine - // OR - // Process info says process is no longer running, that's fine as well - break; - } - if (getResourceContext().getComponentInvocationContext().isInterrupted()) { - // Operation canceled or timed out - throw new InterruptedException(); - } - // Process is still running, wait a second and check again - Thread.sleep(SECONDS.toMillis(1)); - } - } - @SuppressWarnings("rawtypes") protected OperationResult shutdownNode() { ResourceContext<?> context = getResourceContext(); @@ -292,21 +265,19 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } - protected OperationResult startNode() { - ResourceContext<?> context = getResourceContext(); - Configuration pluginConfig = context.getPluginConfiguration(); + Configuration pluginConfig = getResourceContext().getPluginConfiguration(); String baseDir = pluginConfig.getSimpleValue("baseDir"); File binDir = new File(baseDir, "bin"); - File startScript = new File(binDir, getStartScript()); - File pidFile = new File(binDir, "cassandra.pid"); - - ProcessExecution scriptExe = ProcessExecutionUtility.createProcessExecution(startScript); - scriptExe.addArguments(asList("-p", pidFile.getAbsolutePath())); - SystemInfo systemInfo = context.getSystemInformation(); + if (!startScriptExists(binDir)) { + OperationResult failure = new OperationResult("Failed to start Cassandra daemon"); + failure.setErrorMessage("Start script does not exists"); + return failure; + } + ProcessExecution scriptExe = getProcessExecution(binDir); + SystemInfo systemInfo = getResourceContext().getSystemInformation(); ProcessExecutionResults results = systemInfo.executeProcess(scriptExe); - - if (results.getError() == null) { + if (results.getError() == null) { return new OperationResult("Successfully started Cassandra daemon"); } else { OperationResult failure = new OperationResult("Failed to start Cassandra daemon"); @@ -315,6 +286,30 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } + private boolean startScriptExists(File binDir) { + File file = new File(binDir, getStartScript()); + return file.exists() && !file.isDirectory(); + } + + private ProcessExecution getProcessExecution(File binDir) { + ProcessExecution scriptExe; + if (OperatingSystem.getInstance().getName().equals(OperatingSystem.NAME_WIN32)) { + File startScript = new File(binDir, getStartScript()); + scriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + } else { + // On Linux, when Cassandra is started with an absolute path, the command line is too long and is truncated + // in /proc/pid/cmdline (beacuse of a long CLASSPATH made of absolute paths) + // This prevents the process from being later discovered because the process query argument criteria + // expects org.apache.cassandra.service.CassandraDaemon to be found + File startScript = new File("./" + getStartScript()); + scriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + scriptExe.setCheckExecutableExists(false); + } + scriptExe.setWorkingDirectory(binDir.getAbsolutePath()); + scriptExe.addArguments(asList("-p", "cassandra.pid")); + return scriptExe; + } + protected OperationResult restartNode() { OperationResult result = shutdownNode(); diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index b1d50b8..ab97902 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -121,21 +121,27 @@ <plugin> <artifactId>maven-failsafe-plugin</artifactId> <version>2.13</version> + <configuration> + <includes> + <include>**/*ITest.java</include> + </includes> + <argLine>-Djava.library.path=${pc.lib.dir}</argLine> + <systemPropertyVariables> + <pc.plugins.dir>${pc.plugins.dir}</pc.plugins.dir> + </systemPropertyVariables> + <properties> + <property> + <name>listener</name> + <value>org.rhq.test.testng.StdoutReporter</value> + </property> + </properties> + </configuration> <executions> <execution> <id>integration-test</id> <goals> <goal>integration-test</goal> </goals> - <configuration> - <includes> - <include>**/*ITest.java</include> - </includes> - <argLine>-Djava.library.path=${pc.lib.dir}</argLine> - <systemPropertyVariables> - <pc.plugins.dir>${pc.plugins.dir}</pc.plugins.dir> - </systemPropertyVariables> - </configuration> </execution> <execution> <id>verify</id> @@ -155,6 +161,12 @@ <excludes> <exclude>**/*ITest.java</exclude> </excludes> + <properties> + <property> + <name>listener</name> + <value>org.rhq.test.testng.StdoutReporter</value> + </property> + </properties> </configuration> </plugin> </plugins> diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index 5bc8b31..f0744a4 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -31,6 +31,7 @@ import java.util.Set; import com.google.common.collect.Sets; +import org.hyperic.sigar.OperatingSystem; import org.testng.annotations.AfterSuite; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; @@ -113,14 +114,8 @@ public class StorageNodeComponentITest { File binDir = new File(basedir, "bin"); SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); - File startScript = new File("./cassandra"); - ProcessExecution startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript); - startScriptExe.setWorkingDirectory(binDir.getAbsolutePath()); - startScriptExe.setCheckExecutableExists(false); - - startScriptExe.addArguments(asList("-p", "cassandra.pid")); - startScriptExe.setCaptureOutput(true); - ProcessExecutionResults results = systemInfo.executeProcess(startScriptExe); + ProcessExecution processExecution = getProcessExecution(binDir); + ProcessExecutionResults results = systemInfo.executeProcess(processExecution); assertEquals(results.getExitCode(), (Integer) 0, "Cassandra failed to start: " + results.getCapturedOutput()); @@ -135,6 +130,22 @@ public class StorageNodeComponentITest { schemaManager.updateTopology(true); } + private ProcessExecution getProcessExecution(File binDir) { + ProcessExecution startScriptExe; + if (OperatingSystem.getInstance().getName().equals(OperatingSystem.NAME_WIN32)) { + File startScript = new File(binDir, "cassandra.bat"); + startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + } else { + File startScript = new File("./cassandra"); + startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + startScriptExe.setCheckExecutableExists(false); + } + startScriptExe.setWorkingDirectory(binDir.getAbsolutePath()); + startScriptExe.addArguments(asList("-p", "cassandra.pid")); + startScriptExe.setCaptureOutput(true); + return startScriptExe; + } + private void initPluginContainer() { PluginContainerConfiguration pcConfig = new PluginContainerConfiguration(); File pluginsDir = new File(System.getProperty("pc.plugins.dir")); commit c1bfeb61b38892c39ac89d813e4a50687a1f56f1 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 25 11:04:44 2013 +0200 Update intentional changes file (methods added in StorageNodeManagerRemote) diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml index 26e9e95..44886b4 100644 --- a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml @@ -32,6 +32,20 @@ <difference> <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.cloud.StorageNodeConfigurationComposite retrieveConfiguration(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  + <method>boolean updateConfiguration(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNodeConfigurationComposite)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  <method>org.rhq.core.domain.util.PageList findNotAcknowledgedStorageNodeAlerts(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> commit 79b44e371d1c1c9464ec0660ac0ad26a33a82c4b Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 25 09:44:45 2013 +0200 Update intentional changes file (methods added in StorageNodeManagerRemote) diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml index 58c4eda..26e9e95 100644 --- a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml @@ -29,4 +29,18 @@ <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findNotAcknowledgedStorageNodeAlerts(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findAllStorageNodeAlerts(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + </differences> commit 00326c0b70787a56e3cbc30e8a8951a22e99c681 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 24 23:07:53 2013 -0400 do availability check via jmx CassandraNodeComponent previously was doing availability checks at the process level. Results were some times inconsistent in large part due to different behaviors on different platforms. Doing a JMX check is a more representative check since we perform most of the managemeent via JMX. It also eliminates any platform-specific issues. The check is done via a direct JMX connection instead of EMS to avoid the caching issues with EMS that could yield inaccurate results. diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index c41e8e7..70ba4b2 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -35,6 +35,12 @@ import java.util.Date; import java.util.List; import java.util.Map; +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.management.remote.JMXConnector; +import javax.management.remote.JMXConnectorFactory; +import javax.management.remote.JMXServiceURL; + import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Cluster.Builder; import com.datastax.driver.core.Session; @@ -131,10 +137,11 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent public AvailabilityType getAvailability() { long start = System.nanoTime(); try { - // Get a fresh snapshot of the process - ProcessInfoSnapshot processInfoSnapshot = getProcessInfoSnapshot(); - return (processInfoSnapshot != null && processInfoSnapshot.isRunning()) ? AvailabilityType.UP - : AvailabilityType.DOWN; + if (isStorageServiceReachable()) { + return AvailabilityType.UP; + } + + return AvailabilityType.DOWN; } finally { long totalTimeMillis = NANOSECONDS.toMillis(System.nanoTime() - start); if (LOG.isDebugEnabled()) { @@ -146,6 +153,39 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } + private boolean isStorageServiceReachable() { + JMXConnector connector = null; + try { + Configuration pluginConfig = getResourceContext().getPluginConfiguration(); + String url = pluginConfig.getSimpleValue("connectorAddress"); + JMXServiceURL serviceURL = new JMXServiceURL(url); + connector = JMXConnectorFactory.connect(serviceURL, null); + + MBeanServerConnection serverConnection = connector.getMBeanServerConnection(); + ObjectName storageService = new ObjectName("org.apache.cassandra.db:type=StorageService"); + + // query an attribute to make sure it is in fact available + serverConnection.getAttribute(storageService, "NativeTransportRunning"); + + return true; + } catch (Exception e) { + if (LOG.isDebugEnabled()) { + LOG.debug("Failed to make JMX connection to StorageService", e); + } + return false; + } finally { + if (connector != null) { + try { + connector.close(); + } catch (IOException e) { + if (LOG.isDebugEnabled()) { + LOG.debug("An error occurred closing the JMX connector", e); + } + } + } + } + } + private ProcessInfoSnapshot getProcessInfoSnapshot() { ProcessInfoSnapshot processInfoSnapshot = (processInfo == null) ? null : processInfo.freshSnapshot(); if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { @@ -158,10 +198,8 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { - if (name.equals("shutdown")) { OperationResult operationResult = shutdownNode(); - waitForNodeToGoDown(); return operationResult; } else if (name.equals("start")) { return startNode(); @@ -234,6 +272,8 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent long pid = process.getPid(); try { + getEmsConnection().close(); + process.kill("KILL"); Configuration pluginConfig = getResourceContext().getPluginConfiguration(); commit c2bb725d469642b7985eba579f6b50c30a1a776f Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 24 18:55:25 2013 +0200 Fix StorageNodeComponentITest.shutdownStorageNode Fixed storage node module pom typo Made test Cassandra server start with relative paths in classpath (otherwise the command line is too long and gets truncated in /proc/pid/cmdline this preventing the process query to find the server) Made CassandraNodeComponent shutdown operation to wait for server to go down diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 8d74ccc..c41e8e7 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -132,12 +132,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent long start = System.nanoTime(); try { // Get a fresh snapshot of the process - ProcessInfoSnapshot processInfoSnapshot = (processInfo == null) ? null : processInfo.freshSnapshot(); - if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { - processInfo = getResourceContext().getNativeProcess(); - // Safe to get prior snapshot here, we've just recreated the process info instance - processInfoSnapshot = (processInfo == null) ? null : processInfo.priorSnaphot(); - } + ProcessInfoSnapshot processInfoSnapshot = getProcessInfoSnapshot(); return (processInfoSnapshot != null && processInfoSnapshot.isRunning()) ? AvailabilityType.UP : AvailabilityType.DOWN; } finally { @@ -151,11 +146,23 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } + private ProcessInfoSnapshot getProcessInfoSnapshot() { + ProcessInfoSnapshot processInfoSnapshot = (processInfo == null) ? null : processInfo.freshSnapshot(); + if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { + processInfo = getResourceContext().getNativeProcess(); + // Safe to get prior snapshot here, we've just recreated the process info instance + processInfoSnapshot = (processInfo == null) ? null : processInfo.priorSnaphot(); + } + return processInfoSnapshot; + } + @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if (name.equals("shutdown")) { - return shutdownNode(); + OperationResult operationResult = shutdownNode(); + waitForNodeToGoDown(); + return operationResult; } else if (name.equals("start")) { return startNode(); } else if (name.equals("restart")) { @@ -167,6 +174,23 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent return null; } + private void waitForNodeToGoDown() throws InterruptedException { + for (ProcessInfoSnapshot processInfoSnapshot = getProcessInfoSnapshot();; processInfoSnapshot = getProcessInfoSnapshot()) { + if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { + // Process not found, so it died, that's fine + // OR + // Process info says process is no longer running, that's fine as well + break; + } + if (getResourceContext().getComponentInvocationContext().isInterrupted()) { + // Operation canceled or timed out + throw new InterruptedException(); + } + // Process is still running, wait a second and check again + Thread.sleep(SECONDS.toMillis(1)); + } + } + @SuppressWarnings("rawtypes") protected OperationResult shutdownNode() { ResourceContext<?> context = getResourceContext(); diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index df79e40..b1d50b8 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -55,6 +55,20 @@ </dependency> <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>test-utils</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> + </exclusion> + </exclusions> + </dependency> + + + <dependency> <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-schema</artifactId> <version>${project.version}</version> @@ -70,7 +84,7 @@ <phase>pre-integration-test</phase> <configuration> <target> - <property name="sigar.dir" value="${project.build.directory/sigar}"/> + <property name="sigar.dir" value="${project.build.directory}/sigar"/> <mkdir dir="${pc.basedir}"/> <mkdir dir="${pc.lib.dir}"/> diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index b668073..5bc8b31 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -1,3 +1,22 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + package org.rhq.plugins.storage; import static java.util.Arrays.asList; @@ -94,8 +113,10 @@ public class StorageNodeComponentITest { File binDir = new File(basedir, "bin"); SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); - File startScript = new File(binDir, "cassandra"); + File startScript = new File("./cassandra"); ProcessExecution startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + startScriptExe.setWorkingDirectory(binDir.getAbsolutePath()); + startScriptExe.setCheckExecutableExists(false); startScriptExe.addArguments(asList("-p", "cassandra.pid")); startScriptExe.setCaptureOutput(true); @@ -176,8 +197,7 @@ public class StorageNodeComponentITest { assertFalse(pidFile.exists(), pidFile + " should be deleted when the storage node is shutdown."); - // TODO why is this failing? - //assertNodeIsDown("Expected " + storageNode + " to be DOWN after shutting it down"); + assertNodeIsDown("Expected " + storageNode + " to be DOWN after shutting it down"); } @Test(dependsOnMethods = "shutdownStorageNode") diff --git a/modules/plugins/rhq-storage/src/test/resources/log4j.properties b/modules/plugins/rhq-storage/src/test/resources/log4j.properties deleted file mode 100644 index 67db049..0000000 --- a/modules/plugins/rhq-storage/src/test/resources/log4j.properties +++ /dev/null @@ -1,42 +0,0 @@ -# -# /* -# * RHQ Management Platform -# * Copyright (C) 2005-2012 Red Hat, Inc. -# * All rights reserved. -# * -# * This program is free software; you can redistribute it and/or modify -# * it under the terms of the GNU General Public License, version 2, as -# * published by the Free Software Foundation, and/or the GNU Lesser -# * General Public License, version 2.1, also as published by the Free -# * Software Foundation. -# * -# * This program is distributed in the hope that it will be useful, -# * but WITHOUT ANY WARRANTY; without even the implied warranty of -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# * GNU General Public License and the GNU Lesser General Public License -# * for more details. -# * -# * You should have received a copy of the GNU General Public License -# * and the GNU Lesser General Public License along with this program; -# * if not, write to the Free Software Foundation, Inc., -# * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# */ -# - -log4j.rootCategory=WARN, FILE, CONSOLE - -log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender -log4j.appender.FILE.DatePattern='.'yyyy-MM-dd -log4j.appender.FILE.File=./target/test.log -log4j.appender.FILE.layout=org.apache.log4j.PatternLayout -log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n -#log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n -log4j.appender.FILE.Append=false - -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -#log4j.appender.CONSOLE.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n -log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n - -log4j.logger.org.rhq=DEBUG -log4j.logger.com.datastax=DEBUG diff --git a/modules/plugins/rhq-storage/src/test/resources/log4j.xml b/modules/plugins/rhq-storage/src/test/resources/log4j.xml new file mode 100644 index 0000000..ec3cd98 --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/resources/log4j.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out" /> + <param name="Threshold" value="WARN" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L) - %m%n" /> + </layout> + </appender> + + <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> + <param name="File" value="target/test.log" /> + <param name="Append" value="false" /> + <param name="Threshold" value="DEBUG" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L) - %m%n" /> + </layout> + </appender> + + <logger name="org.rhq"> + <level value="DEBUG" /> + </logger> + + <logger name="com.datastax"> + <level value="DEBUG" /> + </logger> + + <root> + <level value="WARN" /> + <appender-ref ref="CONSOLE" /> + <appender-ref ref="FILE" /> + </root> + +</log4j:configuration> commit 280733b7eb74489f2f31695b3536e804447eb349 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 24 07:47:24 2013 -0400 [BZ 987899] remove and create pid file during shutdown and start operations diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index cf24fcd..8d74ccc 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -18,6 +18,7 @@ */ package org.rhq.plugins.cassandra; +import static java.util.Arrays.asList; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static org.rhq.core.system.OperatingSystemType.WINDOWS; @@ -210,6 +211,14 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent long pid = process.getPid(); try { process.kill("KILL"); + + Configuration pluginConfig = getResourceContext().getPluginConfiguration(); + File basedir = new File(pluginConfig.getSimpleValue("baseDir")); + File binDir = new File(basedir, "bin"); + File pidFile = new File(binDir, "cassandra.pid"); + + pidFile.delete(); + return new OperationResult("Successfully shut down Cassandra daemon with pid " + pid); } catch (SigarException e) { LOG.warn("Failed to shut down Cassandra node with pid " + pid, e); @@ -226,8 +235,10 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent String baseDir = pluginConfig.getSimpleValue("baseDir"); File binDir = new File(baseDir, "bin"); File startScript = new File(binDir, getStartScript()); + File pidFile = new File(binDir, "cassandra.pid"); ProcessExecution scriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + scriptExe.addArguments(asList("-p", pidFile.getAbsolutePath())); SystemInfo systemInfo = context.getSystemInformation(); ProcessExecutionResults results = systemInfo.executeProcess(scriptExe); diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index cd9f148..b668073 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -2,7 +2,9 @@ package org.rhq.plugins.storage; import static java.util.Arrays.asList; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; import java.io.File; import java.net.InetAddress; @@ -168,8 +170,34 @@ public class StorageNodeComponentITest { new Configuration(), timeout); assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The shutdown operation failed"); + + File binDir = new File(basedir, "bin"); + File pidFile = new File(binDir, "cassandra.pid"); + + assertFalse(pidFile.exists(), pidFile + " should be deleted when the storage node is shutdown."); + // TODO why is this failing? - assertNodeIsDown("Expected " + storageNode + " to be DOWN after shutting it down"); + //assertNodeIsDown("Expected " + storageNode + " to be DOWN after shutting it down"); + } + + @Test(dependsOnMethods = "shutdownStorageNode") + public void restartStorageNode() { + OperationManager operationManager = PluginContainer.getInstance().getOperationManager(); + OperationServicesAdapter operationsService = new OperationServicesAdapter(operationManager); + + long timeout = 1000 * 60; + OperationContextImpl operationContext = new OperationContextImpl(storageNode.getId()); + OperationServicesResult result = operationsService.invokeOperation(operationContext, "start", + new Configuration(), timeout); + + assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The start operation failed."); + + File binDir = new File(basedir, "bin"); + File pidFile = new File(binDir, "cassandra.pid"); + + assertTrue(pidFile.exists(), pidFile + " should be created when starting the storage node."); + + assertNodeIsUp("Expected " + storageNode + " to be up after restarting it."); } private void assertNodeIsUp(String msg) { @@ -192,7 +220,8 @@ public class StorageNodeComponentITest { private Availability getAvailability() { InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); - return inventoryManager.getAvailabilityIfKnown(storageNode); +// return inventoryManager.getAvailabilityIfKnown(storageNode); + return inventoryManager.getCurrentAvailability(storageNode); } private void executeAvailabilityScan() { commit 00162805c6037034f445c90390d46e36fd004a3a Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 24 07:08:09 2013 -0400 uncommented code that was done while debugging tests diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index f76da22..cf24fcd 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -111,7 +111,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent clusterBuilder = clusterBuilder.withCredentials(username, password); } -// this.cassandraSession = clusterBuilder.build().connect(clusterName); + this.cassandraSession = clusterBuilder.build().connect(clusterName); } catch (Exception e) { LOG.error("Connect to Cassandra " + host + ":" + nativePort, e); throw e; commit eda94d462cb324316e19486c13308b2bd75dad2c Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Jul 24 11:54:53 2013 +0200 BZ 976786 Add a bit more wait time and an additional check if SUCCESS really means it. Return IN_PROGRESS otherwise. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java index 4bfbb7c..7a6fb33 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java @@ -721,6 +721,9 @@ public class ResourceHandlerBean extends AbstractRestBean { @POST @Path("/") + @ApiErrors({ + @ApiError(code = 302, reason = "Creation is still happening. Check back with a GET on the Location.") + }) @ApiOperation(value = "Create a new resource as a child of an existing resource. ", notes= "If a handle is given, a content based resource is created; the content identified by the handle is not removed from the content store." + "If no handle is given, a resource is created from the data of the passed 'resource' object.") @@ -824,6 +827,11 @@ public class ResourceHandlerBean extends AbstractRestBean { CreateResourceStatus status = history.getStatus(); + try { + Thread.sleep(2000L); // give the agent time to do the work + } catch (InterruptedException e) { + ; // nothing + } MediaType mediaType = headers.getAcceptableMediaTypes().get(0); @@ -832,11 +840,16 @@ public class ResourceHandlerBean extends AbstractRestBean { if ( status == CreateResourceStatus.SUCCESS) { ResourceWithType rwt = findCreatedResource(history.getParentResource().getId(),history.getCreatedResourceName(),uriInfo); - - builder = Response.ok(); - builder.entity(rwt); + if (rwt!=null) { + builder = Response.ok(); + builder.entity(rwt); + } else { + // History says we had success but due to internal timing + // the resource is not yet visible, so switch to in_progress + status = CreateResourceStatus.IN_PROGRESS; + } } - else if (status==CreateResourceStatus.IN_PROGRESS) { + if (status==CreateResourceStatus.IN_PROGRESS) { try { Thread.sleep(2000L); // give the agent time to do the work @@ -865,6 +878,7 @@ public class ResourceHandlerBean extends AbstractRestBean { @GET @Path("/creationStatus/{id}") @ApiOperation("Get the status of a resource creation for content based resources.") + @ApiError(code = 302, reason = "Creation is still going on. Check back later with the same URL.") public Response getHistoryItem(@PathParam("id") int historyId, @Context HttpHeaders headers, @Context UriInfo uriInfo) { CreateResourceHistory history; @@ -888,13 +902,17 @@ public class ResourceHandlerBean extends AbstractRestBean { if (status== CreateResourceStatus.SUCCESS) { ResourceWithType rwt = findCreatedResource(history.getParentResource().getId(),history.getCreatedResourceName(),uriInfo); - - builder = Response.ok(); - setCachingHeader(builder, 600); - builder.entity(rwt); - + if (rwt!=null) { + builder = Response.ok(); + setCachingHeader(builder, 600); + builder.entity(rwt); + } else { + // History says we had success but due to internal timing + // the resource is not yet visible, so switch to in_progress + status = CreateResourceStatus.IN_PROGRESS; + } } - else if (status==CreateResourceStatus.IN_PROGRESS) { + if (status==CreateResourceStatus.IN_PROGRESS) { UriBuilder uriBuilder = uriInfo.getRequestUriBuilder(); @@ -913,6 +931,14 @@ public class ResourceHandlerBean extends AbstractRestBean { } + /** + * Find the created resource by its name and parent. Will only return it + * if the resource is already committed. + * @param parentId Id of the parent + * @param name Name of the resource to find + * @param uriInfo UriInfo object to fill links in the returned resource + * @return A ResourceWithType if found, null otherwise. + */ private ResourceWithType findCreatedResource(int parentId, String name, UriInfo uriInfo) { ResourceCriteria criteria = new ResourceCriteria(); criteria.setStrict(true); @@ -920,6 +946,9 @@ public class ResourceHandlerBean extends AbstractRestBean { criteria.addFilterName(name); criteria.addFilterInventoryStatus(InventoryStatus.COMMITTED); List<Resource> resources = resMgr.findResourcesByCriteria(caller,criteria); + if (resources.size()==0) { + return null; + } Resource res = resources.get(0); return fillRWT(res,uriInfo); } diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ContentTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ContentTest.java index 8303513..b12eea3 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ContentTest.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ContentTest.java @@ -222,8 +222,10 @@ public class ContentTest extends AbstractBase { int status = response.getStatusCode(); String location = response.getHeader("Location"); - System.out.println("\nLocation " + location + "\n\n"); - assert location!=null; + if (status!=200) { + System.out.println("\nLocation " + location + "\n\n"); + assert location!=null; + } // We need to check what we got. A 302 means the deploy is still // in progress, so we need to wait a little longer @@ -244,6 +246,7 @@ public class ContentTest extends AbstractBase { createdResourceId = response.jsonPath().getInt("resourceId"); + System.out.flush(); System.out.println("\n Deploy is done, resource Id = " + createdResourceId + " \n"); System.out.flush(); @@ -254,6 +257,7 @@ public class ContentTest extends AbstractBase { // Remove the uploaded content removeContent(handle, false); + System.out.flush(); System.out.println("\n Content removed \n"); System.out.flush(); commit 6c63ae75f9d688d9cbe3c62406c58242a574b789 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 23 22:23:06 2013 -0400 initial commit for StorageNodeComponentITest This is a first stab at some integration tests for the storage plugin. diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index a88f56e..df79e40 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -10,11 +10,16 @@ <groupId>org.rhq</groupId> <artifactId>rhq-rhqstorage-plugin</artifactId> - <packaging>jar</packaging> <name>RHQ Storage Plugin</name> <description>A plugin for managing RHQ Storage Nodes</description> + <properties> + <pc.basedir>${project.build.directory}/plugin-container</pc.basedir> + <pc.plugins.dir>${pc.basedir}/plugins</pc.plugins.dir> + <pc.lib.dir>${pc.basedir}/lib</pc.lib.dir> + </properties> + <dependencies> <dependency> <groupId>${rhq.groupId}</groupId> @@ -27,7 +32,6 @@ <groupId>${rhq.groupId}</groupId> <artifactId>rhq-cassandra-plugin</artifactId> <version>${project.version}</version> -  </dependency> <dependency> @@ -35,8 +39,113 @@ <artifactId>org-mc4j-ems</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-ccm-core</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-platform-plugin</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-schema</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>pre-integration-test</phase> + <configuration> + <target> + <property name="sigar.dir" value="${project.build.directory/sigar}"/> + + <mkdir dir="${pc.basedir}"/> + <mkdir dir="${pc.lib.dir}"/> + <mkdir dir="${pc.plugins.dir}"/> + + <copy file="${org.rhq:rhq-platform-plugin:jar}" todir="${pc.plugins.dir}"/> + <copy file="${org.rhq:rhq-jmx-plugin:jar}" todir="${pc.plugins.dir}"/> + <copy file="${org.rhq:rhq-cassandra-plugin:jar}" todir="${pc.plugins.dir}"/> + <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${pc.plugins.dir}"/> + + <unzip src="${org.hyperic:sigar-dist:zip}" dest="${sigar.dir}"> + <patternset> + <include name="**/lib/sigar.jar" /> + <include name="**/lib/bcel*.jar" /> + <include name="**/lib/*.so" /> + <include name="**/lib/*.sl" /> + <include name="**/lib/*.dll" /> + <include name="**/lib/*.dylib" /> + </patternset> + </unzip> + <move todir="${pc.lib.dir}" flatten="true"> + <fileset dir="${sigar.dir}" includes="**/lib/*"/> + </move> + <delete dir="${sigar.dir}"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.13</version> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>integration-test</goal> + </goals> + <configuration> + <includes> + <include>**/*ITest.java</include> + </includes> + <argLine>-Djava.library.path=${pc.lib.dir}</argLine> + <systemPropertyVariables> + <pc.plugins.dir>${pc.plugins.dir}</pc.plugins.dir> + </systemPropertyVariables> + </configuration> + </execution> + <execution> + <id>verify</id> + <goals> + <goal>verify</goal> + </goals> + <configuration> + <testFailureIgnore>false</testFailureIgnore> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/*ITest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + <profiles> <profile> <id>dev</id> diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java new file mode 100644 index 0000000..cd9f148 --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -0,0 +1,216 @@ +package org.rhq.plugins.storage; + +import static java.util.Arrays.asList; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.io.File; +import java.net.InetAddress; +import java.util.Set; + +import com.google.common.collect.Sets; + +import org.testng.annotations.AfterSuite; +import org.testng.annotations.BeforeSuite; +import org.testng.annotations.Test; + +import org.rhq.cassandra.CassandraClusterManager; +import org.rhq.cassandra.ClusterInitService; +import org.rhq.cassandra.Deployer; +import org.rhq.cassandra.DeploymentOptions; +import org.rhq.cassandra.DeploymentOptionsFactory; +import org.rhq.cassandra.schema.SchemaManager; +import org.rhq.core.clientapi.server.discovery.InventoryReport; +import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pc.PluginContainer; +import org.rhq.core.pc.PluginContainerConfiguration; +import org.rhq.core.pc.inventory.InventoryManager; +import org.rhq.core.pc.operation.OperationContextImpl; +import org.rhq.core.pc.operation.OperationManager; +import org.rhq.core.pc.operation.OperationServicesAdapter; +import org.rhq.core.pc.plugin.FileSystemPluginFinder; +import org.rhq.core.pluginapi.operation.OperationServicesResult; +import org.rhq.core.pluginapi.operation.OperationServicesResultCode; +import org.rhq.core.pluginapi.util.ProcessExecutionUtility; +import org.rhq.core.system.ProcessExecution; +import org.rhq.core.system.ProcessExecutionResults; +import org.rhq.core.system.SystemInfo; +import org.rhq.core.system.SystemInfoFactory; + +/** + * @author John Sanda + */ +public class StorageNodeComponentITest { + + private File basedir; + + private Resource storageNode; + + @BeforeSuite + public void deployStorageNodeAndPluginContainer() throws Exception { + basedir = new File("target", "rhq-storage"); + + deployStorageNode(); + + initPluginContainer(); + } + + private void deployStorageNode() throws Exception { + DeploymentOptionsFactory factory = new DeploymentOptionsFactory(); + DeploymentOptions deploymentOptions = factory.newDeploymentOptions(); + String address = "127.0.0.1"; + + deploymentOptions.setSeeds(address); + deploymentOptions.setListenAddress(address); + deploymentOptions.setRpcAddress(address); + deploymentOptions.setBasedir(basedir.getAbsolutePath()); + deploymentOptions.setCommitLogDir(new File(basedir, "commit_log").getAbsolutePath()); + deploymentOptions.setDataDir(new File(basedir, "data").getAbsolutePath()); + deploymentOptions.setSavedCachesDir(new File(basedir, "saved_caches").getAbsolutePath()); + deploymentOptions.setCommitLogDir(new File(basedir, "logs").getAbsolutePath()); + deploymentOptions.setLoggingLevel("DEBUG"); + deploymentOptions.setNativeTransportPort(9142); + deploymentOptions.setJmxPort(7399); + deploymentOptions.setHeapSize("256M"); + deploymentOptions.setHeapNewSize("64M"); + + deploymentOptions.load(); + + Deployer deployer = new Deployer(); + deployer.setDeploymentOptions(deploymentOptions); + + deployer.unzipDistro(); + deployer.applyConfigChanges(); + deployer.updateFilePerms(); + deployer.updateStorageAuthConf(Sets.newHashSet(InetAddress.getByName(address))); + + File binDir = new File(basedir, "bin"); + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + + File startScript = new File(binDir, "cassandra"); + ProcessExecution startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + + startScriptExe.addArguments(asList("-p", "cassandra.pid")); + startScriptExe.setCaptureOutput(true); + ProcessExecutionResults results = systemInfo.executeProcess(startScriptExe); + + assertEquals(results.getExitCode(), (Integer) 0, "Cassandra failed to start: " + results.getCapturedOutput()); + + StorageNode storageNode = new StorageNode(); + storageNode.parseNodeInformation("127.0.0.1|7399|9142"); + + ClusterInitService clusterInitService = new ClusterInitService(); + clusterInitService.waitForClusterToStart(asList(storageNode)); + + SchemaManager schemaManager = new SchemaManager("rhqadmin", "rhqadmin", "127.0.0.1|7399|9142"); + schemaManager.install(); + schemaManager.updateTopology(true); + } + + private void initPluginContainer() { + PluginContainerConfiguration pcConfig = new PluginContainerConfiguration(); + File pluginsDir = new File(System.getProperty("pc.plugins.dir")); + pcConfig.setPluginDirectory(pluginsDir); + pcConfig.setPluginFinder(new FileSystemPluginFinder(pluginsDir)); + + pcConfig.setInsideAgent(false); + PluginContainer.getInstance().setConfiguration(pcConfig); + PluginContainer.getInstance().initialize(); + } + + @AfterSuite + public void ShutdownPluginContainerAndStorageNode() throws Exception { + PluginContainer.getInstance().shutdown(); + shutdownStorageNodeIfNecessary(); + } + + private void shutdownStorageNodeIfNecessary() throws Exception { + File binDir = new File(basedir, "bin"); + File pidFile = new File(binDir, "cassandra.pid"); + + if (pidFile.exists()) { + CassandraClusterManager ccm = new CassandraClusterManager(); + ccm.killNode(basedir); + } + } + + @Test + public void discoverStorageNode() { + InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); + InventoryReport inventoryReport = inventoryManager.executeServerScanImmediately(); + + if (inventoryReport.getAddedRoots().isEmpty()) { + // could be empty if the storage node is already in inventory from + // a prior discovery scan. + Resource platform = inventoryManager.getPlatform(); + storageNode = findCassandraNode(platform.getChildResources()); + } else { + storageNode = findCassandraNode(inventoryReport.getAddedRoots()); + } + + assertNotNull(storageNode, "Failed to discover Storage Node instance"); + assertNodeIsUp("Expected " + storageNode + " to be UP after discovery"); + } + + @Test(dependsOnMethods = "discoverStorageNode") + public void shutdownStorageNode() throws Exception { + OperationManager operationManager = PluginContainer.getInstance().getOperationManager(); + OperationServicesAdapter operationsService = new OperationServicesAdapter(operationManager); + + long timeout = 1000 * 60; + OperationContextImpl operationContext = new OperationContextImpl(storageNode.getId()); + OperationServicesResult result = operationsService.invokeOperation(operationContext, "shutdown", + new Configuration(), timeout); + + assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The shutdown operation failed"); + // TODO why is this failing? + assertNodeIsDown("Expected " + storageNode + " to be DOWN after shutting it down"); + } + + private void assertNodeIsUp(String msg) { + executeAvailabilityScan(); + + Availability availability = getAvailability(); + + assertNotNull(availability, "Unable to determine availability for " + storageNode); + assertEquals(availability.getAvailabilityType(), AvailabilityType.UP, msg); + } + + private void assertNodeIsDown(String msg) { + executeAvailabilityScan(); + + Availability availability = getAvailability(); + + assertNotNull(availability, "Unable to determine availability for " + storageNode); + assertEquals(availability.getAvailabilityType(), AvailabilityType.DOWN, msg); + } + + private Availability getAvailability() { + InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); + return inventoryManager.getAvailabilityIfKnown(storageNode); + } + + private void executeAvailabilityScan() { + InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); + inventoryManager.executeAvailabilityScanImmediately(false, true); + } + + private Resource findCassandraNode(Set<Resource> resources) { + for (Resource resource : resources) { + if (isCassandraNode(resource.getResourceType())) { + return resource; + } + } + return null; + } + + private boolean isCassandraNode(ResourceType type) { + return type.getPlugin().equals("RHQStorage") && type.getName().equals("RHQ Storage Node"); + } + +} diff --git a/modules/plugins/rhq-storage/src/test/resources/log4j.properties b/modules/plugins/rhq-storage/src/test/resources/log4j.properties new file mode 100644 index 0000000..67db049 --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/resources/log4j.properties @@ -0,0 +1,42 @@ +# +# /* +# * RHQ Management Platform +# * Copyright (C) 2005-2012 Red Hat, Inc. +# * All rights reserved. +# * +# * This program is free software; you can redistribute it and/or modify +# * it under the terms of the GNU General Public License, version 2, as +# * published by the Free Software Foundation, and/or the GNU Lesser +# * General Public License, version 2.1, also as published by the Free +# * Software Foundation. +# * +# * This program is distributed in the hope that it will be useful, +# * but WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# * GNU General Public License and the GNU Lesser General Public License +# * for more details. +# * +# * You should have received a copy of the GNU General Public License +# * and the GNU Lesser General Public License along with this program; +# * if not, write to the Free Software Foundation, Inc., +# * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# */ +# + +log4j.rootCategory=WARN, FILE, CONSOLE + +log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender +log4j.appender.FILE.DatePattern='.'yyyy-MM-dd +log4j.appender.FILE.File=./target/test.log +log4j.appender.FILE.layout=org.apache.log4j.PatternLayout +log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n +#log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n +log4j.appender.FILE.Append=false + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +#log4j.appender.CONSOLE.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n + +log4j.logger.org.rhq=DEBUG +log4j.logger.com.datastax=DEBUG commit 51830a390be2244d6fc6cbd529a5857bb8fb9cba Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 23 22:16:41 2013 -0400 first stab at prepareForBootstrap operation (which is currently broken) This is clearly broken from some manual testing I did. Given that the implementation is a bit sloppy at the moment, this is a good time to get some automated tests in place. The operation will perform the following steps in the ordered specified: 1) shut down the storage node 2) update cassandra.yaml 3) update rhq-storage-auth.conf 4) restart the node diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 0037bfe..f76da22 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -111,7 +111,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent clusterBuilder = clusterBuilder.withCredentials(username, password); } - this.cassandraSession = clusterBuilder.build().connect(clusterName); +// this.cassandraSession = clusterBuilder.build().connect(clusterName); } catch (Exception e) { LOG.error("Connect to Cassandra " + host + ":" + nativePort, e); throw e; @@ -196,7 +196,17 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent operation = storageService.getOperation("drain", emptyParams); operation.invoke((Object[]) emptyParams); - ProcessInfo process = context.getNativeProcess(); + return stopNode(); + } + + protected OperationResult stopNode() { + ProcessInfo process = getResourceContext().getNativeProcess(); + + if (processInfo == null) { + LOG.warn("Failed to obtain process info. It appears Cassandra is already shutdown."); + return new OperationResult("Failed to obtain process info. It appears Cassandra is already shutdown."); + } + long pid = process.getPid(); try { process.kill("KILL"); @@ -209,6 +219,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } + protected OperationResult startNode() { ResourceContext<?> context = getResourceContext(); Configuration pluginConfig = context.getPluginConfiguration(); diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 3b0aa5b..d9b35b9 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -26,11 +26,15 @@ package org.rhq.plugins.storage; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; @@ -39,6 +43,8 @@ import org.mc4j.ems.connection.EmsConnection; import org.mc4j.ems.connection.bean.EmsBean; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.connection.bean.operation.EmsOperation; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; @@ -48,6 +54,7 @@ import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.core.util.StringUtil; @@ -96,6 +103,8 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return updateConfiguration(parameters); } else if (name.equals("updateKnownNodes")) { return updateKnownNodes(parameters); + } else if (name.equals("prepareForBootstrap")) { + return prepareForBootstrap(parameters); } else { return super.invokeOperation(name, parameters); } @@ -132,6 +141,18 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper ipAddresses.add(propertySimple.getStringValue()); } + if (updateAuthFile(result, ipAddresses)) return result; + + EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); + EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); + emsOperation.invoke(); + + result.setSimpleResult("Successfully updated the set of known nodes."); + + return result; + } + + private boolean updateAuthFile(OperationResult result, Set<String> ipAddresses) { log.info("Updating known nodes to " + ipAddresses); File confDir = new File(getBasedir(), "conf"); @@ -150,7 +171,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper log.error(msg); result.setErrorMessage(msg); - return result; + return true; } } @@ -161,7 +182,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper "to unexpected error"; log.error(msg, e); result.setErrorMessage(msg + ": " + ThrowableUtil.getRootMessage(e)); - return result; + return true; } try { @@ -176,18 +197,127 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } result.setErrorMessage("There was an unexpected error while updating " + authFile + ". Make sure that " + "it matches " + authBackupFile + " and then reschedule the operation."); + return true; + } + return false; + } + + private OperationResult prepareForBootstrap(Configuration params) { + log.info("Preparing " + this + " for bootstrap..."); + + ResourceContext context = getResourceContext(); + OperationResult result = new OperationResult(); + + log.info("Stopping storage node"); + OperationResult stopNodeResult = stopNode(); + if (stopNodeResult.getErrorMessage() != null) { + log.error("Failed to stop storage node " + this + " Cannot prepare the node for bootstrap which means " + + "that the storage node cannot join the cluster. Make sure the storage node is not running and retry " + + "the operation"); + result.setErrorMessage("Failed to stop storage node. Cannot prepare the node for bootstrap which means " + + "that it cannot join the cluster. Make sure that the node is not running and retry the operation. " + + "Stopping the storage node failed with this error: " + stopNodeResult.getErrorMessage()); return result; } - EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); - EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); - emsOperation.invoke(); + Configuration pluginConfig = context.getPluginConfiguration(); + String yamlProp = pluginConfig.getSimpleValue("yamlConfiguration"); + File yamlFile = new File(yamlProp); - result.setSimpleResult("Successfully updated the set of known nodes."); + DumperOptions options = new DumperOptions(); + options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + Yaml yaml = new Yaml(options); + + Map yamlConfig = null; + try { + yamlConfig = (Map) yaml.load(new FileInputStream(yamlFile)); + } catch (FileNotFoundException e) { + log.error("Failed to load " + yamlFile, e); + log.error("Cannot prepare " + this + " for bootstrap. " + yamlFile + " must exist in order to make the " + + "necessary configuration changes."); + result.setErrorMessage("Cannot prepare storage node for bootstrap. It appears that " + yamlFile + + " does not exist. Make sure that it exists so that the necessary configuration changes can be made."); + + return result; + } + + purgeDir(getCommitLogDir(yamlConfig)); + for (File dataDir : getDataDirs(yamlConfig)) { + purgeDir(dataDir); + } + purgeDir(getSavedCachesDir(yamlConfig)); + + log.info("Updating cluster settings"); + + String address = pluginConfig.getSimpleValue("host"); + List<String> seeds = getAddresses(params.getList("storageNodeIPAddresses")); + // Make sure this node's address is not in the list; otherwise, it + // won't bootstrap properly. + seeds.remove(address); + try { + updateSeedsList(seeds); + } catch (IOException e) { + log.error("Failed to update seeds property in " + yamlFile, e); + result.setErrorMessage("Failed to prepared node for bootstrap due to unexpected error that occurred " + + "while updating seeds property in " + yamlFile + ":\n" + ThrowableUtil.getAllMessages(e)); + return result; + } + + if (updateAuthFile(result, new HashSet<String>(seeds))) { + return result; + } + + int cqlPort = Integer.parseInt(params.getSimpleValue("cqlPort")); + int gossipPort = Integer.parseInt(params.getSimpleValue("gossipPort")); + + yamlConfig.put("native_transport_port", cqlPort); + yamlConfig.put("storage_port", gossipPort); + + try { + yaml.dump(yamlConfig, new FileWriter(yamlFile)); + } catch (IOException e) { + log.error("Could not update cluster settings in " + yamlFile, e); + result.setErrorMessage("Could not update cluster settings in " + yamlFile + ":\n" + + ThrowableUtil.getAllMessages(e)); + return result; + } + + log.info(this + " is ready to be bootstrap. Restarting storage node..."); + OperationResult startResult = startNode(); + if (startResult.getErrorMessage() != null) { + log.error("Failed to restart storage node:\n" + startResult.getErrorMessage()); + result.setErrorMessage("Failed to restart storage node:\n" + startResult.getErrorMessage()); + } else { + result.setSimpleResult("The storage node was succesfully updated is now bootstrapping into the cluster."); + } return result; } + private void purgeDir(File dir) { + log.info("Purging " + dir); + FileUtil.purge(dir, true); + } + + private File getCommitLogDir(Map yamlConfig) { + return new File((String) yamlConfig.get("commitlog_directory")); + } + + private List<File> getDataDirs(Map yamlConfig) { + List<File> dirs = new ArrayList<File>(); + List<String> dirNames = (List<String>) yamlConfig.get("data_file_directories"); + + for (String dirName : dirNames) { + dirs.add(new File(dirName)); + } + + return dirs; + } + + private File getSavedCachesDir(Map yamlConfig) { + return new File((String) yamlConfig.get("saved_caches_directory")); + } + private OperationResult nodeAdded(Configuration params) { boolean runRepair = params.getSimple("runRepair").getBooleanValue(); boolean updateSeedsList = params.getSimple("updateSeedsList").getBooleanValue(); @@ -405,4 +535,10 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper boolean succeeded; String details; } + + @Override + public String toString() { + return StorageNodeComponent.class.getSimpleName() + "[resourceKey: " + getResourceContext().getResourceKey() + + "]"; + } } diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 1e39d6c..cd84de6 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -101,6 +101,16 @@ </parameters> </operation> + <operation name="prepareForBootstrap"> + <parameters> + <c:simple-property name="cqlPort" type="integer" displayName="CQL Port"/> + <c:simple-property name="gossipPort" type="integer"/> + <c:list-property name="storageNodeIPAddresses" displayName="Storage Node IP Addresses"> + <c:simple-property name="storageNodeIPAddress"/> + </c:list-property> + </parameters> + </operation> + <operation name="prepareForUpgrade" description="Prepares the storage node for upgrade (this operation consists of following steps: 1) turning off the RPC server, 2) turning off the gossiper, 3) taking the snapshot (backuping the data), 4) invoking the drain operation"> <parameters> <c:simple-property name="snapshotName" required="false" type="string" displayName="Snapshot Name" commit bfd21b6b424c85e12b9290be16ba59b4ed1f31bb Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Tue Jul 23 15:02:09 2013 -0400 [BZ 984649] fix module metadata. diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 145e3af..82ff294 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -290,7 +290,7 @@ <delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar.index" />  <replace file="${jboss.home}/modules/system/layers/base/org/jgroups/main/module.xml" - token="jgroups-${jgroups.initial.version}.jar" value="${jgroups.patch.version}"/> + token="jgroups-${jgroups.initial.version}.jar" value="jgroups-${jgroups.patch.version}.jar"/>  <copy file="${settings.localRepository}/org/jgroups/jgroups/${jgroups.patch.version}/jgroups-${jgroups.patch.version}.jar" toDir="${jboss.home}/modules/system/layers/base/org/jgroups/main" verbose="true"/> commit d4f78a42e9433975671b4a125db97ba475ba533c Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Tue Jul 23 13:37:32 2013 -0400 Upgrading richfaces to latest patched version. diff --git a/pom.xml b/pom.xml index 3662bc7..f909033 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ <postgresql.version>9.2-1002.jdbc4</postgresql.version> <h2.version>1.2.139</h2.version> <jtds.version>1.2.2</jtds.version> - <richfaces.version>3.3.3.Final</richfaces.version> + <richfaces.version>3.3.4.Final</richfaces.version> <jline.version>0.9.94</jline.version> <sigar.version>1.6.5.132-5</sigar.version> <sigar.zip.version>1.6.5</sigar.zip.version> commit 1af62df790bbb17fa0ee80d5ab287e264ff4e5e1 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Tue Jul 23 12:28:52 2013 -0400 [BZ 984649] update jgroups usage to latest patched version. diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 0a61138..f1a4c7b 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -19,6 +19,8 @@ <properties> <rhq.dev.data.dir>${rhq.rootDir}/rhq-data</rhq.dev.data.dir> + <jgroups.initial.version>3.2.7.Final</jgroups.initial.version> + <jgroups.patch.version>3.2.10.Final</jgroups.patch.version> </properties> <dependencies> @@ -72,6 +74,13 @@ <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> </dependency> + +  + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>${jgroups.patch.version}</version> + </dependency> </dependencies> <build> @@ -157,6 +166,8 @@ <property name="rhq.server.http.port" value="${rhq.server.http.port}" /> <property name="rhq.server.https.port" value="${rhq.server.https.port}" /> <property name="rhq.sync.endpoint-address" value="${rhq.sync.endpoint-address}" /> + <property name="jgroups.initial.version" value="${jgroups.initial.version}" /> + <property name="jgroups.patch.version" value="${jgroups.patch.version}" /> </ant> </target> </configuration> diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index a81b6cd..145e3af 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -283,6 +283,17 @@ </resources> </module> ]]></echo> + + <echo>Updating JGroups module component for EAP to ${jgroups.patch.version}</echo> +  + <delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar" /> + <delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar.index" /> +  + <replace file="${jboss.home}/modules/system/layers/base/org/jgroups/main/module.xml" + token="jgroups-${jgroups.initial.version}.jar" value="${jgroups.patch.version}"/> +  + <copy file="${settings.localRepository}/org/jgroups/jgroups/${jgroups.patch.version}/jgroups-${jgroups.patch.version}.jar" + toDir="${jboss.home}/modules/system/layers/base/org/jgroups/main" verbose="true"/> <echo>Generate SSL key for RHQ server - 128-bit key that expires in 20 years</echo> <property name="jboss.conf.dir" location="${jboss.home}/standalone/configuration" />

1 0

[rhq] modules/enterprise
by mike thompson 31 Jul '13

31 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/NumberWithUnitsValidator.java | 6 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SimpleEditableFormItem.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java | 18 +++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationHistoryPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java | 12 ++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceAlertsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java | 4 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 26 +++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java | 4 - 35 files changed, 62 insertions(+), 66 deletions(-) New commits: commit 300fe8599d7ad8f442e4c3c779f2bc847c454f49 Author: mtho11 <mikecthompson(a)gmail.com> Date: Wed Jul 31 12:09:39 2013 -0700 [BZ 990200] Static Analysis cleanup of lower risk items in coregui. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java index d896e63..0a80e6a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java @@ -80,7 +80,7 @@ public class LoginView extends Canvas { private static boolean loginShowing = false; - private Messages MSG = CoreGUI.getMessages(); + private static final Messages MSG = CoreGUI.getMessages(); private Window window; private DynamicForm form; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java index ee36243..e1d29ee 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java @@ -158,7 +158,7 @@ public class UserSessionManager { } // If a session is active it will return valid session strings - if (sessionIdString != null && sessionIdString.length() > 0) { + if (sessionIdString.length() > 0) { String[] parts = sessionIdString.split(":"); final int subjectId = Integer.parseInt(parts[0]); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/NumberWithUnitsValidator.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/NumberWithUnitsValidator.java index 37e5589..33b72c3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/NumberWithUnitsValidator.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/NumberWithUnitsValidator.java @@ -91,11 +91,7 @@ public class NumberWithUnitsValidator extends CustomValidator { if (unitsToUse != null) { try { - if (MeasurementParser.parse(value.toString(), unitsToUse) != null) { - return true; - } else { - return false; - } + return MeasurementParser.parse(value.toString(), unitsToUse) != null; } catch (Exception e) { return false; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SimpleEditableFormItem.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SimpleEditableFormItem.java index 494e22c..98bb4af 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SimpleEditableFormItem.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SimpleEditableFormItem.java @@ -48,7 +48,7 @@ import org.rhq.enterprise.gui.coregui.client.Messages; */ public class SimpleEditableFormItem extends CanvasItem { - protected static Messages MSG = CoreGUI.getMessages(); + protected static final Messages MSG = CoreGUI.getMessages(); protected FormItem staticItem; protected FormItem editItem; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java index 328112f..b4abddc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java @@ -54,12 +54,12 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; */ public abstract class AbstractMeasurementRangeEditor extends DynamicForm implements TableWidget { - protected Messages MSG = CoreGUI.getMessages(); + protected static final Messages MSG = CoreGUI.getMessages(); //keyed map of translated date units Ex. minutes,hours,days protected static LinkedHashMap<String, String> lastUnits; //array of values available for displaying/selecting 'last N hours|minutes|days'. - protected static String[] lastValues; + protected static final String[] lastValues; protected boolean advanced; private ButtonItem advancedSimpleButton; @@ -74,13 +74,13 @@ public abstract class AbstractMeasurementRangeEditor extends DynamicForm impleme private SpacerItem space; private ButtonItem setButton; - public static String ENABLE_RANGE_ITEM = "ENABLE_RANGE_ITEM"; - public static String ADVANCED_BUTTON_ITEM = "advanced"; - public static String SIMPLE_VALUE_ITEM = "lastValues"; - public static String SIMPLE_UNIT_ITEM = "lastUnits"; - public static String ADVANCED_START_ITEM = "start"; - public static String ADVANCED_END_ITEM = "end"; - public static String SET_ITEM = "set"; + public static final String ENABLE_RANGE_ITEM = "ENABLE_RANGE_ITEM"; + public static final String ADVANCED_BUTTON_ITEM = "advanced"; + public static final String SIMPLE_VALUE_ITEM = "lastValues"; + public static final String SIMPLE_UNIT_ITEM = "lastUnits"; + public static final String ADVANCED_START_ITEM = "start"; + public static final String ADVANCED_END_ITEM = "end"; + public static final String SET_ITEM = "set"; static { Messages MSG = CoreGUI.getMessages(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java index e9ab2c5..bf082b2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java @@ -118,7 +118,7 @@ public class FavoriteGroupsPortlet extends ResourceGroupListView implements Auto } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java index 6432aa3..0ba8c26 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java @@ -133,7 +133,7 @@ public class GroupBundleDeploymentsPortlet extends EnhancedVLayout implements Cu } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java index 7c3bbb3..57bfa25 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java @@ -222,7 +222,7 @@ public class GroupConfigurationUpdatesPortlet extends EnhancedVLayout implements } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java index 596d5e3..50747a6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java @@ -138,7 +138,7 @@ public class GroupEventsPortlet extends EnhancedVLayout implements CustomSetting } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java index 5ac5e9e..ca07fe8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java @@ -162,7 +162,7 @@ public class GroupMetricsPortlet extends EnhancedVLayout implements CustomSettin } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java index 2be2613..0641b68 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java @@ -132,7 +132,7 @@ public class GroupOobsPortlet extends EnhancedVLayout implements CustomSettingsP } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java index e65e90c..1236778 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java @@ -294,7 +294,7 @@ public class GroupOperationsPortlet extends EnhancedVLayout implements CustomSet } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java index f6a89c3..1ced7e3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java @@ -130,7 +130,7 @@ public class GroupPkgHistoryPortlet extends EnhancedVLayout implements CustomSet } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java index b19d761..89dfaca 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java @@ -344,7 +344,7 @@ public class ResourceGroupD3GraphPortlet extends MetricD3Graph implements AutoRe } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java index 3c8b127..e81c3cd 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java @@ -191,7 +191,7 @@ public class AutodiscoveryPortlet extends ResourceAutodiscoveryView implements C } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java index 2aa99c9..1783dec 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java @@ -121,7 +121,7 @@ public class FavoriteResourcesPortlet extends ResourceSearchView implements Auto } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java index 1854f9f..1913a6e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java @@ -324,7 +324,7 @@ public class ResourceD3GraphPortlet extends MetricD3Graph implements AutoRefresh } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); @Override public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java index f839d07..785ccbb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java @@ -263,7 +263,7 @@ public class PlatformSummaryPortlet extends Table<PlatformMetricDataSource> impl } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { return new PlatformSummaryPortlet(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java index e04c8ef..4edf8b2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java @@ -37,7 +37,7 @@ public class RecentAlertsPortlet extends AbstractRecentAlertsPortlet { } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationHistoryPortlet.java index 3a27b54..497c2c8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationHistoryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationHistoryPortlet.java @@ -38,7 +38,7 @@ public class OperationHistoryPortlet extends AbstractOperationHistoryPortlet { } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java index 949df1a..74c0f14 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java @@ -71,9 +71,9 @@ public class OperationSchedulePortlet extends EnhancedVLayout implements CustomS public static final String OPERATIONS_RANGE_SCHEDULED_ENABLED = "operations-scheduled-enabled"; public static final String OPERATIONS_RANGE_SCHEDULED = "operations-range-scheduled"; - public static String RANGE_DISABLED_MESSAGE = MSG.view_portlet_operations_disabled(); + public static final String RANGE_DISABLED_MESSAGE = MSG.view_portlet_operations_disabled(); //TODO: change this to use the Smart GWT default value. - public static String RANGE_DISABLED_MESSAGE_DEFAULT = MSG.common_msg_noItemsToShow(); + public static final String RANGE_DISABLED_MESSAGE_DEFAULT = MSG.common_msg_noItemsToShow(); private static final int WIDTH_RECENT_TIME = 150; private static final int WIDTH_RECENT_STATUS = 50; @@ -86,10 +86,10 @@ public class OperationSchedulePortlet extends EnhancedVLayout implements CustomS private ListGrid scheduledOperationsGrid = null; private ScheduledOperationsDataSource dataSourceScheduled; - public static String unlimited = "-1"; + public static final String unlimited = "-1"; public static final String unlimitedString = MSG.common_label_unlimited(); - public static String defaultValue = "5"; - public static boolean defaultEnabled = true; + public static final String defaultValue = "5"; + public static final boolean defaultEnabled = true; private Timer refreshTimer; @@ -348,7 +348,7 @@ public class OperationSchedulePortlet extends EnhancedVLayout implements CustomS } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java index 518ac29..3b45e54 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java @@ -288,7 +288,7 @@ public class ProblemResourcesPortlet extends Table<ProblemResourcesDataSource> i } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceAlertsPortlet.java index 3e3054f..44b4ebb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceAlertsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceAlertsPortlet.java @@ -48,7 +48,7 @@ public class ResourceAlertsPortlet extends AbstractRecentAlertsPortlet { } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java index c2f21b5..4ac4fb2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java @@ -63,7 +63,7 @@ public class ResourceBundleDeploymentsPortlet extends GroupBundleDeploymentsPort } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java index 4bad15f..f895fed 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java @@ -74,7 +74,7 @@ public class ResourceConfigurationUpdatesPortlet extends GroupConfigurationUpdat } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java index fc835bf..9f11f84 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java @@ -64,7 +64,7 @@ public class ResourceEventsPortlet extends GroupEventsPortlet { } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java index 3a0c67f..6a80252 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java @@ -87,7 +87,7 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet { } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { @@ -120,7 +120,7 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet { //result timeframe if enabled PropertySimple property = portletConfig.getSimple(Constant.METRIC_RANGE_ENABLE); - if (null != property && Boolean.valueOf(property.getBooleanValue())) {//then proceed setting + if (null != property && property.getBooleanValue()) {//then proceed setting boolean isAdvanced = Boolean.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_BEGIN_END_FLAG, Constant.METRIC_RANGE_BEGIN_END_FLAG_DEFAULT)); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java index 58560ea..51ab846 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java @@ -62,7 +62,7 @@ public class ResourceOobsPortlet extends GroupOobsPortlet { } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java index 7a58867..b619e83 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java @@ -60,7 +60,7 @@ public class ResourcePkgHistoryPortlet extends GroupPkgHistoryPortlet { } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java index 6c05c9b..c42a96e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java @@ -184,7 +184,7 @@ public class InventorySummaryPortlet extends EnhancedVLayout implements AutoRefr } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { return new InventorySummaryPortlet(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java index c08319c..1b20d64 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java @@ -55,7 +55,7 @@ public class TagCloudPortlet extends TagCloudView implements Portlet { } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java index 69cb503..0a5f574 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java @@ -85,7 +85,7 @@ public class MashupPortlet extends HTMLPane implements ConfigurablePortlet { } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java index 335eaac..65b8baf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java @@ -103,7 +103,7 @@ public class MessagePortlet extends HTMLPane implements ConfigurablePortlet { } public static final class Factory implements PortletViewFactory { - public static PortletViewFactory INSTANCE = new Factory(); + public static final PortletViewFactory INSTANCE = new Factory(); public final Portlet getInstance(EntityContext context) { return new MessagePortlet(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java index b22907e..b657345 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java @@ -93,19 +93,19 @@ public abstract class AbstractActivityView extends EnhancedVLayout implements Re protected Canvas recentBundleDeployContent = new Canvas(); //retrieve localized text - public static String RECENT_MEASUREMENTS = MSG.common_title_recent_measurements(); - public static String RECENT_MEASUREMENTS_NONE = MSG.view_resource_inventory_activity_no_recent_metrics(); - public static String RECENT_MEASUREMENTS_GROUP_NONE = MSG.view_group_inventory_activity_no_recent_metrics(); - public static String RECENT_ALERTS = MSG.common_title_recent_alerts(); - public static String RECENT_OOB = MSG.common_title_recent_oob_metrics(); - public static String RECENT_OOB_NONE = MSG.view_resource_inventory_activity_no_recent_oob(); - public static String RECENT_CONFIGURATIONS = MSG.common_title_recent_configuration_updates(); - public static String RECENT_OPERATIONS = MSG.common_title_recent_operations(); - public static String RECENT_EVENTS = MSG.common_title_recent_event_counts(); - public static String RECENT_PKG_HISTORY = MSG.common_title_recent_pkg_history(); - public static String RECENT_BUNDLE_DEPLOY = MSG.common_title_recent_bundle_deployments(); - public static String SEE_MORE = MSG.common_msg_see_more(); - public static String RECENT_CRITERIA_EVENTS_NONE = MSG.view_resource_inventory_activity_criteria_no_recent_events(); + public static final String RECENT_MEASUREMENTS = MSG.common_title_recent_measurements(); + public static final String RECENT_MEASUREMENTS_NONE = MSG.view_resource_inventory_activity_no_recent_metrics(); + public static final String RECENT_MEASUREMENTS_GROUP_NONE = MSG.view_group_inventory_activity_no_recent_metrics(); + public static final String RECENT_ALERTS = MSG.common_title_recent_alerts(); + public static final String RECENT_OOB = MSG.common_title_recent_oob_metrics(); + public static final String RECENT_OOB_NONE = MSG.view_resource_inventory_activity_no_recent_oob(); + public static final String RECENT_CONFIGURATIONS = MSG.common_title_recent_configuration_updates(); + public static final String RECENT_OPERATIONS = MSG.common_title_recent_operations(); + public static final String RECENT_EVENTS = MSG.common_title_recent_event_counts(); + public static final String RECENT_PKG_HISTORY = MSG.common_title_recent_pkg_history(); + public static final String RECENT_BUNDLE_DEPLOY = MSG.common_title_recent_bundle_deployments(); + public static final String SEE_MORE = MSG.common_msg_see_more(); + public static final String RECENT_CRITERIA_EVENTS_NONE = MSG.view_resource_inventory_activity_criteria_no_recent_events(); public static final String CHART_TITLE = MSG.common_title_metric_chart(); private ResourceGroupComposite groupComposite = null; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java index 5f76555..5ae201c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java @@ -131,7 +131,7 @@ public class OverviewForm extends EnhancedDynamicForm { private void buildForm(ResourceType type) { StringLengthValidator notEmptyOrNullValidator = new StringLengthValidator(1, null, false); - StringLengthValidator notNullValidator = new StringLengthValidator(null, null, false); + //StringLengthValidator notNullValidator = new StringLengthValidator(null, null, false); List<FormItem> formItems = new ArrayList<FormItem>(); @@ -320,7 +320,7 @@ public class OverviewForm extends EnhancedDynamicForm { Collections.sort(summaryTraitDefs, new Comparator<MeasurementDefinition>() { public int compare(MeasurementDefinition md1, MeasurementDefinition md2) { - return new Integer(md1.getDisplayOrder()).compareTo(md2.getDisplayOrder()); + return Integer.valueOf(md1.getDisplayOrder()).compareTo(md2.getDisplayOrder()); } });

1 0

[rhq] Branch 'feature/bundle-group' - modules/core modules/enterprise
by Jay Shaughnessy 31 Jul '13

31 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java | 25 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java | 11 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleResourceDeploymentCriteria.java | 9 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java | 44 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java | 14 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java | 2 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/tagging/TagManagerBeanTest.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 445 ++++++---- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerLocal.java | 149 ++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java | 159 ++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 50 - 17 files changed, 583 insertions(+), 359 deletions(-) New commits: commit c0adb33418b870b168d72d682225744664bea1b7 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jul 31 14:19:18 2013 -0400 Fine-grained bundle perms : checkpoint check-in - finished initial work-through of remote/local API methods and the associated coding to support the updated permission scheme - Global.MANAGE_BUNDLE is no longer used as an explicit permission but now only as a convenience for setting all of the new permissions. - merged the "FindXxxByCriteriaWithDestinationFilter" local methods into their respective "FindXxxByCriteria" methods. The base methods should be handling this filtering, otherwise they basically have a security hole. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java index 3a8569f..5af51af 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java @@ -57,7 +57,7 @@ import org.rhq.core.domain.tagging.Tag; * @author John Mazzitelli */ @Entity -@NamedQueries( { +@NamedQueries({ // Below queries primarily used for domain test code. @NamedQuery(name = Bundle.QUERY_FIND_ALL, query = "SELECT b FROM Bundle b"), // @NamedQuery(name = Bundle.QUERY_FIND_BY_NAME, query = "SELECT b FROM Bundle b WHERE :name = b.name"), @@ -182,6 +182,29 @@ public class Bundle implements Serializable { this.bundleVersions = bundleVersions; } + public Set<BundleGroup> getBundleGroups() { + return bundleGroups; + } + + public void setBundleGroups(Set<BundleGroup> bundleGroups) { + this.bundleGroups = bundleGroups; + } + + public void addBundleGroup(BundleGroup bundleGroup) { + if (this.bundleGroups == null) { + this.bundleGroups = new HashSet<BundleGroup>(); + } + this.bundleGroups.add(bundleGroup); + } + + public boolean removeBundleGroup(BundleGroup bundleGroup) { + if (this.bundleGroups != null) { + return this.bundleGroups.remove(bundleGroup); + } else { + return false; + } + } + public List<BundleDestination> getDestinations() { return destinations; } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java index 5e6f8c1..32f2f9d 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java @@ -145,6 +145,12 @@ public class BundleCriteria extends TaggedCriteria { this.fetchBundleVersions = fetchBundleVersions; } + /** + * Unless called by an InventoryManager the destinations will be filtered to those the caller can view, based + * on the resource groups associated with his roles and the group associated wuth the destination. + * + * @param fetchDestinations + */ public void fetchDestinations(boolean fetchDestinations) { this.fetchDestinations = fetchDestinations; } @@ -166,4 +172,9 @@ public class BundleCriteria extends TaggedCriteria { addSortField("description"); this.sortDescription = sortDescription; } + + public boolean isInventoryManagerRequired() { + return fetchDestinations; + } + } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleResourceDeploymentCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleResourceDeploymentCriteria.java index 7ec26d7..4924d6f 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleResourceDeploymentCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleResourceDeploymentCriteria.java @@ -18,15 +18,12 @@ */ package org.rhq.core.domain.criteria; -import java.util.List; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import org.rhq.core.domain.bundle.BundleDeploymentStatus; import org.rhq.core.domain.bundle.BundleResourceDeployment; -import org.rhq.core.domain.util.CriteriaUtils; /** * @author Jay Shaughnessy @@ -85,11 +82,7 @@ public class BundleResourceDeploymentCriteria extends Criteria { /** * By setting this fetch to true, it will cause {@link #isInventoryManagerRequired()} to return true as well. - * - * In practice, however, MANAGE_INVENTORY is too restrictive; a bundle manager who has MANAGE_BUNDLE but not - * MANAGE_INVENTORY would not be able to see any resource deployments. So, until it is possible to handle granular - * authorization checks on optionally fetched criteria data, a bundle manager will be allowed to see resource - * deployments to any platform. + * Without Inventory Manager permission results will be limited to only the resources viewable to the caller. * * @see org.rhq.enterprise.server.bundle.BundleManagerBean#findBundleResourceDeploymentsByCriteria(org.rhq.core.domain.auth.Subject, BundleResourceDeploymentCriteria) */ diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java index 0bc999f..b5dd0e4 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java @@ -79,6 +79,12 @@ public class BundleVersionCriteria extends TaggedCriteria { this.fetchBundle = fetchBundle; } + /** + * Unless called by an InventoryManager the deployments will be filtered to those the caller can view, based + * on the resource groups associated with his roles and the destination associated with the deployments. + * + * @param fetchDestinations + */ public void fetchBundleDeployments(boolean fetchBundleDeployments) { this.fetchBundleDeployments = fetchBundleDeployments; } @@ -91,4 +97,8 @@ public class BundleVersionCriteria extends TaggedCriteria { this.fetchConfigurationDefinition = fetchConfigurationDefinition; } + public boolean isInventoryManagerRequired() { + return fetchBundleDeployments; + } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java index 3f71fb1..576f8a8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java @@ -99,7 +99,7 @@ public class BundleDeploymentDataSource extends RPCDataSource<BundleDeployment, @Override protected void executeFetch(final DSRequest request, final DSResponse response, final BundleDeploymentCriteria criteria) { - bundleService.findBundleDeploymentsByCriteriaWithDestinationFilter(criteria, new AsyncCallback<PageList<BundleDeployment>>() { + bundleService.findBundleDeploymentsByCriteria(criteria, new AsyncCallback<PageList<BundleDeployment>>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError(MSG.view_bundle_deploy_loadDeployFailure(), caught); } @@ -109,7 +109,6 @@ public class BundleDeploymentDataSource extends RPCDataSource<BundleDeployment, processResponse(request.getRequestId(), response); } }); - } @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java index bd54a07..a3bc0d8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java @@ -62,9 +62,9 @@ import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallb import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedIButton; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; public class BundleView extends EnhancedVLayout implements BookmarkableView { private DynamicForm form; @@ -277,7 +277,7 @@ public class BundleView extends EnhancedVLayout implements BookmarkableView { criteria.fetchDestinations(true); criteria.fetchTags(true); - GWTServiceLookup.getBundleService().findBundlesByCriteriaWithDestinationFilter(criteria, + GWTServiceLookup.getBundleService().findBundlesByCriteria(criteria, new AsyncCallback<PageList<Bundle>>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError(MSG.view_bundle_list_error3(), caught); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java index 52f73f3..3ac67dd 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java @@ -58,9 +58,9 @@ import org.rhq.enterprise.gui.coregui.client.components.tagging.TagEditorView; import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallback; import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedIButton; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; /** * @author Greg Hinkle @@ -268,7 +268,7 @@ public class BundleVersionView extends EnhancedVLayout implements BookmarkableVi criteria.fetchConfigurationDefinition(true); criteria.fetchTags(true); - bundleManager.findBundleVersionsByCriteriaWithDestinationFilter(criteria, + bundleManager.findBundleVersionsByCriteria(criteria, new AsyncCallback<PageList<BundleVersion>>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError(MSG.view_bundle_version_loadFailure(), caught); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java index cd108b7..2a45f65 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java @@ -47,8 +47,6 @@ public interface BundleGWTService extends RemoteService { ResourceTypeBundleConfiguration getResourceTypeBundleConfiguration(int compatGroupId) throws RuntimeException; - BundleVersion createBundleVersion(int bundleId, String name, String version, String recipe) throws RuntimeException; - BundleVersion createBundleVersionViaURL(String url, String username, String password) throws RuntimeException; BundleVersion createBundleVersionViaRecipe(String recipe) throws RuntimeException; @@ -74,14 +72,9 @@ public interface BundleGWTService extends RemoteService { PageList<BundleGroup> findBundleGroupsByCriteria(BundleGroupCriteria criteria) throws RuntimeException; - PageList<Bundle> findBundlesByCriteriaWithDestinationFilter(BundleCriteria criteria) throws RuntimeException; - PageList<BundleDeployment> findBundleDeploymentsByCriteria(BundleDeploymentCriteria criteria) throws RuntimeException; - PageList<BundleDeployment> findBundleDeploymentsByCriteriaWithDestinationFilter(BundleDeploymentCriteria criteria) - throws RuntimeException; - PageList<BundleDestination> findBundleDestinationsByCriteria(BundleDestinationCriteria criteria) throws RuntimeException; @@ -92,8 +85,6 @@ public interface BundleGWTService extends RemoteService { PageList<BundleVersion> findBundleVersionsByCriteria(BundleVersionCriteria criteria) throws RuntimeException; - PageList<BundleVersion> findBundleVersionsByCriteriaWithDestinationFilter(BundleVersionCriteria criteria) throws RuntimeException; - PageList<BundleWithLatestVersionComposite> findBundlesWithLatestVersionCompositesByCriteria(BundleCriteria criteria) throws RuntimeException; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java index 88458b8..01b17a1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java @@ -110,18 +110,6 @@ public class BundleGWTServiceImpl extends AbstractGWTServiceImpl implements Bund } @Override - public BundleVersion createBundleVersion(int bundleId, String name, String version, String recipe) - throws RuntimeException { - try { - BundleVersion results = bundleManager.createBundleVersion(getSessionSubject(), bundleId, name, null, - version, recipe); - return SerialUtility.prepare(results, "createBundleVersion"); - } catch (Throwable t) { - throw getExceptionToThrowToClient(t); - } - } - - @Override public void deleteBundles(int[] bundleIds) throws RuntimeException { try { bundleManager.deleteBundles(getSessionSubject(), bundleIds); @@ -246,16 +234,6 @@ public class BundleGWTServiceImpl extends AbstractGWTServiceImpl implements Bund } @Override - public PageList<Bundle> findBundlesByCriteriaWithDestinationFilter(BundleCriteria criteria) throws RuntimeException { - try { - PageList<Bundle> results = bundleManager.findBundlesByCriteriaWithDestinationFilter(getSessionSubject(), criteria); - return SerialUtility.prepare(results, "findBundlesByCriteriaWithDestinationFilter"); - } catch (Throwable t) { - throw getExceptionToThrowToClient(t); - } - } - - @Override public PageList<BundleDeployment> findBundleDeploymentsByCriteria(BundleDeploymentCriteria criteria) throws RuntimeException { try { @@ -268,18 +246,6 @@ public class BundleGWTServiceImpl extends AbstractGWTServiceImpl implements Bund } @Override - public PageList<BundleDeployment> findBundleDeploymentsByCriteriaWithDestinationFilter(BundleDeploymentCriteria criteria) - throws RuntimeException { - try { - PageList<BundleDeployment> result = bundleManager.findBundleDeploymentsByCriteriaWithDestinationFilter(getSessionSubject(), - criteria); - return SerialUtility.prepare(result, "BundleService.findBundleDeploymentsByCriteriaWithDestinationFilter"); - } catch (Throwable t) { - throw getExceptionToThrowToClient(t); - } - } - - @Override public PageList<BundleDestination> findBundleDestinationsByCriteria(BundleDestinationCriteria criteria) throws RuntimeException { try { @@ -324,16 +290,6 @@ public class BundleGWTServiceImpl extends AbstractGWTServiceImpl implements Bund } @Override - public PageList<BundleVersion> findBundleVersionsByCriteriaWithDestinationFilter(BundleVersionCriteria criteria) throws RuntimeException { - try { - PageList<BundleVersion> results = bundleManager.findBundleVersionsByCriteriaWithDestinationFilter(getSessionSubject(), criteria); - return SerialUtility.prepare(results, "findBundleVersionsByCriteriaWithDestinationFilter"); - } catch (Throwable t) { - throw getExceptionToThrowToClient(t); - } - } - - @Override public PageList<BundleWithLatestVersionComposite> findBundlesWithLatestVersionCompositesByCriteria( BundleCriteria criteria) throws RuntimeException { try { diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java index f60d426..c4d9a79 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java @@ -860,7 +860,7 @@ public class BundleManagerBeanTest extends AbstractEJB3Test { int size = brd.getBundleResourceDeploymentHistories().size(); assertTrue(size > 0); String auditMessage = "BundleTest-Message"; - bundleManager.addBundleResourceDeploymentHistory(overlord, brd.getId(), new BundleResourceDeploymentHistory( + bundleManager.addBundleResourceDeploymentHistoryInNewTrans(overlord, brd.getId(), new BundleResourceDeploymentHistory( overlord.getName(), auditMessage, auditMessage, BundleResourceDeploymentHistory.Category.DEPLOY_STEP, BundleResourceDeploymentHistory.Status.SUCCESS, auditMessage, auditMessage)); @@ -1242,7 +1242,7 @@ public class BundleManagerBeanTest extends AbstractEJB3Test { final BundleType type = createBundleType(name); final String recipe = "deploy -f " + TEST_PREFIX + ".zip -d @@ test.path @@"; final BundleVersion bundleVerison = bundleManager.createBundleAndBundleVersion(overlord, fullName, - "description", type.getId(), fullName, fullName + "-desc", "3.0", recipe); + "description", type.getId(), 0, fullName, fullName + "-desc", "3.0", recipe); assertNotNull(bundleVerison); // find the previously created bundle @@ -1272,7 +1272,7 @@ public class BundleManagerBeanTest extends AbstractEJB3Test { final String fullName = TEST_PREFIX + "-bundle-" + name; final String recipe = "deploy -f " + TEST_PREFIX + ".zip -d @@ test.path @@"; final BundleVersion bundleVerison = bundleManager.createBundleAndBundleVersion(overlord, fullName, - "description", bundle.getBundleType().getId(), fullName, fullName + "-desc", "3.0", recipe); + "description", bundle.getBundleType().getId(), 0, fullName, fullName + "-desc", "3.0", recipe); // find the newly created bundle BundleCriteria c = new BundleCriteria(); @@ -1284,6 +1284,12 @@ public class BundleManagerBeanTest extends AbstractEJB3Test { assertEquals(1, bundles.size()); } + @Test(enabled = false) + public void testNoAuthz() throws Exception { + // create + + } + // helper methods private BundleType createBundleType(String name) throws Exception { final String fullName = TEST_PREFIX + "-type-" + name; @@ -1302,7 +1308,7 @@ public class BundleManagerBeanTest extends AbstractEJB3Test { private Bundle createBundle(String name, BundleType bt) throws Exception { final String fullName = TEST_PREFIX + "-bundle-" + name; - Bundle b = bundleManager.createBundle(overlord, fullName, fullName + "-desc", bt.getId()); + Bundle b = bundleManager.createBundle(overlord, fullName, fullName + "-desc", bt.getId(), 0); assert b.getId() > 0; assert b.getName().endsWith(fullName); diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java index 48649d2..46f2bef 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java @@ -684,7 +684,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest { BundleType bundleType = bundleMgr.getBundleType(subjectMgr.getOverlord(), bundleTypeName); assertNotNull("Cannot create bundle. Unable to find bundle type for [name: " + bundleTypeName + "]", bundleType); Bundle bundle = bundleMgr.createBundle(subjectMgr.getOverlord(), bundleName, "test bundle: " + bundleName, - bundleType.getId()); + bundleType.getId(), 0); assertNotNull("Failed create bundle for [name: " + bundleName + "]", bundle); } diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/tagging/TagManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/tagging/TagManagerBeanTest.java index 83a5dfe..bef8921 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/tagging/TagManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/tagging/TagManagerBeanTest.java @@ -259,7 +259,7 @@ public class TagManagerBeanTest extends AbstractEJB3Test { private Bundle createBundle() throws Exception { ResourceType resourceType = SessionTestHelper.createNewResourceType(em); BundleType bundleType = bundleManager.createBundleType(overlord, getRandomString(), resourceType.getId()); - return bundleManager.createBundle(overlord, getRandomString(), getRandomString(), bundleType.getId()); + return bundleManager.createBundle(overlord, getRandomString(), getRandomString(), bundleType.getId(), 0); } private BundleVersion createBundleVersion() throws Exception { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java index 51e59ff..a9882c4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java @@ -30,6 +30,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -197,9 +198,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot @Override @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) - @RequiredPermission(Permission.MANAGE_BUNDLE) - public BundleResourceDeploymentHistory addBundleResourceDeploymentHistory(Subject subject, int bundleDeploymentId, - BundleResourceDeploymentHistory history) throws Exception { + public BundleResourceDeploymentHistory addBundleResourceDeploymentHistoryInNewTrans(Subject subject, + int bundleDeploymentId, BundleResourceDeploymentHistory history) throws Exception { BundleResourceDeployment resourceDeployment = entityManager.find(BundleResourceDeployment.class, bundleDeploymentId); @@ -214,8 +214,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) - public Bundle createBundle(Subject subject, String name, String description, int bundleTypeId) throws Exception { + public Bundle createBundle(Subject subject, String name, String description, int bundleTypeId, int bundleGroupId) + throws Exception { if (null == name || "".equals(name.trim())) { throw new IllegalArgumentException("Invalid bundleName: " + name); } @@ -225,8 +225,15 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot throw new IllegalArgumentException("Invalid bundleTypeId: " + bundleTypeId); } - // create and add the required Repo. the Repo is a detached object which helps in its eventual - // removal. + BundleGroup bundleGroup = null; + if (bundleGroupId > 0) { + bundleGroup = entityManager.find(BundleGroup.class, bundleGroupId); + if (null == bundleGroup) { + throw new IllegalArgumentException("Invalid bundleGroupId: " + bundleGroupId); + } + } + + // create and add the required Repo. the Repo is a detached object which helps in its eventual removal. Repo repo = new Repo(name); repo.setCandidate(false); repo.setSyncSchedule(null); @@ -249,6 +256,9 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot Bundle bundle = new Bundle(name, bundleType, repo, packageType); bundle.setDescription(description); bundle.setPackageType(packageType); + if (null != bundleGroup) { + bundle.addBundleGroup(bundleGroup); + } log.info("Creating bundle: " + bundle); entityManager.persist(bundle); @@ -258,7 +268,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot @Override @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleDeployment createBundleDeploymentInNewTrans(Subject subject, int bundleVersionId, int bundleDestinationId, String name, String description, Configuration configuration) throws Exception { @@ -287,7 +296,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot throw new IllegalArgumentException("Invalid bundleDestinationId: " + bundleDestinationId); } - checkBundleDeploymentAuthz(subject, bundleVersion.getBundle().getId(), bundleDestination.getGroup().getId()); + checkDeployBundleAuthz(subject, bundleVersion.getBundle().getId(), bundleDestination.getGroup().getId()); String name = getBundleDeploymentNameImpl(subject, bundleDestination, bundleVersion, null); return this.createBundleDeploymentImpl(subject, bundleVersion, bundleDestination, name, description, @@ -348,7 +357,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } ResourceGroup group = entityManager.find(ResourceGroup.class, groups.get(0).getId()); - checkBundleDeploymentAuthz(subject, bundle.getId(), groupId); + checkDeployBundleAuthz(subject, bundle.getId(), groupId); BundleDestination dest = new BundleDestination(bundle, name, group, destBaseDirName, deployDir); dest.setDescription(description); @@ -383,6 +392,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot + "] or prevDeploymentId [" + prevDeploymentId + "]"); } + checkDeployBundleAuthz(subject, bundleVersion.getBundle().getId(), bundleDestination.getGroup().getId()); + return getBundleDeploymentNameImpl(subject, bundleDestination, bundleVersion, prevDeployment); } @@ -442,7 +453,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) + @RequiredPermission(Permission.CREATE_BUNDLES) public BundleType createBundleType(Subject subject, String name, int resourceTypeId) throws Exception { if (null == name || "".equals(name.trim())) { throw new IllegalArgumentException("Invalid bundleTypeName: " + name); @@ -459,22 +470,21 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleVersion createBundleAndBundleVersion(Subject subject, String bundleName, String bundleDescription, - int bundleTypeId, String bundleVersionName, String bundleVersionDescription, String version, String recipe) - throws Exception { + int bundleTypeId, int bundleGroupId, String bundleVersionName, String bundleVersionDescription, String version, + String recipe) throws Exception { // first see if the bundle exists or not; if not, create one BundleCriteria criteria = new BundleCriteria(); criteria.setStrict(true); criteria.addFilterBundleTypeId(Integer.valueOf(bundleTypeId)); criteria.addFilterName(bundleName); - criteria.clearPaging();//disable paging as the code assumes all the results will be returned. + criteria.clearPaging(); //disable paging as the code assumes all the results will be returned. PageList<Bundle> bundles = findBundlesByCriteria(subject, criteria); Bundle bundle; if (bundles.getTotalSize() == 0) { - bundle = createBundle(subject, bundleName, bundleDescription, bundleTypeId); + bundle = createBundle(subject, bundleName, bundleDescription, bundleTypeId, bundleGroupId); } else { bundle = bundles.get(0); } @@ -487,7 +497,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot @Override @SuppressWarnings("unchecked") - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleVersion createBundleVersion(Subject subject, int bundleId, String name, String description, String version, String recipe) throws Exception { if (null == name || "".equals(name.trim())) { @@ -533,7 +542,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot versionOrder = ((Number) bv[1]).intValue(); needToUpdateOrder = true; } else { - break; // comparision > 0, means our new version is higher than what's in the DB, because we DESC ordered, we can stop + break; // Comparison > 0, means our new version is higher than what's in the DB, because we DESC ordered, we can stop } } @@ -753,7 +762,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot if (isInitialVersion) { checkCreateInitialBundleVersionAuthz(subject, initialBundleGroupId); - bundle = bundleManager.createBundle(subject, bundleName, bundleDescription, bundleType.getId()); + bundle = bundleManager.createBundle(subject, bundleName, bundleDescription, bundleType.getId(), + initialBundleGroupId); createdBundle = true; } else { bundle = bundles.get(0); @@ -762,8 +772,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } // now create the bundle version with the bundle we either found or created - BundleVersion bundleVersion = bundleManager.createBundleVersion(subject, bundle.getId(), name, description, - version, recipe); + BundleVersion bundleVersion = bundleManager.createBundleVersion(subjectManager.getOverlord(), bundle.getId(), + name, description, version, recipe); // now that we have the bundle version we can actually create the bundle files that were provided in // the bundle distribution @@ -979,7 +989,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleFile addBundleFileViaPackageVersion(Subject subject, int bundleVersionId, String name, int packageVersionId) throws Exception { @@ -1010,7 +1019,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) @TransactionAttribute(TransactionAttributeType.NEVER) public void purgeBundleDestination(final Subject subject, int bundleDestinationId) throws Exception { // find the live bundle deployment for this destination, and get all the resource deployments for that live deployment @@ -1031,6 +1039,13 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot return; // nothing to do } + // Although they likely will, the actual resource deployments may no longer match the members of the destination's + // resource group (if group membership has changed). We still use the group for authz because that is the more + // intuitive, manageable way to do this. Otherwise the subject would need view perms on each of the previously + // deployed-to resources, and that may be tricky to provide. + checkDeployBundleAuthz(subject, liveDeployment.getBundleVersion().getBundle().getId(), liveDeployment + .getDestination().getGroup().getId()); + // we need to obtain the bundle type (the remote plugin container needs it). our first criteria can't fetch this deep, we have to do another query. BundleVersionCriteria bvc = new BundleVersionCriteria(); bvc.addFilterId(liveDeployment.getBundleVersion().getId()); @@ -1082,7 +1097,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot BundleResourceDeploymentHistory history = new BundleResourceDeploymentHistory(subject.getName(), "Purge Requested", "User [" + subject.getName() + "] requested to purge this deployment", null, BundleResourceDeploymentHistory.Status.SUCCESS, null, null); - bundleManager.addBundleResourceDeploymentHistory(subject, resourceDeploy.getId(), history); + bundleManager.addBundleResourceDeploymentHistoryInNewTrans(subjectManager.getOverlord(), + resourceDeploy.getId(), history); // get a connection to the agent and tell it to purge the bundle from the file system Subject overlord = subjectManager.getOverlord(); @@ -1116,8 +1132,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_SECURITY) - // no one should be calling us except overlord public void _finalizePurge(Subject subject, BundleDeployment bundleDeployment, Map<BundleResourceDeployment, String> failedToPurge) throws Exception { @@ -1154,14 +1168,12 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleDeployment scheduleBundleDeployment(Subject subject, int bundleDeploymentId, boolean isCleanDeployment) throws Exception { return scheduleBundleDeploymentImpl(subject, bundleDeploymentId, isCleanDeployment, false, null); } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleDeployment scheduleRevertBundleDeployment(Subject subject, int bundleDestinationId, String deploymentDescription, boolean isCleanDeployment) throws Exception { @@ -1189,6 +1201,9 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot + "] can not be reverted. There is no prior deployment for destinationId [" + bundleDestinationId + "]"); } + checkDeployBundleAuthz(subject, liveDeployment.getBundleVersion().getBundle().getId(), liveDeployment + .getDestination().getGroup().getId()); + // A revert is done by deploying a new deployment that mirrors "prevDeployment". It uses the same // bundleVersion, destination and config as prevDeployment. It can have a new name and new desc, and // may opt to clean the deploy dir. It must be a new deployment so that all status/auditing/history starts @@ -1225,6 +1240,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot + "] group has no members. Invalid deployment destination"); } + checkDeployBundleAuthz(subject, newDeployment.getBundleVersion().getBundle().getId(), group.getId()); + for (Resource groupMember : groupMembers) { try { scheduleBundleResourceDeployment(subject, newDeployment, groupMember, isCleanDeployment, isRevert); @@ -1277,8 +1294,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot // The BundleResourceDeployment record must exist in the db before the agent request because the agent may try // to add History to it during immediate deployments. So, create and persist it (requires a new trans). - BundleResourceDeployment resourceDeployment = bundleManager.createBundleResourceDeployment(subject, - deployment.getId(), bundleTargetResourceId); + BundleResourceDeployment resourceDeployment = bundleManager.createBundleResourceDeploymentInNewTrans( + subjectManager.getOverlord(), deployment.getId(), bundleTargetResourceId); if (null != bundleTarget.getResourceType().getResourceTypeBundleConfiguration()) { @@ -1292,7 +1309,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot AUDIT_ACTION_DEPLOYMENT_REQUESTED, deployment.getName(), null, BundleResourceDeploymentHistory.Status.SUCCESS, "Requested deployment time: " + request.getRequestedDeployTimeAsString(), null); - bundleManager.addBundleResourceDeploymentHistory(subject, resourceDeployment.getId(), history); + bundleManager.addBundleResourceDeploymentHistoryInNewTrans(subjectManager.getOverlord(), + resourceDeployment.getId(), history); BundleScheduleResponse response = bundleAgentService.schedule(request); @@ -1303,7 +1321,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot history = new BundleResourceDeploymentHistory(subject.getName(), AUDIT_ACTION_DEPLOYMENT, deployment.getName(), null, BundleResourceDeploymentHistory.Status.FAILURE, response.getErrorMessage(), null); - bundleManager.addBundleResourceDeploymentHistory(subject, resourceDeployment.getId(), history); + bundleManager.addBundleResourceDeploymentHistoryInNewTrans(subject, resourceDeployment.getId(), + history); } } catch (Throwable t) { // fail the unlaunched resource deployment @@ -1311,7 +1330,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot this.AUDIT_ACTION_DEPLOYMENT, deployment.getName(), null, BundleResourceDeploymentHistory.Status.FAILURE, "Failed to schedule, agent on [" + bundleTarget + "] may be down: " + t, null); - bundleManager.addBundleResourceDeploymentHistory(subject, resourceDeployment.getId(), failureHistory); + bundleManager.addBundleResourceDeploymentHistoryInNewTrans(subject, resourceDeployment.getId(), + failureHistory); bundleManager.setBundleResourceDeploymentStatus(subject, resourceDeployment.getId(), BundleDeploymentStatus.FAILURE); } @@ -1324,7 +1344,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot "Target resource is not of a type that can have bundles deployed to it [resource=" + bundleTarget.getName() + "; id=" + bundleTarget.getId() + "]. Fix target group for destination [" + deployment.getDestination().getName() + "]", null); - bundleManager.addBundleResourceDeploymentHistory(subject, resourceDeployment.getId(), history); + bundleManager.addBundleResourceDeploymentHistoryInNewTrans(subject, resourceDeployment.getId(), history); } return resourceDeployment; @@ -1332,7 +1352,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot @Override @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleScheduleRequest getScheduleRequest(Subject subject, int resourceDeploymentId, boolean isCleanDeployment, boolean isRevert) throws Exception { @@ -1391,8 +1410,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot @Override @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) - @RequiredPermission(Permission.MANAGE_BUNDLE) - public BundleResourceDeployment createBundleResourceDeployment(Subject subject, int bundleDeploymentId, + public BundleResourceDeployment createBundleResourceDeploymentInNewTrans(Subject subject, int bundleDeploymentId, int resourceId) throws Exception { BundleDeployment deployment = entityManager.find(BundleDeployment.class, bundleDeploymentId); @@ -1411,7 +1429,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleResourceDeployment setBundleResourceDeploymentStatus(Subject subject, int resourceDeploymentId, BundleDeploymentStatus status) throws Exception { @@ -1456,14 +1473,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot return resourceDeployment; } - // @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) - // public BundleGroupDeployment createBundleGroupDeployment(BundleGroupDeployment groupDeployment) throws Exception { - // entityManager.persist(groupDeployment); - // return groupDeployment; - //} - @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public Set<String> getBundleVersionFilenames(Subject subject, int bundleVersionId, boolean withoutBundleFileOnly) throws Exception { @@ -1472,6 +1482,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot throw new IllegalArgumentException("Invalid bundleVersionId: " + bundleVersionId); } + checkCreateBundleVersionAuthz(subject, bundleVersion.getBundle().getId()); + // parse the recipe (validation occurs here) and get the config def and list of files BundleType bundleType = bundleVersion.getBundle().getBundleType(); RecipeParseResults parseResults = BundleManagerHelper.getPluginContainer().getBundleServerPluginManager() @@ -1499,11 +1511,9 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } return result; - } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public HashMap<String, Boolean> getAllBundleVersionFilenames(Subject subject, int bundleVersionId) throws Exception { BundleVersion bundleVersion = entityManager.find(BundleVersion.class, bundleVersionId); @@ -1511,6 +1521,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot throw new IllegalArgumentException("Invalid bundleVersionId: " + bundleVersionId); } + checkCreateBundleVersionAuthz(subject, bundleVersion.getBundle().getId()); + // parse the recipe (validation occurs here) and get the config def and list of files BundleType bundleType = bundleVersion.getBundle().getBundleType(); RecipeParseResults parseResults = BundleManagerHelper.getPluginContainer().getBundleServerPluginManager() @@ -1533,7 +1545,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } return result; - } @Override @@ -1557,44 +1568,40 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot @Override public PageList<BundleDeployment> findBundleDeploymentsByCriteria(Subject subject, BundleDeploymentCriteria criteria) { CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria); - CriteriaQueryRunner<BundleDeployment> queryRunner = new CriteriaQueryRunner<BundleDeployment>(criteria, - generator, entityManager); - return queryRunner.execute(); - } - - /** - * Fetch bundle deployments by criteria and then filter on destinations on the result objects to limit what the user can see - * @param subject Caller - * @param criteria criteria to fetch the deployments - * @return List of deployments with destinations filtered. - */ - @Override - public PageList<BundleDeployment> findBundleDeploymentsByCriteriaWithDestinationFilter(Subject subject, - BundleDeploymentCriteria criteria) { - - PageList<BundleDeployment> deployments = findBundleDeploymentsByCriteria(subject, criteria); - if (authorizationManager.isInventoryManager(subject)) - return deployments; - PageList<BundleDeployment> resultingDeployments = new PageList<BundleDeployment>(deployments.getPageControl()); - // We now have visible destinations - go over the resultingDeployments and only include the ones with vis. destinations - for (BundleDeployment deployment : deployments) { + // filter by bundles that are viewable + if (!authorizationManager.hasGlobalPermission(subject, Permission.VIEW_BUNDLES)) { + generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.BUNDLE, null, + subject.getId()); + } - int bundleId = deployment.getBundleVersion().getBundle().getId(); - BundleDestinationCriteria destinationCriteria = new BundleDestinationCriteria(); - destinationCriteria.addFilterBundleId(bundleId); - List<BundleDestination> destinations = findBundleDestinationsByCriteria(subject, destinationCriteria); - if (destinationsContains(destinations, deployment.getDestination())) - resultingDeployments.add(deployment); + CriteriaQueryRunner<BundleDeployment> queryRunner = new CriteriaQueryRunner<BundleDeployment>(criteria, + generator, entityManager); + PageList<BundleDeployment> result = queryRunner.execute(); + + // The result currently holds bundle deployments for bundles viewable by the caller, but we must remove + // those bundle deployments for destinations not viewable by the user. In essence we wanted two authz tokens, + // one for bundle and one for resource group, but we can only supply one. + if (!(result.isEmpty() || authorizationManager.isInventoryManager(subject))) { + + for (Iterator<BundleDeployment> i = result.iterator(); i.hasNext();) { + BundleDeployment bd = i.next(); + int groupId = bd.getDestination().getGroup().getId(); + if (!authorizationManager.canViewGroup(subject, groupId)) { + i.remove(); + } + } } - return resultingDeployments; + + return result; } @Override public PageList<BundleDestination> findBundleDestinationsByCriteria(Subject subject, BundleDestinationCriteria criteria) { CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria); - // Filter by destinations that are viewable + + // Filter by destinations (resource groups) that are viewable if (!authorizationManager.isInventoryManager(subject)) { generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.GROUP, subject.getId()); @@ -1610,74 +1617,95 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria); - if (!authorizationManager.isInventoryManager(subject)) { - if (criteria.isInventoryManagerRequired()) { - // TODO: MANAGE_INVENTORY was too restrictive as a bundle manager could not then - // see his resource deployments. Until we can handle granular authorization checks on - // optionally fetched resource member data, allow a bundle manager to see - // resource deployments to any resource. - if (!authorizationManager.hasGlobalPermission(subject, Permission.MANAGE_BUNDLE)) { - throw new PermissionException("Subject [" + subject.getName() - + "] requires InventoryManager or BundleManager permission for requested query criteria."); - } - } - // TODO limit target groups according to visibility + // filter by bundles that are viewable + if (!authorizationManager.hasGlobalPermission(subject, Permission.VIEW_BUNDLES)) { + generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.BUNDLE, null, + subject.getId()); } CriteriaQueryRunner<BundleResourceDeployment> queryRunner = new CriteriaQueryRunner<BundleResourceDeployment>( criteria, generator, entityManager); + PageList<BundleResourceDeployment> result = queryRunner.execute(); - return queryRunner.execute(); + // if necessary, filter results to resources that are viewable + if (!result.isEmpty() && criteria.isInventoryManagerRequired() + && !authorizationManager.isInventoryManager(subject)) { + + // try to authorize in one call, if that fails then go (slow) fine-grained + List<Integer> resourceIds = new ArrayList<Integer>(result.size()); + for (BundleResourceDeployment brd : result) { + int resourceId = brd.getResource().getId(); + resourceIds.add(resourceId); + } + + if (!authorizationManager.canViewResources(subject, resourceIds)) { + for (Integer resourceId : resourceIds) { + if (!authorizationManager.canViewResource(subject, resourceId)) { + for (Iterator<BundleResourceDeployment> i = result.iterator(); i.hasNext();) { + BundleResourceDeployment brd = i.next(); + if (brd.getResource().getId() == resourceId.intValue()) { + i.remove(); + } + } + } + } + } + } + + return result; } @Override public PageList<BundleVersion> findBundleVersionsByCriteria(Subject subject, BundleVersionCriteria criteria) { CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria); - CriteriaQueryRunner<BundleVersion> queryRunner = new CriteriaQueryRunner<BundleVersion>(criteria, generator, - entityManager); - return queryRunner.execute(); - } - - /** - * Fetch bundle versions by criteria and then filter destination on the result objects to limit what the user can see - * @param subject Caller - * @param criteria criteria to fetch the bundles - * @return List of versions with destinations filtered. - */ - @Override - public PageList<BundleVersion> findBundleVersionsByCriteriaWithDestinationFilter(Subject subject, - BundleVersionCriteria criteria) { - PageList<BundleVersion> versions = findBundleVersionsByCriteria(subject, criteria); - if (authorizationManager.isInventoryManager(subject)) { - return versions; + if (!authorizationManager.hasGlobalPermission(subject, Permission.VIEW_BUNDLES)) { + generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.BUNDLE, null, + subject.getId()); } - // Not inv manager -> restrict visible deployments by visible destinations - for (BundleVersion version : versions) { + CriteriaQueryRunner<BundleVersion> queryRunner = new CriteriaQueryRunner<BundleVersion>(criteria, generator, + entityManager); + PageList<BundleVersion> result = queryRunner.execute(); + + // If asking for optional data that the subject may not be able to see then ensure that the optional + // data is filtered appropriately. In this case only deployments to destinations viewable by the subject + // can be returned. The result currently holds bundle versions viewable by the caller, but the bundle version + // may have been deployed to destinations for which the user does not have access to the destination's + // resource group. (BZ 694741) + if (!result.isEmpty() && criteria.isInventoryManagerRequired() + && !authorizationManager.isInventoryManager(subject)) { + + // this works because findBundleDestinationsByCriteria() authorizes against resource group associations + + for (BundleVersion bundleVersion : result) { + int numDeployments = bundleVersion.getBundleDeployments().size(); + if (0 == numDeployments) { + continue; + } - Bundle bundle = version.getBundle(); - BundleDestinationCriteria destinationCriteria = new BundleDestinationCriteria(); - destinationCriteria.addFilterBundleId(bundle.getId()); - destinationCriteria.clearPaging();//disable paging as the code assumes all the results will be returned. + Bundle bundle = bundleVersion.getBundle(); + BundleDestinationCriteria destinationCriteria = new BundleDestinationCriteria(); + destinationCriteria.clearPaging(); //disable paging as the code assumes all the results will be returned. + destinationCriteria.addFilterBundleId(bundle.getId()); + + // get the viewable destinations and use to filter the deployments + List<BundleDestination> destinations = findBundleDestinationsByCriteria(subject, destinationCriteria); + List<BundleDeployment> filteredDeployments = new ArrayList<BundleDeployment>(numDeployments); + entityManager.detach(bundleVersion); // make sure we don't persist the filtered data + for (BundleDeployment deployment : bundleVersion.getBundleDeployments()) { + if (containsDestination(destinations, deployment.getDestination())) + filteredDeployments.add(deployment); + } - List<BundleDestination> destinations = findBundleDestinationsByCriteria(subject, destinationCriteria); - List<BundleDeployment> resultingDeployments = new ArrayList<BundleDeployment>(version - .getBundleDeployments().size()); - // We now have visible destinations - go over the resultingDeployments and only include the ones with vis. destinations - for (BundleDeployment deployment : version.getBundleDeployments()) { - if (destinationsContains(destinations, deployment.getDestination())) - resultingDeployments.add(deployment); + bundleVersion.setBundleDeployments(filteredDeployments); } - - version.setBundleDeployments(resultingDeployments); } - return versions; - + return result; } - private boolean destinationsContains(List<BundleDestination> list, BundleDestination dest) { + private boolean containsDestination(List<BundleDestination> list, BundleDestination dest) { int id = dest.getId(); for (BundleDestination destination : list) { if (destination.getId() == id) @@ -1689,6 +1717,13 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot @Override public PageList<BundleFile> findBundleFilesByCriteria(Subject subject, BundleFileCriteria criteria) { CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria); + + // filter by bundles that are viewable + if (!authorizationManager.hasGlobalPermission(subject, Permission.VIEW_BUNDLES)) { + generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.BUNDLE, null, + subject.getId()); + } + CriteriaQueryRunner<BundleFile> queryRunner = new CriteriaQueryRunner<BundleFile>(criteria, generator, entityManager); return queryRunner.execute(); @@ -1700,40 +1735,35 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria); if (!authorizationManager.hasGlobalPermission(subject, Permission.VIEW_BUNDLES)) { - generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.BUNDLE, null, subject.getId()); } CriteriaQueryRunner<Bundle> queryRunner = new CriteriaQueryRunner<Bundle>(criteria, generator, entityManager); - return queryRunner.execute(); - } - - /** - * Fetch bundles by criteria and then filter destination on the result objects to limit what the user can see - * @param subject Caller - * @param criteria criteria to fetch the bundles - * @return List of bundles with destinations filtered. - */ - @Override - public PageList<Bundle> findBundlesByCriteriaWithDestinationFilter(Subject subject, BundleCriteria criteria) { - // First get the bundles - PageList<Bundle> bundles = findBundlesByCriteria(subject, criteria); - if (authorizationManager.isInventoryManager(subject)) { - return bundles; - } - // Not inv manager -> restrict visible destinations - PageList<Bundle> result = new PageList<Bundle>(bundles.size(), bundles.getPageControl()); - for (Bundle bundle : bundles.getValues()) { // TODO clone the bundle and return the modified clones - BundleDestinationCriteria destinationCriteria = new BundleDestinationCriteria(); - destinationCriteria.addFilterBundleId(bundle.getId()); - destinationCriteria.clearPaging();//disable paging as the code assumes all the results will be returned. - - List<BundleDestination> destinations = findBundleDestinationsByCriteria(subject, destinationCriteria); - bundle.setDestinations(destinations); + PageList<Bundle> result = queryRunner.execute(); + + // If asking for optional data that the subject may not be able to see then ensure that the optional + // data is filtered appropriately. In this case only destinations viewable by the subject can be returned. + // The result currently holds bundles viewable by the caller, but the bundle may have been deployed to + // destinations for which the user does not have access to the destination's resource group. (BZ 694741) + if (!result.isEmpty() && criteria.isInventoryManagerRequired() + && !authorizationManager.isInventoryManager(subject)) { + + // this works because findBundleDestinationsByCriteria() authorizes against resource group associations + for (Bundle bundle : result) { + if (bundle.getDestinations().isEmpty()) { + continue; + } + BundleDestinationCriteria destinationCriteria = new BundleDestinationCriteria(); + destinationCriteria.clearPaging(); //disable paging as the code assumes all the results will be returned. + destinationCriteria.addFilterBundleId(bundle.getId()); + List<BundleDestination> destinations = findBundleDestinationsByCriteria(subject, destinationCriteria); + entityManager.detach(bundle); // make sure the narrowed set of destinations does not get persisted + bundle.setDestinations(destinations); + } } - return bundles; + return result; } @Override @@ -1750,6 +1780,11 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot + " ( SELECT COUNT(bv3) FROM bundle.bundleVersions bv3 WHERE bv3.bundle.id = bundle.id) AS deploymentCount ) "; generator.alterProjection(replacementSelectList); + if (!authorizationManager.hasGlobalPermission(subject, Permission.VIEW_BUNDLES)) { + generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.BUNDLE, null, + subject.getId()); + } + CriteriaQueryRunner<BundleWithLatestVersionComposite> queryRunner = new CriteriaQueryRunner<BundleWithLatestVersionComposite>( criteria, generator, entityManager); PageList<BundleWithLatestVersionComposite> results = queryRunner.execute(); @@ -1771,13 +1806,14 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot @Override @SuppressWarnings("unchecked") - @RequiredPermission(Permission.MANAGE_BUNDLE) public void deleteBundle(Subject subject, int bundleId) throws Exception { Bundle bundle = this.entityManager.find(Bundle.class, bundleId); if (null == bundle) { return; } + checkDeleteBundleAuthz(subject, bundleId); + Query q = entityManager.createNamedQuery(BundleVersion.QUERY_FIND_BY_BUNDLE_ID); q.setParameter("bundleId", bundleId); List<BundleVersion> bvs = q.getResultList(); @@ -1797,12 +1833,15 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public void deleteBundleDeployment(Subject subject, int bundleDeploymentId) throws Exception { BundleDeployment doomed = this.entityManager.find(BundleDeployment.class, bundleDeploymentId); if (null == doomed) { return; } + + checkDeployBundleAuthz(subject, doomed.getBundleVersion().getBundle().getId(), doomed.getDestination() + .getGroup().getId()); + // only allow deployments to be deleted if they are finished if (BundleDeploymentStatus.SUCCESS == doomed.getStatus() || BundleDeploymentStatus.FAILURE == doomed.getStatus() @@ -1814,13 +1853,14 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public void deleteBundleDestination(Subject subject, int destinationId) throws Exception { BundleDestination doomed = this.entityManager.find(BundleDestination.class, destinationId); if (null == doomed) { return; } + checkDeployBundleAuthz(subject, doomed.getBundle().getId(), doomed.getGroup().getId()); + // deployments replace other deployments and have a self-referring FK. The deployments // need to be removed in a way that will ensure that a replaced deployment is not removed // prior to the replacer. To do this we'll just blanket update all the doomed deployments @@ -1834,26 +1874,26 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public void deleteBundleVersion(Subject subject, int bundleVersionId, boolean deleteBundleIfEmpty) throws Exception { BundleVersion bundleVersion = this.entityManager.find(BundleVersion.class, bundleVersionId); if (null == bundleVersion) { return; } + int bundleId = bundleVersion.getBundle().getId(); + + checkDeleteBundleAuthz(subject, bundleId); + // After we delete this bundle version, this is the version order value that is being removed. // Later we need to re-order the other bundles that are newer than this so their version orders are readjusted. int doomedBundleVersionOrder = bundleVersion.getVersionOrder(); - int bundleId = bundleVersion.getBundle().getId(); - // deployments replace other deployments and have a self-referring FK. The deployments // need to be removed in a way that will ensure that a replaced deployment is not removed // prior to the replacer. To do this we'll just blanket update all the doomed deployments // to break the FK dependency with nulls. Query q = entityManager.createNamedQuery(BundleDeployment.QUERY_UPDATE_FOR_VERSION_REMOVE); q.setParameter("bundleVersionId", bundleVersionId); - @SuppressWarnings("unused") int rowsUpdated = q.executeUpdate(); entityManager.flush(); @@ -1970,10 +2010,10 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot public PageList<BundleGroup> findBundleGroupsByCriteria(Subject subject, BundleGroupCriteria criteria) { CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria); - if (!authorizationManager.hasGlobalPermission(subject, Permission.VIEW_BUNDLES)) { - - generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.BUNDLE, null, - subject.getId()); + // filter by bundle groups that are viewable + if (!authorizationManager.hasGlobalPermission(subject, Permission.MANAGE_BUNDLE_GROUPS)) { + generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.BUNDLE_GROUP, + null, subject.getId()); } CriteriaQueryRunner<BundleGroup> queryRunner = new CriteriaQueryRunner<BundleGroup>(criteria, generator, @@ -1983,11 +2023,29 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot @Override public void unassignBundlesFromBundleGroup(Subject subject, int bundleGroupId, int[] bundleIds) { - // TODO Auto-generated method stub + BundleGroup bundleGroup = entityManager.find(BundleGroup.class, bundleGroupId); + if (null == bundleGroup) { + throw new IllegalArgumentException("BundleGroup does not exist for bundleGroupId [" + bundleGroupId + "]"); + } + + checkAssignBundleGroupAuthz(subject, bundleGroupId, bundleIds); + for (int bundleId : bundleIds) { + Bundle bundle = entityManager.find(Bundle.class, bundleId); + if (null == bundle) { + throw new IllegalArgumentException("Bundle does not exist for bundleId [" + bundleId + "]"); + } + + bundleGroup.removeBundle(bundle); + } } /** + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG + * * @param subject * @param bundleGroupId null or 0 for unassigned initial bundle version creation * @throws PermissionException @@ -2026,6 +2084,11 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } /** + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * * @param subject * @param bundleId required, bundleId of bundle in which bundle version is being created/updated * @throws PermissionException @@ -2062,6 +2125,10 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } /** + * Requires VIEW permission for the relevant bundle and either: + * - Global.CREATE_BUNDLE + * - BundleGroup.CREATE_BUNDLES_IN_GROUP or BundleGroup.ASSIGN_BUNDLES_TO_GROUP for the relevant bundle group + * * @param subject * @param bundleGroupId an existing bundle group * @param bundleIds existing bundles @@ -2109,8 +2176,12 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot return; } - private void checkBundleDeploymentAuthz(Subject subject, int bundleId, int resourceGroupId) - throws PermissionException { + /** + * Required Permissions: Either: + * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + */ + private void checkDeployBundleAuthz(Subject subject, int bundleId, int resourceGroupId) throws PermissionException { boolean hasResourceGroupView = authorizationManager.hasGroupPermission(subject, Permission.VIEW_RESOURCE, resourceGroupId); @@ -2143,4 +2214,46 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot return; } + + /** + * Required Permissions: Either: + * - Global.DELETE_BUNDLES and Global.VIEW_BUNDLES + * - Global.DELETE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.DELETE_BUNDLES_FROM_GROUP for bundle group BG and the relevant bundle is assigned to BG + * + * @param subject + * @param bundleId required, bundleId of bundle, or the bundle version, being deleted + * @throws PermissionException + */ + private void checkDeleteBundleAuthz(Subject subject, int bundleId) throws PermissionException { + + if (bundleId <= 0) { + throw new IllegalArgumentException( + "Must supply valid bundleId for bundle version being deleted. BundleId specified [" + bundleId + "]"); + } + + Set<Permission> globalPerms = authorizationManager.getExplicitGlobalPermissions(subject); + boolean hasGlobalDeleteBundles = globalPerms.contains(Permission.DELETE_BUNDLES); + + if (hasGlobalDeleteBundles && globalPerms.contains(Permission.VIEW_BUNDLES)) { + return; + } + + if (hasGlobalDeleteBundles) { + if (authorizationManager.hasBundlePermission(subject, Permission.VIEW_BUNDLES_IN_GROUP, bundleId)) { + return; + } + } else { + if (authorizationManager.hasBundlePermission(subject, Permission.DELETE_BUNDLES_FROM_GROUP, bundleId)) { + return; + } + } + + String msg = "Subject [" + + subject.getName() + + "] requires either Global.DELETE_BUNDLES + BundleGroup.VIEW_BUNDLES_IN_GROUP, or BundleGroup.DELETE_BUNDLES_FROM_GROUP, to delete bundle [" + + bundleId + "]."; + throw new PermissionException(msg); + } + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerLocal.java index b4d7d1b..01ca620 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerLocal.java @@ -33,10 +33,6 @@ import org.rhq.core.domain.bundle.BundleResourceDeploymentHistory; import org.rhq.core.domain.bundle.BundleType; import org.rhq.core.domain.bundle.BundleVersion; import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.criteria.BundleCriteria; -import org.rhq.core.domain.criteria.BundleDeploymentCriteria; -import org.rhq.core.domain.criteria.BundleVersionCriteria; -import org.rhq.core.domain.util.PageList; /** * Local interface to the manager responsible for creating and managing bundles. @@ -55,51 +51,64 @@ public interface BundleManagerLocal extends BundleManagerRemote { // - legacy reasons /** + * Internal use only + * </p> * Called internally to add history when action is taken against a deployment. This executes * in a New Transaction and supports deployBundle and Agent requests. - * + * </p> + * This method performs NO AUTHZ! + * </p> * @param subject * @param resourceDeploymentId id of the deployment appending the history record * @param history * @return the persisted history */ - BundleResourceDeploymentHistory addBundleResourceDeploymentHistory(Subject subject, int resourceDeploymentId, - BundleResourceDeploymentHistory history) throws Exception; + BundleResourceDeploymentHistory addBundleResourceDeploymentHistoryInNewTrans(Subject subject, + int resourceDeploymentId, BundleResourceDeploymentHistory history) throws Exception; /** - * Mainly Used For Testing - * + * Internal use only, and test entry point. + * </p> + * This method performs NO AUTHZ! + * </p> * @param subject user that must have proper permissions * @param name not null or empty * @param description optional long description of the bundle * @param bundleTypeId valid bundleType + * @param bundleGroupId bundle group, existing bundle group for bundle assignment, or 0 for unassigned * @return the persisted Bundle (id is assigned) */ - Bundle createBundle(Subject subject, String name, String description, int bundleTypeId) throws Exception; + Bundle createBundle(Subject subject, String name, String description, int bundleTypeId, int bundleGroupId) + throws Exception; /** - * Mainly Used For Testing + * Internal use only and test entry point. * - * Convienence method that combines {@link #createBundle(Subject, String, int)} and {@link #createBundleVersion(Subject, int, String, String, String)}. + * Convenience method that combines {@link #createBundle(Subject, String, int)} and {@link #createBundleVersion(Subject, int, String, String, String)}. * This will first check to see if a bundle with the given type/name exists - if it doesn't, it will be created. If it does, it will be reused. * This will then create the bundle version that will be associated with the bundle that was created or found. - * + * </p> + * This method performs NO AUTHZ! + * </p> * @param subject user that must have proper permissions * @param bundleName name of the bundle to use (if not found, it will be created) * @param bundleDescription optional long description of the bundle * @param bundleTypeId the bundle type for the new bundle (if it is created) for which this will be the first version + * @param bundleGroupId the bundle group for the new bundle (if it is created) for which this will be the first version. 0 to leave unassigned. * @param bundleVersionName name of the bundle version * @param bundleVersionDescription optional long description of the bundle version * @param version optional. If not supplied set to 1.0 for first version, or incremented (as best as possible) for subsequent version * @return the persisted BundleVersion (id is assigned) */ BundleVersion createBundleAndBundleVersion(Subject subject, String bundleName, String bundleDescription, - int bundleTypeId, String bundleVersionName, String bundleVersionDescription, String version, String recipe) - throws Exception; + int bundleTypeId, int bundleGroupId, String bundleVersionName, String bundleVersionDescription, String version, + String recipe) throws Exception; /** - * Mainly Used For Testing - * + * Internal use only, test entry point + * </p> + * This method performs NO AUTHZ! + * </p> * @param subject user that must have proper permissions * @param bundleId the bundle for which this will be the next version * @param name not null or empty @@ -112,8 +121,11 @@ public interface BundleManagerLocal extends BundleManagerRemote { /** * Not generally called. For use by Server Side Plugins when registering a Bundle Plugin. - * - * @param subject must be InventoryManager + * </p> + * Required Permissions: + * - Global.CREATE_BUNDLES + * </p> + * @param subject * @param name not null or empty * @param resourceTypeId id of the ResourceType that handles this BundleType * @return the persisted BundleType (id is assigned) @@ -121,26 +133,50 @@ public interface BundleManagerLocal extends BundleManagerRemote { BundleType createBundleType(Subject subject, String name, int resourceTypeId) throws Exception; /** - * This is typically not called directly, typically scheduleBundleResourceDeployment() is called externally. This executes - * in a New Transaction and supports scheduleBundleResourceDeployment. + * This is typically not called directly, typically scheduleBundleResourceDeployment() is called externally. + * This executes in a New Transaction and supports scheduleBundleResourceDeployment. + * </p> + * This method performs NO AUTHZ! + * </p> */ - BundleResourceDeployment createBundleResourceDeployment(Subject subject, int bundleDeploymentId, int resourceId) - throws Exception; + BundleResourceDeployment createBundleResourceDeploymentInNewTrans(Subject subject, int bundleDeploymentId, + int resourceId) throws Exception; /** * Similar to {@link BundleManagerRemote#createBundleDeployment(Subject, int, int, String, Configuration)} but * supplies the internally generated deploymentName and has different transaction semantics. Useful when an * slsb method needs to both create a deployment and schedules it prior to returning to an external caller. + * </p> + * This method performs NO AUTHZ! + * </p> */ public BundleDeployment createBundleDeploymentInNewTrans(Subject subject, int bundleVersionId, int bundleDestinationId, String name, String description, Configuration configuration) throws Exception; - // added here because the same method in @Remote was commented out to bypass a WSProvide issue + /** + * Used by GUI + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * </p> + * + * @param subject + * @param bundleVersionId + * @return Map, filename to foundInBundleVersion + * @throws Exception + */ HashMap<String, Boolean> getAllBundleVersionFilenames(Subject subject, int bundleVersionId) throws Exception; /** - * Needed by the Bundle Deploy and Revert wizards GUI to generate a deployment name for display. - * + * Used by GUI. Needed by the Bundle Deploy and Revert wizards GUI to generate a deployment name for display. + * <pre> + * Required Permissions: Either: + * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * </pre> + * * @param subject * @param bundleDestinationId required * @param bundleVersionId required for progressive deployment, -1 for revert @@ -151,18 +187,26 @@ public interface BundleManagerLocal extends BundleManagerRemote { int prevDeploymentId); /** - * Not for general consumption. A special case method to build the pojo that can be sent to the agent to + * Internal use only. A special case method to build the pojo that can be sent to the agent to * schedule the deployment request. Uses NOT_SUPPORTED transaction attribute to avoid having the cleaned pojo * affect the persistence context. + * </p> + * This method performs NO AUTHZ! + * </p> + * * @throws Exception */ public BundleScheduleRequest getScheduleRequest(Subject subject, int resourceDeploymentId, boolean isCleanDeployment, boolean isRevert) throws Exception; /** - * This is a simple attempt at delete, typically used for removing a poorly defined deployment before it is - * actually scheduled for deployment. The status must be PENDING. It will - * fail if anything actually refers to it. + * Used by GUI. This is a simple attempt at delete, typically used for removing a poorly defined deployment before it is + * actually scheduled for deployment. The status must be PENDING. It will fail if anything actually refers to it. + * <pre> + * Required Permissions: Either: + * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * </pre> * * @param subject * @param bundleDeploymentId @@ -171,8 +215,13 @@ public interface BundleManagerLocal extends BundleManagerRemote { void deleteBundleDeployment(Subject subject, int bundleDeploymentId) throws Exception; /** - * This is a simple attempt at delete, typically used for removing a poorly defined destination. It will + * Used by GUI. This is a simple attempt at delete, typically used for removing a poorly defined destination. It will * fail if any actual deployments are referring to the destination. + * <pre> + * Required Permissions: Either: + * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * </pre> * * @param subject * @param bundleDestinationId @@ -181,7 +230,11 @@ public interface BundleManagerLocal extends BundleManagerRemote { void deleteBundleDestination(Subject subject, int bundleDestinationId) throws Exception; /** - * Called internally to set deployment status. Typically to a completion status when deployment ends. + * Internal use only. Called internally to set deployment status. Typically to a completion status when deployment + * ends. + * </p> + * This method performs NO AUTHZ! + * </p> * * @param subject * @param resourceDeploymentId id of the resource deployment appending the history record @@ -192,9 +245,14 @@ public interface BundleManagerLocal extends BundleManagerRemote { BundleDeploymentStatus status) throws Exception; /** - * This is for internal use only - when {@link #purgeBundleDestination(Subject, int)} is done, it + * Internal use only + * </p> + * When {@link #purgeBundleDestination(Subject, int)} is done, it * calls this so the purge can be finalized. This is required because this method is called with * a transactional context, as opposed to the main purge method. + * </p> + * This method performs NO AUTHZ! + * </p> * * @param subject * @param bundleDeployment @@ -204,29 +262,4 @@ public interface BundleManagerLocal extends BundleManagerRemote { void _finalizePurge(Subject subject, BundleDeployment bundleDeployment, Map<BundleResourceDeployment, String> failedToPurge) throws Exception; - /** - * Fetch bundles by criteria and then on the result objects - * @param subject Caller - * @param criteria criteria to fetch the bundles - * @return List of bundles with destinations filtered. - */ - PageList<Bundle> findBundlesByCriteriaWithDestinationFilter(Subject subject, BundleCriteria criteria); - - /** - * Fetch bundle versions by criteria and then filter destination on the result objects to limit what the user can see - * @param subject Caller - * @param criteria criteria to fetch the bundles - * @return List of bundles with destinations filtered. - */ - PageList<BundleVersion> findBundleVersionsByCriteriaWithDestinationFilter(Subject subject, - BundleVersionCriteria criteria); - - /** - * Fetch bundle deployments by criteria and then filter on destinations on the result objects to limit what the user can see - * @param subject Caller - * @param criteria criteria to fetch the deployments - * @return List of deployments with destinations filtered. - */ - PageList<BundleDeployment> findBundleDeploymentsByCriteriaWithDestinationFilter(Subject subject, - BundleDeploymentCriteria criteria); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java index 5ff63d0..c1b9eef 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java @@ -72,12 +72,13 @@ public interface BundleManagerRemote { /** * Adds a BundleFile to the BundleVersion and implicitly creates the backing PackageVersion. If the PackageVersion * already exists use {@link #addBundleFileViaPackageVersion(Subject, int, String, int)} - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @param subject user that must have proper permissions * @param bundleVersionId id of the BundleVersion incorporating this BundleFile * @param name name of the BundleFile (and the resulting Package) @@ -94,12 +95,13 @@ public interface BundleManagerRemote { * A convenience method taking a byte array as opposed to a stream for the file bits. * WARNING: obviously, this requires the entire bundle file to have been loaded fully in memory. * For very large files, this could cause OutOfMemoryErrors. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @see {@link #addBundleFile(Subject, int, String, String, Architecture, InputStream)} */ BundleFile addBundleFileViaByteArray(Subject subject, int bundleVersionId, String name, String version, @@ -107,12 +109,13 @@ public interface BundleManagerRemote { /** * A convenience method taking a URL String whose content will be streamed to the server and used for the file bits. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @see #addBundleFile(Subject, int, String, String, Architecture, InputStream) */ BundleFile addBundleFileViaURL(Subject subject, int bundleVersionId, String name, String version, @@ -121,12 +124,13 @@ public interface BundleManagerRemote { /** * A variant of {@link #addBundleFileViaURL(Subject, int, String, String, Architecture, String)} supporting the * HTTP basic authentication. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @see #addBundleFileViaURL(Subject, int, String, String, Architecture, String) */ BundleFile addBundleFileViaURL(Subject subject, int bundleVersionId, String name, String version, @@ -134,12 +138,13 @@ public interface BundleManagerRemote { /** * A convenience method taking an existing PackageVersion as opposed to a stream for the file bits. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @see {@link #addBundleFile(Subject, int, String, String, Architecture, InputStream)} */ BundleFile addBundleFileViaPackageVersion(Subject subject, int bundleVersionId, String name, int packageVersionId) @@ -147,11 +152,12 @@ public interface BundleManagerRemote { /** * Assign the specified bundles to the specified bundle group. - * </p> + * <pre> * Requires VIEW permission for the relevant bundle and either: * - Global.CREATE_BUNDLE * - BundleGroup.CREATE_BUNDLES_IN_GROUP or BundleGroup.ASSIGN_BUNDLES_TO_GROUP for the relevant bundle group - * + * </pre> + * * @param subject * @param bundleGroupId * @param bundleIds @@ -163,11 +169,12 @@ public interface BundleManagerRemote { * call. This provides useful, uniform naming for display. An optional, custom description * can be added. This call defines a deployment. The defined deployment can then be * scheduled in a separate call. - * </p> + * <pre> * Required Permissions: Either: * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) - * + * </pre> + * * @param subject user that must have proper permissions * @param bundleVersionId the BundleVersion being deployed by this deployment * @param bundleDestinationId the BundleDestination for the deployment @@ -182,11 +189,12 @@ public interface BundleManagerRemote { /** * Creates a bundle destination that describes a target for the bundle deployments. - * </p> + * <pre> * Required Permissions: Either: * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) - * + * </pre> + * * @param subject user must have MANAGE_INVENTORY permission * @param bundleId the Bundle to be deployed to this Destination * @param name a name for this destination. not null or empty @@ -225,12 +233,13 @@ public interface BundleManagerRemote { * </p> * If this bundle version is the initial version of a new bundle that needs to be created, the subject must * have Global.VIEW_BUNDLES because the new bundle will not be associated with any bundle group. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @param subject user that must have proper permissions * @param recipe the recipe that defines the bundle version to be created * @return the persisted BundleVersion with alot of the internal relationships filled in to help the caller @@ -244,19 +253,21 @@ public interface BundleManagerRemote { * should be assigned to. * If bundleGroupId is 0, then the new bundle will not be associated with any bundle group - this is only * allowed if the caller has the permission Global.VIEW_BUNDLES. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG - * + * </pre> + * * @param subject user that must have proper permissions * @param bundleGroupId identifies the bundle group that the new bundle will be associated with; 0 if no group * @param recipe the recipe that defines the bundle version to be created * @return the persisted BundleVersion with alot of the internal relationships filled in to help the caller * understand all that this method did. */ - BundleVersion createInitialBundleVersionViaRecipe(Subject subject, int bundleGroupId, String recipe) throws Exception; + BundleVersion createInitialBundleVersionViaRecipe(Subject subject, int bundleGroupId, String recipe) + throws Exception; /** * Creates a bundle version based on a Bundle Distribution file. Typically a zip file, the bundle distribution @@ -267,12 +278,13 @@ public interface BundleManagerRemote { * </p> * If this bundle version is the initial version of a new bundle that needs to be created, the subject must * have Global.VIEW_BUNDLES because the new bundle will not be associated with any bundle group. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @param subject user that must have proper permissions * @param distributionFile a local Bundle Distribution file. It must be read accessible by the RHQ server process. * @return the persisted BundleVersion with alot of the internal relationships filled in to help the caller @@ -286,12 +298,13 @@ public interface BundleManagerRemote { * should be assigned to. * If bundleGroupId is 0, then the new bundle will not be associated with any bundle group - this is only * allowed if the caller has the permission Global.VIEW_BUNDLES. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG - * + * </pre> + * * @param subject user that must have proper permissions * @param bundleGroupId identifies the bundle group that the new bundle will be associated with; 0 if no group * @param distributionFile a local Bundle Distribution file. It must be read accessible by the RHQ server process. @@ -299,7 +312,8 @@ public interface BundleManagerRemote { * understand all that this method did. Bundle files specifically are returned. * @throws Exception */ - BundleVersion createInitialBundleVersionViaFile(Subject subject, int bundleGroupId, File distributionFile) throws Exception; + BundleVersion createInitialBundleVersionViaFile(Subject subject, int bundleGroupId, File distributionFile) + throws Exception; /** * Creates a bundle version based on the actual bytes of a Bundle Distribution file. This is essentially @@ -310,12 +324,13 @@ public interface BundleManagerRemote { * </p> * If this bundle version is the initial version of a new bundle that needs to be created, the subject must * have Global.VIEW_BUNDLES because the new bundle will not be associated with any bundle group. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @param subject user that must have proper permissions * @param fileBytes the file bits that make up the entire bundle distribution file * @return the persisted BundleVersion with a lot of the internal relationships filled in to help the caller @@ -329,12 +344,13 @@ public interface BundleManagerRemote { * should be assigned to. * If bundleGroupId is 0, then the new bundle will not be associated with any bundle group - this is only * allowed if the caller has the permission Global.VIEW_BUNDLES. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG - * + * </pre> + * * @param subject user that must have proper permissions * @param bundleGroupId identifies the bundle group that the new bundle will be associated with; 0 if no group * @param fileBytes the file bits that make up the entire bundle distribution file @@ -342,7 +358,8 @@ public interface BundleManagerRemote { * understand all that this method did. Bundle files specifically are returned. * @throws Exception */ - BundleVersion createInitialBundleVersionViaByteArray(Subject subject, int bundleGroupId, byte[] fileBytes) throws Exception; + BundleVersion createInitialBundleVersionViaByteArray(Subject subject, int bundleGroupId, byte[] fileBytes) + throws Exception; /** * Creates a bundle version based on a Bundle Distribution file. Typically a zip file, the bundle distribution @@ -355,12 +372,13 @@ public interface BundleManagerRemote { * </p> * If this bundle version is the initial version of a new bundle that needs to be created, the subject must * have Global.VIEW_BUNDLES because the new bundle will not be associated with any bundle group. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @param subject user that must have proper permissions * @param distributionFileUrl a URL String to the Bundle Distribution file. It must be live, resolvable and read accessible * by the RHQ server process. @@ -376,12 +394,13 @@ public interface BundleManagerRemote { * should be assigned to. * If bundleGroupId is 0, then the new bundle will not be associated with any bundle group - this is only * allowed if the caller has the permission Global.VIEW_BUNDLES. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG - * + * </pre> + * * @param subject user that must have proper permissions * @param bundleGroupId identifies the bundle group that the new bundle will be associated with; 0 if no group * @param distributionFileUrl a URL String to the Bundle Distribution file. It must be live, resolvable and read accessible @@ -390,7 +409,8 @@ public interface BundleManagerRemote { * understand all that this method did. Bundle files specifically are returned. * @throws Exception */ - BundleVersion createInitialBundleVersionViaURL(Subject subject, int bundleGroupId, String distributionFileUrl) throws Exception; + BundleVersion createInitialBundleVersionViaURL(Subject subject, int bundleGroupId, String distributionFileUrl) + throws Exception; /** * A version of the {@link #createBundleVersionViaURL(org.rhq.core.domain.auth.Subject, String)} that accepts a @@ -398,12 +418,13 @@ public interface BundleManagerRemote { * </p> * If this bundle version is the initial version of a new bundle that needs to be created, the subject must * have Global.VIEW_BUNDLES because the new bundle will not be associated with any bundle group. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @see #createBundleVersionViaURL(org.rhq.core.domain.auth.Subject, String) */ BundleVersion createBundleVersionViaURL(Subject subject, String distributionFileUrl, String username, @@ -415,27 +436,30 @@ public interface BundleManagerRemote { * should be assigned to. * If bundleGroupId is 0, then the new bundle will not be associated with any bundle group - this is only * allowed if the caller has the permission Global.VIEW_BUNDLES. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG - * + * </pre> + * * @see #createBundleVersionViaURL(org.rhq.core.domain.auth.Subject, String) */ - BundleVersion createInitialBundleVersionViaURL(Subject subject, int bundleGroupId, String distributionFileUrl, String username, String password) throws Exception; + BundleVersion createInitialBundleVersionViaURL(Subject subject, int bundleGroupId, String distributionFileUrl, + String username, String password) throws Exception; /** * Remove everything associated with the Bundles with the exception of files laid down by related deployments. * Deployed files are left as is on the deployment platforms but the bundle mechanism will no longer track * the deployment of all bundles that have been deleted. * The bundles that are deleted will be removed from all bundle groups that it was a member of. - * </p> + * <pre> * Required Permissions: Either: * - Global.DELETE_BUNDLES and Global.VIEW_BUNDLES * - Global.DELETE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.DELETE_BUNDLES_FROM_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @param subject user that must have proper permissions * @param bundleIds IDs of all bundles to be deleted * @throws Exception if any part of the removal fails. @@ -447,12 +471,13 @@ public interface BundleManagerRemote { * Deployed files are left as is on the deployment platforms but the bundle mechanism will no longer track * the deployment. * The bundles that are deleted will be removed from all bundle groups that it was a member of. - * </p> + * <pre> * Required Permissions: Either: * - Global.DELETE_BUNDLES and Global.VIEW_BUNDLES * - Global.DELETE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.DELETE_BUNDLES_FROM_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @param subject user that must have proper permissions * @param bundleId the id of the bundle to remove * @throws Exception if any part of the removal fails. @@ -476,12 +501,13 @@ public interface BundleManagerRemote { * Deployed files are left as is on the deployment platforms but the bundle mechanism will no longer track * the deployment. * The deleted bundle version will no longer exist in any bundle group. - * </p> + * <pre> * Required Permissions: Either: * - Global.DELETE_BUNDLES and Global.VIEW_BUNDLES * - Global.DELETE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.DELETE_BUNDLES_FROM_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @param subject user that must have proper permissions * @param bundleVersionId the id of the bundle version to remove * @param deleteBundleIfEmpty if <code>true</code> and if this method deletes the last bundle version for its @@ -490,14 +516,40 @@ public interface BundleManagerRemote { */ void deleteBundleVersion(Subject subject, int bundleVersionId, boolean deleteBundleIfEmpty) throws Exception; + /** + * Return the <code>Bundles</code> narrowed by the supplied Criteria. The results are implicitly + * narrowed to those bundles viewable by the <code>subject</code>. + */ PageList<Bundle> findBundlesByCriteria(Subject subject, BundleCriteria criteria); + /** + * Return the <code>BundleGroups</code> narrowed by the supplied Criteria. The results are implicitly + * narrowed to those bundle groups viewable by the <code>subject</code>. + */ PageList<BundleGroup> findBundleGroupsByCriteria(Subject subject, BundleGroupCriteria criteria); + /** + * Return the <code>BundleDeployments</code> narrowed by the supplied Criteria. The results are implicitly + * narrowed to those for bundles and destination groups viewable by the <code>subject</code>. + */ PageList<BundleDeployment> findBundleDeploymentsByCriteria(Subject subject, BundleDeploymentCriteria criteria); + /** + * Return the <code>BundleDestinations</code> narrowed by the supplied Criteria. The results are implicitly + * narrowed to those with destination resource groups viewable by the <code>subject</code>. + */ PageList<BundleDestination> findBundleDestinationsByCriteria(Subject subject, BundleDestinationCriteria criteria); + /** + * Note that this can involves permissions on bundles and resources. Results will always be narrowed to the bundles + * viewable by <code>subject</code>. If optionally requesting the relevant Resources + * via <code>BundleResourceDeploymentCriteria.fetchResources(true)</code> the results will be further narrowed to + * the viewable resources. + * + * @param subject + * @param criteria + * @return + */ PageList<BundleResourceDeployment> findBundleResourceDeploymentsByCriteria(Subject subject, BundleResourceDeploymentCriteria criteria); @@ -516,12 +568,13 @@ public interface BundleManagerRemote { * Determine the files required for a BundleVersion and return all of the filenames or optionally, just those * that lack BundleFiles for the BundleVersion. The recipe may be parsed as part of this call. * This is needed as part of the bundle creation workflow, hence why creation permissions are needed. - * </p> + * <pre> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * + * </pre> + * * @param subject user that must have proper permissions * @param bundleVersionId the BundleVersion being queried * @param withoutBundleFileOnly if true omit any filenames that already have a corresponding BundleFile for @@ -534,7 +587,7 @@ public interface BundleManagerRemote { /** * Purges the destination's live deployment content from the remote platforms. - * </p> + * </pre> * Required Permissions: Either: * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) @@ -550,7 +603,7 @@ public interface BundleManagerRemote { * complete. The returned BundleDeployment can be used to track the history of the individual deployments. * <br/><br/> * TODO: Add the scheduling capability, currently it's Immediate. - * </p> + * </pre> * Required Permissions: Either: * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) @@ -574,7 +627,7 @@ public interface BundleManagerRemote { * call. This provides useful, uniform naming for display. An optional, custom description can be added. * <br/><br/> * TODO: Add the scheduling capability, currently it's Immediate. - * </p> + * </pre> * Required Permissions: Either: * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) @@ -592,7 +645,7 @@ public interface BundleManagerRemote { /** * Unassign the specified bundles from the specified bundle group. - * </p> + * </pre> * Requires VIEW permission for the relevant bundles and either: * - Global.DELETE_BUNDLE * - BundleGroup.DELETE_BUNDLES_FROM_GROUP or BundleGroup.UNASSIGN_BUNDLES_FROM_GROUP for the relevant bundle group diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java index a78d7e9..4e73171 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java @@ -56,7 +56,7 @@ public class BundleServerServiceImpl implements BundleServerService { public void addDeploymentHistory(int bundleDeploymentId, BundleResourceDeploymentHistory history) { try { BundleManagerLocal bm = LookupUtil.getBundleManager(); - bm.addBundleResourceDeploymentHistory(LookupUtil.getSubjectManager().getOverlord(), bundleDeploymentId, + bm.addBundleResourceDeploymentHistoryInNewTrans(LookupUtil.getSubjectManager().getOverlord(), bundleDeploymentId, history); } catch (Exception e) { log.error("Failed to add history to deployment id: " + bundleDeploymentId, e); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java index e65d9f3..0a1060d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java @@ -69,7 +69,8 @@ public final class CriteriaQueryGenerator { public enum AuthorizationTokenType { RESOURCE, // specifies the resource alias to join on for standard res-group-role-subject authorization checking GROUP, // specifies the group alias to join on for standard group-role-subject authorization checking - BUNDLE; // specifies the bundle alias to join on for standard bundle-bundleGroup-role-subject authorization checking + BUNDLE, // specifies the bundle alias to join on for standard bundle-bundleGroup-role-subject authorization checking + BUNDLE_GROUP; // specifies the bundle group alias to join on for standard bundleGroup-role-subject authorization checking } private Criteria criteria; @@ -125,6 +126,8 @@ public final class CriteriaQueryGenerator { setAuthorizationResourceFragment(type, defaultFragment, subjectId); } else if (type == AuthorizationTokenType.BUNDLE) { setAuthorizationBundleFragment(subjectId); + } else if (type == AuthorizationTokenType.BUNDLE_GROUP) { + setAuthorizationBundleGroupFragment(subjectId); } } @@ -249,6 +252,39 @@ public final class CriteriaQueryGenerator { customAuthzFragment = customAuthzFragment.replace("%aliasWithFragment%", aliasReplacement); customAuthzFragment = customAuthzFragment.replace("%innerAlias%", innerAliasReplacement); customAuthzFragment = customAuthzFragment.replace("%subjectId%", String.valueOf(subjectId)); + this.authorizationCustomConditionFragment = customAuthzFragment; + + // If the query results are narrowed by requiredPerms generate the fragment now. It's done + // here for two reasons. First, it seems to make sense to apply this only when an authFragment is + // being used. Second, because one day the query may be less brute force and may modify or + // leverage the joinFragment above. But, after extensive trying a more elegant + // query could not be constructed due to Hibernate limitations. So, for now, here it is... + List<Permission> requiredPerms = this.criteria.getRequiredPermissions(); + if (!(null == requiredPerms || requiredPerms.isEmpty())) { + this.authorizationPermsFragment = "" // + + "( SELECT COUNT(DISTINCT p)" + NL // + + " FROM Subject innerSubject" + NL // + + " JOIN innerSubject.roles r" + NL // + + " JOIN r.permissions p" + NL // + + " WHERE innerSubject.id = " + this.authorizationSubjectId + NL // + + " AND p IN ( :requiredPerms ) ) = :requiredPermsSize" + NL; + } + } + + public void setAuthorizationBundleGroupFragment(int subjectId) { + String fragment = "bundleGroup"; + String customAuthzFragment = "" // + + "( %aliasWithFragment%.id IN ( SELECT %innerAlias%.id " + NL // + + " FROM %alias% innerAlias " + NL // + + " JOIN %innerAlias%.roles r JOIN r.subjects s " + NL // + + " WHERE s.id = %subjectId% ) ) " + NL; + String aliasReplacement = criteria.getAlias() + (fragment != null ? "." + fragment : ""); + String innerAliasReplacement = "innerAlias" + (fragment != null ? "." + fragment : ""); + customAuthzFragment = customAuthzFragment.replace("%alias%", criteria.getAlias()); + customAuthzFragment = customAuthzFragment.replace("%aliasWithFragment%", aliasReplacement); + customAuthzFragment = customAuthzFragment.replace("%innerAlias%", innerAliasReplacement); + customAuthzFragment = customAuthzFragment.replace("%subjectId%", String.valueOf(subjectId)); + this.authorizationCustomConditionFragment = customAuthzFragment; // If the query results are narrowed by requiredPerms generate the fragment now. It's done // here for two reasons. First, it seems to make sense to apply this only when an authFragment is @@ -724,9 +760,9 @@ public final class CriteriaQueryGenerator { private void addPersistentBag(String fieldName) { Field f = findField(fieldName); if (f == null) { - LOG.warn( - "Failed to add persistent bag collection [" + fieldName + "] on class [" + criteria.getPersistentClass().getName() + - "]. There doesn't seem to be a field of that name on the class or any of its superclasses."); + LOG.warn("Failed to add persistent bag collection [" + fieldName + "] on class [" + + criteria.getPersistentClass().getName() + + "]. There doesn't seem to be a field of that name on the class or any of its superclasses."); } else { persistentBagFields.add(f); } @@ -735,9 +771,9 @@ public final class CriteriaQueryGenerator { private void addJoinFetch(String fieldName) { Field f = findField(fieldName); if (f == null) { - LOG.warn( - "Failed to add join fetch field [" + fieldName + "] on class [" + criteria.getPersistentClass().getName() + - "]. There doesn't seem to be a field of that name on the class or any of its superclasses."); + LOG.warn("Failed to add join fetch field [" + fieldName + "] on class [" + + criteria.getPersistentClass().getName() + + "]. There doesn't seem to be a field of that name on the class or any of its superclasses."); } else { joinFetchFields.add(f); }

1 0

[rhq] 2 commits - modules/common modules/enterprise
by John Sanda 31 Jul '13

31 Jul '13

modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties | 2 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 12 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) New commits: commit b2098e8b9b670709054aa796dfa4312a38c58b7a Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 31 13:36:33 2013 -0400 fix check for determining whether or not read repair is needed when adding nodes diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index ee0f406..1c96e27 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -866,19 +866,21 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN List<StorageNode> storageNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, StorageNode.class).setParameter("operationMode", OperationMode.NORMAL).getResultList(); - int clusterSize = storageNodes.size(); + // The previous cluster size will be the current size - 1 since we currently only + // support deploying one node at a time. + int previousClusterSize = storageNodes.size() - 1; boolean isReadRepairNeeded; - if (clusterSize >= 4) { + if (previousClusterSize >= 4) { // At 4 nodes we increase the RF to 3. We are not increasing the RF beyond // that for additional nodes; so, there is no need to run repair if we are // expanding from a 4 node cluster since the RF remains the same. isReadRepairNeeded = false; - } else if (clusterSize == 1) { + } else if (previousClusterSize == 1) { // The RF will increase since we are going from a single to a multi-node // cluster; therefore, we want to run repair. isReadRepairNeeded = true; - } else if (clusterSize == 2) { + } else if (previousClusterSize == 2) { if (storageNodes.size() > 3) { // If we go from 2 to > 3 nodes we will increase the RF to 3; therefore // we want to run repair. @@ -888,7 +890,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN // to run repair. isReadRepairNeeded = false; } - } else if (clusterSize == 3) { + } else if (previousClusterSize == 3) { // We are increasing the cluster size > 3 which means the RF will be // updated to 3; therefore, we want to run repair. isReadRepairNeeded = true; commit cee13fdf4fe40573568616c2729a0e6f97f6fe5f Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 30 16:41:18 2013 -0400 update itest diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties index 774a831..588fb3d 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties @@ -13,7 +13,7 @@ heap_new=-Xmn${HEAP_NEWSIZE} heap_dump_on_OOMError="-XX:+HeapDumpOnOutOfMemoryError" -heap_dump_dir="" +heap_dump_dir= thread_stack_size=-Xss180k

1 0

[rhq] modules/helpers
by Simeon Pinder 31 Jul '13

31 Jul '13

modules/helpers/ldap-tool/pom.xml | 10 ++++++++++ modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java | 10 +++++----- 2 files changed, 15 insertions(+), 5 deletions(-) New commits: commit 83a5f3ddbaf7ea7467a0d8a50bc531efe10fd70b Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Jul 31 11:05:43 2013 -0400 i)ensure jdk 6+ versions and ii)reuse userDN between the steps. diff --git a/modules/helpers/ldap-tool/pom.xml b/modules/helpers/ldap-tool/pom.xml index 770f22c..91416d5 100644 --- a/modules/helpers/ldap-tool/pom.xml +++ b/modules/helpers/ldap-tool/pom.xml @@ -60,6 +60,16 @@ </execution> </executions> </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> <plugin> <artifactId>maven-release-plugin</artifactId> diff --git a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java index 89b0698..bc322ab 100644 --- a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java +++ b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java @@ -57,10 +57,10 @@ import javax.swing.border.TitledBorder; * LDAP calls during auth/authz operations. * * The specific LDAP logic below needs to mirror the latest RHQ code and allow the user - * to test our their configuration without requring a specific RHQ/JON build as a dependency. + * to test our their configuration without requiring a specific RHQ/JON build as a dependency. * * NOTE: To avoid a runtime dependency on specific versions of RHQ or JON, the small implementation - * methods were copied into this class with minimatl changes for logging and ui messaging. The + * methods were copied into this class with minimal changes for logging and ui messaging. The * definitive implementation for each 'copied' method can be found in LDAPGroupManagerBean. * * @author Simeon Pinder @@ -85,6 +85,7 @@ public class TestLdapSettings extends JFrame { private JMenuBar menuBar; private String advdb = "**Verbose:debug ----"; private static final String BASEDN_DELIMITER = ";"; + private String userDN; private static final long serialVersionUID = 1L; int textBoxWidth = 20; @@ -419,7 +420,7 @@ public class TestLdapSettings extends JFrame { } // testing a valid user involves a filtered ldap search // using the loginProperty, and optionally searchFilter - String userDN = ""; + userDN = ""; if (proceed) { // default loginProperty to cn if it's not set if (loginProperty.isEmpty()) { @@ -895,9 +896,8 @@ public class TestLdapSettings extends JFrame { // Load any search filter String groupSearchFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); String groupMemberFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_MEMBER.getInternalName()); - String userDn = (String) systemConfig.get(Context.SECURITY_PRINCIPAL); - String testUserDN = userDn; + String testUserDN = userDN; String ldapServer = (String) systemConfig.get(Context.PROVIDER_URL); Properties env = getProperties(ldapServer);

1 0

[rhq] 10 commits - .classpath etc/dev-utils modules/enterprise modules/helpers
by Simeon Pinder 31 Jul '13

31 Jul '13

.classpath | 1 etc/dev-utils/TestLdapSettings.java | 738 ----- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 185 - modules/helpers/ldap-tool/pom.xml | 75 modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java | 1289 ++++++++++ 5 files changed, 1484 insertions(+), 804 deletions(-) New commits: commit af02d59186c22bd6fce00804fdccee5a6c2d8903 Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Jul 31 07:02:29 2013 -0400 i)Fix issue with authz validation in TestLdapSettings ii)Remove old TestLdapSettings source. diff --git a/etc/dev-utils/TestLdapSettings.java b/etc/dev-utils/TestLdapSettings.java deleted file mode 100644 index 2e29b3d..0000000 --- a/etc/dev-utils/TestLdapSettings.java +++ /dev/null @@ -1,738 +0,0 @@ -package com.test; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import javax.naming.CompositeName; -import javax.naming.Context; -import javax.naming.NamingEnumeration; -import javax.naming.directory.Attribute; -import javax.naming.directory.Attributes; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; -import javax.naming.ldap.InitialLdapContext; -import javax.swing.Box; -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.JTextField; -import javax.swing.border.LineBorder; -import javax.swing.border.TitledBorder; - -//import org.rhq.enterprise.server.util.security.UntrustedSSLSocketFactory; - -/* Is a development test tool that allows the user to simulate the RHQ server side - * LDAP calls during auth/authz operations. - * - * @author Simeon Pinder - */ -public class TestLdapSettings extends JFrame { - //shared fields - private JTextArea testResults; - private JCheckBox ssl; - private JTextField testUserNameValue; - private JTextField testUserPasswordValue; - private HashMap<String, JTextField> fieldMappings; - private String[] keys; - private JCheckBox enableLdapReferral; - private JCheckBox enableVerboseDebugging; - private JCheckBox enableVerboseGroupParsing; - private String advdb = "**Verbose:debug ----"; - - private static final long serialVersionUID = 1L; - int textBoxWidth = 20; - - public static void main(String args[]) { - new TestLdapSettings(); - } - - // Configure window properties - private TestLdapSettings() { - - setTitle("Check LDAP Settings: Simulates LDAP checks/queries of RHQ LDAP integration"); - getContentPane().setLayout(new BorderLayout()); - // top panel definition - JPanel top = new JPanel(); - top.setLayout(new BoxLayout(top, BoxLayout.Y_AXIS)); - top.setBorder(LineBorder.createGrayLineBorder()); - keys = new String[] { "URL:", "Search Filter:", - "Search Base:","Login Property", - "Username:", "Group Search Filter:", - "Password:", "Group Member Filter:", - }; - fieldMappings = loadUiFields(top, keys); - - //add the two checkboxes for additiona debugging options - enableLdapReferral= new JCheckBox("[follow] ldap referrals"); - enableLdapReferral.setSelected(false); - enableVerboseDebugging= new JCheckBox("more verbose logging"); - enableVerboseDebugging.setSelected(false); - enableVerboseGroupParsing= new JCheckBox("more detailed group parsing"); - enableVerboseGroupParsing.setSelected(false); - //put into row display - JPanel advancedDebugRegion = new JPanel(); - advancedDebugRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); - LineBorder advancedBorder = new LineBorder(Color.BLACK, 2); - TitledBorder debugBorder = new TitledBorder(advancedBorder, "Debug:"); - advancedDebugRegion.setBorder(debugBorder); - advancedDebugRegion.add(enableLdapReferral); - advancedDebugRegion.add(enableVerboseDebugging); - advancedDebugRegion.add(enableVerboseGroupParsing); - top.add(advancedDebugRegion); - - ssl = new JCheckBox("SSL:"); - ssl.setEnabled(false); - top.add(ssl); - // test user auth region - JPanel testUserRegion = new JPanel(); - testUserRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); - LineBorder border = new LineBorder(Color.BLUE, 2); - TitledBorder tBorder = new TitledBorder(border, "Authentication/Authorization Check Credentials: (insert valid ldap user assigned to group)"); - testUserRegion.setBorder(tBorder); - JLabel testUserName = new JLabel("Test UserName:"); - testUserNameValue = new JTextField(textBoxWidth); - JLabel testUserPassword = new JLabel("Test Password:"); - testUserPasswordValue = new JTextField(textBoxWidth); - testUserRegion.add(testUserName); - testUserRegion.add(testUserNameValue); - testUserRegion.add(testUserPassword); - testUserRegion.add(testUserPasswordValue); - top.add(testUserRegion); - - // center - JPanel center = new JPanel(); - center.setLayout(new BoxLayout(center, BoxLayout.X_AXIS)); - // build center panel - buildCenterPanel(center); - - // final component layout - getContentPane().add(top, BorderLayout.NORTH); - getContentPane().add(center, BorderLayout.CENTER); - this.setSize(720, 700); - addWindowListener(new WindowAdapter() { - public void windowClosing(WindowEvent e) { - System.exit(0); - } - }); - setVisible(true); - } - - // define the center display panel. - private void buildCenterPanel(JPanel center) { - // First element is Test Button - JButton test = new JButton("Test Settings"); - center.add(test); - // second is large text box that display ldap queries - testResults = new JTextArea("(click button to test settings values: simulates 4 separate checks showing ldap filters used)", - 40, 40); - JScrollPane jsp = new JScrollPane(testResults); - center.add(jsp); - test.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - testResults.setText("");//clear out empty msg - //trim spaces from all fields - String ldapServer = fieldMappings.get(keys[0]).getText().trim(); - String searchFilter = fieldMappings.get(keys[1]).getText().trim(); - String searchBase = fieldMappings.get(keys[2]).getText().trim(); - String loginProperty = fieldMappings.get(keys[3]).getText().trim(); - String bindUserName = fieldMappings.get(keys[4]).getText().trim(); - String groupSearchFilter = fieldMappings.get(keys[5]).getText().trim(); - String bindPassword = fieldMappings.get(keys[6]).getText().trim(); - String groupMemberFilter = fieldMappings.get(keys[7]).getText().trim(); - String testUserName = testUserNameValue.getText().trim(); - String testUserPassword = testUserPasswordValue.getText().trim(); - // validate initial required elements - String msg = null; - boolean proceed = true; - //valid required details set. - if (ldapServer.isEmpty() || bindUserName.isEmpty() - || bindPassword.isEmpty() || searchBase.isEmpty()) { - msg ="STEP-1:FAIL: "+ keys[0] + ", " + keys[2] + ", " + keys[4] + ", " - + keys[6] + " cannot be empty to proceed."; - log(msg); - proceed = false; - } - Properties env; - InitialLdapContext ctx = null; - if (proceed) {// attempt initial ldap bind from RHQ server - msg = "STEP-1:TESTING: Attempting to bind to server:" + ldapServer - + "\n with user '" + bindUserName - + "' and password entered."; - log(msg); - env = getProperties(ldapServer); - env.setProperty(Context.SECURITY_PRINCIPAL, bindUserName); - env.setProperty(Context.SECURITY_CREDENTIALS, bindPassword); - env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); - try { - ctx = new InitialLdapContext(env, null); - msg = "STEP-1:PASS: LDAP bind credentials are correct. Successfully connected to '" - + ldapServer - + "'.\n This means the LDAP Bind credentials for the RHQ Server authentication/authorization requests to ldap server " - + "are correct."; - if(enableVerboseDebugging.isSelected()){ - msg+="\n"+advdb+" LDAP simple authentication bind successful."; - } - log(msg); - proceed = true; - } catch (Exception ex) { - msg = "STEP-1:FAIL: Unable to connect to the LDAP server with credentials specified.\n"; - msg+="Exception:"+ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - proceed = false; - } - } - if (proceed) {// retrieve test credentials to test run auth - // load search controls - SearchControls searchControls = getSearchControls(); - // validating searchFilter and test user/pass creds - proceed = true; - if (testUserName.isEmpty() || (testUserPassword.isEmpty())) { - msg = "STEP-2:FAIL: Test Username/Password fields cannot be empty for this step."; - log(msg); - proceed = false; - } - // testing a valid user involves a filtered ldap search - // using the loginProperty, and optionally searchFilter - String userDN = ""; - if (proceed) { - // default loginProperty to cn if it's not set - if (loginProperty.isEmpty()) { - loginProperty = "cn"; - if(enableVerboseDebugging.isSelected()){ - String mesg = "As you have not specified a login property, defaulting to 'cn'"; - log(advdb+" "+msg); - } - } - String filter; - if (!searchFilter.isEmpty()) { - filter = "(&(" + loginProperty + "=" + testUserName - + ")" + "(" + searchFilter + "))"; - } else { - filter = "(" + loginProperty + "=" + testUserName - + ")"; - } - if(enableVerboseDebugging.isSelected()){ - log(advdb+" The searchfilter is optionally appended to login property for additional shared attribute across users."); - } - msg = "STEP-2:TESTING: To validate the test user the following LDAP filtered component will be used to find matching users:\n"; - msg += filter; - log(msg); - // test out the search on the target ldap server - try { - String[] baseDNs = searchBase.split(";"); - for (int x = 0; x < baseDNs.length; x++) { - NamingEnumeration answer = ctx.search( - baseDNs[x], filter, searchControls); - if(enableVerboseDebugging.isSelected()){ - log(advdb+" this search was excuted against DN component '"+baseDNs[x]+"'."); - } - // boolean ldapApiNpeFound = false; - if (!answer.hasMoreElements()) { - msg="STEP-2:WARN Unable to locate a matching users for the filter'"+filter+ - "'. Please check your loginProperty. Usually 'cn' or 'uid'"; - log(msg); - continue; - } - // Going with the first match - SearchResult si = (SearchResult) answer.next(); - - // Construct the UserDN - userDN = null; - - try { - userDN = si.getNameInNamespace(); - } catch (UnsupportedOperationException use) { - userDN = new CompositeName(si.getName()).get(0); - if (si.isRelative()) { - userDN += "," + baseDNs[x]; - } - } - - msg = "STEP-2:PASS: The test user '" - + testUserName - + "' was succesfully located, and the following userDN will be used in authorization check:\n"; - msg += userDN; - log(msg); - - ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, userDN); - ctx.addToEnvironment(Context.SECURITY_CREDENTIALS,testUserPassword); - ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION,"simple"); - - // if successful then verified that user and pw - // are valid ldap credentials - ctx.reconnect(null); - msg = "STEP-2:PASS: The user '" - + testUserName - + "' was succesfully authenticated using userDN '" - + userDN + "' and password provided.\n" - +"*Note: the loginProperty must match the loginProperty listed in dn: for the user. It is the DN that RHQ will lookup and use."; - log(msg); - } - } catch (Exception ex) { - msg = "STEP-2:FAIL: There was an error while searching for or authenticating the user '" - + testUserName + "'\n"; - msg += ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - proceed=false; - } - try { - ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, bindUserName); - ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, bindPassword); - ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION, "simple"); - ctx.reconnect(null); - } catch (Exception ex) { - msg = "STEP-2:WARN: There was an error when switching back to the bind user '" - + bindUserName + "'\n"; - msg += ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - } - - } - // with authentication completed, now check authorization. - // validate filter components to list all available groups - proceed = false; - if (!groupSearchFilter.isEmpty()) { - Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); - String filter = String - .format("(%s)", groupSearchFilter); - msg = "STEP-3:TESTING: This ldap filter " - + filter - + " will be used to locate ALL available LDAP groups"; - log(msg); - try { - String[] baseDNs = searchBase.split(";"); - for (int x = 0; x < baseDNs.length; x++) { - if(enableVerboseDebugging.isSelected()){ - log(advdb+" this search was excuted against DN component '"+baseDNs[x]+"'."); - } - NamingEnumeration answer = ctx.search( - baseDNs[x], filter, searchControls); - - if(enableVerboseGroupParsing.isSelected()){//in this mode report initial state of Enumeration results - log(advdb+" LDAP Group Search/Enumeration found "+((answer.hasMore())? " SOME ":" NO ")+" matching group(s)."); - } - - boolean ldapApiEnumerationBugEncountered = false; - while ((!ldapApiEnumerationBugEncountered) - && answer.hasMoreElements()) { - // We use the first match - SearchResult si = null; - try { - si = (SearchResult) answer.next(); - } catch (NullPointerException npe) { - if(enableVerboseDebugging.isSelected()){ - log(advdb+" NullPtr exception detected. If known LDAP api enum npe ignore: "+npe.getMessage()+"."); - } - ldapApiEnumerationBugEncountered = true; - break; - } - Map<String, String> entry = new HashMap<String, String>(); - if(enableVerboseDebugging.isSelected()||enableVerboseGroupParsing.isSelected()){ - Attributes attributeContainer = si.getAttributes(); - NamingEnumeration<? extends Attribute> attributes = attributeContainer.getAll(); - String attributesReturned = " "; - while(attributes.hasMore()){ - attributesReturned+=attributes.next().getID()+","; - } - String dbugMesg="\n"+advdb+" Group search LDAP ("+attributeContainer.size()+") attributes located for group '"+si.getName()+"' are ["+ - attributesReturned.substring(0, attributesReturned.length()-1)+"]."; - //directly update here to shorten messages for lots of groups - testResults.setText(testResults.getText() + dbugMesg); - - //additionally parse attribute ids and values for illegal ldap characters - if(enableVerboseGroupParsing.isSelected()){ - attributes = attributeContainer.getAll(); - String currentAttributeId =""; - String currentValue =""; - //spinder: 3/17/11: should we bail on first bad data or display them all? - while(attributes.hasMore()){ - boolean badData = false; - Attribute att = attributes.next(); - currentAttributeId =att.getID(); - if(containsIllegalLdap(currentAttributeId)){ - log(advdb+" LDAP Group: bad atrribute data detected for group '"+si.getName()+"' for attribute '"+currentAttributeId+"'."); - badData=true; - } - if(att.getAll()!=null){ - NamingEnumeration<?> enumer = att.getAll(); - while(enumer.hasMore()){ - currentValue = enumer.next()+""; - if(containsIllegalLdap(currentValue)){ - log(advdb+" LDAP Group: bad data detected for group '"+si.getName()+"' with attribute '"+currentAttributeId+"' and value:"+currentValue); - badData=true; - } - } - } - if(badData){ - log(advdb+"** LDAP Group: Some bad LDAP data detected for group '"+si.getName()+"'."); - } - } - } - } - - Attribute commonNameAttr = si.getAttributes() - .get("cn"); - if(commonNameAttr!=null){ - String name = (String) commonNameAttr.get(); - name = name.trim(); - Attribute desc = si.getAttributes().get( - "description"); - String description = desc != null ? (String) desc - .get() - : ""; - description = description.trim(); - entry.put("id", name); - entry.put("name", name); - entry.put("description", description); - ret.add(entry); - }else{//unable to retrieve details for specific group. - log(advdb+" There was an error retrieving 'cn' attribute for group '"+si.getName()+"'. Not adding to returned list of groups. "); - } - } - } - msg = "STEP-3:TESTING: Using Group Search Filter '" + filter - + "', " + ret.size() - + " ldap group(s) were located.\n"; - if (ret.size() > 0) { - HashMap<String, String>[] ldapLists = new HashMap[ret.size()]; - ret.toArray(ldapLists); - if(enableVerboseGroupParsing.isSelected()){//in this mode go beyond the first ten results. - msg += "STEP-3:PASS: Listing 'all' of the ldap groups located: \n"; - for (int i = 0; i < ret.size(); i++) { - msg += ldapLists[i] + "\n"; - } - }else{//otherwise only show first 10[subset of available groups] - msg += "STEP-3:PASS: Listing a few(<=10) of the ldap groups located: \n"; - for (int i = 0; (i < ret.size() && i < 10); i++) { - msg += ldapLists[i] + "\n"; - } - } - proceed = true;// then can proceed to next step. - } - log(msg); - } catch (Exception ex) { - msg = "STEP-3:FAIL: There was an error searching with the groupFilter supplied: " - + groupSearchFilter + "'\n"; - msg += ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - proceed=false; - } - } else { - msg = "STEP-3:FAIL: Group Search Filter: cannot be empty to proceed."; - log(msg); - proceed=false; - } - // retrieve lists of authorized groups available for the - if (proceed) { - // check groupMember - if (!groupMemberFilter.isEmpty()) { - Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); - String filter = String.format("(&(%s)(%s=%s))", - groupSearchFilter, groupMemberFilter, - LDAPStringUtil.encodeForFilter(userDN)); - msg = "STEP-4:TESTING: about to do ldap search with filter \n'" - + filter - + "'\n to locate groups that test user IS authorized to access."; - log(msg); - try { - String[] baseDNs = searchBase.split(";"); - for (int x = 0; x < baseDNs.length; x++) { - NamingEnumeration answer = ctx.search( - baseDNs[x], filter, searchControls); - boolean ldapApiEnumerationBugEncountered = false; - //BZ:582471- ldap api bug change - while ((!ldapApiEnumerationBugEncountered) - && answer.hasMoreElements()) { - // We use the first match - SearchResult si = null; - try { - si = (SearchResult) answer.next(); - } catch (NullPointerException npe) { - ldapApiEnumerationBugEncountered = true; - break; - } - Map<String, String> entry = new HashMap<String, String>(); - String name = (String) si - .getAttributes().get("cn") - .get(); - name = name.trim(); - Attribute desc = si.getAttributes() - .get("description"); - String description = desc != null ? (String) desc - .get() - : ""; - description = description.trim(); - entry.put("id", name); - entry.put("name", name); - entry.put("description", description); - ret.add(entry); - } - } - msg = "STEP-4:TESTING: Using Group Search Filter '" - + filter + "', " + ret.size() - + " ldap group(s) were located.\n"; - if (ret.size() > 0) { - HashMap<String, String>[] ldapLists = new HashMap[ret - .size()]; - ret.toArray(ldapLists); - msg += "STEP-4:PASS: Listing a few of the ldap groups located: \n"; - // iterate over first ten or less to demonstrate retrieve - for (int i = 0; (i < ret.size() && i < 10); i++) { - msg += ldapLists[i] + "\n"; - } - proceed = true;// then can proceed to next - // step. - }else{ - msg+="STEP-4:WARN: With current settings, test user is not authorized for any groups. Is this correct?"; - } - log(msg); - } catch (Exception ex) { - msg = "STEP-4:FAIL: There was an error searching with the groupFilter supplied: " - + groupSearchFilter + "'\n"; - msg += ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - proceed=false; - } - - } else { - msg = "STEP-4:FAIL: Group Member Filter must be non-empty to proceed with simulating authorization check for test user."; - log(msg); - } - } - if(proceed){ - msg="COMPLETED:PASS: The current settings, for successful steps, should be correct to enter into your RHQ server."; - msg+="\n\n\n\n When you encounter failures, warnings or other unexpected results you should use an external "; - msg+="LDAP search utility to check that the generated filters return the expected LDAP results."; - log(msg); - } - } - } - - private boolean containsIllegalLdap(String currentValue) { - boolean invalidData = false; - if((currentValue!=null)&&(!currentValue.trim().isEmpty())){ - //TODO: spinder 3/17/11: need to figure out regex to filter/detect bad data in returned ldap. Giving up for now. -// String regex = "(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)[/,+\"><;=#]|(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)\$?!\\|[/,+\"><;=#]| $|(?<=^\$ )|^"; -// regex = "(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)[/,+\\\"><;=#]|(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)\\\$?!\\\\|[/,+\\\"><;=#]| $|(?<=^\\\$ )|^"; -// System.out.println("++++++++ CURR VAL:"+currentValue+":INV-CHeck:"+currentValue.matches(",+\"\\<;\n=/")+":NEWCHECK:"+(currentValue.matches(regex))); -// if(currentValue.matches(",+\"\\<;\n=/")){ -// invalidData=true; -// } -// String badList = ",+\"\\<;\n="; - String badList = "+\"\\<;\n"; - for(char car :currentValue.toCharArray()){ - for(char c :badList.toCharArray()){ - if(car == c){ - invalidData=true; - } - } - } - - } - return invalidData; - } - - private String appendStacktraceToMsg(String msg, Exception ex) { - String moreVerbose = ""; - moreVerbose+=advdb+" Exception type:"+ex.getClass()+"\n"; - moreVerbose+=advdb+" Exception stack trace reference:"+ex.getStackTrace()+"\n"; - if(ex.getStackTrace()!=null){ - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - ex.printStackTrace(pw); - moreVerbose+=advdb+" stack trace reference:"+sw.toString(); - } - msg+="\n"+moreVerbose; - return msg; - } - }); - } - - // throw the label and fields together, two to a row. - private HashMap<String, JTextField> loadUiFields(JPanel top, - String[] componentKeys) { - HashMap<String, JTextField> mappings = new HashMap<String, JTextField>(); - for (int i = 0; i < componentKeys.length; i++) { - String firstLabelKey = componentKeys[i]; - String secondLabelKey = componentKeys[++i]; - // locate second key - JPanel row = new JPanel(); - row.setLayout(new FlowLayout(FlowLayout.LEFT)); - JLabel label1 = new JLabel(firstLabelKey); - label1.setSize(textBoxWidth, 5); - JTextField value1 = new JTextField(textBoxWidth); - JLabel label2 = new JLabel(secondLabelKey); - JTextField value2 = new JTextField(textBoxWidth); - row.add(label1); - row.add(value1); - row.add(Box.createRigidArea(new Dimension(0, 5))); - row.add(label2); - row.add(value2); - mappings.put(firstLabelKey, value1); - mappings.put(secondLabelKey, value2); - top.add(row); - } - - return mappings; - } - - private Properties getProperties(String contentProvider) { - Properties env = new Properties(); - env.setProperty(Context.INITIAL_CONTEXT_FACTORY, - "com.sun.jndi.ldap.LdapCtxFactory"); - env.setProperty(Context.PROVIDER_URL, contentProvider); - if(!enableLdapReferral.isSelected()){ - env.setProperty(Context.REFERRAL, "ignore"); - }else{ - String msg="**---- You have chosen to tell LDAP servers to [FOLLOW] context referrals. Default is [IGNORE] referrals. --**"; - log(msg); - env.setProperty(Context.REFERRAL, "follow"); - } - -// // Setup SSL if requested -// String protocol = ssl.isSelected()? "ssl":""; -// if ((protocol != null) && protocol.equals("ssl")) { -// String ldapSocketFactory = env -// .getProperty("java.naming.ldap.factory.socket"); -// if (ldapSocketFactory == null) { -// env.put("java.naming.ldap.factory.socket", -// UntrustedSSLSocketFactory.class.getName()); -// } -// env.put(Context.SECURITY_PROTOCOL, "ssl"); -// } - - return env; - } - - private String delineate() { - String line = "-"; - for (int i = 0; i < 30; i++) { - line += "-"; - } - return line; - } - - private void log(String msg) { - String message = "\n" + delineate() + "\n"; - message += msg; - message += "\n" + delineate() + "\n\n"; - testResults.setText(testResults.getText() + message); - } - - private SearchControls getSearchControls() { - int scope = SearchControls.SUBTREE_SCOPE; - int timeLimit = 0; - long countLimit = 0; - String[] returnedAttributes = null; - boolean returnObject = false; - boolean deference = false; - SearchControls constraints = new SearchControls(scope, countLimit, - timeLimit, returnedAttributes, returnObject, deference); - return constraints; - } -} - -class LDAPStringUtil { - - /** - * <p>Encode a string so that it can be used in an LDAP search filter.</p> - * - * <p>The following table shows the characters that are encoded and their - * encoded version.</p> - * - * <table> - * <tr><th align="center">Character</th><th>Encoded As</th></tr> - * <tr><td align="center">*</td><td>\2a</td></tr> - * <tr><td align="center">(</td><td>\28</td></tr> - * <tr><td align="center">)</td><td>\29</td></tr> - * <tr><td align="center">\</td><td>\5c</td></tr> - * <tr><td align="center"><code>null</code></td><td>\00</td></tr> - * </table> - * - * <p>In addition to encoding the above characters, any non-ASCII character - * (any character with a hex value greater then <code>0x7f</code>) is also - * encoded and rewritten as a UTF-8 character or sequence of characters in - * hex notation.</p> - * - * @param filterString a string that is to be encoded - * @return the encoded version of <code>filterString</code> suitable for use - * in a LDAP search filter - * @see <a href="http://tools.ietf.org/html/rfc4515">RFC 4515</a> - */ - public static String encodeForFilter(final String filterString) { - if (filterString != null && filterString.length() > 0) { - StringBuilder encString = new StringBuilder(filterString.length()); - for (int i = 0; i < filterString.length(); i++) { - char ch = filterString.charAt(i); - switch (ch) { - case '*': // encode a wildcard * character - encString.append("\\2a"); - break; - case '(': // encode a open parenthesis ( character - encString.append("\\28"); - break; - case ')': // encode a close parenthesis ) character - encString.append("\\29"); - break; - case '\\': // encode a backslash \ character - encString.append("\\5c"); - break; - case '\u0000': // encode a null character - encString.append("\\00"); - break; - default: - if (ch <= 0x7f) { // an ASCII character - encString.append(ch); - } else if (ch >= 0x80) { // encode to UTF-8 - try { - byte[] utf8bytes = String.valueOf(ch).getBytes("UTF8"); - for (byte b : utf8bytes) { - encString.append(String.format("\\%02x", b)); - } - } catch (UnsupportedEncodingException e) { - // ignore - } - } - } - } - return encString.toString(); - } - return filterString; - } - -} - diff --git a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java index f3aee15..89b0698 100644 --- a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java +++ b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java @@ -895,7 +895,9 @@ public class TestLdapSettings extends JFrame { // Load any search filter String groupSearchFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); String groupMemberFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_MEMBER.getInternalName()); - String testUserDN=userName; + String userDn = (String) systemConfig.get(Context.SECURITY_PRINCIPAL); + + String testUserDN = userDn; String ldapServer = (String) systemConfig.get(Context.PROVIDER_URL); Properties env = getProperties(ldapServer); commit 2c1c633a863bde145a8372efdc5b9d4c408da62b Author: Simeon Pinder <spinder(a)redhat.com> Date: Tue Jul 30 19:07:57 2013 -0400 Make warning to users more prominent and accessible. diff --git a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java index b9667ea..f3aee15 100644 --- a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java +++ b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java @@ -39,6 +39,9 @@ import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JFrame; import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; import javax.swing.JPanel; import javax.swing.JPasswordField; import javax.swing.JScrollPane; @@ -79,6 +82,7 @@ public class TestLdapSettings extends JFrame { private JCheckBox iterativeVerboseLogging; private JCheckBox enablePosixGroups; private JCheckBox enable32xFeatures; + private JMenuBar menuBar; private String advdb = "**Verbose:debug ----"; private static final String BASEDN_DELIMITER = ";"; @@ -95,10 +99,10 @@ public class TestLdapSettings extends JFrame { final String warnMessage = "<html>***WARNING: Depending upon<br>" + "i)how the ldap server is configured <br>" + "ii)client query paging settings <br>" + - " enabling <b>'more detailed logging'</b>,<br>" + - " <b>'more group parsing'</b> AND/OR <b>'also log to console'</b> may cause the console to hang/freeze <br>" + + " enabling <b>'more verbose logging'</b>,<br>" + + " <b>'more detailed group parsing'</b> AND/OR <b>'also log to console'</b> may cause the console to hang/freeze <br>" + " as the LDAP tool continues to parse large query results. If that occurs it is <br>" + - " suggested that you kill tool and re-run with 'also log to console' so that the console logs<br>" + + " suggested that you stop this tool and re-run your queries with <b>'also log to console'</b> so that the console logs<br>" + " will show which dataset is causing the delay and then you should modify your search|group|member<br>" + " filters accordingly to <b>return smaller results</b> and/or <b>consume larger payloads</b>.<br>" + "***WARNING</html>"; @@ -108,6 +112,12 @@ public class TestLdapSettings extends JFrame { setTitle("Check LDAP Settings: Simulates LDAP checks/queries of RHQ LDAP integration"); getContentPane().setLayout(new BorderLayout()); + menuBar = new JMenuBar(); + JMenu menu = new JMenu("View ***Warning"); + JMenuItem menuItem = new JMenuItem(warnMessage); + menu.add(menuItem); + menuBar.add(menu); + setJMenuBar(menuBar); // top panel definition top = new JPanel(); top.setLayout(new BoxLayout(top, BoxLayout.Y_AXIS)); commit 7c68b4a80c77e822743fdcac857a9364dbaa02d7 Author: Simeon Pinder <spinder(a)redhat.com> Date: Tue Jul 30 17:27:46 2013 -0400 Move under org.rhq like other components. diff --git a/.classpath b/.classpath index e5e7a21..386316a 100644 --- a/.classpath +++ b/.classpath @@ -215,6 +215,7 @@ <classpathentry kind="src" path="modules/plugins/rhq-storage/src/main/java"/> <classpathentry kind="src" path="modules/enterprise/server/data-migration/src/main/java"/> <classpathentry kind="src" path="modules/enterprise/server/data-migration/src/test/java"/> + <classpathentry kind="src" path="modules/helpers/ldap-tool/src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.2.3/httpclient-4.2.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.2.3/httpclient-4.2.3-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/commons-io/commons-io/2.1/commons-io-2.1.jar" sourcepath="M2_REPO/commons-io/commons-io/2.1/commons-io-2.1-sources.jar"/> diff --git a/modules/helpers/ldap-tool/pom.xml b/modules/helpers/ldap-tool/pom.xml index 28f8678..770f22c 100644 --- a/modules/helpers/ldap-tool/pom.xml +++ b/modules/helpers/ldap-tool/pom.xml @@ -19,6 +19,7 @@ <properties> <executable.name>TestLdapSettings</executable.name> <tool.version>1.0.1</tool.version> + <test.package>org.rhq</test.package> </properties> <name>RHQ ldap test tool</name> @@ -33,8 +34,8 @@ <configuration> <archive> <manifest> - <packageName>com.test</packageName> - <mainClass>com.test.TestLdapSettings</mainClass> + <packageName>${test.package}</packageName> + <mainClass>${test.package}.TestLdapSettings</mainClass> </manifest> </archive> </configuration> diff --git a/modules/helpers/ldap-tool/src/main/java/com/test/TestLdapSettings.java b/modules/helpers/ldap-tool/src/main/java/com/test/TestLdapSettings.java deleted file mode 100644 index 75ff277..0000000 --- a/modules/helpers/ldap-tool/src/main/java/com/test/TestLdapSettings.java +++ /dev/null @@ -1,1285 +0,0 @@ -package com.test; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import javax.naming.Context; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attribute; -import javax.naming.directory.Attributes; -import javax.naming.directory.InvalidSearchFilterException; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; -import javax.naming.ldap.Control; -import javax.naming.ldap.InitialLdapContext; -import javax.naming.ldap.PagedResultsControl; -import javax.naming.ldap.PagedResultsResponseControl; -import javax.swing.Box; -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JPasswordField; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.JTextField; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.LineBorder; -import javax.swing.border.TitledBorder; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - -//import org.rhq.enterprise.server.util.security.UntrustedSSLSocketFactory; - -/* Is a development test tool that allows the user to simulate the RHQ server side - * LDAP calls during auth/authz operations. - * - * The specific LDAP logic below needs to mirror the latest RHQ code and allow the user - * to test our their configuration without requring a specific RHQ/JON build as a dependency. - * - * NOTE: To avoid a runtime dependency on specific versions of RHQ or JON, the small implementation - * methods were copied into this class with minimatl changes for logging and ui messaging. The - * definitive implementation for each 'copied' method can be found in LDAPGroupManagerBean. - * - * @author Simeon Pinder - */ -public class TestLdapSettings extends JFrame { - //shared fields - private JTextArea testResults; - private JCheckBox showPasswords; - private JCheckBox ssl; - private JLabel groupPageSizeName; - private JTextField groupMemberQueryValue; - private JTextField testUserNameValue; - private JTextField testUserPasswordValue; - private HashMap<String, JTextField> fieldMappings; - private String[] keys; - private JCheckBox enableLdapReferral; - private JCheckBox enableVerboseDebugging; - private JCheckBox enableVerboseGroupParsing; - private JCheckBox iterativeVerboseLogging; - private JCheckBox enablePosixGroups; - private JCheckBox enable32xFeatures; - private String advdb = "**Verbose:debug ----"; - private static final String BASEDN_DELIMITER = ";"; - - private static final long serialVersionUID = 1L; - int textBoxWidth = 20; - private static JPanel top = null; - private static JPanel testUserRegion = null; - private static Properties env=null; - - public static void main(String args[]) { - new TestLdapSettings(); - } - //After enabling support for Query parsing, we need to warn users of the effects. - final String warnMessage = "<html>***WARNING: Depending upon<br>" + - "i)how the ldap server is configured <br>" + - "ii)client query paging settings <br>" + - " enabling <b>'more detailed logging'</b>,<br>" + - " <b>'more group parsing'</b> AND/OR <b>'also log to console'</b> may cause the console to hang/freeze <br>" + - " as the LDAP tool continues to parse large query results. If that occurs it is <br>" + - " suggested that you kill tool and re-run with 'also log to console' so that the console logs<br>" + - " will show which dataset is causing the delay and then you should modify your search|group|member<br>" + - " filters accordingly to <b>return smaller results</b> and/or <b>consume larger payloads</b>.<br>" + - "***WARNING</html>"; - - // Configure window properties - private TestLdapSettings() { - - setTitle("Check LDAP Settings: Simulates LDAP checks/queries of RHQ LDAP integration"); - getContentPane().setLayout(new BorderLayout()); - // top panel definition - top = new JPanel(); - top.setLayout(new BoxLayout(top, BoxLayout.Y_AXIS)); - top.setBorder(LineBorder.createGrayLineBorder()); - //define checkbox here as it's checked when generating UI. - showPasswords = new JCheckBox("show passwords:"); - showPasswords.setSelected(false); - - keys = new String[] { "URL:", "Search Filter:", - "Search Base:","Login Property", - "Username:", "Group Search Filter:", - "Password:", "Group Member Filter:", - }; - fieldMappings = loadUiFields(top, keys); - - //add the two checkboxes for additiona debugging options - enableLdapReferral= new JCheckBox("[follow] ldap referrals"); - enableLdapReferral.setSelected(false); - enableVerboseDebugging= new JCheckBox("more verbose logging"); - enableVerboseDebugging.setSelected(false); - enableVerboseDebugging.setToolTipText(warnMessage); - enableVerboseGroupParsing= new JCheckBox("more detailed group parsing"); - enableVerboseGroupParsing.setSelected(false); - enableVerboseGroupParsing.setToolTipText("*Take care when using this mode with a large number of groups* Every group discovered is parsed/listed."); - iterativeVerboseLogging= new JCheckBox("also log to console"); - iterativeVerboseLogging.setSelected(false); - iterativeVerboseLogging.setToolTipText("This mode is useful when the test tool is having difficulty returning results from large queries."); - iterativeVerboseLogging.setToolTipText(warnMessage); - enablePosixGroups= new JCheckBox("is Posix Group"); - enablePosixGroups.setSelected(false); - enablePosixGroups.setEnabled(false); - - //put into 3.2.x functionality row - JPanel jon32xRegion = new JPanel(); - jon32xRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); - LineBorder jon32xLineBorder = new LineBorder(Color.BLACK, 2); - TitledBorder jon32xBorder = new TitledBorder(jon32xLineBorder, "JON 3.2.x/RHQ 4.8.x specific features:"); - jon32xRegion.setBorder(jon32xBorder); - enable32xFeatures= new JCheckBox("enable JON 3.2.x/RHQ 4.8.x features"); - enable32xFeatures.setToolTipText("This enables features not available before RHQ 4.8.x/JON 3.2.x."); - enable32xFeatures.setSelected(false); - enable32xFeatures.addItemListener(new ItemListener() { - @Override - public void itemStateChanged(ItemEvent e) { - if(enable32xFeatures.isSelected()){ - groupPageSizeName.setEnabled(true); - groupMemberQueryValue.setEnabled(true); - groupMemberQueryValue.setEditable(true); - groupMemberQueryValue.setText("1000"); - enablePosixGroups.setEnabled(true); - }else{ - groupMemberQueryValue.setText(""); - groupPageSizeName.setEnabled(false); - groupMemberQueryValue.setEnabled(false); - groupMemberQueryValue.setEditable(false); - enablePosixGroups.setEnabled(false); - enablePosixGroups.setSelected(false); - } - } - }); - - jon32xRegion.add(enable32xFeatures); - groupPageSizeName = new JLabel("Group Query Page Size:"); - groupPageSizeName.setEnabled(false); - groupMemberQueryValue = new JTextField(10); - groupMemberQueryValue.setText("1000"); - groupMemberQueryValue.setEditable(false); - jon32xRegion.add(groupPageSizeName); - jon32xRegion.add(groupMemberQueryValue); - jon32xRegion.add(enablePosixGroups); - top.add(jon32xRegion); - - //put into row display - JPanel advancedDebugRegion = new JPanel(); - advancedDebugRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); - LineBorder advancedBorder = new LineBorder(Color.BLACK, 2); - TitledBorder debugBorder = new TitledBorder(advancedBorder, "Debug: **Warning --<hover HERE>**"); - advancedDebugRegion.setBorder(debugBorder); - advancedDebugRegion.add(enableLdapReferral); - advancedDebugRegion.add(enableVerboseDebugging); - advancedDebugRegion.add(enableVerboseGroupParsing); - advancedDebugRegion.add(iterativeVerboseLogging); - advancedDebugRegion.setToolTipText(warnMessage); - top.add(advancedDebugRegion); - - JPanel securityPanel = new JPanel(); - securityPanel.setLayout(new FlowLayout(FlowLayout.LEFT)); - showPasswords.addItemListener(new ItemListener() { - @Override - public void itemStateChanged(ItemEvent e) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - //store off existing value - String existingValue = ""; - String existingTestUserPass = ""; - JTextField current = fieldMappings.get("Password:"); - if(current instanceof JPasswordField){ - JPasswordField pass = ((JPasswordField)current); - if(pass!=null){ - char[] charArray = pass.getPassword(); - if(charArray.length>0){ - existingValue = new String(charArray); - } - } - }else{ - existingValue = current.getText(); - } - //save off test user password as well - if(testUserPasswordValue instanceof JPasswordField){ - JPasswordField pass = ((JPasswordField)testUserPasswordValue); - if(pass!=null){ - char[] charArray = pass.getPassword(); - if(charArray.length>0){ - existingTestUserPass = new String(charArray); - } - } - }else{ - existingTestUserPass=testUserPasswordValue.getText(); - } - - JTextField updatedContainer = null; - if(showPasswords.isSelected()){ - updatedContainer = new JTextField(textBoxWidth); - updatedContainer.setText(existingValue); - testUserPasswordValue = new JTextField(textBoxWidth); - testUserPasswordValue.setText(existingTestUserPass); - }else{ - updatedContainer = new JPasswordField(textBoxWidth); - updatedContainer.setText(existingValue); - testUserPasswordValue = new JPasswordField(textBoxWidth); - testUserPasswordValue.setText(existingTestUserPass); - } - //locate the JPanel and rebuild it Should be at index 3 - JPanel passwordRow = (JPanel) top.getComponent(3); -// JTextField jf = (JTextField) passwordRow.getComponent(1); - //store off existing components - Component[] existing = new Component[passwordRow.getComponentCount()]; - for(int i=0; i<passwordRow.getComponentCount();i++){ - existing[i] = passwordRow.getComponent(i); - } - passwordRow.removeAll(); - for(int j=0;j<existing.length;j++){ - if(j==1){//insert new JTextField instead - passwordRow.add(updatedContainer); - }else{ - passwordRow.add(existing[j]); - } - } - //reload testUserRegion - //store off existing components - Component[] existingTest = new Component[testUserRegion.getComponentCount()]; - for(int i=0; i<testUserRegion.getComponentCount();i++){ - existingTest[i] = testUserRegion.getComponent(i); - } - testUserRegion.removeAll(); - for(int j=0;j<existingTest.length;j++){ - if(j==3){//insert new JTextField instead - testUserRegion.add(testUserPasswordValue); - }else{ - testUserRegion.add(existingTest[j]); - } - } - - top.revalidate(); - top.repaint(); - } - }); - } - }); - securityPanel.add(showPasswords); - ssl = new JCheckBox("SSL:"); - ssl.setEnabled(false); - securityPanel.add(ssl); - top.add(securityPanel); - - // test user auth region - testUserRegion = new JPanel(); - testUserRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); - LineBorder border = new LineBorder(Color.BLUE, 2); - TitledBorder tBorder = new TitledBorder(border, "Authentication/Authorization Check Credentials: (insert valid ldap user assigned to group)"); - testUserRegion.setBorder(tBorder); - JLabel testUserName = new JLabel("Test UserName:"); - testUserNameValue = new JTextField(textBoxWidth); - JLabel testUserPassword = new JLabel("Test Password:"); -// testUserPasswordValue = new JTextField(textBoxWidth); - testUserPasswordValue = new JPasswordField(textBoxWidth); - testUserRegion.add(testUserName); - testUserRegion.add(testUserNameValue); - testUserRegion.add(testUserPassword); - testUserRegion.add(testUserPasswordValue); - top.add(testUserRegion); - - // center - JPanel center = new JPanel(); - center.setLayout(new BoxLayout(center, BoxLayout.X_AXIS)); - // build center panel - buildCenterPanel(center); - - // final component layout - getContentPane().add(top, BorderLayout.NORTH); - getContentPane().add(center, BorderLayout.CENTER); - this.setSize(720, 700); - addWindowListener(new WindowAdapter() { - public void windowClosing(WindowEvent e) { - System.exit(0); - } - }); - setVisible(true); - } - - // define the center display panel. - private void buildCenterPanel(JPanel center) { - // First element is Test Button - JButton test = new JButton("Test Settings"); - center.add(test); - // second is large text box that display ldap queries - testResults = new JTextArea("(click button to test settings values: simulates 4 separate checks showing ldap filters used)", - 40, 40); - JScrollPane jsp = new JScrollPane(testResults); - center.add(jsp); - test.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - testResults.setText("");//clear out empty msg - //trim spaces from all fields - String ldapServer = fieldMappings.get(keys[0]).getText().trim(); - String searchFilter = fieldMappings.get(keys[1]).getText().trim(); - String searchBase = fieldMappings.get(keys[2]).getText().trim(); - String loginProperty = fieldMappings.get(keys[3]).getText().trim(); - String bindUserName = fieldMappings.get(keys[4]).getText().trim(); - String groupSearchFilter = fieldMappings.get(keys[5]).getText().trim(); - String bindPassword = fieldMappings.get(keys[6]).getText().trim(); - String groupMemberFilter = fieldMappings.get(keys[7]).getText().trim(); - String groupMemberQuerySize = groupMemberQueryValue.getText().trim(); - String testUserName = testUserNameValue.getText().trim(); - String testUserPassword = testUserPasswordValue.getText().trim(); - // validate initial required elements - String msg = null; - boolean proceed = true; - //valid required details set. - if (ldapServer.isEmpty() || bindUserName.isEmpty() - || bindPassword.isEmpty() || searchBase.isEmpty()) { - msg ="STEP-1:FAIL: "+ keys[0] + ", " + keys[2] + ", " + keys[4] + ", " - + keys[6] + " cannot be empty to proceed."; - log(msg); - proceed = false; - } - env = null; - InitialLdapContext ctx = null; - if (proceed) {// attempt initial ldap bind from RHQ server - msg = "STEP-1:TESTING: Attempting to bind to server:" + ldapServer - + "\n with user '" + bindUserName - + "' and password entered."; - log(msg); - env = getProperties(ldapServer); - env.setProperty(Context.SECURITY_PRINCIPAL, bindUserName); - env.setProperty(Context.SECURITY_CREDENTIALS, bindPassword); - env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); - //put the rest of the LDAP properties into the Properties instance for use later. - //there still needs to be separate variables since some are for UI validation. - env.setProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), groupSearchFilter); - env.setProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), groupMemberFilter); - env.setProperty(SystemSetting.LDAP_BASE_DN.getInternalName(), searchBase); - env.setProperty(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName(), loginProperty); - env.setProperty(SystemSetting.LDAP_BIND_DN.getInternalName(), bindUserName); - env.setProperty(SystemSetting.LDAP_BIND_PW.getInternalName(), bindPassword); - env.setProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.getInternalName(), groupMemberQuerySize); - - for(Object key :env.keySet()){ - System.out.println(key+"="+env.getProperty(key+"")); - } - - try { - ctx = new InitialLdapContext(env, null); - msg = "STEP-1:PASS: LDAP bind credentials are correct. Successfully connected to '" - + ldapServer - + "'.\n This means the LDAP Bind credentials for the RHQ Server authentication/authorization requests to ldap server " - + "are correct."; - if(enableVerboseDebugging.isSelected()){ - msg+="\n"+advdb+" LDAP simple authentication bind successful."; - } - log(msg); - proceed = true; - } catch (Exception ex) { - msg = "STEP-1:FAIL: Unable to connect to the LDAP server with credentials specified.\n"; - msg+="Exception:"+ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - proceed = false; - } - } - if (proceed) {// retrieve test credentials to test run auth - // load search controls - SearchControls searchControls = getSearchControls(); - // validating searchFilter and test user/pass creds - proceed = true; - if (testUserName.isEmpty() || (testUserPassword.isEmpty())) { - msg = "STEP-2:FAIL: Test Username/Password fields cannot be empty for this step."; - log(msg); - proceed = false; - } - // testing a valid user involves a filtered ldap search - // using the loginProperty, and optionally searchFilter - String userDN = ""; - if (proceed) { - // default loginProperty to cn if it's not set - if (loginProperty.isEmpty()) { - loginProperty = "cn"; - if(enableVerboseDebugging.isSelected()){ - String mesg = "As you have not specified a login property, defaulting to 'cn'"; - log(advdb+" "+msg); - } - } - String filter; - if (!searchFilter.isEmpty()) { - filter = "(&(" + loginProperty + "=" + testUserName - + ")" + "(" + searchFilter + "))"; - } else { - filter = "(" + loginProperty + "=" + testUserName - + ")"; - } - if(enableVerboseDebugging.isSelected()){ - log(advdb+" The searchfilter is optionally appended to login property for additional shared attribute across users."); - } - msg = "STEP-2:TESTING: To validate the test user the following LDAP filtered component will be used to find matching users:\n"; - msg += filter; - log(msg); - // test out the search on the target ldap server - try { - String[] baseDNs = searchBase.split(";"); - for (int x = 0; x < baseDNs.length; x++) { - NamingEnumeration answer = ctx.search( - baseDNs[x], filter, searchControls); - if(enableVerboseDebugging.isSelected()){ - log(advdb+" this search was excuted against DN component '"+baseDNs[x]+"'."); - } - // boolean ldapApiNpeFound = false; - if (!answer.hasMoreElements()) { - msg="STEP-2:WARN Unable to locate a matching users for the filter'"+filter+ - "'. Please check your loginProperty. Usually 'cn' or 'uid'"; - log(msg); - continue; - } - // Going with the first match - SearchResult si = (SearchResult) answer.next(); - - // Construct the UserDN - userDN = si.getName() + "," + baseDNs[x]; - msg = "STEP-2:PASS: The test user '" - + testUserName - + "' was succesfully located, and the following userDN will be used in authorization check:\n"; - msg += userDN; - log(msg); - - ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, userDN); - ctx.addToEnvironment(Context.SECURITY_CREDENTIALS,testUserPassword); - ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION,"simple"); - - // if successful then verified that user and pw - // are valid ldap credentials - ctx.reconnect(null); - msg = "STEP-2:PASS: The user '" - + testUserName - + "' was succesfully authenticated using userDN '" - + userDN + "' and password provided.\n" - +"*Note: the loginProperty must match the loginProperty listed in dn: for the user. It is the DN that RHQ will lookup and use."; - log(msg); - } - } catch (Exception ex) { - msg = "STEP-2:FAIL: There was an error while searching for or authenticating the user '" - + testUserName + "'\n"; - msg += ex.getMessage(); - if(enableVerboseDebugging.isSelected()){ - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - proceed=false; - } - } - // with authentication completed, now check authorization. - // validate filter components to list all available groups - proceed = false; - if (!groupSearchFilter.isEmpty()) { - Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); - String filter = null; - - if (groupSearchFilter.startsWith("(") && groupSearchFilter.endsWith(")")){ - filter = groupSearchFilter; // RFC 2254 does not allow for ((expression)) - }else{ - filter = String - .format("(%s)", groupSearchFilter); - } - msg = "STEP-3:TESTING: This ldap filter " - + filter - + " will be used to locate ALL available LDAP groups"; - log(msg); - - Properties systemConfig = populateProperties(env); - - ret = buildGroup(systemConfig, filter); - msg = "STEP-3:TESTING: Using Group Search Filter '" - + filter + "', " + ret.size() - + " ldap group(s) were located.\n"; - if (ret.size() > 0) { - HashMap<String, String>[] ldapLists = new HashMap[ret - .size()]; - ret.toArray(ldapLists); - // in this mode go beyond the first ten results. - if (enableVerboseGroupParsing.isSelected()) { - msg += "STEP-3:PASS: Listing 'all' of the ldap groups located: \n"; - for (int i = 0; i < ret.size(); i++) { - msg += ldapLists[i] + "\n"; - } - } else {// otherwise only show first 10[subset of - // available groups] - msg += "STEP-3:PASS: Listing a few(<=10) of the ldap groups located: \n"; - for (int i = 0; (i < ret.size() && i < 10); i++) { - msg += ldapLists[i] + "\n"; - } - } - proceed = true;// then can proceed to next step. - } - log(msg); - } else { - msg = "STEP-3:FAIL: Group Search Filter: cannot be empty to proceed."; - log(msg); - proceed=false; - } - // retrieve lists of authorized groups available for the - if (proceed) { - // check groupMember - if (!groupMemberFilter.isEmpty()) { -// Map<String, String> userDetails = new HashMap<String, String>(); -// userDetails = findLdapUserDetails(userDN); - Set<String> userDetails = findAvailableGroupsFor(testUserName); - - if(!userDetails.isEmpty()){ - proceed=true; - } - } else { - msg = "STEP-4:FAIL: Group Member Filter must be non-empty to proceed with simulating authorization check for test user."; - log(msg); - } - } - if(proceed){ - msg="COMPLETED:PASS: The current settings, for successful steps, should be correct to enter into your RHQ server."; - msg+="\n\n\n\n When you encounter failures, warnings or other unexpected results you should use an external "; - msg+="LDAP search utility to check that the generated filters return the expected LDAP results."; - log(msg); - } - } - } - }); - } - - private String appendStacktraceToMsg(String msg, Exception ex) { - String moreVerbose = ""; - moreVerbose+=advdb+" Exception type:"+ex.getClass()+"\n"; - moreVerbose+=advdb+" Exception stack trace reference:"+ex.getStackTrace()+"\n"; - if(ex.getStackTrace()!=null){ - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - ex.printStackTrace(pw); - moreVerbose+=advdb+" stack trace reference:"+sw.toString(); - } - msg+="\n"+moreVerbose; - return msg; - } - - private boolean containsIllegalLdap(String currentValue) { - boolean invalidData = false; - if((currentValue!=null)&&(!currentValue.trim().isEmpty())){ - //TODO: spinder 3/17/11: need to figure out regex to filter/detect bad data in returned ldap. Giving up for now. -// String regex = "(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)[/,+\"><;=#]|(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)\$?!\\|[/,+\"><;=#]| $|(?<=^\$ )|^"; -// regex = "(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)[/,+\\\"><;=#]|(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)\\\$?!\\\\|[/,+\\\"><;=#]| $|(?<=^\\\$ )|^"; -// System.out.println("++++++++ CURR VAL:"+currentValue+":INV-CHeck:"+currentValue.matches(",+\"\\<;\n=/")+":NEWCHECK:"+(currentValue.matches(regex))); -// if(currentValue.matches(",+\"\\<;\n=/")){ -// invalidData=true; -// } -// String badList = ",+\"\\<;\n="; - String badList = "+\"\\<;\n"; - for(char car :currentValue.toCharArray()){ - for(char c :badList.toCharArray()){ - if(car == c){ - invalidData=true; - } - } - } - - } - return invalidData; - } - /** - * @throws NamingException - * @see org.jboss.security.auth.spi.UsernamePasswordLoginModule#validatePassword(java.lang.String,java.lang.String) - */ - protected Set<Map<String, String>> buildGroup(Properties systemConfig, String filter) { - Set<Map<String, String>> groupDetailsMap = new HashSet<Map<String, String>>(); - // Load our LDAP specific properties - // Load the BaseDN - String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); - - // Load the LoginProperty - String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); - if (loginProperty == null) { - // Use the default - loginProperty = "cn"; - } - // Load any information we may need to bind - String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); - String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); - if (bindDN != null) { - systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); - systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); - systemConfig.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); - } - try { - InitialLdapContext ctx = new InitialLdapContext(systemConfig, null); - SearchControls searchControls = getSearchControls(); - /*String filter = "(&(objectclass=groupOfUniqueNames)(uniqueMember=uid=" + userName - + ",ou=People, dc=rhndev, dc=redhat, dc=com))";*/ - - //modify the search control to only include the attributes we will use - String[] attributes = { "cn", "description" }; - searchControls.setReturningAttributes(attributes); - - //BZ:964250: add rfc 2696 - //default to 1000 results. System setting page size from UI should be non-negative integer > 0. - //additionally as system settings are modifiable via CLI which may not have param checking enabled do some - //more checking. - int defaultPageSize = 1000; - // only if they're enabled in the UI. - if (enable32xFeatures.isSelected()) { - String groupPageSize = systemConfig.getProperty( - SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE - .getInternalName(), "" + defaultPageSize); - if ((groupPageSize != null) - && (!groupPageSize.trim().isEmpty())) { - int passedInPageSize = -1; - try { - passedInPageSize = Integer - .valueOf(groupPageSize.trim()); - if (passedInPageSize > 0) { - defaultPageSize = passedInPageSize; - if(enableVerboseDebugging.isSelected()){ - log(advdb - + " LDAP Group Query Page Sizing of '"+defaultPageSize+"' is being requested from server."); - } - } - } catch (NumberFormatException nfe) { - // log issue and do nothing. Go with the default. - String msg = "LDAP Group Page Size passed in '" - + groupPageSize - + "' in is invalid. Defaulting to 1000 results." - + nfe.getMessage(); - log(msg); - } - } - ctx.setRequestControls(new Control[] { new PagedResultsControl( - defaultPageSize, Control.CRITICAL) }); - } - // Loop through each configured base DN. It may be useful - // in the future to allow for a filter to be configured for - // each BaseDN, but for now the filter will apply to all. - String[] baseDNs = baseDN.split(BASEDN_DELIMITER); - - for (int x = 0; x < baseDNs.length; x++) { - if (enableVerboseDebugging.isSelected()) { - log(advdb - + " this search was excuted against DN component '" - + baseDNs[x] + "'."); - } - executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); - - // continually parsing pages of results until we're done. - // only if they're enabled in the UI. - if (enable32xFeatures.isSelected()) { - // handle paged results if they're being used here - byte[] cookie = null; - Control[] controls = ctx.getResponseControls(); - if (controls != null) { - for (Control control : controls) { - if (control instanceof PagedResultsResponseControl) { - PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; - cookie = pagedResult.getCookie(); - } - } - } - - while (cookie != null) { - String msg = "RFC 2696 is supported by the server and we are paging through the results. "+ - groupDetailsMap.size()+" results returned so far."; - if(enableVerboseGroupParsing.isSelected()){ - log(advdb - + msg); - } - // ensure the next requests contains the session/cookie - // details - ctx.setRequestControls(new Control[] { new PagedResultsControl( - defaultPageSize, cookie, Control.CRITICAL) }); - executeGroupSearch(filter, groupDetailsMap, ctx, - searchControls, baseDNs, x); - // empty out cookie - cookie = null; - // test for further iterations - controls = ctx.getResponseControls(); - if (controls != null) { - for (Control control : controls) { - if (control instanceof PagedResultsResponseControl) { - PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; - cookie = pagedResult.getCookie(); - } - } - } - } - } - }//end of for loop - } catch (NamingException e) { - if (e instanceof InvalidSearchFilterException) { - InvalidSearchFilterException fException = (InvalidSearchFilterException) e; - String message = "The ldap group filter defined is invalid "; - log(message); - } - //TODO: check for ldap connection/unavailable/etc. exceptions. - else { - String mesg = "LDAP communication error: " + e.getMessage(); - log(mesg); - } - } catch (IOException iex) { - String msg = "Unexpected LDAP communciation error:" + iex.getMessage(); - log(msg); - } - - return groupDetailsMap; - } - - /** Executes the LDAP group query using the filters, context and search controls, etc. parameters passed in. - * The matching groups located during processing this pages of results are added as new entries to the - * groupDetailsMap passed in. - * - * @param filter - * @param groupDetailsMap - * @param ctx - * @param searchControls - * @param baseDNs - * @param x - * @throws NamingException - */ - private void executeGroupSearch(String filter, Set<Map<String, String>> groupDetailsMap, InitialLdapContext ctx, - SearchControls searchControls, String[] baseDNs, int x) throws NamingException { - //execute search based on controls and context passed in. - NamingEnumeration<SearchResult> answer = ctx.search(baseDNs[x], filter, searchControls); - boolean ldapApiEnumerationBugEncountered = false; - while ((!ldapApiEnumerationBugEncountered) && answer.hasMoreElements()) {//BZ:582471- ldap api bug change - // We use the first match - SearchResult si = null; - try { - si = answer.next(); - } catch (NullPointerException npe) { - if (enableVerboseDebugging.isSelected()) { - log(advdb - + " NullPtr exception detected. If known LDAP api enum npe ignore: " - + npe.getMessage() + "."); - } - ldapApiEnumerationBugEncountered = true; - break; - } - - if (enableVerboseDebugging.isSelected() - || enableVerboseGroupParsing.isSelected()) { - Attributes attributeContainer = si.getAttributes(); - NamingEnumeration<? extends Attribute> attributes = attributeContainer - .getAll(); - String attributesReturned = " "; - while (attributes.hasMore()) { - attributesReturned += attributes.next().getID() + ","; - } - String dbugMesg = "\n" - + advdb - + " Group search LDAP (" - + attributeContainer.size() - + ") attributes located for group '" - + si.getName() - + "' are [" - + attributesReturned.substring(0, - attributesReturned.length() - 1) + "]."; - // directly update here to shorten messages for lots of groups - testResults.setText(testResults.getText() + dbugMesg); - //This flag can be used in the unlikely case that the UI hangs during a test operation.: - if(iterativeVerboseLogging.isSelected()){ - System.out.println(dbugMesg); - } - - // additionally parse attribute ids and values for illegal ldap - // characters - if (enableVerboseGroupParsing.isSelected()) { - attributes = attributeContainer.getAll(); - String currentAttributeId = ""; - String currentValue = ""; - // spinder: 3/17/11: should we bail on first bad data or - // display them all? - while (attributes.hasMore()) { - boolean badData = false; - Attribute att = attributes.next(); - currentAttributeId = att.getID(); - if (containsIllegalLdap(currentAttributeId)) { - log(advdb - + " LDAP Group: bad atrribute data detected for group '" - + si.getName() + "' for attribute '" - + currentAttributeId + "'."); - badData = true; - } - if (att.getAll() != null) { - NamingEnumeration<?> enumer = att.getAll(); - while (enumer.hasMore()) { - currentValue = enumer.next() + ""; - if (containsIllegalLdap(currentValue)) { - log(advdb - + " LDAP Group: bad data detected for group '" - + si.getName() - + "' with attribute '" - + currentAttributeId - + "' and value:" + currentValue); - badData = true; - } - } - } - if (badData) { - log(advdb - + "** LDAP Group: Some bad LDAP data detected for group '" - + si.getName() + "'."); - } - } - } - } - - Map<String, String> entry = new HashMap<String, String>(); - // String name = (String) si.getAttributes().get("cn").get(); - Attribute commonNameAttr = si.getAttributes().get("cn"); - if (commonNameAttr != null) { - String name = (String) commonNameAttr.get(); - name = name.trim(); - Attribute desc = si.getAttributes().get("description"); - String description = desc != null ? (String) desc.get() : ""; - description = description.trim(); - entry.put("id", name); - entry.put("name", name); - entry.put("description", description); - groupDetailsMap.add(entry); - } else {// unable to retrieve details for specific group. - log(advdb - + " There was an error retrieving 'cn' attribute for group '" - + si.getName() - + "'. Not adding to returned list of groups. "); - } - } - } - - public Map<String, String> findLdapUserDetails(String userName) { - // Load our LDAP specific properties - Properties systemConfig = env; - HashMap<String, String> userDetails = new HashMap<String, String>(); - - // Load the BaseDN - String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); - - // Load the LoginProperty - String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); - if (loginProperty == null) { - // Use the default - loginProperty = "cn"; - } - // Load any information we may need to bind - String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); - String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); - - // Load any search filter - String groupSearchFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); - String groupMemberFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_MEMBER.getInternalName()); - String testUserDN=userName; - String ldapServer = (String) systemConfig.get(Context.PROVIDER_URL); - - Properties env = getProperties(ldapServer); - - if (bindDN != null) { - env.setProperty(Context.SECURITY_PRINCIPAL, bindDN); - env.setProperty(Context.SECURITY_CREDENTIALS, bindPW); - env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); - } - - try { - InitialLdapContext ctx = new InitialLdapContext(env, null); - SearchControls searchControls = getSearchControls(); - - String filter = String.format("(&(%s)(%s=%s))", - groupSearchFilter, groupMemberFilter, - testUserDN); - - generateUiLoggingForStep4LdapFilter(userName, filter); - - // Loop through each configured base DN. It may be useful - // in the future to allow for a filter to be configured for - // each BaseDN, but for now the filter will apply to all. - String[] baseDNs = baseDN.split(BASEDN_DELIMITER); - for (int x = 0; x < baseDNs.length; x++) { - NamingEnumeration<SearchResult> answer = ctx.search(baseDNs[x], filter, searchControls); - if (!answer.hasMoreElements()) { //BZ:582471- ldap api bug change - // Nothing found for this DN, move to the next one if we have one. - continue; - } - - // We use the first match - SearchResult si = answer.next(); - //generate the DN - String userDN = null; - try { - userDN = si.getNameInNamespace(); - } catch (UnsupportedOperationException use) { - userDN = si.getName(); - if (userDN.startsWith("\"")) { - userDN = userDN.substring(1, userDN.length()); - } - if (userDN.endsWith("\"")) { - userDN = userDN.substring(0, userDN.length() - 1); - } - userDN = userDN + "," + baseDNs[x]; - } - userDetails.put("dn", userDN); - - // Construct the UserDN - NamingEnumeration<String> keys = si.getAttributes().getIDs(); - while (keys.hasMore()) { - String key = keys.next(); - Attribute value = si.getAttributes().get(key); - if ((value != null) && (value.get() != null)) { - userDetails.put(key, value.get().toString()); - } - } -// return userDetails; - }//end of for loop - generateUiLoggingStep4Authz(filter); - return userDetails; - } catch (Exception ex) { - generateUiLoggingStep4Exception(ex); - } - return userDetails; - } - - public Set<String> findAvailableGroupsFor(String userName) { - // Load our LDAP specific properties - Properties options = env; - String groupFilter = options.getProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), ""); - String groupMember = options.getProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), ""); - String groupUsePosix = options.getProperty(SystemSetting.LDAP_GROUP_USE_POSIX.getInternalName(), "false"); - if (groupUsePosix == null) { - groupUsePosix = Boolean.toString(false);//default to false - } - boolean usePosixGroups = Boolean.valueOf(groupUsePosix); - String userAttribute = getUserAttribute(options, userName, usePosixGroups); - Set<String> ldapSet = new HashSet<String>(); - - if (userAttribute != null && userAttribute.trim().length() > 0) { - //TODO: spinder 4/21/10 put in error/debug logging messages for badly formatted filter combinations - String filter = ""; - //form assumes examples where groupFilter is like 'objectclass=groupOfNames' and groupMember is 'member' - // to produce ldap filter like (&(objectclass=groupOfNames)(member=cn=Administrator,ou=People,dc=test,dc=com)) - // or like (&(objectclass=groupOfNames)(memberUid=Administrator)) for posixGroups. - filter = String.format("(&(%s)(%s=%s))", groupFilter, groupMember, encodeForFilter(userAttribute)); - - Set<Map<String, String>> matched = buildGroup(options, filter); -// log.trace("Located '" + matched.size() + "' LDAP groups for user '" + userName -// + "' using following ldap filter '" + filter + "'."); - - //iterate to extract just the group names. - for (Map<String, String> match : matched) { - ldapSet.add(match.get("id")); - } - } else { -// log.debug("Group lookup will not be performed due to no UserDN found for user " + userName); - } - - return ldapSet; - } - - private void generateUiLoggingStep4Exception(Exception ex) { - String groupSearchFilter = env - .getProperty(SystemSetting.LDAP_GROUP_FILTER - .getInternalName()); - String msg = "STEP-4:FAIL: There was an error searching with the groupFilter supplied: " - + groupSearchFilter + "'\n"; - msg += ex.getMessage(); - if (enableVerboseDebugging.isSelected()) { - msg = appendStacktraceToMsg(msg, ex); - } - log(msg); - } - - private void generateUiLoggingStep4Authz(String filter) { - Set<Map<String, String>> groups = buildGroup(env, filter); - String msg = "STEP-4:TESTING: Using Group Search Filter '" - + filter + "', " + groups.size() - + " ldap group(s) were located.\n"; - if (groups.size() > 0) { - HashMap<String, String>[] ldapLists = new HashMap[groups - .size()]; - groups.toArray(ldapLists); - msg += "STEP-4:PASS: Listing a few of the ldap groups located: \n"; - // iterate over first ten or less to demonstrate retrieve - for (int i = 0; (i < groups.size() && i < 10); i++) { - msg += ldapLists[i] + "\n"; - } - }else{ - msg+="STEP-4:WARN: With current settings, test user is not authorized for any groups. Is this correct?"; - } - log(msg); - } - - private void generateUiLoggingForStep4LdapFilter(String userName, - String filter) { - String msg = "STEP-4:TESTING: about to do ldap search with filter \n'" - + filter - + "'\n to locate groups that test user '"+userName+"' IS authorized to access."; - log(msg); - } - - - // throw the label and fields together, two to a row. - private HashMap<String, JTextField> loadUiFields(JPanel top, - String[] componentKeys) { - HashMap<String, JTextField> mappings = new HashMap<String, JTextField>(); - for (int i = 0; i < componentKeys.length; i++) { - String firstLabelKey = componentKeys[i]; - String secondLabelKey = componentKeys[++i]; - // locate second key - JPanel row = new JPanel(); - row.setLayout(new FlowLayout(FlowLayout.LEFT)); - JLabel label1 = new JLabel(firstLabelKey); - label1.setSize(textBoxWidth, 5); -// JTextField value1 = new JTextField(textBoxWidth); - JTextField value1 = null; - if (firstLabelKey.equalsIgnoreCase("Password:")&&(!showPasswords.isSelected())) { - value1 = new JPasswordField(textBoxWidth); - } else { - value1 = new JTextField(textBoxWidth); - } - JLabel label2 = new JLabel(secondLabelKey); - JTextField value2 = new JTextField(textBoxWidth); - row.add(label1); - row.add(value1); - row.add(Box.createRigidArea(new Dimension(0, 5))); - row.add(label2); - row.add(value2); - mappings.put(firstLabelKey, value1); - mappings.put(secondLabelKey, value2); - top.add(row); - } - - return mappings; - } - - private Properties getProperties(String contentProvider) { - Properties env = new Properties(); - env.setProperty(Context.INITIAL_CONTEXT_FACTORY, - "com.sun.jndi.ldap.LdapCtxFactory"); - env.setProperty(Context.PROVIDER_URL, contentProvider); - if(!enableLdapReferral.isSelected()){ - env.setProperty(Context.REFERRAL, "ignore"); - }else{ - String msg="**---- You have chosen to tell LDAP servers to [FOLLOW] context referrals. Default is [IGNORE] referrals. --**"; - log(msg); - env.setProperty(Context.REFERRAL, "follow"); - } - -// // Setup SSL if requested -// String protocol = ssl.isSelected()? "ssl":""; -// if ((protocol != null) && protocol.equals("ssl")) { -// String ldapSocketFactory = env -// .getProperty("java.naming.ldap.factory.socket"); -// if (ldapSocketFactory == null) { -// env.put("java.naming.ldap.factory.socket", -// UntrustedSSLSocketFactory.class.getName()); -// } -// env.put(Context.SECURITY_PROTOCOL, "ssl"); -// } - - return env; - } - - private String delineate() { - String line = "-"; - for (int i = 0; i < 30; i++) { - line += "-"; - } - return line; - } - - /** Takes care of delineating messages and conditional logging contents passed in. - * @param msg - */ - private void log(String msg) { - String message = "\n" + delineate() + "\n"; - message += msg; - message += "\n" + delineate() + "\n\n"; - //This flag can be used in the unlikely case that the UI hangs during a test operation.: - if(iterativeVerboseLogging.isSelected()){ - System.out.println(message); - } - testResults.setText(testResults.getText() + message); - } - - private SearchControls getSearchControls() { - int scope = SearchControls.SUBTREE_SCOPE; - int timeLimit = 0; - long countLimit = 0; - String[] returnedAttributes = null; - boolean returnObject = false; - boolean deference = false; - SearchControls constraints = new SearchControls(scope, countLimit, - timeLimit, returnedAttributes, returnObject, deference); - return constraints; - } - - /** Translate SystemSettings to familiar Properties instance since we're - * passing not one but multiple values. - * - * @param systemSettings - * @return - */ - private Properties populateProperties(Properties existing) { - Properties properties = new Properties(); - if(existing!=null){ - properties = existing; - } - for (SystemSetting entry : SystemSetting.values()) { - if(entry!=null){ - switch(entry){ - case LDAP_BASED_JAAS_PROVIDER: - properties.put(entry.getInternalName(), ""); - break; - } - } - } - return properties; - } - - /**Build/retrieve the user DN. Not usually a property. - * - * @param options - * @param userName - * @param usePosixGroups boolean indicating whether we search for groups with posixGroup format - * @return - */ - private String getUserAttribute(Properties options, String userName, boolean usePosixGroups) { - Map<String, String> details = findLdapUserDetails(userName); - String userAttribute = null; - if (usePosixGroups) {//return just the username as posixGroup member search uses (&(%s)(memberUid=username)) - userAttribute = userName; - } else {//this is the default where group search uses (&(%s)(uniqueMember={userDn})) - userAttribute = details.get("dn"); - } - - return userAttribute; - } - - /** See LDAPStringUtil.encodeForFilter() for original code/source/author/etc. - * <p>Encode a string so that it can be used in an LDAP search filter.</p> - * - * <p>The following table shows the characters that are encoded and their - * encoded version.</p> - * - * <table> - * <tr><th align="center">Character</th><th>Encoded As</th></tr> - * <tr><td align="center">*</td><td>\2a</td></tr> - * <tr><td align="center">(</td><td>\28</td></tr> - * <tr><td align="center">)</td><td>\29</td></tr> - * <tr><td align="center">\</td><td>\5c</td></tr> - * <tr><td align="center"><code>null</code></td><td>\00</td></tr> - * </table> - * - * <p>In addition to encoding the above characters, any non-ASCII character - * (any character with a hex value greater then <code>0x7f</code>) is also - * encoded and rewritten as a UTF-8 character or sequence of characters in - * hex notation.</p> - * - * @param filterString a string that is to be encoded - * @return the encoded version of <code>filterString</code> suitable for use - * in a LDAP search filter - * @see <a href="http://tools.ietf.org/html/rfc4515">RFC 4515</a> - */ - public static String encodeForFilter(final String filterString) { - if (filterString != null && filterString.length() > 0) { - StringBuilder encString = new StringBuilder(filterString.length()); - for (int i = 0; i < filterString.length(); i++) { - char ch = filterString.charAt(i); - switch (ch) { - case '*': // encode a wildcard * character - encString.append("\\2a"); - break; - case '(': // encode a open parenthesis ( character - encString.append("\\28"); - break; - case ')': // encode a close parenthesis ) character - encString.append("\\29"); - break; - case '\\': // encode a backslash \ character - encString.append("\\5c"); - break; - case '\u0000': // encode a null character - encString.append("\\00"); - break; - default: - if (ch <= 0x7f) { // an ASCII character - encString.append(ch); - } else if (ch >= 0x80) { // encode to UTF-8 - try { - byte[] utf8bytes = String.valueOf(ch).getBytes("UTF8"); - for (byte b : utf8bytes) { - encString.append(String.format("\\%02x", b)); - } - } catch (UnsupportedEncodingException e) { - // ignore - } - } - } - } - return encString.toString(); - } - return filterString; - } -} - -//Mock up the upgraded system properties approach to use SystemSetting -enum SystemSetting { - LDAP_BASED_JAAS_PROVIDER("CAM_JAAS_PROVIDER"), - LDAP_NAMING_PROVIDER_URL("CAM_LDAP_NAMING_PROVIDER_URL"), - USE_SSL_FOR_LDAP("CAM_LDAP_PROTOCOL"), - LDAP_LOGIN_PROPERTY("CAM_LDAP_LOGIN_PROPERTY"), - LDAP_FILTER("CAM_LDAP_FILTER"), - LDAP_GROUP_FILTER("CAM_LDAP_GROUP_FILTER"), - LDAP_GROUP_MEMBER("CAM_LDAP_GROUP_MEMBER"), - LDAP_GROUP_QUERY_PAGE_SIZE("CAM_LDAP_GROUP_QUERY_PAGE_SIZE"), - LDAP_BASE_DN("CAM_LDAP_BASE_DN"), - LDAP_BIND_DN("CAM_LDAP_BIND_DN"), - LDAP_BIND_PW("CAM_LDAP_BIND_PW"), - LDAP_NAMING_FACTORY("CAM_LDAP_NAMING_FACTORY_INITIAL"), - LDAP_GROUP_USE_POSIX("CAM_LDAP_GROUP_USE_POSIX"), - ; - - private String internalName; - - private SystemSetting(String name) { - this.internalName = name; - } - - public String getInternalName() { - return internalName; - } - - public static SystemSetting getByInternalName(String internalName) { - for (SystemSetting p : SystemSetting.values()) { - if (p.internalName.equals(internalName)) { - return p; - } - } - return null; - } -} - - diff --git a/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java new file mode 100644 index 0000000..b9667ea --- /dev/null +++ b/modules/helpers/ldap-tool/src/main/java/org/rhq/TestLdapSettings.java @@ -0,0 +1,1277 @@ +package org.rhq; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import javax.naming.Context; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; +import javax.naming.directory.Attributes; +import javax.naming.directory.InvalidSearchFilterException; +import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; +import javax.naming.ldap.Control; +import javax.naming.ldap.InitialLdapContext; +import javax.naming.ldap.PagedResultsControl; +import javax.naming.ldap.PagedResultsResponseControl; +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JPasswordField; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.SwingUtilities; +import javax.swing.border.LineBorder; +import javax.swing.border.TitledBorder; + +//import org.rhq.enterprise.server.util.security.UntrustedSSLSocketFactory; + +/* Is a development test tool that allows the user to simulate the RHQ server side + * LDAP calls during auth/authz operations. + * + * The specific LDAP logic below needs to mirror the latest RHQ code and allow the user + * to test our their configuration without requring a specific RHQ/JON build as a dependency. + * + * NOTE: To avoid a runtime dependency on specific versions of RHQ or JON, the small implementation + * methods were copied into this class with minimatl changes for logging and ui messaging. The + * definitive implementation for each 'copied' method can be found in LDAPGroupManagerBean. + * + * @author Simeon Pinder + */ +public class TestLdapSettings extends JFrame { + //shared fields + private JTextArea testResults; + private JCheckBox showPasswords; + private JCheckBox ssl; + private JLabel groupPageSizeName; + private JTextField groupMemberQueryValue; + private JTextField testUserNameValue; + private JTextField testUserPasswordValue; + private HashMap<String, JTextField> fieldMappings; + private String[] keys; + private JCheckBox enableLdapReferral; + private JCheckBox enableVerboseDebugging; + private JCheckBox enableVerboseGroupParsing; + private JCheckBox iterativeVerboseLogging; + private JCheckBox enablePosixGroups; + private JCheckBox enable32xFeatures; + private String advdb = "**Verbose:debug ----"; + private static final String BASEDN_DELIMITER = ";"; + + private static final long serialVersionUID = 1L; + int textBoxWidth = 20; + private static JPanel top = null; + private static JPanel testUserRegion = null; + private static Properties env=null; + + public static void main(String args[]) { + new TestLdapSettings(); + } + //After enabling support for Query parsing, we need to warn users of the effects. + final String warnMessage = "<html>***WARNING: Depending upon<br>" + + "i)how the ldap server is configured <br>" + + "ii)client query paging settings <br>" + + " enabling <b>'more detailed logging'</b>,<br>" + + " <b>'more group parsing'</b> AND/OR <b>'also log to console'</b> may cause the console to hang/freeze <br>" + + " as the LDAP tool continues to parse large query results. If that occurs it is <br>" + + " suggested that you kill tool and re-run with 'also log to console' so that the console logs<br>" + + " will show which dataset is causing the delay and then you should modify your search|group|member<br>" + + " filters accordingly to <b>return smaller results</b> and/or <b>consume larger payloads</b>.<br>" + + "***WARNING</html>"; + + // Configure window properties + private TestLdapSettings() { + + setTitle("Check LDAP Settings: Simulates LDAP checks/queries of RHQ LDAP integration"); + getContentPane().setLayout(new BorderLayout()); + // top panel definition + top = new JPanel(); + top.setLayout(new BoxLayout(top, BoxLayout.Y_AXIS)); + top.setBorder(LineBorder.createGrayLineBorder()); + //define checkbox here as it's checked when generating UI. + showPasswords = new JCheckBox("show passwords:"); + showPasswords.setSelected(false); + + keys = new String[] { "URL:", "Search Filter:", + "Search Base:","Login Property", + "Username:", "Group Search Filter:", + "Password:", "Group Member Filter:", + }; + fieldMappings = loadUiFields(top, keys); + + //add the two checkboxes for additiona debugging options + enableLdapReferral= new JCheckBox("[follow] ldap referrals"); + enableLdapReferral.setSelected(false); + enableVerboseDebugging= new JCheckBox("more verbose logging"); + enableVerboseDebugging.setSelected(false); + enableVerboseDebugging.setToolTipText(warnMessage); + enableVerboseGroupParsing= new JCheckBox("more detailed group parsing"); + enableVerboseGroupParsing.setSelected(false); + enableVerboseGroupParsing.setToolTipText("*Take care when using this mode with a large number of groups* Every group discovered is parsed/listed."); + iterativeVerboseLogging= new JCheckBox("also log to console"); + iterativeVerboseLogging.setSelected(false); + iterativeVerboseLogging.setToolTipText("This mode is useful when the test tool is having difficulty returning results from large queries."); + iterativeVerboseLogging.setToolTipText(warnMessage); + enablePosixGroups= new JCheckBox("is Posix Group"); + enablePosixGroups.setSelected(false); + enablePosixGroups.setEnabled(false); + + //put into 3.2.x functionality row + JPanel jon32xRegion = new JPanel(); + jon32xRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); + LineBorder jon32xLineBorder = new LineBorder(Color.BLACK, 2); + TitledBorder jon32xBorder = new TitledBorder(jon32xLineBorder, "JON 3.2.x/RHQ 4.8.x specific features:"); + jon32xRegion.setBorder(jon32xBorder); + enable32xFeatures= new JCheckBox("enable JON 3.2.x/RHQ 4.8.x features"); + enable32xFeatures.setToolTipText("This enables features not available before RHQ 4.8.x/JON 3.2.x."); + enable32xFeatures.setSelected(false); + enable32xFeatures.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + if(enable32xFeatures.isSelected()){ + groupPageSizeName.setEnabled(true); + groupMemberQueryValue.setEnabled(true); + groupMemberQueryValue.setEditable(true); + groupMemberQueryValue.setText("1000"); + enablePosixGroups.setEnabled(true); + }else{ + groupMemberQueryValue.setText(""); + groupPageSizeName.setEnabled(false); + groupMemberQueryValue.setEnabled(false); + groupMemberQueryValue.setEditable(false); + enablePosixGroups.setEnabled(false); + enablePosixGroups.setSelected(false); + } + } + }); + + jon32xRegion.add(enable32xFeatures); + groupPageSizeName = new JLabel("Group Query Page Size:"); + groupPageSizeName.setEnabled(false); + groupMemberQueryValue = new JTextField(10); + groupMemberQueryValue.setText("1000"); + groupMemberQueryValue.setEditable(false); + jon32xRegion.add(groupPageSizeName); + jon32xRegion.add(groupMemberQueryValue); + jon32xRegion.add(enablePosixGroups); + top.add(jon32xRegion); + + //put into row display + JPanel advancedDebugRegion = new JPanel(); + advancedDebugRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); + LineBorder advancedBorder = new LineBorder(Color.BLACK, 2); + TitledBorder debugBorder = new TitledBorder(advancedBorder, "Debug: **Warning --<hover HERE>**"); + advancedDebugRegion.setBorder(debugBorder); + advancedDebugRegion.add(enableLdapReferral); + advancedDebugRegion.add(enableVerboseDebugging); + advancedDebugRegion.add(enableVerboseGroupParsing); + advancedDebugRegion.add(iterativeVerboseLogging); + advancedDebugRegion.setToolTipText(warnMessage); + top.add(advancedDebugRegion); + + JPanel securityPanel = new JPanel(); + securityPanel.setLayout(new FlowLayout(FlowLayout.LEFT)); + showPasswords.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + //store off existing value + String existingValue = ""; + String existingTestUserPass = ""; + JTextField current = fieldMappings.get("Password:"); + if(current instanceof JPasswordField){ + JPasswordField pass = ((JPasswordField)current); + if(pass!=null){ + char[] charArray = pass.getPassword(); + if(charArray.length>0){ + existingValue = new String(charArray); + } + } + }else{ + existingValue = current.getText(); + } + //save off test user password as well + if(testUserPasswordValue instanceof JPasswordField){ + JPasswordField pass = ((JPasswordField)testUserPasswordValue); + if(pass!=null){ + char[] charArray = pass.getPassword(); + if(charArray.length>0){ + existingTestUserPass = new String(charArray); + } + } + }else{ + existingTestUserPass=testUserPasswordValue.getText(); + } + + JTextField updatedContainer = null; + if(showPasswords.isSelected()){ + updatedContainer = new JTextField(textBoxWidth); + updatedContainer.setText(existingValue); + testUserPasswordValue = new JTextField(textBoxWidth); + testUserPasswordValue.setText(existingTestUserPass); + }else{ + updatedContainer = new JPasswordField(textBoxWidth); + updatedContainer.setText(existingValue); + testUserPasswordValue = new JPasswordField(textBoxWidth); + testUserPasswordValue.setText(existingTestUserPass); + } + //locate the JPanel and rebuild it Should be at index 3 + JPanel passwordRow = (JPanel) top.getComponent(3); +// JTextField jf = (JTextField) passwordRow.getComponent(1); + //store off existing components + Component[] existing = new Component[passwordRow.getComponentCount()]; + for(int i=0; i<passwordRow.getComponentCount();i++){ + existing[i] = passwordRow.getComponent(i); + } + passwordRow.removeAll(); + for(int j=0;j<existing.length;j++){ + if(j==1){//insert new JTextField instead + passwordRow.add(updatedContainer); + }else{ + passwordRow.add(existing[j]); + } + } + //reload testUserRegion + //store off existing components + Component[] existingTest = new Component[testUserRegion.getComponentCount()]; + for(int i=0; i<testUserRegion.getComponentCount();i++){ + existingTest[i] = testUserRegion.getComponent(i); + } + testUserRegion.removeAll(); + for(int j=0;j<existingTest.length;j++){ + if(j==3){//insert new JTextField instead + testUserRegion.add(testUserPasswordValue); + }else{ + testUserRegion.add(existingTest[j]); + } + } + + top.revalidate(); + top.repaint(); + } + }); + } + }); + securityPanel.add(showPasswords); + ssl = new JCheckBox("SSL:"); + ssl.setEnabled(false); + securityPanel.add(ssl); + top.add(securityPanel); + + // test user auth region + testUserRegion = new JPanel(); + testUserRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); + LineBorder border = new LineBorder(Color.BLUE, 2); + TitledBorder tBorder = new TitledBorder(border, "Authentication/Authorization Check Credentials: (insert valid ldap user assigned to group)"); + testUserRegion.setBorder(tBorder); + JLabel testUserName = new JLabel("Test UserName:"); + testUserNameValue = new JTextField(textBoxWidth); + JLabel testUserPassword = new JLabel("Test Password:"); +// testUserPasswordValue = new JTextField(textBoxWidth); + testUserPasswordValue = new JPasswordField(textBoxWidth); + testUserRegion.add(testUserName); + testUserRegion.add(testUserNameValue); + testUserRegion.add(testUserPassword); + testUserRegion.add(testUserPasswordValue); + top.add(testUserRegion); + + // center + JPanel center = new JPanel(); + center.setLayout(new BoxLayout(center, BoxLayout.X_AXIS)); + // build center panel + buildCenterPanel(center); + + // final component layout + getContentPane().add(top, BorderLayout.NORTH); + getContentPane().add(center, BorderLayout.CENTER); + this.setSize(720, 700); + addWindowListener(new WindowAdapter() { + public void windowClosing(WindowEvent e) { + System.exit(0); + } + }); + setVisible(true); + } + + // define the center display panel. + private void buildCenterPanel(JPanel center) { + // First element is Test Button + JButton test = new JButton("Test Settings"); + center.add(test); + // second is large text box that display ldap queries + testResults = new JTextArea("(click button to test settings values: simulates 4 separate checks showing ldap filters used)", + 40, 40); + JScrollPane jsp = new JScrollPane(testResults); + center.add(jsp); + test.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + testResults.setText("");//clear out empty msg + //trim spaces from all fields + String ldapServer = fieldMappings.get(keys[0]).getText().trim(); + String searchFilter = fieldMappings.get(keys[1]).getText().trim(); + String searchBase = fieldMappings.get(keys[2]).getText().trim(); + String loginProperty = fieldMappings.get(keys[3]).getText().trim(); + String bindUserName = fieldMappings.get(keys[4]).getText().trim(); + String groupSearchFilter = fieldMappings.get(keys[5]).getText().trim(); + String bindPassword = fieldMappings.get(keys[6]).getText().trim(); + String groupMemberFilter = fieldMappings.get(keys[7]).getText().trim(); + String groupMemberQuerySize = groupMemberQueryValue.getText().trim(); + String testUserName = testUserNameValue.getText().trim(); + String testUserPassword = testUserPasswordValue.getText().trim(); + // validate initial required elements + String msg = null; + boolean proceed = true; + //valid required details set. + if (ldapServer.isEmpty() || bindUserName.isEmpty() + || bindPassword.isEmpty() || searchBase.isEmpty()) { + msg ="STEP-1:FAIL: "+ keys[0] + ", " + keys[2] + ", " + keys[4] + ", " + + keys[6] + " cannot be empty to proceed."; + log(msg); + proceed = false; + } + env = null; + InitialLdapContext ctx = null; + if (proceed) {// attempt initial ldap bind from RHQ server + msg = "STEP-1:TESTING: Attempting to bind to server:" + ldapServer + + "\n with user '" + bindUserName + + "' and password entered."; + log(msg); + env = getProperties(ldapServer); + env.setProperty(Context.SECURITY_PRINCIPAL, bindUserName); + env.setProperty(Context.SECURITY_CREDENTIALS, bindPassword); + env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + //put the rest of the LDAP properties into the Properties instance for use later. + //there still needs to be separate variables since some are for UI validation. + env.setProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), groupSearchFilter); + env.setProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), groupMemberFilter); + env.setProperty(SystemSetting.LDAP_BASE_DN.getInternalName(), searchBase); + env.setProperty(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName(), loginProperty); + env.setProperty(SystemSetting.LDAP_BIND_DN.getInternalName(), bindUserName); + env.setProperty(SystemSetting.LDAP_BIND_PW.getInternalName(), bindPassword); + env.setProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.getInternalName(), groupMemberQuerySize); + + try { + ctx = new InitialLdapContext(env, null); + msg = "STEP-1:PASS: LDAP bind credentials are correct. Successfully connected to '" + + ldapServer + + "'.\n This means the LDAP Bind credentials for the RHQ Server authentication/authorization requests to ldap server " + + "are correct."; + if(enableVerboseDebugging.isSelected()){ + msg+="\n"+advdb+" LDAP simple authentication bind successful."; + } + log(msg); + proceed = true; + } catch (Exception ex) { + msg = "STEP-1:FAIL: Unable to connect to the LDAP server with credentials specified.\n"; + msg+="Exception:"+ex.getMessage(); + if(enableVerboseDebugging.isSelected()){ + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + proceed = false; + } + } + if (proceed) {// retrieve test credentials to test run auth + // load search controls + SearchControls searchControls = getSearchControls(); + // validating searchFilter and test user/pass creds + proceed = true; + if (testUserName.isEmpty() || (testUserPassword.isEmpty())) { + msg = "STEP-2:FAIL: Test Username/Password fields cannot be empty for this step."; + log(msg); + proceed = false; + } + // testing a valid user involves a filtered ldap search + // using the loginProperty, and optionally searchFilter + String userDN = ""; + if (proceed) { + // default loginProperty to cn if it's not set + if (loginProperty.isEmpty()) { + loginProperty = "cn"; + if(enableVerboseDebugging.isSelected()){ + String mesg = "As you have not specified a login property, defaulting to 'cn'"; + log(advdb+" "+msg); + } + } + String filter; + if (!searchFilter.isEmpty()) { + filter = "(&(" + loginProperty + "=" + testUserName + + ")" + "(" + searchFilter + "))"; + } else { + filter = "(" + loginProperty + "=" + testUserName + + ")"; + } + if(enableVerboseDebugging.isSelected()){ + log(advdb+" The searchfilter is optionally appended to login property for additional shared attribute across users."); + } + msg = "STEP-2:TESTING: To validate the test user the following LDAP filtered component will be used to find matching users:\n"; + msg += filter; + log(msg); + // test out the search on the target ldap server + try { + String[] baseDNs = searchBase.split(";"); + for (int x = 0; x < baseDNs.length; x++) { + NamingEnumeration answer = ctx.search( + baseDNs[x], filter, searchControls); + if(enableVerboseDebugging.isSelected()){ + log(advdb+" this search was excuted against DN component '"+baseDNs[x]+"'."); + } + // boolean ldapApiNpeFound = false; + if (!answer.hasMoreElements()) { + msg="STEP-2:WARN Unable to locate a matching users for the filter'"+filter+ + "'. Please check your loginProperty. Usually 'cn' or 'uid'"; + log(msg); + continue; + } + // Going with the first match + SearchResult si = (SearchResult) answer.next(); + + // Construct the UserDN + userDN = si.getName() + "," + baseDNs[x]; + msg = "STEP-2:PASS: The test user '" + + testUserName + + "' was succesfully located, and the following userDN will be used in authorization check:\n"; + msg += userDN; + log(msg); + + ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, userDN); + ctx.addToEnvironment(Context.SECURITY_CREDENTIALS,testUserPassword); + ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION,"simple"); + + // if successful then verified that user and pw + // are valid ldap credentials + ctx.reconnect(null); + msg = "STEP-2:PASS: The user '" + + testUserName + + "' was succesfully authenticated using userDN '" + + userDN + "' and password provided.\n" + +"*Note: the loginProperty must match the loginProperty listed in dn: for the user. It is the DN that RHQ will lookup and use."; + log(msg); + } + } catch (Exception ex) { + msg = "STEP-2:FAIL: There was an error while searching for or authenticating the user '" + + testUserName + "'\n"; + msg += ex.getMessage(); + if(enableVerboseDebugging.isSelected()){ + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + proceed=false; + } + } + // with authentication completed, now check authorization. + // validate filter components to list all available groups + proceed = false; + if (!groupSearchFilter.isEmpty()) { + Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); + String filter = null; + + if (groupSearchFilter.startsWith("(") && groupSearchFilter.endsWith(")")){ + filter = groupSearchFilter; // RFC 2254 does not allow for ((expression)) + }else{ + filter = String + .format("(%s)", groupSearchFilter); + } + msg = "STEP-3:TESTING: This ldap filter " + + filter + + " will be used to locate ALL available LDAP groups"; + log(msg); + + Properties systemConfig = populateProperties(env); + + ret = buildGroup(systemConfig, filter); + msg = "STEP-3:TESTING: Using Group Search Filter '" + + filter + "', " + ret.size() + + " ldap group(s) were located.\n"; + if (ret.size() > 0) { + HashMap<String, String>[] ldapLists = new HashMap[ret + .size()]; + ret.toArray(ldapLists); + // in this mode go beyond the first ten results. + if (enableVerboseGroupParsing.isSelected()) { + msg += "STEP-3:PASS: Listing 'all' of the ldap groups located: \n"; + for (int i = 0; i < ret.size(); i++) { + msg += ldapLists[i] + "\n"; + } + } else {// otherwise only show first 10[subset of + // available groups] + msg += "STEP-3:PASS: Listing a few(<=10) of the ldap groups located: \n"; + for (int i = 0; (i < ret.size() && i < 10); i++) { + msg += ldapLists[i] + "\n"; + } + } + proceed = true;// then can proceed to next step. + } + log(msg); + } else { + msg = "STEP-3:FAIL: Group Search Filter: cannot be empty to proceed."; + log(msg); + proceed=false; + } + // retrieve lists of authorized groups available for the + if (proceed) { + // check groupMember + if (!groupMemberFilter.isEmpty()) { +// Map<String, String> userDetails = new HashMap<String, String>(); +// userDetails = findLdapUserDetails(userDN); + Set<String> userDetails = findAvailableGroupsFor(testUserName); + + if(!userDetails.isEmpty()){ + proceed=true; + } + } else { + msg = "STEP-4:FAIL: Group Member Filter must be non-empty to proceed with simulating authorization check for test user."; + log(msg); + } + } + if(proceed){ + msg="COMPLETED:PASS: The current settings, for successful steps, should be correct to enter into your RHQ server."; + msg+="\n\n\n\n When you encounter failures, warnings or other unexpected results you should use an external "; + msg+="LDAP search utility to check that the generated filters return the expected LDAP results."; + log(msg); + } + } + } + }); + } + + private String appendStacktraceToMsg(String msg, Exception ex) { + String moreVerbose = ""; + moreVerbose+=advdb+" Exception type:"+ex.getClass()+"\n"; + moreVerbose+=advdb+" Exception stack trace reference:"+ex.getStackTrace()+"\n"; + if(ex.getStackTrace()!=null){ + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + ex.printStackTrace(pw); + moreVerbose+=advdb+" stack trace reference:"+sw.toString(); + } + msg+="\n"+moreVerbose; + return msg; + } + + private boolean containsIllegalLdap(String currentValue) { + boolean invalidData = false; + if((currentValue!=null)&&(!currentValue.trim().isEmpty())){ + //TODO: spinder 3/17/11: need to figure out regex to filter/detect bad data in returned ldap. Giving up for now. +// String regex = "(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)[/,+\"><;=#]|(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)\$?!\\|[/,+\"><;=#]| $|(?<=^\$ )|^"; +// regex = "(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)[/,+\\\"><;=#]|(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)\\\$?!\\\\|[/,+\\\"><;=#]| $|(?<=^\\\$ )|^"; +// System.out.println("++++++++ CURR VAL:"+currentValue+":INV-CHeck:"+currentValue.matches(",+\"\\<;\n=/")+":NEWCHECK:"+(currentValue.matches(regex))); +// if(currentValue.matches(",+\"\\<;\n=/")){ +// invalidData=true; +// } +// String badList = ",+\"\\<;\n="; + String badList = "+\"\\<;\n"; + for(char car :currentValue.toCharArray()){ + for(char c :badList.toCharArray()){ + if(car == c){ + invalidData=true; + } + } + } + + } + return invalidData; + } + /** + * @throws NamingException + * @see org.jboss.security.auth.spi.UsernamePasswordLoginModule#validatePassword(java.lang.String,java.lang.String) + */ + protected Set<Map<String, String>> buildGroup(Properties systemConfig, String filter) { + Set<Map<String, String>> groupDetailsMap = new HashSet<Map<String, String>>(); + // Load our LDAP specific properties + // Load the BaseDN + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + + // Load the LoginProperty + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); + if (loginProperty == null) { + // Use the default + loginProperty = "cn"; + } + // Load any information we may need to bind + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); + if (bindDN != null) { + systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); + systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); + systemConfig.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + } + try { + InitialLdapContext ctx = new InitialLdapContext(systemConfig, null); + SearchControls searchControls = getSearchControls(); + /*String filter = "(&(objectclass=groupOfUniqueNames)(uniqueMember=uid=" + userName + + ",ou=People, dc=rhndev, dc=redhat, dc=com))";*/ + + //modify the search control to only include the attributes we will use + String[] attributes = { "cn", "description" }; + searchControls.setReturningAttributes(attributes); + + //BZ:964250: add rfc 2696 + //default to 1000 results. System setting page size from UI should be non-negative integer > 0. + //additionally as system settings are modifiable via CLI which may not have param checking enabled do some + //more checking. + int defaultPageSize = 1000; + // only if they're enabled in the UI. + if (enable32xFeatures.isSelected()) { + String groupPageSize = systemConfig.getProperty( + SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE + .getInternalName(), "" + defaultPageSize); + if ((groupPageSize != null) + && (!groupPageSize.trim().isEmpty())) { + int passedInPageSize = -1; + try { + passedInPageSize = Integer + .valueOf(groupPageSize.trim()); + if (passedInPageSize > 0) { + defaultPageSize = passedInPageSize; + if(enableVerboseDebugging.isSelected()){ + log(advdb + + " LDAP Group Query Page Sizing of '"+defaultPageSize+"' is being requested from server."); + } + } + } catch (NumberFormatException nfe) { + // log issue and do nothing. Go with the default. + String msg = "LDAP Group Page Size passed in '" + + groupPageSize + + "' in is invalid. Defaulting to 1000 results." + + nfe.getMessage(); + log(msg); + } + } + ctx.setRequestControls(new Control[] { new PagedResultsControl( + defaultPageSize, Control.CRITICAL) }); + } + // Loop through each configured base DN. It may be useful + // in the future to allow for a filter to be configured for + // each BaseDN, but for now the filter will apply to all. + String[] baseDNs = baseDN.split(BASEDN_DELIMITER); + + for (int x = 0; x < baseDNs.length; x++) { + if (enableVerboseDebugging.isSelected()) { + log(advdb + + " this search was excuted against DN component '" + + baseDNs[x] + "'."); + } + executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); + + // continually parsing pages of results until we're done. + // only if they're enabled in the UI. + if (enable32xFeatures.isSelected()) { + // handle paged results if they're being used here + byte[] cookie = null; + Control[] controls = ctx.getResponseControls(); + if (controls != null) { + for (Control control : controls) { + if (control instanceof PagedResultsResponseControl) { + PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; + cookie = pagedResult.getCookie(); + } + } + } + + while (cookie != null) { + String msg = "RFC 2696 is supported by the server and we are paging through the results. "+ + groupDetailsMap.size()+" results returned so far."; + if(enableVerboseGroupParsing.isSelected()){ + log(advdb + + msg); + } + // ensure the next requests contains the session/cookie + // details + ctx.setRequestControls(new Control[] { new PagedResultsControl( + defaultPageSize, cookie, Control.CRITICAL) }); + executeGroupSearch(filter, groupDetailsMap, ctx, + searchControls, baseDNs, x); + // empty out cookie + cookie = null; + // test for further iterations + controls = ctx.getResponseControls(); + if (controls != null) { + for (Control control : controls) { + if (control instanceof PagedResultsResponseControl) { + PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; + cookie = pagedResult.getCookie(); + } + } + } + } + } + }//end of for loop + } catch (NamingException e) { + if (e instanceof InvalidSearchFilterException) { + InvalidSearchFilterException fException = (InvalidSearchFilterException) e; + String message = "The ldap group filter defined is invalid "; + log(message); + } + //TODO: check for ldap connection/unavailable/etc. exceptions. + else { + String mesg = "LDAP communication error: " + e.getMessage(); + log(mesg); + } + } catch (IOException iex) { + String msg = "Unexpected LDAP communciation error:" + iex.getMessage(); + log(msg); + } + + return groupDetailsMap; + } + + /** Executes the LDAP group query using the filters, context and search controls, etc. parameters passed in. + * The matching groups located during processing this pages of results are added as new entries to the + * groupDetailsMap passed in. + * + * @param filter + * @param groupDetailsMap + * @param ctx + * @param searchControls + * @param baseDNs + * @param x + * @throws NamingException + */ + private void executeGroupSearch(String filter, Set<Map<String, String>> groupDetailsMap, InitialLdapContext ctx, + SearchControls searchControls, String[] baseDNs, int x) throws NamingException { + //execute search based on controls and context passed in. + NamingEnumeration<SearchResult> answer = ctx.search(baseDNs[x], filter, searchControls); + boolean ldapApiEnumerationBugEncountered = false; + while ((!ldapApiEnumerationBugEncountered) && answer.hasMoreElements()) {//BZ:582471- ldap api bug change + // We use the first match + SearchResult si = null; + try { + si = answer.next(); + } catch (NullPointerException npe) { + if (enableVerboseDebugging.isSelected()) { + log(advdb + + " NullPtr exception detected. If known LDAP api enum npe ignore: " + + npe.getMessage() + "."); + } + ldapApiEnumerationBugEncountered = true; + break; + } + + if (enableVerboseDebugging.isSelected() + || enableVerboseGroupParsing.isSelected()) { + Attributes attributeContainer = si.getAttributes(); + NamingEnumeration<? extends Attribute> attributes = attributeContainer + .getAll(); + String attributesReturned = " "; + while (attributes.hasMore()) { + attributesReturned += attributes.next().getID() + ","; + } + String dbugMesg = "\n" + + advdb + + " Group search LDAP (" + + attributeContainer.size() + + ") attributes located for group '" + + si.getName() + + "' are [" + + attributesReturned.substring(0, + attributesReturned.length() - 1) + "]."; + // directly update here to shorten messages for lots of groups + testResults.setText(testResults.getText() + dbugMesg); + //This flag can be used in the unlikely case that the UI hangs during a test operation.: + if(iterativeVerboseLogging.isSelected()){ + System.out.println(dbugMesg); + } + + // additionally parse attribute ids and values for illegal ldap + // characters + if (enableVerboseGroupParsing.isSelected()) { + attributes = attributeContainer.getAll(); + String currentAttributeId = ""; + String currentValue = ""; + // spinder: 3/17/11: should we bail on first bad data or + // display them all? + while (attributes.hasMore()) { + boolean badData = false; + Attribute att = attributes.next(); + currentAttributeId = att.getID(); + if (containsIllegalLdap(currentAttributeId)) { + log(advdb + + " LDAP Group: bad atrribute data detected for group '" + + si.getName() + "' for attribute '" + + currentAttributeId + "'."); + badData = true; + } + if (att.getAll() != null) { + NamingEnumeration<?> enumer = att.getAll(); + while (enumer.hasMore()) { + currentValue = enumer.next() + ""; + if (containsIllegalLdap(currentValue)) { + log(advdb + + " LDAP Group: bad data detected for group '" + + si.getName() + + "' with attribute '" + + currentAttributeId + + "' and value:" + currentValue); + badData = true; + } + } + } + if (badData) { + log(advdb + + "** LDAP Group: Some bad LDAP data detected for group '" + + si.getName() + "'."); + } + } + } + } + + Map<String, String> entry = new HashMap<String, String>(); + // String name = (String) si.getAttributes().get("cn").get(); + Attribute commonNameAttr = si.getAttributes().get("cn"); + if (commonNameAttr != null) { + String name = (String) commonNameAttr.get(); + name = name.trim(); + Attribute desc = si.getAttributes().get("description"); + String description = desc != null ? (String) desc.get() : ""; + description = description.trim(); + entry.put("id", name); + entry.put("name", name); + entry.put("description", description); + groupDetailsMap.add(entry); + } else {// unable to retrieve details for specific group. + log(advdb + + " There was an error retrieving 'cn' attribute for group '" + + si.getName() + + "'. Not adding to returned list of groups. "); + } + } + } + + public Map<String, String> findLdapUserDetails(String userName) { + // Load our LDAP specific properties + Properties systemConfig = env; + HashMap<String, String> userDetails = new HashMap<String, String>(); + + // Load the BaseDN + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + + // Load the LoginProperty + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); + if (loginProperty == null) { + // Use the default + loginProperty = "cn"; + } + // Load any information we may need to bind + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); + + // Load any search filter + String groupSearchFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); + String groupMemberFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_MEMBER.getInternalName()); + String testUserDN=userName; + String ldapServer = (String) systemConfig.get(Context.PROVIDER_URL); + + Properties env = getProperties(ldapServer); + + if (bindDN != null) { + env.setProperty(Context.SECURITY_PRINCIPAL, bindDN); + env.setProperty(Context.SECURITY_CREDENTIALS, bindPW); + env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + } + + try { + InitialLdapContext ctx = new InitialLdapContext(env, null); + SearchControls searchControls = getSearchControls(); + + String filter = String.format("(&(%s)(%s=%s))", + groupSearchFilter, groupMemberFilter, + testUserDN); + + generateUiLoggingForStep4LdapFilter(userName, filter); + + // Loop through each configured base DN. It may be useful + // in the future to allow for a filter to be configured for + // each BaseDN, but for now the filter will apply to all. + String[] baseDNs = baseDN.split(BASEDN_DELIMITER); + for (int x = 0; x < baseDNs.length; x++) { + NamingEnumeration<SearchResult> answer = ctx.search(baseDNs[x], filter, searchControls); + if (!answer.hasMoreElements()) { //BZ:582471- ldap api bug change + // Nothing found for this DN, move to the next one if we have one. + continue; + } + + // We use the first match + SearchResult si = answer.next(); + //generate the DN + String userDN = null; + try { + userDN = si.getNameInNamespace(); + } catch (UnsupportedOperationException use) { + userDN = si.getName(); + if (userDN.startsWith("\"")) { + userDN = userDN.substring(1, userDN.length()); + } + if (userDN.endsWith("\"")) { + userDN = userDN.substring(0, userDN.length() - 1); + } + userDN = userDN + "," + baseDNs[x]; + } + userDetails.put("dn", userDN); + + // Construct the UserDN + NamingEnumeration<String> keys = si.getAttributes().getIDs(); + while (keys.hasMore()) { + String key = keys.next(); + Attribute value = si.getAttributes().get(key); + if ((value != null) && (value.get() != null)) { + userDetails.put(key, value.get().toString()); + } + } +// return userDetails; + }//end of for loop + generateUiLoggingStep4Authz(filter); + return userDetails; + } catch (Exception ex) { + generateUiLoggingStep4Exception(ex); + } + return userDetails; + } + + public Set<String> findAvailableGroupsFor(String userName) { + // Load our LDAP specific properties + Properties options = env; + String groupFilter = options.getProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), ""); + String groupMember = options.getProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), ""); + String groupUsePosix = options.getProperty(SystemSetting.LDAP_GROUP_USE_POSIX.getInternalName(), "false"); + if (groupUsePosix == null) { + groupUsePosix = Boolean.toString(false);//default to false + } + boolean usePosixGroups = Boolean.valueOf(groupUsePosix); + String userAttribute = getUserAttribute(options, userName, usePosixGroups); + Set<String> ldapSet = new HashSet<String>(); + + if (userAttribute != null && userAttribute.trim().length() > 0) { + //TODO: spinder 4/21/10 put in error/debug logging messages for badly formatted filter combinations + String filter = ""; + //form assumes examples where groupFilter is like 'objectclass=groupOfNames' and groupMember is 'member' + // to produce ldap filter like (&(objectclass=groupOfNames)(member=cn=Administrator,ou=People,dc=test,dc=com)) + // or like (&(objectclass=groupOfNames)(memberUid=Administrator)) for posixGroups. + filter = String.format("(&(%s)(%s=%s))", groupFilter, groupMember, encodeForFilter(userAttribute)); + + Set<Map<String, String>> matched = buildGroup(options, filter); +// log.trace("Located '" + matched.size() + "' LDAP groups for user '" + userName +// + "' using following ldap filter '" + filter + "'."); + + //iterate to extract just the group names. + for (Map<String, String> match : matched) { + ldapSet.add(match.get("id")); + } + } else { +// log.debug("Group lookup will not be performed due to no UserDN found for user " + userName); + } + + return ldapSet; + } + + private void generateUiLoggingStep4Exception(Exception ex) { + String groupSearchFilter = env + .getProperty(SystemSetting.LDAP_GROUP_FILTER + .getInternalName()); + String msg = "STEP-4:FAIL: There was an error searching with the groupFilter supplied: " + + groupSearchFilter + "'\n"; + msg += ex.getMessage(); + if (enableVerboseDebugging.isSelected()) { + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + } + + private void generateUiLoggingStep4Authz(String filter) { + Set<Map<String, String>> groups = buildGroup(env, filter); + String msg = "STEP-4:TESTING: Using Group Search Filter '" + + filter + "', " + groups.size() + + " ldap group(s) were located.\n"; + if (groups.size() > 0) { + HashMap<String, String>[] ldapLists = new HashMap[groups + .size()]; + groups.toArray(ldapLists); + msg += "STEP-4:PASS: Listing a few of the ldap groups located: \n"; + // iterate over first ten or less to demonstrate retrieve + for (int i = 0; (i < groups.size() && i < 10); i++) { + msg += ldapLists[i] + "\n"; + } + }else{ + msg+="STEP-4:WARN: With current settings, test user is not authorized for any groups. Is this correct?"; + } + log(msg); + } + + private void generateUiLoggingForStep4LdapFilter(String userName, + String filter) { + String msg = "STEP-4:TESTING: about to do ldap search with filter \n'" + + filter + + "'\n to locate groups that test user '"+userName+"' IS authorized to access."; + log(msg); + } + + + // throw the label and fields together, two to a row. + private HashMap<String, JTextField> loadUiFields(JPanel top, + String[] componentKeys) { + HashMap<String, JTextField> mappings = new HashMap<String, JTextField>(); + for (int i = 0; i < componentKeys.length; i++) { + String firstLabelKey = componentKeys[i]; + String secondLabelKey = componentKeys[++i]; + // locate second key + JPanel row = new JPanel(); + row.setLayout(new FlowLayout(FlowLayout.LEFT)); + JLabel label1 = new JLabel(firstLabelKey); + label1.setSize(textBoxWidth, 5); +// JTextField value1 = new JTextField(textBoxWidth); + JTextField value1 = null; + if (firstLabelKey.equalsIgnoreCase("Password:")&&(!showPasswords.isSelected())) { + value1 = new JPasswordField(textBoxWidth); + } else { + value1 = new JTextField(textBoxWidth); + } + JLabel label2 = new JLabel(secondLabelKey); + JTextField value2 = new JTextField(textBoxWidth); + row.add(label1); + row.add(value1); + row.add(Box.createRigidArea(new Dimension(0, 5))); + row.add(label2); + row.add(value2); + mappings.put(firstLabelKey, value1); + mappings.put(secondLabelKey, value2); + top.add(row); + } + + return mappings; + } + + private Properties getProperties(String contentProvider) { + Properties env = new Properties(); + env.setProperty(Context.INITIAL_CONTEXT_FACTORY, + "com.sun.jndi.ldap.LdapCtxFactory"); + env.setProperty(Context.PROVIDER_URL, contentProvider); + if(!enableLdapReferral.isSelected()){ + env.setProperty(Context.REFERRAL, "ignore"); + }else{ + String msg="**---- You have chosen to tell LDAP servers to [FOLLOW] context referrals. Default is [IGNORE] referrals. --**"; + log(msg); + env.setProperty(Context.REFERRAL, "follow"); + } + +// // Setup SSL if requested +// String protocol = ssl.isSelected()? "ssl":""; +// if ((protocol != null) && protocol.equals("ssl")) { +// String ldapSocketFactory = env +// .getProperty("java.naming.ldap.factory.socket"); +// if (ldapSocketFactory == null) { +// env.put("java.naming.ldap.factory.socket", +// UntrustedSSLSocketFactory.class.getName()); +// } +// env.put(Context.SECURITY_PROTOCOL, "ssl"); +// } + + return env; + } + + private String delineate() { + String line = "-"; + for (int i = 0; i < 30; i++) { + line += "-"; + } + return line; + } + + /** Takes care of delineating messages and conditional logging contents passed in. + * @param msg + */ + private void log(String msg) { + String message = "\n" + delineate() + "\n"; + message += msg; + message += "\n" + delineate() + "\n\n"; + //This flag can be used in the unlikely case that the UI hangs during a test operation.: + if(iterativeVerboseLogging.isSelected()){ + System.out.println(message); + } + testResults.setText(testResults.getText() + message); + } + + private SearchControls getSearchControls() { + int scope = SearchControls.SUBTREE_SCOPE; + int timeLimit = 0; + long countLimit = 0; + String[] returnedAttributes = null; + boolean returnObject = false; + boolean deference = false; + SearchControls constraints = new SearchControls(scope, countLimit, + timeLimit, returnedAttributes, returnObject, deference); + return constraints; + } + + /** Translate SystemSettings to familiar Properties instance since we're + * passing not one but multiple values. + * + * @param systemSettings + * @return + */ + private Properties populateProperties(Properties existing) { + Properties properties = new Properties(); + if(existing!=null){ + properties = existing; + } + for (SystemSetting entry : SystemSetting.values()) { + if(entry!=null){ + switch(entry){ + case LDAP_BASED_JAAS_PROVIDER: + properties.put(entry.getInternalName(), ""); + break; + } + } + } + return properties; + } + + /**Build/retrieve the user DN. Not usually a property. + * + * @param options + * @param userName + * @param usePosixGroups boolean indicating whether we search for groups with posixGroup format + * @return + */ + private String getUserAttribute(Properties options, String userName, boolean usePosixGroups) { + Map<String, String> details = findLdapUserDetails(userName); + String userAttribute = null; + if (usePosixGroups) {//return just the username as posixGroup member search uses (&(%s)(memberUid=username)) + userAttribute = userName; + } else {//this is the default where group search uses (&(%s)(uniqueMember={userDn})) + userAttribute = details.get("dn"); + } + + return userAttribute; + } + + /** See LDAPStringUtil.encodeForFilter() for original code/source/author/etc. + * <p>Encode a string so that it can be used in an LDAP search filter.</p> + * + * <p>The following table shows the characters that are encoded and their + * encoded version.</p> + * + * <table> + * <tr><th align="center">Character</th><th>Encoded As</th></tr> + * <tr><td align="center">*</td><td>\2a</td></tr> + * <tr><td align="center">(</td><td>\28</td></tr> + * <tr><td align="center">)</td><td>\29</td></tr> + * <tr><td align="center">\</td><td>\5c</td></tr> + * <tr><td align="center"><code>null</code></td><td>\00</td></tr> + * </table> + * + * <p>In addition to encoding the above characters, any non-ASCII character + * (any character with a hex value greater then <code>0x7f</code>) is also + * encoded and rewritten as a UTF-8 character or sequence of characters in + * hex notation.</p> + * + * @param filterString a string that is to be encoded + * @return the encoded version of <code>filterString</code> suitable for use + * in a LDAP search filter + * @see <a href="http://tools.ietf.org/html/rfc4515">RFC 4515</a> + */ + public static String encodeForFilter(final String filterString) { + if (filterString != null && filterString.length() > 0) { + StringBuilder encString = new StringBuilder(filterString.length()); + for (int i = 0; i < filterString.length(); i++) { + char ch = filterString.charAt(i); + switch (ch) { + case '*': // encode a wildcard * character + encString.append("\\2a"); + break; + case '(': // encode a open parenthesis ( character + encString.append("\\28"); + break; + case ')': // encode a close parenthesis ) character + encString.append("\\29"); + break; + case '\\': // encode a backslash \ character + encString.append("\\5c"); + break; + case '\u0000': // encode a null character + encString.append("\\00"); + break; + default: + if (ch <= 0x7f) { // an ASCII character + encString.append(ch); + } else if (ch >= 0x80) { // encode to UTF-8 + try { + byte[] utf8bytes = String.valueOf(ch).getBytes("UTF8"); + for (byte b : utf8bytes) { + encString.append(String.format("\\%02x", b)); + } + } catch (UnsupportedEncodingException e) { + // ignore + } + } + } + } + return encString.toString(); + } + return filterString; + } +} + +//Mock up the upgraded system properties approach to use SystemSetting +enum SystemSetting { + LDAP_BASED_JAAS_PROVIDER("CAM_JAAS_PROVIDER"), + LDAP_NAMING_PROVIDER_URL("CAM_LDAP_NAMING_PROVIDER_URL"), + USE_SSL_FOR_LDAP("CAM_LDAP_PROTOCOL"), + LDAP_LOGIN_PROPERTY("CAM_LDAP_LOGIN_PROPERTY"), + LDAP_FILTER("CAM_LDAP_FILTER"), + LDAP_GROUP_FILTER("CAM_LDAP_GROUP_FILTER"), + LDAP_GROUP_MEMBER("CAM_LDAP_GROUP_MEMBER"), + LDAP_GROUP_QUERY_PAGE_SIZE("CAM_LDAP_GROUP_QUERY_PAGE_SIZE"), + LDAP_BASE_DN("CAM_LDAP_BASE_DN"), + LDAP_BIND_DN("CAM_LDAP_BIND_DN"), + LDAP_BIND_PW("CAM_LDAP_BIND_PW"), + LDAP_NAMING_FACTORY("CAM_LDAP_NAMING_FACTORY_INITIAL"), + LDAP_GROUP_USE_POSIX("CAM_LDAP_GROUP_USE_POSIX"), + ; + + private String internalName; + + private SystemSetting(String name) { + this.internalName = name; + } + + public String getInternalName() { + return internalName; + } + + public static SystemSetting getByInternalName(String internalName) { + for (SystemSetting p : SystemSetting.values()) { + if (p.internalName.equals(internalName)) { + return p; + } + } + return null; + } +} + + commit 251234a787556629f0a9efcc82c1206079680e4e Author: Simeon Pinder <spinder(a)redhat.com> Date: Tue Jul 30 17:11:49 2013 -0400 Move TestLdapSettings to it's own module. diff --git a/modules/helpers/ldap-tool/pom.xml b/modules/helpers/ldap-tool/pom.xml new file mode 100644 index 0000000..28f8678 --- /dev/null +++ b/modules/helpers/ldap-tool/pom.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.rhq</groupId> + <artifactId>rhq-parent</artifactId> + <version>4.9.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> + </parent> + + <groupId>org.rhq.helpers</groupId> + <artifactId>ldap-tool</artifactId> + <packaging>jar</packaging> + <version>4.9.0-SNAPSHOT</version> + + <properties> + <executable.name>TestLdapSettings</executable.name> + <tool.version>1.0.1</tool.version> + </properties> + + <name>RHQ ldap test tool</name> + <description>Executable jar to exercise LDAP settings used by RHQ with external LDAP server.</description> + + <build> + + <plugins> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <packageName>com.test</packageName> + <mainClass>com.test.TestLdapSettings</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <id>tool-finalize</id> + <phase>verify</phase> + <configuration> + <target> + <copy file="${project.build.directory}/${project.build.finalName}.jar" + tofile="${project.build.directory}/${executable.name}.jar"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-release-plugin</artifactId> + <version>2.1</version> + </plugin> + + </plugins> + + </build> + +</project> + + diff --git a/modules/helpers/ldap-tool/src/main/java/com/test/TestLdapSettings.java b/modules/helpers/ldap-tool/src/main/java/com/test/TestLdapSettings.java new file mode 100644 index 0000000..75ff277 --- /dev/null +++ b/modules/helpers/ldap-tool/src/main/java/com/test/TestLdapSettings.java @@ -0,0 +1,1285 @@ +package com.test; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import javax.naming.Context; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; +import javax.naming.directory.Attributes; +import javax.naming.directory.InvalidSearchFilterException; +import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; +import javax.naming.ldap.Control; +import javax.naming.ldap.InitialLdapContext; +import javax.naming.ldap.PagedResultsControl; +import javax.naming.ldap.PagedResultsResponseControl; +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JPasswordField; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.LineBorder; +import javax.swing.border.TitledBorder; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +//import org.rhq.enterprise.server.util.security.UntrustedSSLSocketFactory; + +/* Is a development test tool that allows the user to simulate the RHQ server side + * LDAP calls during auth/authz operations. + * + * The specific LDAP logic below needs to mirror the latest RHQ code and allow the user + * to test our their configuration without requring a specific RHQ/JON build as a dependency. + * + * NOTE: To avoid a runtime dependency on specific versions of RHQ or JON, the small implementation + * methods were copied into this class with minimatl changes for logging and ui messaging. The + * definitive implementation for each 'copied' method can be found in LDAPGroupManagerBean. + * + * @author Simeon Pinder + */ +public class TestLdapSettings extends JFrame { + //shared fields + private JTextArea testResults; + private JCheckBox showPasswords; + private JCheckBox ssl; + private JLabel groupPageSizeName; + private JTextField groupMemberQueryValue; + private JTextField testUserNameValue; + private JTextField testUserPasswordValue; + private HashMap<String, JTextField> fieldMappings; + private String[] keys; + private JCheckBox enableLdapReferral; + private JCheckBox enableVerboseDebugging; + private JCheckBox enableVerboseGroupParsing; + private JCheckBox iterativeVerboseLogging; + private JCheckBox enablePosixGroups; + private JCheckBox enable32xFeatures; + private String advdb = "**Verbose:debug ----"; + private static final String BASEDN_DELIMITER = ";"; + + private static final long serialVersionUID = 1L; + int textBoxWidth = 20; + private static JPanel top = null; + private static JPanel testUserRegion = null; + private static Properties env=null; + + public static void main(String args[]) { + new TestLdapSettings(); + } + //After enabling support for Query parsing, we need to warn users of the effects. + final String warnMessage = "<html>***WARNING: Depending upon<br>" + + "i)how the ldap server is configured <br>" + + "ii)client query paging settings <br>" + + " enabling <b>'more detailed logging'</b>,<br>" + + " <b>'more group parsing'</b> AND/OR <b>'also log to console'</b> may cause the console to hang/freeze <br>" + + " as the LDAP tool continues to parse large query results. If that occurs it is <br>" + + " suggested that you kill tool and re-run with 'also log to console' so that the console logs<br>" + + " will show which dataset is causing the delay and then you should modify your search|group|member<br>" + + " filters accordingly to <b>return smaller results</b> and/or <b>consume larger payloads</b>.<br>" + + "***WARNING</html>"; + + // Configure window properties + private TestLdapSettings() { + + setTitle("Check LDAP Settings: Simulates LDAP checks/queries of RHQ LDAP integration"); + getContentPane().setLayout(new BorderLayout()); + // top panel definition + top = new JPanel(); + top.setLayout(new BoxLayout(top, BoxLayout.Y_AXIS)); + top.setBorder(LineBorder.createGrayLineBorder()); + //define checkbox here as it's checked when generating UI. + showPasswords = new JCheckBox("show passwords:"); + showPasswords.setSelected(false); + + keys = new String[] { "URL:", "Search Filter:", + "Search Base:","Login Property", + "Username:", "Group Search Filter:", + "Password:", "Group Member Filter:", + }; + fieldMappings = loadUiFields(top, keys); + + //add the two checkboxes for additiona debugging options + enableLdapReferral= new JCheckBox("[follow] ldap referrals"); + enableLdapReferral.setSelected(false); + enableVerboseDebugging= new JCheckBox("more verbose logging"); + enableVerboseDebugging.setSelected(false); + enableVerboseDebugging.setToolTipText(warnMessage); + enableVerboseGroupParsing= new JCheckBox("more detailed group parsing"); + enableVerboseGroupParsing.setSelected(false); + enableVerboseGroupParsing.setToolTipText("*Take care when using this mode with a large number of groups* Every group discovered is parsed/listed."); + iterativeVerboseLogging= new JCheckBox("also log to console"); + iterativeVerboseLogging.setSelected(false); + iterativeVerboseLogging.setToolTipText("This mode is useful when the test tool is having difficulty returning results from large queries."); + iterativeVerboseLogging.setToolTipText(warnMessage); + enablePosixGroups= new JCheckBox("is Posix Group"); + enablePosixGroups.setSelected(false); + enablePosixGroups.setEnabled(false); + + //put into 3.2.x functionality row + JPanel jon32xRegion = new JPanel(); + jon32xRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); + LineBorder jon32xLineBorder = new LineBorder(Color.BLACK, 2); + TitledBorder jon32xBorder = new TitledBorder(jon32xLineBorder, "JON 3.2.x/RHQ 4.8.x specific features:"); + jon32xRegion.setBorder(jon32xBorder); + enable32xFeatures= new JCheckBox("enable JON 3.2.x/RHQ 4.8.x features"); + enable32xFeatures.setToolTipText("This enables features not available before RHQ 4.8.x/JON 3.2.x."); + enable32xFeatures.setSelected(false); + enable32xFeatures.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + if(enable32xFeatures.isSelected()){ + groupPageSizeName.setEnabled(true); + groupMemberQueryValue.setEnabled(true); + groupMemberQueryValue.setEditable(true); + groupMemberQueryValue.setText("1000"); + enablePosixGroups.setEnabled(true); + }else{ + groupMemberQueryValue.setText(""); + groupPageSizeName.setEnabled(false); + groupMemberQueryValue.setEnabled(false); + groupMemberQueryValue.setEditable(false); + enablePosixGroups.setEnabled(false); + enablePosixGroups.setSelected(false); + } + } + }); + + jon32xRegion.add(enable32xFeatures); + groupPageSizeName = new JLabel("Group Query Page Size:"); + groupPageSizeName.setEnabled(false); + groupMemberQueryValue = new JTextField(10); + groupMemberQueryValue.setText("1000"); + groupMemberQueryValue.setEditable(false); + jon32xRegion.add(groupPageSizeName); + jon32xRegion.add(groupMemberQueryValue); + jon32xRegion.add(enablePosixGroups); + top.add(jon32xRegion); + + //put into row display + JPanel advancedDebugRegion = new JPanel(); + advancedDebugRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); + LineBorder advancedBorder = new LineBorder(Color.BLACK, 2); + TitledBorder debugBorder = new TitledBorder(advancedBorder, "Debug: **Warning --<hover HERE>**"); + advancedDebugRegion.setBorder(debugBorder); + advancedDebugRegion.add(enableLdapReferral); + advancedDebugRegion.add(enableVerboseDebugging); + advancedDebugRegion.add(enableVerboseGroupParsing); + advancedDebugRegion.add(iterativeVerboseLogging); + advancedDebugRegion.setToolTipText(warnMessage); + top.add(advancedDebugRegion); + + JPanel securityPanel = new JPanel(); + securityPanel.setLayout(new FlowLayout(FlowLayout.LEFT)); + showPasswords.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + //store off existing value + String existingValue = ""; + String existingTestUserPass = ""; + JTextField current = fieldMappings.get("Password:"); + if(current instanceof JPasswordField){ + JPasswordField pass = ((JPasswordField)current); + if(pass!=null){ + char[] charArray = pass.getPassword(); + if(charArray.length>0){ + existingValue = new String(charArray); + } + } + }else{ + existingValue = current.getText(); + } + //save off test user password as well + if(testUserPasswordValue instanceof JPasswordField){ + JPasswordField pass = ((JPasswordField)testUserPasswordValue); + if(pass!=null){ + char[] charArray = pass.getPassword(); + if(charArray.length>0){ + existingTestUserPass = new String(charArray); + } + } + }else{ + existingTestUserPass=testUserPasswordValue.getText(); + } + + JTextField updatedContainer = null; + if(showPasswords.isSelected()){ + updatedContainer = new JTextField(textBoxWidth); + updatedContainer.setText(existingValue); + testUserPasswordValue = new JTextField(textBoxWidth); + testUserPasswordValue.setText(existingTestUserPass); + }else{ + updatedContainer = new JPasswordField(textBoxWidth); + updatedContainer.setText(existingValue); + testUserPasswordValue = new JPasswordField(textBoxWidth); + testUserPasswordValue.setText(existingTestUserPass); + } + //locate the JPanel and rebuild it Should be at index 3 + JPanel passwordRow = (JPanel) top.getComponent(3); +// JTextField jf = (JTextField) passwordRow.getComponent(1); + //store off existing components + Component[] existing = new Component[passwordRow.getComponentCount()]; + for(int i=0; i<passwordRow.getComponentCount();i++){ + existing[i] = passwordRow.getComponent(i); + } + passwordRow.removeAll(); + for(int j=0;j<existing.length;j++){ + if(j==1){//insert new JTextField instead + passwordRow.add(updatedContainer); + }else{ + passwordRow.add(existing[j]); + } + } + //reload testUserRegion + //store off existing components + Component[] existingTest = new Component[testUserRegion.getComponentCount()]; + for(int i=0; i<testUserRegion.getComponentCount();i++){ + existingTest[i] = testUserRegion.getComponent(i); + } + testUserRegion.removeAll(); + for(int j=0;j<existingTest.length;j++){ + if(j==3){//insert new JTextField instead + testUserRegion.add(testUserPasswordValue); + }else{ + testUserRegion.add(existingTest[j]); + } + } + + top.revalidate(); + top.repaint(); + } + }); + } + }); + securityPanel.add(showPasswords); + ssl = new JCheckBox("SSL:"); + ssl.setEnabled(false); + securityPanel.add(ssl); + top.add(securityPanel); + + // test user auth region + testUserRegion = new JPanel(); + testUserRegion.setLayout(new FlowLayout(FlowLayout.LEFT)); + LineBorder border = new LineBorder(Color.BLUE, 2); + TitledBorder tBorder = new TitledBorder(border, "Authentication/Authorization Check Credentials: (insert valid ldap user assigned to group)"); + testUserRegion.setBorder(tBorder); + JLabel testUserName = new JLabel("Test UserName:"); + testUserNameValue = new JTextField(textBoxWidth); + JLabel testUserPassword = new JLabel("Test Password:"); +// testUserPasswordValue = new JTextField(textBoxWidth); + testUserPasswordValue = new JPasswordField(textBoxWidth); + testUserRegion.add(testUserName); + testUserRegion.add(testUserNameValue); + testUserRegion.add(testUserPassword); + testUserRegion.add(testUserPasswordValue); + top.add(testUserRegion); + + // center + JPanel center = new JPanel(); + center.setLayout(new BoxLayout(center, BoxLayout.X_AXIS)); + // build center panel + buildCenterPanel(center); + + // final component layout + getContentPane().add(top, BorderLayout.NORTH); + getContentPane().add(center, BorderLayout.CENTER); + this.setSize(720, 700); + addWindowListener(new WindowAdapter() { + public void windowClosing(WindowEvent e) { + System.exit(0); + } + }); + setVisible(true); + } + + // define the center display panel. + private void buildCenterPanel(JPanel center) { + // First element is Test Button + JButton test = new JButton("Test Settings"); + center.add(test); + // second is large text box that display ldap queries + testResults = new JTextArea("(click button to test settings values: simulates 4 separate checks showing ldap filters used)", + 40, 40); + JScrollPane jsp = new JScrollPane(testResults); + center.add(jsp); + test.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + testResults.setText("");//clear out empty msg + //trim spaces from all fields + String ldapServer = fieldMappings.get(keys[0]).getText().trim(); + String searchFilter = fieldMappings.get(keys[1]).getText().trim(); + String searchBase = fieldMappings.get(keys[2]).getText().trim(); + String loginProperty = fieldMappings.get(keys[3]).getText().trim(); + String bindUserName = fieldMappings.get(keys[4]).getText().trim(); + String groupSearchFilter = fieldMappings.get(keys[5]).getText().trim(); + String bindPassword = fieldMappings.get(keys[6]).getText().trim(); + String groupMemberFilter = fieldMappings.get(keys[7]).getText().trim(); + String groupMemberQuerySize = groupMemberQueryValue.getText().trim(); + String testUserName = testUserNameValue.getText().trim(); + String testUserPassword = testUserPasswordValue.getText().trim(); + // validate initial required elements + String msg = null; + boolean proceed = true; + //valid required details set. + if (ldapServer.isEmpty() || bindUserName.isEmpty() + || bindPassword.isEmpty() || searchBase.isEmpty()) { + msg ="STEP-1:FAIL: "+ keys[0] + ", " + keys[2] + ", " + keys[4] + ", " + + keys[6] + " cannot be empty to proceed."; + log(msg); + proceed = false; + } + env = null; + InitialLdapContext ctx = null; + if (proceed) {// attempt initial ldap bind from RHQ server + msg = "STEP-1:TESTING: Attempting to bind to server:" + ldapServer + + "\n with user '" + bindUserName + + "' and password entered."; + log(msg); + env = getProperties(ldapServer); + env.setProperty(Context.SECURITY_PRINCIPAL, bindUserName); + env.setProperty(Context.SECURITY_CREDENTIALS, bindPassword); + env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + //put the rest of the LDAP properties into the Properties instance for use later. + //there still needs to be separate variables since some are for UI validation. + env.setProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), groupSearchFilter); + env.setProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), groupMemberFilter); + env.setProperty(SystemSetting.LDAP_BASE_DN.getInternalName(), searchBase); + env.setProperty(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName(), loginProperty); + env.setProperty(SystemSetting.LDAP_BIND_DN.getInternalName(), bindUserName); + env.setProperty(SystemSetting.LDAP_BIND_PW.getInternalName(), bindPassword); + env.setProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.getInternalName(), groupMemberQuerySize); + + for(Object key :env.keySet()){ + System.out.println(key+"="+env.getProperty(key+"")); + } + + try { + ctx = new InitialLdapContext(env, null); + msg = "STEP-1:PASS: LDAP bind credentials are correct. Successfully connected to '" + + ldapServer + + "'.\n This means the LDAP Bind credentials for the RHQ Server authentication/authorization requests to ldap server " + + "are correct."; + if(enableVerboseDebugging.isSelected()){ + msg+="\n"+advdb+" LDAP simple authentication bind successful."; + } + log(msg); + proceed = true; + } catch (Exception ex) { + msg = "STEP-1:FAIL: Unable to connect to the LDAP server with credentials specified.\n"; + msg+="Exception:"+ex.getMessage(); + if(enableVerboseDebugging.isSelected()){ + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + proceed = false; + } + } + if (proceed) {// retrieve test credentials to test run auth + // load search controls + SearchControls searchControls = getSearchControls(); + // validating searchFilter and test user/pass creds + proceed = true; + if (testUserName.isEmpty() || (testUserPassword.isEmpty())) { + msg = "STEP-2:FAIL: Test Username/Password fields cannot be empty for this step."; + log(msg); + proceed = false; + } + // testing a valid user involves a filtered ldap search + // using the loginProperty, and optionally searchFilter + String userDN = ""; + if (proceed) { + // default loginProperty to cn if it's not set + if (loginProperty.isEmpty()) { + loginProperty = "cn"; + if(enableVerboseDebugging.isSelected()){ + String mesg = "As you have not specified a login property, defaulting to 'cn'"; + log(advdb+" "+msg); + } + } + String filter; + if (!searchFilter.isEmpty()) { + filter = "(&(" + loginProperty + "=" + testUserName + + ")" + "(" + searchFilter + "))"; + } else { + filter = "(" + loginProperty + "=" + testUserName + + ")"; + } + if(enableVerboseDebugging.isSelected()){ + log(advdb+" The searchfilter is optionally appended to login property for additional shared attribute across users."); + } + msg = "STEP-2:TESTING: To validate the test user the following LDAP filtered component will be used to find matching users:\n"; + msg += filter; + log(msg); + // test out the search on the target ldap server + try { + String[] baseDNs = searchBase.split(";"); + for (int x = 0; x < baseDNs.length; x++) { + NamingEnumeration answer = ctx.search( + baseDNs[x], filter, searchControls); + if(enableVerboseDebugging.isSelected()){ + log(advdb+" this search was excuted against DN component '"+baseDNs[x]+"'."); + } + // boolean ldapApiNpeFound = false; + if (!answer.hasMoreElements()) { + msg="STEP-2:WARN Unable to locate a matching users for the filter'"+filter+ + "'. Please check your loginProperty. Usually 'cn' or 'uid'"; + log(msg); + continue; + } + // Going with the first match + SearchResult si = (SearchResult) answer.next(); + + // Construct the UserDN + userDN = si.getName() + "," + baseDNs[x]; + msg = "STEP-2:PASS: The test user '" + + testUserName + + "' was succesfully located, and the following userDN will be used in authorization check:\n"; + msg += userDN; + log(msg); + + ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, userDN); + ctx.addToEnvironment(Context.SECURITY_CREDENTIALS,testUserPassword); + ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION,"simple"); + + // if successful then verified that user and pw + // are valid ldap credentials + ctx.reconnect(null); + msg = "STEP-2:PASS: The user '" + + testUserName + + "' was succesfully authenticated using userDN '" + + userDN + "' and password provided.\n" + +"*Note: the loginProperty must match the loginProperty listed in dn: for the user. It is the DN that RHQ will lookup and use."; + log(msg); + } + } catch (Exception ex) { + msg = "STEP-2:FAIL: There was an error while searching for or authenticating the user '" + + testUserName + "'\n"; + msg += ex.getMessage(); + if(enableVerboseDebugging.isSelected()){ + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + proceed=false; + } + } + // with authentication completed, now check authorization. + // validate filter components to list all available groups + proceed = false; + if (!groupSearchFilter.isEmpty()) { + Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); + String filter = null; + + if (groupSearchFilter.startsWith("(") && groupSearchFilter.endsWith(")")){ + filter = groupSearchFilter; // RFC 2254 does not allow for ((expression)) + }else{ + filter = String + .format("(%s)", groupSearchFilter); + } + msg = "STEP-3:TESTING: This ldap filter " + + filter + + " will be used to locate ALL available LDAP groups"; + log(msg); + + Properties systemConfig = populateProperties(env); + + ret = buildGroup(systemConfig, filter); + msg = "STEP-3:TESTING: Using Group Search Filter '" + + filter + "', " + ret.size() + + " ldap group(s) were located.\n"; + if (ret.size() > 0) { + HashMap<String, String>[] ldapLists = new HashMap[ret + .size()]; + ret.toArray(ldapLists); + // in this mode go beyond the first ten results. + if (enableVerboseGroupParsing.isSelected()) { + msg += "STEP-3:PASS: Listing 'all' of the ldap groups located: \n"; + for (int i = 0; i < ret.size(); i++) { + msg += ldapLists[i] + "\n"; + } + } else {// otherwise only show first 10[subset of + // available groups] + msg += "STEP-3:PASS: Listing a few(<=10) of the ldap groups located: \n"; + for (int i = 0; (i < ret.size() && i < 10); i++) { + msg += ldapLists[i] + "\n"; + } + } + proceed = true;// then can proceed to next step. + } + log(msg); + } else { + msg = "STEP-3:FAIL: Group Search Filter: cannot be empty to proceed."; + log(msg); + proceed=false; + } + // retrieve lists of authorized groups available for the + if (proceed) { + // check groupMember + if (!groupMemberFilter.isEmpty()) { +// Map<String, String> userDetails = new HashMap<String, String>(); +// userDetails = findLdapUserDetails(userDN); + Set<String> userDetails = findAvailableGroupsFor(testUserName); + + if(!userDetails.isEmpty()){ + proceed=true; + } + } else { + msg = "STEP-4:FAIL: Group Member Filter must be non-empty to proceed with simulating authorization check for test user."; + log(msg); + } + } + if(proceed){ + msg="COMPLETED:PASS: The current settings, for successful steps, should be correct to enter into your RHQ server."; + msg+="\n\n\n\n When you encounter failures, warnings or other unexpected results you should use an external "; + msg+="LDAP search utility to check that the generated filters return the expected LDAP results."; + log(msg); + } + } + } + }); + } + + private String appendStacktraceToMsg(String msg, Exception ex) { + String moreVerbose = ""; + moreVerbose+=advdb+" Exception type:"+ex.getClass()+"\n"; + moreVerbose+=advdb+" Exception stack trace reference:"+ex.getStackTrace()+"\n"; + if(ex.getStackTrace()!=null){ + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + ex.printStackTrace(pw); + moreVerbose+=advdb+" stack trace reference:"+sw.toString(); + } + msg+="\n"+moreVerbose; + return msg; + } + + private boolean containsIllegalLdap(String currentValue) { + boolean invalidData = false; + if((currentValue!=null)&&(!currentValue.trim().isEmpty())){ + //TODO: spinder 3/17/11: need to figure out regex to filter/detect bad data in returned ldap. Giving up for now. +// String regex = "(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)[/,+\"><;=#]|(?<=(?:[^\\]|^)(\\\\)+|[^\\]|^)\$?!\\|[/,+\"><;=#]| $|(?<=^\$ )|^"; +// regex = "(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)[/,+\\\"><;=#]|(?<=(?:[^\\\\]|^)(\\\\\\\\)+|[^\\\\]|^)\\\$?!\\\\|[/,+\\\"><;=#]| $|(?<=^\\\$ )|^"; +// System.out.println("++++++++ CURR VAL:"+currentValue+":INV-CHeck:"+currentValue.matches(",+\"\\<;\n=/")+":NEWCHECK:"+(currentValue.matches(regex))); +// if(currentValue.matches(",+\"\\<;\n=/")){ +// invalidData=true; +// } +// String badList = ",+\"\\<;\n="; + String badList = "+\"\\<;\n"; + for(char car :currentValue.toCharArray()){ + for(char c :badList.toCharArray()){ + if(car == c){ + invalidData=true; + } + } + } + + } + return invalidData; + } + /** + * @throws NamingException + * @see org.jboss.security.auth.spi.UsernamePasswordLoginModule#validatePassword(java.lang.String,java.lang.String) + */ + protected Set<Map<String, String>> buildGroup(Properties systemConfig, String filter) { + Set<Map<String, String>> groupDetailsMap = new HashSet<Map<String, String>>(); + // Load our LDAP specific properties + // Load the BaseDN + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + + // Load the LoginProperty + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); + if (loginProperty == null) { + // Use the default + loginProperty = "cn"; + } + // Load any information we may need to bind + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); + if (bindDN != null) { + systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); + systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); + systemConfig.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + } + try { + InitialLdapContext ctx = new InitialLdapContext(systemConfig, null); + SearchControls searchControls = getSearchControls(); + /*String filter = "(&(objectclass=groupOfUniqueNames)(uniqueMember=uid=" + userName + + ",ou=People, dc=rhndev, dc=redhat, dc=com))";*/ + + //modify the search control to only include the attributes we will use + String[] attributes = { "cn", "description" }; + searchControls.setReturningAttributes(attributes); + + //BZ:964250: add rfc 2696 + //default to 1000 results. System setting page size from UI should be non-negative integer > 0. + //additionally as system settings are modifiable via CLI which may not have param checking enabled do some + //more checking. + int defaultPageSize = 1000; + // only if they're enabled in the UI. + if (enable32xFeatures.isSelected()) { + String groupPageSize = systemConfig.getProperty( + SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE + .getInternalName(), "" + defaultPageSize); + if ((groupPageSize != null) + && (!groupPageSize.trim().isEmpty())) { + int passedInPageSize = -1; + try { + passedInPageSize = Integer + .valueOf(groupPageSize.trim()); + if (passedInPageSize > 0) { + defaultPageSize = passedInPageSize; + if(enableVerboseDebugging.isSelected()){ + log(advdb + + " LDAP Group Query Page Sizing of '"+defaultPageSize+"' is being requested from server."); + } + } + } catch (NumberFormatException nfe) { + // log issue and do nothing. Go with the default. + String msg = "LDAP Group Page Size passed in '" + + groupPageSize + + "' in is invalid. Defaulting to 1000 results." + + nfe.getMessage(); + log(msg); + } + } + ctx.setRequestControls(new Control[] { new PagedResultsControl( + defaultPageSize, Control.CRITICAL) }); + } + // Loop through each configured base DN. It may be useful + // in the future to allow for a filter to be configured for + // each BaseDN, but for now the filter will apply to all. + String[] baseDNs = baseDN.split(BASEDN_DELIMITER); + + for (int x = 0; x < baseDNs.length; x++) { + if (enableVerboseDebugging.isSelected()) { + log(advdb + + " this search was excuted against DN component '" + + baseDNs[x] + "'."); + } + executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); + + // continually parsing pages of results until we're done. + // only if they're enabled in the UI. + if (enable32xFeatures.isSelected()) { + // handle paged results if they're being used here + byte[] cookie = null; + Control[] controls = ctx.getResponseControls(); + if (controls != null) { + for (Control control : controls) { + if (control instanceof PagedResultsResponseControl) { + PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; + cookie = pagedResult.getCookie(); + } + } + } + + while (cookie != null) { + String msg = "RFC 2696 is supported by the server and we are paging through the results. "+ + groupDetailsMap.size()+" results returned so far."; + if(enableVerboseGroupParsing.isSelected()){ + log(advdb + + msg); + } + // ensure the next requests contains the session/cookie + // details + ctx.setRequestControls(new Control[] { new PagedResultsControl( + defaultPageSize, cookie, Control.CRITICAL) }); + executeGroupSearch(filter, groupDetailsMap, ctx, + searchControls, baseDNs, x); + // empty out cookie + cookie = null; + // test for further iterations + controls = ctx.getResponseControls(); + if (controls != null) { + for (Control control : controls) { + if (control instanceof PagedResultsResponseControl) { + PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; + cookie = pagedResult.getCookie(); + } + } + } + } + } + }//end of for loop + } catch (NamingException e) { + if (e instanceof InvalidSearchFilterException) { + InvalidSearchFilterException fException = (InvalidSearchFilterException) e; + String message = "The ldap group filter defined is invalid "; + log(message); + } + //TODO: check for ldap connection/unavailable/etc. exceptions. + else { + String mesg = "LDAP communication error: " + e.getMessage(); + log(mesg); + } + } catch (IOException iex) { + String msg = "Unexpected LDAP communciation error:" + iex.getMessage(); + log(msg); + } + + return groupDetailsMap; + } + + /** Executes the LDAP group query using the filters, context and search controls, etc. parameters passed in. + * The matching groups located during processing this pages of results are added as new entries to the + * groupDetailsMap passed in. + * + * @param filter + * @param groupDetailsMap + * @param ctx + * @param searchControls + * @param baseDNs + * @param x + * @throws NamingException + */ + private void executeGroupSearch(String filter, Set<Map<String, String>> groupDetailsMap, InitialLdapContext ctx, + SearchControls searchControls, String[] baseDNs, int x) throws NamingException { + //execute search based on controls and context passed in. + NamingEnumeration<SearchResult> answer = ctx.search(baseDNs[x], filter, searchControls); + boolean ldapApiEnumerationBugEncountered = false; + while ((!ldapApiEnumerationBugEncountered) && answer.hasMoreElements()) {//BZ:582471- ldap api bug change + // We use the first match + SearchResult si = null; + try { + si = answer.next(); + } catch (NullPointerException npe) { + if (enableVerboseDebugging.isSelected()) { + log(advdb + + " NullPtr exception detected. If known LDAP api enum npe ignore: " + + npe.getMessage() + "."); + } + ldapApiEnumerationBugEncountered = true; + break; + } + + if (enableVerboseDebugging.isSelected() + || enableVerboseGroupParsing.isSelected()) { + Attributes attributeContainer = si.getAttributes(); + NamingEnumeration<? extends Attribute> attributes = attributeContainer + .getAll(); + String attributesReturned = " "; + while (attributes.hasMore()) { + attributesReturned += attributes.next().getID() + ","; + } + String dbugMesg = "\n" + + advdb + + " Group search LDAP (" + + attributeContainer.size() + + ") attributes located for group '" + + si.getName() + + "' are [" + + attributesReturned.substring(0, + attributesReturned.length() - 1) + "]."; + // directly update here to shorten messages for lots of groups + testResults.setText(testResults.getText() + dbugMesg); + //This flag can be used in the unlikely case that the UI hangs during a test operation.: + if(iterativeVerboseLogging.isSelected()){ + System.out.println(dbugMesg); + } + + // additionally parse attribute ids and values for illegal ldap + // characters + if (enableVerboseGroupParsing.isSelected()) { + attributes = attributeContainer.getAll(); + String currentAttributeId = ""; + String currentValue = ""; + // spinder: 3/17/11: should we bail on first bad data or + // display them all? + while (attributes.hasMore()) { + boolean badData = false; + Attribute att = attributes.next(); + currentAttributeId = att.getID(); + if (containsIllegalLdap(currentAttributeId)) { + log(advdb + + " LDAP Group: bad atrribute data detected for group '" + + si.getName() + "' for attribute '" + + currentAttributeId + "'."); + badData = true; + } + if (att.getAll() != null) { + NamingEnumeration<?> enumer = att.getAll(); + while (enumer.hasMore()) { + currentValue = enumer.next() + ""; + if (containsIllegalLdap(currentValue)) { + log(advdb + + " LDAP Group: bad data detected for group '" + + si.getName() + + "' with attribute '" + + currentAttributeId + + "' and value:" + currentValue); + badData = true; + } + } + } + if (badData) { + log(advdb + + "** LDAP Group: Some bad LDAP data detected for group '" + + si.getName() + "'."); + } + } + } + } + + Map<String, String> entry = new HashMap<String, String>(); + // String name = (String) si.getAttributes().get("cn").get(); + Attribute commonNameAttr = si.getAttributes().get("cn"); + if (commonNameAttr != null) { + String name = (String) commonNameAttr.get(); + name = name.trim(); + Attribute desc = si.getAttributes().get("description"); + String description = desc != null ? (String) desc.get() : ""; + description = description.trim(); + entry.put("id", name); + entry.put("name", name); + entry.put("description", description); + groupDetailsMap.add(entry); + } else {// unable to retrieve details for specific group. + log(advdb + + " There was an error retrieving 'cn' attribute for group '" + + si.getName() + + "'. Not adding to returned list of groups. "); + } + } + } + + public Map<String, String> findLdapUserDetails(String userName) { + // Load our LDAP specific properties + Properties systemConfig = env; + HashMap<String, String> userDetails = new HashMap<String, String>(); + + // Load the BaseDN + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + + // Load the LoginProperty + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); + if (loginProperty == null) { + // Use the default + loginProperty = "cn"; + } + // Load any information we may need to bind + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); + + // Load any search filter + String groupSearchFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); + String groupMemberFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_MEMBER.getInternalName()); + String testUserDN=userName; + String ldapServer = (String) systemConfig.get(Context.PROVIDER_URL); + + Properties env = getProperties(ldapServer); + + if (bindDN != null) { + env.setProperty(Context.SECURITY_PRINCIPAL, bindDN); + env.setProperty(Context.SECURITY_CREDENTIALS, bindPW); + env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + } + + try { + InitialLdapContext ctx = new InitialLdapContext(env, null); + SearchControls searchControls = getSearchControls(); + + String filter = String.format("(&(%s)(%s=%s))", + groupSearchFilter, groupMemberFilter, + testUserDN); + + generateUiLoggingForStep4LdapFilter(userName, filter); + + // Loop through each configured base DN. It may be useful + // in the future to allow for a filter to be configured for + // each BaseDN, but for now the filter will apply to all. + String[] baseDNs = baseDN.split(BASEDN_DELIMITER); + for (int x = 0; x < baseDNs.length; x++) { + NamingEnumeration<SearchResult> answer = ctx.search(baseDNs[x], filter, searchControls); + if (!answer.hasMoreElements()) { //BZ:582471- ldap api bug change + // Nothing found for this DN, move to the next one if we have one. + continue; + } + + // We use the first match + SearchResult si = answer.next(); + //generate the DN + String userDN = null; + try { + userDN = si.getNameInNamespace(); + } catch (UnsupportedOperationException use) { + userDN = si.getName(); + if (userDN.startsWith("\"")) { + userDN = userDN.substring(1, userDN.length()); + } + if (userDN.endsWith("\"")) { + userDN = userDN.substring(0, userDN.length() - 1); + } + userDN = userDN + "," + baseDNs[x]; + } + userDetails.put("dn", userDN); + + // Construct the UserDN + NamingEnumeration<String> keys = si.getAttributes().getIDs(); + while (keys.hasMore()) { + String key = keys.next(); + Attribute value = si.getAttributes().get(key); + if ((value != null) && (value.get() != null)) { + userDetails.put(key, value.get().toString()); + } + } +// return userDetails; + }//end of for loop + generateUiLoggingStep4Authz(filter); + return userDetails; + } catch (Exception ex) { + generateUiLoggingStep4Exception(ex); + } + return userDetails; + } + + public Set<String> findAvailableGroupsFor(String userName) { + // Load our LDAP specific properties + Properties options = env; + String groupFilter = options.getProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), ""); + String groupMember = options.getProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), ""); + String groupUsePosix = options.getProperty(SystemSetting.LDAP_GROUP_USE_POSIX.getInternalName(), "false"); + if (groupUsePosix == null) { + groupUsePosix = Boolean.toString(false);//default to false + } + boolean usePosixGroups = Boolean.valueOf(groupUsePosix); + String userAttribute = getUserAttribute(options, userName, usePosixGroups); + Set<String> ldapSet = new HashSet<String>(); + + if (userAttribute != null && userAttribute.trim().length() > 0) { + //TODO: spinder 4/21/10 put in error/debug logging messages for badly formatted filter combinations + String filter = ""; + //form assumes examples where groupFilter is like 'objectclass=groupOfNames' and groupMember is 'member' + // to produce ldap filter like (&(objectclass=groupOfNames)(member=cn=Administrator,ou=People,dc=test,dc=com)) + // or like (&(objectclass=groupOfNames)(memberUid=Administrator)) for posixGroups. + filter = String.format("(&(%s)(%s=%s))", groupFilter, groupMember, encodeForFilter(userAttribute)); + + Set<Map<String, String>> matched = buildGroup(options, filter); +// log.trace("Located '" + matched.size() + "' LDAP groups for user '" + userName +// + "' using following ldap filter '" + filter + "'."); + + //iterate to extract just the group names. + for (Map<String, String> match : matched) { + ldapSet.add(match.get("id")); + } + } else { +// log.debug("Group lookup will not be performed due to no UserDN found for user " + userName); + } + + return ldapSet; + } + + private void generateUiLoggingStep4Exception(Exception ex) { + String groupSearchFilter = env + .getProperty(SystemSetting.LDAP_GROUP_FILTER + .getInternalName()); + String msg = "STEP-4:FAIL: There was an error searching with the groupFilter supplied: " + + groupSearchFilter + "'\n"; + msg += ex.getMessage(); + if (enableVerboseDebugging.isSelected()) { + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + } + + private void generateUiLoggingStep4Authz(String filter) { + Set<Map<String, String>> groups = buildGroup(env, filter); + String msg = "STEP-4:TESTING: Using Group Search Filter '" + + filter + "', " + groups.size() + + " ldap group(s) were located.\n"; + if (groups.size() > 0) { + HashMap<String, String>[] ldapLists = new HashMap[groups + .size()]; + groups.toArray(ldapLists); + msg += "STEP-4:PASS: Listing a few of the ldap groups located: \n"; + // iterate over first ten or less to demonstrate retrieve + for (int i = 0; (i < groups.size() && i < 10); i++) { + msg += ldapLists[i] + "\n"; + } + }else{ + msg+="STEP-4:WARN: With current settings, test user is not authorized for any groups. Is this correct?"; + } + log(msg); + } + + private void generateUiLoggingForStep4LdapFilter(String userName, + String filter) { + String msg = "STEP-4:TESTING: about to do ldap search with filter \n'" + + filter + + "'\n to locate groups that test user '"+userName+"' IS authorized to access."; + log(msg); + } + + + // throw the label and fields together, two to a row. + private HashMap<String, JTextField> loadUiFields(JPanel top, + String[] componentKeys) { + HashMap<String, JTextField> mappings = new HashMap<String, JTextField>(); + for (int i = 0; i < componentKeys.length; i++) { + String firstLabelKey = componentKeys[i]; + String secondLabelKey = componentKeys[++i]; + // locate second key + JPanel row = new JPanel(); + row.setLayout(new FlowLayout(FlowLayout.LEFT)); + JLabel label1 = new JLabel(firstLabelKey); + label1.setSize(textBoxWidth, 5); +// JTextField value1 = new JTextField(textBoxWidth); + JTextField value1 = null; + if (firstLabelKey.equalsIgnoreCase("Password:")&&(!showPasswords.isSelected())) { + value1 = new JPasswordField(textBoxWidth); + } else { + value1 = new JTextField(textBoxWidth); + } + JLabel label2 = new JLabel(secondLabelKey); + JTextField value2 = new JTextField(textBoxWidth); + row.add(label1); + row.add(value1); + row.add(Box.createRigidArea(new Dimension(0, 5))); + row.add(label2); + row.add(value2); + mappings.put(firstLabelKey, value1); + mappings.put(secondLabelKey, value2); + top.add(row); + } + + return mappings; + } + + private Properties getProperties(String contentProvider) { + Properties env = new Properties(); + env.setProperty(Context.INITIAL_CONTEXT_FACTORY, + "com.sun.jndi.ldap.LdapCtxFactory"); + env.setProperty(Context.PROVIDER_URL, contentProvider); + if(!enableLdapReferral.isSelected()){ + env.setProperty(Context.REFERRAL, "ignore"); + }else{ + String msg="**---- You have chosen to tell LDAP servers to [FOLLOW] context referrals. Default is [IGNORE] referrals. --**"; + log(msg); + env.setProperty(Context.REFERRAL, "follow"); + } + +// // Setup SSL if requested +// String protocol = ssl.isSelected()? "ssl":""; +// if ((protocol != null) && protocol.equals("ssl")) { +// String ldapSocketFactory = env +// .getProperty("java.naming.ldap.factory.socket"); +// if (ldapSocketFactory == null) { +// env.put("java.naming.ldap.factory.socket", +// UntrustedSSLSocketFactory.class.getName()); +// } +// env.put(Context.SECURITY_PROTOCOL, "ssl"); +// } + + return env; + } + + private String delineate() { + String line = "-"; + for (int i = 0; i < 30; i++) { + line += "-"; + } + return line; + } + + /** Takes care of delineating messages and conditional logging contents passed in. + * @param msg + */ + private void log(String msg) { + String message = "\n" + delineate() + "\n"; + message += msg; + message += "\n" + delineate() + "\n\n"; + //This flag can be used in the unlikely case that the UI hangs during a test operation.: + if(iterativeVerboseLogging.isSelected()){ + System.out.println(message); + } + testResults.setText(testResults.getText() + message); + } + + private SearchControls getSearchControls() { + int scope = SearchControls.SUBTREE_SCOPE; + int timeLimit = 0; + long countLimit = 0; + String[] returnedAttributes = null; + boolean returnObject = false; + boolean deference = false; + SearchControls constraints = new SearchControls(scope, countLimit, + timeLimit, returnedAttributes, returnObject, deference); + return constraints; + } + + /** Translate SystemSettings to familiar Properties instance since we're + * passing not one but multiple values. + * + * @param systemSettings + * @return + */ + private Properties populateProperties(Properties existing) { + Properties properties = new Properties(); + if(existing!=null){ + properties = existing; + } + for (SystemSetting entry : SystemSetting.values()) { + if(entry!=null){ + switch(entry){ + case LDAP_BASED_JAAS_PROVIDER: + properties.put(entry.getInternalName(), ""); + break; + } + } + } + return properties; + } + + /**Build/retrieve the user DN. Not usually a property. + * + * @param options + * @param userName + * @param usePosixGroups boolean indicating whether we search for groups with posixGroup format + * @return + */ + private String getUserAttribute(Properties options, String userName, boolean usePosixGroups) { + Map<String, String> details = findLdapUserDetails(userName); + String userAttribute = null; + if (usePosixGroups) {//return just the username as posixGroup member search uses (&(%s)(memberUid=username)) + userAttribute = userName; + } else {//this is the default where group search uses (&(%s)(uniqueMember={userDn})) + userAttribute = details.get("dn"); + } + + return userAttribute; + } + + /** See LDAPStringUtil.encodeForFilter() for original code/source/author/etc. + * <p>Encode a string so that it can be used in an LDAP search filter.</p> + * + * <p>The following table shows the characters that are encoded and their + * encoded version.</p> + * + * <table> + * <tr><th align="center">Character</th><th>Encoded As</th></tr> + * <tr><td align="center">*</td><td>\2a</td></tr> + * <tr><td align="center">(</td><td>\28</td></tr> + * <tr><td align="center">)</td><td>\29</td></tr> + * <tr><td align="center">\</td><td>\5c</td></tr> + * <tr><td align="center"><code>null</code></td><td>\00</td></tr> + * </table> + * + * <p>In addition to encoding the above characters, any non-ASCII character + * (any character with a hex value greater then <code>0x7f</code>) is also + * encoded and rewritten as a UTF-8 character or sequence of characters in + * hex notation.</p> + * + * @param filterString a string that is to be encoded + * @return the encoded version of <code>filterString</code> suitable for use + * in a LDAP search filter + * @see <a href="http://tools.ietf.org/html/rfc4515">RFC 4515</a> + */ + public static String encodeForFilter(final String filterString) { + if (filterString != null && filterString.length() > 0) { + StringBuilder encString = new StringBuilder(filterString.length()); + for (int i = 0; i < filterString.length(); i++) { + char ch = filterString.charAt(i); + switch (ch) { + case '*': // encode a wildcard * character + encString.append("\\2a"); + break; + case '(': // encode a open parenthesis ( character + encString.append("\\28"); + break; + case ')': // encode a close parenthesis ) character + encString.append("\\29"); + break; + case '\\': // encode a backslash \ character + encString.append("\\5c"); + break; + case '\u0000': // encode a null character + encString.append("\\00"); + break; + default: + if (ch <= 0x7f) { // an ASCII character + encString.append(ch); + } else if (ch >= 0x80) { // encode to UTF-8 + try { + byte[] utf8bytes = String.valueOf(ch).getBytes("UTF8"); + for (byte b : utf8bytes) { + encString.append(String.format("\\%02x", b)); + } + } catch (UnsupportedEncodingException e) { + // ignore + } + } + } + } + return encString.toString(); + } + return filterString; + } +} + +//Mock up the upgraded system properties approach to use SystemSetting +enum SystemSetting { + LDAP_BASED_JAAS_PROVIDER("CAM_JAAS_PROVIDER"), + LDAP_NAMING_PROVIDER_URL("CAM_LDAP_NAMING_PROVIDER_URL"), + USE_SSL_FOR_LDAP("CAM_LDAP_PROTOCOL"), + LDAP_LOGIN_PROPERTY("CAM_LDAP_LOGIN_PROPERTY"), + LDAP_FILTER("CAM_LDAP_FILTER"), + LDAP_GROUP_FILTER("CAM_LDAP_GROUP_FILTER"), + LDAP_GROUP_MEMBER("CAM_LDAP_GROUP_MEMBER"), + LDAP_GROUP_QUERY_PAGE_SIZE("CAM_LDAP_GROUP_QUERY_PAGE_SIZE"), + LDAP_BASE_DN("CAM_LDAP_BASE_DN"), + LDAP_BIND_DN("CAM_LDAP_BIND_DN"), + LDAP_BIND_PW("CAM_LDAP_BIND_PW"), + LDAP_NAMING_FACTORY("CAM_LDAP_NAMING_FACTORY_INITIAL"), + LDAP_GROUP_USE_POSIX("CAM_LDAP_GROUP_USE_POSIX"), + ; + + private String internalName; + + private SystemSetting(String name) { + this.internalName = name; + } + + public String getInternalName() { + return internalName; + } + + public static SystemSetting getByInternalName(String internalName) { + for (SystemSetting p : SystemSetting.values()) { + if (p.internalName.equals(internalName)) { + return p; + } + } + return null; + } +} + + commit 78f4063d9d6dd5a6be04bc28ea67f16a10973cf6 Author: Simeon Pinder <spinder(a)redhat.com> Date: Tue Jul 30 17:07:58 2013 -0400 Load ldap properties in same way as before refactor and deprecate old property load mechanism as does not work well with reusing existing properties. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index 097b993..8a0e321 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -586,7 +586,34 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" } } //now load default/shared LDAP properties as we always have - properties = getProperties(properties); + // Set our default factory name if one is not given + String factoryName = properties.getProperty(SystemSetting.LDAP_NAMING_FACTORY.name()); + properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, factoryName); + + // Setup SSL if requested + String value = properties.getProperty(SystemSetting.USE_SSL_FOR_LDAP.name()); + boolean ldapSsl = "ssl".equalsIgnoreCase(value); + if (ldapSsl) { + String ldapSocketFactory = properties.getProperty("java.naming.ldap.factory.socket"); + if (ldapSocketFactory == null) { + properties.put("java.naming.ldap.factory.socket", UntrustedSSLSocketFactory.class.getName()); + } + properties.put(Context.SECURITY_PROTOCOL, "ssl"); + } + + // Set the LDAP url + String providerUrl = properties.getProperty(SystemSetting.LDAP_NAMING_PROVIDER_URL.name()); + if (providerUrl == null) { + int port = (ldapSsl) ? 636 : 389; + providerUrl = "ldap://localhost:" + port; + } + + properties.setProperty(Context.PROVIDER_URL, providerUrl); + + // Follow referrals automatically + properties.setProperty(Context.REFERRAL, "ignore"); //BZ:582471- active directory query change + + // properties = getProperties(properties); } return properties; } @@ -598,6 +625,7 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" * * @return properties that are to be used when connecting to LDAP server */ + @Deprecated private Properties getProperties(Properties systemConfig) { Properties env = new Properties(systemConfig); // Set our default factory name if one is not given commit 13ee16caf7ff65fe5af0033c1583b906c36c1288 Author: Simeon Pinder <spinder(a)redhat.com> Date: Mon Jul 29 12:02:56 2013 -0400 Include default ldap property settings in initialization as well. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index cd27c32..097b993 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -585,6 +585,8 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" } } } + //now load default/shared LDAP properties as we always have + properties = getProperties(properties); } return properties; } commit 9460e0244be9494d7a7168322c91dac6c1c20fa9 Author: Simeon Pinder <spinder(a)redhat.com> Date: Mon Jul 29 01:32:10 2013 -0400 Fix some deprecated property references. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index 02de558..cd27c32 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -98,7 +98,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { Properties systemConfig = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); //retrieve the filters. - String groupFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); + String groupFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.name()); if ((groupFilter != null) && (!groupFilter.trim().isEmpty())) { String filter; if (groupFilter.startsWith("(") && groupFilter.endsWith(")")) { @@ -116,9 +116,9 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { public Set<String> findAvailableGroupsFor(String userName) { Properties options = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); - String groupFilter = options.getProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), ""); - String groupMember = options.getProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), ""); - String groupUsePosix = options.getProperty(SystemSetting.LDAP_GROUP_USE_POSIX.getInternalName(), "false"); + String groupFilter = options.getProperty(SystemSetting.LDAP_GROUP_FILTER.name(), ""); + String groupMember = options.getProperty(SystemSetting.LDAP_GROUP_MEMBER.name(), ""); + String groupUsePosix = options.getProperty(SystemSetting.LDAP_GROUP_USE_POSIX.name(), "false"); if (groupUsePosix == null) { groupUsePosix = Boolean.toString(false);//default to false } @@ -299,20 +299,20 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { HashMap<String, String> userDetails = new HashMap<String, String>(); // Load the BaseDN - String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.name()); // Load the LoginProperty - String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.name()); if (loginProperty == null) { // Use the default loginProperty = "cn"; } // Load any information we may need to bind - String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); - String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.name()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.name()); // Load any search filter - String searchFilter = (String) systemConfig.get(SystemSetting.LDAP_FILTER.getInternalName()); + String searchFilter = (String) systemConfig.get(SystemSetting.LDAP_FILTER.name()); if (bindDN != null) { systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); @@ -384,17 +384,17 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { Set<Map<String, String>> groupDetailsMap = new HashSet<Map<String, String>>(); //Load our LDAP specific properties // Load the BaseDN - String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.name()); // Load the LoginProperty - String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.name()); if (loginProperty == null) { // Use the default loginProperty = "cn"; } // Load any information we may need to bind - String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); - String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.name()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.name()); if (bindDN != null) { systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); @@ -411,7 +411,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { searchControls.setReturningAttributes(attributes); //detect whether to use Query Page Control - String groupUseQueryPaging = systemConfig.getProperty(SystemSetting.LDAP_GROUP_PAGING.getInternalName(), + String groupUseQueryPaging = systemConfig.getProperty(SystemSetting.LDAP_GROUP_PAGING.name(), "false"); if (groupUseQueryPaging == null) { groupUseQueryPaging = Boolean.toString(false);//default to false @@ -426,7 +426,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { // only if they're enabled in the UI. if (useQueryPaging) { String groupPageSize = systemConfig.getProperty( - SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.getInternalName(), "" +SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" + defaultPageSize); if ((groupPageSize != null) && (!groupPageSize.trim().isEmpty())) { int passedInPageSize = -1; @@ -599,7 +599,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { private Properties getProperties(Properties systemConfig) { Properties env = new Properties(systemConfig); // Set our default factory name if one is not given - String factoryName = env.getProperty(SystemSetting.LDAP_NAMING_FACTORY.getInternalName()); + String factoryName = env.getProperty(SystemSetting.LDAP_NAMING_FACTORY.name()); env.setProperty(Context.INITIAL_CONTEXT_FACTORY, factoryName); // Setup SSL if requested @@ -614,7 +614,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { } // Set the LDAP url - String providerUrl = env.getProperty(RHQConstants.LDAPUrl); + String providerUrl = env.getProperty(SystemSetting.LDAP_NAMING_PROVIDER_URL.name()); if (providerUrl == null) { int port = (ldapSsl) ? 636 : 389; providerUrl = "ldap://localhost:" + port; commit b5897cf41d3b3a0a5c337b70fe6211380a9e73a7 Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Jun 19 13:51:17 2013 -0400 Some more doc and cleanup/refactor. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index 4c0c2fc..02de558 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -156,6 +156,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { throw new IllegalArgumentException("Role with id [" + roleId + "] does not exist."); } + //add some code to synch up the current list of ldap groups. Set<LdapGroup> currentGroups = role.getLdapGroups(); List<String> currentGroupNames = new ArrayList<String>(currentGroups.size()); for (LdapGroup group : currentGroups) { @@ -167,10 +168,12 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { newGroupNames.add(group.getName()); } + //figure out which ones are new then add them. List<String> namesOfGroupsToBeAdded = new ArrayList<String>(newGroupNames); namesOfGroupsToBeAdded.removeAll(currentGroupNames); addLdapGroupsToRole(subject, roleId, namesOfGroupsToBeAdded); + //figure out which ones need to be removed. then remove them. List<String> namesOfGroupsToBeRemoved = new ArrayList<String>(currentGroupNames); namesOfGroupsToBeRemoved.removeAll(newGroupNames); int[] idsOfGroupsToBeRemoved = new int[namesOfGroupsToBeRemoved.size()]; @@ -290,11 +293,10 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { } public Map<String, String> findLdapUserDetails(String userName) { + // Load our LDAP specific properties Properties systemConfig = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); HashMap<String, String> userDetails = new HashMap<String, String>(); - // Load our LDAP specific properties - Properties env = getProperties(systemConfig); // Load the BaseDN String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); @@ -312,13 +314,13 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { // Load any search filter String searchFilter = (String) systemConfig.get(SystemSetting.LDAP_FILTER.getInternalName()); if (bindDN != null) { - env.setProperty(Context.SECURITY_PRINCIPAL, bindDN); - env.setProperty(Context.SECURITY_CREDENTIALS, bindPW); - env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); + systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); + systemConfig.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); } try { - InitialLdapContext ctx = new InitialLdapContext(env, null); + InitialLdapContext ctx = new InitialLdapContext(systemConfig, null); SearchControls searchControls = getSearchControls(); // Add the search filter if specified. This only allows for a single search filter.. i.e. foo=bar. commit 8ebda9f14429ffc5f74ce4d83f0ebf952fb8bf63 Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Jun 19 13:36:52 2013 -0400 Use property internal name. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index d80732e..4c0c2fc 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -380,7 +380,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { */ protected Set<Map<String, String>> buildGroup(Properties systemConfig, String filter) { Set<Map<String, String>> groupDetailsMap = new HashSet<Map<String, String>>(); - + //Load our LDAP specific properties // Load the BaseDN String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); @@ -423,7 +423,8 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { int defaultPageSize = 1000; // only if they're enabled in the UI. if (useQueryPaging) { - String groupPageSize = systemConfig.getProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" + String groupPageSize = systemConfig.getProperty( + SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.getInternalName(), "" + defaultPageSize); if ((groupPageSize != null) && (!groupPageSize.trim().isEmpty())) { int passedInPageSize = -1; commit e205af70c89490329d8a3e0d157af05758f77cee Author: Simeon Pinder <spinder(a)redhat.com> Date: Mon Jun 17 12:26:59 2013 -0400 Clean up some deprecated usage of Properties by LDAP, and small refactoring. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index 7473321..d80732e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -94,27 +94,30 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { private SystemManagerLocal systemManager; public Set<Map<String, String>> findAvailableGroups() { - Properties systemConfig = systemManager.getSystemConfiguration(subjectManager.getOverlord()); - Set<Map<String, String>> emptyAvailableGroups = new HashSet<Map<String, String>>(); + //load current system properties + Properties systemConfig = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); //retrieve the filters. - String groupFilter = (String) systemConfig.get(RHQConstants.LDAPGroupFilter); + String groupFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.getInternalName()); if ((groupFilter != null) && (!groupFilter.trim().isEmpty())) { String filter; - if (groupFilter.startsWith("(") && groupFilter.endsWith(")")) + if (groupFilter.startsWith("(") && groupFilter.endsWith(")")) { filter = groupFilter; // RFC 2254 does not allow for ((expression)) - else + } else { filter = String.format("(%s)", groupFilter); // not wrapped in (), wrap it + } return buildGroup(systemConfig, filter); } + + Set<Map<String, String>> emptyAvailableGroups = new HashSet<Map<String, String>>(); return emptyAvailableGroups; } public Set<String> findAvailableGroupsFor(String userName) { - Properties options = systemManager.getSystemConfiguration(subjectManager.getOverlord()); - String groupFilter = options.getProperty(RHQConstants.LDAPGroupFilter, ""); - String groupMember = options.getProperty(RHQConstants.LDAPGroupMember, ""); + Properties options = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); + String groupFilter = options.getProperty(SystemSetting.LDAP_GROUP_FILTER.getInternalName(), ""); + String groupMember = options.getProperty(SystemSetting.LDAP_GROUP_MEMBER.getInternalName(), ""); String groupUsePosix = options.getProperty(SystemSetting.LDAP_GROUP_USE_POSIX.getInternalName(), "false"); if (groupUsePosix == null) { groupUsePosix = Boolean.toString(false);//default to false @@ -287,26 +290,27 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { } public Map<String, String> findLdapUserDetails(String userName) { - Properties systemConfig = systemManager.getSystemConfiguration(subjectManager.getOverlord()); + Properties systemConfig = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); + HashMap<String, String> userDetails = new HashMap<String, String>(); // Load our LDAP specific properties Properties env = getProperties(systemConfig); // Load the BaseDN - String baseDN = (String) systemConfig.get(RHQConstants.LDAPBaseDN); + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); // Load the LoginProperty - String loginProperty = (String) systemConfig.get(RHQConstants.LDAPLoginProperty); + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); if (loginProperty == null) { // Use the default loginProperty = "cn"; } // Load any information we may need to bind - String bindDN = (String) systemConfig.get(RHQConstants.LDAPBindDN); - String bindPW = (String) systemConfig.get(RHQConstants.LDAPBindPW); + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); // Load any search filter - String searchFilter = (String) systemConfig.get(RHQConstants.LDAPFilter); + String searchFilter = (String) systemConfig.get(SystemSetting.LDAP_FILTER.getInternalName()); if (bindDN != null) { env.setProperty(Context.SECURITY_PRINCIPAL, bindDN); env.setProperty(Context.SECURITY_CREDENTIALS, bindPW); @@ -375,29 +379,27 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { * @see org.jboss.security.auth.spi.UsernamePasswordLoginModule#validatePassword(java.lang.String,java.lang.String) */ protected Set<Map<String, String>> buildGroup(Properties systemConfig, String filter) { - Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); - // Load our LDAP specific properties - Properties env = getProperties(systemConfig); + Set<Map<String, String>> groupDetailsMap = new HashSet<Map<String, String>>(); // Load the BaseDN - String baseDN = (String) systemConfig.get(RHQConstants.LDAPBaseDN); + String baseDN = (String) systemConfig.get(SystemSetting.LDAP_BASE_DN.getInternalName()); // Load the LoginProperty - String loginProperty = (String) systemConfig.get(RHQConstants.LDAPLoginProperty); + String loginProperty = (String) systemConfig.get(SystemSetting.LDAP_LOGIN_PROPERTY.getInternalName()); if (loginProperty == null) { // Use the default loginProperty = "cn"; } // Load any information we may need to bind - String bindDN = (String) systemConfig.get(RHQConstants.LDAPBindDN); - String bindPW = (String) systemConfig.get(RHQConstants.LDAPBindPW); + String bindDN = (String) systemConfig.get(SystemSetting.LDAP_BIND_DN.getInternalName()); + String bindPW = (String) systemConfig.get(SystemSetting.LDAP_BIND_PW.getInternalName()); if (bindDN != null) { - env.setProperty(Context.SECURITY_PRINCIPAL, bindDN); - env.setProperty(Context.SECURITY_CREDENTIALS, bindPW); - env.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); + systemConfig.setProperty(Context.SECURITY_PRINCIPAL, bindDN); + systemConfig.setProperty(Context.SECURITY_CREDENTIALS, bindPW); + systemConfig.setProperty(Context.SECURITY_AUTHENTICATION, "simple"); } try { - InitialLdapContext ctx = new InitialLdapContext(env, null); + InitialLdapContext ctx = new InitialLdapContext(systemConfig, null); SearchControls searchControls = getSearchControls(); /*String filter = "(&(objectclass=groupOfUniqueNames)(uniqueMember=uid=" + userName + ",ou=People, dc=rhndev, dc=redhat, dc=com))";*/ @@ -421,8 +423,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { int defaultPageSize = 1000; // only if they're enabled in the UI. if (useQueryPaging) { - Properties options = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); - String groupPageSize = options.getProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" + String groupPageSize = systemConfig.getProperty(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" + defaultPageSize); if ((groupPageSize != null) && (!groupPageSize.trim().isEmpty())) { int passedInPageSize = -1; @@ -445,11 +446,12 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { String[] baseDNs = baseDN.split(BASEDN_DELIMITER); for (int x = 0; x < baseDNs.length; x++) { - executeGroupSearch(filter, ret, ctx, searchControls, baseDNs, x); + executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); // continually parsing pages of results until we're done. // only if they're enabled in the UI. if (useQueryPaging) { + //handle paged results if they're being used here byte[] cookie = null; Control[] controls = ctx.getResponseControls(); @@ -466,7 +468,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { //ensure the next requests contains the session/cookie details ctx.setRequestControls(new Control[] { new PagedResultsControl(defaultPageSize, cookie, Control.CRITICAL) }); - executeGroupSearch(filter, ret, ctx, searchControls, baseDNs, x); + executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); //empty out cookie cookie = null; //test for further iterations @@ -479,6 +481,25 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { } } } + //continually parsing pages of results until we're done. + while (cookie != null) { + //ensure the next requests contains the session/cookie details + ctx.setRequestControls(new Control[] { new PagedResultsControl(defaultPageSize, cookie, + Control.CRITICAL) }); + executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); + //empty out cookie + cookie = null; + //test for further iterations + controls = ctx.getResponseControls(); + if (controls != null) { + for (Control control : controls) { + if (control instanceof PagedResultsResponseControl) { + PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; + cookie = pagedResult.getCookie(); + } + } + } + } } } } @@ -498,32 +519,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { log.error("Unexpected LDAP communciation error:" + iex.getMessage(), iex); throw new LdapCommunicationException(iex); } - - return ret; - } - - /** Translate SystemSettings to familiar Properties instance since we're - * passing not one but multiple values. - * - * @param systemSettings - * @return - */ - private Properties populateProperties(SystemSettings systemSettings) { - Properties properties = null; - if (systemSettings != null) { - properties = new Properties(); - Set<Entry<SystemSetting, String>> entries = systemSettings.entrySet(); - for (Entry<SystemSetting, String> entry : entries) { - SystemSetting key = entry.getKey(); - if (key != null) { - String value = entry.getValue(); - if (value != null) { - properties.put(key.name(), value); - } - } - } - } - return properties; + return groupDetailsMap; } /** Executes the LDAP group query using the filters, context and search controls, etc. parameters passed in. @@ -566,6 +562,30 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { } } + /** Translate SystemSettings to familiar Properties instance since we're + * passing not one but multiple values. + * + * @param systemSettings + * @return + */ + private Properties populateProperties(SystemSettings systemSettings) { + Properties properties = null; + if (systemSettings != null) { + properties = new Properties(); + Set<Entry<SystemSetting, String>> entries = systemSettings.entrySet(); + for (Entry<SystemSetting, String> entry : entries) { + SystemSetting key = entry.getKey(); + if (key != null) { + String value = entry.getValue(); + if (value != null) { + properties.put(key.name(), value); + } + } + } + } + return properties; + } + /** * Load a default set of properties to use when connecting to the LDAP server. If basic authentication is needed, * the caller must set Context.SECURITY_PRINCIPAL, Context.SECURITY_CREDENTIALS and Context.SECURITY_AUTHENTICATION @@ -576,7 +596,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { private Properties getProperties(Properties systemConfig) { Properties env = new Properties(systemConfig); // Set our default factory name if one is not given - String factoryName = env.getProperty(RHQConstants.LDAPFactory); + String factoryName = env.getProperty(SystemSetting.LDAP_NAMING_FACTORY.getInternalName()); env.setProperty(Context.INITIAL_CONTEXT_FACTORY, factoryName); // Setup SSL if requested

1 0

[rhq] modules/enterprise
by Jiri Kremser 31 Jul '13

31 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 0db28524acf4160725c7b0101b7d923903ea93b0 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Jul 31 15:09:45 2013 +0200 [BZ 976827] - Description text area in General properties tab under Alerts -> Definition is not getting set to blank one it has been edited. Instead it displays the previous value that was stored - setting an empty string if descriptionField.getValue() == null diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java index 1f47a81..d501787 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java @@ -175,9 +175,7 @@ public class GeneralPropertiesAlertDefinitionForm extends DynamicForm implements public void saveAlertDefinition() { alertDefinition.setName(nameField.getValue().toString()); Object description = descriptionField.getValue(); - if (null != description) { - alertDefinition.setDescription(description.toString()); - } + alertDefinition.setDescription(null == description ? "" : description.toString()); String prioritySelected = prioritySelection.getValue().toString(); alertDefinition.setPriority(AlertPriority.valueOf(prioritySelected));

1 0

[rhq] 2 commits - modules/enterprise
by mike thompson 31 Jul '13

31 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java | 87 +++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 16 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java | 20 +- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 5 12 files changed, 109 insertions(+), 59 deletions(-) New commits: commit 0a006570d7b5fd255a6124f388a3023fe1df010e Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 30 17:43:16 2013 -0700 i18n availability summary pie graph. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java index 057a77f..fb8e096 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java @@ -18,14 +18,15 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype; +import java.util.ArrayList; +import java.util.List; + import com.smartgwt.client.widgets.HTMLFlow; + import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; -import java.util.ArrayList; -import java.util.List; - /** * Contains the javascript chart definition for an implementation of the d3 availability chart. This implementation is * just a line that changes color based on availability type: up=green, down=red, orange=disabled, unknown=grey, @@ -48,7 +49,8 @@ public class AvailabilitySummaryPieGraphType { StringBuilder divAndSvgDefs = new StringBuilder(); divAndSvgDefs.append("<div id=\"availSummaryChart\" >"); - divAndSvgDefs.append("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:"+HEIGHT+"px;\" ></svg>"); + divAndSvgDefs.append("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:" + HEIGHT + + "px;\" ></svg>"); divAndSvgDefs.append("</div>"); HTMLFlow graphFlow = new HTMLFlow(divAndSvgDefs.toString()); graphFlow.setWidth(WIDTH); @@ -56,7 +58,8 @@ public class AvailabilitySummaryPieGraphType { return graphFlow; } - public void setAvailabilityData(String upLabel, double upPercent, String downLabel, double downPercent, String disabledLabel, double disabledPercent ){ + public void setAvailabilityData(String upLabel, double upPercent, String downLabel, double downPercent, + String disabledLabel, double disabledPercent) { availabilitySummaries = new ArrayList<AvailabilitySummary>(); availabilitySummaries.add(new AvailabilitySummary(upLabel, upPercent)); availabilitySummaries.add(new AvailabilitySummary(downLabel, downPercent)); @@ -70,8 +73,9 @@ public class AvailabilitySummaryPieGraphType { // loop through the avail intervals for (AvailabilitySummary availabilitySummary : availabilitySummaries) { sb.append("{ \"label\":\"" + availabilitySummary.getLabel() + "\", "); - sb.append(" \"value\": \"" + MeasurementConverterClient.format(availabilitySummary.getValue(), - MeasurementUnits.PERCENTAGE, true) + "\" },"); + sb.append(" \"value\": \"" + + MeasurementConverterClient.format(availabilitySummary.getValue(), MeasurementUnits.PERCENTAGE, + true) + "\" },"); } sb.setLength(sb.length() - 1); } @@ -87,47 +91,50 @@ public class AvailabilitySummaryPieGraphType { public native void drawJsniChart() /*-{ console.log("Draw Availability Summary Pie Chart"); - var w = 100, - h = 100, - r = h/2, - color = $wnd.d3.scale.category10(), - data = this.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilitySummaryPieGraphType::getAvailabilitySummaryJson()(), - vis = $wnd.d3.select("#availSummaryChart svg") - .append("g") - .data(data) - .attr("width", w) - .attr("height", h) - .attr("transform", "translate(" + r + "," + r + ")"), - arc = $wnd.d3.svg.arc() - .outerRadius(r), - pie = $wnd.d3.layout.pie(), - arcs = vis.selectAll("g.slice") - .data(pie) - .enter() - .append("g") - .attr("class", "slice"); + var global = this, + w = 100, + h = 100, + r = h / 2, + color = $wnd.d3.scale.category10(), + data = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilitySummaryPieGraphType::getAvailabilitySummaryJson()(), + vis = $wnd.d3.select("#availSummaryChart svg") + .append("g") + .data(data) + .attr("width", w) + .attr("height", h) + .attr("transform", "translate(" + r + "," + r + ")"), + arc = $wnd.d3.svg.arc() + .outerRadius(r), + pie = $wnd.d3.layout.pie(), + arcs = vis.selectAll("g.slice") + .data(pie) + .enter() + .append("g") + .attr("class", "slice"); arcs.append("path") - .attr("fill", function (d, i) { - return color(i); - }) - .attr("d", arc); + .attr("fill", function (d, i) { + return color(i); + }) + .attr("d", arc); arcs.append("text") - .attr("transform", function (d) { - d.innerRadius = 0; - d.outerRadius = r; - return "translate(" + arc.centroid(d) + ")"; - }) - .attr("text-anchor", "middle") - .text(function (d, i) { - return data[i].value; - }); + .attr("transform", function (d) { + d.innerRadius = 0; + d.outerRadius = r; + return "translate(" + arc.centroid(d) + ")"; + }) + .attr("text-anchor", "middle") + .style("font-size", "9px") + .style("font-family", "Arial, Verdana, sans-serif;") + .attr("fill", "#000") + .text(function (d, i) { + return data[i].value; + }); console.log("done with avail summary pie graph"); }-*/; - private static class AvailabilitySummary { final private String label; final private double value; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java index ce4f8ef..52b0d86 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java @@ -23,6 +23,7 @@ import java.util.LinkedHashMap; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.widgets.IButton; import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.SelectItem; import com.smartgwt.client.widgets.form.fields.events.ChangeEvent; import com.smartgwt.client.widgets.form.fields.events.ChangeHandler; @@ -79,7 +80,7 @@ public class AddToDashboardComponent extends ToolStrip implements Enhanced { addToDashboardButton.disable(); dashboardSelectItem = new SelectItem(); - dashboardSelectItem.setTitle("Dashboards"); + dashboardSelectItem.setTitle(MSG.chart_metrics_add_to_dashboard_label()); dashboardSelectItem.setWidth(300); dashboardSelectItem.setPickListWidth(210); populateDashboardMenu(); @@ -102,7 +103,7 @@ public class AddToDashboardComponent extends ToolStrip implements Enhanced { .getMetricDefinitions()) { if (measurementDefinition.getId() == selectedRecord .getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID)) { - Log.debug("Add to Dashboard -- Storing: " + measurementDefinition.getDisplayName() + Log.info("Add to Dashboard -- Storing: " + measurementDefinition.getDisplayName() + " in " + selectedDashboard.getName()); storeDashboardMetric(selectedDashboard, resource, measurementDefinition); break; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java index cffcfd7..5835f61 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java @@ -40,7 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; /** - * This shows the availability history for a resource. + * This view shows the detail availability data in tabular form and a pie chart for available %. * * @author Jay Shaughnessy * @author John Mazzitelli @@ -49,6 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; public class ResourceMetricAvailabilityView extends EnhancedVLayout { private Resource resource; + private DynamicForm form; private StaticTextItem currentField; private StaticTextItem availTimeField; private StaticTextItem downTimeField; @@ -81,7 +82,7 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { private DynamicForm createSummaryForm() { - DynamicForm form = new DynamicForm(); + form = new DynamicForm(); form.setWidth100(); form.setAutoHeight(); form.setMargin(10); @@ -138,14 +139,13 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { currentTimeField.setShowTitle(false); CanvasItem availPieChartItem = new CanvasItem(); - //@todo: i18n - availPieChartItem.setTitle("Availability"); + availPieChartItem.setTitle(MSG.pie_chart_availability_summary_label()); availPieChartItem.setCanvas(availabilitySummaryPieGraph.createGraphMarker()); availPieChartItem.setRowSpan(3); availPieChartItem.setVAlign(VerticalAlignment.TOP); availPieChartItem.setTitleVAlign(VerticalAlignment.TOP); - availPieChartItem.setHeight(60); - availPieChartItem.setWidth(60); + availPieChartItem.setHeight(AvailabilitySummaryPieGraphType.HEIGHT); + availPieChartItem.setWidth(AvailabilitySummaryPieGraphType.WIDTH); form.setItems(currentField, availPieChartItem, availTimeField, downTimeField, disabledTimeField, failureCountField, disabledCountField, mtbfField, mttrField, unknownField, @@ -164,17 +164,15 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { public void onSuccess(ResourceAvailabilitySummary result) { Log.debug("reloadSummaryData"); - //@todo: i18n availabilitySummaryPieGraph.setAvailabilityData( - "Up", result.getUpPercentage(), - "Down", result.getDownPercentage(), - "Disabled" ,result.getDisabledPercentage() + MSG.pie_chart_availability_summary_up(), result.getUpPercentage(), + MSG.pie_chart_availability_summary_down(), result.getDownPercentage(), + MSG.pie_chart_availability_summary_disabled() ,result.getDisabledPercentage() ); new Timer(){ @Override public void run() { - Log.debug("Run Avail Graph"); availabilitySummaryPieGraph.drawJsniChart(); } }.schedule(150); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index abcfa62..7f2e7d4 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -21,6 +21,7 @@ chart_hover_start_label = Start chart_hover_time_format = %I:%M:%S %p chart_ie_not_supported = Charting is not available for this browser. chart_metrics= Metrics +chart_metrics_add_to_dashboard_label= Dashboards chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. chart_metrics_expand_tooltip= Click here to collapse additional availability detail. chart_metrics_sparkline_header= Chart @@ -459,6 +460,10 @@ filter_from_date = From filter_to_date = To group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource +pie_chart_availability_summary_disabled = Disabled +pie_chart_availability_summary_down = Down +pie_chart_availability_summary_label = Availability +pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = Parent Ancestry for: util_errorHandler_nullException = exception was null util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 3a79eeb..941eb60 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -49,6 +49,7 @@ chart_hover_date_format = %d.%m.%y chart_hover_time_format = %H:%M:%S ##chart_ie_not_supported = Charting is not available for this browser. ##chart_metrics= Metrics +##chart_metrics_add_to_dashboard_label= Dashboards ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart @@ -478,6 +479,10 @@ filter_from_date = Od filter_to_date = Do group_tree_groupOfResourceType = Skupina: [{0}] group_tree_partialClusterTooltip = {0} z {1} členů skupiny má "{2}" zdroj +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = Původ rodiče pro: util_errorHandler_nullException = výjimka byla null util_monitoringRequestCallback_error_checkServerStatusFailure = Nepodařilo se určit stav přihlašování - zkontrolujte stav serveru. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index e79504c..e30a19e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -27,6 +27,7 @@ chart_ie_not_supported = Charting ist bei diesem Browser nicht unterstützt ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart +##chart_metrics_add_to_dashboard_label= Dashboards chart_no_data_label = Keine Daten vorhanden ##chart_single_value_label = Value chart_slider_button_bar_day = Tag @@ -457,6 +458,10 @@ filter_from_date = Von filter_to_date = Bis group_tree_groupOfResourceType = Gruppe von [{0}] group_tree_partialClusterTooltip = {0} der {1} Gruppenmitglieder haben eine ''{2}'' Ressource +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_disambiguationReportDecorator_pluginSuffix = ({0} Plugin) util_errorHandler_nullException = Exception war null ##util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 3f1f701..bed024b 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -28,6 +28,7 @@ ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart +##chart_metrics_add_to_dashboard_label= Dashboards ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -455,6 +456,10 @@ filter_from_date = 開始 filter_to_date = 終了 ##group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {1} の中の {0} グループメンバーが ''{2}'' リソースを持っています +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = 親の先祖 : util_disambiguationReportDecorator_pluginSuffix = ({0} プラグイン) util_errorHandler_nullException = 例外は null でした diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 3d40d83..416f4b4 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -26,6 +26,7 @@ ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart +##chart_metrics_add_to_dashboard_label= Dashboards ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -412,6 +413,10 @@ favorites_resources = 즐겨찾기 리소스 filter_from_date = 시작 group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {1} 중 {0} 그룹 멤버가 ''{2}'' 자원을 가지고 있습니다. +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = 부모의 조상: util_errorHandler_nullException = 예외는 null이었습니다. util_monitoringRequestCallback_error_checkServerStatusFailure = 로그인 상태를 확인할 수 없습니다 - 서버의 상태를 확인하십시요 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index de43fa4..47cac36 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -25,6 +25,7 @@ ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart +##chart_metrics_add_to_dashboard_label= Dashboards ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -460,6 +461,10 @@ favorites_resources = Recursos Favoritos ##filter_to_date = To ##group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = Ancestral para: util_errorHandler_nullException = Exce\u00E7\u00E3o nula util_monitoringRequestCallback_error_checkServerStatusFailure = Imposs\u00EDvel verificar o status do login - verifique o status do Servidor. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 669d8d6..99f34f9 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -25,6 +25,7 @@ ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart +##chart_metrics_add_to_dashboard_label= Dashboards ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -2549,6 +2550,10 @@ favorites_resources = Избранные ресурсы filter_from_date = От filter_to_date = До group_tree_partialClusterTooltip = {0} из {1} членов группы имеют ресурс ''{2}'' +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_errorHandler_nullException = Возникло null исключение util_monitoringRequestCallback_error_checkServerStatusFailure = Не удается определить статус авторизации - проверьте состояние сервера. util_userPerm_loadFailGlobal = Не удается загрузить ваши глобальные полномочия - не предоставлены. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index b15023f..69ca0f6 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -25,6 +25,7 @@ ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_metrics_sparkline_header= Chart +##chart_metrics_add_to_dashboard_label= Dashboards ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -450,6 +451,10 @@ favorites_resources = \u8d44\u6e90\u6536\u85cf\u5939 ##filter_to_date = To ##group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = \u9664\u53bb {1},{0}\u7684\u7ec4\u6210\u5458\u62e5\u6709 \u4e00\u4e2a''{2}''\u8d44\u6e90 +##pie_chart_availability_summary_disabled = Disabled +##pie_chart_availability_summary_down = Down +##pie_chart_availability_summary_label = Availability +##pie_chart_availability_summary_up = Up util_ancestry_parentAncestry = Parent Ancestry for: util_errorHandler_nullException = \u5f02\u5e38\u662f null util_monitoringRequestCallback_error_checkServerStatusFailure = \u65e0\u6cd5\u786e\u5b9a\u767b\u5f55\u72b6\u6001- \u68c0\u67e5\u670d\u52a1\u5668\u72b6\u6001. commit 5fc0c3dcb14fa1406e24e57d213a0cbda0205255 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 30 11:42:37 2013 -0700 Fix bug with new metrics database and not much history results in NPE on metrics page. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 82a9d98..bb67587 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -121,9 +121,9 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re metricsTableListGrid.addSelectionChangedHandler(new SelectionChangedHandler() { @Override public void onSelectionChanged(SelectionEvent selectionEvent) { - if(metricsTableListGrid.getSelectedRecords().length > 0){ + if (metricsTableListGrid.getSelectedRecords().length > 0) { addToDashboardComponent.enableAddToDashboardButton(); - }else { + } else { addToDashboardComponent.disableAddToDashboardButton(); } } @@ -304,11 +304,15 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re public void onDataArrived(DataArrivedEvent dataArrivedEvent) { int startRow = dataArrivedEvent.getStartRow(); int endRow = dataArrivedEvent.getEndRow(); + for (int i = startRow; i < endRow; i++) { - if (null != metricsTableView && null != metricsTableView.expandedRows - && metricsTableView.expandedRows.contains(getRecord(i).getAttributeAsInt( - MetricsViewDataSource.FIELD_METRIC_DEF_ID))) { - expandRecord(getRecord(i)); + ListGridRecord listGridRecord = getRecord(i); + if (null != listGridRecord) { + int metricDefinitionId = listGridRecord + .getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); + if (null != metricsTableView && metricsTableView.expandedRows.contains(metricDefinitionId)) { + expandRecord(listGridRecord); + } } } }

1 0

[rhq] 2 commits - modules/enterprise
by mike thompson 31 Jul '13

31 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java | 148 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java | 62 ++-- 4 files changed, 188 insertions(+), 26 deletions(-) New commits: commit 49886f1a8f52cbf5166498280d4ee28e679621f7 Author: mtho11 <mikecthompson(a)gmail.com> Date: Tue Jul 30 10:59:02 2013 -0700 Change layout of fields in availability detail form of metric page. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index ee06724..3e573dd 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -230,8 +230,6 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { .attr("height", height + margin.top + margin.bottom) .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); - console.error("avail.chartSelection: "+ availChartContext.chartSelection); - svg.selectAll("rect.availBars") .data(availChartContext.data) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java index 23effb0..057a77f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java @@ -18,7 +18,10 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype; +import com.smartgwt.client.widgets.HTMLFlow; +import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; import java.util.ArrayList; import java.util.List; @@ -32,11 +35,27 @@ import java.util.List; */ public class AvailabilitySummaryPieGraphType { + public static final int HEIGHT = 100; + public static final int WIDTH = 100; + private List<AvailabilitySummary> availabilitySummaries; public AvailabilitySummaryPieGraphType() { } + public HTMLFlow createGraphMarker() { + Log.debug("drawGraph marker in AvailabilitySummaryPieGraph"); + + StringBuilder divAndSvgDefs = new StringBuilder(); + divAndSvgDefs.append("<div id=\"availSummaryChart\" >"); + divAndSvgDefs.append("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:"+HEIGHT+"px;\" ></svg>"); + divAndSvgDefs.append("</div>"); + HTMLFlow graphFlow = new HTMLFlow(divAndSvgDefs.toString()); + graphFlow.setWidth(WIDTH); + graphFlow.setHeight(HEIGHT); + return graphFlow; + } + public void setAvailabilityData(String upLabel, double upPercent, String downLabel, double downPercent, String disabledLabel, double disabledPercent ){ availabilitySummaries = new ArrayList<AvailabilitySummary>(); availabilitySummaries.add(new AvailabilitySummary(upLabel, upPercent)); @@ -51,7 +70,8 @@ public class AvailabilitySummaryPieGraphType { // loop through the avail intervals for (AvailabilitySummary availabilitySummary : availabilitySummaries) { sb.append("{ \"label\":\"" + availabilitySummary.getLabel() + "\", "); - sb.append(" \"value\": \"" + availabilitySummary.getValue() * 100 + "\" },"); + sb.append(" \"value\": \"" + MeasurementConverterClient.format(availabilitySummary.getValue(), + MeasurementUnits.PERCENTAGE, true) + "\" },"); } sb.setLength(sb.length() - 1); } @@ -67,26 +87,21 @@ public class AvailabilitySummaryPieGraphType { public native void drawJsniChart() /*-{ console.log("Draw Availability Summary Pie Chart"); - var data = this.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilitySummaryPieGraphType::getAvailabilitySummaryJson()(); - var w = 100, h = 100, - r = 30, - color = $wnd.d3.scale.category10(); - - var vis = $wnd.d3.select("#availSummaryChart svg") + r = h/2, + color = $wnd.d3.scale.category10(), + data = this.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilitySummaryPieGraphType::getAvailabilitySummaryJson()(), + vis = $wnd.d3.select("#availSummaryChart svg") .append("g") .data(data) .attr("width", w) .attr("height", h) - .attr("transform", "translate(" + r + "," + r + ")"); - - var arc = $wnd.d3.svg.arc() - .outerRadius(r); - - var pie = $wnd.d3.layout.pie(); - - var arcs = vis.selectAll("g.slice") + .attr("transform", "translate(" + r + "," + r + ")"), + arc = $wnd.d3.svg.arc() + .outerRadius(r), + pie = $wnd.d3.layout.pie(), + arcs = vis.selectAll("g.slice") .data(pie) .enter() .append("g") @@ -108,7 +123,7 @@ public class AvailabilitySummaryPieGraphType { .text(function (d, i) { return data[i].value; }); - console.warn("done with avail summary pie graph"); + console.log("done with avail summary pie graph"); }-*/; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java index 961ea5a..cffcfd7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java @@ -22,8 +22,9 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitori import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.widgets.HTMLFlow; +import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.CanvasItem; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.StaticTextItem; @@ -49,11 +50,8 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { private Resource resource; private StaticTextItem currentField; - private StaticTextItem availField; private StaticTextItem availTimeField; - private StaticTextItem downField; private StaticTextItem downTimeField; - private StaticTextItem disabledField; private StaticTextItem disabledTimeField; private StaticTextItem failureCountField; private StaticTextItem disabledCountField; @@ -71,29 +69,16 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { availabilitySummaryPieGraph = new AvailabilitySummaryPieGraphType(); setWidth100(); - setHeight(265); + setHeight(165); } @Override protected void onInit() { super.onInit(); - addMember(createGraphMarker()); addMember(createSummaryForm()); } - public HTMLFlow createGraphMarker() { - Log.debug("drawGraph marker in AvailabilitySummaryPieGraph"); - - StringBuilder divAndSvgDefs = new StringBuilder(); - divAndSvgDefs.append("<div id=\"availSummaryChart" - + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:100px;\">"); - divAndSvgDefs.append("</svg></div>"); - HTMLFlow graph = new HTMLFlow(divAndSvgDefs.toString()); - graph.setWidth100(); - graph.setHeight(100); - //addMember(graph); - return graph; - } + private DynamicForm createSummaryForm() { DynamicForm form = new DynamicForm(); @@ -108,28 +93,16 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { currentField.setColSpan(4); // row 2 - availField = new StaticTextItem("avail", MSG.view_resource_monitor_availability_availability()); - availField.setWrapTitle(false); - prepareTooltip(availField, MSG.view_resource_monitor_availability_availability_tooltip()); - availTimeField = new StaticTextItem("availTime", MSG.view_resource_monitor_availability_uptime()); availTimeField.setWrapTitle(false); prepareTooltip(availTimeField, MSG.view_resource_monitor_availability_uptime_tooltip()); // row 3 - downField = new StaticTextItem("down", MSG.view_resource_monitor_availability_down()); - downField.setWrapTitle(false); - prepareTooltip(downField, MSG.view_resource_monitor_availability_down_tooltip()); - downTimeField = new StaticTextItem("downTime", MSG.view_resource_monitor_availability_downtime()); downTimeField.setWrapTitle(false); prepareTooltip(downTimeField, MSG.view_resource_monitor_availability_downtime_tooltip()); // row 4 - disabledField = new StaticTextItem("disabled", MSG.view_resource_monitor_availability_disabled()); - disabledField.setWrapTitle(false); - prepareTooltip(disabledField, MSG.view_resource_monitor_availability_disabled_tooltip()); - disabledTimeField = new StaticTextItem("disabledTime", MSG.view_resource_monitor_availability_disabledTime()); disabledTimeField.setWrapTitle(false); prepareTooltip(disabledTimeField, MSG.view_resource_monitor_availability_disabledTime_tooltip()); @@ -164,7 +137,17 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { currentTimeField.setColSpan(4); currentTimeField.setShowTitle(false); - form.setItems(currentField, availField, availTimeField, downField, downTimeField, disabledField, + CanvasItem availPieChartItem = new CanvasItem(); + //@todo: i18n + availPieChartItem.setTitle("Availability"); + availPieChartItem.setCanvas(availabilitySummaryPieGraph.createGraphMarker()); + availPieChartItem.setRowSpan(3); + availPieChartItem.setVAlign(VerticalAlignment.TOP); + availPieChartItem.setTitleVAlign(VerticalAlignment.TOP); + availPieChartItem.setHeight(60); + availPieChartItem.setWidth(60); + + form.setItems(currentField, availPieChartItem, availTimeField, downTimeField, disabledTimeField, failureCountField, disabledCountField, mtbfField, mttrField, unknownField, currentTimeField); @@ -181,6 +164,7 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { public void onSuccess(ResourceAvailabilitySummary result) { Log.debug("reloadSummaryData"); + //@todo: i18n availabilitySummaryPieGraph.setAvailabilityData( "Up", result.getUpPercentage(), "Down", result.getDownPercentage(), @@ -197,16 +181,10 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { currentField.setValue(MSG.view_resource_monitor_availability_currentStatus_value(result .getCurrent().getName(), TimestampCellFormatter.format(result.getLastChange().getTime()))); - availField.setValue(MeasurementConverterClient.format(result.getUpPercentage(), - MeasurementUnits.PERCENTAGE, true)); availTimeField.setValue(MeasurementConverterClient.format((double) result.getUpTime(), MeasurementUnits.MILLISECONDS, true)); - downField.setValue(MeasurementConverterClient.format(result.getDownPercentage(), - MeasurementUnits.PERCENTAGE, true)); downTimeField.setValue(MeasurementConverterClient.format((double) result.getDownTime(), MeasurementUnits.MILLISECONDS, true)); - disabledField.setValue(MeasurementConverterClient.format(result.getDisabledPercentage(), - MeasurementUnits.PERCENTAGE, true)); disabledTimeField.setValue(MeasurementConverterClient.format((double) result.getDisabledTime(), MeasurementUnits.MILLISECONDS, true)); failureCountField.setValue(result.getFailures()); commit 3d310c939d5018a9878a8fd836a220a5b2f018f4 Author: mtho11 <mikecthompson(a)gmail.com> Date: Mon Jul 29 20:07:11 2013 -0700 Availability pie chart for metrics page. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index 811a579..ee06724 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -230,6 +230,8 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { .attr("height", height + margin.top + margin.bottom) .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); + console.error("avail.chartSelection: "+ availChartContext.chartSelection); + svg.selectAll("rect.availBars") .data(availChartContext.data) @@ -329,7 +331,6 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { // Public API draw: function (availChartContext) { "use strict"; - console.log("AvailabilityChart"); drawBars(availChartContext); createHovers(); } @@ -338,7 +339,6 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { }(); - console.log("Avail Data records: "+availChartContext.data.length); if (typeof availChartContext.data !== 'undefined' && availChartContext.data.length > 0) { availabilityGraph.draw(availChartContext); console.log("Availability Chart Drawn"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java new file mode 100644 index 0000000..23effb0 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java @@ -0,0 +1,133 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype; + +import org.rhq.enterprise.gui.coregui.client.util.Log; + +import java.util.ArrayList; +import java.util.List; + +/** + * Contains the javascript chart definition for an implementation of the d3 availability chart. This implementation is + * just a line that changes color based on availability type: up=green, down=red, orange=disabled, unknown=grey, + * empty=grey, warn=yellow. This version of the availability graph shows continuous intervals. + * + * @author Mike Thompson + */ +public class AvailabilitySummaryPieGraphType { + + private List<AvailabilitySummary> availabilitySummaries; + + public AvailabilitySummaryPieGraphType() { + } + + public void setAvailabilityData(String upLabel, double upPercent, String downLabel, double downPercent, String disabledLabel, double disabledPercent ){ + availabilitySummaries = new ArrayList<AvailabilitySummary>(); + availabilitySummaries.add(new AvailabilitySummary(upLabel, upPercent)); + availabilitySummaries.add(new AvailabilitySummary(downLabel, downPercent)); + availabilitySummaries.add(new AvailabilitySummary(disabledLabel, disabledPercent)); + + } + + public String getAvailabilitySummaryJson() { + StringBuilder sb = new StringBuilder("["); + if (null != availabilitySummaries) { + // loop through the avail intervals + for (AvailabilitySummary availabilitySummary : availabilitySummaries) { + sb.append("{ \"label\":\"" + availabilitySummary.getLabel() + "\", "); + sb.append(" \"value\": \"" + availabilitySummary.getValue() * 100 + "\" },"); + } + sb.setLength(sb.length() - 1); + } + + sb.append("]"); + Log.debug(sb.toString()); + return sb.toString(); + } + + /** + * The magic JSNI to draw the charts with d3. + */ + public native void drawJsniChart() /*-{ + console.log("Draw Availability Summary Pie Chart"); + + var data = this.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilitySummaryPieGraphType::getAvailabilitySummaryJson()(); + + var w = 100, + h = 100, + r = 30, + color = $wnd.d3.scale.category10(); + + var vis = $wnd.d3.select("#availSummaryChart svg") + .append("g") + .data(data) + .attr("width", w) + .attr("height", h) + .attr("transform", "translate(" + r + "," + r + ")"); + + var arc = $wnd.d3.svg.arc() + .outerRadius(r); + + var pie = $wnd.d3.layout.pie(); + + var arcs = vis.selectAll("g.slice") + .data(pie) + .enter() + .append("g") + .attr("class", "slice"); + + arcs.append("path") + .attr("fill", function (d, i) { + return color(i); + }) + .attr("d", arc); + + arcs.append("text") + .attr("transform", function (d) { + d.innerRadius = 0; + d.outerRadius = r; + return "translate(" + arc.centroid(d) + ")"; + }) + .attr("text-anchor", "middle") + .text(function (d, i) { + return data[i].value; + }); + console.warn("done with avail summary pie graph"); + + }-*/; + + + private static class AvailabilitySummary { + final private String label; + final private double value; + + private AvailabilitySummary(String label, double value) { + this.label = label; + this.value = value; + } + + private String getLabel() { + return label; + } + + private double getValue() { + return value; + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 09a7bc3..82a9d98 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -305,7 +305,7 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re int startRow = dataArrivedEvent.getStartRow(); int endRow = dataArrivedEvent.getEndRow(); for (int i = startRow; i < endRow; i++) { - if (null != metricsTableView.expandedRows + if (null != metricsTableView && null != metricsTableView.expandedRows && metricsTableView.expandedRows.contains(getRecord(i).getAttributeAsInt( MetricsViewDataSource.FIELD_METRIC_DEF_ID))) { expandRecord(getRecord(i)); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java index 9d6b892..961ea5a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java @@ -20,7 +20,9 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; +import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.StaticTextItem; @@ -31,6 +33,8 @@ import org.rhq.core.domain.resource.composite.ResourceAvailabilitySummary; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilitySummaryPieGraphType; +import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; @@ -58,22 +62,39 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { private StaticTextItem unknownField; private StaticTextItem currentTimeField; + private AvailabilitySummaryPieGraphType availabilitySummaryPieGraph; + public ResourceMetricAvailabilityView(Resource resource) { super(); this.resource = resource; + availabilitySummaryPieGraph = new AvailabilitySummaryPieGraphType(); setWidth100(); - setHeight(165); + setHeight(265); } @Override protected void onInit() { super.onInit(); - + addMember(createGraphMarker()); addMember(createSummaryForm()); } + public HTMLFlow createGraphMarker() { + Log.debug("drawGraph marker in AvailabilitySummaryPieGraph"); + + StringBuilder divAndSvgDefs = new StringBuilder(); + divAndSvgDefs.append("<div id=\"availSummaryChart" + + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:100px;\">"); + divAndSvgDefs.append("</svg></div>"); + HTMLFlow graph = new HTMLFlow(divAndSvgDefs.toString()); + graph.setWidth100(); + graph.setHeight(100); + //addMember(graph); + return graph; + } + private DynamicForm createSummaryForm() { DynamicForm form = new DynamicForm(); form.setWidth100(); @@ -158,6 +179,21 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { @Override public void onSuccess(ResourceAvailabilitySummary result) { + Log.debug("reloadSummaryData"); + + availabilitySummaryPieGraph.setAvailabilityData( + "Up", result.getUpPercentage(), + "Down", result.getDownPercentage(), + "Disabled" ,result.getDisabledPercentage() + ); + new Timer(){ + + @Override + public void run() { + Log.debug("Run Avail Graph"); + availabilitySummaryPieGraph.drawJsniChart(); + } + }.schedule(150); currentField.setValue(MSG.view_resource_monitor_availability_currentStatus_value(result .getCurrent().getName(), TimestampCellFormatter.format(result.getLastChange().getTime()))); @@ -189,6 +225,8 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { currentTimeField.setValue(MSG.view_resource_monitor_availability_currentAsOf(TimestampCellFormatter .format(result.getCurrentTime()))); + + } @Override

1 0

[rhq] modules/plugins
by John Sanda 30 Jul '13

30 Jul '13

modules/plugins/rhq-storage/src/test/resources/cassandra.yaml | 690 ++++++++++ 1 file changed, 690 insertions(+) New commits: commit b8bb84b69f992e3fd06fdd2c70b7482f421c6909 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 30 16:13:09 2013 -0400 forgot to add test resource file in previous commit diff --git a/modules/plugins/rhq-storage/src/test/resources/cassandra.yaml b/modules/plugins/rhq-storage/src/test/resources/cassandra.yaml new file mode 100644 index 0000000..fd7973b --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/resources/cassandra.yaml @@ -0,0 +1,690 @@ +# Cassandra storage config YAML + +# NOTE: +# See http://wiki.apache.org/cassandra/StorageConfiguration for +# full explanations of configuration directives +# /NOTE + +# The name of the cluster. This is mainly used to prevent machines in +# one logical cluster from joining another. +cluster_name: rhq + +# This defines the number of tokens randomly assigned to this node on the ring +# The more tokens, relative to other nodes, the larger the proportion of data +# that this node will store. You probably want all nodes to have the same number +# of tokens assuming they have equal hardware capability. +# +# If you leave this unspecified, Cassandra will use the default of 1 token for legacy compatibility, +# and will use the initial_token as described below. +# +# Specifying initial_token will override this setting. +# +# If you already have a cluster with 1 token per node, and wish to migrate to +# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations +num_tokens: 256 + +# If you haven't specified num_tokens, or have set it to the default of 1 then +# you should always specify InitialToken when setting up a production +# cluster for the first time, and often when adding capacity later. +# The principle is that each node should be given an equal slice of +# the token ring; see http://wiki.apache.org/cassandra/Operations +# for more details. +# +# If blank, Cassandra will request a token bisecting the range of +# the heaviest-loaded existing node. If there is no load information +# available, such as is the case with a new cluster, it will pick +# a random token, which will lead to hot spots. +#initial_token: + +# See http://wiki.apache.org/cassandra/HintedHandoff +hinted_handoff_enabled: true +# this defines the maximum amount of time a dead host will have hints +# generated. After it has been dead this long, new hints for it will not be +# created until it has been seen alive and gone down again. +max_hint_window_in_ms: 10800000 # 3 hours +# throttle in KB's per second, per delivery thread +hinted_handoff_throttle_in_kb: 1024 +# Number of threads with which to deliver hints; +# Consider increasing this number when you have multi-dc deployments, since +# cross-dc handoff tends to be slower +max_hints_delivery_threads: 2 + +# The following setting populates the page cache on memtable flush and compaction +# WARNING: Enable this setting only when the whole node's data fits in memory. +# Defaults to: false +# populate_io_cache_on_flush: false + +# Authentication backend, implementing IAuthenticator; used to identify users +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator, +# PasswordAuthenticator}. +# +# - AllowAllAuthenticator performs no checks - set it to disable authentication. +# - PasswordAuthenticator relies on username/password pairs to authenticate +# users. It keeps usernames and hashed passwords in system_auth.credentials table. +# Please increase system_auth keyspace replication factor if you use this authenticator. +authenticator: org.apache.cassandra.auth.PasswordAuthenticator + +# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer, +# CassandraAuthorizer}. +# +# - AllowAllAuthorizer allows any action to any user - set it to disable authorization. +# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please +# increase system_auth keyspace replication factor if you use this authorizer. +authorizer: org.apache.cassandra.auth.CassandraAuthorizer + +# Validity period for permissions cache (fetching permissions can be an +# expensive operation depending on the authorizer, CassandraAuthorizer is +# one example). Defaults to 2000, set to 0 to disable. +# Will be disabled automatically for AllowAllAuthorizer. +permissions_validity_in_ms: 2000 + +# The partitioner is responsible for distributing rows (by key) across +# nodes in the cluster. Any IPartitioner may be used, including your +# own as long as it is on the classpath. Out of the box, Cassandra +# provides org.apache.cassandra.dht.{Murmur3Partitioner, RandomPartitioner +# ByteOrderedPartitioner, OrderPreservingPartitioner (deprecated)}. +# +# - RandomPartitioner distributes rows across the cluster evenly by md5. +# This is the default prior to 1.2 and is retained for compatibility. +# - Murmur3Partitioner is similar to RandomPartioner but uses Murmur3_128 +# Hash Function instead of md5. When in doubt, this is the best option. +# - ByteOrderedPartitioner orders rows lexically by key bytes. BOP allows +# scanning rows in key order, but the ordering can generate hot spots +# for sequential insertion workloads. +# - OrderPreservingPartitioner is an obsolete form of BOP, that stores +# - keys in a less-efficient format and only works with keys that are +# UTF8-encoded Strings. +# - CollatingOPP colates according to EN,US rules rather than lexical byte +# ordering. Use this as an example if you need custom collation. +# +# See http://wiki.apache.org/cassandra/Operations for more on +# partitioners and token selection. +partitioner: org.apache.cassandra.dht.Murmur3Partitioner + +# directories where Cassandra should store data on disk. +data_file_directories: + - /Users/jsanda/Development/redhat/rhq/rhq-data/storage-1/data + +# commit log +commitlog_directory: /Users/jsanda/Development/redhat/rhq/rhq-data/storage-1/commit_log + +# policy for data disk failures: +# stop: shut down gossip and Thrift, leaving the node effectively dead, but +# still inspectable via JMX. +# best_effort: stop using the failed disk and respond to requests based on +# remaining available sstables. This means you WILL see obsolete +# data at CL.ONE! +# ignore: ignore fatal errors and let requests fail, as in pre-1.2 Cassandra +disk_failure_policy: stop + +# Maximum size of the key cache in memory. +# +# Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the +# minimum, sometimes more. The key cache is fairly tiny for the amount of +# time it saves, so it's worthwhile to use it at large numbers. +# The row cache saves even more time, but must store the whole values of +# its rows, so it is extremely space-intensive. It's best to only use the +# row cache if you have hot rows or static rows. +# +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is empty to make it "auto" (min(5% of Heap (in MB), 100MB)). Set to 0 to disable key cache. +key_cache_size_in_mb: + +# Duration in seconds after which Cassandra should +# safe the keys cache. Caches are saved to saved_caches_directory as +# specified in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 14400 or 4 hours. +key_cache_save_period: 14400 + +# Number of keys from the key cache to save +# Disabled by default, meaning all keys are going to be saved +# key_cache_keys_to_save: 100 + +# Maximum size of the row cache in memory. +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is 0, to disable row caching. +row_cache_size_in_mb: 0 + +# Duration in seconds after which Cassandra should +# safe the row cache. Caches are saved to saved_caches_directory as specified +# in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 0 to disable saving the row cache. +row_cache_save_period: 0 + +# Number of keys from the row cache to save +# Disabled by default, meaning all keys are going to be saved +# row_cache_keys_to_save: 100 + +# The provider for the row cache to use. +# +# Supported values are: ConcurrentLinkedHashCacheProvider, SerializingCacheProvider +# +# SerializingCacheProvider serialises the contents of the row and stores +# it in native memory, i.e., off the JVM Heap. Serialized rows take +# significantly less memory than "live" rows in the JVM, so you can cache +# more rows in a given memory footprint. And storing the cache off-heap +# means you can use smaller heap sizes, reducing the impact of GC pauses. +# +# It is also valid to specify the fully-qualified class name to a class +# that implements org.apache.cassandra.cache.IRowCacheProvider. +# +# Defaults to SerializingCacheProvider +row_cache_provider: SerializingCacheProvider + +# saved caches +saved_caches_directory: /Users/jsanda/Development/redhat/rhq/rhq-data/storage-1/saved_caches + +# commitlog_sync may be either "periodic" or "batch." +# When in batch mode, Cassandra won't ack writes until the commit log +# has been fsynced to disk. It will wait up to +# commitlog_sync_batch_window_in_ms milliseconds for other writes, before +# performing the sync. +# +# commitlog_sync: batch +# commitlog_sync_batch_window_in_ms: 50 +# +# the other option is "periodic" where writes may be acked immediately +# and the CommitLog is simply synced every commitlog_sync_period_in_ms +# milliseconds. +commitlog_sync: periodic +commitlog_sync_period_in_ms: 10000 + +# The size of the individual commitlog file segments. A commitlog +# segment may be archived, deleted, or recycled once all the data +# in it (potentally from each columnfamily in the system) has been +# flushed to sstables. +# +# The default size is 32, which is almost always fine, but if you are +# archiving commitlog segments (see commitlog_archiving.properties), +# then you probably want a finer granularity of archiving; 8 or 16 MB +# is reasonable. +commitlog_segment_size_in_mb: 32 + +# any class that implements the SeedProvider interface and has a +# constructor that takes a Map<String, String> of parameters will do. +seed_provider: + # Addresses of hosts that are deemed contact points. + # Cassandra nodes use this list of hosts to find each other and learn + # the topology of the ring. You must change this if you are running + # multiple nodes! + - class_name: org.apache.cassandra.locator.SimpleSeedProvider + parameters: + # seeds is actually a comma-delimited list of addresses. + # Ex: "<ip1>,<ip2>,<ip3>" + - seeds: "127.0.0.1" + +# emergency pressure valve: each time heap usage after a full (CMS) +# garbage collection is above this fraction of the max, Cassandra will +# flush the largest memtables. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +# +# RELYING ON THIS AS YOUR PRIMARY TUNING MECHANISM WILL WORK POORLY: +# it is most effective under light to moderate load, or read-heavy +# workloads; under truly massive write load, it will often be too +# little, too late. +flush_largest_memtables_at: 0.75 + +# emergency pressure valve #2: the first time heap usage after a full +# (CMS) garbage collection is above this fraction of the max, +# Cassandra will reduce cache maximum _capacity_ to the given fraction +# of the current _size_. Should usually be set substantially above +# flush_largest_memtables_at, since that will have less long-term +# impact on the system. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +reduce_cache_sizes_at: 0.85 +reduce_cache_capacity_to: 0.6 + +# For workloads with more data than can fit in memory, Cassandra's +# bottleneck will be reads that need to fetch data from +# disk. "concurrent_reads" should be set to (16 * number_of_drives) in +# order to allow the operations to enqueue low enough in the stack +# that the OS and drives can reorder them. +# +# On the other hand, since writes are almost never IO bound, the ideal +# number of "concurrent_writes" is dependent on the number of cores in +# your system; (8 * number_of_cores) is a good rule of thumb. +concurrent_reads: 32 +concurrent_writes: 32 + +# Total memory to use for memtables. Cassandra will flush the largest +# memtable when this much memory is used. +# If omitted, Cassandra will set it to 1/3 of the heap. +# memtable_total_space_in_mb: 2048 + +# Total space to use for commitlogs. Since commitlog segments are +# mmapped, and hence use up address space, the default size is 32 +# on 32-bit JVMs, and 1024 on 64-bit JVMs. +# +# If space gets above this value (it will round up to the next nearest +# segment multiple), Cassandra will flush every dirty CF in the oldest +# segment and remove it. So a small total commitlog space will tend +# to cause more flush activity on less-active columnfamilies. +# commitlog_total_space_in_mb: 4096 + +# This sets the amount of memtable flush writer threads. These will +# be blocked by disk io, and each one will hold a memtable in memory +# while blocked. If you have a large heap and many data directories, +# you can increase this value for better flush performance. +# By default this will be set to the amount of data directories defined. +#memtable_flush_writers: 1 + +# the number of full memtables to allow pending flush, that is, +# waiting for a writer thread. At a minimum, this should be set to +# the maximum number of secondary indexes created on a single CF. +memtable_flush_queue_size: 4 + +# Whether to, when doing sequential writing, fsync() at intervals in +# order to force the operating system to flush the dirty +# buffers. Enable this to avoid sudden dirty buffer flushing from +# impacting read latencies. Almost always a good idea on SSD:s; not +# necessarily on platters. +trickle_fsync: false +trickle_fsync_interval_in_kb: 10240 + +# TCP port, for commands and data +storage_port: 7100 + +# SSL port, for encrypted communication. Unused unless enabled in +# encryption_options +ssl_storage_port: 7101 + +# Address to bind to and tell other Cassandra nodes to connect to. You +# _must_ change this if you want multiple nodes to be able to +# communicate! +# +# Leaving it blank leaves it up to InetAddress.getLocalHost(). This +# will always do the Right Thing *if* the node is properly configured +# (hostname, name resolution, etc), and the Right Thing is to use the +# address associated with the hostname (it might not be). +# +# Setting this to 0.0.0.0 is always wrong. +listen_address: 127.0.0.1 + +# Address to broadcast to other Cassandra nodes +# Leaving this blank will set it to the same value as listen_address +# broadcast_address: 1.2.3.4 + +# Internode authentication backend, implementing IInternodeAuthenticator; +# used to allow/disallow connections from peer nodes. +internode_authenticator: org.rhq.cassandra.auth.RhqInternodeAuthenticator + +# Whether to start the native transport server. +# Currently, only the thrift server is started by default because the native +# transport is considered beta. +# Please note that the address on which the native transport is bound is the +# same as the rpc_address. The port however is different and specified below. +start_native_transport: true +# port for the CQL native transport to listen for clients on +native_transport_port: 9142 +# The minimum and maximum threads for handling requests when the native +# transport is used. The meaning is those is similar to the one of +# rpc_min_threads and rpc_max_threads, though the default differ slightly and +# are the ones below: +# native_transport_min_threads: 16 +native_transport_max_threads: 128 + + +# Whether to start the thrift rpc server. +start_rpc: false +# The address to bind the Thrift RPC service to -- clients connect +# here. Unlike ListenAddress above, you *can* specify 0.0.0.0 here if +# you want Thrift to listen on all interfaces. +# +# Leaving this blank has the same effect it does for ListenAddress, +# (i.e. it will be based on the configured hostname of the node). +rpc_address: 127.0.0.1 +# port for Thrift to listen for clients on +rpc_port: 9160 + +# enable or disable keepalive on rpc connections +rpc_keepalive: true + +# Cassandra provides three out-of-the-box options for the RPC Server: +# +# sync -> One thread per thrift connection. For a very large number of clients, memory +# will be your limiting factor. On a 64 bit JVM, 128KB is the minimum stack size +# per thread, and that will correspond to your use of virtual memory (but physical memory +# may be limited depending on use of stack space). +# +# hsha -> Stands for "half synchronous, half asynchronous." All thrift clients are handled +# asynchronously using a small number of threads that does not vary with the amount +# of thrift clients (and thus scales well to many clients). The rpc requests are still +# synchronous (one thread per active request). +# +# The default is sync because on Windows hsha is about 30% slower. On Linux, +# sync/hsha performance is about the same, with hsha of course using less memory. +# +# Alternatively, can provide your own RPC server by providing the fully-qualified class name +# of an o.a.c.t.TServerFactory that can create an instance of it. +rpc_server_type: sync + +# Uncomment rpc_min|max_thread to set request pool size limits. +# +# Regardless of your choice of RPC server (see above), the number of maximum requests in the +# RPC thread pool dictates how many concurrent requests are possible (but if you are using the sync +# RPC server, it also dictates the number of clients that can be connected at all). +# +# The default is unlimited and thus provide no protection against clients overwhelming the server. You are +# encouraged to set a maximum that makes sense for you in production, but do keep in mind that +# rpc_max_threads represents the maximum number of client requests this server may execute concurrently. +# +# rpc_min_threads: 16 +# rpc_max_threads: 2048 + +# uncomment to set socket buffer sizes on rpc connections +# rpc_send_buff_size_in_bytes: +# rpc_recv_buff_size_in_bytes: + +# uncomment to set socket buffer size for internode communication +# Note that when setting this, the buffer size is limited by net.core.wmem_max +# and when not setting it it is defined by net.ipv4.tcp_wmem +# See: +# /proc/sys/net/core/wmem_max +# /proc/sys/net/core/rmem_max +# /proc/sys/net/ipv4/tcp_wmem +# /proc/sys/net/ipv4/tcp_wmem +# and: man tcp +# internode_send_buff_size_in_bytes: +# internode_recv_buff_size_in_bytes: + +# Frame size for thrift (maximum field length). +thrift_framed_transport_size_in_mb: 15 + +# The max length of a thrift message, including all fields and +# internal thrift overhead. +thrift_max_message_length_in_mb: 16 + +# Set to true to have Cassandra create a hard link to each sstable +# flushed or streamed locally in a backups/ subdirectory of the +# Keyspace data. Removing these links is the operator's +# responsibility. +incremental_backups: false + +# Whether or not to take a snapshot before each compaction. Be +# careful using this option, since Cassandra won't clean up the +# snapshots for you. Mostly useful if you're paranoid when there +# is a data format change. +snapshot_before_compaction: false + +# Whether or not a snapshot is taken of the data before keyspace truncation +# or dropping of column families. The STRONGLY advised default of true +# should be used to provide data safety. If you set this flag to false, you will +# lose data on truncation or drop. +auto_snapshot: true + +# Add column indexes to a row after its contents reach this size. +# Increase if your column values are large, or if you have a very large +# number of columns. The competing causes are, Cassandra has to +# deserialize this much of the row to read a single column, so you want +# it to be small - at least if you do many partial-row reads - but all +# the index data is read for each access, so you don't want to generate +# that wastefully either. +column_index_size_in_kb: 64 + +# Size limit for rows being compacted in memory. Larger rows will spill +# over to disk and use a slower two-pass compaction process. A message +# will be logged specifying the row key. +in_memory_compaction_limit_in_mb: 64 + +# Number of simultaneous compactions to allow, NOT including +# validation "compactions" for anti-entropy repair. Simultaneous +# compactions can help preserve read performance in a mixed read/write +# workload, by mitigating the tendency of small sstables to accumulate +# during a single long running compactions. The default is usually +# fine and if you experience problems with compaction running too +# slowly or too fast, you should look at +# compaction_throughput_mb_per_sec first. +# +# concurrent_compactors defaults to the number of cores. +# Uncomment to make compaction mono-threaded, the pre-0.8 default. +#concurrent_compactors: 1 + +# Multi-threaded compaction. When enabled, each compaction will use +# up to one thread per core, plus one thread per sstable being merged. +# This is usually only useful for SSD-based hardware: otherwise, +# your concern is usually to get compaction to do LESS i/o (see: +# compaction_throughput_mb_per_sec), not more. +multithreaded_compaction: false + +# Throttles compaction to the given total throughput across the entire +# system. The faster you insert data, the faster you need to compact in +# order to keep the sstable count down, but in general, setting this to +# 16 to 32 times the rate you are inserting data is more than sufficient. +# Setting this to 0 disables throttling. Note that this account for all types +# of compaction, including validation compaction. +compaction_throughput_mb_per_sec: 16 + +# Track cached row keys during compaction, and re-cache their new +# positions in the compacted sstable. Disable if you use really large +# key caches. +compaction_preheat_key_cache: true + +# Throttles all outbound streaming file transfers on this node to the +# given total throughput in Mbps. This is necessary because Cassandra does +# mostly sequential IO when streaming data during bootstrap or repair, which +# can lead to saturating the network connection and degrading rpc performance. +# When unset, the default is 200 Mbps or 25 MB/s. +# stream_throughput_outbound_megabits_per_sec: 200 + +# How long the coordinator should wait for read operations to complete +read_request_timeout_in_ms: 20000 +# How long the coordinator should wait for seq or index scans to complete +range_request_timeout_in_ms: 20000 +# How long the coordinator should wait for writes to complete +write_request_timeout_in_ms: 20000 +# How long the coordinator should wait for truncates to complete +# (This can be much longer, because we need to flush all CFs +# to make sure we can clear out anythink in the commitlog that could +# cause truncated data to reappear.) +truncate_request_timeout_in_ms: 60000 +# The default timeout for other, miscellaneous operations +request_timeout_in_ms: 20000 + +# Enable operation timeout information exchange between nodes to accurately +# measure request timeouts, If disabled cassandra will assuming the request +# was forwarded to the replica instantly by the coordinator +# +# Warning: before enabling this property make sure to ntp is installed +# and the times are synchronized between the nodes. +cross_node_timeout: false + +# Enable socket timeout for streaming operation. +# When a timeout occurs during streaming, streaming is retried from the start +# of the current file. This *can* involve re-streaming an important amount of +# data, so you should avoid setting the value too low. +# Default value is 0, which never timeout streams. +# streaming_socket_timeout_in_ms: 0 + +# phi value that must be reached for a host to be marked down. +# most users should never need to adjust this. +# phi_convict_threshold: 8 + +# endpoint_snitch -- Set this to a class that implements +# IEndpointSnitch. The snitch has two functions: +# - it teaches Cassandra enough about your network topology to route +# requests efficiently +# - it allows Cassandra to spread replicas around your cluster to avoid +# correlated failures. It does this by grouping machines into +# "datacenters" and "racks." Cassandra will do its best not to have +# more than one replica on the same "rack" (which may not actually +# be a physical location) +# +# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER, +# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS +# ARE PLACED. +# +# Out of the box, Cassandra provides +# - SimpleSnitch: +# Treats Strategy order as proximity. This improves cache locality +# when disabling read repair, which can further improve throughput. +# Only appropriate for single-datacenter deployments. +# - PropertyFileSnitch: +# Proximity is determined by rack and data center, which are +# explicitly configured in cassandra-topology.properties. +# - GossipingPropertyFileSnitch +# The rack and datacenter for the local node are defined in +# cassandra-rackdc.properties and propagated to other nodes via gossip. If +# cassandra-topology.properties exists, it is used as a fallback, allowing +# migration from the PropertyFileSnitch. +# - RackInferringSnitch: +# Proximity is determined by rack and data center, which are +# assumed to correspond to the 3rd and 2nd octet of each node's +# IP address, respectively. Unless this happens to match your +# deployment conventions (as it did Facebook's), this is best used +# as an example of writing a custom Snitch class. +# - Ec2Snitch: +# Appropriate for EC2 deployments in a single Region. Loads Region +# and Availability Zone information from the EC2 API. The Region is +# treated as the Datacenter, and the Availability Zone as the rack. +# Only private IPs are used, so this will not work across multiple +# Regions. +# - Ec2MultiRegionSnitch: +# Uses public IPs as broadcast_address to allow cross-region +# connectivity. (Thus, you should set seed addresses to the public +# IP as well.) You will need to open the storage_port or +# ssl_storage_port on the public IP firewall. (For intra-Region +# traffic, Cassandra will switch to the private IP after +# establishing a connection.) +# +# You can use a custom Snitch by setting this to the full class name +# of the snitch, which will be assumed to be on your classpath. +endpoint_snitch: SimpleSnitch + +# controls how often to perform the more expensive part of host score +# calculation +dynamic_snitch_update_interval_in_ms: 100 +# controls how often to reset all host scores, allowing a bad host to +# possibly recover +dynamic_snitch_reset_interval_in_ms: 600000 +# if set greater than zero and read_repair_chance is < 1.0, this will allow +# 'pinning' of replicas to hosts in order to increase cache capacity. +# The badness threshold will control how much worse the pinned host has to be +# before the dynamic snitch will prefer other replicas over it. This is +# expressed as a double which represents a percentage. Thus, a value of +# 0.2 means Cassandra would continue to prefer the static snitch values +# until the pinned host was 20% worse than the fastest. +dynamic_snitch_badness_threshold: 0.1 + +# request_scheduler -- Set this to a class that implements +# RequestScheduler, which will schedule incoming client requests +# according to the specific policy. This is useful for multi-tenancy +# with a single Cassandra cluster. +# NOTE: This is specifically for requests from the client and does +# not affect inter node communication. +# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place +# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of +# client requests to a node with a separate queue for each +# request_scheduler_id. The scheduler is further customized by +# request_scheduler_options as described below. +request_scheduler: org.apache.cassandra.scheduler.NoScheduler + +# Scheduler Options vary based on the type of scheduler +# NoScheduler - Has no options +# RoundRobin +# - throttle_limit -- The throttle_limit is the number of in-flight +# requests per client. Requests beyond +# that limit are queued up until +# running requests can complete. +# The value of 80 here is twice the number of +# concurrent_reads + concurrent_writes. +# - default_weight -- default_weight is optional and allows for +# overriding the default which is 1. +# - weights -- Weights are optional and will default to 1 or the +# overridden default_weight. The weight translates into how +# many requests are handled during each turn of the +# RoundRobin, based on the scheduler id. +# +# request_scheduler_options: +# throttle_limit: 80 +# default_weight: 5 +# weights: +# Keyspace1: 1 +# Keyspace2: 5 + +# request_scheduler_id -- An identifer based on which to perform +# the request scheduling. Currently the only valid option is keyspace. +# request_scheduler_id: keyspace + +# index_interval controls the sampling of entries from the primrary +# row index in terms of space versus time. The larger the interval, +# the smaller and less effective the sampling will be. In technicial +# terms, the interval coresponds to the number of index entries that +# are skipped between taking each sample. All the sampled entries +# must fit in memory. Generally, a value between 128 and 512 here +# coupled with a large key cache size on CFs results in the best trade +# offs. This value is not often changed, however if you have many +# very small rows (many to an OS page), then increasing this will +# often lower memory usage without a impact on performance. +index_interval: 128 + +# Enable or disable inter-node encryption +# Default settings are TLS v1, RSA 1024-bit keys (it is imperative that +# users generate their own keys) TLS_RSA_WITH_AES_128_CBC_SHA as the cipher +# suite for authentication, key exchange and encryption of the actual data transfers. +# NOTE: No custom encryption options are enabled at the moment +# The available internode options are : all, none, dc, rack +# +# If set to dc cassandra will encrypt the traffic between the DCs +# If set to rack cassandra will encrypt the traffic between the racks +# +# The passwords used in these options must match the passwords used when generating +# the keystore and truststore. For instructions on generating these files, see: +# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSS… +# +server_encryption_options: + internode_encryption: none + keystore: conf/.keystore + keystore_password: cassandra + truststore: conf/.truststore + truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + # require_client_auth: false + +# enable or disable client/server encryption. +client_encryption_options: + enabled: false + keystore: conf/.keystore + keystore_password: cassandra + # require_client_auth: false + # Set trustore and truststore_password if require_client_auth is true + # truststore: conf/.truststore + # truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + +# internode_compression controls whether traffic between nodes is +# compressed. +# can be: all - all traffic is compressed +# dc - traffic between different datacenters is compressed +# none - nothing is compressed. +internode_compression: none + +# Enable or disable tcp_nodelay for inter-dc communication. +# Disabling it will result in larger (but fewer) network packets being sent, +# reducing overhead from the TCP protocol itself, at the cost of increasing +# latency if you block for cross-datacenter responses. +inter_dc_tcp_nodelay: true

1 0

[rhq] 3 commits - modules/common modules/plugins
by John Sanda 30 Jul '13

30 Jul '13

modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties | 2 modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java | 16 ++ modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java | 28 +++++ modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java | 55 ++++++++++ modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 11 ++ modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java | 41 ++++++- 6 files changed, 143 insertions(+), 10 deletions(-) New commits: commit 13371f91328e26f66d687196acbc6b7e5aab4bd0 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 30 14:28:38 2013 -0400 add resource config support for cql and gossip ports in rhq-storage plugin diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties index 1faee9d..2eb5ab5 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties @@ -13,7 +13,7 @@ heap_new="-Xmn64M" heap_dump_on_OOMError="-XX:+HeapDumpOnOutOfMemoryError" -heap_dump_dir="" +heap_dump_dir= thread_stack_size="-Xss180k" diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java index 5276c84..c53c19b 100644 --- a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java @@ -108,7 +108,7 @@ public class ConfigEditor { return (Integer) config.get("native_transport_port"); } - public void setNativeTransportPort(int port) { + public void setNativeTransportPort(Integer port) { config.put("native_transport_port", port); } @@ -116,7 +116,7 @@ public class ConfigEditor { return (Integer) config.get("storage_port"); } - public void setStoragePort(int port) { + public void setStoragePort(Integer port) { config.put("storage_port", port); } diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index dd5b8a2..edaf9f9 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -5,6 +5,12 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.yaml.snakeyaml.error.YAMLException; + +import org.rhq.cassandra.util.ConfigEditor; +import org.rhq.cassandra.util.ConfigEditorException; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PropertySimple; @@ -18,12 +24,16 @@ import org.rhq.core.util.StringUtil; */ public class StorageNodeConfigDelegate implements ConfigurationFacet { + private Log log = LogFactory.getLog(StorageNodeConfigDelegate.class); + private File jvmOptsFile; private File wrapperEnvFile; + private File cassandraYamlFile; public StorageNodeConfigDelegate(File basedir) { File confDir = new File(basedir, "conf"); jvmOptsFile = new File(confDir, "cassandra-jvm.properties"); + cassandraYamlFile = new File(confDir, "cassandra.yaml"); // for windows, config props also get propagated to the wrapper env if (isWindows()) { @@ -60,6 +70,11 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { config.put(new PropertySimple("heapDumpDir", new File(basedir, "bin").getAbsolutePath())); } + ConfigEditor yamlEditor = new ConfigEditor(cassandraYamlFile); + yamlEditor.load(); + config.put(new PropertySimple("cqlPort", yamlEditor.getNativeTransportPort())); + config.put(new PropertySimple("gossipPort", yamlEditor.getStoragePort())); + return config; } @@ -135,6 +150,7 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { Configuration config = configurationUpdateReport.getConfiguration(); updateCassandraJvmProps(config); + updateCassandraYaml(config); if (isWindows()) { updateWrapperEnv(config); @@ -145,6 +161,8 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { configurationUpdateReport.setErrorMessage("No configuration update was applied: " + e.getMessage()); } catch (IOException e) { configurationUpdateReport.setErrorMessageFromThrowable(e); + } catch (ConfigEditorException e) { + configurationUpdateReport.setErrorMessageFromThrowable(e); } } @@ -195,6 +213,43 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { propertiesUpdater.update(properties); } + private void updateCassandraYaml(Configuration newConfig) { + ConfigEditor editor = new ConfigEditor(cassandraYamlFile); + try { + editor.load(); + + PropertySimple cqlPortProperty = newConfig.getSimple("cqlPort"); + if (cqlPortProperty != null) { + editor.setNativeTransportPort(cqlPortProperty.getIntegerValue()); + } + + PropertySimple gossipPortProperty = newConfig.getSimple("gossipPort"); + if (gossipPortProperty != null) { + editor.setStoragePort(gossipPortProperty.getIntegerValue()); + } + + editor.save(); + } catch (ConfigEditorException e) { + if (e.getCause() instanceof YAMLException) { + log.error("Failed to update " + cassandraYamlFile); + log.info("Attempting to restore " + cassandraYamlFile); + try { + editor.restore(); + throw e; + } catch (ConfigEditorException e1) { + log.error("Failed to restore " + cassandraYamlFile + ". A copy of the file prior to any " + + "modifications can be found at " + editor.getBackupFile()); + throw new ConfigEditorException("There was an error updating " + cassandraYamlFile + " and " + + "undoing the changes failed. A copy of the file can be found at " + editor.getBackupFile() + + ". See the agent logs for more details.", e); + } + } else { + log.error("No updates were made to " + cassandraYamlFile + " due to an unexpected error", e); + throw e; + } + } + } + private void updateWrapperEnv(Configuration config) throws IOException { PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(wrapperEnvFile.getAbsolutePath()); Properties properties = propertiesUpdater.loadExistingProperties(); diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index f5a4f6d..84bb832 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -175,6 +175,17 @@ <c:simple-property name="heapDumpDir" displayName="Heap Dump Directory" required="false" description="The directory in which heap dumps will be written."/> </c:group> + <c:group name="Ports"> + <c:simple-property name="cqlPort" + displayName="CQL Port" + type="integer" + description="The port on which to listen for client requests over the native, CQL protocol. + This is a shared, cluster-wide setting."/> + <c:simple-property name="gossipPort" + type="integer" + description="The port used for internode communication. This is a shared, cluster-wide setting."/> + + </c:group> </resource-configuration> <server name="Cassandra Server JVM" diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java index 64d14b2..15861c1 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java @@ -6,17 +6,20 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.Method; import java.util.Properties; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import org.rhq.cassandra.util.ConfigEditor; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.util.file.FileUtil; +import org.rhq.core.util.stream.StreamUtil; /** * @author John Sanda @@ -25,6 +28,8 @@ public class StorageNodeConfigDelegateTest { private File basedir; + private File cassandraYamlFile; + private StorageNodeConfigDelegate configDelegate; @BeforeMethod @@ -33,6 +38,11 @@ public class StorageNodeConfigDelegateTest { basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); FileUtil.purge(basedir, true); configDelegate = new StorageNodeConfigDelegate(basedir); + + cassandraYamlFile = new File(confDir(), "cassandra.yaml"); + InputStream inputStream = getClass().getResourceAsStream("/cassandra.yaml"); + FileOutputStream outputStream = new FileOutputStream(cassandraYamlFile); + StreamUtil.copy(inputStream, outputStream); } @@ -55,13 +65,24 @@ public class StorageNodeConfigDelegateTest { public void updateValidConfig() throws Exception { createDefaultConfig(); - Configuration config = new Configuration(); - config.put(new PropertySimple("minHeapSize", "1024M")); - config.put(new PropertySimple("maxHeapSize", "1024M")); - config.put(new PropertySimple("heapNewSize", "256M")); - config.put(new PropertySimple("threadStackSize", "240")); - config.put(new PropertySimple("heapDumpOnOOMError", true)); - config.put(new PropertySimple("heapDumpDir", confDir())); + Configuration config = Configuration.builder() + .addSimple("minHeapSize", "1024M") + .addSimple("maxHeapSize", "1024M") + .addSimple("heapNewSize", "256M") + .addSimple("threadStackSize", "240") + .addSimple("heapDumpOnOOMError", true) + .addSimple("heapDumpDir", confDir()) + .addSimple("cqlPort", 9595) + .addSimple("gossipPort", 9696) + .build(); +// config.put(new PropertySimple("minHeapSize", "1024M")); +// config.put(new PropertySimple("maxHeapSize", "1024M")); +// config.put(new PropertySimple("heapNewSize", "256M")); +// config.put(new PropertySimple("threadStackSize", "240")); +// config.put(new PropertySimple("heapDumpOnOOMError", true)); +// config.put(new PropertySimple("heapDumpDir", confDir())); +// config.put(new PropertySimple("cqlPort", 9595)); +// config.put(new PropertySimple("gossipPort", 9696)); ConfigurationUpdateReport report = new ConfigurationUpdateReport(config); @@ -78,6 +99,12 @@ public class StorageNodeConfigDelegateTest { "Failed to update property [heap_dump_on_OOMError]"); assertEquals(properties.getProperty("heap_dump_dir"), confDir().getAbsolutePath(), "Failed to update property [heap_dump_dir]"); + + ConfigEditor yamlEditor = new ConfigEditor(cassandraYamlFile); + yamlEditor.load(); + + assertEquals(yamlEditor.getNativeTransportPort(), (Integer) 9595, "Failed to update native_transport_port"); + assertEquals(yamlEditor.getStoragePort(), (Integer) 9696, "Failed to update storage_port"); } @Test commit 6de86c41792464bdab2197227ba32df34e77e16d Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 30 13:17:15 2013 -0400 make dataFileDirectories property read/write diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java index 9e1f86b..5276c84 100644 --- a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java @@ -88,6 +88,10 @@ public class ConfigEditor { return (List<String>) config.get("data_file_directories"); } + public void setDataFileDirectories(List<String> dirs) { + config.put("data_file_directories", dirs); + } + public String getSavedCachesDirectory() { return (String) config.get("saved_caches_directory"); } diff --git a/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java b/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java index f339b48..9c3cc16 100644 --- a/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java +++ b/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java @@ -1,5 +1,6 @@ package org.rhq.cassandra.util; +import static java.util.Arrays.asList; import static org.testng.Assert.assertEquals; import java.io.File; @@ -88,6 +89,24 @@ public class ConfigEditorTest { assertEquals(editor.getStoragePort(), config.storage_port, "Failed to fetch storage_port"); } + @Test + public void updateDataFilesDirectories() throws Exception { + ConfigEditor editor = new ConfigEditor(configFile); + editor.load(); + editor.setDataFileDirectories(asList("/data/dir1", "/data/dir2", "data/dir3")); + editor.save(); + + Config config = loadConfig(); + + assertEquals(config.data_file_directories, new String[] {"/data/dir1", "/data/dir2", "data/dir3"}, + "Failed to update data_file_directories"); + + editor.load(); + + assertEquals(editor.getDataFileDirectories().toArray(new String[3]), config.data_file_directories, + "Failed to fetch data_file_directories"); + } + private Config loadConfig() throws Exception { FileInputStream inputStream = new FileInputStream(configFile); org.yaml.snakeyaml.constructor.Constructor constructor = commit 8affd85fb953f7b32e1439cefc436285546cb662 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 30 12:57:25 2013 -0400 make storagePort and nativeTransportPort read/write properties diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java index 0b4a127..9e1f86b 100644 --- a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java @@ -100,10 +100,18 @@ public class ConfigEditor { params.put("seeds", StringUtil.arrayToString(seeds)); } + public Integer getNativeTransportPort() { + return (Integer) config.get("native_transport_port"); + } + public void setNativeTransportPort(int port) { config.put("native_transport_port", port); } + public Integer getStoragePort() { + return (Integer) config.get("storage_port"); + } + public void setStoragePort(int port) { config.put("storage_port", port); } diff --git a/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java b/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java index cf344e2..f339b48 100644 --- a/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java +++ b/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java @@ -65,6 +65,11 @@ public class ConfigEditorTest { Config config = loadConfig(); assertEquals(config.native_transport_port, (Integer) 9393, "Failed to update native_transport_port"); + + editor.load(); + + assertEquals(editor.getNativeTransportPort(), config.native_transport_port, + "Failed to fetch native_transport_port"); } @Test @@ -77,6 +82,10 @@ public class ConfigEditorTest { Config config = loadConfig(); assertEquals(config.storage_port, (Integer) 6767, "Failed to update storage_port"); + + editor.load(); + + assertEquals(editor.getStoragePort(), config.storage_port, "Failed to fetch storage_port"); } private Config loadConfig() throws Exception {

1 0

[rhq] modules/core modules/enterprise
by John Sanda 30 Jul '13

30 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 366 +++++++--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java | 7 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandler.java | 17 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java | 90 ++ 7 files changed, 418 insertions(+), 88 deletions(-) New commits: commit 490af59ea3141e94f865475df51ba061db82a716 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 30 10:53:24 2013 -0400 adding back support for deploying additional nodes with internode authentication When the user installs a new storage node the following steps occur, * The node is committed into inventory (but not part of storage cluster) * StorageNode entity is created with mode set to INSTALLED * New node is announced to the cluster * Server schedules operation for cluster nodes to update internode auth conf file to include the new node * Server prepares new node for bootstrap * Schedules operation on new node to * Apply cluster settings * Update internode auth conf settings * Restart the node so it bootstraps into cluster * Token ranges will be assigned to node * New node will stream data from other nodes * Server is notified that new node is up and part of the cluster * The operation mode is set to NORMAL * addNodeMaintenance operation is run on each cluster node * Updates replication_factor if necessary * Runs repair if necessary * Deletes old keys * Updates seeds property diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java index 575edc74..f4d3934 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java @@ -56,6 +56,8 @@ import org.rhq.core.domain.resource.Resource; + " FROM StorageNode s " // + "LEFT JOIN FETCH s.resource r " // + " WHERE s.address = :address"), + @NamedQuery(name = StorageNode.QUERY_FIND_ALL_BY_MODE, query = + "SELECT s FROM StorageNode s WHERE s.operationMode = :operationMode"), @NamedQuery(name = StorageNode.QUERY_FIND_ALL_NOT_INSTALLED, query = "SELECT s FROM StorageNode s WHERE NOT s.operationMode = 'INSTALLED'"), @NamedQuery(name = StorageNode.QUERY_FIND_ALL_NORMAL, query = "SELECT s FROM StorageNode s WHERE s.operationMode = 'NORMAL'"), @NamedQuery(name = StorageNode.QUERY_DELETE_BY_ID, query = "" // @@ -91,6 +93,7 @@ public class StorageNode implements Serializable { public static final String QUERY_FIND_ALL = "StorageNode.findAll"; public static final String QUERY_FIND_BY_ADDRESS = "StorageNode.findByAddress"; + public static final String QUERY_FIND_ALL_BY_MODE = "StorageNode.findAllByMode"; public static final String QUERY_FIND_ALL_NOT_INSTALLED = "StorageNode.findAllCloudMembers"; public static final String QUERY_DELETE_BY_ID = "StorageNode.deleteById"; public static final String QUERY_FIND_ALL_NORMAL = "StorageNode.findAllNormalCloudMembers"; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 049cf42..ee0f406 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -24,6 +24,8 @@ */ package org.rhq.enterprise.server.cloud; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -47,6 +49,7 @@ import org.quartz.JobDataMap; import org.quartz.SimpleTrigger; import org.quartz.Trigger; +import org.rhq.cassandra.schema.SchemaManager; import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; @@ -57,6 +60,8 @@ import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.common.JobTrigger; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertyList; +import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; @@ -73,6 +78,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; +import org.rhq.core.util.StringUtil; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.alert.AlertManagerLocal; import org.rhq.enterprise.server.auth.SubjectManagerLocal; @@ -82,6 +88,7 @@ import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal; import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal; import org.rhq.enterprise.server.operation.OperationManagerLocal; +import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; import org.rhq.enterprise.server.rest.reporting.MeasurementConverter; @@ -100,6 +107,14 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private final Log log = LogFactory.getLog(StorageNodeManagerBean.class); + private static final String USERNAME_PROPERTY = "rhq.cassandra.username"; + private static final String PASSWORD_PROPERTY = "rhq.cassandra.password"; + private final static String MAINTENANCE_OPERATION = "addNodeMaintenance"; + private final static String MAINTENANCE_OPERATION_NOTE = "Topology change maintenance."; + private final static String RUN_REPAIR_PROPERTY = "runRepair"; + private final static String UPDATE_SEEDS_LIST = "updateSeedsList"; + private final static String SEEDS_LIST = "seedsList"; + private static final String RHQ_STORAGE_CQL_PORT_PROPERTY = "nativeTransportPort"; private static final String RHQ_STORAGE_JMX_PORT_PROPERTY = "jmxPort"; private static final String RHQ_STORAGE_ADDRESS_PROPERTY = "host"; @@ -139,46 +154,86 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @EJB private StorageNodeManagerLocal storageNodeManger; + @EJB + private ResourceManagerLocal resourceManager; + @Override public void linkResource(Resource resource) { - List<StorageNode> storageNodes = this.getStorageNodes(); - Configuration resourceConfig = resource.getPluginConfiguration(); - String configAddress = resourceConfig.getSimpleValue(RHQ_STORAGE_ADDRESS_PROPERTY); - - if (configAddress != null) { - // TODO Do not add the node to the group until we have verified it has joined the cluster - // StorageNodeMaintenanceJob currently determines if a new node has successfully joined the cluster. - addStorageNodeToGroup(resource); - - boolean storageNodeFound = false; - if (storageNodes != null) { - for (StorageNode storageNode : storageNodes) { - if (configAddress.equals(storageNode.getAddress())) { - storageNode.setResource(resource); - storageNode.setOperationMode(OperationMode.NORMAL); - storageNodeFound = true; - break; - } - } - } + String address = resourceConfig.getSimpleValue(RHQ_STORAGE_ADDRESS_PROPERTY); - if (!storageNodeFound) { - int cqlPort = Integer.parseInt(resourceConfig.getSimpleValue(RHQ_STORAGE_CQL_PORT_PROPERTY)); - int jmxPort = Integer.parseInt(resourceConfig.getSimpleValue(RHQ_STORAGE_JMX_PORT_PROPERTY)); + if (log.isInfoEnabled()) { + log.info("Linking " + resource + " to storage node at " + address); + } + try { + StorageNode storageNode = findStorageNodeByAddress(InetAddress.getByName(address)); - StorageNode storageNode = new StorageNode(); - storageNode.setAddress(configAddress); - storageNode.setCqlPort(cqlPort); - storageNode.setJmxPort(jmxPort); + if (storageNode != null) { + if (log.isInfoEnabled()) { + log.info(storageNode + " is an existing storage node. No cluster maintenance is necessary."); + } storageNode.setResource(resource); storageNode.setOperationMode(OperationMode.NORMAL); + addStorageNodeToGroup(resource); + } else { + storageNode = new StorageNode(); + storageNode.setAddress(address); + storageNode.setCqlPort(Integer.parseInt(resourceConfig.getSimpleValue(RHQ_STORAGE_CQL_PORT_PROPERTY))); + storageNode.setJmxPort(Integer.parseInt(resourceConfig.getSimpleValue(RHQ_STORAGE_JMX_PORT_PROPERTY))); + storageNode.setResource(resource); + storageNode.setOperationMode(OperationMode.INSTALLED); entityManager.persist(storageNode); -// scheduleQuartzJob(storageNodes.size()); + if (log.isInfoEnabled()) { + log.info(storageNode + " is a new storage node and not part of the storage node cluster."); + log.info("Scheduling maintenance operations to bring " + storageNode + " into the cluster..."); + } + + announceNewNode(storageNode); } + } catch (UnknownHostException e) { + throw new RuntimeException("Could not resolve address [" + address + "]. The resource " + resource + + " cannot be linked to a storage node", e); + } + } + + private void announceNewNode(StorageNode newStorageNode) { + if (log.isInfoEnabled()) { + log.info("Announcing " + newStorageNode + " to storage node cluster."); + } + + ResourceGroup storageNodeGroup = getStorageNodeGroup(); + + GroupOperationSchedule schedule = new GroupOperationSchedule(); + schedule.setGroup(storageNodeGroup); + schedule.setHaltOnFailure(false); + schedule.setExecutionOrder(new ArrayList<Resource>(storageNodeGroup.getExplicitResources())); + schedule.setJobTrigger(JobTrigger.createNowTrigger()); + schedule.setSubject(subjectManager.getOverlord()); + schedule.setOperationName("updateKnownNodes"); + + Configuration parameters = new Configuration(); + parameters.put(createPropertyListOfAddresses("ipAddresses", combine(getStorageNodes(), newStorageNode))); + schedule.setParameters(parameters); + + operationManager.scheduleGroupOperation(subjectManager.getOverlord(), schedule); + } + + private List<StorageNode> combine(List<StorageNode> storageNodes, StorageNode storageNode) { + List<StorageNode> newList = new ArrayList<StorageNode>(storageNodes.size() + 1); + newList.addAll(storageNodes); + newList.add(storageNode); + + return newList; + } + + private PropertyList createPropertyListOfAddresses(String propertyName, List<StorageNode> nodes) { + PropertyList list = new PropertyList(propertyName); + for (StorageNode storageNode : nodes) { + list.add(new PropertySimple("address", storageNode.getAddress())); } + return list; } @Override @@ -214,7 +269,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN ResourceGroup group = getStorageNodeGroup(); resourceGroupManager.addResourcesToGroup(subjectManager.getOverlord(), group.getId(), - new int[] {resource.getId()}); + new int[]{resource.getId()}); } @Override @@ -232,6 +287,13 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN } @Override + public void addToStorageNodeGroup(StorageNode storageNode) { + storageNode.setOperationMode(OperationMode.NORMAL); + entityManager.merge(storageNode); + addStorageNodeToGroup(storageNode.getResource()); + } + + @Override public ResourceGroup getStorageNodeGroup() { Subject overlord = subjectManager.getOverlord(); @@ -398,6 +460,19 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return runner.execute(); } + public StorageNode findStorageNodeByAddress(InetAddress address) { + TypedQuery<StorageNode> query = entityManager.<StorageNode> createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS, + StorageNode.class); + query.setParameter("address", address.getHostAddress()); + List<StorageNode> result = query.getResultList(); + + if (result != null && result.size() > 0) { + return result.get(0); + } + + return null; + } + @Override @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS), @RequiredPermission(Permission.MANAGE_INVENTORY) }) @@ -472,19 +547,6 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN entityManager.flush(); } - private StorageNode findStorageNodeByAddress(String address) { - TypedQuery<StorageNode> query = entityManager.<StorageNode> createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS, - StorageNode.class); - query.setParameter("address", address); - List<StorageNode> result = query.getResultList(); - - if (result != null && result.size() > 0) { - return result.get(0); - } - - return null; - } - private StorageNodeLoadComposite.MeasurementAggregateWithUnits getMeasurementAggregateWithUnits(Subject subject, int schedId, MeasurementUnits units, long beginTime, long endTime) { MeasurementAggregate measurementAggregate = measurementManager.getAggregate(subject, schedId, beginTime, @@ -641,63 +703,68 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @Override public boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) { - StorageNode storageNode = findStorageNodeByAddress(storageNodeConfiguration.getStorageNode().getAddress()); + try { + StorageNode storageNode = findStorageNodeByAddress(InetAddress.getByName( + storageNodeConfiguration.getStorageNode().getAddress())); + + if (storageNode != null && storageNode.getResource() != null) { + Configuration parameters = new Configuration(); + parameters.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); + if (storageNodeConfiguration.getHeapSize() != null) { + parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); + } + if (storageNodeConfiguration.getHeapNewSize() != null) { + parameters.setSimpleValue("heapNewSize", storageNodeConfiguration.getHeapNewSize() + ""); + } + if (storageNodeConfiguration.getThreadStackSize() != null) { + parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); + } + parameters.setSimpleValue("restartIfRequired", "false"); - if (storageNode != null && storageNode.getResource() != null) { - Configuration parameters = new Configuration(); - parameters.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); - if (storageNodeConfiguration.getHeapSize() != null) { - parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); - } - if (storageNodeConfiguration.getHeapNewSize() != null) { - parameters.setSimpleValue("heapNewSize", storageNodeConfiguration.getHeapNewSize() + ""); - } - if (storageNodeConfiguration.getThreadStackSize() != null) { - parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); - } - parameters.setSimpleValue("restartIfRequired", "false"); + Resource storageNodeResource = storageNode.getResource(); - Resource storageNodeResource = storageNode.getResource(); + boolean result = runOperationAndWaitForResult(subject, storageNodeResource, UPDATE_CONFIGURATION_OPERATION, + parameters); - boolean result = runOperationAndWaitForResult(subject, storageNodeResource, UPDATE_CONFIGURATION_OPERATION, - parameters); + if (result) { + //2. Update the JMX port + //this is a fast operation compared to the restart + storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); + entityManager.merge(storageNode); - if (result) { - //2. Update the JMX port - //this is a fast operation compared to the restart - storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); - entityManager.merge(storageNode); + //3. Restart the storage node + result = runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, + new Configuration()); - //3. Restart the storage node - result = runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, - new Configuration()); + //4. Update the plugin configuration to talk with the new server + //Up to this point communication with the storage node should not have been affected by the intermediate + //changes + Configuration storageNodePluginConfig = configurationManager.getPluginConfiguration(subject, + storageNodeResource.getId()); - //4. Update the plugin configuration to talk with the new server - //Up to this point communication with the storage node should not have been affected by the intermediate - //changes - Configuration storageNodePluginConfig = configurationManager.getPluginConfiguration(subject, - storageNodeResource.getId()); + String existingJMXPort = storageNodePluginConfig.getSimpleValue("jmxPort"); + String newJMXPort = storageNodeConfiguration.getJmxPort() + ""; - String existingJMXPort = storageNodePluginConfig.getSimpleValue("jmxPort"); - String newJMXPort = storageNodeConfiguration.getJmxPort() + ""; + if (!existingJMXPort.equals(newJMXPort)) { + storageNodePluginConfig.setSimpleValue("jmxPort", newJMXPort); - if (!existingJMXPort.equals(newJMXPort)) { - storageNodePluginConfig.setSimpleValue("jmxPort", newJMXPort); + String existingConnectionURL = storageNodePluginConfig.getSimpleValue("connectorAddress"); + String newConnectionURL = existingConnectionURL.replace(":" + existingJMXPort + "/", ":" + + storageNodeConfiguration.getJmxPort() + "/"); + storageNodePluginConfig.setSimpleValue("connectorAddress", newConnectionURL); - String existingConnectionURL = storageNodePluginConfig.getSimpleValue("connectorAddress"); - String newConnectionURL = existingConnectionURL.replace(":" + existingJMXPort + "/", ":" - + storageNodeConfiguration.getJmxPort() + "/"); - storageNodePluginConfig.setSimpleValue("connectorAddress", newConnectionURL); + configurationManager.updatePluginConfiguration(subject, storageNodeResource.getId(), + storageNodePluginConfig); + } - configurationManager.updatePluginConfiguration(subject, storageNodeResource.getId(), - storageNodePluginConfig); + return result; } - - return result; } - } - return false; + return false; + } catch (UnknownHostException e) { + throw new RuntimeException("Failed to resolve address for " + storageNodeConfiguration, e); + } } @Override @@ -754,4 +821,129 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return successResultFound; } -} + + @Override + public void prepareNewNodesForBootstrap() { + List<StorageNode> newStorageNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE) + .setParameter("operationMode", OperationMode.INSTALLED).getResultList(); + if (newStorageNodes.isEmpty()) { + throw new RuntimeException("Failed to find storage node to bootstrap into cluster."); + } + // Right now, without some user input, we can only reliably bootstrap one node at a + // time. To support bootstrapping multiple nodes concurrently, a mechanism will have + // to be put in place for the user to declare in advance the nodes that are coming + // online. Then we can wait until all declared nodes have been committed into + // inventory and announced to the cluster + StorageNode storageNode = newStorageNodes.get(0); + + if (log.isInfoEnabled()) { + log.info("Preparing to bootstrap " + storageNode + " into cluster..."); + } + + List<StorageNode> existingStorageNodes = getStorageNodes(); + + ResourceOperationSchedule schedule = new ResourceOperationSchedule(); + schedule.setResource(storageNode.getResource()); + schedule.setJobTrigger(JobTrigger.createNowTrigger()); + schedule.setSubject(subjectManager.getOverlord()); + schedule.setOperationName("prepareForBootstrap"); + + Configuration parameters = new Configuration(); + parameters.put(new PropertySimple("cqlPort", existingStorageNodes.get(0).getCqlPort())); + // TODO need to add support for storage_port in cassandra/storage plugins + parameters.put(new PropertySimple("gossipPort", 7100)); + parameters.put(createPropertyListOfAddresses("storageNodeIPAddresses", getStorageNodes())); + + schedule.setParameters(parameters); + + operationManager.scheduleResourceOperation(subjectManager.getOverlord(), schedule); + } + + @Override + public void runAddNodeMaintenance() { + log.info("Preparing to schedule addNodeMaintenance on the storage cluster..."); + + List<StorageNode> storageNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, + StorageNode.class).setParameter("operationMode", OperationMode.NORMAL).getResultList(); + + int clusterSize = storageNodes.size(); + boolean isReadRepairNeeded; + + if (clusterSize >= 4) { + // At 4 nodes we increase the RF to 3. We are not increasing the RF beyond + // that for additional nodes; so, there is no need to run repair if we are + // expanding from a 4 node cluster since the RF remains the same. + isReadRepairNeeded = false; + } else if (clusterSize == 1) { + // The RF will increase since we are going from a single to a multi-node + // cluster; therefore, we want to run repair. + isReadRepairNeeded = true; + } else if (clusterSize == 2) { + if (storageNodes.size() > 3) { + // If we go from 2 to > 3 nodes we will increase the RF to 3; therefore + // we want to run repair. + isReadRepairNeeded = true; + } else { + // If we go from 2 to 3 nodes, we keep the RF at 2 so there is no need + // to run repair. + isReadRepairNeeded = false; + } + } else if (clusterSize == 3) { + // We are increasing the cluster size > 3 which means the RF will be + // updated to 3; therefore, we want to run repair. + isReadRepairNeeded = true; + } else { + // If we cluster size of zero, then something is really screwed up. It + // should always be > 0. + isReadRepairNeeded = storageNodes.size() > 1; + } + + if (isReadRepairNeeded) { + updateTopology(storageNodes); + } + + ResourceGroup storageNodeGroup = getStorageNodeGroup(); + + GroupOperationSchedule schedule = new GroupOperationSchedule(); + schedule.setGroup(storageNodeGroup); + schedule.setHaltOnFailure(false); + schedule.setExecutionOrder(new ArrayList<Resource>(storageNodeGroup.getExplicitResources())); + schedule.setJobTrigger(JobTrigger.createNowTrigger()); + schedule.setSubject(subjectManager.getOverlord()); + schedule.setOperationName(MAINTENANCE_OPERATION); + schedule.setDescription(MAINTENANCE_OPERATION_NOTE); + + Configuration config = new Configuration(); + config.put(createPropertyListOfAddresses(SEEDS_LIST, storageNodes)); + config.put(new PropertySimple(RUN_REPAIR_PROPERTY, isReadRepairNeeded)); + config.put(new PropertySimple(UPDATE_SEEDS_LIST, Boolean.TRUE)); + + schedule.setParameters(config); + + operationManager.scheduleGroupOperation(subjectManager.getOverlord(), schedule); + } + + private boolean updateTopology(List<StorageNode> storageNodes) { + String username = getRequiredStorageProperty(USERNAME_PROPERTY); + String password = getRequiredStorageProperty(PASSWORD_PROPERTY); + SchemaManager schemaManager = new SchemaManager(username, password, storageNodes); + try{ + return schemaManager.updateTopology(false); + } catch (Exception e) { + log.error("An error occurred while applying schema topology changes", e); + } + + return false; + } + + private String getRequiredStorageProperty(String property) { + String value = System.getProperty(property); + if (StringUtil.isEmpty(property)) { + throw new IllegalStateException("The system property [" + property + "] is not set. The RHQ " + + "server will not be able connect to the RHQ storage node(s). This property should be defined " + + "in rhq-server.properties."); + } + return value; + } + +} \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index 15fa85c..00ba9e7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -18,6 +18,7 @@ */ package org.rhq.enterprise.server.cloud; +import java.net.InetAddress; import java.util.List; import javax.ejb.Local; @@ -106,6 +107,8 @@ public interface StorageNodeManagerLocal { */ PageList<Alert> findAllStorageNodeAlerts(Subject subject, StorageNode storageNode); + StorageNode findStorageNodeByAddress(InetAddress address); + /** * Find ids for all resources and sub-resources of Storage Nodes that @@ -170,6 +173,8 @@ public interface StorageNodeManagerLocal { */ boolean storageNodeGroupExists(); + void addToStorageNodeGroup(StorageNode storageNode); + /** * This method assumes the storage node resource group already exists; as such, it should only be called from places * in the code that are after the point(s) where the group has been created. @@ -181,4 +186,8 @@ public interface StorageNodeManagerLocal { void scheduleOperationInNewTransaction(Subject subject, ResourceOperationSchedule schedule); + void prepareNewNodesForBootstrap(); + + void runAddNodeMaintenance(); + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java index 088f13e..5d3b1ae 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java @@ -96,6 +96,7 @@ import org.rhq.enterprise.server.resource.ResourceNotFoundException; import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; import org.rhq.enterprise.server.resource.group.ResourceGroupNotFoundException; import org.rhq.enterprise.server.scheduler.SchedulerLocal; +import org.rhq.enterprise.server.storage.StorageNodeOperationsHandler; import org.rhq.enterprise.server.util.CriteriaQueryGenerator; import org.rhq.enterprise.server.util.CriteriaQueryRunner; @@ -123,6 +124,9 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan @EJB private SubjectManagerLocal subjectManager; + @EJB + private StorageNodeOperationsHandler storageNodeOperationsHandler; + @SuppressWarnings("unchecked") public List<IntegerOptionItem> getResourceNameOptionItems(int groupId) { String queryName = ResourceGroup.QUERY_FIND_RESOURCE_NAMES_BY_GROUP_ID; @@ -917,7 +921,7 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan if (history.getParameters() != null) { history.getParameters().getId(); // eagerly reload the parameters } - + storageNodeOperationsHandler.handleOperationUpdateIfNecessary(history); notifyAlertConditionCacheManager("updateOperationHistory", history); return history; } @@ -1723,6 +1727,7 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan if (!stillInProgress) { groupHistory.setErrorMessage((groupErrorMessage == null) ? null : groupErrorMessage.toString()); groupHistory.setStatus(groupStatus); + storageNodeOperationsHandler.handleGroupOperationUpdateIfNecessary(groupHistory); notifyAlertConditionCacheManager("checkForCompletedGroupOperation", groupHistory); } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java index ec28888..0b404bb 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java @@ -9,7 +9,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.cloud.Server; +import org.rhq.core.domain.cloud.StorageNode; import org.rhq.enterprise.server.auth.SubjectManagerLocal; +import org.rhq.enterprise.server.cloud.StorageNodeManagerLocal; import org.rhq.enterprise.server.cloud.TopologyManagerLocal; import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; @@ -36,6 +38,18 @@ public class StorageClusterMonitor implements StorageStateListener { log.info("Taking server out of maintenance mode"); updateServerMode(Server.OperationMode.NORMAL); } + + StorageNodeManagerLocal storageNodeManager = LookupUtil.getStorageNodeManager(); + StorageNode newClusterNode = storageNodeManager.findStorageNodeByAddress(address); + + if (newClusterNode == null) { + log.error("Did not find storage node with address [" + address.getHostAddress() + "]. This should not " + + "happen."); + } else { + log.info("Adding " + newClusterNode + " to storage cluster and scheduling cluster maintenance..."); + storageNodeManager.addToStorageNodeGroup(newClusterNode); + storageNodeManager.runAddNodeMaintenance(); + } } @Override diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandler.java new file mode 100644 index 0000000..96e8de8 --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandler.java @@ -0,0 +1,17 @@ +package org.rhq.enterprise.server.storage; + +import javax.ejb.Asynchronous; + +import org.rhq.core.domain.operation.GroupOperationHistory; +import org.rhq.core.domain.operation.OperationHistory; + +/** + * @author John Sanda + */ +public interface StorageNodeOperationsHandler { + @Asynchronous + void handleOperationUpdateIfNecessary(OperationHistory operationHistory); + + @Asynchronous + void handleGroupOperationUpdateIfNecessary(GroupOperationHistory operationHistory); +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java new file mode 100644 index 0000000..6da5cca --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java @@ -0,0 +1,90 @@ +package org.rhq.enterprise.server.storage; + +import javax.ejb.Asynchronous; +import javax.ejb.EJB; +import javax.ejb.Stateless; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.core.domain.operation.GroupOperationHistory; +import org.rhq.core.domain.operation.OperationDefinition; +import org.rhq.core.domain.operation.OperationHistory; +import org.rhq.core.domain.operation.OperationRequestStatus; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.enterprise.server.RHQConstants; +import org.rhq.enterprise.server.cloud.StorageNodeManagerLocal; + +/** + * @author John Sanda + */ +@Stateless +public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHandler { + + private final Log log = LogFactory.getLog(StorageNodeOperationsHandlerBean.class); + + private static final String STORAGE_NODE_TYPE_NAME = "RHQ Storage Node"; + private static final String STORAGE_NODE_PLUGIN_NAME = "RHQStorage"; + + @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) + private EntityManager entityManager; + + @EJB + private StorageNodeManagerLocal storageNodeManager; + + @Override + @Asynchronous + public void handleOperationUpdateIfNecessary(OperationHistory operationHistory) { +// if (isStorageNodeOperation(operationHistory.getOperationDefinition())) { +// if (operationHistory.getOperationDefinition().getName().equals("prepareForBootstrap")) { +// ResourceOperationHistory resourceOperationHistory = entityManager.find(ResourceOperationHistory.class, +// operationHistory.getId()); +// if (resourceOperationHistory.getStatus() == OperationRequestStatus.SUCCESS) { +// +// } +// StorageNode storageNode = findStorageNode(resourceOperationHistory.getResource()); +// storageNode.setOperationMode(StorageNode.OperationMode.NORMAL); +// } +// } + } + + private StorageNode findStorageNode(Resource resource) { + for (StorageNode storageNode : storageNodeManager.getStorageNodes()) { + if (storageNode.getResource().getId() == resource.getId()) { + return storageNode; + } + } + return null; + } + + @Override + @Asynchronous + public void handleGroupOperationUpdateIfNecessary(GroupOperationHistory groupOperationHistory) { + if (isStorageNodeOperation(groupOperationHistory.getOperationDefinition())) { + if (groupOperationHistory.getOperationDefinition().getName().equals("updateKnownNodes")) { + if (groupOperationHistory.getStatus() == OperationRequestStatus.SUCCESS) { + log.info("New storage has been successfully announced to the storage node cluster."); + storageNodeManager.prepareNewNodesForBootstrap(); + } else if (groupOperationHistory.getStatus() == OperationRequestStatus.FAILURE) { + log.warn("Failed to announce new storage node to the cluster. It cannot join the cluster until " + + "it has been announced to existing cluster nodes."); + } else if (groupOperationHistory.getStatus() == OperationRequestStatus.CANCELED) { + log.warn("New storage node has not been announced to the cluster. The group operation " + + groupOperationHistory.getOperationDefinition().getName() + " has been canceled. The new node " + + "cannot join the cluster until it has been announced to existing cluster nodes."); + } + } + } + } + + private boolean isStorageNodeOperation(OperationDefinition operationDefinition) { + ResourceType resourceType = operationDefinition.getResourceType(); + return resourceType.getName().equals(STORAGE_NODE_TYPE_NAME) && + resourceType.getPlugin().equals(STORAGE_NODE_PLUGIN_NAME); + } + +}

1 0

[rhq] Branch 'feature/bundle-group' - 2 commits - modules/core modules/enterprise
by Jay Shaughnessy 29 Jul '13

29 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java | 20 modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java | 35 modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java | 6 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java | 52 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java | 25 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 423 ++++++++-- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java | 20 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 45 - 17 files changed, 524 insertions(+), 113 deletions(-) New commits: commit b36674c735aea47d668f840e4cd53560de3e80d8 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jul 29 17:22:29 2013 -0400 In progress: working through the bundle remote API and adding fine-grained authz... diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java index 27ac704..5f86d8e 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java @@ -58,7 +58,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup; * @author Greg Hinkle */ @Entity -@NamedQueries( { +@NamedQueries({ @NamedQuery(name = Subject.QUERY_GET_SUBJECTS_ASSIGNED_TO_ROLE, query = "" // + "SELECT s " // @@ -139,6 +139,16 @@ import org.rhq.core.domain.resource.group.ResourceGroup; + " JOIN r.permissions p " // + " JOIN r.subjects s " // + " WHERE s.id = :subjectId and p = :permission ) ) "), + + @NamedQuery(name = Subject.QUERY_HAS_BUNDLE_PERMISSION, query = "SELECT COUNT(b) " + + "FROM Bundle b, IN (b.bundleGroups) bg, IN (bg.roles) r, IN (r.subjects) s, IN (r.permissions) p " + + "WHERE s = :subject AND b.id = :bundleId AND p = :permission"), + + @NamedQuery(name = Subject.QUERY_HAS_BUNDLE_GROUP_PERMISSION, query = "SELECT count(r) " + + "FROM Role r JOIN r.subjects s JOIN r.permissions p " + + "WHERE r in (SELECT r2 from BundleGroup bg JOIN bg.roles r2 WHERE bg.id = :bundleGroupId) " + + " AND s = :subject " + " AND p = :permission"), + @NamedQuery(name = Subject.QUERY_CAN_VIEW_RESOURCE, query = "SELECT COUNT(res) " + "FROM Resource res, IN (res.implicitGroups) g, IN (g.roles) r, IN (r.subjects) s " + "WHERE s = :subject AND res.id = :resourceId"), @@ -228,6 +238,8 @@ public class Subject implements Serializable { public static final String QUERY_HAS_PRIVATE_GROUP_PERMISSION = "Subject.hasPrivateGroupPermission"; public static final String QUERY_HAS_RESOURCE_PERMISSION = "Subject.hasResourcePermission"; public static final String QUERY_HAS_AUTO_GROUP_PERMISSION = "Subject.hasAutoGroupPermission"; + public static final String QUERY_HAS_BUNDLE_PERMISSION = "Subject.hasBundlePermission"; + public static final String QUERY_HAS_BUNDLE_GROUP_PERMISSION = "Subject.hasBundleGroupPermission"; /** This query can return more than 1 if the resource is accessible via separate groups */ public static final String QUERY_CAN_VIEW_RESOURCE = "Subject.canViewResource"; @@ -314,7 +326,8 @@ public class Subject implements Serializable { init(); } - public Subject(@NotNull String name, boolean factive, boolean fsystem) { + public Subject(@NotNull + String name, boolean factive, boolean fsystem) { init(); this.name = name; this.factive = factive; @@ -353,7 +366,8 @@ public class Subject implements Serializable { return this.name; } - public void setName(@NotNull String name) { + public void setName(@NotNull + String name) { this.name = name; } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java index 4ca733c..77f66fc 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java @@ -104,10 +104,8 @@ public enum Permission { CONFIGURE_WRITE(Target.RESOURCE), // 11 /** - * can C/U/D provisioning bundles + * can perform any bundle action, assigns all other bundle permissions */ - // NOTE: This is a GLOBAL permission, but is defined down here so as to maintain the ordinal indexes of the other - // pre-existing permissions. MANAGE_BUNDLE(Target.GLOBAL), // 12 /** @@ -124,7 +122,6 @@ public enum Permission { /** * Can C/U/D repositories and content sources */ - // NOTE: This is a GLOBAL permission but defined here to maintain the ordinal indexes MANAGE_REPOSITORIES(Target.GLOBAL), // 15 /** @@ -135,7 +132,6 @@ public enum Permission { /** * Can view other RHQ users, except for their assigned roles */ - // NOTE: This is a GLOBAL permission but defined here to maintain the ordinal indexes VIEW_USERS(Target.GLOBAL), // 17 /** @@ -146,54 +142,59 @@ public enum Permission { /** * Can create Bundle [Versions]s * Can assign to viewable bundle groups - * Can create global Bundle [Versions] if holding Global.VIEW_BUNDLES + * Can create unassigned Bundle [Versions] if holding Global.VIEW_BUNDLES */ CREATE_BUNDLES(Target.GLOBAL), // 19 /** * Can delete viewable bundle [Versions]s * Can unassign from viewable bundle groups - * Can delete global bundles if holding Global.VIEW_BUNDLES + * Can delete unassigned bundles if holding Global.VIEW_BUNDLES */ DELETE_BUNDLES(Target.GLOBAL), // 20 /** - * Can view any bundle, including global bundles + * Can view any bundle, including unassigned bundles */ VIEW_BUNDLES(Target.GLOBAL), // 21 /** - * Can deploy any viewable bundle version to any viewable (deployable, compatible) resource group + * Can deploy any viewable bundle version to any viewable [deployable, compatible] resource group */ DEPLOY_BUNDLES(Target.GLOBAL), // 22 /** - * Can assign viewable bundles to the bundle group + * Can assign viewable bundles to the bundle groups associated with the role. * - this can be a copy from another viewable bundle group - * - this can be a global bundle if holding Global.VIEW_BUNDLES + * - this can be an unassigned bundle if holding Global.VIEW_BUNDLES */ ASSIGN_BUNDLES_TO_GROUP(Target.BUNDLE), // 23 /** - * Can unassign bundles from the bundle group - * - the bundle is not deleted and becomes a global bundle if assigned to no other bundle group + * Can unassign bundles assigned to bundle groups associated with the role. + * - the bundle is not deleted and becomes an unassigned bundle if assigned to no other bundle group */ UNASSIGN_BUNDLES_FROM_GROUP(Target.BUNDLE), // 24 /** - * Can create bundle [version]s for this bundle group + * Can create [implicitly assigned] bundle [version]s for bundle groups associated with the role. */ CREATE_BUNDLES_IN_GROUP(Target.BUNDLE), // 25 /** - * Can delete bundle [version]s from the bundle group + * Can delete assigned bundle [version]s from the bundle groups associated with the role. */ DELETE_BUNDLES_FROM_GROUP(Target.BUNDLE), // 26 /** - * Implied - Can view bundles in the bundle group + * Implied - Can view the bundles assigned to the bundle groups associated with the role. */ - VIEW_BUNDLES_IN_GROUP(Target.BUNDLE) // 27 + VIEW_BUNDLES_IN_GROUP(Target.BUNDLE), // 27 + + /** + * Can deploy viewable bundles to the [compatible, deployable] resource groups associated with the role. + */ + DEPLOY_BUNDLES_TO_GROUP(Target.RESOURCE) // 28 ; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java index 7b5499f..3a8569f 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java @@ -105,6 +105,9 @@ public class Bundle implements Serializable { private List<BundleVersion> bundleVersions = new ArrayList<BundleVersion>(); @ManyToMany(mappedBy = "bundles", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) + private Set<BundleGroup> bundleGroups; + + @ManyToMany(mappedBy = "bundles", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) private Set<Tag> tags; public Bundle() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java index 5e80d82..77beefb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java @@ -431,6 +431,7 @@ public class PermissionsEditor extends EnhancedVStack { String permissionName = record.getAttribute(nameField); Permission permission = Permission.valueOf(permissionName); String permissionDisplayName = record.getAttribute("displayName"); + if (permission == Permission.VIEW_RESOURCE) { String messageString = MSG.view_adminRoles_permissions_readAccessImplied(permissionDisplayName); handleIllegalPermissionSelection(event, messageString); @@ -449,6 +450,11 @@ public class PermissionsEditor extends EnhancedVStack { String messageString = MSG .view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection(permissionDisplayName); handleIllegalPermissionSelection(event, messageString); + } else if (!authorized && selectedPermissions.contains(Permission.MANAGE_BUNDLE) + && Permission.BUNDLE_ALL.contains(permission)) { + String messageString = MSG + .view_adminRoles_permissions_illegalDeselectionDueToManageBundleSelection(permissionDisplayName); + handleIllegalPermissionSelection(event, messageString); } else { updatePermissions(authorized, permission); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 25f5171..5a42502 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -509,6 +509,7 @@ view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = Global Permissions view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} read permission cannot be deselected, unless the {0} write permission, which implies the read permission, is deselected first. +view_adminRoles_permissions_illegalDeselectionDueToManageBundleSelection = {0} permission cannot be deselected, unless Manage Bundle, which implies all Bundle permissions, is deselected first. view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permission cannot be deselected, unless Manage Inventory, which implies all Resource permissions, is deselected first. view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} permission cannot be deselected, unless the Manage Security permission, which implies all other permissions, is deselected first. view_adminRoles_permissions_isAuthorized = Authorized? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 8982a54..69c8452 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -528,6 +528,7 @@ view_adminRoles_permissions_autoselecting_manageSecurity_implied = Automaticky o view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = Globální povolení ##view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} read permission cannot be deselected, unless the {0} write permission, which implies the read permission, is deselected first. +##view_adminRoles_permissions_illegalDeselectionDueToManageBundleSelection = {0} permission cannot be deselected, unless Manage Bundle, which implies all Bundle permissions, is deselected first. ##view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permission cannot be deselected, unless Manage Inventory, which implies all Resource permissions, is deselected first. ##view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} permission cannot be deselected, unless the Manage Security permission, which implies all other permissions, is deselected first. view_adminRoles_permissions_isAuthorized = Autorizován? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index 8b086a7..ddd4686 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -507,6 +507,7 @@ view_adminRoles_noLdap = Die LDAP-Integration ist nicht konfiguriert. Um LDAP zu view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = Globale Rechte ##view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} read permission cannot be deselected, unless the {0} write permission, which implies the read permission, is deselected first. +##view_adminRoles_permissions_illegalDeselectionDueToManageBundleSelection = {0} permission cannot be deselected, unless Manage Bundle, which implies all Bundle permissions, is deselected first. ##view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permission cannot be deselected, unless Manage Inventory, which implies all Resource permissions, is deselected first. ##view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} permission cannot be deselected, unless the Manage Security permission, which implies all other permissions, is deselected first. view_adminRoles_permissions_isAuthorized = Berechtigt? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index a78ab58..49cc7e6 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -506,6 +506,7 @@ view_adminRoles_permissions_autoselecting_manageSecurity_implied = 未選択の view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = グローバル権限 view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} 読み取り権限は選択解除できませんでした。読み取り権限を暗示する {0} 書き込み権限が最初に選択解除されなければそれはできません。 +##view_adminRoles_permissions_illegalDeselectionDueToManageBundleSelection = {0} permission cannot be deselected, unless Manage Bundle, which implies all Bundle permissions, is deselected first. view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} 権限は選択解除できませんでした。他のすべてのリソースを暗示する管理インベントリが最初に選択解除されなければそれはできません。 view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} 権限は選択解除できませんでした。他のすべての権限を暗示する管理セキュリティ権限が最初に選択解除されなければそれはできません。 view_adminRoles_permissions_isAuthorized = 権限があるか? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index a00f560..89c10c0 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -457,6 +457,7 @@ view_adminRoles_noLdap = LDAP 보안 통합이 설정되지 않았습니다. LDA view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = 글로벌 권한 view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} 읽기 권한은 선택 해제 할 수 없습니다. 읽기 권한을 암시하는 {0} 쓰기 권한이 먼저 선택 해제되어야 그것은 수행할 수 있습니다. +##view_adminRoles_permissions_illegalDeselectionDueToManageBundleSelection = {0} permission cannot be deselected, unless Manage Bundle, which implies all Bundle permissions, is deselected first. view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} 권한은 선택 해제 할 수 없습니다. 다른 모든 자원을 암시하는 관리 인벤토리가 먼저 선택 해제되어야 그것은 수행할 수 있습니다. view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} 권한은 선택 해제 할 수 없습니다. 다른 모든 권한을 암시하는 관리 보안 권한이 먼저 선택 해제되어야 그것은 수행할 수 있습니다. view_adminRoles_permissions_isAuthorized = 권한이 있습니까? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index e6a7864..26546fb 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -511,6 +511,7 @@ view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = Permiss\u00F5es Globais view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} permiss\u00E3o de leitura n\u00E3 pode ser desmarcada, a menos que {0} permiss\u00E3o de escrita, que implica na permiss\u00E3o de leitura, seja desmarcada primeiro. +##view_adminRoles_permissions_illegalDeselectionDueToManageBundleSelection = {0} permission cannot be deselected, unless Manage Bundle, which implies all Bundle permissions, is deselected first. view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permiss\u00E3o n\u00E3o pode ser desmarcada, a menos que Gerenciar Invent\u00E1rio, que implica todas as permiss\u00F5es de Recurso, seja desmarcada primeiro. view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} permiss\u00E3o n\u00E3o pode ser desmarcada, a menos que a permiss\u00E3 Gerenciar SeguranÁa, que implica em todas outras permissıes, seja desmarcada primeiro. view_adminRoles_permissions_isAuthorized = Autorizado? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 4f9a97e..5692d33 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -2591,6 +2591,7 @@ view_adminRoles_permissions_autoselecting_manageSecurity_implied = Автома view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = Глобальные полномчия view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} полномочия на чтение не могут быть отключены, пока предварительно {0} полномочия записи, которые включают полномочия на чтение, не будут отключены. +##view_adminRoles_permissions_illegalDeselectionDueToManageBundleSelection = {0} permission cannot be deselected, unless Manage Bundle, which implies all Bundle permissions, is deselected first. view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} полномочия не могут быть отключены, пока предварительно Manage Inventory, которая включает все полномочия ресурса, не будет отключено. view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} полномочия не могут быть отключены, пока предватильно Manage Security полномочие, которое включает все другие полномочия, не будет отключено. view_adminRoles_permissions_isAuthorized = Авторизованы? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 547ebd5..f126e51 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -500,6 +500,7 @@ view_adminRoles_noLdap = \u6ca1\u6709\u96c6\u6210LDAP\u5b89\u5168, \u5230<a {0}> view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = \u5168\u5c40\u6388\u6743 ##view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} read permission cannot be deselected, unless the {0} write permission, which implies the read permission, is deselected first. +##view_adminRoles_permissions_illegalDeselectionDueToManageBundleSelection = {0} permission cannot be deselected, unless Manage Bundle, which implies all Bundle permissions, is deselected first. ##view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permission cannot be deselected, unless Manage Inventory, which implies all Resource permissions, is deselected first. ##view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} permission cannot be deselected, unless the Manage Security permission, which implies all other permissions, is deselected first. view_adminRoles_permissions_isAuthorized = \u6388\u6743? diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java index 2fda53e..d71095f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java @@ -51,6 +51,7 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) private EntityManager entityManager; + @Override @SuppressWarnings("unchecked") public Set<Permission> getExplicitGlobalPermissions(Subject subject) { Query query = entityManager.createNamedQuery(Subject.QUERY_GET_GLOBAL_PERMISSIONS); @@ -66,6 +67,7 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { return results; } + @Override @SuppressWarnings("unchecked") public Set<Permission> getExplicitGroupPermissions(Subject subject, int groupId) { Set<Permission> result = new HashSet<Permission>(); @@ -99,12 +101,14 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { return result; } + @Override public Set<Permission> getImplicitGroupPermissions(Subject subject, int groupId) { Set<Permission> permissions = isInventoryManager(subject) ? Permission.RESOURCE_ALL : getExplicitGroupPermissions(subject, groupId); return permissions; } + @Override @SuppressWarnings("unchecked") public Set<Permission> getExplicitResourcePermissions(Subject subject, int resourceId) { Query query = entityManager.createNamedQuery(Subject.QUERY_GET_PERMISSIONS_BY_RESOURCE_ID); @@ -119,12 +123,14 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { return results; } + @Override public Set<Permission> getImplicitResourcePermissions(Subject subject, int resourceId) { Set<Permission> permissions = isInventoryManager(subject) ? Permission.RESOURCE_ALL : getExplicitResourcePermissions(subject, resourceId); return permissions; } + @Override public boolean hasGlobalPermission(Subject subject, Permission permission) { if (isOverlord(subject)) { return true; @@ -137,6 +143,7 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { return (count != 0); } + @Override @SuppressWarnings("unchecked") public boolean hasGroupPermission(Subject subject, Permission permission, int groupId) { if (isInventoryManager(subject)) { @@ -170,6 +177,7 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { } } + @Override public boolean hasResourcePermission(Subject subject, Permission permission, int resourceId) { if (isInventoryManager(subject)) { return true; @@ -183,6 +191,31 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { return (count != 0); } + @SuppressWarnings("unchecked") + @Override + public boolean hasBundlePermission(Subject subject, Permission permission, int bundleId) { + + Query query = entityManager.createNamedQuery(Subject.QUERY_HAS_BUNDLE_PERMISSION); + query.setParameter("subject", subject); + query.setParameter("permission", permission); + query.setParameter("bundleId", bundleId); + long count = (Long) query.getSingleResult(); + return (count != 0); + } + + @SuppressWarnings("unchecked") + @Override + public boolean hasBundleGroupPermission(Subject subject, Permission permission, int bundleGroupId) { + + Query query = entityManager.createNamedQuery(Subject.QUERY_HAS_BUNDLE_GROUP_PERMISSION); + query.setParameter("subject", subject); + query.setParameter("permission", permission); + query.setParameter("bundleGroupId", bundleGroupId); + long count = (Long) query.getSingleResult(); + return (count != 0); + } + + @Override public boolean hasAutoGroupPermission(Subject subject, Permission permission, int parentResourceId, int resourceTypeId) { if (isInventoryManager(subject)) { @@ -207,6 +240,7 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { return (baseCount == subjectCount); } + @Override public boolean canViewResource(Subject subject, int resourceId) { if (isInventoryManager(subject)) { return true; @@ -219,6 +253,7 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { return (count != 0); } + @Override public boolean canViewResources(Subject subject, List<Integer> resourceIds) { if (isInventoryManager(subject)) { return true; @@ -232,6 +267,7 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { return count == resourceIds.size(); } + @Override public boolean canViewGroup(Subject subject, int groupId) { if (isInventoryManager(subject)) { return true; @@ -244,6 +280,7 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { return (count != 0); } + @Override public boolean canViewAutoGroup(Subject subject, int parentResourceId, int resourceTypeId) { if (isInventoryManager(subject)) { return true; @@ -266,10 +303,12 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { return (baseCount == subjectCount); } + @Override public boolean isInventoryManager(Subject subject) { return hasGlobalPermission(subject, Permission.MANAGE_INVENTORY); } + @Override @SuppressWarnings("unchecked") public boolean hasResourcePermission(Subject subject, Permission permission, Collection<Integer> resourceIds) { if (isInventoryManager(subject)) { @@ -284,16 +323,20 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { return results.containsAll(resourceIds); } + @Override public boolean isSystemSuperuser(Subject subject) { // We know that our overlord is always id=1 and the rhqadmin user is always id=2. - return (subject != null) && ((subject.getId() == SUBJECT_ID_OVERLORD) || (subject.getId() == SUBJECT_ID_RHQADMIN)); + return (subject != null) + && ((subject.getId() == SUBJECT_ID_OVERLORD) || (subject.getId() == SUBJECT_ID_RHQADMIN)); } + @Override public boolean isOverlord(Subject subject) { // We know that our overlord is always id=1. return (subject != null) && (subject.getId() == SUBJECT_ID_OVERLORD); } + @Override public boolean canUpdateRepo(Subject subject, int repoId) { if (hasGlobalPermission(subject, Permission.MANAGE_REPOSITORIES)) { return true; @@ -301,11 +344,12 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { Query q = entityManager.createNamedQuery(Repo.QUERY_CHECK_REPO_OWNED_BY_SUBJECT_ID); q.setParameter("repoId", repoId); q.setParameter("subjectId", subject.getId()); - + Long num = (Long) q.getSingleResult(); return num > 0; } - + + @Override public boolean canViewRepo(Subject subject, int repoId) { if (hasGlobalPermission(subject, Permission.MANAGE_REPOSITORIES)) { return true; @@ -314,7 +358,7 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { Query q = entityManager.createNamedQuery(Repo.QUERY_CHECK_REPO_VISIBLE_BY_SUBJECT_ID); q.setParameter("repoId", repoId); q.setParameter("subjectId", subject.getId()); - + Long num = (Long) q.getSingleResult(); return num > 0; } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java index 194e345..8872d61 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java @@ -20,7 +20,6 @@ package org.rhq.enterprise.server.authz; import java.util.Collection; import java.util.List; -import java.util.Properties; import java.util.Set; import javax.ejb.Local; @@ -135,6 +134,30 @@ public interface AuthorizationManagerLocal { boolean hasAutoGroupPermission(Subject subject, Permission permission, int parentResourceId, int resourceTypeId); /** + * Returns true if the current user possesses the specified bundle permission for the specified bundle. + * + * @param subject the current subject or caller + * @param permission a bundle permission (i.e. permission.getTarget() == Permission.Target.BUNDLE) + * @param bundleId the id of the bundle to check permissions against + * + * @return true if the current user possesses the specified resource permission for the specified resource + */ + + boolean hasBundlePermission(Subject subject, Permission permission, int bundleId); + + /** + * Returns true if the current user possesses the specified bundle permission for the specified bundle group. + * + * @param subject the current subject or caller + * @param permission a bundle permission (i.e. permission.getTarget() == Permission.Target.BUNDLE) + * @param bundleGroupId the id of the bundle group to check permissions against + * + * @return true if the current user possesses the specified resource permission for the specified resource + */ + + boolean hasBundleGroupPermission(Subject subject, Permission permission, int bundleGroupId); + + /** * Returns true if the current user possesses the specified global permission. * * @param subject the current subject or caller diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java index 139a26e..51e59ff 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java @@ -214,12 +214,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - public void assignBundlesToBundleGroup(Subject subject, int bundleGroupId, int... bundleIds) { - // TODO Auto-generated method stub - - } - - @Override @RequiredPermission(Permission.MANAGE_BUNDLE) public Bundle createBundle(Subject subject, String name, String description, int bundleTypeId) throws Exception { if (null == name || "".equals(name.trim())) { @@ -281,7 +275,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleDeployment createBundleDeployment(Subject subject, int bundleVersionId, int bundleDestinationId, String description, Configuration configuration) throws Exception { @@ -294,6 +287,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot throw new IllegalArgumentException("Invalid bundleDestinationId: " + bundleDestinationId); } + checkBundleDeploymentAuthz(subject, bundleVersion.getBundle().getId(), bundleDestination.getGroup().getId()); + String name = getBundleDeploymentNameImpl(subject, bundleDestination, bundleVersion, null); return this.createBundleDeploymentImpl(subject, bundleVersion, bundleDestination, name, description, configuration); @@ -326,7 +321,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleDestination createBundleDestination(Subject subject, int bundleId, String name, String description, String destBaseDirName, String deployDir, Integer groupId) throws Exception { @@ -354,6 +348,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } ResourceGroup group = entityManager.find(ResourceGroup.class, groups.get(0).getId()); + checkBundleDeploymentAuthz(subject, bundle.getId(), groupId); + BundleDestination dest = new BundleDestination(bundle, name, group, destBaseDirName, deployDir); dest.setDescription(description); entityManager.persist(dest); @@ -561,37 +557,78 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleVersion createBundleVersionViaRecipe(Subject subject, String recipe) throws Exception { + return createBundleVersionViaRecipeImpl(subject, recipe, false, 0); + } + + @Override + public BundleVersion createInitialBundleVersionViaRecipe(Subject subject, int bundleGroupId, String recipe) + throws Exception { + + return createBundleVersionViaRecipeImpl(subject, recipe, true, bundleGroupId); + } + + private BundleVersion createBundleVersionViaRecipeImpl(Subject subject, String recipe, + boolean mustBeInitialVersion, int initialBundleGroupId) throws Exception { + BundleServerPluginManager manager = BundleManagerHelper.getPluginContainer().getBundleServerPluginManager(); BundleDistributionInfo info = manager.parseRecipe(recipe); - BundleVersion bundleVersion = createBundleVersionViaDistributionInfo(subject, info); + BundleVersion bundleVersion = createBundleVersionViaDistributionInfo(subject, info, mustBeInitialVersion, + initialBundleGroupId); return bundleVersion; } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) @TransactionAttribute(TransactionAttributeType.NEVER) public BundleVersion createBundleVersionViaFile(Subject subject, File distributionFile) throws Exception { + return createBundleVersionViaFileImpl(subject, distributionFile, false, 0); + } + + @Override + @TransactionAttribute(TransactionAttributeType.NEVER) + public BundleVersion createInitialBundleVersionViaFile(Subject subject, int bundleGroupId, File distributionFile) + throws Exception { + + return createBundleVersionViaFileImpl(subject, distributionFile, true, bundleGroupId); + } + + private BundleVersion createBundleVersionViaFileImpl(Subject subject, File distributionFile, + boolean mustBeInitialVersion, int initialBundleGroupId) throws Exception { + BundleServerPluginManager manager = BundleManagerHelper.getPluginContainer().getBundleServerPluginManager(); BundleDistributionInfo info = manager.processBundleDistributionFile(distributionFile); - BundleVersion bundleVersion = createBundleVersionViaDistributionInfo(subject, info); + BundleVersion bundleVersion = createBundleVersionViaDistributionInfo(subject, info, mustBeInitialVersion, + initialBundleGroupId); return bundleVersion; } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) @TransactionAttribute(TransactionAttributeType.NEVER) public BundleVersion createBundleVersionViaByteArray(Subject subject, byte[] fileBytes) throws Exception { + return createBundleVersionViaByteArrayImpl(subject, fileBytes, false, 0); + } + + @Override + @TransactionAttribute(TransactionAttributeType.NEVER) + public BundleVersion createInitialBundleVersionViaByteArray(Subject subject, int bundleGroupId, byte[] fileBytes) + throws Exception { + + return createBundleVersionViaByteArrayImpl(subject, fileBytes, true, bundleGroupId); + } + + private BundleVersion createBundleVersionViaByteArrayImpl(Subject subject, byte[] fileBytes, + boolean mustBeInitialVersion, int bundleGroupId) throws Exception { + File tmpFile = File.createTempFile("bundleDistroBits", ".zip"); try { StreamUtil.copy(new ByteArrayInputStream(fileBytes), new FileOutputStream(tmpFile)); - BundleVersion bundleVersion = createBundleVersionViaFile(subject, tmpFile); + BundleVersion bundleVersion = createBundleVersionViaFileImpl(subject, tmpFile, mustBeInitialVersion, + bundleGroupId); return bundleVersion; } finally { if (tmpFile != null) { @@ -601,17 +638,36 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) @TransactionAttribute(TransactionAttributeType.NEVER) public BundleVersion createBundleVersionViaURL(Subject subject, String distributionFileUrl) throws Exception { + return createBundleVersionViaURL(subject, distributionFileUrl, null, null); } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) @TransactionAttribute(TransactionAttributeType.NEVER) public BundleVersion createBundleVersionViaURL(Subject subject, String distributionFileUrl, String username, String password) throws Exception { + + return createBundleVersionViaURLImpl(subject, distributionFileUrl, username, password, false, 0); + } + + @Override + public BundleVersion createInitialBundleVersionViaURL(Subject subject, int bundleGroupId, String distributionFileUrl) + throws Exception { + + return createInitialBundleVersionViaURL(subject, bundleGroupId, distributionFileUrl, null, null); + } + + @Override + public BundleVersion createInitialBundleVersionViaURL(Subject subject, int bundleGroupId, + String distributionFileUrl, String username, String password) throws Exception { + + return createBundleVersionViaURLImpl(subject, distributionFileUrl, username, password, true, bundleGroupId); + } + + public BundleVersion createBundleVersionViaURLImpl(Subject subject, String distributionFileUrl, String username, + String password, boolean mustBeInitialVersion, int initialBundleGroupId) throws Exception { File file = null; try { file = downloadFile(distributionFileUrl, username, password); @@ -619,7 +675,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot log.debug("Copied [" + file.length() + "] bytes from [" + distributionFileUrl + "] into [" + file.getPath() + "]"); - return createBundleVersionViaFile(subject, file); + return createBundleVersionViaFileImpl(subject, file, mustBeInitialVersion, initialBundleGroupId); } finally { if (file != null) { file.delete(); @@ -669,8 +725,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot return file; } - private BundleVersion createBundleVersionViaDistributionInfo(Subject subject, BundleDistributionInfo info) - throws Exception { + private BundleVersion createBundleVersionViaDistributionInfo(Subject subject, BundleDistributionInfo info, + boolean mustBeInitialVersion, Integer initialBundleGroupId) throws Exception { BundleType bundleType = bundleManager.getBundleType(subject, info.getBundleTypeName()); String bundleName = info.getRecipeParseResults().getBundleMetadata().getBundleName(); @@ -680,7 +736,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot String version = info.getRecipeParseResults().getBundleMetadata().getBundleVersion(); String recipe = info.getRecipe(); - // first see if the bundle exists or not; if not, create one + // first see if the bundle exists or not boolean createdBundle; BundleCriteria criteria = new BundleCriteria(); criteria.setStrict(true); @@ -689,11 +745,19 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot PageList<Bundle> bundles = bundleManager.findBundlesByCriteria(subject, criteria); Bundle bundle; - if (bundles.getTotalSize() == 0) { + boolean isInitialVersion = (bundles.getTotalSize() == 0); + + if (!isInitialVersion && mustBeInitialVersion) { + throw new PermissionException("This must be the initial version of a new Bundle."); + } + + if (isInitialVersion) { + checkCreateInitialBundleVersionAuthz(subject, initialBundleGroupId); bundle = bundleManager.createBundle(subject, bundleName, bundleDescription, bundleType.getId()); createdBundle = true; } else { bundle = bundles.get(0); + checkCreateBundleVersionAuthz(subject, bundle.getId()); createdBundle = false; } @@ -808,7 +872,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleFile addBundleFile(Subject subject, int bundleVersionId, String name, String version, Architecture architecture, InputStream fileStream) throws Exception { @@ -826,6 +889,9 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot throw new IllegalArgumentException("Invalid bundleVersionId: " + bundleVersionId); } + // Check authorization + checkCreateBundleVersionAuthz(subject, bundleVersion.getBundle().getId()); + // Create the PackageVersion the BundleFile is tied to. This implicitly creates the // Package for the PackageVersion. Bundle bundle = bundleVersion.getBundle(); @@ -866,7 +932,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleFile addBundleFileViaByteArray(Subject subject, int bundleVersionId, String name, String version, Architecture architecture, byte[] fileBytes) throws Exception { @@ -874,7 +939,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleFile addBundleFileViaURL(Subject subject, int bundleVersionId, String name, String version, Architecture architecture, String bundleFileUrl) throws Exception { @@ -885,11 +949,17 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE) @TransactionAttribute(TransactionAttributeType.NEVER) public BundleFile addBundleFileViaURL(Subject subject, int bundleVersionId, String name, String version, Architecture architecture, String bundleFileUrl, String userName, String password) throws Exception { + // Check authorization prior to performing any file download + BundleVersion bundleVersion = entityManager.find(BundleVersion.class, bundleVersionId); + if (null == bundleVersion) { + throw new IllegalArgumentException("Invalid bundleVersionId: " + bundleVersionId); + } + checkCreateBundleVersionAuthz(subject, bundleVersion.getBundle().getId()); + File file = null; FileInputStream fis = null; try { @@ -925,8 +995,11 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot throw new IllegalArgumentException("Invalid packageVersionId: " + packageVersionId); } + // Check authorization + checkCreateBundleVersionAuthz(subject, bundleVersion.getBundle().getId()); + // With all the plumbing in place, create and persist the BundleFile. Tie it to the Package if the caller - // wants this BundleFile pinned to themost recent version. + // wants this BundleFile pinned to the most recent version. BundleFile bundleFile = new BundleFile(); bundleFile.setBundleVersion(bundleVersion); bundleFile.setPackageVersion(packageVersion); @@ -1317,31 +1390,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE_GROUPS) - public BundleGroup createBundleGroup(Subject subject, String name, String description) throws Exception { - if (null == name || "".equals(name.trim())) { - throw new IllegalArgumentException("Invalid bundleGroupName: " + name); - } - - BundleGroupCriteria c = new BundleGroupCriteria(); - c.addFilterName(name); - c.setStrict(true); - if (!bundleManager.findBundleGroupsByCriteria(subject, c).isEmpty()) { - throw new IllegalArgumentException("Invalid bundleGroupName, bundle group already exists with name: " - + name); - } - - // create and add the required Repo. the Repo is a detached object which helps in its eventual - // removal. - BundleGroup bg = new BundleGroup(name); - bg.setDescription(description); - - entityManager.persist(bg); - - return bg; - } - - @Override @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleResourceDeployment createBundleResourceDeployment(Subject subject, int bundleDeploymentId, @@ -1661,14 +1709,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot return queryRunner.execute(); } - @Override - public PageList<BundleGroup> findBundleGroupsByCriteria(Subject subject, BundleGroupCriteria criteria) { - CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria); - CriteriaQueryRunner<BundleGroup> queryRunner = new CriteriaQueryRunner<BundleGroup>(criteria, generator, - entityManager); - return queryRunner.execute(); - } - /** * Fetch bundles by criteria and then filter destination on the result objects to limit what the user can see * @param subject Caller @@ -1697,27 +1737,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE_GROUPS) - public void deleteBundleGroups(Subject subject, int... bundleGroupIds) throws Exception { - - for (int bundleGroupId : bundleGroupIds) { - BundleGroup bundleGroup = this.entityManager.find(BundleGroup.class, bundleGroupIds); - if (null == bundleGroup) { - return; - } - - // unassign any bundles assigned to the bundle group - for (Bundle b : bundleGroup.getBundles()) { - bundleGroup.removeBundle(b); - } - bundleGroup = entityManager.merge(bundleGroup); - - // now remove the bundle group - entityManager.remove(bundleGroup); - } - } - - @Override public PageList<BundleWithLatestVersionComposite> findBundlesWithLatestVersionCompositesByCriteria(Subject subject, BundleCriteria criteria) { @@ -1862,12 +1881,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot return; } - @Override - public void unassignBundlesFromBundleGroup(Subject subject, int bundleGroupId, int... bundleIds) { - // TODO Auto-generated method stub - - } - private void safeClose(InputStream is) { if (null != is) { try { @@ -1888,4 +1901,246 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } } + @Override + public void assignBundlesToBundleGroup(Subject subject, int bundleGroupId, int[] bundleIds) { + BundleGroup bundleGroup = entityManager.find(BundleGroup.class, bundleGroupId); + if (null == bundleGroup) { + throw new IllegalArgumentException("BundleGroup does not exist for bundleGroupId [" + bundleGroupId + "]"); + } + + checkAssignBundleGroupAuthz(subject, bundleGroupId, bundleIds); + + for (int bundleId : bundleIds) { + Bundle bundle = entityManager.find(Bundle.class, bundleId); + if (null == bundle) { + throw new IllegalArgumentException("Bundle does not exist for bundleId [" + bundleId + "]"); + } + + bundleGroup.addBundle(bundle); + } + } + + @Override + @RequiredPermission(Permission.MANAGE_BUNDLE_GROUPS) + public BundleGroup createBundleGroup(Subject subject, String name, String description) throws Exception { + if (null == name || "".equals(name.trim())) { + throw new IllegalArgumentException("Invalid bundleGroupName: " + name); + } + + BundleGroupCriteria c = new BundleGroupCriteria(); + c.addFilterName(name); + c.setStrict(true); + if (!bundleManager.findBundleGroupsByCriteria(subject, c).isEmpty()) { + throw new IllegalArgumentException("Invalid bundleGroupName, bundle group already exists with name: " + + name); + } + + // create and add the required Repo. the Repo is a detached object which helps in its eventual + // removal. + BundleGroup bg = new BundleGroup(name); + bg.setDescription(description); + + entityManager.persist(bg); + + return bg; + } + + @Override + @RequiredPermission(Permission.MANAGE_BUNDLE_GROUPS) + public void deleteBundleGroups(Subject subject, int[] bundleGroupIds) throws Exception { + + for (int bundleGroupId : bundleGroupIds) { + BundleGroup bundleGroup = this.entityManager.find(BundleGroup.class, bundleGroupIds); + if (null == bundleGroup) { + return; + } + + // unassign any bundles assigned to the bundle group + for (Bundle b : bundleGroup.getBundles()) { + bundleGroup.removeBundle(b); + } + bundleGroup = entityManager.merge(bundleGroup); + + // now remove the bundle group + entityManager.remove(bundleGroup); + } + } + + @Override + public PageList<BundleGroup> findBundleGroupsByCriteria(Subject subject, BundleGroupCriteria criteria) { + CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria); + + if (!authorizationManager.hasGlobalPermission(subject, Permission.VIEW_BUNDLES)) { + + generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.BUNDLE, null, + subject.getId()); + } + + CriteriaQueryRunner<BundleGroup> queryRunner = new CriteriaQueryRunner<BundleGroup>(criteria, generator, + entityManager); + return queryRunner.execute(); + } + + @Override + public void unassignBundlesFromBundleGroup(Subject subject, int bundleGroupId, int[] bundleIds) { + // TODO Auto-generated method stub + + } + + /** + * @param subject + * @param bundleGroupId null or 0 for unassigned initial bundle version creation + * @throws PermissionException + */ + private void checkCreateInitialBundleVersionAuthz(Subject subject, Integer bundleGroupId) + throws PermissionException { + Set<Permission> globalPerms = authorizationManager.getExplicitGlobalPermissions(subject); + boolean hasGlobalCreateBundles = globalPerms.contains(Permission.CREATE_BUNDLES); + + if (hasGlobalCreateBundles && globalPerms.contains(Permission.VIEW_BUNDLES)) { + return; + } + + if (null == bundleGroupId || bundleGroupId.intValue() <= 0) { + String msg = "Subject [" + subject.getName() + + "] requires Global CREATE_BUNDLES and VIEW_BUNDLES to create unsassigned initial bundle version."; + throw new PermissionException(msg); + } + + if (hasGlobalCreateBundles) { + if (authorizationManager.hasBundleGroupPermission(subject, Permission.VIEW_BUNDLES_IN_GROUP, bundleGroupId)) { + return; + } + } else { + if (authorizationManager.hasBundleGroupPermission(subject, Permission.CREATE_BUNDLES_IN_GROUP, + bundleGroupId)) { + return; + } + } + + String msg = "Subject [" + + subject.getName() + + "] requires either Global.CREATE_BUNDLES + BundleGroup.VIEW_BUNDLES_IN_GROUP, or BundleGroup.CREATE_BUNDLES_IN_GROUP, to create or update a bundle in bundle group [" + + bundleGroupId + "]."; + throw new PermissionException(msg); + } + + /** + * @param subject + * @param bundleId required, bundleId of bundle in which bundle version is being created/updated + * @throws PermissionException + */ + private void checkCreateBundleVersionAuthz(Subject subject, int bundleId) throws PermissionException { + + if (bundleId <= 0) { + throw new IllegalArgumentException( + "Must supply valid bundleId for bundle version being created. BundleId specified [" + bundleId + "]"); + } + + Set<Permission> globalPerms = authorizationManager.getExplicitGlobalPermissions(subject); + boolean hasGlobalCreateBundles = globalPerms.contains(Permission.CREATE_BUNDLES); + + if (hasGlobalCreateBundles && globalPerms.contains(Permission.VIEW_BUNDLES)) { + return; + } + + if (hasGlobalCreateBundles) { + if (authorizationManager.hasBundlePermission(subject, Permission.VIEW_BUNDLES_IN_GROUP, bundleId)) { + return; + } + } else { + if (authorizationManager.hasBundlePermission(subject, Permission.CREATE_BUNDLES_IN_GROUP, bundleId)) { + return; + } + } + + String msg = "Subject [" + + subject.getName() + + "] requires either Global.CREATE_BUNDLES + BundleGroup.VIEW_BUNDLES_IN_GROUP, or BundleGroup.CREATE_BUNDLES_IN_GROUP, to create or update a bundleVersion for bundle [" + + bundleId + "]."; + throw new PermissionException(msg); + } + + /** + * @param subject + * @param bundleGroupId an existing bundle group + * @param bundleIds existing bundles + * @throws PermissionException + */ + private void checkAssignBundleGroupAuthz(Subject subject, int bundleGroupId, int[] bundleIds) + throws PermissionException { + + Set<Permission> globalPerms = authorizationManager.getExplicitGlobalPermissions(subject); + boolean hasGlobalCreateBundles = globalPerms.contains(Permission.CREATE_BUNDLES); + boolean hasGlobalViewBundles = globalPerms.contains(Permission.VIEW_BUNDLES); + + if (hasGlobalCreateBundles && hasGlobalViewBundles) { + return; + } + + boolean hasBundleGroupCreate = hasGlobalCreateBundles + || authorizationManager + .hasBundleGroupPermission(subject, Permission.CREATE_BUNDLES_IN_GROUP, bundleGroupId); + boolean hasBundleGroupAssign = hasBundleGroupCreate + || authorizationManager + .hasBundleGroupPermission(subject, Permission.ASSIGN_BUNDLES_TO_GROUP, bundleGroupId); + + if (!hasBundleGroupAssign) { + String msg = "Subject [" + + subject.getName() + + "] requires one of Global.CREATE_BUNDLES, BundleGroup.CREATE_BUNDLES_IN_GROUP, or BundleGroup.ASSIGN_BUNDLES_TO_GROUP to assign a bundle to undle group [" + + bundleGroupId + "]."; + throw new PermissionException(msg); + } + + for (int bundleId : bundleIds) { + if (bundleId <= 0) { + throw new IllegalArgumentException("Invalid bundleId: [" + bundleId + "]"); + } + + if (!authorizationManager.hasBundlePermission(subject, Permission.VIEW_BUNDLES_IN_GROUP, bundleId)) { + String msg = "Subject [" + subject.getName() + + "] requires either Global.VIEW_BUNDLES or BundleGroup.VIEW_BUNDLES_IN_GROUP to assign bundle [" + + bundleId + "] to bundle group [" + bundleGroupId + "]"; + throw new PermissionException(msg); + } + } + + return; + } + + private void checkBundleDeploymentAuthz(Subject subject, int bundleId, int resourceGroupId) + throws PermissionException { + + boolean hasResourceGroupView = authorizationManager.hasGroupPermission(subject, Permission.VIEW_RESOURCE, + resourceGroupId); + + if (!hasResourceGroupView) { + String msg = "Subject [" + subject.getName() + "] requires VIEW permission on resource group [" + + resourceGroupId + "]."; + throw new PermissionException(msg); + } + + Set<Permission> globalPerms = authorizationManager.getExplicitGlobalPermissions(subject); + boolean hasGlobalDeployBundles = globalPerms.contains(Permission.DEPLOY_BUNDLES); + boolean hasGlobalViewBundles = globalPerms.contains(Permission.VIEW_BUNDLES); + + if (hasGlobalDeployBundles && hasGlobalViewBundles) { + return; + } + + boolean hasResourceGroupDeploy = hasGlobalDeployBundles + || authorizationManager.hasGroupPermission(subject, Permission.DEPLOY_BUNDLES_TO_GROUP, resourceGroupId); + boolean hasBundleView = hasGlobalViewBundles + || authorizationManager.hasBundlePermission(subject, Permission.VIEW_BUNDLES_IN_GROUP, bundleId); + + if (!(hasResourceGroupDeploy && hasBundleView)) { + String msg = "Subject [" + subject.getName() + + "] requires DEPLOY permission (global or on for resource group [" + resourceGroupId + + "] and VIEW permission for bundle [" + bundleId + "]"; + throw new PermissionException(msg); + } + + return; + } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java index cffe363..5ff63d0 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java @@ -247,8 +247,8 @@ public interface BundleManagerRemote { * </p> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES - * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG * * @param subject user that must have proper permissions * @param bundleGroupId identifies the bundle group that the new bundle will be associated with; 0 if no group @@ -289,8 +289,8 @@ public interface BundleManagerRemote { * </p> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES - * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG * * @param subject user that must have proper permissions * @param bundleGroupId identifies the bundle group that the new bundle will be associated with; 0 if no group @@ -332,8 +332,8 @@ public interface BundleManagerRemote { * </p> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES - * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG * * @param subject user that must have proper permissions * @param bundleGroupId identifies the bundle group that the new bundle will be associated with; 0 if no group @@ -379,8 +379,8 @@ public interface BundleManagerRemote { * </p> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES - * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG * * @param subject user that must have proper permissions * @param bundleGroupId identifies the bundle group that the new bundle will be associated with; 0 if no group @@ -418,8 +418,8 @@ public interface BundleManagerRemote { * </p> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES - * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG - * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG * * @see #createBundleVersionViaURL(org.rhq.core.domain.auth.Subject, String) */ commit dac01526994e7de15ef99a72768bd9a81d7b8818 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jul 26 15:44:58 2013 -0400 Add new auth token for bundles diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java index ac05e20..139a26e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java @@ -214,6 +214,12 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override + public void assignBundlesToBundleGroup(Subject subject, int bundleGroupId, int... bundleIds) { + // TODO Auto-generated method stub + + } + + @Override @RequiredPermission(Permission.MANAGE_BUNDLE) public Bundle createBundle(Subject subject, String name, String description, int bundleTypeId) throws Exception { if (null == name || "".equals(name.trim())) { @@ -257,31 +263,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE_GROUPS) - public BundleGroup createBundleGroup(Subject subject, String name, String description) throws Exception { - if (null == name || "".equals(name.trim())) { - throw new IllegalArgumentException("Invalid bundleGroupName: " + name); - } - - BundleGroupCriteria c = new BundleGroupCriteria(); - c.addFilterName(name); - c.setStrict(true); - if (!bundleManager.findBundleGroupsByCriteria(subject, c).isEmpty()) { - throw new IllegalArgumentException("Invalid bundleGroupName, bundle group already exists with name: " - + name); - } - - // create and add the required Repo. the Repo is a detached object which helps in its eventual - // removal. - BundleGroup bg = new BundleGroup(name); - bg.setDescription(description); - - entityManager.persist(bg); - - return bg; - } - - @Override @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleDeployment createBundleDeploymentInNewTrans(Subject subject, int bundleVersionId, @@ -1336,6 +1317,31 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override + @RequiredPermission(Permission.MANAGE_BUNDLE_GROUPS) + public BundleGroup createBundleGroup(Subject subject, String name, String description) throws Exception { + if (null == name || "".equals(name.trim())) { + throw new IllegalArgumentException("Invalid bundleGroupName: " + name); + } + + BundleGroupCriteria c = new BundleGroupCriteria(); + c.addFilterName(name); + c.setStrict(true); + if (!bundleManager.findBundleGroupsByCriteria(subject, c).isEmpty()) { + throw new IllegalArgumentException("Invalid bundleGroupName, bundle group already exists with name: " + + name); + } + + // create and add the required Repo. the Repo is a detached object which helps in its eventual + // removal. + BundleGroup bg = new BundleGroup(name); + bg.setDescription(description); + + entityManager.persist(bg); + + return bg; + } + + @Override @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleResourceDeployment createBundleResourceDeployment(Subject subject, int bundleDeploymentId, @@ -1642,7 +1648,15 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot @Override public PageList<Bundle> findBundlesByCriteria(Subject subject, BundleCriteria criteria) { + CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria); + + if (!authorizationManager.hasGlobalPermission(subject, Permission.VIEW_BUNDLES)) { + + generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.BUNDLE, null, + subject.getId()); + } + CriteriaQueryRunner<Bundle> queryRunner = new CriteriaQueryRunner<Bundle>(criteria, generator, entityManager); return queryRunner.execute(); } @@ -1683,6 +1697,27 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override + @RequiredPermission(Permission.MANAGE_BUNDLE_GROUPS) + public void deleteBundleGroups(Subject subject, int... bundleGroupIds) throws Exception { + + for (int bundleGroupId : bundleGroupIds) { + BundleGroup bundleGroup = this.entityManager.find(BundleGroup.class, bundleGroupIds); + if (null == bundleGroup) { + return; + } + + // unassign any bundles assigned to the bundle group + for (Bundle b : bundleGroup.getBundles()) { + bundleGroup.removeBundle(b); + } + bundleGroup = entityManager.merge(bundleGroup); + + // now remove the bundle group + entityManager.remove(bundleGroup); + } + } + + @Override public PageList<BundleWithLatestVersionComposite> findBundlesWithLatestVersionCompositesByCriteria(Subject subject, BundleCriteria criteria) { @@ -1780,27 +1815,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override - @RequiredPermission(Permission.MANAGE_BUNDLE_GROUPS) - public void deleteBundleGroups(Subject subject, int... bundleGroupIds) throws Exception { - - for (int bundleGroupId : bundleGroupIds) { - BundleGroup bundleGroup = this.entityManager.find(BundleGroup.class, bundleGroupIds); - if (null == bundleGroup) { - return; - } - - // unassign any bundles assigned to the bundle group - for (Bundle b : bundleGroup.getBundles()) { - bundleGroup.removeBundle(b); - } - bundleGroup = entityManager.merge(bundleGroup); - - // now remove the bundle group - entityManager.remove(bundleGroup); - } - } - - @Override @RequiredPermission(Permission.MANAGE_BUNDLE) public void deleteBundleVersion(Subject subject, int bundleVersionId, boolean deleteBundleIfEmpty) throws Exception { BundleVersion bundleVersion = this.entityManager.find(BundleVersion.class, bundleVersionId); @@ -1848,6 +1862,12 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot return; } + @Override + public void unassignBundlesFromBundleGroup(Subject subject, int bundleGroupId, int... bundleIds) { + // TODO Auto-generated method stub + + } + private void safeClose(InputStream is) { if (null != is) { try { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java index 574fe73..e65d9f3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java @@ -68,7 +68,8 @@ public final class CriteriaQueryGenerator { public enum AuthorizationTokenType { RESOURCE, // specifies the resource alias to join on for standard res-group-role-subject authorization checking - GROUP; // specifies the group alias to join on for standard group-role-subject authorization checking + GROUP, // specifies the group alias to join on for standard group-role-subject authorization checking + BUNDLE; // specifies the bundle alias to join on for standard bundle-bundleGroup-role-subject authorization checking } private Criteria criteria; @@ -118,10 +119,13 @@ public final class CriteriaQueryGenerator { String defaultFragment = null; if (type == AuthorizationTokenType.RESOURCE) { defaultFragment = "resource"; + setAuthorizationResourceFragment(type, defaultFragment, subjectId); } else if (type == AuthorizationTokenType.GROUP) { defaultFragment = "group"; + setAuthorizationResourceFragment(type, defaultFragment, subjectId); + } else if (type == AuthorizationTokenType.BUNDLE) { + setAuthorizationBundleFragment(subjectId); } - setAuthorizationResourceFragment(type, defaultFragment, subjectId); } private String fixFilterOverride(String expression, String fieldName) { @@ -173,9 +177,9 @@ public final class CriteriaQueryGenerator { + " does not yet support generating queries for '" + type + "' token types"); } - // If the query results are narrowed by requiredParams generate the fragment now. It's done + // If the query results are narrowed by requiredPerms generate the fragment now. It's done // here for two reasons. First, it seems to make sense to apply this only when an authFragment is - // being used. Second, because ond day the query may be less brute force and may modify or + // being used. Second, because one day the query may be less brute force and may modify or // leverage the joinFragment above. But, after extensive trying a more elegant // query could not be constructed due to Hibernate limitations. So, for now, here it is... List<Permission> requiredPerms = this.criteria.getRequiredPermissions(); @@ -230,6 +234,39 @@ public final class CriteriaQueryGenerator { return customAuthzFragment; } + public void setAuthorizationBundleFragment(int subjectId) { + this.authorizationSubjectId = subjectId; + + String fragment = "bundle"; + String customAuthzFragment = "" // + + "( %aliasWithFragment%.id IN ( SELECT %innerAlias%.id " + NL // + + " FROM %alias% innerAlias " + NL // + + " JOIN %innerAlias%.bundleGroups g JOIN g.roles r JOIN r.subjects s " + NL // + + " WHERE s.id = %subjectId% ) )" + NL; // + String aliasReplacement = criteria.getAlias() + (fragment != null ? "." + fragment : ""); + String innerAliasReplacement = "innerAlias" + (fragment != null ? "." + fragment : ""); + customAuthzFragment = customAuthzFragment.replace("%alias%", criteria.getAlias()); + customAuthzFragment = customAuthzFragment.replace("%aliasWithFragment%", aliasReplacement); + customAuthzFragment = customAuthzFragment.replace("%innerAlias%", innerAliasReplacement); + customAuthzFragment = customAuthzFragment.replace("%subjectId%", String.valueOf(subjectId)); + + // If the query results are narrowed by requiredPerms generate the fragment now. It's done + // here for two reasons. First, it seems to make sense to apply this only when an authFragment is + // being used. Second, because one day the query may be less brute force and may modify or + // leverage the joinFragment above. But, after extensive trying a more elegant + // query could not be constructed due to Hibernate limitations. So, for now, here it is... + List<Permission> requiredPerms = this.criteria.getRequiredPermissions(); + if (!(null == requiredPerms || requiredPerms.isEmpty())) { + this.authorizationPermsFragment = "" // + + "( SELECT COUNT(DISTINCT p)" + NL // + + " FROM Subject innerSubject" + NL // + + " JOIN innerSubject.roles r" + NL // + + " JOIN r.permissions p" + NL // + + " WHERE innerSubject.id = " + this.authorizationSubjectId + NL // + + " AND p IN ( :requiredPerms ) ) = :requiredPermsSize" + NL; + } + } + public String getParameterReplacedQuery(boolean countQuery) { String query = getQueryString(countQuery);

1 0

[rhq] modules/enterprise
by Jiri Kremser 29 Jul '13

29 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 29 ++++++---- 1 file changed, 20 insertions(+), 9 deletions(-) New commits: commit 160452fff76ba285b5774c866f1a6f07aae239e9 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Mon Jul 29 14:45:30 2013 +0200 If there is just one group definition in ConfigurationEditor, normal form is used instead SectionStack component. Also the "Jump to Section" navigation is hidden for just one group to save some space on the screen. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java index 779772f..418300f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java @@ -415,17 +415,29 @@ public class ConfigurationEditor extends EnhancedVLayout { EnhancedVLayout layout = new EnhancedVLayout(); List<PropertyGroupDefinition> groupDefinitions = configurationDefinition.getGroupDefinitions(); - if (groupDefinitions.isEmpty()) { - // No prop groups, so we just need a single form for the non-grouped props. + if (groupDefinitions.isEmpty() || groupDefinitions.size() == 1) { + // No or one prop groups, so we just need a single form for the non-grouped props + // and another one if there is just one group List<PropertyDefinition> propertyDefinitions = new ArrayList<PropertyDefinition>( configurationDefinition.getNonGroupedProperties()); - - DynamicForm form = buildPropertiesForm(propertyDefinitions, configuration); - form.setBorder("1px solid #AAA"); - form.validate(); - layout.addMember(form); + if (!propertyDefinitions.isEmpty()) { + DynamicForm form = buildPropertiesForm(propertyDefinitions, configuration); + form.setBorder("1px solid #AAA"); + form.validate(); + layout.addMember(form); + } + if (groupDefinitions.size() == 1) { + propertyDefinitions.addAll(configurationDefinition.getPropertiesInGroup(groupDefinitions.get(0) + .getName())); + DynamicForm groupForm = buildPropertiesForm(propertyDefinitions, configuration); + groupForm.setIsGroup(true); + groupForm.setGroupTitle(groupDefinitions.get(0).getDisplayName()); + groupForm.setBorder("1px solid #AAA"); + groupForm.validate(); + layout.addMember(groupForm); + } } else { - // One or more prop groups, so create a section stack with one section per group. + // Two or more prop groups, so create a section stack with one section per group. final SectionStack sectionStack = new SectionStack(); sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE); sectionStack.setWidth100(); @@ -441,7 +453,6 @@ public class ConfigurationEditor extends EnhancedVLayout { // com.allen_sauer.gwt.log.client.Log.info("building: " + definition.getDisplayName()); sectionStack.addSection(buildGroupSection(definition)); } - this.toolStrip = buildToolStrip(layout, sectionStack); layout.addMember(toolStrip); layout.addMember(sectionStack);

1 0

[rhq] 2 commits - etc/rhq-ircBot modules/enterprise
by Jiri Kremser 29 Jul '13

29 Jul '13

etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks |binary modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit ef3e3e3912fa2f015edf6f2eea8b0217bb7b9999 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Mon Jul 29 13:19:16 2013 +0200 Adding the newly (6/28/13) issued certificate for accessing the pto calendar (mail.corp.redhat.com domain) to the rhq-ircbot keystore. This one should be valid until 6/28/15. diff --git a/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks b/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks index 3d73cbc..431de7c 100644 Binary files a/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks and b/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks differ commit f9f495ce4c2c0419cd75ca47096c3af9644a3250 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Mon Jul 29 12:54:06 2013 +0200 Calling the right setter. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 7d861f1..049cf42 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -310,7 +310,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN if ((scheduleId = scheduleIdsMap.get(totalDiskUsedPercentageMetric)) != null) { StorageNodeLoadComposite.MeasurementAggregateWithUnits totalDiskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); - result.setDataDiskUsedPercentage(totalDiskUsedPercentageAggregateWithUnits); + result.setTotalDiskUsedPercentage(totalDiskUsedPercentageAggregateWithUnits); } if ((scheduleId = scheduleIdsMap.get(freeDiskToDataRatioMetric)) != null) { MeasurementAggregate freeDiskToDataRatioAggregate = measurementManager.getAggregate(subject, @@ -754,4 +754,4 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return successResultFound; } -} \ No newline at end of file +}

1 0

[rhq] modules/plugins
by John Sanda 28 Jul '13

28 Jul '13

modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java | 19 ++++++++-- 1 file changed, 16 insertions(+), 3 deletions(-) New commits: commit c781acf5ce4680f4722cc6dfdeaadca2dfc110c8 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 28 07:36:07 2013 -0400 override default ring delay to speed up test and hopefully fix jenkins failure diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index ef92510..bd171a4 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -29,6 +29,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileReader; import java.net.InetAddress; +import java.util.Properties; import java.util.Set; import com.google.common.collect.ImmutableSet; @@ -73,6 +74,7 @@ import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; +import org.rhq.core.util.PropertiesFileUpdate; import org.rhq.core.util.stream.StreamUtil; /** @@ -124,6 +126,18 @@ public class StorageNodeComponentITest { deployer.updateFilePerms(); deployer.updateStorageAuthConf(Sets.newHashSet(InetAddress.getByName(address))); + File confDir = new File(basedir, "conf"); + File cassandraJvmPropsFile = new File(confDir, "cassandra-jvm.properties"); + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(cassandraJvmPropsFile.getAbsolutePath()); + Properties properties = propertiesUpdater.loadExistingProperties(); + + String jvmOpts = properties.getProperty("JVM_OPTS"); + jvmOpts = jvmOpts.substring(0, jvmOpts.lastIndexOf("\"")); + jvmOpts = jvmOpts + " -Dcassandra.ring_delay_ms=100\""; + properties.setProperty("JVM_OPTS", jvmOpts); + + propertiesUpdater.update(properties); + File binDir = new File(basedir, "bin"); SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); @@ -261,9 +275,8 @@ public class StorageNodeComponentITest { log.info("Waiting for node to boostrap..."); // When a node goes through bootstrap, StorageService sleeps for RING_DELAY ms // while it determines the ranges of the token ring it will own. RING_DELAY defaults - // to 30 seconds by default. - // TODO Override the default RING_DELAY to speed up tests - Thread.sleep(33000); + // to 30 seconds by default but we are overriding it to be 100 ms. + Thread.sleep(3000); assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The operation failed: " + result.getErrorStackTrace());

1 0

[rhq] modules/plugins
by John Sanda 27 Jul '13

27 Jul '13

modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/InternodeAuthConfUpdateException.java | 22 ++ modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 104 +++------- modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java | 4 3 files changed, 64 insertions(+), 66 deletions(-) New commits: commit 96745558fb5c803bda91f5ac1180b17db8a76364 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 27 14:08:18 2013 -0400 updating exception handling and logging in prepareForBootstrap diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/InternodeAuthConfUpdateException.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/InternodeAuthConfUpdateException.java new file mode 100644 index 0000000..d1e6e56 --- /dev/null +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/InternodeAuthConfUpdateException.java @@ -0,0 +1,22 @@ +package org.rhq.plugins.storage; + +/** + * @author John Sanda + */ +public class InternodeAuthConfUpdateException extends Exception { + + public InternodeAuthConfUpdateException() { + } + + public InternodeAuthConfUpdateException(String message) { + super(message); + } + + public InternodeAuthConfUpdateException(String message, Throwable cause) { + super(message, cause); + } + + public InternodeAuthConfUpdateException(Throwable cause) { + super(cause); + } +} diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index eb0b9fd..2cb9501 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -29,12 +29,10 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; -import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; @@ -95,6 +93,14 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return new File(pluginConfig.getSimpleValue("baseDir")); } + private File getConfDir() { + return new File(getBasedir(), "conf"); + } + + private File getInternodeAuthConfFile() { + return new File(getConfDir(), "rhq-storage-auth.conf"); + } + @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if (name.equals("addNodeMaintenance")) { @@ -242,56 +248,24 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper ipAddresses.add(propertySimple.getStringValue()); } - if (updateAuthFile(result, ipAddresses)) return result; - - EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); - EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); - emsOperation.invoke(); - - result.setSimpleResult("Successfully updated the set of known nodes."); - - return result; - } - - private boolean updateAuthFile(OperationResult result, Set<String> ipAddresses) { - log.info("Updating known nodes to " + ipAddresses); + try { + updateInternodeAuthConfFile(ipAddresses); - File confDir = new File(getBasedir(), "conf"); - File authFile = new File(confDir, "rhq-storage-auth.conf"); - File authBackupFile = new File(confDir, "." + authFile.getName() + ".bak"); + EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); + EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); + emsOperation.invoke(); - if (authBackupFile.exists()) { - if (log.isDebugEnabled()) { - log.debug(authBackupFile + " already exists. Deleting it now in preparation of creating new backup " + - "for " + authFile.getName()); - } - if (!authBackupFile.delete()) { - String msg = "Failed to delete backup file " + authBackupFile + ". The operation will abort " + - "since " + authFile + " cannot reliably be backed up before making changes. Please delete " + - authBackupFile + " manually and reschedule the operation once the file has been removed."; - log.error(msg); - result.setErrorMessage(msg); - - return true; - } - } + result.setSimpleResult("Successfully updated the set of known nodes."); - try { - StreamUtil.copy(new StringReader(StringUtil.collectionToString(ipAddresses, "\n")), - new FileWriter(authFile), true); - } catch (IOException e) { - log.error("An error occurred while updating " + authFile, e); - try { - log.info("Restoring back up file " + authBackupFile); - FileUtil.copyFile(authBackupFile, authFile); - authBackupFile.delete(); - } catch (IOException e1) { - log.error("Failed to revert backup of " + authFile, e1); - } - result.setErrorMessage("There was an unexpected error while updating " + authFile); - return true; + return result; + } catch (InternodeAuthConfUpdateException e) { + File authFile = getInternodeAuthConfFile(); + log.error("Failed to update set of trusted nodes in " + authFile + " due to the following error(s): " + + ThrowableUtil.getAllMessages(e)) ; + result.setErrorMessage("Failed to update set of trusted nodes in " + authFile + " due to the following " + + "error(s): " + ThrowableUtil.getAllMessages(e)); + return result; } - return false; } private OperationResult prepareForBootstrap(Configuration params) { @@ -326,7 +300,6 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } purgeDir(new File(configEditor.getSavedCachesDirectory())); - log.info("Updating cluster settings"); String address = pluginConfig.getSimpleValue("host"); @@ -344,10 +317,9 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper configEditor.setStoragePort(gossipPort); configEditor.save(); + log.info("Cluster configuration settings have been applied to " + yamlFile); - if (updateAuthFile(result, new HashSet<String>(addresses))) { - return result; - } + updateInternodeAuthConfFile(new HashSet<String>(addresses)); log.info(this + " is ready to be bootstrap. Restarting storage node..."); OperationResult startResult = startNode(); @@ -376,6 +348,11 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } } return result; + } catch (InternodeAuthConfUpdateException e) { + File authFile = getInternodeAuthConfFile(); + result.setErrorMessage("Failed to update " + authFile + " due to the following error(s): " + + ThrowableUtil.getAllMessages(e)); + return result; } } @@ -384,23 +361,18 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper FileUtil.purge(dir, true); } - private File getCommitLogDir(Map yamlConfig) { - return new File((String) yamlConfig.get("commitlog_directory")); - } + private void updateInternodeAuthConfFile(Set<String> ipAddresses) throws InternodeAuthConfUpdateException { + File authFile = getInternodeAuthConfFile(); - private List<File> getDataDirs(Map yamlConfig) { - List<File> dirs = new ArrayList<File>(); - List<String> dirNames = (List<String>) yamlConfig.get("data_file_directories"); + log.info("Updating " + authFile); - for (String dirName : dirNames) { - dirs.add(new File(dirName)); + try { + StreamUtil.copy(new StringReader(StringUtil.collectionToString(ipAddresses, "\n")), + new FileWriter(authFile), true); + } catch (Exception e) { + log.error("An error occurred while trying to update " + authFile, e); + throw new InternodeAuthConfUpdateException("An error occurred while trying to update " + authFile, e); } - - return dirs; - } - - private File getSavedCachesDir(Map yamlConfig) { - return new File((String) yamlConfig.get("saved_caches_directory")); } private OperationResult nodeAdded(Configuration params) { diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index d10e428..ef92510 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -259,6 +259,10 @@ public class StorageNodeComponentITest { params, timeout); log.info("Waiting for node to boostrap..."); + // When a node goes through bootstrap, StorageService sleeps for RING_DELAY ms + // while it determines the ranges of the token ring it will own. RING_DELAY defaults + // to 30 seconds by default. + // TODO Override the default RING_DELAY to speed up tests Thread.sleep(33000); assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The operation failed: " +

1 0

[rhq] 2 commits - modules/common modules/plugins
by John Sanda 27 Jul '13

27 Jul '13

modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java | 111 + modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditorException.java | 21 modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java | 94 + modules/common/cassandra-util/src/test/resources/cassandra.yaml | 690 ++++++++++ modules/plugins/cassandra/pom.xml | 9 modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 128 - modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java | 51 7 files changed, 1031 insertions(+), 73 deletions(-) New commits: commit 237d38ea10fe57dfb699f01cd999c3aa53391ef4 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 27 12:49:30 2013 -0400 adding some initial test coverage for prepareForBootstrap operation The prepareForBootstrap method has been refactored to use ConfigEditor but there is still a good bit of clean up to do. diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java index 679a84c..0b4a127 100644 --- a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java @@ -76,6 +76,22 @@ public class ConfigEditor { } } + public File getBackupFile() { + return backupFile; + } + + public String getCommitLogDirectory() { + return (String) config.get("commitlog_directory"); + } + + public List<String> getDataFileDirectories() { + return (List<String>) config.get("data_file_directories"); + } + + public String getSavedCachesDirectory() { + return (String) config.get("saved_caches_directory"); + } + public void setSeeds(String... seeds) { List seedProviderList = (List) config.get("seed_provider"); Map seedProvider = (Map) seedProviderList.get(0); diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index da90f09..bafc8d7 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -36,6 +36,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-util</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>rhq-core-domain</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -89,6 +94,10 @@ <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> <artifactItems> <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-util</artifactId> + </artifactItem> + <artifactItem> <groupId>com.datastax.cassandra</groupId> <artifactId>cassandra-driver-core</artifactId> <version>${cassandra.driver.version}</version> diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 5933093..eb0b9fd 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -26,7 +26,6 @@ package org.rhq.plugins.storage; import java.io.File; -import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; @@ -45,9 +44,10 @@ import org.mc4j.ems.connection.EmsConnection; import org.mc4j.ems.connection.bean.EmsBean; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.connection.bean.operation.EmsOperation; -import org.yaml.snakeyaml.DumperOptions; -import org.yaml.snakeyaml.Yaml; +import org.yaml.snakeyaml.error.YAMLException; +import org.rhq.cassandra.util.ConfigEditor; +import org.rhq.cassandra.util.ConfigEditorException; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.Property; @@ -277,27 +277,18 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } try { - FileUtil.copyFile(authFile, authBackupFile); - } catch (IOException e) { - String msg = "Failed to backup " + authFile + " prior to making updates. The operation will abort due " + - "to unexpected error"; - log.error(msg, e); - result.setErrorMessage(msg + ": " + ThrowableUtil.getRootMessage(e)); - return true; - } - - try { StreamUtil.copy(new StringReader(StringUtil.collectionToString(ipAddresses, "\n")), new FileWriter(authFile), true); } catch (IOException e) { log.error("An error occurred while updating " + authFile, e); try { + log.info("Restoring back up file " + authBackupFile); FileUtil.copyFile(authBackupFile, authFile); + authBackupFile.delete(); } catch (IOException e1) { log.error("Failed to revert backup of " + authFile, e1); } - result.setErrorMessage("There was an unexpected error while updating " + authFile + ". Make sure that " + - "it matches " + authBackupFile + " and then reschedule the operation."); + result.setErrorMessage("There was an unexpected error while updating " + authFile); return true; } return false; @@ -325,74 +316,67 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper String yamlProp = pluginConfig.getSimpleValue("yamlConfiguration"); File yamlFile = new File(yamlProp); - DumperOptions options = new DumperOptions(); - options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); - Yaml yaml = new Yaml(options); - - Map yamlConfig = null; + ConfigEditor configEditor = new ConfigEditor(yamlFile); try { - yamlConfig = (Map) yaml.load(new FileInputStream(yamlFile)); - } catch (FileNotFoundException e) { - log.error("Failed to load " + yamlFile, e); - log.error("Cannot prepare " + this + " for bootstrap. " + yamlFile + " must exist in order to make the " + - "necessary configuration changes."); - result.setErrorMessage("Cannot prepare storage node for bootstrap. It appears that " + yamlFile + - " does not exist. Make sure that it exists so that the necessary configuration changes can be made."); + configEditor.load(); - return result; - } + purgeDir(new File(configEditor.getCommitLogDirectory())); + for (String dir : configEditor.getDataFileDirectories()) { + purgeDir(new File(dir)); + } + purgeDir(new File(configEditor.getSavedCachesDirectory())); - purgeDir(getCommitLogDir(yamlConfig)); - for (File dataDir : getDataDirs(yamlConfig)) { - purgeDir(dataDir); - } - purgeDir(getSavedCachesDir(yamlConfig)); - log.info("Updating cluster settings"); + log.info("Updating cluster settings"); - String address = pluginConfig.getSimpleValue("host"); - List<String> seeds = getAddresses(params.getList("storageNodeIPAddresses")); - // Make sure this node's address is not in the list; otherwise, it - // won't bootstrap properly. - seeds.remove(address); - try { - updateSeedsList(seeds); - } catch (IOException e) { - log.error("Failed to update seeds property in " + yamlFile, e); - result.setErrorMessage("Failed to prepared node for bootstrap due to unexpected error that occurred " + - "while updating seeds property in " + yamlFile + ":\n" + ThrowableUtil.getAllMessages(e)); - return result; - } + String address = pluginConfig.getSimpleValue("host"); + int cqlPort = Integer.parseInt(params.getSimpleValue("cqlPort")); + int gossipPort = Integer.parseInt(params.getSimpleValue("gossipPort")); + List<String> addresses = getAddresses(params.getList("storageNodeIPAddresses")); - if (updateAuthFile(result, new HashSet<String>(seeds))) { - return result; - } + // Make sure this node's address is not in the list; otherwise, it + // won't bootstrap properly. + List<String> seeds = new ArrayList<String>(addresses); + seeds.remove(address); - int cqlPort = Integer.parseInt(params.getSimpleValue("cqlPort")); - int gossipPort = Integer.parseInt(params.getSimpleValue("gossipPort")); + configEditor.setSeeds(seeds.toArray(new String[seeds.size()])); + configEditor.setNativeTransportPort(cqlPort); + configEditor.setStoragePort(gossipPort); - yamlConfig.put("native_transport_port", cqlPort); - yamlConfig.put("storage_port", gossipPort); + configEditor.save(); - try { - yaml.dump(yamlConfig, new FileWriter(yamlFile)); - } catch (IOException e) { - log.error("Could not update cluster settings in " + yamlFile, e); - result.setErrorMessage("Could not update cluster settings in " + yamlFile + ":\n" + - ThrowableUtil.getAllMessages(e)); - return result; - } + if (updateAuthFile(result, new HashSet<String>(addresses))) { + return result; + } - log.info(this + " is ready to be bootstrap. Restarting storage node..."); - OperationResult startResult = startNode(); - if (startResult.getErrorMessage() != null) { - log.error("Failed to restart storage node:\n" + startResult.getErrorMessage()); - result.setErrorMessage("Failed to restart storage node:\n" + startResult.getErrorMessage()); - } else { - result.setSimpleResult("The storage node was succesfully updated is now bootstrapping into the cluster."); - } + log.info(this + " is ready to be bootstrap. Restarting storage node..."); + OperationResult startResult = startNode(); + if (startResult.getErrorMessage() != null) { + log.error("Failed to restart storage node:\n" + startResult.getErrorMessage()); + result.setErrorMessage("Failed to restart storage node:\n" + startResult.getErrorMessage()); + } else { + result.setSimpleResult("The storage node was succesfully updated is now bootstrapping into the cluster."); + } - return result; + return result; + } catch (ConfigEditorException e) { + log.error("There was an error while trying to update " + yamlFile, e); + if (e.getCause() instanceof YAMLException) { + log.info("Attempting to restore " + yamlFile); + try { + configEditor.restore(); + result.setErrorMessage("Failed to update configuration file [" + yamlFile + "]: " + + ThrowableUtil.getAllMessages(e.getCause())); + } catch (ConfigEditorException e1) { + log.error("Failed to restore " + yamlFile + ". A copy of the file prior to any modifications " + + "can be found at " + configEditor.getBackupFile()); + result.setErrorMessage("There was an error updating [" + yamlFile + "] and undoing the changes " + + "Failed. A copy of the file can be found at " + configEditor.getBackupFile() + ". See the " + + "agent logs for more details"); + } + } + return result; + } } private void purgeDir(File dir) { diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index eb4d545..d10e428 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -26,15 +26,25 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; import java.net.InetAddress; import java.util.Set; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import org.apache.cassandra.config.Config; +import org.apache.cassandra.config.SeedProviderDef; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hyperic.sigar.OperatingSystem; import org.testng.annotations.AfterSuite; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; +import org.yaml.snakeyaml.Loader; +import org.yaml.snakeyaml.TypeDescription; +import org.yaml.snakeyaml.Yaml; import org.rhq.cassandra.CassandraClusterManager; import org.rhq.cassandra.ClusterInitService; @@ -63,12 +73,15 @@ import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; +import org.rhq.core.util.stream.StreamUtil; /** * @author John Sanda */ public class StorageNodeComponentITest { + private final Log log = LogFactory.getLog(StorageNodeComponentITest.class); + private File basedir; private Resource storageNode; @@ -232,7 +245,7 @@ public class StorageNodeComponentITest { } @Test(dependsOnMethods = "restartStorageNode") - public void prepareForBootstrap() { + public void prepareForBootstrap() throws Exception { Configuration params = Configuration.builder().addSimple("cqlPort", 9242).addSimple("gossipPort", 7200) .openList("storageNodeIPAddresses", "storageNodeIPAddresse").addSimples("127.0.0.1", "127.0.0.2") .closeList().build(); @@ -245,10 +258,22 @@ public class StorageNodeComponentITest { OperationServicesResult result = operationsService.invokeOperation(operationContext, "prepareForBootstrap", params, timeout); + log.info("Waiting for node to boostrap..."); + Thread.sleep(33000); + assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The operation failed: " + result.getErrorStackTrace()); assertNodeIsUp("Expected " + storageNode + " to be up after the prepareForBootstrap operation completes."); + + assertThatInternodeAuthConfFileMatches("127.0.0.1", "127.0.0.2"); + + File confDir = new File(basedir, "conf"); + File cassandraYamlFile = new File(confDir, "cassandra.yaml"); + Config config = loadConfig(cassandraYamlFile); + + assertEquals(config.seed_provider.parameters.get("seeds"), "127.0.0.2", "Failed to update seeds " + + "property in " + cassandraYamlFile); } private void assertNodeIsUp(String msg) { @@ -292,4 +317,28 @@ public class StorageNodeComponentITest { return type.getPlugin().equals("RHQStorage") && type.getName().equals("RHQ Storage Node"); } + private void assertThatInternodeAuthConfFileMatches(String... addresses) throws Exception { + File confDir = new File(basedir, "conf"); + File internodeAuthConfFile = new File(confDir, "rhq-storage-auth.conf"); + String contents = StreamUtil.slurp(new FileReader(internodeAuthConfFile)); + + Set<String> expected = ImmutableSet.copyOf(addresses); + Set<String> actual = ImmutableSet.copyOf(contents.split("\n")); + + assertEquals(actual, expected, "Failed to update internode authentication conf file " + + internodeAuthConfFile + "."); + } + + private Config loadConfig(File configFile) throws Exception { + FileInputStream inputStream = new FileInputStream(configFile); + org.yaml.snakeyaml.constructor.Constructor constructor = + new org.yaml.snakeyaml.constructor.Constructor(Config.class); + TypeDescription seedDesc = new TypeDescription(SeedProviderDef.class); + seedDesc.putMapPropertyType("parameters", String.class, String.class); + constructor.addTypeDescription(seedDesc); + Yaml yaml = new Yaml(new Loader(constructor)); + + return (Config) yaml.load(inputStream); + } + } commit 30c6d6678edbb44bd7b07db0cd2855b9f1790aba Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 27 10:14:18 2013 -0400 initial commit for ConfigEditor which handles updating cassandra.yaml diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java new file mode 100644 index 0000000..679a84c --- /dev/null +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditor.java @@ -0,0 +1,95 @@ +package org.rhq.cassandra.util; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; + +import org.rhq.core.util.StringUtil; +import org.rhq.core.util.file.FileUtil; + +/** + * @author John Sanda + */ +public class ConfigEditor { + + private File configFile; + + private File backupFile; + + private Yaml yaml; + + private Map config; + + public ConfigEditor(File cassandraYamlFile) { + configFile = cassandraYamlFile; + } + + public void load() { + try { + DumperOptions options = new DumperOptions(); + options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + yaml = new Yaml(options); + config = (Map) yaml.load(new FileInputStream(configFile)); + createBackup(); + } catch (FileNotFoundException e) { + throw new ConfigEditorException("Failed to load " + configFile, e); + } + } + + public void save() { + try { + yaml.dump(config, new FileWriter(configFile)); + backupFile.delete(); + yaml = null; + config = null; + backupFile = null; + } catch (Exception e) { + throw new ConfigEditorException("Failed to save changes to " + configFile, e); + } + } + + public void restore() { + try { + FileUtil.copyFile(backupFile, configFile); + backupFile.delete(); + yaml = null; + config = null; + backupFile = null; + } catch (IOException e) { + throw new ConfigEditorException("Failed to restore " + configFile + " from " + backupFile, e); + } + } + + private void createBackup() { + backupFile = new File(configFile.getParent(), "." + configFile.getName() + ".bak"); + try { + FileUtil.copyFile(configFile, backupFile); + } catch (IOException e) { + throw new ConfigEditorException("Failed to create " + backupFile, e); + } + } + + public void setSeeds(String... seeds) { + List seedProviderList = (List) config.get("seed_provider"); + Map seedProvider = (Map) seedProviderList.get(0); + List paramsList = (List) seedProvider.get("parameters"); + Map params = (Map) paramsList.get(0); + params.put("seeds", StringUtil.arrayToString(seeds)); + } + + public void setNativeTransportPort(int port) { + config.put("native_transport_port", port); + } + + public void setStoragePort(int port) { + config.put("storage_port", port); + } + +} diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditorException.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditorException.java new file mode 100644 index 0000000..db9e7ea --- /dev/null +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ConfigEditorException.java @@ -0,0 +1,21 @@ +package org.rhq.cassandra.util; + +/** + * @author John Sanda + */ +public class ConfigEditorException extends RuntimeException { + + public ConfigEditorException() { + } + + public ConfigEditorException(String message) { + } + + public ConfigEditorException(String message, Throwable cause) { + super(message, cause); + } + + public ConfigEditorException(Throwable cause) { + super(cause); + } +} diff --git a/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java b/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java new file mode 100644 index 0000000..cf344e2 --- /dev/null +++ b/modules/common/cassandra-util/src/test/java/org/rhq/cassandra/util/ConfigEditorTest.java @@ -0,0 +1,94 @@ +package org.rhq.cassandra.util; + +import static org.testng.Assert.assertEquals; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.lang.reflect.Method; + +import org.apache.cassandra.config.Config; +import org.apache.cassandra.config.SeedProviderDef; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.yaml.snakeyaml.Loader; +import org.yaml.snakeyaml.TypeDescription; +import org.yaml.snakeyaml.Yaml; + +import org.rhq.core.util.file.FileUtil; +import org.rhq.core.util.stream.StreamUtil; + +/** + * @author John Sanda + */ +public class ConfigEditorTest { + + private File basedir; + + private File configFile; + + @BeforeMethod + public void initTestDir(Method test) throws Exception { + File dir = new File(getClass().getResource(".").toURI()); + basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); + FileUtil.purge(basedir, true); + basedir.mkdirs(); + + configFile = new File(basedir, "cassandra.yaml"); + + InputStream inputStream = getClass().getResourceAsStream("/cassandra.yaml"); + FileOutputStream outputStream = new FileOutputStream(configFile); + StreamUtil.copy(inputStream, outputStream); + } + + @Test + public void updateSeeds() throws Exception { + ConfigEditor editor = new ConfigEditor(configFile); + editor.load(); + editor.setSeeds("127.0.0.1", "127.0.0.2", "127.0.0.3"); + editor.save(); + + Config config = loadConfig(); + + assertEquals(config.seed_provider.parameters.get("seeds"), "127.0.0.1,127.0.0.2,127.0.0.3", + "Failed to update seeds property."); + } + + @Test + public void updateNativeTransportPort() throws Exception { + ConfigEditor editor = new ConfigEditor(configFile); + editor.load(); + editor.setNativeTransportPort(9393); + editor.save(); + + Config config = loadConfig(); + + assertEquals(config.native_transport_port, (Integer) 9393, "Failed to update native_transport_port"); + } + + @Test + public void updateStoragePort() throws Exception { + ConfigEditor editor = new ConfigEditor(configFile); + editor.load(); + editor.setStoragePort(6767); + editor.save(); + + Config config = loadConfig(); + + assertEquals(config.storage_port, (Integer) 6767, "Failed to update storage_port"); + } + + private Config loadConfig() throws Exception { + FileInputStream inputStream = new FileInputStream(configFile); + org.yaml.snakeyaml.constructor.Constructor constructor = + new org.yaml.snakeyaml.constructor.Constructor(Config.class); + TypeDescription seedDesc = new TypeDescription(SeedProviderDef.class); + seedDesc.putMapPropertyType("parameters", String.class, String.class); + constructor.addTypeDescription(seedDesc); + Yaml yaml = new Yaml(new Loader(constructor)); + + return (Config) yaml.load(inputStream); + } + +} diff --git a/modules/common/cassandra-util/src/test/resources/cassandra.yaml b/modules/common/cassandra-util/src/test/resources/cassandra.yaml new file mode 100644 index 0000000..fd7973b --- /dev/null +++ b/modules/common/cassandra-util/src/test/resources/cassandra.yaml @@ -0,0 +1,690 @@ +# Cassandra storage config YAML + +# NOTE: +# See http://wiki.apache.org/cassandra/StorageConfiguration for +# full explanations of configuration directives +# /NOTE + +# The name of the cluster. This is mainly used to prevent machines in +# one logical cluster from joining another. +cluster_name: rhq + +# This defines the number of tokens randomly assigned to this node on the ring +# The more tokens, relative to other nodes, the larger the proportion of data +# that this node will store. You probably want all nodes to have the same number +# of tokens assuming they have equal hardware capability. +# +# If you leave this unspecified, Cassandra will use the default of 1 token for legacy compatibility, +# and will use the initial_token as described below. +# +# Specifying initial_token will override this setting. +# +# If you already have a cluster with 1 token per node, and wish to migrate to +# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations +num_tokens: 256 + +# If you haven't specified num_tokens, or have set it to the default of 1 then +# you should always specify InitialToken when setting up a production +# cluster for the first time, and often when adding capacity later. +# The principle is that each node should be given an equal slice of +# the token ring; see http://wiki.apache.org/cassandra/Operations +# for more details. +# +# If blank, Cassandra will request a token bisecting the range of +# the heaviest-loaded existing node. If there is no load information +# available, such as is the case with a new cluster, it will pick +# a random token, which will lead to hot spots. +#initial_token: + +# See http://wiki.apache.org/cassandra/HintedHandoff +hinted_handoff_enabled: true +# this defines the maximum amount of time a dead host will have hints +# generated. After it has been dead this long, new hints for it will not be +# created until it has been seen alive and gone down again. +max_hint_window_in_ms: 10800000 # 3 hours +# throttle in KB's per second, per delivery thread +hinted_handoff_throttle_in_kb: 1024 +# Number of threads with which to deliver hints; +# Consider increasing this number when you have multi-dc deployments, since +# cross-dc handoff tends to be slower +max_hints_delivery_threads: 2 + +# The following setting populates the page cache on memtable flush and compaction +# WARNING: Enable this setting only when the whole node's data fits in memory. +# Defaults to: false +# populate_io_cache_on_flush: false + +# Authentication backend, implementing IAuthenticator; used to identify users +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator, +# PasswordAuthenticator}. +# +# - AllowAllAuthenticator performs no checks - set it to disable authentication. +# - PasswordAuthenticator relies on username/password pairs to authenticate +# users. It keeps usernames and hashed passwords in system_auth.credentials table. +# Please increase system_auth keyspace replication factor if you use this authenticator. +authenticator: org.apache.cassandra.auth.PasswordAuthenticator + +# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer, +# CassandraAuthorizer}. +# +# - AllowAllAuthorizer allows any action to any user - set it to disable authorization. +# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please +# increase system_auth keyspace replication factor if you use this authorizer. +authorizer: org.apache.cassandra.auth.CassandraAuthorizer + +# Validity period for permissions cache (fetching permissions can be an +# expensive operation depending on the authorizer, CassandraAuthorizer is +# one example). Defaults to 2000, set to 0 to disable. +# Will be disabled automatically for AllowAllAuthorizer. +permissions_validity_in_ms: 2000 + +# The partitioner is responsible for distributing rows (by key) across +# nodes in the cluster. Any IPartitioner may be used, including your +# own as long as it is on the classpath. Out of the box, Cassandra +# provides org.apache.cassandra.dht.{Murmur3Partitioner, RandomPartitioner +# ByteOrderedPartitioner, OrderPreservingPartitioner (deprecated)}. +# +# - RandomPartitioner distributes rows across the cluster evenly by md5. +# This is the default prior to 1.2 and is retained for compatibility. +# - Murmur3Partitioner is similar to RandomPartioner but uses Murmur3_128 +# Hash Function instead of md5. When in doubt, this is the best option. +# - ByteOrderedPartitioner orders rows lexically by key bytes. BOP allows +# scanning rows in key order, but the ordering can generate hot spots +# for sequential insertion workloads. +# - OrderPreservingPartitioner is an obsolete form of BOP, that stores +# - keys in a less-efficient format and only works with keys that are +# UTF8-encoded Strings. +# - CollatingOPP colates according to EN,US rules rather than lexical byte +# ordering. Use this as an example if you need custom collation. +# +# See http://wiki.apache.org/cassandra/Operations for more on +# partitioners and token selection. +partitioner: org.apache.cassandra.dht.Murmur3Partitioner + +# directories where Cassandra should store data on disk. +data_file_directories: + - /Users/jsanda/Development/redhat/rhq/rhq-data/storage-1/data + +# commit log +commitlog_directory: /Users/jsanda/Development/redhat/rhq/rhq-data/storage-1/commit_log + +# policy for data disk failures: +# stop: shut down gossip and Thrift, leaving the node effectively dead, but +# still inspectable via JMX. +# best_effort: stop using the failed disk and respond to requests based on +# remaining available sstables. This means you WILL see obsolete +# data at CL.ONE! +# ignore: ignore fatal errors and let requests fail, as in pre-1.2 Cassandra +disk_failure_policy: stop + +# Maximum size of the key cache in memory. +# +# Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the +# minimum, sometimes more. The key cache is fairly tiny for the amount of +# time it saves, so it's worthwhile to use it at large numbers. +# The row cache saves even more time, but must store the whole values of +# its rows, so it is extremely space-intensive. It's best to only use the +# row cache if you have hot rows or static rows. +# +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is empty to make it "auto" (min(5% of Heap (in MB), 100MB)). Set to 0 to disable key cache. +key_cache_size_in_mb: + +# Duration in seconds after which Cassandra should +# safe the keys cache. Caches are saved to saved_caches_directory as +# specified in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 14400 or 4 hours. +key_cache_save_period: 14400 + +# Number of keys from the key cache to save +# Disabled by default, meaning all keys are going to be saved +# key_cache_keys_to_save: 100 + +# Maximum size of the row cache in memory. +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is 0, to disable row caching. +row_cache_size_in_mb: 0 + +# Duration in seconds after which Cassandra should +# safe the row cache. Caches are saved to saved_caches_directory as specified +# in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 0 to disable saving the row cache. +row_cache_save_period: 0 + +# Number of keys from the row cache to save +# Disabled by default, meaning all keys are going to be saved +# row_cache_keys_to_save: 100 + +# The provider for the row cache to use. +# +# Supported values are: ConcurrentLinkedHashCacheProvider, SerializingCacheProvider +# +# SerializingCacheProvider serialises the contents of the row and stores +# it in native memory, i.e., off the JVM Heap. Serialized rows take +# significantly less memory than "live" rows in the JVM, so you can cache +# more rows in a given memory footprint. And storing the cache off-heap +# means you can use smaller heap sizes, reducing the impact of GC pauses. +# +# It is also valid to specify the fully-qualified class name to a class +# that implements org.apache.cassandra.cache.IRowCacheProvider. +# +# Defaults to SerializingCacheProvider +row_cache_provider: SerializingCacheProvider + +# saved caches +saved_caches_directory: /Users/jsanda/Development/redhat/rhq/rhq-data/storage-1/saved_caches + +# commitlog_sync may be either "periodic" or "batch." +# When in batch mode, Cassandra won't ack writes until the commit log +# has been fsynced to disk. It will wait up to +# commitlog_sync_batch_window_in_ms milliseconds for other writes, before +# performing the sync. +# +# commitlog_sync: batch +# commitlog_sync_batch_window_in_ms: 50 +# +# the other option is "periodic" where writes may be acked immediately +# and the CommitLog is simply synced every commitlog_sync_period_in_ms +# milliseconds. +commitlog_sync: periodic +commitlog_sync_period_in_ms: 10000 + +# The size of the individual commitlog file segments. A commitlog +# segment may be archived, deleted, or recycled once all the data +# in it (potentally from each columnfamily in the system) has been +# flushed to sstables. +# +# The default size is 32, which is almost always fine, but if you are +# archiving commitlog segments (see commitlog_archiving.properties), +# then you probably want a finer granularity of archiving; 8 or 16 MB +# is reasonable. +commitlog_segment_size_in_mb: 32 + +# any class that implements the SeedProvider interface and has a +# constructor that takes a Map<String, String> of parameters will do. +seed_provider: + # Addresses of hosts that are deemed contact points. + # Cassandra nodes use this list of hosts to find each other and learn + # the topology of the ring. You must change this if you are running + # multiple nodes! + - class_name: org.apache.cassandra.locator.SimpleSeedProvider + parameters: + # seeds is actually a comma-delimited list of addresses. + # Ex: "<ip1>,<ip2>,<ip3>" + - seeds: "127.0.0.1" + +# emergency pressure valve: each time heap usage after a full (CMS) +# garbage collection is above this fraction of the max, Cassandra will +# flush the largest memtables. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +# +# RELYING ON THIS AS YOUR PRIMARY TUNING MECHANISM WILL WORK POORLY: +# it is most effective under light to moderate load, or read-heavy +# workloads; under truly massive write load, it will often be too +# little, too late. +flush_largest_memtables_at: 0.75 + +# emergency pressure valve #2: the first time heap usage after a full +# (CMS) garbage collection is above this fraction of the max, +# Cassandra will reduce cache maximum _capacity_ to the given fraction +# of the current _size_. Should usually be set substantially above +# flush_largest_memtables_at, since that will have less long-term +# impact on the system. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +reduce_cache_sizes_at: 0.85 +reduce_cache_capacity_to: 0.6 + +# For workloads with more data than can fit in memory, Cassandra's +# bottleneck will be reads that need to fetch data from +# disk. "concurrent_reads" should be set to (16 * number_of_drives) in +# order to allow the operations to enqueue low enough in the stack +# that the OS and drives can reorder them. +# +# On the other hand, since writes are almost never IO bound, the ideal +# number of "concurrent_writes" is dependent on the number of cores in +# your system; (8 * number_of_cores) is a good rule of thumb. +concurrent_reads: 32 +concurrent_writes: 32 + +# Total memory to use for memtables. Cassandra will flush the largest +# memtable when this much memory is used. +# If omitted, Cassandra will set it to 1/3 of the heap. +# memtable_total_space_in_mb: 2048 + +# Total space to use for commitlogs. Since commitlog segments are +# mmapped, and hence use up address space, the default size is 32 +# on 32-bit JVMs, and 1024 on 64-bit JVMs. +# +# If space gets above this value (it will round up to the next nearest +# segment multiple), Cassandra will flush every dirty CF in the oldest +# segment and remove it. So a small total commitlog space will tend +# to cause more flush activity on less-active columnfamilies. +# commitlog_total_space_in_mb: 4096 + +# This sets the amount of memtable flush writer threads. These will +# be blocked by disk io, and each one will hold a memtable in memory +# while blocked. If you have a large heap and many data directories, +# you can increase this value for better flush performance. +# By default this will be set to the amount of data directories defined. +#memtable_flush_writers: 1 + +# the number of full memtables to allow pending flush, that is, +# waiting for a writer thread. At a minimum, this should be set to +# the maximum number of secondary indexes created on a single CF. +memtable_flush_queue_size: 4 + +# Whether to, when doing sequential writing, fsync() at intervals in +# order to force the operating system to flush the dirty +# buffers. Enable this to avoid sudden dirty buffer flushing from +# impacting read latencies. Almost always a good idea on SSD:s; not +# necessarily on platters. +trickle_fsync: false +trickle_fsync_interval_in_kb: 10240 + +# TCP port, for commands and data +storage_port: 7100 + +# SSL port, for encrypted communication. Unused unless enabled in +# encryption_options +ssl_storage_port: 7101 + +# Address to bind to and tell other Cassandra nodes to connect to. You +# _must_ change this if you want multiple nodes to be able to +# communicate! +# +# Leaving it blank leaves it up to InetAddress.getLocalHost(). This +# will always do the Right Thing *if* the node is properly configured +# (hostname, name resolution, etc), and the Right Thing is to use the +# address associated with the hostname (it might not be). +# +# Setting this to 0.0.0.0 is always wrong. +listen_address: 127.0.0.1 + +# Address to broadcast to other Cassandra nodes +# Leaving this blank will set it to the same value as listen_address +# broadcast_address: 1.2.3.4 + +# Internode authentication backend, implementing IInternodeAuthenticator; +# used to allow/disallow connections from peer nodes. +internode_authenticator: org.rhq.cassandra.auth.RhqInternodeAuthenticator + +# Whether to start the native transport server. +# Currently, only the thrift server is started by default because the native +# transport is considered beta. +# Please note that the address on which the native transport is bound is the +# same as the rpc_address. The port however is different and specified below. +start_native_transport: true +# port for the CQL native transport to listen for clients on +native_transport_port: 9142 +# The minimum and maximum threads for handling requests when the native +# transport is used. The meaning is those is similar to the one of +# rpc_min_threads and rpc_max_threads, though the default differ slightly and +# are the ones below: +# native_transport_min_threads: 16 +native_transport_max_threads: 128 + + +# Whether to start the thrift rpc server. +start_rpc: false +# The address to bind the Thrift RPC service to -- clients connect +# here. Unlike ListenAddress above, you *can* specify 0.0.0.0 here if +# you want Thrift to listen on all interfaces. +# +# Leaving this blank has the same effect it does for ListenAddress, +# (i.e. it will be based on the configured hostname of the node). +rpc_address: 127.0.0.1 +# port for Thrift to listen for clients on +rpc_port: 9160 + +# enable or disable keepalive on rpc connections +rpc_keepalive: true + +# Cassandra provides three out-of-the-box options for the RPC Server: +# +# sync -> One thread per thrift connection. For a very large number of clients, memory +# will be your limiting factor. On a 64 bit JVM, 128KB is the minimum stack size +# per thread, and that will correspond to your use of virtual memory (but physical memory +# may be limited depending on use of stack space). +# +# hsha -> Stands for "half synchronous, half asynchronous." All thrift clients are handled +# asynchronously using a small number of threads that does not vary with the amount +# of thrift clients (and thus scales well to many clients). The rpc requests are still +# synchronous (one thread per active request). +# +# The default is sync because on Windows hsha is about 30% slower. On Linux, +# sync/hsha performance is about the same, with hsha of course using less memory. +# +# Alternatively, can provide your own RPC server by providing the fully-qualified class name +# of an o.a.c.t.TServerFactory that can create an instance of it. +rpc_server_type: sync + +# Uncomment rpc_min|max_thread to set request pool size limits. +# +# Regardless of your choice of RPC server (see above), the number of maximum requests in the +# RPC thread pool dictates how many concurrent requests are possible (but if you are using the sync +# RPC server, it also dictates the number of clients that can be connected at all). +# +# The default is unlimited and thus provide no protection against clients overwhelming the server. You are +# encouraged to set a maximum that makes sense for you in production, but do keep in mind that +# rpc_max_threads represents the maximum number of client requests this server may execute concurrently. +# +# rpc_min_threads: 16 +# rpc_max_threads: 2048 + +# uncomment to set socket buffer sizes on rpc connections +# rpc_send_buff_size_in_bytes: +# rpc_recv_buff_size_in_bytes: + +# uncomment to set socket buffer size for internode communication +# Note that when setting this, the buffer size is limited by net.core.wmem_max +# and when not setting it it is defined by net.ipv4.tcp_wmem +# See: +# /proc/sys/net/core/wmem_max +# /proc/sys/net/core/rmem_max +# /proc/sys/net/ipv4/tcp_wmem +# /proc/sys/net/ipv4/tcp_wmem +# and: man tcp +# internode_send_buff_size_in_bytes: +# internode_recv_buff_size_in_bytes: + +# Frame size for thrift (maximum field length). +thrift_framed_transport_size_in_mb: 15 + +# The max length of a thrift message, including all fields and +# internal thrift overhead. +thrift_max_message_length_in_mb: 16 + +# Set to true to have Cassandra create a hard link to each sstable +# flushed or streamed locally in a backups/ subdirectory of the +# Keyspace data. Removing these links is the operator's +# responsibility. +incremental_backups: false + +# Whether or not to take a snapshot before each compaction. Be +# careful using this option, since Cassandra won't clean up the +# snapshots for you. Mostly useful if you're paranoid when there +# is a data format change. +snapshot_before_compaction: false + +# Whether or not a snapshot is taken of the data before keyspace truncation +# or dropping of column families. The STRONGLY advised default of true +# should be used to provide data safety. If you set this flag to false, you will +# lose data on truncation or drop. +auto_snapshot: true + +# Add column indexes to a row after its contents reach this size. +# Increase if your column values are large, or if you have a very large +# number of columns. The competing causes are, Cassandra has to +# deserialize this much of the row to read a single column, so you want +# it to be small - at least if you do many partial-row reads - but all +# the index data is read for each access, so you don't want to generate +# that wastefully either. +column_index_size_in_kb: 64 + +# Size limit for rows being compacted in memory. Larger rows will spill +# over to disk and use a slower two-pass compaction process. A message +# will be logged specifying the row key. +in_memory_compaction_limit_in_mb: 64 + +# Number of simultaneous compactions to allow, NOT including +# validation "compactions" for anti-entropy repair. Simultaneous +# compactions can help preserve read performance in a mixed read/write +# workload, by mitigating the tendency of small sstables to accumulate +# during a single long running compactions. The default is usually +# fine and if you experience problems with compaction running too +# slowly or too fast, you should look at +# compaction_throughput_mb_per_sec first. +# +# concurrent_compactors defaults to the number of cores. +# Uncomment to make compaction mono-threaded, the pre-0.8 default. +#concurrent_compactors: 1 + +# Multi-threaded compaction. When enabled, each compaction will use +# up to one thread per core, plus one thread per sstable being merged. +# This is usually only useful for SSD-based hardware: otherwise, +# your concern is usually to get compaction to do LESS i/o (see: +# compaction_throughput_mb_per_sec), not more. +multithreaded_compaction: false + +# Throttles compaction to the given total throughput across the entire +# system. The faster you insert data, the faster you need to compact in +# order to keep the sstable count down, but in general, setting this to +# 16 to 32 times the rate you are inserting data is more than sufficient. +# Setting this to 0 disables throttling. Note that this account for all types +# of compaction, including validation compaction. +compaction_throughput_mb_per_sec: 16 + +# Track cached row keys during compaction, and re-cache their new +# positions in the compacted sstable. Disable if you use really large +# key caches. +compaction_preheat_key_cache: true + +# Throttles all outbound streaming file transfers on this node to the +# given total throughput in Mbps. This is necessary because Cassandra does +# mostly sequential IO when streaming data during bootstrap or repair, which +# can lead to saturating the network connection and degrading rpc performance. +# When unset, the default is 200 Mbps or 25 MB/s. +# stream_throughput_outbound_megabits_per_sec: 200 + +# How long the coordinator should wait for read operations to complete +read_request_timeout_in_ms: 20000 +# How long the coordinator should wait for seq or index scans to complete +range_request_timeout_in_ms: 20000 +# How long the coordinator should wait for writes to complete +write_request_timeout_in_ms: 20000 +# How long the coordinator should wait for truncates to complete +# (This can be much longer, because we need to flush all CFs +# to make sure we can clear out anythink in the commitlog that could +# cause truncated data to reappear.) +truncate_request_timeout_in_ms: 60000 +# The default timeout for other, miscellaneous operations +request_timeout_in_ms: 20000 + +# Enable operation timeout information exchange between nodes to accurately +# measure request timeouts, If disabled cassandra will assuming the request +# was forwarded to the replica instantly by the coordinator +# +# Warning: before enabling this property make sure to ntp is installed +# and the times are synchronized between the nodes. +cross_node_timeout: false + +# Enable socket timeout for streaming operation. +# When a timeout occurs during streaming, streaming is retried from the start +# of the current file. This *can* involve re-streaming an important amount of +# data, so you should avoid setting the value too low. +# Default value is 0, which never timeout streams. +# streaming_socket_timeout_in_ms: 0 + +# phi value that must be reached for a host to be marked down. +# most users should never need to adjust this. +# phi_convict_threshold: 8 + +# endpoint_snitch -- Set this to a class that implements +# IEndpointSnitch. The snitch has two functions: +# - it teaches Cassandra enough about your network topology to route +# requests efficiently +# - it allows Cassandra to spread replicas around your cluster to avoid +# correlated failures. It does this by grouping machines into +# "datacenters" and "racks." Cassandra will do its best not to have +# more than one replica on the same "rack" (which may not actually +# be a physical location) +# +# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER, +# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS +# ARE PLACED. +# +# Out of the box, Cassandra provides +# - SimpleSnitch: +# Treats Strategy order as proximity. This improves cache locality +# when disabling read repair, which can further improve throughput. +# Only appropriate for single-datacenter deployments. +# - PropertyFileSnitch: +# Proximity is determined by rack and data center, which are +# explicitly configured in cassandra-topology.properties. +# - GossipingPropertyFileSnitch +# The rack and datacenter for the local node are defined in +# cassandra-rackdc.properties and propagated to other nodes via gossip. If +# cassandra-topology.properties exists, it is used as a fallback, allowing +# migration from the PropertyFileSnitch. +# - RackInferringSnitch: +# Proximity is determined by rack and data center, which are +# assumed to correspond to the 3rd and 2nd octet of each node's +# IP address, respectively. Unless this happens to match your +# deployment conventions (as it did Facebook's), this is best used +# as an example of writing a custom Snitch class. +# - Ec2Snitch: +# Appropriate for EC2 deployments in a single Region. Loads Region +# and Availability Zone information from the EC2 API. The Region is +# treated as the Datacenter, and the Availability Zone as the rack. +# Only private IPs are used, so this will not work across multiple +# Regions. +# - Ec2MultiRegionSnitch: +# Uses public IPs as broadcast_address to allow cross-region +# connectivity. (Thus, you should set seed addresses to the public +# IP as well.) You will need to open the storage_port or +# ssl_storage_port on the public IP firewall. (For intra-Region +# traffic, Cassandra will switch to the private IP after +# establishing a connection.) +# +# You can use a custom Snitch by setting this to the full class name +# of the snitch, which will be assumed to be on your classpath. +endpoint_snitch: SimpleSnitch + +# controls how often to perform the more expensive part of host score +# calculation +dynamic_snitch_update_interval_in_ms: 100 +# controls how often to reset all host scores, allowing a bad host to +# possibly recover +dynamic_snitch_reset_interval_in_ms: 600000 +# if set greater than zero and read_repair_chance is < 1.0, this will allow +# 'pinning' of replicas to hosts in order to increase cache capacity. +# The badness threshold will control how much worse the pinned host has to be +# before the dynamic snitch will prefer other replicas over it. This is +# expressed as a double which represents a percentage. Thus, a value of +# 0.2 means Cassandra would continue to prefer the static snitch values +# until the pinned host was 20% worse than the fastest. +dynamic_snitch_badness_threshold: 0.1 + +# request_scheduler -- Set this to a class that implements +# RequestScheduler, which will schedule incoming client requests +# according to the specific policy. This is useful for multi-tenancy +# with a single Cassandra cluster. +# NOTE: This is specifically for requests from the client and does +# not affect inter node communication. +# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place +# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of +# client requests to a node with a separate queue for each +# request_scheduler_id. The scheduler is further customized by +# request_scheduler_options as described below. +request_scheduler: org.apache.cassandra.scheduler.NoScheduler + +# Scheduler Options vary based on the type of scheduler +# NoScheduler - Has no options +# RoundRobin +# - throttle_limit -- The throttle_limit is the number of in-flight +# requests per client. Requests beyond +# that limit are queued up until +# running requests can complete. +# The value of 80 here is twice the number of +# concurrent_reads + concurrent_writes. +# - default_weight -- default_weight is optional and allows for +# overriding the default which is 1. +# - weights -- Weights are optional and will default to 1 or the +# overridden default_weight. The weight translates into how +# many requests are handled during each turn of the +# RoundRobin, based on the scheduler id. +# +# request_scheduler_options: +# throttle_limit: 80 +# default_weight: 5 +# weights: +# Keyspace1: 1 +# Keyspace2: 5 + +# request_scheduler_id -- An identifer based on which to perform +# the request scheduling. Currently the only valid option is keyspace. +# request_scheduler_id: keyspace + +# index_interval controls the sampling of entries from the primrary +# row index in terms of space versus time. The larger the interval, +# the smaller and less effective the sampling will be. In technicial +# terms, the interval coresponds to the number of index entries that +# are skipped between taking each sample. All the sampled entries +# must fit in memory. Generally, a value between 128 and 512 here +# coupled with a large key cache size on CFs results in the best trade +# offs. This value is not often changed, however if you have many +# very small rows (many to an OS page), then increasing this will +# often lower memory usage without a impact on performance. +index_interval: 128 + +# Enable or disable inter-node encryption +# Default settings are TLS v1, RSA 1024-bit keys (it is imperative that +# users generate their own keys) TLS_RSA_WITH_AES_128_CBC_SHA as the cipher +# suite for authentication, key exchange and encryption of the actual data transfers. +# NOTE: No custom encryption options are enabled at the moment +# The available internode options are : all, none, dc, rack +# +# If set to dc cassandra will encrypt the traffic between the DCs +# If set to rack cassandra will encrypt the traffic between the racks +# +# The passwords used in these options must match the passwords used when generating +# the keystore and truststore. For instructions on generating these files, see: +# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSS… +# +server_encryption_options: + internode_encryption: none + keystore: conf/.keystore + keystore_password: cassandra + truststore: conf/.truststore + truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + # require_client_auth: false + +# enable or disable client/server encryption. +client_encryption_options: + enabled: false + keystore: conf/.keystore + keystore_password: cassandra + # require_client_auth: false + # Set trustore and truststore_password if require_client_auth is true + # truststore: conf/.truststore + # truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + +# internode_compression controls whether traffic between nodes is +# compressed. +# can be: all - all traffic is compressed +# dc - traffic between different datacenters is compressed +# none - nothing is compressed. +internode_compression: none + +# Enable or disable tcp_nodelay for inter-dc communication. +# Disabling it will result in larger (but fewer) network packets being sent, +# reducing overhead from the TCP protocol itself, at the cost of increasing +# latency if you block for cross-datacenter responses. +inter_dc_tcp_nodelay: true

1 0

[rhq] Branch 'feature/bundle-group' - modules/enterprise
by mazz 26 Jul '13

26 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java | 115 ++++++++++ 1 file changed, 115 insertions(+) New commits: commit f7fea2d432ad92b49574387af1964245acd490aa Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Jul 26 17:01:56 2013 -0400 add createInitialBundleVersion APIs diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java index 8b4dae6..cffe363 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java @@ -223,6 +223,9 @@ public interface BundleManagerRemote { * bundle the bundle will be implicitly created. The bundle type is discovered by the bundle server * plugin that can parse the recipe. * </p> + * If this bundle version is the initial version of a new bundle that needs to be created, the subject must + * have Global.VIEW_BUNDLES because the new bundle will not be associated with any bundle group. + * </p> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG @@ -236,12 +239,35 @@ public interface BundleManagerRemote { BundleVersion createBundleVersionViaRecipe(Subject subject, String recipe) throws Exception; /** + * Like #createBundleVersionViaRecipe except this method will assume this is a new bundle and is responsible + * for creating the bundle as well as the bundle version. The caller can indicate which bundle group the new bundle + * should be assigned to. + * If bundleGroupId is 0, then the new bundle will not be associated with any bundle group - this is only + * allowed if the caller has the permission Global.VIEW_BUNDLES. + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * + * @param subject user that must have proper permissions + * @param bundleGroupId identifies the bundle group that the new bundle will be associated with; 0 if no group + * @param recipe the recipe that defines the bundle version to be created + * @return the persisted BundleVersion with alot of the internal relationships filled in to help the caller + * understand all that this method did. + */ + BundleVersion createInitialBundleVersionViaRecipe(Subject subject, int bundleGroupId, String recipe) throws Exception; + + /** * Creates a bundle version based on a Bundle Distribution file. Typically a zip file, the bundle distribution * contains the recipe for a supported bundle type, along with 0, 1 or more bundle files that will be associated * with the bundle version. The recipe specifies the bundle name, version, version name and version description. * If this is the initial version for the named bundle the bundle will be implicitly created. The bundle type * is discovered by inspecting the distribution file. * </p> + * If this bundle version is the initial version of a new bundle that needs to be created, the subject must + * have Global.VIEW_BUNDLES because the new bundle will not be associated with any bundle group. + * </p> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG @@ -255,12 +281,36 @@ public interface BundleManagerRemote { BundleVersion createBundleVersionViaFile(Subject subject, File distributionFile) throws Exception; /** + * Like #createBundleVersionViaFile except this method will assume this is a new bundle and is responsible + * for creating the bundle as well as the bundle version. The caller can indicate which bundle group the new bundle + * should be assigned to. + * If bundleGroupId is 0, then the new bundle will not be associated with any bundle group - this is only + * allowed if the caller has the permission Global.VIEW_BUNDLES. + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * + * @param subject user that must have proper permissions + * @param bundleGroupId identifies the bundle group that the new bundle will be associated with; 0 if no group + * @param distributionFile a local Bundle Distribution file. It must be read accessible by the RHQ server process. + * @return the persisted BundleVersion with alot of the internal relationships filled in to help the caller + * understand all that this method did. Bundle files specifically are returned. + * @throws Exception + */ + BundleVersion createInitialBundleVersionViaFile(Subject subject, int bundleGroupId, File distributionFile) throws Exception; + + /** * Creates a bundle version based on the actual bytes of a Bundle Distribution file. This is essentially * the same as {@link #createBundleVersionViaFile(Subject, File)} but the caller is providing the actual * bytes of the file as opposed to the file itself. * WARNING: obviously, this requires the entire distribution file to have been loaded fully in memory. * For very large distribution files, this could cause OutOfMemoryErrors. * </p> + * If this bundle version is the initial version of a new bundle that needs to be created, the subject must + * have Global.VIEW_BUNDLES because the new bundle will not be associated with any bundle group. + * </p> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG @@ -274,6 +324,27 @@ public interface BundleManagerRemote { BundleVersion createBundleVersionViaByteArray(Subject subject, byte[] fileBytes) throws Exception; /** + * Like #createBundleVersionViaByteArray except this method will assume this is a new bundle and is responsible + * for creating the bundle as well as the bundle version. The caller can indicate which bundle group the new bundle + * should be assigned to. + * If bundleGroupId is 0, then the new bundle will not be associated with any bundle group - this is only + * allowed if the caller has the permission Global.VIEW_BUNDLES. + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * + * @param subject user that must have proper permissions + * @param bundleGroupId identifies the bundle group that the new bundle will be associated with; 0 if no group + * @param fileBytes the file bits that make up the entire bundle distribution file + * @return the persisted BundleVersion with a lot of the internal relationships filled in to help the caller + * understand all that this method did. Bundle files specifically are returned. + * @throws Exception + */ + BundleVersion createInitialBundleVersionViaByteArray(Subject subject, int bundleGroupId, byte[] fileBytes) throws Exception; + + /** * Creates a bundle version based on a Bundle Distribution file. Typically a zip file, the bundle distribution * contains the recipe for a supported bundle type, along with 0, 1 or more bundle files that will be associated * with the bundle version. The recipe specifies the bundle name, version, version name and version description. @@ -282,6 +353,9 @@ public interface BundleManagerRemote { * <br/></br> * Note, if the file is local it is more efficient to use {@link #createBundleVersionViaFile(Subject,File)}. * </p> + * If this bundle version is the initial version of a new bundle that needs to be created, the subject must + * have Global.VIEW_BUNDLES because the new bundle will not be associated with any bundle group. + * </p> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG @@ -297,9 +371,34 @@ public interface BundleManagerRemote { BundleVersion createBundleVersionViaURL(Subject subject, String distributionFileUrl) throws Exception; /** + * Like #createBundleVersionViaURL except this method will assume this is a new bundle and is responsible + * for creating the bundle as well as the bundle version. The caller can indicate which bundle group the new bundle + * should be assigned to. + * If bundleGroupId is 0, then the new bundle will not be associated with any bundle group - this is only + * allowed if the caller has the permission Global.VIEW_BUNDLES. + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * + * @param subject user that must have proper permissions + * @param bundleGroupId identifies the bundle group that the new bundle will be associated with; 0 if no group + * @param distributionFileUrl a URL String to the Bundle Distribution file. It must be live, resolvable and read accessible + * by the RHQ server process. + * @return the persisted BundleVersion with a lot of the internal relationships filled in to help the caller + * understand all that this method did. Bundle files specifically are returned. + * @throws Exception + */ + BundleVersion createInitialBundleVersionViaURL(Subject subject, int bundleGroupId, String distributionFileUrl) throws Exception; + + /** * A version of the {@link #createBundleVersionViaURL(org.rhq.core.domain.auth.Subject, String)} that accepts a * username and password for basic authentication on the HTTP URLs. * </p> + * If this bundle version is the initial version of a new bundle that needs to be created, the subject must + * have Global.VIEW_BUNDLES because the new bundle will not be associated with any bundle group. + * </p> * Required Permissions: Either: * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG @@ -311,6 +410,22 @@ public interface BundleManagerRemote { String password) throws Exception; /** + * Like #createBundleVersionViaURL except this method will assume this is a new bundle and is responsible + * for creating the bundle as well as the bundle version. The caller can indicate which bundle group the new bundle + * should be assigned to. + * If bundleGroupId is 0, then the new bundle will not be associated with any bundle group - this is only + * allowed if the caller has the permission Global.VIEW_BUNDLES. + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * + * @see #createBundleVersionViaURL(org.rhq.core.domain.auth.Subject, String) + */ + BundleVersion createInitialBundleVersionViaURL(Subject subject, int bundleGroupId, String distributionFileUrl, String username, String password) throws Exception; + + /** * Remove everything associated with the Bundles with the exception of files laid down by related deployments. * Deployed files are left as is on the deployment platforms but the bundle mechanism will no longer track * the deployment of all bundles that have been deleted.

1 0

[rhq] modules/plugins
by John Sanda 26 Jul '13

26 Jul '13

modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 4 modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 75 +++++++++- modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java | 21 ++ 3 files changed, 95 insertions(+), 5 deletions(-) New commits: commit d01c43b697ef67f598016824d6cd47b5de2ac83e Author: John Sanda <jsanda(a)redhat.com> Date: Fri Jul 26 15:42:46 2013 -0400 add storage node shutdown operation that uses pid file There can be problems with getting the actual, current pid from Sigar, so the storage node plugin will first attempt to get the pid from the pid file which should exist on disk. If that fails, then we will attempt to get the pid from Sigar. This implementation for shutdown does not work for Windows so need to revist it to add in Windows support. We may even consider delegating to rhqtcl. diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 3e55a93..d648ad8 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -246,8 +246,6 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent long pid = process.getPid(); try { - getEmsConnection().close(); - process.kill("KILL"); Configuration pluginConfig = getResourceContext().getPluginConfiguration(); @@ -266,7 +264,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } - private void waitForNodeToGoDown() throws InterruptedException { + protected void waitForNodeToGoDown() throws InterruptedException { if (OperatingSystem.getInstance().getName().equals(OperatingSystem.NAME_MACOSX)) { // See this thread on VMWare forum: http://communities.vmware.com/message/2187972#2187972 // Unfortunately there is no work around for this failure on Mac OSX so the method will silently return on diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 125f4d2..5933093 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -28,6 +28,7 @@ package org.rhq.plugins.storage; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; @@ -39,6 +40,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hyperic.sigar.SigarException; import org.mc4j.ems.connection.EmsConnection; import org.mc4j.ems.connection.bean.EmsBean; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; @@ -54,9 +56,11 @@ import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.pluginapi.inventory.ProcessScanResult; import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.system.ProcessInfo; import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.core.util.file.FileUtil; @@ -105,11 +109,80 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return updateKnownNodes(parameters); } else if (name.equals("prepareForBootstrap")) { return prepareForBootstrap(parameters); + } else if (name.equals("shutdown")) { + return shutdownStorageNode(); } else { return super.invokeOperation(name, parameters); } } + private OperationResult shutdownStorageNode() { + OperationResult result = new OperationResult(); + File binDir = new File(getBasedir(), "bin"); + File pidFile = new File(binDir, "cassandra.pid"); + + try { + if (pidFile.exists()) { + long pid = readPidFile(pidFile); + log.info("Shutting down storage node with pid " + pid); + ProcessInfo process = findProcessInfo(pid); + if (process != null) { + try { + process.kill("KILL"); + waitForNodeToGoDown(); + pidFile.delete(); + result.setSimpleResult("Successfully storage node with pid " + pid); + } catch (SigarException e) { + log.error("Failed to delete storage node with pid " + process.getPid(), e); + result.setErrorMessage("Failed to delete storage node with pid " + pid + ": " + + ThrowableUtil.getAllMessages(e)); + } + } else { + log.warn("Could not find process info for pid " + pid); + result = shutdownUsingNativeProcessInfo(); + } + + } else { + log.warn("Did not find pid file " + pidFile + ". It should not be modified, deleted, or moved."); + result = shutdownUsingNativeProcessInfo(); + } + } catch (FileNotFoundException e) { + log.error("Could not read pid file " + pidFile, e); + result.setErrorMessage("Could not read pid file " + pidFile + ": " + ThrowableUtil.getAllMessages(e)); + } catch (InterruptedException e) { + log.warn("The shutdown operation was cancelled or interrupted. This interruption occurred while trying " + + "to verify that the storage node process has exited."); + result.setErrorMessage("The operation was cancelled or interrupted while trying to verify that the " + + "storage node process has exited."); + } + return result; + } + + private long readPidFile(File pidFile) throws FileNotFoundException { + return Long.parseLong(StreamUtil.slurp(new FileReader(pidFile))); + } + + private ProcessInfo findProcessInfo(long pid) { + List<ProcessScanResult> scanResults = getResourceContext().getNativeProcessesForType(); + + for (ProcessScanResult scanResult : scanResults) { + if (scanResult.getProcessInfo().getPid() == pid) { + return scanResult.getProcessInfo(); + } + } + return null; + } + + private OperationResult shutdownUsingNativeProcessInfo() throws InterruptedException { + log.warn("Could not obtain process info from pid file"); + log.info("Obtaining process info from the system to perform the shutdown"); + + OperationResult result = shutdownNode(); + waitForNodeToGoDown(); + + return result; + } + private OperationResult updateConfiguration(Configuration params) { boolean restartIsRequired = false; @@ -237,7 +310,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper OperationResult result = new OperationResult(); log.info("Stopping storage node"); - OperationResult stopNodeResult = stopNode(); + OperationResult stopNodeResult = shutdownStorageNode(); if (stopNodeResult.getErrorMessage() != null) { log.error("Failed to stop storage node " + this + " Cannot prepare the node for bootstrap which means " + "that the storage node cannot join the cluster. Make sure the storage node is not running and retry " + diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index f0744a4..eb4d545 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -231,6 +231,26 @@ public class StorageNodeComponentITest { assertNodeIsUp("Expected " + storageNode + " to be up after restarting it."); } + @Test(dependsOnMethods = "restartStorageNode") + public void prepareForBootstrap() { + Configuration params = Configuration.builder().addSimple("cqlPort", 9242).addSimple("gossipPort", 7200) + .openList("storageNodeIPAddresses", "storageNodeIPAddresse").addSimples("127.0.0.1", "127.0.0.2") + .closeList().build(); + + OperationManager operationManager = PluginContainer.getInstance().getOperationManager(); + OperationServicesAdapter operationsService = new OperationServicesAdapter(operationManager); + + long timeout = 1000 * 60; + OperationContextImpl operationContext = new OperationContextImpl(storageNode.getId()); + OperationServicesResult result = operationsService.invokeOperation(operationContext, "prepareForBootstrap", + params, timeout); + + assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The operation failed: " + + result.getErrorStackTrace()); + + assertNodeIsUp("Expected " + storageNode + " to be up after the prepareForBootstrap operation completes."); + } + private void assertNodeIsUp(String msg) { executeAvailabilityScan(); @@ -251,7 +271,6 @@ public class StorageNodeComponentITest { private Availability getAvailability() { InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); -// return inventoryManager.getAvailabilityIfKnown(storageNode); return inventoryManager.getCurrentAvailability(storageNode); }

1 0

[rhq] Branch 'feature/bundle-group' - modules/enterprise
by mazz 26 Jul '13

26 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java | 176 +++++++--- 1 file changed, 140 insertions(+), 36 deletions(-) New commits: commit a9c76478054bb558012e2706a6d64435f9588d7e Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Jul 26 15:45:05 2013 -0400 add some javadoc and new apis for bundle groups diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java index 0ffdc1a..8b4dae6 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java @@ -72,7 +72,12 @@ public interface BundleManagerRemote { /** * Adds a BundleFile to the BundleVersion and implicitly creates the backing PackageVersion. If the PackageVersion * already exists use {@link #addBundleFileViaPackageVersion(Subject, int, String, int)} - * + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * * @param subject user that must have proper permissions * @param bundleVersionId id of the BundleVersion incorporating this BundleFile * @param name name of the BundleFile (and the resulting Package) @@ -89,7 +94,12 @@ public interface BundleManagerRemote { * A convenience method taking a byte array as opposed to a stream for the file bits. * WARNING: obviously, this requires the entire bundle file to have been loaded fully in memory. * For very large files, this could cause OutOfMemoryErrors. - * + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * * @see {@link #addBundleFile(Subject, int, String, String, Architecture, InputStream)} */ BundleFile addBundleFileViaByteArray(Subject subject, int bundleVersionId, String name, String version, @@ -97,7 +107,12 @@ public interface BundleManagerRemote { /** * A convenience method taking a URL String whose content will be streamed to the server and used for the file bits. - * + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * * @see #addBundleFile(Subject, int, String, String, Architecture, InputStream) */ BundleFile addBundleFileViaURL(Subject subject, int bundleVersionId, String name, String version, @@ -106,6 +121,11 @@ public interface BundleManagerRemote { /** * A variant of {@link #addBundleFileViaURL(Subject, int, String, String, Architecture, String)} supporting the * HTTP basic authentication. + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * * @see #addBundleFileViaURL(Subject, int, String, String, Architecture, String) */ @@ -114,19 +134,40 @@ public interface BundleManagerRemote { /** * A convenience method taking an existing PackageVersion as opposed to a stream for the file bits. - * + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * * @see {@link #addBundleFile(Subject, int, String, String, Architecture, InputStream)} */ BundleFile addBundleFileViaPackageVersion(Subject subject, int bundleVersionId, String name, int packageVersionId) throws Exception; - //void assignBundlesToBundleGroup - + /** + * Assign the specified bundles to the specified bundle group. + * </p> + * Requires VIEW permission for the relevant bundle and either: + * - Global.CREATE_BUNDLE + * - BundleGroup.CREATE_BUNDLES_IN_GROUP or BundleGroup.ASSIGN_BUNDLES_TO_GROUP for the relevant bundle group + * + * @param subject + * @param bundleGroupId + * @param bundleIds + */ + void assignBundlesToBundleGroup(Subject subject, int bundleGroupId, int[] bundleIds); + /** * Create a new bundle deployment. Note that bundle deployment names are generated by this * call. This provides useful, uniform naming for display. An optional, custom description * can be added. This call defines a deployment. The defined deployment can then be * scheduled in a separate call. + * </p> + * Required Permissions: Either: + * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * * @param subject user that must have proper permissions * @param bundleVersionId the BundleVersion being deployed by this deployment * @param bundleDestinationId the BundleDestination for the deployment @@ -141,7 +182,11 @@ public interface BundleManagerRemote { /** * Creates a bundle destination that describes a target for the bundle deployments. - * + * </p> + * Required Permissions: Either: + * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * * @param subject user must have MANAGE_INVENTORY permission * @param bundleId the Bundle to be deployed to this Destination * @param name a name for this destination. not null or empty @@ -161,7 +206,8 @@ public interface BundleManagerRemote { /** * Create a new bundle group. * <p/> - * Requires Global.MANAGE_BUNDLE_GROUP permission. + * Require Permissions: + * - Global.MANAGE_BUNDLE_GROUPS * * @param subject user that must have proper permissions * @param name the unique bundle group name @@ -176,7 +222,12 @@ public interface BundleManagerRemote { * version, version name and version description. If this is the initial version for the named * bundle the bundle will be implicitly created. The bundle type is discovered by the bundle server * plugin that can parse the recipe. - * + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * * @param subject user that must have proper permissions * @param recipe the recipe that defines the bundle version to be created * @return the persisted BundleVersion with alot of the internal relationships filled in to help the caller @@ -190,7 +241,12 @@ public interface BundleManagerRemote { * with the bundle version. The recipe specifies the bundle name, version, version name and version description. * If this is the initial version for the named bundle the bundle will be implicitly created. The bundle type * is discovered by inspecting the distribution file. - * + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * * @param subject user that must have proper permissions * @param distributionFile a local Bundle Distribution file. It must be read accessible by the RHQ server process. * @return the persisted BundleVersion with alot of the internal relationships filled in to help the caller @@ -204,6 +260,11 @@ public interface BundleManagerRemote { * bytes of the file as opposed to the file itself. * WARNING: obviously, this requires the entire distribution file to have been loaded fully in memory. * For very large distribution files, this could cause OutOfMemoryErrors. + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * * @param subject user that must have proper permissions * @param fileBytes the file bits that make up the entire bundle distribution file @@ -220,7 +281,12 @@ public interface BundleManagerRemote { * is discovered by inspecting the distribution file. * <br/></br> * Note, if the file is local it is more efficient to use {@link #createBundleVersionViaFile(Subject,File)}. - * + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * * @param subject user that must have proper permissions * @param distributionFileUrl a URL String to the Bundle Distribution file. It must be live, resolvable and read accessible * by the RHQ server process. @@ -233,6 +299,11 @@ public interface BundleManagerRemote { /** * A version of the {@link #createBundleVersionViaURL(org.rhq.core.domain.auth.Subject, String)} that accepts a * username and password for basic authentication on the HTTP URLs. + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG * * @see #createBundleVersionViaURL(org.rhq.core.domain.auth.Subject, String) */ @@ -243,7 +314,13 @@ public interface BundleManagerRemote { * Remove everything associated with the Bundles with the exception of files laid down by related deployments. * Deployed files are left as is on the deployment platforms but the bundle mechanism will no longer track * the deployment of all bundles that have been deleted. - * + * The bundles that are deleted will be removed from all bundle groups that it was a member of. + * </p> + * Required Permissions: Either: + * - Global.DELETE_BUNDLES and Global.VIEW_BUNDLES + * - Global.DELETE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.DELETE_BUNDLES_FROM_GROUP for bundle group BG and the relevant bundle is assigned to BG + * * @param subject user that must have proper permissions * @param bundleIds IDs of all bundles to be deleted * @throws Exception if any part of the removal fails. @@ -254,7 +331,13 @@ public interface BundleManagerRemote { * Remove everything associated with the Bundle with the exception of files laid down by related deployments. * Deployed files are left as is on the deployment platforms but the bundle mechanism will no longer track * the deployment. - * + * The bundles that are deleted will be removed from all bundle groups that it was a member of. + * </p> + * Required Permissions: Either: + * - Global.DELETE_BUNDLES and Global.VIEW_BUNDLES + * - Global.DELETE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.DELETE_BUNDLES_FROM_GROUP for bundle group BG and the relevant bundle is assigned to BG + * * @param subject user that must have proper permissions * @param bundleId the id of the bundle to remove * @throws Exception if any part of the removal fails. @@ -264,19 +347,26 @@ public interface BundleManagerRemote { /** * Delete a bundle group. Any currently assigned bundles will be removed but are not deleted. * <p/> - * Requires Global.MANAGE_BUNDLE_GROUP permission. + * Required Permissions: + * - Global.MANAGE_BUNDLE_GROUPS * * @param subject user that must have proper permissions - * @param id the bundle group id + * @param ids the bundle group id * @throws Exception */ - void deleteBundleGroups(Subject subject, int... id) throws Exception; + void deleteBundleGroups(Subject subject, int[] ids) throws Exception; /** * Remove everything associated with the BundleVersion with the exception of files laid down by related deployments. * Deployed files are left as is on the deployment platforms but the bundle mechanism will no longer track * the deployment. - * + * The deleted bundle version will no longer exist in any bundle group. + * </p> + * Required Permissions: Either: + * - Global.DELETE_BUNDLES and Global.VIEW_BUNDLES + * - Global.DELETE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.DELETE_BUNDLES_FROM_GROUP for bundle group BG and the relevant bundle is assigned to BG + * * @param subject user that must have proper permissions * @param bundleVersionId the id of the bundle version to remove * @param deleteBundleIfEmpty if <code>true</code> and if this method deletes the last bundle version for its @@ -310,7 +400,13 @@ public interface BundleManagerRemote { /** * Determine the files required for a BundleVersion and return all of the filenames or optionally, just those * that lack BundleFiles for the BundleVersion. The recipe may be parsed as part of this call. - * + * This is needed as part of the bundle creation workflow, hence why creation permissions are needed. + * </p> + * Required Permissions: Either: + * - Global.CREATE_BUNDLES and Global.VIEW_BUNDLES + * - Global.CREATE_BUNDLES and BundleGroup.VIEW_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * - BundleGroup.CREATE_BUNDLES_IN_GROUP for bundle group BG and the relevant bundle is assigned to BG + * * @param subject user that must have proper permissions * @param bundleVersionId the BundleVersion being queried * @param withoutBundleFileOnly if true omit any filenames that already have a corresponding BundleFile for @@ -322,23 +418,11 @@ public interface BundleManagerRemote { throws Exception; /** - * Similar to {@link #getBundleVersionFilenames(Subject, int, boolean)}, this will determine the files required for a BundleVersion and return - * all of the filenames, with the values of the map being true if they already exist or false if they lack BundleFile representation - * in the BundleVersion. - * - * @param subject user that must have proper permissions - * @param bundleVersionId the BundleVersion being queried - * @return map keyed on filenames whose value indicates if a bundle file exists for the file or not - * @throws Exception - */ - /* comment back in when someone writes an adapter to support Map un/marshalling - Map<String, Boolean> getAllBundleVersionFilenames( - Subject subject, - int bundleVersionId) throws Exception; - */ - - /** * Purges the destination's live deployment content from the remote platforms. + * </p> + * Required Permissions: Either: + * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) * * @param subject user that must have proper permissions * @param bundleDestinationId the ID of the destination that is to be purged of bundle content @@ -351,7 +435,11 @@ public interface BundleManagerRemote { * complete. The returned BundleDeployment can be used to track the history of the individual deployments. * <br/><br/> * TODO: Add the scheduling capability, currently it's Immediate. - * <br/> + * </p> + * Required Permissions: Either: + * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * * @param subject user that must have proper permissions * @param bundleDeploymentId the BundleDeployment being used to guide the deployments * @param isCleanDeployment if true perform a wipe of the deploy directory prior to the deployment. If false @@ -371,7 +459,11 @@ public interface BundleManagerRemote { * call. This provides useful, uniform naming for display. An optional, custom description can be added. * <br/><br/> * TODO: Add the scheduling capability, currently it's Immediate. - * <br/> + * </p> + * Required Permissions: Either: + * - Global.DEPLOY_BUNDLES and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * - Resource.DEPLOY_BUNDLES_TO_GROUP and a view of the relevant bundle and a view of the relevant resource group (may involve multiple roles) + * * @param subject user that must have proper permissions * @param deploymentDescription an optional longer description describing this deployment. If null defaults * to the description of the previous deployment. @@ -383,4 +475,16 @@ public interface BundleManagerRemote { BundleDeployment scheduleRevertBundleDeployment(Subject subject, int bundleDestinationId, String deploymentDescription, boolean isCleanDeployment) throws Exception; + /** + * Unassign the specified bundles from the specified bundle group. + * </p> + * Requires VIEW permission for the relevant bundles and either: + * - Global.DELETE_BUNDLE + * - BundleGroup.DELETE_BUNDLES_FROM_GROUP or BundleGroup.UNASSIGN_BUNDLES_FROM_GROUP for the relevant bundle group + * + * @param subject + * @param bundleGroupId + * @param bundleIds + */ + void unassignBundlesFromBundleGroup(Subject subject, int bundleGroupId, int[] bundleIds); }

1 0

[rhq] Branch 'feature/bundle-group' - modules/core
by mazz 26 Jul '13

26 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4945c1c2722ee77294860be6d99e15d5612f1220 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Jul 26 11:20:54 2013 -0400 trivial change - first commit from intellij :} diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java index 88fb948..4ca733c 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java @@ -193,7 +193,7 @@ public enum Permission { /** * Implied - Can view bundles in the bundle group */ - VIEW_BUNDLES_IN_GROUP(Target.BUNDLE) // 25 + VIEW_BUNDLES_IN_GROUP(Target.BUNDLE) // 27 ;

1 0

[rhq] Branch 'feature/bundle-group' - modules/enterprise
by Jay Shaughnessy 26 Jul '13

26 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 112 +++++++--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java | 26 ++ 2 files changed, 105 insertions(+), 33 deletions(-) New commits: commit 57a64d60c88eb9b16c0a4048cd732057acbea65e Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jul 26 10:16:34 2013 -0400 Start of remote API design/impl for BundleGroups diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java index dbecb26..ac05e20 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java @@ -257,6 +257,31 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override + @RequiredPermission(Permission.MANAGE_BUNDLE_GROUPS) + public BundleGroup createBundleGroup(Subject subject, String name, String description) throws Exception { + if (null == name || "".equals(name.trim())) { + throw new IllegalArgumentException("Invalid bundleGroupName: " + name); + } + + BundleGroupCriteria c = new BundleGroupCriteria(); + c.addFilterName(name); + c.setStrict(true); + if (!bundleManager.findBundleGroupsByCriteria(subject, c).isEmpty()) { + throw new IllegalArgumentException("Invalid bundleGroupName, bundle group already exists with name: " + + name); + } + + // create and add the required Repo. the Repo is a detached object which helps in its eventual + // removal. + BundleGroup bg = new BundleGroup(name); + bg.setDescription(description); + + entityManager.persist(bg); + + return bg; + } + + @Override @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleDeployment createBundleDeploymentInNewTrans(Subject subject, int bundleVersionId, @@ -502,8 +527,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot RecipeParseResults results; try { - results = BundleManagerHelper.getPluginContainer().getBundleServerPluginManager().parseRecipe( - bundleType.getName(), recipe); + results = BundleManagerHelper.getPluginContainer().getBundleServerPluginManager() + .parseRecipe(bundleType.getName(), recipe); } catch (Exception e) { // ensure that we throw a runtime exception to force a rollback throw new RuntimeException("Failed to parse recipe", e); @@ -610,8 +635,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot try { file = downloadFile(distributionFileUrl, username, password); - log.debug("Copied [" + file.length() + "] bytes from [" + distributionFileUrl + "] into [" - + file.getPath() + "]"); + log.debug("Copied [" + file.length() + "] bytes from [" + distributionFileUrl + "] into [" + file.getPath() + + "]"); return createBundleVersionViaFile(subject, file); } finally { @@ -631,8 +656,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } } - private File downloadFileFromHttp(URL url, String username, String password) throws URISyntaxException, - IOException { + private File downloadFileFromHttp(URL url, String username, String password) throws URISyntaxException, IOException { HttpParams params = new BasicHttpParams(); HttpClientParams.setRedirecting(params, true); @@ -647,9 +671,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot HttpResponse response = httpClient.execute(get); if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { - throw new IllegalArgumentException( - "Failed to download the file from the URL [" + url + "]. The server responded: " + - response.getStatusLine().toString()); + throw new IllegalArgumentException("Failed to download the file from the URL [" + url + + "]. The server responded: " + response.getStatusLine().toString()); } InputStream contents = response.getEntity().getContent(); @@ -842,8 +865,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot // Create the mapping between the Bundle's Repo and the BundleFile's PackageVersion Repo repo = bundle.getRepo(); // add the packageVersion as overlord, this allows users without MANAGE_INVENTORY permission to add bundle files - repoManager.addPackageVersionsToRepo(subjectManager.getOverlord(), repo.getId(), new int[] { packageVersion - .getId() }); + repoManager.addPackageVersionsToRepo(subjectManager.getOverlord(), repo.getId(), + new int[] { packageVersion.getId() }); // Classify the Package with the Bundle name in order to distinguish it from the same package name for // a different bundle. @@ -904,7 +927,6 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } } - @Override @RequiredPermission(Permission.MANAGE_BUNDLE) public BundleFile addBundleFileViaPackageVersion(Subject subject, int bundleVersionId, String name, @@ -1126,8 +1148,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot BundleDeployment revertDeployment = bundleManager.createBundleDeploymentInNewTrans(subject, prevDeployment .getBundleVersion().getId(), bundleDestinationId, name, desc, config); - return scheduleBundleDeploymentImpl(subject, revertDeployment.getId(), isCleanDeployment, true, prevDeployment - .getReplacedBundleDeploymentId()); + return scheduleBundleDeploymentImpl(subject, revertDeployment.getId(), isCleanDeployment, true, + prevDeployment.getReplacedBundleDeploymentId()); } // revertedDeploymentReplacedDeployment is only meaningful if isRevert is true @@ -1201,8 +1223,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot // The BundleResourceDeployment record must exist in the db before the agent request because the agent may try // to add History to it during immediate deployments. So, create and persist it (requires a new trans). - BundleResourceDeployment resourceDeployment = bundleManager.createBundleResourceDeployment(subject, deployment - .getId(), bundleTargetResourceId); + BundleResourceDeployment resourceDeployment = bundleManager.createBundleResourceDeployment(subject, + deployment.getId(), bundleTargetResourceId); if (null != bundleTarget.getResourceType().getResourceTypeBundleConfiguration()) { @@ -1225,8 +1247,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot bundleManager.setBundleResourceDeploymentStatus(subject, resourceDeployment.getId(), BundleDeploymentStatus.FAILURE); history = new BundleResourceDeploymentHistory(subject.getName(), AUDIT_ACTION_DEPLOYMENT, - deployment.getName(), null, BundleResourceDeploymentHistory.Status.FAILURE, response - .getErrorMessage(), null); + deployment.getName(), null, BundleResourceDeploymentHistory.Status.FAILURE, + response.getErrorMessage(), null); bundleManager.addBundleResourceDeploymentHistory(subject, resourceDeployment.getId(), history); } } catch (Throwable t) { @@ -1494,9 +1516,9 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot */ @Override public PageList<BundleDeployment> findBundleDeploymentsByCriteriaWithDestinationFilter(Subject subject, - BundleDeploymentCriteria criteria) { + BundleDeploymentCriteria criteria) { - PageList<BundleDeployment> deployments = findBundleDeploymentsByCriteria(subject,criteria); + PageList<BundleDeployment> deployments = findBundleDeploymentsByCriteria(subject, criteria); if (authorizationManager.isInventoryManager(subject)) return deployments; @@ -1507,8 +1529,8 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot int bundleId = deployment.getBundleVersion().getBundle().getId(); BundleDestinationCriteria destinationCriteria = new BundleDestinationCriteria(); destinationCriteria.addFilterBundleId(bundleId); - List<BundleDestination> destinations = findBundleDestinationsByCriteria(subject,destinationCriteria); - if (destinationsContains(destinations,deployment.getDestination())) + List<BundleDestination> destinations = findBundleDestinationsByCriteria(subject, destinationCriteria); + if (destinationsContains(destinations, deployment.getDestination())) resultingDeployments.add(deployment); } return resultingDeployments; @@ -1520,8 +1542,10 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria); // Filter by destinations that are viewable if (!authorizationManager.isInventoryManager(subject)) { - generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.GROUP,subject.getId()); - } CriteriaQueryRunner<BundleDestination> queryRunner = new CriteriaQueryRunner<BundleDestination>(criteria, + generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.GROUP, + subject.getId()); + } + CriteriaQueryRunner<BundleDestination> queryRunner = new CriteriaQueryRunner<BundleDestination>(criteria, generator, entityManager); return queryRunner.execute(); } @@ -1568,26 +1592,27 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot */ @Override public PageList<BundleVersion> findBundleVersionsByCriteriaWithDestinationFilter(Subject subject, - BundleVersionCriteria criteria) { + BundleVersionCriteria criteria) { - PageList<BundleVersion> versions = findBundleVersionsByCriteria(subject,criteria); + PageList<BundleVersion> versions = findBundleVersionsByCriteria(subject, criteria); if (authorizationManager.isInventoryManager(subject)) { return versions; } // Not inv manager -> restrict visible deployments by visible destinations - for (BundleVersion version:versions) { + for (BundleVersion version : versions) { Bundle bundle = version.getBundle(); BundleDestinationCriteria destinationCriteria = new BundleDestinationCriteria(); destinationCriteria.addFilterBundleId(bundle.getId()); destinationCriteria.clearPaging();//disable paging as the code assumes all the results will be returned. - List<BundleDestination> destinations = findBundleDestinationsByCriteria(subject,destinationCriteria); - List<BundleDeployment> resultingDeployments = new ArrayList<BundleDeployment>(version.getBundleDeployments().size()); + List<BundleDestination> destinations = findBundleDestinationsByCriteria(subject, destinationCriteria); + List<BundleDeployment> resultingDeployments = new ArrayList<BundleDeployment>(version + .getBundleDeployments().size()); // We now have visible destinations - go over the resultingDeployments and only include the ones with vis. destinations for (BundleDeployment deployment : version.getBundleDeployments()) { - if (destinationsContains(destinations,deployment.getDestination())) + if (destinationsContains(destinations, deployment.getDestination())) resultingDeployments.add(deployment); } @@ -1639,18 +1664,18 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot @Override public PageList<Bundle> findBundlesByCriteriaWithDestinationFilter(Subject subject, BundleCriteria criteria) { // First get the bundles - PageList<Bundle> bundles = findBundlesByCriteria(subject,criteria); + PageList<Bundle> bundles = findBundlesByCriteria(subject, criteria); if (authorizationManager.isInventoryManager(subject)) { return bundles; } // Not inv manager -> restrict visible destinations - PageList<Bundle> result = new PageList<Bundle>(bundles.size(),bundles.getPageControl()); + PageList<Bundle> result = new PageList<Bundle>(bundles.size(), bundles.getPageControl()); for (Bundle bundle : bundles.getValues()) { // TODO clone the bundle and return the modified clones BundleDestinationCriteria destinationCriteria = new BundleDestinationCriteria(); destinationCriteria.addFilterBundleId(bundle.getId()); destinationCriteria.clearPaging();//disable paging as the code assumes all the results will be returned. - List<BundleDestination> destinations = findBundleDestinationsByCriteria(subject,destinationCriteria); + List<BundleDestination> destinations = findBundleDestinationsByCriteria(subject, destinationCriteria); bundle.setDestinations(destinations); } @@ -1755,6 +1780,27 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot } @Override + @RequiredPermission(Permission.MANAGE_BUNDLE_GROUPS) + public void deleteBundleGroups(Subject subject, int... bundleGroupIds) throws Exception { + + for (int bundleGroupId : bundleGroupIds) { + BundleGroup bundleGroup = this.entityManager.find(BundleGroup.class, bundleGroupIds); + if (null == bundleGroup) { + return; + } + + // unassign any bundles assigned to the bundle group + for (Bundle b : bundleGroup.getBundles()) { + bundleGroup.removeBundle(b); + } + bundleGroup = entityManager.merge(bundleGroup); + + // now remove the bundle group + entityManager.remove(bundleGroup); + } + } + + @Override @RequiredPermission(Permission.MANAGE_BUNDLE) public void deleteBundleVersion(Subject subject, int bundleVersionId, boolean deleteBundleIfEmpty) throws Exception { BundleVersion bundleVersion = this.entityManager.find(BundleVersion.class, bundleVersionId); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java index b72d6b5..0ffdc1a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java @@ -120,6 +120,8 @@ public interface BundleManagerRemote { BundleFile addBundleFileViaPackageVersion(Subject subject, int bundleVersionId, String name, int packageVersionId) throws Exception; + //void assignBundlesToBundleGroup + /** * Create a new bundle deployment. Note that bundle deployment names are generated by this * call. This provides useful, uniform naming for display. An optional, custom description @@ -157,6 +159,19 @@ public interface BundleManagerRemote { String destBaseDirName, String deployDir, Integer groupId) throws Exception; /** + * Create a new bundle group. + * <p/> + * Requires Global.MANAGE_BUNDLE_GROUP permission. + * + * @param subject user that must have proper permissions + * @param name the unique bundle group name + * @param description an optional description + * @return the persisted BundleGroup + * @throws Exception + */ + BundleGroup createBundleGroup(Subject subject, String name, String description) throws Exception; + + /** * Creates a bundle version based on single recipe string. The recipe specifies the bundle name, * version, version name and version description. If this is the initial version for the named * bundle the bundle will be implicitly created. The bundle type is discovered by the bundle server @@ -247,6 +262,17 @@ public interface BundleManagerRemote { void deleteBundle(Subject subject, int bundleId) throws Exception; /** + * Delete a bundle group. Any currently assigned bundles will be removed but are not deleted. + * <p/> + * Requires Global.MANAGE_BUNDLE_GROUP permission. + * + * @param subject user that must have proper permissions + * @param id the bundle group id + * @throws Exception + */ + void deleteBundleGroups(Subject subject, int... id) throws Exception; + + /** * Remove everything associated with the BundleVersion with the exception of files laid down by related deployments. * Deployed files are left as is on the deployment platforms but the bundle mechanism will no longer track * the deployment.

1 0

[rhq] modules/enterprise
by Heiko W. Rupp 26 Jul '13

26 Jul '13

modules/enterprise/gui/coregui/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2e33f605b32204385e9dc7c4ea9f2f3ac2e71850 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Jul 26 14:14:15 2013 +0200 Put the real version in here, as otherwise we have a circular dependency. diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 353f4d9..a227ed4 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -19,7 +19,7 @@ <properties>  - <gwt.version>${gwt.version}</gwt.version> + <gwt.version>2.5.0</gwt.version> <smartgwt.version>3.0</smartgwt.version> <!-- If this is too much memory to allocate to your gwt:debug process then override this property in

1 0

[rhq] 2 commits - modules/enterprise modules/helpers pom.xml
by John Sanda 26 Jul '13

26 Jul '13

modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java | 6 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java | 18 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java | 69 ++++ modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java | 153 ++-------- modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 5 modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageResultSetFuture.java | 76 ++++ modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java | 110 +++++++ modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageStateListener.java | 20 + modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/ListPagedResult.java | 6 modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/SimplePagedResult.java | 11 modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java | 35 ++ modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/ClusterMonitorTest.java | 92 ++++++ modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsBaselineCalculatorTest.java | 14 modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java | 17 - modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 7 modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/TimeoutTest.java | 5 modules/enterprise/server/server-metrics/src/test/resources/log4j.properties | 2 modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java | 5 pom.xml | 2 21 files changed, 497 insertions(+), 163 deletions(-) New commits: commit 9fbd3da4446f026dd4095f23345a5acaa0b956c0 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Jul 25 22:08:20 2013 -0400 check cluster status using cql driver instead of using jmx The server had been polling storage cluster nodes with a jmx call to make sure that at least one node is up for client requests. If no nodes are up, then the server goes into maintenance mode. That check is no longer done with a quartz job using jmx. It is now performed with event notifications we receive from the cql driver. This means that the server no longer has to care about storage node jmx ports. This has a couple benefits. First, it reduces the complexity involved with changing the jmx port. Secondly, since the server no longer is making jmx calls to storage nodes, the port can be locked down to localhost access. Any server side code that needs access to the driver's Session should instead use the new StorageSession class. StorageSession provides the same API, and it also encapsulates the event handling/propagation logic that is necesary for monitoring the cluster availability. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java index 4cc67c0..9f49143 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java @@ -39,7 +39,6 @@ import java.util.List; import javax.ejb.EJB; -import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.NoHostAvailableException; import org.joda.time.DateTime; @@ -60,13 +59,14 @@ import org.rhq.core.domain.resource.Agent; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.enterprise.server.auth.SubjectManagerLocal; -import org.rhq.enterprise.server.storage.StorageClientManagerBean; import org.rhq.enterprise.server.drift.DriftServerPluginService; import org.rhq.enterprise.server.resource.ResourceManagerLocal; +import org.rhq.enterprise.server.storage.StorageClientManagerBean; import org.rhq.enterprise.server.test.AbstractEJB3Test; import org.rhq.enterprise.server.test.TransactionCallback; import org.rhq.enterprise.server.util.ResourceTreeHelper; import org.rhq.server.metrics.MetricsDAO; +import org.rhq.server.metrics.StorageSession; import org.rhq.server.metrics.domain.AggregateNumericMetric; import org.rhq.server.metrics.domain.AggregateType; import org.rhq.server.metrics.domain.MetricsTable; @@ -360,7 +360,7 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { private void purgeMetricsTables() { try { - Session session = storageClientManager.getSession(); + StorageSession session = storageClientManager.getSession(); session.execute("TRUNCATE " + MetricsTable.RAW); session.execute("TRUNCATE " + MetricsTable.ONE_HOUR); diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java index 49048ee..fdf2b1a 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java @@ -28,7 +28,6 @@ import java.util.Random; import javax.inject.Inject; import javax.persistence.Query; -import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.NoHostAvailableException; import org.testng.annotations.Test; @@ -45,13 +44,14 @@ import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageControl; -import org.rhq.enterprise.server.storage.StorageClientManagerBean; import org.rhq.enterprise.server.measurement.MeasurementBaselineManagerLocal; import org.rhq.enterprise.server.measurement.MeasurementOOBManagerLocal; import org.rhq.enterprise.server.resource.ResourceManagerLocal; +import org.rhq.enterprise.server.storage.StorageClientManagerBean; import org.rhq.enterprise.server.test.AbstractEJB3Test; import org.rhq.enterprise.server.util.LookupUtil; import org.rhq.server.metrics.MetricsDAO; +import org.rhq.server.metrics.StorageSession; import org.rhq.server.metrics.domain.AggregateNumericMetric; import org.rhq.server.metrics.domain.AggregateType; import org.rhq.server.metrics.domain.MetricsTable; @@ -645,7 +645,7 @@ public class MeasurementBaselineManagerTest extends AbstractEJB3Test { // Query q = em.createNativeQuery(sql); // q.executeUpdate(); try { - Session session = storageClientManager.getSession(); + StorageSession session = storageClientManager.getSession(); session.execute("DELETE FROM " + MetricsTable.ONE_HOUR.getTableName() + " WHERE schedule_id = " + schedule.getId()); } catch (NoHostAvailableException e) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java index 7ce77d8..fa88263 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java @@ -450,7 +450,6 @@ public class StartupBean implements StartupLocal { } storageClientManager.init(); - storageClusterHeartBeatJob.scheduleJob(); } /** diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java index 2d48092..ae80e50 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java @@ -50,6 +50,7 @@ import org.rhq.server.metrics.DateTimeService; import org.rhq.server.metrics.MetricsConfiguration; import org.rhq.server.metrics.MetricsDAO; import org.rhq.server.metrics.MetricsServer; +import org.rhq.server.metrics.StorageSession; /** * @author John Sanda @@ -70,7 +71,7 @@ public class StorageClientManagerBean { @EJB private StorageNodeManagerLocal storageNodeManager; - private Session session; + private StorageSession session; private MetricsConfiguration metricsConfiguration; private MetricsDAO metricsDAO; private MetricsServer metricsServer; @@ -95,7 +96,12 @@ public class StorageClientManagerBean { String password = getRequiredStorageProperty(PASSWORD_PROP); metricsConfiguration = new MetricsConfiguration(); - session = createSession(username, password, storageNodeManager.getStorageNodes()); + + Session wrappedSession = createSession(username, password, storageNodeManager.getStorageNodes()); + session = new StorageSession(wrappedSession); + + session.addStorageStateListener(new StorageClusterMonitor()); + metricsDAO = new MetricsDAO(session, metricsConfiguration); Server server = serverManager.getServer(); @@ -121,15 +127,15 @@ public class StorageClientManagerBean { } public MetricsDAO getMetricsDAO() { - return this.metricsDAO; + return metricsDAO; } public MetricsServer getMetricsServer() { - return this.metricsServer; + return metricsServer; } - public Session getSession() { - return this.session; + public StorageSession getSession() { + return session; } public MetricsConfiguration getMetricsConfiguration() { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java new file mode 100644 index 0000000..ec28888 --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java @@ -0,0 +1,69 @@ +package org.rhq.enterprise.server.storage; + +import java.net.InetAddress; +import java.util.concurrent.atomic.AtomicBoolean; + +import com.datastax.driver.core.exceptions.NoHostAvailableException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.core.domain.cloud.Server; +import org.rhq.enterprise.server.auth.SubjectManagerLocal; +import org.rhq.enterprise.server.cloud.TopologyManagerLocal; +import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; +import org.rhq.server.metrics.StorageStateListener; + +/** + * @author John Sanda + */ +public class StorageClusterMonitor implements StorageStateListener { + + private Log log = LogFactory.getLog(StorageClusterMonitor.class); + + private AtomicBoolean isClusterDown = new AtomicBoolean(false); + + public boolean isClusterDown() { + return isClusterDown.get(); + } + + @Override + public void onStorageNodeUp(InetAddress address) { + log.info("Storage node at " + address.getHostAddress() + " is up"); + + if (isClusterDown.compareAndSet(true, false)) { + log.info("Taking server out of maintenance mode"); + updateServerMode(Server.OperationMode.NORMAL); + } + } + + @Override + public void onStorageNodeDown(InetAddress address) { + log.info("Storage node at " + address.getHostAddress() + " is down"); + } + + @Override + public void onStorageNodeRemoved(InetAddress address) { + log.info("Storage node at " + address.getHostAddress() + " has been removed from the cluster"); + } + + @Override + public void onStorageClusterDown(NoHostAvailableException e) { + if (isClusterDown.compareAndSet(false, true)) { + log.error("The server cannot connect to any storage nodes. The server will now go into maintenance mode."); + updateServerMode(Server.OperationMode.MAINTENANCE); + } + } + + private void updateServerMode(Server.OperationMode mode) { + ServerManagerLocal serverManager = LookupUtil.getServerManager(); + TopologyManagerLocal topologyManager = LookupUtil.getTopologyManager(); + SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager(); + + Server server = serverManager.getServer(); + + topologyManager.updateServerMode(subjectManager.getOverlord(), new Integer[] {server.getId()}, + Server.OperationMode.MAINTENANCE); + } +} diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java index 3ea47e8..63c11f1 100644 --- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java +++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java @@ -26,20 +26,13 @@ package org.rhq.server.metrics; -import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto; - -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.Set; import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.Statement; import com.datastax.driver.core.exceptions.NoHostAvailableException; import org.apache.commons.logging.Log; @@ -67,7 +60,7 @@ public class MetricsDAO { private final Log log = LogFactory.getLog(MetricsDAO.class); - private Session session; + private StorageSession storageSession; private MetricsConfiguration configuration; @@ -86,8 +79,8 @@ public class MetricsDAO { private PreparedStatement findTimeSliceForIndex; private PreparedStatement deleteIndexEntries; - public MetricsDAO(Session session, MetricsConfiguration configuration) { - this.session = session; + public MetricsDAO(StorageSession session, MetricsConfiguration configuration) { + this.storageSession = session; this.configuration = configuration; initPreparedStatements(); } @@ -104,176 +97,118 @@ public class MetricsDAO { // re-initialized and re-prepared with the new TTLs. None of this would be necessary // if the TTL value could be a bound value. - insertRawData = session.prepare( + insertRawData = storageSession.prepare( "INSERT INTO " + MetricsTable.RAW + " (schedule_id, time, value) VALUES (?, ?, ?) USING TTL " + configuration.getRawTTL()); - rawMetricsQuery = session.prepare("SELECT schedule_id, time, value FROM " + MetricsTable.RAW + + rawMetricsQuery = storageSession.prepare("SELECT schedule_id, time, value FROM " + MetricsTable.RAW + " WHERE schedule_id = ? AND time >= ? AND time < ? ORDER BY time"); - insertOneHourData = session.prepare("INSERT INTO " + MetricsTable.ONE_HOUR + "(schedule_id, time, " + + insertOneHourData = storageSession.prepare("INSERT INTO " + MetricsTable.ONE_HOUR + "(schedule_id, time, " + "type, value) VALUES (?, ?, ?, ?) USING TTL " + configuration.getOneHourTTL()); - insertSixHourData = session.prepare("INSERT INTO " + MetricsTable.SIX_HOUR + "(schedule_id, time, " + + insertSixHourData = storageSession.prepare("INSERT INTO " + MetricsTable.SIX_HOUR + "(schedule_id, time, " + "type, value) VALUES (?, ?, ?, ?) USING TTL " + configuration.getOneHourTTL()); - insertTwentyFourHourData = session.prepare("INSERT INTO " + MetricsTable.TWENTY_FOUR_HOUR + "(schedule_id, " + + insertTwentyFourHourData = storageSession.prepare("INSERT INTO " + MetricsTable.TWENTY_FOUR_HOUR + "(schedule_id, " + "time, type, value) VALUES (?, ?, ?, ?) USING TTL " + configuration.getOneHourTTL()); - updateMetricsIndex = session.prepare("INSERT INTO " + MetricsTable.INDEX + " (bucket, time, schedule_id) " + + updateMetricsIndex = storageSession.prepare("INSERT INTO " + MetricsTable.INDEX + " (bucket, time, schedule_id) " + "VALUES (?, ?, ?)"); - findLatestRawMetric = session.prepare("SELECT schedule_id, time, value FROM " + MetricsTable.RAW + + findLatestRawMetric = storageSession.prepare("SELECT schedule_id, time, value FROM " + MetricsTable.RAW + " WHERE schedule_id = ? ORDER BY time DESC LIMIT 1"); - findRawMetrics = session.prepare("SELECT schedule_id, time, value FROM " + MetricsTable.RAW + + findRawMetrics = storageSession.prepare("SELECT schedule_id, time, value FROM " + MetricsTable.RAW + " WHERE schedule_id = ? AND time >= ? AND time <= ?"); - findOneHourMetricsByDateRange = session.prepare("SELECT schedule_id, time, type, value FROM " + + findOneHourMetricsByDateRange = storageSession.prepare("SELECT schedule_id, time, type, value FROM " + MetricsTable.ONE_HOUR + " WHERE schedule_id = ? AND time >= ? AND time < ?"); - findSixHourMetricsByDateRange = session.prepare("SELECT schedule_id, time, type, value FROM " + findSixHourMetricsByDateRange = storageSession.prepare("SELECT schedule_id, time, type, value FROM " + MetricsTable.SIX_HOUR + " WHERE schedule_id = ? AND time >= ? AND time < ?"); - findTwentyFourHourMetricsByDateRange = session.prepare("SELECT schedule_id, time, type, value FROM " + + findTwentyFourHourMetricsByDateRange = storageSession.prepare("SELECT schedule_id, time, type, value FROM " + MetricsTable.TWENTY_FOUR_HOUR + " WHERE schedule_id = ? AND time >= ? AND time < ?"); - findIndexEntries = session.prepare("SELECT time, schedule_id FROM " + MetricsTable.INDEX + + findIndexEntries = storageSession.prepare("SELECT time, schedule_id FROM " + MetricsTable.INDEX + " WHERE bucket = ? AND time = ?"); - findTimeSliceForIndex = session.prepare("SELECT time FROM " + MetricsTable.INDEX + + findTimeSliceForIndex = storageSession.prepare("SELECT time FROM " + MetricsTable.INDEX + " WHERE bucket = ? AND time = ?"); - deleteIndexEntries = session.prepare("DELETE FROM " + MetricsTable.INDEX + " WHERE bucket = ? AND time = ?"); + deleteIndexEntries = storageSession.prepare("DELETE FROM " + MetricsTable.INDEX + " WHERE bucket = ? AND time = ?"); long endTime = System.currentTimeMillis(); log.info("Finished initializing prepared statements in " + (endTime - startTime) + " ms"); } - public ResultSetFuture insertRawData(MeasurementDataNumeric data) { + public StorageResultSetFuture insertRawData(MeasurementDataNumeric data) { BoundStatement statement = insertRawData.bind(data.getScheduleId(), new Date(data.getTimestamp()), data.getValue()); - return session.executeAsync(statement); - } - - public List<MetricResultFuture<MeasurementDataNumeric>> insertRawMetricsAsync(Set<MeasurementDataNumeric> dataSet, - int ttl) { - try { - List<MetricResultFuture<MeasurementDataNumeric>> resultFutures = new ArrayList<MetricResultFuture<MeasurementDataNumeric>>(); - - String cql = "INSERT INTO raw_metrics (schedule_id, time, value) VALUES (?, ?, ?) " + "USING TTL " + ttl; - PreparedStatement statement = session.prepare(cql); - - for (MeasurementDataNumeric data : dataSet) { - BoundStatement boundStatement = statement.bind(data.getScheduleId(), new Date(data.getTimestamp()), - data.getValue()); - - resultFutures.add(new MetricResultFuture<MeasurementDataNumeric>(session.executeAsync(boundStatement), - data)); - } - - return resultFutures; - } catch (NoHostAvailableException e) { - throw new CQLException(e); - } + return storageSession.executeAsync(statement); } public ResultSet insertOneHourData(int scheduleId, long timestamp, AggregateType type, double value) { BoundStatement statement = insertOneHourData.bind(scheduleId, new Date(timestamp), type.ordinal(), value); - return session.execute(statement); + return storageSession.execute(statement); } public ResultSet insertSixHourData(int scheduleId, long timestamp, AggregateType type, double value) { BoundStatement statement = insertSixHourData.bind(scheduleId, new Date(timestamp), type.ordinal(), value); - return session.execute(statement); + return storageSession.execute(statement); } public ResultSet insertTwentyFourHourData(int scheduleId, long timestamp, AggregateType type, double value) { BoundStatement statement = insertTwentyFourHourData.bind(scheduleId, new Date(timestamp), type.ordinal(), value); - return session.execute(statement); - } - - public List<MetricResultFuture<AggregateNumericMetric>> insertAggregatesAsync(MetricsTable table, - List<AggregateNumericMetric> metrics, int ttl) { - List<MetricResultFuture<AggregateNumericMetric>> updates = new ArrayList<MetricResultFuture<AggregateNumericMetric>>(); - - if (metrics.isEmpty()) { - return updates; - } - - try { - Statement statement = null; - - for (AggregateNumericMetric metric : metrics) { - statement = insertInto(table.getTableName()) - .value("schedule_id", metric.getScheduleId()) - .value("time", new Date(metric.getTimestamp())) - .value("type", AggregateType.MIN.ordinal()) - .value("value", metric.getMin()); - updates.add(new MetricResultFuture<AggregateNumericMetric>(session.executeAsync(statement), metric)); - - statement = insertInto(table.getTableName()) - .value("schedule_id", metric.getScheduleId()) - .value("time", new Date(metric.getTimestamp())) - .value("type", AggregateType.MAX.ordinal()) - .value("value", metric.getMax()); - updates.add(new MetricResultFuture<AggregateNumericMetric>(session.executeAsync(statement), metric)); - - statement = insertInto(table.getTableName()) - .value("schedule_id", metric.getScheduleId()) - .value("time", new Date(metric.getTimestamp())) - .value("type", AggregateType.AVG.ordinal()) - .value("value", metric.getAvg()); - updates.add(new MetricResultFuture<AggregateNumericMetric>(session.executeAsync(statement), metric)); - } - - return updates; - } catch (Exception e) { - throw new CQLException(e); - } + return storageSession.execute(statement); } public Iterable<RawNumericMetric> findRawMetrics(int scheduleId, long startTime, long endTime) { try { BoundStatement boundStatement = rawMetricsQuery.bind(scheduleId, new Date(startTime), new Date(endTime)); - return new SimplePagedResult<RawNumericMetric>(boundStatement, new RawNumericMetricMapper(false), session); + return new SimplePagedResult<RawNumericMetric>(boundStatement, new RawNumericMetricMapper(false), + storageSession); } catch (NoHostAvailableException e) { throw new CQLException(e); } } - public ResultSetFuture findRawMetricsAsync(int scheduleId, long startTime, long endTime) { + public StorageResultSetFuture findRawMetricsAsync(int scheduleId, long startTime, long endTime) { BoundStatement boundStatement = rawMetricsQuery.bind(scheduleId, new Date(startTime), new Date(endTime)); - return session.executeAsync(boundStatement); + return storageSession.executeAsync(boundStatement); } public RawNumericMetric findLatestRawMetric(int scheduleId) { RawNumericMetricMapper mapper = new RawNumericMetricMapper(false); BoundStatement boundStatement = findLatestRawMetric.bind(scheduleId); - ResultSet resultSet = session.execute(boundStatement); + ResultSet resultSet = storageSession.execute(boundStatement); return mapper.mapOne(resultSet); } public Iterable<RawNumericMetric> findRawMetrics(List<Integer> scheduleIds, long startTime, long endTime) { return new ListPagedResult<RawNumericMetric>(findRawMetrics, scheduleIds, startTime, endTime, - new RawNumericMetricMapper(), session); + new RawNumericMetricMapper(), storageSession); } public Iterable<AggregateNumericMetric> findOneHourMetrics(int scheduleId, long startTime, long endTime) { BoundStatement statement = findOneHourMetricsByDateRange.bind(scheduleId, new Date(startTime), new Date(endTime)); - return new SimplePagedResult<AggregateNumericMetric>(statement, new AggregateNumericMetricMapper(), session); + return new SimplePagedResult<AggregateNumericMetric>(statement, new AggregateNumericMetricMapper(), + storageSession); } public Iterable<AggregateNumericMetric> findSixHourMetrics(int scheduleId, long startTime, long endTime) { BoundStatement statement = findSixHourMetricsByDateRange.bind(scheduleId, new Date(startTime), new Date(endTime)); - return new SimplePagedResult<AggregateNumericMetric>(statement, new AggregateNumericMetricMapper(), session); + return new SimplePagedResult<AggregateNumericMetric>(statement, new AggregateNumericMetricMapper(), + storageSession); } public Iterable<AggregateNumericMetric> findTwentyFourHourMetrics(int scheduleId, long startTime, long endTime) { BoundStatement statement = findTwentyFourHourMetricsByDateRange.bind(scheduleId, new Date(startTime), new Date(endTime)); - return new SimplePagedResult<AggregateNumericMetric>(statement, new AggregateNumericMetricMapper(), session); + return new SimplePagedResult<AggregateNumericMetric>(statement, new AggregateNumericMetricMapper(), + storageSession); } public Iterable<AggregateSimpleNumericMetric> findAggregatedSimpleOneHourMetric(int scheduleId, long startTime, @@ -281,52 +216,52 @@ public class MetricsDAO { BoundStatement statement = findOneHourMetricsByDateRange.bind(scheduleId, new Date(startTime), new Date(endTime)); return new SimplePagedResult<AggregateSimpleNumericMetric>(statement, new AggregateSimpleNumericMetricMapper(), - session); + storageSession); } public Iterable<AggregateNumericMetric> findOneHourMetrics(List<Integer> scheduleIds, long startTime, long endTime) { return new ListPagedResult<AggregateNumericMetric>(findOneHourMetricsByDateRange, scheduleIds, startTime, endTime, - new AggregateNumericMetricMapper(), session); + new AggregateNumericMetricMapper(), storageSession); } public Iterable<AggregateNumericMetric> findSixHourMetrics(List<Integer> scheduleIds, long startTime, long endTime) { return new ListPagedResult<AggregateNumericMetric>(findSixHourMetricsByDateRange, scheduleIds, startTime, endTime, - new AggregateNumericMetricMapper(), session); + new AggregateNumericMetricMapper(), storageSession); } public Iterable<AggregateNumericMetric> findTwentyFourHourMetrics(List<Integer> scheduleIds, long startTime, long endTime) { return new ListPagedResult<AggregateNumericMetric>(findTwentyFourHourMetricsByDateRange, scheduleIds, startTime, endTime, - new AggregateNumericMetricMapper(), session); + new AggregateNumericMetricMapper(), storageSession); } public Iterable<MetricsIndexEntry> findMetricsIndexEntries(final MetricsTable table, long timestamp) { BoundStatement statement = findIndexEntries.bind(table.toString(), new Date(timestamp)); - return new SimplePagedResult<MetricsIndexEntry>(statement, new MetricsIndexEntryMapper(table), session); + return new SimplePagedResult<MetricsIndexEntry>(statement, new MetricsIndexEntryMapper(table), storageSession); } public ResultSet setFindTimeSliceForIndex(MetricsTable table, long timestamp) { BoundStatement statement = findTimeSliceForIndex.bind(table.toString(), new Date(timestamp)); - return session.execute(statement); + return storageSession.execute(statement); } public void updateMetricsIndex(MetricsTable table, Map<Integer, Long> updates) { for (Integer scheduleId : updates.keySet()) { BoundStatement statement = updateMetricsIndex.bind(table.getTableName(), new Date(updates.get(scheduleId)), scheduleId); - session.execute(statement); + storageSession.execute(statement); } } - public ResultSetFuture updateMetricsIndex(MetricsTable table, int scheduleId, long timestamp) { + public StorageResultSetFuture updateMetricsIndex(MetricsTable table, int scheduleId, long timestamp) { BoundStatement statement = updateMetricsIndex.bind(table.getTableName(), new Date(timestamp), scheduleId); - return session.executeAsync(statement); + return storageSession.executeAsync(statement); } public void deleteMetricsIndexEntries(MetricsTable table, long timestamp) { BoundStatement statement = deleteIndexEntries.bind(table.getTableName(), new Date(timestamp)); - session.execute(statement); + storageSession.execute(statement); } } diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java index 7395953..9756006 100644 --- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java +++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java @@ -35,7 +35,6 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicInteger; import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; import com.datastax.driver.core.Row; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -299,7 +298,7 @@ public class MetricsServer { for (final MeasurementDataNumeric data : dataSet) { semaphore.acquire(); - ResultSetFuture resultSetFuture = dao.insertRawData(data); + StorageResultSetFuture resultSetFuture = dao.insertRawData(data); Futures.addCallback(resultSetFuture, new FutureCallback<ResultSet>() { @Override public void onSuccess(ResultSet rows) { @@ -325,7 +324,7 @@ public class MetricsServer { long timeSlice = dateTimeService.getTimeSlice(new DateTime(rawData.getTimestamp()), configuration.getRawTimeSliceDuration()).getMillis(); - ResultSetFuture resultSetFuture = dao.updateMetricsIndex(MetricsTable.ONE_HOUR, rawData.getScheduleId(), + StorageResultSetFuture resultSetFuture = dao.updateMetricsIndex(MetricsTable.ONE_HOUR, rawData.getScheduleId(), timeSlice); Futures.addCallback(resultSetFuture, new FutureCallback<ResultSet>() { @Override diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageResultSetFuture.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageResultSetFuture.java new file mode 100644 index 0000000..902bf4a --- /dev/null +++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageResultSetFuture.java @@ -0,0 +1,76 @@ +package org.rhq.server.metrics; + +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Executor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.ResultSetFuture; +import com.datastax.driver.core.exceptions.NoHostAvailableException; +import com.google.common.util.concurrent.ListenableFuture; + +/** + * @author John Sanda + */ +public class StorageResultSetFuture implements ListenableFuture<ResultSet> { + + private ResultSetFuture wrapperFuture; + + private List<StorageStateListener> listeners; + + public StorageResultSetFuture(ResultSetFuture resultSetFuture, List<StorageStateListener> listeners) { + wrapperFuture = resultSetFuture; + this.listeners = listeners; + } + + @Override + public void addListener(Runnable listener, Executor executor) { + wrapperFuture.addListener(listener, executor); + } + + @Override + public boolean cancel(boolean mayInterruptIfRunning) { + return wrapperFuture.cancel(mayInterruptIfRunning); + } + + @Override + public boolean isCancelled() { + return wrapperFuture.isCancelled(); + } + + @Override + public boolean isDone() { + return wrapperFuture.isDone(); + } + + @Override + public ResultSet get() throws InterruptedException, ExecutionException { + try { + return wrapperFuture.get(); + } catch (ExecutionException e) { + return handleException(e); + } + } + + @Override + public ResultSet get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, + TimeoutException { + try { + return wrapperFuture.get(timeout, unit); + } catch (ExecutionException e) { + return handleException(e); + } + } + + private ResultSet handleException(ExecutionException e) throws ExecutionException { + if (e.getCause() instanceof NoHostAvailableException) { + NoHostAvailableException cause = (NoHostAvailableException) e.getCause(); + for (StorageStateListener listener : listeners) { + listener.onStorageClusterDown(cause); + } + } + throw e; + } +} diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java new file mode 100644 index 0000000..3f7af3f --- /dev/null +++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java @@ -0,0 +1,110 @@ +package org.rhq.server.metrics; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.Host; +import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.Query; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.ResultSetFuture; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.exceptions.NoHostAvailableException; + +/** + * @author John Sanda + */ +public class StorageSession implements Host.StateListener { + + private Session wrappedSession; + + private List<StorageStateListener> listeners = new ArrayList<StorageStateListener>(); + + public StorageSession(Session wrappedSession) { + this.wrappedSession = wrappedSession; + this.wrappedSession.getCluster().register(this); + } + + public void addStorageStateListener(StorageStateListener listener) { + listeners.add(listener); + } + + public ResultSet execute(String query) { + try { + return wrappedSession.execute(query); + } catch (NoHostAvailableException e) { + return handleException(e); + } + } + + public ResultSet execute(Query query) { + try { + return wrappedSession.execute(query); + } catch (NoHostAvailableException e) { + return handleException(e); + } + } + + public StorageResultSetFuture executeAsync(String query) { + ResultSetFuture future = wrappedSession.executeAsync(query); + return new StorageResultSetFuture(future, listeners); + } + + public StorageResultSetFuture executeAsync(Query query) { + ResultSetFuture future = wrappedSession.executeAsync(query); + return new StorageResultSetFuture(future, listeners); + } + + public PreparedStatement prepare(String query) { + return wrappedSession.prepare(query); + } + + public void shutdown() { + wrappedSession.shutdown(); + } + + public boolean shutdown(long timeout, TimeUnit unit) { + return wrappedSession.shutdown(timeout, unit); + } + + public Cluster getCluster() { + return wrappedSession.getCluster(); + } + + @Override + public void onAdd(Host host) { + for (StorageStateListener listener : listeners) { + listener.onStorageNodeUp(host.getAddress()); + } + } + + @Override + public void onUp(Host host) { + for (StorageStateListener listener : listeners) { + listener.onStorageNodeUp(host.getAddress()); + } + } + + @Override + public void onDown(Host host) { + for (StorageStateListener listener : listeners) { + listener.onStorageNodeDown(host.getAddress()); + } + } + + @Override + public void onRemove(Host host) { + for (StorageStateListener listener : listeners) { + listener.onStorageNodeRemoved(host.getAddress()); + } + } + + private ResultSet handleException(NoHostAvailableException e) { + for (StorageStateListener listener : listeners) { + listener.onStorageClusterDown(e); + } + throw e; + } +} diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageStateListener.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageStateListener.java new file mode 100644 index 0000000..6a3a216 --- /dev/null +++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageStateListener.java @@ -0,0 +1,20 @@ +package org.rhq.server.metrics; + +import java.net.InetAddress; + +import com.datastax.driver.core.exceptions.NoHostAvailableException; + +/** + * @author John Sanda + */ +public interface StorageStateListener { + + void onStorageNodeUp(InetAddress address); + + void onStorageNodeDown(InetAddress address); + + void onStorageNodeRemoved(InetAddress address); + + void onStorageClusterDown(NoHostAvailableException e); + +} diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/ListPagedResult.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/ListPagedResult.java index 1c1fdd2..f3abd20 100644 --- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/ListPagedResult.java +++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/ListPagedResult.java @@ -33,10 +33,10 @@ import java.util.List; import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.NoHostAvailableException; import org.rhq.server.metrics.CQLException; +import org.rhq.server.metrics.StorageSession; /** * This class helps paginate Cassandra results that have a list in the matching clause. Instead of running @@ -52,12 +52,12 @@ public class ListPagedResult<T> implements Iterable<T> { private final long startTime; private final long endTime; private final ResultSetMapper<T> mapper; - private final Session session; + private final StorageSession session; private final PreparedStatement preparedStatement; public ListPagedResult(PreparedStatement preparedStatement, List<Integer> scheduleIds, long startTime, long endTime, - ResultSetMapper<T> mapper, Session session) { + ResultSetMapper<T> mapper, StorageSession session) { this.preparedStatement = preparedStatement; this.scheduleIds = new LinkedList<Integer>(scheduleIds); this.startTime = startTime; diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/SimplePagedResult.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/SimplePagedResult.java index d14195c..e31db95 100644 --- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/SimplePagedResult.java +++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/SimplePagedResult.java @@ -34,6 +34,7 @@ import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.exceptions.NoHostAvailableException; import org.rhq.server.metrics.CQLException; +import org.rhq.server.metrics.StorageSession; /** * This class is just a placeholder for future pagination implementations once Cassandra gets native support for paging results. @@ -51,7 +52,7 @@ public class SimplePagedResult<T> implements Iterable<T> { private final ResultSetMapper<T> mapper; private final Query query; - private final Session session; + private final StorageSession session; private final int pageSize; /** @@ -60,7 +61,7 @@ public class SimplePagedResult<T> implements Iterable<T> { * @param session Cassandra session * @param pageSize page size */ - public SimplePagedResult(Query query, ResultSetMapper<T> mapper, Session session, int pageSize) { + public SimplePagedResult(Query query, ResultSetMapper<T> mapper, StorageSession session, int pageSize) { this.query = query; this.mapper = mapper; this.session = session; @@ -73,7 +74,7 @@ public class SimplePagedResult<T> implements Iterable<T> { * @param session Cassandra session * @param pageSize page size */ - public SimplePagedResult(String query, ResultSetMapper<T> mapper, Session session, int pageSize) { + public SimplePagedResult(String query, ResultSetMapper<T> mapper, StorageSession session, int pageSize) { this(new SimpleStatement(query), mapper, session, pageSize); } @@ -82,7 +83,7 @@ public class SimplePagedResult<T> implements Iterable<T> { * @param mapper result set mapper * @param session Cassandra session */ - public SimplePagedResult(Query query, ResultSetMapper<T> mapper, Session session) { + public SimplePagedResult(Query query, ResultSetMapper<T> mapper, StorageSession session) { this(query, mapper, session, DEFAULT_PAGE_SIZE); } @@ -92,7 +93,7 @@ public class SimplePagedResult<T> implements Iterable<T> { * @param session Cassandra session * @param pageSize page size */ - public SimplePagedResult(String query, ResultSetMapper<T> mapper, Session session) { + public SimplePagedResult(String query, ResultSetMapper<T> mapper, StorageSession session) { this(new SimpleStatement(query), mapper, session); } diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java index c4c48c8..b227b2d 100644 --- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java +++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java @@ -33,6 +33,7 @@ import java.util.concurrent.CountDownLatch; import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.Host; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; @@ -65,8 +66,12 @@ public class CassandraIntegrationTest { protected static Session session; + protected static StorageSession storageSession; + private static DateTimeService dateTimeService; + private final Log log = LogFactory.getLog(CassandraIntegrationTest.class); + @BeforeSuite @DeployCluster(numNodes = 2, username = "rhqadmin", password = "rhqadmin", waitForSchemaAgreement = true) public void deployCluster() throws Exception { @@ -76,7 +81,31 @@ public class CassandraIntegrationTest { .addContactPoints("127.0.0.1", "127.0.02") .withCredentials("rhqadmin", "rhqadmin") .build(); + + cluster.register(new Host.StateListener() { + @Override + public void onAdd(Host host) { + log.info("host " + host + " added"); + } + + @Override + public void onUp(Host host) { + log.info("host " + host + " up"); + } + + @Override + public void onDown(Host host) { + log.info("host " + host + " down"); + } + + @Override + public void onRemove(Host host) { + log.info("host " + host + " removed"); + } + }); + session = cluster.connect("rhq"); + storageSession = new StorageSession(session); } @AfterSuite(alwaysRun = true) @@ -98,7 +127,7 @@ public class CassandraIntegrationTest { BoundStatement boundStatement = statement.bind(scheduleId); return new SimplePagedResult<AggregateNumericMetric>(boundStatement, new AggregateNumericMetricMapper(), - session); + storageSession); } protected Iterable<AggregateNumericMetric> findAggregateMetricsWithMetadata(MetricsTable table, int scheduleId, @@ -109,11 +138,11 @@ public class CassandraIntegrationTest { "SELECT schedule_id, time, type, value, ttl(value), writetime(value) " + "FROM " + table + " " + "WHERE schedule_id = ? AND time >= ? AND time < ?"; - PreparedStatement statement = session.prepare(cql); + PreparedStatement statement = storageSession.prepare(cql); BoundStatement boundStatement = statement.bind(scheduleId, new Date(startTime), new Date(endTime)); return new SimplePagedResult<AggregateNumericMetric>(boundStatement, new AggregateNumericMetricMapper(true), - session); + storageSession); } catch (NoHostAvailableException e) { throw new CQLException(e); } diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/ClusterMonitorTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/ClusterMonitorTest.java new file mode 100644 index 0000000..871b7c5 --- /dev/null +++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/ClusterMonitorTest.java @@ -0,0 +1,92 @@ +package org.rhq.server.metrics; + +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.ConsistencyLevel; +import com.datastax.driver.core.Host; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.querybuilder.QueryBuilder; +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.cassandra.util.ClusterBuilder; +import org.rhq.core.domain.measurement.MeasurementDataNumeric; + +/** + * @author John Sanda + */ +public class ClusterMonitorTest { + + private final Log log = LogFactory.getLog(ClusterMonitorTest.class); + +// @Test + public void monitorCluster() { + Cluster cluster = new ClusterBuilder() + .addContactPoints("127.0.0.1") +// .withCredentials("cassandra", "cassandra") + .withCredentials("rhqadmin", "rhqadmin") + .build(); + + cluster.register(new Host.StateListener() { + @Override + public void onAdd(Host host) { + log.info("host " + host + " ADDED"); + } + + @Override + public void onUp(Host host) { + log.info("host " + host + " UP"); + } + + @Override + public void onDown(Host host) { + log.info("host " + host + " DOWN"); + } + + @Override + public void onRemove(Host host) { + log.info("host " + host + " REMOVED"); + } + }); + + Session session = cluster.connect("rhq"); + StorageSession storageSession = new StorageSession(session); + + MetricsDAO dao = new MetricsDAO(storageSession, new MetricsConfiguration()); + + while (true) { + try { + Thread.sleep(10000); + try { +// session.execute("select * from system.schema_keyspaces"); + com.datastax.driver.core.Query query = QueryBuilder.select().from("rhq", "raw_metrics").setConsistencyLevel( + ConsistencyLevel.ALL); +// session.execute(query); +// session.execute("select * from rhq.raw_metrics"); +// log.info("query succeeded"); + StorageResultSetFuture future = dao.insertRawData + (new MeasurementDataNumeric(System.currentTimeMillis(), 123, 1.1)); + + Futures.addCallback(future, new FutureCallback<ResultSet>() { + @Override + public void onSuccess(ResultSet rows) { + log.info("insert succeeded"); + } + + @Override + public void onFailure(Throwable throwable) { + log.error("insert failed", throwable); + } + }); + } catch (Exception e) { + log.error("query failed", e); + } + } catch (InterruptedException e) { + } + } + } + +} diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsBaselineCalculatorTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsBaselineCalculatorTest.java index ab4bd03..2b58222 100644 --- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsBaselineCalculatorTest.java +++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsBaselineCalculatorTest.java @@ -35,8 +35,6 @@ import java.util.Arrays; import java.util.List; import java.util.Random; -import com.datastax.driver.core.Session; - import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.testng.PowerMockObjectFactory; @@ -71,9 +69,9 @@ public class MetricsBaselineCalculatorTest { //tell the method story as it happens: mock dependencies and configure //those dependencies to get the method under test to completion. - Session mockSession = mock(Session.class); + StorageSession mockSession = mock(StorageSession.class); MetricsDAO mockMetricsDAO = mock(MetricsDAO.class); - PowerMockito.whenNew(MetricsDAO.class).withParameterTypes(Session.class, MetricsConfiguration.class) + PowerMockito.whenNew(MetricsDAO.class).withParameterTypes(StorageSession.class, MetricsConfiguration.class) .withArguments(eq(mockSession), eq(metricsConfiguration)).thenReturn(mockMetricsDAO); when(mockMetricsDAO.findAggregatedSimpleOneHourMetric(eq(1), eq(0), @@ -147,9 +145,9 @@ public class MetricsBaselineCalculatorTest { //tell the method story as it happens: mock dependencies and configure //those dependencies to get the method under test to completion. - Session mockSession = mock(Session.class); + StorageSession mockSession = mock(StorageSession.class); MetricsDAO mockMetricsDAO = mock(MetricsDAO.class); - PowerMockito.whenNew(MetricsDAO.class).withParameterTypes(Session.class, MetricsConfiguration.class) + PowerMockito.whenNew(MetricsDAO.class).withParameterTypes(StorageSession.class, MetricsConfiguration.class) .withArguments(eq(mockSession), eq(metricsConfiguration)).thenReturn(mockMetricsDAO); when( @@ -214,9 +212,9 @@ public class MetricsBaselineCalculatorTest { //tell the method story as it happens: mock dependencies and configure //those dependencies to get the method under test to completion. - Session mockSession = mock(Session.class); + StorageSession mockSession = mock(StorageSession.class); MetricsDAO mockMetricsDAO = mock(MetricsDAO.class); - PowerMockito.whenNew(MetricsDAO.class).withParameterTypes(Session.class, MetricsConfiguration.class) + PowerMockito.whenNew(MetricsDAO.class).withParameterTypes(StorageSession.class, MetricsConfiguration.class) .withArguments(eq(mockSession), eq(metricsConfiguration)).thenReturn(mockMetricsDAO); when( diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java index ee65292..b06dfda 100644 --- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java +++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java @@ -38,7 +38,6 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import com.datastax.driver.core.ResultSetFuture; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; @@ -78,7 +77,7 @@ public class MetricsDAOTest extends CassandraIntegrationTest { @BeforeClass public void initDAO() throws Exception { - dao = new MetricsDAO(session, new MetricsConfiguration()); + dao = new MetricsDAO(storageSession, new MetricsConfiguration()); } @BeforeMethod @@ -101,7 +100,7 @@ public class MetricsDAOTest extends CassandraIntegrationTest { WaitForWrite waitForResults = new WaitForWrite(1); - ResultSetFuture resultSetFuture = dao.insertRawData(expected); + StorageResultSetFuture resultSetFuture = dao.insertRawData(expected); Futures.addCallback(resultSetFuture, waitForResults); waitForResults.await("Failed to insert raw data"); @@ -131,7 +130,7 @@ public class MetricsDAOTest extends CassandraIntegrationTest { WaitForWrite waitForWrite = new WaitForWrite(data.size()); for (MeasurementDataNumeric raw : data) { - ResultSetFuture resultSetFuture = dao.insertRawData(raw); + StorageResultSetFuture resultSetFuture = dao.insertRawData(raw); Futures.addCallback(resultSetFuture, waitForWrite); } waitForWrite.await("Failed to insert raw data"); @@ -160,14 +159,14 @@ public class MetricsDAOTest extends CassandraIntegrationTest { WaitForWrite waitForWrite = new WaitForWrite(data.size()); for (MeasurementDataNumeric raw : data) { - ResultSetFuture resultSetFuture = dao.insertRawData(raw); + StorageResultSetFuture resultSetFuture = dao.insertRawData(raw); Futures.addCallback(resultSetFuture, waitForWrite); } waitForWrite.await("Failed to insert raw data"); RawNumericMetricMapper mapper = new RawNumericMetricMapper(); WaitForRead<RawNumericMetric> waitForRead = new WaitForRead<RawNumericMetric>(mapper); - ResultSetFuture resultSetFuture = dao.findRawMetricsAsync(scheduleId, + StorageResultSetFuture resultSetFuture = dao.findRawMetricsAsync(scheduleId, threeMinutesAgo.minusSeconds(5).getMillis(), oneMinuteAgo.plusSeconds(5).getMillis()); Futures.addCallback(resultSetFuture, waitForRead); @@ -200,7 +199,7 @@ public class MetricsDAOTest extends CassandraIntegrationTest { WaitForWrite waitForWrite = new WaitForWrite(data.size()); for (MeasurementDataNumeric raw : data) { - ResultSetFuture resultSetFuture = dao.insertRawData(raw); + StorageResultSetFuture resultSetFuture = dao.insertRawData(raw); Futures.addCallback(resultSetFuture, waitForWrite); } waitForWrite.await("Failed to insert raw data"); @@ -321,9 +320,9 @@ public class MetricsDAOTest extends CassandraIntegrationTest { WaitForWrite waitForWrite = new WaitForWrite(2); - ResultSetFuture resultSetFuture1 = dao.updateMetricsIndex(MetricsTable.TWENTY_FOUR_HOUR, scheduleId1, + StorageResultSetFuture resultSetFuture1 = dao.updateMetricsIndex(MetricsTable.TWENTY_FOUR_HOUR, scheduleId1, hour0().getMillis()); - ResultSetFuture resultSetFuture2 = dao.updateMetricsIndex(MetricsTable.TWENTY_FOUR_HOUR, scheduleId2, + StorageResultSetFuture resultSetFuture2 = dao.updateMetricsIndex(MetricsTable.TWENTY_FOUR_HOUR, scheduleId2, hour0().getMillis()); Futures.addCallback(resultSetFuture1, waitForWrite); diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java index 1ec4771..b4de4e0 100644 --- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java +++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java @@ -43,7 +43,6 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import com.datastax.driver.core.ResultSetFuture; import com.google.common.base.Throwables; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; @@ -113,7 +112,7 @@ public class MetricsServerTest extends CassandraIntegrationTest { dateTimeService.setConfiguration(configuration); metricsServer.setDateTimeService(dateTimeService); - dao = new MetricsDAO(session, configuration); + dao = new MetricsDAO(storageSession, configuration); metricsServer.setDAO(dao); purgeDB(); @@ -230,7 +229,7 @@ public class MetricsServerTest extends CassandraIntegrationTest { WaitForWrite waitForRawInserts = new WaitForWrite(rawMetrics.size()); for (MeasurementDataNumeric raw : rawMetrics) { - ResultSetFuture resultSetFuture = dao.insertRawData(raw); + StorageResultSetFuture resultSetFuture = dao.insertRawData(raw); Futures.addCallback(resultSetFuture, waitForRawInserts); } waitForRawInserts.await("Failed to insert raw data"); @@ -1008,7 +1007,7 @@ public class MetricsServerTest extends CassandraIntegrationTest { "SELECT schedule_id, time, value, ttl(value), writetime(value) " + "FROM " + MetricsTable.RAW + " " + "WHERE schedule_id = " + scheduleId + " AND time >= " + startTime + " AND time < " + endTime; - return new SimplePagedResult<RawNumericMetric>(cql, new RawNumericMetricMapper(true), session); + return new SimplePagedResult<RawNumericMetric>(cql, new RawNumericMetricMapper(true), storageSession); } private static class WaitForRawInserts implements RawDataInsertedCallback { diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/TimeoutTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/TimeoutTest.java index e2b23ec..dabd110 100644 --- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/TimeoutTest.java +++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/TimeoutTest.java @@ -35,7 +35,6 @@ import com.google.common.base.Throwables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.testng.annotations.Test; import org.rhq.core.domain.measurement.MeasurementDataNumeric; @@ -43,7 +42,7 @@ public class TimeoutTest extends CassandraIntegrationTest { private final Log log = LogFactory.getLog(TimeoutTest.class); - @Test +// @Test public void generateTimeout() throws Exception { MetricsConfiguration configuration = new MetricsConfiguration(); @@ -54,7 +53,7 @@ public class TimeoutTest extends CassandraIntegrationTest { dateTimeService.setConfiguration(configuration); metricsServer.setDateTimeService(dateTimeService); - MetricsDAO dao = new MetricsDAO(session, configuration); + MetricsDAO dao = new MetricsDAO(new StorageSession(session), configuration); metricsServer.setDAO(dao); long time = hour0().getMillis(); diff --git a/modules/enterprise/server/server-metrics/src/test/resources/log4j.properties b/modules/enterprise/server/server-metrics/src/test/resources/log4j.properties index 67db049..59bd5db 100644 --- a/modules/enterprise/server/server-metrics/src/test/resources/log4j.properties +++ b/modules/enterprise/server/server-metrics/src/test/resources/log4j.properties @@ -39,4 +39,4 @@ log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n log4j.logger.org.rhq=DEBUG -log4j.logger.com.datastax=DEBUG +log4j.logger.com.datastax=WARN diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java index 7ff8f6c..40e00bf 100644 --- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java +++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java @@ -60,6 +60,7 @@ import org.rhq.metrics.simulator.stats.Stats; import org.rhq.server.metrics.DateTimeService; import org.rhq.server.metrics.MetricsDAO; import org.rhq.server.metrics.MetricsServer; +import org.rhq.server.metrics.StorageSession; /** * @author John Sanda @@ -96,7 +97,9 @@ public class Simulator implements ShutdownManager { session = createSession(nodes, compression); } - MetricsDAO metricsDAO = new MetricsDAO(session, plan.getMetricsServerConfiguration()); + StorageSession storageSession = new StorageSession(session); + + MetricsDAO metricsDAO = new MetricsDAO(storageSession, plan.getMetricsServerConfiguration()); MetricsServer metricsServer = new MetricsServer(); metricsServer.setDAO(metricsDAO); metricsServer.setConfiguration(plan.getMetricsServerConfiguration()); commit 6c62c7c89a1707660e86fa97320420c2ef817339 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Jul 25 22:06:31 2013 -0400 upgrade to version 1.0.2 of datastax driver diff --git a/pom.xml b/pom.xml index f909033..3f2adbd 100644 --- a/pom.xml +++ b/pom.xml @@ -178,7 +178,7 @@  <cassandra.version>1.2.4</cassandra.version> <cassandra.thrift.version>0.7.0</cassandra.thrift.version> - <cassandra.driver.version>1.0.0-rhq-1.2.4</cassandra.driver.version> + <cassandra.driver.version>1.0.2-rhq-1.2.4</cassandra.driver.version> <cassandra.driver.netty.version>3.6.3.Final</cassandra.driver.netty.version> <cassandra.snappy.version>1.0.4.1-rhq-p1</cassandra.snappy.version> <cassandra.snakeyaml.version>1.6</cassandra.snakeyaml.version>

1 0

[rhq] modules/enterprise modules/plugins
by snegrea 25 Jul '13

25 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 48 +++++++--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java | 3 modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 8 - 3 files changed, 42 insertions(+), 17 deletions(-) New commits: commit b9029136b21154a2572c1794807de2ca9a30e2a2 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Jul 25 17:52:00 2013 -0500 Operations are now created in a new transaction. Also, change the way the configuration is updated. The steps for a full configuration update: 1) Invoke config update operation on the plugin 2) Update the JMX port on the storage node entity 3) Restart the storage node server 4) Update the connection settings for the storage node if JMX port changed diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 7a7eda4..7d861f1 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -35,6 +35,8 @@ import java.util.Queue; import javax.ejb.EJB; import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import javax.ejb.TransactionAttributeType; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; @@ -134,6 +136,9 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @EJB private ConfigurationManagerLocal configurationManager; + @EJB + private StorageNodeManagerLocal storageNodeManger; + @Override public void linkResource(Resource resource) { List<StorageNode> storageNodes = this.getStorageNodes(); @@ -658,31 +663,49 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN parameters); if (result) { + //2. Update the JMX port + //this is a fast operation compared to the restart + storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); + entityManager.merge(storageNode); + + //3. Restart the storage node + result = runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, + new Configuration()); + + //4. Update the plugin configuration to talk with the new server + //Up to this point communication with the storage node should not have been affected by the intermediate + //changes Configuration storageNodePluginConfig = configurationManager.getPluginConfiguration(subject, storageNodeResource.getId()); String existingJMXPort = storageNodePluginConfig.getSimpleValue("jmxPort"); - storageNodePluginConfig.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); + String newJMXPort = storageNodeConfiguration.getJmxPort() + ""; - String existingConnectionURL = storageNodePluginConfig.getSimpleValue("connectorAddress"); - String newConnectionURL = existingConnectionURL.replace(":" + existingJMXPort + "/", ":" - + storageNodeConfiguration.getJmxPort() + "/"); - storageNodePluginConfig.setSimpleValue("connectorAddress", newConnectionURL); + if (!existingJMXPort.equals(newJMXPort)) { + storageNodePluginConfig.setSimpleValue("jmxPort", newJMXPort); - configurationManager.updatePluginConfiguration(subject, storageNodeResource.getId(), - storageNodePluginConfig); + String existingConnectionURL = storageNodePluginConfig.getSimpleValue("connectorAddress"); + String newConnectionURL = existingConnectionURL.replace(":" + existingJMXPort + "/", ":" + + storageNodeConfiguration.getJmxPort() + "/"); + storageNodePluginConfig.setSimpleValue("connectorAddress", newConnectionURL); - storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); - entityManager.merge(storageNode); - entityManager.flush(); + configurationManager.updatePluginConfiguration(subject, storageNodeResource.getId(), + storageNodePluginConfig); + } - return runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, null); + return result; } } return false; } + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + public void scheduleOperationInNewTransaction(Subject subject, ResourceOperationSchedule schedule) { + operationManager.scheduleResourceOperation(subject, schedule); + } + private boolean runOperationAndWaitForResult(Subject subject, Resource storageNodeResource, String operationToRun, Configuration parameters) { @@ -696,8 +719,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN newSchedule.setDescription("Run by StorageNodeManagerBean"); newSchedule.setParameters(parameters); - operationManager.scheduleResourceOperation(subject, newSchedule); - entityManager.flush(); + storageNodeManger.scheduleOperationInNewTransaction(subject, newSchedule); //waiting for the operation result then return it int iteration = 0; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index 69b16c4..15fa85c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -28,6 +28,7 @@ import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.criteria.StorageNodeCriteria; +import org.rhq.core.domain.operation.bean.ResourceOperationSchedule; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageList; @@ -178,4 +179,6 @@ public interface StorageNodeManagerLocal { */ ResourceGroup getStorageNodeGroup(); + void scheduleOperationInNewTransaction(Subject subject, ResourceOperationSchedule schedule); + } diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index a42040d..f5a4f6d 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -132,10 +132,10 @@ <operation name="updateConfiguration" description="Updates the node configuration. Will require a separate server restart for the settings to take effect."> <parameters> - <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> - <c:simple-property name="heapSize" type="string" description="The heap size to be used for both -Xms and -Xmx JVM options."/> - <c:simple-property name="heapNewSize" type="string" description="The heap new size to be used be used with -Xmn JVM option."/> - <c:simple-property name="threadStackSize" type="integer" description="The thread stack size. This memory is allocated to each thread off heap. The + <c:simple-property name="jmxPort" type="integer" required="false" description="JMX port JVM option."/> + <c:simple-property name="heapSize" type="string" required="false" description="The heap size to be used for both -Xms and -Xmx JVM options."/> + <c:simple-property name="heapNewSize" type="string" required="false" description="The heap new size to be used be used with -Xmn JVM option."/> + <c:simple-property name="threadStackSize" type="integer" required="false" description="The thread stack size. This memory is allocated to each thread off heap. The value should be an integer that will be interpreted in kilobytes."/> <c:simple-property name="restartIfRequired" type="boolean" required="true" default="false" description="If [true] then restart the server at the end of the update if and if only the updates made require a restart. If [false] the server will not be restarted regardless of the updates made."/> </parameters>

1 0

[rhq] modules/enterprise
by mike thompson 25 Jul '13

25 Jul '13

modules/enterprise/gui/coregui/pom.xml | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java | 311 ------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/LineMetricGraph.java | 158 --- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 115 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java | 79 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java | 258 ++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 33 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 204 ----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 308 +++---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java | 27 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java | 399 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java | 185 ++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java | 237 ----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java | 167 ++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java | 213 ++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 385 +++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java | 307 +++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java | 208 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 7 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 5 modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js | 4 36 files changed, 2078 insertions(+), 1649 deletions(-) New commits: commit 97003022a49e9e534fd54488966eb89950760c39 Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Jul 25 14:16:38 2013 -0700 [BZ 988574] - Consolidated Metrics Screen - UXD Redesign diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 969ab8e..353f4d9 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -19,7 +19,7 @@ <properties>  - <gwt.version>2.5.0</gwt.version> + <gwt.version>${gwt.version}</gwt.version> <smartgwt.version>3.0</smartgwt.version>  -  - <dependency> - <groupId>com.googlecode.gflot</groupId> - <artifactId>gflot</artifactId> - <version>2.4.3</version> - <scope>provided</scope> - </dependency> +  <dependency> @@ -245,7 +236,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>2.5.0</version> + <version>${gwt.version}</version> <configuration> <noServer>true</noServer> <inplace>false</inplace> diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java index d11467a..b48a712 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java @@ -114,6 +114,12 @@ public enum IconEnum { STORAGE_NODE("global/StorageNode_16.png", "global/StorageNode_24.png"), ///////////////////////////// + // General + ///////////////////////////// + EXPANDED_ICON("[SKIN]/ListGrid/row_expanded.png"), + COLLAPSED_ICON("[SKIN]/ListGrid/row_collapsed.png"), + + ///////////////////////////// // Resource Specific Tabs ///////////////////////////// CALLTIME("global/Recent_16.png", "global/Recent_24.png"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java index 4cfe199..4ce05d2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java @@ -1202,16 +1202,15 @@ public class Table<DS extends RPCDataSource> extends EnhancedHLayout implements } if (hiddenItem != null) { - Log.debug("Found hidden items"); // Add the hidden item if it exists FormItem[] tmpItems = new FormItem[items.length + 1]; System.arraycopy(items, 0, tmpItems, 0, items.length); tmpItems[items.length] = hiddenItem; items = tmpItems; } - for (FormItem item : items) { - Log.debug(" ******** Form Items sent: " + item.getName() + ": " + item.getValue()); - } +// for (FormItem item : items) { +// Log.debug(" ******** Form Items sent: " + item.getName() + ": " + item.getValue()); +// } super.setItems(items); } @@ -1223,19 +1222,16 @@ public class Table<DS extends RPCDataSource> extends EnhancedHLayout implements @Override public void onKeyPress(KeyPressEvent event) { if (event.getKeyName().equals("Enter")) { - Log.debug("Table.TableFilter Pressed Enter key"); if (null != searchBarItem) { if (searchBarItem.getSearchBar().isFilterEnabled()) { TextItem searchTextItem = searchBarItem.getSearchBar().getSearchTextItem(); String searchBarValue = searchTextItem.getValueAsString(); String hiddenValue = (String) hiddenItem.getValue(); - Log.debug("Table.TableFilter searchBarValue :" + searchBarValue + ", hiddenValue" + hiddenValue); // Only send a fetch request if the user actually changed the search expression. if (!equals(searchBarValue, hiddenValue)) { hiddenItem.setValue(searchBarValue); - Log.debug("Table.TableFilter fetchFilteredTableData"); fetchFilteredTableData(); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java index e75b65a..ace6154 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java @@ -202,6 +202,10 @@ public abstract class AbstractMetricGraph extends VLayout implements HasD3Metric return metricGraphData.getPortalId(); } + public boolean isHideLegend(){ + return metricGraphData.isHideLegend(); + } + public void setGraphListView(AbstractD3GraphListView graphListView) { this.graphListView = graphListView; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java index 2075783..b4f1354 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java @@ -77,7 +77,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { prefs = measurementUserPreferences.getMetricRangePreferences(); Log.debug("ButtonBarDateTimeRangeEditor initialized with start Date: " + new Date(prefs.begin) + " end Date: " + new Date(prefs.end)); - createButtons(); + //createButtons(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java index ecd3b46..5ae392f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java @@ -73,6 +73,7 @@ public class MetricGraphData implements JsonMetricProducer { private MeasurementOOBComposite lastOOB; private Integer chartHeight; private boolean isPortalGraph; + private boolean hideLegend; private MetricGraphData(int portalId) { @@ -249,6 +250,14 @@ public class MetricGraphData implements JsonMetricProducer { return isPortalGraph; } + public boolean isHideLegend() { + return hideLegend; + } + + public void setHideLegend(boolean hideLegend) { + this.hideLegend = hideLegend; + } + public String getChartTitle() { if(definition != null){ @@ -380,8 +389,8 @@ public class MetricGraphData implements JsonMetricProducer { * @see StackedBarMetricGraphImpl */ public boolean showBarAvgTrendLine() { + int numberOfAggBars = 0; for (MeasurementDataNumericHighLowComposite measurement : metricData) { - int numberOfAggBars = 0; boolean noValuesInCurrentBarUndefined = (!Double.isNaN(measurement.getValue()) && !Double.isNaN(measurement.getHighValue()) && !Double.isNaN(measurement.getLowValue())); boolean foundAggregateBar = (measurement.getValue() != measurement.getHighValue() || measurement.getHighValue() != measurement.getLowValue()); // if there exists a even one aggregate bar then I can short circuit this and exit diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java deleted file mode 100644 index 34ca60b..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype; - -import java.util.Date; -import java.util.List; - -import org.rhq.core.domain.measurement.Availability; -import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; -import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.Messages; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AvailabilityGraphType; -import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; - -/** - * This is now old and for demonstration purposes only. - * Contains the javascript chart definition for an implementation of the d3 availability chart. This implementation is - * just a line that changes color based on availability type: up=green, down=red, orange=disabled, unknown=grey, - * empty=grey, warn=yellow. This version of the availability graph shows continuous intervals. - * @deprecated - * @see AvailabilityOverUnderGraphType - * - * @author Mike Thompson - */ -public class AvailabilityLineGraphType implements AvailabilityGraphType { - - private static Messages MSG = CoreGUI.getMessages(); - private List<Availability> availabilityList; - private List<ResourceGroupAvailability> groupAvailabilityList; - private Integer entityId; - - /** - * General constructor for stacked bar graph when you have all the data needed to produce the graph. (This is true - * for all cases but the dashboard portlet). - */ - public AvailabilityLineGraphType(Integer entityId) { - this.entityId = entityId; - } - - public void setAvailabilityList(List<Availability> availabilityList) { - this.availabilityList = availabilityList; - } - - public void setGroupAvailabilityList(List<ResourceGroupAvailability> groupAvailabilityList) { - this.groupAvailabilityList = groupAvailabilityList; - } - - public String getAvailabilityJson() { - StringBuilder sb = new StringBuilder("["); - if (null != availabilityList) { - // loop through the avail intervals - for (Availability availability : availabilityList) { - sb.append("{ \"availType\":\"" + availability.getAvailabilityType() + "\", "); - sb.append(" \"availTypeMessage\":\"" + availability.getAvailabilityType()+ "\", "); - sb.append(" \"availStart\":" + availability.getStartTime() + ", "); - // last record will be null - long endTime = availability.getEndTime() != null ? availability.getEndTime() : (new Date()).getTime(); - sb.append(" \"availEnd\":" + endTime + ", "); - - long availDuration = endTime - availability.getStartTime(); - String availDurationString = MeasurementConverterClient.format((double) availDuration, - MeasurementUnits.MILLISECONDS, true); - sb.append(" \"availDuration\": \"" + availDurationString + "\" },"); - - } - sb.setLength(sb.length() - 1); - - } else if (null != groupAvailabilityList) { - // loop through the group avail down intervals - for (ResourceGroupAvailability groupAvailability : groupAvailabilityList) { - // allows substitution for situations like WARN=MIXED for easier terminology - String availabilityTypeMessage = (groupAvailability.getGroupAvailabilityType().equals(ResourceGroupComposite.GroupAvailabilityType.WARN)) - ? MSG.chart_hover_availability_type_warn() : groupAvailability.getGroupAvailabilityType().name(); - - sb.append("{ \"availType\":\"" + groupAvailability.getGroupAvailabilityType() + "\", "); - sb.append(" \"availTypeMessage\":\"" + availabilityTypeMessage + "\", "); - sb.append(" \"availStart\":" + groupAvailability.getStartTime() + ", "); - // last record will be null - long endTime = groupAvailability.getEndTime() != null ? groupAvailability.getEndTime() : (new Date()) - .getTime(); - sb.append(" \"availEnd\":" + endTime + ", "); - - long availDuration = endTime - groupAvailability.getStartTime(); - String availDurationString = MeasurementConverterClient.format((double) availDuration, - MeasurementUnits.MILLISECONDS, true); - sb.append(" \"availDuration\": \"" + availDurationString + "\" },"); - - } - sb.setLength(sb.length() - 1); - } - - sb.append("]"); - Log.debug(sb.toString()); - return sb.toString(); - } - - /** - * The magic JSNI to draw the charts with d3. - */ - public native void drawJsniChart() /*-{ - console.log("Draw Availability chart"); - - var global = this, - // tidy up all of our interactions with java (via JSNI) thru AvailChartContext class - // NOTE: rhq.js has the javascript object constructors in it. - availChartContext = new $wnd.AvailChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartId()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getAvailabilityJson()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartDateLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartTimeLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverStartLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverEndLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverBarLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverAvailabilityLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverTimeFormat()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverDateFormat()() - ); - - - var availabilityGraph = function () { - "use strict"; - // privates - - var margin = {top: 5, right: 5, bottom: 5, left: 40}, - barOffset = 10, - width = 750 - margin.left - margin.right + barOffset, - height = 20 - margin.top - margin.bottom, - pixelsOffHeight = 0, - svg; - - - function drawBars(availChartContext) { - var xAxisMin = $wnd.d3.min(availChartContext.data, function (d) { - return +d.availStart; - }), - xAxisMax = $wnd.d3.max(availChartContext.data, function (d) { - return +d.availEnd; - }), - - timeScale = $wnd.d3.time.scale() - .range([0, width]) - .domain([xAxisMin, xAxisMax]), - - yScale = $wnd.d3.scale.linear() - .clamp(true) - .rangeRound([height, 0]) - .domain([0, 4]), - - svg = $wnd.d3.select(availChartContext.chartSelection).append("g") - .attr("width", width + margin.left + margin.right) - .attr("height", height + margin.top + margin.bottom) - .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); - - - // The gray bars at the bottom leading up - svg.selectAll("rect.availBars") - .data(availChartContext.data) - .enter().append("rect") - .attr("class", "availBars") - .attr("x", function (d) { - return timeScale(+d.availStart); - }) - .attr("y", function (d) { - return yScale(0); - }) - .attr("height", function (d) { - return height - yScale(4) - pixelsOffHeight; - }) - .attr("width", function (d) { - return timeScale(+d.availEnd) - timeScale(+d.availStart); - }) - - .attr("opacity", ".9") - .attr("fill", function (d) { - if (d.availType === 'DOWN') { - return "#FF1919"; // red - } - else if (d.availType === 'DISABLED') { - return "#FF9933"; // orange - } - else if (d.availType === 'UNKNOWN') { - return "#CCC"; // gray - } - else if (d.availType === 'UP') { - return "#198C19"; // green - } - else if (d.availType === 'WARN') { - return "#FFFF00"; // yellow - } - else if (d.availType === 'EMPTY') { - return "#CCC"; // gray - } - else { - // should not ever happen, but... - console.warn("AvailabilityType not valid."); - return "#000"; //black - } - }); - } - - function createHovers() { - $wnd.jQuery('svg rect.availBars').tipsy({ - gravity: 'n', - html: true, - trigger: 'hover', - title: function () { - var d = this.__data__; - return formatHovers(d); - }, - show: function (e, el) { - el.css({ 'z-index': '990000'}) - } - }); - } - - function formatHovers(d) { - var hoverString, - timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat), - dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat), - availStart = new Date(+d.availStart), - availEnd = new Date(+d.availEnd); - - hoverString = - '<div class="chartHoverEnclosingDiv">' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + d.availTypeMessage + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + d.availDuration + '</span></div>' + - '</div>'; - return hoverString; - - } - - return { - // Public API - draw: function (chartContext) { - "use strict"; - console.info("AvailabilityChart"); - //console.time("availabilityChart"); - - drawBars(availChartContext); - createHovers(); - //console.timeEnd("availabilityChart"); - } - }; // end public closure - - - }(); - - if (availChartContext.data !== undefined && availChartContext.data.length > 0) { - availabilityGraph.draw(availChartContext); - } - - }-*/; - - public String getChartId() { - return String.valueOf(entityId); - } - - public String getChartTimeLabel() { - return MSG.chart_time_label(); - } - - public String getChartDateLabel() { - return MSG.chart_date_label(); - } - - public String getChartHoverAvailabilityLabel() { - return MSG.chart_hover_availability_label(); - } - - public String getChartHoverStartLabel() { - return MSG.chart_hover_start_label(); - } - - public String getChartHoverEndLabel() { - return MSG.chart_hover_end_label(); - } - - public String getChartHoverBarLabel() { - return MSG.chart_hover_bar_label(); - } - - public String getChartHoverTimeFormat() { - return MSG.chart_hover_time_format(); - } - - public String getChartHoverDateFormat() { - return MSG.chart_hover_date_format(); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index 7c5f80a..811a579 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -311,13 +311,6 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { }); } - function timeFormat(formats) { - return function(date) { - var i = formats.length - 1, f = formats[i]; - while (!f[1](date)) f = formats[--i]; - return f[0](date); - } - } function formatHovers(d) { var timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat), @@ -345,11 +338,13 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { }(); - if (availChartContext.data !== undefined && availChartContext.data.length > 0) { + console.log("Avail Data records: "+availChartContext.data.length); + if (typeof availChartContext.data !== 'undefined' && availChartContext.data.length > 0) { availabilityGraph.draw(availChartContext); + console.log("Availability Chart Drawn"); } - }-*/; + }-*/; public String getChartId() { return String.valueOf(entityId); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/LineMetricGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/LineMetricGraph.java deleted file mode 100644 index 079b2ab..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/LineMetricGraph.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype; - -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; - -/** - * Contains the javascript chart definition for a d3 Line graph chart. - * NOTE: this class isn't used just provided as an example as how to create - * other graph types. - * - * @author Mike Thompson - */ -public final class LineMetricGraph extends AbstractMetricGraph { - - /** - * General constructor for stacked bar graph when you have all the data needed to - * produce the graph. (This is true for all cases but the dashboard portlet). - */ - public LineMetricGraph(MetricGraphData metricGraphData) { - setMetricGraphData(metricGraphData); - } - - /** - * The magic JSNI to draw the charts with d3. - */ - public native void drawJsniChart() /*-{ - console.log("Draw Metric Line jsni chart"); - var global = this, - chartId = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getChartId()(), - chartHandle = "#rChart-"+chartId, - chartSelection = chartHandle + " svg", - json = $wnd.jQuery.parseJSON(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getJsonMetrics()()), - yAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getChartTitle()(), - yAxisUnits = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getYAxisUnits()(), - xAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getXAxisTitle()(); - - console.log("chart id: "+chartSelection ); - console.log(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getJsonMetrics()()); - - - function draw(data){ - "use strict"; - - var margin = {top: 10, right: 5, bottom: 30, left: 70}, - width = 400 - margin.left - margin.right, - height = 150 - margin.top - margin.bottom; - - var timeScale = $wnd.d3.time.scale() - .range([0, width]) - .domain($wnd.d3.extent(data, function(d) { return d.x; })); - - var yScale = $wnd.d3.scale.linear() - .rangeRound([height, 0]) - .domain([$wnd.d3.min(data.map(function(x) {return x.low;})), $wnd.d3.max(data.map(function(x){return x.high;}))]); - - var xAxis = $wnd.d3.svg.axis() - .scale(timeScale) - .ticks(5) - .orient("bottom"); - - var yAxis = $wnd.d3.svg.axis() - .scale(yScale) - .ticks(5) - .orient("left"); - - var interpolation = "basis"; - - var line = $wnd.d3.svg.line() - .interpolate(interpolation) - .x(function(d) { return timeScale(d.x); }) - .y(function(d) { return yScale(+d.y); }); - - var highLine = $wnd.d3.svg.line() - .interpolate(interpolation) - .x(function(d) { return timeScale(d.x); }) - .y(function(d) { return yScale(+d.high); }); - - var lowLine = $wnd.d3.svg.line() - .interpolate(interpolation) - .x(function(d) { return timeScale(d.x); }) - .y(function(d) { return yScale(+d.low); }); - - var svg = $wnd.d3.select(chartSelection).append("g") - .attr("width", width + margin.left + margin.right) - .attr("height", height + margin.top + margin.bottom) - .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); - - svg.append("g") - .attr("class", "x axis") - .attr("transform", "translate(0," + height + ")") - .call(xAxis); - - - svg.append("g") - .attr("class", "y axis") - .call(yAxis) - .append("text") - .attr("transform", "rotate(-90)") - .attr("y", -60) - .attr("dy", ".71em") - .style("text-anchor", "end") - .text(yAxisUnits === "NONE" ? "" : yAxisUnits); - - console.log("finished axes"); - - svg.append("path") - .datum(data) - .attr("class", "line") - .attr("fill", "none") - .attr("stroke", "steelblue") - .attr("stroke-width", "2") - .attr("d", line); - - svg.append("path") - .datum(data) - .attr("class", "highLine") - .attr("fill", "none") - .attr("stroke", "red") - .attr("stroke-width", "1.5") - //.attr("stroke-dasharray", "20,10,5,5,5,10") - .attr("stroke-dasharray", "5,5") - .attr("stroke-opacity", ".3") - .attr("d", highLine); - - svg.append("path") - .datum(data) - .attr("class", "lowLine") - .attr("fill", "none") - .attr("stroke", "blue") - .attr("stroke-width", "1.5") - .attr("stroke-dasharray", "5,5") - .attr("stroke-opacity", ".3") - .attr("d", lowLine); - - console.log("finished paths"); - }(data); - - }-*/; - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java index 9058ea5..67552d3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java @@ -73,7 +73,8 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getButtonBarDateTimeFormat()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getChartSingleValueLabel()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getXAxisTimeFormatHours()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getXAxisTimeFormatHoursMinutes()() + global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getXAxisTimeFormatHoursMinutes()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::isHideLegend()() ); @@ -217,8 +218,8 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { .attr("transform", "translate(" + margin.left + "," + (+titleHeight + titleSpace + margin.top) + ")"); legendUnDefined = (typeof min === 'undefined') || (typeof avg === 'undefined') || (typeof peak === 'undefined'); - if (!useSmallCharts() && !legendUnDefined) { - createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits); + if (!(chartContext.hideLegend && !useSmallCharts())) { + createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits); } } @@ -693,7 +694,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { }; // end public closure }(); - if(typeof chartContext.data !== 'undefined' && chartContext.data.length > 0){ + if(typeof chartContext.data !== 'undefined' && chartContext.data !== null && chartContext.data.length > 0){ metricStackedBarGraph.draw(chartContext); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java index 59737ac..a9789c6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java @@ -21,7 +21,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.EnumSet; import java.util.List; import com.google.gwt.core.client.GWT; @@ -35,19 +34,17 @@ import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.measurement.DisplayType; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; -import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; @@ -55,7 +52,7 @@ import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; * Build the Group version of the View that shows the individual graph views. * @author Mike Thompson */ -public final class D3GroupGraphListView extends AbstractD3GraphListView implements AutoRefresh{ +public final class D3GroupGraphListView extends AbstractD3GraphListView implements AutoRefresh { private ResourceGroup resourceGroup; private VLayout graphsVLayout; @@ -75,7 +72,8 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen addMember(buttonBarDateTimeRangeEditor); if (showAvailabilityGraph) { - availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>(new AvailabilityOverUnderGraphType(resourceGroup.getId())); + availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( + new AvailabilityOverUnderGraphType(resourceGroup.getId())); addMember(availabilityGraph); } graphsVLayout = new VLayout(); @@ -89,7 +87,6 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen addMember(graphsVLayout); } - public void redrawGraphs() { this.onDraw(); } @@ -100,68 +97,60 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen private void buildGraphs() { queryAvailability(EntityContext.forGroup(resourceGroup), buttonBarDateTimeRangeEditor.getStartTime(), - buttonBarDateTimeRangeEditor.getEndTime(), null); + buttonBarDateTimeRangeEditor.getEndTime(), null); - ResourceTypeRepository.Cache.getInstance().getResourceTypes(resourceGroup.getResourceType().getId(), - EnumSet.of(ResourceTypeRepository.MetadataType.measurements), - new ResourceTypeRepository.TypeLoadedCallback() { - public void onTypesLoaded(final ResourceType type) { + final ArrayList<MeasurementDefinition> measurementDefinitions = new ArrayList<MeasurementDefinition>(); - final ArrayList<MeasurementDefinition> measurementDefinitions = new ArrayList<MeasurementDefinition>(); + for (MeasurementDefinition def : resourceGroup.getResourceType().getMetricDefinitions()) { + if (def.getDataType() == DataType.MEASUREMENT && def.getDisplayType() == DisplayType.SUMMARY) { + measurementDefinitions.add(def); + } + } - for (MeasurementDefinition def : type.getMetricDefinitions()) { - if (def.getDataType() == DataType.MEASUREMENT && def.getDisplayType() == DisplayType.SUMMARY) { - measurementDefinitions.add(def); - } - } + Collections.sort(measurementDefinitions, new Comparator<MeasurementDefinition>() { + public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { + return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); + } + }); - Collections.sort(measurementDefinitions, new Comparator<MeasurementDefinition>() { - public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { - return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); - } - }); + int[] measDefIdArray = new int[measurementDefinitions.size()]; + for (int i = 0; i < measDefIdArray.length; i++) { + measDefIdArray[i] = measurementDefinitions.get(i).getId(); + } - int[] measDefIdArray = new int[measurementDefinitions.size()]; - for (int i = 0; i < measDefIdArray.length; i++) { - measDefIdArray[i] = measurementDefinitions.get(i).getId(); - } + GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroup(resourceGroup.getId(), measDefIdArray, + buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), 60, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), caught); + loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); + } - GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroup(resourceGroup.getId(), - measDefIdArray, buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), 60, - new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), - caught); - loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); - } - - @Override - public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> result) { - if (result.isEmpty()) { - loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); - } else { - loadingLabel.hide(); - int i = 0; - for (List<MeasurementDataNumericHighLowComposite> data : result) { - buildIndividualGraph(measurementDefinitions.get(i++), data); - } - // There is a weird timing case when availabilityGraph can be null - if (availabilityGraph != null) { - availabilityGraph.setGroupAvailabilityList(groupAvailabilityList); - new Timer(){ - @Override - public void run() { - availabilityGraph.drawJsniChart(); - } - }.schedule(150); - } + @Override + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> result) { + if (result.isEmpty()) { + loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); + } else { + loadingLabel.hide(); + int i = 0; + for (List<MeasurementDataNumericHighLowComposite> data : result) { + buildIndividualGraph(measurementDefinitions.get(i++), data); + } + // There is a weird timing case when availabilityGraph can be null + if (availabilityGraph != null) { + availabilityGraph.setGroupAvailabilityList(groupAvailabilityList); + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); } - } - }); - + }.schedule(150); + } + } } }); + } protected void queryAvailability(final EntityContext groupContext, Long startTime, Long endTime, @@ -197,7 +186,7 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen List<MeasurementDataNumericHighLowComposite> data) { MetricGraphData metricGraphData = MetricGraphData.createForResourceGroup(resourceGroup.getId(), - resourceGroup.getName(), measurementDefinition, data ); + resourceGroup.getName(), measurementDefinition, data); StackedBarMetricGraphImpl graph = GWT.create(StackedBarMetricGraphImpl.class); graph.setMetricGraphData(metricGraphData); @@ -207,11 +196,9 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen graphView.setWidth("95%"); graphView.setHeight(MULTI_CHART_HEIGHT); - if(graphsVLayout != null){ + if (graphsVLayout != null) { graphsVLayout.addMember(graphView); } } - - } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java new file mode 100644 index 0000000..101df60 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java @@ -0,0 +1,79 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table; + + +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; + +/** + * A MultiLine version of the Composite group single metric multiple resource charts. + * + * @author Mike Thompson + */ +public final class CompositeGroupMultiLineGraphListView extends CompositeGroupD3GraphListView +{ + private static final Messages MSG = CoreGUI.getMessages(); + + public CompositeGroupMultiLineGraphListView(int groupId, int defId, boolean isAutogroup) + { + super(groupId, defId, isAutogroup); + } + + + + @Override + public native void drawJsniChart() /*-{ + console.log("Draw nvd3 charts for composite multiline graph"); + var chartId = global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), + chartHandle = "#mChart-"+chartId, + chartSelection = chartHandle + " svg", + yAxisUnits = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getYAxisUnits()(), + xAxisLabel = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTitle()(), + xAxisTimeFormat = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupMultiLineGraphListView::getXAxisTimeFormatHoursMinutes()(); + json = eval(this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getJsonMetrics()()); + + $wnd.nv.addGraph(function() { + var chart = $wnd.nv.models.lineChart(); + + chart.xAxis.axisLabel(xAxisLabel) + .tickFormat(function(d) { return $wnd.d3.time.format(xAxisTimeFormat)(new Date(d)) }); + + chart.yAxis + .axisLabel(yAxisUnits) + .tickFormat($wnd.d3.format('.02f')); + + $wnd.d3.select(chartSelection) + .datum(json) + .transition().duration(300) + .call(chart); + + $wnd.nv.utils.windowResize(chart.update); + + return chart; + }); + + }-*/; + + + + public String getXAxisTimeFormatHoursMinutes() { + return MSG.chart_xaxis_time_format_hours_minutes(); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java new file mode 100644 index 0000000..8ca1ac5 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java @@ -0,0 +1,258 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail; + +import java.util.HashMap; +import java.util.Map; +import java.util.TreeSet; + +import com.google.gwt.http.client.Request; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.RequestCallback; +import com.google.gwt.http.client.RequestException; +import com.google.gwt.http.client.Response; +import com.google.gwt.user.client.History; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.menu.Menu; +import com.smartgwt.client.widgets.menu.MenuItem; +import com.smartgwt.client.widgets.menu.events.ClickHandler; +import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.criteria.DashboardCriteria; +import org.rhq.core.domain.criteria.SubjectCriteria; +import org.rhq.core.domain.dashboard.Dashboard; +import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.measurement.MeasurementSchedule; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resource.graph.ResourceD3GraphPortlet; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; +import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; + +/** + * Utility Class to build menus for linking to the Dashboard. + * @author Jay Shaughnessy + * @author Greg Hinkle + * @author Mike Thompson + */ +public class DashboardLinkUtility { + final static Messages MSG = CoreGUI.getMessages(); + + private DashboardLinkUtility() { + } + + public static MenuItem buildMetricsMenu(final ResourceType resourceType, final Resource resource, String label) { + + MenuItem measurements = new MenuItem(label); + final Menu measurementsSubMenu = new Menu(); + + DashboardCriteria criteria = new DashboardCriteria(); + GWTServiceLookup.getDashboardService().findDashboardsByCriteria(criteria, + new AsyncCallback<PageList<Dashboard>>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_dashboard(), + caught); + } + + public void onSuccess(PageList<Dashboard> result) { + //sort the display items alphabetically + TreeSet<String> ordered = new TreeSet<String>(); + Map<String, MeasurementDefinition> definitionMap = new HashMap<String, MeasurementDefinition>(); + for (MeasurementDefinition m : resourceType.getMetricDefinitions()) { + ordered.add(m.getDisplayName()); + definitionMap.put(m.getDisplayName(), m); + } + + for (String displayName : ordered) { + final MeasurementDefinition def = definitionMap.get(displayName); + //only add menu items for Measurement + if (def.getDataType().equals(DataType.MEASUREMENT)) { + MenuItem defItem = new MenuItem(def.getDisplayName()); + measurementsSubMenu.addItem(defItem); + Menu defSubItem = new Menu(); + defItem.setSubmenu(defSubItem); + + for (final Dashboard d : result) { + MenuItem addToDBItem = new MenuItem(MSG + .view_tree_common_contextMenu_addChartToDashboard(d.getName())); + defSubItem.addItem(addToDBItem); + + addToDBItem.addClickHandler(new ClickHandler() { + + public void onClick(MenuItemClickEvent menuItemClickEvent) { + DashboardPortlet p = new DashboardPortlet(MSG + .view_tree_common_contextMenu_resourceGraph(), ResourceD3GraphPortlet.KEY, + 250); + p.getConfiguration() + .put( + new PropertySimple(ResourceD3GraphPortlet.CFG_RESOURCE_ID, resource + .getId())); + p.getConfiguration().put( + new PropertySimple(ResourceD3GraphPortlet.CFG_DEFINITION_ID, def.getId())); + + d.addPortlet(p); + + GWTServiceLookup.getDashboardService().storeDashboard(d, + new AsyncCallback<Dashboard>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), + caught); + } + + public void onSuccess(Dashboard result) { + CoreGUI + .getMessageCenter() + .notify( + new Message( + MSG.view_tree_common_contextMenu_saveChartToDashboardSuccessful(result + .getName()), Message.Severity.Info)); + } + }); + + } + + }); + + } + + //add new menu item for adding current graphable element to view if on Monitor/Graphs tab + String currentViewPath = History.getToken(); + if (currentViewPath.contains("Monitoring/Metrics")) { + MenuItem addGraphItem = new MenuItem(MSG.common_title_add_graph_to_view()); + defSubItem.addItem(addGraphItem); + + addGraphItem.addClickHandler(new ClickHandler() { + public void onClick(MenuItemClickEvent menuItemClickEvent) { + //generate javascript to call out to. + //Ex. menuLayers.hide();addMetric('${metric.resourceId},${metric.scheduleId}') + if (getScheduleDefinitionId(resource, def.getName()) > -1) { + final String resourceGraphElements = resource.getId() + "," + + getScheduleDefinitionId(resource, def.getName()); + + //Once, the portal-war will be rewritten to GWT and operations performed + //within the iframe + JSF will update the user preferences, the following + //2 lines could be uncommented and the lines below them refactorized + //MeasurementUserPreferences measurementPreferences = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); + //String selectedView = measurementPreferences.getSelectedView(String.valueOf(resource.getId())); + + final int sid = UserSessionManager.getSessionSubject().getId(); + SubjectCriteria c = new SubjectCriteria(); + c.addFilterId(sid); + + GWTServiceLookup.getSubjectService().findSubjectsByCriteria(c, + new AsyncCallback<PageList<Subject>>() { + public void onSuccess(PageList<Subject> result) { + if (result.size() > 0) { + UserPreferences uPreferences = new UserPreferences(result + .get(0)); + MeasurementUserPreferences mPreferences = new MeasurementUserPreferences( + uPreferences); + String selectedView = mPreferences.getSelectedView(String + .valueOf(resource.getId())); + + addNewMetric(String.valueOf(resource.getId()), + selectedView, resourceGraphElements); + } else { + Log.warn("DashboardLinkUtility: Error obtaining subject with id:" + sid); + } + } + + public void onFailure(Throwable caught) { + Log.warn("DashboardLinkUtility: Error obtaining subject with id:" + sid, caught); + } + }); + } + } + }); + } + } + } + + } + }); + measurements.setSubmenu(measurementsSubMenu); + return measurements; + } + + /** Locate the specific schedule definition using the definition identifier. + */ + private static int getScheduleDefinitionId(Resource resource, String definitionName) { + int id = -1; + if (resource.getSchedules() != null) { + boolean located = false; + MeasurementSchedule[] schedules = new MeasurementSchedule[resource.getSchedules().size()]; + resource.getSchedules().toArray(schedules); + for (int i = 0; (!located && i < resource.getSchedules().size()); i++) { + MeasurementSchedule schedule = schedules[i]; + MeasurementDefinition definition = schedule.getDefinition(); + if ((definition != null) && definition.getName().equals(definitionName)) { + located = true; + id = schedule.getId(); + } + } + } + return id; + } + + private static void addNewMetric(String id, String selectedView, String resourceGraphElements) { + //construct portal.war url to access + String baseUrl = "/resource/common/monitor/visibility/IndicatorCharts.do"; + baseUrl += "?id=" + id; + baseUrl += "&view=" + selectedView; + baseUrl += "&action=addChart&metric=" + resourceGraphElements; + final String url = baseUrl; + //initiate HTTP request + final RequestBuilder b = new RequestBuilder(RequestBuilder.GET, baseUrl); + + try { + b.setCallback(new RequestCallback() { + public void onResponseReceived(final Request request, final Response response) { + Log.trace("Successfully submitted request to add graph to view:" + url); + + //kick off a page reload. + String currentViewPath = History.getToken(); + CoreGUI.goToView(currentViewPath, true); + } + + @Override + public void onError(Request request, Throwable t) { + Log.trace("Error adding Metric:" + url, t); + } + }); + b.send(); + } catch (RequestException e) { + Log.warn("Error adding Metric:" + url, e); + } + + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index 2d33d66..ae51195 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -66,9 +66,8 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.ResourceAgentView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.CalltimeView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.ResourceAvailabilityView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.schedules.ResourceSchedulesView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table.MeasurementTableView; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table.MetricsResourceView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.traits.TraitsView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history.ResourceOperationHistoryListView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.schedule.ResourceOperationScheduleListView; @@ -129,10 +128,8 @@ public class ResourceDetailView extends private SubTab summaryActivity; private SubTab summaryTimeline; - private SubTab monitorGraphs; private SubTab monitorMetrics; private SubTab monitorTraits; - private SubTab monitorAvail; private SubTab monitorSched; private SubTab monitorCallTime; private SubTab inventoryChildren; @@ -196,16 +193,11 @@ public class ResourceDetailView extends monitoringTab = new TwoLevelTab(new ViewName("Monitoring", MSG.view_tabs_common_monitoring()), IconEnum.SUSPECT_METRICS); - monitorGraphs = new SubTab(monitoringTab, new ViewName("Graphs", MSG.view_tabs_common_graphs()), null); - - monitorMetrics = new SubTab(monitoringTab, new ViewName("Metrics", "Metrics"), null); + monitorMetrics = new SubTab(monitoringTab, new ViewName("Metrics", MSG.view_tabs_common_metrics()), null); monitorTraits = new SubTab(monitoringTab, new ViewName("Traits", MSG.view_tabs_common_traits()), null); - monitorAvail = new SubTab(monitoringTab, new ViewName("Availability", MSG.view_tabs_common_availability()), - null); monitorSched = new SubTab(monitoringTab, new ViewName("Schedules", MSG.view_tabs_common_schedules()), null); monitorCallTime = new SubTab(monitoringTab, new ViewName("CallTime", MSG.view_tabs_common_calltime()), null); - monitoringTab.registerSubTabs(monitorGraphs, monitorMetrics, monitorTraits, monitorAvail, - monitorSched, monitorCallTime); + monitoringTab.registerSubTabs( monitorMetrics, monitorTraits, monitorSched, monitorCallTime); tabs.add(monitoringTab); eventsTab = new TwoLevelTab(new ViewName("Events", MSG.view_tabs_common_events()), IconEnum.EVENTS); @@ -395,22 +387,14 @@ public class ResourceDetailView extends boolean visibleToIE8 = !BrowserUtility.isBrowserPreIE9(); - viewFactory = (!visibleToIE8) ? null : new ViewFactory() { - @Override - public Canvas createView() { - return createD3GraphListView(); - } - }; - updateSubTab(this.monitoringTab, this.monitorGraphs, visible, visibleToIE8, viewFactory); - // visible = same test as above viewFactory = (!visible) ? null : new ViewFactory() { @Override public Canvas createView() { - return new MeasurementTableView(resource.getId()); + return new MetricsResourceView(resource); } }; - updateSubTab(this.monitoringTab, this.monitorMetrics, visible, true, viewFactory); + updateSubTab(this.monitoringTab, this.monitorMetrics, visible, visibleToIE8, viewFactory); visible = hasMetricsOfType(this.resourceComposite, DataType.TRAIT); viewFactory = (!visible) ? null : new ViewFactory() { @@ -421,13 +405,6 @@ public class ResourceDetailView extends }; updateSubTab(this.monitoringTab, this.monitorTraits, visible, true, viewFactory); - updateSubTab(this.monitoringTab, this.monitorAvail, true, true, new ViewFactory() { - @Override - public Canvas createView() { - return new ResourceAvailabilityView(resourceComposite); - } - }); - updateSubTab(this.monitoringTab, this.monitorSched, hasMetricsOfType(this.resourceComposite, null), true, new ViewFactory() { @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java index 071f831..a3990bb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java @@ -32,11 +32,6 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import com.google.gwt.http.client.Request; -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.RequestCallback; -import com.google.gwt.http.client.RequestException; -import com.google.gwt.http.client.Response; import com.google.gwt.user.client.History; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.DSCallback; @@ -60,17 +55,8 @@ import com.smartgwt.client.widgets.tree.events.DataArrivedHandler; import com.smartgwt.client.widgets.tree.events.NodeContextClickEvent; import com.smartgwt.client.widgets.tree.events.NodeContextClickHandler; -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.criteria.DashboardCriteria; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; -import org.rhq.core.domain.criteria.SubjectCriteria; -import org.rhq.core.domain.dashboard.Dashboard; -import org.rhq.core.domain.dashboard.DashboardPortlet; -import org.rhq.core.domain.measurement.DataType; -import org.rhq.core.domain.measurement.MeasurementDefinition; -import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.operation.OperationDefinition; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; @@ -82,11 +68,9 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.ViewId; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resource.graph.ResourceD3GraphPortlet; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync; @@ -101,8 +85,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; -import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; /** * @author Jay Shaughnessy @@ -562,7 +544,7 @@ public class ResourceTreeView extends EnhancedVLayout { resourceContextMenu.addItem(operations); // Metric graph addition menu - resourceContextMenu.addItem(buildMetricsMenu(resourceType, resource)); + resourceContextMenu.addItem(DashboardLinkUtility.buildMetricsMenu(resourceType, resource, MSG.view_tree_common_contextMenu_measurements())); // Create Child Menu and Manual Import Menu final Set<ResourceType> creatableChildTypes = getCreatableChildTypes(resourceType); @@ -725,190 +707,6 @@ public class ResourceTreeView extends EnhancedVLayout { tree.reloadChildren(refreshNode); } - private MenuItem buildMetricsMenu(final ResourceType type, final Resource resource) { - MenuItem measurements = new MenuItem(MSG.view_tree_common_contextMenu_measurements()); - final Menu measurementsSubMenu = new Menu(); - - DashboardCriteria criteria = new DashboardCriteria(); - GWTServiceLookup.getDashboardService().findDashboardsByCriteria(criteria, - new AsyncCallback<PageList<Dashboard>>() { - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_dashboard(), - caught); - } - - public void onSuccess(PageList<Dashboard> result) { - //sort the display items alphabetically - TreeSet<String> ordered = new TreeSet<String>(); - Map<String, MeasurementDefinition> definitionMap = new HashMap<String, MeasurementDefinition>(); - for (MeasurementDefinition m : type.getMetricDefinitions()) { - ordered.add(m.getDisplayName()); - definitionMap.put(m.getDisplayName(), m); - } - - for (String displayName : ordered) { - final MeasurementDefinition def = definitionMap.get(displayName); - //only add menu items for Measurement - if (def.getDataType().equals(DataType.MEASUREMENT)) { - MenuItem defItem = new MenuItem(def.getDisplayName()); - measurementsSubMenu.addItem(defItem); - Menu defSubItem = new Menu(); - defItem.setSubmenu(defSubItem); - - for (final Dashboard d : result) { - MenuItem addToDBItem = new MenuItem(MSG - .view_tree_common_contextMenu_addChartToDashboard(d.getName())); - defSubItem.addItem(addToDBItem); - - addToDBItem.addClickHandler(new ClickHandler() { - - public void onClick(MenuItemClickEvent menuItemClickEvent) { - DashboardPortlet p = new DashboardPortlet(MSG - .view_tree_common_contextMenu_resourceGraph(), ResourceD3GraphPortlet.KEY, - 250); - p.getConfiguration().put( - new PropertySimple(ResourceD3GraphPortlet.CFG_RESOURCE_ID, resource.getId())); - p.getConfiguration().put( - new PropertySimple(ResourceD3GraphPortlet.CFG_DEFINITION_ID, def.getId())); - - d.addPortlet(p); - - GWTServiceLookup.getDashboardService().storeDashboard(d, - new AsyncCallback<Dashboard>() { - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), - caught); - } - - public void onSuccess(Dashboard result) { - CoreGUI - .getMessageCenter() - .notify( - new Message( - MSG.view_tree_common_contextMenu_saveChartToDashboardSuccessful(result - .getName()), Message.Severity.Info)); - } - }); - - } - - }); - - - }//end dashboard iteration - - //add new menu item for adding current graphable element to view if on Monitor/Graphs tab - String currentViewPath = History.getToken(); - if (currentViewPath.contains("Monitoring/NewGraphs")) { - MenuItem addGraphItem = new MenuItem(MSG.common_title_add_graph_to_view()); - defSubItem.addItem(addGraphItem); - - addGraphItem.addClickHandler(new ClickHandler() { - public void onClick(MenuItemClickEvent menuItemClickEvent) { - //generate javascript to call out to. - //Ex. menuLayers.hide();addMetric('${metric.resourceId},${metric.scheduleId}') - if (getScheduleDefinitionId(resource, def.getName()) > -1) { - final String resourceGraphElements = resource.getId() + "," - + getScheduleDefinitionId(resource, def.getName()); - - //Once, the portal-war will be rewritten to GWT and operations performed - //within the iframe + JSF will update the user preferences, the following - //2 lines could be uncommented and the lines below them refactorized - //MeasurementUserPreferences measurementPreferences = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); - //String selectedView = measurementPreferences.getSelectedView(String.valueOf(resource.getId())); - - final int sid = UserSessionManager.getSessionSubject().getId(); - SubjectCriteria c = new SubjectCriteria(); - c.addFilterId(sid); - - GWTServiceLookup.getSubjectService().findSubjectsByCriteria(c, - new AsyncCallback<PageList<Subject>>() { - public void onSuccess(PageList<Subject> result) { - if (result.size() > 0) { - UserPreferences uPreferences = new UserPreferences(result - .get(0)); - MeasurementUserPreferences mPreferences = new MeasurementUserPreferences( - uPreferences); - String selectedView = mPreferences.getSelectedView(String - .valueOf(resource.getId())); - - addNewMetric(String.valueOf(resource.getId()), - selectedView, resourceGraphElements); - } else { - Log.trace("Error obtaining subject with id:" + sid); - } - } - - public void onFailure(Throwable caught) { - Log.trace("Error obtaining subject with id:" + sid, caught); - } - }); - } - } - }); - } // end add the "add to view" menu item - }//end trait exclusion - }//end measurement def iteration - - } - }); - measurements.setSubmenu(measurementsSubMenu); - return measurements; - } - - private void addNewMetric(String id, String selectedView, String resourceGraphElements) { - //construct portal.war url to access - String baseUrl = "/resource/common/monitor/visibility/IndicatorCharts.do"; - baseUrl += "?id=" + id; - baseUrl += "&view=" + selectedView; - baseUrl += "&action=addChart&metric=" + resourceGraphElements; - final String url = baseUrl; - //initiate HTTP request - final RequestBuilder b = new RequestBuilder(RequestBuilder.GET, baseUrl); - - try { - b.setCallback(new RequestCallback() { - public void onResponseReceived(final Request request, final Response response) { - Log.trace("Successfully submitted request to add graph to view:" + url); - - //kick off a page reload. - String currentViewPath = History.getToken(); - CoreGUI.goToView(currentViewPath, true); - } - - @Override - public void onError(Request request, Throwable t) { - Log.trace("Error adding Metric:" + url, t); - } - }); - b.send(); - } catch (RequestException e) { - Log.trace("Error adding Metric:" + url, e); - } - } - - /** Locate the specific schedule definition using the definition identifier. - */ - private int getScheduleDefinitionId(Resource resource, String definitionName) { - int id = -1; - if (resource.getSchedules() != null) { - boolean located = false; - MeasurementSchedule[] schedules = new MeasurementSchedule[resource.getSchedules().size()]; - resource.getSchedules().toArray(schedules); - for (int i = 0; (!located && i < resource.getSchedules().size()); i++) { - MeasurementSchedule schedule = schedules[i]; - MeasurementDefinition definition = schedule.getDefinition(); - if ((definition != null) && definition.getName().equals(definitionName)) { - located = true; - id = schedule.getId(); - } - } - } - return id; - } private void setRootResource(Resource rootResource) { this.rootResource = rootResource; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java index 65893ce..8b9f327 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -21,7 +21,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitori import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.EnumSet; import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -30,7 +29,6 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Overflow; -import com.smartgwt.client.widgets.form.fields.events.ClickHandler; import com.smartgwt.client.widgets.layout.VLayout; import org.rhq.core.domain.common.EntityContext; @@ -41,16 +39,14 @@ import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite; import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.async.Command; import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; @@ -115,17 +111,17 @@ public class D3GraphListView extends AbstractD3GraphListView { setOverflow(Overflow.HIDDEN); } - @Override protected void onDraw() { super.onDraw(); - Log.debug("D3GraphListView.onDraw() for: " + resource.getName()+ " id: "+ resource.getId()); + Log.debug("D3GraphListView.onDraw() for: " + resource.getName() + " id: " + resource.getId()); destroyMembers(); addMember(buttonBarDateTimeRangeEditor); if (showAvailabilityGraph) { - availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>(new AvailabilityOverUnderGraphType(resource.getId())); + availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( + new AvailabilityOverUnderGraphType(resource.getId())); addMember(availabilityGraph); } @@ -163,8 +159,8 @@ public class D3GraphListView extends AbstractD3GraphListView { @Override public void onSuccess(List<Availability> availList) { - Log.debug("\nSuccessfully queried availability in: " - + (System.currentTimeMillis() - timerStart) + " ms."); + Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + + " ms."); availabilityList = availList; if (countDownLatch != null) { countDownLatch.countDown(); @@ -180,193 +176,179 @@ public class D3GraphListView extends AbstractD3GraphListView { private void queryAndBuildGraphs() { final long startTimer = System.currentTimeMillis(); - if(null != availabilityGraph){ + if (null != availabilityGraph) { queryAvailability(EntityContext.forResource(resource.getId()), buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), null); } - ResourceTypeRepository.Cache.getInstance().getResourceTypes(resource.getResourceType().getId(), - EnumSet.of(ResourceTypeRepository.MetadataType.measurements), - new ResourceTypeRepository.TypeLoadedCallback() { - public void onTypesLoaded(final ResourceType type) { + final ArrayList<MeasurementDefinition> measurementDefinitions = new ArrayList<MeasurementDefinition>(); + final ArrayList<MeasurementDefinition> summaryMeasurementDefinitions = new ArrayList<MeasurementDefinition>(); - final ArrayList<MeasurementDefinition> measurementDefinitions = new ArrayList<MeasurementDefinition>(); - final ArrayList<MeasurementDefinition> summaryMeasurementDefinitions = new ArrayList<MeasurementDefinition>(); + for (MeasurementDefinition def : resource.getResourceType().getMetricDefinitions()) { + if (def.getDataType() == DataType.MEASUREMENT && def.getDisplayType() == DisplayType.SUMMARY) { + summaryMeasurementDefinitions.add(def); + } + measurementDefinitions.add(def); + } - for (MeasurementDefinition def : type.getMetricDefinitions()) { - if (def.getDataType() == DataType.MEASUREMENT && def.getDisplayType() == DisplayType.SUMMARY) { - summaryMeasurementDefinitions.add(def); - } - measurementDefinitions.add(def); - } + Collections.sort(measurementDefinitions, new Comparator<MeasurementDefinition>() { + @Override + public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { + return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); + } + }); + Collections.sort(summaryMeasurementDefinitions, new Comparator<MeasurementDefinition>() { + @Override + public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { + return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); + } + }); + + int[] measDefIdArray = new int[measurementDefinitions.size()]; + for (int i = 0; i < measDefIdArray.length; i++) { + measDefIdArray[i] = measurementDefinitions.get(i).getId(); + } - Collections.sort(measurementDefinitions, new Comparator<MeasurementDefinition>() { - @Override - public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { - return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); - } - }); - Collections.sort(summaryMeasurementDefinitions, new Comparator<MeasurementDefinition>() { - @Override - public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { - return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); - } - }); - - int[] measDefIdArray = new int[measurementDefinitions.size()]; - for (int i = 0; i < measDefIdArray.length; i++) { - measDefIdArray[i] = measurementDefinitions.get(i).getId(); + // setting up a deferred Command to execute after all resource queries have completed (successfully or unsuccessfully) + // we know there are exactly 2 resources + final CountDownLatch countDownLatch = CountDownLatch.create(NUM_ASYNC_CALLS, new Command() { + @Override + /** + * Satisfied only after ALL of the metric queries AND availability have completed + */ + public void execute() { + Log.debug("Total Time for async metrics/avail query: " + (System.currentTimeMillis() - startTimer)); + if (null == metricsDataList || metricsDataList.isEmpty()) { + loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); + } else { + loadingLabel.hide(); + if (useSummaryData) { + buildSummaryGraphs(metricsDataList, summaryMeasurementDefinitions, measurementDefinitions); + } else { + determineGraphsToBuild(metricsDataList, measurementDefinitions, definitionIds); } - - // setting up a deferred Command to execute after all resource queries have completed (successfully or unsuccessfully) - // we know there are exactly 2 resources - final CountDownLatch countDownLatch = CountDownLatch.create(NUM_ASYNC_CALLS, new Command() { - @Override - /** - * Satisfied only after ALL of the metric queries AND availability have completed - */ - public void execute() { - Log.debug("Total Time for async metrics/avail query: " - + (System.currentTimeMillis() - startTimer)); - if (null == metricsDataList || metricsDataList.isEmpty()) { - loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); - } else { - loadingLabel.hide(); - if (useSummaryData) { - buildSummaryGraphs(metricsDataList, summaryMeasurementDefinitions, - measurementDefinitions); - } else { - determineGraphsToBuild(metricsDataList, measurementDefinitions, definitionIds); - } - // There is a weird timing case when availabilityGraph can be null - if (null != availabilityGraph) { - // we only need the first metricData since we are only taking the - // availability data set in there for the dropdowns already - availabilityGraph.setAvailabilityList(availabilityList); - new Timer(){ - @Override - public void run() { - availabilityGraph.drawJsniChart(); - } - }.schedule(150); - } + // There is a weird timing case when availabilityGraph can be null + if (null != availabilityGraph) { + // we only need the first metricData since we are only taking the + // availability data set in there for the dropdowns already + availabilityGraph.setAvailabilityList(availabilityList); + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); } + }.schedule(150); + } + } - } - }); + } + }); - queryMetricData(measDefIdArray, countDownLatch); - queryOOBMetrics(resource, countDownLatch); - // now the countDown latch will run sometime asynchronously + queryMetricData(measDefIdArray, countDownLatch); + queryOOBMetrics(resource, countDownLatch); + // now the countDown latch will run sometime asynchronously + } + private void queryMetricData(final int[] measDefIdArray, final CountDownLatch countDownLatch) { + GWTServiceLookup.getMeasurementDataService().findDataForResource(resource.getId(), measDefIdArray, + buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), 60, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), caught); + loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); + countDownLatch.countDown(); } - private void queryMetricData(final int[] measDefIdArray, final CountDownLatch countDownLatch) { - GWTServiceLookup.getMeasurementDataService().findDataForResource(resource.getId(), measDefIdArray, - buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), 60, - new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), - caught); - loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); - countDownLatch.countDown(); - } - - @Override - public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> metrics) { - metricsDataList = metrics; - Log.debug("Regular Metric graph data queried in: " - + (System.currentTimeMillis() - startTimer + " ms.")); - countDownLatch.countDown(); + @Override + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> metrics) { + metricsDataList = metrics; + countDownLatch.countDown(); - } - }); } + }); + } - private void queryOOBMetrics(final Resource resource, final CountDownLatch countDownLatch) { + private void queryOOBMetrics(final Resource resource, final CountDownLatch countDownLatch) { - final long startTime = System.currentTimeMillis(); + final long startTime = System.currentTimeMillis(); - GWTServiceLookup.getMeasurementDataService().getHighestNOOBsForResource(resource.getId(), 60, + GWTServiceLookup.getMeasurementDataService().getHighestNOOBsForResource(resource.getId(), 60, - new AsyncCallback<PageList<MeasurementOOBComposite>>() { - @Override - public void onSuccess(PageList<MeasurementOOBComposite> measurementOOBComposites) { + new AsyncCallback<PageList<MeasurementOOBComposite>>() { + @Override + public void onSuccess(PageList<MeasurementOOBComposite> measurementOOBComposites) { - measurementOOBCompositeList = measurementOOBComposites; - Log.debug("\nSuccessfully queried "+measurementOOBCompositeList.size() +" OOB records in: " + (System.currentTimeMillis() - startTime) - + " ms."); - countDownLatch.countDown(); - } + measurementOOBCompositeList = measurementOOBComposites; + Log.debug("\nSuccessfully queried " + measurementOOBCompositeList.size() + " OOB records in: " + + (System.currentTimeMillis() - startTime) + " ms."); + countDownLatch.countDown(); + } - @Override - public void onFailure(Throwable caught) { - Log.debug("Error retrieving out of bound metrics for resource [" + resource.getId() + "]:" - + caught.getMessage()); - countDownLatch.countDown(); - } - }); + @Override + public void onFailure(Throwable caught) { + Log.debug("Error retrieving out of bound metrics for resource [" + resource.getId() + "]:" + + caught.getMessage()); + countDownLatch.countDown(); + } + }); - } + } - /** - * Spin through the measurement definitions (in order) checking to see if they are in the - * summary measurement definition set and if so build a graph. - * @param measurementData - * @param summaryMeasurementDefinitions - * @param measurementDefinitions - */ - private void buildSummaryGraphs(List<List<MeasurementDataNumericHighLowComposite>> measurementData, - List<MeasurementDefinition> summaryMeasurementDefinitions, - List<MeasurementDefinition> measurementDefinitions) { - Set<Integer> summaryIds = new TreeSet<Integer>(); - for (MeasurementDefinition summaryMeasurementDefinition : summaryMeasurementDefinitions) { - summaryIds.add(summaryMeasurementDefinition.getId()); - } + /** + * Spin through the measurement definitions (in order) checking to see if they are in the + * summary measurement definition set and if so build a graph. + * @param measurementData + * @param summaryMeasurementDefinitions + * @param measurementDefinitions + */ + private void buildSummaryGraphs(List<List<MeasurementDataNumericHighLowComposite>> measurementData, + List<MeasurementDefinition> summaryMeasurementDefinitions, List<MeasurementDefinition> measurementDefinitions) { + Set<Integer> summaryIds = new TreeSet<Integer>(); + for (MeasurementDefinition summaryMeasurementDefinition : summaryMeasurementDefinitions) { + summaryIds.add(summaryMeasurementDefinition.getId()); + } - int i = 0; - for (MeasurementDefinition measurementDefinition : measurementDefinitions) { - if (summaryIds.contains(measurementDefinition.getId())) { - buildSingleGraph(measurementOOBCompositeList, measurementDefinition, - measurementData.get(i), MULTI_CHART_HEIGHT); - } - i++; - } + int i = 0; + for (MeasurementDefinition measurementDefinition : measurementDefinitions) { + if (summaryIds.contains(measurementDefinition.getId())) { + buildSingleGraph(measurementOOBCompositeList, measurementDefinition, measurementData.get(i), + MULTI_CHART_HEIGHT); + } + i++; + } - } + } - private void determineGraphsToBuild(List<List<MeasurementDataNumericHighLowComposite>> measurementData, - List<MeasurementDefinition> measurementDefinitions, Set<Integer> definitionIds) { - int i = 0; - for (List<MeasurementDataNumericHighLowComposite> metric : measurementData) { - - for (Integer selectedDefinitionId : definitionIds) { - final MeasurementDefinition measurementDefinition = measurementDefinitions.get(i); - final int measurementId = measurementDefinition.getId(); - - if (null != selectedDefinitionId) { - // single graph case - if (measurementId == selectedDefinitionId) { - buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, SINGLE_CHART_HEIGHT); - } - } else { - // multiple graph case - buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, MULTI_CHART_HEIGHT); - } - } - i++; + private void determineGraphsToBuild(List<List<MeasurementDataNumericHighLowComposite>> measurementData, + List<MeasurementDefinition> measurementDefinitions, Set<Integer> definitionIds) { + int i = 0; + for (List<MeasurementDataNumericHighLowComposite> metric : measurementData) { + + for (Integer selectedDefinitionId : definitionIds) { + final MeasurementDefinition measurementDefinition = measurementDefinitions.get(i); + final int measurementId = measurementDefinition.getId(); + + if (null != selectedDefinitionId) { + // single graph case + if (measurementId == selectedDefinitionId) { + buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, + SINGLE_CHART_HEIGHT); } + } else { + // multiple graph case + buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, MULTI_CHART_HEIGHT); } - }); - + } + i++; + } } private void buildSingleGraph(PageList<MeasurementOOBComposite> measurementOOBCompositeList, MeasurementDefinition measurementDefinition, List<MeasurementDataNumericHighLowComposite> data, int height) { MetricGraphData metricGraphData = MetricGraphData.createForResource(resource.getId(), resource.getName(), - measurementDefinition, data, measurementOOBCompositeList ); + measurementDefinition, data, measurementOOBCompositeList); StackedBarMetricGraphImpl graph = GWT.create(StackedBarMetricGraphImpl.class); graph.setMetricGraphData(metricGraphData); graph.setGraphListView(this); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java index 3b4ec1f..65807f9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java @@ -22,6 +22,7 @@ import com.google.gwt.user.client.Timer; import com.smartgwt.client.widgets.HTMLFlow; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.RedrawGraphs; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; @@ -30,7 +31,7 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; * A D3 graph implementation for graphing Resource metrics. * Just the graph only. No avail graph no buttons just he graph. */ -public class MetricD3Graph<T extends AbstractD3GraphListView> extends EnhancedVLayout { +public class MetricD3Graph<T extends AbstractD3GraphListView> extends EnhancedVLayout implements RedrawGraphs{ protected StackedBarMetricGraphImpl graph; private HTMLFlow graphDiv = null; @@ -59,18 +60,18 @@ public class MetricD3Graph<T extends AbstractD3GraphListView> extends EnhancedVL */ private static String getSvgDefs() { return " <defs>" - + " <linearGradient id=\"headerGrad\" x1=\"0%\" y1=\"0%\" x2=\"0%\" y2=\"100%\">" - + " <stop offset=\"0%\" style=\"stop-color:#E6E6E6;stop-opacity:1\"/>" - + " <stop offset=\"100%\" style=\"stop-color:#F0F0F0;stop-opacity:1\"/>" - + " </linearGradient>" - + " <pattern id=\"noDataStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" - + " width=\"6\" height=\"3\">" - + " <path d=\"M 0 0 6 0\" style=\"stroke:#CCCCCC; fill:none;\"/>" - + " </pattern>" - + " <pattern id=\"unknownStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" - + " width=\"6\" height=\"3\">" - + " <path d=\"M 0 0 6 0\" style=\"stroke:#2E9EC2; fill:none;\"/>" - + " </pattern>" + + " <linearGradient id=\"headerGrad\" x1=\"0%\" y1=\"0%\" x2=\"0%\" y2=\"100%\">" + + " <stop offset=\"0%\" style=\"stop-color:#E6E6E6;stop-opacity:1\"/>" + + " <stop offset=\"100%\" style=\"stop-color:#F0F0F0;stop-opacity:1\"/>" + + " </linearGradient>" + + " <pattern id=\"noDataStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" + + " width=\"6\" height=\"3\">" + + " <path d=\"M 0 0 6 0\" style=\"stroke:#CCCCCC; fill:none;\"/>" + + " </pattern>" + + " <pattern id=\"unknownStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" + + " width=\"6\" height=\"3\">" + + " <path d=\"M 0 0 6 0\" style=\"stroke:#2E9EC2; fill:none;\"/>" + + " </pattern>" + "<pattern id=\"diagonalHatchFill\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\" width=\"105\" height=\"105\">" + "<g style=\"fill:none; stroke:black; stroke-width:1\">" + "<path d=\"M0 90 l15,15\"/>" diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java deleted file mode 100644 index 6719070..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java +++ /dev/null @@ -1,399 +0,0 @@ -/* - * RHQ Management Platform - * Copyright 2012, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail; - -import java.util.ArrayList; -import java.util.Date; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.data.SortSpecifier; -import com.smartgwt.client.rpc.RPCResponse; -import com.smartgwt.client.types.Alignment; -import com.smartgwt.client.types.ListGridFieldType; -import com.smartgwt.client.types.SortDirection; -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.fields.FormItem; -import com.smartgwt.client.widgets.form.fields.StaticTextItem; -import com.smartgwt.client.widgets.grid.ListGridField; -import com.smartgwt.client.widgets.grid.ListGridRecord; -import com.smartgwt.client.widgets.layout.Layout; - -import org.rhq.core.domain.criteria.AvailabilityCriteria; -import org.rhq.core.domain.measurement.Availability; -import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.core.domain.resource.composite.ResourceAvailabilitySummary; -import org.rhq.core.domain.resource.composite.ResourceComposite; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.domain.util.PageOrdering; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.ImageManager; -import org.rhq.enterprise.gui.coregui.client.components.table.Table; -import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; -import org.rhq.enterprise.gui.coregui.client.gwt.AvailabilityGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; -import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; - -/** - * This shows the availability history for a resource. - * - * @author Jay Shaughnessy - * @author John Mazzitelli - */ -public class ResourceAvailabilityView extends EnhancedVLayout { - - private ResourceComposite resourceComposite; - private StaticTextItem currentField; - private StaticTextItem availField; - private StaticTextItem availTimeField; - private StaticTextItem downField; - private StaticTextItem downTimeField; - private StaticTextItem disabledField; - private StaticTextItem disabledTimeField; - private StaticTextItem failureCountField; - private StaticTextItem disabledCountField; - private StaticTextItem mtbfField; - private StaticTextItem mttrField; - private StaticTextItem unknownField; - private StaticTextItem currentTimeField; - - public ResourceAvailabilityView(ResourceComposite resourceComposite) { - super(); - - this.resourceComposite = resourceComposite; - - setWidth100(); - setHeight100(); - } - - @Override - protected void onInit() { - super.onInit(); - - addMember(createSummaryForm()); - addMember(createListView()); - } - - private DynamicForm createSummaryForm() { - DynamicForm form = new DynamicForm(); - form.setWidth100(); - form.setAutoHeight(); - form.setMargin(10); - form.setNumCols(4); - - // row 1 - currentField = new StaticTextItem("current", MSG.view_resource_monitor_availability_currentStatus()); - currentField.setWrapTitle(false); - currentField.setColSpan(4); - - // row 2 - availField = new StaticTextItem("avail", MSG.view_resource_monitor_availability_availability()); - availField.setWrapTitle(false); - prepareTooltip(availField, MSG.view_resource_monitor_availability_availability_tooltip()); - - availTimeField = new StaticTextItem("availTime", MSG.view_resource_monitor_availability_uptime()); - availTimeField.setWrapTitle(false); - prepareTooltip(availTimeField, MSG.view_resource_monitor_availability_uptime_tooltip()); - - // row 3 - downField = new StaticTextItem("down", MSG.view_resource_monitor_availability_down()); - downField.setWrapTitle(false); - prepareTooltip(downField, MSG.view_resource_monitor_availability_down_tooltip()); - - downTimeField = new StaticTextItem("downTime", MSG.view_resource_monitor_availability_downtime()); - downTimeField.setWrapTitle(false); - prepareTooltip(downTimeField, MSG.view_resource_monitor_availability_downtime_tooltip()); - - // row 4 - disabledField = new StaticTextItem("disabled", MSG.view_resource_monitor_availability_disabled()); - disabledField.setWrapTitle(false); - prepareTooltip(disabledField, MSG.view_resource_monitor_availability_disabled_tooltip()); - - disabledTimeField = new StaticTextItem("disabledTime", MSG.view_resource_monitor_availability_disabledTime()); - disabledTimeField.setWrapTitle(false); - prepareTooltip(disabledTimeField, MSG.view_resource_monitor_availability_disabledTime_tooltip()); - - // row 5 - failureCountField = new StaticTextItem("failureCount", MSG.view_resource_monitor_availability_numFailures()); - failureCountField.setWrapTitle(false); - prepareTooltip(failureCountField, MSG.view_resource_monitor_availability_numFailures_tooltip()); - - disabledCountField = new StaticTextItem("disabledCount", MSG.view_resource_monitor_availability_numDisabled()); - disabledCountField.setWrapTitle(false); - prepareTooltip(disabledCountField, MSG.view_resource_monitor_availability_numDisabled_tooltip()); - - // row 6 - mtbfField = new StaticTextItem("mtbf", MSG.view_resource_monitor_availability_mtbf()); - mtbfField.setWrapTitle(false); - prepareTooltip(mtbfField, MSG.view_resource_monitor_availability_mtbf_tooltip()); - - mttrField = new StaticTextItem("mttr", MSG.view_resource_monitor_availability_mttr()); - mttrField.setWrapTitle(false); - prepareTooltip(mttrField, MSG.view_resource_monitor_availability_mttr_tooltip()); - - // row 7 - unknownField = new StaticTextItem("unknown"); - unknownField.setWrapTitle(false); - unknownField.setColSpan(4); - unknownField.setShowTitle(false); - - // row 8 - currentTimeField = new StaticTextItem("currentTime"); - currentTimeField.setWrapTitle(false); - currentTimeField.setColSpan(4); - currentTimeField.setShowTitle(false); - - form.setItems(currentField, availField, availTimeField, downField, downTimeField, disabledField, - disabledTimeField, failureCountField, disabledCountField, mtbfField, mttrField, unknownField, - currentTimeField); - - reloadSummaryData(); - - return form; - } - - private void reloadSummaryData() { - GWTServiceLookup.getResourceService().getResourceAvailabilitySummary(resourceComposite.getResource().getId(), - new AsyncCallback<ResourceAvailabilitySummary>() { - - @Override - public void onSuccess(ResourceAvailabilitySummary result) { - - currentField.setValue(MSG.view_resource_monitor_availability_currentStatus_value(result - .getCurrent().getName(), TimestampCellFormatter.format(result.getLastChange().getTime()))); - availField.setValue(MeasurementConverterClient.format(result.getUpPercentage(), - MeasurementUnits.PERCENTAGE, true)); - availTimeField.setValue(MeasurementConverterClient.format((double) result.getUpTime(), - MeasurementUnits.MILLISECONDS, true)); - downField.setValue(MeasurementConverterClient.format(result.getDownPercentage(), - MeasurementUnits.PERCENTAGE, true)); - downTimeField.setValue(MeasurementConverterClient.format((double) result.getDownTime(), - MeasurementUnits.MILLISECONDS, true)); - disabledField.setValue(MeasurementConverterClient.format(result.getDisabledPercentage(), - MeasurementUnits.PERCENTAGE, true)); - disabledTimeField.setValue(MeasurementConverterClient.format((double) result.getDisabledTime(), - MeasurementUnits.MILLISECONDS, true)); - failureCountField.setValue(result.getFailures()); - disabledCountField.setValue(result.getDisabled()); - mtbfField.setValue(MeasurementConverterClient.format((double) result.getMTBF(), - MeasurementUnits.MILLISECONDS, true)); - mttrField.setValue(MeasurementConverterClient.format((double) result.getMTTR(), - MeasurementUnits.MILLISECONDS, true)); - - if (result.getUnknownTime() > 0L) { - unknownField.setValue(MSG.view_resource_monitor_availability_unknown(MeasurementConverterClient - .format((double) result.getUnknownTime(), MeasurementUnits.MILLISECONDS, true))); - } else { - unknownField.setValue(""); - } - - currentTimeField.setValue(MSG.view_resource_monitor_availability_currentAsOf(TimestampCellFormatter - .format(result.getCurrentTime()))); - } - - @Override - public void onFailure(Throwable caught) { - currentField.setValue(MSG.common_label_error()); - CoreGUI.getErrorHandler() - .handleError(MSG.view_resource_monitor_availability_summaryError(), caught); - } - }); - } - - private void prepareTooltip(FormItem item, String tooltip) { - item.setHoverWidth(400); - item.setPrompt(tooltip); - } - - private Table<ListView.DS> createListView() { - ListView listView = new ListView(resourceComposite.getResource().getId()); - return listView; - } - - private class ListView extends Table<ListView.DS> { - - private DS dataSource; - private int resourceId; - - public ListView(int resourceId) { - super(null, new SortSpecifier[] { new SortSpecifier("startTime", SortDirection.DESCENDING) }); - - this.resourceId = resourceId; - - setDataSource(getDataSource()); - } - - @Override - public DS getDataSource() { - if (null == this.dataSource) { - this.dataSource = new DS(resourceId); - } - return this.dataSource; - } - - @Override - public void refresh() { - super.refresh(); - reloadSummaryData(); - } - - @Override - protected void configureTableContents(Layout contents) { - super.configureTableContents(contents); - setAutoHeight(); - } - - @Override - protected void configureTable() { - ArrayList<ListGridField> dataSourceFields = getDataSource().getListGridFields(); - getListGrid().setFields(dataSourceFields.toArray(new ListGridField[dataSourceFields.size()])); - - super.configureTable(); - } - - private class DS extends RPCDataSource<Availability, AvailabilityCriteria> { - - public static final String ATTR_ID = "id"; - public static final String ATTR_AVAILABILITY = "availabilityType"; - public static final String ATTR_START_TIME = "startTime"; - public static final String ATTR_END_TIME = "endTime"; - - public static final String ATTR_DURATION = "duration"; - - private AvailabilityGWTServiceAsync availService = GWTServiceLookup.getAvailabilityService(); - private int resourceId; - - public DS(int resourceId) { - super(); - this.resourceId = resourceId; - addDataSourceFields(); - } - - /** - * The view that contains the list grid which will display this datasource's data will call this - * method to get the field information which is used to control the display of the data. - * - * @return list grid fields used to display the datasource data - */ - public ArrayList<ListGridField> getListGridFields() { - ArrayList<ListGridField> fields = new ArrayList<ListGridField>(6); - - ListGridField startTimeField = new ListGridField(ATTR_START_TIME, MSG.common_title_start()); - startTimeField.setCellFormatter(new TimestampCellFormatter()); - startTimeField.setShowHover(true); - startTimeField.setHoverCustomizer(TimestampCellFormatter.getHoverCustomizer(ATTR_START_TIME)); - startTimeField.setCanSortClientOnly(true); - fields.add(startTimeField); - - ListGridField endTimeField = new ListGridField(ATTR_END_TIME, MSG.common_title_end()); - endTimeField.setCellFormatter(new TimestampCellFormatter()); - endTimeField.setShowHover(true); - endTimeField.setHoverCustomizer(TimestampCellFormatter.getHoverCustomizer(ATTR_END_TIME)); - endTimeField.setCanSortClientOnly(true); - fields.add(endTimeField); - - ListGridField durationField = new ListGridField(ATTR_DURATION, MSG.common_title_duration()); - durationField.setAlign(Alignment.RIGHT); - fields.add(durationField); - - ListGridField availabilityField = new ListGridField(ATTR_AVAILABILITY, MSG.common_title_availability()); - availabilityField.setType(ListGridFieldType.IMAGE); - availabilityField.setAlign(Alignment.CENTER); - fields.add(availabilityField); - - return fields; - } - - @Override - protected AvailabilityCriteria getFetchCriteria(DSRequest request) { - AvailabilityCriteria c = new AvailabilityCriteria(); - c.addFilterResourceId(resourceId); - c.addFilterInitialAvailability(false); - - // This code is unlikely to be necessary as the encompassing view should be using an initial - // sort specifier. But just in case, make sure we set the initial sort. Note that we have to - // manipulate the PageControl directly as per the restrictions on getFetchCriteria() (see jdoc). - PageControl pageControl = getPageControl(request); - if (pageControl.getOrderingFields().isEmpty()) { - pageControl.initDefaultOrderingField("startTime", PageOrdering.DESC); - } - - return c; - } - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, - AvailabilityCriteria criteria) { - - this.availService.findAvailabilityByCriteria(criteria, new AsyncCallback<PageList<Availability>>() { - public void onFailure(Throwable caught) { - // TODO fix message - CoreGUI.getErrorHandler().handleError(MSG.common_label_error(), caught); - response.setStatus(RPCResponse.STATUS_FAILURE); - processResponse(request.getRequestId(), response); - } - - public void onSuccess(final PageList<Availability> result) { - response.setData(buildRecords(result)); - response.setTotalRows(result.size()); - processResponse(request.getRequestId(), response); - } - }); - } - - @Override - public Availability copyValues(Record from) { - return null; - } - - @Override - public ListGridRecord copyValues(Availability from) { - ListGridRecord record = new ListGridRecord(); - - record.setAttribute(ATTR_ID, from.getId()); - record.setAttribute(ATTR_AVAILABILITY, - ImageManager.getAvailabilityIconFromAvailType(from.getAvailabilityType())); - record.setAttribute(ATTR_START_TIME, new Date(from.getStartTime())); - if (null != from.getEndTime()) { - record.setAttribute(ATTR_END_TIME, new Date(from.getEndTime())); - long duration = from.getEndTime() - from.getStartTime(); - record.setAttribute(ATTR_DURATION, - MeasurementConverterClient.format((double) duration, MeasurementUnits.MILLISECONDS, true)); - - } else { - record.setAttribute(ATTR_END_TIME, MSG.common_label_none2()); - long duration = System.currentTimeMillis() - from.getStartTime(); - record.setAttribute(ATTR_DURATION, - MeasurementConverterClient.format((double) duration, MeasurementUnits.MILLISECONDS, true)); - - } - - return record; - } - } - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java new file mode 100644 index 0000000..ce4f8ef --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java @@ -0,0 +1,185 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import java.util.LinkedHashMap; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.IButton; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.form.fields.SelectItem; +import com.smartgwt.client.widgets.form.fields.events.ChangeEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangeHandler; +import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.toolbar.ToolStrip; + +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.criteria.DashboardCriteria; +import org.rhq.core.domain.dashboard.Dashboard; +import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resource.graph.ResourceD3GraphPortlet; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.Enhanced; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; + +/** + * @author Mike Thompson + */ +public class AddToDashboardComponent extends ToolStrip implements Enhanced { + final private Resource resource; + private SelectItem dashboardSelectItem; + private Dashboard selectedDashboard; + private IButton addToDashboardButton; + private LinkedHashMap<String, String> dashboardMenuMap; + private LinkedHashMap<Integer, Dashboard> dashboardMap; + private MetricsTableView.MetricsTableListGrid metricsListGrid; + + public AddToDashboardComponent(Resource resource) { + this.resource = resource; + setPadding(5); + setMembersMargin(15); + setWidth(300); + dashboardMenuMap = new LinkedHashMap<String, String>(); + dashboardMap = new LinkedHashMap<Integer, Dashboard>(); + createToolstrip(); + } + + @Override + protected void onDraw() { + super.onDraw(); + removeMembers(getMembers()); + createToolstrip(); + } + + private void createToolstrip() { + addSpacer(15); + dashboardSelectItem = new SelectItem(); + addToDashboardButton = new IButton(MSG.view_metric_addToDashboard()); + addToDashboardButton.disable(); + + dashboardSelectItem = new SelectItem(); + dashboardSelectItem.setTitle("Dashboards"); + dashboardSelectItem.setWidth(300); + dashboardSelectItem.setPickListWidth(210); + populateDashboardMenu(); + addFormItem(dashboardSelectItem); + addMember(addToDashboardButton); + + dashboardSelectItem.addChangeHandler(new ChangeHandler() { + @Override + public void onChange(ChangeEvent changeEvent) { + Integer selectedDashboardId = Integer.valueOf((String) changeEvent.getValue()); + selectedDashboard = dashboardMap.get(selectedDashboardId); + } + }); + addToDashboardButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() { + @Override + public void onClick(ClickEvent clickEvent) { + ListGridRecord[] selectedRecords = metricsListGrid.getSelectedRecords(); + for (ListGridRecord selectedRecord : selectedRecords) { + for (MeasurementDefinition measurementDefinition : resource.getResourceType() + .getMetricDefinitions()) { + if (measurementDefinition.getId() == selectedRecord + .getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID)) { + Log.debug("Add to Dashboard -- Storing: " + measurementDefinition.getDisplayName() + + " in " + selectedDashboard.getName()); + storeDashboardMetric(selectedDashboard, resource, measurementDefinition); + break; + } + } + } + } + }); + } + + public void disableAddToDashboardButton(){ + addToDashboardButton.disable(); + } + + public void enableAddToDashboardButton(){ + addToDashboardButton.enable(); + } + + + public void populateDashboardMenu() { + dashboardMenuMap.clear(); + dashboardMap.clear(); + + DashboardCriteria criteria = new DashboardCriteria(); + GWTServiceLookup.getDashboardService().findDashboardsByCriteria(criteria, + new AsyncCallback<PageList<Dashboard>>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_dashboard(), + caught); + } + + public void onSuccess(PageList<Dashboard> dashboards) { + for (final Dashboard dashboard : dashboards) { + dashboardMenuMap.put(String.valueOf(dashboard.getId()), + MSG.view_tree_common_contextMenu_addChartToDashboard(dashboard.getName())); + dashboardMap.put(dashboard.getId(), dashboard); + } + selectedDashboard = dashboards.get(0); + dashboardSelectItem.setValueMap(dashboardMenuMap); + dashboardSelectItem.setValue(selectedDashboard.getId()); + } + }); + } + + /** + * The metrics list grid is not available on object creation so we must attach later after it has been initialized. + * @param metricsListGrid + */ + public void setMetricsListGrid(MetricsTableView.MetricsTableListGrid metricsListGrid) { + this.metricsListGrid = metricsListGrid; + } + + + private void storeDashboardMetric(Dashboard dashboard, Resource resource, MeasurementDefinition definition) { + DashboardPortlet dashboardPortlet = new DashboardPortlet(MSG.view_tree_common_contextMenu_resourceGraph(), + ResourceD3GraphPortlet.KEY, 250); + dashboardPortlet.getConfiguration().put( + new PropertySimple(ResourceD3GraphPortlet.CFG_RESOURCE_ID, resource.getId())); + dashboardPortlet.getConfiguration().put( + new PropertySimple(ResourceD3GraphPortlet.CFG_DEFINITION_ID, definition.getId())); + + dashboard.addPortlet(dashboardPortlet); + + GWTServiceLookup.getDashboardService().storeDashboard(dashboard, new AsyncCallback<Dashboard>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), + caught); + } + + public void onSuccess(Dashboard result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_tree_common_contextMenu_saveChartToDashboardSuccessful(result.getName()), + Message.Severity.Info)); + } + }); + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java deleted file mode 100644 index 7022648..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java +++ /dev/null @@ -1,237 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Set; -import java.util.TreeSet; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.types.SelectionStyle; -import com.smartgwt.client.widgets.Window; -import com.smartgwt.client.widgets.events.CloseClickEvent; -import com.smartgwt.client.widgets.events.CloseClickHandler; -import com.smartgwt.client.widgets.grid.ListGrid; -import com.smartgwt.client.widgets.grid.ListGridField; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.criteria.ResourceCriteria; -import org.rhq.core.domain.measurement.MeasurementData; -import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.core.domain.resource.composite.ResourceComposite; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasurementRangeEditor; -import org.rhq.enterprise.gui.coregui.client.components.table.Table; -import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView; -import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView.ChartViewWindow; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; - -/** - * Views a resource's measurements in a tabular view. - * - * @author John Mazzitelli - */ -public class MeasurementTableView extends Table<MetricsTableDataSource> { - - private final int resourceId; - - public MeasurementTableView(int resourceId) { - super(); - this.resourceId = resourceId; - setDataSource(new MetricsTableDataSource(resourceId)); - } - - protected void configureTable() { - ArrayList<ListGridField> fields = getDataSource().getListGridFields(); - setListGridFields(fields.toArray(new ListGridField[0])); - addExtraWidget(new UserPreferencesMeasurementRangeEditor(), true); - addTableAction(MSG.view_measureTable_getLive(), new TableAction() { - @Override - public boolean isEnabled(ListGridRecord[] selection) { - return selection != null && selection.length > 0; - } - - @Override - public void executeAction(ListGridRecord[] selection, Object actionValue) { - if (selection == null || selection.length == 0) { - return; - } - // keyed on metric name - string[0] is the metric label, [1] is the units - final HashMap<String, String[]> scheduleNamesAndUnits = new HashMap<String, String[]>(); - int[] definitionIds = new int[selection.length]; - int i = 0; - for (ListGridRecord record : selection) { - Integer defId = record.getAttributeAsInt(MetricsTableDataSource.FIELD_METRIC_DEF_ID); - definitionIds[i++] = defId.intValue(); - - String name = record.getAttribute(MetricsTableDataSource.FIELD_METRIC_NAME); - String label = record.getAttribute(MetricsTableDataSource.FIELD_METRIC_LABEL); - String units = record.getAttribute(MetricsTableDataSource.FIELD_METRIC_UNITS); - if (units == null || units.length() < 1) { - units = MeasurementUnits.NONE.name(); - } - - scheduleNamesAndUnits.put(name, new String[] { label, units }); - } - - // actually go out and ask the agents for the data - GWTServiceLookup.getMeasurementDataService(60000).findLiveData(resourceId, definitionIds, - new AsyncCallback<Set<MeasurementData>>() { - @Override - public void onSuccess(Set<MeasurementData> result) { - if (result == null) { - result = new HashSet<MeasurementData>(0); - } - ArrayList<ListGridRecord> records = new ArrayList<ListGridRecord>(result.size()); - for (MeasurementData data : result) { - String[] nameAndUnits = scheduleNamesAndUnits.get(data.getName()); - if (nameAndUnits != null) { - double doubleValue; - if (data.getValue() instanceof Number) { - doubleValue = ((Number) data.getValue()).doubleValue(); - } else { - doubleValue = Double.parseDouble(data.getValue().toString()); - } - String value = MeasurementConverterClient.formatToSignificantPrecision( - new double[] { doubleValue }, MeasurementUnits.valueOf(nameAndUnits[1]), true)[0]; - - ListGridRecord record = new ListGridRecord(); - record.setAttribute("name", nameAndUnits[0]); - record.setAttribute("value", value); - records.add(record); - } - } - Collections.sort(records, new Comparator<ListGridRecord>() { - public int compare(ListGridRecord o1, ListGridRecord o2) { - return o1.getAttribute("name").compareTo(o2.getAttribute("name")); - } - }); - showLiveData(records); - } - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_measureTable_getLive_failure(), caught); - } - }); - } - }); - - - addTableAction(MSG.view_measureTable_chartMetricValues(), new TableAction() { - @Override - public boolean isEnabled(ListGridRecord[] selection) { - return selection != null && selection.length > 0; - } - - @Override - public void executeAction(ListGridRecord[] selection, Object actionValue) { - if (selection == null || selection.length == 0) { - return; - } - final TreeSet<Integer> definitionIds = new TreeSet<Integer>(); - for (ListGridRecord record : selection) { - Integer defId = record.getAttributeAsInt(MetricsTableDataSource.FIELD_METRIC_DEF_ID); - definitionIds.add(defId); - } - - ResourceCriteria criteria = new ResourceCriteria(); - criteria.addFilterId(resourceId); - criteria.fetchSchedules(true); - GWTServiceLookup.getResourceService().findResourceCompositesByCriteria(criteria, - new AsyncCallback<PageList<ResourceComposite>>() { - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_inventory_resource_loadFailed(String.valueOf(resourceId)), - Message.Severity.Warning)); - - CoreGUI.goToView(InventoryView.VIEW_ID.getName()); - } - - @Override - public void onSuccess(PageList<ResourceComposite> result) { - if (result.isEmpty()) { - onFailure(new Exception(MSG.view_inventory_resource_loadFailed(String - .valueOf(resourceId)))); - } else { - final ResourceComposite resourceComposite = result.get(0); - - ChartViewWindow window = new ChartViewWindow(""); - final D3GraphListView graphListView = D3GraphListView.createMultipleGraphs( - resourceComposite.getResource(), definitionIds, true); - - window.addItem(graphListView); - window.show(); - refreshTableInfo(); - - } - } - }); - - } - }); - } - - private void showLiveData(ArrayList<ListGridRecord> records) { - final Window liveDataWindow = new Window(); - liveDataWindow.setTitle(MSG.view_measureTable_live_title()); - liveDataWindow.setShowModalMask(true); - liveDataWindow.setShowMinimizeButton(false); - liveDataWindow.setShowMaximizeButton(true); - liveDataWindow.setShowCloseButton(true); - liveDataWindow.setShowResizer(true); - liveDataWindow.setCanDragResize(true); - liveDataWindow.setDismissOnEscape(true); - liveDataWindow.setIsModal(true); - liveDataWindow.setWidth(700); - liveDataWindow.setHeight(425); - liveDataWindow.setAutoCenter(true); - liveDataWindow.centerInPage(); - liveDataWindow.addCloseClickHandler(new CloseClickHandler() { - @Override - public void onCloseClick(CloseClickEvent event) { - liveDataWindow.destroy(); - refreshTableInfo(); - } - }); - - ListGrid liveDataGrid = new ListGrid(); - liveDataGrid.setShowAllRecords(true); - liveDataGrid.setData(records.toArray(new ListGridRecord[records.size()])); - liveDataGrid.setSelectionType(SelectionStyle.NONE); - ListGridField name = new ListGridField("name", MSG.common_title_metric()); - ListGridField value = new ListGridField("value", MSG.common_title_value()); - liveDataGrid.setFields(name, value); - - liveDataWindow.addItem(liveDataGrid); - liveDataWindow.show(); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java new file mode 100644 index 0000000..bcea825 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -0,0 +1,167 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import java.util.List; + +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.types.Overflow; +import com.smartgwt.client.types.VerticalAlignment; +import com.smartgwt.client.widgets.Img; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.events.ClickHandler; + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.resource.Resource; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.IconEnum; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; +import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedHLayout; + +/** + * The consolidated metrics view showing metric graphs and availability data both in graphical and tabular form. + * + * @author Mike Thompson + */ +public class MetricsResourceView extends AbstractD3GraphListView { + + private static final String COLLAPSED_TOOLTIP = MSG.chart_metrics_collapse_tooltip(); + private static final String EXPANDED_TOOLTIP = MSG.chart_metrics_expand_tooltip(); + + private final Resource resource; + private Img expandCollapseArrow; + private final MetricsTableView metricsTableView; + private final ResourceMetricAvailabilityView availabilityDetails; + + public MetricsResourceView(Resource resource) { + super(); + setOverflow(Overflow.AUTO); + setWidth100(); + setHeight100(); + this.resource = resource; + metricsTableView = new MetricsTableView(resource, this); + availabilityDetails = new ResourceMetricAvailabilityView(resource); + } + + + public void redrawGraphs() { + this.onDraw(); + } + + public void refreshGraphs(){ + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); + BrowserUtility.graphSparkLines(); + } + }.schedule(150); + } + + @Override + protected void onDraw() { + super.onDraw(); + Log.debug("MetricResourceView.onDraw() for: " + resource.getName() + " id: " + resource.getId()); + destroyMembers(); + + + addMember(buttonBarDateTimeRangeEditor); + + availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( + new AvailabilityOverUnderGraphType(resource.getId())); + + EnhancedHLayout expandCollapseHLayout = new EnhancedHLayout(); + + //add expand/collapse icon + expandCollapseArrow = new Img(IconEnum.COLLAPSED_ICON.getIcon16x16Path(), 16, 16); + expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP); + expandCollapseArrow.setLayoutAlign(VerticalAlignment.BOTTOM); + expandCollapseArrow.addClickHandler(new ClickHandler() { + private boolean collapsed = true; + + @Override + public void onClick(ClickEvent event) { + collapsed = !collapsed; + if (collapsed) { + expandCollapseArrow.setSrc(IconEnum.COLLAPSED_ICON.getIcon16x16Path()); + expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP); + availabilityDetails.hide(); + } else { + expandCollapseArrow.setSrc(IconEnum.EXPANDED_ICON.getIcon16x16Path()); + expandCollapseArrow.setTooltip(EXPANDED_TOOLTIP); + availabilityDetails.show(); + + } + refreshGraphs(); + } + }); + + + expandCollapseHLayout.addMember(expandCollapseArrow); + expandCollapseHLayout.addMember(availabilityGraph); + addMember(expandCollapseHLayout); + + availabilityDetails.hide(); + addMember(availabilityDetails); + + metricsTableView.setHeight100(); + addMember(metricsTableView); + + + queryAvailability(EntityContext.forResource(resource.getId()), buttonBarDateTimeRangeEditor.getStartTime(), + buttonBarDateTimeRangeEditor.getEndTime(), null); + } + + @Override + protected void queryAvailability(final EntityContext context, Long startTime, Long endTime, CountDownLatch notUsed ) { + + final long timerStart = System.currentTimeMillis(); + + // now return the availability + GWTServiceLookup.getAvailabilityService().getAvailabilitiesForResource(context.getResourceId(), startTime, + endTime, new AsyncCallback<List<Availability>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_availability_loadFailed(), caught); + } + + @Override + public void onSuccess(List<Availability> availList) { + Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + + " ms."); + availabilityGraph.setAvailabilityList(availList); + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); + } + }.schedule(150); + } + }); + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java index 318166d..57e62ab 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java @@ -1,7 +1,13 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; import java.util.ArrayList; +import java.util.Arrays; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Set; +import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.DSRequest; import com.smartgwt.client.data.DSResponse; @@ -11,18 +17,28 @@ import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.criteria.Criteria; +import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.MeasurementSchedule; +import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.measurement.ui.MetricDisplaySummary; import org.rhq.core.domain.measurement.ui.MetricDisplayValue; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.resource.composite.ResourceComposite; +import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; +import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; +import org.rhq.enterprise.gui.coregui.client.util.async.Command; +import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; -import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; /** * A simple data source to read in metric data summaries for a resource. @@ -31,9 +47,13 @@ import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; * we just load them all in at once. * * @author John Mazzitelli + * @author Mike Thompson + * @todo: get rid of this once we have tested the new screen out */ +@Deprecated public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, Criteria> { + public static final String FIELD_SPARKLINE = "sparkline"; public static final String FIELD_METRIC_LABEL = "label"; public static final String FIELD_ALERT_COUNT = "alertCount"; public static final String FIELD_MIN_VALUE = "min"; @@ -44,11 +64,15 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, public static final String FIELD_METRIC_SCHED_ID = "schedId"; public static final String FIELD_METRIC_UNITS = "units"; public static final String FIELD_METRIC_NAME = "name"; - + public static final String FIELD_RESOURCE_ID = "resourceId"; private int resourceId; + private List<MetricDisplaySummary> metricDisplaySummaries; + private List<List<MeasurementDataNumericHighLowComposite>> metricsDataList; + private MeasurementUserPreferences measurementUserPrefs; public MetricsTableDataSource(int resourceId) { this.resourceId = resourceId; + measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); } /** @@ -58,7 +82,25 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, * @return list grid fields used to display the datasource data */ public ArrayList<ListGridField> getListGridFields() { - ArrayList<ListGridField> fields = new ArrayList<ListGridField>(6); + ArrayList<ListGridField> fields = new ArrayList<ListGridField>(7); + + ListGridField sparklineField = new ListGridField(FIELD_SPARKLINE, "chart"); + sparklineField.setCellFormatter(new CellFormatter() { + @Override + public String format(Object value, ListGridRecord record, int rowNum, int colNum) { + if (value == null) { + return ""; + } + String contents = "<span id='sparkline_" + resourceId + "-" + + record.getAttributeAsInt(FIELD_METRIC_DEF_ID) + "' class='dynamicsparkline' width='70' " + + "values='" + record.getAttribute(FIELD_SPARKLINE) + "'></span>"; + return contents; + + } + }); + + sparklineField.setWidth(80); + fields.add(sparklineField); ListGridField nameField = new ListGridField(FIELD_METRIC_LABEL, MSG.common_title_name()); nameField.setWidth("30%"); @@ -101,6 +143,7 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, MeasurementUtility.formatSimpleMetrics(from); ListGridRecord record = new ListGridRecord(); + record.setAttribute(FIELD_SPARKLINE, getCsvMetricsForSparkline()); record.setAttribute(FIELD_METRIC_LABEL, from.getLabel()); record.setAttribute(FIELD_ALERT_COUNT, String.valueOf(from.getAlertCount())); record.setAttribute(FIELD_MIN_VALUE, getMetricStringValue(from.getMinMetric())); @@ -111,9 +154,32 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, record.setAttribute(FIELD_METRIC_SCHED_ID, from.getScheduleId()); record.setAttribute(FIELD_METRIC_UNITS, from.getUnits()); record.setAttribute(FIELD_METRIC_NAME, from.getMetricName()); + record.setAttribute(FIELD_RESOURCE_ID, resourceId); return record; } + private String getCsvMetricsForSparkline() { + StringBuilder sb = new StringBuilder(); + Log.debug("getCsvMetricsForSparkline.metricsDataList: " + metricsDataList.size()); + for (List<MeasurementDataNumericHighLowComposite> measurementData : metricsDataList) { + for (int i = 0; i < measurementData.size(); i++) { + // take the last 20 values + if (i >= measurementData.size() - 20) { + if (!Double.isNaN(measurementData.get(i).getValue())) { + sb.append((int) measurementData.get(i).getValue()); + sb.append(","); + } + } + } + if (sb.toString().endsWith(",")) { + sb.setLength(sb.length() - 1); + } + } + Log.debug("getCsvMetricsForSparkline: " + sb.toString()); + + return sb.toString(); + } + protected String getMetricStringValue(MetricDisplayValue value) { return (value != null) ? value.toString() : ""; } @@ -127,34 +193,54 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, @Override protected void executeFetch(final DSRequest request, final DSResponse response, final Criteria unused) { - // see MetricsTableUIBean for the old JSF class to see where this came from - GWTServiceLookup.getMeasurementScheduleService().findSchedulesForResourceAndType(resourceId, DataType.MEASUREMENT, null, true, new AsyncCallback<ArrayList<MeasurementSchedule>>() { @Override - public void onSuccess(ArrayList<MeasurementSchedule> result) { - int[] schedIds = new int[result.size()]; + public void onSuccess(ArrayList<MeasurementSchedule> measurementSchedules) { + int[] scheduleIds = new int[measurementSchedules.size()]; int i = 0; - for (MeasurementSchedule measurementSchedule : result) { - schedIds[i++] = measurementSchedule.getId(); + for (MeasurementSchedule measurementSchedule : measurementSchedules) { + scheduleIds[i++] = measurementSchedule.getId(); } - UserPreferences prefs = UserSessionManager.getUserPreferences(); - MeasurementUserPreferences mprefs = new MeasurementUserPreferences(prefs); - ArrayList<Long> range = mprefs.getMetricRangePreferences().getBeginEndTimes(); + final CountDownLatch countDownLatch = CountDownLatch.create(2, new Command() { + + @Override + public void execute() { + response.setData(buildRecords(metricDisplaySummaries)); + processResponse(request.getRequestId(), response); + + new Timer() { + + @Override + public void run() { + BrowserUtility.graphSparkLines(); + } + }.schedule(150); + Log.debug("*** Finished CountdownLatch for metrics loaded: " + metricsDataList.size()); + } + }); + + retrieveResourceMetrics(resourceId, countDownLatch); + GWTServiceLookup.getMeasurementChartsService().getMetricDisplaySummariesForResource(resourceId, - schedIds, range.get(0), range.get(1), new AsyncCallback<ArrayList<MetricDisplaySummary>>() { - @Override - public void onSuccess(ArrayList<MetricDisplaySummary> result) { - response.setData(buildRecords(result)); - processResponse(request.getRequestId(), response); - } + scheduleIds, measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, + new AsyncCallback<ArrayList<MetricDisplaySummary>>() { + @Override + public void onSuccess(ArrayList<MetricDisplaySummary> metricDisplaySummaries) { + setMetricDisplaySummaries(metricDisplaySummaries); + countDownLatch.countDown(); + } - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Cannot load metrics", caught); + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError("Cannot load metrics", caught); + countDownLatch.countDown(); + } } - }); + + ); } @Override @@ -163,4 +249,87 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, } }); } + + void setMetricDisplaySummaries(List<MetricDisplaySummary> metricDisplaySummaries) { + this.metricDisplaySummaries = metricDisplaySummaries; + } + + public void retrieveResourceMetrics(final Integer resourceId, final CountDownLatch countDownLatch) { + + ResourceCriteria criteria = new ResourceCriteria(); + criteria.addFilterId(resourceId); + + //locate the resource + GWTServiceLookup.getResourceService().findResourceCompositesByCriteria(criteria, + new AsyncCallback<PageList<ResourceComposite>>() { + @Override + public void onFailure(Throwable caught) { + Log.debug("Error retrieving resource resource composite for resource [" + resourceId + "]:" + + caught.getMessage()); + } + + @Override + public void onSuccess(PageList<ResourceComposite> resourceCompositePageList) { + if (!resourceCompositePageList.isEmpty()) { + final ResourceComposite resourceComposite = resourceCompositePageList.get(0); + final Resource resource = resourceComposite.getResource(); + // Load the fully fetched ResourceType. + ResourceType resourceType = resource.getResourceType(); + ResourceTypeRepository.Cache.getInstance().getResourceTypes(resourceType.getId(), + EnumSet.of(ResourceTypeRepository.MetadataType.measurements), + new ResourceTypeRepository.TypeLoadedCallback() { + public void onTypesLoaded(ResourceType type) { + resource.setResourceType(type); + //metric definitions + Set<MeasurementDefinition> definitions = type.getMetricDefinitions(); + + //build id mapping for measurementDefinition instances Ex. Free Memory -> MeasurementDefinition[100071] + final HashMap<String, MeasurementDefinition> measurementDefMap = new HashMap<String, MeasurementDefinition>(); + for (MeasurementDefinition definition : definitions) { + measurementDefMap.put(definition.getDisplayName(), definition); + } + //bundle definition ids for asynch call. + int[] definitionArrayIds = new int[definitions.size()]; + final String[] displayOrder = new String[definitions.size()]; + measurementDefMap.keySet().toArray(displayOrder); + //sort the charting data ex. Free Memory, Free Swap Space,..System Load + Arrays.sort(displayOrder); + + //organize definitionArrayIds for ordered request on server. + int index = 0; + for (String definitionToDisplay : displayOrder) { + definitionArrayIds[index++] = measurementDefMap.get(definitionToDisplay) + .getId(); + } + + GWTServiceLookup.getMeasurementDataService().findDataForResource(resourceId, + definitionArrayIds, measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, 60, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + Log.warn("Error retrieving recent metrics charting data for resource [" + + resourceId + "]:" + caught.getMessage()); + } + + @Override + public void onSuccess( + List<List<MeasurementDataNumericHighLowComposite>> measurementDataList) { + + if (!measurementDataList.isEmpty()) { + metricsDataList = measurementDataList; + Log.debug("*** Setting metricsDataList.size: " + + metricsDataList.size()); + countDownLatch.countDown(); + } + } + }); + + } + }); + } + } + }); + + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java new file mode 100644 index 0000000..09a7bc3 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -0,0 +1,385 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.types.ExpansionMode; +import com.smartgwt.client.types.SelectionStyle; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.HTMLFlow; +import com.smartgwt.client.widgets.Window; +import com.smartgwt.client.widgets.events.CloseClickEvent; +import com.smartgwt.client.widgets.events.CloseClickHandler; +import com.smartgwt.client.widgets.grid.ListGrid; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.grid.events.DataArrivedEvent; +import com.smartgwt.client.widgets.grid.events.DataArrivedHandler; +import com.smartgwt.client.widgets.grid.events.RecordCollapseEvent; +import com.smartgwt.client.widgets.grid.events.RecordCollapseHandler; +import com.smartgwt.client.widgets.grid.events.RecordExpandEvent; +import com.smartgwt.client.widgets.grid.events.RecordExpandHandler; +import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler; +import com.smartgwt.client.widgets.grid.events.SelectionEvent; +import com.smartgwt.client.widgets.grid.events.SortChangedHandler; +import com.smartgwt.client.widgets.grid.events.SortEvent; +import com.smartgwt.client.widgets.layout.VLayout; + +import org.rhq.core.domain.measurement.MeasurementData; +import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; +import org.rhq.core.domain.resource.Resource; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; +import org.rhq.enterprise.gui.coregui.client.components.table.Table; +import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.RedrawGraphs; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph; +import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; +import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; + +/** + * Views a resource's metrics in a tabular view with sparkline graph and optional detailed d3 graph. + * + * @author John Mazzitelli + * @author Mike Thompson + */ +public class MetricsTableView extends Table<MetricsViewDataSource> implements RedrawGraphs { + + private final Resource resource; + private final AbstractD3GraphListView abstractD3GraphListView; + + private final MeasurementUserPreferences measurementUserPrefs; + private final AddToDashboardComponent addToDashboardComponent; + private MetricsTableListGrid metricsTableListGrid; + + Set<Integer> expandedRows = new HashSet<Integer>(); + + public MetricsTableView(Resource resource, AbstractD3GraphListView abstractD3GraphListView) { + super(); + this.resource = resource; + this.abstractD3GraphListView = abstractD3GraphListView; + measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); + setDataSource(new MetricsViewDataSource(resource)); + addToDashboardComponent = new AddToDashboardComponent(resource); + } + + /** + * Creates this Table's list grid (called by onInit()). Subclasses can override this if they require a custom + * subclass of ListGrid. + * + * @return this Table's list grid (must be an instance of ListGrid) + */ + @Override + protected ListGrid createListGrid() { + metricsTableListGrid = new MetricsTableListGrid(this, resource); + addToDashboardComponent.setMetricsListGrid(metricsTableListGrid); + return metricsTableListGrid; + } + + protected void configureTable() { + ArrayList<ListGridField> fields = getDataSource().getListGridFields(); + setListGridFields(fields.toArray(new ListGridField[0])); + + addTableAction(MSG.view_measureTable_getLive(), new ShowLiveDataTableAction(this)); + addExtraWidget(addToDashboardComponent, false); + addToDashboardComponent.disableAddToDashboardButton(); + metricsTableListGrid.addSelectionChangedHandler(new SelectionChangedHandler() { + @Override + public void onSelectionChanged(SelectionEvent selectionEvent) { + if(metricsTableListGrid.getSelectedRecords().length > 0){ + addToDashboardComponent.enableAddToDashboardButton(); + }else { + addToDashboardComponent.disableAddToDashboardButton(); + } + } + }); + } + + private static class ShowLiveDataTableAction implements TableAction { + private MetricsTableView metricsTableView; + + public ShowLiveDataTableAction(MetricsTableView metricsTableView) { + this.metricsTableView = metricsTableView; + } + + @Override + public boolean isEnabled(ListGridRecord[] selection) { + return selection != null && selection.length > 0; + } + + @Override + public void executeAction(ListGridRecord[] selection, Object actionValue) { + if (selection == null || selection.length == 0) { + return; + } + // keyed on metric name - string[0] is the metric label, [1] is the units + final HashMap<String, String[]> scheduleNamesAndUnits = new HashMap<String, String[]>(); + int[] definitionIds = new int[selection.length]; + int i = 0; + for (ListGridRecord record : selection) { + Integer defId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); + definitionIds[i++] = defId; + + String name = record.getAttribute(MetricsViewDataSource.FIELD_METRIC_NAME); + String label = record.getAttribute(MetricsViewDataSource.FIELD_METRIC_LABEL); + String units = record.getAttribute(MetricsViewDataSource.FIELD_METRIC_UNITS); + if (units == null || units.length() < 1) { + units = MeasurementUnits.NONE.name(); + } + + scheduleNamesAndUnits.put(name, new String[] { label, units }); + } + + // actually go out and ask the agents for the data + GWTServiceLookup.getMeasurementDataService(60000).findLiveData(metricsTableView.resource.getId(), + definitionIds, new AsyncCallback<Set<MeasurementData>>() { + @Override + public void onSuccess(Set<MeasurementData> result) { + if (result == null) { + result = new HashSet<MeasurementData>(0); + } + ArrayList<ListGridRecord> records = new ArrayList<ListGridRecord>(result.size()); + for (MeasurementData data : result) { + String[] nameAndUnits = scheduleNamesAndUnits.get(data.getName()); + if (nameAndUnits != null) { + double doubleValue; + if (data.getValue() instanceof Number) { + doubleValue = ((Number) data.getValue()).doubleValue(); + } else { + doubleValue = Double.parseDouble(data.getValue().toString()); + } + String value = MeasurementConverterClient.formatToSignificantPrecision( + new double[] { doubleValue }, MeasurementUnits.valueOf(nameAndUnits[1]), true)[0]; + + ListGridRecord record = new ListGridRecord(); + record.setAttribute("name", nameAndUnits[0]); + record.setAttribute("value", value); + records.add(record); + } + } + Collections.sort(records, new Comparator<ListGridRecord>() { + public int compare(ListGridRecord o1, ListGridRecord o2) { + return o1.getAttribute("name").compareTo(o2.getAttribute("name")); + } + }); + showLiveData(records); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_measureTable_getLive_failure(), caught); + } + }); + } + + private void showLiveData(ArrayList<ListGridRecord> records) { + final Window liveDataWindow = new Window(); + liveDataWindow.setTitle(MSG.view_measureTable_live_title()); + liveDataWindow.setShowModalMask(true); + liveDataWindow.setShowMinimizeButton(false); + liveDataWindow.setShowMaximizeButton(true); + liveDataWindow.setShowCloseButton(true); + liveDataWindow.setShowResizer(true); + liveDataWindow.setCanDragResize(true); + liveDataWindow.setDismissOnEscape(true); + liveDataWindow.setIsModal(true); + liveDataWindow.setWidth(700); + liveDataWindow.setHeight(425); + liveDataWindow.setAutoCenter(true); + liveDataWindow.centerInPage(); + liveDataWindow.addCloseClickHandler(new CloseClickHandler() { + @Override + public void onCloseClick(CloseClickEvent event) { + liveDataWindow.destroy(); + metricsTableView.refreshTableInfo(); + } + }); + + ListGrid liveDataGrid = new ListGrid(); + liveDataGrid.setShowAllRecords(true); + liveDataGrid.setData(records.toArray(new ListGridRecord[records.size()])); + liveDataGrid.setSelectionType(SelectionStyle.NONE); + ListGridField name = new ListGridField("name", MSG.common_title_metric()); + ListGridField value = new ListGridField("value", MSG.common_title_value()); + liveDataGrid.setFields(name, value); + + liveDataWindow.addItem(liveDataGrid); + liveDataWindow.show(); + } + + } + + @Override + /** + * Redraw Graphs in this context means to refresh the table and redraw open graphs. + */ + public void redrawGraphs() { + Log.debug("MetricsView.redrawGraphs."); + + new Timer() { + + @Override + public void run() { + BrowserUtility.graphSparkLines(); + } + }.schedule(150); + + } + + public class MetricsTableListGrid extends ListGrid { + + private static final int TREEVIEW_DETAIL_CHART_HEIGHT = 205; + private static final int NUM_METRIC_POINTS = 60; + private Resource resource; + final MetricsTableView metricsTableView; + + public MetricsTableListGrid(final MetricsTableView metricsTableView, final Resource resource) { + super(); + this.resource = resource; + this.metricsTableView = metricsTableView; + setCanExpandRecords(true); + setCanExpandMultipleRecords(true); + setExpansionMode(ExpansionMode.DETAIL_FIELD); + + addRecordExpandHandler(new RecordExpandHandler() { + @Override + public void onRecordExpand(RecordExpandEvent recordExpandEvent) { + metricsTableView.expandedRows.add(recordExpandEvent.getRecord().getAttributeAsInt( + MetricsViewDataSource.FIELD_METRIC_DEF_ID)); + redrawGraphs(); + } + + }); + addRecordCollapseHandler(new RecordCollapseHandler() { + @Override + public void onRecordCollapse(RecordCollapseEvent recordCollapseEvent) { + metricsTableView.expandedRows.remove(recordCollapseEvent.getRecord().getAttributeAsInt( + MetricsViewDataSource.FIELD_METRIC_DEF_ID)); + redrawGraphs(); + } + }); + addSortChangedHandler(new SortChangedHandler() { + @Override + public void onSortChanged(SortEvent sortEvent) { + redrawGraphs(); + } + }); + addDataArrivedHandler(new DataArrivedHandler() { + @Override + public void onDataArrived(DataArrivedEvent dataArrivedEvent) { + int startRow = dataArrivedEvent.getStartRow(); + int endRow = dataArrivedEvent.getEndRow(); + for (int i = startRow; i < endRow; i++) { + if (null != metricsTableView.expandedRows + && metricsTableView.expandedRows.contains(getRecord(i).getAttributeAsInt( + MetricsViewDataSource.FIELD_METRIC_DEF_ID))) { + expandRecord(getRecord(i)); + } + } + } + }); + + } + + @Override + protected Canvas getExpansionComponent(final ListGridRecord record) { + final Integer definitionId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); + final Integer resourceId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_RESOURCE_ID); + VLayout vLayout = new VLayout(); + vLayout.setPadding(5); + + final String chartId = "rChart-" + resourceId + "-" + definitionId; + HTMLFlow htmlFlow = new HTMLFlow(MetricD3Graph.createGraphMarkerTemplate(chartId, + TREEVIEW_DETAIL_CHART_HEIGHT)); + vLayout.addMember(htmlFlow); + + int[] definitionArrayIds = new int[1]; + definitionArrayIds[0] = definitionId; + GWTServiceLookup.getMeasurementDataService().findDataForResource(resourceId, definitionArrayIds, + measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, NUM_METRIC_POINTS, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + Log.warn("Error retrieving recent metrics charting data for resource [" + resourceId + "]:" + + caught.getMessage()); + } + + @Override + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> results) { + if (!results.isEmpty()) { + + //load the data results for the given metric definition + List<MeasurementDataNumericHighLowComposite> measurementList = results.get(0); + + MeasurementDefinition measurementDefinition = null; + for (MeasurementDefinition definition : resource.getResourceType().getMetricDefinitions()) { + if (definition.getId() == definitionId) { + measurementDefinition = definition; + break; + } + } + + MetricGraphData metricGraphData = MetricGraphData.createForResource(resourceId, + resource.getName(), measurementDefinition, measurementList, null); + metricGraphData.setHideLegend(true); + + StackedBarMetricGraphImpl graph = GWT.create(StackedBarMetricGraphImpl.class); + graph.setMetricGraphData(metricGraphData); + final MetricD3Graph graphView = new MetricD3Graph(graph, abstractD3GraphListView); + new Timer() { + @Override + public void run() { + graphView.drawJsniChart(); + BrowserUtility.graphSparkLines(); + + } + }.schedule(150); + + } else { + Log.warn("No chart data retrieving for resource [" + resourceId + "-" + definitionId + "]"); + + } + } + }); + + return vLayout; + } + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java new file mode 100644 index 0000000..5c2fe25 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java @@ -0,0 +1,307 @@ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Set; + +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.criteria.Criteria; +import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.measurement.MeasurementSchedule; +import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; +import org.rhq.core.domain.measurement.ui.MetricDisplaySummary; +import org.rhq.core.domain.measurement.ui.MetricDisplayValue; +import org.rhq.core.domain.resource.Resource; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; +import org.rhq.enterprise.gui.coregui.client.util.async.Command; +import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; +import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; + +/** + * A simple data source to read in metric data summaries for a resource. + * This doesn't support paging - everything is returned in one query. Since + * the number of metrics per resource is relatively small (never more than tens of them), + * we just load them all in at once. + * + * @author John Mazzitelli + * @author Mike Thompson + */ +public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, Criteria> { + + private static final int NUMBER_OF_METRIC_POINTS = 60; + public static final String FIELD_SPARKLINE = "sparkline"; + public static final String FIELD_METRIC_LABEL = "label"; + public static final String FIELD_ALERT_COUNT = "alertCount"; + public static final String FIELD_MIN_VALUE = "min"; + public static final String FIELD_MAX_VALUE = "max"; + public static final String FIELD_AVG_VALUE = "avg"; + public static final String FIELD_LAST_VALUE = "last"; + public static final String FIELD_METRIC_DEF_ID = "defId"; + public static final String FIELD_METRIC_SCHED_ID = "schedId"; + public static final String FIELD_METRIC_UNITS = "units"; + public static final String FIELD_METRIC_NAME = "name"; + public static final String FIELD_RESOURCE_ID = "resourceId"; + private final Resource resource; + private List<MetricDisplaySummary> metricDisplaySummaries; + private List<List<MeasurementDataNumericHighLowComposite>> metricsDataList; + private int[] definitionArrayIds; + private final MeasurementUserPreferences measurementUserPrefs; + + public MetricsViewDataSource(Resource resource) { + this.resource = resource; + measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); + } + + /** + * The view that contains the list grid which will display this datasource's data will call this + * method to get the field information which is used to control the display of the data. + * + * @return list grid fields used to display the datasource data + */ + public ArrayList<ListGridField> getListGridFields() { + ArrayList<ListGridField> fields = new ArrayList<ListGridField>(7); + + ListGridField sparklineField = new ListGridField(FIELD_SPARKLINE, MSG.chart_metrics_sparkline_header()); + sparklineField.setCellFormatter(new CellFormatter() { + @Override + public String format(Object value, ListGridRecord record, int rowNum, int colNum) { + if (value == null) { + return ""; + } + String contents = "<span id='sparkline_" + resource.getId() + "-" + + record.getAttributeAsInt(FIELD_METRIC_DEF_ID) + "' class='dynamicsparkline' width='70' " + + "values='" + record.getAttribute(FIELD_SPARKLINE) + "'></span>"; + return contents; + + } + }); + + sparklineField.setWidth(80); + fields.add(sparklineField); + + ListGridField nameField = new ListGridField(FIELD_METRIC_LABEL, MSG.common_title_name()); + nameField.setWidth("30%"); + fields.add(nameField); + + ListGridField minField = new ListGridField(FIELD_MIN_VALUE, MSG.view_resource_monitor_table_min()); + minField.setWidth("15%"); + fields.add(minField); + + ListGridField maxField = new ListGridField(FIELD_MAX_VALUE, MSG.view_resource_monitor_table_max()); + maxField.setWidth("15%"); + fields.add(maxField); + + ListGridField avgField = new ListGridField(FIELD_AVG_VALUE, MSG.view_resource_monitor_table_avg()); + avgField.setWidth("15%"); + fields.add(avgField); + + ListGridField lastField = new ListGridField(FIELD_LAST_VALUE, MSG.view_resource_monitor_table_last()); + lastField.setWidth("15%"); + fields.add(lastField); + + ListGridField alertsField = new ListGridField(FIELD_ALERT_COUNT, MSG.common_title_alerts()); + alertsField.setWidth("10%"); + fields.add(alertsField); + + return fields; + } + + @Override + public MetricDisplaySummary copyValues(Record from) { + // we should never need this method - we only go in one direction + // if we ever need this, just have copyValues store an "object" attribute whose value is "from" + // which this method then just reads out. Since we don't need this now, save memory by not + // keeping the MetricDisplayValue around + return null; + } + + @Override + public ListGridRecord copyValues(MetricDisplaySummary from) { + MeasurementUtility.formatSimpleMetrics(from); + + ListGridRecord record = new ListGridRecord(); + record.setAttribute(FIELD_SPARKLINE, getCsvMetricsForSparkline(from.getDefinitionId())); + record.setAttribute(FIELD_METRIC_LABEL, from.getLabel()); + record.setAttribute(FIELD_ALERT_COUNT, String.valueOf(from.getAlertCount())); + record.setAttribute(FIELD_MIN_VALUE, getMetricStringValue(from.getMinMetric())); + record.setAttribute(FIELD_MAX_VALUE, getMetricStringValue(from.getMaxMetric())); + record.setAttribute(FIELD_AVG_VALUE, getMetricStringValue(from.getAvgMetric())); + record.setAttribute(FIELD_LAST_VALUE, getMetricStringValue(from.getLastMetric())); + record.setAttribute(FIELD_METRIC_DEF_ID, from.getDefinitionId()); + record.setAttribute(FIELD_METRIC_SCHED_ID, from.getScheduleId()); + record.setAttribute(FIELD_METRIC_UNITS, from.getUnits()); + record.setAttribute(FIELD_METRIC_NAME, from.getMetricName()); + record.setAttribute(FIELD_RESOURCE_ID, resource.getId()); + return record; + } + + private String getCsvMetricsForSparkline(int definitionId) { + StringBuilder sb = new StringBuilder(); + List<MeasurementDataNumericHighLowComposite> selectedMetricsList = getMeasurementsForMeasurementDefId(definitionId); + + for (int i = 0; i < selectedMetricsList.size(); i++) { + MeasurementDataNumericHighLowComposite measurementData = selectedMetricsList.get(i); + if (!Double.isNaN(measurementData.getValue())) { + sb.append((int) measurementData.getValue()); + sb.append(","); + } + } + + if (sb.toString().endsWith(",")) { + sb.setLength(sb.length() - 1); + } + + return sb.toString(); + } + + List<MeasurementDataNumericHighLowComposite> getMeasurementsForMeasurementDefId(int definitionId) { + int selectedIndex = 0; + + // find the ordinal position as specified when querying the metrics + for (int i = 0; i < definitionArrayIds.length; i++) { + if (definitionArrayIds[i] == definitionId) { + selectedIndex = i; + break; + } + } + + return metricsDataList.get(selectedIndex); + } + + protected String getMetricStringValue(MetricDisplayValue value) { + return (value != null) ? value.toString() : ""; + } + + @Override + protected Criteria getFetchCriteria(DSRequest request) { + // NOTE: we don't use criterias for this datasource, just return null + return null; + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, final Criteria unused) { + + GWTServiceLookup.getMeasurementScheduleService().findSchedulesForResourceAndType(resource.getId(), + DataType.MEASUREMENT, null, true, new AsyncCallback<ArrayList<MeasurementSchedule>>() { + @Override + public void onSuccess(ArrayList<MeasurementSchedule> measurementSchedules) { + int[] scheduleIds = new int[measurementSchedules.size()]; + int i = 0; + for (MeasurementSchedule measurementSchedule : measurementSchedules) { + scheduleIds[i++] = measurementSchedule.getId(); + } + + final CountDownLatch countDownLatch = CountDownLatch.create(2, new Command() { + + @Override + public void execute() { + response.setData(buildRecords(metricDisplaySummaries)); + processResponse(request.getRequestId(), response); + + new Timer() { + + @Override + public void run() { + BrowserUtility.graphSparkLines(); + } + }.schedule(150); + } + }); + + queryResourceMetrics(resource, measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, countDownLatch); + queryMetricDisplaySummaries(scheduleIds, measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, countDownLatch); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError("Cannot load schedules", caught); + } + }); + } + + private void queryMetricDisplaySummaries(int[] scheduleIds, Long startTime, Long endTime, + final CountDownLatch countDownLatch) { + GWTServiceLookup.getMeasurementChartsService().getMetricDisplaySummariesForResource(resource.getId(), + scheduleIds, startTime, endTime, new AsyncCallback<ArrayList<MetricDisplaySummary>>() { + @Override + public void onSuccess(ArrayList<MetricDisplaySummary> metricDisplaySummaries) { + setMetricDisplaySummaries(metricDisplaySummaries); + countDownLatch.countDown(); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError("Cannot load metrics", caught); + countDownLatch.countDown(); + } + } + + ); + } + + void setMetricDisplaySummaries(List<MetricDisplaySummary> metricDisplaySummaries) { + this.metricDisplaySummaries = metricDisplaySummaries; + } + + public void queryResourceMetrics(final Resource resource, Long startTime, Long endTime, + final CountDownLatch countDownLatch) { + Set<MeasurementDefinition> definitions = resource.getResourceType().getMetricDefinitions(); + + //build id mapping for measurementDefinition instances Ex. Free Memory -> MeasurementDefinition[100071] + final HashMap<String, MeasurementDefinition> measurementDefMap = new HashMap<String, MeasurementDefinition>(); + for (MeasurementDefinition definition : definitions) { + measurementDefMap.put(definition.getDisplayName(), definition); + } + //bundle definition ids for asynch call. + definitionArrayIds = new int[definitions.size()]; + final String[] displayOrder = new String[definitions.size()]; + measurementDefMap.keySet().toArray(displayOrder); + //sort the charting data ex. Free Memory, Free Swap Space,..System Load + Arrays.sort(displayOrder); + + //organize definitionArrayIds for ordered request on server. + int index = 0; + for (String definitionToDisplay : displayOrder) { + definitionArrayIds[index++] = measurementDefMap.get(definitionToDisplay).getId(); + } + + GWTServiceLookup.getMeasurementDataService().findDataForResource(resource.getId(), definitionArrayIds, + startTime, endTime, NUMBER_OF_METRIC_POINTS, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + Log.warn("Error retrieving recent metrics charting data for resource [" + resource.getId() + "]:" + + caught.getMessage()); + } + + @Override + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> measurementDataList) { + + if (null != measurementDataList && !measurementDataList.isEmpty()) { + metricsDataList = measurementDataList; + countDownLatch.countDown(); + } + } + }); + + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java new file mode 100644 index 0000000..9d6b892 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java @@ -0,0 +1,208 @@ +/* + * RHQ Management Platform + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.FormItem; +import com.smartgwt.client.widgets.form.fields.StaticTextItem; + +import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.composite.ResourceAvailabilitySummary; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; + +/** + * This shows the availability history for a resource. + * + * @author Jay Shaughnessy + * @author John Mazzitelli + * @author Mike Thompson + */ +public class ResourceMetricAvailabilityView extends EnhancedVLayout { + + private Resource resource; + private StaticTextItem currentField; + private StaticTextItem availField; + private StaticTextItem availTimeField; + private StaticTextItem downField; + private StaticTextItem downTimeField; + private StaticTextItem disabledField; + private StaticTextItem disabledTimeField; + private StaticTextItem failureCountField; + private StaticTextItem disabledCountField; + private StaticTextItem mtbfField; + private StaticTextItem mttrField; + private StaticTextItem unknownField; + private StaticTextItem currentTimeField; + + public ResourceMetricAvailabilityView(Resource resource) { + super(); + + this.resource = resource; + + setWidth100(); + setHeight(165); + } + + @Override + protected void onInit() { + super.onInit(); + + addMember(createSummaryForm()); + } + + private DynamicForm createSummaryForm() { + DynamicForm form = new DynamicForm(); + form.setWidth100(); + form.setAutoHeight(); + form.setMargin(10); + form.setNumCols(4); + + // row 1 + currentField = new StaticTextItem("current", MSG.view_resource_monitor_availability_currentStatus()); + currentField.setWrapTitle(false); + currentField.setColSpan(4); + + // row 2 + availField = new StaticTextItem("avail", MSG.view_resource_monitor_availability_availability()); + availField.setWrapTitle(false); + prepareTooltip(availField, MSG.view_resource_monitor_availability_availability_tooltip()); + + availTimeField = new StaticTextItem("availTime", MSG.view_resource_monitor_availability_uptime()); + availTimeField.setWrapTitle(false); + prepareTooltip(availTimeField, MSG.view_resource_monitor_availability_uptime_tooltip()); + + // row 3 + downField = new StaticTextItem("down", MSG.view_resource_monitor_availability_down()); + downField.setWrapTitle(false); + prepareTooltip(downField, MSG.view_resource_monitor_availability_down_tooltip()); + + downTimeField = new StaticTextItem("downTime", MSG.view_resource_monitor_availability_downtime()); + downTimeField.setWrapTitle(false); + prepareTooltip(downTimeField, MSG.view_resource_monitor_availability_downtime_tooltip()); + + // row 4 + disabledField = new StaticTextItem("disabled", MSG.view_resource_monitor_availability_disabled()); + disabledField.setWrapTitle(false); + prepareTooltip(disabledField, MSG.view_resource_monitor_availability_disabled_tooltip()); + + disabledTimeField = new StaticTextItem("disabledTime", MSG.view_resource_monitor_availability_disabledTime()); + disabledTimeField.setWrapTitle(false); + prepareTooltip(disabledTimeField, MSG.view_resource_monitor_availability_disabledTime_tooltip()); + + // row 5 + failureCountField = new StaticTextItem("failureCount", MSG.view_resource_monitor_availability_numFailures()); + failureCountField.setWrapTitle(false); + prepareTooltip(failureCountField, MSG.view_resource_monitor_availability_numFailures_tooltip()); + + disabledCountField = new StaticTextItem("disabledCount", MSG.view_resource_monitor_availability_numDisabled()); + disabledCountField.setWrapTitle(false); + prepareTooltip(disabledCountField, MSG.view_resource_monitor_availability_numDisabled_tooltip()); + + // row 6 + mtbfField = new StaticTextItem("mtbf", MSG.view_resource_monitor_availability_mtbf()); + mtbfField.setWrapTitle(false); + prepareTooltip(mtbfField, MSG.view_resource_monitor_availability_mtbf_tooltip()); + + mttrField = new StaticTextItem("mttr", MSG.view_resource_monitor_availability_mttr()); + mttrField.setWrapTitle(false); + prepareTooltip(mttrField, MSG.view_resource_monitor_availability_mttr_tooltip()); + + // row 7 + unknownField = new StaticTextItem("unknown"); + unknownField.setWrapTitle(false); + unknownField.setColSpan(4); + unknownField.setShowTitle(false); + + // row 8 + currentTimeField = new StaticTextItem("currentTime"); + currentTimeField.setWrapTitle(false); + currentTimeField.setColSpan(4); + currentTimeField.setShowTitle(false); + + form.setItems(currentField, availField, availTimeField, downField, downTimeField, disabledField, + disabledTimeField, failureCountField, disabledCountField, mtbfField, mttrField, unknownField, + currentTimeField); + + reloadSummaryData(); + + return form; + } + + private void reloadSummaryData() { + GWTServiceLookup.getResourceService().getResourceAvailabilitySummary(resource.getId(), + new AsyncCallback<ResourceAvailabilitySummary>() { + + @Override + public void onSuccess(ResourceAvailabilitySummary result) { + + currentField.setValue(MSG.view_resource_monitor_availability_currentStatus_value(result + .getCurrent().getName(), TimestampCellFormatter.format(result.getLastChange().getTime()))); + availField.setValue(MeasurementConverterClient.format(result.getUpPercentage(), + MeasurementUnits.PERCENTAGE, true)); + availTimeField.setValue(MeasurementConverterClient.format((double) result.getUpTime(), + MeasurementUnits.MILLISECONDS, true)); + downField.setValue(MeasurementConverterClient.format(result.getDownPercentage(), + MeasurementUnits.PERCENTAGE, true)); + downTimeField.setValue(MeasurementConverterClient.format((double) result.getDownTime(), + MeasurementUnits.MILLISECONDS, true)); + disabledField.setValue(MeasurementConverterClient.format(result.getDisabledPercentage(), + MeasurementUnits.PERCENTAGE, true)); + disabledTimeField.setValue(MeasurementConverterClient.format((double) result.getDisabledTime(), + MeasurementUnits.MILLISECONDS, true)); + failureCountField.setValue(result.getFailures()); + disabledCountField.setValue(result.getDisabled()); + mtbfField.setValue(MeasurementConverterClient.format((double) result.getMTBF(), + MeasurementUnits.MILLISECONDS, true)); + mttrField.setValue(MeasurementConverterClient.format((double) result.getMTTR(), + MeasurementUnits.MILLISECONDS, true)); + + if (result.getUnknownTime() > 0L) { + unknownField.setValue(MSG.view_resource_monitor_availability_unknown(MeasurementConverterClient + .format((double) result.getUnknownTime(), MeasurementUnits.MILLISECONDS, true))); + } else { + unknownField.setValue(""); + } + + currentTimeField.setValue(MSG.view_resource_monitor_availability_currentAsOf(TimestampCellFormatter + .format(result.getCurrentTime()))); + } + + @Override + public void onFailure(Throwable caught) { + currentField.setValue(MSG.common_label_error()); + CoreGUI.getErrorHandler() + .handleError(MSG.view_resource_monitor_availability_summaryError(), caught); + } + }); + } + + private void prepareTooltip(FormItem item, String tooltip) { + item.setHoverWidth(400); + item.setPrompt(tooltip); + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java index 1edd076..94fd1e8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java @@ -26,7 +26,6 @@ import com.smartgwt.client.data.fields.DataSourceTextField; import com.smartgwt.client.widgets.form.fields.events.KeyUpEvent; import com.smartgwt.client.widgets.grid.HoverCustomizer; import com.smartgwt.client.widgets.grid.ListGrid; -import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; import com.smartgwt.client.widgets.grid.events.RecordClickEvent; @@ -89,17 +88,14 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { */ @Override public void onRecordClick(RecordClickEvent event) { - Log.debug("BasicSearchStrategy click"); String kind = event.getRecord().getAttribute(ATTR_KIND); String searchExpression; if (kind.equals("SAVED") || kind.equals("GLOBAL")) { - Log.debug("Saved or Global Search Click"); searchExpression = event.getRecord().getAttribute(ATTR_PATTERN); } else { - Log.debug("Regular Search Click"); searchExpression = event.getRecord().getAttribute(ATTR_NAME); } @@ -112,14 +108,12 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { @Override public void searchFocusHandler() { - Log.debug("focus in BasicSearchStrategy"); String searchExpression = searchBar.getSearchTextItem().getValueAsString(); doSearch(searchExpression); } @Override public void searchKeyUpHandler(KeyUpEvent keyUpEvent) { - Log.debug("Keyup in BasicSearchStrategy: " + keyUpEvent.getKeyName()); String searchExpression = searchBar.getSearchTextItem().getValueAsString(); doSearch(searchExpression); } @@ -131,20 +125,16 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { private void doSearch(String searchExpression) { if (isSearchInProgress) { - Log.debug("Adding pending search [" + searchExpression + "]"); pendingSearchExpression = (null == searchExpression) ? "" : searchExpression; return; } - Log.debug("Search Start"); isSearchInProgress = true; if (null == searchExpression || searchExpression.isEmpty()) { - Log.debug("Empty Search expression"); getSearchSuggestions(SearchSubsystem.RESOURCE, null, 0); } else { - Log.debug("doSearch: " + searchExpression); getSearchSuggestions(SearchSubsystem.RESOURCE, searchBar.getSearchTextItem().getValueAsString(), searchBar .getSearchTextItem().getValueAsString().length()); } @@ -154,7 +144,6 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { final long suggestStart = System.currentTimeMillis(); - Log.debug("Searching for: " + expression); searchService.getTabAwareSuggestions(searchSubsystem, expression, caretPosition, null, new AsyncCallback<List<SearchSuggestion>>() { @@ -179,7 +168,6 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { ds.setFields(idField, valueField); searchBarPickListGrid.setDataSource(ds); - ListGridField[] fields = searchBarPickListGrid.getAllFields(); searchBarPickListGrid.getField(ATTR_VALUE).setShowHover(true); searchBarPickListGrid.getField(ATTR_VALUE).setHoverCustomizer(new HoverCustomizer() { @@ -223,7 +211,7 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { searchBarPickListGrid.setData(new ListGridRecord[] {}); searchBarPickListGrid.fetchData(); } catch (Exception e) { - Log.debug("Caught exception on fetchData: " + e); + Log.info("Caught exception on fetchData: " + e); } long suggestFetchTime = System.currentTimeMillis() - suggestStart; @@ -250,7 +238,6 @@ public class BasicSearchStrategy extends AbstractSearchStrategy { @Override public void onFailure(Throwable caught) { - Log.debug("Search End"); isSearchInProgress = false; pendingSearchExpression = null; CoreGUI.getErrorHandler().handleError(MSG.view_searchBar_suggest_failSuggest(), caught); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java index 10505e9..a069a5d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java @@ -31,5 +31,5 @@ import org.rhq.enterprise.gui.coregui.client.Messages; */ public interface Enhanced { - Messages MSG = CoreGUI.getMessages(); + final static Messages MSG = CoreGUI.getMessages(); } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 19d3fa5..abcfa62 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -20,6 +20,10 @@ chart_hover_period_label = Period chart_hover_start_label = Start chart_hover_time_format = %I:%M:%S %p chart_ie_not_supported = Charting is not available for this browser. +chart_metrics= Metrics +chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +chart_metrics_sparkline_header= Chart chart_no_data_label = No Data chart_single_value_label = Value chart_slider_button_bar_day = Day @@ -1792,6 +1796,7 @@ view_messageCenter_messageTime = Time view_messageCenter_messageTitle = Message Center view_messageCenter_noRecentMessages = No Recent Messages view_messageCenter_stackTraceFollows = --- STACK TRACE FOLLOWS --- +view_metric_addToDashboard = Add to Dashboard view_metric_traits = Traits view_metric_viewTraitHistory = Value History for Trait [{0}] view_operationHistoryDetails_dateCompleted = Date Completed @@ -2111,7 +2116,7 @@ view_titleBar_common_updateTagsSuccessful = The tags for [{0}] have been updated view_titleBar_group_failInfo = Failed to get general info on group [{0}] with ID [{1}] view_titleBar_group_summary_collapsedTooltip = Click to show more details for this group view_titleBar_group_summary_expandedTooltip = Click to hide details for this group -view_tree_common_contextMenu_addChartToDashboard = Add chart to dashboard [{0}] +view_tree_common_contextMenu_addChartToDashboard = Add Graph to Dashboard [{0}] view_tree_common_contextMenu_editPluginConfiguration = Edit [{0}] Plugin Configuration view_tree_common_contextMenu_editResourceConfiguration = Edit [{0}] Resource Configuration view_tree_common_contextMenu_groupGraph = Group Metric Graph diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index f71f907..3a79eeb 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -48,6 +48,10 @@ chart_hover_date_format = %d.%m.%y ##chart_hover_start_label = Start chart_hover_time_format = %H:%M:%S ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_day = Day @@ -1804,6 +1808,7 @@ view_messageCenter_messageTime = Čas view_messageCenter_messageTitle = Centrum zpráv view_messageCenter_noRecentMessages = Žádné nové zprávy view_messageCenter_stackTraceFollows = --- VÝPIS ZÁSOBNÍKU NÍŽE --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = Vlastnosti view_metric_viewTraitHistory = Historie hodnot pro vlastnost [{0}] view_operationHistoryDetails_dateCompleted = Datum ukončení diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index 524dcc0..e79504c 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -23,6 +23,10 @@ chart_hover_period_label = Zeitraum chart_hover_start_label = Start chart_hover_time_format = %H:%M:%S chart_ie_not_supported = Charting ist bei diesem Browser nicht unterstützt +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart chart_no_data_label = Keine Daten vorhanden ##chart_single_value_label = Value chart_slider_button_bar_day = Tag @@ -1591,6 +1595,7 @@ view_messageCenter_messageTime = Zeitpukt view_messageCenter_messageTitle = Nachrichtencenter view_messageCenter_noRecentMessages = Keine aktuellen Nachrichten view_messageCenter_stackTraceFollows = --- STACK TRACE FOLGT --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = Traits view_metric_viewTraitHistory = Werteverlauf für Trait [{0}] ##view_operationCreateWizard_error_scheduleOperationFailure = Failed to schedule operation execution. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index cb0c35f..3f1f701 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -24,6 +24,10 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -1775,6 +1779,7 @@ view_messageCenter_messageTime = 時間 view_messageCenter_messageTitle = メッセージセンター view_messageCenter_noRecentMessages = 最近のメッセージはありません view_messageCenter_stackTraceFollows = --- スタックトレース --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = トレイト view_metric_viewTraitHistory = トレイト [{0}] のための値の履歴 view_operationHistoryDetails_dateCompleted = 完了日 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 32dc73d..3d40d83 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -22,6 +22,10 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -1496,6 +1500,7 @@ view_messageCenter_messageTime = 시간 view_messageCenter_messageTitle = 메시지 센터 view_messageCenter_noRecentMessages = 최근 메시지는 없습니다 view_messageCenter_stackTraceFollows = --- 스택 추적 --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = 특성 view_metric_viewTraitHistory = 특성 [{0}]에 대한 값 기록 view_operationHistoryDetails_dateCompleted = 완료일 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index f4419e1..de43fa4 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -21,6 +21,10 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -1808,6 +1812,7 @@ view_messageCenter_messageTime = Tempo view_messageCenter_messageTitle = Centro de Mensagens view_messageCenter_noRecentMessages = N\u00E3o existem Mensagens Recentes view_messageCenter_stackTraceFollows = --- STACK TRACE FOLLOWS --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = Traits view_metric_viewTraitHistory = Value History for Trait [{0}] view_operationCreateWizard_button_execute = Execute diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index d75b76e..669d8d6 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -21,6 +21,10 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -1728,6 +1732,7 @@ #view_messageCenter_messageTitle = Message Center #view_messageCenter_noRecentMessages = No Recent Messages #view_messageCenter_stackTraceFollows = --- STACK TRACE FOLLOWS --- +##view_metric_addToDashboard = Add to Dashboard #view_metric_traits = Traits #view_metric_viewTraitHistory = Value History for Trait [{0}] #view_operationHistoryDetails_dateCompleted = Date Completed diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index a9a24df..b15023f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -21,6 +21,10 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min @@ -1776,6 +1780,7 @@ view_messageCenter_messageTime = \u65f6\u95f4 view_messageCenter_messageTitle = \u6d88\u606f\u4e2d\u5fc3 view_messageCenter_noRecentMessages = \u65e0\u8fd1\u671f\u6d88\u606f view_messageCenter_stackTraceFollows = --- \u540e\u9762\u662f\u5f02\u5e38\u4fe1\u606f --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = \u7279\u5f81 view_metric_viewTraitHistory = Value History for Trait [{0}] view_operationHistoryDetails_dateCompleted = \u5b8c\u6210\u65e5\u671f diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js index 40c7ca8..ef65e69 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js +++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js @@ -38,9 +38,10 @@ if (!window.console.log) window.console.log = function () { * @param singleValueLabel * @param chartXaxisTimeFormatHours * @param chartXaxisTimeFormatHoursMinutes + * @param showLegend * @constructor */ -var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel, hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { +var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel, hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes, hideLegend) { "use strict"; if (!(this instanceof ChartContext)) { throw new Error("ChartContext function cannot be called as a function.") @@ -78,6 +79,7 @@ var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, char this.buttonBarDateTimeFormat = buttonBarDateTimeFormat; this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; + this.hideLegend = hideLegend; }, /**

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - modules/enterprise
by mike thompson 25 Jul '13

25 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java | 1 + 1 file changed, 1 insertion(+) New commits: commit da83e836cf14ca8fd6aa2a7195de03a80083eb54 Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Jul 25 12:34:13 2013 -0700 Consolidated Metrics - Bug fixes. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java index cfb1947..ce4f8ef 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java @@ -76,6 +76,7 @@ public class AddToDashboardComponent extends ToolStrip implements Enhanced { addSpacer(15); dashboardSelectItem = new SelectItem(); addToDashboardButton = new IButton(MSG.view_metric_addToDashboard()); + addToDashboardButton.disable(); dashboardSelectItem = new SelectItem(); dashboardSelectItem.setTitle("Dashboards");

1 0

[rhq] Branch 'feature/bundle-group' - modules/core modules/enterprise
by Jay Shaughnessy 25 Jul '13

25 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java | 7 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java | 25 ++++++++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java | 5 +- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 8 ++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 9 +++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 17 ++++++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 3 - modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 10 ++++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 22 ++++---- 11 files changed, 91 insertions(+), 19 deletions(-) New commits: commit f126a952186530d6e0e84afca704862e9a0a8f60 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Jul 25 15:45:30 2013 -0400 More work on working new bundle group stuff into role edit view. Also, continued cleanup of Messages.properties. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java index 5b009b5..88fb948 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java @@ -228,15 +228,22 @@ public enum Permission { public static final Set<Permission> GLOBAL_ALL = new HashSet<Permission>(); public static final Set<Permission> RESOURCE_ALL = new HashSet<Permission>(); + public static final Set<Permission> BUNDLE_ALL = new HashSet<Permission>(); static { for (Permission permission : Permission.values()) { switch (permission.getTarget()) { case GLOBAL: GLOBAL_ALL.add(permission); + if (permission.name().contains("BUNDLE")) { + BUNDLE_ALL.add(permission); + } break; case RESOURCE: RESOURCE_ALL.add(permission); break; + case BUNDLE: + BUNDLE_ALL.add(permission); + break; } } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java index cde2c6d..5e80d82 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java @@ -101,6 +101,11 @@ public class PermissionsEditor extends EnhancedVStack { this.resourcePermissionsGrid = createResourcePermissionsGrid(); addMember(this.resourcePermissionsGrid); + Label bundleGroupPermissionsHeader = new Label("<h4>" + + MSG.view_adminRoles_permissions_bundleGroupPermissions() + "</h4>"); + bundleGroupPermissionsHeader.setHeight(17); + addMember(bundleGroupPermissionsHeader); + this.bundleGroupPermissionsGrid = createBundleGroupPermissionsGrid(); addMember(this.bundleGroupPermissionsGrid); @@ -135,6 +140,13 @@ public class PermissionsEditor extends EnhancedVStack { record.setAttribute("writeAuthorized", this.selectedPermissions.contains(writePermission)); } + ListGridRecord[] bundleGroupPermissionRecords = this.bundleGroupPermissionsGrid.getRecords(); + for (ListGridRecord record : bundleGroupPermissionRecords) { + String permissionName = record.getAttribute("name"); + Permission permission = Permission.valueOf(permissionName); + record.setAttribute("authorized", this.selectedPermissions.contains(permission)); + } + markForRedraw(); } @@ -216,7 +228,6 @@ public class PermissionsEditor extends EnhancedVStack { MSG.view_adminRoles_permissions_permDesc_deployBundles()); records.add(record); - record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_viewUsers(), "global/User", Permission.VIEW_USERS, MSG.view_adminRoles_permissions_permDesc_viewUsers()); records.add(record); @@ -481,6 +492,12 @@ public class PermissionsEditor extends EnhancedVStack { messageString = MSG.view_adminRoles_permissions_autoselecting_configureWrite_implied(); redrawRequired = true; } + } else if (permission == Permission.MANAGE_BUNDLE) { + // MANAGE_BUNDLE implies all other bundle-related perms + if (this.selectedPermissions.addAll(Permission.BUNDLE_ALL)) { + messageString = MSG.view_adminRoles_permissions_autoselecting_manageBundle_implied(); + redrawRequired = true; + } } } else { this.selectedPermissions.remove(permission); @@ -499,14 +516,14 @@ public class PermissionsEditor extends EnhancedVStack { } } - private ListGridRecord createPermissionRecord(String displayName, String icon, Permission globalPermission, + private ListGridRecord createPermissionRecord(String displayName, String icon, Permission permission, String description) { ListGridRecord record = new ListGridRecord(); record.setAttribute("displayName", displayName); record.setAttribute("icon", icon); - record.setAttribute("name", globalPermission.name()); + record.setAttribute("name", permission.name()); record.setAttribute("description", description); - record.setAttribute("authorized", this.selectedPermissions.contains(globalPermission)); + record.setAttribute("authorized", this.selectedPermissions.contains(permission)); return record; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java index 63b6e3f..9c2dc96 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java @@ -268,7 +268,7 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen onItemChanged(); } }); - updateTab(this.resourceGroupsTab, this.resourceGroupSelector); + updateTab(this.bundleGroupsTab, this.bundleGroupSelector); } @@ -393,6 +393,9 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen if (this.ldapGroupSelector != null) { this.ldapGroupSelector.reset(); } + if (this.bundleGroupSelector != null) { + this.bundleGroupSelector.reset(); + } } private static void updateTab(Tab tab, Canvas content) { diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 1f9c73c..25f5171 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -503,8 +503,10 @@ view_adminRoles_ldapGroupsReadOnly = LDAP group data is read only view_adminRoles_noLdap = The LDAP security integration is not configured. To configure LDAP, go to <a {0}>{1}</a>. view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it... view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected CONFIGURE_READ permission, since CONFIGURE_WRITE implies it... +view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions... view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected unselected Resource permissions, since MANAGE_INVENTORY implies all Resource permissions... view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected unselected permissions, since MANAGE_SECURITY implies all other permissions... +view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = Global Permissions view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} read permission cannot be deselected, unless the {0} write permission, which implies the read permission, is deselected first. view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permission cannot be deselected, unless Manage Inventory, which implies all Resource permissions, is deselected first. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 4e73829..8982a54 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -522,12 +522,14 @@ view_adminRoles_ldapGroupsReadOnly = data LDAP skupiny jsou jen pro čtení view_adminRoles_noLdap = Integrace LDAP není nakonfigurována. K nastavení řízení bezpečnosti přes LDAP prosím navštivte <a {0}>{1}</a>. view_adminRoles_permissions_autoselecting_configureRead_implied = Automaticky odoznačeno CONFIGURE_WRITE povolení, protože absence CONFIGURE_READ to implikuje... view_adminRoles_permissions_autoselecting_configureWrite_implied = Automaticky označeno CONFIGURE_READ povolení, protože CONFIGURE_WRITE jej implikuje... +##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions... view_adminRoles_permissions_autoselecting_manageInventory_implied = Automaticky označeny neoznačené zdroje, protože MANAGE_INVENTORY implikuje povolení na všech zdrojích... view_adminRoles_permissions_autoselecting_manageSecurity_implied = Automaticky označeny neoznačená povolení, protože MANAGE_SECURITY implikuje povolení na všech práv... +view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = Globální povolení -view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} read permission cannot be deselected, unless the {0} write permission, which implies the read permission, is deselected first. -view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permission cannot be deselected, unless Manage Inventory, which implies all Resource permissions, is deselected first. -view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} permission cannot be deselected, unless the Manage Security permission, which implies all other permissions, is deselected first. +##view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} read permission cannot be deselected, unless the {0} write permission, which implies the read permission, is deselected first. +##view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permission cannot be deselected, unless Manage Inventory, which implies all Resource permissions, is deselected first. +##view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} permission cannot be deselected, unless the Manage Security permission, which implies all other permissions, is deselected first. view_adminRoles_permissions_isAuthorized = Autorizován? view_adminRoles_permissions_isRead = Čtení? view_adminRoles_permissions_isWrite = Zápis? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index 0db1d05..8b086a7 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -499,7 +499,16 @@ view_adminRoles_globalPerms = Applikationsweite Rechte view_adminRoles_ldapGroups = LDAP-Gruppen view_adminRoles_ldapGroupsReadOnly = LDAP Gruppendaten können nur gelesen werden view_adminRoles_noLdap = Die LDAP-Integration ist nicht konfiguriert. Um LDAP zu konfigurieren, wechseln sie zu <a {0}>{1}</a>. +##view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it... +##view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected CONFIGURE_READ permission, since CONFIGURE_WRITE implies it... +##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions... +##view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected unselected Resource permissions, since MANAGE_INVENTORY implies all Resource permissions... +##view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected unselected permissions, since MANAGE_SECURITY implies all other permissions... +view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = Globale Rechte +##view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} read permission cannot be deselected, unless the {0} write permission, which implies the read permission, is deselected first. +##view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permission cannot be deselected, unless Manage Inventory, which implies all Resource permissions, is deselected first. +##view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} permission cannot be deselected, unless the Manage Security permission, which implies all other permissions, is deselected first. view_adminRoles_permissions_isAuthorized = Berechtigt? view_adminRoles_permissions_isRead = Lesen? view_adminRoles_permissions_isWrite = Schreiben? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 626243e..a78ab58 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -500,8 +500,10 @@ view_adminRoles_ldapGroupsReadOnly = LDAPグループデータは読み出し専 view_adminRoles_noLdap = LDAPセキュリティの統合は構成されていません。LDAPを構成するには、 <a {0}>{1}</a>に行ってください。 view_adminRoles_permissions_autoselecting_configureRead_implied = CONFIGURE_WRITE権限が自動的に選択されました。なぜなら、CONFIGURE_READが無いことがそれを暗示しているからです。 view_adminRoles_permissions_autoselecting_configureWrite_implied = CONFIGURE_READ権限が自動的に選択されました。なぜなら、CONFIGURE_WRITEがそれを暗示しているからです。 +##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions... view_adminRoles_permissions_autoselecting_manageInventory_implied = 未選択のリソース権限が自動的に選択されました。なぜなら、MANAGE_INVENTORYはすべてのリソース権限を暗示しているからです。 view_adminRoles_permissions_autoselecting_manageSecurity_implied = 未選択の権限が自動的に選択されました。なぜなら、MANAGE_SECURITYは他のすべての権限を暗示しているからです。 +view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = グローバル権限 view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} 読み取り権限は選択解除できませんでした。読み取り権限を暗示する {0} 書き込み権限が最初に選択解除されなければそれはできません。 view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} 権限は選択解除できませんでした。他のすべてのリソースを暗示する管理インベントリが最初に選択解除されなければそれはできません。 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 0da2a6e..a00f560 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -447,12 +447,21 @@ view_adminRoles_failLdapGroupsRole = 역할을 위해 사용가능한 LDAP 그 view_adminRoles_failRoles = 역할 제거에 실패했습니다. view_adminRoles_globalPerms = 글로벌 권한 view_adminRoles_ldapGroups = LDAP 그룹 +##view_adminRoles_ldapGroupsReadOnly = LDAP group data is read only view_adminRoles_noLdap = LDAP 보안 통합이 설정되지 않았습니다. LDAP을 구성하려면 <a {0}>{1}</a>로 가십시요. +##view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it... +##view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected CONFIGURE_READ permission, since CONFIGURE_WRITE implies it... +##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions... +##view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected unselected Resource permissions, since MANAGE_INVENTORY implies all Resource permissions... +##view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected unselected permissions, since MANAGE_SECURITY implies all other permissions... +view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = 글로벌 권한 view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} 읽기 권한은 선택 해제 할 수 없습니다. 읽기 권한을 암시하는 {0} 쓰기 권한이 먼저 선택 해제되어야 그것은 수행할 수 있습니다. view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} 권한은 선택 해제 할 수 없습니다. 다른 모든 자원을 암시하는 관리 인벤토리가 먼저 선택 해제되어야 그것은 수행할 수 있습니다. view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} 권한은 선택 해제 할 수 없습니다. 다른 모든 권한을 암시하는 관리 보안 권한이 먼저 선택 해제되어야 그것은 수행할 수 있습니다. view_adminRoles_permissions_isAuthorized = 권한이 있습니까? +##view_adminRoles_permissions_isRead = Read? +##view_adminRoles_permissions_isWrite = Write? ##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle to the bundle group ##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s. can copy existing bundles between viewable groups ##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle [version]s for the bundle group. can copy a viewable bundle to the bundle group. @@ -470,16 +479,22 @@ view_adminRoles_permissions_permDesc_manageSettings = {0} 서버의 수정 및 ##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the group view_adminRoles_permissions_permDesc_viewUsers = 다른 사용자를 볼 수 있습니다. 그러나 그들에게 할당된 역할은 보이지 않습니다. view_adminRoles_permissions_permReadDesc_configure = 자원 설정 및 자원 설정 수정 기록 보기 +##view_adminRoles_permissions_permReadDesc_control = (IMPLIED) view available operations and operation execution history view_adminRoles_permissions_permReadDesc_createChildResources = (암시적) 자식 리소스 만들기 기록 보기 view_adminRoles_permissions_permReadDesc_deleteChildResources = (암시적) 자식 리소스 삭제 기록 보기 +##view_adminRoles_permissions_permReadDesc_inventory = (IMPLIED) view Resource properties (name, description, version, etc.), connection settings, and connection settings history view_adminRoles_permissions_permReadDesc_manageAlerts = (암시적) 경고 정의 및 경고 기록 보기 view_adminRoles_permissions_permReadDesc_manageContent = (암시적) 설치되어 사용가능한 패키지; 패키지 설치 기록 보기 view_adminRoles_permissions_permReadDesc_manageDrift = (암시적) 드리프트 정의와 드리프트 기록 보기 view_adminRoles_permissions_permReadDesc_manageEvents = (암시적) 이벤트 보기 view_adminRoles_permissions_permReadDesc_manageMeasurements = (암시적) 통계 데이터 및 수집 스케쥴 보기 +##view_adminRoles_permissions_permWriteDesc_configure = update Resource configuration; delete Resource configuration revision history items +##view_adminRoles_permissions_permWriteDesc_control = execute operations; delete operation execution history items view_adminRoles_permissions_permWriteDesc_createChildResources = (작성 가능한 유형의 자식 리소스에 대한) 새로운 자식 리소스 만들기 view_adminRoles_permissions_permWriteDesc_deleteChildResources = 자원 제거 인벤토리; (삭제 가능한 유형의 자원에 대한) 리소스 삭제 +##view_adminRoles_permissions_permWriteDesc_inventory = update Resource name, version, description, and connection settings; delete connection settings history items view_adminRoles_permissions_permWriteDesc_manageAlerts = 경고 정의를 만들기, 수정, 삭제; 경고 기록 확인 및 삭제 +##view_adminRoles_permissions_permWriteDesc_manageContent = subscribe to content sources; install and uninstall packages view_adminRoles_permissions_permWriteDesc_manageDrift = 드리프트 정의 만들기, 수정, 삭제; 드리프트 인스턴스 관리 view_adminRoles_permissions_permWriteDesc_manageEvents = 이벤트 삭제 view_adminRoles_permissions_permWriteDesc_manageMeasurements = 통계 수집 스케쥴 수정 @@ -517,6 +532,8 @@ view_adminRoles_resourcePerms = 리소스 권한 view_adminRoles_roleAdded = 역할 [{0}]이 추가되었습니다. view_adminRoles_roleDeleteFailed = 역할 [{0}]의 삭제에 실패했습니다. view_adminRoles_roleDeleted = 역할 [{0}]이 삭제되었습니다. +##view_adminRoles_roleUpdateFailed = Failed to update role [{0}]. +##view_adminRoles_roleUpdated = Role [{0}] updated. view_adminTemplates_definedBy = 정의 view_adminTemplates_platformServices = 플랫폼 서비스 view_adminTemplates_platforms = 플랫폼 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 6d74d41..e6a7864 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -505,8 +505,10 @@ view_adminRoles_ldapGroupsReadOnly = Informa\u00E7\u00F5es do grupo LDAP com per view_adminRoles_noLdap = A integra\u00E7\u00E3o com o LDAP ainda n\u00E3o foi configurada. Para configurar o LDAP acesse <a {0}>{1}</a>. view_adminRoles_permissions_autoselecting_configureRead_implied = Permiss\u00E3o CONFIGURE_WRITE desmarcada automaticamente devida a aus\u00EAncia da permiss\u00E3o CONFIGURE_READ... view_adminRoles_permissions_autoselecting_configureWrite_implied = Permiss\u00E3o CONFIGURE_READ marcada automaticamente devida a marca\u00E7\u00E3o de CONFIGURE_WRITE... +##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions... view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected unselected Resource permissions, since MANAGE_INVENTORY implies all Resource permissions... view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected unselected permissions, since MANAGE_SECURITY implies all other permissions... +view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = Permiss\u00F5es Globais view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} permiss\u00E3o de leitura n\u00E3 pode ser desmarcada, a menos que {0} permiss\u00E3o de escrita, que implica na permiss\u00E3o de leitura, seja desmarcada primeiro. view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permiss\u00E3o n\u00E3o pode ser desmarcada, a menos que Gerenciar Invent\u00E1rio, que implica todas as permiss\u00F5es de Recurso, seja desmarcada primeiro. @@ -584,7 +586,6 @@ view_adminRoles_resourcePerms = Permiss\u00F5es do Recurso view_adminRoles_roleAdded = Perfil [{0}] adicionado. view_adminRoles_roleDeleteFailed = Falha ao excluir o perfil [{0}]. view_adminRoles_roleDeleted = Perfil [{0}] exclu\u00EDdo. -view_adminRoles_roleExists = O perfil com nome [{0}] j\u00E1 existe. view_adminRoles_roleUpdateFailed = Falha ao atualizar o perfil [{0}]. view_adminRoles_roleUpdated = Perfil [{0}] atualizado. ##view_adminTemplates_definedBy = Defined By diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index f31b829..4f9a97e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -2574,6 +2574,7 @@ view_adminConfig_systemSettings = Системные настройки view_adminContent_contentSources = Источники контента view_adminRoles_assignedGroups = Назначенные группы ресурсов view_adminRoles_assignedSubjects = Назначенные субъекты +##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please use another name. view_adminRoles_failLdap = Не удалось определить, настроен ли LDAP - предположительно LDAP отсутствует. view_adminRoles_failLdapGroups = Не удалось получить LDAP-группы. Предположительно LDAP группы отсутствуют view_adminRoles_failLdapGroupsRole = Не удалось загрузить LDAP группы, доступные для роли. @@ -2581,10 +2582,13 @@ view_adminRoles_failRoles = Не удалось получить роли. view_adminRoles_globalPerms = Глобальные полномочия view_adminRoles_ldapGroups = LDAP-группы view_adminRoles_ldapGroupsReadOnly = данные LDAP групп доступны только для чтения +##view_adminRoles_noLdap = The LDAP security integration is not configured. To configure LDAP, go to <a {0}>{1}</a>. view_adminRoles_permissions_autoselecting_configureRead_implied = Автоматически отключено CONFIGURE_WRITE полномочие, поскольку отсутствует CONFIGURE_READ... view_adminRoles_permissions_autoselecting_configureWrite_implied = Автоматически выбрано CONFIGURE_READ полномочие, поскольку CONFIGURE_WRITE подразумевает, что ... +##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions... view_adminRoles_permissions_autoselecting_manageInventory_implied = Автоматически установлены не выбранные полномочия реусурсов, поскольку MANAGE_INVENTORY предполагает все полномочия ресурса... view_adminRoles_permissions_autoselecting_manageSecurity_implied = Автоматически установлены невыбранные полномочия, поскольку MANAGE_SECURITY включает все другие полномочия... +view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = Глобальные полномчия view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} полномочия на чтение не могут быть отключены, пока предварительно {0} полномочия записи, которые включают полномочия на чтение, не будут отключены. view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} полномочия не могут быть отключены, пока предварительно Manage Inventory, которая включает все полномочия ресурса, не будет отключено. @@ -2609,17 +2613,23 @@ view_adminRoles_permissions_permDesc_manageSecurity = можно создава ##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the group ##view_adminRoles_permissions_permDesc_viewUsers = can view other users, with the exception of their assigned roles view_adminRoles_permissions_permReadDesc_configure = просмотр конфигурации ресурса и историю версий конфигурации ресурса +##view_adminRoles_permissions_permReadDesc_control = (IMPLIED) view available operations and operation execution history view_adminRoles_permissions_permReadDesc_createChildResources = (ПОДРАЗУМЕВАЕМЫЙ) просмотр истории создания дочернего ресурса view_adminRoles_permissions_permReadDesc_deleteChildResources = (ПОДРАЗУМЕВАЕМЫЙ) просмотр истории удаления дочернего ресурса view_adminRoles_permissions_permReadDesc_inventory = (ПОДРАЗУМЕВАЕМЫЙ) просмотр свойств ресурса (наименование, описание, версия и т.д.), настройки подключения, и историю настроек подключения view_adminRoles_permissions_permReadDesc_manageAlerts = (ПОДРАЗУМЕВАЕМЫЙ) просмотр определений предупреждений и истории предупреждения +##view_adminRoles_permissions_permReadDesc_manageContent = (IMPLIED) view installed and available packages; view package installation history +##view_adminRoles_permissions_permReadDesc_manageDrift = (IMPLIED) view drift definitions and drift history view_adminRoles_permissions_permReadDesc_manageEvents = (ПОДРАЗУМЕВАЕМЫЙ) просмотр событий +##view_adminRoles_permissions_permReadDesc_manageMeasurements = (IMPLIED) view metric data and collection schedules view_adminRoles_permissions_permWriteDesc_configure = обновить конфигурацию ресурса; удалить элементы истории версий конфигурации ресурса view_adminRoles_permissions_permWriteDesc_control = выполнять операции; удалить элементы истории выполнения операций +##view_adminRoles_permissions_permWriteDesc_createChildResources = create new child Resources (for child Resources of types that are creatable) view_adminRoles_permissions_permWriteDesc_deleteChildResources = убрать ресурс из инвентаризации; удалить ресурсы (для типов ресурсов, которые могут быть удалены) view_adminRoles_permissions_permWriteDesc_inventory = обновить наименование ресурса, версию, описание и настройки подключения; удалить элементы истории настроек подключения view_adminRoles_permissions_permWriteDesc_manageAlerts = создать, обновить и удалить определения уведомлений; подтверждать и удалять элементы истории предупреждений view_adminRoles_permissions_permWriteDesc_manageContent = подписаться на источники контента; устанавливать и удалять пакеты +##view_adminRoles_permissions_permWriteDesc_manageDrift = create, update, and delete drift definitions; and manage drift instances view_adminRoles_permissions_permWriteDesc_manageEvents = удалять события view_adminRoles_permissions_permWriteDesc_manageMeasurements = обновление метрик коллекции планировщиков ##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 1aeb1a1..547ebd5 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -492,14 +492,16 @@ view_adminRoles_globalPerms = \u5168\u5c40\u6388\u6743 view_adminRoles_ldapGroups = LDAP\u7ec4 view_adminRoles_ldapGroupsReadOnly = LDAP\u7ec4\u6570\u636e\u4e3a\u53ea\u8bfb view_adminRoles_noLdap = \u6ca1\u6709\u96c6\u6210LDAP\u5b89\u5168, \u5230<a {0}>{1}</a>. -view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it... -view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected CONFIGURE_READ permission, since CONFIGURE_WRITE implies it... -view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected unselected Resource permissions, since MANAGE_INVENTORY implies all Resource permissions... -view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected unselected permissions, since MANAGE_SECURITY implies all other permissions... +##view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it... +##view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected CONFIGURE_READ permission, since CONFIGURE_WRITE implies it... +##view_adminRoles_permissions_autoselecting_manageBundle_implied = Autoselected unselected permissions, since MANAGE_BUNDLE implies all other bundle permissions... +##view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected unselected Resource permissions, since MANAGE_INVENTORY implies all Resource permissions... +##view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected unselected permissions, since MANAGE_SECURITY implies all other permissions... +view_adminRoles_permissions_bundleGroupPermissions = Bundle Group Permissions view_adminRoles_permissions_globalPermissions = \u5168\u5c40\u6388\u6743 -view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} read permission cannot be deselected, unless the {0} write permission, which implies the read permission, is deselected first. -view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permission cannot be deselected, unless Manage Inventory, which implies all Resource permissions, is deselected first. -view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} permission cannot be deselected, unless the Manage Security permission, which implies all other permissions, is deselected first. +##view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} read permission cannot be deselected, unless the {0} write permission, which implies the read permission, is deselected first. +##view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permission cannot be deselected, unless Manage Inventory, which implies all Resource permissions, is deselected first. +##view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} permission cannot be deselected, unless the Manage Security permission, which implies all other permissions, is deselected first. view_adminRoles_permissions_isAuthorized = \u6388\u6743? view_adminRoles_permissions_isRead = \u8bfb? view_adminRoles_permissions_isWrite = \u5199? @@ -523,16 +525,16 @@ view_adminRoles_permissions_permReadDesc_configure = \u67e5\u770b\u8d44\u6e90\u9 view_adminRoles_permissions_permReadDesc_control = (IMPLIED) \u67e5\u770b\u53ef\u7528\u64cd\u4f5c\u548c\u64cd\u4f5c\u6267\u884c\u5386\u53f2 view_adminRoles_permissions_permReadDesc_createChildResources = (IMPLIED) \u67e5\u770b\u5b50\u8d44\u6e90\u521b\u5efa\u5386\u53f2 view_adminRoles_permissions_permReadDesc_deleteChildResources = (IMPLIED) \u67e5\u770b\u5b50\u8d44\u6e90\u5220\u9664\u5386\u53f2 -view_adminRoles_permissions_permReadDesc_inventory = (IMPLIED) view Resource properties (name, description, version, etc.), connection settings, and connection settings history +##view_adminRoles_permissions_permReadDesc_inventory = (IMPLIED) view Resource properties (name, description, version, etc.), connection settings, and connection settings history view_adminRoles_permissions_permReadDesc_manageAlerts = (IMPLIED) \u67e5\u770b\u544a\u8b66\u5b9a\u4e49\u548c\u544a\u8b66\u5386\u53f2 view_adminRoles_permissions_permReadDesc_manageContent = (IMPLIED) \u67e5\u770b\u5b89\u88c5\u7684\u548c\u53ef\u7528\u7684\u5305; \u67e5\u770b\u5305\u5b89\u88c5\u5386\u53f2 ##view_adminRoles_permissions_permReadDesc_manageDrift = (IMPLIED) view drift definitions and drift history view_adminRoles_permissions_permReadDesc_manageEvents = (IMPLIED)\u67e5\u770b\u4e8b\u4ef6 -view_adminRoles_permissions_permReadDesc_manageMeasurements = (IMPLIED) view metric data and collection schedules +##view_adminRoles_permissions_permReadDesc_manageMeasurements = (IMPLIED) view metric data and collection schedules view_adminRoles_permissions_permWriteDesc_configure = \u66f4\u65b0\u8d44\u6e90\u914d\u7f6e; \u5220\u9664\u8d44\u6e90\u914d\u7f6e\u4fee\u8ba2\u7684\u5386\u53f2\u9879 view_adminRoles_permissions_permWriteDesc_control = \u6267\u884c\u64cd\u4f5c; \u5220\u9664\u64cd\u4f5c\u6267\u884c\u5386\u53f2 view_adminRoles_permissions_permWriteDesc_createChildResources = \u521b\u5efa\u65b0\u7684\u5b50\u8d44\u6e90 (for child Resources of types that are creatable) -view_adminRoles_permissions_permWriteDesc_deleteChildResources = uninventory resources; delete Resources (for Resources of types that are deletable) +##view_adminRoles_permissions_permWriteDesc_deleteChildResources = uninventory resources; delete Resources (for Resources of types that are deletable) view_adminRoles_permissions_permWriteDesc_inventory = \u66f4\u65b0\u8d44\u6e90\u540d, \u7248\u672c,\u63cf\u8ff0, \u548c\u8fde\u63a5\u8bbe\u7f6e; \u5220\u9664\u8fde\u63a5\u8bbe\u7f6e\u5386\u53f2\u9879 view_adminRoles_permissions_permWriteDesc_manageAlerts = \u521b\u5efa, \u66f4\u65b0, \u548c\u5220\u9664\u544a\u8b66\u5b9a\u4e49; \u786e\u8ba4\u548c\u5220\u9664\u5386\u53f2\u544a\u8b66\u9879 view_adminRoles_permissions_permWriteDesc_manageContent = \u8ba2\u9605\u5185\u5bb9\u6e90; \u5b89\u88c5\u5378\u8f7d\u5305

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - modules/enterprise
by mike thompson 25 Jul '13

25 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java | 155 ++-------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 13 2 files changed, 48 insertions(+), 120 deletions(-) New commits: commit bbbaa4ebbadf744568f02f7964a97a5ec4f96198 Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Jul 25 09:51:40 2013 -0700 Consolidated Metrics - Add to Dashboard - enable/disable Add to Dashboard if no selection is made. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java index 84e20eb..cfb1947 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java @@ -20,12 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitori import java.util.LinkedHashMap; -import com.google.gwt.http.client.Request; -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.RequestCallback; -import com.google.gwt.http.client.RequestException; -import com.google.gwt.http.client.Response; -import com.google.gwt.user.client.History; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.widgets.IButton; import com.smartgwt.client.widgets.events.ClickEvent; @@ -33,8 +27,6 @@ import com.smartgwt.client.widgets.form.fields.SelectItem; import com.smartgwt.client.widgets.form.fields.events.ChangeEvent; import com.smartgwt.client.widgets.form.fields.events.ChangeHandler; import com.smartgwt.client.widgets.grid.ListGridRecord; -import com.smartgwt.client.widgets.menu.events.ClickHandler; -import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; import com.smartgwt.client.widgets.toolbar.ToolStrip; import org.rhq.core.domain.configuration.PropertySimple; @@ -42,7 +34,6 @@ import org.rhq.core.domain.criteria.DashboardCriteria; import org.rhq.core.domain.dashboard.Dashboard; import org.rhq.core.domain.dashboard.DashboardPortlet; import org.rhq.core.domain.measurement.MeasurementDefinition; -import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; @@ -68,9 +59,10 @@ public class AddToDashboardComponent extends ToolStrip implements Enhanced { this.resource = resource; setPadding(5); setMembersMargin(15); - setWidth(400); + setWidth(300); dashboardMenuMap = new LinkedHashMap<String, String>(); dashboardMap = new LinkedHashMap<Integer, Dashboard>(); + createToolstrip(); } @Override @@ -87,8 +79,8 @@ public class AddToDashboardComponent extends ToolStrip implements Enhanced { dashboardSelectItem = new SelectItem(); dashboardSelectItem.setTitle("Dashboards"); - dashboardSelectItem.setWidth(350); - dashboardSelectItem.setPickListWidth(250); + dashboardSelectItem.setWidth(300); + dashboardSelectItem.setPickListWidth(210); populateDashboardMenu(); addFormItem(dashboardSelectItem); addMember(addToDashboardButton); @@ -105,10 +97,13 @@ public class AddToDashboardComponent extends ToolStrip implements Enhanced { public void onClick(ClickEvent clickEvent) { ListGridRecord[] selectedRecords = metricsListGrid.getSelectedRecords(); for (ListGridRecord selectedRecord : selectedRecords) { - for (MeasurementDefinition measurementDefinition : resource.getResourceType().getMetricDefinitions()) { - if(measurementDefinition.getId() == selectedRecord.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID)){ - Log.debug("**Add to Dashboard -- Storing: "+measurementDefinition.getDisplayName() +" in "+ selectedDashboard.getName()); - storeDashboardMetric(selectedDashboard,resource,measurementDefinition); + for (MeasurementDefinition measurementDefinition : resource.getResourceType() + .getMetricDefinitions()) { + if (measurementDefinition.getId() == selectedRecord + .getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID)) { + Log.debug("Add to Dashboard -- Storing: " + measurementDefinition.getDisplayName() + + " in " + selectedDashboard.getName()); + storeDashboardMetric(selectedDashboard, resource, measurementDefinition); break; } } @@ -117,28 +112,39 @@ public class AddToDashboardComponent extends ToolStrip implements Enhanced { }); } + public void disableAddToDashboardButton(){ + addToDashboardButton.disable(); + } + + public void enableAddToDashboardButton(){ + addToDashboardButton.enable(); + } + + public void populateDashboardMenu() { dashboardMenuMap.clear(); dashboardMap.clear(); DashboardCriteria criteria = new DashboardCriteria(); GWTServiceLookup.getDashboardService().findDashboardsByCriteria(criteria, - new AsyncCallback<PageList<Dashboard>>() { + new AsyncCallback<PageList<Dashboard>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_dashboard(), - caught); - } + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_dashboard(), + caught); + } - public void onSuccess(PageList<Dashboard> dashboards) { - for (final Dashboard dashboard : dashboards) { - dashboardMenuMap.put(String.valueOf(dashboard.getId()), - MSG.view_tree_common_contextMenu_addChartToDashboard(dashboard.getName())); - dashboardMap.put(dashboard.getId(), dashboard); - dashboardSelectItem.setValueMap(dashboardMenuMap); - } + public void onSuccess(PageList<Dashboard> dashboards) { + for (final Dashboard dashboard : dashboards) { + dashboardMenuMap.put(String.valueOf(dashboard.getId()), + MSG.view_tree_common_contextMenu_addChartToDashboard(dashboard.getName())); + dashboardMap.put(dashboard.getId(), dashboard); } - }); + selectedDashboard = dashboards.get(0); + dashboardSelectItem.setValueMap(dashboardMenuMap); + dashboardSelectItem.setValue(selectedDashboard.getId()); + } + }); } /** @@ -149,25 +155,6 @@ public class AddToDashboardComponent extends ToolStrip implements Enhanced { this.metricsListGrid = metricsListGrid; } - /** Locate the specific schedule definition using the definition identifier. - */ - private static int getScheduleDefinitionId(Resource resource, int definitionId) { - int id = -1; - if (resource.getSchedules() != null) { - boolean located = false; - MeasurementSchedule[] schedules = new MeasurementSchedule[resource.getSchedules().size()]; - resource.getSchedules().toArray(schedules); - for (int i = 0; (!located && i < resource.getSchedules().size()); i++) { - MeasurementSchedule schedule = schedules[i]; - MeasurementDefinition definition = schedule.getDefinition(); - if ((definition != null) && definition.getId() == definitionId) { - located = true; - id = schedule.getId(); - } - } - } - return id; - } private void storeDashboardMetric(Dashboard dashboard, Resource resource, MeasurementDefinition definition) { DashboardPortlet dashboardPortlet = new DashboardPortlet(MSG.view_tree_common_contextMenu_resourceGraph(), @@ -194,76 +181,4 @@ public class AddToDashboardComponent extends ToolStrip implements Enhanced { }); } - private static void addNewMetric(String id, String selectedView, String resourceGraphElements) { - //construct portal.war url to access - String baseUrl = "/resource/common/monitor/visibility/IndicatorCharts.do"; - baseUrl += "?id=" + id; - baseUrl += "&view=" + selectedView; - baseUrl += "&action=addChart&metric=" + resourceGraphElements; - final String url = baseUrl; - //initiate HTTP request - final RequestBuilder b = new RequestBuilder(RequestBuilder.GET, baseUrl); - - try { - b.setCallback(new RequestCallback() { - public void onResponseReceived(final Request request, final Response response) { - Log.trace("Successfully submitted request to add graph to view:" + url); - - //kick off a page reload. - String currentViewPath = History.getToken(); - CoreGUI.goToView(currentViewPath, true); - } - - @Override - public void onError(Request request, Throwable t) { - Log.warn("Error adding Metric:" + url, t); - } - }); - b.send(); - } catch (RequestException e) { - Log.warn("Error adding Metric:" + url, e); - } - - } - - private static class AddToDashboardClickHandler implements ClickHandler { - - private final Resource resource; - private final MeasurementDefinition definition; - private final Dashboard dashboard; - - public AddToDashboardClickHandler(Resource resource, MeasurementDefinition definition, Dashboard dashboard) { - this.resource = resource; - this.definition = definition; - this.dashboard = dashboard; - } - - public void onClick(MenuItemClickEvent menuItemClickEvent) { - DashboardPortlet dashboardPortlet = new DashboardPortlet(MSG.view_tree_common_contextMenu_resourceGraph(), - ResourceD3GraphPortlet.KEY, 250); - dashboardPortlet.getConfiguration().put( - new PropertySimple(ResourceD3GraphPortlet.CFG_RESOURCE_ID, resource.getId())); - dashboardPortlet.getConfiguration().put( - new PropertySimple(ResourceD3GraphPortlet.CFG_DEFINITION_ID, definition.getId())); - - dashboard.addPortlet(dashboardPortlet); - - GWTServiceLookup.getDashboardService().storeDashboard(dashboard, new AsyncCallback<Dashboard>() { - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), caught); - } - - public void onSuccess(Dashboard result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_tree_common_contextMenu_saveChartToDashboardSuccessful(result.getName()), - Message.Severity.Info)); - } - }); - - } - - } - } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index a4b15d1..09a7bc3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -46,6 +46,8 @@ import com.smartgwt.client.widgets.grid.events.RecordCollapseEvent; import com.smartgwt.client.widgets.grid.events.RecordCollapseHandler; import com.smartgwt.client.widgets.grid.events.RecordExpandEvent; import com.smartgwt.client.widgets.grid.events.RecordExpandHandler; +import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler; +import com.smartgwt.client.widgets.grid.events.SelectionEvent; import com.smartgwt.client.widgets.grid.events.SortChangedHandler; import com.smartgwt.client.widgets.grid.events.SortEvent; import com.smartgwt.client.widgets.layout.VLayout; @@ -115,6 +117,17 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re addTableAction(MSG.view_measureTable_getLive(), new ShowLiveDataTableAction(this)); addExtraWidget(addToDashboardComponent, false); + addToDashboardComponent.disableAddToDashboardButton(); + metricsTableListGrid.addSelectionChangedHandler(new SelectionChangedHandler() { + @Override + public void onSelectionChanged(SelectionEvent selectionEvent) { + if(metricsTableListGrid.getSelectedRecords().length > 0){ + addToDashboardComponent.enableAddToDashboardButton(); + }else { + addToDashboardComponent.disableAddToDashboardButton(); + } + } + }); } private static class ShowLiveDataTableAction implements TableAction {

1 0

[rhq] modules/plugins
by Thomas Segismont 25 Jul '13

25 Jul '13

modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 4ab947d9c450a94601055509cb9c4240b0652210 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 25 18:06:07 2013 +0200 Bug 886126 - Datasource JNDI change takes too long to be propagated to JON server In EAP5, JNDI name is the key of Datasource and Connection Factory managed components. Consequently, there is no way to change the JNDI name of such components without creating a new managed component, which will in the end be discovered by RHQ. So in RHQ, jndi-name config property is now marked as read-only (it will still be required when creating a Datasource or a Connection Factory). diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml index 2b14f5b..9a53a80 100644 --- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml @@ -133,6 +133,7 @@ <!ENTITY datasourceConnectionResourceConfigProps ' <c:simple-property name="jndi-name" + readOnly="true" displayName="JNDI Name" description="The global JNDI Name under which to bind the datasource" type="string"/> @@ -502,7 +503,7 @@ --> <!ENTITY connectionFactoryConnectionResourceConfigProps ' - <c:simple-property required="true" name="jndi-name" displayName="JNDI Name" + <c:simple-property required="true" name="jndi-name" readOnly="true" displayName="JNDI Name" description="The global JNDI name to bind the connection factory under."/> <c:simple-property required="true" name="rar-name" displayName="RAR Name">

1 0

[rhq] 3 commits - modules/enterprise modules/integration-tests
by Heiko W. Rupp 25 Jul '13

25 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java | 15 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/helper/LinkDeserializer.java | 28 modules/integration-tests/rest-api/pom.xml | 11 modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java | 337 +++++----- modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java | 4 modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkDeserializer.java | 18 modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkSerializer.java | 53 + 7 files changed, 308 insertions(+), 158 deletions(-) New commits: commit ddef8592f462ec95309368170b1e6c60966b8d6b Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Jul 25 17:17:27 2013 +0200 Make the parser check its input and bail out if it is not valid. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/helper/LinkDeserializer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/helper/LinkDeserializer.java index e9582d4..f320d09 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/helper/LinkDeserializer.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/helper/LinkDeserializer.java @@ -20,7 +20,11 @@ package org.rhq.enterprise.server.rest.helper; import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.codehaus.jackson.JsonLocation; +import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.JsonProcessingException; import org.codehaus.jackson.map.DeserializationContext; @@ -44,25 +48,47 @@ import org.rhq.enterprise.server.rest.domain.Link; */ public class LinkDeserializer extends JsonDeserializer<Link>{ + Pattern textPattern = Pattern.compile("\\S+"); // Non whitespace; could possibly be narrowed + @Override public Link deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { String tmp = jp.getText(); // { + validate(jp, tmp,"{"); jp.nextToken(); // skip over { to the rel String rel = jp.getText(); + validateText(jp, rel); jp.nextToken(); // skip over { tmp = jp.getText(); + validate(jp, tmp,"{"); jp.nextToken(); // skip over "href" tmp = jp.getText(); -// jp.nextToken(); // skip over : + validate(jp, tmp,"href"); jp.nextToken(); // skip to "http:// ... " String href = jp.getText(); + validateText(jp, href); jp.nextToken(); // skip } tmp = jp.getText(); + validate(jp, tmp, "}"); jp.nextToken(); // skip } + tmp = jp.getText(); + validate(jp, tmp, "}"); Link link = new Link(rel,href); return link; } + + private void validateText(JsonParser jsonParser, String input) throws JsonProcessingException { + Matcher m = textPattern.matcher(input); + if (!m.matches()) { + throw new JsonParseException("Unexpected token: " + input, jsonParser.getTokenLocation()); + } + } + + private void validate(JsonParser jsonParser, String input, String expected) throws JsonProcessingException { + if (!input.equals(expected)) { + throw new JsonParseException("Unexpected token: " + input, jsonParser.getTokenLocation()); + } + } } diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java index 3d39181..7789f9e 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java @@ -18,7 +18,6 @@ */ package org.rhq.modules.integrationTests.restApi; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -219,10 +218,61 @@ public class OperationsTest extends AbstractBase { .when() .delete("/operation/" + draftId); } + } + + @Test + public void testCatchBadLinkSerialization() throws Exception { + + // Test that when we get Links back in bad format, we + // correctly bail out. + + Operation draft = getADraftOperation(_platformId, discoveryDefinitionId); + + int draftId = draft.getId(); + draft.getParams().put("detailedDiscovery",true); + + String jsonWithBadLinkSer = // + "{\n" + + " \"id\": " + draftId + ",\n" + + " \"name\": \"discovery\",\n" + + " \"readyToSubmit\": false,\n" + + " \"resourceId\": " + _platformId + ",\n" + + " \"definitionId\": " + discoveryDefinitionId + ",\n" + + " \"params\": {\n" + + " \"detailedDiscovery\": true\n" + + " },\n" + + " \"links\": [\n" + + " {\n" + + " \"rel\": \"edit\",\n" + + " \"href\": \"http://localhost:7080/rest/operation/" + draftId + "\"\n" + + " }\n" + + " ]\n" + + "}"; + + try { + given() + .contentType(ContentType.JSON) + .pathParam("id", draftId) + .body(jsonWithBadLinkSer) + .log().everything() + .expect() + .statusCode(503) + .log().ifError() + .when() + .put("/operation/{id}"); + } finally { + // delete the draft again + expect() + .statusCode(204) + .when() + .delete("/operation/" + draftId); + } } + + @Test public void testCreateDraftOperationAndScheduleExecution() throws Exception { commit 32395046687dcfd0cd9e46164a9ce4b6a82d1752 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Jul 25 14:57:07 2013 +0200 Add a LinkSerializer to send links in correct format (one could argue not to send links at all). diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java index 57c1a49..3d39181 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java @@ -318,8 +318,6 @@ public class OperationsTest extends AbstractBase { assert draft != null; assert draft.getDefinitionId() == definitionId; - draft.setLinks(new ArrayList<Link>()); // Clean out links TODO - System.out.println("--- Draft created --"); System.out.flush(); diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java index c3f7b2b..c199729 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java @@ -20,11 +20,13 @@ package org.rhq.modules.integrationTests.restApi.d; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * A Link inside objects * @author Heiko W. Rupp */ +@JsonSerialize(using = LinkSerializer.class) @JsonDeserialize(using = LinkDeserializer.class) public class Link { diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkSerializer.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkSerializer.java new file mode 100644 index 0000000..759c8dc --- /dev/null +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkSerializer.java @@ -0,0 +1,53 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.modules.integrationTests.restApi.d; + +import java.io.IOException; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +/** + * Special serializer for Link objects that does not map the classical {rel:abc, href:xyz} scheme, + * but which puts the rel name "at the outside" like { abc : { href : xyz }} to make it easier for + * clients to access the link. + * See also https://bugzilla.redhat.com/show_bug.cgi?id=845244 + * @author Heiko W. Rupp + * @see LinkDeserializer + */ +public class LinkSerializer extends JsonSerializer<Link> { + + @Override + public void serialize(Link link, JsonGenerator jsonGenerator, + SerializerProvider serializerProvider) throws IOException, JsonProcessingException { + + jsonGenerator.writeStartObject(); + jsonGenerator.writeFieldName(link.getRel()); + + jsonGenerator.writeStartObject(); + jsonGenerator.writeFieldName("href"); + jsonGenerator.writeString(link.getHref()); + jsonGenerator.writeEndObject(); + + jsonGenerator.writeEndObject(); + } +} commit 83336d77e19949e332d29e936ce6739aded399da Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Jul 25 12:55:54 2013 +0200 BZ 974963 Allow to schedule operations that have no parameters. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java index 5e8e68e..070675e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java @@ -303,12 +303,15 @@ public class OperationsHandlerBean extends AbstractRestBean { // Validate parameters ConfigurationDefinition parameterDefinition = opDef.getParametersConfigurationDefinition(); - List<String> errorMessages = ConfigurationHelper.checkConfigurationWrtDefinition(parameters, parameterDefinition); - - if (errorMessages.size()>0) { - // Configuration is not ok - operation.setReadyToSubmit(false); - throw new BadArgumentException("Validation of parameters failed", StringUtils.getListAsString(errorMessages,", ")); + if (parameterDefinition!=null) { + // There are parameters defined, so lets validate them. + List<String> errorMessages = ConfigurationHelper.checkConfigurationWrtDefinition(parameters, parameterDefinition); + + if (errorMessages.size()>0) { + // Configuration is not ok + operation.setReadyToSubmit(false); + throw new BadArgumentException("Validation of parameters failed", StringUtils.getListAsString(errorMessages,", ")); + } } } diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index 47bfe18..5d7bde5 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -18,7 +18,7 @@ <properties> <surefire-plugin.version>2.10</surefire-plugin.version> - <jackson.version>1.9.5</jackson.version> + <jackson.version>2.0.5</jackson.version> <rest-assured.version>1.8.1</rest-assured.version> </properties> @@ -53,15 +53,14 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> <version>${jackson.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> <version>${jackson.version}</version> <scope>test</scope> </dependency> diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java index 7800e5c..57c1a49 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java @@ -18,6 +18,7 @@ */ package org.rhq.modules.integrationTests.restApi; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -42,7 +43,8 @@ import static org.hamcrest.core.Is.is; */ public class OperationsTest extends AbstractBase { - private int definitionId; + private int discoveryDefinitionId; + private int viewPLDefinitionId; @Before public void setUp() throws Exception { @@ -58,15 +60,20 @@ public class OperationsTest extends AbstractBase { .when() .get("/operation/definitions"); - definitionId = -1; + discoveryDefinitionId = -1; List<Map<String,Object>> list = r.as(List.class); for (Map<String,Object> map : list) { - if (map.get("name").equals("discovery")) { - definitionId = (Integer) map.get("id"); + String name = (String) map.get("name"); + Integer id = (Integer) map.get("id"); + if (name.equals("discovery")) { + discoveryDefinitionId = id; + } + if (name.equals("viewProcessList")) { + viewPLDefinitionId = id; } } - assert definitionId !=-1 : "No discovery operation found"; + assert discoveryDefinitionId !=-1 : "No discovery operation found"; } @Test @@ -76,7 +83,7 @@ public class OperationsTest extends AbstractBase { given() .header(acceptJson) - .pathParam("did",definitionId) + .pathParam("did", discoveryDefinitionId) .expect() .statusCode(200) .body("name",is("discovery")) @@ -92,7 +99,7 @@ public class OperationsTest extends AbstractBase { given() .header(acceptJson) - .pathParam("did",-42) + .pathParam("did", -42) .expect() .statusCode(404) .when() @@ -107,7 +114,7 @@ public class OperationsTest extends AbstractBase { given() .header(acceptJson) - .queryParam("resourceId",42) + .queryParam("resourceId", 42) .expect() .statusCode(404) .when() @@ -134,7 +141,7 @@ public class OperationsTest extends AbstractBase { given() .header(acceptJson) - .pathParam("did",-42) + .pathParam("did", -42) .expect() .statusCode(406) .when() @@ -150,7 +157,7 @@ public class OperationsTest extends AbstractBase { given() .header(acceptJson) .queryParam("resourceId", 42) - .pathParam("definitionId", definitionId) + .pathParam("definitionId", discoveryDefinitionId) .expect() .statusCode(404) .when() @@ -164,7 +171,7 @@ public class OperationsTest extends AbstractBase { given() .header(acceptJson) - .pathParam("definitionId", definitionId) + .pathParam("definitionId", discoveryDefinitionId) .expect() .statusCode(406) .when() @@ -174,20 +181,7 @@ public class OperationsTest extends AbstractBase { @Test public void testCreateDraftOperation() throws Exception { - Operation draft = - given() - .header(acceptJson) - .pathParam("definitionId",definitionId) - .queryParam("resourceId",_platformId) - .expect() - .statusCode(200) - .log().ifError() - .when() - .post("/operation/definition/{definitionId}") - .as(Operation.class); - - assert draft != null; - assert draft.getDefinitionId() == definitionId; + Operation draft = getADraftOperation(_platformId, discoveryDefinitionId); int draftId = draft.getId(); @@ -202,29 +196,17 @@ public class OperationsTest extends AbstractBase { @Test public void testCreateAndUpdateDraftOperation() throws Exception { - Operation draft = - given() - .header(acceptJson) - .pathParam("definitionId",definitionId) - .queryParam("resourceId",_platformId) - .expect() - .statusCode(200) - .log().ifError() - .when() - .post("/operation/definition/{definitionId}") - .as(Operation.class); - - assert draft != null; - assert draft.getDefinitionId() == definitionId; + Operation draft = getADraftOperation(_platformId, discoveryDefinitionId); int draftId = draft.getId(); - draft.getParams().put("detailed",true); + draft.getParams().put("detailedDiscovery",true); try { given() .contentType(ContentType.JSON) .pathParam("id", draftId) .body(draft) + .log().everything() .expect() .statusCode(200) .log().ifError() @@ -246,25 +228,51 @@ public class OperationsTest extends AbstractBase { int platformId = findIdOfARealPlatform(); - Operation draft = + Operation draft = getADraftOperation(platformId, discoveryDefinitionId); + + int draftId = draft.getId(); + + draft.setReadyToSubmit(true); + draft.getParams().put("detailedDiscovery", false); + + // update to schedule + Operation scheduled = given() - .header(acceptJson) - .pathParam("definitionId",definitionId) - .queryParam("resourceId",platformId) + .contentType(ContentType.JSON) + .pathParam("id",draftId) + .body(draft) .expect() .statusCode(200) .log().ifError() .when() - .post("/operation/definition/{definitionId}") + .put("/operation/{id}") .as(Operation.class); - assert draft != null; - assert draft.getDefinitionId() == definitionId; + System.out.println(scheduled.getId()); + String history = findHistoryItem(scheduled); + + String historyId = history.substring(history.lastIndexOf("/")+1); + try { + waitAndCheckStatus(platformId, historyId); + + } finally { + + // Wait until the operation has finished and then delete + waitForTerminationAndDelete(historyId); + + } + } + + @Test + public void testCreateDraftOperationNoParamsAndScheduleExecution() throws Exception { + + int platformId = findIdOfARealPlatform(); + + Operation draft = getADraftOperation(platformId, viewPLDefinitionId); int draftId = draft.getId(); draft.setReadyToSubmit(true); - draft.getParams().put("detailedDiscovery", false); // update to schedule Operation scheduled = @@ -280,6 +288,45 @@ public class OperationsTest extends AbstractBase { .as(Operation.class); System.out.println(scheduled.getId()); + String history = findHistoryItem(scheduled); + + String historyId = history.substring(history.lastIndexOf("/")+1); + try { + waitAndCheckStatus(platformId, historyId); + + } finally { + + // Wait until the operation has finished and then delete + waitForTerminationAndDelete(historyId); + + } + } + + private Operation getADraftOperation(int platformId, int definitionId) { + Operation draft = + given() + .header(acceptJson) + .pathParam("definitionId", definitionId) + .queryParam("resourceId",platformId) + .expect() + .statusCode(200) + .log().ifError() + .when() + .post("/operation/definition/{definitionId}") + .as(Operation.class); + + assert draft != null; + assert draft.getDefinitionId() == definitionId; + + draft.setLinks(new ArrayList<Link>()); // Clean out links TODO + + System.out.println("--- Draft created --"); + System.out.flush(); + + return draft; + } + + private String findHistoryItem(Operation scheduled) { String history = null; List<Link> links = scheduled.getLinks(); for (Link link : links) { @@ -288,76 +335,74 @@ public class OperationsTest extends AbstractBase { } } assert history != null; + return history; + } - String historyId = history.substring(history.lastIndexOf("/")+1); - try { - Thread.sleep(15000); // we need to wait a little as the execution may take time + private void waitAndCheckStatus(int platformId, String historyId) throws InterruptedException { + Thread.sleep(15000); // we need to wait a little as the execution may take time - given() - .pathParam("hid",historyId) - .expect() - .statusCode(200) - .log().ifError() - .when() - .get("/operation/history/{hid}"); + given() + .pathParam("hid", historyId) + .expect() + .statusCode(200) + .log().ifError() + .when() + .get("/operation/history/{hid}"); + + // See if we also find it when we are looking for histories on the resource + Response response = + given() + .queryParam("resourceId", platformId) + .header(acceptJson) + .expect() + .statusCode(200) + .log().ifError() + .when() + .get("/operation/history"); - // See if we also find it when we are looking for histories on the resource + // compare + List<Map<String,Object>> list = response.as(List.class); + boolean found = false; + for (Map<String,Object> map : list) { + if (map.get("jobId").equals(historyId)) { + found = true; + } + } + assert found; + } + + private void waitForTerminationAndDelete(String historyId) throws InterruptedException { + boolean done = false; + int count = 0; + while (!done) { Response response = given() - .queryParam("resourceId",platformId) .header(acceptJson) - .expect() - .statusCode(200) - .log().ifError() + .pathParam("hid", historyId) .when() - .get("/operation/history"); - - // compare - List<Map<String,Object>> list = response.as(List.class); - boolean found = false; - for (Map<String,Object> map : list) { - if (map.get("jobId").equals(historyId)) { - found = true; - } - } - assert found; + .get("/operation/history/{hid}"); - } finally { + JsonPath jsonPath = response.jsonPath(); + String status= jsonPath.getString("status"); + int code = response.statusCode(); - // Wait until the operation has finished and then delete - boolean done = false; - int count = 0; - while (!done) { - Response response = - given() - .header(acceptJson) - .pathParam("hid", historyId) - .when() - .get("/operation/history/{hid}"); - - JsonPath jsonPath = response.jsonPath(); - String status= jsonPath.getString("status"); - int code = response.statusCode(); - - if (code==200 && (status.equals("Success") || status.equals("Failed"))) { - done = true; - } else { - Thread.sleep(2000); - } - count ++; - assert count < 10 :"Waited for 20sec -- something is wrong"; + if (code==200 && (status.equals("Success") || status.equals("Failed"))) { + done = true; + } else { + Thread.sleep(2000); } - - // Delete the history item - given() - .pathParam("hid",historyId) - .expect() - .statusCode(204) - .log().ifError() - .when() - .delete("/operation/history/{hid}"); - + count ++; + assert count < 10 :"Waited for 20sec -- something is wrong"; } + + // Delete the history item + given() + .pathParam("hid", historyId) + .expect() + .statusCode(204) + .log().ifError() + .when() + .delete("/operation/history/{hid}"); } @Test @@ -365,20 +410,7 @@ public class OperationsTest extends AbstractBase { int platformId = findIdOfARealPlatform(); - Operation draft = - given() - .header(acceptJson) - .pathParam("definitionId",definitionId) - .queryParam("resourceId",platformId) - .expect() - .statusCode(200) - .log().ifError() - .when() - .post("/operation/definition/{definitionId}") - .as(Operation.class); - - assert draft != null; - assert draft.getDefinitionId() == definitionId; + Operation draft = getADraftOperation(platformId, discoveryDefinitionId); int draftId = draft.getId(); @@ -423,20 +455,7 @@ public class OperationsTest extends AbstractBase { int platformId = findIdOfARealPlatform(); - Operation draft = - given() - .header(acceptJson) - .pathParam("definitionId",definitionId) - .queryParam("resourceId",platformId) - .expect() - .statusCode(200) - .log().ifError() - .when() - .post("/operation/definition/{definitionId}") - .as(Operation.class); - - assert draft != null; - assert draft.getDefinitionId() == definitionId; + Operation draft = getADraftOperation(platformId, discoveryDefinitionId); int draftId = draft.getId(); diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java index e16213c..c3f7b2b 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Link.java @@ -19,7 +19,7 @@ package org.rhq.modules.integrationTests.restApi.d; -import org.codehaus.jackson.map.annotate.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; /** * A Link inside objects diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkDeserializer.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkDeserializer.java index 5d45724..c138761 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkDeserializer.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/LinkDeserializer.java @@ -21,19 +21,19 @@ package org.rhq.modules.integrationTests.restApi.d; import java.io.IOException; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonProcessingException; -import org.codehaus.jackson.ObjectCodec; -import org.codehaus.jackson.map.DeserializationContext; -import org.codehaus.jackson.map.JsonDeserializer; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; /** * Custom deserializer for link object that are now in the form { relname : { "href": link}} * * @author Heiko W. Rupp */ -public class LinkDeserializer extends JsonDeserializer<Link>{ +public class LinkDeserializer extends JsonDeserializer<Link> { @Override public Link deserialize(JsonParser jsonParser, @@ -41,8 +41,8 @@ public class LinkDeserializer extends JsonDeserializer<Link>{ ObjectCodec oc = jsonParser.getCodec(); JsonNode node = oc.readTree(jsonParser); - String rel = node.getFieldNames().next(); - String href = node.getElements().next().get("href").getTextValue(); + String rel = node.fieldNames().next(); + String href = node.elements().next().get("href").textValue(); return new Link(rel,href);

1 0

[rhq] modules/plugins
by Thomas Segismont 25 Jul '13

25 Jul '13

modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 38 +++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) New commits: commit bac87d4800260b79c0398291d3909aa1b383b5e2 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 25 16:50:06 2013 +0200 Make CassandraNodeComponent shutdown operation wait for server to go down (unless running on OSX) diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 37aa425..3e55a93 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -68,6 +68,7 @@ import org.rhq.core.pluginapi.util.ProcessExecutionUtility; import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.ProcessInfo; +import org.rhq.core.system.ProcessInfo.ProcessInfoSnapshot; import org.rhq.core.system.SystemInfo; import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; @@ -140,7 +141,6 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent if (isStorageServiceReachable()) { return AvailabilityType.UP; } - return AvailabilityType.DOWN; } finally { long totalTimeMillis = NANOSECONDS.toMillis(System.nanoTime() - start); @@ -190,6 +190,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if (name.equals("shutdown")) { OperationResult operationResult = shutdownNode(); + waitForNodeToGoDown(); return operationResult; } else if (name.equals("start")) { return startNode(); @@ -238,7 +239,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent protected OperationResult stopNode() { ProcessInfo process = getResourceContext().getNativeProcess(); - if (processInfo == null) { + if (process == null) { LOG.warn("Failed to obtain process info. It appears Cassandra is already shutdown."); return new OperationResult("Failed to obtain process info. It appears Cassandra is already shutdown."); } @@ -265,6 +266,39 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } + private void waitForNodeToGoDown() throws InterruptedException { + if (OperatingSystem.getInstance().getName().equals(OperatingSystem.NAME_MACOSX)) { + // See this thread on VMWare forum: http://communities.vmware.com/message/2187972#2187972 + // Unfortunately there is no work around for this failure on Mac OSX so the method will silently return on + // this platform. + return; + } + for (ProcessInfoSnapshot processInfoSnapshot = getProcessInfoSnapshot();; processInfoSnapshot = getProcessInfoSnapshot()) { + if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { + // Process not found, so it died, that's fine + // OR + // Process info says process is no longer running, that's fine as well + break; + } + if (getResourceContext().getComponentInvocationContext().isInterrupted()) { + // Operation canceled or timed out + throw new InterruptedException(); + } + // Process is still running, wait a second and check again + Thread.sleep(SECONDS.toMillis(2)); + } + } + + private ProcessInfoSnapshot getProcessInfoSnapshot() { + ProcessInfoSnapshot processInfoSnapshot = (processInfo == null) ? null : processInfo.freshSnapshot(); + if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { + processInfo = getResourceContext().getNativeProcess(); + // Safe to get prior snapshot here, we've just recreated the process info instance + processInfoSnapshot = (processInfo == null) ? null : processInfo.priorSnaphot(); + } + return processInfoSnapshot; + } + protected OperationResult startNode() { Configuration pluginConfig = getResourceContext().getPluginConfiguration(); String baseDir = pluginConfig.getSimpleValue("baseDir");

1 0

[rhq] 2 commits - modules/enterprise modules/plugins
by snegrea 25 Jul '13

25 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 48 ++++++---- modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 28 +++++ modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java | 26 +++-- modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 4 4 files changed, 80 insertions(+), 26 deletions(-) New commits: commit 76183b30be9694e81ed93239ff505f887c101f32 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Jul 25 08:51:47 2013 -0500 Add support for updating the JMX Port. The process sends a restart to the resource last to avoid putting the Server in maintenance mode. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 1441785..7a7eda4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -103,7 +103,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private static final String RHQ_STORAGE_ADDRESS_PROPERTY = "host"; private static final int OPERATION_QUERY_TIMEOUT = 20000; - private static final int MAX_ITERATIONS = 6; + private static final int MAX_ITERATIONS = 10; private static final String UPDATE_CONFIGURATION_OPERATION = "updateConfiguration"; private static final String RESTART_OPERATION = "restart"; @@ -639,16 +639,45 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN StorageNode storageNode = findStorageNodeByAddress(storageNodeConfiguration.getStorageNode().getAddress()); if (storageNode != null && storageNode.getResource() != null) { - Resource storageNodeResource = storageNode.getResource(); Configuration parameters = new Configuration(); parameters.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); - parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); - parameters.setSimpleValue("heapNewSize", storageNodeConfiguration.getHeapNewSize() + ""); - parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); - parameters.setSimpleValue("restartIfRequired", "true"); + if (storageNodeConfiguration.getHeapSize() != null) { + parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); + } + if (storageNodeConfiguration.getHeapNewSize() != null) { + parameters.setSimpleValue("heapNewSize", storageNodeConfiguration.getHeapNewSize() + ""); + } + if (storageNodeConfiguration.getThreadStackSize() != null) { + parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); + } + parameters.setSimpleValue("restartIfRequired", "false"); - return runOperationAndWaitForResult(subject, storageNodeResource, UPDATE_CONFIGURATION_OPERATION, + Resource storageNodeResource = storageNode.getResource(); + + boolean result = runOperationAndWaitForResult(subject, storageNodeResource, UPDATE_CONFIGURATION_OPERATION, parameters); + + if (result) { + Configuration storageNodePluginConfig = configurationManager.getPluginConfiguration(subject, + storageNodeResource.getId()); + + String existingJMXPort = storageNodePluginConfig.getSimpleValue("jmxPort"); + storageNodePluginConfig.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); + + String existingConnectionURL = storageNodePluginConfig.getSimpleValue("connectorAddress"); + String newConnectionURL = existingConnectionURL.replace(":" + existingJMXPort + "/", ":" + + storageNodeConfiguration.getJmxPort() + "/"); + storageNodePluginConfig.setSimpleValue("connectorAddress", newConnectionURL); + + configurationManager.updatePluginConfiguration(subject, storageNodeResource.getId(), + storageNodePluginConfig); + + storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); + entityManager.merge(storageNode); + entityManager.flush(); + + return runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, null); + } } return false; diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 41a0c42..125f4d2 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -117,6 +117,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper //update storage node jvm settings Configuration config = new Configuration(); + config.put(new PropertySimple("jmxPort", params.getSimpleValue("jmxPort"))); config.put(new PropertySimple("minHeapSize", params.getSimpleValue("heapSize"))); config.put(new PropertySimple("maxHeapSize", params.getSimpleValue("heapSize"))); config.put(new PropertySimple("heapNewSize", params.getSimpleValue("heapNewSize"))); diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index 1667877..dd5b8a2 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -148,11 +148,17 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { } } - private void updateCassandraJvmProps(Configuration config) throws IOException { + private void updateCassandraJvmProps(Configuration newConfig) throws IOException { PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(jvmOptsFile.getAbsolutePath()); Properties properties = propertiesUpdater.loadExistingProperties(); - String maxHeapSize = config.getSimpleValue("maxHeapSize"); + String jmxPort = newConfig.getSimpleValue("jmxPort"); + if (!StringUtil.isEmpty(jmxPort)) { + validateIntegerArg("jmx_port", jmxPort); + properties.setProperty("jmx_port", jmxPort); + } + + String maxHeapSize = newConfig.getSimpleValue("maxHeapSize"); if (!StringUtil.isEmpty(maxHeapSize)) { validateHeapArg("maxHeapSize", maxHeapSize); // We want min and max heap to be the same @@ -160,19 +166,19 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { properties.setProperty("heap_max", "-Xmx" + maxHeapSize); } - String heapNewSize = config.getSimpleValue("heapNewSize"); + String heapNewSize = newConfig.getSimpleValue("heapNewSize"); if (!StringUtil.isEmpty(heapNewSize)) { validateHeapArg("heapNewSize", heapNewSize); properties.setProperty("heap_new", "-Xmn" + heapNewSize); } - String threadStackSize = config.getSimpleValue("threadStackSize"); + String threadStackSize = newConfig.getSimpleValue("threadStackSize"); if (!StringUtil.isEmpty(threadStackSize)) { - validateStackArg(threadStackSize); + validateIntegerArg("threadStackSize", threadStackSize); properties.setProperty("thread_stack_size", "-Xss" + threadStackSize + "k"); } - PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); + PropertySimple heapDumpOnOMMError = newConfig.getSimple("heapDumpOnOOMError"); if (heapDumpOnOMMError != null) { if (heapDumpOnOMMError.getBooleanValue()) { properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); @@ -181,7 +187,7 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { } } - String heapDumpDir = useForwardSlash(config.getSimpleValue("heapDumpDir")); + String heapDumpDir = useForwardSlash(newConfig.getSimpleValue("heapDumpDir")); if (!StringUtil.isEmpty(heapDumpDir)) { properties.setProperty("heap_dump_dir", heapDumpDir); } @@ -209,7 +215,7 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { String threadStackSize = config.getSimpleValue("threadStackSize"); if (!StringUtil.isEmpty(threadStackSize)) { - validateStackArg(threadStackSize); + validateIntegerArg("threadStackSize", threadStackSize); properties.setProperty("set.thread_stack_size", "-Xss" + threadStackSize + "k"); } @@ -248,11 +254,11 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { } } - private void validateStackArg(String value) { + private void validateIntegerArg(String name, String value) { try { Integer.parseInt(value); } catch (NumberFormatException e) { - throw new IllegalArgumentException(value + " is not a legal value for the property [threadStackSize]"); + throw new IllegalArgumentException(value + " is not a legal value for the property [" + name + "]"); } } diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index aca3ba2..a42040d 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -32,6 +32,7 @@ <c:simple-property name="baseDir" displayName="Base Directory" description="The base directory from which the Cassandra Daemon was launched." required="false"/> <c:simple-property name="yamlConfiguration" displayName="YAML Configuration File" description="YAML Configuration File"/> <c:simple-property name="nativeTransportPort" description="The port on which Cassandra listens for CQL client connections." default="9042" type="integer"/> + <c:simple-property name="jmxPort" description="The JMX port for Cassandra" default="7299" type="integer" readOnly="true"/> <c:simple-property name="host" description="The host on which cassandra listens to CQL client connections" default="localhost"/> <c:simple-property name="clusterName" description="Cluster name" default="localhost"/> <c:simple-property name="authenticator" required="true" default="org.apache.cassandra.auth.AllowAllAuthenticator" description="Cassandra client authenticator"> @@ -131,11 +132,11 @@ <operation name="updateConfiguration" description="Updates the node configuration. Will require a separate server restart for the settings to take effect."> <parameters> + <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> <c:simple-property name="heapSize" type="string" description="The heap size to be used for both -Xms and -Xmx JVM options."/> <c:simple-property name="heapNewSize" type="string" description="The heap new size to be used be used with -Xmn JVM option."/> <c:simple-property name="threadStackSize" type="integer" description="The thread stack size. This memory is allocated to each thread off heap. The value should be an integer that will be interpreted in kilobytes."/> - <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> <c:simple-property name="restartIfRequired" type="boolean" required="true" default="false" description="If [true] then restart the server at the end of the update if and if only the updates made require a restart. If [false] the server will not be restarted regardless of the updates made."/> </parameters> <results> commit c4c99241f2c2406b4b916865b0932d1df5e2af4f Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Jul 23 16:43:29 2013 -0500 Move the restart operation to the plugin rather than server bean. This simplifies the interface between the server bean and storage node plugin. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 9416c67..1441785 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -645,21 +645,10 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); parameters.setSimpleValue("heapNewSize", storageNodeConfiguration.getHeapNewSize() + ""); parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); + parameters.setSimpleValue("restartIfRequired", "true"); - boolean updateConfigurationResult = runOperationAndWaitForResult(subject, storageNodeResource, - UPDATE_CONFIGURATION_OPERATION, parameters); - - if (updateConfigurationResult) { - boolean restartResult = runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, - null); - - if (restartResult) { - storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); - entityManager.persist(storageNode); - - return true; - } - } + return runOperationAndWaitForResult(subject, storageNodeResource, UPDATE_CONFIGURATION_OPERATION, + parameters); } return false; diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index d9b35b9..41a0c42 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -111,6 +111,8 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } private OperationResult updateConfiguration(Configuration params) { + boolean restartIsRequired = false; + OperationResult result = new OperationResult("Configuration updated."); //update storage node jvm settings @@ -125,6 +127,31 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper if (!configurationUpdate.getStatus().equals(ConfigurationUpdateStatus.SUCCESS)) { result.setErrorMessage(configurationUpdate.getErrorMessage()); + } else { + if (params.getSimpleValue("heapSize") != null + || params.getSimpleValue("heapNewSize") != null + || params.getSimpleValue("threadStackSize") != null) { + restartIsRequired = true; + } + } + + //restart the server if: + //- requested by the user + //- the updates done require restart + boolean restartIfRequiredConfig = false; + if (params.getSimpleValue("restartIfRequired") != null) { + restartIfRequiredConfig = Boolean.parseBoolean(params.getSimpleValue("restartIfRequired")); + } + + if (restartIfRequiredConfig && restartIsRequired) { + try { + OperationResult restartResult = this.invokeOperation("restart", null); + if (restartResult.getErrorMessage() != null) { + result.setErrorMessage(restartResult.getErrorMessage()); + } + } catch (Exception e) { + result.setErrorMessage(e.getMessage()); + } } return result; diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index cd84de6..aca3ba2 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -136,6 +136,7 @@ <c:simple-property name="threadStackSize" type="integer" description="The thread stack size. This memory is allocated to each thread off heap. The value should be an integer that will be interpreted in kilobytes."/> <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> + <c:simple-property name="restartIfRequired" type="boolean" required="true" default="false" description="If [true] then restart the server at the end of the update if and if only the updates made require a restart. If [false] the server will not be restarted regardless of the updates made."/> </parameters> <results> <c:simple-property name="operationResult" description="Outcome of updating the configuration."/>

1 0

[rhq] modules/plugins
by Thomas Segismont 25 Jul '13

25 Jul '13

modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 73 ++++------ modules/plugins/rhq-storage/pom.xml | 30 ++-- modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java | 27 ++- 3 files changed, 74 insertions(+), 56 deletions(-) New commits: commit f0ec56f27ca9b3871290d717232dd0fcec1b488c Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 25 12:16:39 2013 +0200 CassandraNodeComponent#startNode now starts C* with a short CLASSPATH to allow later discovery on Linux diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 70ba4b2..37aa425 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -47,6 +47,7 @@ import com.datastax.driver.core.Session; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hyperic.sigar.OperatingSystem; import org.hyperic.sigar.SigarException; import org.mc4j.ems.connection.EmsConnection; import org.mc4j.ems.connection.bean.EmsBean; @@ -67,7 +68,6 @@ import org.rhq.core.pluginapi.util.ProcessExecutionUtility; import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.ProcessInfo; -import org.rhq.core.system.ProcessInfo.ProcessInfoSnapshot; import org.rhq.core.system.SystemInfo; import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; @@ -186,16 +186,6 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } - private ProcessInfoSnapshot getProcessInfoSnapshot() { - ProcessInfoSnapshot processInfoSnapshot = (processInfo == null) ? null : processInfo.freshSnapshot(); - if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { - processInfo = getResourceContext().getNativeProcess(); - // Safe to get prior snapshot here, we've just recreated the process info instance - processInfoSnapshot = (processInfo == null) ? null : processInfo.priorSnaphot(); - } - return processInfoSnapshot; - } - @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if (name.equals("shutdown")) { @@ -212,23 +202,6 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent return null; } - private void waitForNodeToGoDown() throws InterruptedException { - for (ProcessInfoSnapshot processInfoSnapshot = getProcessInfoSnapshot();; processInfoSnapshot = getProcessInfoSnapshot()) { - if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { - // Process not found, so it died, that's fine - // OR - // Process info says process is no longer running, that's fine as well - break; - } - if (getResourceContext().getComponentInvocationContext().isInterrupted()) { - // Operation canceled or timed out - throw new InterruptedException(); - } - // Process is still running, wait a second and check again - Thread.sleep(SECONDS.toMillis(1)); - } - } - @SuppressWarnings("rawtypes") protected OperationResult shutdownNode() { ResourceContext<?> context = getResourceContext(); @@ -292,21 +265,19 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } - protected OperationResult startNode() { - ResourceContext<?> context = getResourceContext(); - Configuration pluginConfig = context.getPluginConfiguration(); + Configuration pluginConfig = getResourceContext().getPluginConfiguration(); String baseDir = pluginConfig.getSimpleValue("baseDir"); File binDir = new File(baseDir, "bin"); - File startScript = new File(binDir, getStartScript()); - File pidFile = new File(binDir, "cassandra.pid"); - - ProcessExecution scriptExe = ProcessExecutionUtility.createProcessExecution(startScript); - scriptExe.addArguments(asList("-p", pidFile.getAbsolutePath())); - SystemInfo systemInfo = context.getSystemInformation(); + if (!startScriptExists(binDir)) { + OperationResult failure = new OperationResult("Failed to start Cassandra daemon"); + failure.setErrorMessage("Start script does not exists"); + return failure; + } + ProcessExecution scriptExe = getProcessExecution(binDir); + SystemInfo systemInfo = getResourceContext().getSystemInformation(); ProcessExecutionResults results = systemInfo.executeProcess(scriptExe); - - if (results.getError() == null) { + if (results.getError() == null) { return new OperationResult("Successfully started Cassandra daemon"); } else { OperationResult failure = new OperationResult("Failed to start Cassandra daemon"); @@ -315,6 +286,30 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } + private boolean startScriptExists(File binDir) { + File file = new File(binDir, getStartScript()); + return file.exists() && !file.isDirectory(); + } + + private ProcessExecution getProcessExecution(File binDir) { + ProcessExecution scriptExe; + if (OperatingSystem.getInstance().getName().equals(OperatingSystem.NAME_WIN32)) { + File startScript = new File(binDir, getStartScript()); + scriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + } else { + // On Linux, when Cassandra is started with an absolute path, the command line is too long and is truncated + // in /proc/pid/cmdline (beacuse of a long CLASSPATH made of absolute paths) + // This prevents the process from being later discovered because the process query argument criteria + // expects org.apache.cassandra.service.CassandraDaemon to be found + File startScript = new File("./" + getStartScript()); + scriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + scriptExe.setCheckExecutableExists(false); + } + scriptExe.setWorkingDirectory(binDir.getAbsolutePath()); + scriptExe.addArguments(asList("-p", "cassandra.pid")); + return scriptExe; + } + protected OperationResult restartNode() { OperationResult result = shutdownNode(); diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index b1d50b8..ab97902 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -121,21 +121,27 @@ <plugin> <artifactId>maven-failsafe-plugin</artifactId> <version>2.13</version> + <configuration> + <includes> + <include>**/*ITest.java</include> + </includes> + <argLine>-Djava.library.path=${pc.lib.dir}</argLine> + <systemPropertyVariables> + <pc.plugins.dir>${pc.plugins.dir}</pc.plugins.dir> + </systemPropertyVariables> + <properties> + <property> + <name>listener</name> + <value>org.rhq.test.testng.StdoutReporter</value> + </property> + </properties> + </configuration> <executions> <execution> <id>integration-test</id> <goals> <goal>integration-test</goal> </goals> - <configuration> - <includes> - <include>**/*ITest.java</include> - </includes> - <argLine>-Djava.library.path=${pc.lib.dir}</argLine> - <systemPropertyVariables> - <pc.plugins.dir>${pc.plugins.dir}</pc.plugins.dir> - </systemPropertyVariables> - </configuration> </execution> <execution> <id>verify</id> @@ -155,6 +161,12 @@ <excludes> <exclude>**/*ITest.java</exclude> </excludes> + <properties> + <property> + <name>listener</name> + <value>org.rhq.test.testng.StdoutReporter</value> + </property> + </properties> </configuration> </plugin> </plugins> diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index 5bc8b31..f0744a4 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -31,6 +31,7 @@ import java.util.Set; import com.google.common.collect.Sets; +import org.hyperic.sigar.OperatingSystem; import org.testng.annotations.AfterSuite; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; @@ -113,14 +114,8 @@ public class StorageNodeComponentITest { File binDir = new File(basedir, "bin"); SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); - File startScript = new File("./cassandra"); - ProcessExecution startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript); - startScriptExe.setWorkingDirectory(binDir.getAbsolutePath()); - startScriptExe.setCheckExecutableExists(false); - - startScriptExe.addArguments(asList("-p", "cassandra.pid")); - startScriptExe.setCaptureOutput(true); - ProcessExecutionResults results = systemInfo.executeProcess(startScriptExe); + ProcessExecution processExecution = getProcessExecution(binDir); + ProcessExecutionResults results = systemInfo.executeProcess(processExecution); assertEquals(results.getExitCode(), (Integer) 0, "Cassandra failed to start: " + results.getCapturedOutput()); @@ -135,6 +130,22 @@ public class StorageNodeComponentITest { schemaManager.updateTopology(true); } + private ProcessExecution getProcessExecution(File binDir) { + ProcessExecution startScriptExe; + if (OperatingSystem.getInstance().getName().equals(OperatingSystem.NAME_WIN32)) { + File startScript = new File(binDir, "cassandra.bat"); + startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + } else { + File startScript = new File("./cassandra"); + startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + startScriptExe.setCheckExecutableExists(false); + } + startScriptExe.setWorkingDirectory(binDir.getAbsolutePath()); + startScriptExe.addArguments(asList("-p", "cassandra.pid")); + startScriptExe.setCaptureOutput(true); + return startScriptExe; + } + private void initPluginContainer() { PluginContainerConfiguration pcConfig = new PluginContainerConfiguration(); File pluginsDir = new File(System.getProperty("pc.plugins.dir"));

1 0

[rhq] modules/enterprise
by Thomas Segismont 25 Jul '13

25 Jul '13

modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml | 14 ++++++++++ 1 file changed, 14 insertions(+) New commits: commit 17793afa6bd966d69b3198a936a2f0b0503e288b Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 25 11:04:44 2013 +0200 Update intentional changes file (methods added in StorageNodeManagerRemote) diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml index 26e9e95..44886b4 100644 --- a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml @@ -32,6 +32,20 @@ <difference> <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.cloud.StorageNodeConfigurationComposite retrieveConfiguration(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  + <method>boolean updateConfiguration(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNodeConfigurationComposite)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  <method>org.rhq.core.domain.util.PageList findNotAcknowledgedStorageNodeAlerts(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference>

1 0

[rhq] modules/enterprise
by Thomas Segismont 25 Jul '13

25 Jul '13

modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml | 14 ++++++++++ 1 file changed, 14 insertions(+) New commits: commit 600119036639c9e6bfb56a77f99c71d77d757646 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 25 09:44:45 2013 +0200 Update intentional changes file (methods added in StorageNodeManagerRemote) diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml index 58c4eda..26e9e95 100644 --- a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml @@ -29,4 +29,18 @@ <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findNotAcknowledgedStorageNodeAlerts(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findAllStorageNodeAlerts(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + </differences>

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - modules/enterprise
by mike thompson 25 Jul '13

25 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java | 269 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 36 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java | 2 5 files changed, 291 insertions(+), 30 deletions(-) New commits: commit b464215123d251133599eedd080e56723eb65b80 Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Jul 24 15:18:13 2013 -0700 Consolidated Metrics - Add to Dashboard - change to new AddToDashboardComponent. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java index 2075783..b4f1354 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java @@ -77,7 +77,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { prefs = measurementUserPreferences.getMetricRangePreferences(); Log.debug("ButtonBarDateTimeRangeEditor initialized with start Date: " + new Date(prefs.begin) + " end Date: " + new Date(prefs.end)); - createButtons(); + //createButtons(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java index 779f877..8ca1ac5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java @@ -143,7 +143,7 @@ public class DashboardLinkUtility { }); - }//end dashboard iteration + } //add new menu item for adding current graphable element to view if on Monitor/Graphs tab String currentViewPath = History.getToken(); @@ -183,20 +183,20 @@ public class DashboardLinkUtility { addNewMetric(String.valueOf(resource.getId()), selectedView, resourceGraphElements); } else { - Log.trace("Error obtaining subject with id:" + sid); + Log.warn("DashboardLinkUtility: Error obtaining subject with id:" + sid); } } public void onFailure(Throwable caught) { - Log.trace("Error obtaining subject with id:" + sid, caught); + Log.warn("DashboardLinkUtility: Error obtaining subject with id:" + sid, caught); } }); } } }); - } // end add the "add to view" menu item - }//end trait exclusion - }//end measurement def iteration + } + } + } } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java new file mode 100644 index 0000000..84e20eb --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/AddToDashboardComponent.java @@ -0,0 +1,269 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import java.util.LinkedHashMap; + +import com.google.gwt.http.client.Request; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.RequestCallback; +import com.google.gwt.http.client.RequestException; +import com.google.gwt.http.client.Response; +import com.google.gwt.user.client.History; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.IButton; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.form.fields.SelectItem; +import com.smartgwt.client.widgets.form.fields.events.ChangeEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangeHandler; +import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.menu.events.ClickHandler; +import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; +import com.smartgwt.client.widgets.toolbar.ToolStrip; + +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.criteria.DashboardCriteria; +import org.rhq.core.domain.dashboard.Dashboard; +import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.measurement.MeasurementSchedule; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resource.graph.ResourceD3GraphPortlet; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.Enhanced; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; + +/** + * @author Mike Thompson + */ +public class AddToDashboardComponent extends ToolStrip implements Enhanced { + final private Resource resource; + private SelectItem dashboardSelectItem; + private Dashboard selectedDashboard; + private IButton addToDashboardButton; + private LinkedHashMap<String, String> dashboardMenuMap; + private LinkedHashMap<Integer, Dashboard> dashboardMap; + private MetricsTableView.MetricsTableListGrid metricsListGrid; + + public AddToDashboardComponent(Resource resource) { + this.resource = resource; + setPadding(5); + setMembersMargin(15); + setWidth(400); + dashboardMenuMap = new LinkedHashMap<String, String>(); + dashboardMap = new LinkedHashMap<Integer, Dashboard>(); + } + + @Override + protected void onDraw() { + super.onDraw(); + removeMembers(getMembers()); + createToolstrip(); + } + + private void createToolstrip() { + addSpacer(15); + dashboardSelectItem = new SelectItem(); + addToDashboardButton = new IButton(MSG.view_metric_addToDashboard()); + + dashboardSelectItem = new SelectItem(); + dashboardSelectItem.setTitle("Dashboards"); + dashboardSelectItem.setWidth(350); + dashboardSelectItem.setPickListWidth(250); + populateDashboardMenu(); + addFormItem(dashboardSelectItem); + addMember(addToDashboardButton); + + dashboardSelectItem.addChangeHandler(new ChangeHandler() { + @Override + public void onChange(ChangeEvent changeEvent) { + Integer selectedDashboardId = Integer.valueOf((String) changeEvent.getValue()); + selectedDashboard = dashboardMap.get(selectedDashboardId); + } + }); + addToDashboardButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() { + @Override + public void onClick(ClickEvent clickEvent) { + ListGridRecord[] selectedRecords = metricsListGrid.getSelectedRecords(); + for (ListGridRecord selectedRecord : selectedRecords) { + for (MeasurementDefinition measurementDefinition : resource.getResourceType().getMetricDefinitions()) { + if(measurementDefinition.getId() == selectedRecord.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID)){ + Log.debug("**Add to Dashboard -- Storing: "+measurementDefinition.getDisplayName() +" in "+ selectedDashboard.getName()); + storeDashboardMetric(selectedDashboard,resource,measurementDefinition); + break; + } + } + } + } + }); + } + + public void populateDashboardMenu() { + dashboardMenuMap.clear(); + dashboardMap.clear(); + + DashboardCriteria criteria = new DashboardCriteria(); + GWTServiceLookup.getDashboardService().findDashboardsByCriteria(criteria, + new AsyncCallback<PageList<Dashboard>>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_dashboard(), + caught); + } + + public void onSuccess(PageList<Dashboard> dashboards) { + for (final Dashboard dashboard : dashboards) { + dashboardMenuMap.put(String.valueOf(dashboard.getId()), + MSG.view_tree_common_contextMenu_addChartToDashboard(dashboard.getName())); + dashboardMap.put(dashboard.getId(), dashboard); + dashboardSelectItem.setValueMap(dashboardMenuMap); + } + } + }); + } + + /** + * The metrics list grid is not available on object creation so we must attach later after it has been initialized. + * @param metricsListGrid + */ + public void setMetricsListGrid(MetricsTableView.MetricsTableListGrid metricsListGrid) { + this.metricsListGrid = metricsListGrid; + } + + /** Locate the specific schedule definition using the definition identifier. + */ + private static int getScheduleDefinitionId(Resource resource, int definitionId) { + int id = -1; + if (resource.getSchedules() != null) { + boolean located = false; + MeasurementSchedule[] schedules = new MeasurementSchedule[resource.getSchedules().size()]; + resource.getSchedules().toArray(schedules); + for (int i = 0; (!located && i < resource.getSchedules().size()); i++) { + MeasurementSchedule schedule = schedules[i]; + MeasurementDefinition definition = schedule.getDefinition(); + if ((definition != null) && definition.getId() == definitionId) { + located = true; + id = schedule.getId(); + } + } + } + return id; + } + + private void storeDashboardMetric(Dashboard dashboard, Resource resource, MeasurementDefinition definition) { + DashboardPortlet dashboardPortlet = new DashboardPortlet(MSG.view_tree_common_contextMenu_resourceGraph(), + ResourceD3GraphPortlet.KEY, 250); + dashboardPortlet.getConfiguration().put( + new PropertySimple(ResourceD3GraphPortlet.CFG_RESOURCE_ID, resource.getId())); + dashboardPortlet.getConfiguration().put( + new PropertySimple(ResourceD3GraphPortlet.CFG_DEFINITION_ID, definition.getId())); + + dashboard.addPortlet(dashboardPortlet); + + GWTServiceLookup.getDashboardService().storeDashboard(dashboard, new AsyncCallback<Dashboard>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), + caught); + } + + public void onSuccess(Dashboard result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_tree_common_contextMenu_saveChartToDashboardSuccessful(result.getName()), + Message.Severity.Info)); + } + }); + } + + private static void addNewMetric(String id, String selectedView, String resourceGraphElements) { + //construct portal.war url to access + String baseUrl = "/resource/common/monitor/visibility/IndicatorCharts.do"; + baseUrl += "?id=" + id; + baseUrl += "&view=" + selectedView; + baseUrl += "&action=addChart&metric=" + resourceGraphElements; + final String url = baseUrl; + //initiate HTTP request + final RequestBuilder b = new RequestBuilder(RequestBuilder.GET, baseUrl); + + try { + b.setCallback(new RequestCallback() { + public void onResponseReceived(final Request request, final Response response) { + Log.trace("Successfully submitted request to add graph to view:" + url); + + //kick off a page reload. + String currentViewPath = History.getToken(); + CoreGUI.goToView(currentViewPath, true); + } + + @Override + public void onError(Request request, Throwable t) { + Log.warn("Error adding Metric:" + url, t); + } + }); + b.send(); + } catch (RequestException e) { + Log.warn("Error adding Metric:" + url, e); + } + + } + + private static class AddToDashboardClickHandler implements ClickHandler { + + private final Resource resource; + private final MeasurementDefinition definition; + private final Dashboard dashboard; + + public AddToDashboardClickHandler(Resource resource, MeasurementDefinition definition, Dashboard dashboard) { + this.resource = resource; + this.definition = definition; + this.dashboard = dashboard; + } + + public void onClick(MenuItemClickEvent menuItemClickEvent) { + DashboardPortlet dashboardPortlet = new DashboardPortlet(MSG.view_tree_common_contextMenu_resourceGraph(), + ResourceD3GraphPortlet.KEY, 250); + dashboardPortlet.getConfiguration().put( + new PropertySimple(ResourceD3GraphPortlet.CFG_RESOURCE_ID, resource.getId())); + dashboardPortlet.getConfiguration().put( + new PropertySimple(ResourceD3GraphPortlet.CFG_DEFINITION_ID, definition.getId())); + + dashboard.addPortlet(dashboardPortlet); + + GWTServiceLookup.getDashboardService().storeDashboard(dashboard, new AsyncCallback<Dashboard>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), caught); + } + + public void onSuccess(Dashboard result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_tree_common_contextMenu_saveChartToDashboardSuccessful(result.getName()), + Message.Severity.Info)); + } + }); + + } + + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 010e06f..a4b15d1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -49,7 +49,6 @@ import com.smartgwt.client.widgets.grid.events.RecordExpandHandler; import com.smartgwt.client.widgets.grid.events.SortChangedHandler; import com.smartgwt.client.widgets.grid.events.SortEvent; import com.smartgwt.client.widgets.layout.VLayout; -import com.smartgwt.client.widgets.menu.Menu; import org.rhq.core.domain.measurement.MeasurementData; import org.rhq.core.domain.measurement.MeasurementDefinition; @@ -65,7 +64,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphLis import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.RedrawGraphs; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.DashboardLinkUtility; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph; import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; import org.rhq.enterprise.gui.coregui.client.util.Log; @@ -84,7 +82,8 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re private final AbstractD3GraphListView abstractD3GraphListView; private final MeasurementUserPreferences measurementUserPrefs; - private final Menu addToDashboardMenu; + private final AddToDashboardComponent addToDashboardComponent; + private MetricsTableListGrid metricsTableListGrid; Set<Integer> expandedRows = new HashSet<Integer>(); @@ -92,12 +91,9 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re super(); this.resource = resource; this.abstractD3GraphListView = abstractD3GraphListView; - setDataSource(new MetricsViewDataSource(resource)); - addToDashboardMenu = new Menu(); - addToDashboardMenu.setWidth(200); - addToDashboardMenu.setItems(DashboardLinkUtility.buildMetricsMenu(resource.getResourceType(), resource, - MSG.view_metric_addToDashboard())); measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); + setDataSource(new MetricsViewDataSource(resource)); + addToDashboardComponent = new AddToDashboardComponent(resource); } /** @@ -108,7 +104,9 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re */ @Override protected ListGrid createListGrid() { - return new MetricsTableListGrid(this, resource, addToDashboardMenu); + metricsTableListGrid = new MetricsTableListGrid(this, resource); + addToDashboardComponent.setMetricsListGrid(metricsTableListGrid); + return metricsTableListGrid; } protected void configureTable() { @@ -116,8 +114,7 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re setListGridFields(fields.toArray(new ListGridField[0])); addTableAction(MSG.view_measureTable_getLive(), new ShowLiveDataTableAction(this)); - //addExtraWidget(addToDashboardMenu, false); - + addExtraWidget(addToDashboardComponent, false); } private static class ShowLiveDataTableAction implements TableAction { @@ -251,20 +248,16 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re } - private class MetricsTableListGrid extends ListGrid { + public class MetricsTableListGrid extends ListGrid { private static final int TREEVIEW_DETAIL_CHART_HEIGHT = 205; private static final int NUM_METRIC_POINTS = 60; private Resource resource; - final private Menu addToDashboardMenu; final MetricsTableView metricsTableView; - public MetricsTableListGrid(final MetricsTableView metricsTableView, final Resource resource, - final Menu dashboardMenu) { + public MetricsTableListGrid(final MetricsTableView metricsTableView, final Resource resource) { super(); this.resource = resource; - this.addToDashboardMenu = dashboardMenu; - this.addToDashboardMenu.disable(); this.metricsTableView = metricsTableView; setCanExpandRecords(true); setCanExpandMultipleRecords(true); @@ -299,8 +292,9 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re int startRow = dataArrivedEvent.getStartRow(); int endRow = dataArrivedEvent.getEndRow(); for (int i = startRow; i < endRow; i++) { - if (metricsTableView.expandedRows.contains(getRecord(i).getAttributeAsInt( - MetricsViewDataSource.FIELD_METRIC_DEF_ID))) { + if (null != metricsTableView.expandedRows + && metricsTableView.expandedRows.contains(getRecord(i).getAttributeAsInt( + MetricsViewDataSource.FIELD_METRIC_DEF_ID))) { expandRecord(getRecord(i)); } } @@ -309,7 +303,6 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re } - @Override protected Canvas getExpansionComponent(final ListGridRecord record) { final Integer definitionId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); @@ -318,7 +311,6 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re vLayout.setPadding(5); final String chartId = "rChart-" + resourceId + "-" + definitionId; - Log.debug("getExpansionComponent for: " + chartId); HTMLFlow htmlFlow = new HTMLFlow(MetricD3Graph.createGraphMarkerTemplate(chartId, TREEVIEW_DETAIL_CHART_HEIGHT)); vLayout.addMember(htmlFlow); @@ -331,7 +323,7 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { @Override public void onFailure(Throwable caught) { - Log.debug("Error retrieving recent metrics charting data for resource [" + resourceId + "]:" + Log.warn("Error retrieving recent metrics charting data for resource [" + resourceId + "]:" + caught.getMessage()); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java index fbb9bff..5c2fe25 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java @@ -296,7 +296,7 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C @Override public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> measurementDataList) { - if (!measurementDataList.isEmpty()) { + if (null != measurementDataList && !measurementDataList.isEmpty()) { metricsDataList = measurementDataList; countDownLatch.countDown(); }

1 0

[rhq] modules/plugins
by John Sanda 25 Jul '13

25 Jul '13

modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 52 ++++++++-- 1 file changed, 46 insertions(+), 6 deletions(-) New commits: commit 067cb8cc2d2204e187f104ad7cb5b8de2220cc25 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 24 23:07:53 2013 -0400 do availability check via jmx CassandraNodeComponent previously was doing availability checks at the process level. Results were some times inconsistent in large part due to different behaviors on different platforms. Doing a JMX check is a more representative check since we perform most of the managemeent via JMX. It also eliminates any platform-specific issues. The check is done via a direct JMX connection instead of EMS to avoid the caching issues with EMS that could yield inaccurate results. diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index c41e8e7..70ba4b2 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -35,6 +35,12 @@ import java.util.Date; import java.util.List; import java.util.Map; +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.management.remote.JMXConnector; +import javax.management.remote.JMXConnectorFactory; +import javax.management.remote.JMXServiceURL; + import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Cluster.Builder; import com.datastax.driver.core.Session; @@ -131,10 +137,11 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent public AvailabilityType getAvailability() { long start = System.nanoTime(); try { - // Get a fresh snapshot of the process - ProcessInfoSnapshot processInfoSnapshot = getProcessInfoSnapshot(); - return (processInfoSnapshot != null && processInfoSnapshot.isRunning()) ? AvailabilityType.UP - : AvailabilityType.DOWN; + if (isStorageServiceReachable()) { + return AvailabilityType.UP; + } + + return AvailabilityType.DOWN; } finally { long totalTimeMillis = NANOSECONDS.toMillis(System.nanoTime() - start); if (LOG.isDebugEnabled()) { @@ -146,6 +153,39 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } + private boolean isStorageServiceReachable() { + JMXConnector connector = null; + try { + Configuration pluginConfig = getResourceContext().getPluginConfiguration(); + String url = pluginConfig.getSimpleValue("connectorAddress"); + JMXServiceURL serviceURL = new JMXServiceURL(url); + connector = JMXConnectorFactory.connect(serviceURL, null); + + MBeanServerConnection serverConnection = connector.getMBeanServerConnection(); + ObjectName storageService = new ObjectName("org.apache.cassandra.db:type=StorageService"); + + // query an attribute to make sure it is in fact available + serverConnection.getAttribute(storageService, "NativeTransportRunning"); + + return true; + } catch (Exception e) { + if (LOG.isDebugEnabled()) { + LOG.debug("Failed to make JMX connection to StorageService", e); + } + return false; + } finally { + if (connector != null) { + try { + connector.close(); + } catch (IOException e) { + if (LOG.isDebugEnabled()) { + LOG.debug("An error occurred closing the JMX connector", e); + } + } + } + } + } + private ProcessInfoSnapshot getProcessInfoSnapshot() { ProcessInfoSnapshot processInfoSnapshot = (processInfo == null) ? null : processInfo.freshSnapshot(); if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { @@ -158,10 +198,8 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { - if (name.equals("shutdown")) { OperationResult operationResult = shutdownNode(); - waitForNodeToGoDown(); return operationResult; } else if (name.equals("start")) { return startNode(); @@ -234,6 +272,8 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent long pid = process.getPid(); try { + getEmsConnection().close(); + process.kill("KILL"); Configuration pluginConfig = getResourceContext().getPluginConfiguration();

1 0

[rhq] Branch 'feature/bundle-group' - modules/core modules/enterprise
by Jay Shaughnessy 24 Jul '13

24 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java | 99 +++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleBundleGroupSelector.java | 40 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java | 31 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java | 17 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java | 83 ++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupsDataSource.java | 126 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java | 12 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 43 ++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 43 ++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 50 ++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 41 ++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 45 ++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 43 ++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 28 ++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 43 ++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 12 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java | 4 19 files changed, 681 insertions(+), 91 deletions(-) New commits: commit 8dfcad9d2bdb3138651e19e65e784c999106a5d6 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jul 24 17:28:38 2013 -0400 Work in progress - getting new bundle perms integrated into role views diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java index 40e3150..5b009b5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java @@ -145,15 +145,15 @@ public enum Permission { /** * Can create Bundle [Versions]s + * Can assign to viewable bundle groups * Can create global Bundle [Versions] if holding Global.VIEW_BUNDLES - * Can assign to viewable bundle groups */ CREATE_BUNDLES(Target.GLOBAL), // 19 /** - * Can delete bundle [Versions]s from viewable groups + * Can delete viewable bundle [Versions]s + * Can unassign from viewable bundle groups * Can delete global bundles if holding Global.VIEW_BUNDLES - * Can unassign from viewable bundle groups */ DELETE_BUNDLES(Target.GLOBAL), // 20 @@ -188,7 +188,7 @@ public enum Permission { /** * Can delete bundle [version]s from the bundle group */ - DELETE_BUNDLES_IN_GROUP(Target.BUNDLE), // 26 + DELETE_BUNDLES_FROM_GROUP(Target.BUNDLE), // 26 /** * Implied - Can view bundles in the bundle group diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java index d949617..cde2c6d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java @@ -48,8 +48,8 @@ import org.rhq.core.domain.authz.Role; import org.rhq.core.domain.common.ProductInfo; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVStack; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; /** * An editor for editing the set of RHQ {@link Permission permission}s associated with an RHQ {@link Role role}. @@ -62,6 +62,7 @@ public class PermissionsEditor extends EnhancedVStack { private ListGrid globalPermissionsGrid; private ListGrid resourcePermissionsGrid; + private ListGrid bundleGroupPermissionsGrid; private Set<Permission> selectedPermissions; private RoleEditView roleEditView; private boolean isReadOnly; @@ -99,6 +100,10 @@ public class PermissionsEditor extends EnhancedVStack { this.resourcePermissionsGrid = createResourcePermissionsGrid(); addMember(this.resourcePermissionsGrid); + + this.bundleGroupPermissionsGrid = createBundleGroupPermissionsGrid(); + addMember(this.bundleGroupPermissionsGrid); + } public void reset() { @@ -162,31 +167,57 @@ public class PermissionsEditor extends EnhancedVStack { grid.setFields(iconField, displayNameField, authorizedField, descriptionField); List<ListGridRecord> records = new ArrayList<ListGridRecord>(); - ListGridRecord record = createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_manageSecurity(), + ListGridRecord record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_manageSecurity(), "global/Locked", Permission.MANAGE_SECURITY, MSG.view_adminRoles_permissions_permDesc_manageSecurity()); records.add(record); - record = createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_manageInventory(), + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_manageInventory(), "subsystems/inventory/Inventory", Permission.MANAGE_INVENTORY, MSG.view_adminRoles_permissions_permDesc_manageInventory()); records.add(record); - record = createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_manageSettings(), + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_manageSettings(), "subsystems/configure/Configure", Permission.MANAGE_SETTINGS, MSG.view_adminRoles_permissions_permDesc_manageSettings(productInfo.getShortName())); records.add(record); - record = createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_manageBundles(), + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_manageRepositories(), + "subsystems/content/Content", Permission.MANAGE_REPOSITORIES, + MSG.view_adminRoles_permissions_permDesc_manageRepositories()); + records.add(record); + + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_manageBundles(), "subsystems/bundle/Bundle", Permission.MANAGE_BUNDLE, MSG.view_adminRoles_permissions_permDesc_manageBundles()); records.add(record); - record = createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_manageRepositories(), - "subsystems/content/Content", Permission.MANAGE_REPOSITORIES, - MSG.view_adminRoles_permissions_permDesc_manageRepositories()); + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_manageBundleGroups(), + "subsystems/content/Content", Permission.MANAGE_BUNDLE_GROUPS, + MSG.view_adminRoles_permissions_permDesc_manageBundleGroups()); + records.add(record); + + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_createBundles(), + "subsystems/content/Content", Permission.CREATE_BUNDLES, + MSG.view_adminRoles_permissions_permDesc_createBundles()); + records.add(record); + + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_deleteBundles(), + "subsystems/content/Content", Permission.DELETE_BUNDLES, + MSG.view_adminRoles_permissions_permDesc_deleteBundles()); + records.add(record); + + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_viewBundles(), + "subsystems/content/Content", Permission.VIEW_BUNDLES, + MSG.view_adminRoles_permissions_permDesc_viewBundles()); records.add(record); - record = createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_viewUsers(), "global/User", + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_deployBundles(), + "subsystems/content/Content", Permission.DEPLOY_BUNDLES, + MSG.view_adminRoles_permissions_permDesc_deployBundles()); + records.add(record); + + + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_viewUsers(), "global/User", Permission.VIEW_USERS, MSG.view_adminRoles_permissions_permDesc_viewUsers()); records.add(record); @@ -280,6 +311,54 @@ public class PermissionsEditor extends EnhancedVStack { return grid; } + private ListGrid createBundleGroupPermissionsGrid() { + ListGrid grid = createPermissionsGrid(); + // TODO: Add table title. + + ListGridField iconField = createIconField(); + + ListGridField displayNameField = new ListGridField("displayName", MSG.common_title_name(), 130); + + ListGridField descriptionField = new ListGridField("description", MSG.common_title_description()); + descriptionField.setWrap(true); + + final ListGridField authorizedField = createAuthorizedField("authorized", + MSG.view_adminRoles_permissions_isAuthorized(), "name", grid, false); + + grid.setFields(iconField, displayNameField, authorizedField, descriptionField); + + List<ListGridRecord> records = new ArrayList<ListGridRecord>(); + + ListGridRecord record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_assignBundlesToGroup(), + "subsystems/bundle/Bundle", Permission.ASSIGN_BUNDLES_TO_GROUP, + MSG.view_adminRoles_permissions_permDesc_assignBundlesToGroup()); + records.add(record); + + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_unassignBundlesFromGroup(), + "subsystems/bundle/Bundle", Permission.UNASSIGN_BUNDLES_FROM_GROUP, + MSG.view_adminRoles_permissions_permDesc_unassignBundlesFromGroup()); + records.add(record); + + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_createBundlesInGroup(), + "subsystems/bundle/Bundle", Permission.CREATE_BUNDLES_IN_GROUP, + MSG.view_adminRoles_permissions_permDesc_createBundlesInGroup()); + records.add(record); + + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_deleteBundlesFromGroup(), + "subsystems/bundle/Bundle", Permission.DELETE_BUNDLES_FROM_GROUP, + MSG.view_adminRoles_permissions_permDesc_deleteBundlesFromGroup()); + records.add(record); + + record = createPermissionRecord(MSG.view_adminRoles_permissions_perm_viewBundlesInGroup(), + "subsystems/bundle/Bundle", Permission.VIEW_BUNDLES_IN_GROUP, + MSG.view_adminRoles_permissions_permDesc_viewBundlesInGroup()); + records.add(record); + + grid.setData(records.toArray(new ListGridRecord[records.size()])); + + return grid; + } + private ListGridField createIconField() { ListGridField iconField = new ListGridField("icon", " ", 28); iconField.setShowDefaultContextMenu(false); @@ -420,7 +499,7 @@ public class PermissionsEditor extends EnhancedVStack { } } - private ListGridRecord createGlobalPermissionRecord(String displayName, String icon, Permission globalPermission, + private ListGridRecord createPermissionRecord(String displayName, String icon, Permission globalPermission, String description) { ListGridRecord record = new ListGridRecord(); record.setAttribute("displayName", displayName); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleBundleGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleBundleGroupSelector.java new file mode 100644 index 0000000..e3876ca --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleBundleGroupSelector.java @@ -0,0 +1,40 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.enterprise.gui.coregui.client.admin.roles; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.enterprise.gui.coregui.client.bundle.group.BundleGroupSelector; + + +/** + * @author Jay Shaughnessy + */ +public class RoleBundleGroupSelector extends BundleGroupSelector { + + public RoleBundleGroupSelector(ListGridRecord[] bundleGroupRecords, boolean isReadOnly) { + super(isReadOnly); + + setAssigned(bundleGroupRecords); + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java index 941c7ee..63b6e3f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java @@ -46,6 +46,7 @@ import org.rhq.enterprise.gui.coregui.client.PermissionsLoader; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.admin.users.UsersDataSource; +import org.rhq.enterprise.gui.coregui.client.bundle.group.BundleGroupSelector; import org.rhq.enterprise.gui.coregui.client.components.form.AbstractRecordEditor; import org.rhq.enterprise.gui.coregui.client.components.form.EnhancedDynamicForm; import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedEvent; @@ -75,6 +76,9 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen private Tab ldapGroupsTab; private RoleLdapGroupSelector ldapGroupSelector; + private Tab bundleGroupsTab; + private BundleGroupSelector bundleGroupSelector; + private boolean hasManageSecurityPermission; private boolean isLdapConfigured; private boolean isSystemRole; @@ -161,6 +165,9 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen if (!this.isSystemRole) { this.resourceGroupsTab = buildResourceGroupsTab(tabSet); tabSet.addTab(resourceGroupsTab); + + this.bundleGroupsTab = buildBundleGroupsTab(tabSet); + tabSet.addTab(bundleGroupsTab); } this.subjectsTab = buildSubjectsTab(tabSet); @@ -189,6 +196,13 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen return tab; } + private Tab buildBundleGroupsTab(TabSet tabSet) { + Tab tab = new Tab(MSG.common_title_bundleGroups(), ImageManager.getBundleIcon()); + // NOTE: We will set the tab content to the bundle group selector later once the Role has been fetched. + + return tab; + } + private Tab buildSubjectsTab(TabSet tabSet) { Tab tab = new Tab(MSG.common_title_users(), "global/User_16.png"); // NOTE: We will set the tab content to the subject selector later once the Role has been fetched. @@ -244,6 +258,18 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen } }); updateTab(this.resourceGroupsTab, this.resourceGroupSelector); + + Record[] bundleGroupRecords = record.getAttributeAsRecordArray(RolesDataSource.Field.BUNDLE_GROUPS); + ListGridRecord[] bundleGroupListGridRecords = toListGridRecordArray(bundleGroupRecords); + this.bundleGroupSelector = new RoleBundleGroupSelector(bundleGroupListGridRecords, + !this.hasManageSecurityPermission); + this.bundleGroupSelector.addAssignedItemsChangedHandler(new AssignedItemsChangedHandler() { + public void onSelectionChanged(AssignedItemsChangedEvent event) { + onItemChanged(); + } + }); + updateTab(this.resourceGroupsTab, this.resourceGroupSelector); + } ListGridRecord[] subjectListGridRecords = toListGridRecordArray(subjectRecords); @@ -341,6 +367,11 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen getForm().setValue(RolesDataSource.Field.LDAP_GROUPS, ldapGroupRecords); } + if (this.bundleGroupSelector != null) { + ListGridRecord[] bundleGroupRecords = this.bundleGroupSelector.getSelectedRecords(); + getForm().setValue(RolesDataSource.Field.BUNDLE_GROUPS, bundleGroupRecords); + } + // Submit the form values to the datasource. super.save(requestProperties); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java index b454fad..047dacc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java @@ -37,11 +37,13 @@ import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.authz.Role; +import org.rhq.core.domain.bundle.BundleGroup; import org.rhq.core.domain.criteria.RoleCriteria; import org.rhq.core.domain.resource.group.LdapGroup; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.admin.users.UsersDataSource; +import org.rhq.enterprise.gui.coregui.client.bundle.group.BundleGroupsDataSource; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.RoleGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupsDataSource; @@ -61,6 +63,7 @@ public class RolesDataSource extends RPCDataSource<Role, RoleCriteria> { public static final String NAME = "name"; public static final String DESCRIPTION = "description"; public static final String RESOURCE_GROUPS = "resourceGroups"; + public static final String BUNDLE_GROUPS = "bundleGroups"; public static final String PERMISSIONS = "permissions"; public static final String SUBJECTS = "subjects"; public static final String LDAP_GROUPS = "ldapGroups"; @@ -125,6 +128,10 @@ public class RolesDataSource extends RPCDataSource<Role, RoleCriteria> { MSG.datasource_roles_field_ldapGroups()); fields.add(ldapGroupsField); + DataSourceField bundleGroupsField = new DataSourceField(Field.BUNDLE_GROUPS, FieldType.ANY, + MSG.common_title_bundleGroups()); + fields.add(bundleGroupsField); + return fields; } @@ -223,6 +230,10 @@ public class RolesDataSource extends RPCDataSource<Role, RoleCriteria> { Set<LdapGroup> ldapGroups = new RoleLdapGroupSelector.LdapGroupsDataSource().buildDataObjects(ldapGroupRecords); to.setLdapGroups(ldapGroups); + Record[] bundleGroupRecords = from.getAttributeAsRecordArray(Field.BUNDLE_GROUPS); + Set<BundleGroup> bundleGroups = BundleGroupsDataSource.getInstance().buildDataObjects(bundleGroupRecords); + to.setBundleGroups(bundleGroups); + return to; } @@ -256,6 +267,12 @@ public class RolesDataSource extends RPCDataSource<Role, RoleCriteria> { ListGridRecord[] ldapGroupRecords = new RoleLdapGroupSelector.LdapGroupsDataSource() .buildRecords(ldapGroups); targetRecord.setAttribute(Field.LDAP_GROUPS, ldapGroupRecords); + + Set<BundleGroup> bundleGroups = sourceRole.getBundleGroups(); + ListGridRecord[] bundleGroupRecords = BundleGroupsDataSource.getInstance() + .buildRecords(bundleGroups, false); + targetRecord.setAttribute(Field.BUNDLE_GROUPS, bundleGroupRecords); + } return targetRecord; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java new file mode 100644 index 0000000..3a5c047 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupSelector.java @@ -0,0 +1,83 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.group; + +import com.smartgwt.client.data.Criteria; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.TextItem; + +import org.rhq.core.domain.bundle.BundleGroup; +import org.rhq.core.domain.criteria.BundleGroupCriteria; +import org.rhq.enterprise.gui.coregui.client.components.selector.AbstractSelector; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; + +/** + * @author Jay Shaughnessy + */ +public class BundleGroupSelector extends AbstractSelector<BundleGroup, BundleGroupCriteria> { + + + public BundleGroupSelector() { + this(false); + } + + public BundleGroupSelector(boolean isReadOnly) { + super(isReadOnly); + } + + protected DynamicForm getAvailableFilterForm() { + DynamicForm availableFilterForm = new DynamicForm(); + availableFilterForm.setNumCols(4); + final TextItem search = new TextItem("search", MSG.common_title_search()); + + availableFilterForm.setItems(search); + + return availableFilterForm; + } + + protected RPCDataSource<BundleGroup, BundleGroupCriteria> getDataSource() { + return new SelectedBundleGroupsDataSource(); + } + + protected Criteria getLatestCriteria(DynamicForm availableFilterForm) { + String search = (String) availableFilterForm.getValue("search"); + + Criteria latestCriteria = new Criteria(); + latestCriteria.addCriteria("search", search); + + return latestCriteria; + } + + @Override + protected String getItemTitle() { + return MSG.common_title_bundleGroups(); + } + + public class SelectedBundleGroupsDataSource extends BundleGroupsDataSource { + @Override + protected BundleGroupCriteria getFetchCriteria(final DSRequest request) { + BundleGroupCriteria result = super.getFetchCriteria(request); + if (null != result) { + result.setStrict(false); + } + return result; + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupsDataSource.java new file mode 100644 index 0000000..4f76f06 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/group/BundleGroupsDataSource.java @@ -0,0 +1,126 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.group; + +import java.util.List; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.DataSourceField; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.data.fields.DataSourceIntegerField; +import com.smartgwt.client.data.fields.DataSourceTextField; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.bundle.BundleGroup; +import org.rhq.core.domain.criteria.BundleGroupCriteria; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; + +/** + * @author Jay Shaughnessy + */ +public class BundleGroupsDataSource extends RPCDataSource<BundleGroup, BundleGroupCriteria> { + + private BundleGWTServiceAsync bundleService = GWTServiceLookup.getBundleService(); + + private static BundleGroupsDataSource INSTANCE; + + public static BundleGroupsDataSource getInstance() { + if (INSTANCE == null) { + INSTANCE = new BundleGroupsDataSource(); + } + return INSTANCE; + } + + public BundleGroupsDataSource() { + super(); + List<DataSourceField> fields = addDataSourceFields(); + addFields(fields); + } + + @Override + protected List<DataSourceField> addDataSourceFields() { + List<DataSourceField> fields = super.addDataSourceFields(); + + DataSourceIntegerField idField = new DataSourceIntegerField("id", MSG.common_title_id()); + idField.setPrimaryKey(true); + fields.add(idField); + + DataSourceTextField nameField = new DataSourceTextField("name", MSG.common_title_name()); + fields.add(nameField); + + DataSourceTextField descriptionField = new DataSourceTextField("description", MSG.common_title_description()); + fields.add(descriptionField); + + return fields; + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, final BundleGroupCriteria criteria) { + bundleService.findBundleGroupsByCriteria(criteria, new AsyncCallback<PageList<BundleGroup>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.dataSource_bundle_loadFailed(), caught); + response.setStatus(DSResponse.STATUS_FAILURE); + processResponse(request.getRequestId(), response); + } + + public void onSuccess(PageList<BundleGroup> result) { + response.setData(buildRecords(result)); + response.setTotalRows(result.getTotalSize()); + processResponse(request.getRequestId(), response); + } + }); + } + + @Override + protected BundleGroupCriteria getFetchCriteria(final DSRequest request) { + BundleGroupCriteria criteria = new BundleGroupCriteria(); + // may support tags in future, but not in rev1 + //criteria.addFilterTagNamespace(getFilter(request, "tagNamespace", String.class)); + //criteria.addFilterTagSemantic(getFilter(request, "tagSemantic", String.class)); + //criteria.addFilterTagName(getFilter(request, "tagName", String.class)); + //criteria.addFilterTagSemantic(getFilter(request, "tagSemantic", String.class)); + criteria.addFilterName(getFilter(request, "search", String.class)); + + return criteria; + } + + @Override + public BundleGroup copyValues(Record from) { + return (BundleGroup) from.getAttributeAsObject("object"); + } + + @Override + public ListGridRecord copyValues(BundleGroup from) { + ListGridRecord record = new ListGridRecord(); + + record.setAttribute("id", from.getId()); + record.setAttribute("name", from.getName()); + record.setAttribute("description", from.getDescription()); + + record.setAttribute("object", from); + + return record; + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java index 54c3085..cd108b7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java @@ -27,6 +27,7 @@ import org.rhq.core.domain.bundle.Bundle; import org.rhq.core.domain.bundle.BundleDeployment; import org.rhq.core.domain.bundle.BundleDestination; import org.rhq.core.domain.bundle.BundleFile; +import org.rhq.core.domain.bundle.BundleGroup; import org.rhq.core.domain.bundle.BundleResourceDeployment; import org.rhq.core.domain.bundle.BundleType; import org.rhq.core.domain.bundle.BundleVersion; @@ -37,6 +38,7 @@ import org.rhq.core.domain.criteria.BundleCriteria; import org.rhq.core.domain.criteria.BundleDeploymentCriteria; import org.rhq.core.domain.criteria.BundleDestinationCriteria; import org.rhq.core.domain.criteria.BundleFileCriteria; +import org.rhq.core.domain.criteria.BundleGroupCriteria; import org.rhq.core.domain.criteria.BundleResourceDeploymentCriteria; import org.rhq.core.domain.criteria.BundleVersionCriteria; import org.rhq.core.domain.util.PageList; @@ -70,6 +72,8 @@ public interface BundleGWTService extends RemoteService { PageList<Bundle> findBundlesByCriteria(BundleCriteria criteria) throws RuntimeException; + PageList<BundleGroup> findBundleGroupsByCriteria(BundleGroupCriteria criteria) throws RuntimeException; + PageList<Bundle> findBundlesByCriteriaWithDestinationFilter(BundleCriteria criteria) throws RuntimeException; PageList<BundleDeployment> findBundleDeploymentsByCriteria(BundleDeploymentCriteria criteria) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java index e51383d..88458b8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java @@ -25,6 +25,7 @@ import org.rhq.core.domain.bundle.Bundle; import org.rhq.core.domain.bundle.BundleDeployment; import org.rhq.core.domain.bundle.BundleDestination; import org.rhq.core.domain.bundle.BundleFile; +import org.rhq.core.domain.bundle.BundleGroup; import org.rhq.core.domain.bundle.BundleResourceDeployment; import org.rhq.core.domain.bundle.BundleType; import org.rhq.core.domain.bundle.BundleVersion; @@ -35,6 +36,7 @@ import org.rhq.core.domain.criteria.BundleCriteria; import org.rhq.core.domain.criteria.BundleDeploymentCriteria; import org.rhq.core.domain.criteria.BundleDestinationCriteria; import org.rhq.core.domain.criteria.BundleFileCriteria; +import org.rhq.core.domain.criteria.BundleGroupCriteria; import org.rhq.core.domain.criteria.BundleResourceDeploymentCriteria; import org.rhq.core.domain.criteria.BundleVersionCriteria; import org.rhq.core.domain.util.PageList; @@ -234,6 +236,16 @@ public class BundleGWTServiceImpl extends AbstractGWTServiceImpl implements Bund } @Override + public PageList<BundleGroup> findBundleGroupsByCriteria(BundleGroupCriteria criteria) throws RuntimeException { + try { + PageList<BundleGroup> results = bundleManager.findBundleGroupsByCriteria(getSessionSubject(), criteria); + return SerialUtility.prepare(results, "findBundleGroupsByCriteria"); + } catch (Throwable t) { + throw getExceptionToThrowToClient(t); + } + } + + @Override public PageList<Bundle> findBundlesByCriteriaWithDestinationFilter(BundleCriteria criteria) throws RuntimeException { try { PageList<Bundle> results = bundleManager.findBundlesByCriteriaWithDestinationFilter(getSessionSubject(), criteria); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 19d3fa5..1f9c73c 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -43,17 +43,6 @@ common_button_ack_all = Acknowledge All common_button_add = Add common_button_advanced = Advanced... common_button_apply = Apply -common_buttonbar_custom_window_title= Date Range -common_buttonbar_custom_window_subtitle= Custom -common_buttonbar_datetime_format= MM/dd/yyyy h:mm a -common_buttonbar_datetime_format_moment_js= MM/DD/YYYY h:mm a -common_buttonbar_end_date= End Date -common_buttonbar_end_time= End Time -common_buttonbar_start_date= Start Date -common_buttonbar_start_time= Start Time -common_buttonbar_custom = Custom... -common_buttonbar_custom_cancel = Cancel -common_buttonbar_custom_save = Save common_button_cancel = Cancel common_button_close = Close common_button_compare = Compare @@ -86,6 +75,17 @@ common_button_set = Set common_button_showDetails = Show Details... common_button_unignore = Unignore common_button_uninventory = Uninventory +common_buttonbar_custom = Custom... +common_buttonbar_custom_cancel = Cancel +common_buttonbar_custom_save = Save +common_buttonbar_custom_window_subtitle = Custom +common_buttonbar_custom_window_title = Date Range +common_buttonbar_datetime_format = MM/dd/yyyy h:mm a +common_buttonbar_datetime_format_moment_js = MM/DD/YYYY h:mm a +common_buttonbar_end_date = End Date +common_buttonbar_end_time = End Time +common_buttonbar_start_date = Start Date +common_buttonbar_start_time = Start Time common_calendar_april_short = apr common_calendar_august_short = aug common_calendar_december_short = dec @@ -158,6 +158,7 @@ common_title_available_resources = Available Resources common_title_average_metrics = Average Metrics per Minute common_title_background = Background common_title_bundle = Bundle +common_title_bundleGroups = Bundle Groups common_title_bundles = Bundles common_title_category = Category common_title_change_refresh_time = Refresh Interval @@ -511,11 +512,21 @@ view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} view_adminRoles_permissions_isAuthorized = Authorized? view_adminRoles_permissions_isRead = Read? view_adminRoles_permissions_isWrite = Write? +view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle to the bundle group +view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s. can copy existing bundles between viewable groups +view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle [version]s for the bundle group. can copy a viewable bundle to the bundle group. +view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable bundle [version]s +view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle [version]s from the bundle group (implicitly deleting then from other assigned groups) +view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle version to any viewable, deployable, compatible, resource group +view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete bundle groups view_adminRoles_permissions_permDesc_manageBundles = can create, update, or delete provisioning bundles (viewing is implied for everyone) view_adminRoles_permissions_permDesc_manageInventory = has all Resource permissions, as described below, for all Resources; can create, update, and delete groups; and can import auto-discovered or manually discovered Resources view_adminRoles_permissions_permDesc_manageRepositories = can create, update, or delete repositories of any user (everyone can create their own repositories), can associate content sources to repositories. view_adminRoles_permissions_permDesc_manageSecurity = can create, update, or delete users and roles - implies all other permissions view_adminRoles_permissions_permDesc_manageSettings = can modify the {0} Server configuration and perform any Server-related functionality +view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not delete) a bundle from the bundle group +view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global bundles (those not assigned to any bundle group) +view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the group view_adminRoles_permissions_permDesc_viewUsers = can view other users, with the exception of their assigned roles view_adminRoles_permissions_permReadDesc_configure = view Resource configuration and Resource configuration revision history view_adminRoles_permissions_permReadDesc_control = (IMPLIED) view available operations and operation execution history @@ -537,12 +548,19 @@ view_adminRoles_permissions_permWriteDesc_manageContent = subscribe to content s view_adminRoles_permissions_permWriteDesc_manageDrift = create, update, and delete drift definitions; and manage drift instances view_adminRoles_permissions_permWriteDesc_manageEvents = delete events view_adminRoles_permissions_permWriteDesc_manageMeasurements = update metric collection schedules +view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group view_adminRoles_permissions_perm_configure = Configure view_adminRoles_permissions_perm_control = Control +view_adminRoles_permissions_perm_createBundles = Create Bundles +view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group view_adminRoles_permissions_perm_createChildResources = Create Child Resources +view_adminRoles_permissions_perm_deleteBundles = Delete Bundles +view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group view_adminRoles_permissions_perm_deleteChildResources = Delete Child Resources +view_adminRoles_permissions_perm_deployBundles = Deploy Bundles view_adminRoles_permissions_perm_inventory = Inventory view_adminRoles_permissions_perm_manageAlerts = Manage Alerts +view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups view_adminRoles_permissions_perm_manageBundles = Manage Bundles view_adminRoles_permissions_perm_manageContent = Manage Content view_adminRoles_permissions_perm_manageDrift = Manage Drift @@ -552,6 +570,9 @@ view_adminRoles_permissions_perm_manageMeasurements = Manage Measurements view_adminRoles_permissions_perm_manageRepositories = Manage Repositories view_adminRoles_permissions_perm_manageSecurity = Manage Security view_adminRoles_permissions_perm_manageSettings = Manage Settings +view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group +view_adminRoles_permissions_perm_viewBundles = View Bundles +view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group view_adminRoles_permissions_perm_viewUsers = View Users view_adminRoles_permissions_read = Read: view_adminRoles_permissions_readAccessImplied = Read access for the {0} permission is implied and cannot be disabled. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index f71f907..4e73829 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -66,17 +66,6 @@ common_button_ack_all = Potvrdit všechny common_button_add = Přidat common_button_advanced = Rozšířené... common_button_apply = Použít -##common_buttonbar_custom_window_title= Date Range -##common_buttonbar_custom_window_subtitle= Custom -common_buttonbar_datetime_format=dd.MM.yy hh:mm -common_buttonbar_datetime_format_moment_js= DD.MM.YY HH:mm -##common_buttonbar_end_date= End Date -##common_buttonbar_end_time= End Time -##common_buttonbar_start_date= Start Date -##common_buttonbar_start_time= Start Time -##common_buttonbar_custom = Custom... -##common_buttonbar_custom_cancel = Cancel -##common_buttonbar_custom_save = Save common_button_cancel = Storno common_button_close = Zavřít common_button_compare = Porovnat @@ -109,6 +98,17 @@ common_button_set = Nastavit common_button_showDetails = Zobrazi detaily... ##common_button_unignore = Unignore common_button_uninventory = Odstranit z inventáře +##common_buttonbar_custom = Custom... +##common_buttonbar_custom_cancel = Cancel +##common_buttonbar_custom_save = Save +##common_buttonbar_custom_window_subtitle = Custom +##common_buttonbar_custom_window_title = Date Range +common_buttonbar_datetime_format = dd.MM.yy hh:mm +common_buttonbar_datetime_format_moment_js = DD.MM.YY HH:mm +##common_buttonbar_end_date = End Date +##common_buttonbar_end_time = End Time +##common_buttonbar_start_date = Start Date +##common_buttonbar_start_time = Start Time common_calendar_april_short = dub common_calendar_august_short = srp common_calendar_december_short = pro @@ -180,6 +180,7 @@ common_title_available_resources = Dostupné zdroje common_title_average_metrics = Průměrné metriky za minutu common_title_background = Pozadí common_title_bundle = Balík +##common_title_bundleGroups = Bundle Groups common_title_bundles = Balíky common_title_category = Kategorie common_title_change_refresh_time = Obnovovací interval @@ -530,11 +531,21 @@ view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} view_adminRoles_permissions_isAuthorized = Autorizován? view_adminRoles_permissions_isRead = Čtení? view_adminRoles_permissions_isWrite = Zápis? +##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle to the bundle group +##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s. can copy existing bundles between viewable groups +##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle [version]s for the bundle group. can copy a viewable bundle to the bundle group. +##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable bundle [version]s +##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle [version]s from the bundle group (implicitly deleting then from other assigned groups) +##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle version to any viewable, deployable, compatible, resource group +##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete bundle groups view_adminRoles_permissions_permDesc_manageBundles = může vytvářet, měnit, mazat balíky (zobrazovat může kdokoli) view_adminRoles_permissions_permDesc_manageInventory = má všechna práva zdroje: může vytvářet, měnit, mazat skupiny, může importovat automaticky nebo manuálně nalezené zdroje view_adminRoles_permissions_permDesc_manageRepositories = může vytvářet, měnit, mazat repozitáře jakýchkoli uživatelů (každý může vytvářet své repozitáře), může asociovat zdroje obsahů s repozitáři view_adminRoles_permissions_permDesc_manageSecurity = může vytvářet, měnit, mazat uživatele a role - implikuje všechna ostatní povolení view_adminRoles_permissions_permDesc_manageSettings = může modifikovat {0} serverovou konfiguraci a provozovat jakékoli operace související se serverem +##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not delete) a bundle from the bundle group +##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global bundles (those not assigned to any bundle group) +##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the group view_adminRoles_permissions_permDesc_viewUsers = může zobrazovat ostatní uživatele s výjimkou jejich přiřazených rolí view_adminRoles_permissions_permReadDesc_configure = zobrazí konfiguraci zdroje a historii konfigurace zdroje view_adminRoles_permissions_permReadDesc_control = (VÝCHOZÍ) zobrazí dostupné operace a historii spouštění operací @@ -556,12 +567,19 @@ view_adminRoles_permissions_permWriteDesc_manageContent = přihlásit se k odbě view_adminRoles_permissions_permWriteDesc_manageDrift = vytvořit, změnit a smazat definici driftu view_adminRoles_permissions_permWriteDesc_manageEvents = mazat události view_adminRoles_permissions_permWriteDesc_manageMeasurements = měnit rozvrhy sběru metrik +##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group view_adminRoles_permissions_perm_configure = Konfigurovat view_adminRoles_permissions_perm_control = Ovládání +##view_adminRoles_permissions_perm_createBundles = Create Bundles +##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group view_adminRoles_permissions_perm_createChildResources = Vytvářet potomky zdrojů +##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles +##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group view_adminRoles_permissions_perm_deleteChildResources = Vytvářet potomky zdrojů +##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles view_adminRoles_permissions_perm_inventory = Inventarizovat view_adminRoles_permissions_perm_manageAlerts = Spravovat výstrahy +##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups view_adminRoles_permissions_perm_manageBundles = Spravovat balíky view_adminRoles_permissions_perm_manageContent = Spravovat obsah view_adminRoles_permissions_perm_manageDrift = Spravovat drift @@ -571,6 +589,9 @@ view_adminRoles_permissions_perm_manageMeasurements = Spravovat měření view_adminRoles_permissions_perm_manageRepositories = Spravovat repozitáře view_adminRoles_permissions_perm_manageSecurity = Spravovat bezpečnost view_adminRoles_permissions_perm_manageSettings = Spravovat nastavení +view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group +##view_adminRoles_permissions_perm_viewBundles = View Bundles +##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group view_adminRoles_permissions_perm_viewUsers = Zobrazit uživatelé view_adminRoles_permissions_read = Číst: view_adminRoles_permissions_readAccessImplied = Přístup pro čtení pro {0} je výchozí a nemůže být zakázán. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index 524dcc0..0db1d05 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -46,17 +46,6 @@ common_button_ack_all = Alle bestätigen common_button_add = Hinzufügen common_button_advanced = Erweitert... common_button_apply = Anwenden -common_buttonbar_custom_window_title=Zeitbereich -common_buttonbar_datetime_format=dd.MM.yy hh:mm -common_buttonbar_datetime_format_moment_js= DD.MM.YY HH:mm -common_buttonbar_end_date=Enddatum -common_buttonbar_end_time=Endzeitpunkt -common_buttonbar_start_date=Startdatum -common_buttonbar_start_time=Startzeitpunkt -common_buttonbar_custom_cancel=Abbrechen -common_buttonbar_custom_save=Speichern -common_buttonbar_custom_window_subtitle= Spezifisch -common_buttonbar_custom = Spezifisch... common_button_cancel = Abbrechen common_button_close = Schließen common_button_compare = Vergleichen @@ -89,6 +78,17 @@ common_button_set = Setzen common_button_showDetails = Details anzeigen... common_button_unignore = Ignorieren aufheben common_button_uninventory = Aus dem Inventar löschen +common_buttonbar_custom = Spezifisch... +common_buttonbar_custom_cancel = Abbrechen +common_buttonbar_custom_save = Speichern +common_buttonbar_custom_window_subtitle = Spezifisch +common_buttonbar_custom_window_title = Zeitbereich +common_buttonbar_datetime_format = dd.MM.yy hh:mm +common_buttonbar_datetime_format_moment_js = DD.MM.YY HH:mm +common_buttonbar_end_date = Enddatum +common_buttonbar_end_time = Endzeitpunkt +common_buttonbar_start_date = Startdatum +common_buttonbar_start_time = Startzeitpunkt common_calendar_april_short = Apr common_calendar_august_short = Aug common_calendar_december_short = Dez @@ -160,6 +160,7 @@ common_title_available_resources = Verfügbare Ressourcen common_title_average_metrics = Durchsch. Anzahl Metriken pro Minute common_title_background = Hintergrund common_title_bundle = Bundle +##common_title_bundleGroups = Bundle Groups common_title_bundles = Bundles common_title_category = Kategorie common_title_change_refresh_time = Aktualisierungsintervall @@ -502,10 +503,22 @@ view_adminRoles_permissions_globalPermissions = Globale Rechte view_adminRoles_permissions_isAuthorized = Berechtigt? view_adminRoles_permissions_isRead = Lesen? view_adminRoles_permissions_isWrite = Schreiben? +##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle to the bundle group +##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s. can copy existing bundles between viewable groups +##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle [version]s for the bundle group. can copy a viewable bundle to the bundle group. +##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable bundle [version]s +##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle [version]s from the bundle group (implicitly deleting then from other assigned groups) +##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle version to any viewable, deployable, compatible, resource group +##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete bundle groups view_adminRoles_permissions_permDesc_manageBundles = Kann Bundles anlegen, aktualisieren und löschen (Ansehen ist für alle implizit erlaubt). view_adminRoles_permissions_permDesc_manageInventory = Hat alle Rechte auf alle Ressourcen, wie unten beschrieben. Kann Gruppen anlegen, aktualisieren und löschen. Kann Ressourcen in das Inventar aufnehmen. +##view_adminRoles_permissions_permDesc_manageRepositories = can create, update, or delete repositories of any user (everyone can create their own repositories), can associate content sources to repositories. view_adminRoles_permissions_permDesc_manageSecurity = Kann Benutzer und Rollen anlegen, aktualisieren oder löschen (Anschauen ist für alle implizit erlaubt) view_adminRoles_permissions_permDesc_manageSettings = Kann die Konfiguration des {0}-Servers ändern und jegliche Server-bezogene Funktionalität ausführen. +##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not delete) a bundle from the bundle group +##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global bundles (those not assigned to any bundle group) +##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the group +##view_adminRoles_permissions_permDesc_viewUsers = can view other users, with the exception of their assigned roles view_adminRoles_permissions_permReadDesc_configure = Ansehen der Ressourcen-Konfiguration und des Verlaufs derselben. view_adminRoles_permissions_permReadDesc_control = (IMPLIZIT) Ansehen der verfügbaren Operationen und des Verlaufs der ausgeführen Operationen view_adminRoles_permissions_permReadDesc_createChildResources = (IMPLIZIT) Ansehen des Verlaufs des Anlegens von Kind-Ressourcen @@ -526,20 +539,32 @@ view_adminRoles_permissions_permWriteDesc_manageContent = Abonnieren von Content view_adminRoles_permissions_permWriteDesc_manageDrift = Anlegen, Bearbeiten und Löschen von Drift-Definitionen und Management von Drift-Instanzen view_adminRoles_permissions_permWriteDesc_manageEvents = Ereignisse löschen view_adminRoles_permissions_permWriteDesc_manageMeasurements = Zeitplan für das Monitoring bearbeiten +##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group view_adminRoles_permissions_perm_configure = Konfiguration view_adminRoles_permissions_perm_control = Operationen +##view_adminRoles_permissions_perm_createBundles = Create Bundles +##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group view_adminRoles_permissions_perm_createChildResources = Kind-Ressourcen erzeugen +##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles +##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group view_adminRoles_permissions_perm_deleteChildResources = Löschen von Kind-Ressourcen +##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles view_adminRoles_permissions_perm_inventory = Inventar view_adminRoles_permissions_perm_manageAlerts = Alarme verwalten +##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups view_adminRoles_permissions_perm_manageBundles = Bundles verwalten view_adminRoles_permissions_perm_manageContent = Content verwalten view_adminRoles_permissions_perm_manageDrift = Drift verwalten view_adminRoles_permissions_perm_manageEvents = Ereignisse verwalten view_adminRoles_permissions_perm_manageInventory = Inventar verwalten view_adminRoles_permissions_perm_manageMeasurements = Monitoring verwalten +##view_adminRoles_permissions_perm_manageRepositories = Manage Repositories view_adminRoles_permissions_perm_manageSecurity = Sicherheitseinstellungen verwalten view_adminRoles_permissions_perm_manageSettings = Einstellungen verwalten +view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group +##view_adminRoles_permissions_perm_viewBundles = View Bundles +##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group +##view_adminRoles_permissions_perm_viewUsers = View Users view_adminRoles_permissions_read = Lesen view_adminRoles_permissions_readAccessImplied = Lesezugriff für das Recht {0} ist implizit und kann nicht abgeschaltet werden. view_adminRoles_permissions_resourcePermissions = Rechte für Ressourcen @@ -746,8 +771,7 @@ view_admin_systemSettings_AlertPurge_name = Bereinigen der Alarme, die älter si view_admin_systemSettings_AvailabilityPurge_name = Lösche Verfügbarkeitsdaten, die älter sind als ##view_admin_systemSettings_DriftFilePurge_desc = How old unused and orphaned drift files must be before being purged from backend storage. This is specified in days. view_admin_systemSettings_DriftFilePurge_name = Bereinige ungenutzte Drift-Dateine, die älter sind als -view_admin_systemSettings_LDAPBaseDN_name = \ -view_admin_systemSettings_LDAPBindPW_name = Passwort +view_admin_systemSettings_LDAPBaseDN_name = view_admin_systemSettings_LDAPBindPW_name = Passwort ##view_admin_systemSettings_RHQSessionTimeout_desc = If this amount of time passes without any user interaction in the browser, the session is considered as expired and user is aked to log in again. This value is specified in hours. ##view_admin_systemSettings_RHQSessionTimeout_name = GUI Session Timeout view_admin_systemSettings_TraitPurge_name = Bereinigen der Trait-Daten, die älter sind als diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index cb0c35f..626243e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -46,16 +46,6 @@ common_button_ack_all = すべてを確認 common_button_add = 追加 common_button_advanced = 高度な設定... common_button_apply = 適用 -##common_buttonbar_custom_window_title= Date Range -##common_buttonbar_custom_window_subtitle= Custom -##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a -##common_buttonbar_end_date= End Date -##common_buttonbar_end_time= End Time -##common_buttonbar_start_date= Start Date -##common_buttonbar_start_time= Start Time -##common_buttonbar_custom = Custom... -##common_buttonbar_custom_cancel = Cancel -##common_buttonbar_custom_save = Save common_button_cancel = キャンセル common_button_close = 閉じる common_button_compare = 比較 @@ -88,6 +78,16 @@ common_button_set = 設定 common_button_showDetails = 詳細表示... ##common_button_unignore = Unignore common_button_uninventory = アンインベントリ +##common_buttonbar_custom = Custom... +##common_buttonbar_custom_cancel = Cancel +##common_buttonbar_custom_save = Save +##common_buttonbar_custom_window_subtitle = Custom +##common_buttonbar_custom_window_title = Date Range +##common_buttonbar_datetime_format = MM/dd/yyyy h:mm a +##common_buttonbar_end_date = End Date +##common_buttonbar_end_time = End Time +##common_buttonbar_start_date = Start Date +##common_buttonbar_start_time = Start Time common_calendar_april_short = 4月 common_calendar_august_short = 8月 common_calendar_december_short = 12月 @@ -160,6 +160,7 @@ common_title_available_resources = 利用可能リソース common_title_average_metrics = 毎分の平均メトリックス common_title_background = 背景色 common_title_bundle = バンドル +##common_title_bundleGroups = Bundle Groups common_title_bundles = バンドル common_title_category = カテゴリ common_title_change_refresh_time = リフレッシュ間隔 @@ -508,11 +509,21 @@ view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} view_adminRoles_permissions_isAuthorized = 権限があるか? view_adminRoles_permissions_isRead = 読み出しですか? view_adminRoles_permissions_isWrite = 書き込みですか? +##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle to the bundle group +##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s. can copy existing bundles between viewable groups +##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle [version]s for the bundle group. can copy a viewable bundle to the bundle group. +##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable bundle [version]s +##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle [version]s from the bundle group (implicitly deleting then from other assigned groups) +##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle version to any viewable, deployable, compatible, resource group +##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete bundle groups view_adminRoles_permissions_permDesc_manageBundles = プロビジョニングバンドルの作成、更新、削除が可能です(誰でも暗黙的に閲覧可能です) view_adminRoles_permissions_permDesc_manageInventory = すべてのリソースについてすべてのリソース権限を持ちます。つまり、グループの作成、更新、削除、そして自動検出された、または手動で検出されたリソースのインポートが可能です view_adminRoles_permissions_permDesc_manageRepositories = ユーザーのリポジトリの作成、更新、削除が可能(誰でもリポジトリを作成可能)で、コンテントソースとリポジトリも関連づけができます。 view_adminRoles_permissions_permDesc_manageSecurity = ユーザーとロールの作成、更新、削除、その他すべての権限が可能です view_adminRoles_permissions_permDesc_manageSettings = {0}サーバーの修正と任意のサーバー関連の機能の実行ができます +##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not delete) a bundle from the bundle group +##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global bundles (those not assigned to any bundle group) +##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the group view_adminRoles_permissions_permDesc_viewUsers = 他のユーザーを閲覧できます。しかし、それらに割り当てられたロールは見えません。 view_adminRoles_permissions_permReadDesc_configure = リソース構成とリソース構成リビジョン履歴の閲覧 view_adminRoles_permissions_permReadDesc_control = 利用可能オペレーション; オペレーション実行履歴の(暗黙的な)閲覧 @@ -534,12 +545,19 @@ view_adminRoles_permissions_permWriteDesc_manageContent = コンテントソー view_adminRoles_permissions_permWriteDesc_manageDrift = ドリフト定義の作成、更新、削除; ドリフトインスタンスの管理 view_adminRoles_permissions_permWriteDesc_manageEvents = イベントの削除 view_adminRoles_permissions_permWriteDesc_manageMeasurements = メトリック収集スケジュールの更新 +##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group view_adminRoles_permissions_perm_configure = 構成 view_adminRoles_permissions_perm_control = 制御 +##view_adminRoles_permissions_perm_createBundles = Create Bundles +##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group view_adminRoles_permissions_perm_createChildResources = 子リソースの作成 +##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles +##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group view_adminRoles_permissions_perm_deleteChildResources = 子リソースの削除 +##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles view_adminRoles_permissions_perm_inventory = インベントリ view_adminRoles_permissions_perm_manageAlerts = アラートの管理 +##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups view_adminRoles_permissions_perm_manageBundles = バンドルの管理 view_adminRoles_permissions_perm_manageContent = コンテント管理 view_adminRoles_permissions_perm_manageDrift = ドリフト管理 @@ -549,6 +567,9 @@ view_adminRoles_permissions_perm_manageMeasurements = 測定の管理 view_adminRoles_permissions_perm_manageRepositories = リポジトリの管理 view_adminRoles_permissions_perm_manageSecurity = セキュリティの管理 view_adminRoles_permissions_perm_manageSettings = 設定の管理 +view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group +##view_adminRoles_permissions_perm_viewBundles = View Bundles +##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group view_adminRoles_permissions_perm_viewUsers = ユーザー閲覧 view_adminRoles_permissions_read = Read: view_adminRoles_permissions_readAccessImplied = [{0}] 権限のための読み取りアクセスを暗示されていて無効にできません diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 32dc73d..0da2a6e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -44,16 +44,6 @@ common_button_ack_all = 전체 확인 common_button_add = 추가 common_button_advanced = 고급 설정... common_button_apply = 적용 -##common_buttonbar_custom_window_title= Date Range -##common_buttonbar_custom_window_subtitle= Custom -##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a -##common_buttonbar_end_date= End Date -##common_buttonbar_end_time= End Time -##common_buttonbar_start_date= Start Date -##common_buttonbar_start_time= Start Time -##common_buttonbar_custom = Custom... -##common_buttonbar_custom_cancel = Cancel -##common_buttonbar_custom_save = Save common_button_cancel = 취소 common_button_close = 닫기 common_button_compare = 비교 @@ -85,6 +75,16 @@ common_button_set = 설정 common_button_showDetails = 자세히보기... ##common_button_unignore = Unignore common_button_uninventory = 인벤토리 제거 +##common_buttonbar_custom = Custom... +##common_buttonbar_custom_cancel = Cancel +##common_buttonbar_custom_save = Save +##common_buttonbar_custom_window_subtitle = Custom +##common_buttonbar_custom_window_title = Date Range +##common_buttonbar_datetime_format = MM/dd/yyyy h:mm a +##common_buttonbar_end_date = End Date +##common_buttonbar_end_time = End Time +##common_buttonbar_start_date = Start Date +##common_buttonbar_start_time = Start Time common_calendar_april_short = 4월 common_calendar_august_short = 8월 common_calendar_december_short = 12월 @@ -153,6 +153,7 @@ common_title_available_resources = 사용 가능한 자원 common_title_average_metrics = 분당 평균 통계 common_title_background = 배경색 common_title_bundle = 번들 +##common_title_bundleGroups = Bundle Groups common_title_bundles = 번들 common_title_change_refresh_time = 새로고침 주기 common_title_columns = 컬럼 @@ -452,8 +453,21 @@ view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelecti view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} 권한은 선택 해제 할 수 없습니다. 다른 모든 자원을 암시하는 관리 인벤토리가 먼저 선택 해제되어야 그것은 수행할 수 있습니다. view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} 권한은 선택 해제 할 수 없습니다. 다른 모든 권한을 암시하는 관리 보안 권한이 먼저 선택 해제되어야 그것은 수행할 수 있습니다. view_adminRoles_permissions_isAuthorized = 권한이 있습니까? +##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle to the bundle group +##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s. can copy existing bundles between viewable groups +##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle [version]s for the bundle group. can copy a viewable bundle to the bundle group. +##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable bundle [version]s +##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle [version]s from the bundle group (implicitly deleting then from other assigned groups) +##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle version to any viewable, deployable, compatible, resource group +##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete bundle groups +##view_adminRoles_permissions_permDesc_manageBundles = can create, update, or delete provisioning bundles (viewing is implied for everyone) view_adminRoles_permissions_permDesc_manageInventory = 모든 자원의 모든 자원 권한을 갖습니다. 즉, 그룹의 생성, 삭제, 자동감지 또는 수동으로 검출된 자원을 가져올수 있습니다. +##view_adminRoles_permissions_permDesc_manageRepositories = can create, update, or delete repositories of any user (everyone can create their own repositories), can associate content sources to repositories. +##view_adminRoles_permissions_permDesc_manageSecurity = can create, update, or delete users and roles - implies all other permissions view_adminRoles_permissions_permDesc_manageSettings = {0} 서버의 수정 및 모든 서버 관련 기능을 수행할 수 있습니다. +##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not delete) a bundle from the bundle group +##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global bundles (those not assigned to any bundle group) +##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the group view_adminRoles_permissions_permDesc_viewUsers = 다른 사용자를 볼 수 있습니다. 그러나 그들에게 할당된 역할은 보이지 않습니다. view_adminRoles_permissions_permReadDesc_configure = 자원 설정 및 자원 설정 수정 기록 보기 view_adminRoles_permissions_permReadDesc_createChildResources = (암시적) 자식 리소스 만들기 기록 보기 @@ -469,13 +483,21 @@ view_adminRoles_permissions_permWriteDesc_manageAlerts = 경고 정의를 만들 view_adminRoles_permissions_permWriteDesc_manageDrift = 드리프트 정의 만들기, 수정, 삭제; 드리프트 인스턴스 관리 view_adminRoles_permissions_permWriteDesc_manageEvents = 이벤트 삭제 view_adminRoles_permissions_permWriteDesc_manageMeasurements = 통계 수집 스케쥴 수정 +##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group view_adminRoles_permissions_perm_configure = 구성 view_adminRoles_permissions_perm_control = 제어 +##view_adminRoles_permissions_perm_createBundles = Create Bundles +##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group view_adminRoles_permissions_perm_createChildResources = 자식 리소스 만들기 +##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles +##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group view_adminRoles_permissions_perm_deleteChildResources = 자식 리소스 삭제 +##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles view_adminRoles_permissions_perm_inventory = 인벤토리 view_adminRoles_permissions_perm_manageAlerts = 경고 관리 +##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups view_adminRoles_permissions_perm_manageBundles = 번들 관리 +##view_adminRoles_permissions_perm_manageContent = Manage Content view_adminRoles_permissions_perm_manageDrift = 드리프트 관리 view_adminRoles_permissions_perm_manageEvents = 이벤트 관리 view_adminRoles_permissions_perm_manageInventory = 인벤토리 관리 @@ -483,6 +505,9 @@ view_adminRoles_permissions_perm_manageMeasurements = 측정 관리 view_adminRoles_permissions_perm_manageRepositories = 저장소 관리 view_adminRoles_permissions_perm_manageSecurity = 보안 관리 view_adminRoles_permissions_perm_manageSettings = 설정 관리 +view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group +##view_adminRoles_permissions_perm_viewBundles = View Bundles +##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group view_adminRoles_permissions_perm_viewUsers = 사용자 보기 view_adminRoles_permissions_read = 읽기: view_adminRoles_permissions_readAccessImplied = {0} 권한에 대한 읽기 엑세스를 암시해 해제 할 수 없습니다. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index f4419e1..6d74d41 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -43,16 +43,6 @@ common_button_ack_all = Confirmar Todos common_button_add = Adicionar common_button_advanced = Avan\u00E7ado... common_button_apply = Aplicar -##common_buttonbar_custom_window_title= Date Range -##common_buttonbar_custom_window_subtitle= Custom -##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a -##common_buttonbar_end_date= End Date -##common_buttonbar_end_time= End Time -##common_buttonbar_start_date= Start Date -##common_buttonbar_start_time= Start Time -##common_buttonbar_custom = Custom... -##common_buttonbar_custom_cancel = Cancel -##common_buttonbar_custom_save = Save common_button_cancel = Cancelar common_button_close = Fechar common_button_compare = Comparar @@ -85,6 +75,16 @@ common_button_set = Definir common_button_showDetails = Mostrar Detalhes... ##common_button_unignore = Unignore common_button_uninventory = Remover do Invent\u00E1rio +##common_buttonbar_custom = Custom... +##common_buttonbar_custom_cancel = Cancel +##common_buttonbar_custom_save = Save +##common_buttonbar_custom_window_subtitle = Custom +##common_buttonbar_custom_window_title = Date Range +##common_buttonbar_datetime_format = MM/dd/yyyy h:mm a +##common_buttonbar_end_date = End Date +##common_buttonbar_end_time = End Time +##common_buttonbar_start_date = Start Date +##common_buttonbar_start_time = Start Time common_calendar_april_short = abr common_calendar_august_short = ago common_calendar_december_short = dez @@ -157,6 +157,7 @@ common_title_available_resources = Recursos Dispon\u00EDveis common_title_average_metrics = M\u00E9tricas da m\u00E9dia por Minuto common_title_background = Fundo (background) common_title_bundle = Bundle +##common_title_bundleGroups = Bundle Groups common_title_bundles = Bundles common_title_category = Categoria common_title_change_refresh_time = Atualizar Intervalo @@ -513,11 +514,22 @@ view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} view_adminRoles_permissions_isAuthorized = Autorizado? view_adminRoles_permissions_isRead = Leitura? view_adminRoles_permissions_isWrite = Escrita? +##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle to the bundle group +##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s. can copy existing bundles between viewable groups +##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle [version]s for the bundle group. can copy a viewable bundle to the bundle group. +##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable bundle [version]s +##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle [version]s from the bundle group (implicitly deleting then from other assigned groups) +##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle version to any viewable, deployable, compatible, resource group +##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete bundle groups view_adminRoles_permissions_permDesc_manageBundles = pode criar, atualizar, ou excluir o provisionamento de bundles (a visualiza\u00E7\u00E3 \u00E9 implicita para todos) view_adminRoles_permissions_permDesc_manageInventory = possui todas as permiss\u00F5es de Recurso, como descrito abaixo, pode criar, atualizar, excluir grupos e importar Recursos descobertos automaticamente ou manualmente. view_adminRoles_permissions_permDesc_manageRepositories = pode criar, atualizar, ou excluir reposit\u00F3rios de qualquer usu\u00E1rio (todos podem criar seus pr\u00F3prios reposit\u00F3rios), pode associar fontes de conte\u00FAdos a reposit\u00F3rios. view_adminRoles_permissions_permDesc_manageSecurity = pode criar, atualizar, ou excluir usu\u00E1rios e perfis (visualiza\u00E7\u00E3o \u00E9 padr\u00E3o para todos) ##view_adminRoles_permissions_permDesc_manageSettings = pode modificar a configura\u00E7\u00E3o do RHQ Server e utilizar qualquer funcionalidade relacionada ao Servidor +##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not delete) a bundle from the bundle group +##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global bundles (those not assigned to any bundle group) +##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the group +##view_adminRoles_permissions_permDesc_viewUsers = can view other users, with the exception of their assigned roles view_adminRoles_permissions_permReadDesc_configure = view Resource configuration and Resource configuration revision history view_adminRoles_permissions_permReadDesc_control = (IMPL\u00CDCITO) visualizar opera\u00E7\u00F5es dispon\u00EDveis e o hist\u00F3rico da execu\u00E7\u00E3o de opera\u00E7\u00F5es view_adminRoles_permissions_permReadDesc_createChildResources = (IMPL\u00CDCITO) visualizar o hist\u00F3rico de cria\u00E7\u00E3o do recurso filho @@ -538,12 +550,19 @@ view_adminRoles_permissions_permWriteDesc_manageContent = inscrever-se no reposi ##view_adminRoles_permissions_permWriteDesc_manageDrift = create, update, and delete drift definitions; and manage drift instances view_adminRoles_permissions_permWriteDesc_manageEvents = excluir eventos view_adminRoles_permissions_permWriteDesc_manageMeasurements = atualizar agendamento de coleta de m\u00E9tricas +##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group view_adminRoles_permissions_perm_configure = Configurar view_adminRoles_permissions_perm_control = Controlar +##view_adminRoles_permissions_perm_createBundles = Create Bundles +##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group view_adminRoles_permissions_perm_createChildResources = Criar Recurso filho +##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles +##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group view_adminRoles_permissions_perm_deleteChildResources = Excluir Recursos filhos +##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles view_adminRoles_permissions_perm_inventory = Invent\u00E1rio view_adminRoles_permissions_perm_manageAlerts = Gerenciar Alertas +##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups view_adminRoles_permissions_perm_manageBundles = Gerenciar Bundles view_adminRoles_permissions_perm_manageContent = Gerenciar Conte\u00FAdo ##view_adminRoles_permissions_perm_manageDrift = Manage Drift @@ -553,6 +572,10 @@ view_adminRoles_permissions_perm_manageMeasurements = Gerenciar M\u00E9tricas view_adminRoles_permissions_perm_manageRepositories = Gerenciar Reposit\u00F3rios view_adminRoles_permissions_perm_manageSecurity = Gerenciar Seguran\u00E7a view_adminRoles_permissions_perm_manageSettings = Gerenciar Configura\u00E7\u00F5es +view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group +##view_adminRoles_permissions_perm_viewBundles = View Bundles +##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group +##view_adminRoles_permissions_perm_viewUsers = View Users view_adminRoles_permissions_read = Leitura: view_adminRoles_permissions_readAccessImplied = Acesso de leitura para a permiss\u00E3o {0} \u00E9 impl\u00EDcita e n\u00E3o pode ser desabilitada. view_adminRoles_permissions_resourcePermissions = Permiss\u00F5es de Recurso diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index d75b76e..f31b829 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -2271,6 +2271,7 @@ common_title_available_resources = Доступные ресурсы common_title_average_metrics = Среднее количество метрик в минуту common_title_background = Фон common_title_bundle = Пакет +##common_title_bundleGroups = Bundle Groups common_title_bundles = Пакеты common_title_category = Категория common_title_change_refresh_time = Интервал обновления @@ -2591,9 +2592,22 @@ view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} view_adminRoles_permissions_isAuthorized = Авторизованы? view_adminRoles_permissions_isRead = Читать? view_adminRoles_permissions_isWrite = Запись? +##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle to the bundle group +##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s. can copy existing bundles between viewable groups +##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle [version]s for the bundle group. can copy a viewable bundle to the bundle group. +##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable bundle [version]s +##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle [version]s from the bundle group (implicitly deleting then from other assigned groups) +##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle version to any viewable, deployable, compatible, resource group +##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete bundle groups view_adminRoles_permissions_permDesc_manageBundles = Можно создавать, обновлять и удалять узлы предоставления (просмотр предоставляется всем) +##view_adminRoles_permissions_permDesc_manageInventory = has all Resource permissions, as described below, for all Resources; can create, update, and delete groups; and can import auto-discovered or manually discovered Resources view_adminRoles_permissions_permDesc_manageRepositories = можно создавать, обновлять или удалять репозитории любого пользователя (каждый может создавать свои собственные репозитории), можно ассоциировать источники контента с резпозиториями. view_adminRoles_permissions_permDesc_manageSecurity = можно создавать, обновлять или удалять пользователей и роли - включает все другие полномочия +##view_adminRoles_permissions_permDesc_manageSettings = can modify the {0} Server configuration and perform any Server-related functionality +##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not delete) a bundle from the bundle group +##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global bundles (those not assigned to any bundle group) +##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the group +##view_adminRoles_permissions_permDesc_viewUsers = can view other users, with the exception of their assigned roles view_adminRoles_permissions_permReadDesc_configure = просмотр конфигурации ресурса и историю версий конфигурации ресурса view_adminRoles_permissions_permReadDesc_createChildResources = (ПОДРАЗУМЕВАЕМЫЙ) просмотр истории создания дочернего ресурса view_adminRoles_permissions_permReadDesc_deleteChildResources = (ПОДРАЗУМЕВАЕМЫЙ) просмотр истории удаления дочернего ресурса @@ -2608,18 +2622,32 @@ view_adminRoles_permissions_permWriteDesc_manageAlerts = создать, обн view_adminRoles_permissions_permWriteDesc_manageContent = подписаться на источники контента; устанавливать и удалять пакеты view_adminRoles_permissions_permWriteDesc_manageEvents = удалять события view_adminRoles_permissions_permWriteDesc_manageMeasurements = обновление метрик коллекции планировщиков +##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group view_adminRoles_permissions_perm_configure = Конфигурация view_adminRoles_permissions_perm_control = Управление +##view_adminRoles_permissions_perm_createBundles = Create Bundles +##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group +##view_adminRoles_permissions_perm_createChildResources = Create Child Resources +##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles +##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group +##view_adminRoles_permissions_perm_deleteChildResources = Delete Child Resources +##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles view_adminRoles_permissions_perm_inventory = Инвентаризация view_adminRoles_permissions_perm_manageAlerts = Управление предупреждениями +##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups view_adminRoles_permissions_perm_manageBundles = Управление узлами view_adminRoles_permissions_perm_manageContent = Управление контентом +##view_adminRoles_permissions_perm_manageDrift = Manage Drift view_adminRoles_permissions_perm_manageEvents = Управление событиями view_adminRoles_permissions_perm_manageInventory = Управление инвентаризацией view_adminRoles_permissions_perm_manageMeasurements = Управление измерениями view_adminRoles_permissions_perm_manageRepositories = Управление репозиториями view_adminRoles_permissions_perm_manageSecurity = Управление безопасностью view_adminRoles_permissions_perm_manageSettings = Управление настройками +view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group +##view_adminRoles_permissions_perm_viewBundles = View Bundles +##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group +##view_adminRoles_permissions_perm_viewUsers = View Users view_adminRoles_permissions_read = Чтение\: view_adminRoles_permissions_readAccessImplied = Доступ чтения для {0} полномочия подразумевается и не может быть закрыт. view_adminRoles_permissions_resourcePermissions = Полномчия ресурса diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index a9a24df..1aeb1a1 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -43,16 +43,6 @@ common_button_ack_all = \u786e\u8ba4\u6240\u6709 common_button_add = \u6dfb\u52a0 common_button_advanced = \u9ad8\u7ea7... common_button_apply = \u63a5\u53d7 -##common_buttonbar_custom_window_title= Date Range -##common_buttonbar_custom_window_subtitle= Custom -##common_buttonbar_datetime_format= MM/dd/yyyy h:mm a -##common_buttonbar_end_date= End Date -##common_buttonbar_end_time= End Time -##common_buttonbar_start_date= Start Date -##common_buttonbar_start_time= Start Time -##common_buttonbar_custom = Custom... -##common_buttonbar_custom_cancel = Cancel -##common_buttonbar_custom_save = Save common_button_cancel = \u53d6\u6d88 common_button_close = \u5173\u95ed common_button_compare = \u5bf9\u6bd4 @@ -85,6 +75,16 @@ common_button_set = Set common_button_showDetails = \u67e5\u770b\u8be6\u60c5... ##common_button_unignore = Unignore common_button_uninventory = Uninventory +##common_buttonbar_custom = Custom... +##common_buttonbar_custom_cancel = Cancel +##common_buttonbar_custom_save = Save +##common_buttonbar_custom_window_subtitle = Custom +##common_buttonbar_custom_window_title = Date Range +##common_buttonbar_datetime_format = MM/dd/yyyy h:mm a +##common_buttonbar_end_date = End Date +##common_buttonbar_end_time = End Time +##common_buttonbar_start_date = Start Date +##common_buttonbar_start_time = Start Time common_calendar_april_short = \u56db\u6708 common_calendar_august_short = \u516b\u6708 common_calendar_december_short = \u5341\u4e8c\u6708 @@ -157,6 +157,7 @@ common_title_available_resources = \u53ef\u7528\u7684\u8d44\u6e90 common_title_average_metrics = \u5e73\u5747\u6bcf\u5206\u949f\u6307\u6807 common_title_background = \u80cc\u666f\u8272 common_title_bundle = Bundle +##common_title_bundleGroups = Bundle Groups common_title_bundles = Bundles common_title_category = \u7c7b\u522b common_title_change_refresh_time = \u5237\u65b0\u95f4\u9694 @@ -502,11 +503,22 @@ view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} view_adminRoles_permissions_isAuthorized = \u6388\u6743? view_adminRoles_permissions_isRead = \u8bfb? view_adminRoles_permissions_isWrite = \u5199? +##view_adminRoles_permissions_permDesc_assignBundlesToGroup = can copy a viewable bundle to the bundle group +##view_adminRoles_permissions_permDesc_createBundles = can create new bundle [version]s. can copy existing bundles between viewable groups +##view_adminRoles_permissions_permDesc_createBundlesInGroup = can create new bundle [version]s for the bundle group. can copy a viewable bundle to the bundle group. +##view_adminRoles_permissions_permDesc_deleteBundles = can delete or unassign viewable bundle [version]s +##view_adminRoles_permissions_permDesc_deleteBundlesFromGroup = can delete bundle [version]s from the bundle group (implicitly deleting then from other assigned groups) +##view_adminRoles_permissions_permDesc_deployBundles = can deploy any viewable bundle version to any viewable, deployable, compatible, resource group +##view_adminRoles_permissions_permDesc_manageBundleGroups = can create, update, or delete bundle groups view_adminRoles_permissions_permDesc_manageBundles = \u80fd\u521b\u5efa,\u66f4\u65b0\u6216\u8005\u5220\u9664\u63d0\u4f9b\u7684bundles(\u4efb\u4f55\u4eba\u90fd\u80fd\u67e5\u770b) view_adminRoles_permissions_permDesc_manageInventory = \u62e5\u6709\u6240\u6709\u8d44\u6e90\u6743\u9650, \u5982\u4e0b\u6240\u8ff0, \u5bf9\u6240\u6709\u8d44\u6e90; \u5177\u6709\u521b\u5efa, \u66f4\u65b0, \u5220\u9664\u7ec4; \u80fd\u5bfc\u5165\u81ea\u52a8\u53d1\u73b0\u6216\u624b\u52a8\u53d1\u73b0\u7684\u8d44\u6e90 view_adminRoles_permissions_permDesc_manageRepositories = can create, update, or delete repositories of any user (everyone can create their own repositories), can associate content sources to repositories. view_adminRoles_permissions_permDesc_manageSecurity = \u80fd\u521b\u5efa,\u66f4\u65b0,\u6216\u5220\u9664\u7528\u6237\u548c\u89d2\u8272 (\u4efb\u4f55\u4eba\u90fd\u6709\u67e5\u770b\u6743\u9650) ##view_adminRoles_permissions_permDesc_manageSettings = \u80fd\u4fee\u6539RHQ\u670d\u52a1\u5668\u914d\u7f6e\u800c\u4e14\u80fd\u64cd\u4f5c\u4efb\u4f55\u76f8\u5173\u7684\u670d\u52a1\u5668\u529f\u80fd +##view_adminRoles_permissions_permDesc_unassignBundlesFromGroup = can unassign (not delete) a bundle from the bundle group +##view_adminRoles_permissions_permDesc_viewBundles = can view any bundle including global bundles (those not assigned to any bundle group) +##view_adminRoles_permissions_permDesc_viewBundlesInGroup = can view any bundle in the group +##view_adminRoles_permissions_permDesc_viewUsers = can view other users, with the exception of their assigned roles view_adminRoles_permissions_permReadDesc_configure = \u67e5\u770b\u8d44\u6e90\u914d\u7f6e\u548c\u8d44\u6e90\u914d\u7f6e\u4fee\u8ba2\u5386\u53f2 view_adminRoles_permissions_permReadDesc_control = (IMPLIED) \u67e5\u770b\u53ef\u7528\u64cd\u4f5c\u548c\u64cd\u4f5c\u6267\u884c\u5386\u53f2 view_adminRoles_permissions_permReadDesc_createChildResources = (IMPLIED) \u67e5\u770b\u5b50\u8d44\u6e90\u521b\u5efa\u5386\u53f2 @@ -527,12 +539,19 @@ view_adminRoles_permissions_permWriteDesc_manageContent = \u8ba2\u9605\u5185\u5b ##view_adminRoles_permissions_permWriteDesc_manageDrift = create, update, and delete drift definitions; and manage drift instances view_adminRoles_permissions_permWriteDesc_manageEvents = \u5220\u9664\u4e8b\u4ef6 view_adminRoles_permissions_permWriteDesc_manageMeasurements = \u66f4\u65b0\u6307\u6807\u96c6\u8ba1\u5212\u4efb\u52a1 +##view_adminRoles_permissions_perm_assignBundlesToGroup = Assign Bundles To Group view_adminRoles_permissions_perm_configure = \u914d\u7f6e view_adminRoles_permissions_perm_control = \u63a7\u5236 +##view_adminRoles_permissions_perm_createBundles = Create Bundles +##view_adminRoles_permissions_perm_createBundlesInGroup = Create Bundles In Group view_adminRoles_permissions_perm_createChildResources = \u521b\u5efa\u5b50\u8d44\u6e90 +##view_adminRoles_permissions_perm_deleteBundles = Delete Bundles +##view_adminRoles_permissions_perm_deleteBundlesFromGroup = Delete Bundles From Group view_adminRoles_permissions_perm_deleteChildResources = \u5220\u9664\u5b50\u8d44\u6e90 +##view_adminRoles_permissions_perm_deployBundles = Deploy Bundles view_adminRoles_permissions_perm_inventory = \u6e05\u5355 view_adminRoles_permissions_perm_manageAlerts = \u7ba1\u7406\u544a\u8b66 +##view_adminRoles_permissions_perm_manageBundleGroups = Manage Bundle Groups view_adminRoles_permissions_perm_manageBundles = \u7ba1\u7406Bundles view_adminRoles_permissions_perm_manageContent = \u7ba1\u7406\u5185\u5bb9 ##view_adminRoles_permissions_perm_manageDrift = Manage Drift @@ -542,6 +561,10 @@ view_adminRoles_permissions_perm_manageMeasurements = \u7ba1\u7406\u6307\u6807 view_adminRoles_permissions_perm_manageRepositories = \u7ba1\u7406\u5e93 view_adminRoles_permissions_perm_manageSecurity = \u7ba1\u7406\u6743\u9650 view_adminRoles_permissions_perm_manageSettings = \u7ba1\u7406\u914d\u7f6e +view_adminRoles_permissions_perm_unassignBundlesFromGroup = Unassign Bundles From Group +##view_adminRoles_permissions_perm_viewBundles = View Bundles +##view_adminRoles_permissions_perm_viewBundlesInGroup = View Bundles In Group +##view_adminRoles_permissions_perm_viewUsers = View Users view_adminRoles_permissions_read = \u8bfb: view_adminRoles_permissions_readAccessImplied = \u9ed8\u8ba4\u6709\u8bbf\u95ee{0}\u7684\u6743\u9650\u800c\u4e14\u65e0\u6cd5\u7981\u7528. view_adminRoles_permissions_resourcePermissions = \u8d44\u6e90\u6388\u6743 diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java index f61782a..dbecb26 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java @@ -43,7 +43,6 @@ import javax.persistence.EntityNotFoundException; import javax.persistence.PersistenceContext; import javax.persistence.Query; -import org.apache.commons.httpclient.params.DefaultHttpParams; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.HttpResponse; @@ -55,7 +54,6 @@ import org.apache.http.client.params.HttpClientParams; import org.apache.http.impl.auth.BasicScheme; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.params.BasicHttpParams; -import org.apache.http.params.DefaultedHttpParams; import org.apache.http.params.HttpParams; import org.apache.maven.artifact.versioning.ComparableVersion; @@ -72,6 +70,7 @@ import org.rhq.core.domain.bundle.BundleDeployment; import org.rhq.core.domain.bundle.BundleDeploymentStatus; import org.rhq.core.domain.bundle.BundleDestination; import org.rhq.core.domain.bundle.BundleFile; +import org.rhq.core.domain.bundle.BundleGroup; import org.rhq.core.domain.bundle.BundleResourceDeployment; import org.rhq.core.domain.bundle.BundleResourceDeploymentHistory; import org.rhq.core.domain.bundle.BundleType; @@ -90,6 +89,7 @@ import org.rhq.core.domain.criteria.BundleCriteria; import org.rhq.core.domain.criteria.BundleDeploymentCriteria; import org.rhq.core.domain.criteria.BundleDestinationCriteria; import org.rhq.core.domain.criteria.BundleFileCriteria; +import org.rhq.core.domain.criteria.BundleGroupCriteria; import org.rhq.core.domain.criteria.BundleResourceDeploymentCriteria; import org.rhq.core.domain.criteria.BundleVersionCriteria; import org.rhq.core.domain.criteria.ResourceCriteria; @@ -1622,6 +1622,14 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot return queryRunner.execute(); } + @Override + public PageList<BundleGroup> findBundleGroupsByCriteria(Subject subject, BundleGroupCriteria criteria) { + CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria); + CriteriaQueryRunner<BundleGroup> queryRunner = new CriteriaQueryRunner<BundleGroup>(criteria, generator, + entityManager); + return queryRunner.execute(); + } + /** * Fetch bundles by criteria and then filter destination on the result objects to limit what the user can see * @param subject Caller diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java index 2387833..b72d6b5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java @@ -30,6 +30,7 @@ import org.rhq.core.domain.bundle.Bundle; import org.rhq.core.domain.bundle.BundleDeployment; import org.rhq.core.domain.bundle.BundleDestination; import org.rhq.core.domain.bundle.BundleFile; +import org.rhq.core.domain.bundle.BundleGroup; import org.rhq.core.domain.bundle.BundleResourceDeployment; import org.rhq.core.domain.bundle.BundleType; import org.rhq.core.domain.bundle.BundleVersion; @@ -41,6 +42,7 @@ import org.rhq.core.domain.criteria.BundleCriteria; import org.rhq.core.domain.criteria.BundleDeploymentCriteria; import org.rhq.core.domain.criteria.BundleDestinationCriteria; import org.rhq.core.domain.criteria.BundleFileCriteria; +import org.rhq.core.domain.criteria.BundleGroupCriteria; import org.rhq.core.domain.criteria.BundleResourceDeploymentCriteria; import org.rhq.core.domain.criteria.BundleVersionCriteria; import org.rhq.core.domain.util.PageList; @@ -259,6 +261,8 @@ public interface BundleManagerRemote { PageList<Bundle> findBundlesByCriteria(Subject subject, BundleCriteria criteria); + PageList<BundleGroup> findBundleGroupsByCriteria(Subject subject, BundleGroupCriteria criteria); + PageList<BundleDeployment> findBundleDeploymentsByCriteria(Subject subject, BundleDeploymentCriteria criteria); PageList<BundleDestination> findBundleDestinationsByCriteria(Subject subject, BundleDestinationCriteria criteria);

1 0

[rhq] modules/plugins
by Thomas Segismont 24 Jul '13

24 Jul '13

modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 38 +++++++-- modules/plugins/rhq-storage/pom.xml | 16 +++ modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java | 26 +++++- modules/plugins/rhq-storage/src/test/resources/log4j.properties | 42 ---------- modules/plugins/rhq-storage/src/test/resources/log4j.xml | 40 +++++++++ 5 files changed, 109 insertions(+), 53 deletions(-) New commits: commit 20f29263bca99d540b4027b63b690f805663ed13 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 24 18:55:25 2013 +0200 Fix StorageNodeComponentITest.shutdownStorageNode Fixed storage node module pom typo Made test Cassandra server start with relative paths in classpath (otherwise the command line is too long and gets truncated in /proc/pid/cmdline this preventing the process query to find the server) Made CassandraNodeComponent shutdown operation to wait for server to go down diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 8d74ccc..c41e8e7 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -132,12 +132,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent long start = System.nanoTime(); try { // Get a fresh snapshot of the process - ProcessInfoSnapshot processInfoSnapshot = (processInfo == null) ? null : processInfo.freshSnapshot(); - if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { - processInfo = getResourceContext().getNativeProcess(); - // Safe to get prior snapshot here, we've just recreated the process info instance - processInfoSnapshot = (processInfo == null) ? null : processInfo.priorSnaphot(); - } + ProcessInfoSnapshot processInfoSnapshot = getProcessInfoSnapshot(); return (processInfoSnapshot != null && processInfoSnapshot.isRunning()) ? AvailabilityType.UP : AvailabilityType.DOWN; } finally { @@ -151,11 +146,23 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } + private ProcessInfoSnapshot getProcessInfoSnapshot() { + ProcessInfoSnapshot processInfoSnapshot = (processInfo == null) ? null : processInfo.freshSnapshot(); + if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { + processInfo = getResourceContext().getNativeProcess(); + // Safe to get prior snapshot here, we've just recreated the process info instance + processInfoSnapshot = (processInfo == null) ? null : processInfo.priorSnaphot(); + } + return processInfoSnapshot; + } + @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if (name.equals("shutdown")) { - return shutdownNode(); + OperationResult operationResult = shutdownNode(); + waitForNodeToGoDown(); + return operationResult; } else if (name.equals("start")) { return startNode(); } else if (name.equals("restart")) { @@ -167,6 +174,23 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent return null; } + private void waitForNodeToGoDown() throws InterruptedException { + for (ProcessInfoSnapshot processInfoSnapshot = getProcessInfoSnapshot();; processInfoSnapshot = getProcessInfoSnapshot()) { + if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { + // Process not found, so it died, that's fine + // OR + // Process info says process is no longer running, that's fine as well + break; + } + if (getResourceContext().getComponentInvocationContext().isInterrupted()) { + // Operation canceled or timed out + throw new InterruptedException(); + } + // Process is still running, wait a second and check again + Thread.sleep(SECONDS.toMillis(1)); + } + } + @SuppressWarnings("rawtypes") protected OperationResult shutdownNode() { ResourceContext<?> context = getResourceContext(); diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index df79e40..b1d50b8 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -55,6 +55,20 @@ </dependency> <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>test-utils</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> + </exclusion> + </exclusions> + </dependency> + + + <dependency> <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-schema</artifactId> <version>${project.version}</version> @@ -70,7 +84,7 @@ <phase>pre-integration-test</phase> <configuration> <target> - <property name="sigar.dir" value="${project.build.directory/sigar}"/> + <property name="sigar.dir" value="${project.build.directory}/sigar"/> <mkdir dir="${pc.basedir}"/> <mkdir dir="${pc.lib.dir}"/> diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index b668073..5bc8b31 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -1,3 +1,22 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + package org.rhq.plugins.storage; import static java.util.Arrays.asList; @@ -94,8 +113,10 @@ public class StorageNodeComponentITest { File binDir = new File(basedir, "bin"); SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); - File startScript = new File(binDir, "cassandra"); + File startScript = new File("./cassandra"); ProcessExecution startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + startScriptExe.setWorkingDirectory(binDir.getAbsolutePath()); + startScriptExe.setCheckExecutableExists(false); startScriptExe.addArguments(asList("-p", "cassandra.pid")); startScriptExe.setCaptureOutput(true); @@ -176,8 +197,7 @@ public class StorageNodeComponentITest { assertFalse(pidFile.exists(), pidFile + " should be deleted when the storage node is shutdown."); - // TODO why is this failing? - //assertNodeIsDown("Expected " + storageNode + " to be DOWN after shutting it down"); + assertNodeIsDown("Expected " + storageNode + " to be DOWN after shutting it down"); } @Test(dependsOnMethods = "shutdownStorageNode") diff --git a/modules/plugins/rhq-storage/src/test/resources/log4j.properties b/modules/plugins/rhq-storage/src/test/resources/log4j.properties deleted file mode 100644 index 67db049..0000000 --- a/modules/plugins/rhq-storage/src/test/resources/log4j.properties +++ /dev/null @@ -1,42 +0,0 @@ -# -# /* -# * RHQ Management Platform -# * Copyright (C) 2005-2012 Red Hat, Inc. -# * All rights reserved. -# * -# * This program is free software; you can redistribute it and/or modify -# * it under the terms of the GNU General Public License, version 2, as -# * published by the Free Software Foundation, and/or the GNU Lesser -# * General Public License, version 2.1, also as published by the Free -# * Software Foundation. -# * -# * This program is distributed in the hope that it will be useful, -# * but WITHOUT ANY WARRANTY; without even the implied warranty of -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# * GNU General Public License and the GNU Lesser General Public License -# * for more details. -# * -# * You should have received a copy of the GNU General Public License -# * and the GNU Lesser General Public License along with this program; -# * if not, write to the Free Software Foundation, Inc., -# * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# */ -# - -log4j.rootCategory=WARN, FILE, CONSOLE - -log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender -log4j.appender.FILE.DatePattern='.'yyyy-MM-dd -log4j.appender.FILE.File=./target/test.log -log4j.appender.FILE.layout=org.apache.log4j.PatternLayout -log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n -#log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n -log4j.appender.FILE.Append=false - -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -#log4j.appender.CONSOLE.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n -log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n - -log4j.logger.org.rhq=DEBUG -log4j.logger.com.datastax=DEBUG diff --git a/modules/plugins/rhq-storage/src/test/resources/log4j.xml b/modules/plugins/rhq-storage/src/test/resources/log4j.xml new file mode 100644 index 0000000..ec3cd98 --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/resources/log4j.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out" /> + <param name="Threshold" value="WARN" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L) - %m%n" /> + </layout> + </appender> + + <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> + <param name="File" value="target/test.log" /> + <param name="Append" value="false" /> + <param name="Threshold" value="DEBUG" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L) - %m%n" /> + </layout> + </appender> + + <logger name="org.rhq"> + <level value="DEBUG" /> + </logger> + + <logger name="com.datastax"> + <level value="DEBUG" /> + </logger> + + <root> + <level value="WARN" /> + <appender-ref ref="CONSOLE" /> + <appender-ref ref="FILE" /> + </root> + +</log4j:configuration>

1 0

[rhq] modules/plugins
by John Sanda 24 Jul '13

24 Jul '13

modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 11 +++ modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java | 33 +++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) New commits: commit 68fcc27445e375748d2bd27429d7729ae3c076db Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 24 07:47:24 2013 -0400 [BZ 987899] remove and create pid file during shutdown and start operations diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index cf24fcd..8d74ccc 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -18,6 +18,7 @@ */ package org.rhq.plugins.cassandra; +import static java.util.Arrays.asList; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static org.rhq.core.system.OperatingSystemType.WINDOWS; @@ -210,6 +211,14 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent long pid = process.getPid(); try { process.kill("KILL"); + + Configuration pluginConfig = getResourceContext().getPluginConfiguration(); + File basedir = new File(pluginConfig.getSimpleValue("baseDir")); + File binDir = new File(basedir, "bin"); + File pidFile = new File(binDir, "cassandra.pid"); + + pidFile.delete(); + return new OperationResult("Successfully shut down Cassandra daemon with pid " + pid); } catch (SigarException e) { LOG.warn("Failed to shut down Cassandra node with pid " + pid, e); @@ -226,8 +235,10 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent String baseDir = pluginConfig.getSimpleValue("baseDir"); File binDir = new File(baseDir, "bin"); File startScript = new File(binDir, getStartScript()); + File pidFile = new File(binDir, "cassandra.pid"); ProcessExecution scriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + scriptExe.addArguments(asList("-p", pidFile.getAbsolutePath())); SystemInfo systemInfo = context.getSystemInformation(); ProcessExecutionResults results = systemInfo.executeProcess(scriptExe); diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index cd9f148..b668073 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -2,7 +2,9 @@ package org.rhq.plugins.storage; import static java.util.Arrays.asList; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; import java.io.File; import java.net.InetAddress; @@ -168,8 +170,34 @@ public class StorageNodeComponentITest { new Configuration(), timeout); assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The shutdown operation failed"); + + File binDir = new File(basedir, "bin"); + File pidFile = new File(binDir, "cassandra.pid"); + + assertFalse(pidFile.exists(), pidFile + " should be deleted when the storage node is shutdown."); + // TODO why is this failing? - assertNodeIsDown("Expected " + storageNode + " to be DOWN after shutting it down"); + //assertNodeIsDown("Expected " + storageNode + " to be DOWN after shutting it down"); + } + + @Test(dependsOnMethods = "shutdownStorageNode") + public void restartStorageNode() { + OperationManager operationManager = PluginContainer.getInstance().getOperationManager(); + OperationServicesAdapter operationsService = new OperationServicesAdapter(operationManager); + + long timeout = 1000 * 60; + OperationContextImpl operationContext = new OperationContextImpl(storageNode.getId()); + OperationServicesResult result = operationsService.invokeOperation(operationContext, "start", + new Configuration(), timeout); + + assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The start operation failed."); + + File binDir = new File(basedir, "bin"); + File pidFile = new File(binDir, "cassandra.pid"); + + assertTrue(pidFile.exists(), pidFile + " should be created when starting the storage node."); + + assertNodeIsUp("Expected " + storageNode + " to be up after restarting it."); } private void assertNodeIsUp(String msg) { @@ -192,7 +220,8 @@ public class StorageNodeComponentITest { private Availability getAvailability() { InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); - return inventoryManager.getAvailabilityIfKnown(storageNode); +// return inventoryManager.getAvailabilityIfKnown(storageNode); + return inventoryManager.getCurrentAvailability(storageNode); } private void executeAvailabilityScan() {

1 0

[rhq] modules/plugins
by John Sanda 24 Jul '13

24 Jul '13

modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 96286a4e22da2135a85ad6b09d069b9e690a05c9 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 24 07:08:09 2013 -0400 uncommented code that was done while debugging tests diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index f76da22..cf24fcd 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -111,7 +111,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent clusterBuilder = clusterBuilder.withCredentials(username, password); } -// this.cassandraSession = clusterBuilder.build().connect(clusterName); + this.cassandraSession = clusterBuilder.build().connect(clusterName); } catch (Exception e) { LOG.error("Connect to Cassandra " + host + ":" + nativePort, e); throw e;

1 0

[rhq] modules/enterprise modules/integration-tests
by Heiko W. Rupp 24 Jul '13

24 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java | 49 +++++++--- modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ContentTest.java | 8 + 2 files changed, 45 insertions(+), 12 deletions(-) New commits: commit 1ceae7f8fc049bd036d03e4c84fadb5a8a057563 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Jul 24 11:54:53 2013 +0200 BZ 976786 Add a bit more wait time and an additional check if SUCCESS really means it. Return IN_PROGRESS otherwise. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java index 4bfbb7c..7a6fb33 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java @@ -721,6 +721,9 @@ public class ResourceHandlerBean extends AbstractRestBean { @POST @Path("/") + @ApiErrors({ + @ApiError(code = 302, reason = "Creation is still happening. Check back with a GET on the Location.") + }) @ApiOperation(value = "Create a new resource as a child of an existing resource. ", notes= "If a handle is given, a content based resource is created; the content identified by the handle is not removed from the content store." + "If no handle is given, a resource is created from the data of the passed 'resource' object.") @@ -824,6 +827,11 @@ public class ResourceHandlerBean extends AbstractRestBean { CreateResourceStatus status = history.getStatus(); + try { + Thread.sleep(2000L); // give the agent time to do the work + } catch (InterruptedException e) { + ; // nothing + } MediaType mediaType = headers.getAcceptableMediaTypes().get(0); @@ -832,11 +840,16 @@ public class ResourceHandlerBean extends AbstractRestBean { if ( status == CreateResourceStatus.SUCCESS) { ResourceWithType rwt = findCreatedResource(history.getParentResource().getId(),history.getCreatedResourceName(),uriInfo); - - builder = Response.ok(); - builder.entity(rwt); + if (rwt!=null) { + builder = Response.ok(); + builder.entity(rwt); + } else { + // History says we had success but due to internal timing + // the resource is not yet visible, so switch to in_progress + status = CreateResourceStatus.IN_PROGRESS; + } } - else if (status==CreateResourceStatus.IN_PROGRESS) { + if (status==CreateResourceStatus.IN_PROGRESS) { try { Thread.sleep(2000L); // give the agent time to do the work @@ -865,6 +878,7 @@ public class ResourceHandlerBean extends AbstractRestBean { @GET @Path("/creationStatus/{id}") @ApiOperation("Get the status of a resource creation for content based resources.") + @ApiError(code = 302, reason = "Creation is still going on. Check back later with the same URL.") public Response getHistoryItem(@PathParam("id") int historyId, @Context HttpHeaders headers, @Context UriInfo uriInfo) { CreateResourceHistory history; @@ -888,13 +902,17 @@ public class ResourceHandlerBean extends AbstractRestBean { if (status== CreateResourceStatus.SUCCESS) { ResourceWithType rwt = findCreatedResource(history.getParentResource().getId(),history.getCreatedResourceName(),uriInfo); - - builder = Response.ok(); - setCachingHeader(builder, 600); - builder.entity(rwt); - + if (rwt!=null) { + builder = Response.ok(); + setCachingHeader(builder, 600); + builder.entity(rwt); + } else { + // History says we had success but due to internal timing + // the resource is not yet visible, so switch to in_progress + status = CreateResourceStatus.IN_PROGRESS; + } } - else if (status==CreateResourceStatus.IN_PROGRESS) { + if (status==CreateResourceStatus.IN_PROGRESS) { UriBuilder uriBuilder = uriInfo.getRequestUriBuilder(); @@ -913,6 +931,14 @@ public class ResourceHandlerBean extends AbstractRestBean { } + /** + * Find the created resource by its name and parent. Will only return it + * if the resource is already committed. + * @param parentId Id of the parent + * @param name Name of the resource to find + * @param uriInfo UriInfo object to fill links in the returned resource + * @return A ResourceWithType if found, null otherwise. + */ private ResourceWithType findCreatedResource(int parentId, String name, UriInfo uriInfo) { ResourceCriteria criteria = new ResourceCriteria(); criteria.setStrict(true); @@ -920,6 +946,9 @@ public class ResourceHandlerBean extends AbstractRestBean { criteria.addFilterName(name); criteria.addFilterInventoryStatus(InventoryStatus.COMMITTED); List<Resource> resources = resMgr.findResourcesByCriteria(caller,criteria); + if (resources.size()==0) { + return null; + } Resource res = resources.get(0); return fillRWT(res,uriInfo); } diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ContentTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ContentTest.java index 8303513..b12eea3 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ContentTest.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ContentTest.java @@ -222,8 +222,10 @@ public class ContentTest extends AbstractBase { int status = response.getStatusCode(); String location = response.getHeader("Location"); - System.out.println("\nLocation " + location + "\n\n"); - assert location!=null; + if (status!=200) { + System.out.println("\nLocation " + location + "\n\n"); + assert location!=null; + } // We need to check what we got. A 302 means the deploy is still // in progress, so we need to wait a little longer @@ -244,6 +246,7 @@ public class ContentTest extends AbstractBase { createdResourceId = response.jsonPath().getInt("resourceId"); + System.out.flush(); System.out.println("\n Deploy is done, resource Id = " + createdResourceId + " \n"); System.out.flush(); @@ -254,6 +257,7 @@ public class ContentTest extends AbstractBase { // Remove the uploaded content removeContent(handle, false); + System.out.flush(); System.out.println("\n Content removed \n"); System.out.flush();

1 0

[rhq] Branch 'code-smell' - 51 commits - etc/dev-utils etc/scripts modules/common modules/core modules/enterprise modules/helpers modules/plugins pom.xml
by lkrejci 24 Jul '13

24 Jul '13

etc/dev-utils/TestLdapSettings.java | 102 + etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat | 48 etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh | 42 modules/common/cassandra-auth/pom.xml | 27 modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticator.java | 78 + modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticatorMBean.java | 10 modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 9 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra | 3 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties | 2 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh | 247 --- modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml | 2 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java | 37 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java | 87 + modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties | 2 modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml | 2 modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 93 + modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java | 93 + modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra-env.sh | 247 +++ modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra.yaml | 690 ++++++++++ modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/log4j-server.properties | 45 modules/common/cassandra-schema/pom.xml | 6 modules/common/pom.xml | 1 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java | 44 modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java | 2 modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java | 159 ++ modules/core/client-api/src/test/resources/test-hibernate.xml | 8 modules/core/client-api/src/test/resources/test-jbossas.xml | 10 modules/core/client-api/src/test/resources/test-subcategories-nested.xml | 60 modules/core/domain/intentional-api-changes-since-4.8.0.xml | 8 modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java | 3 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java | 3 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java | 130 + modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java | 58 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 9 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java | 13 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 15 modules/enterprise/gui/coregui/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java | 32 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java | 20 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java | 42 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java | 38 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 4 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 4 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 4 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 4 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 4 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 4 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 4 modules/enterprise/server/appserver/pom.xml | 11 modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf | 36 modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env | 24 modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc | 6 modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 11 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 5 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java | 37 modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml | 14 modules/enterprise/server/jar/pom.xml | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 207 ++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java | 47 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java | 22 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java | 3 modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java | 45 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java | 86 + modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java | 37 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java | 18 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java | 10 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java | 10 modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/ConfigProperty.java | 49 modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java | 12 modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java | 126 + modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java | 104 - modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl | 14 modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java | 11 modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 15 modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java | 68 modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml | 8 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 55 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java | 24 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java | 7 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java | 12 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java | 7 modules/plugins/rhq-storage/pom.xml | 113 + modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 245 +++ modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java | 142 +- modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 34 modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java | 216 +++ modules/plugins/rhq-storage/src/test/resources/log4j.properties | 42 pom.xml | 6 93 files changed, 3893 insertions(+), 633 deletions(-) New commits: commit b537244bad778a80f6fdf92880abc245eed465ec Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 23 22:23:06 2013 -0400 initial commit for StorageNodeComponentITest This is a first stab at some integration tests for the storage plugin. diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index a88f56e..df79e40 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -10,11 +10,16 @@ <groupId>org.rhq</groupId> <artifactId>rhq-rhqstorage-plugin</artifactId> - <packaging>jar</packaging> <name>RHQ Storage Plugin</name> <description>A plugin for managing RHQ Storage Nodes</description> + <properties> + <pc.basedir>${project.build.directory}/plugin-container</pc.basedir> + <pc.plugins.dir>${pc.basedir}/plugins</pc.plugins.dir> + <pc.lib.dir>${pc.basedir}/lib</pc.lib.dir> + </properties> + <dependencies> <dependency> <groupId>${rhq.groupId}</groupId> @@ -27,7 +32,6 @@ <groupId>${rhq.groupId}</groupId> <artifactId>rhq-cassandra-plugin</artifactId> <version>${project.version}</version> -  </dependency> <dependency> @@ -35,8 +39,113 @@ <artifactId>org-mc4j-ems</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-ccm-core</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-platform-plugin</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-schema</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>pre-integration-test</phase> + <configuration> + <target> + <property name="sigar.dir" value="${project.build.directory/sigar}"/> + + <mkdir dir="${pc.basedir}"/> + <mkdir dir="${pc.lib.dir}"/> + <mkdir dir="${pc.plugins.dir}"/> + + <copy file="${org.rhq:rhq-platform-plugin:jar}" todir="${pc.plugins.dir}"/> + <copy file="${org.rhq:rhq-jmx-plugin:jar}" todir="${pc.plugins.dir}"/> + <copy file="${org.rhq:rhq-cassandra-plugin:jar}" todir="${pc.plugins.dir}"/> + <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${pc.plugins.dir}"/> + + <unzip src="${org.hyperic:sigar-dist:zip}" dest="${sigar.dir}"> + <patternset> + <include name="**/lib/sigar.jar" /> + <include name="**/lib/bcel*.jar" /> + <include name="**/lib/*.so" /> + <include name="**/lib/*.sl" /> + <include name="**/lib/*.dll" /> + <include name="**/lib/*.dylib" /> + </patternset> + </unzip> + <move todir="${pc.lib.dir}" flatten="true"> + <fileset dir="${sigar.dir}" includes="**/lib/*"/> + </move> + <delete dir="${sigar.dir}"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.13</version> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>integration-test</goal> + </goals> + <configuration> + <includes> + <include>**/*ITest.java</include> + </includes> + <argLine>-Djava.library.path=${pc.lib.dir}</argLine> + <systemPropertyVariables> + <pc.plugins.dir>${pc.plugins.dir}</pc.plugins.dir> + </systemPropertyVariables> + </configuration> + </execution> + <execution> + <id>verify</id> + <goals> + <goal>verify</goal> + </goals> + <configuration> + <testFailureIgnore>false</testFailureIgnore> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/*ITest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + <profiles> <profile> <id>dev</id> diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java new file mode 100644 index 0000000..cd9f148 --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -0,0 +1,216 @@ +package org.rhq.plugins.storage; + +import static java.util.Arrays.asList; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.io.File; +import java.net.InetAddress; +import java.util.Set; + +import com.google.common.collect.Sets; + +import org.testng.annotations.AfterSuite; +import org.testng.annotations.BeforeSuite; +import org.testng.annotations.Test; + +import org.rhq.cassandra.CassandraClusterManager; +import org.rhq.cassandra.ClusterInitService; +import org.rhq.cassandra.Deployer; +import org.rhq.cassandra.DeploymentOptions; +import org.rhq.cassandra.DeploymentOptionsFactory; +import org.rhq.cassandra.schema.SchemaManager; +import org.rhq.core.clientapi.server.discovery.InventoryReport; +import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pc.PluginContainer; +import org.rhq.core.pc.PluginContainerConfiguration; +import org.rhq.core.pc.inventory.InventoryManager; +import org.rhq.core.pc.operation.OperationContextImpl; +import org.rhq.core.pc.operation.OperationManager; +import org.rhq.core.pc.operation.OperationServicesAdapter; +import org.rhq.core.pc.plugin.FileSystemPluginFinder; +import org.rhq.core.pluginapi.operation.OperationServicesResult; +import org.rhq.core.pluginapi.operation.OperationServicesResultCode; +import org.rhq.core.pluginapi.util.ProcessExecutionUtility; +import org.rhq.core.system.ProcessExecution; +import org.rhq.core.system.ProcessExecutionResults; +import org.rhq.core.system.SystemInfo; +import org.rhq.core.system.SystemInfoFactory; + +/** + * @author John Sanda + */ +public class StorageNodeComponentITest { + + private File basedir; + + private Resource storageNode; + + @BeforeSuite + public void deployStorageNodeAndPluginContainer() throws Exception { + basedir = new File("target", "rhq-storage"); + + deployStorageNode(); + + initPluginContainer(); + } + + private void deployStorageNode() throws Exception { + DeploymentOptionsFactory factory = new DeploymentOptionsFactory(); + DeploymentOptions deploymentOptions = factory.newDeploymentOptions(); + String address = "127.0.0.1"; + + deploymentOptions.setSeeds(address); + deploymentOptions.setListenAddress(address); + deploymentOptions.setRpcAddress(address); + deploymentOptions.setBasedir(basedir.getAbsolutePath()); + deploymentOptions.setCommitLogDir(new File(basedir, "commit_log").getAbsolutePath()); + deploymentOptions.setDataDir(new File(basedir, "data").getAbsolutePath()); + deploymentOptions.setSavedCachesDir(new File(basedir, "saved_caches").getAbsolutePath()); + deploymentOptions.setCommitLogDir(new File(basedir, "logs").getAbsolutePath()); + deploymentOptions.setLoggingLevel("DEBUG"); + deploymentOptions.setNativeTransportPort(9142); + deploymentOptions.setJmxPort(7399); + deploymentOptions.setHeapSize("256M"); + deploymentOptions.setHeapNewSize("64M"); + + deploymentOptions.load(); + + Deployer deployer = new Deployer(); + deployer.setDeploymentOptions(deploymentOptions); + + deployer.unzipDistro(); + deployer.applyConfigChanges(); + deployer.updateFilePerms(); + deployer.updateStorageAuthConf(Sets.newHashSet(InetAddress.getByName(address))); + + File binDir = new File(basedir, "bin"); + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + + File startScript = new File(binDir, "cassandra"); + ProcessExecution startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + + startScriptExe.addArguments(asList("-p", "cassandra.pid")); + startScriptExe.setCaptureOutput(true); + ProcessExecutionResults results = systemInfo.executeProcess(startScriptExe); + + assertEquals(results.getExitCode(), (Integer) 0, "Cassandra failed to start: " + results.getCapturedOutput()); + + StorageNode storageNode = new StorageNode(); + storageNode.parseNodeInformation("127.0.0.1|7399|9142"); + + ClusterInitService clusterInitService = new ClusterInitService(); + clusterInitService.waitForClusterToStart(asList(storageNode)); + + SchemaManager schemaManager = new SchemaManager("rhqadmin", "rhqadmin", "127.0.0.1|7399|9142"); + schemaManager.install(); + schemaManager.updateTopology(true); + } + + private void initPluginContainer() { + PluginContainerConfiguration pcConfig = new PluginContainerConfiguration(); + File pluginsDir = new File(System.getProperty("pc.plugins.dir")); + pcConfig.setPluginDirectory(pluginsDir); + pcConfig.setPluginFinder(new FileSystemPluginFinder(pluginsDir)); + + pcConfig.setInsideAgent(false); + PluginContainer.getInstance().setConfiguration(pcConfig); + PluginContainer.getInstance().initialize(); + } + + @AfterSuite + public void ShutdownPluginContainerAndStorageNode() throws Exception { + PluginContainer.getInstance().shutdown(); + shutdownStorageNodeIfNecessary(); + } + + private void shutdownStorageNodeIfNecessary() throws Exception { + File binDir = new File(basedir, "bin"); + File pidFile = new File(binDir, "cassandra.pid"); + + if (pidFile.exists()) { + CassandraClusterManager ccm = new CassandraClusterManager(); + ccm.killNode(basedir); + } + } + + @Test + public void discoverStorageNode() { + InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); + InventoryReport inventoryReport = inventoryManager.executeServerScanImmediately(); + + if (inventoryReport.getAddedRoots().isEmpty()) { + // could be empty if the storage node is already in inventory from + // a prior discovery scan. + Resource platform = inventoryManager.getPlatform(); + storageNode = findCassandraNode(platform.getChildResources()); + } else { + storageNode = findCassandraNode(inventoryReport.getAddedRoots()); + } + + assertNotNull(storageNode, "Failed to discover Storage Node instance"); + assertNodeIsUp("Expected " + storageNode + " to be UP after discovery"); + } + + @Test(dependsOnMethods = "discoverStorageNode") + public void shutdownStorageNode() throws Exception { + OperationManager operationManager = PluginContainer.getInstance().getOperationManager(); + OperationServicesAdapter operationsService = new OperationServicesAdapter(operationManager); + + long timeout = 1000 * 60; + OperationContextImpl operationContext = new OperationContextImpl(storageNode.getId()); + OperationServicesResult result = operationsService.invokeOperation(operationContext, "shutdown", + new Configuration(), timeout); + + assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The shutdown operation failed"); + // TODO why is this failing? + assertNodeIsDown("Expected " + storageNode + " to be DOWN after shutting it down"); + } + + private void assertNodeIsUp(String msg) { + executeAvailabilityScan(); + + Availability availability = getAvailability(); + + assertNotNull(availability, "Unable to determine availability for " + storageNode); + assertEquals(availability.getAvailabilityType(), AvailabilityType.UP, msg); + } + + private void assertNodeIsDown(String msg) { + executeAvailabilityScan(); + + Availability availability = getAvailability(); + + assertNotNull(availability, "Unable to determine availability for " + storageNode); + assertEquals(availability.getAvailabilityType(), AvailabilityType.DOWN, msg); + } + + private Availability getAvailability() { + InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); + return inventoryManager.getAvailabilityIfKnown(storageNode); + } + + private void executeAvailabilityScan() { + InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); + inventoryManager.executeAvailabilityScanImmediately(false, true); + } + + private Resource findCassandraNode(Set<Resource> resources) { + for (Resource resource : resources) { + if (isCassandraNode(resource.getResourceType())) { + return resource; + } + } + return null; + } + + private boolean isCassandraNode(ResourceType type) { + return type.getPlugin().equals("RHQStorage") && type.getName().equals("RHQ Storage Node"); + } + +} diff --git a/modules/plugins/rhq-storage/src/test/resources/log4j.properties b/modules/plugins/rhq-storage/src/test/resources/log4j.properties new file mode 100644 index 0000000..67db049 --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/resources/log4j.properties @@ -0,0 +1,42 @@ +# +# /* +# * RHQ Management Platform +# * Copyright (C) 2005-2012 Red Hat, Inc. +# * All rights reserved. +# * +# * This program is free software; you can redistribute it and/or modify +# * it under the terms of the GNU General Public License, version 2, as +# * published by the Free Software Foundation, and/or the GNU Lesser +# * General Public License, version 2.1, also as published by the Free +# * Software Foundation. +# * +# * This program is distributed in the hope that it will be useful, +# * but WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# * GNU General Public License and the GNU Lesser General Public License +# * for more details. +# * +# * You should have received a copy of the GNU General Public License +# * and the GNU Lesser General Public License along with this program; +# * if not, write to the Free Software Foundation, Inc., +# * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# */ +# + +log4j.rootCategory=WARN, FILE, CONSOLE + +log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender +log4j.appender.FILE.DatePattern='.'yyyy-MM-dd +log4j.appender.FILE.File=./target/test.log +log4j.appender.FILE.layout=org.apache.log4j.PatternLayout +log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n +#log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n +log4j.appender.FILE.Append=false + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +#log4j.appender.CONSOLE.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n + +log4j.logger.org.rhq=DEBUG +log4j.logger.com.datastax=DEBUG commit 83e5b228871c9a8352e98a12e0db76f8f4ea982e Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 23 22:16:41 2013 -0400 first stab at prepareForBootstrap operation (which is currently broken) This is clearly broken from some manual testing I did. Given that the implementation is a bit sloppy at the moment, this is a good time to get some automated tests in place. The operation will perform the following steps in the ordered specified: 1) shut down the storage node 2) update cassandra.yaml 3) update rhq-storage-auth.conf 4) restart the node diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 0037bfe..f76da22 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -111,7 +111,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent clusterBuilder = clusterBuilder.withCredentials(username, password); } - this.cassandraSession = clusterBuilder.build().connect(clusterName); +// this.cassandraSession = clusterBuilder.build().connect(clusterName); } catch (Exception e) { LOG.error("Connect to Cassandra " + host + ":" + nativePort, e); throw e; @@ -196,7 +196,17 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent operation = storageService.getOperation("drain", emptyParams); operation.invoke((Object[]) emptyParams); - ProcessInfo process = context.getNativeProcess(); + return stopNode(); + } + + protected OperationResult stopNode() { + ProcessInfo process = getResourceContext().getNativeProcess(); + + if (processInfo == null) { + LOG.warn("Failed to obtain process info. It appears Cassandra is already shutdown."); + return new OperationResult("Failed to obtain process info. It appears Cassandra is already shutdown."); + } + long pid = process.getPid(); try { process.kill("KILL"); @@ -209,6 +219,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } + protected OperationResult startNode() { ResourceContext<?> context = getResourceContext(); Configuration pluginConfig = context.getPluginConfiguration(); diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 3b0aa5b..d9b35b9 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -26,11 +26,15 @@ package org.rhq.plugins.storage; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; @@ -39,6 +43,8 @@ import org.mc4j.ems.connection.EmsConnection; import org.mc4j.ems.connection.bean.EmsBean; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.connection.bean.operation.EmsOperation; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; @@ -48,6 +54,7 @@ import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.core.util.StringUtil; @@ -96,6 +103,8 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return updateConfiguration(parameters); } else if (name.equals("updateKnownNodes")) { return updateKnownNodes(parameters); + } else if (name.equals("prepareForBootstrap")) { + return prepareForBootstrap(parameters); } else { return super.invokeOperation(name, parameters); } @@ -132,6 +141,18 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper ipAddresses.add(propertySimple.getStringValue()); } + if (updateAuthFile(result, ipAddresses)) return result; + + EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); + EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); + emsOperation.invoke(); + + result.setSimpleResult("Successfully updated the set of known nodes."); + + return result; + } + + private boolean updateAuthFile(OperationResult result, Set<String> ipAddresses) { log.info("Updating known nodes to " + ipAddresses); File confDir = new File(getBasedir(), "conf"); @@ -150,7 +171,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper log.error(msg); result.setErrorMessage(msg); - return result; + return true; } } @@ -161,7 +182,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper "to unexpected error"; log.error(msg, e); result.setErrorMessage(msg + ": " + ThrowableUtil.getRootMessage(e)); - return result; + return true; } try { @@ -176,18 +197,127 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } result.setErrorMessage("There was an unexpected error while updating " + authFile + ". Make sure that " + "it matches " + authBackupFile + " and then reschedule the operation."); + return true; + } + return false; + } + + private OperationResult prepareForBootstrap(Configuration params) { + log.info("Preparing " + this + " for bootstrap..."); + + ResourceContext context = getResourceContext(); + OperationResult result = new OperationResult(); + + log.info("Stopping storage node"); + OperationResult stopNodeResult = stopNode(); + if (stopNodeResult.getErrorMessage() != null) { + log.error("Failed to stop storage node " + this + " Cannot prepare the node for bootstrap which means " + + "that the storage node cannot join the cluster. Make sure the storage node is not running and retry " + + "the operation"); + result.setErrorMessage("Failed to stop storage node. Cannot prepare the node for bootstrap which means " + + "that it cannot join the cluster. Make sure that the node is not running and retry the operation. " + + "Stopping the storage node failed with this error: " + stopNodeResult.getErrorMessage()); return result; } - EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); - EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); - emsOperation.invoke(); + Configuration pluginConfig = context.getPluginConfiguration(); + String yamlProp = pluginConfig.getSimpleValue("yamlConfiguration"); + File yamlFile = new File(yamlProp); - result.setSimpleResult("Successfully updated the set of known nodes."); + DumperOptions options = new DumperOptions(); + options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + Yaml yaml = new Yaml(options); + + Map yamlConfig = null; + try { + yamlConfig = (Map) yaml.load(new FileInputStream(yamlFile)); + } catch (FileNotFoundException e) { + log.error("Failed to load " + yamlFile, e); + log.error("Cannot prepare " + this + " for bootstrap. " + yamlFile + " must exist in order to make the " + + "necessary configuration changes."); + result.setErrorMessage("Cannot prepare storage node for bootstrap. It appears that " + yamlFile + + " does not exist. Make sure that it exists so that the necessary configuration changes can be made."); + + return result; + } + + purgeDir(getCommitLogDir(yamlConfig)); + for (File dataDir : getDataDirs(yamlConfig)) { + purgeDir(dataDir); + } + purgeDir(getSavedCachesDir(yamlConfig)); + + log.info("Updating cluster settings"); + + String address = pluginConfig.getSimpleValue("host"); + List<String> seeds = getAddresses(params.getList("storageNodeIPAddresses")); + // Make sure this node's address is not in the list; otherwise, it + // won't bootstrap properly. + seeds.remove(address); + try { + updateSeedsList(seeds); + } catch (IOException e) { + log.error("Failed to update seeds property in " + yamlFile, e); + result.setErrorMessage("Failed to prepared node for bootstrap due to unexpected error that occurred " + + "while updating seeds property in " + yamlFile + ":\n" + ThrowableUtil.getAllMessages(e)); + return result; + } + + if (updateAuthFile(result, new HashSet<String>(seeds))) { + return result; + } + + int cqlPort = Integer.parseInt(params.getSimpleValue("cqlPort")); + int gossipPort = Integer.parseInt(params.getSimpleValue("gossipPort")); + + yamlConfig.put("native_transport_port", cqlPort); + yamlConfig.put("storage_port", gossipPort); + + try { + yaml.dump(yamlConfig, new FileWriter(yamlFile)); + } catch (IOException e) { + log.error("Could not update cluster settings in " + yamlFile, e); + result.setErrorMessage("Could not update cluster settings in " + yamlFile + ":\n" + + ThrowableUtil.getAllMessages(e)); + return result; + } + + log.info(this + " is ready to be bootstrap. Restarting storage node..."); + OperationResult startResult = startNode(); + if (startResult.getErrorMessage() != null) { + log.error("Failed to restart storage node:\n" + startResult.getErrorMessage()); + result.setErrorMessage("Failed to restart storage node:\n" + startResult.getErrorMessage()); + } else { + result.setSimpleResult("The storage node was succesfully updated is now bootstrapping into the cluster."); + } return result; } + private void purgeDir(File dir) { + log.info("Purging " + dir); + FileUtil.purge(dir, true); + } + + private File getCommitLogDir(Map yamlConfig) { + return new File((String) yamlConfig.get("commitlog_directory")); + } + + private List<File> getDataDirs(Map yamlConfig) { + List<File> dirs = new ArrayList<File>(); + List<String> dirNames = (List<String>) yamlConfig.get("data_file_directories"); + + for (String dirName : dirNames) { + dirs.add(new File(dirName)); + } + + return dirs; + } + + private File getSavedCachesDir(Map yamlConfig) { + return new File((String) yamlConfig.get("saved_caches_directory")); + } + private OperationResult nodeAdded(Configuration params) { boolean runRepair = params.getSimple("runRepair").getBooleanValue(); boolean updateSeedsList = params.getSimple("updateSeedsList").getBooleanValue(); @@ -405,4 +535,10 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper boolean succeeded; String details; } + + @Override + public String toString() { + return StorageNodeComponent.class.getSimpleName() + "[resourceKey: " + getResourceContext().getResourceKey() + + "]"; + } } diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 1e39d6c..cd84de6 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -101,6 +101,16 @@ </parameters> </operation> + <operation name="prepareForBootstrap"> + <parameters> + <c:simple-property name="cqlPort" type="integer" displayName="CQL Port"/> + <c:simple-property name="gossipPort" type="integer"/> + <c:list-property name="storageNodeIPAddresses" displayName="Storage Node IP Addresses"> + <c:simple-property name="storageNodeIPAddress"/> + </c:list-property> + </parameters> + </operation> + <operation name="prepareForUpgrade" description="Prepares the storage node for upgrade (this operation consists of following steps: 1) turning off the RPC server, 2) turning off the gossiper, 3) taking the snapshot (backuping the data), 4) invoking the drain operation"> <parameters> <c:simple-property name="snapshotName" required="false" type="string" displayName="Snapshot Name" commit 4fa9f082b2e011b3bde9defe1021248148c4ad40 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Tue Jul 23 15:02:09 2013 -0400 [BZ 984649] fix module metadata. diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 145e3af..82ff294 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -290,7 +290,7 @@ <delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar.index" />  <replace file="${jboss.home}/modules/system/layers/base/org/jgroups/main/module.xml" - token="jgroups-${jgroups.initial.version}.jar" value="${jgroups.patch.version}"/> + token="jgroups-${jgroups.initial.version}.jar" value="jgroups-${jgroups.patch.version}.jar"/>  <copy file="${settings.localRepository}/org/jgroups/jgroups/${jgroups.patch.version}/jgroups-${jgroups.patch.version}.jar" toDir="${jboss.home}/modules/system/layers/base/org/jgroups/main" verbose="true"/> commit 8203c669b3b3ba5ed5c3ef27f051220da93ea868 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Tue Jul 23 13:37:32 2013 -0400 Upgrading richfaces to latest patched version. diff --git a/pom.xml b/pom.xml index 3662bc7..f909033 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ <postgresql.version>9.2-1002.jdbc4</postgresql.version> <h2.version>1.2.139</h2.version> <jtds.version>1.2.2</jtds.version> - <richfaces.version>3.3.3.Final</richfaces.version> + <richfaces.version>3.3.4.Final</richfaces.version> <jline.version>0.9.94</jline.version> <sigar.version>1.6.5.132-5</sigar.version> <sigar.zip.version>1.6.5</sigar.zip.version> commit caeb7a5c832334b74f76a265c8028a5697152dda Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Tue Jul 23 12:28:52 2013 -0400 [BZ 984649] update jgroups usage to latest patched version. diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 0a61138..f1a4c7b 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -19,6 +19,8 @@ <properties> <rhq.dev.data.dir>${rhq.rootDir}/rhq-data</rhq.dev.data.dir> + <jgroups.initial.version>3.2.7.Final</jgroups.initial.version> + <jgroups.patch.version>3.2.10.Final</jgroups.patch.version> </properties> <dependencies> @@ -72,6 +74,13 @@ <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> </dependency> + +  + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>${jgroups.patch.version}</version> + </dependency> </dependencies> <build> @@ -157,6 +166,8 @@ <property name="rhq.server.http.port" value="${rhq.server.http.port}" /> <property name="rhq.server.https.port" value="${rhq.server.https.port}" /> <property name="rhq.sync.endpoint-address" value="${rhq.sync.endpoint-address}" /> + <property name="jgroups.initial.version" value="${jgroups.initial.version}" /> + <property name="jgroups.patch.version" value="${jgroups.patch.version}" /> </ant> </target> </configuration> diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index a81b6cd..145e3af 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -283,6 +283,17 @@ </resources> </module> ]]></echo> + + <echo>Updating JGroups module component for EAP to ${jgroups.patch.version}</echo> +  + <delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar" /> + <delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar.index" /> +  + <replace file="${jboss.home}/modules/system/layers/base/org/jgroups/main/module.xml" + token="jgroups-${jgroups.initial.version}.jar" value="${jgroups.patch.version}"/> +  + <copy file="${settings.localRepository}/org/jgroups/jgroups/${jgroups.patch.version}/jgroups-${jgroups.patch.version}.jar" + toDir="${jboss.home}/modules/system/layers/base/org/jgroups/main" verbose="true"/> <echo>Generate SSL key for RHQ server - 128-bit key that expires in 20 years</echo> <property name="jboss.conf.dir" location="${jboss.home}/standalone/configuration" /> commit cc64adde1d8835f8c000afe2de0746fda5bbd5c1 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Jul 23 08:43:19 2013 -0500 One more place where the previous rebase removed code for the storage node configuration. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 31e3bf7..9416c67 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -643,6 +643,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN Configuration parameters = new Configuration(); parameters.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); + parameters.setSimpleValue("heapNewSize", storageNodeConfiguration.getHeapNewSize() + ""); + parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); boolean updateConfigurationResult = runOperationAndWaitForResult(subject, storageNodeResource, UPDATE_CONFIGURATION_OPERATION, parameters); commit 373a931987b402479df3d02269cc00f4ac88a358 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Jul 23 08:42:49 2013 -0500 Enable the new set of calculated metrics for disk space utilization in the UI and CLI. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java index 80bfdd6..2c0b8f8 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java @@ -41,9 +41,13 @@ public class StorageNodeLoadComposite implements Serializable { private MeasurementAggregateWithUnits heapUsed; private MeasurementAggregateWithUnits heapPercentageUsed; private MeasurementAggregateWithUnits load; - private MeasurementAggregateWithUnits partitionDiskUsedPercentage; private MeasurementAggregateWithUnits dataDiskUsed; private MeasurementAggregate tokens; + + private MeasurementAggregateWithUnits dataDiskUsedPercentage; + private MeasurementAggregateWithUnits totalDiskUsedPercentage; + private MeasurementAggregate freeDiskToDataSizeRatio; + private MeasurementAggregateWithUnits actuallyOwns; public StorageNodeLoadComposite() { @@ -113,35 +117,59 @@ public class StorageNodeLoadComposite implements Serializable { public void setHeapPercentageUsed(MeasurementAggregateWithUnits heapPercentageUsed) { this.heapPercentageUsed = heapPercentageUsed; } - + /** * @deprecated use {@link #getPartitionDiskUsedPercentage() getPartitionDiskUsedPercentage()} instead - * + * * @return partitionDiskUsedPercentage */ public MeasurementAggregateWithUnits getDiskSpacePercentageUsed() { - return getPartitionDiskUsedPercentage(); + return getDataDiskUsedPercentage(); } - + /** * @deprecated use {@link #setPartitionDiskUsedPercentage() setPartitionDiskUsedPercentage()} instead - * + * * @param partitionDiskUsedPercentage */ - public void setDiskSpacePercentageUsed(MeasurementAggregateWithUnits partitionDiskUsedPercentage) { - setPartitionDiskUsedPercentage(partitionDiskUsedPercentage); + public void setDiskSpacePercentageUsed(MeasurementAggregateWithUnits diskUsedPercentage) { + setDataDiskUsedPercentage(diskUsedPercentage); + } + + /** + * @return A computed metric for the percentage of disk space used by data file on the corresponding partitions. + * If multiple data locations are configured then the aggregate is calculated. + */ + public MeasurementAggregateWithUnits getDataDiskUsedPercentage() { + return dataDiskUsedPercentage; + } + + public void setDataDiskUsedPercentage(MeasurementAggregateWithUnits dataDiskUsedPercentage) { + this.dataDiskUsedPercentage = dataDiskUsedPercentage; + } + + /** + * @return A computed metric for the percentage of total (system + Storage Node data file) disk space used the partitions where data files are stored. + * If multiple data locations are configured then the aggregate is calculated. + */ + public MeasurementAggregateWithUnits getTotalDiskUsedPercentage() { + return totalDiskUsedPercentage; + } + + public void setTotalDiskUsedPercentage(MeasurementAggregateWithUnits totalDiskUsedPercentage) { + this.totalDiskUsedPercentage = totalDiskUsedPercentage; } /** - * @return A computed metric for the percentage of disk space used on the partition that contains the SSTables. - * If multiple data locations are configured then the partition with the highest utilization will be reported. + * @return A computed metric for the percentage of total (system + Storage Node data file) disk space used the partitions where data files are stored. + * If multiple data locations are configured then the aggregate is calculated. */ - public MeasurementAggregateWithUnits getPartitionDiskUsedPercentage() { - return partitionDiskUsedPercentage; + public MeasurementAggregate getFreeDiskToDataSizeRatio() { + return freeDiskToDataSizeRatio; } - public void setPartitionDiskUsedPercentage(MeasurementAggregateWithUnits partitionDiskUsedPercentage) { - this.partitionDiskUsedPercentage = partitionDiskUsedPercentage; + public void setFreeDiskToDataSizeRatio(MeasurementAggregate freeDiskToDataSizeRatio) { + this.freeDiskToDataSizeRatio = freeDiskToDataSizeRatio; } /** @@ -202,7 +230,7 @@ public class StorageNodeLoadComposite implements Serializable { builder.append("heapUsed=").append(heapUsed).append(", "); builder.append("heapPercentageUsed=").append(heapPercentageUsed).append(", "); builder.append("load=").append(load).append(", "); - builder.append("partitionDiskUsedPercentage=").append(partitionDiskUsedPercentage).append(", "); + builder.append("dataUsedPercentage=").append(dataDiskUsedPercentage).append(", "); builder.append("dataDiskUsed=").append(dataDiskUsed).append(", "); builder.append("tokens=").append(tokens).append(", "); builder.append("actuallyOwns=").append(actuallyOwns); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java index 7d413fd..07064b7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java @@ -47,6 +47,7 @@ import org.rhq.core.domain.cloud.StorageNode.OperationMode; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite.MeasurementAggregateWithUnits; import org.rhq.core.domain.criteria.StorageNodeCriteria; +import org.rhq.core.domain.measurement.MeasurementAggregate; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; @@ -200,7 +201,8 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod public static class StorageNodeLoadCompositeDatasource extends RPCDataSource<StorageNodeLoadComposite, StorageNodeCriteria> { public static final String HEAP_PERCENTAGE_KEY = "heapPercentage"; - public static final String DISK_SPACE_PERCENTAGE_KEY = "diskSpacePercentage"; + public static final String DATA_DISK_SPACE_PERCENTAGE_KEY = "dataDiskSpacePercentage"; + public static final String TOTAL_DISK_SPACE_PERCENTAGE_KEY = "totalDiskSpacePercentage"; private int id; public static StorageNodeLoadCompositeDatasource getInstance(int id) { @@ -296,10 +298,15 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod "This value is calculated by dividing Heap Used by Heap Maximum.", HEAP_PERCENTAGE_KEY), Arrays.<Object> asList(loadComposite.getLoad(), "Load", "Data stored on the node", "load"), Arrays.<Object> asList( - loadComposite.getPartitionDiskUsedPercentage(), - "Disk Space Percent Used", - "Percentage of total disk space used for the partition that contains the data files.If multiple data locations are specified then this will report the average utilization accross all the partitions.", - DISK_SPACE_PERCENTAGE_KEY), + loadComposite.getDataDiskUsedPercentage(), + "Data Disk Space Percent Used", + "Percentage of disk space used by data files on the partitions that contain the data files. If multiple data locations are specified then the aggregate accross all the partitions that contain data files is reported.", + DATA_DISK_SPACE_PERCENTAGE_KEY), + Arrays.<Object> asList( + loadComposite.getTotalDiskUsedPercentage(), + "Total Disk Space Percent Used", + "Percentage of total disk space used (system and Storage Node) on the partitions that contain the data files. If multiple data locations are specified then the aggregate accross all the partitions that contain data files is reported.", + TOTAL_DISK_SPACE_PERCENTAGE_KEY), Arrays.<Object> asList( loadComposite.getDataDiskUsed(), "Total Disk Space Used", @@ -325,6 +332,21 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod recordsList.add(tokens); } + + if (loadComposite.getFreeDiskToDataSizeRatio() != null){ + MeasurementAggregate aggregate = loadComposite.getFreeDiskToDataSizeRatio(); + + ListGridRecord record = new ListGridRecord(); + record.setAttribute("id", "freeDiskToDataSizeRatio"); + record.setAttribute("name", "Free Disk To Data Size Ratio"); + record.setAttribute("hover", "Ratio of (Free Disk)/(Data File Size). A value below 1 is not recommended since a compaction or repair process could double the amount of disk space used by data files. If multiple data locations are specified then the aggregate accross all the partitions that contain data files is reported."); + record.setAttribute("min", aggregate.getMin()); + record.setAttribute("avg", aggregate.getAvg()); + record.setAttribute("max", aggregate.getMax()); + + recordsList.add(record); + } + ListGridRecord[] records = recordsList.toArray(new ListGridRecord[recordsList.size()]); return records; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java index e8dde9d..e044e4e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java @@ -51,8 +51,9 @@ public class StorageNodeLoadComponent extends EnhancedVLayout { @Override protected String getCellCSSText(ListGridRecord record, int rowNum, int colNum) { if ("avg".equals(getFieldName(colNum)) - && (StorageNodeLoadCompositeDatasource.HEAP_PERCENTAGE_KEY.equals(record.getAttribute("id")) || StorageNodeLoadCompositeDatasource.DISK_SPACE_PERCENTAGE_KEY - .equals(record.getAttribute("id")))) { + && (StorageNodeLoadCompositeDatasource.HEAP_PERCENTAGE_KEY.equals(record.getAttribute("id")) || + StorageNodeLoadCompositeDatasource.DATA_DISK_SPACE_PERCENTAGE_KEY.equals(record.getAttribute("id")) || + StorageNodeLoadCompositeDatasource.TOTAL_DISK_SPACE_PERCENTAGE_KEY.equals(record.getAttribute("id")))) { if (record.getAttributeAsFloat("avgFloat") > .85) { return "font-weight:bold; color:#d64949;"; } else if (record.getAttributeAsFloat("avgFloat") > .7) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index fab803b..31e3bf7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -253,13 +253,16 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN Map<String, Integer> scheduleIdsMap = new HashMap<String, Integer>(); // get the schedule ids for Storage Service resource - final String tokensMetric = "Tokens", ownershipMetric = "Ownership", diskUsedPercentageMetric = "Calculated.PartitionDiskUsedPercentage"; + final String tokensMetric = "Tokens", ownershipMetric = "Ownership"; + final String dataDiskUsedPercentageMetric = "Calculated.DataDiskUsedPercentage"; + final String totalDiskUsedPercentageMetric = "Calculated.TotalDiskUsedPercentage"; + final String freeDiskToDataRatioMetric = "Calculated.FreeDiskToDataSizeRatio"; final String loadMetric = "Load", keyCacheSize = "KeyCacheSize", rowCacheSize = "RowCacheSize", totalCommitLogSize = "TotalCommitlogSize"; TypedQuery<Object[]> query = entityManager.<Object[]> createNamedQuery( StorageNode.QUERY_FIND_SCHEDULE_IDS_BY_PARENT_RESOURCE_ID_AND_MEASUREMENT_DEFINITION_NAMES, Object[].class); query.setParameter("parrentId", resourceId).setParameter("metricNames", - Arrays.asList(tokensMetric, ownershipMetric, diskUsedPercentageMetric, loadMetric, keyCacheSize, - rowCacheSize, totalCommitLogSize)); + Arrays.asList(tokensMetric, ownershipMetric, loadMetric, keyCacheSize, rowCacheSize, totalCommitLogSize, + dataDiskUsedPercentageMetric, totalDiskUsedPercentageMetric, freeDiskToDataRatioMetric)); for (Object[] pair : query.getResultList()) { scheduleIdsMap.put((String) pair[0], (Integer) pair[1]); } @@ -292,10 +295,22 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); result.setActuallyOwns(ownershipAggregateWithUnits); } - if ((scheduleId = scheduleIdsMap.get(diskUsedPercentageMetric)) != null) { - StorageNodeLoadComposite.MeasurementAggregateWithUnits diskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( + + //calculated disk space related metrics + if ((scheduleId = scheduleIdsMap.get(dataDiskUsedPercentageMetric)) != null) { + StorageNodeLoadComposite.MeasurementAggregateWithUnits dataDiskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( + subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); + result.setDataDiskUsedPercentage(dataDiskUsedPercentageAggregateWithUnits); + } + if ((scheduleId = scheduleIdsMap.get(totalDiskUsedPercentageMetric)) != null) { + StorageNodeLoadComposite.MeasurementAggregateWithUnits totalDiskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); - result.setPartitionDiskUsedPercentage(diskUsedPercentageAggregateWithUnits); + result.setDataDiskUsedPercentage(totalDiskUsedPercentageAggregateWithUnits); + } + if ((scheduleId = scheduleIdsMap.get(freeDiskToDataRatioMetric)) != null) { + MeasurementAggregate freeDiskToDataRatioAggregate = measurementManager.getAggregate(subject, + scheduleId, beginTime, endTime); + result.setFreeDiskToDataSizeRatio(freeDiskToDataRatioAggregate); } if ((scheduleId = scheduleIdsMap.get(loadMetric)) != null) { diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml index 5bbebed..e95f995 100644 --- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml @@ -188,7 +188,7 @@ <metric property="Calculated.DataDiskUsedPercentage" displayName="Data File Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of disk space used by Cassandra data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> <metric property="Calculated.TotalDiskUsedPercentage" displayName="Total Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of total disk space used. The metric acounts overall disk usage (including system files), not just disk space used by Cassandra. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> - <metric property="Calculated.FreeDiskToDataSizeRatio" displayName="Free Disk to Data Size Ratio" dataType="measurement" displayType="summary" description="Ratio of (Amount of Free Disk)/(Data File Size). A value below 1 is not recommended since a compaction or repair process could double the amount of disk space used by data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> + <metric property="Calculated.FreeDiskToDataSizeRatio" displayName="Free Disk to Data Size Ratio" dataType="measurement" displayType="summary" description="Ratio of (Free Disk)/(Data File Size). A value below 1 is not recommended since a compaction or repair process could double the amount of disk space used by data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> <metric property="CurrentGenerationNumber" dataType="trait" displayType="summary" description="Current generation number"/> <metric property="ExceptionCount" measurementType="trendsup" dataType="measurement" displayType="summary" description="Exception Count"/> commit 6997631e56204db41c9f4902eef1c6210706be3f Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 15:14:22 2013 -0500 Add back code used to update storage node configuration tha was lost due to rebase. This code updates two additional storage node properties added. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index b32ab5b..fab803b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -611,6 +611,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN storageNodeResource.getId()); configuration.setHeapSize(storageNodeConfiguration.getSimpleValue("maxHeapSize")); + configuration.setHeapNewSize(storageNodeConfiguration.getSimpleValue("heapNewSize")); + configuration.setThreadStackSize(storageNodeConfiguration.getSimpleValue("threadStackSize")); configuration.setJmxPort(storageNode.getJmxPort()); } diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 8156d02..1e39d6c 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -122,6 +122,9 @@ <operation name="updateConfiguration" description="Updates the node configuration. Will require a separate server restart for the settings to take effect."> <parameters> <c:simple-property name="heapSize" type="string" description="The heap size to be used for both -Xms and -Xmx JVM options."/> + <c:simple-property name="heapNewSize" type="string" description="The heap new size to be used be used with -Xmn JVM option."/> + <c:simple-property name="threadStackSize" type="integer" description="The thread stack size. This memory is allocated to each thread off heap. The + value should be an integer that will be interpreted in kilobytes."/> <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> </parameters> <results> commit e85abcf495d6939d876b09bd1de1e71a29af17ec Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Jul 23 10:42:17 2013 +0200 BZ 796480 (and others) add support for subCategory in embedded types (aka runs-inside) diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java index 88dd865..d5ff2ef 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java @@ -417,16 +417,56 @@ public class PluginMetadataParser { return serviceResourceType; } - private static void setSubCategory(ResourceDescriptor resourceDescriptor, ResourceType resourceType) + /** + * Try to find the subCategory of the p/s/s descriptor in one of the parents + * <subcategories><subcategory>Foo</subcategory></subcategories> elements and + * set it on the resourceType if found. + * + * It is not enough to look at the direct parents, but we need to also look at the + * <runs-inside> types if our type is "embedded" in a different type. + * @param resourceDescriptor Descriptor to get the subCategory attribute from + * @param resourceType The type to attach the ResourceSubCategory to. + * @throws InvalidPluginDescriptorException If the descriptor.subCategory can not be found in any parent. + */ + private void setSubCategory(ResourceDescriptor resourceDescriptor, ResourceType resourceType) throws InvalidPluginDescriptorException { String subCatName = resourceDescriptor.getSubCategory(); if (subCatName != null) { ResourceSubCategory subCat = SubCategoriesMetadataParser.findSubCategoryOnResourceTypeAncestor( resourceType, subCatName); - if (subCat == null) + + // We need to look at resourceDescriptor -> runsInside to see if one of those defines the + // subcategories that we are looking for. + if (subCat == null && resourceDescriptor.getRunsInside() != null) { + RunsInsideType rit = resourceDescriptor.getRunsInside(); + List<ParentResourceType> parentResourceTypeList = rit.getParentResourceType(); + for (ParentResourceType parentResourceType : parentResourceTypeList) { + ResourceType parentType = getResourceTypeFromPlugin(parentResourceType.getName(),parentResourceType.getPlugin()); + // check on the parent + if (parentType.getChildSubCategories()!=null ) { + for (ResourceSubCategory parentSubcat : parentType.getChildSubCategories()) { + if (parentSubcat.getName().equals(subCatName)) { + subCat = parentSubcat; + break; + } + } + } + + // Not found on runs-inside type look at the ancestor of those runs-inside types? + if (subCat==null) { + subCat = SubCategoriesMetadataParser.findSubCategoryOnResourceTypeAncestor(parentType,subCatName); + } + if (subCat!=null) { + break; + } + } + } + + if (subCat == null) { throw new InvalidPluginDescriptorException("Resource type [" + resourceType.getName() + "] specified a subcategory (" + subCatName + ") that is not defined as a child subcategory of one of its ancestor resource types."); + } resourceType.setSubCategory(subCat); } } diff --git a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java index 20e1aa9..2a9595f 100644 --- a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java +++ b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java @@ -226,6 +226,7 @@ public class ExtensionModelTest { assert jbossServer.getCategory().equals(ResourceCategory.SERVER); assert jbossServer.getDescription().equals("JBoss Application Server Description"); assert jbossServer.getParentResourceTypes().size() == 0; + assert jbossServer.getChildSubCategories().size() == 2; assert jbossServer.getChildResourceTypes().size() == 1; ResourceType embeddedTomcatServer = jbossServer.getChildResourceTypes().iterator().next(); @@ -263,6 +264,7 @@ public class ExtensionModelTest { assert hibernateService.getDescription().equals("Hibernate Service Description"); assert hibernateService.getChildResourceTypes().size() == 0; assert hibernateService.getParentResourceTypes().size() == 3; + assert hibernateService.getSubCategory().getName().equals("Framework"); ResourceType tomcatServer = metadataManager.getType("TomcatServer", "Tomcat"); ResourceType jbossServer = metadataManager.getType("JBossASServer", "JBossAS"); diff --git a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java new file mode 100644 index 0000000..1cba523 --- /dev/null +++ b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java @@ -0,0 +1,159 @@ + /* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.clientapi.agent.metadata.test; + + import java.net.URL; + import java.util.List; + import java.util.Set; + + import javax.xml.bind.JAXBContext; + import javax.xml.bind.Unmarshaller; + import javax.xml.bind.util.ValidationEventCollector; + + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.testng.annotations.BeforeSuite; + import org.testng.annotations.Test; + + import org.rhq.core.clientapi.agent.metadata.PluginMetadataManager; + import org.rhq.core.clientapi.agent.metadata.SubCategoriesMetadataParser; + import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil; + import org.rhq.core.clientapi.descriptor.DescriptorPackages; + import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; + import org.rhq.core.clientapi.descriptor.plugin.ResourceDescriptor; + import org.rhq.core.clientapi.descriptor.plugin.ServerDescriptor; + import org.rhq.core.clientapi.descriptor.plugin.ServiceDescriptor; + import org.rhq.core.clientapi.descriptor.plugin.SubCategoryDescriptor; + import org.rhq.core.domain.resource.ResourceCategory; + import org.rhq.core.domain.resource.ResourceSubCategory; + import org.rhq.core.domain.resource.ResourceType; + + /** + * @author Charles Crouch + * @author Heiko W. Rupp + */ +public class NestedSubCategoriesMetadataParserTest { + private static final String DESCRIPTOR_FILENAME = "test-subcategories-nested.xml"; + private final Log LOG = LogFactory.getLog(NestedSubCategoriesMetadataParserTest.class); + + private PluginDescriptor pluginDescriptor; + + @BeforeSuite + public void loadPluginDescriptor() throws Exception { + try { + URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME); + LOG.info("Loading plugin descriptor at: " + descriptorUrl); + + JAXBContext jaxbContext = JAXBContext.newInstance(DescriptorPackages.PC_PLUGIN); + + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + ValidationEventCollector vec = new ValidationEventCollector(); + unmarshaller.setEventHandler(vec); + pluginDescriptor = (PluginDescriptor) unmarshaller.unmarshal(descriptorUrl.openStream()); + } catch (Throwable t) { + // Catch RuntimeExceptions and Errors and dump their stack trace, because Surefire will completely swallow them + // and throw a cryptic NPE (see http://jira.codehaus.org/browse/SUREFIRE-157)! + t.printStackTrace(); + throw new RuntimeException(t); + } + } + + @Test + public void parseSingleSubCategory() { + List<ServerDescriptor> servers = pluginDescriptor.getServers(); + ServerDescriptor server0 = servers.get(0); + ResourceDescriptor.Subcategories subCategoriesDescriptor = server0.getSubcategories(); + assert subCategoriesDescriptor != null : "No subcategories element: " + server0.getName(); + + List<SubCategoryDescriptor> subCategoryDescriptors = subCategoriesDescriptor.getSubcategory(); + + assert subCategoryDescriptors != null : "No subcategory elements: " + server0.getName(); + assert !subCategoryDescriptors.isEmpty() : "No subcategory elements: " + server0.getName(); + + ResourceSubCategory subCat; + + ResourceType resType = new ResourceType("testResType", "myplugin", ResourceCategory.SERVER, null); + subCat = SubCategoriesMetadataParser.getSubCategory(subCategoryDescriptors.get(0), resType); + + assert subCat != null : "Null subcategory received from parser"; + assert subCat.getName().equals("applications") : "Name not read correctly"; + assert subCat.getDisplayName().equals("Apps") : "Display name not read correctly"; + assert subCat.getDescription().equals("The apps.") : "Description not read correctly"; + // getSubCategory is no longer responsible for setting resourcetype information, that is done in PluginMetadataParser + //assert subCat.getResourceType().equals(resType) : "ResourceType not set correctly"; + + } + + @Test + public void parseNestedSubCategories() { + List<ServerDescriptor> servers = pluginDescriptor.getServers(); + ServerDescriptor server2 = servers.get(1); + assert server2.getName().equals("testServer2"); + ResourceDescriptor.Subcategories subCategoriesDescriptor = server2.getSubcategories(); + assert subCategoriesDescriptor == null : "Unexpected subcategories element: " + server2.getName(); + assert server2.getSubCategory().equals("applications"); + + List<ServiceDescriptor> services = pluginDescriptor.getServices(); + ServiceDescriptor service1 = services.get(0); + assert service1.getName().equals("testService"); + assert service1.getSubCategory().equals("applications"); + } + + @Test + public void testParseViaMetaDataManager() throws Exception { + + PluginDescriptor pluginDescriptor; + + URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME); + System.out.println("Loading plugin descriptor at: " + descriptorUrl); + + pluginDescriptor = (PluginDescriptor) AgentPluginDescriptorUtil.parsePluginDescriptor(descriptorUrl + .openStream()); + + PluginMetadataManager metadataManager = new PluginMetadataManager(); + Set<ResourceType> typeSet = metadataManager.loadPlugin(pluginDescriptor); + assert typeSet != null : "Got no types!!"; + assert typeSet.size()==5 : "Expected 5 types, but got " + typeSet.size(); + + ResourceType testService = findType(typeSet,"testService"); + assert testService.getSubCategory().getName().equals("applications"); + + ResourceType testService2 = findType(typeSet,"testService2"); + assert testService2.getSubCategory().getName().equals("applications"); + + ResourceType testService3 = findType(typeSet,"testService3"); + assert testService3.getSubCategory().getName().equals("fooBar"); + + + } + + private ResourceType findType(Set<ResourceType> types, String name) { + for (ResourceType type : types ) { + if (type.getName().equals(name)) { + return type; + } + } + assert false : "Type with name " + name + " not found"; + return null; + } + } \ No newline at end of file diff --git a/modules/core/client-api/src/test/resources/test-hibernate.xml b/modules/core/client-api/src/test/resources/test-hibernate.xml index 37a2e03..9051ca2 100644 --- a/modules/core/client-api/src/test/resources/test-hibernate.xml +++ b/modules/core/client-api/src/test/resources/test-hibernate.xml @@ -3,7 +3,7 @@ package="org.rhq.plugins.test2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin"> - + <depends plugin="JMX" /> <depends plugin="Tomcat" /> <depends plugin="JBossAS" /> @@ -11,11 +11,13 @@ <service name="HibernateService" discovery="HibernateDiscoveryComponent" class="HibernateServiceComponent" - description="Hibernate Service Description"> + description="Hibernate Service Description" + subCategory="Framework" + > <runs-inside> <parent-resource-type name="TomcatServer" plugin="Tomcat"/> <parent-resource-type name="JBossASServer" plugin="JBossAS"/> <parent-resource-type name="EmbeddedTomcatServer" plugin="JBossAS"/> </runs-inside> - </service> + </service> </plugin> \ No newline at end of file diff --git a/modules/core/client-api/src/test/resources/test-jbossas.xml b/modules/core/client-api/src/test/resources/test-jbossas.xml index 4d2602b..8269343 100644 --- a/modules/core/client-api/src/test/resources/test-jbossas.xml +++ b/modules/core/client-api/src/test/resources/test-jbossas.xml @@ -12,7 +12,11 @@ discovery="JBossASDiscoveryComponent" class="JBossASServerComponent" description="JBoss Application Server Description"> - + <subcategories> + <subcategory name="Applications" /> + <subcategory name="Framework" /> + </subcategories> + <operation name="stop" displayName="Stop JBossAS Server" description="Kills the server" timeout="30"> <parameters> <c:simple-property name="force" @@ -29,7 +33,7 @@ required="true" description="If true, the server is definitely down; otherwise, the shutdown was issued but it is unclear if it really died"/> </results> - </operation> + </operation> <server name="EmbeddedTomcatServer" description="Embedded Tomcat Web Server Description" sourcePlugin="Tomcat" @@ -37,6 +41,6 @@ discovery="JBossASTomcatDiscoveryComponent" class="JBossASTomcatServerComponent"> </server> - + </server> </plugin> \ No newline at end of file diff --git a/modules/core/client-api/src/test/resources/test-subcategories-nested.xml b/modules/core/client-api/src/test/resources/test-subcategories-nested.xml new file mode 100644 index 0000000..eb43af7 --- /dev/null +++ b/modules/core/client-api/src/test/resources/test-subcategories-nested.xml @@ -0,0 +1,60 @@ + + +<plugin name="TestPlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:xmlns:rhq-plugin"> + + <server name="testServer1"> + <subcategories> + <subcategory name="applications" displayName="Apps" description="The apps."/> + <subcategory name="fooBar"/> + </subcategories> + </server> + +  + <server name="testServer2" subCategory="applications"> + <runs-inside> + <parent-resource-type name="testServer1" plugin="TestPlugin"/> + </runs-inside> + <metric property="testMetric"/> + </server> + + <service name="testService" subCategory="applications"> + <runs-inside> + <parent-resource-type name="testServer1" plugin="TestPlugin"/> + </runs-inside> + + </service> + + <service name="testService2" subCategory="applications"> + <runs-inside> + <parent-resource-type name="testServer1" plugin="TestPlugin"/> + </runs-inside> + + </service> + + <service name="testService3" subCategory="fooBar"> + <runs-inside> + <parent-resource-type name="testServer1" plugin="TestPlugin"/> + </runs-inside> + + </service> + +</plugin> commit 60329fcbda5a1961e0f9285c70eb56ea12fe2eb0 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 22 15:00:35 2013 +0200 Add Michael Burman as contributor diff --git a/pom.xml b/pom.xml index c5cf5a7..3662bc7 100644 --- a/pom.xml +++ b/pom.xml @@ -2353,6 +2353,10 @@ <timezone>+1</timezone> </contributor> <contributor> + <name>Michael Burman</name> + <timezone>+2</timezone> + </contributor> + <contributor> <name>Torben Jäger</name> <timezone>+1</timezone> </contributor> commit d7e9f5b9871824d1f02ae762b44cff85ff6c3d44 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Tue Jul 23 10:41:12 2013 +0200 Bug 969621 - EAP 6 managed plug-in is unable to discover EAP servers when more then one is running on a single host Update expected resource keys in itests diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java index 91ece92..269474b 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java @@ -43,8 +43,11 @@ public class DomainServerComponentTest extends AbstractServerComponentTest { public static final ResourceType RESOURCE_TYPE = new ResourceType("JBossAS7 Host Controller", PLUGIN_NAME, ResourceCategory.SERVER, null); - // The key is the server's base dir. - public static final String RESOURCE_KEY = new File(JBOSS_HOME, "domain").getPath(); + // The key is the server host config file + // hostConfig: /tmp/jboss-as-6.0.0/domain/configuration/host.xml + public static final String RESOURCE_KEY = "hostConfig: " + + new File(JBOSS_HOME, "domain" + File.separator + "configuration" + File.separator + "host.xml") + .getAbsolutePath(); @Override protected ResourceType getServerResourceType() { diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java index d128144..182ef36 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.modules.plugins.jbossas7.itest.domain; @@ -488,10 +488,8 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest { InventoryManager im = pluginContainer.getInventoryManager(); Resource platform = im.getPlatform(); //host controller - ResourceType hostControllerType = new ResourceType("JBossAS7 Host Controller", PLUGIN_NAME, - ResourceCategory.SERVER, null); - Resource hostController = getResourceByTypeAndKey(platform, hostControllerType, - "/tmp/jboss-as-6.0.0/domain"); + Resource hostController = getResourceByTypeAndKey(platform, DomainServerComponentTest.RESOURCE_TYPE, + DomainServerComponentTest.RESOURCE_KEY); //profile=full-ha ResourceType profileType = new ResourceType("Profile", PLUGIN_NAME, ResourceCategory.SERVICE, null); String key = PROFILE; diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java index 8446345..32f92c7 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java @@ -51,8 +51,11 @@ public class StandaloneServerComponentTest extends AbstractServerComponentTest { public static final ResourceType RESOURCE_TYPE = new ResourceType("JBossAS7 Standalone Server", PLUGIN_NAME, ResourceCategory.SERVER, null); - // The key is the server's base dir. - public static final String RESOURCE_KEY = new File(JBOSS_HOME, "standalone").getPath(); + // The key is the server host config file + // hostConfig: /tmp/jboss-as-6.0.0/standalone/configuration/standalone-full-ha.xml + public static final String RESOURCE_KEY = "hostConfig: " + + new File(JBOSS_HOME, "standalone" + File.separator + "configuration" + File.separator + + "standalone-full-ha.xml").getAbsolutePath(); private static final String RELOAD_OPERATION_NAME = "reload"; private static final String RESTART_OPERATION_NAME = "restart"; commit 567aee7f81c6aa0f7680d4f394cccb1974705320 Author: Larry O'Leary <loleary(a)redhat.com> Date: Mon Jul 22 16:10:09 2013 -0500 BZ 981015: Fix test failures introduced by commit 01cd91b - findLdapUserDetails was appending baseDN twice during fallback code - FakeLdapContext contained some lazy escaping on the mock group entries diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java index dad31ce..2ae6265 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java @@ -99,7 +99,6 @@ public class FakeLdapContext implements LdapContext { try { return new FakeNamingEnumeration<SearchResult>(ldapTestData.getSearchResults(attributes)); } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); return null; } @@ -516,12 +515,12 @@ public class FakeLdapContext implements LdapContext { attr = new BasicAttribute("member"); attr.add("cn=Robert Smith,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Cannon\\, Brett,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Charles H\\\\Samlin,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Charles H\\Samlin,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Craig \\#1 Sellers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Beverly \\+1 Balanger,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Bethany \\<Stuart\\> Wallace,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Zachory S\\; Balanger,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Allen \\\"The Hammer\\\" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Allen \"The Hammer\" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Sam Not \\= Smitherson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=\\ Billy The Kiddough\\ ,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=System/Integration API,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); @@ -557,12 +556,12 @@ public class FakeLdapContext implements LdapContext { attr = new BasicAttribute("member"); attr.add("cn=John Smith,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Dr. Greg Hause\\, MD,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Cindy\\\\Cynthia Groober,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Cindy\\Cynthia Groober,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Biff \\# Rogers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Steven \\+2 Reed,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Lisa \\<The Great\\> Toller,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Homer J Simpsonite\\; III,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Jessica \\\"Crouching Tiger\\\" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Jessica \"Crouching Tiger\" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Hope \\= Rein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=\\ Sue Ferguson\\ ,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Phil/Susan Carlson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); @@ -598,12 +597,12 @@ public class FakeLdapContext implements LdapContext { attr = new BasicAttribute("member"); attr.add("cn=Sheri Smith,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Walsh\\, Brad,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Jim\\\\James Kirk,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Jim\\James Kirk,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Sandra \\# Phillips,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=William Tell Overture \\+1,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Craig \\<Bison\\> Allen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Walter T Fredrick\\; The Second,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Stanley \\\"Short\\\" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Stanley \"Short\" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Noah \\= Sadler,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=\\ Stuart Smiley\\ ,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=System/Integration API 2,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); @@ -984,7 +983,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with backslash (\\) in 'cn' in the RHQ Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Charles H\\\\Samlin,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Charles H\\Samlin,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Cindy\\Cynthia Groober,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -1033,7 +1032,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with backslash (\\) in 'cn' in the JBoss Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Cindy\\\\Cynthia Groober,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Cindy\\Cynthia Groober,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Jim\\James Kirk,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -1082,7 +1081,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with backslash (\\) in 'cn' in the JBoss Monitor Group"); attrs.put(attr); - sr = new SearchResult("cn=Jim\\\\James Kirk,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Jim\\James Kirk,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Craig \#1 Sellers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -1675,7 +1674,7 @@ public class FakeLdapContext implements LdapContext { null, attrs, true); this.add(sr); - // dn: cn=Allen \"The Hammer\" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com + // dn: cn=Allen "The Hammer" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com attrs = new BasicAttributes(); attr = new BasicAttribute("baseName"); @@ -1721,11 +1720,11 @@ public class FakeLdapContext implements LdapContext { attr.add("User with quote (\") in 'cn' in the RHQ Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Allen \\\"The Hammer\\\" Callen,ou=users", "javax.naming.directory.DirContext", + sr = new SearchResult("cn=Allen \"The Hammer\" Callen,ou=users", "javax.naming.directory.DirContext", null, attrs, true); this.add(sr); - // dn: cn=Jessica \"Crouching Tiger\" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com + // dn: cn=Jessica "Crouching Tiger" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com attrs = new BasicAttributes(); attr = new BasicAttribute("baseName"); @@ -1771,11 +1770,11 @@ public class FakeLdapContext implements LdapContext { attr.add("User with quote (\") in 'cn' in the JBoss Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Jessica \\\"Crouching Tiger\\\" Mathers,ou=users", + sr = new SearchResult("cn=Jessica \"Crouching Tiger\" Mathers,ou=users", "javax.naming.directory.DirContext", null, attrs, true); this.add(sr); - // dn: cn=Stanley \"Short\" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com + // dn: cn=Stanley "Short" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com attrs = new BasicAttributes(); attr = new BasicAttribute("baseName"); @@ -1821,7 +1820,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with quote (\") in 'cn' in the JBoss Monitor Group"); attrs.put(attr); - sr = new SearchResult("cn=Stanley \\\"Short\\\" Mein,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Stanley \"Short\" Mein,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Sam Not \= Smitherson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -2160,7 +2159,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with slash (/) in 'cn' in the RHQ Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=System/Integration API,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=System\\/Integration API,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Phil/Susan Carlson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -2209,7 +2208,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with slash (/) in 'cn' in the JBoss Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Phil/Susan Carlson,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Phil\\/Susan Carlson,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=System/Integration API 2,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -2254,7 +2253,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with slash (/) in 'cn' in the JBoss Monitor Group"); attrs.put(attr); - sr = new SearchResult("cn=System/Integration API 2,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=System\\/Integration API 2,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Lee -Fast- Croutche,ou=users,dc=test,dc=rhq,dc=redhat,dc=com diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index a28c709..7473321 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -350,7 +350,6 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { if (si.isRelative()) { userDN += "," + baseDNs[x]; } - userDN = userDN + "," + baseDNs[x]; } userDetails.put("dn", userDN); commit 8c693ee685d538a28a3c42ce813b10b49997f871 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jul 22 16:36:23 2013 -0400 get rid of the upgrade wording, it's confusing when performing an initial install. diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java index 61c8a9c..fb9bceb 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java @@ -363,14 +363,14 @@ public abstract class AbstractInstall extends ControlCommand { protected void startRHQServerForInstallation() throws IOException { try { - log.info("The RHQ Server must be started to complete its upgrade. Starting the RHQ server in preparation of running the server installer..."); + log.info("The RHQ Server must be started to complete its installation. Starting the RHQ server in preparation of running the server installer..."); // when you unzip the distro, you are getting a fresh, unadulterated, out-of-box EAP installation, which by default listens // to port 9999 for its native management subsystem. Make sure some other independent EAP server (or anything for that matter) // isn't already listening to that port. if (isPortInUse("127.0.0.1", 9999)) { throw new IOException( - "Something is already listening to port 9999 - shut it down before upgrading the server."); + "Something is already listening to port 9999 - shut it down before installing the server."); } Executor executor = new DefaultExecutor(); @@ -400,7 +400,7 @@ public abstract class AbstractInstall extends ControlCommand { } // Wait for the server to complete it's startup - log.info("Waiting for the RHQ Server to start in preparation of running the server installer for upgrade..."); + log.info("Waiting for the RHQ Server to start in preparation of running the server installer..."); commandLine = getCommandLine("rhq-installer", "--test"); Executor installerExecutor = new DefaultExecutor(); commit 2409ed2dcd705c58e5024182e95445431b25acf5 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 22 15:16:49 2013 -0400 document the 4.8 storage patch script diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh index 33984d1..ae78240 100755 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh @@ -1,7 +1,43 @@ #!/bin/bash +# +# BACKGROUND: +# This patch script needs to be run against RHQ 4.8.0 installations prior to +# script. You do not need to run this script if upgrading from a version +# earlier than 4.8.0. +# +# PREREQUISITES: +# 1) Shut down the RHQ storage node and server. +# +# 2) Edit <rhq-install-dir>/rhq-storage/conf/cassandra.yaml and set the +# following property, +# +# start_rpc: true +# +# 3) Note the value of rpc_port in cassandra.yaml. By default it is 9160 which +# is fine. +# +# RUNNING THE PATCH: +# 1) cd <patch-dir> +# +# 2) ./rhq48-storage-patch.sh <rhq-480-server-dir> <storage-ip-address> <thrift-port> <jmx-port> +# +# 3) Carefully reivew the script output for any errors. +# +# 4) Edit cassandra.yaml against and reset start_rpc: false +# +# ADDITIONAL NOTES: +# The <jmx-port> defaults to 7299. If you are uncertain of what value to use, +# you can find it in the UI. Log into RHQ and go to Administration --> Storage Nodes. +# +# If you are uncertain of the value to use for the storage node IP address, you +# find the correct valu in the storage nodes admin UI as well. +# +# EXAMPLE: +# ./rhq48-storage-patch.sh /opt/rhq-4.8.0 127.0.0.1 9160 7299 +# Usage: ./rhq48-storage-patch.sh <rhq-480-server-dir> <storage-ip-address> <thrift-port> <jmx-port> function usage() { - echo "Usage: $0 <rhq-server-dir> <storage-ip-address> <cql-port> <jmx-port>" + echo "Usage: $0 <rhq-480-server-dir> <storage-ip-address> <thrift-port> <jmx-port>" } if [ $# -ne 4 ]; then @@ -16,11 +52,11 @@ fi RHQ_SERVER_DIR=$1 CQL_HOSTNAME=$2 -CQL_PORT=$3 +THRIFT_PORT=$3 JMX_PORT=$4 export CQLSH_HOST=$2 -export CQL_PORT=$3 +export CQLSH_PORT=$3 PATCH="apache-cassandra-1.2.4-patch-1.jar" commit c91c8f23416db836308b2bf3871fdda87559297e Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 14:12:08 2013 -0500 Update the storage node manager API for alerts to support UI functionality. diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml index a9ce322..58c4eda 100644 --- a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml @@ -11,8 +11,22 @@ <difference> <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findNotAcknowledgedStorageNodeAlerts(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  <method>org.rhq.core.domain.util.PageList findAllStorageNodeAlerts(org.rhq.core.domain.auth.Subject)</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findAllStorageNodeAlerts(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + </differences> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index c2a7b46..b32ab5b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -512,12 +512,22 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @Override public PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject) { - return findStorageNodeAlerts(subject, false); + return findStorageNodeAlerts(subject, false, null); + } + + @Override + public PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject, StorageNode storageNode) { + return findStorageNodeAlerts(subject, false, storageNode); } @Override public PageList<Alert> findAllStorageNodeAlerts(Subject subject) { - return findStorageNodeAlerts(subject, true); + return findStorageNodeAlerts(subject, true, null); + } + + @Override + public PageList<Alert> findAllStorageNodeAlerts(Subject subject, StorageNode storageNode) { + return findStorageNodeAlerts(subject, true, storageNode); } /** @@ -527,8 +537,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN * @param allAlerts if [true] then return all alerts; if [false] then return only alerts that are not acknowledged * @return alerts */ - private PageList<Alert> findStorageNodeAlerts(Subject subject, boolean allAlerts) { - Integer[] resouceIdsWithAlertDefinitions = findResourcesWithAlertDefinitions(); + private PageList<Alert> findStorageNodeAlerts(Subject subject, boolean allAlerts, StorageNode storageNode) { + Integer[] resouceIdsWithAlertDefinitions = findResourcesWithAlertDefinitions(storageNode); PageList<Alert> alerts = new PageList<Alert>(); if( resouceIdsWithAlertDefinitions != null && resouceIdsWithAlertDefinitions.length != 0 ){ @@ -555,31 +565,35 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return alerts; } - /** - * Return resource Ids for all resources and sub-resources of Storage Nodes that - * have alert definitions. This will be used by the resource criteria to find - * all alerts triggered for storage nodes. - * - * @return - */ - private Integer[] findResourcesWithAlertDefinitions() { - List<Integer> resourceIdsWithAlertDefinitions = new ArrayList<Integer>(); - List<StorageNode> test2 = getStorageNodes(); + @Override + public Integer[] findResourcesWithAlertDefinitions() { + return this.findResourcesWithAlertDefinitions(null); + } + + @Override + public Integer[] findResourcesWithAlertDefinitions(StorageNode storageNode) { + List<StorageNode> initialStorageNodes; + if (storageNode == null) { + initialStorageNodes = getStorageNodes(); + } else { + initialStorageNodes = Arrays.asList(storageNode); + } Queue<Resource> unvisitedResources = new LinkedList<Resource>(); - for (StorageNode node : test2) { - if (node.getResource() != null) { - unvisitedResources.add(node.getResource()); + for (StorageNode initialStorageNode : initialStorageNodes) { + if (initialStorageNode.getResource() != null) { + unvisitedResources.add(initialStorageNode.getResource()); } } - while(!unvisitedResources.isEmpty()){ + List<Integer> resourceIdsWithAlertDefinitions = new ArrayList<Integer>(); + while (!unvisitedResources.isEmpty()) { Resource resource = unvisitedResources.poll(); if (resource.getAlertDefinitions() != null) { resourceIdsWithAlertDefinitions.add(resource.getId()); } - for(Resource child: resource.getChildResources()){ + for (Resource child : resource.getChildResources()) { unvisitedResources.add(child); } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index 6fca820..69b16c4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -81,6 +81,15 @@ public interface StorageNodeManagerLocal { PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject); /** + * Fetches the list of Storage Node related alerts that have not yet been acknowledged for the + * specified storage node. + * + * @param subject subject + * @return storage nodes alerts not acknowledged + */ + PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject, StorageNode storageNode); + + /** * Fetches all the Storage Node related alerts. * * @param subject subject @@ -89,6 +98,39 @@ public interface StorageNodeManagerLocal { PageList<Alert> findAllStorageNodeAlerts(Subject subject); /** + * Fetches all the Storage Node related alerts for the specified storage node. + * + * @param subject subject + * @return all storage nodes alerts + */ + PageList<Alert> findAllStorageNodeAlerts(Subject subject, StorageNode storageNode); + + + /** + * Find ids for all resources and sub-resources of Storage Nodes that + * have alert definitions. This can be used by the resource criteria queries to find + * all alerts triggered for storage nodes resources. + * + * @return resource ids + */ + Integer[] findResourcesWithAlertDefinitions(); + + /** + * Find ids for all resources and sub-resources, of the specified storage node, that + * have alert definitions. This can be used by the resource criteria queries to find + * all alerts triggered for storage nodes resources. + * + * If storage node is null it find ids for all resources and sub-resources of Storage Nodes that + * have alert definitions. Please see {@link #findResourcesWithAlertDefinitions()} for more details. + * + * @param storageNode storage node + * + * @return resource ids + */ + Integer[] findResourcesWithAlertDefinitions(StorageNode storageNode); + + + /** * <p>Prepares the node for subsequent upgrade.</p> * <p> CAUTION: this method will set the RHQ server to maintenance mode, RHQ storage flushes all the data to disk * and backup of all the keyspaces is created</p> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java index 7be1b07..75ac02b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java @@ -73,10 +73,27 @@ public interface StorageNodeManagerRemote { PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject); /** + * Fetches the list of Storage Node related alerts that have not yet been acknowledged for the + * specified storage node. + * + * @param subject subject + * @return storage nodes alerts not acknowledged + */ + PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject, StorageNode storageNode); + + /** * Fetches all the Storage Node related alerts. * * @param subject subject * @return all storage nodes alerts */ PageList<Alert> findAllStorageNodeAlerts(Subject subject); + + /** + * Fetches all the Storage Node related alerts for the specified storage node. + * + * @param subject subject + * @return all storage nodes alerts + */ + PageList<Alert> findAllStorageNodeAlerts(Subject subject, StorageNode storageNode); } commit c6c9e50398ffb5fc6d297ceffc369975a56b3ef9 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jul 22 14:09:52 2013 -0400 Add windows support storage install options and resource config update. Introduce rhq-storage-wrapper.env to hold the configurable values (mimicing somewhat cassandra-jvm.properties) and apply the values as token replacements in rhq-storage-wrapper.conf. Note that cassandra-jvm.properties is still kept up to date on windows and can be used generically, as needed. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index 6547043..60667cc 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -91,7 +91,14 @@ public class Deployer { applyConfigChanges(confDir, "cassandra.yaml", tokens); applyConfigChanges(confDir, "log4j-server.properties", tokens); applyChangesToCassandraJvmProps(confDir, deploymentOptions); -// applyConfigChanges(confDir, "cassandra-env.sh", tokens); + + // For windows, update the service wrapper env. It may not ne necessary to have updated cassandra-jvm.properties + // as well as this file, but for now we'll update both, leaving the former as a dependably set file. + if (File.separatorChar == '\\') { + applyChangesToWindowsServiceWrapper(deployDir); + } + + // applyConfigChanges(confDir, "cassandra-env.sh", tokens); } private void applyConfigChanges(File confDir, String fileName, Map<String, String> tokens) @@ -109,8 +116,8 @@ public class Deployer { rhqFile.delete(); } catch (IOException e) { log.error("An unexpected error occurred while apply configuration changes to " + filteredFile, e); - throw new DeploymentException("An unexpected error occurred while apply configuration changes to " + - filteredFile, e); + throw new DeploymentException("An unexpected error occurred while apply configuration changes to " + + filteredFile, e); } } @@ -132,8 +139,8 @@ public class Deployer { String javaVersion = System.getProperty("java.version"); // The check here is taken right from cassandra-env.sh - if ((!isOpenJDK() || javaVersion.compareTo("1.6.0") > 0) || - (javaVersion.equals("1.6.0") && getJavaPatchVersion() > 23)) { + if ((!isOpenJDK() || javaVersion.compareTo("1.6.0") > 0) + || (javaVersion.equals("1.6.0") && getJavaPatchVersion() > 23)) { properties.put("java_agent", "-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"); } @@ -165,6 +172,29 @@ public class Deployer { return Integer.parseInt(javaVersion.substring(startIndex + 1, javaVersion.length())); } + public void applyChangesToWindowsServiceWrapper(File deployDir) throws DeploymentException { + File wrapperDir = new File(deployDir, "../bin/wrapper"); + File wrapperEnvFile = new File(wrapperDir, "rhq-storage-wrapper.env"); + + try { + log.info("Applying configuration changes to " + wrapperEnvFile); + + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(wrapperEnvFile.getAbsolutePath()); + Properties wrapperEnvProps = propertiesUpdater.loadExistingProperties(); + + wrapperEnvProps.setProperty("set.heap_min", "-Xms" + deploymentOptions.getHeapSize()); + wrapperEnvProps.setProperty("set.heap_max", "-Xmx" + deploymentOptions.getHeapSize()); + wrapperEnvProps.setProperty("set.heap_new", "-Xmn" + deploymentOptions.getHeapNewSize()); + wrapperEnvProps.setProperty("set.thread_stack_size", "-Xss" + deploymentOptions.getStackSize()); + wrapperEnvProps.setProperty("set.jmx_port", deploymentOptions.getJmxPort().toString()); + + propertiesUpdater.update(wrapperEnvProps); + } catch (IOException e) { + log.error("An error occurred while updating " + wrapperEnvFile, e); + throw new DeploymentException("An error occurred while updating " + wrapperEnvFile, e); + } + } + public void updateFilePerms() { File deployDir = new File(deploymentOptions.getBasedir()); File binDir = new File(deployDir, "bin"); @@ -187,8 +217,8 @@ public class Deployer { try { authFile.delete(); - StreamUtil.copy(new StringReader(StringUtil.collectionToString(addresses, "\n")), - new FileWriter(authFile), true); + StreamUtil.copy(new StringReader(StringUtil.collectionToString(addresses, "\n")), new FileWriter(authFile), + true); } catch (IOException e) { throw new RuntimeException("Failed to update " + authFile); } diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf index 14f2ff1..de83364 100644 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf @@ -66,23 +66,25 @@ wrapper.app.parameter.3="-Dcassandra-foreground=yes" # Additional JVM parameters (quotes ARE needed) wrapper.java.additional.1="-ea" wrapper.java.additional.2="-javaagent:"%RHQ_STORAGE_HOME%\lib\jamm-0.2.5.jar"" -wrapper.java.additional.3="-Xms1G" -wrapper.java.additional.4="-Xmx1G" -wrapper.java.additional.5="-XX:+HeapDumpOnOutOfMemoryError" -wrapper.java.additional.6="-XX:+UseParNewGC" -wrapper.java.additional.7="-XX:+UseConcMarkSweepGC" -wrapper.java.additional.8="-XX:+CMSParallelRemarkEnabled" -wrapper.java.additional.9="-XX:SurvivorRatio=8" -wrapper.java.additional.10="-XX:MaxTenuringThreshold=1" -wrapper.java.additional.11="-XX:CMSInitiatingOccupancyFraction=75" -wrapper.java.additional.12="-XX:+UseCMSInitiatingOccupancyOnly" -wrapper.java.additional.13="-Dcom.sun.management.jmxremote.port=7299" -wrapper.java.additional.14="-Dcom.sun.management.jmxremote.ssl=false" -wrapper.java.additional.15="-Dcom.sun.management.jmxremote.authenticate=false" -wrapper.java.additional.16="-Dlog4j.configuration=log4j-server.properties" -wrapper.java.additional.17="-Dlog4j.defaultInitOverride=true" - -# We want to make sure the Storage Node starts in the casandra bin directory +wrapper.java.additional.3="%heap_min%" +wrapper.java.additional.4="%heap_max%" +wrapper.java.additional.5="%heap_new%" +wrapper.java.additional.6="%heap_dump_on_OOMError%" +wrapper.java.additional.7="%heap_dump_dir%" +wrapper.java.additional.8="-XX:+UseConcMarkSweepGC" +wrapper.java.additional.9="-XX:+CMSParallelRemarkEnabled" +wrapper.java.additional.10="-XX:SurvivorRatio=8" +wrapper.java.additional.11="-XX:MaxTenuringThreshold=1" +wrapper.java.additional.12="-XX:CMSInitiatingOccupancyFraction=75" +wrapper.java.additional.13="-XX:+UseCMSInitiatingOccupancyOnly" +wrapper.java.additional.14="-XX:+UseParNewGC" +wrapper.java.additional.15="-Dcom.sun.management.jmxremote.port=%jmx_port%" +wrapper.java.additional.16="-Dcom.sun.management.jmxremote.ssl=false" +wrapper.java.additional.17="-Dcom.sun.management.jmxremote.authenticate=false" +wrapper.java.additional.18="-Dlog4j.configuration=log4j-server.properties" +wrapper.java.additional.19="-Dlog4j.defaultInitOverride=true" + +# We want to make sure the Storage Node starts in the cassandra bin directory wrapper.working.dir=%RHQ_STORAGE_HOME%/bin #***************************************************************************** diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env new file mode 100644 index 0000000..1441e0a --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env @@ -0,0 +1,24 @@ +#***************************************************************************** +# RHQ Storage Node Java Service Wrapper Environment Settings File +# +# This file specifies a set of environment variables that will be +# applied to the Storage Node JVM. +# +# THIS FILE SHOULD NOT BE EDITED! +# +# This file represents the values managed as RHQ Storage Node resource +# configuration values. Or, set by the installer. +# +#***************************************************************************** + +set.jmx_port=7299 + +set.heap_min=-Xms512M +set.heap_max=-Xms512M +set.heap_new=-Xmn128M + +set.thread_stack_size=-Xss180k + +set.heap_dump_on_OOMError=-XX:+HeapDumpOnOutOfMemoryError + +set.heap_dump_dir= diff --git a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc index ee0d448..6941358 100644 --- a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc +++ b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc @@ -4,11 +4,11 @@ # # override and lower the initial memory profile -wrapper.java.additional.18=-Xms128M -wrapper.java.additional.19=-Xmx256M +wrapper.java.additional.20=-Xms128M +wrapper.java.additional.21=-Xmx256M # enable remote debugging -#wrapper.java.additional.20=-agentlib:jdwp=transport=dt_socket,address=8788,server=y,suspend=n +#wrapper.java.additional.22=-agentlib:jdwp=transport=dt_socket,address=8788,server=y,suspend=n # disable JVM startup timeout wrapper.startup.timeout=0 diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index 8d1771d..1667877 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -19,10 +19,17 @@ import org.rhq.core.util.StringUtil; public class StorageNodeConfigDelegate implements ConfigurationFacet { private File jvmOptsFile; + private File wrapperEnvFile; public StorageNodeConfigDelegate(File basedir) { File confDir = new File(basedir, "conf"); jvmOptsFile = new File(confDir, "cassandra-jvm.properties"); + + // for windows, config props also get propagated to the wrapper env + if (isWindows()) { + File wrapperDir = new File(basedir, "../bin/wrapper"); + wrapperEnvFile = new File(wrapperDir, "rhq-storage-wrapper.env"); + } } @Override @@ -56,6 +63,16 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { return config; } + /** + * Ensure that the path uses only forward slash. + * @param path + * @return forward-slashed path, or null if path is null + */ + private static String useForwardSlash(String path) { + + return (null != path) ? path.replace('\\', '/') : null; + } + private String getHeapMinProp(Properties properties) { String value = properties.getProperty("heap_min"); @@ -115,47 +132,14 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { @Override public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { try { - PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(jvmOptsFile.getAbsolutePath()); - Properties properties = propertiesUpdater.loadExistingProperties(); - Configuration config = configurationUpdateReport.getConfiguration(); - String maxHeapSize = config.getSimpleValue("maxHeapSize"); - if (!StringUtil.isEmpty(maxHeapSize)) { - validateHeapArg("maxHeapSize", maxHeapSize); - // We want min and max heap to be the same - properties.setProperty("heap_min", "-Xms" + maxHeapSize); - properties.setProperty("heap_max", "-Xmx" + maxHeapSize); - } - - String heapNewSize = config.getSimpleValue("heapNewSize"); - if (!StringUtil.isEmpty(heapNewSize)) { - validateHeapArg("heapNewSize", heapNewSize); - properties.setProperty("heap_new", "-Xmn" + heapNewSize); - } + updateCassandraJvmProps(config); - String threadStackSize = config.getSimpleValue("threadStackSize"); - if (!StringUtil.isEmpty(threadStackSize)) { - validateStackArg(threadStackSize); - properties.setProperty("thread_stack_size", "-Xss" + threadStackSize + "k"); + if (isWindows()) { + updateWrapperEnv(config); } - PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); - if (heapDumpOnOMMError != null) { - if (heapDumpOnOMMError.getBooleanValue()) { - properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); - } else { - properties.setProperty("heap_dump_on_OOMError", ""); - } - } - - String heapDumpDir = config.getSimpleValue("heapDumpDir"); - if (!StringUtil.isEmpty(heapDumpDir)) { - properties.setProperty("heap_dump_dir", heapDumpDir); - } - - propertiesUpdater.update(properties); - configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); } catch (IllegalArgumentException e) { configurationUpdateReport.setErrorMessage("No configuration update was applied: " + e.getMessage()); @@ -164,6 +148,88 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { } } + private void updateCassandraJvmProps(Configuration config) throws IOException { + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(jvmOptsFile.getAbsolutePath()); + Properties properties = propertiesUpdater.loadExistingProperties(); + + String maxHeapSize = config.getSimpleValue("maxHeapSize"); + if (!StringUtil.isEmpty(maxHeapSize)) { + validateHeapArg("maxHeapSize", maxHeapSize); + // We want min and max heap to be the same + properties.setProperty("heap_min", "-Xms" + maxHeapSize); + properties.setProperty("heap_max", "-Xmx" + maxHeapSize); + } + + String heapNewSize = config.getSimpleValue("heapNewSize"); + if (!StringUtil.isEmpty(heapNewSize)) { + validateHeapArg("heapNewSize", heapNewSize); + properties.setProperty("heap_new", "-Xmn" + heapNewSize); + } + + String threadStackSize = config.getSimpleValue("threadStackSize"); + if (!StringUtil.isEmpty(threadStackSize)) { + validateStackArg(threadStackSize); + properties.setProperty("thread_stack_size", "-Xss" + threadStackSize + "k"); + } + + PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); + if (heapDumpOnOMMError != null) { + if (heapDumpOnOMMError.getBooleanValue()) { + properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + } else { + properties.setProperty("heap_dump_on_OOMError", ""); + } + } + + String heapDumpDir = useForwardSlash(config.getSimpleValue("heapDumpDir")); + if (!StringUtil.isEmpty(heapDumpDir)) { + properties.setProperty("heap_dump_dir", heapDumpDir); + } + + propertiesUpdater.update(properties); + } + + private void updateWrapperEnv(Configuration config) throws IOException { + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(wrapperEnvFile.getAbsolutePath()); + Properties properties = propertiesUpdater.loadExistingProperties(); + + String maxHeapSize = config.getSimpleValue("maxHeapSize"); + if (!StringUtil.isEmpty(maxHeapSize)) { + validateHeapArg("maxHeapSize", maxHeapSize); + // We want min and max heap to be the same + properties.setProperty("set.heap_min", "-Xms" + maxHeapSize); + properties.setProperty("set.heap_max", "-Xmx" + maxHeapSize); + } + + String heapNewSize = config.getSimpleValue("heapNewSize"); + if (!StringUtil.isEmpty(heapNewSize)) { + validateHeapArg("heapNewSize", heapNewSize); + properties.setProperty("set.heap_new", "-Xmn" + heapNewSize); + } + + String threadStackSize = config.getSimpleValue("threadStackSize"); + if (!StringUtil.isEmpty(threadStackSize)) { + validateStackArg(threadStackSize); + properties.setProperty("set.thread_stack_size", "-Xss" + threadStackSize + "k"); + } + + PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); + if (heapDumpOnOMMError != null) { + if (heapDumpOnOMMError.getBooleanValue()) { + properties.setProperty("set.heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + } else { + properties.setProperty("set.heap_dump_on_OOMError", ""); + } + } + + String heapDumpDir = useForwardSlash(config.getSimpleValue("heapDumpDir")); + if (!StringUtil.isEmpty(heapDumpDir)) { + properties.setProperty("set.heap_dump_dir", heapDumpDir); + } + + propertiesUpdater.update(properties); + } + private void validateHeapArg(String name, String value) { if (value.length() < 2) { throw new IllegalArgumentException(value + " is not a legal value for the property [" + name + "]"); @@ -189,4 +255,8 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { throw new IllegalArgumentException(value + " is not a legal value for the property [threadStackSize]"); } } + + private boolean isWindows() { + return File.separatorChar == '\\'; + } } commit 969ea38e7254d61903c699380bd066d6cad3e85e Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jul 22 14:06:39 2013 -0400 When recreating win services make sure they get started appropriately. diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java index 8c885b0..61c8a9c 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java @@ -36,12 +36,16 @@ import java.util.Properties; import org.apache.commons.cli.CommandLine; import org.apache.commons.exec.DefaultExecuteResultHandler; import org.apache.commons.exec.DefaultExecutor; +import org.apache.commons.exec.ExecuteException; import org.apache.commons.exec.Executor; import org.apache.commons.exec.PumpStreamHandler; + import org.jboss.as.controller.client.ModelControllerClient; + import org.rhq.common.jbossas.client.controller.DeploymentJBossASClient; import org.rhq.common.jbossas.client.controller.MCCHelper; import org.rhq.server.control.ControlCommand; +import org.rhq.server.control.RHQControlException; /** * Common code for commands that perform installs. Basically shared code for Install and Upgrade commands. @@ -55,7 +59,7 @@ public abstract class AbstractInstall extends ControlCommand { protected final String STORAGE_CONFIG_PROP = "rhqctl.install.storage-config"; - protected void installWindowsService(File workingDir, String batFile) throws Exception { + protected void installWindowsService(File workingDir, String batFile, boolean start) throws Exception { Executor executor = new DefaultExecutor(); executor.setWorkingDirectory(workingDir); executor.setStreamHandler(new PumpStreamHandler()); @@ -69,6 +73,11 @@ public abstract class AbstractInstall extends ControlCommand { commandLine = getCommandLine(batFile, "install"); executor.execute(commandLine); + + if (start) { + commandLine = getCommandLine(batFile, "start"); + executor.execute(commandLine); + } } protected void validateCustomStorageDataDirectories(CommandLine commandLine, List<String> errors) { @@ -100,6 +109,54 @@ public abstract class AbstractInstall extends ControlCommand { } } + protected void waitForProcessToStop(String pid) throws Exception { + + if (isWindows() || pid == null) { + // For the moment we have no better way to just wait some time + Thread.sleep(10 * 1000L); + } else { + int tries = 5; + while (tries > 0) { + log.debug("."); + if (!isUnixPidRunning(pid)) { + break; + } + Thread.sleep(2 * 1000L); + tries--; + } + if (tries == 0) { + throw new RHQControlException("Process [" + pid + + "] did not finish yet. Terminate it manually and retry."); + } + } + + } + + protected boolean isUnixPidRunning(String pid) { + + Executor executor = new DefaultExecutor(); + executor.setWorkingDirectory(getBinDir()); + executor.setStreamHandler(new PumpStreamHandler()); + org.apache.commons.exec.CommandLine commandLine; + + commandLine = new org.apache.commons.exec.CommandLine("/bin/kill").addArgument("-0").addArgument(pid); + + try { + int code = executor.execute(commandLine); + if (code != 0) { + return false; + } + } catch (ExecuteException ee) { + if (ee.getExitValue() == 1) { + // return code 1 means process does not exist + return false; + } + } catch (IOException e) { + log.error("Checking for running process failed: " + e.getMessage()); + } + return true; + } + protected void waitForRHQServerToInitialize() throws Exception { try { final long messageInterval = 30000L; @@ -287,7 +344,6 @@ public abstract class AbstractInstall extends ControlCommand { log.debug("Stopping RHQ server..."); - Executor executor = new DefaultExecutor(); executor.setWorkingDirectory(serverBinDir); executor.setStreamHandler(new PumpStreamHandler()); diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java index bb6aa40..0808db2 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java @@ -142,7 +142,7 @@ public class Install extends AbstractInstall { if (!isStorageInstalled()) { installStorageNode(getStorageBasedir(), commandLine); } else if (isWindows()) { - installWindowsService(getBinDir(), "rhq-storage"); + installWindowsService(getBinDir(), "rhq-storage", true); } if (!isServerInstalled()) { @@ -150,7 +150,7 @@ public class Install extends AbstractInstall { runRHQServerInstaller(); waitForRHQServerToInitialize(); } else if (isWindows()) { - installWindowsService(getBinDir(), "rhq-server"); + installWindowsService(getBinDir(), "rhq-server", true); } if (!isAgentInstalled()) { @@ -158,13 +158,15 @@ public class Install extends AbstractInstall { File agentBasedir = getAgentBasedir(); installAgent(agentBasedir); configureAgent(agentBasedir, commandLine); - if (Boolean.parseBoolean(commandLine.getOptionValue(AGENT_AUTOSTART_OPTION, "true"))) { + boolean start = Boolean.parseBoolean(commandLine.getOptionValue(AGENT_AUTOSTART_OPTION, "true")); + if (start) { startAgent(agentBasedir, true); } else { log.info("The agent was installed but was told not to start automatically."); } } else if (isWindows()) { - installWindowsService(new File(getAgentBasedir(), "bin"), "rhq-agent-wrapper"); + boolean start = Boolean.parseBoolean(commandLine.getOptionValue(AGENT_AUTOSTART_OPTION, "true")); + installWindowsService(new File(getAgentBasedir(), "bin"), "rhq-agent-wrapper", start); } } else { @@ -173,7 +175,7 @@ public class Install extends AbstractInstall { log.info("The RHQ storage node is already installed in " + new File(getBaseDir(), "storage")); if (isWindows()) { - installWindowsService(getBinDir(), "rhq-storage"); + installWindowsService(getBinDir(), "rhq-storage", true); } else { log.info("Skipping storage node installation."); } @@ -200,7 +202,7 @@ public class Install extends AbstractInstall { log.warn("The RHQ server is already installed."); if (isWindows()) { - installWindowsService(getBinDir(), "rhq-server"); + installWindowsService(getBinDir(), "rhq-server", true); } else { log.info("Skipping server installation."); } @@ -217,8 +219,10 @@ public class Install extends AbstractInstall { if (isAgentInstalled() && !commandLine.hasOption(STORAGE_OPTION)) { log.info("The RHQ agent is already installed in [" + getAgentBasedir() + "]"); + boolean start = Boolean + .parseBoolean(commandLine.getOptionValue(AGENT_AUTOSTART_OPTION, "true")); if (isWindows()) { - installWindowsService(new File(getAgentBasedir(), "bin"), "rhq-agent-wrapper"); + installWindowsService(new File(getAgentBasedir(), "bin"), "rhq-agent-wrapper", start); } else { log.info("Skipping agent installation."); } commit e1461de493712c30e454fa51f946a72cadf2c257 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:47:00 2013 -0500 Fix merge rebase issue. diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 4744e96..3b0aa5b 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -41,8 +41,8 @@ import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.connection.bean.operation.EmsOperation; import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; @@ -116,7 +116,8 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper if (!configurationUpdate.getStatus().equals(ConfigurationUpdateStatus.SUCCESS)) { result.setErrorMessage(configurationUpdate.getErrorMessage()); - + } + return result; } commit 642421966cbea990df8cf0593e1fb82a4c1a98a8 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:40:53 2013 -0500 Attempt to improve the operation trigger for updates on the storage node configuration. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index c77e229..c2a7b46 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -64,6 +64,7 @@ import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.operation.OperationRequestStatus; import org.rhq.core.domain.operation.ResourceOperationHistory; import org.rhq.core.domain.operation.bean.GroupOperationSchedule; +import org.rhq.core.domain.operation.bean.ResourceOperationSchedule; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; @@ -101,8 +102,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private static final String RHQ_STORAGE_JMX_PORT_PROPERTY = "jmxPort"; private static final String RHQ_STORAGE_ADDRESS_PROPERTY = "host"; - private static final int OPERATION_QUERY_TIMEOUT = 1000; - private static final int MAX_ITERATIONS = 5; + private static final int OPERATION_QUERY_TIMEOUT = 20000; + private static final int MAX_ITERATIONS = 6; private static final String UPDATE_CONFIGURATION_OPERATION = "updateConfiguration"; private static final String RESTART_OPERATION = "restart"; @@ -636,8 +637,16 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN //scheduling the operation long operationStartTime = System.currentTimeMillis(); - operationManager.scheduleResourceOperation(subject, storageNodeResource.getId(), operationToRun, 0, 0, 0, 0, - parameters, "Run by StorageNodeManagerBean"); + + ResourceOperationSchedule newSchedule = new ResourceOperationSchedule(); + newSchedule.setJobTrigger(JobTrigger.createNowTrigger()); + newSchedule.setResource(storageNodeResource); + newSchedule.setOperationName(operationToRun); + newSchedule.setDescription("Run by StorageNodeManagerBean"); + newSchedule.setParameters(parameters); + + operationManager.scheduleResourceOperation(subject, newSchedule); + entityManager.flush(); //waiting for the operation result then return it int iteration = 0; commit a7e279884e1a7ee6c0782c1d5e79a27dcff26b76 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:39:55 2013 -0500 Implement the storage node operation for updating jvm options. diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 006dd26..4744e96 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -42,6 +42,7 @@ import org.mc4j.ems.connection.bean.operation.EmsOperation; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.Property; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; @@ -102,7 +103,20 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper private OperationResult updateConfiguration(Configuration params) { OperationResult result = new OperationResult("Configuration updated."); - //TODO: implement updates to various sub-resources here + + //update storage node jvm settings + Configuration config = new Configuration(); + config.put(new PropertySimple("minHeapSize", params.getSimpleValue("heapSize"))); + config.put(new PropertySimple("maxHeapSize", params.getSimpleValue("heapSize"))); + config.put(new PropertySimple("heapNewSize", params.getSimpleValue("heapNewSize"))); + config.put(new PropertySimple("threadStackSize", params.getSimpleValue("threadStackSize"))); + + ConfigurationUpdateReport configurationUpdate = new ConfigurationUpdateReport(config); + this.updateResourceConfiguration(configurationUpdate); + + if (!configurationUpdate.getStatus().equals(ConfigurationUpdateStatus.SUCCESS)) { + result.setErrorMessage(configurationUpdate.getErrorMessage()); + return result; } commit 26a7f7f476e03367d52e9e229f2e583c789e7bec Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:38:15 2013 -0500 Add two more properties to the list of configurable properties for the storaga node. The new properties are heap new size and thread stack size. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java index e2c64f9..32d8ab3 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java @@ -33,6 +33,8 @@ public class StorageNodeConfigurationComposite implements Serializable { private StorageNode storageNode; private int jmxPort; private String heapSize; + private String threadStackSize; + private String heapNewSize; public StorageNodeConfigurationComposite() { // GWT needs this @@ -85,14 +87,44 @@ public class StorageNodeConfigurationComposite implements Serializable { this.heapSize = heapSize; } + /** + * @return the threadStackSize + */ + public String getThreadStackSize() { + return threadStackSize; + } + + /** + * @param threadStackSize the threadStackSize to set + */ + public void setThreadStackSize(String threadStackSize) { + this.threadStackSize = threadStackSize; + } + + /** + * @return the heapNewSize + */ + public String getHeapNewSize() { + return heapNewSize; + } + + /** + * @param heapNewSize the heapNewSize to set + */ + public void setHeapNewSize(String heapNewSize) { + this.heapNewSize = heapNewSize; + } + /* (non-Javadoc) * @see java.lang.Object#toString() */ public String toString() { StringBuilder builder = new StringBuilder(); builder.append("storageNode.addresss=").append(storageNode.getAddress()).append(", "); + builder.append("jmxPort=").append(jmxPort).append(","); builder.append("heapSize=").append(heapSize).append(", "); - builder.append("jmxPort=").append(jmxPort).append(""); + builder.append("heapNewSize=").append(heapSize).append(", "); + builder.append("threadStackSize=").append(threadStackSize).append(""); return builder.toString(); } } commit a0285ac83b5b673dab0582f9ff52baaa746fd8cd Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:37:10 2013 -0500 Update the set of calculated metrics for Cassandra to incorporate latest feedback. There are three metrics now: total system used space percentage, data file disk space used percentage, and free to data disk space ratio. Also, update the alert definition for disk space to monitor all three metrics. diff --git a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java index 8995ec0..37d10a8 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java +++ b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java @@ -61,7 +61,9 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone private final Log log = LogFactory.getLog(AlertDefinitionServerPluginComponent.class); - private static final String PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.PartitionDiskUsedPercentage"; + private static final String DATA_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.DataDiskUsedPercentage"; + private static final String TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.TotalDiskUsedPercentage"; + private static final String FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME = "Calculated.FreeDiskToDataSizeRatio"; static private final List<InjectedTemplate> injectedTemplates; static private final InjectedTemplate storageNodeHighHeapTemplate; @@ -297,23 +299,42 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone newTemplate.setRecoveryId(0); newTemplate.setEnabled(true); - AlertCondition ac = new AlertCondition(); - ac.setCategory(AlertConditionCategory.THRESHOLD); - ac.setComparator(">"); - ac.setThreshold(0.5D); + + AlertCondition dataDiskUsedAlertCondition = new AlertCondition(); + dataDiskUsedAlertCondition.setCategory(AlertConditionCategory.THRESHOLD); + dataDiskUsedAlertCondition.setComparator(">"); + dataDiskUsedAlertCondition.setThreshold(0.5D); + + AlertCondition totalDiskUsedAlertCondition = new AlertCondition(); + totalDiskUsedAlertCondition.setCategory(AlertConditionCategory.THRESHOLD); + totalDiskUsedAlertCondition.setComparator(">"); + totalDiskUsedAlertCondition.setThreshold(0.75D); + + AlertCondition freeSpaveDataRatioAlertCondition = new AlertCondition(); + freeSpaveDataRatioAlertCondition.setCategory(AlertConditionCategory.THRESHOLD); + freeSpaveDataRatioAlertCondition.setComparator("<"); + freeSpaveDataRatioAlertCondition.setThreshold(1.5D); List<Integer> measurementDefinitionIds = new ArrayList<Integer>(1); for (MeasurementDefinition d : resourceType.getMetricDefinitions()) { - if (PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME.equals(d.getName())) { + if (DATA_DISK_USED_PERCENTAGE_METRIC_NAME.equals(d.getName())) { measurementDefinitionIds.add(d.getId()); - ac.setMeasurementDefinition(d); - ac.setName(d.getDisplayName()); + dataDiskUsedAlertCondition.setMeasurementDefinition(d); + dataDiskUsedAlertCondition.setName(d.getDisplayName()); + } else if (TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME.equals(d.getName())) { + measurementDefinitionIds.add(d.getId()); + totalDiskUsedAlertCondition.setMeasurementDefinition(d); + totalDiskUsedAlertCondition.setName(d.getDisplayName()); + } else if (FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME.equals(d.getName())) { + measurementDefinitionIds.add(d.getId()); + freeSpaveDataRatioAlertCondition.setMeasurementDefinition(d); + freeSpaveDataRatioAlertCondition.setName(d.getDisplayName()); } } - assert null != ac.getMeasurementDefinition() : "Did not find expected measurement definition " - + PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME + " for " - + resourceType; - newTemplate.addCondition(ac); + + newTemplate.addCondition(dataDiskUsedAlertCondition); + newTemplate.addCondition(totalDiskUsedAlertCondition); + newTemplate.addCondition(freeSpaveDataRatioAlertCondition); AlertDampening dampener = new AlertDampening(AlertDampening.Category.PARTIAL_COUNT); dampener.setPeriod(15); diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java index e5a2283..76ce2b2 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java @@ -58,7 +58,9 @@ import org.rhq.plugins.jmx.JMXComponent; public class StorageServiceComponent extends ComplexConfigurationResourceComponent { private static final String OWNERSHIP_METRIC_NAME = "Ownership"; - private static final String PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.PartitionDiskUsedPercentage"; + private static final String DATA_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.DataDiskUsedPercentage"; + private static final String TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.TotalDiskUsedPercentage"; + private static final String FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME = "Calculated.FreeDiskToDataSizeRatio"; private static final String DATA_FILE_LOCATIONS_NAME = "AllDataFileLocations"; private static final String LOAD_NAME = "Load"; @@ -156,6 +158,22 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone @Override protected void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests, EmsBean bean) { super.getValues(report, requests, bean); + + EmsAttribute loadAttribute = bean.getAttribute(LOAD_NAME); + Object loadValue = loadAttribute.refresh(); + + EmsAttribute dataFileLocationAttribute = bean.getAttribute(DATA_FILE_LOCATIONS_NAME); + Object dataFileLocationValue = dataFileLocationAttribute.refresh(); + + double load = 0; + if (loadValue != null && dataFileLocationValue != null && dataFileLocationValue instanceof String[]) { + //Please visit for details: https://issues.apache.org/jira/browse/CASSANDRA-2749 + //The average usage of all partitions with the data will be reported. + //Cassandra selects the partition with most free space for SStable flush and compaction. + load = Double.parseDouble(loadValue.toString()); + load = load / 1024d; //transform in MB + } + for (MeasurementScheduleRequest request : requests) { if (OWNERSHIP_METRIC_NAME.equals(request.getName()) && host != null) { EmsAttribute attribute = bean.getAttribute(OWNERSHIP_METRIC_NAME); @@ -179,49 +197,53 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone report.addData(new MeasurementDataNumeric(request, value.doubleValue())); } break; - } else if (PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName())) { - - - EmsAttribute loadAttribute = bean.getAttribute(LOAD_NAME); - Object loadValue = loadAttribute.refresh(); - - EmsAttribute dataFileLocationAttribute = bean.getAttribute(DATA_FILE_LOCATIONS_NAME); - Object dataFileLocationValue = dataFileLocationAttribute.refresh(); - - if (loadValue != null && dataFileLocationValue != null && dataFileLocationValue instanceof String[]) { - //Please visit for details: https://issues.apache.org/jira/browse/CASSANDRA-2749 - //The average usage of all partitions with the data will be reported. - //Cassandra selects the partition with most free space for SStable flush and compaction. - double load = Double.parseDouble(loadValue.toString()); - - report.addData(new MeasurementDataNumeric(request, getPartitionDiskUsedPercentage(load, - (String[]) dataFileLocationValue))); - } + } else if (DATA_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName()) + || TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName()) + || FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME.equals(request.getName())) { + double metricValue = getDiskUsageMetric(request, load, (String[]) dataFileLocationValue); + report.addData(new MeasurementDataNumeric(request, metricValue)); } } } - private double getPartitionDiskUsedPercentage(double dataSize, String[] paths) { + private double getDiskUsageMetric(MeasurementScheduleRequest request, double dataSize, String[] paths) { List<String> visitedMountPoints = new ArrayList<String>(); long totalDiskSpace = 0; + long totalFreeDiskSpace = 0; + long totalUsedDiskSpace = 0; for (String path : paths) { try { FileSystemInfo fileSystemInfo = this.getResourceContext().getSystemInformation().getFileSystem(path); if (!visitedMountPoints.contains(fileSystemInfo.getMountPoint())) { visitedMountPoints.add(fileSystemInfo.getMountPoint()); + + //contrary to Sigar documentation this values are reported in MB and not bytes totalDiskSpace += fileSystemInfo.getFileSystemUsage().getTotal(); + totalFreeDiskSpace += fileSystemInfo.getFileSystemUsage().getFree(); + totalUsedDiskSpace += fileSystemInfo.getFileSystemUsage().getUsed(); } } catch (Exception e) { log.error("Unable to determine file system usage information for data file location " + path, e); } } + double metricValue = 0; + + if (totalDiskSpace != 0) { - double rawPercentage = dataSize / ((double) totalDiskSpace); - return Math.round(rawPercentage * 100.0) / 100.0; + double rawPercentage = 0; + if (DATA_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName())) { + rawPercentage = dataSize / ((double) totalDiskSpace); + } else if (TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName())) { + rawPercentage = ((double) totalUsedDiskSpace) / ((double) totalDiskSpace); + } else if (FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME.equals(request.getName())) { + rawPercentage = ((double) totalFreeDiskSpace) / (double) dataSize; + } + + metricValue = Math.round(rawPercentage * 100d) / 100d; } - return 0; + return metricValue; } } diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml index a1b3412..5bbebed 100644 --- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml @@ -186,9 +186,11 @@ </parameters> </operation> + <metric property="Calculated.DataDiskUsedPercentage" displayName="Data File Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of disk space used by Cassandra data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> + <metric property="Calculated.TotalDiskUsedPercentage" displayName="Total Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of total disk space used. The metric acounts overall disk usage (including system files), not just disk space used by Cassandra. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> + <metric property="Calculated.FreeDiskToDataSizeRatio" displayName="Free Disk to Data Size Ratio" dataType="measurement" displayType="summary" description="Ratio of (Amount of Free Disk)/(Data File Size). A value below 1 is not recommended since a compaction or repair process could double the amount of disk space used by data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> + <metric property="CurrentGenerationNumber" dataType="trait" displayType="summary" description="Current generation number"/> - <metric property="Calculated.PartitionDiskUsedPercentage" displayName="Data File Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of disk space used by the data files. If multiple data locations are specified then this will report - the average utilization accross all the partitions that contain data files."/> <metric property="ExceptionCount" measurementType="trendsup" dataType="measurement" displayType="summary" description="Exception Count"/> <metric property="Initialized" dataType="trait" displayType="summary" description="Initialized"/> <metric property="Joined" dataType="trait" displayType="summary" description="Joined"/> commit 82d0075ed860dcc2f2aed57191e4fa64806caa97 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Mon Jul 22 14:39:39 2013 +0200 Entities < and > in the plugin descriptor were interpreted as HTML in the ConfigurationEditor and the content between them wasn't there. diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml index e6bc1da..a1b3412 100644 --- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml @@ -159,7 +159,7 @@ <operation name="takeSnapshot" description="Takes a snapshot of all keyspaces. A snapshot first flushes all in-memory writes to disk and then creates a hard link of each SSTable file for each keyspace. Note that a column family can have multiple - SSTables on disk. By default snapshots are stored in the <cassandra_data_dir>/<keyspace_name>/<column_family_name>/snapshots + SSTables on disk. By default snapshots are stored in the [cassandra_data_dir]/[keyspace_name]/[column_family_name]/snapshots directory. On Linux/UNIX systems cassandra_data_dir defaults to /var/lib/cassandra/data"> <parameters> <c:simple-property name="snapshotName" required="false" type="string" displayName="Snapshot Name" commit 1a520b6c33dd2bde09d58ea7e51d04c83622f481 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 22 07:17:20 2013 -0400 comment out exporting test ear Might be nice to enable exporting test ear with a system property where the location is also configurable. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java index 2fd8624..8010c2b 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java @@ -413,7 +413,8 @@ public abstract class AbstractEJB3Test extends Arquillian { //System.out.println("** The Deployment EAR: " + testEar.toString(true) + "\n"); // Save the test EAR to a zip file for inspection (set file explicitly) - exportZip(testEar, new File("/Users/jsanda/tmp/test-ear.ear")); + //String tmpDir = System.getProperty("java.io.tmpdir"); + //exportZip(testEar, new File(tmpDir, "test.ear")); return testEar; } commit df8669222aa3146b71b3252166af6bdd387806cd Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 22 10:38:44 2013 +0200 Add more units. diff --git a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java index 0ae4011..150b9e0 100644 --- a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java +++ b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat, Inc. and/or its affiliates, and + * Copyright 2009-2013, Red Hat, Inc. and/or its affiliates, and * individual contributors as indicated by the @author tags. See the * copyright.txt file in the distribution for a full listing of * individual contributors. @@ -26,10 +26,18 @@ package org.rhq.helpers.pluginAnnotations.agent; * Metric Units. * * @author Galder Zamarreño + * @author Heiko W. Rupp + * See also org.rhq.core.domain.measurement.MeasurementUnits * @since 4.0 */ +@SuppressWarnings("unused") public enum Units { - NONE, MILLISECONDS, SECONDS, PERCENTAGE; + NONE, PERCENTAGE, + BYTES, KILOBYTES, MEGABYTES, GIGABYTES, TERABYTES, PETABYTES, + BITS, KILOBITS, MEGABITS, GIGABITS, TERABITS, PETABITS, + EPOCH_MILLISECONDS, EPOCH_SECONDS, + JIFFYS, NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS, + CELSIUS, KELVIN, FAHRENHEIT; @Override public String toString() { commit 14edae37060b25ebcfed621deef0281c72b1cea2 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 21 21:22:43 2013 -0400 adding resource operation to update internode auth conf file The operation updates the file on disk and then invokes the JMX operation to have the authenticator reload the configuration so that the changes can be picked up without having to restart the node. diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 380da65..006dd26 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -26,7 +26,12 @@ package org.rhq.plugins.storage; import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -36,6 +41,7 @@ import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.connection.bean.operation.EmsOperation; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; @@ -43,7 +49,10 @@ import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.core.util.file.FileUtil; +import org.rhq.core.util.stream.StreamUtil; import org.rhq.plugins.cassandra.CassandraNodeComponent; import org.rhq.plugins.cassandra.util.KeyspaceService; @@ -84,6 +93,8 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return readRepair(); } else if (name.equals("updateConfiguration")) { return updateConfiguration(parameters); + } else if (name.equals("updateKnownNodes")) { + return updateKnownNodes(parameters); } else { return super.invokeOperation(name, parameters); } @@ -95,6 +106,73 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return result; } + private OperationResult updateKnownNodes(Configuration params) { + OperationResult result = new OperationResult(); + + PropertyList propertyList = params.getList("ipAddresses"); + Set<String> ipAddresses = new HashSet<String>(); + + for (Property property : propertyList.getList()) { + PropertySimple propertySimple = (PropertySimple) property; + ipAddresses.add(propertySimple.getStringValue()); + } + + log.info("Updating known nodes to " + ipAddresses); + + File confDir = new File(getBasedir(), "conf"); + File authFile = new File(confDir, "rhq-storage-auth.conf"); + File authBackupFile = new File(confDir, "." + authFile.getName() + ".bak"); + + if (authBackupFile.exists()) { + if (log.isDebugEnabled()) { + log.debug(authBackupFile + " already exists. Deleting it now in preparation of creating new backup " + + "for " + authFile.getName()); + } + if (!authBackupFile.delete()) { + String msg = "Failed to delete backup file " + authBackupFile + ". The operation will abort " + + "since " + authFile + " cannot reliably be backed up before making changes. Please delete " + + authBackupFile + " manually and reschedule the operation once the file has been removed."; + log.error(msg); + result.setErrorMessage(msg); + + return result; + } + } + + try { + FileUtil.copyFile(authFile, authBackupFile); + } catch (IOException e) { + String msg = "Failed to backup " + authFile + " prior to making updates. The operation will abort due " + + "to unexpected error"; + log.error(msg, e); + result.setErrorMessage(msg + ": " + ThrowableUtil.getRootMessage(e)); + return result; + } + + try { + StreamUtil.copy(new StringReader(StringUtil.collectionToString(ipAddresses, "\n")), + new FileWriter(authFile), true); + } catch (IOException e) { + log.error("An error occurred while updating " + authFile, e); + try { + FileUtil.copyFile(authBackupFile, authFile); + } catch (IOException e1) { + log.error("Failed to revert backup of " + authFile, e1); + } + result.setErrorMessage("There was an unexpected error while updating " + authFile + ". Make sure that " + + "it matches " + authBackupFile + " and then reschedule the operation."); + return result; + } + + EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); + EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); + emsOperation.invoke(); + + result.setSimpleResult("Successfully updated the set of known nodes."); + + return result; + } + private OperationResult nodeAdded(Configuration params) { boolean runRepair = params.getSimple("runRepair").getBooleanValue(); boolean updateSeedsList = params.getSimple("updateSeedsList").getBooleanValue(); diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 6ed31b7..8156d02 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -93,6 +93,14 @@ </results> </operation> + <operation name="updateKnownNodes"> + <parameters> + <c:list-property name="ipAddresses"> + <c:simple-property name="ipAddress"/> + </c:list-property> + </parameters> + </operation> + <operation name="prepareForUpgrade" description="Prepares the storage node for upgrade (this operation consists of following steps: 1) turning off the RPC server, 2) turning off the gossiper, 3) taking the snapshot (backuping the data), 4) invoking the drain operation"> <parameters> <c:simple-property name="snapshotName" required="false" type="string" displayName="Snapshot Name" commit 38777a49e6b5c5f92c54c3f41511f5f691d2a548 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 21 21:21:45 2013 -0400 update cassandra deployer itest diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties index a90d23c..774a831 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties @@ -17,9 +17,9 @@ heap_dump_dir="" thread_stack_size=-Xss180k -java_agent="" # Enable jamm when running on Java 6 patch version 23 or higher. #java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" +java_agent=-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar # GC tuning options # diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml index 15d08f2..b9e490a 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml @@ -323,7 +323,7 @@ listen_address: localhost # Internode authentication backend, implementing IInternodeAuthenticator; # used to allow/disallow connections from peer nodes. -# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator +internode_authenticator: org.rhq.cassandra.auth.RhqInternodeAuthenticator # Whether to start the native transport server. # Currently, only the thrift server is started by default because the native commit 1750170844f6a68b11256ba001fe6cffb53439f6 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 21 21:14:48 2013 -0400 temporarily disable the quartz job that is kicked off when a new node is added I need to disable the job while working on the internode authentication stuff. If the maintenance operations run on the nodes, the cluster can actually get into a bad state because the nodes' authentication conf files have not been updated which means the new node is not actually part of the cluster. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 3f1ec69..c77e229 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -170,7 +170,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN entityManager.persist(storageNode); - scheduleQuartzJob(storageNodes.size()); +// scheduleQuartzJob(storageNodes.size()); } } } commit fe6da9b5511a3b4c97c2421079db04020c33c27f Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 21 21:11:43 2013 -0400 pre-configure internode auth conf file From testing I have done thus far it appears that a storage node should have its own IP address included in the internode authentication config file. The storage installer updates the auth file to include the node's address as well as and seeds. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java index edf1430..c8bb2ef 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java @@ -34,6 +34,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; +import java.net.InetAddress; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -109,6 +110,13 @@ public class CassandraClusterManager { List<StorageNode> nodes = new ArrayList<StorageNode>(deploymentOptions.getNumNodes()); String seeds = collectionToString(calculateLocalIPAddresses(deploymentOptions.getNumNodes())); + Set<InetAddress> ipAddresses = null; + + try { + ipAddresses = getClusterIPAddresses(); + } catch (IOException e) { + throw new RuntimeException("Failed to get cluster IP addresses", e); + } for (int i = 0; i < deploymentOptions.getNumNodes(); ++i) { File basedir = new File(deploymentOptions.getClusterDir(), "node" + i); @@ -141,7 +149,7 @@ public class CassandraClusterManager { storageNode.setCqlPort(nodeOptions.getNativeTransportPort()); nodes.add(storageNode); - updateStorageAuthConf(basedir); + deployer.updateStorageAuthConf(ipAddresses); installedNodeDirs.add(basedir); } catch (Exception e) { @@ -193,6 +201,15 @@ public class CassandraClusterManager { return i <= seedsArray.length ? seedsArray[i - 1] : ("127.0.0." + i); } + private Set<InetAddress> getClusterIPAddresses() throws IOException { + Set<InetAddress> ipAddresses = new HashSet<InetAddress>(); + for (String address : calculateLocalIPAddresses(deploymentOptions.getNumNodes())) { + ipAddresses.add(InetAddress.getByName(address)); + } + + return ipAddresses; + } + private List<StorageNode> calculateNodes() { List<StorageNode> nodes = new ArrayList<StorageNode>(deploymentOptions.getNumNodes()); for (int i = 0; i < deploymentOptions.getNumNodes(); ++i) { diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index b01ebe9..6547043 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -30,13 +30,18 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; +import java.io.StringReader; +import java.net.InetAddress; +import java.util.HashSet; import java.util.Map; import java.util.Properties; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.util.PropertiesFileUpdate; +import org.rhq.core.util.StringUtil; import org.rhq.core.util.TokenReplacingReader; import org.rhq.core.util.ZipUtil; import org.rhq.core.util.stream.StreamUtil; @@ -171,4 +176,22 @@ public class Deployer { } } + public void updateStorageAuthConf(Set<InetAddress> ipAddresses) { + File confDir = new File(deploymentOptions.getBasedir(), "conf"); + File authFile = new File(confDir, "rhq-storage-auth.conf"); + + Set<String> addresses = new HashSet<String>(ipAddresses.size()); + for (InetAddress ipAddress : ipAddresses) { + addresses.add(ipAddress.getHostAddress()); + } + + try { + authFile.delete(); + StreamUtil.copy(new StringReader(StringUtil.collectionToString(addresses, "\n")), + new FileWriter(authFile), true); + } catch (IOException e) { + throw new RuntimeException("Failed to update " + authFile); + } + } + } diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 5c5ac4e..113d66b 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -34,10 +34,12 @@ import java.net.InetAddress; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Properties; +import java.util.Set; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -386,6 +388,7 @@ public class StorageInstaller { deployer.unzipDistro(); deployer.applyConfigChanges(); deployer.updateFilePerms(); + deployer.updateStorageAuthConf(getAddresses(hostname, seeds)); log.info("Finished installing RHQ Storage Node."); @@ -499,6 +502,19 @@ public class StorageInstaller { return dir; } + private Set<InetAddress> getAddresses(String hostname, String seeds) throws IOException { + Set<InetAddress> addresses = new HashSet<InetAddress>(); + addresses.add(InetAddress.getByName(hostname)); + + if (!StringUtil.isEmpty(seeds)) { + for (String seed : seeds.split(",")) { + addresses.add(InetAddress.getByName(seed)); + } + } + + return addresses; + } + private PropertiesFileUpdate getServerProperties() { String sysprop = System.getProperty("rhq.server.properties-file"); if (sysprop == null) { commit b63c38cb0c19cd062d14c5e025164021f1e946cc Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 20 09:53:10 2013 -0400 turn on internode authentication This enabled internode authentication in cassandra.yaml and the cassandra-auth module is packaged with our Cassandra distro. The authentication config file is automatically updated for integrated tests. There is still work to be done for multi-node dev-container (and production) deployments. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 2bde394..c12c567 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -113,6 +113,11 @@ <artifactId>snappy-java</artifactId> <version>${cassandra.snappy.version}</version> </dependency> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-cassandra-auth</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <executions> <execution> @@ -166,12 +171,15 @@ <delete file="${cassandra.dir}/lib/snappy-java-1.0.4.1.jar"/> <copy file="${settings.localRepository}/org/xerial/snappy/snappy-java/${cassandra.snappy.version}/snappy-java-${cassandra.snappy.version}.jar" todir="${cassandra.dir}/lib"/> + <copy file="${settings.localRepository}/org/rhq/rhq-cassandra-auth/${project.version}/rhq-cassandra-auth-${project.version}.jar" + todir="${cassandra.dir}/lib"/> <move file="${project.build.outputDirectory}/cassandra/conf" todir="${cassandra.dir}"/> <delete file="${cassandra.dir}/bin/cassandra"/> <move file="${project.build.outputDirectory}/cassandra/bin/cassandra" todir="${cassandra.dir}/bin"/> <delete dir="${project.build.outputDirectory}/cassandra"/> <delete dir="${cassandra.dir}/javadoc"/> <delete file="${cassandra.dir}/conf/cassandra-env.sh"/> + <touch file="${cassandra.dir}/conf/rhq-storage-auth.conf"/> <zip basedir="${cassandra.dir}" destfile="${cassandra.distro.zip}"/> <delete dir="${cassandra.dir}"/> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties index 612c65e..1faee9d 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties @@ -17,9 +17,9 @@ heap_dump_dir="" thread_stack_size="-Xss180k" -java_agent="" # Enable jamm when running on Java 6 patch version 23 or higher. #java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" +java_agent= # GC tuning options # diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml index 298db9d..da09e92 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml @@ -323,7 +323,7 @@ listen_address: ${rhq.cassandra.listen.address} # Internode authentication backend, implementing IInternodeAuthenticator; # used to allow/disallow connections from peer nodes. -# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator +internode_authenticator: org.rhq.cassandra.auth.RhqInternodeAuthenticator # Whether to start the native transport server. # Currently, only the thrift server is started by default because the native diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java index 338ef3a..edf1430 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java @@ -30,7 +30,9 @@ import static org.rhq.core.util.StringUtil.collectionToString; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileReader; +import java.io.FileWriter; import java.io.IOException; +import java.io.StringReader; import java.io.StringWriter; import java.util.ArrayList; import java.util.Arrays; @@ -50,6 +52,7 @@ import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; +import org.rhq.core.util.StringUtil; import org.rhq.core.util.file.FileUtil; import org.rhq.core.util.stream.StreamUtil; @@ -138,6 +141,8 @@ public class CassandraClusterManager { storageNode.setCqlPort(nodeOptions.getNativeTransportPort()); nodes.add(storageNode); + updateStorageAuthConf(basedir); + installedNodeDirs.add(basedir); } catch (Exception e) { log.error("Failed to install node at " + basedir); @@ -152,6 +157,21 @@ public class CassandraClusterManager { return nodes; } + private void updateStorageAuthConf(File basedir) { + File confDir = new File(basedir, "conf"); + File authFile = new File(confDir, "rhq-storage-auth.conf"); + authFile.delete(); + + Set<String> addresses = calculateLocalIPAddresses(deploymentOptions.getNumNodes()); + + try { + StreamUtil.copy(new StringReader(StringUtil.collectionToString(addresses, "\n")), + new FileWriter(authFile), true); + } catch (IOException e) { + throw new RuntimeException("Failed to update " + authFile); + } + } + private Set<String> calculateLocalIPAddresses(int numNodes) { Set<String> addresses = new HashSet<String>(); diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index b222c82..b01ebe9 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -160,11 +160,6 @@ public class Deployer { return Integer.parseInt(javaVersion.substring(startIndex + 1, javaVersion.length())); } - private boolean isLaterThanJava1_6() { - String javaVersion = System.getProperty("java.version"); - return javaVersion.compareTo("1.6.0") > 0; - } - public void updateFilePerms() { File deployDir = new File(deploymentOptions.getBasedir()); File binDir = new File(deployDir, "bin"); commit 890a378fc11b04f3e7af64babfbfd1a7e306b7cd Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 20 07:56:14 2013 -0400 initial commit for cassandra-auth module This is the first cut at our IInternodeAuthenticator. It loads IP addresses from a config file. There is a JMX operation to reload the config file that can be used after the config file is updated. diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml new file mode 100644 index 0000000..c53c752 --- /dev/null +++ b/modules/common/cassandra-auth/pom.xml @@ -0,0 +1,27 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.rhq</groupId> + <artifactId>rhq-common-parent</artifactId> + <version>4.9.0-SNAPSHOT</version> + </parent> + + <artifactId>rhq-cassandra-auth</artifactId> + <name>RHQ Cassandra Authentication</name> + + <properties> + <moduleName>org.rhq.${project.artifactId}</moduleName> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.cassandra</groupId> + <artifactId>cassandra-all</artifactId> + <version>${cassandra.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> +</project> diff --git a/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticator.java b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticator.java new file mode 100644 index 0000000..56980f1 --- /dev/null +++ b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticator.java @@ -0,0 +1,78 @@ +package org.rhq.cassandra.auth; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.lang.management.ManagementFactory; +import java.net.InetAddress; +import java.net.URISyntaxException; +import java.util.HashSet; +import java.util.Set; + +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.apache.cassandra.auth.IInternodeAuthenticator; +import org.apache.cassandra.exceptions.ConfigurationException; + +/** + * @author John Sanda + */ +public class RhqInternodeAuthenticator implements IInternodeAuthenticator, RhqInternodeAuthenticatorMBean { + + private final String MBEAN_NAME = "org.rhq.cassandra.auth:type=" + RhqInternodeAuthenticator.class.getSimpleName(); + + private final String CONF_FILE = "rhq-storage-auth.conf"; + + private File authConfFile; + + private Set<InetAddress> addresses = new HashSet<InetAddress>(); + + public RhqInternodeAuthenticator() { + try { + authConfFile = new File(getClass().getResource("/" + CONF_FILE).toURI()); + if (!authConfFile.exists()) { + throw new RuntimeException(authConfFile + " does not exist"); + } + + reloadConfiguration(); + } catch (URISyntaxException e) { + throw new RuntimeException("Failed to load " + CONF_FILE, e); + } + + try { + MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); + ObjectName nameObj = new ObjectName(MBEAN_NAME); + mbs.registerMBean(this, nameObj); + } catch (Exception e) { + throw new RuntimeException("Failed to register MBean " + MBEAN_NAME, e); + } + } + + @Override + public boolean authenticate(InetAddress address, int port) { + return addresses.contains(address); + } + + @Override + public void reloadConfiguration() { + try { + addresses.clear(); + + BufferedReader reader = new BufferedReader(new FileReader(authConfFile)); + String line = reader.readLine(); + + while (line != null) { + addresses.add(InetAddress.getByName(line)); + line = reader.readLine(); + } + } catch (IOException e) { + throw new RuntimeException("Failed to load addresses from " + authConfFile, e); + } + } + + @Override + public void validateConfiguration() throws ConfigurationException { + } +} diff --git a/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticatorMBean.java b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticatorMBean.java new file mode 100644 index 0000000..5e20389 --- /dev/null +++ b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticatorMBean.java @@ -0,0 +1,10 @@ +package org.rhq.cassandra.auth; + +/** + * @author John Sanda + */ +public interface RhqInternodeAuthenticatorMBean { + + public void reloadConfiguration(); + +} diff --git a/modules/common/pom.xml b/modules/common/pom.xml index bcbf862..7d12500 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -30,6 +30,7 @@ <module>ant-bundle</module> <module>drift</module> <module>jboss-as-dmr-client</module> + <module>cassandra-auth</module> <module>cassandra-util</module> <module>cassandra-jmx</module> <module>cassandra-schema</module> commit 8cf740355dfab9832b904984aaba4e52bf759951 Author: John Sanda <jsanda(a)redhat.com> Date: Fri Jul 19 22:18:23 2013 -0400 add logic to enable jamm java agent, which mirrors logic in cassandra-env.sh diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index 1e31e14..b222c82 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -125,6 +125,13 @@ public class Deployer { properties.setProperty("thread_stack_size", "-Xss" + deploymentOptions.getStackSize()); properties.setProperty("jmx_port", deploymentOptions.getJmxPort().toString()); + String javaVersion = System.getProperty("java.version"); + // The check here is taken right from cassandra-env.sh + if ((!isOpenJDK() || javaVersion.compareTo("1.6.0") > 0) || + (javaVersion.equals("1.6.0") && getJavaPatchVersion() > 23)) { + properties.put("java_agent", "-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"); + } + propertiesUpdater.update(properties); } catch (IOException e) { log.error("An error occurred while updating " + jvmPropsFile, e); @@ -132,6 +139,32 @@ public class Deployer { } } + private boolean isOpenJDK() { + String javaVMName = System.getProperty("java.vm.name"); + return javaVMName.startsWith("OpenJDK"); + } + + private boolean isJava1_6() { + String javaVersion = System.getProperty("java.version"); + return javaVersion.startsWith("1.6.0"); + } + + private int getJavaPatchVersion() { + String javaVersion = System.getProperty("java.version"); + int startIndex = javaVersion.indexOf('_'); + + if (startIndex == -1) { + return 0; + } + + return Integer.parseInt(javaVersion.substring(startIndex + 1, javaVersion.length())); + } + + private boolean isLaterThanJava1_6() { + String javaVersion = System.getProperty("java.version"); + return javaVersion.compareTo("1.6.0") > 0; + } + public void updateFilePerms() { File deployDir = new File(deploymentOptions.getBasedir()); File binDir = new File(deployDir, "bin"); commit 0517e453381aec1d30b6aaa62bec63a322dfa350 Author: Larry O'Leary <loleary(a)redhat.com> Date: Fri Jul 19 19:05:25 2013 -0500 Updated TestLdapSettings to include changes/fixes introduced from the following BZs: Bug 707047 - LDAP Group Member search doesn't escape special characters Bug 981015 - LDAP auth fails if user's DN contains a backslash Also includes a fix in where the user auth test would fail to switch back to the directory bind account and result in ACL failures on the following group lookup steps. diff --git a/etc/dev-utils/TestLdapSettings.java b/etc/dev-utils/TestLdapSettings.java index 4df79dc..2e29b3d 100644 --- a/etc/dev-utils/TestLdapSettings.java +++ b/etc/dev-utils/TestLdapSettings.java @@ -10,12 +10,14 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.PrintWriter; import java.io.StringWriter; +import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Properties; import java.util.Set; +import javax.naming.CompositeName; import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.directory.Attribute; @@ -257,7 +259,17 @@ public class TestLdapSettings extends JFrame { SearchResult si = (SearchResult) answer.next(); // Construct the UserDN - userDN = si.getName() + "," + baseDNs[x]; + userDN = null; + + try { + userDN = si.getNameInNamespace(); + } catch (UnsupportedOperationException use) { + userDN = new CompositeName(si.getName()).get(0); + if (si.isRelative()) { + userDN += "," + baseDNs[x]; + } + } + msg = "STEP-2:PASS: The test user '" + testUserName + "' was succesfully located, and the following userDN will be used in authorization check:\n"; @@ -288,6 +300,21 @@ public class TestLdapSettings extends JFrame { log(msg); proceed=false; } + try { + ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, bindUserName); + ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, bindPassword); + ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION, "simple"); + ctx.reconnect(null); + } catch (Exception ex) { + msg = "STEP-2:WARN: There was an error when switching back to the bind user '" + + bindUserName + "'\n"; + msg += ex.getMessage(); + if(enableVerboseDebugging.isSelected()){ + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + } + } // with authentication completed, now check authorization. // validate filter components to list all available groups @@ -433,7 +460,7 @@ public class TestLdapSettings extends JFrame { Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); String filter = String.format("(&(%s)(%s=%s))", groupSearchFilter, groupMemberFilter, - userDN); + LDAPStringUtil.encodeForFilter(userDN)); msg = "STEP-4:TESTING: about to do ldap search with filter \n'" + filter + "'\n to locate groups that test user IS authorized to access."; @@ -638,3 +665,74 @@ public class TestLdapSettings extends JFrame { return constraints; } } + +class LDAPStringUtil { + + /** + * <p>Encode a string so that it can be used in an LDAP search filter.</p> + * + * <p>The following table shows the characters that are encoded and their + * encoded version.</p> + * + * <table> + * <tr><th align="center">Character</th><th>Encoded As</th></tr> + * <tr><td align="center">*</td><td>\2a</td></tr> + * <tr><td align="center">(</td><td>\28</td></tr> + * <tr><td align="center">)</td><td>\29</td></tr> + * <tr><td align="center">\</td><td>\5c</td></tr> + * <tr><td align="center"><code>null</code></td><td>\00</td></tr> + * </table> + * + * <p>In addition to encoding the above characters, any non-ASCII character + * (any character with a hex value greater then <code>0x7f</code>) is also + * encoded and rewritten as a UTF-8 character or sequence of characters in + * hex notation.</p> + * + * @param filterString a string that is to be encoded + * @return the encoded version of <code>filterString</code> suitable for use + * in a LDAP search filter + * @see <a href="http://tools.ietf.org/html/rfc4515">RFC 4515</a> + */ + public static String encodeForFilter(final String filterString) { + if (filterString != null && filterString.length() > 0) { + StringBuilder encString = new StringBuilder(filterString.length()); + for (int i = 0; i < filterString.length(); i++) { + char ch = filterString.charAt(i); + switch (ch) { + case '*': // encode a wildcard * character + encString.append("\\2a"); + break; + case '(': // encode a open parenthesis ( character + encString.append("\\28"); + break; + case ')': // encode a close parenthesis ) character + encString.append("\\29"); + break; + case '\\': // encode a backslash \ character + encString.append("\\5c"); + break; + case '\u0000': // encode a null character + encString.append("\\00"); + break; + default: + if (ch <= 0x7f) { // an ASCII character + encString.append(ch); + } else if (ch >= 0x80) { // encode to UTF-8 + try { + byte[] utf8bytes = String.valueOf(ch).getBytes("UTF8"); + for (byte b : utf8bytes) { + encString.append(String.format("\\%02x", b)); + } + } catch (UnsupportedEncodingException e) { + // ignore + } + } + } + } + return encString.toString(); + } + return filterString; + } + +} + commit 5d3b55ed04d5da4eab12704c8391872cd93421ad Author: John Sanda <jsanda(a)redhat.com> Date: Fri Jul 19 15:35:34 2013 -0400 forgot to include new test resources in previous commit diff --git a/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra-env.sh b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra-env.sh new file mode 100644 index 0000000..cd415b3 --- /dev/null +++ b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra-env.sh @@ -0,0 +1,247 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +calculate_heap_sizes() +{ + case "`uname`" in + Linux) + system_memory_in_mb=`free -m | awk '/Mem:/ {print $2}'` + system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` + ;; + FreeBSD) + system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'` + system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` + system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` + ;; + SunOS) + system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'` + system_cpu_cores=`psrinfo | wc -l` + ;; + Darwin) + system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'` + system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` + system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` + ;; + *) + # assume reasonable defaults for e.g. a modern desktop or + # cheap server + system_memory_in_mb="2048" + system_cpu_cores="2" + ;; + esac + + # some systems like the raspberry pi don't report cores, use at least 1 + if [ "$system_cpu_cores" -lt "1" ] + then + system_cpu_cores="1" + fi + + # set max heap size based on the following + # max(min(1/2 ram, 1024MB), min(1/4 ram, 8GB)) + # calculate 1/2 ram and cap to 1024MB + # calculate 1/4 ram and cap to 8192MB + # pick the max + half_system_memory_in_mb=`expr $system_memory_in_mb / 2` + quarter_system_memory_in_mb=`expr $half_system_memory_in_mb / 2` + if [ "$half_system_memory_in_mb" -gt "1024" ] + then + half_system_memory_in_mb="1024" + fi + if [ "$quarter_system_memory_in_mb" -gt "8192" ] + then + quarter_system_memory_in_mb="8192" + fi + if [ "$half_system_memory_in_mb" -gt "$quarter_system_memory_in_mb" ] + then + max_heap_size_in_mb="$half_system_memory_in_mb" + else + max_heap_size_in_mb="$quarter_system_memory_in_mb" + fi + MAX_HEAP_SIZE="${max_heap_size_in_mb}M" + + # Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4 * heap size) + max_sensible_yg_per_core_in_mb="100" + max_sensible_yg_in_mb=`expr $max_sensible_yg_per_core_in_mb "*" $system_cpu_cores` + + desired_yg_in_mb=`expr $max_heap_size_in_mb / 4` + + if [ "$desired_yg_in_mb" -gt "$max_sensible_yg_in_mb" ] + then + HEAP_NEWSIZE="${max_sensible_yg_in_mb}M" + else + HEAP_NEWSIZE="${desired_yg_in_mb}M" + fi +} + +# Determine the sort of JVM we'll be running on. + +java_ver_output=`"${JAVA:-java}" -version 2>&1` + +jvmver=`echo "$java_ver_output" | awk -F'"' 'NR==1 {print $2}'` +JVM_VERSION=${jvmver%_*} +JVM_PATCH_VERSION=${jvmver#*_} + +jvm=`echo "$java_ver_output" | awk 'NR==2 {print $1}'` +case "$jvm" in + OpenJDK) + JVM_VENDOR=OpenJDK + # this will be "64-Bit" or "32-Bit" + JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $2}'` + ;; + "Java(TM)") + JVM_VENDOR=Oracle + # this will be "64-Bit" or "32-Bit" + JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $3}'` + ;; + *) + # Help fill in other JVM values + JVM_VENDOR=other + JVM_ARCH=unknown + ;; +esac + + +# Override these to set the amount of memory to allocate to the JVM at +# start-up. For production use you may wish to adjust this for your +# environment. MAX_HEAP_SIZE is the total amount of memory dedicated +# to the Java heap; HEAP_NEWSIZE refers to the size of the young +# generation. Both MAX_HEAP_SIZE and HEAP_NEWSIZE should be either set +# or not (if you set one, set the other). +# +# The main trade-off for the young generation is that the larger it +# is, the longer GC pause times will be. The shorter it is, the more +# expensive GC will be (usually). +# +# The example HEAP_NEWSIZE assumes a modern 8-core+ machine for decent pause +# times. If in doubt, and if you do not particularly want to tweak, go with +# 100 MB per physical CPU core. + +#MAX_HEAP_SIZE="4G" +#HEAP_NEWSIZE="800M" + +if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then + calculate_heap_sizes +else + if [ "x$MAX_HEAP_SIZE" = "x" ] || [ "x$HEAP_NEWSIZE" = "x" ]; then + echo "please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs (see cassandra-env.sh)" + exit 1 + fi +fi + +# Specifies the default port over which Cassandra will be available for +# JMX connections. +JMX_PORT="7399" + + +# Here we create the arguments that will get passed to the jvm when +# starting cassandra. + +# enable assertions. disabling this in production will give a modest +# performance benefit (around 5%). +JVM_OPTS="$JVM_OPTS -ea" + +# add the jamm javaagent +if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \ + || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ] +then + JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" +fi + +# enable thread priorities, primarily so we can give periodic tasks +# a lower priority to avoid interfering with client workload +JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities" +# allows lowering thread priority without being root. see +# http://tech.stolsvik.com/2010/01/linux-java-thread-priorities-workaround.ht… +JVM_OPTS="$JVM_OPTS -XX:ThreadPriorityPolicy=42" + +# min and max heap sizes should be set to the same value to avoid +# stop-the-world GC pauses during resize, and so that we can lock the +# heap in memory on startup to prevent any of it from being swapped +# out. +JVM_OPTS="$JVM_OPTS -Xms512M" +JVM_OPTS="$JVM_OPTS -Xmx512M" +JVM_OPTS="$JVM_OPTS -Xmn128M" +JVM_OPTS="$JVM_OPTS -XX:+HeapDumpOnOutOfMemoryError" + +# set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR +if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then + JVM_OPTS="$JVM_OPTS -XX:HeapDumpPath=$CASSANDRA_HEAPDUMP_DIR/cassandra-`date +%s`-pid$$.hprof" +fi + + +startswith() { [ "${1#$2}" != "$1" ]; } + +if [ "`uname`" = "Linux" ] ; then + # reduce the per-thread stack size to minimize the impact of Thrift + # thread-per-client. (Best practice is for client connections to + # be pooled anyway.) Only do so on Linux where it is known to be + # supported. + # u34 and greater need 180k + JVM_OPTS="$JVM_OPTS -Xss180k" +fi +echo "xss = $JVM_OPTS" + +# GC tuning options +JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC" +JVM_OPTS="$JVM_OPTS -XX:+UseConcMarkSweepGC" +JVM_OPTS="$JVM_OPTS -XX:+CMSParallelRemarkEnabled" +JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8" +JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1" +JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75" +JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly" +JVM_OPTS="$JVM_OPTS -XX:+UseTLAB" +# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check +if [ "$JVM_VERSION" \> "1.7" ] ; then + JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark" +fi + +# GC logging options -- uncomment to enable +# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails" +# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps" +# JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC" +# JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution" +# JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime" +# JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure" +# JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1" +# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log" +# If you are using JDK 6u34 7u2 or later you can enable GC log rotation +# don't stick the date in the log name if rotation is on. +# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log" +# JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation" +# JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10" +# JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M" + +# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414 +# JVM_OPTS="$JVM_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1414" + +# Prefer binding to IPv4 network intefaces (when net.ipv6.bindv6only=1). See +# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6342561 (short version: +# comment out this entry to enable IPv6 support). +JVM_OPTS="$JVM_OPTS -Djava.net.preferIPv4Stack=true" + +# jmx: metrics and administration interface +# +# add this if you're having trouble connecting: +# JVM_OPTS="$JVM_OPTS -Djava.rmi.server.hostname=<public name>" +# +# see +# https://blogs.oracle.com/jmxetc/entry/troubleshooting_connection_problems_i… +# for more on configuring JMX through firewalls, etc. (Short version: +# get it working with no firewall first.) +JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT" +JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false" +JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false" +JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS" diff --git a/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra.yaml b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra.yaml new file mode 100644 index 0000000..8c9c68c --- /dev/null +++ b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra.yaml @@ -0,0 +1,690 @@ +# Cassandra storage config YAML + +# NOTE: +# See http://wiki.apache.org/cassandra/StorageConfiguration for +# full explanations of configuration directives +# /NOTE + +# The name of the cluster. This is mainly used to prevent machines in +# one logical cluster from joining another. +cluster_name: rhq + +# This defines the number of tokens randomly assigned to this node on the ring +# The more tokens, relative to other nodes, the larger the proportion of data +# that this node will store. You probably want all nodes to have the same number +# of tokens assuming they have equal hardware capability. +# +# If you leave this unspecified, Cassandra will use the default of 1 token for legacy compatibility, +# and will use the initial_token as described below. +# +# Specifying initial_token will override this setting. +# +# If you already have a cluster with 1 token per node, and wish to migrate to +# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations +num_tokens: 256 + +# If you haven't specified num_tokens, or have set it to the default of 1 then +# you should always specify InitialToken when setting up a production +# cluster for the first time, and often when adding capacity later. +# The principle is that each node should be given an equal slice of +# the token ring; see http://wiki.apache.org/cassandra/Operations +# for more details. +# +# If blank, Cassandra will request a token bisecting the range of +# the heaviest-loaded existing node. If there is no load information +# available, such as is the case with a new cluster, it will pick +# a random token, which will lead to hot spots. +#initial_token: + +# See http://wiki.apache.org/cassandra/HintedHandoff +hinted_handoff_enabled: true +# this defines the maximum amount of time a dead host will have hints +# generated. After it has been dead this long, new hints for it will not be +# created until it has been seen alive and gone down again. +max_hint_window_in_ms: 10800000 # 3 hours +# throttle in KB's per second, per delivery thread +hinted_handoff_throttle_in_kb: 1024 +# Number of threads with which to deliver hints; +# Consider increasing this number when you have multi-dc deployments, since +# cross-dc handoff tends to be slower +max_hints_delivery_threads: 2 + +# The following setting populates the page cache on memtable flush and compaction +# WARNING: Enable this setting only when the whole node's data fits in memory. +# Defaults to: false +# populate_io_cache_on_flush: false + +# Authentication backend, implementing IAuthenticator; used to identify users +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator, +# PasswordAuthenticator}. +# +# - AllowAllAuthenticator performs no checks - set it to disable authentication. +# - PasswordAuthenticator relies on username/password pairs to authenticate +# users. It keeps usernames and hashed passwords in system_auth.credentials table. +# Please increase system_auth keyspace replication factor if you use this authenticator. +authenticator: org.apache.cassandra.auth.PasswordAuthenticator + +# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer, +# CassandraAuthorizer}. +# +# - AllowAllAuthorizer allows any action to any user - set it to disable authorization. +# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please +# increase system_auth keyspace replication factor if you use this authorizer. +authorizer: org.apache.cassandra.auth.CassandraAuthorizer + +# Validity period for permissions cache (fetching permissions can be an +# expensive operation depending on the authorizer, CassandraAuthorizer is +# one example). Defaults to 2000, set to 0 to disable. +# Will be disabled automatically for AllowAllAuthorizer. +permissions_validity_in_ms: 2000 + +# The partitioner is responsible for distributing rows (by key) across +# nodes in the cluster. Any IPartitioner may be used, including your +# own as long as it is on the classpath. Out of the box, Cassandra +# provides org.apache.cassandra.dht.{Murmur3Partitioner, RandomPartitioner +# ByteOrderedPartitioner, OrderPreservingPartitioner (deprecated)}. +# +# - RandomPartitioner distributes rows across the cluster evenly by md5. +# This is the default prior to 1.2 and is retained for compatibility. +# - Murmur3Partitioner is similar to RandomPartioner but uses Murmur3_128 +# Hash Function instead of md5. When in doubt, this is the best option. +# - ByteOrderedPartitioner orders rows lexically by key bytes. BOP allows +# scanning rows in key order, but the ordering can generate hot spots +# for sequential insertion workloads. +# - OrderPreservingPartitioner is an obsolete form of BOP, that stores +# - keys in a less-efficient format and only works with keys that are +# UTF8-encoded Strings. +# - CollatingOPP colates according to EN,US rules rather than lexical byte +# ordering. Use this as an example if you need custom collation. +# +# See http://wiki.apache.org/cassandra/Operations for more on +# partitioners and token selection. +partitioner: org.apache.cassandra.dht.Murmur3Partitioner + +# directories where Cassandra should store data on disk. +data_file_directories: + - target/rhq48/rhq-storage/data + +# commit log +commitlog_directory: target/rhq48/rhq-storage/commit_log + +# policy for data disk failures: +# stop: shut down gossip and Thrift, leaving the node effectively dead, but +# still inspectable via JMX. +# best_effort: stop using the failed disk and respond to requests based on +# remaining available sstables. This means you WILL see obsolete +# data at CL.ONE! +# ignore: ignore fatal errors and let requests fail, as in pre-1.2 Cassandra +disk_failure_policy: stop + +# Maximum size of the key cache in memory. +# +# Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the +# minimum, sometimes more. The key cache is fairly tiny for the amount of +# time it saves, so it's worthwhile to use it at large numbers. +# The row cache saves even more time, but must store the whole values of +# its rows, so it is extremely space-intensive. It's best to only use the +# row cache if you have hot rows or static rows. +# +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is empty to make it "auto" (min(5% of Heap (in MB), 100MB)). Set to 0 to disable key cache. +key_cache_size_in_mb: + +# Duration in seconds after which Cassandra should +# safe the keys cache. Caches are saved to saved_caches_directory as +# specified in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 14400 or 4 hours. +key_cache_save_period: 14400 + +# Number of keys from the key cache to save +# Disabled by default, meaning all keys are going to be saved +# key_cache_keys_to_save: 100 + +# Maximum size of the row cache in memory. +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is 0, to disable row caching. +row_cache_size_in_mb: 0 + +# Duration in seconds after which Cassandra should +# safe the row cache. Caches are saved to saved_caches_directory as specified +# in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 0 to disable saving the row cache. +row_cache_save_period: 0 + +# Number of keys from the row cache to save +# Disabled by default, meaning all keys are going to be saved +# row_cache_keys_to_save: 100 + +# The provider for the row cache to use. +# +# Supported values are: ConcurrentLinkedHashCacheProvider, SerializingCacheProvider +# +# SerializingCacheProvider serialises the contents of the row and stores +# it in native memory, i.e., off the JVM Heap. Serialized rows take +# significantly less memory than "live" rows in the JVM, so you can cache +# more rows in a given memory footprint. And storing the cache off-heap +# means you can use smaller heap sizes, reducing the impact of GC pauses. +# +# It is also valid to specify the fully-qualified class name to a class +# that implements org.apache.cassandra.cache.IRowCacheProvider. +# +# Defaults to SerializingCacheProvider +row_cache_provider: SerializingCacheProvider + +# saved caches +saved_caches_directory: target/rhq48/rhq-storage/saved_caches + +# commitlog_sync may be either "periodic" or "batch." +# When in batch mode, Cassandra won't ack writes until the commit log +# has been fsynced to disk. It will wait up to +# commitlog_sync_batch_window_in_ms milliseconds for other writes, before +# performing the sync. +# +# commitlog_sync: batch +# commitlog_sync_batch_window_in_ms: 50 +# +# the other option is "periodic" where writes may be acked immediately +# and the CommitLog is simply synced every commitlog_sync_period_in_ms +# milliseconds. +commitlog_sync: periodic +commitlog_sync_period_in_ms: 10000 + +# The size of the individual commitlog file segments. A commitlog +# segment may be archived, deleted, or recycled once all the data +# in it (potentally from each columnfamily in the system) has been +# flushed to sstables. +# +# The default size is 32, which is almost always fine, but if you are +# archiving commitlog segments (see commitlog_archiving.properties), +# then you probably want a finer granularity of archiving; 8 or 16 MB +# is reasonable. +commitlog_segment_size_in_mb: 32 + +# any class that implements the SeedProvider interface and has a +# constructor that takes a Map<String, String> of parameters will do. +seed_provider: + # Addresses of hosts that are deemed contact points. + # Cassandra nodes use this list of hosts to find each other and learn + # the topology of the ring. You must change this if you are running + # multiple nodes! + - class_name: org.apache.cassandra.locator.SimpleSeedProvider + parameters: + # seeds is actually a comma-delimited list of addresses. + # Ex: "<ip1>,<ip2>,<ip3>" + - seeds: "127.0.0.1" + +# emergency pressure valve: each time heap usage after a full (CMS) +# garbage collection is above this fraction of the max, Cassandra will +# flush the largest memtables. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +# +# RELYING ON THIS AS YOUR PRIMARY TUNING MECHANISM WILL WORK POORLY: +# it is most effective under light to moderate load, or read-heavy +# workloads; under truly massive write load, it will often be too +# little, too late. +flush_largest_memtables_at: 0.75 + +# emergency pressure valve #2: the first time heap usage after a full +# (CMS) garbage collection is above this fraction of the max, +# Cassandra will reduce cache maximum _capacity_ to the given fraction +# of the current _size_. Should usually be set substantially above +# flush_largest_memtables_at, since that will have less long-term +# impact on the system. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +reduce_cache_sizes_at: 0.85 +reduce_cache_capacity_to: 0.6 + +# For workloads with more data than can fit in memory, Cassandra's +# bottleneck will be reads that need to fetch data from +# disk. "concurrent_reads" should be set to (16 * number_of_drives) in +# order to allow the operations to enqueue low enough in the stack +# that the OS and drives can reorder them. +# +# On the other hand, since writes are almost never IO bound, the ideal +# number of "concurrent_writes" is dependent on the number of cores in +# your system; (8 * number_of_cores) is a good rule of thumb. +concurrent_reads: 32 +concurrent_writes: 32 + +# Total memory to use for memtables. Cassandra will flush the largest +# memtable when this much memory is used. +# If omitted, Cassandra will set it to 1/3 of the heap. +# memtable_total_space_in_mb: 2048 + +# Total space to use for commitlogs. Since commitlog segments are +# mmapped, and hence use up address space, the default size is 32 +# on 32-bit JVMs, and 1024 on 64-bit JVMs. +# +# If space gets above this value (it will round up to the next nearest +# segment multiple), Cassandra will flush every dirty CF in the oldest +# segment and remove it. So a small total commitlog space will tend +# to cause more flush activity on less-active columnfamilies. +# commitlog_total_space_in_mb: 4096 + +# This sets the amount of memtable flush writer threads. These will +# be blocked by disk io, and each one will hold a memtable in memory +# while blocked. If you have a large heap and many data directories, +# you can increase this value for better flush performance. +# By default this will be set to the amount of data directories defined. +#memtable_flush_writers: 1 + +# the number of full memtables to allow pending flush, that is, +# waiting for a writer thread. At a minimum, this should be set to +# the maximum number of secondary indexes created on a single CF. +memtable_flush_queue_size: 4 + +# Whether to, when doing sequential writing, fsync() at intervals in +# order to force the operating system to flush the dirty +# buffers. Enable this to avoid sudden dirty buffer flushing from +# impacting read latencies. Almost always a good idea on SSD:s; not +# necessarily on platters. +trickle_fsync: false +trickle_fsync_interval_in_kb: 10240 + +# TCP port, for commands and data +storage_port: 7100 + +# SSL port, for encrypted communication. Unused unless enabled in +# encryption_options +ssl_storage_port: 7101 + +# Address to bind to and tell other Cassandra nodes to connect to. You +# _must_ change this if you want multiple nodes to be able to +# communicate! +# +# Leaving it blank leaves it up to InetAddress.getLocalHost(). This +# will always do the Right Thing *if* the node is properly configured +# (hostname, name resolution, etc), and the Right Thing is to use the +# address associated with the hostname (it might not be). +# +# Setting this to 0.0.0.0 is always wrong. +listen_address: 127.0.0.1 + +# Address to broadcast to other Cassandra nodes +# Leaving this blank will set it to the same value as listen_address +# broadcast_address: 1.2.3.4 + +# Internode authentication backend, implementing IInternodeAuthenticator; +# used to allow/disallow connections from peer nodes. +# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator + +# Whether to start the native transport server. +# Currently, only the thrift server is started by default because the native +# transport is considered beta. +# Please note that the address on which the native transport is bound is the +# same as the rpc_address. The port however is different and specified below. +start_native_transport: true +# port for the CQL native transport to listen for clients on +native_transport_port: 9142 +# The minimum and maximum threads for handling requests when the native +# transport is used. The meaning is those is similar to the one of +# rpc_min_threads and rpc_max_threads, though the default differ slightly and +# are the ones below: +# native_transport_min_threads: 16 +native_transport_max_threads: 128 + + +# Whether to start the thrift rpc server. +start_rpc: false +# The address to bind the Thrift RPC service to -- clients connect +# here. Unlike ListenAddress above, you *can* specify 0.0.0.0 here if +# you want Thrift to listen on all interfaces. +# +# Leaving this blank has the same effect it does for ListenAddress, +# (i.e. it will be based on the configured hostname of the node). +rpc_address: 127.0.0.1 +# port for Thrift to listen for clients on +rpc_port: 9160 + +# enable or disable keepalive on rpc connections +rpc_keepalive: true + +# Cassandra provides three out-of-the-box options for the RPC Server: +# +# sync -> One thread per thrift connection. For a very large number of clients, memory +# will be your limiting factor. On a 64 bit JVM, 128KB is the minimum stack size +# per thread, and that will correspond to your use of virtual memory (but physical memory +# may be limited depending on use of stack space). +# +# hsha -> Stands for "half synchronous, half asynchronous." All thrift clients are handled +# asynchronously using a small number of threads that does not vary with the amount +# of thrift clients (and thus scales well to many clients). The rpc requests are still +# synchronous (one thread per active request). +# +# The default is sync because on Windows hsha is about 30% slower. On Linux, +# sync/hsha performance is about the same, with hsha of course using less memory. +# +# Alternatively, can provide your own RPC server by providing the fully-qualified class name +# of an o.a.c.t.TServerFactory that can create an instance of it. +rpc_server_type: sync + +# Uncomment rpc_min|max_thread to set request pool size limits. +# +# Regardless of your choice of RPC server (see above), the number of maximum requests in the +# RPC thread pool dictates how many concurrent requests are possible (but if you are using the sync +# RPC server, it also dictates the number of clients that can be connected at all). +# +# The default is unlimited and thus provide no protection against clients overwhelming the server. You are +# encouraged to set a maximum that makes sense for you in production, but do keep in mind that +# rpc_max_threads represents the maximum number of client requests this server may execute concurrently. +# +# rpc_min_threads: 16 +# rpc_max_threads: 2048 + +# uncomment to set socket buffer sizes on rpc connections +# rpc_send_buff_size_in_bytes: +# rpc_recv_buff_size_in_bytes: + +# uncomment to set socket buffer size for internode communication +# Note that when setting this, the buffer size is limited by net.core.wmem_max +# and when not setting it it is defined by net.ipv4.tcp_wmem +# See: +# /proc/sys/net/core/wmem_max +# /proc/sys/net/core/rmem_max +# /proc/sys/net/ipv4/tcp_wmem +# /proc/sys/net/ipv4/tcp_wmem +# and: man tcp +# internode_send_buff_size_in_bytes: +# internode_recv_buff_size_in_bytes: + +# Frame size for thrift (maximum field length). +thrift_framed_transport_size_in_mb: 15 + +# The max length of a thrift message, including all fields and +# internal thrift overhead. +thrift_max_message_length_in_mb: 16 + +# Set to true to have Cassandra create a hard link to each sstable +# flushed or streamed locally in a backups/ subdirectory of the +# Keyspace data. Removing these links is the operator's +# responsibility. +incremental_backups: false + +# Whether or not to take a snapshot before each compaction. Be +# careful using this option, since Cassandra won't clean up the +# snapshots for you. Mostly useful if you're paranoid when there +# is a data format change. +snapshot_before_compaction: false + +# Whether or not a snapshot is taken of the data before keyspace truncation +# or dropping of column families. The STRONGLY advised default of true +# should be used to provide data safety. If you set this flag to false, you will +# lose data on truncation or drop. +auto_snapshot: true + +# Add column indexes to a row after its contents reach this size. +# Increase if your column values are large, or if you have a very large +# number of columns. The competing causes are, Cassandra has to +# deserialize this much of the row to read a single column, so you want +# it to be small - at least if you do many partial-row reads - but all +# the index data is read for each access, so you don't want to generate +# that wastefully either. +column_index_size_in_kb: 64 + +# Size limit for rows being compacted in memory. Larger rows will spill +# over to disk and use a slower two-pass compaction process. A message +# will be logged specifying the row key. +in_memory_compaction_limit_in_mb: 64 + +# Number of simultaneous compactions to allow, NOT including +# validation "compactions" for anti-entropy repair. Simultaneous +# compactions can help preserve read performance in a mixed read/write +# workload, by mitigating the tendency of small sstables to accumulate +# during a single long running compactions. The default is usually +# fine and if you experience problems with compaction running too +# slowly or too fast, you should look at +# compaction_throughput_mb_per_sec first. +# +# concurrent_compactors defaults to the number of cores. +# Uncomment to make compaction mono-threaded, the pre-0.8 default. +#concurrent_compactors: 1 + +# Multi-threaded compaction. When enabled, each compaction will use +# up to one thread per core, plus one thread per sstable being merged. +# This is usually only useful for SSD-based hardware: otherwise, +# your concern is usually to get compaction to do LESS i/o (see: +# compaction_throughput_mb_per_sec), not more. +multithreaded_compaction: false + +# Throttles compaction to the given total throughput across the entire +# system. The faster you insert data, the faster you need to compact in +# order to keep the sstable count down, but in general, setting this to +# 16 to 32 times the rate you are inserting data is more than sufficient. +# Setting this to 0 disables throttling. Note that this account for all types +# of compaction, including validation compaction. +compaction_throughput_mb_per_sec: 16 + +# Track cached row keys during compaction, and re-cache their new +# positions in the compacted sstable. Disable if you use really large +# key caches. +compaction_preheat_key_cache: true + +# Throttles all outbound streaming file transfers on this node to the +# given total throughput in Mbps. This is necessary because Cassandra does +# mostly sequential IO when streaming data during bootstrap or repair, which +# can lead to saturating the network connection and degrading rpc performance. +# When unset, the default is 200 Mbps or 25 MB/s. +# stream_throughput_outbound_megabits_per_sec: 200 + +# How long the coordinator should wait for read operations to complete +read_request_timeout_in_ms: 20000 +# How long the coordinator should wait for seq or index scans to complete +range_request_timeout_in_ms: 20000 +# How long the coordinator should wait for writes to complete +write_request_timeout_in_ms: 20000 +# How long the coordinator should wait for truncates to complete +# (This can be much longer, because we need to flush all CFs +# to make sure we can clear out anythink in the commitlog that could +# cause truncated data to reappear.) +truncate_request_timeout_in_ms: 60000 +# The default timeout for other, miscellaneous operations +request_timeout_in_ms: 20000 + +# Enable operation timeout information exchange between nodes to accurately +# measure request timeouts, If disabled cassandra will assuming the request +# was forwarded to the replica instantly by the coordinator +# +# Warning: before enabling this property make sure to ntp is installed +# and the times are synchronized between the nodes. +cross_node_timeout: false + +# Enable socket timeout for streaming operation. +# When a timeout occurs during streaming, streaming is retried from the start +# of the current file. This *can* involve re-streaming an important amount of +# data, so you should avoid setting the value too low. +# Default value is 0, which never timeout streams. +# streaming_socket_timeout_in_ms: 0 + +# phi value that must be reached for a host to be marked down. +# most users should never need to adjust this. +# phi_convict_threshold: 8 + +# endpoint_snitch -- Set this to a class that implements +# IEndpointSnitch. The snitch has two functions: +# - it teaches Cassandra enough about your network topology to route +# requests efficiently +# - it allows Cassandra to spread replicas around your cluster to avoid +# correlated failures. It does this by grouping machines into +# "datacenters" and "racks." Cassandra will do its best not to have +# more than one replica on the same "rack" (which may not actually +# be a physical location) +# +# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER, +# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS +# ARE PLACED. +# +# Out of the box, Cassandra provides +# - SimpleSnitch: +# Treats Strategy order as proximity. This improves cache locality +# when disabling read repair, which can further improve throughput. +# Only appropriate for single-datacenter deployments. +# - PropertyFileSnitch: +# Proximity is determined by rack and data center, which are +# explicitly configured in cassandra-topology.properties. +# - GossipingPropertyFileSnitch +# The rack and datacenter for the local node are defined in +# cassandra-rackdc.properties and propagated to other nodes via gossip. If +# cassandra-topology.properties exists, it is used as a fallback, allowing +# migration from the PropertyFileSnitch. +# - RackInferringSnitch: +# Proximity is determined by rack and data center, which are +# assumed to correspond to the 3rd and 2nd octet of each node's +# IP address, respectively. Unless this happens to match your +# deployment conventions (as it did Facebook's), this is best used +# as an example of writing a custom Snitch class. +# - Ec2Snitch: +# Appropriate for EC2 deployments in a single Region. Loads Region +# and Availability Zone information from the EC2 API. The Region is +# treated as the Datacenter, and the Availability Zone as the rack. +# Only private IPs are used, so this will not work across multiple +# Regions. +# - Ec2MultiRegionSnitch: +# Uses public IPs as broadcast_address to allow cross-region +# connectivity. (Thus, you should set seed addresses to the public +# IP as well.) You will need to open the storage_port or +# ssl_storage_port on the public IP firewall. (For intra-Region +# traffic, Cassandra will switch to the private IP after +# establishing a connection.) +# +# You can use a custom Snitch by setting this to the full class name +# of the snitch, which will be assumed to be on your classpath. +endpoint_snitch: SimpleSnitch + +# controls how often to perform the more expensive part of host score +# calculation +dynamic_snitch_update_interval_in_ms: 100 +# controls how often to reset all host scores, allowing a bad host to +# possibly recover +dynamic_snitch_reset_interval_in_ms: 600000 +# if set greater than zero and read_repair_chance is < 1.0, this will allow +# 'pinning' of replicas to hosts in order to increase cache capacity. +# The badness threshold will control how much worse the pinned host has to be +# before the dynamic snitch will prefer other replicas over it. This is +# expressed as a double which represents a percentage. Thus, a value of +# 0.2 means Cassandra would continue to prefer the static snitch values +# until the pinned host was 20% worse than the fastest. +dynamic_snitch_badness_threshold: 0.1 + +# request_scheduler -- Set this to a class that implements +# RequestScheduler, which will schedule incoming client requests +# according to the specific policy. This is useful for multi-tenancy +# with a single Cassandra cluster. +# NOTE: This is specifically for requests from the client and does +# not affect inter node communication. +# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place +# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of +# client requests to a node with a separate queue for each +# request_scheduler_id. The scheduler is further customized by +# request_scheduler_options as described below. +request_scheduler: org.apache.cassandra.scheduler.NoScheduler + +# Scheduler Options vary based on the type of scheduler +# NoScheduler - Has no options +# RoundRobin +# - throttle_limit -- The throttle_limit is the number of in-flight +# requests per client. Requests beyond +# that limit are queued up until +# running requests can complete. +# The value of 80 here is twice the number of +# concurrent_reads + concurrent_writes. +# - default_weight -- default_weight is optional and allows for +# overriding the default which is 1. +# - weights -- Weights are optional and will default to 1 or the +# overridden default_weight. The weight translates into how +# many requests are handled during each turn of the +# RoundRobin, based on the scheduler id. +# +# request_scheduler_options: +# throttle_limit: 80 +# default_weight: 5 +# weights: +# Keyspace1: 1 +# Keyspace2: 5 + +# request_scheduler_id -- An identifer based on which to perform +# the request scheduling. Currently the only valid option is keyspace. +# request_scheduler_id: keyspace + +# index_interval controls the sampling of entries from the primrary +# row index in terms of space versus time. The larger the interval, +# the smaller and less effective the sampling will be. In technicial +# terms, the interval coresponds to the number of index entries that +# are skipped between taking each sample. All the sampled entries +# must fit in memory. Generally, a value between 128 and 512 here +# coupled with a large key cache size on CFs results in the best trade +# offs. This value is not often changed, however if you have many +# very small rows (many to an OS page), then increasing this will +# often lower memory usage without a impact on performance. +index_interval: 128 + +# Enable or disable inter-node encryption +# Default settings are TLS v1, RSA 1024-bit keys (it is imperative that +# users generate their own keys) TLS_RSA_WITH_AES_128_CBC_SHA as the cipher +# suite for authentication, key exchange and encryption of the actual data transfers. +# NOTE: No custom encryption options are enabled at the moment +# The available internode options are : all, none, dc, rack +# +# If set to dc cassandra will encrypt the traffic between the DCs +# If set to rack cassandra will encrypt the traffic between the racks +# +# The passwords used in these options must match the passwords used when generating +# the keystore and truststore. For instructions on generating these files, see: +# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSS… +# +server_encryption_options: + internode_encryption: none + keystore: conf/.keystore + keystore_password: cassandra + truststore: conf/.truststore + truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + # require_client_auth: false + +# enable or disable client/server encryption. +client_encryption_options: + enabled: false + keystore: conf/.keystore + keystore_password: cassandra + # require_client_auth: false + # Set trustore and truststore_password if require_client_auth is true + # truststore: conf/.truststore + # truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + +# internode_compression controls whether traffic between nodes is +# compressed. +# can be: all - all traffic is compressed +# dc - traffic between different datacenters is compressed +# none - nothing is compressed. +internode_compression: all + +# Enable or disable tcp_nodelay for inter-dc communication. +# Disabling it will result in larger (but fewer) network packets being sent, +# reducing overhead from the TCP protocol itself, at the cost of increasing +# latency if you block for cross-datacenter responses. +inter_dc_tcp_nodelay: true diff --git a/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/log4j-server.properties b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/log4j-server.properties new file mode 100644 index 0000000..c2e6dab --- /dev/null +++ b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/log4j-server.properties @@ -0,0 +1,45 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# for production, you should probably set pattern to %c instead of %l. +# (%l is slower.) + +# output messages into a rolling log file as well as stdout +log4j.rootLogger=INFO,stdout,R + +# stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n + +# rolling log file +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.maxFileSize=20MB +log4j.appender.R.maxBackupIndex=50 +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n +# Edit the next line to point to your logs directory +log4j.appender.R.File=target/rhq48/rhq-storage/logs/rhq-storage.log +log4j.appender.R.Threshold=INFO + +# Application logging options +#log4j.logger.org.apache.cassandra=DEBUG +#log4j.logger.org.apache.cassandra.db=DEBUG +#log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG + +# Adding this to avoid thrift logging disconnect errors. +log4j.logger.org.apache.thrift.server.TNonblockingServer=ERROR + commit 656cc6066250f46ff51e16230c0f7c8263f55435 Author: John Sanda <jsanda(a)redhat.com> Date: Fri Jul 19 13:43:46 2013 -0400 [BZ 983226] fixing upgrade regression introduced by use of cassandra-jvm.properties This commit removes cassandra-env.sh from our Cassandra distro since we are no longer using that script. The storage installer upgrade has been cleaned up some so that it will get the jmx port from cassandra-env.sh for 4.8 installs and then update cassandra-jvm.properties. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 42f6c8b..2bde394 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -171,6 +171,7 @@ <move file="${project.build.outputDirectory}/cassandra/bin/cassandra" todir="${cassandra.dir}/bin"/> <delete dir="${project.build.outputDirectory}/cassandra"/> <delete dir="${cassandra.dir}/javadoc"/> + <delete file="${cassandra.dir}/conf/cassandra-env.sh"/> <zip basedir="${cassandra.dir}" destfile="${cassandra.distro.zip}"/> <delete dir="${cassandra.dir}"/> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra index 742d9c0..ddbc099 100755 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra @@ -106,8 +106,7 @@ if [ -z "$CASSANDRA_CONF" -o -z "$CLASSPATH" ]; then exit 1 fi -if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then - #. "$CASSANDRA_CONF/cassandra-env.sh" +if [ -f "$CASSANDRA_CONF/cassandra-jvm.properties" ]; then . "$CASSANDRA_CONF/cassandra-jvm.properties" fi diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh deleted file mode 100644 index 99b3128..0000000 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh +++ /dev/null @@ -1,247 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -calculate_heap_sizes() -{ - case "`uname`" in - Linux) - system_memory_in_mb=`free -m | awk '/Mem:/ {print $2}'` - system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` - ;; - FreeBSD) - system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - SunOS) - system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'` - system_cpu_cores=`psrinfo | wc -l` - ;; - Darwin) - system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - *) - # assume reasonable defaults for e.g. a modern desktop or - # cheap server - system_memory_in_mb="2048" - system_cpu_cores="2" - ;; - esac - - # some systems like the raspberry pi don't report cores, use at least 1 - if [ "$system_cpu_cores" -lt "1" ] - then - system_cpu_cores="1" - fi - - # set max heap size based on the following - # max(min(1/2 ram, 1024MB), min(1/4 ram, 8GB)) - # calculate 1/2 ram and cap to 1024MB - # calculate 1/4 ram and cap to 8192MB - # pick the max - half_system_memory_in_mb=`expr $system_memory_in_mb / 2` - quarter_system_memory_in_mb=`expr $half_system_memory_in_mb / 2` - if [ "$half_system_memory_in_mb" -gt "1024" ] - then - half_system_memory_in_mb="1024" - fi - if [ "$quarter_system_memory_in_mb" -gt "8192" ] - then - quarter_system_memory_in_mb="8192" - fi - if [ "$half_system_memory_in_mb" -gt "$quarter_system_memory_in_mb" ] - then - max_heap_size_in_mb="$half_system_memory_in_mb" - else - max_heap_size_in_mb="$quarter_system_memory_in_mb" - fi - MAX_HEAP_SIZE="\${max_heap_size_in_mb}M" - - # Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4 * heap size) - max_sensible_yg_per_core_in_mb="100" - max_sensible_yg_in_mb=`expr $max_sensible_yg_per_core_in_mb "*" $system_cpu_cores` - - desired_yg_in_mb=`expr $max_heap_size_in_mb / 4` - - if [ "$desired_yg_in_mb" -gt "$max_sensible_yg_in_mb" ] - then - HEAP_NEWSIZE="\${max_sensible_yg_in_mb}M" - else - HEAP_NEWSIZE="\${desired_yg_in_mb}M" - fi -} - -# Determine the sort of JVM we'll be running on. - -java_ver_output=`"\${JAVA:-java}" -version 2>&1` - -jvmver=`echo "$java_ver_output" | awk -F'"' 'NR==1 {print $2}'` -JVM_VERSION=\${jvmver%_*} -JVM_PATCH_VERSION=\${jvmver#*_} - -jvm=`echo "$java_ver_output" | awk 'NR==2 {print $1}'` -case "$jvm" in - OpenJDK) - JVM_VENDOR=OpenJDK - # this will be "64-Bit" or "32-Bit" - JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $2}'` - ;; - "Java(TM)") - JVM_VENDOR=Oracle - # this will be "64-Bit" or "32-Bit" - JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $3}'` - ;; - *) - # Help fill in other JVM values - JVM_VENDOR=other - JVM_ARCH=unknown - ;; -esac - - -# Override these to set the amount of memory to allocate to the JVM at -# start-up. For production use you may wish to adjust this for your -# environment. MAX_HEAP_SIZE is the total amount of memory dedicated -# to the Java heap; HEAP_NEWSIZE refers to the size of the young -# generation. Both MAX_HEAP_SIZE and HEAP_NEWSIZE should be either set -# or not (if you set one, set the other). -# -# The main trade-off for the young generation is that the larger it -# is, the longer GC pause times will be. The shorter it is, the more -# expensive GC will be (usually). -# -# The example HEAP_NEWSIZE assumes a modern 8-core+ machine for decent pause -# times. If in doubt, and if you do not particularly want to tweak, go with -# 100 MB per physical CPU core. - -#MAX_HEAP_SIZE="4G" -#HEAP_NEWSIZE="800M" - -if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then - calculate_heap_sizes -else - if [ "x$MAX_HEAP_SIZE" = "x" ] || [ "x$HEAP_NEWSIZE" = "x" ]; then - echo "please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs (see cassandra-env.sh)" - exit 1 - fi -fi - -# Specifies the default port over which Cassandra will be available for -# JMX connections. -JMX_PORT="${rhq.cassandra.jmx.port}" - - -# Here we create the arguments that will get passed to the jvm when -# starting cassandra. - -# enable assertions. disabling this in production will give a modest -# performance benefit (around 5%). -JVM_OPTS="$JVM_OPTS -ea" - -# add the jamm javaagent -if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \\> "1.6.0" ] \\ - || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ] -then - JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" -fi - -# enable thread priorities, primarily so we can give periodic tasks -# a lower priority to avoid interfering with client workload -JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities" -# allows lowering thread priority without being root. see -# http://tech.stolsvik.com/2010/01/linux-java-thread-priorities-workaround.ht… -JVM_OPTS="$JVM_OPTS -XX:ThreadPriorityPolicy=42" - -# min and max heap sizes should be set to the same value to avoid -# stop-the-world GC pauses during resize, and so that we can lock the -# heap in memory on startup to prevent any of it from being swapped -# out. -JVM_OPTS="$JVM_OPTS -Xms${rhq.cassandra.max.heap.size}" -JVM_OPTS="$JVM_OPTS -Xmx${rhq.cassandra.max.heap.size}" -JVM_OPTS="$JVM_OPTS -Xmn${rhq.cassandra.heap.new.size}" -JVM_OPTS="$JVM_OPTS -XX:+HeapDumpOnOutOfMemoryError" - -# set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR -if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then - JVM_OPTS="$JVM_OPTS -XX:HeapDumpPath=$CASSANDRA_HEAPDUMP_DIR/cassandra-`date +%s`-pid$$.hprof" -fi - - -startswith() { [ "\${1#$2}" != "$1" ]; } - -if [ "`uname`" = "Linux" ] ; then - # reduce the per-thread stack size to minimize the impact of Thrift - # thread-per-client. (Best practice is for client connections to - # be pooled anyway.) Only do so on Linux where it is known to be - # supported. - # u34 and greater need 180k - JVM_OPTS="$JVM_OPTS -Xss${rhq.cassandra.stack.size}" -fi -echo "xss = $JVM_OPTS" - -# GC tuning options -JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC" -JVM_OPTS="$JVM_OPTS -XX:+UseConcMarkSweepGC" -JVM_OPTS="$JVM_OPTS -XX:+CMSParallelRemarkEnabled" -JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8" -JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1" -JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75" -JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly" -JVM_OPTS="$JVM_OPTS -XX:+UseTLAB" -# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check -if [ "$JVM_VERSION" \\> "1.7" ] ; then - JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark" -fi - -# GC logging options -- uncomment to enable -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails" -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps" -# JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC" -# JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution" -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime" -# JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure" -# JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1" -# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log" -# If you are using JDK 6u34 7u2 or later you can enable GC log rotation -# don't stick the date in the log name if rotation is on. -# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log" -# JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation" -# JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10" -# JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M" - -# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414 -# JVM_OPTS="$JVM_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1414" - -# Prefer binding to IPv4 network intefaces (when net.ipv6.bindv6only=1). See -# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6342561 (short version: -# comment out this entry to enable IPv6 support). -JVM_OPTS="$JVM_OPTS -Djava.net.preferIPv4Stack=true" - -# jmx: metrics and administration interface -# -# add this if you're having trouble connecting: -# JVM_OPTS="$JVM_OPTS -Djava.rmi.server.hostname=<public name>" -# -# see -# https://blogs.oracle.com/jmxetc/entry/troubleshooting_connection_problems_i… -# for more on configuring JMX through firewalls, etc. (Short version: -# get it working with no firewall first.) -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT" -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false" -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false" -JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS" diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 63282e4..5c5ac4e 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -25,8 +25,10 @@ package org.rhq.storage.installer; +import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; +import java.io.FileReader; import java.io.IOException; import java.net.InetAddress; import java.util.ArrayList; @@ -250,15 +252,32 @@ public class StorageInstaller { File oldConfDir = new File(existingStorageDir, "conf"); File newConfDir = new File(storageBasedir, "conf"); + File cassandraEnvFile = new File(oldConfDir, "cassandra-env.sh"); + String cassandraYaml = "cassandra.yaml"; String cassandraJvmProps = "cassandra-jvm.properties"; File cassandraJvmPropsFile = new File(newConfDir, cassandraJvmProps); String log4j = "log4j-server.properties"; replaceFile(new File(oldConfDir, cassandraYaml), new File(newConfDir, cassandraYaml)); - replaceFile(new File(oldConfDir, cassandraJvmProps), cassandraJvmPropsFile); replaceFile(new File(oldConfDir, log4j), new File(newConfDir, log4j)); + if (cassandraEnvFile.exists()) { + // Then this is an RHQ 4.8 install + jmxPort = parseJmxPortFromCassandrEnv(cassandraEnvFile); + Properties jvmProps = new Properties(); + jvmProps.load(new FileInputStream(cassandraJvmPropsFile)); + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate( + cassandraJvmPropsFile.getAbsolutePath()); + jvmProps.setProperty("jmx_port", Integer.toString(jmxPort)); + + propertiesUpdater.update(jvmProps); + + } else { + jmxPort = parseJmxPort(cassandraJvmPropsFile); + replaceFile(new File(oldConfDir, cassandraJvmProps), cassandraJvmPropsFile); + } + log.info("Finished installing RHQ Storage Node."); log.info("Updating rhq-server.properties..."); @@ -268,8 +287,6 @@ public class StorageInstaller { Map<String, Object> config = (Map<String, Object>) yaml.load(new FileInputStream(yamlFile)); hostname = (String) config.get("listen_address"); - - jmxPort = parseJmxPort(cassandraJvmPropsFile); } else { if (cmdLine.hasOption("dir")) { File basedir = new File(cmdLine.getOptionValue("dir")); @@ -661,6 +678,60 @@ public class StorageInstaller { } } + private int parseJmxPortFromCassandrEnv(File cassandraEnvFile) { + Integer port = null; + if (isWindows()) { + // TODO + return defaultJmxPort; + } else { + BufferedReader reader = null; + try { + reader = new BufferedReader(new FileReader(cassandraEnvFile)); + String line = reader.readLine(); + + while (line != null) { + if (line.startsWith("JMX_PORT")) { + int startIndex = "JMX_PORT=\"".length(); + int endIndex = line.lastIndexOf("\""); + + if (startIndex == -1 || endIndex == -1) { + log.error("Failed to parse the JMX port. Make sure that you have the JMX port defined on its " + + "own line as follows, JMX_PORT=\"<jmx-port>\""); + throw new RuntimeException("Cannot determine JMX port"); + } + try { + port = Integer.parseInt(line.substring(startIndex, endIndex)); + } catch (NumberFormatException e) { + log.error("The JMX port must be an integer. [" + port + "] is an invalid value"); + throw new RuntimeException("The JMX port has an invalid value"); + } + return port; + } + line = reader.readLine(); + } + log.error("Failed to parse the JMX port. Make sure that you have the JMX port defined on its " + + "own line as follows, JMX_PORT=\"<jmx-port>\""); + throw new RuntimeException("Cannot determine JMX port"); + } catch (IOException e) { + log.error("Failed to parse JMX port. There was an unexpected IO error", e); + throw new RuntimeException("Failed to parse JMX port due to IO error: " + e.getMessage()); + } finally { + try { + if (reader != null) { + reader.close(); + } + } catch (IOException e) { + if (log.isDebugEnabled()) { + log.debug("An error occurred closing the " + BufferedReader.class.getName() + " used to " + + "parse the JMX port", e); + } else { + log.warn("There was error closing the reader used to parse the JMX port: " + e.getMessage()); + } + } + } + } + } + private int parseJmxPort(File cassandraJvmOptsFile) { Integer port = null; if (isWindows()) { diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java index 3fd13c7..a7921c0 100644 --- a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -2,11 +2,13 @@ package org.rhq.storage.installer; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; import java.io.File; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.lang.reflect.Method; import java.util.Properties; @@ -20,41 +22,53 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.rhq.cassandra.CassandraClusterManager; +import org.rhq.core.util.MessageDigestGenerator; import org.rhq.core.util.file.FileUtil; +import org.rhq.core.util.stream.StreamUtil; /** * @author John Sanda */ public class StorageInstallerTest { + private MessageDigestGenerator digestGenerator; + private File basedir; + private File serverDir; + private File storageDir; private StorageInstaller installer; @BeforeMethod public void initDirs(Method test) throws Exception { + digestGenerator = new MessageDigestGenerator(MessageDigestGenerator.SHA_256); + File dir = new File(getClass().getResource(".").toURI()); basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); FileUtil.purge(basedir, true); basedir.mkdirs(); - System.setProperty("rhq.server.basedir", basedir.getAbsolutePath()); + serverDir = new File(basedir, "rhq-server"); - File serverPropsFile = new File(basedir, "rhq-server.properties"); + System.setProperty("rhq.server.basedir", serverDir.getAbsolutePath()); + + File serverPropsFile = new File(serverDir, "rhq-server.properties"); FileUtils.touch(serverPropsFile); System.setProperty("rhq.server.properties-file", serverPropsFile.getAbsolutePath()); - storageDir = new File(basedir, "rhq-storage"); + storageDir = new File(serverDir, "rhq-storage"); installer = new StorageInstaller(); } @AfterMethod public void shutdownStorageNode() throws Exception { - CassandraClusterManager ccm = new CassandraClusterManager(); - ccm.killNode(storageDir); + if (FileUtils.getFile(storageDir, "bin", "cassandra.pid").exists()) { + CassandraClusterManager ccm = new CassandraClusterManager(); + ccm.killNode(storageDir); + } } @Test @@ -97,6 +111,65 @@ public class StorageInstallerTest { assertTrue(savedCachesDir.exists(), "Expected to find saved_caches directory at " + savedCachesDir); } + @Test + public void upgradeFromRHQ48Install() throws Exception { + File rhq48ServerDir = new File(basedir, "rhq48-server"); + File rhq48StorageDir = new File(rhq48ServerDir, "rhq-storage"); + File rhq48StorageConfDir = new File(rhq48StorageDir, "conf"); + + File oldCassandraYamlFile = new File(rhq48StorageConfDir, "cassandra.yaml"); + File oldCassandraEnvFile = new File(rhq48StorageConfDir, "cassandra-env.sh"); + File oldLog4JFile = new File(rhq48StorageConfDir, "log4j-server.properties"); + + rhq48StorageConfDir.mkdirs(); + StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/cassandra.yaml"), + new FileOutputStream(oldCassandraYamlFile), true); + StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/cassandra-env.sh"), + new FileOutputStream(oldCassandraEnvFile)); + StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/log4j-server.properties"), + new FileOutputStream(oldLog4JFile)); + + CommandLineParser parser = new PosixParser(); + + String[] args = { + "--upgrade", rhq48ServerDir.getAbsolutePath(), + "--dir", storageDir.getAbsolutePath() + }; + + CommandLine cmdLine = parser.parse(installer.getOptions(), args); + int status = installer.run(cmdLine); + + assertEquals(status, 0, "Expected to get back a status code of 0 for a successful upgrade"); + assertNodeIsRunning(); + + File binDir = new File(storageDir, "bin"); + assertTrue(binDir.exists(), "Expected to find bin directory at " + binDir); + + File libDir = new File(storageDir, "lib"); + assertTrue(libDir.exists(), "Expected to find lib directory at " + libDir); + + File confDir = new File(storageDir, "conf"); + assertTrue(confDir.exists(), "Expected to find conf directory at " + confDir); + + File newCassandraYamlFile = new File(confDir, "cassandra.yaml"); + assertEquals(sha256(oldCassandraYamlFile), sha256(newCassandraYamlFile), newCassandraYamlFile + + " does not match the original version"); + + File newLog4JFile = new File(confDir, "log4j-server.properties"); + assertEquals(sha256(oldLog4JFile), sha256(newLog4JFile), newLog4JFile + " does not match the original version"); + + assertFalse(new File(confDir, "cassandra-env.sh").exists(), "cassandra-env.sh should not be used after RHQ 4.8.0"); + + File cassandraJvmPropsFile = new File(confDir, "cassandra-jvm.properties"); + Properties properties = new Properties(); + properties.load(new FileInputStream(cassandraJvmPropsFile)); + + // If this check fails, make sure that the expected value matches the value in + // src/test/resources/rhq48/storage/conf/cassandra-env.sh + assertEquals(properties.getProperty("jmx_port"), "7399", "Failed to update the JMX port in " + + cassandraJvmPropsFile); + } + private void assertNodeIsRunning() { try { installer.verifyNodeIsUp("127.0.0.1", 7299, 3, 1000); @@ -106,7 +179,7 @@ public class StorageInstallerTest { } private void assertRhqServerPropsUpdated() { - File serverPropsFile = new File(basedir, "rhq-server.properties"); + File serverPropsFile = new File(serverDir, "rhq-server.properties"); Properties properties = new Properties(); try { @@ -120,4 +193,12 @@ public class StorageInstallerTest { assertEquals(seeds, "127.0.0.1|7299|9142"); } + private String sha256(File file) { + try { + return digestGenerator.calcDigestString(file); + } catch (IOException e) { + throw new RuntimeException("Failed to calculate SHA-256 hash for " + file.getPath(), e); + } + } + } commit 8ad6e86b9ba704eb468646fd7fffcf5dd082e2c4 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Jul 19 18:13:31 2013 +0200 Add annotation and processing for configuration properties. Also shuffle some classes around. diff --git a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/ConfigProperty.java b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/ConfigProperty.java new file mode 100644 index 0000000..4b5a3ab --- /dev/null +++ b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/ConfigProperty.java @@ -0,0 +1,49 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginAnnotations.agent; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * A configuration property for resource or plugin config. + * Currently only property simple are supported. + * @author Heiko W. Rupp + */ +(a)Retention(RetentionPolicy.RUNTIME) +@Target( { ElementType.FIELD}) +public @interface ConfigProperty { + + public Scope scope() default Scope.PLUGIN; + String property() default ""; + String displayName() default ""; + String description() default ""; + boolean readOnly() default false; + String defaultValue() default ""; + RhqType rhqType() default RhqType.VOID; + + + public enum Scope { + PLUGIN, + RESOURCE; + } +} diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java index 3c90b7b..16ec437 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java @@ -19,15 +19,23 @@ package org.rhq.helpers.pluginGen; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.List; +import org.rhq.helpers.pluginAnnotations.agent.ConfigProperty; +import org.rhq.helpers.pluginAnnotations.agent.Metric; +import org.rhq.helpers.pluginAnnotations.agent.Operation; +import org.rhq.helpers.pluginAnnotations.agent.Parameter; +import org.rhq.helpers.pluginAnnotations.agent.RhqType; + /** * Processor that scans a directory for annotated classes and generates metrics etc. from them. * @author Heiko W. Rupp */ public class AnnotationProcessor { - private List<Class> classList; private final DirectoryClassLoader classLoader; public AnnotationProcessor(String baseDirectory) { @@ -36,9 +44,119 @@ public class AnnotationProcessor { } public void populate(Props props) { - classList = classLoader.findClasses(); + List<Class> classList = classLoader.findClasses(); + + populateMetrics(props, classList); + populateOperations(props, classList); + populateConfigurations(props, classList); + } + + public void populateMetrics(Props props, List<Class> classes) { + for (Class<?> clazz : classes) { + for (Field field : clazz.getDeclaredFields()) { + Metric metricAnnot = field.getAnnotation(Metric.class); + addMetric(props, metricAnnot, field.getName()); + } + + for (Method method : clazz.getDeclaredMethods()) { + Metric metricAnnot = method.getAnnotation(Metric.class); + addMetric(props, metricAnnot, method.getName()); + } + } + } + + public void populateOperations(Props props, List<Class> classes) { + for (Class<?> clazz : classes) { + for (Method method : clazz.getDeclaredMethods()) { + Operation operationAnnot = method.getAnnotation(Operation.class); + if (operationAnnot != null) { + String property = operationAnnot.name(); + if (property.isEmpty()) { + property = method.getName(); + } + Props.OperationProps op = new Props.OperationProps(property); + op.setDisplayName(operationAnnot.displayName()); + op.setDescription(operationAnnot.description()); + RhqType type = RhqType.findType(method.getReturnType()); + if (type != RhqType.VOID) { + Props.SimpleProperty simpleProperty = new Props.SimpleProperty(type.getRhqName()); + op.setResult(simpleProperty); + } - props.populateMetrics(classList); - props.populateOperations(classList); + Class[] types = method.getParameterTypes(); + int i=0; + for (Annotation[] annotations : method.getParameterAnnotations() ) { + for (Annotation annotation : annotations) { + if (annotation instanceof Parameter) { + Parameter parameter = (Parameter) annotation; + Props.SimpleProperty simpleProperty = new Props.SimpleProperty(parameter.name()); + simpleProperty.setDescription(parameter.description()); + Class typeClass = types[i]; + RhqType rhqType = RhqType.findType(typeClass); + if (parameter.type()!=RhqType.VOID){ + rhqType = parameter.type(); + } + simpleProperty.setType(rhqType.getRhqName()); + op.getParams().add(simpleProperty); + } + } + i++; + } + props.getOperations().add(op); + } + + } + } + } + + public void populateConfigurations(Props props, List<Class> classes) { + for (Class<?> clazz : classes) { + for (Field field : clazz.getDeclaredFields()) { + ConfigProperty configProperty = field.getAnnotation(ConfigProperty.class); + if (configProperty!=null) { + String name = configProperty.property(); + if(name.isEmpty()) { + name = field.getName(); + } + Props.SimpleProperty property = new Props.SimpleProperty(name); + property.setDescription(configProperty.description()); + property.setDisplayName(configProperty.displayName()); + Class type = field.getType(); + RhqType rhqType = RhqType.findType(type); + if (configProperty.rhqType()!=RhqType.VOID) { + rhqType = configProperty.rhqType(); + } + property.setType(rhqType.getRhqName()); + + switch (configProperty.scope()){ + case PLUGIN: + props.getPluginConfig().add(property); + break; + case RESOURCE: + props.getResourceConfig().add(property); + break; + default: + throw new IllegalStateException("Unknown scope: " +configProperty.scope().name()); + } + } + } + } } + + private void addMetric(Props props, Metric metricAnnot, String name) { + if (metricAnnot != null) { + String property = metricAnnot.property(); + if (property.isEmpty()) { + property = name; + } + Props.MetricProps metric = new Props.MetricProps(property); + metric.setDisplayName(metricAnnot.displayName()); + metric.setDisplayType(metricAnnot.displayType()); + metric.setDataType(metricAnnot.dataType()); + metric.setDescription(metricAnnot.description()); + metric.setUnits(metricAnnot.units()); + props.getMetrics().add(metric); + } + } + } diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java index 95be574..c88fbc0 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java @@ -18,20 +18,12 @@ */ package org.rhq.helpers.pluginGen; -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.util.HashSet; import java.util.LinkedHashSet; -import java.util.List; import java.util.Set; import org.rhq.helpers.pluginAnnotations.agent.DataType; import org.rhq.helpers.pluginAnnotations.agent.DisplayType; -import org.rhq.helpers.pluginAnnotations.agent.Metric; -import org.rhq.helpers.pluginAnnotations.agent.Operation; -import org.rhq.helpers.pluginAnnotations.agent.Parameter; -import org.rhq.helpers.pluginAnnotations.agent.RhqType; import org.rhq.helpers.pluginAnnotations.agent.Units; /** @@ -94,7 +86,8 @@ public class Props { /** Embedded children */ private Set<Props> children = new HashSet<Props>(); - private Set<SimpleProperty> simpleProps = new LinkedHashSet<SimpleProperty>(); + private Set<SimpleProperty> pluginConfig = new LinkedHashSet<SimpleProperty>(); + private Set<SimpleProperty> resourceConfig = new LinkedHashSet<SimpleProperty>(); private Set<Template> templates = new HashSet<Template>(); @@ -291,12 +284,12 @@ public class Props { this.rhqVersion = rhqVersion; } - public Set<SimpleProperty> getSimpleProps() { - return simpleProps; + public Set<SimpleProperty> getPluginConfig() { + return pluginConfig; } - public void setSimpleProps(Set<SimpleProperty> simpleProps) { - this.simpleProps = simpleProps; + public void setPluginConfig(Set<SimpleProperty> pluginConfig) { + this.pluginConfig = pluginConfig; } public Set<Template> getTemplates() { @@ -307,7 +300,15 @@ public class Props { this.templates = templates; } - public Set<MetricProps> getMetrics() { + public Set<SimpleProperty> getResourceConfig() { + return resourceConfig; + } + + public void setResourceConfig(Set<SimpleProperty> resourceConfig) { + this.resourceConfig = resourceConfig; + } + + public Set<MetricProps> getMetrics() { return metrics; } @@ -363,79 +364,6 @@ public class Props { this.scanForAnnotations = scanForAnnotations; } - public void populateMetrics(List<Class> classes) { - for (Class<?> clazz : classes) { - for (Field field : clazz.getDeclaredFields()) { - Metric metricAnnot = field.getAnnotation(Metric.class); - addMetric(metricAnnot, field.getName()); - } - - for (Method method : clazz.getDeclaredMethods()) { - Metric metricAnnot = method.getAnnotation(Metric.class); - addMetric(metricAnnot, method.getName()); - } - } - } - - public void populateOperations(List<Class> classes) { - for (Class<?> clazz : classes) { - for (Method method : clazz.getDeclaredMethods()) { - Operation operationAnnot = method.getAnnotation(Operation.class); - if (operationAnnot != null) { - String property = operationAnnot.name(); - if (property.isEmpty()) { - property = method.getName(); - } - OperationProps op = new OperationProps(property); - op.setDisplayName(operationAnnot.displayName()); - op.setDescription(operationAnnot.description()); - RhqType type = RhqType.findType(method.getReturnType()); - if (type != RhqType.VOID) { - SimpleProperty simpleProperty = new SimpleProperty(type.getRhqName()); - op.setResult(simpleProperty); - } - - Class[] types = method.getParameterTypes(); - int i=0; - for (Annotation[] annotations : method.getParameterAnnotations() ) { - for (Annotation annotation : annotations) { - if (annotation instanceof Parameter) { - Parameter parameter = (Parameter) annotation; - SimpleProperty simpleProperty = new SimpleProperty(parameter.name()); - simpleProperty.setDescription(parameter.description()); - Class typeClass = types[i]; - RhqType rhqType = RhqType.findType(typeClass); - if (parameter.type()!=RhqType.VOID){ - rhqType = parameter.type(); - } - simpleProperty.setType(rhqType.getRhqName()); - op.getParams().add(simpleProperty); - } - } - i++; - } - operations.add(op); - } - - } - } - } - - private void addMetric(Metric metricAnnot, String name) { - if (metricAnnot != null) { - String property = metricAnnot.property(); - if (property.isEmpty()) { - property = name; - } - MetricProps metric = new MetricProps(property); - metric.setDisplayName(metricAnnot.displayName()); - metric.setDisplayType(metricAnnot.displayType()); - metric.setDataType(metricAnnot.dataType()); - metric.setDescription(metricAnnot.description()); - metric.setUnits(metricAnnot.units()); - metrics.add(metric); - } - } @Override public String toString() { @@ -466,7 +394,7 @@ public class Props { sb.append(", dependsOnJmxPlugin=").append(dependsOnJmxPlugin); sb.append(", rhqVersion='").append(rhqVersion).append('\''); sb.append(", children=").append(children); - sb.append(", simpleProps=").append(simpleProps); + sb.append(", simpleProps=").append(pluginConfig); sb.append(", templates=").append(templates); sb.append(", runsInsides=").append(runsInsides); sb.append('}'); diff --git a/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl b/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl index 5579806..ce35ebe 100644 --- a/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl +++ b/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl @@ -45,9 +45,9 @@ name="${props.name}" </runs-inside> </#if> - <#if props.simpleProps?has_content> + <#if props.pluginConfig?has_content> <plugin-configuration> - <#list props.simpleProps as simpleProps> + <#list props.pluginConfig as simpleProps> <c:simple-property name="${simpleProps.name}" description="${simpleProps.description}" <#if simpleProps.type??>type="${simpleProps.type}"</#if> <#if simpleProps.readOnly>readOnly="true"</#if>/> </#list>  @@ -106,4 +106,12 @@ name="${props.name}"  <c:simple-property name="dummy"/> </resource-configuration> - </#if> \ No newline at end of file + </#if> + +<#if props.resourceConfig?has_content> + <resource-configuration> + <#list props.resourceConfig as simpleProps> + <c:simple-property name="${simpleProps.name}" description="${simpleProps.description}" <#if simpleProps.type??>type="${simpleProps.type}"</#if> <#if simpleProps.readOnly>readOnly="true"</#if>/> + </#list> + </resource-configuration> +</#if> diff --git a/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java b/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java index fbc571b..5027dbb 100644 --- a/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java +++ b/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java @@ -19,6 +19,7 @@ package org.rhq.helpers.pluginGen.test; +import org.rhq.helpers.pluginAnnotations.agent.ConfigProperty; import org.rhq.helpers.pluginAnnotations.agent.DataType; import org.rhq.helpers.pluginAnnotations.agent.DisplayType; import org.rhq.helpers.pluginAnnotations.agent.MeasurementType; @@ -26,6 +27,7 @@ import org.rhq.helpers.pluginAnnotations.agent.Metric; import org.rhq.helpers.pluginAnnotations.agent.Operation; import org.rhq.helpers.pluginAnnotations.agent.Parameter; import org.rhq.helpers.pluginAnnotations.agent.RhqType; +import org.rhq.helpers.pluginAnnotations.agent.Units; /** * Just a sample @@ -34,7 +36,8 @@ import org.rhq.helpers.pluginAnnotations.agent.RhqType; public class FooBean { - @Metric(description = "How often was this bean invoked", displayType = DisplayType.SUMMARY, measurementType = MeasurementType.DYNAMIC) + @Metric(description = "How often was this bean invoked", displayType = DisplayType.SUMMARY, measurementType = MeasurementType.DYNAMIC, + units = Units.SECONDS) int invocationCount; @Metric(description = "Just a foo", dataType = DataType.TRAIT) @@ -51,5 +54,11 @@ public class FooBean { invocationCount -= by; } + @ConfigProperty(scope = ConfigProperty.Scope.PLUGIN, displayName="The Password", + readOnly = false, property="thePassword",description = "A password", rhqType = RhqType.PASSWORD) + String password; + + @ConfigProperty(scope = ConfigProperty.Scope.RESOURCE) + int defaultSteps; } commit 039a42a2e696bb1bb0b170bec87ed95fe13921e2 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Jul 19 16:40:48 2013 +0200 API Checks - Changing StorageNode.QUERY_FIND_BY_ADDRESS. The constants for native queries shouldn't be part of the public API. diff --git a/modules/core/domain/intentional-api-changes-since-4.8.0.xml b/modules/core/domain/intentional-api-changes-since-4.8.0.xml index f21a45f..a8a77b4 100644 --- a/modules/core/domain/intentional-api-changes-since-4.8.0.xml +++ b/modules/core/domain/intentional-api-changes-since-4.8.0.xml @@ -1,3 +1,11 @@ <?xml version="1.0"?> <differences> + <difference> + <className>org/rhq/core/domain/cloud/StorageNode</className> + <differenceType>6003</differenceType> + <field>QUERY_FIND_BY_ADDRESS</field> + <justification> + Changing StorageNode.QUERY_FIND_BY_ADDRESS. The constants for native queries shouldn't be part of the public API. + </justification> + </difference> </differences> commit 78eb557ae8f799b628769d76ccece61b6cb452a4 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Jul 19 16:17:53 2013 +0200 [BZ 959587] - Alert definition should display units when entering a value; e.g. 'seconds' or 'megabytes' - Adding "BaseUnits" field to the popup form. The tooltip displays all allowed units from the same MeasurementUnits.Family. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java index 31811ab..d66f23b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java @@ -22,6 +22,9 @@ */ package org.rhq.core.domain.measurement; +import java.util.ArrayList; +import java.util.List; + import org.rhq.core.domain.measurement.util.MeasurementConversionException; /** @@ -117,6 +120,16 @@ public enum MeasurementUnits { return null; } + + public List<MeasurementUnits> getFamilyUnits() { + List<MeasurementUnits> returnList = new ArrayList<MeasurementUnits>(); + for (MeasurementUnits units : MeasurementUnits.values()) { + if (units.family == family) { + returnList.add(units); + } + } + return returnList; + } public boolean isComparableTo(MeasurementUnits other) { return family == other.family; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java index 870140d..f4fbcad 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java @@ -44,6 +44,8 @@ import com.smartgwt.client.widgets.form.fields.SelectItem; import com.smartgwt.client.widgets.form.fields.SpacerItem; import com.smartgwt.client.widgets.form.fields.StaticTextItem; import com.smartgwt.client.widgets.form.fields.TextItem; +import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.toolbar.ToolStrip; @@ -613,6 +615,7 @@ public class ConditionEditor extends EnhancedVLayout { } absoluteValue.setShowIfCondition(ifFunc); formItems.add(absoluteValue); + formItems.add(buildBaseUnitsItem(metricDropDownMenu, ifFunc, editMode)); } else { String noMetricsStr = MSG.view_alert_definition_condition_editor_metric_nometrics(); StaticTextItem noMetrics = buildHelpTextItem(THRESHOLD_NO_METRICS_ITEMNAME, noMetricsStr, ifFunc); @@ -663,6 +666,7 @@ public class ConditionEditor extends EnhancedVLayout { formItems.add(absoluteLowValue); formItems.add(absoluteHighValue); + formItems.add(buildBaseUnitsItem(metricDropDownMenu, ifFunc, editMode)); } else { String noMetricsStr = MSG.view_alert_definition_condition_editor_metric_nometrics(); StaticTextItem noMetrics = buildHelpTextItem(RANGE_NO_METRICS_ITEMNAME, noMetricsStr, ifFunc); @@ -1220,6 +1224,40 @@ public class ConditionEditor extends EnhancedVLayout { return comparatorSelection; } + private StaticTextItem buildBaseUnitsItem(final SelectItem metricDropDownMenu, FormItemIfFunction ifFunc, + boolean editMode) { + String baseUnits = MSG.view_alert_definition_condition_editor_common_baseUnits(); + final StaticTextItem baseUnitsItem = new StaticTextItem("baseUnits", baseUnits); + baseUnitsItem.setHoverWidth(200); + baseUnitsItem.setShowIfCondition(ifFunc); + + metricDropDownMenu.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + MeasurementDefinition measDef = getMeasurementDefinition(form.getValueAsString(metricDropDownMenu + .getName())); + baseUnitsItem.setValue(measDef.getUnits() == MeasurementUnits.NONE ? MSG + .view_alert_definition_condition_editor_common_baseUnits_none() + : measDef.getUnits() == MeasurementUnits.MILLISECONDS ? MeasurementUnits.SECONDS : measDef + .getUnits()); + List<MeasurementUnits> availableUnits = measDef.getUnits().getFamilyUnits(); + baseUnitsItem.setTooltip(MSG.view_alert_definition_condition_editor_common_baseUnits_availableUnits() + + (availableUnits.isEmpty() || availableUnits.get(0) == MeasurementUnits.NONE ? MSG + .view_alert_definition_condition_editor_common_baseUnits_none() : availableUnits)); + } + }); + // initialize the field with proper value + MeasurementUnits units = editMode ? existingCondition.getMeasurementDefinition().getUnits() + : ConditionEditor.this.resourceType.getMetricDefinitions().iterator().next().getUnits(); + baseUnitsItem.setValue(units == MeasurementUnits.NONE ? MSG + .view_alert_definition_condition_editor_common_baseUnits_none() + : units == MeasurementUnits.MILLISECONDS ? MeasurementUnits.SECONDS : units); + List<MeasurementUnits> availableUnits = units.getFamilyUnits(); + baseUnitsItem.setTooltip(MSG.view_alert_definition_condition_editor_common_baseUnits_availableUnits() + + (availableUnits.isEmpty() || availableUnits.get(0) == MeasurementUnits.NONE ? MSG + .view_alert_definition_condition_editor_common_baseUnits_none() : availableUnits)); + return baseUnitsItem; + } + private StaticTextItem buildHelpTextItem(String itemName, String helpText, FormItemIfFunction ifFunc) { StaticTextItem help = new StaticTextItem(itemName); help.setShowTitle(false); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index ed6b130..19d3fa5 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -919,6 +919,9 @@ view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = T view_alert_definition_condition_editor_availability_tooltip = Specify the availability state change that will trigger the condition. view_alert_definition_condition_editor_availability_value = Availability view_alert_definition_condition_editor_common_avg = Average +view_alert_definition_condition_editor_common_baseUnits = Base Units +view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = Maximum view_alert_definition_condition_editor_common_min = Minimum view_alert_definition_condition_editor_common_regex = Regular Expression diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 1950003..f71f907 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -933,6 +933,9 @@ view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = P view_alert_definition_condition_editor_availability_tooltip = Specifikujte stav dostupnosti, který poté splní podmínku. view_alert_definition_condition_editor_availability_value = Dostupnost view_alert_definition_condition_editor_common_avg = Průměr +view_alert_definition_condition_editor_common_baseUnits = Základní jednotky +view_alert_definition_condition_editor_common_baseUnits_availableUnits = Dostupné jednotky: +view_alert_definition_condition_editor_common_baseUnits_none = Źádné view_alert_definition_condition_editor_common_max = Maximum view_alert_definition_condition_editor_common_min = Minimum view_alert_definition_condition_editor_common_regex = Regulární výraz diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index bd8e0b4..524dcc0 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -844,6 +844,9 @@ view_alert_definition_condition_editor_avilability_option_up = Wird verfügbar view_alert_definition_condition_editor_avilability_tooltip = Geben Sie die Änderung der Verfügbarkeit an, die die Bedingung auslösen soll. view_alert_definition_condition_editor_avilability_value = Verfügbarkeit view_alert_definition_condition_editor_common_avg = Durchschnitt +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = Maximum view_alert_definition_condition_editor_common_min = Minimum view_alert_definition_condition_editor_common_regex = Regulärer Ausdruck diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 1c0005b..cb0c35f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -908,6 +908,9 @@ view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = view_alert_definition_condition_editor_availability_tooltip = 条件のトリガーとなるアベイラビリティ状態の変化を指定します view_alert_definition_condition_editor_availability_value = アベイラビリティ view_alert_definition_condition_editor_common_avg = 平均 +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = 最大 view_alert_definition_condition_editor_common_min = 最小 view_alert_definition_condition_editor_common_regex = 正規表現 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 5118a2d..32dc73d 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -797,6 +797,9 @@ view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = view_alert_definition_condition_editor_availability_tooltip = 조건 트리거하는 가용성 상태의 변화를 지정합니다. view_alert_definition_condition_editor_availability_value = 가용성 view_alert_definition_condition_editor_common_avg = 평균 +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = 최대 view_alert_definition_condition_editor_common_min = 최소 view_alert_definition_condition_editor_common_regex = 정규 표현식 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index bfd95e8..f4419e1 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -916,6 +916,9 @@ view_alert_common_tab_recovery = Recupera\u00E7\u00E3o view_alert_definition_condition_editor_availability_tooltip = Especifica a mudan\u00E7a de estado na disponibilidade do recurso que ir\u00E1 disparar a condi\u00E7\u00E3o. view_alert_definition_condition_editor_availability_value = Disponibilidade view_alert_definition_condition_editor_common_avg = M\u00E9dio +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = M\u00E1ximo view_alert_definition_condition_editor_common_min = M\u00EDnimo view_alert_definition_condition_editor_common_regex = Express\u00E3o Regular diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index e03e1a9..d75b76e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -881,6 +881,9 @@ #view_alert_definition_condition_editor_availability_tooltip = Specify the availability state change that will trigger the condition. #view_alert_definition_condition_editor_availability_value = Availability #view_alert_definition_condition_editor_common_avg = Average +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None #view_alert_definition_condition_editor_common_max = Maximum #view_alert_definition_condition_editor_common_min = Minimum #view_alert_definition_condition_editor_delete_confirm = Delete the selected alert condition(s)? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 82ddc2a..a9a24df 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -902,6 +902,9 @@ view_alert_common_tab_recovery = \u8fd8\u539f view_alert_definition_condition_editor_availability_tooltip = Specify the availability state change that will trigger the condition. view_alert_definition_condition_editor_availability_value = \u53ef\u7528\u6027 view_alert_definition_condition_editor_common_avg = \u5e73\u5747 +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = \u6700\u5927 view_alert_definition_condition_editor_common_min = \u6700\u5c0f view_alert_definition_condition_editor_common_regex = \u6b63\u5219\u8868\u8fbe\u5f0f commit 1f6cf05d57599ded2d196241284b4b5167886c80 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Jul 19 12:43:35 2013 +0200 [BZ 980091] - link in the alert to the parent on which the alert was created - Adding the link to AlertDetailsView if the alert is defined by parent definition. Parent definition could mean group alert definition, autogroup alert definition or template definition diff --git a/modules/enterprise/gui/coregui/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch b/modules/enterprise/gui/coregui/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch new file mode 100644 index 0000000..627021f --- /dev/null +++ b/modules/enterprise/gui/coregui/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.wst.jsdt.core.javascriptValidator"/> +<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java index 17dd6d6..d66baea 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java @@ -57,6 +57,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.admin.templates.AlertDefinitionTemplateTypeView; import org.rhq.enterprise.gui.coregui.client.components.form.DateFilterItem; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.gwt.AlertGWTServiceAsync; @@ -74,6 +75,8 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; * @author John Mazzitelli */ public class AlertDataSource extends RPCDataSource<Alert, AlertCriteria> { + + private static final String FIELD_PARENT = "parent"; // may be template or group alert def parent public static final String PRIORITY_ICON_HIGH = ImageManager.getAlertIcon(AlertPriority.HIGH); public static final String PRIORITY_ICON_MEDIUM = ImageManager.getAlertIcon(AlertPriority.MEDIUM); @@ -359,6 +362,7 @@ public class AlertDataSource extends RPCDataSource<Alert, AlertCriteria> { } criteria.addFilterEntityContext(entityContext); criteria.fetchConditionLogs(true); +// criteria.fetchGroupAlertDefinition(true); return criteria; } @@ -410,6 +414,22 @@ public class AlertDataSource extends RPCDataSource<Alert, AlertCriteria> { record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry()); record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, resource.getResourceType().getId()); + AlertDefinition groupAlertDefinition = alertDefinition.getGroupAlertDefinition(); + Integer parentId = alertDefinition.getParentId(); + if (groupAlertDefinition != null && groupAlertDefinition.getGroup() != null) { + boolean isAutogroup = groupAlertDefinition.getGroup().getAutoGroupParentResource() != null; + record.setAttribute(FIELD_PARENT, (isAutogroup ? "#Resource/AutoGroup/" : "#ResourceGroup/") + + groupAlertDefinition.getGroup().getId() + "/Alerts/Definitions/" + groupAlertDefinition.getId()); + record.setLinkText(MSG.view_alert_definition_for_group()); + } else if (parentId != null && parentId.intValue() != 0) { + record.setAttribute( + FIELD_PARENT, + LinkManager.getAdminTemplatesEditLink(AlertDefinitionTemplateTypeView.VIEW_ID.getName(), resource + .getResourceType().getId()) + + "/" + parentId); + record.setLinkText(MSG.view_alert_definition_for_type()); + } + Set<AlertConditionLog> conditionLogs = from.getConditionLogs(); String conditionText; String conditionValue; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java index 68a0953..ed98d94 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java @@ -40,8 +40,12 @@ import com.smartgwt.client.widgets.tab.Tab; import com.smartgwt.client.widgets.tab.TabSet; import org.rhq.core.domain.alert.Alert; +import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.criteria.AlertCriteria; +import org.rhq.core.domain.criteria.AlertDefinitionCriteria; +import org.rhq.core.domain.criteria.ResourceGroupCriteria; +import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.CoreGUI; @@ -83,7 +87,14 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie @Override public void onSuccess(PageList<Alert> result) { Alert alert = result.get(0); - show(alert); + Integer parentId = alert.getAlertDefinition().getParentId(); + AlertDefinition groupAlertDefinition = alert.getAlertDefinition().getGroupAlertDefinition(); + if (groupAlertDefinition != null || (parentId != null && parentId.intValue() != 0)) { + fetchDefinitionWithGroupAndTemplate(alert); + } else { + show(alert); + } + } @Override @@ -92,6 +103,24 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie } }); } + + private void fetchDefinitionWithGroupAndTemplate(final Alert alert) { + AlertDefinitionCriteria criteria = new AlertDefinitionCriteria(); + criteria.addFilterAlertId(alert.getId()); + criteria.fetchGroupAlertDefinition(true); + criteria.fetchResourceType(true); + GWTServiceLookup.getAlertDefinitionService().findAlertDefinitionsByCriteria(criteria, new AsyncCallback<PageList<AlertDefinition>>() { + public void onSuccess(PageList<AlertDefinition> result) { + alert.getAlertDefinition().setGroupAlertDefinition(result.get(0).getGroupAlertDefinition()); + alert.getAlertDefinition().setResourceType(result.get(0).getResourceType()); + show(alert); + } + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_alert_details_loadFailed(), caught); + } + }); + } private void show(Alert alert) { destroyMembers(); @@ -102,7 +131,7 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie addMember(getDetailsTabSet(record)); } - private TabSet getDetailsTabSet(Record record) { + private TabSet getDetailsTabSet(ListGridRecord record) { TabSet tabset = new NamedTabSet(); Tab generalTab = new NamedTab(new ViewName("general", MSG.view_alert_common_tab_general())); @@ -121,7 +150,7 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie return tabset; } - private DynamicForm getDetailsTableForAlert(Record record) { + private DynamicForm getDetailsTableForAlert(ListGridRecord record) { DynamicForm form = new DynamicForm(); form.setNumCols(4); form.setHeight("15%"); @@ -189,6 +218,13 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie MSG.view_alert_details_field_resource_ancestry()); resourceAncestryItem.setValue(record.getAttribute("resourceAncestry")); items.add(resourceAncestryItem); + + String parentUrl = record.getAttribute("parent"); + if (parentUrl != null) { + StaticTextItem parentItem = new StaticTextItem("parent", "Parent Definition"); + parentItem.setValue(LinkManager.getHref(parentUrl, record.getLinkText())); + items.add(parentItem); + } form.setItems(items.toArray(new FormItem[items.size()])); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 84e9c6e..ed6b130 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1080,6 +1080,7 @@ view_alert_definitions_update_failure = Alert definition update failed view_alert_definitions_update_success = Alert definition successfully updated view_alert_details_field_ack_at = Acknowledged at view_alert_details_field_ack_by = Acknowledged by +view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = Recovery Info view_alert_details_field_resource_ancestry = Resource Ancestry view_alert_details_field_watched_resource = Watched Resource diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index d6a102b..1950003 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -1094,6 +1094,7 @@ view_alert_definitions_update_failure = Nepodařilo se změnit definici výstrah view_alert_definitions_update_success = Úspěšně změněna definice výstrahy view_alert_details_field_ack_at = Potvrzeno v view_alert_details_field_ack_by = Potvrzeno kým +view_alert_details_field_parent_definition = Definice rodiče view_alert_details_field_recovery_info = Informace o obnově view_alert_details_field_resource_ancestry = Původ zdroje view_alert_details_field_watched_resource = Sledovaný zdroj diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 9237f76..1c0005b 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -1069,6 +1069,7 @@ view_alert_definitions_update_failure = アラート定義の更新に失敗し view_alert_definitions_update_success = アラート定義の更新に成功しました view_alert_details_field_ack_at = 次の場所で確認済みです view_alert_details_field_ack_by = 次の人によって確認済みです +##view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = リカバリ情報 ##view_alert_details_field_resource_ancestry = Resource Ancestry ##view_alert_details_field_watched_resource = Watched Resource diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index bd34f9b..5118a2d 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -935,6 +935,7 @@ view_alert_definitions_table_title_group = 그룹 경고 정의 view_alert_definitions_table_title_resource = 리소스 경고 정의 view_alert_details_field_ack_at = 다음 위치에서 확인했습니다 view_alert_details_field_ack_by = 다음 사람에 의해 확인되었습니다 +##view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = 복구 정보 view_alert_details_field_resource_ancestry = 리소스 조상 view_alert_details_field_watched_resource = 관심 리소스 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 1330eb7..bfd95e8 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -1078,6 +1078,7 @@ view_alert_definitions_update_success = Defini\u00E7\u00E3o do alerta atualizada view_alert_details_breadcrumb = Detalhes view_alert_details_field_ack_at = Verificado em view_alert_details_field_ack_by = Verificado por +##view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = Informa\u00E7\u00E3o de Recupera\u00E7\u00E3o ##view_alert_details_field_resource_ancestry = Resource Ancestry ##view_alert_details_field_watched_resource = Watched Resource diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 72a287b..e03e1a9 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -1042,6 +1042,7 @@ #view_alert_definitions_update_success = Alert definition successfully updated #view_alert_details_field_ack_at = Acknowledged at #view_alert_details_field_ack_by = Acknowledged by +##view_alert_details_field_parent_definition = Parent definition #view_alert_details_field_recovery_info = Recovery Info #view_alert_details_loadFailed = Failed to fetch alert details #view_alerts_ack_confirm = Acknowledge the selected alert(s)? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 10f9b0a..82ddc2a 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -1063,6 +1063,7 @@ view_alert_definitions_update_failure = \u544a\u8b66\u5b9a\u4e49\u66f4\u65b0\u59 view_alert_definitions_update_success = \u544a\u8b66\u5b9a\u4e49\u66f4\u65b0\u6210\u529f view_alert_details_field_ack_at = \u786e\u8ba4\u4e8e view_alert_details_field_ack_by = \u786e\u8ba4\u8005 +##view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = \u8fd8\u539f\u4fe1\u606f ##view_alert_details_field_resource_ancestry = Resource Ancestry ##view_alert_details_field_watched_resource = Watched Resource commit 67c442b7baa5db4cdd3715fd89db9ea01b9e2fa8 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Jul 19 12:41:13 2013 +0200 Removing deprecated annotation, adding orphanRemoval=true attribute instead. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java index 4742c17..44a8eac 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java @@ -253,9 +253,8 @@ public class Alert implements Serializable { @ManyToOne private AlertDefinition alertDefinition; - @OneToMany(mappedBy = "alert", cascade = CascadeType.ALL) + @OneToMany(mappedBy = "alert", cascade = CascadeType.ALL, orphanRemoval=true) @OrderBy - @org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN) // primary key private Set<AlertConditionLog> conditionLogs = new LinkedHashSet<AlertConditionLog>(); diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java index 0f2d0b1..be98df5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java @@ -86,8 +86,7 @@ public class AlertDampening implements java.io.Serializable { // This is required for cascade behavior. We want to be able to cascade delete the AlertDampeningEvents when an // AlertDefinition is removed from the db, due to deleting a Resource from inventory. - @OneToMany(mappedBy = "alertDefinition", cascade = { CascadeType.REFRESH, CascadeType.REMOVE }) - @org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN) + @OneToMany(mappedBy = "alertDefinition", cascade = { CascadeType.REFRESH, CascadeType.REMOVE }, orphanRemoval = true) private Set<AlertDampeningEvent> alertDampeningEvents = new HashSet<AlertDampeningEvent>(); protected AlertDampening() { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java index 02362ce..3445d9e 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java @@ -293,7 +293,6 @@ public class AlertDefinition implements Serializable { // do not cascade remove - group removal will be detaching children alert defs from the group def, // and then letting the children be deleted slowly by existing alert def removal mechanisms - @SuppressWarnings("unused") @OneToMany(mappedBy = "groupAlertDefinition", fetch = FetchType.LAZY, cascade = { CascadeType.PERSIST }) @OrderBy private Set<AlertDefinition> groupAlertDefinitionChildren = new LinkedHashSet<AlertDefinition>(); @@ -361,11 +360,10 @@ public class AlertDefinition implements Serializable { // referencing AlertConditionLog records. private Set<AlertCondition> conditions = new LinkedHashSet<AlertCondition>(1); // Most alerts will only have one condition. - @OneToMany(mappedBy = "alertDefinition", cascade = CascadeType.ALL) + @OneToMany(mappedBy = "alertDefinition", cascade = CascadeType.ALL, orphanRemoval = true) // Although similar to AlertCondition, we do use DELETE_ORPHAN here. The reason is because AlertNotificationLog // does not refer back to the AlertNotification record and therefore the notification logs are not affected // by the loss of the AlertNotification that spawned the notification. - @org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN) private List<AlertNotification> alertNotifications = new ArrayList<AlertNotification>(); /** commit 92a286d611085d96ba1710c442035445dda5318a Author: Jirka Kremser <jkremser(a)redhat.com> Date: Thu Jul 18 18:37:48 2013 +0200 [BZ 980091] - link in the alert to the parent on which the alert was created - Adding a new filter on AlertDefinitionCriteria (filter by alert id). diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java index 854efaf..9d4e51d 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java @@ -48,6 +48,7 @@ public class AlertDefinitionCriteria extends Criteria { private String filterName; private String filterDescription; private AlertPriority filterPriority; + private Integer filterAlertId; // requires overrides private NonBindingOverrideFilter filterAlertTemplateOnly; // requires overrides - finds only alert templates private Integer filterAlertTemplateParentId; // requires overrides private Integer filterAlertTemplateResourceTypeId; // requires overrides @@ -75,6 +76,10 @@ public class AlertDefinitionCriteria extends Criteria { private PageOrdering sortResourceName; // requires sort override public AlertDefinitionCriteria() { + filterOverrides.put("alertId", "" + + "id IN ( SELECT alert.alertDefinition.id " // + + " FROM Alert alert " // + + " WHERE alert.id = ? )"); filterOverrides.put("alertTemplateOnly", "resourceType IS NOT NULL"); filterOverrides.put("alertTemplateParentId", "parentId = ?"); filterOverrides.put("alertTemplateResourceTypeId", "resourceType.id = ?"); @@ -113,6 +118,10 @@ public class AlertDefinitionCriteria extends Criteria { public void addFilterAlertTemplateParentId(Integer filterAlertTemplateParentId) { this.filterAlertTemplateParentId = filterAlertTemplateParentId; } + + public void addFilterAlertId(Integer filterAlertId) { + this.filterAlertId = filterAlertId; + } public void addFilterAlertTemplateResourceTypeId(Integer filterAlertTemplateResourceTypeId) { this.filterAlertTemplateResourceTypeId = filterAlertTemplateResourceTypeId; commit b3aa6d8a54378fad077d2052e9f9620768723a4d Author: Michael Burman <yak(a)iki.fi> Date: Fri Jul 19 12:27:38 2013 +0200 BZ980076 Check if storage is really running after a crash diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java index 8988d98..5528619 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java @@ -1,7 +1,7 @@ /* * * * RHQ Management Platform - * * Copyright (C) 2005-2012 Red Hat, Inc. + * * Copyright (C) 2005-2013 Red Hat, Inc. * * All rights reserved. * * * * This program is free software; you can redistribute it and/or modify @@ -41,6 +41,10 @@ import org.apache.commons.cli.ParseException; import org.apache.commons.cli.PosixParser; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.exec.DefaultExecutor; +import org.apache.commons.exec.ExecuteException; +import org.apache.commons.exec.Executor; +import org.apache.commons.exec.PumpStreamHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -171,10 +175,15 @@ public abstract class ControlCommand { return getStorageBasedir().exists(); } - protected String getStoragePid() throws IOException { + protected File getStoragePidFile() { File storageBasedir = getStorageBasedir(); File storageBinDir = new File(storageBasedir, "bin"); File pidFile = new File(storageBinDir, "cassandra.pid"); + return pidFile; + } + + protected String getStoragePid() throws IOException { + File pidFile = getStoragePidFile(); if (pidFile.exists()) { return StreamUtil.slurp(new FileReader(pidFile)); @@ -282,4 +291,77 @@ public abstract class ControlCommand { return inUse; } + + protected void waitForProcessToStop(String pid) throws Exception { + + if (isWindows() || pid==null) { + // For the moment we have no better way to just wait some time + Thread.sleep(10*1000L); + } else { + int tries = 5; + while (tries > 0) { + log.debug("."); + if (!isUnixPidRunning(pid)) { + break; + } + Thread.sleep(2*1000L); + tries--; + } + if (tries==0) { + throw new RHQControlException("Process [" + pid + "] did not finish yet. Terminate it manually and retry."); + } + } + + } + + protected void killPid(String pid) throws IOException { + Executor executor = new DefaultExecutor(); + executor.setWorkingDirectory(getBinDir()); + executor.setStreamHandler(new PumpStreamHandler()); + org.apache.commons.exec.CommandLine commandLine; + + commandLine = new org.apache.commons.exec.CommandLine("kill").addArgument(pid); + executor.execute(commandLine); + } + + protected boolean isUnixPidRunning(String pid) { + + Executor executor = new DefaultExecutor(); + executor.setWorkingDirectory(getBinDir()); + executor.setStreamHandler(new PumpStreamHandler()); + org.apache.commons.exec.CommandLine commandLine = new org.apache.commons.exec.CommandLine("/bin/kill") + .addArgument("-0") + .addArgument(pid); + + try { + int code = executor.execute(commandLine); + if (code!=0) { + return false; + } + } catch (ExecuteException ee ) { + if (ee.getExitValue()==1) { + // return code 1 means process does not exist + return false; + } + } catch (IOException e) { + log.error("Checking for running process failed: " + e.getMessage()); + } + return true; + } + + protected boolean isStorageRunning() throws IOException { + String pid = getStoragePid(); + if(pid == null) { + return false; + } else if(pid != null && !isUnixPidRunning(pid)) { + // There is a phantom pidfile + File pidFile = getStoragePidFile(); + if(!pidFile.delete()) { + throw new RHQControlException("Could not delete storage pidfile " + pidFile.getAbsolutePath()); + } + return false; + } else { + return true; + } + } } diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java index fe7cdd4..8c885b0 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java @@ -1,7 +1,7 @@ /* * * * RHQ Management Platform - * * Copyright (C) 2005-2012 Red Hat, Inc. + * * Copyright (C) 2005-2013 Red Hat, Inc. * * All rights reserved. * * * * This program is free software; you can redistribute it and/or modify @@ -36,16 +36,12 @@ import java.util.Properties; import org.apache.commons.cli.CommandLine; import org.apache.commons.exec.DefaultExecuteResultHandler; import org.apache.commons.exec.DefaultExecutor; -import org.apache.commons.exec.ExecuteException; import org.apache.commons.exec.Executor; import org.apache.commons.exec.PumpStreamHandler; - import org.jboss.as.controller.client.ModelControllerClient; - import org.rhq.common.jbossas.client.controller.DeploymentJBossASClient; import org.rhq.common.jbossas.client.controller.MCCHelper; import org.rhq.server.control.ControlCommand; -import org.rhq.server.control.RHQControlException; /** * Common code for commands that perform installs. Basically shared code for Install and Upgrade commands. @@ -104,55 +100,6 @@ public abstract class AbstractInstall extends ControlCommand { } } - protected void waitForProcessToStop(String pid) throws Exception { - - if (isWindows() || pid==null) { - // For the moment we have no better way to just wait some time - Thread.sleep(10*1000L); - } else { - int tries = 5; - while (tries > 0) { - log.debug("."); - if (!isUnixPidRunning(pid)) { - break; - } - Thread.sleep(2*1000L); - tries--; - } - if (tries==0) { - throw new RHQControlException("Process [" + pid + "] did not finish yet. Terminate it manually and retry."); - } - } - - } - - protected boolean isUnixPidRunning(String pid) { - - Executor executor = new DefaultExecutor(); - executor.setWorkingDirectory(getBinDir()); - executor.setStreamHandler(new PumpStreamHandler()); - org.apache.commons.exec.CommandLine commandLine; - - commandLine = new org.apache.commons.exec.CommandLine("/bin/kill") - .addArgument("-0") - .addArgument(pid); - - try { - int code = executor.execute(commandLine); - if (code!=0) { - return false; - } - } catch (ExecuteException ee ) { - if (ee.getExitValue()==1) { - // return code 1 means process does not exist - return false; - } - } catch (IOException e) { - log.error("Checking for running process failed: " + e.getMessage()); - } - return true; - } - protected void waitForRHQServerToInitialize() throws Exception { try { final long messageInterval = 30000L; diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java index 7e83c9e..f15b13e 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java @@ -1,7 +1,7 @@ /* * * * RHQ Management Platform - * * Copyright (C) 2005-2012 Red Hat, Inc. + * * Copyright (C) 2005-2013 Red Hat, Inc. * * All rights reserved. * * * * This program is free software; you can redistribute it and/or modify @@ -26,7 +26,6 @@ package org.rhq.server.control.command; import java.io.File; -import java.io.FileReader; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Options; @@ -137,14 +136,13 @@ public class Start extends ControlCommand { log.debug("Failed to start storage service", e); } } else { - File storageBinDir = new File(getStorageBasedir(), "bin"); - File pidFile = new File(storageBinDir, "cassandra.pid"); + File pidFile = getStoragePidFile(); // For now we are duplicating logic in the status command. This code will be // replaced when we implement a rhq-storage.sh script. - if (pidFile.exists()) { - String pid = StreamUtil.slurp(new FileReader(pidFile)); + if (isStorageRunning()) { + String pid = getStoragePid(); System.out.println("RHQ storage node (pid " + pid + ") is running"); } else { commandLine = getCommandLine(false, "cassandra", "-p", pidFile.getAbsolutePath()); diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java index 53d0374..908aa8e 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java @@ -1,7 +1,7 @@ /* * * * RHQ Management Platform - * * Copyright (C) 2005-2012 Red Hat, Inc. + * * Copyright (C) 2005-2013 Red Hat, Inc. * * All rights reserved. * * * * This program is free software; you can redistribute it and/or modify @@ -126,13 +126,13 @@ public class Stop extends AbstractInstall { log.debug("Failed to stop storage service", e); } } else { - String pid = getStoragePid(); - if (pid != null) { + if(isStorageRunning()) { + String pid = getStoragePid(); + System.out.println("Stopping RHQ storage node..."); System.out.println("RHQ storage node (pid=" + pid + ") is stopping..."); - commandLine = new org.apache.commons.exec.CommandLine("kill").addArgument(pid); - executor.execute(commandLine); + killPid(pid); waitForProcessToStop(pid); commit bf8587569567d261791f272a672f5722d7dca8c0 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 18 23:37:57 2013 +0200 [as7] Fix domain api version discovery Look for the first node of type element instead of simply calling getFirstChild diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java index 329246e..3c71135 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,11 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.modules.plugins.jbossas7.helper; +import static org.rhq.core.util.StringUtil.EMPTY_STRING; +import static org.w3c.dom.Node.ELEMENT_NODE; + import java.io.File; import java.io.FileInputStream; import java.io.InputStream; @@ -33,6 +36,7 @@ import javax.xml.xpath.XPathFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; +import org.w3c.dom.Node; import org.rhq.core.pluginapi.util.CommandLineOption; import org.rhq.modules.plugins.jbossas7.AS7CommandLine; @@ -234,11 +238,15 @@ public class HostConfiguration { } public String getDomainApiVersion() { - - String version = document.getFirstChild().getAttributes().getNamedItem("xmlns").getTextContent(); - - version = version.substring(version.lastIndexOf(':')+1); - return version; + // Look for the first child node of type element (<host> in domain mode or <server> in standalone mode) + // We can't just call getFirstChild because first child could be a node of type comment + for (Node childNode = document.getFirstChild(); childNode != null; childNode = childNode.getNextSibling()) { + if (childNode.getNodeType() == ELEMENT_NODE) { + String xmlns = childNode.getAttributes().getNamedItem("xmlns").getTextContent(); + return xmlns.substring(xmlns.lastIndexOf(':') + 1); + } + } + return EMPTY_STRING; } /** commit 5283e5356d2ca4bda6e3aeea9d323c186030baa9 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 18 09:41:39 2013 +0200 Bug 969621 - EAP 6 managed plug-in is unable to discover EAP servers when more then one is running on a single host diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index cc13406..cd9f276 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.modules.plugins.jbossas7; @@ -42,6 +42,7 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.resource.ResourceUpgradeReport; import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; @@ -49,6 +50,8 @@ import org.rhq.core.pluginapi.inventory.ManualAddFacet; import org.rhq.core.pluginapi.inventory.ProcessScanResult; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeContext; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeFacet; import org.rhq.core.pluginapi.util.CommandLineOption; import org.rhq.core.pluginapi.util.FileUtils; import org.rhq.core.pluginapi.util.JavaCommandLine; @@ -66,12 +69,15 @@ import org.rhq.modules.plugins.jbossas7.json.Result; * Abstract base discovery component for the two server types - "JBossAS7 Host Controller" and * "JBossAS7 Standalone Server". */ -public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent, ManualAddFacet { +public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent, ManualAddFacet, ResourceUpgradeFacet { private static final String JBOSS_AS_PREFIX = "jboss-as-"; private static final String JBOSS_EAP_PREFIX = "jboss-eap-"; private static final String WILDFLY_PREFIX = "wildfly-"; + private static final String LOCAL_RESOURCE_KEY_PREFIX = "hostConfig: "; + private static final String REMOTE_RESOURCE_KEY_PREFIX = "hostPort: "; + private static final String HOME_DIR_SYSPROP = "jboss.home.dir"; private static final String RHQADMIN = "rhqadmin"; @@ -202,7 +208,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent setStartScriptPluginConfigProps(process, commandLine, pluginConfig, agentProcess); setUserAndPasswordPluginConfigProps(serverPluginConfig, hostConfig, baseDir); - String key = baseDir.getPath(); + String key = createKeyForLocalResource(serverPluginConfig); HostPort hostPort = hostConfig.getDomainControllerHostPort(commandLine); String name = buildDefaultResourceName(hostPort, managementHostPort, productType); String description = buildDefaultResourceDescription(hostPort, productType); @@ -455,7 +461,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent HostPort managementHostPort = new HostPort(false); managementHostPort.host = hostname; managementHostPort.port = port; - String key = hostname + ":" + port; + String key = createKeyForRemoteResource(hostname + ":" + port); String name = buildDefaultResourceName(hostPort, managementHostPort, productType); String version = productInfo.getProductVersion(); String description = buildDefaultResourceDescription(hostPort, productType); @@ -469,6 +475,43 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent return detail; } + @Override + public ResourceUpgradeReport upgrade(ResourceUpgradeContext inventoriedResource) { + String currentResourceKey = inventoriedResource.getResourceKey(); + Configuration pluginConfiguration = inventoriedResource.getPluginConfiguration(); + ServerPluginConfiguration serverPluginConfiguration = new ServerPluginConfiguration(pluginConfiguration); + + if (currentResourceKey.startsWith(LOCAL_RESOURCE_KEY_PREFIX) + || currentResourceKey.startsWith(REMOTE_RESOURCE_KEY_PREFIX)) { + // Resource key already in right format + return null; + } + + ResourceUpgradeReport report = new ResourceUpgradeReport(); + + if (new File(currentResourceKey).isDirectory()) { + // Old key format for a local resource (key is base dir) + report.setNewResourceKey(createKeyForLocalResource(serverPluginConfiguration)); + } else if (currentResourceKey.contains(":")) { + // Old key format for a remote (manually added) resource (key is base dir) + report.setNewResourceKey(createKeyForRemoteResource(currentResourceKey)); + } else { + log.warn("Unknown format, cannot upgrade resource key [" + currentResourceKey + "]"); + return null; + } + + return report; + } + + private String createKeyForRemoteResource(String hostPort) { + return REMOTE_RESOURCE_KEY_PREFIX + hostPort; + } + + private String createKeyForLocalResource(ServerPluginConfiguration serverPluginConfiguration) { + return LOCAL_RESOURCE_KEY_PREFIX + + serverPluginConfiguration.getHostConfigFile().getAbsolutePath(); + } + private <T>T getServerAttribute(ASConnection connection, String attributeName) { Operation op = new ReadAttribute(null, attributeName); Result res = connection.execute(op); commit e6fa8c734c2bfee9ad46a2b7683d4c86b4897e5c Author: John Sanda <jsanda(a)redhat.com> Date: Thu Jul 18 07:23:34 2013 -0400 take 2 at dependency clean up JNA libraries were getting pulled into the ear as transitive dependencies. JNA is used by the cassandra-ccm-core module to shutdown Cassandra. This functionality though is only used in test code. diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index c648685..f418afc 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -77,6 +77,14 @@ <groupId>org.rhq</groupId> <artifactId>rhq-core-plugin-api</artifactId> </exclusion> + <exclusion> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + </exclusion> + <exclusion> + <groupId>net.java.dev.jna</groupId> + <artifactId>platform</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 2245978..97496f7 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -47,18 +47,6 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>rhq-cassandra-ccm-core</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.cassandra</groupId> - <artifactId>cassandra-clientutil</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-ccm-testng</artifactId> <version>${project.version}</version> <scope>test</scope> commit 375f6f66fcc9214cc3d13605c17859ac11e3fd45 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Jul 18 05:04:00 2013 -0500 Temporary fix for the server jar name for dev profile (it was still using the old name). diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 7c236c7..c648685 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -776,7 +776,7 @@ <properties> <rhq.rootDir>../../../..</rhq.rootDir> <rhq.containerDir>${rhq.rootDir}/${rhq.devContainerServerPath}</rhq.containerDir> - <rhq.deploymentName>${project.build.finalName}-ejb3.jar</rhq.deploymentName> + <rhq.deploymentName>rhq-server.jar</rhq.deploymentName> <rhq.deploymentDir>${rhq.containerDir}/${rhq.earDeployDir}/${rhq.deploymentName}</rhq.deploymentDir> </properties> commit b59d1684eb12c4e1c5a78309b4ec40eeb461b7d5 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 17 20:17:14 2013 -0400 fix test ear deployment error that resulted from renaming server jar The ear deployment was failing because classes were not getting added to the rhq-server.jar in the test ear. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java index 4dfbd46..2fd8624 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java @@ -341,7 +341,7 @@ public abstract class AbstractEJB3Test extends Arquillian { // merge rhq.ear into testEar but include only the EJB jars and the supporting libraries. Note that we // don't include the services sar because tests are responsible for prepare/unprepare of all required services, // we don't want the production services performing any unexpected work. - testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\\.jar.*")); + testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\\.jar.*|/rhq-server.jar.*")); // remove startup beans and shutdown listeners, we don't want this to be a full server deployment. The tests // start/stop what they need, typically with test services or mocks. testEar.delete(ArchivePaths @@ -413,7 +413,7 @@ public abstract class AbstractEJB3Test extends Arquillian { //System.out.println("** The Deployment EAR: " + testEar.toString(true) + "\n"); // Save the test EAR to a zip file for inspection (set file explicitly) - //exportZip(testEar, new File("c:/temp/test-ear.ear")); + exportZip(testEar, new File("/Users/jsanda/tmp/test-ear.ear")); return testEar; } commit c855df20b787a6db0a7b9aed7b1fb5597eb0e2d6 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jul 17 17:09:55 2013 -0400 Work on the windows rhq48 cassandra upgrade patch diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat index e0312dc..c190503 100644 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat @@ -1,14 +1,54 @@ @echo off + +rem =========================================================================== +rem RHQ Storage Node (Cassandra) Windows 4.8.0 upgrade patch script +rem +rem WHO NEEDS TO RUN THE PATCH? +rem +rem Run this patch script if you are: +rem - Running RHQ 4.8.0 on Windows +rem - Planning to upgrade and maintain your Storage node data +rem +rem PREQUISITES: +rem +rem This patch requires the installation of Python. Download Python 2.7.5 from: +rem +rem http://www.python.org/download/releases/2.7.5/ +rem +rem Install as directed. Note that Python will need to be on your PATH to run this patch. Also, +rem this patch will not work with Python3. +rem +rem Edit <rhq-install-dir>\rhq-storage\conf\cassandra.yaml to ensure the following is true: +rem +rem start_rpc: true +rem +rem Note the setting of rpc_port. By default it is 9160, which is fine. +rem +rem RUNNING THE PATCH: +rem +rem > cd <patch-dir> +rem > rhq48-storage-patch.bat <rhq-480-server-dir> <storage-node-ip-address> <thrift-rpc-port> <jmx-port> +rem +rem For example: +rem > rhq48-storage-patch.bat c:\rhq-server-4.8.0 127.0.0.1 9160 7299 +rem +rem Review the output carefully. There should be no errors (be careful, the script may still have completed). +rem If errors are encountered fix the issue and rerun the patch. +rem +rem When done, you can again edit cassandra.yaml and reset start_rpc: false +rem +rem =========================================================================== + setlocal if /i "%4" == "" ( - echo Usage: rhq48-storage-patch.bat ^<rhq-server-dir^> ^<storage-ip-address^> ^<cql-port^> ^<jmx-port^> + echo Usage: rhq48-storage-patch.bat ^<rhq-server-dir^> ^<storage-ip-address^> ^<thrift-rpc-port^> ^<jmx-port^> exit /B 1 ) set RHQ_SERVER_DIR=%1 -set CQL_HOSTNAME=%2 -set CQL_PORT=%3 +set CQLSH_HOST=%2 +set CQLSH_PORT=%3 set JMX_PORT=%4 set USERNAME="rhqadmin" set PASSWORD="rhqadmin" @@ -29,7 +69,7 @@ echo Waiting for RHQ Storage Node to start up.. rem Sleep is not implemented in all Windows prompts, this one won't work in Vista choice /n /c y /d y /t 3 -set RHQ_STORAGE_BIN=%RHQ_SERVER_DIR%\rhq-storage\bin\ +set RHQ_STORAGE_BIN=%RHQ_SERVER_DIR%\rhq-storage\bin set CQLSH_PATH=%RHQ_STORAGE_BIN%\cqlsh set NODETOOL_PATH=%RHQ_STORAGE_BIN%\nodetool.bat commit 11b8ae9cff9ca5085bfe317a01653cc8b81d8bb7 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Jul 17 14:14:02 2013 -0500 Initial implementation for the Storage Node configuration composite. The final resource operation still needs to be implemented but the rest of the functionality is implemented. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java index 14043db..575edc74 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java @@ -90,7 +90,7 @@ public class StorageNode implements Serializable { public static final long serialVersionUID = 1L; public static final String QUERY_FIND_ALL = "StorageNode.findAll"; - public static final String QUERY_FIND_BY_ADDRESS = "StorageNode.findByName"; + public static final String QUERY_FIND_BY_ADDRESS = "StorageNode.findByAddress"; public static final String QUERY_FIND_ALL_NOT_INSTALLED = "StorageNode.findAllCloudMembers"; public static final String QUERY_DELETE_BY_ID = "StorageNode.deleteById"; public static final String QUERY_FIND_ALL_NORMAL = "StorageNode.findAllNormalCloudMembers"; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java new file mode 100644 index 0000000..e2c64f9 --- /dev/null +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java @@ -0,0 +1,98 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.domain.cloud; + +import java.io.Serializable; + +/** + * @author Stefan Negrea + */ +public class StorageNodeConfigurationComposite implements Serializable { + private static final long serialVersionUID = 1L; + + private StorageNode storageNode; + private int jmxPort; + private String heapSize; + + public StorageNodeConfigurationComposite() { + // GWT needs this + } + + public StorageNodeConfigurationComposite(StorageNode storageNode) { + this.storageNode = storageNode; + } + + /** + * @return associated storage node + */ + public StorageNode getStorageNode() { + return storageNode; + } + + /** + * @param storageNode storage node + */ + protected void setStorageNode(StorageNode storageNode) { + this.storageNode = storageNode; + } + + + /** + * @return the JMX port + */ + public int getJmxPort() { + return jmxPort; + } + + /** + * @param jmxPort JMX port to set + */ + public void setJmxPort(int jmxPort) { + this.jmxPort = jmxPort; + } + + /** + * @return the heap size + */ + public String getHeapSize() { + return heapSize; + } + + /** + * @param heapSize heap size to set + */ + public void setHeapSize(String heapSize) { + this.heapSize = heapSize; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("storageNode.addresss=").append(storageNode.getAddress()).append(", "); + builder.append("heapSize=").append(heapSize).append(", "); + builder.append("jmxPort=").append(jmxPort).append(""); + return builder.toString(); + } +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index fa51fe1..3f1ec69 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -51,14 +51,18 @@ import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.cloud.Server; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.cloud.StorageNode.OperationMode; +import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.common.JobTrigger; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; +import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.measurement.MeasurementAggregate; import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.domain.operation.OperationRequestStatus; +import org.rhq.core.domain.operation.ResourceOperationHistory; import org.rhq.core.domain.operation.bean.GroupOperationSchedule; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; @@ -72,6 +76,7 @@ import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.authz.RequiredPermission; import org.rhq.enterprise.server.authz.RequiredPermissions; import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal; +import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal; import org.rhq.enterprise.server.operation.OperationManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; @@ -96,6 +101,11 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private static final String RHQ_STORAGE_JMX_PORT_PROPERTY = "jmxPort"; private static final String RHQ_STORAGE_ADDRESS_PROPERTY = "host"; + private static final int OPERATION_QUERY_TIMEOUT = 1000; + private static final int MAX_ITERATIONS = 5; + private static final String UPDATE_CONFIGURATION_OPERATION = "updateConfiguration"; + private static final String RESTART_OPERATION = "restart"; + @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) private EntityManager entityManager; @@ -120,6 +130,9 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @EJB private AlertManagerLocal alertManager; + @EJB + private ConfigurationManagerLocal configurationManager; + @Override public void linkResource(Resource resource) { List<StorageNode> storageNodes = this.getStorageNodes(); @@ -438,6 +451,19 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN entityManager.flush(); } + private StorageNode findStorageNodeByAddress(String address) { + TypedQuery<StorageNode> query = entityManager.<StorageNode> createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS, + StorageNode.class); + query.setParameter("address", address); + List<StorageNode> result = query.getResultList(); + + if (result != null && result.size() > 0) { + return result.get(0); + } + + return null; + } + private StorageNodeLoadComposite.MeasurementAggregateWithUnits getMeasurementAggregateWithUnits(Subject subject, int schedId, MeasurementUnits units, long beginTime, long endTime) { MeasurementAggregate measurementAggregate = measurementManager.getAggregate(subject, schedId, beginTime, @@ -559,4 +585,91 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return resourceIdsWithAlertDefinitions.toArray(new Integer[resourceIdsWithAlertDefinitions.size()]); } + + @Override + public StorageNodeConfigurationComposite retrieveConfiguration(Subject subject, StorageNode storageNode) { + StorageNodeConfigurationComposite configuration = new StorageNodeConfigurationComposite(storageNode); + + if (storageNode != null && storageNode.getResource() != null) { + Resource storageNodeResource = storageNode.getResource(); + Configuration storageNodeConfiguration = configurationManager.getResourceConfiguration(subject, + storageNodeResource.getId()); + + configuration.setHeapSize(storageNodeConfiguration.getSimpleValue("maxHeapSize")); + configuration.setJmxPort(storageNode.getJmxPort()); + } + + return configuration; + } + + @Override + public boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) { + StorageNode storageNode = findStorageNodeByAddress(storageNodeConfiguration.getStorageNode().getAddress()); + + if (storageNode != null && storageNode.getResource() != null) { + Resource storageNodeResource = storageNode.getResource(); + Configuration parameters = new Configuration(); + parameters.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); + parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); + + boolean updateConfigurationResult = runOperationAndWaitForResult(subject, storageNodeResource, + UPDATE_CONFIGURATION_OPERATION, parameters); + + if (updateConfigurationResult) { + boolean restartResult = runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, + null); + + if (restartResult) { + storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); + entityManager.persist(storageNode); + + return true; + } + } + } + + return false; + } + + private boolean runOperationAndWaitForResult(Subject subject, Resource storageNodeResource, String operationToRun, + Configuration parameters) { + + //scheduling the operation + long operationStartTime = System.currentTimeMillis(); + operationManager.scheduleResourceOperation(subject, storageNodeResource.getId(), operationToRun, 0, 0, 0, 0, + parameters, "Run by StorageNodeManagerBean"); + + //waiting for the operation result then return it + int iteration = 0; + boolean successResultFound = false; + while (iteration < MAX_ITERATIONS && !successResultFound) { + ResourceOperationHistoryCriteria criteria = new ResourceOperationHistoryCriteria(); + criteria.addFilterResourceIds(storageNodeResource.getId()); + criteria.addFilterStartTime(operationStartTime); + criteria.addFilterOperationName(operationToRun); + criteria.addFilterStatus(OperationRequestStatus.SUCCESS); + criteria.setPageControl(PageControl.getUnlimitedInstance()); + + PageList<ResourceOperationHistory> results = operationManager.findResourceOperationHistoriesByCriteria( + subject, criteria); + + if (results != null && results.size() > 0) { + successResultFound = true; + } + + if (successResultFound) { + break; + } else { + try { + Thread.sleep(OPERATION_QUERY_TIMEOUT); + } catch (Exception e) { + log.error(e); + } + } + + iteration++; + } + + return successResultFound; + } } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index a9b2514..6fca820 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -25,6 +25,7 @@ import javax.ejb.Local; import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.resource.Resource; @@ -56,6 +57,10 @@ public interface StorageNodeManagerLocal { */ StorageNodeLoadComposite getLoad(Subject subject, StorageNode node, long beginTime, long endTime); + StorageNodeConfigurationComposite retrieveConfiguration(Subject subject, StorageNode storageNode); + + boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration); + /** * Fetches the list of StorageNode entities based on provided criteria. * diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java index 72432db..7be1b07 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java @@ -23,6 +23,7 @@ import javax.ejb.Remote; import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.util.PageList; @@ -48,6 +49,10 @@ public interface StorageNodeManagerRemote { */ StorageNodeLoadComposite getLoad(Subject subject, StorageNode node, long beginTime, long endTime); + StorageNodeConfigurationComposite retrieveConfiguration(Subject subject, StorageNode storageNode); + + boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration); + /** * <p>Fetches the list of {@link StorageNode} entities based on provided criteria.</p> * diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java index 6b1940d..54ca4c2 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java @@ -71,7 +71,6 @@ public class StorageNodeMaintenanceJob extends AbstractStatefulJob { private final static String RUN_REPAIR_PROPERTY = "runRepair"; private final static String UPDATE_SEEDS_LIST = "updateSeedsList"; private final static String SEEDS_LIST = "seedsList"; - private final static String SUCCEED_PROPERTY = "succeed"; private static final String USERNAME_PROP = "rhq.cassandra.username"; private static final String PASSWORD_PROP = "rhq.cassandra.password"; @@ -169,8 +168,6 @@ public class StorageNodeMaintenanceJob extends AbstractStatefulJob { List<Resource> childResources = LookupUtil.getResourceManager().findResourcesByCriteria( LookupUtil.getSubjectManager().getOverlord(), c); - - for (Resource childResource : childResources) { if (STORAGE_SERVICE.equals(childResource.getName())) { try { diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 6194146..380da65 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -82,11 +82,19 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return prepareForUpgrade(parameters); } else if (name.equals("readRepair")) { return readRepair(); + } else if (name.equals("updateConfiguration")) { + return updateConfiguration(parameters); } else { return super.invokeOperation(name, parameters); } } + private OperationResult updateConfiguration(Configuration params) { + OperationResult result = new OperationResult("Configuration updated."); + //TODO: implement updates to various sub-resources here + return result; + } + private OperationResult nodeAdded(Configuration params) { boolean runRepair = params.getSimple("runRepair").getBooleanValue(); boolean updateSeedsList = params.getSimple("updateSeedsList").getBooleanValue(); @@ -222,12 +230,12 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } return result; } - + private OperationResult prepareForUpgrade(Configuration parameters) throws Exception { EmsConnection emsConnection = getEmsConnection(); EmsBean storageService = emsConnection.getBean("org.apache.cassandra.db:type=StorageService"); Class<?>[] emptyParams = new Class<?>[0]; - + if (log.isDebugEnabled()) { log.debug("Disabling native transport..."); } @@ -249,7 +257,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper snapshotName = System.currentTimeMillis() + ""; } operation.invoke(snapshotName, new String[] {}); - + // max 2 sec waitForTaskToComplete(500, 10, 150); @@ -261,7 +269,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return new OperationResult(); } - + private void waitForTaskToComplete(int initialWaiting, int maxTries, int sleepMillis) { // initial waiting try { diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 5a60d19..6ed31b7 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -73,7 +73,7 @@ </c:list-property> </results> </operation> - + <operation name="addNodeMaintenance"> <parameters> <c:simple-property name="runRepair" type="boolean" default="true"/> @@ -111,6 +111,16 @@ </parameters> </operation> + <operation name="updateConfiguration" description="Updates the node configuration. Will require a separate server restart for the settings to take effect."> + <parameters> + <c:simple-property name="heapSize" type="string" description="The heap size to be used for both -Xms and -Xmx JVM options."/> + <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> + </parameters> + <results> + <c:simple-property name="operationResult" description="Outcome of updating the configuration."/> + </results> + </operation> + <resource-configuration> <c:group name="MemorySettings"> <c:simple-property name="minHeapSize" @@ -195,3 +205,4 @@ <service name="Keyspace" sourcePlugin="Cassandra" sourceType="Keyspace"/> </server> </plugin> + commit b268d00034cb7af8d929006e8ac4688eeae58549 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 17 13:10:58 2013 -0400 Revert "cleaning up dependencies" This reverts commit e798901b83e37cd267a2d11489664569918ef90d. diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index 55dedb8..8e3b44a 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -15,6 +15,12 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-ccm-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-util</artifactId> <version>${project.version}</version> </dependency> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 97496f7..2245978 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -47,6 +47,18 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-ccm-core</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.cassandra</groupId> + <artifactId>cassandra-clientutil</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-ccm-testng</artifactId> <version>${project.version}</version> <scope>test</scope> commit a05f561f5fcac94b3308937b07d3b1e1e3f84d58 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 17 16:59:03 2013 +0200 Print simpler log message when component invocation is interrupted and log level is higher than debug diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java index a9fe1c2..3669947 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java @@ -671,8 +671,19 @@ public class ResourceContainer implements Serializable { public void markContextInterrupted() { localContext.markInterrupted(); - LOG.warn("Invocation has been marked interrupted for method [" + method + "] on resource [" - + resourceContainer.getResource() + "]"); + LOG.warn(getContextInterruptedWarningMessage(LOG.isDebugEnabled())); + } + + private String getContextInterruptedWarningMessage(boolean detailed) { + StringBuilder sb = new StringBuilder(); + sb.append("Invocation has been marked interrupted for method ["); + if (detailed) { + sb.append(method.toGenericString()); + } else { + sb.append(method.getDeclaringClass().getSimpleName()).append(".").append(method.getName()); + } + sb.append("] on resource [").append(resourceContainer.getResource()).append("]"); + return sb.toString(); } } }

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - 19 commits - etc/scripts modules/common modules/core modules/enterprise modules/plugins pom.xml
by mike thompson 24 Jul '13

24 Jul '13

etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh | 42 + modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java | 44 +- modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java | 44 +- modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java | 2 modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java | 159 +++++++ modules/core/client-api/src/test/resources/test-hibernate.xml | 8 modules/core/client-api/src/test/resources/test-jbossas.xml | 10 modules/core/client-api/src/test/resources/test-subcategories-nested.xml | 60 ++ modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java | 58 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java | 32 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 1 modules/enterprise/server/appserver/pom.xml | 11 modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf | 36 - modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env | 24 + modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc | 6 modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 11 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java | 37 - modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 83 ++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java | 42 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java | 17 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 1 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java | 66 ++- modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java | 18 modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 15 modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml | 2 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java | 7 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java | 12 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java | 7 modules/plugins/rhq-storage/pom.xml | 113 +++++ modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 148 ++++++ modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java | 142 ++++-- modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 13 modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java | 216 ++++++++++ modules/plugins/rhq-storage/src/test/resources/log4j.properties | 42 + pom.xml | 6 46 files changed, 1387 insertions(+), 178 deletions(-) New commits: commit 18fd1fb33345694e18ae21d0f3632a8b8a34d376 Merge: 05024a9 b537244 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 23 21:33:31 2013 -0700 Merge branch 'master' into mtho11/consolidated-metrics commit 05024a983a883423e6680ee0efcaa47445614666 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 23 17:56:20 2013 -0700 i18n the consolidated metrics diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 8797d59..010e06f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -116,7 +116,7 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re setListGridFields(fields.toArray(new ListGridField[0])); addTableAction(MSG.view_measureTable_getLive(), new ShowLiveDataTableAction(this)); - addExtraWidget(addToDashboardMenu, false); + //addExtraWidget(addToDashboardMenu, false); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java index 431e076..fbb9bff 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java @@ -78,7 +78,7 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C public ArrayList<ListGridField> getListGridFields() { ArrayList<ListGridField> fields = new ArrayList<ListGridField>(7); - ListGridField sparklineField = new ListGridField(FIELD_SPARKLINE, "chart"); + ListGridField sparklineField = new ListGridField(FIELD_SPARKLINE, MSG.chart_metrics_sparkline_header()); sparklineField.setCellFormatter(new CellFormatter() { @Override public String format(Object value, ListGridRecord record, int rowNum, int colNum) { diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index cf54939..abcfa62 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -23,6 +23,7 @@ chart_ie_not_supported = Charting is not available for this browser. chart_metrics= Metrics chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +chart_metrics_sparkline_header= Chart chart_no_data_label = No Data chart_single_value_label = Value chart_slider_button_bar_day = Day diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index ac8a91e..3a79eeb 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -51,6 +51,7 @@ chart_hover_time_format = %H:%M:%S ##chart_metrics= Metrics ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_day = Day diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index a775ed1..e79504c 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -26,6 +26,7 @@ chart_ie_not_supported = Charting ist bei diesem Browser nicht unterstützt ##chart_metrics= Metrics ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart chart_no_data_label = Keine Daten vorhanden ##chart_single_value_label = Value chart_slider_button_bar_day = Tag diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index cf88ed6..3f1f701 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -27,6 +27,7 @@ ##chart_metrics= Metrics ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 1849bb7..3d40d83 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -25,6 +25,7 @@ ##chart_metrics= Metrics ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 517c787..de43fa4 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -24,6 +24,7 @@ ##chart_metrics= Metrics ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 6311cef..669d8d6 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -24,6 +24,7 @@ ##chart_metrics= Metrics ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 67006d0..b15023f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -24,6 +24,7 @@ ##chart_metrics= Metrics ##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. ##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. +##chart_metrics_sparkline_header= Chart ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min commit b537244bad778a80f6fdf92880abc245eed465ec Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 23 22:23:06 2013 -0400 initial commit for StorageNodeComponentITest This is a first stab at some integration tests for the storage plugin. diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index a88f56e..df79e40 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -10,11 +10,16 @@ <groupId>org.rhq</groupId> <artifactId>rhq-rhqstorage-plugin</artifactId> - <packaging>jar</packaging> <name>RHQ Storage Plugin</name> <description>A plugin for managing RHQ Storage Nodes</description> + <properties> + <pc.basedir>${project.build.directory}/plugin-container</pc.basedir> + <pc.plugins.dir>${pc.basedir}/plugins</pc.plugins.dir> + <pc.lib.dir>${pc.basedir}/lib</pc.lib.dir> + </properties> + <dependencies> <dependency> <groupId>${rhq.groupId}</groupId> @@ -27,7 +32,6 @@ <groupId>${rhq.groupId}</groupId> <artifactId>rhq-cassandra-plugin</artifactId> <version>${project.version}</version> -  </dependency> <dependency> @@ -35,8 +39,113 @@ <artifactId>org-mc4j-ems</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-ccm-core</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-platform-plugin</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-schema</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>pre-integration-test</phase> + <configuration> + <target> + <property name="sigar.dir" value="${project.build.directory/sigar}"/> + + <mkdir dir="${pc.basedir}"/> + <mkdir dir="${pc.lib.dir}"/> + <mkdir dir="${pc.plugins.dir}"/> + + <copy file="${org.rhq:rhq-platform-plugin:jar}" todir="${pc.plugins.dir}"/> + <copy file="${org.rhq:rhq-jmx-plugin:jar}" todir="${pc.plugins.dir}"/> + <copy file="${org.rhq:rhq-cassandra-plugin:jar}" todir="${pc.plugins.dir}"/> + <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${pc.plugins.dir}"/> + + <unzip src="${org.hyperic:sigar-dist:zip}" dest="${sigar.dir}"> + <patternset> + <include name="**/lib/sigar.jar" /> + <include name="**/lib/bcel*.jar" /> + <include name="**/lib/*.so" /> + <include name="**/lib/*.sl" /> + <include name="**/lib/*.dll" /> + <include name="**/lib/*.dylib" /> + </patternset> + </unzip> + <move todir="${pc.lib.dir}" flatten="true"> + <fileset dir="${sigar.dir}" includes="**/lib/*"/> + </move> + <delete dir="${sigar.dir}"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.13</version> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>integration-test</goal> + </goals> + <configuration> + <includes> + <include>**/*ITest.java</include> + </includes> + <argLine>-Djava.library.path=${pc.lib.dir}</argLine> + <systemPropertyVariables> + <pc.plugins.dir>${pc.plugins.dir}</pc.plugins.dir> + </systemPropertyVariables> + </configuration> + </execution> + <execution> + <id>verify</id> + <goals> + <goal>verify</goal> + </goals> + <configuration> + <testFailureIgnore>false</testFailureIgnore> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/*ITest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + <profiles> <profile> <id>dev</id> diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java new file mode 100644 index 0000000..cd9f148 --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -0,0 +1,216 @@ +package org.rhq.plugins.storage; + +import static java.util.Arrays.asList; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.io.File; +import java.net.InetAddress; +import java.util.Set; + +import com.google.common.collect.Sets; + +import org.testng.annotations.AfterSuite; +import org.testng.annotations.BeforeSuite; +import org.testng.annotations.Test; + +import org.rhq.cassandra.CassandraClusterManager; +import org.rhq.cassandra.ClusterInitService; +import org.rhq.cassandra.Deployer; +import org.rhq.cassandra.DeploymentOptions; +import org.rhq.cassandra.DeploymentOptionsFactory; +import org.rhq.cassandra.schema.SchemaManager; +import org.rhq.core.clientapi.server.discovery.InventoryReport; +import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pc.PluginContainer; +import org.rhq.core.pc.PluginContainerConfiguration; +import org.rhq.core.pc.inventory.InventoryManager; +import org.rhq.core.pc.operation.OperationContextImpl; +import org.rhq.core.pc.operation.OperationManager; +import org.rhq.core.pc.operation.OperationServicesAdapter; +import org.rhq.core.pc.plugin.FileSystemPluginFinder; +import org.rhq.core.pluginapi.operation.OperationServicesResult; +import org.rhq.core.pluginapi.operation.OperationServicesResultCode; +import org.rhq.core.pluginapi.util.ProcessExecutionUtility; +import org.rhq.core.system.ProcessExecution; +import org.rhq.core.system.ProcessExecutionResults; +import org.rhq.core.system.SystemInfo; +import org.rhq.core.system.SystemInfoFactory; + +/** + * @author John Sanda + */ +public class StorageNodeComponentITest { + + private File basedir; + + private Resource storageNode; + + @BeforeSuite + public void deployStorageNodeAndPluginContainer() throws Exception { + basedir = new File("target", "rhq-storage"); + + deployStorageNode(); + + initPluginContainer(); + } + + private void deployStorageNode() throws Exception { + DeploymentOptionsFactory factory = new DeploymentOptionsFactory(); + DeploymentOptions deploymentOptions = factory.newDeploymentOptions(); + String address = "127.0.0.1"; + + deploymentOptions.setSeeds(address); + deploymentOptions.setListenAddress(address); + deploymentOptions.setRpcAddress(address); + deploymentOptions.setBasedir(basedir.getAbsolutePath()); + deploymentOptions.setCommitLogDir(new File(basedir, "commit_log").getAbsolutePath()); + deploymentOptions.setDataDir(new File(basedir, "data").getAbsolutePath()); + deploymentOptions.setSavedCachesDir(new File(basedir, "saved_caches").getAbsolutePath()); + deploymentOptions.setCommitLogDir(new File(basedir, "logs").getAbsolutePath()); + deploymentOptions.setLoggingLevel("DEBUG"); + deploymentOptions.setNativeTransportPort(9142); + deploymentOptions.setJmxPort(7399); + deploymentOptions.setHeapSize("256M"); + deploymentOptions.setHeapNewSize("64M"); + + deploymentOptions.load(); + + Deployer deployer = new Deployer(); + deployer.setDeploymentOptions(deploymentOptions); + + deployer.unzipDistro(); + deployer.applyConfigChanges(); + deployer.updateFilePerms(); + deployer.updateStorageAuthConf(Sets.newHashSet(InetAddress.getByName(address))); + + File binDir = new File(basedir, "bin"); + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + + File startScript = new File(binDir, "cassandra"); + ProcessExecution startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + + startScriptExe.addArguments(asList("-p", "cassandra.pid")); + startScriptExe.setCaptureOutput(true); + ProcessExecutionResults results = systemInfo.executeProcess(startScriptExe); + + assertEquals(results.getExitCode(), (Integer) 0, "Cassandra failed to start: " + results.getCapturedOutput()); + + StorageNode storageNode = new StorageNode(); + storageNode.parseNodeInformation("127.0.0.1|7399|9142"); + + ClusterInitService clusterInitService = new ClusterInitService(); + clusterInitService.waitForClusterToStart(asList(storageNode)); + + SchemaManager schemaManager = new SchemaManager("rhqadmin", "rhqadmin", "127.0.0.1|7399|9142"); + schemaManager.install(); + schemaManager.updateTopology(true); + } + + private void initPluginContainer() { + PluginContainerConfiguration pcConfig = new PluginContainerConfiguration(); + File pluginsDir = new File(System.getProperty("pc.plugins.dir")); + pcConfig.setPluginDirectory(pluginsDir); + pcConfig.setPluginFinder(new FileSystemPluginFinder(pluginsDir)); + + pcConfig.setInsideAgent(false); + PluginContainer.getInstance().setConfiguration(pcConfig); + PluginContainer.getInstance().initialize(); + } + + @AfterSuite + public void ShutdownPluginContainerAndStorageNode() throws Exception { + PluginContainer.getInstance().shutdown(); + shutdownStorageNodeIfNecessary(); + } + + private void shutdownStorageNodeIfNecessary() throws Exception { + File binDir = new File(basedir, "bin"); + File pidFile = new File(binDir, "cassandra.pid"); + + if (pidFile.exists()) { + CassandraClusterManager ccm = new CassandraClusterManager(); + ccm.killNode(basedir); + } + } + + @Test + public void discoverStorageNode() { + InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); + InventoryReport inventoryReport = inventoryManager.executeServerScanImmediately(); + + if (inventoryReport.getAddedRoots().isEmpty()) { + // could be empty if the storage node is already in inventory from + // a prior discovery scan. + Resource platform = inventoryManager.getPlatform(); + storageNode = findCassandraNode(platform.getChildResources()); + } else { + storageNode = findCassandraNode(inventoryReport.getAddedRoots()); + } + + assertNotNull(storageNode, "Failed to discover Storage Node instance"); + assertNodeIsUp("Expected " + storageNode + " to be UP after discovery"); + } + + @Test(dependsOnMethods = "discoverStorageNode") + public void shutdownStorageNode() throws Exception { + OperationManager operationManager = PluginContainer.getInstance().getOperationManager(); + OperationServicesAdapter operationsService = new OperationServicesAdapter(operationManager); + + long timeout = 1000 * 60; + OperationContextImpl operationContext = new OperationContextImpl(storageNode.getId()); + OperationServicesResult result = operationsService.invokeOperation(operationContext, "shutdown", + new Configuration(), timeout); + + assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The shutdown operation failed"); + // TODO why is this failing? + assertNodeIsDown("Expected " + storageNode + " to be DOWN after shutting it down"); + } + + private void assertNodeIsUp(String msg) { + executeAvailabilityScan(); + + Availability availability = getAvailability(); + + assertNotNull(availability, "Unable to determine availability for " + storageNode); + assertEquals(availability.getAvailabilityType(), AvailabilityType.UP, msg); + } + + private void assertNodeIsDown(String msg) { + executeAvailabilityScan(); + + Availability availability = getAvailability(); + + assertNotNull(availability, "Unable to determine availability for " + storageNode); + assertEquals(availability.getAvailabilityType(), AvailabilityType.DOWN, msg); + } + + private Availability getAvailability() { + InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); + return inventoryManager.getAvailabilityIfKnown(storageNode); + } + + private void executeAvailabilityScan() { + InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); + inventoryManager.executeAvailabilityScanImmediately(false, true); + } + + private Resource findCassandraNode(Set<Resource> resources) { + for (Resource resource : resources) { + if (isCassandraNode(resource.getResourceType())) { + return resource; + } + } + return null; + } + + private boolean isCassandraNode(ResourceType type) { + return type.getPlugin().equals("RHQStorage") && type.getName().equals("RHQ Storage Node"); + } + +} diff --git a/modules/plugins/rhq-storage/src/test/resources/log4j.properties b/modules/plugins/rhq-storage/src/test/resources/log4j.properties new file mode 100644 index 0000000..67db049 --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/resources/log4j.properties @@ -0,0 +1,42 @@ +# +# /* +# * RHQ Management Platform +# * Copyright (C) 2005-2012 Red Hat, Inc. +# * All rights reserved. +# * +# * This program is free software; you can redistribute it and/or modify +# * it under the terms of the GNU General Public License, version 2, as +# * published by the Free Software Foundation, and/or the GNU Lesser +# * General Public License, version 2.1, also as published by the Free +# * Software Foundation. +# * +# * This program is distributed in the hope that it will be useful, +# * but WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# * GNU General Public License and the GNU Lesser General Public License +# * for more details. +# * +# * You should have received a copy of the GNU General Public License +# * and the GNU Lesser General Public License along with this program; +# * if not, write to the Free Software Foundation, Inc., +# * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# */ +# + +log4j.rootCategory=WARN, FILE, CONSOLE + +log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender +log4j.appender.FILE.DatePattern='.'yyyy-MM-dd +log4j.appender.FILE.File=./target/test.log +log4j.appender.FILE.layout=org.apache.log4j.PatternLayout +log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n +#log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n +log4j.appender.FILE.Append=false + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +#log4j.appender.CONSOLE.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n + +log4j.logger.org.rhq=DEBUG +log4j.logger.com.datastax=DEBUG commit 83e5b228871c9a8352e98a12e0db76f8f4ea982e Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 23 22:16:41 2013 -0400 first stab at prepareForBootstrap operation (which is currently broken) This is clearly broken from some manual testing I did. Given that the implementation is a bit sloppy at the moment, this is a good time to get some automated tests in place. The operation will perform the following steps in the ordered specified: 1) shut down the storage node 2) update cassandra.yaml 3) update rhq-storage-auth.conf 4) restart the node diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 0037bfe..f76da22 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -111,7 +111,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent clusterBuilder = clusterBuilder.withCredentials(username, password); } - this.cassandraSession = clusterBuilder.build().connect(clusterName); +// this.cassandraSession = clusterBuilder.build().connect(clusterName); } catch (Exception e) { LOG.error("Connect to Cassandra " + host + ":" + nativePort, e); throw e; @@ -196,7 +196,17 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent operation = storageService.getOperation("drain", emptyParams); operation.invoke((Object[]) emptyParams); - ProcessInfo process = context.getNativeProcess(); + return stopNode(); + } + + protected OperationResult stopNode() { + ProcessInfo process = getResourceContext().getNativeProcess(); + + if (processInfo == null) { + LOG.warn("Failed to obtain process info. It appears Cassandra is already shutdown."); + return new OperationResult("Failed to obtain process info. It appears Cassandra is already shutdown."); + } + long pid = process.getPid(); try { process.kill("KILL"); @@ -209,6 +219,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } + protected OperationResult startNode() { ResourceContext<?> context = getResourceContext(); Configuration pluginConfig = context.getPluginConfiguration(); diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 3b0aa5b..d9b35b9 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -26,11 +26,15 @@ package org.rhq.plugins.storage; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; @@ -39,6 +43,8 @@ import org.mc4j.ems.connection.EmsConnection; import org.mc4j.ems.connection.bean.EmsBean; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.connection.bean.operation.EmsOperation; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; @@ -48,6 +54,7 @@ import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.core.util.StringUtil; @@ -96,6 +103,8 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return updateConfiguration(parameters); } else if (name.equals("updateKnownNodes")) { return updateKnownNodes(parameters); + } else if (name.equals("prepareForBootstrap")) { + return prepareForBootstrap(parameters); } else { return super.invokeOperation(name, parameters); } @@ -132,6 +141,18 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper ipAddresses.add(propertySimple.getStringValue()); } + if (updateAuthFile(result, ipAddresses)) return result; + + EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); + EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); + emsOperation.invoke(); + + result.setSimpleResult("Successfully updated the set of known nodes."); + + return result; + } + + private boolean updateAuthFile(OperationResult result, Set<String> ipAddresses) { log.info("Updating known nodes to " + ipAddresses); File confDir = new File(getBasedir(), "conf"); @@ -150,7 +171,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper log.error(msg); result.setErrorMessage(msg); - return result; + return true; } } @@ -161,7 +182,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper "to unexpected error"; log.error(msg, e); result.setErrorMessage(msg + ": " + ThrowableUtil.getRootMessage(e)); - return result; + return true; } try { @@ -176,18 +197,127 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } result.setErrorMessage("There was an unexpected error while updating " + authFile + ". Make sure that " + "it matches " + authBackupFile + " and then reschedule the operation."); + return true; + } + return false; + } + + private OperationResult prepareForBootstrap(Configuration params) { + log.info("Preparing " + this + " for bootstrap..."); + + ResourceContext context = getResourceContext(); + OperationResult result = new OperationResult(); + + log.info("Stopping storage node"); + OperationResult stopNodeResult = stopNode(); + if (stopNodeResult.getErrorMessage() != null) { + log.error("Failed to stop storage node " + this + " Cannot prepare the node for bootstrap which means " + + "that the storage node cannot join the cluster. Make sure the storage node is not running and retry " + + "the operation"); + result.setErrorMessage("Failed to stop storage node. Cannot prepare the node for bootstrap which means " + + "that it cannot join the cluster. Make sure that the node is not running and retry the operation. " + + "Stopping the storage node failed with this error: " + stopNodeResult.getErrorMessage()); return result; } - EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); - EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); - emsOperation.invoke(); + Configuration pluginConfig = context.getPluginConfiguration(); + String yamlProp = pluginConfig.getSimpleValue("yamlConfiguration"); + File yamlFile = new File(yamlProp); - result.setSimpleResult("Successfully updated the set of known nodes."); + DumperOptions options = new DumperOptions(); + options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + Yaml yaml = new Yaml(options); + + Map yamlConfig = null; + try { + yamlConfig = (Map) yaml.load(new FileInputStream(yamlFile)); + } catch (FileNotFoundException e) { + log.error("Failed to load " + yamlFile, e); + log.error("Cannot prepare " + this + " for bootstrap. " + yamlFile + " must exist in order to make the " + + "necessary configuration changes."); + result.setErrorMessage("Cannot prepare storage node for bootstrap. It appears that " + yamlFile + + " does not exist. Make sure that it exists so that the necessary configuration changes can be made."); + + return result; + } + + purgeDir(getCommitLogDir(yamlConfig)); + for (File dataDir : getDataDirs(yamlConfig)) { + purgeDir(dataDir); + } + purgeDir(getSavedCachesDir(yamlConfig)); + + log.info("Updating cluster settings"); + + String address = pluginConfig.getSimpleValue("host"); + List<String> seeds = getAddresses(params.getList("storageNodeIPAddresses")); + // Make sure this node's address is not in the list; otherwise, it + // won't bootstrap properly. + seeds.remove(address); + try { + updateSeedsList(seeds); + } catch (IOException e) { + log.error("Failed to update seeds property in " + yamlFile, e); + result.setErrorMessage("Failed to prepared node for bootstrap due to unexpected error that occurred " + + "while updating seeds property in " + yamlFile + ":\n" + ThrowableUtil.getAllMessages(e)); + return result; + } + + if (updateAuthFile(result, new HashSet<String>(seeds))) { + return result; + } + + int cqlPort = Integer.parseInt(params.getSimpleValue("cqlPort")); + int gossipPort = Integer.parseInt(params.getSimpleValue("gossipPort")); + + yamlConfig.put("native_transport_port", cqlPort); + yamlConfig.put("storage_port", gossipPort); + + try { + yaml.dump(yamlConfig, new FileWriter(yamlFile)); + } catch (IOException e) { + log.error("Could not update cluster settings in " + yamlFile, e); + result.setErrorMessage("Could not update cluster settings in " + yamlFile + ":\n" + + ThrowableUtil.getAllMessages(e)); + return result; + } + + log.info(this + " is ready to be bootstrap. Restarting storage node..."); + OperationResult startResult = startNode(); + if (startResult.getErrorMessage() != null) { + log.error("Failed to restart storage node:\n" + startResult.getErrorMessage()); + result.setErrorMessage("Failed to restart storage node:\n" + startResult.getErrorMessage()); + } else { + result.setSimpleResult("The storage node was succesfully updated is now bootstrapping into the cluster."); + } return result; } + private void purgeDir(File dir) { + log.info("Purging " + dir); + FileUtil.purge(dir, true); + } + + private File getCommitLogDir(Map yamlConfig) { + return new File((String) yamlConfig.get("commitlog_directory")); + } + + private List<File> getDataDirs(Map yamlConfig) { + List<File> dirs = new ArrayList<File>(); + List<String> dirNames = (List<String>) yamlConfig.get("data_file_directories"); + + for (String dirName : dirNames) { + dirs.add(new File(dirName)); + } + + return dirs; + } + + private File getSavedCachesDir(Map yamlConfig) { + return new File((String) yamlConfig.get("saved_caches_directory")); + } + private OperationResult nodeAdded(Configuration params) { boolean runRepair = params.getSimple("runRepair").getBooleanValue(); boolean updateSeedsList = params.getSimple("updateSeedsList").getBooleanValue(); @@ -405,4 +535,10 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper boolean succeeded; String details; } + + @Override + public String toString() { + return StorageNodeComponent.class.getSimpleName() + "[resourceKey: " + getResourceContext().getResourceKey() + + "]"; + } } diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 1e39d6c..cd84de6 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -101,6 +101,16 @@ </parameters> </operation> + <operation name="prepareForBootstrap"> + <parameters> + <c:simple-property name="cqlPort" type="integer" displayName="CQL Port"/> + <c:simple-property name="gossipPort" type="integer"/> + <c:list-property name="storageNodeIPAddresses" displayName="Storage Node IP Addresses"> + <c:simple-property name="storageNodeIPAddress"/> + </c:list-property> + </parameters> + </operation> + <operation name="prepareForUpgrade" description="Prepares the storage node for upgrade (this operation consists of following steps: 1) turning off the RPC server, 2) turning off the gossiper, 3) taking the snapshot (backuping the data), 4) invoking the drain operation"> <parameters> <c:simple-property name="snapshotName" required="false" type="string" displayName="Snapshot Name" commit 4fa9f082b2e011b3bde9defe1021248148c4ad40 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Tue Jul 23 15:02:09 2013 -0400 [BZ 984649] fix module metadata. diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 145e3af..82ff294 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -290,7 +290,7 @@ <delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar.index" />  <replace file="${jboss.home}/modules/system/layers/base/org/jgroups/main/module.xml" - token="jgroups-${jgroups.initial.version}.jar" value="${jgroups.patch.version}"/> + token="jgroups-${jgroups.initial.version}.jar" value="jgroups-${jgroups.patch.version}.jar"/>  <copy file="${settings.localRepository}/org/jgroups/jgroups/${jgroups.patch.version}/jgroups-${jgroups.patch.version}.jar" toDir="${jboss.home}/modules/system/layers/base/org/jgroups/main" verbose="true"/> commit 8203c669b3b3ba5ed5c3ef27f051220da93ea868 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Tue Jul 23 13:37:32 2013 -0400 Upgrading richfaces to latest patched version. diff --git a/pom.xml b/pom.xml index 3662bc7..f909033 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ <postgresql.version>9.2-1002.jdbc4</postgresql.version> <h2.version>1.2.139</h2.version> <jtds.version>1.2.2</jtds.version> - <richfaces.version>3.3.3.Final</richfaces.version> + <richfaces.version>3.3.4.Final</richfaces.version> <jline.version>0.9.94</jline.version> <sigar.version>1.6.5.132-5</sigar.version> <sigar.zip.version>1.6.5</sigar.zip.version> commit caeb7a5c832334b74f76a265c8028a5697152dda Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Tue Jul 23 12:28:52 2013 -0400 [BZ 984649] update jgroups usage to latest patched version. diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 0a61138..f1a4c7b 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -19,6 +19,8 @@ <properties> <rhq.dev.data.dir>${rhq.rootDir}/rhq-data</rhq.dev.data.dir> + <jgroups.initial.version>3.2.7.Final</jgroups.initial.version> + <jgroups.patch.version>3.2.10.Final</jgroups.patch.version> </properties> <dependencies> @@ -72,6 +74,13 @@ <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> </dependency> + +  + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>${jgroups.patch.version}</version> + </dependency> </dependencies> <build> @@ -157,6 +166,8 @@ <property name="rhq.server.http.port" value="${rhq.server.http.port}" /> <property name="rhq.server.https.port" value="${rhq.server.https.port}" /> <property name="rhq.sync.endpoint-address" value="${rhq.sync.endpoint-address}" /> + <property name="jgroups.initial.version" value="${jgroups.initial.version}" /> + <property name="jgroups.patch.version" value="${jgroups.patch.version}" /> </ant> </target> </configuration> diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index a81b6cd..145e3af 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -283,6 +283,17 @@ </resources> </module> ]]></echo> + + <echo>Updating JGroups module component for EAP to ${jgroups.patch.version}</echo> +  + <delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar" /> + <delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar.index" /> +  + <replace file="${jboss.home}/modules/system/layers/base/org/jgroups/main/module.xml" + token="jgroups-${jgroups.initial.version}.jar" value="${jgroups.patch.version}"/> +  + <copy file="${settings.localRepository}/org/jgroups/jgroups/${jgroups.patch.version}/jgroups-${jgroups.patch.version}.jar" + toDir="${jboss.home}/modules/system/layers/base/org/jgroups/main" verbose="true"/> <echo>Generate SSL key for RHQ server - 128-bit key that expires in 20 years</echo> <property name="jboss.conf.dir" location="${jboss.home}/standalone/configuration" /> commit cc64adde1d8835f8c000afe2de0746fda5bbd5c1 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Jul 23 08:43:19 2013 -0500 One more place where the previous rebase removed code for the storage node configuration. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 31e3bf7..9416c67 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -643,6 +643,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN Configuration parameters = new Configuration(); parameters.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); + parameters.setSimpleValue("heapNewSize", storageNodeConfiguration.getHeapNewSize() + ""); + parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); boolean updateConfigurationResult = runOperationAndWaitForResult(subject, storageNodeResource, UPDATE_CONFIGURATION_OPERATION, parameters); commit 373a931987b402479df3d02269cc00f4ac88a358 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Jul 23 08:42:49 2013 -0500 Enable the new set of calculated metrics for disk space utilization in the UI and CLI. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java index 80bfdd6..2c0b8f8 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java @@ -41,9 +41,13 @@ public class StorageNodeLoadComposite implements Serializable { private MeasurementAggregateWithUnits heapUsed; private MeasurementAggregateWithUnits heapPercentageUsed; private MeasurementAggregateWithUnits load; - private MeasurementAggregateWithUnits partitionDiskUsedPercentage; private MeasurementAggregateWithUnits dataDiskUsed; private MeasurementAggregate tokens; + + private MeasurementAggregateWithUnits dataDiskUsedPercentage; + private MeasurementAggregateWithUnits totalDiskUsedPercentage; + private MeasurementAggregate freeDiskToDataSizeRatio; + private MeasurementAggregateWithUnits actuallyOwns; public StorageNodeLoadComposite() { @@ -113,35 +117,59 @@ public class StorageNodeLoadComposite implements Serializable { public void setHeapPercentageUsed(MeasurementAggregateWithUnits heapPercentageUsed) { this.heapPercentageUsed = heapPercentageUsed; } - + /** * @deprecated use {@link #getPartitionDiskUsedPercentage() getPartitionDiskUsedPercentage()} instead - * + * * @return partitionDiskUsedPercentage */ public MeasurementAggregateWithUnits getDiskSpacePercentageUsed() { - return getPartitionDiskUsedPercentage(); + return getDataDiskUsedPercentage(); } - + /** * @deprecated use {@link #setPartitionDiskUsedPercentage() setPartitionDiskUsedPercentage()} instead - * + * * @param partitionDiskUsedPercentage */ - public void setDiskSpacePercentageUsed(MeasurementAggregateWithUnits partitionDiskUsedPercentage) { - setPartitionDiskUsedPercentage(partitionDiskUsedPercentage); + public void setDiskSpacePercentageUsed(MeasurementAggregateWithUnits diskUsedPercentage) { + setDataDiskUsedPercentage(diskUsedPercentage); + } + + /** + * @return A computed metric for the percentage of disk space used by data file on the corresponding partitions. + * If multiple data locations are configured then the aggregate is calculated. + */ + public MeasurementAggregateWithUnits getDataDiskUsedPercentage() { + return dataDiskUsedPercentage; + } + + public void setDataDiskUsedPercentage(MeasurementAggregateWithUnits dataDiskUsedPercentage) { + this.dataDiskUsedPercentage = dataDiskUsedPercentage; + } + + /** + * @return A computed metric for the percentage of total (system + Storage Node data file) disk space used the partitions where data files are stored. + * If multiple data locations are configured then the aggregate is calculated. + */ + public MeasurementAggregateWithUnits getTotalDiskUsedPercentage() { + return totalDiskUsedPercentage; + } + + public void setTotalDiskUsedPercentage(MeasurementAggregateWithUnits totalDiskUsedPercentage) { + this.totalDiskUsedPercentage = totalDiskUsedPercentage; } /** - * @return A computed metric for the percentage of disk space used on the partition that contains the SSTables. - * If multiple data locations are configured then the partition with the highest utilization will be reported. + * @return A computed metric for the percentage of total (system + Storage Node data file) disk space used the partitions where data files are stored. + * If multiple data locations are configured then the aggregate is calculated. */ - public MeasurementAggregateWithUnits getPartitionDiskUsedPercentage() { - return partitionDiskUsedPercentage; + public MeasurementAggregate getFreeDiskToDataSizeRatio() { + return freeDiskToDataSizeRatio; } - public void setPartitionDiskUsedPercentage(MeasurementAggregateWithUnits partitionDiskUsedPercentage) { - this.partitionDiskUsedPercentage = partitionDiskUsedPercentage; + public void setFreeDiskToDataSizeRatio(MeasurementAggregate freeDiskToDataSizeRatio) { + this.freeDiskToDataSizeRatio = freeDiskToDataSizeRatio; } /** @@ -202,7 +230,7 @@ public class StorageNodeLoadComposite implements Serializable { builder.append("heapUsed=").append(heapUsed).append(", "); builder.append("heapPercentageUsed=").append(heapPercentageUsed).append(", "); builder.append("load=").append(load).append(", "); - builder.append("partitionDiskUsedPercentage=").append(partitionDiskUsedPercentage).append(", "); + builder.append("dataUsedPercentage=").append(dataDiskUsedPercentage).append(", "); builder.append("dataDiskUsed=").append(dataDiskUsed).append(", "); builder.append("tokens=").append(tokens).append(", "); builder.append("actuallyOwns=").append(actuallyOwns); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java index 7d413fd..07064b7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java @@ -47,6 +47,7 @@ import org.rhq.core.domain.cloud.StorageNode.OperationMode; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite.MeasurementAggregateWithUnits; import org.rhq.core.domain.criteria.StorageNodeCriteria; +import org.rhq.core.domain.measurement.MeasurementAggregate; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; @@ -200,7 +201,8 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod public static class StorageNodeLoadCompositeDatasource extends RPCDataSource<StorageNodeLoadComposite, StorageNodeCriteria> { public static final String HEAP_PERCENTAGE_KEY = "heapPercentage"; - public static final String DISK_SPACE_PERCENTAGE_KEY = "diskSpacePercentage"; + public static final String DATA_DISK_SPACE_PERCENTAGE_KEY = "dataDiskSpacePercentage"; + public static final String TOTAL_DISK_SPACE_PERCENTAGE_KEY = "totalDiskSpacePercentage"; private int id; public static StorageNodeLoadCompositeDatasource getInstance(int id) { @@ -296,10 +298,15 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod "This value is calculated by dividing Heap Used by Heap Maximum.", HEAP_PERCENTAGE_KEY), Arrays.<Object> asList(loadComposite.getLoad(), "Load", "Data stored on the node", "load"), Arrays.<Object> asList( - loadComposite.getPartitionDiskUsedPercentage(), - "Disk Space Percent Used", - "Percentage of total disk space used for the partition that contains the data files.If multiple data locations are specified then this will report the average utilization accross all the partitions.", - DISK_SPACE_PERCENTAGE_KEY), + loadComposite.getDataDiskUsedPercentage(), + "Data Disk Space Percent Used", + "Percentage of disk space used by data files on the partitions that contain the data files. If multiple data locations are specified then the aggregate accross all the partitions that contain data files is reported.", + DATA_DISK_SPACE_PERCENTAGE_KEY), + Arrays.<Object> asList( + loadComposite.getTotalDiskUsedPercentage(), + "Total Disk Space Percent Used", + "Percentage of total disk space used (system and Storage Node) on the partitions that contain the data files. If multiple data locations are specified then the aggregate accross all the partitions that contain data files is reported.", + TOTAL_DISK_SPACE_PERCENTAGE_KEY), Arrays.<Object> asList( loadComposite.getDataDiskUsed(), "Total Disk Space Used", @@ -325,6 +332,21 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod recordsList.add(tokens); } + + if (loadComposite.getFreeDiskToDataSizeRatio() != null){ + MeasurementAggregate aggregate = loadComposite.getFreeDiskToDataSizeRatio(); + + ListGridRecord record = new ListGridRecord(); + record.setAttribute("id", "freeDiskToDataSizeRatio"); + record.setAttribute("name", "Free Disk To Data Size Ratio"); + record.setAttribute("hover", "Ratio of (Free Disk)/(Data File Size). A value below 1 is not recommended since a compaction or repair process could double the amount of disk space used by data files. If multiple data locations are specified then the aggregate accross all the partitions that contain data files is reported."); + record.setAttribute("min", aggregate.getMin()); + record.setAttribute("avg", aggregate.getAvg()); + record.setAttribute("max", aggregate.getMax()); + + recordsList.add(record); + } + ListGridRecord[] records = recordsList.toArray(new ListGridRecord[recordsList.size()]); return records; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java index e8dde9d..e044e4e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java @@ -51,8 +51,9 @@ public class StorageNodeLoadComponent extends EnhancedVLayout { @Override protected String getCellCSSText(ListGridRecord record, int rowNum, int colNum) { if ("avg".equals(getFieldName(colNum)) - && (StorageNodeLoadCompositeDatasource.HEAP_PERCENTAGE_KEY.equals(record.getAttribute("id")) || StorageNodeLoadCompositeDatasource.DISK_SPACE_PERCENTAGE_KEY - .equals(record.getAttribute("id")))) { + && (StorageNodeLoadCompositeDatasource.HEAP_PERCENTAGE_KEY.equals(record.getAttribute("id")) || + StorageNodeLoadCompositeDatasource.DATA_DISK_SPACE_PERCENTAGE_KEY.equals(record.getAttribute("id")) || + StorageNodeLoadCompositeDatasource.TOTAL_DISK_SPACE_PERCENTAGE_KEY.equals(record.getAttribute("id")))) { if (record.getAttributeAsFloat("avgFloat") > .85) { return "font-weight:bold; color:#d64949;"; } else if (record.getAttributeAsFloat("avgFloat") > .7) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index fab803b..31e3bf7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -253,13 +253,16 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN Map<String, Integer> scheduleIdsMap = new HashMap<String, Integer>(); // get the schedule ids for Storage Service resource - final String tokensMetric = "Tokens", ownershipMetric = "Ownership", diskUsedPercentageMetric = "Calculated.PartitionDiskUsedPercentage"; + final String tokensMetric = "Tokens", ownershipMetric = "Ownership"; + final String dataDiskUsedPercentageMetric = "Calculated.DataDiskUsedPercentage"; + final String totalDiskUsedPercentageMetric = "Calculated.TotalDiskUsedPercentage"; + final String freeDiskToDataRatioMetric = "Calculated.FreeDiskToDataSizeRatio"; final String loadMetric = "Load", keyCacheSize = "KeyCacheSize", rowCacheSize = "RowCacheSize", totalCommitLogSize = "TotalCommitlogSize"; TypedQuery<Object[]> query = entityManager.<Object[]> createNamedQuery( StorageNode.QUERY_FIND_SCHEDULE_IDS_BY_PARENT_RESOURCE_ID_AND_MEASUREMENT_DEFINITION_NAMES, Object[].class); query.setParameter("parrentId", resourceId).setParameter("metricNames", - Arrays.asList(tokensMetric, ownershipMetric, diskUsedPercentageMetric, loadMetric, keyCacheSize, - rowCacheSize, totalCommitLogSize)); + Arrays.asList(tokensMetric, ownershipMetric, loadMetric, keyCacheSize, rowCacheSize, totalCommitLogSize, + dataDiskUsedPercentageMetric, totalDiskUsedPercentageMetric, freeDiskToDataRatioMetric)); for (Object[] pair : query.getResultList()) { scheduleIdsMap.put((String) pair[0], (Integer) pair[1]); } @@ -292,10 +295,22 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); result.setActuallyOwns(ownershipAggregateWithUnits); } - if ((scheduleId = scheduleIdsMap.get(diskUsedPercentageMetric)) != null) { - StorageNodeLoadComposite.MeasurementAggregateWithUnits diskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( + + //calculated disk space related metrics + if ((scheduleId = scheduleIdsMap.get(dataDiskUsedPercentageMetric)) != null) { + StorageNodeLoadComposite.MeasurementAggregateWithUnits dataDiskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( + subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); + result.setDataDiskUsedPercentage(dataDiskUsedPercentageAggregateWithUnits); + } + if ((scheduleId = scheduleIdsMap.get(totalDiskUsedPercentageMetric)) != null) { + StorageNodeLoadComposite.MeasurementAggregateWithUnits totalDiskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); - result.setPartitionDiskUsedPercentage(diskUsedPercentageAggregateWithUnits); + result.setDataDiskUsedPercentage(totalDiskUsedPercentageAggregateWithUnits); + } + if ((scheduleId = scheduleIdsMap.get(freeDiskToDataRatioMetric)) != null) { + MeasurementAggregate freeDiskToDataRatioAggregate = measurementManager.getAggregate(subject, + scheduleId, beginTime, endTime); + result.setFreeDiskToDataSizeRatio(freeDiskToDataRatioAggregate); } if ((scheduleId = scheduleIdsMap.get(loadMetric)) != null) { diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml index 5bbebed..e95f995 100644 --- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml @@ -188,7 +188,7 @@ <metric property="Calculated.DataDiskUsedPercentage" displayName="Data File Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of disk space used by Cassandra data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> <metric property="Calculated.TotalDiskUsedPercentage" displayName="Total Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of total disk space used. The metric acounts overall disk usage (including system files), not just disk space used by Cassandra. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> - <metric property="Calculated.FreeDiskToDataSizeRatio" displayName="Free Disk to Data Size Ratio" dataType="measurement" displayType="summary" description="Ratio of (Amount of Free Disk)/(Data File Size). A value below 1 is not recommended since a compaction or repair process could double the amount of disk space used by data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> + <metric property="Calculated.FreeDiskToDataSizeRatio" displayName="Free Disk to Data Size Ratio" dataType="measurement" displayType="summary" description="Ratio of (Free Disk)/(Data File Size). A value below 1 is not recommended since a compaction or repair process could double the amount of disk space used by data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> <metric property="CurrentGenerationNumber" dataType="trait" displayType="summary" description="Current generation number"/> <metric property="ExceptionCount" measurementType="trendsup" dataType="measurement" displayType="summary" description="Exception Count"/> commit 6997631e56204db41c9f4902eef1c6210706be3f Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 15:14:22 2013 -0500 Add back code used to update storage node configuration tha was lost due to rebase. This code updates two additional storage node properties added. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index b32ab5b..fab803b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -611,6 +611,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN storageNodeResource.getId()); configuration.setHeapSize(storageNodeConfiguration.getSimpleValue("maxHeapSize")); + configuration.setHeapNewSize(storageNodeConfiguration.getSimpleValue("heapNewSize")); + configuration.setThreadStackSize(storageNodeConfiguration.getSimpleValue("threadStackSize")); configuration.setJmxPort(storageNode.getJmxPort()); } diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 8156d02..1e39d6c 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -122,6 +122,9 @@ <operation name="updateConfiguration" description="Updates the node configuration. Will require a separate server restart for the settings to take effect."> <parameters> <c:simple-property name="heapSize" type="string" description="The heap size to be used for both -Xms and -Xmx JVM options."/> + <c:simple-property name="heapNewSize" type="string" description="The heap new size to be used be used with -Xmn JVM option."/> + <c:simple-property name="threadStackSize" type="integer" description="The thread stack size. This memory is allocated to each thread off heap. The + value should be an integer that will be interpreted in kilobytes."/> <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> </parameters> <results> commit e85abcf495d6939d876b09bd1de1e71a29af17ec Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Jul 23 10:42:17 2013 +0200 BZ 796480 (and others) add support for subCategory in embedded types (aka runs-inside) diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java index 88dd865..d5ff2ef 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java @@ -417,16 +417,56 @@ public class PluginMetadataParser { return serviceResourceType; } - private static void setSubCategory(ResourceDescriptor resourceDescriptor, ResourceType resourceType) + /** + * Try to find the subCategory of the p/s/s descriptor in one of the parents + * <subcategories><subcategory>Foo</subcategory></subcategories> elements and + * set it on the resourceType if found. + * + * It is not enough to look at the direct parents, but we need to also look at the + * <runs-inside> types if our type is "embedded" in a different type. + * @param resourceDescriptor Descriptor to get the subCategory attribute from + * @param resourceType The type to attach the ResourceSubCategory to. + * @throws InvalidPluginDescriptorException If the descriptor.subCategory can not be found in any parent. + */ + private void setSubCategory(ResourceDescriptor resourceDescriptor, ResourceType resourceType) throws InvalidPluginDescriptorException { String subCatName = resourceDescriptor.getSubCategory(); if (subCatName != null) { ResourceSubCategory subCat = SubCategoriesMetadataParser.findSubCategoryOnResourceTypeAncestor( resourceType, subCatName); - if (subCat == null) + + // We need to look at resourceDescriptor -> runsInside to see if one of those defines the + // subcategories that we are looking for. + if (subCat == null && resourceDescriptor.getRunsInside() != null) { + RunsInsideType rit = resourceDescriptor.getRunsInside(); + List<ParentResourceType> parentResourceTypeList = rit.getParentResourceType(); + for (ParentResourceType parentResourceType : parentResourceTypeList) { + ResourceType parentType = getResourceTypeFromPlugin(parentResourceType.getName(),parentResourceType.getPlugin()); + // check on the parent + if (parentType.getChildSubCategories()!=null ) { + for (ResourceSubCategory parentSubcat : parentType.getChildSubCategories()) { + if (parentSubcat.getName().equals(subCatName)) { + subCat = parentSubcat; + break; + } + } + } + + // Not found on runs-inside type look at the ancestor of those runs-inside types? + if (subCat==null) { + subCat = SubCategoriesMetadataParser.findSubCategoryOnResourceTypeAncestor(parentType,subCatName); + } + if (subCat!=null) { + break; + } + } + } + + if (subCat == null) { throw new InvalidPluginDescriptorException("Resource type [" + resourceType.getName() + "] specified a subcategory (" + subCatName + ") that is not defined as a child subcategory of one of its ancestor resource types."); + } resourceType.setSubCategory(subCat); } } diff --git a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java index 20e1aa9..2a9595f 100644 --- a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java +++ b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java @@ -226,6 +226,7 @@ public class ExtensionModelTest { assert jbossServer.getCategory().equals(ResourceCategory.SERVER); assert jbossServer.getDescription().equals("JBoss Application Server Description"); assert jbossServer.getParentResourceTypes().size() == 0; + assert jbossServer.getChildSubCategories().size() == 2; assert jbossServer.getChildResourceTypes().size() == 1; ResourceType embeddedTomcatServer = jbossServer.getChildResourceTypes().iterator().next(); @@ -263,6 +264,7 @@ public class ExtensionModelTest { assert hibernateService.getDescription().equals("Hibernate Service Description"); assert hibernateService.getChildResourceTypes().size() == 0; assert hibernateService.getParentResourceTypes().size() == 3; + assert hibernateService.getSubCategory().getName().equals("Framework"); ResourceType tomcatServer = metadataManager.getType("TomcatServer", "Tomcat"); ResourceType jbossServer = metadataManager.getType("JBossASServer", "JBossAS"); diff --git a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java new file mode 100644 index 0000000..1cba523 --- /dev/null +++ b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java @@ -0,0 +1,159 @@ + /* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.clientapi.agent.metadata.test; + + import java.net.URL; + import java.util.List; + import java.util.Set; + + import javax.xml.bind.JAXBContext; + import javax.xml.bind.Unmarshaller; + import javax.xml.bind.util.ValidationEventCollector; + + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.testng.annotations.BeforeSuite; + import org.testng.annotations.Test; + + import org.rhq.core.clientapi.agent.metadata.PluginMetadataManager; + import org.rhq.core.clientapi.agent.metadata.SubCategoriesMetadataParser; + import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil; + import org.rhq.core.clientapi.descriptor.DescriptorPackages; + import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; + import org.rhq.core.clientapi.descriptor.plugin.ResourceDescriptor; + import org.rhq.core.clientapi.descriptor.plugin.ServerDescriptor; + import org.rhq.core.clientapi.descriptor.plugin.ServiceDescriptor; + import org.rhq.core.clientapi.descriptor.plugin.SubCategoryDescriptor; + import org.rhq.core.domain.resource.ResourceCategory; + import org.rhq.core.domain.resource.ResourceSubCategory; + import org.rhq.core.domain.resource.ResourceType; + + /** + * @author Charles Crouch + * @author Heiko W. Rupp + */ +public class NestedSubCategoriesMetadataParserTest { + private static final String DESCRIPTOR_FILENAME = "test-subcategories-nested.xml"; + private final Log LOG = LogFactory.getLog(NestedSubCategoriesMetadataParserTest.class); + + private PluginDescriptor pluginDescriptor; + + @BeforeSuite + public void loadPluginDescriptor() throws Exception { + try { + URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME); + LOG.info("Loading plugin descriptor at: " + descriptorUrl); + + JAXBContext jaxbContext = JAXBContext.newInstance(DescriptorPackages.PC_PLUGIN); + + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + ValidationEventCollector vec = new ValidationEventCollector(); + unmarshaller.setEventHandler(vec); + pluginDescriptor = (PluginDescriptor) unmarshaller.unmarshal(descriptorUrl.openStream()); + } catch (Throwable t) { + // Catch RuntimeExceptions and Errors and dump their stack trace, because Surefire will completely swallow them + // and throw a cryptic NPE (see http://jira.codehaus.org/browse/SUREFIRE-157)! + t.printStackTrace(); + throw new RuntimeException(t); + } + } + + @Test + public void parseSingleSubCategory() { + List<ServerDescriptor> servers = pluginDescriptor.getServers(); + ServerDescriptor server0 = servers.get(0); + ResourceDescriptor.Subcategories subCategoriesDescriptor = server0.getSubcategories(); + assert subCategoriesDescriptor != null : "No subcategories element: " + server0.getName(); + + List<SubCategoryDescriptor> subCategoryDescriptors = subCategoriesDescriptor.getSubcategory(); + + assert subCategoryDescriptors != null : "No subcategory elements: " + server0.getName(); + assert !subCategoryDescriptors.isEmpty() : "No subcategory elements: " + server0.getName(); + + ResourceSubCategory subCat; + + ResourceType resType = new ResourceType("testResType", "myplugin", ResourceCategory.SERVER, null); + subCat = SubCategoriesMetadataParser.getSubCategory(subCategoryDescriptors.get(0), resType); + + assert subCat != null : "Null subcategory received from parser"; + assert subCat.getName().equals("applications") : "Name not read correctly"; + assert subCat.getDisplayName().equals("Apps") : "Display name not read correctly"; + assert subCat.getDescription().equals("The apps.") : "Description not read correctly"; + // getSubCategory is no longer responsible for setting resourcetype information, that is done in PluginMetadataParser + //assert subCat.getResourceType().equals(resType) : "ResourceType not set correctly"; + + } + + @Test + public void parseNestedSubCategories() { + List<ServerDescriptor> servers = pluginDescriptor.getServers(); + ServerDescriptor server2 = servers.get(1); + assert server2.getName().equals("testServer2"); + ResourceDescriptor.Subcategories subCategoriesDescriptor = server2.getSubcategories(); + assert subCategoriesDescriptor == null : "Unexpected subcategories element: " + server2.getName(); + assert server2.getSubCategory().equals("applications"); + + List<ServiceDescriptor> services = pluginDescriptor.getServices(); + ServiceDescriptor service1 = services.get(0); + assert service1.getName().equals("testService"); + assert service1.getSubCategory().equals("applications"); + } + + @Test + public void testParseViaMetaDataManager() throws Exception { + + PluginDescriptor pluginDescriptor; + + URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME); + System.out.println("Loading plugin descriptor at: " + descriptorUrl); + + pluginDescriptor = (PluginDescriptor) AgentPluginDescriptorUtil.parsePluginDescriptor(descriptorUrl + .openStream()); + + PluginMetadataManager metadataManager = new PluginMetadataManager(); + Set<ResourceType> typeSet = metadataManager.loadPlugin(pluginDescriptor); + assert typeSet != null : "Got no types!!"; + assert typeSet.size()==5 : "Expected 5 types, but got " + typeSet.size(); + + ResourceType testService = findType(typeSet,"testService"); + assert testService.getSubCategory().getName().equals("applications"); + + ResourceType testService2 = findType(typeSet,"testService2"); + assert testService2.getSubCategory().getName().equals("applications"); + + ResourceType testService3 = findType(typeSet,"testService3"); + assert testService3.getSubCategory().getName().equals("fooBar"); + + + } + + private ResourceType findType(Set<ResourceType> types, String name) { + for (ResourceType type : types ) { + if (type.getName().equals(name)) { + return type; + } + } + assert false : "Type with name " + name + " not found"; + return null; + } + } \ No newline at end of file diff --git a/modules/core/client-api/src/test/resources/test-hibernate.xml b/modules/core/client-api/src/test/resources/test-hibernate.xml index 37a2e03..9051ca2 100644 --- a/modules/core/client-api/src/test/resources/test-hibernate.xml +++ b/modules/core/client-api/src/test/resources/test-hibernate.xml @@ -3,7 +3,7 @@ package="org.rhq.plugins.test2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin"> - + <depends plugin="JMX" /> <depends plugin="Tomcat" /> <depends plugin="JBossAS" /> @@ -11,11 +11,13 @@ <service name="HibernateService" discovery="HibernateDiscoveryComponent" class="HibernateServiceComponent" - description="Hibernate Service Description"> + description="Hibernate Service Description" + subCategory="Framework" + > <runs-inside> <parent-resource-type name="TomcatServer" plugin="Tomcat"/> <parent-resource-type name="JBossASServer" plugin="JBossAS"/> <parent-resource-type name="EmbeddedTomcatServer" plugin="JBossAS"/> </runs-inside> - </service> + </service> </plugin> \ No newline at end of file diff --git a/modules/core/client-api/src/test/resources/test-jbossas.xml b/modules/core/client-api/src/test/resources/test-jbossas.xml index 4d2602b..8269343 100644 --- a/modules/core/client-api/src/test/resources/test-jbossas.xml +++ b/modules/core/client-api/src/test/resources/test-jbossas.xml @@ -12,7 +12,11 @@ discovery="JBossASDiscoveryComponent" class="JBossASServerComponent" description="JBoss Application Server Description"> - + <subcategories> + <subcategory name="Applications" /> + <subcategory name="Framework" /> + </subcategories> + <operation name="stop" displayName="Stop JBossAS Server" description="Kills the server" timeout="30"> <parameters> <c:simple-property name="force" @@ -29,7 +33,7 @@ required="true" description="If true, the server is definitely down; otherwise, the shutdown was issued but it is unclear if it really died"/> </results> - </operation> + </operation> <server name="EmbeddedTomcatServer" description="Embedded Tomcat Web Server Description" sourcePlugin="Tomcat" @@ -37,6 +41,6 @@ discovery="JBossASTomcatDiscoveryComponent" class="JBossASTomcatServerComponent"> </server> - + </server> </plugin> \ No newline at end of file diff --git a/modules/core/client-api/src/test/resources/test-subcategories-nested.xml b/modules/core/client-api/src/test/resources/test-subcategories-nested.xml new file mode 100644 index 0000000..eb43af7 --- /dev/null +++ b/modules/core/client-api/src/test/resources/test-subcategories-nested.xml @@ -0,0 +1,60 @@ + + +<plugin name="TestPlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:xmlns:rhq-plugin"> + + <server name="testServer1"> + <subcategories> + <subcategory name="applications" displayName="Apps" description="The apps."/> + <subcategory name="fooBar"/> + </subcategories> + </server> + +  + <server name="testServer2" subCategory="applications"> + <runs-inside> + <parent-resource-type name="testServer1" plugin="TestPlugin"/> + </runs-inside> + <metric property="testMetric"/> + </server> + + <service name="testService" subCategory="applications"> + <runs-inside> + <parent-resource-type name="testServer1" plugin="TestPlugin"/> + </runs-inside> + + </service> + + <service name="testService2" subCategory="applications"> + <runs-inside> + <parent-resource-type name="testServer1" plugin="TestPlugin"/> + </runs-inside> + + </service> + + <service name="testService3" subCategory="fooBar"> + <runs-inside> + <parent-resource-type name="testServer1" plugin="TestPlugin"/> + </runs-inside> + + </service> + +</plugin> commit 60329fcbda5a1961e0f9285c70eb56ea12fe2eb0 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 22 15:00:35 2013 +0200 Add Michael Burman as contributor diff --git a/pom.xml b/pom.xml index c5cf5a7..3662bc7 100644 --- a/pom.xml +++ b/pom.xml @@ -2353,6 +2353,10 @@ <timezone>+1</timezone> </contributor> <contributor> + <name>Michael Burman</name> + <timezone>+2</timezone> + </contributor> + <contributor> <name>Torben Jäger</name> <timezone>+1</timezone> </contributor> commit d7e9f5b9871824d1f02ae762b44cff85ff6c3d44 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Tue Jul 23 10:41:12 2013 +0200 Bug 969621 - EAP 6 managed plug-in is unable to discover EAP servers when more then one is running on a single host Update expected resource keys in itests diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java index 91ece92..269474b 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java @@ -43,8 +43,11 @@ public class DomainServerComponentTest extends AbstractServerComponentTest { public static final ResourceType RESOURCE_TYPE = new ResourceType("JBossAS7 Host Controller", PLUGIN_NAME, ResourceCategory.SERVER, null); - // The key is the server's base dir. - public static final String RESOURCE_KEY = new File(JBOSS_HOME, "domain").getPath(); + // The key is the server host config file + // hostConfig: /tmp/jboss-as-6.0.0/domain/configuration/host.xml + public static final String RESOURCE_KEY = "hostConfig: " + + new File(JBOSS_HOME, "domain" + File.separator + "configuration" + File.separator + "host.xml") + .getAbsolutePath(); @Override protected ResourceType getServerResourceType() { diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java index d128144..182ef36 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.modules.plugins.jbossas7.itest.domain; @@ -488,10 +488,8 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest { InventoryManager im = pluginContainer.getInventoryManager(); Resource platform = im.getPlatform(); //host controller - ResourceType hostControllerType = new ResourceType("JBossAS7 Host Controller", PLUGIN_NAME, - ResourceCategory.SERVER, null); - Resource hostController = getResourceByTypeAndKey(platform, hostControllerType, - "/tmp/jboss-as-6.0.0/domain"); + Resource hostController = getResourceByTypeAndKey(platform, DomainServerComponentTest.RESOURCE_TYPE, + DomainServerComponentTest.RESOURCE_KEY); //profile=full-ha ResourceType profileType = new ResourceType("Profile", PLUGIN_NAME, ResourceCategory.SERVICE, null); String key = PROFILE; diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java index 8446345..32f92c7 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java @@ -51,8 +51,11 @@ public class StandaloneServerComponentTest extends AbstractServerComponentTest { public static final ResourceType RESOURCE_TYPE = new ResourceType("JBossAS7 Standalone Server", PLUGIN_NAME, ResourceCategory.SERVER, null); - // The key is the server's base dir. - public static final String RESOURCE_KEY = new File(JBOSS_HOME, "standalone").getPath(); + // The key is the server host config file + // hostConfig: /tmp/jboss-as-6.0.0/standalone/configuration/standalone-full-ha.xml + public static final String RESOURCE_KEY = "hostConfig: " + + new File(JBOSS_HOME, "standalone" + File.separator + "configuration" + File.separator + + "standalone-full-ha.xml").getAbsolutePath(); private static final String RELOAD_OPERATION_NAME = "reload"; private static final String RESTART_OPERATION_NAME = "restart"; commit 567aee7f81c6aa0f7680d4f394cccb1974705320 Author: Larry O'Leary <loleary(a)redhat.com> Date: Mon Jul 22 16:10:09 2013 -0500 BZ 981015: Fix test failures introduced by commit 01cd91b - findLdapUserDetails was appending baseDN twice during fallback code - FakeLdapContext contained some lazy escaping on the mock group entries diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java index dad31ce..2ae6265 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java @@ -99,7 +99,6 @@ public class FakeLdapContext implements LdapContext { try { return new FakeNamingEnumeration<SearchResult>(ldapTestData.getSearchResults(attributes)); } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); return null; } @@ -516,12 +515,12 @@ public class FakeLdapContext implements LdapContext { attr = new BasicAttribute("member"); attr.add("cn=Robert Smith,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Cannon\\, Brett,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Charles H\\\\Samlin,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Charles H\\Samlin,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Craig \\#1 Sellers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Beverly \\+1 Balanger,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Bethany \\<Stuart\\> Wallace,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Zachory S\\; Balanger,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Allen \\\"The Hammer\\\" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Allen \"The Hammer\" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Sam Not \\= Smitherson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=\\ Billy The Kiddough\\ ,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=System/Integration API,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); @@ -557,12 +556,12 @@ public class FakeLdapContext implements LdapContext { attr = new BasicAttribute("member"); attr.add("cn=John Smith,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Dr. Greg Hause\\, MD,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Cindy\\\\Cynthia Groober,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Cindy\\Cynthia Groober,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Biff \\# Rogers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Steven \\+2 Reed,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Lisa \\<The Great\\> Toller,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Homer J Simpsonite\\; III,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Jessica \\\"Crouching Tiger\\\" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Jessica \"Crouching Tiger\" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Hope \\= Rein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=\\ Sue Ferguson\\ ,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Phil/Susan Carlson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); @@ -598,12 +597,12 @@ public class FakeLdapContext implements LdapContext { attr = new BasicAttribute("member"); attr.add("cn=Sheri Smith,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Walsh\\, Brad,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Jim\\\\James Kirk,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Jim\\James Kirk,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Sandra \\# Phillips,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=William Tell Overture \\+1,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Craig \\<Bison\\> Allen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Walter T Fredrick\\; The Second,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Stanley \\\"Short\\\" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Stanley \"Short\" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Noah \\= Sadler,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=\\ Stuart Smiley\\ ,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=System/Integration API 2,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); @@ -984,7 +983,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with backslash (\\) in 'cn' in the RHQ Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Charles H\\\\Samlin,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Charles H\\Samlin,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Cindy\\Cynthia Groober,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -1033,7 +1032,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with backslash (\\) in 'cn' in the JBoss Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Cindy\\\\Cynthia Groober,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Cindy\\Cynthia Groober,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Jim\\James Kirk,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -1082,7 +1081,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with backslash (\\) in 'cn' in the JBoss Monitor Group"); attrs.put(attr); - sr = new SearchResult("cn=Jim\\\\James Kirk,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Jim\\James Kirk,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Craig \#1 Sellers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -1675,7 +1674,7 @@ public class FakeLdapContext implements LdapContext { null, attrs, true); this.add(sr); - // dn: cn=Allen \"The Hammer\" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com + // dn: cn=Allen "The Hammer" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com attrs = new BasicAttributes(); attr = new BasicAttribute("baseName"); @@ -1721,11 +1720,11 @@ public class FakeLdapContext implements LdapContext { attr.add("User with quote (\") in 'cn' in the RHQ Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Allen \\\"The Hammer\\\" Callen,ou=users", "javax.naming.directory.DirContext", + sr = new SearchResult("cn=Allen \"The Hammer\" Callen,ou=users", "javax.naming.directory.DirContext", null, attrs, true); this.add(sr); - // dn: cn=Jessica \"Crouching Tiger\" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com + // dn: cn=Jessica "Crouching Tiger" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com attrs = new BasicAttributes(); attr = new BasicAttribute("baseName"); @@ -1771,11 +1770,11 @@ public class FakeLdapContext implements LdapContext { attr.add("User with quote (\") in 'cn' in the JBoss Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Jessica \\\"Crouching Tiger\\\" Mathers,ou=users", + sr = new SearchResult("cn=Jessica \"Crouching Tiger\" Mathers,ou=users", "javax.naming.directory.DirContext", null, attrs, true); this.add(sr); - // dn: cn=Stanley \"Short\" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com + // dn: cn=Stanley "Short" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com attrs = new BasicAttributes(); attr = new BasicAttribute("baseName"); @@ -1821,7 +1820,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with quote (\") in 'cn' in the JBoss Monitor Group"); attrs.put(attr); - sr = new SearchResult("cn=Stanley \\\"Short\\\" Mein,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Stanley \"Short\" Mein,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Sam Not \= Smitherson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -2160,7 +2159,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with slash (/) in 'cn' in the RHQ Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=System/Integration API,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=System\\/Integration API,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Phil/Susan Carlson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -2209,7 +2208,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with slash (/) in 'cn' in the JBoss Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Phil/Susan Carlson,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Phil\\/Susan Carlson,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=System/Integration API 2,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -2254,7 +2253,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with slash (/) in 'cn' in the JBoss Monitor Group"); attrs.put(attr); - sr = new SearchResult("cn=System/Integration API 2,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=System\\/Integration API 2,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Lee -Fast- Croutche,ou=users,dc=test,dc=rhq,dc=redhat,dc=com diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index a28c709..7473321 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -350,7 +350,6 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { if (si.isRelative()) { userDN += "," + baseDNs[x]; } - userDN = userDN + "," + baseDNs[x]; } userDetails.put("dn", userDN); commit 8c693ee685d538a28a3c42ce813b10b49997f871 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jul 22 16:36:23 2013 -0400 get rid of the upgrade wording, it's confusing when performing an initial install. diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java index 61c8a9c..fb9bceb 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java @@ -363,14 +363,14 @@ public abstract class AbstractInstall extends ControlCommand { protected void startRHQServerForInstallation() throws IOException { try { - log.info("The RHQ Server must be started to complete its upgrade. Starting the RHQ server in preparation of running the server installer..."); + log.info("The RHQ Server must be started to complete its installation. Starting the RHQ server in preparation of running the server installer..."); // when you unzip the distro, you are getting a fresh, unadulterated, out-of-box EAP installation, which by default listens // to port 9999 for its native management subsystem. Make sure some other independent EAP server (or anything for that matter) // isn't already listening to that port. if (isPortInUse("127.0.0.1", 9999)) { throw new IOException( - "Something is already listening to port 9999 - shut it down before upgrading the server."); + "Something is already listening to port 9999 - shut it down before installing the server."); } Executor executor = new DefaultExecutor(); @@ -400,7 +400,7 @@ public abstract class AbstractInstall extends ControlCommand { } // Wait for the server to complete it's startup - log.info("Waiting for the RHQ Server to start in preparation of running the server installer for upgrade..."); + log.info("Waiting for the RHQ Server to start in preparation of running the server installer..."); commandLine = getCommandLine("rhq-installer", "--test"); Executor installerExecutor = new DefaultExecutor(); commit 2409ed2dcd705c58e5024182e95445431b25acf5 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 22 15:16:49 2013 -0400 document the 4.8 storage patch script diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh index 33984d1..ae78240 100755 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh @@ -1,7 +1,43 @@ #!/bin/bash +# +# BACKGROUND: +# This patch script needs to be run against RHQ 4.8.0 installations prior to +# script. You do not need to run this script if upgrading from a version +# earlier than 4.8.0. +# +# PREREQUISITES: +# 1) Shut down the RHQ storage node and server. +# +# 2) Edit <rhq-install-dir>/rhq-storage/conf/cassandra.yaml and set the +# following property, +# +# start_rpc: true +# +# 3) Note the value of rpc_port in cassandra.yaml. By default it is 9160 which +# is fine. +# +# RUNNING THE PATCH: +# 1) cd <patch-dir> +# +# 2) ./rhq48-storage-patch.sh <rhq-480-server-dir> <storage-ip-address> <thrift-port> <jmx-port> +# +# 3) Carefully reivew the script output for any errors. +# +# 4) Edit cassandra.yaml against and reset start_rpc: false +# +# ADDITIONAL NOTES: +# The <jmx-port> defaults to 7299. If you are uncertain of what value to use, +# you can find it in the UI. Log into RHQ and go to Administration --> Storage Nodes. +# +# If you are uncertain of the value to use for the storage node IP address, you +# find the correct valu in the storage nodes admin UI as well. +# +# EXAMPLE: +# ./rhq48-storage-patch.sh /opt/rhq-4.8.0 127.0.0.1 9160 7299 +# Usage: ./rhq48-storage-patch.sh <rhq-480-server-dir> <storage-ip-address> <thrift-port> <jmx-port> function usage() { - echo "Usage: $0 <rhq-server-dir> <storage-ip-address> <cql-port> <jmx-port>" + echo "Usage: $0 <rhq-480-server-dir> <storage-ip-address> <thrift-port> <jmx-port>" } if [ $# -ne 4 ]; then @@ -16,11 +52,11 @@ fi RHQ_SERVER_DIR=$1 CQL_HOSTNAME=$2 -CQL_PORT=$3 +THRIFT_PORT=$3 JMX_PORT=$4 export CQLSH_HOST=$2 -export CQL_PORT=$3 +export CQLSH_PORT=$3 PATCH="apache-cassandra-1.2.4-patch-1.jar" commit c91c8f23416db836308b2bf3871fdda87559297e Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 14:12:08 2013 -0500 Update the storage node manager API for alerts to support UI functionality. diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml index a9ce322..58c4eda 100644 --- a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml @@ -11,8 +11,22 @@ <difference> <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findNotAcknowledgedStorageNodeAlerts(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  <method>org.rhq.core.domain.util.PageList findAllStorageNodeAlerts(org.rhq.core.domain.auth.Subject)</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findAllStorageNodeAlerts(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + </differences> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index c2a7b46..b32ab5b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -512,12 +512,22 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @Override public PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject) { - return findStorageNodeAlerts(subject, false); + return findStorageNodeAlerts(subject, false, null); + } + + @Override + public PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject, StorageNode storageNode) { + return findStorageNodeAlerts(subject, false, storageNode); } @Override public PageList<Alert> findAllStorageNodeAlerts(Subject subject) { - return findStorageNodeAlerts(subject, true); + return findStorageNodeAlerts(subject, true, null); + } + + @Override + public PageList<Alert> findAllStorageNodeAlerts(Subject subject, StorageNode storageNode) { + return findStorageNodeAlerts(subject, true, storageNode); } /** @@ -527,8 +537,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN * @param allAlerts if [true] then return all alerts; if [false] then return only alerts that are not acknowledged * @return alerts */ - private PageList<Alert> findStorageNodeAlerts(Subject subject, boolean allAlerts) { - Integer[] resouceIdsWithAlertDefinitions = findResourcesWithAlertDefinitions(); + private PageList<Alert> findStorageNodeAlerts(Subject subject, boolean allAlerts, StorageNode storageNode) { + Integer[] resouceIdsWithAlertDefinitions = findResourcesWithAlertDefinitions(storageNode); PageList<Alert> alerts = new PageList<Alert>(); if( resouceIdsWithAlertDefinitions != null && resouceIdsWithAlertDefinitions.length != 0 ){ @@ -555,31 +565,35 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return alerts; } - /** - * Return resource Ids for all resources and sub-resources of Storage Nodes that - * have alert definitions. This will be used by the resource criteria to find - * all alerts triggered for storage nodes. - * - * @return - */ - private Integer[] findResourcesWithAlertDefinitions() { - List<Integer> resourceIdsWithAlertDefinitions = new ArrayList<Integer>(); - List<StorageNode> test2 = getStorageNodes(); + @Override + public Integer[] findResourcesWithAlertDefinitions() { + return this.findResourcesWithAlertDefinitions(null); + } + + @Override + public Integer[] findResourcesWithAlertDefinitions(StorageNode storageNode) { + List<StorageNode> initialStorageNodes; + if (storageNode == null) { + initialStorageNodes = getStorageNodes(); + } else { + initialStorageNodes = Arrays.asList(storageNode); + } Queue<Resource> unvisitedResources = new LinkedList<Resource>(); - for (StorageNode node : test2) { - if (node.getResource() != null) { - unvisitedResources.add(node.getResource()); + for (StorageNode initialStorageNode : initialStorageNodes) { + if (initialStorageNode.getResource() != null) { + unvisitedResources.add(initialStorageNode.getResource()); } } - while(!unvisitedResources.isEmpty()){ + List<Integer> resourceIdsWithAlertDefinitions = new ArrayList<Integer>(); + while (!unvisitedResources.isEmpty()) { Resource resource = unvisitedResources.poll(); if (resource.getAlertDefinitions() != null) { resourceIdsWithAlertDefinitions.add(resource.getId()); } - for(Resource child: resource.getChildResources()){ + for (Resource child : resource.getChildResources()) { unvisitedResources.add(child); } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index 6fca820..69b16c4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -81,6 +81,15 @@ public interface StorageNodeManagerLocal { PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject); /** + * Fetches the list of Storage Node related alerts that have not yet been acknowledged for the + * specified storage node. + * + * @param subject subject + * @return storage nodes alerts not acknowledged + */ + PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject, StorageNode storageNode); + + /** * Fetches all the Storage Node related alerts. * * @param subject subject @@ -89,6 +98,39 @@ public interface StorageNodeManagerLocal { PageList<Alert> findAllStorageNodeAlerts(Subject subject); /** + * Fetches all the Storage Node related alerts for the specified storage node. + * + * @param subject subject + * @return all storage nodes alerts + */ + PageList<Alert> findAllStorageNodeAlerts(Subject subject, StorageNode storageNode); + + + /** + * Find ids for all resources and sub-resources of Storage Nodes that + * have alert definitions. This can be used by the resource criteria queries to find + * all alerts triggered for storage nodes resources. + * + * @return resource ids + */ + Integer[] findResourcesWithAlertDefinitions(); + + /** + * Find ids for all resources and sub-resources, of the specified storage node, that + * have alert definitions. This can be used by the resource criteria queries to find + * all alerts triggered for storage nodes resources. + * + * If storage node is null it find ids for all resources and sub-resources of Storage Nodes that + * have alert definitions. Please see {@link #findResourcesWithAlertDefinitions()} for more details. + * + * @param storageNode storage node + * + * @return resource ids + */ + Integer[] findResourcesWithAlertDefinitions(StorageNode storageNode); + + + /** * <p>Prepares the node for subsequent upgrade.</p> * <p> CAUTION: this method will set the RHQ server to maintenance mode, RHQ storage flushes all the data to disk * and backup of all the keyspaces is created</p> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java index 7be1b07..75ac02b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java @@ -73,10 +73,27 @@ public interface StorageNodeManagerRemote { PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject); /** + * Fetches the list of Storage Node related alerts that have not yet been acknowledged for the + * specified storage node. + * + * @param subject subject + * @return storage nodes alerts not acknowledged + */ + PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject, StorageNode storageNode); + + /** * Fetches all the Storage Node related alerts. * * @param subject subject * @return all storage nodes alerts */ PageList<Alert> findAllStorageNodeAlerts(Subject subject); + + /** + * Fetches all the Storage Node related alerts for the specified storage node. + * + * @param subject subject + * @return all storage nodes alerts + */ + PageList<Alert> findAllStorageNodeAlerts(Subject subject, StorageNode storageNode); } commit c6c9e50398ffb5fc6d297ceffc369975a56b3ef9 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jul 22 14:09:52 2013 -0400 Add windows support storage install options and resource config update. Introduce rhq-storage-wrapper.env to hold the configurable values (mimicing somewhat cassandra-jvm.properties) and apply the values as token replacements in rhq-storage-wrapper.conf. Note that cassandra-jvm.properties is still kept up to date on windows and can be used generically, as needed. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index 6547043..60667cc 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -91,7 +91,14 @@ public class Deployer { applyConfigChanges(confDir, "cassandra.yaml", tokens); applyConfigChanges(confDir, "log4j-server.properties", tokens); applyChangesToCassandraJvmProps(confDir, deploymentOptions); -// applyConfigChanges(confDir, "cassandra-env.sh", tokens); + + // For windows, update the service wrapper env. It may not ne necessary to have updated cassandra-jvm.properties + // as well as this file, but for now we'll update both, leaving the former as a dependably set file. + if (File.separatorChar == '\\') { + applyChangesToWindowsServiceWrapper(deployDir); + } + + // applyConfigChanges(confDir, "cassandra-env.sh", tokens); } private void applyConfigChanges(File confDir, String fileName, Map<String, String> tokens) @@ -109,8 +116,8 @@ public class Deployer { rhqFile.delete(); } catch (IOException e) { log.error("An unexpected error occurred while apply configuration changes to " + filteredFile, e); - throw new DeploymentException("An unexpected error occurred while apply configuration changes to " + - filteredFile, e); + throw new DeploymentException("An unexpected error occurred while apply configuration changes to " + + filteredFile, e); } } @@ -132,8 +139,8 @@ public class Deployer { String javaVersion = System.getProperty("java.version"); // The check here is taken right from cassandra-env.sh - if ((!isOpenJDK() || javaVersion.compareTo("1.6.0") > 0) || - (javaVersion.equals("1.6.0") && getJavaPatchVersion() > 23)) { + if ((!isOpenJDK() || javaVersion.compareTo("1.6.0") > 0) + || (javaVersion.equals("1.6.0") && getJavaPatchVersion() > 23)) { properties.put("java_agent", "-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"); } @@ -165,6 +172,29 @@ public class Deployer { return Integer.parseInt(javaVersion.substring(startIndex + 1, javaVersion.length())); } + public void applyChangesToWindowsServiceWrapper(File deployDir) throws DeploymentException { + File wrapperDir = new File(deployDir, "../bin/wrapper"); + File wrapperEnvFile = new File(wrapperDir, "rhq-storage-wrapper.env"); + + try { + log.info("Applying configuration changes to " + wrapperEnvFile); + + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(wrapperEnvFile.getAbsolutePath()); + Properties wrapperEnvProps = propertiesUpdater.loadExistingProperties(); + + wrapperEnvProps.setProperty("set.heap_min", "-Xms" + deploymentOptions.getHeapSize()); + wrapperEnvProps.setProperty("set.heap_max", "-Xmx" + deploymentOptions.getHeapSize()); + wrapperEnvProps.setProperty("set.heap_new", "-Xmn" + deploymentOptions.getHeapNewSize()); + wrapperEnvProps.setProperty("set.thread_stack_size", "-Xss" + deploymentOptions.getStackSize()); + wrapperEnvProps.setProperty("set.jmx_port", deploymentOptions.getJmxPort().toString()); + + propertiesUpdater.update(wrapperEnvProps); + } catch (IOException e) { + log.error("An error occurred while updating " + wrapperEnvFile, e); + throw new DeploymentException("An error occurred while updating " + wrapperEnvFile, e); + } + } + public void updateFilePerms() { File deployDir = new File(deploymentOptions.getBasedir()); File binDir = new File(deployDir, "bin"); @@ -187,8 +217,8 @@ public class Deployer { try { authFile.delete(); - StreamUtil.copy(new StringReader(StringUtil.collectionToString(addresses, "\n")), - new FileWriter(authFile), true); + StreamUtil.copy(new StringReader(StringUtil.collectionToString(addresses, "\n")), new FileWriter(authFile), + true); } catch (IOException e) { throw new RuntimeException("Failed to update " + authFile); } diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf index 14f2ff1..de83364 100644 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf @@ -66,23 +66,25 @@ wrapper.app.parameter.3="-Dcassandra-foreground=yes" # Additional JVM parameters (quotes ARE needed) wrapper.java.additional.1="-ea" wrapper.java.additional.2="-javaagent:"%RHQ_STORAGE_HOME%\lib\jamm-0.2.5.jar"" -wrapper.java.additional.3="-Xms1G" -wrapper.java.additional.4="-Xmx1G" -wrapper.java.additional.5="-XX:+HeapDumpOnOutOfMemoryError" -wrapper.java.additional.6="-XX:+UseParNewGC" -wrapper.java.additional.7="-XX:+UseConcMarkSweepGC" -wrapper.java.additional.8="-XX:+CMSParallelRemarkEnabled" -wrapper.java.additional.9="-XX:SurvivorRatio=8" -wrapper.java.additional.10="-XX:MaxTenuringThreshold=1" -wrapper.java.additional.11="-XX:CMSInitiatingOccupancyFraction=75" -wrapper.java.additional.12="-XX:+UseCMSInitiatingOccupancyOnly" -wrapper.java.additional.13="-Dcom.sun.management.jmxremote.port=7299" -wrapper.java.additional.14="-Dcom.sun.management.jmxremote.ssl=false" -wrapper.java.additional.15="-Dcom.sun.management.jmxremote.authenticate=false" -wrapper.java.additional.16="-Dlog4j.configuration=log4j-server.properties" -wrapper.java.additional.17="-Dlog4j.defaultInitOverride=true" - -# We want to make sure the Storage Node starts in the casandra bin directory +wrapper.java.additional.3="%heap_min%" +wrapper.java.additional.4="%heap_max%" +wrapper.java.additional.5="%heap_new%" +wrapper.java.additional.6="%heap_dump_on_OOMError%" +wrapper.java.additional.7="%heap_dump_dir%" +wrapper.java.additional.8="-XX:+UseConcMarkSweepGC" +wrapper.java.additional.9="-XX:+CMSParallelRemarkEnabled" +wrapper.java.additional.10="-XX:SurvivorRatio=8" +wrapper.java.additional.11="-XX:MaxTenuringThreshold=1" +wrapper.java.additional.12="-XX:CMSInitiatingOccupancyFraction=75" +wrapper.java.additional.13="-XX:+UseCMSInitiatingOccupancyOnly" +wrapper.java.additional.14="-XX:+UseParNewGC" +wrapper.java.additional.15="-Dcom.sun.management.jmxremote.port=%jmx_port%" +wrapper.java.additional.16="-Dcom.sun.management.jmxremote.ssl=false" +wrapper.java.additional.17="-Dcom.sun.management.jmxremote.authenticate=false" +wrapper.java.additional.18="-Dlog4j.configuration=log4j-server.properties" +wrapper.java.additional.19="-Dlog4j.defaultInitOverride=true" + +# We want to make sure the Storage Node starts in the cassandra bin directory wrapper.working.dir=%RHQ_STORAGE_HOME%/bin #***************************************************************************** diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env new file mode 100644 index 0000000..1441e0a --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env @@ -0,0 +1,24 @@ +#***************************************************************************** +# RHQ Storage Node Java Service Wrapper Environment Settings File +# +# This file specifies a set of environment variables that will be +# applied to the Storage Node JVM. +# +# THIS FILE SHOULD NOT BE EDITED! +# +# This file represents the values managed as RHQ Storage Node resource +# configuration values. Or, set by the installer. +# +#***************************************************************************** + +set.jmx_port=7299 + +set.heap_min=-Xms512M +set.heap_max=-Xms512M +set.heap_new=-Xmn128M + +set.thread_stack_size=-Xss180k + +set.heap_dump_on_OOMError=-XX:+HeapDumpOnOutOfMemoryError + +set.heap_dump_dir= diff --git a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc index ee0d448..6941358 100644 --- a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc +++ b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc @@ -4,11 +4,11 @@ # # override and lower the initial memory profile -wrapper.java.additional.18=-Xms128M -wrapper.java.additional.19=-Xmx256M +wrapper.java.additional.20=-Xms128M +wrapper.java.additional.21=-Xmx256M # enable remote debugging -#wrapper.java.additional.20=-agentlib:jdwp=transport=dt_socket,address=8788,server=y,suspend=n +#wrapper.java.additional.22=-agentlib:jdwp=transport=dt_socket,address=8788,server=y,suspend=n # disable JVM startup timeout wrapper.startup.timeout=0 diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index 8d1771d..1667877 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -19,10 +19,17 @@ import org.rhq.core.util.StringUtil; public class StorageNodeConfigDelegate implements ConfigurationFacet { private File jvmOptsFile; + private File wrapperEnvFile; public StorageNodeConfigDelegate(File basedir) { File confDir = new File(basedir, "conf"); jvmOptsFile = new File(confDir, "cassandra-jvm.properties"); + + // for windows, config props also get propagated to the wrapper env + if (isWindows()) { + File wrapperDir = new File(basedir, "../bin/wrapper"); + wrapperEnvFile = new File(wrapperDir, "rhq-storage-wrapper.env"); + } } @Override @@ -56,6 +63,16 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { return config; } + /** + * Ensure that the path uses only forward slash. + * @param path + * @return forward-slashed path, or null if path is null + */ + private static String useForwardSlash(String path) { + + return (null != path) ? path.replace('\\', '/') : null; + } + private String getHeapMinProp(Properties properties) { String value = properties.getProperty("heap_min"); @@ -115,47 +132,14 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { @Override public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { try { - PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(jvmOptsFile.getAbsolutePath()); - Properties properties = propertiesUpdater.loadExistingProperties(); - Configuration config = configurationUpdateReport.getConfiguration(); - String maxHeapSize = config.getSimpleValue("maxHeapSize"); - if (!StringUtil.isEmpty(maxHeapSize)) { - validateHeapArg("maxHeapSize", maxHeapSize); - // We want min and max heap to be the same - properties.setProperty("heap_min", "-Xms" + maxHeapSize); - properties.setProperty("heap_max", "-Xmx" + maxHeapSize); - } - - String heapNewSize = config.getSimpleValue("heapNewSize"); - if (!StringUtil.isEmpty(heapNewSize)) { - validateHeapArg("heapNewSize", heapNewSize); - properties.setProperty("heap_new", "-Xmn" + heapNewSize); - } + updateCassandraJvmProps(config); - String threadStackSize = config.getSimpleValue("threadStackSize"); - if (!StringUtil.isEmpty(threadStackSize)) { - validateStackArg(threadStackSize); - properties.setProperty("thread_stack_size", "-Xss" + threadStackSize + "k"); + if (isWindows()) { + updateWrapperEnv(config); } - PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); - if (heapDumpOnOMMError != null) { - if (heapDumpOnOMMError.getBooleanValue()) { - properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); - } else { - properties.setProperty("heap_dump_on_OOMError", ""); - } - } - - String heapDumpDir = config.getSimpleValue("heapDumpDir"); - if (!StringUtil.isEmpty(heapDumpDir)) { - properties.setProperty("heap_dump_dir", heapDumpDir); - } - - propertiesUpdater.update(properties); - configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); } catch (IllegalArgumentException e) { configurationUpdateReport.setErrorMessage("No configuration update was applied: " + e.getMessage()); @@ -164,6 +148,88 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { } } + private void updateCassandraJvmProps(Configuration config) throws IOException { + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(jvmOptsFile.getAbsolutePath()); + Properties properties = propertiesUpdater.loadExistingProperties(); + + String maxHeapSize = config.getSimpleValue("maxHeapSize"); + if (!StringUtil.isEmpty(maxHeapSize)) { + validateHeapArg("maxHeapSize", maxHeapSize); + // We want min and max heap to be the same + properties.setProperty("heap_min", "-Xms" + maxHeapSize); + properties.setProperty("heap_max", "-Xmx" + maxHeapSize); + } + + String heapNewSize = config.getSimpleValue("heapNewSize"); + if (!StringUtil.isEmpty(heapNewSize)) { + validateHeapArg("heapNewSize", heapNewSize); + properties.setProperty("heap_new", "-Xmn" + heapNewSize); + } + + String threadStackSize = config.getSimpleValue("threadStackSize"); + if (!StringUtil.isEmpty(threadStackSize)) { + validateStackArg(threadStackSize); + properties.setProperty("thread_stack_size", "-Xss" + threadStackSize + "k"); + } + + PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); + if (heapDumpOnOMMError != null) { + if (heapDumpOnOMMError.getBooleanValue()) { + properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + } else { + properties.setProperty("heap_dump_on_OOMError", ""); + } + } + + String heapDumpDir = useForwardSlash(config.getSimpleValue("heapDumpDir")); + if (!StringUtil.isEmpty(heapDumpDir)) { + properties.setProperty("heap_dump_dir", heapDumpDir); + } + + propertiesUpdater.update(properties); + } + + private void updateWrapperEnv(Configuration config) throws IOException { + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(wrapperEnvFile.getAbsolutePath()); + Properties properties = propertiesUpdater.loadExistingProperties(); + + String maxHeapSize = config.getSimpleValue("maxHeapSize"); + if (!StringUtil.isEmpty(maxHeapSize)) { + validateHeapArg("maxHeapSize", maxHeapSize); + // We want min and max heap to be the same + properties.setProperty("set.heap_min", "-Xms" + maxHeapSize); + properties.setProperty("set.heap_max", "-Xmx" + maxHeapSize); + } + + String heapNewSize = config.getSimpleValue("heapNewSize"); + if (!StringUtil.isEmpty(heapNewSize)) { + validateHeapArg("heapNewSize", heapNewSize); + properties.setProperty("set.heap_new", "-Xmn" + heapNewSize); + } + + String threadStackSize = config.getSimpleValue("threadStackSize"); + if (!StringUtil.isEmpty(threadStackSize)) { + validateStackArg(threadStackSize); + properties.setProperty("set.thread_stack_size", "-Xss" + threadStackSize + "k"); + } + + PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); + if (heapDumpOnOMMError != null) { + if (heapDumpOnOMMError.getBooleanValue()) { + properties.setProperty("set.heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + } else { + properties.setProperty("set.heap_dump_on_OOMError", ""); + } + } + + String heapDumpDir = useForwardSlash(config.getSimpleValue("heapDumpDir")); + if (!StringUtil.isEmpty(heapDumpDir)) { + properties.setProperty("set.heap_dump_dir", heapDumpDir); + } + + propertiesUpdater.update(properties); + } + private void validateHeapArg(String name, String value) { if (value.length() < 2) { throw new IllegalArgumentException(value + " is not a legal value for the property [" + name + "]"); @@ -189,4 +255,8 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { throw new IllegalArgumentException(value + " is not a legal value for the property [threadStackSize]"); } } + + private boolean isWindows() { + return File.separatorChar == '\\'; + } } commit 969ea38e7254d61903c699380bd066d6cad3e85e Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jul 22 14:06:39 2013 -0400 When recreating win services make sure they get started appropriately. diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java index 8c885b0..61c8a9c 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java @@ -36,12 +36,16 @@ import java.util.Properties; import org.apache.commons.cli.CommandLine; import org.apache.commons.exec.DefaultExecuteResultHandler; import org.apache.commons.exec.DefaultExecutor; +import org.apache.commons.exec.ExecuteException; import org.apache.commons.exec.Executor; import org.apache.commons.exec.PumpStreamHandler; + import org.jboss.as.controller.client.ModelControllerClient; + import org.rhq.common.jbossas.client.controller.DeploymentJBossASClient; import org.rhq.common.jbossas.client.controller.MCCHelper; import org.rhq.server.control.ControlCommand; +import org.rhq.server.control.RHQControlException; /** * Common code for commands that perform installs. Basically shared code for Install and Upgrade commands. @@ -55,7 +59,7 @@ public abstract class AbstractInstall extends ControlCommand { protected final String STORAGE_CONFIG_PROP = "rhqctl.install.storage-config"; - protected void installWindowsService(File workingDir, String batFile) throws Exception { + protected void installWindowsService(File workingDir, String batFile, boolean start) throws Exception { Executor executor = new DefaultExecutor(); executor.setWorkingDirectory(workingDir); executor.setStreamHandler(new PumpStreamHandler()); @@ -69,6 +73,11 @@ public abstract class AbstractInstall extends ControlCommand { commandLine = getCommandLine(batFile, "install"); executor.execute(commandLine); + + if (start) { + commandLine = getCommandLine(batFile, "start"); + executor.execute(commandLine); + } } protected void validateCustomStorageDataDirectories(CommandLine commandLine, List<String> errors) { @@ -100,6 +109,54 @@ public abstract class AbstractInstall extends ControlCommand { } } + protected void waitForProcessToStop(String pid) throws Exception { + + if (isWindows() || pid == null) { + // For the moment we have no better way to just wait some time + Thread.sleep(10 * 1000L); + } else { + int tries = 5; + while (tries > 0) { + log.debug("."); + if (!isUnixPidRunning(pid)) { + break; + } + Thread.sleep(2 * 1000L); + tries--; + } + if (tries == 0) { + throw new RHQControlException("Process [" + pid + + "] did not finish yet. Terminate it manually and retry."); + } + } + + } + + protected boolean isUnixPidRunning(String pid) { + + Executor executor = new DefaultExecutor(); + executor.setWorkingDirectory(getBinDir()); + executor.setStreamHandler(new PumpStreamHandler()); + org.apache.commons.exec.CommandLine commandLine; + + commandLine = new org.apache.commons.exec.CommandLine("/bin/kill").addArgument("-0").addArgument(pid); + + try { + int code = executor.execute(commandLine); + if (code != 0) { + return false; + } + } catch (ExecuteException ee) { + if (ee.getExitValue() == 1) { + // return code 1 means process does not exist + return false; + } + } catch (IOException e) { + log.error("Checking for running process failed: " + e.getMessage()); + } + return true; + } + protected void waitForRHQServerToInitialize() throws Exception { try { final long messageInterval = 30000L; @@ -287,7 +344,6 @@ public abstract class AbstractInstall extends ControlCommand { log.debug("Stopping RHQ server..."); - Executor executor = new DefaultExecutor(); executor.setWorkingDirectory(serverBinDir); executor.setStreamHandler(new PumpStreamHandler()); diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java index bb6aa40..0808db2 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java @@ -142,7 +142,7 @@ public class Install extends AbstractInstall { if (!isStorageInstalled()) { installStorageNode(getStorageBasedir(), commandLine); } else if (isWindows()) { - installWindowsService(getBinDir(), "rhq-storage"); + installWindowsService(getBinDir(), "rhq-storage", true); } if (!isServerInstalled()) { @@ -150,7 +150,7 @@ public class Install extends AbstractInstall { runRHQServerInstaller(); waitForRHQServerToInitialize(); } else if (isWindows()) { - installWindowsService(getBinDir(), "rhq-server"); + installWindowsService(getBinDir(), "rhq-server", true); } if (!isAgentInstalled()) { @@ -158,13 +158,15 @@ public class Install extends AbstractInstall { File agentBasedir = getAgentBasedir(); installAgent(agentBasedir); configureAgent(agentBasedir, commandLine); - if (Boolean.parseBoolean(commandLine.getOptionValue(AGENT_AUTOSTART_OPTION, "true"))) { + boolean start = Boolean.parseBoolean(commandLine.getOptionValue(AGENT_AUTOSTART_OPTION, "true")); + if (start) { startAgent(agentBasedir, true); } else { log.info("The agent was installed but was told not to start automatically."); } } else if (isWindows()) { - installWindowsService(new File(getAgentBasedir(), "bin"), "rhq-agent-wrapper"); + boolean start = Boolean.parseBoolean(commandLine.getOptionValue(AGENT_AUTOSTART_OPTION, "true")); + installWindowsService(new File(getAgentBasedir(), "bin"), "rhq-agent-wrapper", start); } } else { @@ -173,7 +175,7 @@ public class Install extends AbstractInstall { log.info("The RHQ storage node is already installed in " + new File(getBaseDir(), "storage")); if (isWindows()) { - installWindowsService(getBinDir(), "rhq-storage"); + installWindowsService(getBinDir(), "rhq-storage", true); } else { log.info("Skipping storage node installation."); } @@ -200,7 +202,7 @@ public class Install extends AbstractInstall { log.warn("The RHQ server is already installed."); if (isWindows()) { - installWindowsService(getBinDir(), "rhq-server"); + installWindowsService(getBinDir(), "rhq-server", true); } else { log.info("Skipping server installation."); } @@ -217,8 +219,10 @@ public class Install extends AbstractInstall { if (isAgentInstalled() && !commandLine.hasOption(STORAGE_OPTION)) { log.info("The RHQ agent is already installed in [" + getAgentBasedir() + "]"); + boolean start = Boolean + .parseBoolean(commandLine.getOptionValue(AGENT_AUTOSTART_OPTION, "true")); if (isWindows()) { - installWindowsService(new File(getAgentBasedir(), "bin"), "rhq-agent-wrapper"); + installWindowsService(new File(getAgentBasedir(), "bin"), "rhq-agent-wrapper", start); } else { log.info("Skipping agent installation."); }

1 0

[rhq] 2 commits - modules/plugins
by John Sanda 24 Jul '13

24 Jul '13

modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 15 modules/plugins/rhq-storage/pom.xml | 113 +++++ modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 148 ++++++ modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 10 modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java | 216 ++++++++++ modules/plugins/rhq-storage/src/test/resources/log4j.properties | 42 + 6 files changed, 534 insertions(+), 10 deletions(-) New commits: commit b537244bad778a80f6fdf92880abc245eed465ec Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 23 22:23:06 2013 -0400 initial commit for StorageNodeComponentITest This is a first stab at some integration tests for the storage plugin. diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index a88f56e..df79e40 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -10,11 +10,16 @@ <groupId>org.rhq</groupId> <artifactId>rhq-rhqstorage-plugin</artifactId> - <packaging>jar</packaging> <name>RHQ Storage Plugin</name> <description>A plugin for managing RHQ Storage Nodes</description> + <properties> + <pc.basedir>${project.build.directory}/plugin-container</pc.basedir> + <pc.plugins.dir>${pc.basedir}/plugins</pc.plugins.dir> + <pc.lib.dir>${pc.basedir}/lib</pc.lib.dir> + </properties> + <dependencies> <dependency> <groupId>${rhq.groupId}</groupId> @@ -27,7 +32,6 @@ <groupId>${rhq.groupId}</groupId> <artifactId>rhq-cassandra-plugin</artifactId> <version>${project.version}</version> -  </dependency> <dependency> @@ -35,8 +39,113 @@ <artifactId>org-mc4j-ems</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-ccm-core</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-platform-plugin</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-schema</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>pre-integration-test</phase> + <configuration> + <target> + <property name="sigar.dir" value="${project.build.directory/sigar}"/> + + <mkdir dir="${pc.basedir}"/> + <mkdir dir="${pc.lib.dir}"/> + <mkdir dir="${pc.plugins.dir}"/> + + <copy file="${org.rhq:rhq-platform-plugin:jar}" todir="${pc.plugins.dir}"/> + <copy file="${org.rhq:rhq-jmx-plugin:jar}" todir="${pc.plugins.dir}"/> + <copy file="${org.rhq:rhq-cassandra-plugin:jar}" todir="${pc.plugins.dir}"/> + <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${pc.plugins.dir}"/> + + <unzip src="${org.hyperic:sigar-dist:zip}" dest="${sigar.dir}"> + <patternset> + <include name="**/lib/sigar.jar" /> + <include name="**/lib/bcel*.jar" /> + <include name="**/lib/*.so" /> + <include name="**/lib/*.sl" /> + <include name="**/lib/*.dll" /> + <include name="**/lib/*.dylib" /> + </patternset> + </unzip> + <move todir="${pc.lib.dir}" flatten="true"> + <fileset dir="${sigar.dir}" includes="**/lib/*"/> + </move> + <delete dir="${sigar.dir}"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.13</version> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>integration-test</goal> + </goals> + <configuration> + <includes> + <include>**/*ITest.java</include> + </includes> + <argLine>-Djava.library.path=${pc.lib.dir}</argLine> + <systemPropertyVariables> + <pc.plugins.dir>${pc.plugins.dir}</pc.plugins.dir> + </systemPropertyVariables> + </configuration> + </execution> + <execution> + <id>verify</id> + <goals> + <goal>verify</goal> + </goals> + <configuration> + <testFailureIgnore>false</testFailureIgnore> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/*ITest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + <profiles> <profile> <id>dev</id> diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java new file mode 100644 index 0000000..cd9f148 --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -0,0 +1,216 @@ +package org.rhq.plugins.storage; + +import static java.util.Arrays.asList; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.io.File; +import java.net.InetAddress; +import java.util.Set; + +import com.google.common.collect.Sets; + +import org.testng.annotations.AfterSuite; +import org.testng.annotations.BeforeSuite; +import org.testng.annotations.Test; + +import org.rhq.cassandra.CassandraClusterManager; +import org.rhq.cassandra.ClusterInitService; +import org.rhq.cassandra.Deployer; +import org.rhq.cassandra.DeploymentOptions; +import org.rhq.cassandra.DeploymentOptionsFactory; +import org.rhq.cassandra.schema.SchemaManager; +import org.rhq.core.clientapi.server.discovery.InventoryReport; +import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pc.PluginContainer; +import org.rhq.core.pc.PluginContainerConfiguration; +import org.rhq.core.pc.inventory.InventoryManager; +import org.rhq.core.pc.operation.OperationContextImpl; +import org.rhq.core.pc.operation.OperationManager; +import org.rhq.core.pc.operation.OperationServicesAdapter; +import org.rhq.core.pc.plugin.FileSystemPluginFinder; +import org.rhq.core.pluginapi.operation.OperationServicesResult; +import org.rhq.core.pluginapi.operation.OperationServicesResultCode; +import org.rhq.core.pluginapi.util.ProcessExecutionUtility; +import org.rhq.core.system.ProcessExecution; +import org.rhq.core.system.ProcessExecutionResults; +import org.rhq.core.system.SystemInfo; +import org.rhq.core.system.SystemInfoFactory; + +/** + * @author John Sanda + */ +public class StorageNodeComponentITest { + + private File basedir; + + private Resource storageNode; + + @BeforeSuite + public void deployStorageNodeAndPluginContainer() throws Exception { + basedir = new File("target", "rhq-storage"); + + deployStorageNode(); + + initPluginContainer(); + } + + private void deployStorageNode() throws Exception { + DeploymentOptionsFactory factory = new DeploymentOptionsFactory(); + DeploymentOptions deploymentOptions = factory.newDeploymentOptions(); + String address = "127.0.0.1"; + + deploymentOptions.setSeeds(address); + deploymentOptions.setListenAddress(address); + deploymentOptions.setRpcAddress(address); + deploymentOptions.setBasedir(basedir.getAbsolutePath()); + deploymentOptions.setCommitLogDir(new File(basedir, "commit_log").getAbsolutePath()); + deploymentOptions.setDataDir(new File(basedir, "data").getAbsolutePath()); + deploymentOptions.setSavedCachesDir(new File(basedir, "saved_caches").getAbsolutePath()); + deploymentOptions.setCommitLogDir(new File(basedir, "logs").getAbsolutePath()); + deploymentOptions.setLoggingLevel("DEBUG"); + deploymentOptions.setNativeTransportPort(9142); + deploymentOptions.setJmxPort(7399); + deploymentOptions.setHeapSize("256M"); + deploymentOptions.setHeapNewSize("64M"); + + deploymentOptions.load(); + + Deployer deployer = new Deployer(); + deployer.setDeploymentOptions(deploymentOptions); + + deployer.unzipDistro(); + deployer.applyConfigChanges(); + deployer.updateFilePerms(); + deployer.updateStorageAuthConf(Sets.newHashSet(InetAddress.getByName(address))); + + File binDir = new File(basedir, "bin"); + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + + File startScript = new File(binDir, "cassandra"); + ProcessExecution startScriptExe = ProcessExecutionUtility.createProcessExecution(startScript); + + startScriptExe.addArguments(asList("-p", "cassandra.pid")); + startScriptExe.setCaptureOutput(true); + ProcessExecutionResults results = systemInfo.executeProcess(startScriptExe); + + assertEquals(results.getExitCode(), (Integer) 0, "Cassandra failed to start: " + results.getCapturedOutput()); + + StorageNode storageNode = new StorageNode(); + storageNode.parseNodeInformation("127.0.0.1|7399|9142"); + + ClusterInitService clusterInitService = new ClusterInitService(); + clusterInitService.waitForClusterToStart(asList(storageNode)); + + SchemaManager schemaManager = new SchemaManager("rhqadmin", "rhqadmin", "127.0.0.1|7399|9142"); + schemaManager.install(); + schemaManager.updateTopology(true); + } + + private void initPluginContainer() { + PluginContainerConfiguration pcConfig = new PluginContainerConfiguration(); + File pluginsDir = new File(System.getProperty("pc.plugins.dir")); + pcConfig.setPluginDirectory(pluginsDir); + pcConfig.setPluginFinder(new FileSystemPluginFinder(pluginsDir)); + + pcConfig.setInsideAgent(false); + PluginContainer.getInstance().setConfiguration(pcConfig); + PluginContainer.getInstance().initialize(); + } + + @AfterSuite + public void ShutdownPluginContainerAndStorageNode() throws Exception { + PluginContainer.getInstance().shutdown(); + shutdownStorageNodeIfNecessary(); + } + + private void shutdownStorageNodeIfNecessary() throws Exception { + File binDir = new File(basedir, "bin"); + File pidFile = new File(binDir, "cassandra.pid"); + + if (pidFile.exists()) { + CassandraClusterManager ccm = new CassandraClusterManager(); + ccm.killNode(basedir); + } + } + + @Test + public void discoverStorageNode() { + InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); + InventoryReport inventoryReport = inventoryManager.executeServerScanImmediately(); + + if (inventoryReport.getAddedRoots().isEmpty()) { + // could be empty if the storage node is already in inventory from + // a prior discovery scan. + Resource platform = inventoryManager.getPlatform(); + storageNode = findCassandraNode(platform.getChildResources()); + } else { + storageNode = findCassandraNode(inventoryReport.getAddedRoots()); + } + + assertNotNull(storageNode, "Failed to discover Storage Node instance"); + assertNodeIsUp("Expected " + storageNode + " to be UP after discovery"); + } + + @Test(dependsOnMethods = "discoverStorageNode") + public void shutdownStorageNode() throws Exception { + OperationManager operationManager = PluginContainer.getInstance().getOperationManager(); + OperationServicesAdapter operationsService = new OperationServicesAdapter(operationManager); + + long timeout = 1000 * 60; + OperationContextImpl operationContext = new OperationContextImpl(storageNode.getId()); + OperationServicesResult result = operationsService.invokeOperation(operationContext, "shutdown", + new Configuration(), timeout); + + assertEquals(result.getResultCode(), OperationServicesResultCode.SUCCESS, "The shutdown operation failed"); + // TODO why is this failing? + assertNodeIsDown("Expected " + storageNode + " to be DOWN after shutting it down"); + } + + private void assertNodeIsUp(String msg) { + executeAvailabilityScan(); + + Availability availability = getAvailability(); + + assertNotNull(availability, "Unable to determine availability for " + storageNode); + assertEquals(availability.getAvailabilityType(), AvailabilityType.UP, msg); + } + + private void assertNodeIsDown(String msg) { + executeAvailabilityScan(); + + Availability availability = getAvailability(); + + assertNotNull(availability, "Unable to determine availability for " + storageNode); + assertEquals(availability.getAvailabilityType(), AvailabilityType.DOWN, msg); + } + + private Availability getAvailability() { + InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); + return inventoryManager.getAvailabilityIfKnown(storageNode); + } + + private void executeAvailabilityScan() { + InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); + inventoryManager.executeAvailabilityScanImmediately(false, true); + } + + private Resource findCassandraNode(Set<Resource> resources) { + for (Resource resource : resources) { + if (isCassandraNode(resource.getResourceType())) { + return resource; + } + } + return null; + } + + private boolean isCassandraNode(ResourceType type) { + return type.getPlugin().equals("RHQStorage") && type.getName().equals("RHQ Storage Node"); + } + +} diff --git a/modules/plugins/rhq-storage/src/test/resources/log4j.properties b/modules/plugins/rhq-storage/src/test/resources/log4j.properties new file mode 100644 index 0000000..67db049 --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/resources/log4j.properties @@ -0,0 +1,42 @@ +# +# /* +# * RHQ Management Platform +# * Copyright (C) 2005-2012 Red Hat, Inc. +# * All rights reserved. +# * +# * This program is free software; you can redistribute it and/or modify +# * it under the terms of the GNU General Public License, version 2, as +# * published by the Free Software Foundation, and/or the GNU Lesser +# * General Public License, version 2.1, also as published by the Free +# * Software Foundation. +# * +# * This program is distributed in the hope that it will be useful, +# * but WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# * GNU General Public License and the GNU Lesser General Public License +# * for more details. +# * +# * You should have received a copy of the GNU General Public License +# * and the GNU Lesser General Public License along with this program; +# * if not, write to the Free Software Foundation, Inc., +# * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# */ +# + +log4j.rootCategory=WARN, FILE, CONSOLE + +log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender +log4j.appender.FILE.DatePattern='.'yyyy-MM-dd +log4j.appender.FILE.File=./target/test.log +log4j.appender.FILE.layout=org.apache.log4j.PatternLayout +log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n +#log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n +log4j.appender.FILE.Append=false + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +#log4j.appender.CONSOLE.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n + +log4j.logger.org.rhq=DEBUG +log4j.logger.com.datastax=DEBUG commit 83e5b228871c9a8352e98a12e0db76f8f4ea982e Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 23 22:16:41 2013 -0400 first stab at prepareForBootstrap operation (which is currently broken) This is clearly broken from some manual testing I did. Given that the implementation is a bit sloppy at the moment, this is a good time to get some automated tests in place. The operation will perform the following steps in the ordered specified: 1) shut down the storage node 2) update cassandra.yaml 3) update rhq-storage-auth.conf 4) restart the node diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 0037bfe..f76da22 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -111,7 +111,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent clusterBuilder = clusterBuilder.withCredentials(username, password); } - this.cassandraSession = clusterBuilder.build().connect(clusterName); +// this.cassandraSession = clusterBuilder.build().connect(clusterName); } catch (Exception e) { LOG.error("Connect to Cassandra " + host + ":" + nativePort, e); throw e; @@ -196,7 +196,17 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent operation = storageService.getOperation("drain", emptyParams); operation.invoke((Object[]) emptyParams); - ProcessInfo process = context.getNativeProcess(); + return stopNode(); + } + + protected OperationResult stopNode() { + ProcessInfo process = getResourceContext().getNativeProcess(); + + if (processInfo == null) { + LOG.warn("Failed to obtain process info. It appears Cassandra is already shutdown."); + return new OperationResult("Failed to obtain process info. It appears Cassandra is already shutdown."); + } + long pid = process.getPid(); try { process.kill("KILL"); @@ -209,6 +219,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } + protected OperationResult startNode() { ResourceContext<?> context = getResourceContext(); Configuration pluginConfig = context.getPluginConfiguration(); diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 3b0aa5b..d9b35b9 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -26,11 +26,15 @@ package org.rhq.plugins.storage; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; @@ -39,6 +43,8 @@ import org.mc4j.ems.connection.EmsConnection; import org.mc4j.ems.connection.bean.EmsBean; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.connection.bean.operation.EmsOperation; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; @@ -48,6 +54,7 @@ import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.core.util.StringUtil; @@ -96,6 +103,8 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return updateConfiguration(parameters); } else if (name.equals("updateKnownNodes")) { return updateKnownNodes(parameters); + } else if (name.equals("prepareForBootstrap")) { + return prepareForBootstrap(parameters); } else { return super.invokeOperation(name, parameters); } @@ -132,6 +141,18 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper ipAddresses.add(propertySimple.getStringValue()); } + if (updateAuthFile(result, ipAddresses)) return result; + + EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); + EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); + emsOperation.invoke(); + + result.setSimpleResult("Successfully updated the set of known nodes."); + + return result; + } + + private boolean updateAuthFile(OperationResult result, Set<String> ipAddresses) { log.info("Updating known nodes to " + ipAddresses); File confDir = new File(getBasedir(), "conf"); @@ -150,7 +171,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper log.error(msg); result.setErrorMessage(msg); - return result; + return true; } } @@ -161,7 +182,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper "to unexpected error"; log.error(msg, e); result.setErrorMessage(msg + ": " + ThrowableUtil.getRootMessage(e)); - return result; + return true; } try { @@ -176,18 +197,127 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } result.setErrorMessage("There was an unexpected error while updating " + authFile + ". Make sure that " + "it matches " + authBackupFile + " and then reschedule the operation."); + return true; + } + return false; + } + + private OperationResult prepareForBootstrap(Configuration params) { + log.info("Preparing " + this + " for bootstrap..."); + + ResourceContext context = getResourceContext(); + OperationResult result = new OperationResult(); + + log.info("Stopping storage node"); + OperationResult stopNodeResult = stopNode(); + if (stopNodeResult.getErrorMessage() != null) { + log.error("Failed to stop storage node " + this + " Cannot prepare the node for bootstrap which means " + + "that the storage node cannot join the cluster. Make sure the storage node is not running and retry " + + "the operation"); + result.setErrorMessage("Failed to stop storage node. Cannot prepare the node for bootstrap which means " + + "that it cannot join the cluster. Make sure that the node is not running and retry the operation. " + + "Stopping the storage node failed with this error: " + stopNodeResult.getErrorMessage()); return result; } - EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); - EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); - emsOperation.invoke(); + Configuration pluginConfig = context.getPluginConfiguration(); + String yamlProp = pluginConfig.getSimpleValue("yamlConfiguration"); + File yamlFile = new File(yamlProp); - result.setSimpleResult("Successfully updated the set of known nodes."); + DumperOptions options = new DumperOptions(); + options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + Yaml yaml = new Yaml(options); + + Map yamlConfig = null; + try { + yamlConfig = (Map) yaml.load(new FileInputStream(yamlFile)); + } catch (FileNotFoundException e) { + log.error("Failed to load " + yamlFile, e); + log.error("Cannot prepare " + this + " for bootstrap. " + yamlFile + " must exist in order to make the " + + "necessary configuration changes."); + result.setErrorMessage("Cannot prepare storage node for bootstrap. It appears that " + yamlFile + + " does not exist. Make sure that it exists so that the necessary configuration changes can be made."); + + return result; + } + + purgeDir(getCommitLogDir(yamlConfig)); + for (File dataDir : getDataDirs(yamlConfig)) { + purgeDir(dataDir); + } + purgeDir(getSavedCachesDir(yamlConfig)); + + log.info("Updating cluster settings"); + + String address = pluginConfig.getSimpleValue("host"); + List<String> seeds = getAddresses(params.getList("storageNodeIPAddresses")); + // Make sure this node's address is not in the list; otherwise, it + // won't bootstrap properly. + seeds.remove(address); + try { + updateSeedsList(seeds); + } catch (IOException e) { + log.error("Failed to update seeds property in " + yamlFile, e); + result.setErrorMessage("Failed to prepared node for bootstrap due to unexpected error that occurred " + + "while updating seeds property in " + yamlFile + ":\n" + ThrowableUtil.getAllMessages(e)); + return result; + } + + if (updateAuthFile(result, new HashSet<String>(seeds))) { + return result; + } + + int cqlPort = Integer.parseInt(params.getSimpleValue("cqlPort")); + int gossipPort = Integer.parseInt(params.getSimpleValue("gossipPort")); + + yamlConfig.put("native_transport_port", cqlPort); + yamlConfig.put("storage_port", gossipPort); + + try { + yaml.dump(yamlConfig, new FileWriter(yamlFile)); + } catch (IOException e) { + log.error("Could not update cluster settings in " + yamlFile, e); + result.setErrorMessage("Could not update cluster settings in " + yamlFile + ":\n" + + ThrowableUtil.getAllMessages(e)); + return result; + } + + log.info(this + " is ready to be bootstrap. Restarting storage node..."); + OperationResult startResult = startNode(); + if (startResult.getErrorMessage() != null) { + log.error("Failed to restart storage node:\n" + startResult.getErrorMessage()); + result.setErrorMessage("Failed to restart storage node:\n" + startResult.getErrorMessage()); + } else { + result.setSimpleResult("The storage node was succesfully updated is now bootstrapping into the cluster."); + } return result; } + private void purgeDir(File dir) { + log.info("Purging " + dir); + FileUtil.purge(dir, true); + } + + private File getCommitLogDir(Map yamlConfig) { + return new File((String) yamlConfig.get("commitlog_directory")); + } + + private List<File> getDataDirs(Map yamlConfig) { + List<File> dirs = new ArrayList<File>(); + List<String> dirNames = (List<String>) yamlConfig.get("data_file_directories"); + + for (String dirName : dirNames) { + dirs.add(new File(dirName)); + } + + return dirs; + } + + private File getSavedCachesDir(Map yamlConfig) { + return new File((String) yamlConfig.get("saved_caches_directory")); + } + private OperationResult nodeAdded(Configuration params) { boolean runRepair = params.getSimple("runRepair").getBooleanValue(); boolean updateSeedsList = params.getSimple("updateSeedsList").getBooleanValue(); @@ -405,4 +535,10 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper boolean succeeded; String details; } + + @Override + public String toString() { + return StorageNodeComponent.class.getSimpleName() + "[resourceKey: " + getResourceContext().getResourceKey() + + "]"; + } } diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 1e39d6c..cd84de6 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -101,6 +101,16 @@ </parameters> </operation> + <operation name="prepareForBootstrap"> + <parameters> + <c:simple-property name="cqlPort" type="integer" displayName="CQL Port"/> + <c:simple-property name="gossipPort" type="integer"/> + <c:list-property name="storageNodeIPAddresses" displayName="Storage Node IP Addresses"> + <c:simple-property name="storageNodeIPAddress"/> + </c:list-property> + </parameters> + </operation> + <operation name="prepareForUpgrade" description="Prepares the storage node for upgrade (this operation consists of following steps: 1) turning off the RPC server, 2) turning off the gossiper, 3) taking the snapshot (backuping the data), 4) invoking the drain operation"> <parameters> <c:simple-property name="snapshotName" required="false" type="string" displayName="Snapshot Name"

1 0

[rhq] Changes to 'feature/bundle-group'
by Jay Shaughnessy 23 Jul '13

23 Jul '13

New branch 'feature/bundle-group' available with the following commits: commit da7b8bf04aab224fcce8c613fb1dee74c62186d1 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jul 23 17:37:15 2013 -0400 Start setting up some infrastructure for Bundle Groups and associated permissions.

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - modules/enterprise
by mike thompson 23 Jul '13

23 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b7a901b43c29d0d0bdd8e883443b483b86039f18 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 23 13:52:13 2013 -0700 Fixed Global Exception in dashboard portlet chart when chartContext.data is null. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java index eeb97cf..67552d3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java @@ -694,7 +694,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { }; // end public closure }(); - if(typeof chartContext.data !== 'undefined' && chartContext.data.length > 0){ + if(typeof chartContext.data !== 'undefined' && chartContext.data !== null && chartContext.data.length > 0){ metricStackedBarGraph.draw(chartContext); }

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - modules/enterprise
by mike thompson 23 Jul '13

23 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 32 ++++++++-- 1 file changed, 28 insertions(+), 4 deletions(-) New commits: commit 5f701d641746c6dfc69d3ce8dd93afd82b52c768 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 23 13:09:38 2013 -0700 Consolidated Metrics - Implement manual expand/collapse row collection as redraws forget expanded rows. Expanded rows are now preserved across refreshes. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index b837af1..8797d59 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -40,12 +40,12 @@ import com.smartgwt.client.widgets.events.CloseClickHandler; import com.smartgwt.client.widgets.grid.ListGrid; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.grid.events.DataArrivedEvent; +import com.smartgwt.client.widgets.grid.events.DataArrivedHandler; import com.smartgwt.client.widgets.grid.events.RecordCollapseEvent; import com.smartgwt.client.widgets.grid.events.RecordCollapseHandler; import com.smartgwt.client.widgets.grid.events.RecordExpandEvent; import com.smartgwt.client.widgets.grid.events.RecordExpandHandler; -import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler; -import com.smartgwt.client.widgets.grid.events.SelectionEvent; import com.smartgwt.client.widgets.grid.events.SortChangedHandler; import com.smartgwt.client.widgets.grid.events.SortEvent; import com.smartgwt.client.widgets.layout.VLayout; @@ -86,6 +86,8 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re private final MeasurementUserPreferences measurementUserPrefs; private final Menu addToDashboardMenu; + Set<Integer> expandedRows = new HashSet<Integer>(); + public MetricsTableView(Resource resource, AbstractD3GraphListView abstractD3GraphListView) { super(); this.resource = resource; @@ -106,7 +108,7 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re */ @Override protected ListGrid createListGrid() { - return new MetricsTableListGrid(resource, addToDashboardMenu); + return new MetricsTableListGrid(this, resource, addToDashboardMenu); } protected void configureTable() { @@ -255,18 +257,24 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re private static final int NUM_METRIC_POINTS = 60; private Resource resource; final private Menu addToDashboardMenu; + final MetricsTableView metricsTableView; - public MetricsTableListGrid(final Resource resource, final Menu dashboardMenu) { + public MetricsTableListGrid(final MetricsTableView metricsTableView, final Resource resource, + final Menu dashboardMenu) { super(); this.resource = resource; this.addToDashboardMenu = dashboardMenu; this.addToDashboardMenu.disable(); + this.metricsTableView = metricsTableView; setCanExpandRecords(true); setCanExpandMultipleRecords(true); setExpansionMode(ExpansionMode.DETAIL_FIELD); + addRecordExpandHandler(new RecordExpandHandler() { @Override public void onRecordExpand(RecordExpandEvent recordExpandEvent) { + metricsTableView.expandedRows.add(recordExpandEvent.getRecord().getAttributeAsInt( + MetricsViewDataSource.FIELD_METRIC_DEF_ID)); redrawGraphs(); } @@ -274,6 +282,8 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re addRecordCollapseHandler(new RecordCollapseHandler() { @Override public void onRecordCollapse(RecordCollapseEvent recordCollapseEvent) { + metricsTableView.expandedRows.remove(recordCollapseEvent.getRecord().getAttributeAsInt( + MetricsViewDataSource.FIELD_METRIC_DEF_ID)); redrawGraphs(); } }); @@ -283,9 +293,23 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re redrawGraphs(); } }); + addDataArrivedHandler(new DataArrivedHandler() { + @Override + public void onDataArrived(DataArrivedEvent dataArrivedEvent) { + int startRow = dataArrivedEvent.getStartRow(); + int endRow = dataArrivedEvent.getEndRow(); + for (int i = startRow; i < endRow; i++) { + if (metricsTableView.expandedRows.contains(getRecord(i).getAttributeAsInt( + MetricsViewDataSource.FIELD_METRIC_DEF_ID))) { + expandRecord(getRecord(i)); + } + } + } + }); } + @Override protected Canvas getExpansionComponent(final ListGridRecord record) { final Integer definitionId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID);

1 0

[rhq] 3 commits - modules/enterprise pom.xml
by Simeon Pinder 23 Jul '13

23 Jul '13

modules/enterprise/server/appserver/pom.xml | 11 ++++++++++ modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 11 ++++++++++ pom.xml | 2 - 3 files changed, 23 insertions(+), 1 deletion(-) New commits: commit 4fa9f082b2e011b3bde9defe1021248148c4ad40 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Tue Jul 23 15:02:09 2013 -0400 [BZ 984649] fix module metadata. diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 145e3af..82ff294 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -290,7 +290,7 @@ <delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar.index" />  <replace file="${jboss.home}/modules/system/layers/base/org/jgroups/main/module.xml" - token="jgroups-${jgroups.initial.version}.jar" value="${jgroups.patch.version}"/> + token="jgroups-${jgroups.initial.version}.jar" value="jgroups-${jgroups.patch.version}.jar"/>  <copy file="${settings.localRepository}/org/jgroups/jgroups/${jgroups.patch.version}/jgroups-${jgroups.patch.version}.jar" toDir="${jboss.home}/modules/system/layers/base/org/jgroups/main" verbose="true"/> commit 8203c669b3b3ba5ed5c3ef27f051220da93ea868 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Tue Jul 23 13:37:32 2013 -0400 Upgrading richfaces to latest patched version. diff --git a/pom.xml b/pom.xml index 3662bc7..f909033 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ <postgresql.version>9.2-1002.jdbc4</postgresql.version> <h2.version>1.2.139</h2.version> <jtds.version>1.2.2</jtds.version> - <richfaces.version>3.3.3.Final</richfaces.version> + <richfaces.version>3.3.4.Final</richfaces.version> <jline.version>0.9.94</jline.version> <sigar.version>1.6.5.132-5</sigar.version> <sigar.zip.version>1.6.5</sigar.zip.version> commit caeb7a5c832334b74f76a265c8028a5697152dda Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Tue Jul 23 12:28:52 2013 -0400 [BZ 984649] update jgroups usage to latest patched version. diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 0a61138..f1a4c7b 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -19,6 +19,8 @@ <properties> <rhq.dev.data.dir>${rhq.rootDir}/rhq-data</rhq.dev.data.dir> + <jgroups.initial.version>3.2.7.Final</jgroups.initial.version> + <jgroups.patch.version>3.2.10.Final</jgroups.patch.version> </properties> <dependencies> @@ -72,6 +74,13 @@ <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> </dependency> + +  + <dependency> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>${jgroups.patch.version}</version> + </dependency> </dependencies> <build> @@ -157,6 +166,8 @@ <property name="rhq.server.http.port" value="${rhq.server.http.port}" /> <property name="rhq.server.https.port" value="${rhq.server.https.port}" /> <property name="rhq.sync.endpoint-address" value="${rhq.sync.endpoint-address}" /> + <property name="jgroups.initial.version" value="${jgroups.initial.version}" /> + <property name="jgroups.patch.version" value="${jgroups.patch.version}" /> </ant> </target> </configuration> diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index a81b6cd..145e3af 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -283,6 +283,17 @@ </resources> </module> ]]></echo> + + <echo>Updating JGroups module component for EAP to ${jgroups.patch.version}</echo> +  + <delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar" /> + <delete file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar.index" /> +  + <replace file="${jboss.home}/modules/system/layers/base/org/jgroups/main/module.xml" + token="jgroups-${jgroups.initial.version}.jar" value="${jgroups.patch.version}"/> +  + <copy file="${settings.localRepository}/org/jgroups/jgroups/${jgroups.patch.version}/jgroups-${jgroups.patch.version}.jar" + toDir="${jboss.home}/modules/system/layers/base/org/jgroups/main" verbose="true"/> <echo>Generate SSL key for RHQ server - 128-bit key that expires in 20 years</echo> <property name="jboss.conf.dir" location="${jboss.home}/standalone/configuration" />

1 0

[rhq] Branch 'release/jon3.1.x' - modules/enterprise
by Larry O'Leary 23 Jul '13

23 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java | 16 +++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 17 +--- modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java | 37 ++++------ 3 files changed, 39 insertions(+), 31 deletions(-) New commits: commit cb7bdca5eb624e5064dc0e4191e63b01e4877829 Author: Larry O'Leary <loleary(a)redhat.com> Date: Wed Jul 17 16:32:05 2013 +0200 BZ 981015 - Ldap auth failed if DN contained a backslash (cherry-picked from commit 01cd91b130f563ba62cd96a46f2cb3a2ac567a48) BZ 981015: Fix test failures introduced by commit 01cd91b - findLdapUserDetails was appending baseDN twice during fallback code - FakeLdapContext contained some lazy escaping on the mock group entries (cherry picked from commit 567aee7f81c6aa0f7680d4f394cccb1974705320) diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java index 3de303c..38af750 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java @@ -23,6 +23,7 @@ import java.util.Iterator; import java.util.Properties; import java.util.Map.Entry; +import javax.naming.CompositeName; import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.directory.SearchControls; @@ -189,7 +190,18 @@ public class LdapLoginModule extends UsernamePasswordLoginModule { SearchResult si = (SearchResult) answer.next(); // Construct the UserDN - String userDN = si.getName() + "," + baseDNs[x]; + String userDN = null; + + try { + userDN = si.getNameInNamespace(); + } catch (UnsupportedOperationException use) { + userDN = new CompositeName(si.getName()).get(0); + if (si.isRelative()) { + userDN += "," + baseDNs[x]; + } + } + + log.debug("Using LDAP userDN=" + userDN); ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, userDN); ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, inputPassword); @@ -204,7 +216,7 @@ public class LdapLoginModule extends UsernamePasswordLoginModule { // If we try all the BaseDN's and have not found a match, return false return false; } catch (Exception e) { - log.info("Failed to validate password: " + e.getMessage()); + log.info("Failed to validate password for [" + userName + "]: " + e.getMessage()); return false; } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index eeeb4fc..f828950 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.server.resource.group; @@ -31,6 +31,7 @@ import java.util.Set; import javax.ejb.EJB; import javax.ejb.Stateless; +import javax.naming.CompositeName; import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.NamingException; @@ -322,14 +323,10 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { try { userDN = si.getNameInNamespace(); } catch (UnsupportedOperationException use) { - userDN = si.getName(); - if (userDN.startsWith("\"")) { - userDN = userDN.substring(1, userDN.length()); + userDN = new CompositeName(si.getName()).get(0); + if (si.isRelative()) { + userDN += "," + baseDNs[x]; } - if (userDN.endsWith("\"")) { - userDN = userDN.substring(0, userDN.length() - 1); - } - userDN = userDN + "," + baseDNs[x]; } userDetails.put("dn", userDN); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java index dad31ce..2ae6265 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java @@ -99,7 +99,6 @@ public class FakeLdapContext implements LdapContext { try { return new FakeNamingEnumeration<SearchResult>(ldapTestData.getSearchResults(attributes)); } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); return null; } @@ -516,12 +515,12 @@ public class FakeLdapContext implements LdapContext { attr = new BasicAttribute("member"); attr.add("cn=Robert Smith,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Cannon\\, Brett,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Charles H\\\\Samlin,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Charles H\\Samlin,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Craig \\#1 Sellers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Beverly \\+1 Balanger,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Bethany \\<Stuart\\> Wallace,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Zachory S\\; Balanger,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Allen \\\"The Hammer\\\" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Allen \"The Hammer\" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Sam Not \\= Smitherson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=\\ Billy The Kiddough\\ ,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=System/Integration API,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); @@ -557,12 +556,12 @@ public class FakeLdapContext implements LdapContext { attr = new BasicAttribute("member"); attr.add("cn=John Smith,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Dr. Greg Hause\\, MD,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Cindy\\\\Cynthia Groober,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Cindy\\Cynthia Groober,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Biff \\# Rogers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Steven \\+2 Reed,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Lisa \\<The Great\\> Toller,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Homer J Simpsonite\\; III,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Jessica \\\"Crouching Tiger\\\" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Jessica \"Crouching Tiger\" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Hope \\= Rein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=\\ Sue Ferguson\\ ,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Phil/Susan Carlson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); @@ -598,12 +597,12 @@ public class FakeLdapContext implements LdapContext { attr = new BasicAttribute("member"); attr.add("cn=Sheri Smith,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Walsh\\, Brad,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Jim\\\\James Kirk,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Jim\\James Kirk,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Sandra \\# Phillips,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=William Tell Overture \\+1,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Craig \\<Bison\\> Allen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Walter T Fredrick\\; The Second,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Stanley \\\"Short\\\" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Stanley \"Short\" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Noah \\= Sadler,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=\\ Stuart Smiley\\ ,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=System/Integration API 2,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); @@ -984,7 +983,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with backslash (\\) in 'cn' in the RHQ Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Charles H\\\\Samlin,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Charles H\\Samlin,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Cindy\\Cynthia Groober,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -1033,7 +1032,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with backslash (\\) in 'cn' in the JBoss Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Cindy\\\\Cynthia Groober,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Cindy\\Cynthia Groober,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Jim\\James Kirk,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -1082,7 +1081,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with backslash (\\) in 'cn' in the JBoss Monitor Group"); attrs.put(attr); - sr = new SearchResult("cn=Jim\\\\James Kirk,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Jim\\James Kirk,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Craig \#1 Sellers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -1675,7 +1674,7 @@ public class FakeLdapContext implements LdapContext { null, attrs, true); this.add(sr); - // dn: cn=Allen \"The Hammer\" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com + // dn: cn=Allen "The Hammer" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com attrs = new BasicAttributes(); attr = new BasicAttribute("baseName"); @@ -1721,11 +1720,11 @@ public class FakeLdapContext implements LdapContext { attr.add("User with quote (\") in 'cn' in the RHQ Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Allen \\\"The Hammer\\\" Callen,ou=users", "javax.naming.directory.DirContext", + sr = new SearchResult("cn=Allen \"The Hammer\" Callen,ou=users", "javax.naming.directory.DirContext", null, attrs, true); this.add(sr); - // dn: cn=Jessica \"Crouching Tiger\" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com + // dn: cn=Jessica "Crouching Tiger" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com attrs = new BasicAttributes(); attr = new BasicAttribute("baseName"); @@ -1771,11 +1770,11 @@ public class FakeLdapContext implements LdapContext { attr.add("User with quote (\") in 'cn' in the JBoss Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Jessica \\\"Crouching Tiger\\\" Mathers,ou=users", + sr = new SearchResult("cn=Jessica \"Crouching Tiger\" Mathers,ou=users", "javax.naming.directory.DirContext", null, attrs, true); this.add(sr); - // dn: cn=Stanley \"Short\" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com + // dn: cn=Stanley "Short" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com attrs = new BasicAttributes(); attr = new BasicAttribute("baseName"); @@ -1821,7 +1820,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with quote (\") in 'cn' in the JBoss Monitor Group"); attrs.put(attr); - sr = new SearchResult("cn=Stanley \\\"Short\\\" Mein,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Stanley \"Short\" Mein,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Sam Not \= Smitherson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -2160,7 +2159,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with slash (/) in 'cn' in the RHQ Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=System/Integration API,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=System\\/Integration API,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Phil/Susan Carlson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -2209,7 +2208,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with slash (/) in 'cn' in the JBoss Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Phil/Susan Carlson,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Phil\\/Susan Carlson,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=System/Integration API 2,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -2254,7 +2253,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with slash (/) in 'cn' in the JBoss Monitor Group"); attrs.put(attr); - sr = new SearchResult("cn=System/Integration API 2,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=System\\/Integration API 2,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Lee -Fast- Croutche,ou=users,dc=test,dc=rhq,dc=redhat,dc=com

1 0

[rhq] 3 commits - modules/core modules/enterprise modules/plugins
by snegrea 23 Jul '13

23 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java | 58 +++++++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java | 32 ++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java | 5 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 31 ++++- modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml | 2 modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 3 6 files changed, 102 insertions(+), 29 deletions(-) New commits: commit cc64adde1d8835f8c000afe2de0746fda5bbd5c1 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Jul 23 08:43:19 2013 -0500 One more place where the previous rebase removed code for the storage node configuration. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 31e3bf7..9416c67 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -643,6 +643,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN Configuration parameters = new Configuration(); parameters.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); + parameters.setSimpleValue("heapNewSize", storageNodeConfiguration.getHeapNewSize() + ""); + parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); boolean updateConfigurationResult = runOperationAndWaitForResult(subject, storageNodeResource, UPDATE_CONFIGURATION_OPERATION, parameters); commit 373a931987b402479df3d02269cc00f4ac88a358 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Jul 23 08:42:49 2013 -0500 Enable the new set of calculated metrics for disk space utilization in the UI and CLI. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java index 80bfdd6..2c0b8f8 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java @@ -41,9 +41,13 @@ public class StorageNodeLoadComposite implements Serializable { private MeasurementAggregateWithUnits heapUsed; private MeasurementAggregateWithUnits heapPercentageUsed; private MeasurementAggregateWithUnits load; - private MeasurementAggregateWithUnits partitionDiskUsedPercentage; private MeasurementAggregateWithUnits dataDiskUsed; private MeasurementAggregate tokens; + + private MeasurementAggregateWithUnits dataDiskUsedPercentage; + private MeasurementAggregateWithUnits totalDiskUsedPercentage; + private MeasurementAggregate freeDiskToDataSizeRatio; + private MeasurementAggregateWithUnits actuallyOwns; public StorageNodeLoadComposite() { @@ -113,35 +117,59 @@ public class StorageNodeLoadComposite implements Serializable { public void setHeapPercentageUsed(MeasurementAggregateWithUnits heapPercentageUsed) { this.heapPercentageUsed = heapPercentageUsed; } - + /** * @deprecated use {@link #getPartitionDiskUsedPercentage() getPartitionDiskUsedPercentage()} instead - * + * * @return partitionDiskUsedPercentage */ public MeasurementAggregateWithUnits getDiskSpacePercentageUsed() { - return getPartitionDiskUsedPercentage(); + return getDataDiskUsedPercentage(); } - + /** * @deprecated use {@link #setPartitionDiskUsedPercentage() setPartitionDiskUsedPercentage()} instead - * + * * @param partitionDiskUsedPercentage */ - public void setDiskSpacePercentageUsed(MeasurementAggregateWithUnits partitionDiskUsedPercentage) { - setPartitionDiskUsedPercentage(partitionDiskUsedPercentage); + public void setDiskSpacePercentageUsed(MeasurementAggregateWithUnits diskUsedPercentage) { + setDataDiskUsedPercentage(diskUsedPercentage); + } + + /** + * @return A computed metric for the percentage of disk space used by data file on the corresponding partitions. + * If multiple data locations are configured then the aggregate is calculated. + */ + public MeasurementAggregateWithUnits getDataDiskUsedPercentage() { + return dataDiskUsedPercentage; + } + + public void setDataDiskUsedPercentage(MeasurementAggregateWithUnits dataDiskUsedPercentage) { + this.dataDiskUsedPercentage = dataDiskUsedPercentage; + } + + /** + * @return A computed metric for the percentage of total (system + Storage Node data file) disk space used the partitions where data files are stored. + * If multiple data locations are configured then the aggregate is calculated. + */ + public MeasurementAggregateWithUnits getTotalDiskUsedPercentage() { + return totalDiskUsedPercentage; + } + + public void setTotalDiskUsedPercentage(MeasurementAggregateWithUnits totalDiskUsedPercentage) { + this.totalDiskUsedPercentage = totalDiskUsedPercentage; } /** - * @return A computed metric for the percentage of disk space used on the partition that contains the SSTables. - * If multiple data locations are configured then the partition with the highest utilization will be reported. + * @return A computed metric for the percentage of total (system + Storage Node data file) disk space used the partitions where data files are stored. + * If multiple data locations are configured then the aggregate is calculated. */ - public MeasurementAggregateWithUnits getPartitionDiskUsedPercentage() { - return partitionDiskUsedPercentage; + public MeasurementAggregate getFreeDiskToDataSizeRatio() { + return freeDiskToDataSizeRatio; } - public void setPartitionDiskUsedPercentage(MeasurementAggregateWithUnits partitionDiskUsedPercentage) { - this.partitionDiskUsedPercentage = partitionDiskUsedPercentage; + public void setFreeDiskToDataSizeRatio(MeasurementAggregate freeDiskToDataSizeRatio) { + this.freeDiskToDataSizeRatio = freeDiskToDataSizeRatio; } /** @@ -202,7 +230,7 @@ public class StorageNodeLoadComposite implements Serializable { builder.append("heapUsed=").append(heapUsed).append(", "); builder.append("heapPercentageUsed=").append(heapPercentageUsed).append(", "); builder.append("load=").append(load).append(", "); - builder.append("partitionDiskUsedPercentage=").append(partitionDiskUsedPercentage).append(", "); + builder.append("dataUsedPercentage=").append(dataDiskUsedPercentage).append(", "); builder.append("dataDiskUsed=").append(dataDiskUsed).append(", "); builder.append("tokens=").append(tokens).append(", "); builder.append("actuallyOwns=").append(actuallyOwns); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java index 7d413fd..07064b7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java @@ -47,6 +47,7 @@ import org.rhq.core.domain.cloud.StorageNode.OperationMode; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite.MeasurementAggregateWithUnits; import org.rhq.core.domain.criteria.StorageNodeCriteria; +import org.rhq.core.domain.measurement.MeasurementAggregate; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; @@ -200,7 +201,8 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod public static class StorageNodeLoadCompositeDatasource extends RPCDataSource<StorageNodeLoadComposite, StorageNodeCriteria> { public static final String HEAP_PERCENTAGE_KEY = "heapPercentage"; - public static final String DISK_SPACE_PERCENTAGE_KEY = "diskSpacePercentage"; + public static final String DATA_DISK_SPACE_PERCENTAGE_KEY = "dataDiskSpacePercentage"; + public static final String TOTAL_DISK_SPACE_PERCENTAGE_KEY = "totalDiskSpacePercentage"; private int id; public static StorageNodeLoadCompositeDatasource getInstance(int id) { @@ -296,10 +298,15 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod "This value is calculated by dividing Heap Used by Heap Maximum.", HEAP_PERCENTAGE_KEY), Arrays.<Object> asList(loadComposite.getLoad(), "Load", "Data stored on the node", "load"), Arrays.<Object> asList( - loadComposite.getPartitionDiskUsedPercentage(), - "Disk Space Percent Used", - "Percentage of total disk space used for the partition that contains the data files.If multiple data locations are specified then this will report the average utilization accross all the partitions.", - DISK_SPACE_PERCENTAGE_KEY), + loadComposite.getDataDiskUsedPercentage(), + "Data Disk Space Percent Used", + "Percentage of disk space used by data files on the partitions that contain the data files. If multiple data locations are specified then the aggregate accross all the partitions that contain data files is reported.", + DATA_DISK_SPACE_PERCENTAGE_KEY), + Arrays.<Object> asList( + loadComposite.getTotalDiskUsedPercentage(), + "Total Disk Space Percent Used", + "Percentage of total disk space used (system and Storage Node) on the partitions that contain the data files. If multiple data locations are specified then the aggregate accross all the partitions that contain data files is reported.", + TOTAL_DISK_SPACE_PERCENTAGE_KEY), Arrays.<Object> asList( loadComposite.getDataDiskUsed(), "Total Disk Space Used", @@ -325,6 +332,21 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod recordsList.add(tokens); } + + if (loadComposite.getFreeDiskToDataSizeRatio() != null){ + MeasurementAggregate aggregate = loadComposite.getFreeDiskToDataSizeRatio(); + + ListGridRecord record = new ListGridRecord(); + record.setAttribute("id", "freeDiskToDataSizeRatio"); + record.setAttribute("name", "Free Disk To Data Size Ratio"); + record.setAttribute("hover", "Ratio of (Free Disk)/(Data File Size). A value below 1 is not recommended since a compaction or repair process could double the amount of disk space used by data files. If multiple data locations are specified then the aggregate accross all the partitions that contain data files is reported."); + record.setAttribute("min", aggregate.getMin()); + record.setAttribute("avg", aggregate.getAvg()); + record.setAttribute("max", aggregate.getMax()); + + recordsList.add(record); + } + ListGridRecord[] records = recordsList.toArray(new ListGridRecord[recordsList.size()]); return records; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java index e8dde9d..e044e4e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeLoadComponent.java @@ -51,8 +51,9 @@ public class StorageNodeLoadComponent extends EnhancedVLayout { @Override protected String getCellCSSText(ListGridRecord record, int rowNum, int colNum) { if ("avg".equals(getFieldName(colNum)) - && (StorageNodeLoadCompositeDatasource.HEAP_PERCENTAGE_KEY.equals(record.getAttribute("id")) || StorageNodeLoadCompositeDatasource.DISK_SPACE_PERCENTAGE_KEY - .equals(record.getAttribute("id")))) { + && (StorageNodeLoadCompositeDatasource.HEAP_PERCENTAGE_KEY.equals(record.getAttribute("id")) || + StorageNodeLoadCompositeDatasource.DATA_DISK_SPACE_PERCENTAGE_KEY.equals(record.getAttribute("id")) || + StorageNodeLoadCompositeDatasource.TOTAL_DISK_SPACE_PERCENTAGE_KEY.equals(record.getAttribute("id")))) { if (record.getAttributeAsFloat("avgFloat") > .85) { return "font-weight:bold; color:#d64949;"; } else if (record.getAttributeAsFloat("avgFloat") > .7) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index fab803b..31e3bf7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -253,13 +253,16 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN Map<String, Integer> scheduleIdsMap = new HashMap<String, Integer>(); // get the schedule ids for Storage Service resource - final String tokensMetric = "Tokens", ownershipMetric = "Ownership", diskUsedPercentageMetric = "Calculated.PartitionDiskUsedPercentage"; + final String tokensMetric = "Tokens", ownershipMetric = "Ownership"; + final String dataDiskUsedPercentageMetric = "Calculated.DataDiskUsedPercentage"; + final String totalDiskUsedPercentageMetric = "Calculated.TotalDiskUsedPercentage"; + final String freeDiskToDataRatioMetric = "Calculated.FreeDiskToDataSizeRatio"; final String loadMetric = "Load", keyCacheSize = "KeyCacheSize", rowCacheSize = "RowCacheSize", totalCommitLogSize = "TotalCommitlogSize"; TypedQuery<Object[]> query = entityManager.<Object[]> createNamedQuery( StorageNode.QUERY_FIND_SCHEDULE_IDS_BY_PARENT_RESOURCE_ID_AND_MEASUREMENT_DEFINITION_NAMES, Object[].class); query.setParameter("parrentId", resourceId).setParameter("metricNames", - Arrays.asList(tokensMetric, ownershipMetric, diskUsedPercentageMetric, loadMetric, keyCacheSize, - rowCacheSize, totalCommitLogSize)); + Arrays.asList(tokensMetric, ownershipMetric, loadMetric, keyCacheSize, rowCacheSize, totalCommitLogSize, + dataDiskUsedPercentageMetric, totalDiskUsedPercentageMetric, freeDiskToDataRatioMetric)); for (Object[] pair : query.getResultList()) { scheduleIdsMap.put((String) pair[0], (Integer) pair[1]); } @@ -292,10 +295,22 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); result.setActuallyOwns(ownershipAggregateWithUnits); } - if ((scheduleId = scheduleIdsMap.get(diskUsedPercentageMetric)) != null) { - StorageNodeLoadComposite.MeasurementAggregateWithUnits diskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( + + //calculated disk space related metrics + if ((scheduleId = scheduleIdsMap.get(dataDiskUsedPercentageMetric)) != null) { + StorageNodeLoadComposite.MeasurementAggregateWithUnits dataDiskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( + subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); + result.setDataDiskUsedPercentage(dataDiskUsedPercentageAggregateWithUnits); + } + if ((scheduleId = scheduleIdsMap.get(totalDiskUsedPercentageMetric)) != null) { + StorageNodeLoadComposite.MeasurementAggregateWithUnits totalDiskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); - result.setPartitionDiskUsedPercentage(diskUsedPercentageAggregateWithUnits); + result.setDataDiskUsedPercentage(totalDiskUsedPercentageAggregateWithUnits); + } + if ((scheduleId = scheduleIdsMap.get(freeDiskToDataRatioMetric)) != null) { + MeasurementAggregate freeDiskToDataRatioAggregate = measurementManager.getAggregate(subject, + scheduleId, beginTime, endTime); + result.setFreeDiskToDataSizeRatio(freeDiskToDataRatioAggregate); } if ((scheduleId = scheduleIdsMap.get(loadMetric)) != null) { diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml index 5bbebed..e95f995 100644 --- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml @@ -188,7 +188,7 @@ <metric property="Calculated.DataDiskUsedPercentage" displayName="Data File Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of disk space used by Cassandra data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> <metric property="Calculated.TotalDiskUsedPercentage" displayName="Total Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of total disk space used. The metric acounts overall disk usage (including system files), not just disk space used by Cassandra. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> - <metric property="Calculated.FreeDiskToDataSizeRatio" displayName="Free Disk to Data Size Ratio" dataType="measurement" displayType="summary" description="Ratio of (Amount of Free Disk)/(Data File Size). A value below 1 is not recommended since a compaction or repair process could double the amount of disk space used by data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> + <metric property="Calculated.FreeDiskToDataSizeRatio" displayName="Free Disk to Data Size Ratio" dataType="measurement" displayType="summary" description="Ratio of (Free Disk)/(Data File Size). A value below 1 is not recommended since a compaction or repair process could double the amount of disk space used by data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> <metric property="CurrentGenerationNumber" dataType="trait" displayType="summary" description="Current generation number"/> <metric property="ExceptionCount" measurementType="trendsup" dataType="measurement" displayType="summary" description="Exception Count"/> commit 6997631e56204db41c9f4902eef1c6210706be3f Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 15:14:22 2013 -0500 Add back code used to update storage node configuration tha was lost due to rebase. This code updates two additional storage node properties added. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index b32ab5b..fab803b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -611,6 +611,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN storageNodeResource.getId()); configuration.setHeapSize(storageNodeConfiguration.getSimpleValue("maxHeapSize")); + configuration.setHeapNewSize(storageNodeConfiguration.getSimpleValue("heapNewSize")); + configuration.setThreadStackSize(storageNodeConfiguration.getSimpleValue("threadStackSize")); configuration.setJmxPort(storageNode.getJmxPort()); } diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 8156d02..1e39d6c 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -122,6 +122,9 @@ <operation name="updateConfiguration" description="Updates the node configuration. Will require a separate server restart for the settings to take effect."> <parameters> <c:simple-property name="heapSize" type="string" description="The heap size to be used for both -Xms and -Xmx JVM options."/> + <c:simple-property name="heapNewSize" type="string" description="The heap new size to be used be used with -Xmn JVM option."/> + <c:simple-property name="threadStackSize" type="integer" description="The thread stack size. This memory is allocated to each thread off heap. The + value should be an integer that will be interpreted in kilobytes."/> <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> </parameters> <results>

1 0

[rhq] 2 commits - modules/core pom.xml
by Heiko W. Rupp 23 Jul '13

23 Jul '13

modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java | 44 ++ modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java | 2 modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java | 159 ++++++++++ modules/core/client-api/src/test/resources/test-hibernate.xml | 8 modules/core/client-api/src/test/resources/test-jbossas.xml | 10 modules/core/client-api/src/test/resources/test-subcategories-nested.xml | 60 +++ pom.xml | 4 7 files changed, 279 insertions(+), 8 deletions(-) New commits: commit e85abcf495d6939d876b09bd1de1e71a29af17ec Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Jul 23 10:42:17 2013 +0200 BZ 796480 (and others) add support for subCategory in embedded types (aka runs-inside) diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java index 88dd865..d5ff2ef 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java @@ -417,16 +417,56 @@ public class PluginMetadataParser { return serviceResourceType; } - private static void setSubCategory(ResourceDescriptor resourceDescriptor, ResourceType resourceType) + /** + * Try to find the subCategory of the p/s/s descriptor in one of the parents + * <subcategories><subcategory>Foo</subcategory></subcategories> elements and + * set it on the resourceType if found. + * + * It is not enough to look at the direct parents, but we need to also look at the + * <runs-inside> types if our type is "embedded" in a different type. + * @param resourceDescriptor Descriptor to get the subCategory attribute from + * @param resourceType The type to attach the ResourceSubCategory to. + * @throws InvalidPluginDescriptorException If the descriptor.subCategory can not be found in any parent. + */ + private void setSubCategory(ResourceDescriptor resourceDescriptor, ResourceType resourceType) throws InvalidPluginDescriptorException { String subCatName = resourceDescriptor.getSubCategory(); if (subCatName != null) { ResourceSubCategory subCat = SubCategoriesMetadataParser.findSubCategoryOnResourceTypeAncestor( resourceType, subCatName); - if (subCat == null) + + // We need to look at resourceDescriptor -> runsInside to see if one of those defines the + // subcategories that we are looking for. + if (subCat == null && resourceDescriptor.getRunsInside() != null) { + RunsInsideType rit = resourceDescriptor.getRunsInside(); + List<ParentResourceType> parentResourceTypeList = rit.getParentResourceType(); + for (ParentResourceType parentResourceType : parentResourceTypeList) { + ResourceType parentType = getResourceTypeFromPlugin(parentResourceType.getName(),parentResourceType.getPlugin()); + // check on the parent + if (parentType.getChildSubCategories()!=null ) { + for (ResourceSubCategory parentSubcat : parentType.getChildSubCategories()) { + if (parentSubcat.getName().equals(subCatName)) { + subCat = parentSubcat; + break; + } + } + } + + // Not found on runs-inside type look at the ancestor of those runs-inside types? + if (subCat==null) { + subCat = SubCategoriesMetadataParser.findSubCategoryOnResourceTypeAncestor(parentType,subCatName); + } + if (subCat!=null) { + break; + } + } + } + + if (subCat == null) { throw new InvalidPluginDescriptorException("Resource type [" + resourceType.getName() + "] specified a subcategory (" + subCatName + ") that is not defined as a child subcategory of one of its ancestor resource types."); + } resourceType.setSubCategory(subCat); } } diff --git a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java index 20e1aa9..2a9595f 100644 --- a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java +++ b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java @@ -226,6 +226,7 @@ public class ExtensionModelTest { assert jbossServer.getCategory().equals(ResourceCategory.SERVER); assert jbossServer.getDescription().equals("JBoss Application Server Description"); assert jbossServer.getParentResourceTypes().size() == 0; + assert jbossServer.getChildSubCategories().size() == 2; assert jbossServer.getChildResourceTypes().size() == 1; ResourceType embeddedTomcatServer = jbossServer.getChildResourceTypes().iterator().next(); @@ -263,6 +264,7 @@ public class ExtensionModelTest { assert hibernateService.getDescription().equals("Hibernate Service Description"); assert hibernateService.getChildResourceTypes().size() == 0; assert hibernateService.getParentResourceTypes().size() == 3; + assert hibernateService.getSubCategory().getName().equals("Framework"); ResourceType tomcatServer = metadataManager.getType("TomcatServer", "Tomcat"); ResourceType jbossServer = metadataManager.getType("JBossASServer", "JBossAS"); diff --git a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java new file mode 100644 index 0000000..1cba523 --- /dev/null +++ b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java @@ -0,0 +1,159 @@ + /* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.clientapi.agent.metadata.test; + + import java.net.URL; + import java.util.List; + import java.util.Set; + + import javax.xml.bind.JAXBContext; + import javax.xml.bind.Unmarshaller; + import javax.xml.bind.util.ValidationEventCollector; + + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.testng.annotations.BeforeSuite; + import org.testng.annotations.Test; + + import org.rhq.core.clientapi.agent.metadata.PluginMetadataManager; + import org.rhq.core.clientapi.agent.metadata.SubCategoriesMetadataParser; + import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil; + import org.rhq.core.clientapi.descriptor.DescriptorPackages; + import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; + import org.rhq.core.clientapi.descriptor.plugin.ResourceDescriptor; + import org.rhq.core.clientapi.descriptor.plugin.ServerDescriptor; + import org.rhq.core.clientapi.descriptor.plugin.ServiceDescriptor; + import org.rhq.core.clientapi.descriptor.plugin.SubCategoryDescriptor; + import org.rhq.core.domain.resource.ResourceCategory; + import org.rhq.core.domain.resource.ResourceSubCategory; + import org.rhq.core.domain.resource.ResourceType; + + /** + * @author Charles Crouch + * @author Heiko W. Rupp + */ +public class NestedSubCategoriesMetadataParserTest { + private static final String DESCRIPTOR_FILENAME = "test-subcategories-nested.xml"; + private final Log LOG = LogFactory.getLog(NestedSubCategoriesMetadataParserTest.class); + + private PluginDescriptor pluginDescriptor; + + @BeforeSuite + public void loadPluginDescriptor() throws Exception { + try { + URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME); + LOG.info("Loading plugin descriptor at: " + descriptorUrl); + + JAXBContext jaxbContext = JAXBContext.newInstance(DescriptorPackages.PC_PLUGIN); + + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + ValidationEventCollector vec = new ValidationEventCollector(); + unmarshaller.setEventHandler(vec); + pluginDescriptor = (PluginDescriptor) unmarshaller.unmarshal(descriptorUrl.openStream()); + } catch (Throwable t) { + // Catch RuntimeExceptions and Errors and dump their stack trace, because Surefire will completely swallow them + // and throw a cryptic NPE (see http://jira.codehaus.org/browse/SUREFIRE-157)! + t.printStackTrace(); + throw new RuntimeException(t); + } + } + + @Test + public void parseSingleSubCategory() { + List<ServerDescriptor> servers = pluginDescriptor.getServers(); + ServerDescriptor server0 = servers.get(0); + ResourceDescriptor.Subcategories subCategoriesDescriptor = server0.getSubcategories(); + assert subCategoriesDescriptor != null : "No subcategories element: " + server0.getName(); + + List<SubCategoryDescriptor> subCategoryDescriptors = subCategoriesDescriptor.getSubcategory(); + + assert subCategoryDescriptors != null : "No subcategory elements: " + server0.getName(); + assert !subCategoryDescriptors.isEmpty() : "No subcategory elements: " + server0.getName(); + + ResourceSubCategory subCat; + + ResourceType resType = new ResourceType("testResType", "myplugin", ResourceCategory.SERVER, null); + subCat = SubCategoriesMetadataParser.getSubCategory(subCategoryDescriptors.get(0), resType); + + assert subCat != null : "Null subcategory received from parser"; + assert subCat.getName().equals("applications") : "Name not read correctly"; + assert subCat.getDisplayName().equals("Apps") : "Display name not read correctly"; + assert subCat.getDescription().equals("The apps.") : "Description not read correctly"; + // getSubCategory is no longer responsible for setting resourcetype information, that is done in PluginMetadataParser + //assert subCat.getResourceType().equals(resType) : "ResourceType not set correctly"; + + } + + @Test + public void parseNestedSubCategories() { + List<ServerDescriptor> servers = pluginDescriptor.getServers(); + ServerDescriptor server2 = servers.get(1); + assert server2.getName().equals("testServer2"); + ResourceDescriptor.Subcategories subCategoriesDescriptor = server2.getSubcategories(); + assert subCategoriesDescriptor == null : "Unexpected subcategories element: " + server2.getName(); + assert server2.getSubCategory().equals("applications"); + + List<ServiceDescriptor> services = pluginDescriptor.getServices(); + ServiceDescriptor service1 = services.get(0); + assert service1.getName().equals("testService"); + assert service1.getSubCategory().equals("applications"); + } + + @Test + public void testParseViaMetaDataManager() throws Exception { + + PluginDescriptor pluginDescriptor; + + URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME); + System.out.println("Loading plugin descriptor at: " + descriptorUrl); + + pluginDescriptor = (PluginDescriptor) AgentPluginDescriptorUtil.parsePluginDescriptor(descriptorUrl + .openStream()); + + PluginMetadataManager metadataManager = new PluginMetadataManager(); + Set<ResourceType> typeSet = metadataManager.loadPlugin(pluginDescriptor); + assert typeSet != null : "Got no types!!"; + assert typeSet.size()==5 : "Expected 5 types, but got " + typeSet.size(); + + ResourceType testService = findType(typeSet,"testService"); + assert testService.getSubCategory().getName().equals("applications"); + + ResourceType testService2 = findType(typeSet,"testService2"); + assert testService2.getSubCategory().getName().equals("applications"); + + ResourceType testService3 = findType(typeSet,"testService3"); + assert testService3.getSubCategory().getName().equals("fooBar"); + + + } + + private ResourceType findType(Set<ResourceType> types, String name) { + for (ResourceType type : types ) { + if (type.getName().equals(name)) { + return type; + } + } + assert false : "Type with name " + name + " not found"; + return null; + } + } \ No newline at end of file diff --git a/modules/core/client-api/src/test/resources/test-hibernate.xml b/modules/core/client-api/src/test/resources/test-hibernate.xml index 37a2e03..9051ca2 100644 --- a/modules/core/client-api/src/test/resources/test-hibernate.xml +++ b/modules/core/client-api/src/test/resources/test-hibernate.xml @@ -3,7 +3,7 @@ package="org.rhq.plugins.test2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin"> - + <depends plugin="JMX" /> <depends plugin="Tomcat" /> <depends plugin="JBossAS" /> @@ -11,11 +11,13 @@ <service name="HibernateService" discovery="HibernateDiscoveryComponent" class="HibernateServiceComponent" - description="Hibernate Service Description"> + description="Hibernate Service Description" + subCategory="Framework" + > <runs-inside> <parent-resource-type name="TomcatServer" plugin="Tomcat"/> <parent-resource-type name="JBossASServer" plugin="JBossAS"/> <parent-resource-type name="EmbeddedTomcatServer" plugin="JBossAS"/> </runs-inside> - </service> + </service> </plugin> \ No newline at end of file diff --git a/modules/core/client-api/src/test/resources/test-jbossas.xml b/modules/core/client-api/src/test/resources/test-jbossas.xml index 4d2602b..8269343 100644 --- a/modules/core/client-api/src/test/resources/test-jbossas.xml +++ b/modules/core/client-api/src/test/resources/test-jbossas.xml @@ -12,7 +12,11 @@ discovery="JBossASDiscoveryComponent" class="JBossASServerComponent" description="JBoss Application Server Description"> - + <subcategories> + <subcategory name="Applications" /> + <subcategory name="Framework" /> + </subcategories> + <operation name="stop" displayName="Stop JBossAS Server" description="Kills the server" timeout="30"> <parameters> <c:simple-property name="force" @@ -29,7 +33,7 @@ required="true" description="If true, the server is definitely down; otherwise, the shutdown was issued but it is unclear if it really died"/> </results> - </operation> + </operation> <server name="EmbeddedTomcatServer" description="Embedded Tomcat Web Server Description" sourcePlugin="Tomcat" @@ -37,6 +41,6 @@ discovery="JBossASTomcatDiscoveryComponent" class="JBossASTomcatServerComponent"> </server> - + </server> </plugin> \ No newline at end of file diff --git a/modules/core/client-api/src/test/resources/test-subcategories-nested.xml b/modules/core/client-api/src/test/resources/test-subcategories-nested.xml new file mode 100644 index 0000000..eb43af7 --- /dev/null +++ b/modules/core/client-api/src/test/resources/test-subcategories-nested.xml @@ -0,0 +1,60 @@ + + +<plugin name="TestPlugin" displayName="Mock JBoss AS" package="org.rhq.plugins.mock.jboss" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:xmlns:rhq-plugin"> + + <server name="testServer1"> + <subcategories> + <subcategory name="applications" displayName="Apps" description="The apps."/> + <subcategory name="fooBar"/> + </subcategories> + </server> + +  + <server name="testServer2" subCategory="applications"> + <runs-inside> + <parent-resource-type name="testServer1" plugin="TestPlugin"/> + </runs-inside> + <metric property="testMetric"/> + </server> + + <service name="testService" subCategory="applications"> + <runs-inside> + <parent-resource-type name="testServer1" plugin="TestPlugin"/> + </runs-inside> + + </service> + + <service name="testService2" subCategory="applications"> + <runs-inside> + <parent-resource-type name="testServer1" plugin="TestPlugin"/> + </runs-inside> + + </service> + + <service name="testService3" subCategory="fooBar"> + <runs-inside> + <parent-resource-type name="testServer1" plugin="TestPlugin"/> + </runs-inside> + + </service> + +</plugin> commit 60329fcbda5a1961e0f9285c70eb56ea12fe2eb0 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 22 15:00:35 2013 +0200 Add Michael Burman as contributor diff --git a/pom.xml b/pom.xml index c5cf5a7..3662bc7 100644 --- a/pom.xml +++ b/pom.xml @@ -2353,6 +2353,10 @@ <timezone>+1</timezone> </contributor> <contributor> + <name>Michael Burman</name> + <timezone>+2</timezone> + </contributor> + <contributor> <name>Torben Jäger</name> <timezone>+1</timezone> </contributor>

1 0

[rhq] modules/plugins
by Thomas Segismont 23 Jul '13

23 Jul '13

modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java | 7 ++++- modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java | 12 ++++------ modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java | 7 ++++- 3 files changed, 15 insertions(+), 11 deletions(-) New commits: commit d7e9f5b9871824d1f02ae762b44cff85ff6c3d44 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Tue Jul 23 10:41:12 2013 +0200 Bug 969621 - EAP 6 managed plug-in is unable to discover EAP servers when more then one is running on a single host Update expected resource keys in itests diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java index 91ece92..269474b 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java @@ -43,8 +43,11 @@ public class DomainServerComponentTest extends AbstractServerComponentTest { public static final ResourceType RESOURCE_TYPE = new ResourceType("JBossAS7 Host Controller", PLUGIN_NAME, ResourceCategory.SERVER, null); - // The key is the server's base dir. - public static final String RESOURCE_KEY = new File(JBOSS_HOME, "domain").getPath(); + // The key is the server host config file + // hostConfig: /tmp/jboss-as-6.0.0/domain/configuration/host.xml + public static final String RESOURCE_KEY = "hostConfig: " + + new File(JBOSS_HOME, "domain" + File.separator + "configuration" + File.separator + "host.xml") + .getAbsolutePath(); @Override protected ResourceType getServerResourceType() { diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java index d128144..182ef36 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.modules.plugins.jbossas7.itest.domain; @@ -488,10 +488,8 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest { InventoryManager im = pluginContainer.getInventoryManager(); Resource platform = im.getPlatform(); //host controller - ResourceType hostControllerType = new ResourceType("JBossAS7 Host Controller", PLUGIN_NAME, - ResourceCategory.SERVER, null); - Resource hostController = getResourceByTypeAndKey(platform, hostControllerType, - "/tmp/jboss-as-6.0.0/domain"); + Resource hostController = getResourceByTypeAndKey(platform, DomainServerComponentTest.RESOURCE_TYPE, + DomainServerComponentTest.RESOURCE_KEY); //profile=full-ha ResourceType profileType = new ResourceType("Profile", PLUGIN_NAME, ResourceCategory.SERVICE, null); String key = PROFILE; diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java index 8446345..32f92c7 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java @@ -51,8 +51,11 @@ public class StandaloneServerComponentTest extends AbstractServerComponentTest { public static final ResourceType RESOURCE_TYPE = new ResourceType("JBossAS7 Standalone Server", PLUGIN_NAME, ResourceCategory.SERVER, null); - // The key is the server's base dir. - public static final String RESOURCE_KEY = new File(JBOSS_HOME, "standalone").getPath(); + // The key is the server host config file + // hostConfig: /tmp/jboss-as-6.0.0/standalone/configuration/standalone-full-ha.xml + public static final String RESOURCE_KEY = "hostConfig: " + + new File(JBOSS_HOME, "standalone" + File.separator + "configuration" + File.separator + + "standalone-full-ha.xml").getAbsolutePath(); private static final String RELOAD_OPERATION_NAME = "reload"; private static final String RESTART_OPERATION_NAME = "restart";

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - 92 commits - .classpath etc/agent-versioning etc/dev-utils etc/rhq-ircBot etc/scripts modules/common modules/core modules/enterprise modules/helpers modules/plugins pom.xml
by mike thompson 23 Jul '13

23 Jul '13

.classpath | 1 etc/agent-versioning/build.xml | 2 etc/dev-utils/TestLdapSettings.java | 102 + etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java | 5 etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat | 104 + etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh | 43 modules/common/cassandra-auth/pom.xml | 27 modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticator.java | 78 + modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticatorMBean.java | 10 modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 87 - modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra | 192 ++ modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties | 112 + modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh | 247 --- modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml | 4 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/deploy.xml | 221 --- modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cli/dbsetup.script | 40 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/create_keyspace.cql | 1 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/dbsetup.cql | 42 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java | 39 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java | 83 + modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java | 4 modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-env.sh | 247 --- modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties | 112 + modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml | 4 modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 146 +- modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java | 204 ++ modules/common/cassandra-installer/src/test/resources/log4j.properties | 41 modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra-env.sh | 247 +++ modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra.yaml | 690 ++++++++++ modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/log4j-server.properties | 45 modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ClusterBuilder.java | 7 modules/common/pom.xml | 1 modules/core/dbutils/pom.xml | 2 modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/StorageNodeAddressUpgradeTask.java | 54 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 5 modules/core/domain/intentional-api-changes-since-4.8.0.xml | 8 modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java | 3 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java | 3 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java | 130 + modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java | 247 +++ modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 9 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java | 13 modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationBuilderTest.java | 237 +++ modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccess.java | 44 modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java | 201 ++ modules/core/native-system/src/test/java/org/rhq/core/system/SigarAccessHandlerTest.java | 172 ++ modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java | 2 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 15 modules/enterprise/gui/coregui/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java | 20 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java | 42 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java | 38 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 17 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 204 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 99 - modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 7 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 4 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 5 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 5 modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 12 modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/JsonPFilter.java | 23 modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.bat | 14 modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.sh | 14 modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 8 modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy | 5 modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java | 22 modules/enterprise/server/ear/pom.xml | 4 modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml | 2 modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 2 modules/enterprise/server/itests-2/pom.xml | 4 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java | 86 - modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/test/GroupMemberCandidateResourcesTest.java | 190 ++ modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 67 modules/enterprise/server/itests-2/src/test/resources/application.xml | 4 modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml | 2 modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml | 18 modules/enterprise/server/jar/pom.xml | 21 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 215 +++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java | 26 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java | 27 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java | 16 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 20 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java | 29 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 10 modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties | 2 modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java | 10 modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml | 16 modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java | 6 modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSenderTest.java | 5 modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java | 49 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java | 86 + modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java | 55 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java | 2 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java | 10 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java | 10 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java | 2 modules/enterprise/server/server-metrics/pom.xml | 12 modules/enterprise/server/startup-subsystem/pom.xml | 4 modules/helpers/metrics-simulator/pom.xml | 6 modules/helpers/pluginAnnotations/pom.xml | 4 modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/ConfigProperty.java | 49 modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Parameter.java | 5 modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/RhqType.java | 77 + modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java | 12 modules/helpers/pluginGen/pom.xml | 42 modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java | 162 ++ modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/DirectoryClassLoader.java | 142 ++ modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java | 357 +++++ modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java | 35 modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java | 135 + modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java | 68 modules/helpers/pluginGen/src/main/resources/component.ftl | 9 modules/helpers/pluginGen/src/main/resources/descriptor.ftl | 9 modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl | 31 modules/helpers/pluginGen/src/main/resources/pom.ftl | 21 modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java | 64 modules/helpers/rest-docs-generator/pom.xml | 12 modules/plugins/cassandra/pom.xml | 4 modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 124 + modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java | 60 modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml | 14 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java | 64 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 55 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java | 25 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java | 24 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java | 13 modules/plugins/rhq-storage/pom.xml | 97 - modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 130 + modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java | 192 ++ modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 54 modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java | 191 ++ modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java | 41 pom.xml | 7 144 files changed, 6408 insertions(+), 1884 deletions(-) New commits: commit 4d3cd62b836415b00987b25d65a6ab38d732abc3 Author: Mike Thompson <mithomps(a)redhat.com> Date: Mon Jul 22 19:04:10 2013 -0700 Consolidated Metrics -Finish 'add to dashboard' button menu functionality. . diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java index e7482fe..779f877 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java @@ -65,13 +65,12 @@ import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; public class DashboardLinkUtility { final static Messages MSG = CoreGUI.getMessages(); - public DashboardLinkUtility getInstance(){ - return new DashboardLinkUtility(); + private DashboardLinkUtility() { } - private DashboardLinkUtility(){ } - public static MenuItem buildMetricsMenu(final ResourceType type, final Resource resource) { - MenuItem measurements = new MenuItem(MSG.view_tree_common_contextMenu_measurements()); + public static MenuItem buildMetricsMenu(final ResourceType resourceType, final Resource resource, String label) { + + MenuItem measurements = new MenuItem(label); final Menu measurementsSubMenu = new Menu(); DashboardCriteria criteria = new DashboardCriteria(); @@ -87,7 +86,7 @@ public class DashboardLinkUtility { //sort the display items alphabetically TreeSet<String> ordered = new TreeSet<String>(); Map<String, MeasurementDefinition> definitionMap = new HashMap<String, MeasurementDefinition>(); - for (MeasurementDefinition m : type.getMetricDefinitions()) { + for (MeasurementDefinition m : resourceType.getMetricDefinitions()) { ordered.add(m.getDisplayName()); definitionMap.put(m.getDisplayName(), m); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java index e305039..a3990bb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java @@ -32,11 +32,6 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import com.google.gwt.http.client.Request; -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.RequestCallback; -import com.google.gwt.http.client.RequestException; -import com.google.gwt.http.client.Response; import com.google.gwt.user.client.History; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.DSCallback; @@ -60,17 +55,8 @@ import com.smartgwt.client.widgets.tree.events.DataArrivedHandler; import com.smartgwt.client.widgets.tree.events.NodeContextClickEvent; import com.smartgwt.client.widgets.tree.events.NodeContextClickHandler; -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.criteria.DashboardCriteria; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; -import org.rhq.core.domain.criteria.SubjectCriteria; -import org.rhq.core.domain.dashboard.Dashboard; -import org.rhq.core.domain.dashboard.DashboardPortlet; -import org.rhq.core.domain.measurement.DataType; -import org.rhq.core.domain.measurement.MeasurementDefinition; -import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.operation.OperationDefinition; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; @@ -82,11 +68,9 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.ViewId; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resource.graph.ResourceD3GraphPortlet; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync; @@ -101,8 +85,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; -import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; /** * @author Jay Shaughnessy @@ -562,7 +544,7 @@ public class ResourceTreeView extends EnhancedVLayout { resourceContextMenu.addItem(operations); // Metric graph addition menu - resourceContextMenu.addItem(buildMetricsMenu(resourceType, resource)); + resourceContextMenu.addItem(DashboardLinkUtility.buildMetricsMenu(resourceType, resource, MSG.view_tree_common_contextMenu_measurements())); // Create Child Menu and Manual Import Menu final Set<ResourceType> creatableChildTypes = getCreatableChildTypes(resourceType); @@ -725,190 +707,6 @@ public class ResourceTreeView extends EnhancedVLayout { tree.reloadChildren(refreshNode); } - private MenuItem buildMetricsMenu(final ResourceType type, final Resource resource) { - MenuItem measurements = new MenuItem(MSG.view_tree_common_contextMenu_measurements()); - final Menu measurementsSubMenu = new Menu(); - - DashboardCriteria criteria = new DashboardCriteria(); - GWTServiceLookup.getDashboardService().findDashboardsByCriteria(criteria, - new AsyncCallback<PageList<Dashboard>>() { - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_dashboard(), - caught); - } - - public void onSuccess(PageList<Dashboard> result) { - //sort the display items alphabetically - TreeSet<String> ordered = new TreeSet<String>(); - Map<String, MeasurementDefinition> definitionMap = new HashMap<String, MeasurementDefinition>(); - for (MeasurementDefinition m : type.getMetricDefinitions()) { - ordered.add(m.getDisplayName()); - definitionMap.put(m.getDisplayName(), m); - } - - for (String displayName : ordered) { - final MeasurementDefinition def = definitionMap.get(displayName); - //only add menu items for Measurement - if (def.getDataType().equals(DataType.MEASUREMENT)) { - MenuItem defItem = new MenuItem(def.getDisplayName()); - measurementsSubMenu.addItem(defItem); - Menu defSubItem = new Menu(); - defItem.setSubmenu(defSubItem); - - for (final Dashboard d : result) { - MenuItem addToDBItem = new MenuItem(MSG - .view_tree_common_contextMenu_addChartToDashboard(d.getName())); - defSubItem.addItem(addToDBItem); - - addToDBItem.addClickHandler(new ClickHandler() { - - public void onClick(MenuItemClickEvent menuItemClickEvent) { - DashboardPortlet p = new DashboardPortlet(MSG - .view_tree_common_contextMenu_resourceGraph(), ResourceD3GraphPortlet.KEY, - 250); - p.getConfiguration().put( - new PropertySimple(ResourceD3GraphPortlet.CFG_RESOURCE_ID, resource.getId())); - p.getConfiguration().put( - new PropertySimple(ResourceD3GraphPortlet.CFG_DEFINITION_ID, def.getId())); - - d.addPortlet(p); - - GWTServiceLookup.getDashboardService().storeDashboard(d, - new AsyncCallback<Dashboard>() { - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), - caught); - } - - public void onSuccess(Dashboard result) { - CoreGUI - .getMessageCenter() - .notify( - new Message( - MSG.view_tree_common_contextMenu_saveChartToDashboardSuccessful(result - .getName()), Message.Severity.Info)); - } - }); - - } - - }); - - - }//end dashboard iteration - - //add new menu item for adding current graphable element to view if on Monitor/Graphs tab - String currentViewPath = History.getToken(); - if (currentViewPath.contains("Monitoring/Metrics")) { - MenuItem addGraphItem = new MenuItem(MSG.common_title_add_graph_to_view()); - defSubItem.addItem(addGraphItem); - - addGraphItem.addClickHandler(new ClickHandler() { - public void onClick(MenuItemClickEvent menuItemClickEvent) { - //generate javascript to call out to. - //Ex. menuLayers.hide();addMetric('${metric.resourceId},${metric.scheduleId}') - if (getScheduleDefinitionId(resource, def.getName()) > -1) { - final String resourceGraphElements = resource.getId() + "," - + getScheduleDefinitionId(resource, def.getName()); - - //Once, the portal-war will be rewritten to GWT and operations performed - //within the iframe + JSF will update the user preferences, the following - //2 lines could be uncommented and the lines below them refactorized - //MeasurementUserPreferences measurementPreferences = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); - //String selectedView = measurementPreferences.getSelectedView(String.valueOf(resource.getId())); - - final int sid = UserSessionManager.getSessionSubject().getId(); - SubjectCriteria c = new SubjectCriteria(); - c.addFilterId(sid); - - GWTServiceLookup.getSubjectService().findSubjectsByCriteria(c, - new AsyncCallback<PageList<Subject>>() { - public void onSuccess(PageList<Subject> result) { - if (result.size() > 0) { - UserPreferences uPreferences = new UserPreferences(result - .get(0)); - MeasurementUserPreferences mPreferences = new MeasurementUserPreferences( - uPreferences); - String selectedView = mPreferences.getSelectedView(String - .valueOf(resource.getId())); - - addNewMetric(String.valueOf(resource.getId()), - selectedView, resourceGraphElements); - } else { - Log.trace("Error obtaining subject with id:" + sid); - } - } - - public void onFailure(Throwable caught) { - Log.trace("Error obtaining subject with id:" + sid, caught); - } - }); - } - } - }); - } // end add the "add to view" menu item - }//end trait exclusion - }//end measurement def iteration - - } - }); - measurements.setSubmenu(measurementsSubMenu); - return measurements; - } - - private void addNewMetric(String id, String selectedView, String resourceGraphElements) { - //construct portal.war url to access - String baseUrl = "/resource/common/monitor/visibility/IndicatorCharts.do"; - baseUrl += "?id=" + id; - baseUrl += "&view=" + selectedView; - baseUrl += "&action=addChart&metric=" + resourceGraphElements; - final String url = baseUrl; - //initiate HTTP request - final RequestBuilder b = new RequestBuilder(RequestBuilder.GET, baseUrl); - - try { - b.setCallback(new RequestCallback() { - public void onResponseReceived(final Request request, final Response response) { - Log.trace("Successfully submitted request to add graph to view:" + url); - - //kick off a page reload. - String currentViewPath = History.getToken(); - CoreGUI.goToView(currentViewPath, true); - } - - @Override - public void onError(Request request, Throwable t) { - Log.trace("Error adding Metric:" + url, t); - } - }); - b.send(); - } catch (RequestException e) { - Log.trace("Error adding Metric:" + url, e); - } - } - - /** Locate the specific schedule definition using the definition identifier. - */ - private int getScheduleDefinitionId(Resource resource, String definitionName) { - int id = -1; - if (resource.getSchedules() != null) { - boolean located = false; - MeasurementSchedule[] schedules = new MeasurementSchedule[resource.getSchedules().size()]; - resource.getSchedules().toArray(schedules); - for (int i = 0; (!located && i < resource.getSchedules().size()); i++) { - MeasurementSchedule schedule = schedules[i]; - MeasurementDefinition definition = schedule.getDefinition(); - if ((definition != null) && definition.getName().equals(definitionName)) { - located = true; - id = schedule.getId(); - } - } - } - return id; - } private void setRootResource(Resource rootResource) { this.rootResource = rootResource; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 31534ed..b837af1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -44,21 +44,18 @@ import com.smartgwt.client.widgets.grid.events.RecordCollapseEvent; import com.smartgwt.client.widgets.grid.events.RecordCollapseHandler; import com.smartgwt.client.widgets.grid.events.RecordExpandEvent; import com.smartgwt.client.widgets.grid.events.RecordExpandHandler; +import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler; +import com.smartgwt.client.widgets.grid.events.SelectionEvent; import com.smartgwt.client.widgets.grid.events.SortChangedHandler; import com.smartgwt.client.widgets.grid.events.SortEvent; import com.smartgwt.client.widgets.layout.VLayout; -import com.smartgwt.client.widgets.menu.MenuItem; -import com.smartgwt.client.widgets.menu.events.ClickHandler; -import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; +import com.smartgwt.client.widgets.menu.Menu; -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.criteria.SubjectCriteria; import org.rhq.core.domain.measurement.MeasurementData; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.components.table.Table; @@ -68,12 +65,12 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphLis import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.RedrawGraphs; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.DashboardLinkUtility; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph; import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; -import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; /** * Views a resource's metrics in a tabular view with sparkline graph and optional detailed d3 graph. @@ -86,13 +83,18 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re private final Resource resource; private final AbstractD3GraphListView abstractD3GraphListView; - private MeasurementUserPreferences measurementUserPrefs; + private final MeasurementUserPreferences measurementUserPrefs; + private final Menu addToDashboardMenu; public MetricsTableView(Resource resource, AbstractD3GraphListView abstractD3GraphListView) { super(); this.resource = resource; this.abstractD3GraphListView = abstractD3GraphListView; setDataSource(new MetricsViewDataSource(resource)); + addToDashboardMenu = new Menu(); + addToDashboardMenu.setWidth(200); + addToDashboardMenu.setItems(DashboardLinkUtility.buildMetricsMenu(resource.getResourceType(), resource, + MSG.view_metric_addToDashboard())); measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); } @@ -104,7 +106,7 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re */ @Override protected ListGrid createListGrid() { - return new MetricsTableListGrid(resource); + return new MetricsTableListGrid(resource, addToDashboardMenu); } protected void configureTable() { @@ -112,7 +114,7 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re setListGridFields(fields.toArray(new ListGridField[0])); addTableAction(MSG.view_measureTable_getLive(), new ShowLiveDataTableAction(this)); - addTableAction(MSG.view_measureTable_addToDashboard(), new AddToDashboardTableAction(this)); + addExtraWidget(addToDashboardMenu, false); } @@ -230,76 +232,6 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re } - private static class AddToDashboardTableAction implements TableAction { - private MetricsTableView metricsTableView; - - public AddToDashboardTableAction(MetricsTableView metricsTableView) { - this.metricsTableView = metricsTableView; - } - - @Override - public boolean isEnabled(ListGridRecord[] selection) { - return selection != null && selection.length > 0; - } - - @Override - public void executeAction(ListGridRecord[] selection, Object actionValue) { - //@todo: Add to Dashboard - } - - public void abc(){ - - MenuItem addGraphItem = new MenuItem(MSG.common_title_add_graph_to_view()); - defSubItem.addItem(addGraphItem); - - addGraphItem.addClickHandler(new ClickHandler() { - public void onClick(MenuItemClickEvent menuItemClickEvent) { - //generate javascript to call out to. - //Ex. menuLayers.hide();addMetric('${metric.resourceId},${metric.scheduleId}') - if (getScheduleDefinitionId(resource, def.getName()) > -1) { - final String resourceGraphElements = resource.getId() + "," - + getScheduleDefinitionId(resource, def.getName()); - - //Once, the portal-war will be rewritten to GWT and operations performed - //within the iframe + JSF will update the user preferences, the following - //2 lines could be uncommented and the lines below them refactorized - //MeasurementUserPreferences measurementPreferences = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); - //String selectedView = measurementPreferences.getSelectedView(String.valueOf(resource.getId())); - - final int sid = UserSessionManager.getSessionSubject().getId(); - SubjectCriteria c = new SubjectCriteria(); - c.addFilterId(sid); - - GWTServiceLookup.getSubjectService().findSubjectsByCriteria(c, - new AsyncCallback<PageList<Subject>>() { - public void onSuccess(PageList<Subject> result) { - if (result.size() > 0) { - UserPreferences uPreferences = new UserPreferences(result - .get(0)); - MeasurementUserPreferences mPreferences = new MeasurementUserPreferences( - uPreferences); - String selectedView = mPreferences.getSelectedView(String - .valueOf(resource.getId())); - - addNewMetric(String.valueOf(resource.getId()), - selectedView, resourceGraphElements); - } else { - Log.trace("Error obtaining subject with id:" + sid); - } - } - - public void onFailure(Throwable caught) { - Log.trace("Error obtaining subject with id:" + sid, caught); - } - }); - } - } - }); - - } - - } - @Override /** * Redraw Graphs in this context means to refresh the table and redraw open graphs. @@ -322,10 +254,13 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re private static final int TREEVIEW_DETAIL_CHART_HEIGHT = 205; private static final int NUM_METRIC_POINTS = 60; private Resource resource; + final private Menu addToDashboardMenu; - public MetricsTableListGrid(Resource resource) { + public MetricsTableListGrid(final Resource resource, final Menu dashboardMenu) { super(); this.resource = resource; + this.addToDashboardMenu = dashboardMenu; + this.addToDashboardMenu.disable(); setCanExpandRecords(true); setCanExpandMultipleRecords(true); setExpansionMode(ExpansionMode.DETAIL_FIELD); @@ -345,10 +280,10 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re addSortChangedHandler(new SortChangedHandler() { @Override public void onSortChanged(SortEvent sortEvent) { - Log.debug("SortChangeHandler"); redrawGraphs(); } }); + } @Override diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 42e8e07..cf54939 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1795,6 +1795,7 @@ view_messageCenter_messageTime = Time view_messageCenter_messageTitle = Message Center view_messageCenter_noRecentMessages = No Recent Messages view_messageCenter_stackTraceFollows = --- STACK TRACE FOLLOWS --- +view_metric_addToDashboard = Add to Dashboard view_metric_traits = Traits view_metric_viewTraitHistory = Value History for Trait [{0}] view_operationHistoryDetails_dateCompleted = Date Completed @@ -2114,7 +2115,7 @@ view_titleBar_common_updateTagsSuccessful = The tags for [{0}] have been updated view_titleBar_group_failInfo = Failed to get general info on group [{0}] with ID [{1}] view_titleBar_group_summary_collapsedTooltip = Click to show more details for this group view_titleBar_group_summary_expandedTooltip = Click to hide details for this group -view_tree_common_contextMenu_addChartToDashboard = Add chart to dashboard [{0}] +view_tree_common_contextMenu_addChartToDashboard = Add Graph to Dashboard [{0}] view_tree_common_contextMenu_editPluginConfiguration = Edit [{0}] Plugin Configuration view_tree_common_contextMenu_editResourceConfiguration = Edit [{0}] Resource Configuration view_tree_common_contextMenu_groupGraph = Group Metric Graph diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index d26f4cb..ac8a91e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -1807,6 +1807,7 @@ view_messageCenter_messageTime = Čas view_messageCenter_messageTitle = Centrum zpráv view_messageCenter_noRecentMessages = Žádné nové zprávy view_messageCenter_stackTraceFollows = --- VÝPIS ZÁSOBNÍKU NÍŽE --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = Vlastnosti view_metric_viewTraitHistory = Historie hodnot pro vlastnost [{0}] view_operationHistoryDetails_dateCompleted = Datum ukončení diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index 5392198..a775ed1 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -1594,6 +1594,7 @@ view_messageCenter_messageTime = Zeitpukt view_messageCenter_messageTitle = Nachrichtencenter view_messageCenter_noRecentMessages = Keine aktuellen Nachrichten view_messageCenter_stackTraceFollows = --- STACK TRACE FOLGT --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = Traits view_metric_viewTraitHistory = Werteverlauf für Trait [{0}] ##view_operationCreateWizard_error_scheduleOperationFailure = Failed to schedule operation execution. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 3edf1b0..cf88ed6 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -1778,6 +1778,7 @@ view_messageCenter_messageTime = 時間 view_messageCenter_messageTitle = メッセージセンター view_messageCenter_noRecentMessages = 最近のメッセージはありません view_messageCenter_stackTraceFollows = --- スタックトレース --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = トレイト view_metric_viewTraitHistory = トレイト [{0}] のための値の履歴 view_operationHistoryDetails_dateCompleted = 完了日 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index f8e27fc..1849bb7 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -1499,6 +1499,7 @@ view_messageCenter_messageTime = 시간 view_messageCenter_messageTitle = 메시지 센터 view_messageCenter_noRecentMessages = 최근 메시지는 없습니다 view_messageCenter_stackTraceFollows = --- 스택 추적 --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = 특성 view_metric_viewTraitHistory = 특성 [{0}]에 대한 값 기록 view_operationHistoryDetails_dateCompleted = 완료일 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 8a6373d..517c787 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -1811,6 +1811,7 @@ view_messageCenter_messageTime = Tempo view_messageCenter_messageTitle = Centro de Mensagens view_messageCenter_noRecentMessages = N\u00E3o existem Mensagens Recentes view_messageCenter_stackTraceFollows = --- STACK TRACE FOLLOWS --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = Traits view_metric_viewTraitHistory = Value History for Trait [{0}] view_operationCreateWizard_button_execute = Execute diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index ad560b4..6311cef 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -1731,6 +1731,7 @@ #view_messageCenter_messageTitle = Message Center #view_messageCenter_noRecentMessages = No Recent Messages #view_messageCenter_stackTraceFollows = --- STACK TRACE FOLLOWS --- +##view_metric_addToDashboard = Add to Dashboard #view_metric_traits = Traits #view_metric_viewTraitHistory = Value History for Trait [{0}] #view_operationHistoryDetails_dateCompleted = Date Completed diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 855cb73..67006d0 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -1779,6 +1779,7 @@ view_messageCenter_messageTime = \u65f6\u95f4 view_messageCenter_messageTitle = \u6d88\u606f\u4e2d\u5fc3 view_messageCenter_noRecentMessages = \u65e0\u8fd1\u671f\u6d88\u606f view_messageCenter_stackTraceFollows = --- \u540e\u9762\u662f\u5f02\u5e38\u4fe1\u606f --- +##view_metric_addToDashboard = Add to Dashboard view_metric_traits = \u7279\u5f81 view_metric_viewTraitHistory = Value History for Trait [{0}] view_operationHistoryDetails_dateCompleted = \u5b8c\u6210\u65e5\u671f commit 221e5895acffdde2a44029a9ec5b9a7293f1bfdd Merge: 061d403 e1461de Author: Mike Thompson <mithomps(a)redhat.com> Date: Mon Jul 22 10:44:48 2013 -0700 Merge branch 'master' into mtho11/consolidated-metrics commit e1461de493712c30e454fa51f946a72cadf2c257 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:47:00 2013 -0500 Fix merge rebase issue. diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 4744e96..3b0aa5b 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -41,8 +41,8 @@ import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.connection.bean.operation.EmsOperation; import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; @@ -116,7 +116,8 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper if (!configurationUpdate.getStatus().equals(ConfigurationUpdateStatus.SUCCESS)) { result.setErrorMessage(configurationUpdate.getErrorMessage()); - + } + return result; } commit 642421966cbea990df8cf0593e1fb82a4c1a98a8 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:40:53 2013 -0500 Attempt to improve the operation trigger for updates on the storage node configuration. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index c77e229..c2a7b46 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -64,6 +64,7 @@ import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.operation.OperationRequestStatus; import org.rhq.core.domain.operation.ResourceOperationHistory; import org.rhq.core.domain.operation.bean.GroupOperationSchedule; +import org.rhq.core.domain.operation.bean.ResourceOperationSchedule; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; @@ -101,8 +102,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private static final String RHQ_STORAGE_JMX_PORT_PROPERTY = "jmxPort"; private static final String RHQ_STORAGE_ADDRESS_PROPERTY = "host"; - private static final int OPERATION_QUERY_TIMEOUT = 1000; - private static final int MAX_ITERATIONS = 5; + private static final int OPERATION_QUERY_TIMEOUT = 20000; + private static final int MAX_ITERATIONS = 6; private static final String UPDATE_CONFIGURATION_OPERATION = "updateConfiguration"; private static final String RESTART_OPERATION = "restart"; @@ -636,8 +637,16 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN //scheduling the operation long operationStartTime = System.currentTimeMillis(); - operationManager.scheduleResourceOperation(subject, storageNodeResource.getId(), operationToRun, 0, 0, 0, 0, - parameters, "Run by StorageNodeManagerBean"); + + ResourceOperationSchedule newSchedule = new ResourceOperationSchedule(); + newSchedule.setJobTrigger(JobTrigger.createNowTrigger()); + newSchedule.setResource(storageNodeResource); + newSchedule.setOperationName(operationToRun); + newSchedule.setDescription("Run by StorageNodeManagerBean"); + newSchedule.setParameters(parameters); + + operationManager.scheduleResourceOperation(subject, newSchedule); + entityManager.flush(); //waiting for the operation result then return it int iteration = 0; commit a7e279884e1a7ee6c0782c1d5e79a27dcff26b76 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:39:55 2013 -0500 Implement the storage node operation for updating jvm options. diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 006dd26..4744e96 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -42,6 +42,7 @@ import org.mc4j.ems.connection.bean.operation.EmsOperation; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.Property; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; @@ -102,7 +103,20 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper private OperationResult updateConfiguration(Configuration params) { OperationResult result = new OperationResult("Configuration updated."); - //TODO: implement updates to various sub-resources here + + //update storage node jvm settings + Configuration config = new Configuration(); + config.put(new PropertySimple("minHeapSize", params.getSimpleValue("heapSize"))); + config.put(new PropertySimple("maxHeapSize", params.getSimpleValue("heapSize"))); + config.put(new PropertySimple("heapNewSize", params.getSimpleValue("heapNewSize"))); + config.put(new PropertySimple("threadStackSize", params.getSimpleValue("threadStackSize"))); + + ConfigurationUpdateReport configurationUpdate = new ConfigurationUpdateReport(config); + this.updateResourceConfiguration(configurationUpdate); + + if (!configurationUpdate.getStatus().equals(ConfigurationUpdateStatus.SUCCESS)) { + result.setErrorMessage(configurationUpdate.getErrorMessage()); + return result; } commit 26a7f7f476e03367d52e9e229f2e583c789e7bec Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:38:15 2013 -0500 Add two more properties to the list of configurable properties for the storaga node. The new properties are heap new size and thread stack size. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java index e2c64f9..32d8ab3 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java @@ -33,6 +33,8 @@ public class StorageNodeConfigurationComposite implements Serializable { private StorageNode storageNode; private int jmxPort; private String heapSize; + private String threadStackSize; + private String heapNewSize; public StorageNodeConfigurationComposite() { // GWT needs this @@ -85,14 +87,44 @@ public class StorageNodeConfigurationComposite implements Serializable { this.heapSize = heapSize; } + /** + * @return the threadStackSize + */ + public String getThreadStackSize() { + return threadStackSize; + } + + /** + * @param threadStackSize the threadStackSize to set + */ + public void setThreadStackSize(String threadStackSize) { + this.threadStackSize = threadStackSize; + } + + /** + * @return the heapNewSize + */ + public String getHeapNewSize() { + return heapNewSize; + } + + /** + * @param heapNewSize the heapNewSize to set + */ + public void setHeapNewSize(String heapNewSize) { + this.heapNewSize = heapNewSize; + } + /* (non-Javadoc) * @see java.lang.Object#toString() */ public String toString() { StringBuilder builder = new StringBuilder(); builder.append("storageNode.addresss=").append(storageNode.getAddress()).append(", "); + builder.append("jmxPort=").append(jmxPort).append(","); builder.append("heapSize=").append(heapSize).append(", "); - builder.append("jmxPort=").append(jmxPort).append(""); + builder.append("heapNewSize=").append(heapSize).append(", "); + builder.append("threadStackSize=").append(threadStackSize).append(""); return builder.toString(); } } commit a0285ac83b5b673dab0582f9ff52baaa746fd8cd Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:37:10 2013 -0500 Update the set of calculated metrics for Cassandra to incorporate latest feedback. There are three metrics now: total system used space percentage, data file disk space used percentage, and free to data disk space ratio. Also, update the alert definition for disk space to monitor all three metrics. diff --git a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java index 8995ec0..37d10a8 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java +++ b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java @@ -61,7 +61,9 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone private final Log log = LogFactory.getLog(AlertDefinitionServerPluginComponent.class); - private static final String PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.PartitionDiskUsedPercentage"; + private static final String DATA_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.DataDiskUsedPercentage"; + private static final String TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.TotalDiskUsedPercentage"; + private static final String FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME = "Calculated.FreeDiskToDataSizeRatio"; static private final List<InjectedTemplate> injectedTemplates; static private final InjectedTemplate storageNodeHighHeapTemplate; @@ -297,23 +299,42 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone newTemplate.setRecoveryId(0); newTemplate.setEnabled(true); - AlertCondition ac = new AlertCondition(); - ac.setCategory(AlertConditionCategory.THRESHOLD); - ac.setComparator(">"); - ac.setThreshold(0.5D); + + AlertCondition dataDiskUsedAlertCondition = new AlertCondition(); + dataDiskUsedAlertCondition.setCategory(AlertConditionCategory.THRESHOLD); + dataDiskUsedAlertCondition.setComparator(">"); + dataDiskUsedAlertCondition.setThreshold(0.5D); + + AlertCondition totalDiskUsedAlertCondition = new AlertCondition(); + totalDiskUsedAlertCondition.setCategory(AlertConditionCategory.THRESHOLD); + totalDiskUsedAlertCondition.setComparator(">"); + totalDiskUsedAlertCondition.setThreshold(0.75D); + + AlertCondition freeSpaveDataRatioAlertCondition = new AlertCondition(); + freeSpaveDataRatioAlertCondition.setCategory(AlertConditionCategory.THRESHOLD); + freeSpaveDataRatioAlertCondition.setComparator("<"); + freeSpaveDataRatioAlertCondition.setThreshold(1.5D); List<Integer> measurementDefinitionIds = new ArrayList<Integer>(1); for (MeasurementDefinition d : resourceType.getMetricDefinitions()) { - if (PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME.equals(d.getName())) { + if (DATA_DISK_USED_PERCENTAGE_METRIC_NAME.equals(d.getName())) { measurementDefinitionIds.add(d.getId()); - ac.setMeasurementDefinition(d); - ac.setName(d.getDisplayName()); + dataDiskUsedAlertCondition.setMeasurementDefinition(d); + dataDiskUsedAlertCondition.setName(d.getDisplayName()); + } else if (TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME.equals(d.getName())) { + measurementDefinitionIds.add(d.getId()); + totalDiskUsedAlertCondition.setMeasurementDefinition(d); + totalDiskUsedAlertCondition.setName(d.getDisplayName()); + } else if (FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME.equals(d.getName())) { + measurementDefinitionIds.add(d.getId()); + freeSpaveDataRatioAlertCondition.setMeasurementDefinition(d); + freeSpaveDataRatioAlertCondition.setName(d.getDisplayName()); } } - assert null != ac.getMeasurementDefinition() : "Did not find expected measurement definition " - + PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME + " for " - + resourceType; - newTemplate.addCondition(ac); + + newTemplate.addCondition(dataDiskUsedAlertCondition); + newTemplate.addCondition(totalDiskUsedAlertCondition); + newTemplate.addCondition(freeSpaveDataRatioAlertCondition); AlertDampening dampener = new AlertDampening(AlertDampening.Category.PARTIAL_COUNT); dampener.setPeriod(15); diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java index e5a2283..76ce2b2 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java @@ -58,7 +58,9 @@ import org.rhq.plugins.jmx.JMXComponent; public class StorageServiceComponent extends ComplexConfigurationResourceComponent { private static final String OWNERSHIP_METRIC_NAME = "Ownership"; - private static final String PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.PartitionDiskUsedPercentage"; + private static final String DATA_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.DataDiskUsedPercentage"; + private static final String TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.TotalDiskUsedPercentage"; + private static final String FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME = "Calculated.FreeDiskToDataSizeRatio"; private static final String DATA_FILE_LOCATIONS_NAME = "AllDataFileLocations"; private static final String LOAD_NAME = "Load"; @@ -156,6 +158,22 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone @Override protected void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests, EmsBean bean) { super.getValues(report, requests, bean); + + EmsAttribute loadAttribute = bean.getAttribute(LOAD_NAME); + Object loadValue = loadAttribute.refresh(); + + EmsAttribute dataFileLocationAttribute = bean.getAttribute(DATA_FILE_LOCATIONS_NAME); + Object dataFileLocationValue = dataFileLocationAttribute.refresh(); + + double load = 0; + if (loadValue != null && dataFileLocationValue != null && dataFileLocationValue instanceof String[]) { + //Please visit for details: https://issues.apache.org/jira/browse/CASSANDRA-2749 + //The average usage of all partitions with the data will be reported. + //Cassandra selects the partition with most free space for SStable flush and compaction. + load = Double.parseDouble(loadValue.toString()); + load = load / 1024d; //transform in MB + } + for (MeasurementScheduleRequest request : requests) { if (OWNERSHIP_METRIC_NAME.equals(request.getName()) && host != null) { EmsAttribute attribute = bean.getAttribute(OWNERSHIP_METRIC_NAME); @@ -179,49 +197,53 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone report.addData(new MeasurementDataNumeric(request, value.doubleValue())); } break; - } else if (PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName())) { - - - EmsAttribute loadAttribute = bean.getAttribute(LOAD_NAME); - Object loadValue = loadAttribute.refresh(); - - EmsAttribute dataFileLocationAttribute = bean.getAttribute(DATA_FILE_LOCATIONS_NAME); - Object dataFileLocationValue = dataFileLocationAttribute.refresh(); - - if (loadValue != null && dataFileLocationValue != null && dataFileLocationValue instanceof String[]) { - //Please visit for details: https://issues.apache.org/jira/browse/CASSANDRA-2749 - //The average usage of all partitions with the data will be reported. - //Cassandra selects the partition with most free space for SStable flush and compaction. - double load = Double.parseDouble(loadValue.toString()); - - report.addData(new MeasurementDataNumeric(request, getPartitionDiskUsedPercentage(load, - (String[]) dataFileLocationValue))); - } + } else if (DATA_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName()) + || TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName()) + || FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME.equals(request.getName())) { + double metricValue = getDiskUsageMetric(request, load, (String[]) dataFileLocationValue); + report.addData(new MeasurementDataNumeric(request, metricValue)); } } } - private double getPartitionDiskUsedPercentage(double dataSize, String[] paths) { + private double getDiskUsageMetric(MeasurementScheduleRequest request, double dataSize, String[] paths) { List<String> visitedMountPoints = new ArrayList<String>(); long totalDiskSpace = 0; + long totalFreeDiskSpace = 0; + long totalUsedDiskSpace = 0; for (String path : paths) { try { FileSystemInfo fileSystemInfo = this.getResourceContext().getSystemInformation().getFileSystem(path); if (!visitedMountPoints.contains(fileSystemInfo.getMountPoint())) { visitedMountPoints.add(fileSystemInfo.getMountPoint()); + + //contrary to Sigar documentation this values are reported in MB and not bytes totalDiskSpace += fileSystemInfo.getFileSystemUsage().getTotal(); + totalFreeDiskSpace += fileSystemInfo.getFileSystemUsage().getFree(); + totalUsedDiskSpace += fileSystemInfo.getFileSystemUsage().getUsed(); } } catch (Exception e) { log.error("Unable to determine file system usage information for data file location " + path, e); } } + double metricValue = 0; + + if (totalDiskSpace != 0) { - double rawPercentage = dataSize / ((double) totalDiskSpace); - return Math.round(rawPercentage * 100.0) / 100.0; + double rawPercentage = 0; + if (DATA_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName())) { + rawPercentage = dataSize / ((double) totalDiskSpace); + } else if (TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName())) { + rawPercentage = ((double) totalUsedDiskSpace) / ((double) totalDiskSpace); + } else if (FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME.equals(request.getName())) { + rawPercentage = ((double) totalFreeDiskSpace) / (double) dataSize; + } + + metricValue = Math.round(rawPercentage * 100d) / 100d; } - return 0; + return metricValue; } } diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml index a1b3412..5bbebed 100644 --- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml @@ -186,9 +186,11 @@ </parameters> </operation> + <metric property="Calculated.DataDiskUsedPercentage" displayName="Data File Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of disk space used by Cassandra data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> + <metric property="Calculated.TotalDiskUsedPercentage" displayName="Total Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of total disk space used. The metric acounts overall disk usage (including system files), not just disk space used by Cassandra. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> + <metric property="Calculated.FreeDiskToDataSizeRatio" displayName="Free Disk to Data Size Ratio" dataType="measurement" displayType="summary" description="Ratio of (Amount of Free Disk)/(Data File Size). A value below 1 is not recommended since a compaction or repair process could double the amount of disk space used by data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> + <metric property="CurrentGenerationNumber" dataType="trait" displayType="summary" description="Current generation number"/> - <metric property="Calculated.PartitionDiskUsedPercentage" displayName="Data File Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of disk space used by the data files. If multiple data locations are specified then this will report - the average utilization accross all the partitions that contain data files."/> <metric property="ExceptionCount" measurementType="trendsup" dataType="measurement" displayType="summary" description="Exception Count"/> <metric property="Initialized" dataType="trait" displayType="summary" description="Initialized"/> <metric property="Joined" dataType="trait" displayType="summary" description="Joined"/> commit 82d0075ed860dcc2f2aed57191e4fa64806caa97 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Mon Jul 22 14:39:39 2013 +0200 Entities < and > in the plugin descriptor were interpreted as HTML in the ConfigurationEditor and the content between them wasn't there. diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml index e6bc1da..a1b3412 100644 --- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml @@ -159,7 +159,7 @@ <operation name="takeSnapshot" description="Takes a snapshot of all keyspaces. A snapshot first flushes all in-memory writes to disk and then creates a hard link of each SSTable file for each keyspace. Note that a column family can have multiple - SSTables on disk. By default snapshots are stored in the <cassandra_data_dir>/<keyspace_name>/<column_family_name>/snapshots + SSTables on disk. By default snapshots are stored in the [cassandra_data_dir]/[keyspace_name]/[column_family_name]/snapshots directory. On Linux/UNIX systems cassandra_data_dir defaults to /var/lib/cassandra/data"> <parameters> <c:simple-property name="snapshotName" required="false" type="string" displayName="Snapshot Name" commit 1a520b6c33dd2bde09d58ea7e51d04c83622f481 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 22 07:17:20 2013 -0400 comment out exporting test ear Might be nice to enable exporting test ear with a system property where the location is also configurable. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java index 2fd8624..8010c2b 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java @@ -413,7 +413,8 @@ public abstract class AbstractEJB3Test extends Arquillian { //System.out.println("** The Deployment EAR: " + testEar.toString(true) + "\n"); // Save the test EAR to a zip file for inspection (set file explicitly) - exportZip(testEar, new File("/Users/jsanda/tmp/test-ear.ear")); + //String tmpDir = System.getProperty("java.io.tmpdir"); + //exportZip(testEar, new File(tmpDir, "test.ear")); return testEar; } commit df8669222aa3146b71b3252166af6bdd387806cd Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 22 10:38:44 2013 +0200 Add more units. diff --git a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java index 0ae4011..150b9e0 100644 --- a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java +++ b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat, Inc. and/or its affiliates, and + * Copyright 2009-2013, Red Hat, Inc. and/or its affiliates, and * individual contributors as indicated by the @author tags. See the * copyright.txt file in the distribution for a full listing of * individual contributors. @@ -26,10 +26,18 @@ package org.rhq.helpers.pluginAnnotations.agent; * Metric Units. * * @author Galder Zamarreño + * @author Heiko W. Rupp + * See also org.rhq.core.domain.measurement.MeasurementUnits * @since 4.0 */ +@SuppressWarnings("unused") public enum Units { - NONE, MILLISECONDS, SECONDS, PERCENTAGE; + NONE, PERCENTAGE, + BYTES, KILOBYTES, MEGABYTES, GIGABYTES, TERABYTES, PETABYTES, + BITS, KILOBITS, MEGABITS, GIGABITS, TERABITS, PETABITS, + EPOCH_MILLISECONDS, EPOCH_SECONDS, + JIFFYS, NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS, + CELSIUS, KELVIN, FAHRENHEIT; @Override public String toString() { commit 14edae37060b25ebcfed621deef0281c72b1cea2 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 21 21:22:43 2013 -0400 adding resource operation to update internode auth conf file The operation updates the file on disk and then invokes the JMX operation to have the authenticator reload the configuration so that the changes can be picked up without having to restart the node. diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 380da65..006dd26 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -26,7 +26,12 @@ package org.rhq.plugins.storage; import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -36,6 +41,7 @@ import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.connection.bean.operation.EmsOperation; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; @@ -43,7 +49,10 @@ import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.core.util.file.FileUtil; +import org.rhq.core.util.stream.StreamUtil; import org.rhq.plugins.cassandra.CassandraNodeComponent; import org.rhq.plugins.cassandra.util.KeyspaceService; @@ -84,6 +93,8 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return readRepair(); } else if (name.equals("updateConfiguration")) { return updateConfiguration(parameters); + } else if (name.equals("updateKnownNodes")) { + return updateKnownNodes(parameters); } else { return super.invokeOperation(name, parameters); } @@ -95,6 +106,73 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return result; } + private OperationResult updateKnownNodes(Configuration params) { + OperationResult result = new OperationResult(); + + PropertyList propertyList = params.getList("ipAddresses"); + Set<String> ipAddresses = new HashSet<String>(); + + for (Property property : propertyList.getList()) { + PropertySimple propertySimple = (PropertySimple) property; + ipAddresses.add(propertySimple.getStringValue()); + } + + log.info("Updating known nodes to " + ipAddresses); + + File confDir = new File(getBasedir(), "conf"); + File authFile = new File(confDir, "rhq-storage-auth.conf"); + File authBackupFile = new File(confDir, "." + authFile.getName() + ".bak"); + + if (authBackupFile.exists()) { + if (log.isDebugEnabled()) { + log.debug(authBackupFile + " already exists. Deleting it now in preparation of creating new backup " + + "for " + authFile.getName()); + } + if (!authBackupFile.delete()) { + String msg = "Failed to delete backup file " + authBackupFile + ". The operation will abort " + + "since " + authFile + " cannot reliably be backed up before making changes. Please delete " + + authBackupFile + " manually and reschedule the operation once the file has been removed."; + log.error(msg); + result.setErrorMessage(msg); + + return result; + } + } + + try { + FileUtil.copyFile(authFile, authBackupFile); + } catch (IOException e) { + String msg = "Failed to backup " + authFile + " prior to making updates. The operation will abort due " + + "to unexpected error"; + log.error(msg, e); + result.setErrorMessage(msg + ": " + ThrowableUtil.getRootMessage(e)); + return result; + } + + try { + StreamUtil.copy(new StringReader(StringUtil.collectionToString(ipAddresses, "\n")), + new FileWriter(authFile), true); + } catch (IOException e) { + log.error("An error occurred while updating " + authFile, e); + try { + FileUtil.copyFile(authBackupFile, authFile); + } catch (IOException e1) { + log.error("Failed to revert backup of " + authFile, e1); + } + result.setErrorMessage("There was an unexpected error while updating " + authFile + ". Make sure that " + + "it matches " + authBackupFile + " and then reschedule the operation."); + return result; + } + + EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); + EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); + emsOperation.invoke(); + + result.setSimpleResult("Successfully updated the set of known nodes."); + + return result; + } + private OperationResult nodeAdded(Configuration params) { boolean runRepair = params.getSimple("runRepair").getBooleanValue(); boolean updateSeedsList = params.getSimple("updateSeedsList").getBooleanValue(); diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 6ed31b7..8156d02 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -93,6 +93,14 @@ </results> </operation> + <operation name="updateKnownNodes"> + <parameters> + <c:list-property name="ipAddresses"> + <c:simple-property name="ipAddress"/> + </c:list-property> + </parameters> + </operation> + <operation name="prepareForUpgrade" description="Prepares the storage node for upgrade (this operation consists of following steps: 1) turning off the RPC server, 2) turning off the gossiper, 3) taking the snapshot (backuping the data), 4) invoking the drain operation"> <parameters> <c:simple-property name="snapshotName" required="false" type="string" displayName="Snapshot Name" commit 38777a49e6b5c5f92c54c3f41511f5f691d2a548 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 21 21:21:45 2013 -0400 update cassandra deployer itest diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties index a90d23c..774a831 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties @@ -17,9 +17,9 @@ heap_dump_dir="" thread_stack_size=-Xss180k -java_agent="" # Enable jamm when running on Java 6 patch version 23 or higher. #java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" +java_agent=-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar # GC tuning options # diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml index 15d08f2..b9e490a 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml @@ -323,7 +323,7 @@ listen_address: localhost # Internode authentication backend, implementing IInternodeAuthenticator; # used to allow/disallow connections from peer nodes. -# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator +internode_authenticator: org.rhq.cassandra.auth.RhqInternodeAuthenticator # Whether to start the native transport server. # Currently, only the thrift server is started by default because the native commit 1750170844f6a68b11256ba001fe6cffb53439f6 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 21 21:14:48 2013 -0400 temporarily disable the quartz job that is kicked off when a new node is added I need to disable the job while working on the internode authentication stuff. If the maintenance operations run on the nodes, the cluster can actually get into a bad state because the nodes' authentication conf files have not been updated which means the new node is not actually part of the cluster. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 3f1ec69..c77e229 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -170,7 +170,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN entityManager.persist(storageNode); - scheduleQuartzJob(storageNodes.size()); +// scheduleQuartzJob(storageNodes.size()); } } } commit fe6da9b5511a3b4c97c2421079db04020c33c27f Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 21 21:11:43 2013 -0400 pre-configure internode auth conf file From testing I have done thus far it appears that a storage node should have its own IP address included in the internode authentication config file. The storage installer updates the auth file to include the node's address as well as and seeds. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java index edf1430..c8bb2ef 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java @@ -34,6 +34,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; +import java.net.InetAddress; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -109,6 +110,13 @@ public class CassandraClusterManager { List<StorageNode> nodes = new ArrayList<StorageNode>(deploymentOptions.getNumNodes()); String seeds = collectionToString(calculateLocalIPAddresses(deploymentOptions.getNumNodes())); + Set<InetAddress> ipAddresses = null; + + try { + ipAddresses = getClusterIPAddresses(); + } catch (IOException e) { + throw new RuntimeException("Failed to get cluster IP addresses", e); + } for (int i = 0; i < deploymentOptions.getNumNodes(); ++i) { File basedir = new File(deploymentOptions.getClusterDir(), "node" + i); @@ -141,7 +149,7 @@ public class CassandraClusterManager { storageNode.setCqlPort(nodeOptions.getNativeTransportPort()); nodes.add(storageNode); - updateStorageAuthConf(basedir); + deployer.updateStorageAuthConf(ipAddresses); installedNodeDirs.add(basedir); } catch (Exception e) { @@ -193,6 +201,15 @@ public class CassandraClusterManager { return i <= seedsArray.length ? seedsArray[i - 1] : ("127.0.0." + i); } + private Set<InetAddress> getClusterIPAddresses() throws IOException { + Set<InetAddress> ipAddresses = new HashSet<InetAddress>(); + for (String address : calculateLocalIPAddresses(deploymentOptions.getNumNodes())) { + ipAddresses.add(InetAddress.getByName(address)); + } + + return ipAddresses; + } + private List<StorageNode> calculateNodes() { List<StorageNode> nodes = new ArrayList<StorageNode>(deploymentOptions.getNumNodes()); for (int i = 0; i < deploymentOptions.getNumNodes(); ++i) { diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index b01ebe9..6547043 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -30,13 +30,18 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; +import java.io.StringReader; +import java.net.InetAddress; +import java.util.HashSet; import java.util.Map; import java.util.Properties; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.util.PropertiesFileUpdate; +import org.rhq.core.util.StringUtil; import org.rhq.core.util.TokenReplacingReader; import org.rhq.core.util.ZipUtil; import org.rhq.core.util.stream.StreamUtil; @@ -171,4 +176,22 @@ public class Deployer { } } + public void updateStorageAuthConf(Set<InetAddress> ipAddresses) { + File confDir = new File(deploymentOptions.getBasedir(), "conf"); + File authFile = new File(confDir, "rhq-storage-auth.conf"); + + Set<String> addresses = new HashSet<String>(ipAddresses.size()); + for (InetAddress ipAddress : ipAddresses) { + addresses.add(ipAddress.getHostAddress()); + } + + try { + authFile.delete(); + StreamUtil.copy(new StringReader(StringUtil.collectionToString(addresses, "\n")), + new FileWriter(authFile), true); + } catch (IOException e) { + throw new RuntimeException("Failed to update " + authFile); + } + } + } diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 5c5ac4e..113d66b 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -34,10 +34,12 @@ import java.net.InetAddress; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Properties; +import java.util.Set; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -386,6 +388,7 @@ public class StorageInstaller { deployer.unzipDistro(); deployer.applyConfigChanges(); deployer.updateFilePerms(); + deployer.updateStorageAuthConf(getAddresses(hostname, seeds)); log.info("Finished installing RHQ Storage Node."); @@ -499,6 +502,19 @@ public class StorageInstaller { return dir; } + private Set<InetAddress> getAddresses(String hostname, String seeds) throws IOException { + Set<InetAddress> addresses = new HashSet<InetAddress>(); + addresses.add(InetAddress.getByName(hostname)); + + if (!StringUtil.isEmpty(seeds)) { + for (String seed : seeds.split(",")) { + addresses.add(InetAddress.getByName(seed)); + } + } + + return addresses; + } + private PropertiesFileUpdate getServerProperties() { String sysprop = System.getProperty("rhq.server.properties-file"); if (sysprop == null) { commit b63c38cb0c19cd062d14c5e025164021f1e946cc Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 20 09:53:10 2013 -0400 turn on internode authentication This enabled internode authentication in cassandra.yaml and the cassandra-auth module is packaged with our Cassandra distro. The authentication config file is automatically updated for integrated tests. There is still work to be done for multi-node dev-container (and production) deployments. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 2bde394..c12c567 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -113,6 +113,11 @@ <artifactId>snappy-java</artifactId> <version>${cassandra.snappy.version}</version> </dependency> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-cassandra-auth</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <executions> <execution> @@ -166,12 +171,15 @@ <delete file="${cassandra.dir}/lib/snappy-java-1.0.4.1.jar"/> <copy file="${settings.localRepository}/org/xerial/snappy/snappy-java/${cassandra.snappy.version}/snappy-java-${cassandra.snappy.version}.jar" todir="${cassandra.dir}/lib"/> + <copy file="${settings.localRepository}/org/rhq/rhq-cassandra-auth/${project.version}/rhq-cassandra-auth-${project.version}.jar" + todir="${cassandra.dir}/lib"/> <move file="${project.build.outputDirectory}/cassandra/conf" todir="${cassandra.dir}"/> <delete file="${cassandra.dir}/bin/cassandra"/> <move file="${project.build.outputDirectory}/cassandra/bin/cassandra" todir="${cassandra.dir}/bin"/> <delete dir="${project.build.outputDirectory}/cassandra"/> <delete dir="${cassandra.dir}/javadoc"/> <delete file="${cassandra.dir}/conf/cassandra-env.sh"/> + <touch file="${cassandra.dir}/conf/rhq-storage-auth.conf"/> <zip basedir="${cassandra.dir}" destfile="${cassandra.distro.zip}"/> <delete dir="${cassandra.dir}"/> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties index 612c65e..1faee9d 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties @@ -17,9 +17,9 @@ heap_dump_dir="" thread_stack_size="-Xss180k" -java_agent="" # Enable jamm when running on Java 6 patch version 23 or higher. #java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" +java_agent= # GC tuning options # diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml index 298db9d..da09e92 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml @@ -323,7 +323,7 @@ listen_address: ${rhq.cassandra.listen.address} # Internode authentication backend, implementing IInternodeAuthenticator; # used to allow/disallow connections from peer nodes. -# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator +internode_authenticator: org.rhq.cassandra.auth.RhqInternodeAuthenticator # Whether to start the native transport server. # Currently, only the thrift server is started by default because the native diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java index 338ef3a..edf1430 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java @@ -30,7 +30,9 @@ import static org.rhq.core.util.StringUtil.collectionToString; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileReader; +import java.io.FileWriter; import java.io.IOException; +import java.io.StringReader; import java.io.StringWriter; import java.util.ArrayList; import java.util.Arrays; @@ -50,6 +52,7 @@ import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; +import org.rhq.core.util.StringUtil; import org.rhq.core.util.file.FileUtil; import org.rhq.core.util.stream.StreamUtil; @@ -138,6 +141,8 @@ public class CassandraClusterManager { storageNode.setCqlPort(nodeOptions.getNativeTransportPort()); nodes.add(storageNode); + updateStorageAuthConf(basedir); + installedNodeDirs.add(basedir); } catch (Exception e) { log.error("Failed to install node at " + basedir); @@ -152,6 +157,21 @@ public class CassandraClusterManager { return nodes; } + private void updateStorageAuthConf(File basedir) { + File confDir = new File(basedir, "conf"); + File authFile = new File(confDir, "rhq-storage-auth.conf"); + authFile.delete(); + + Set<String> addresses = calculateLocalIPAddresses(deploymentOptions.getNumNodes()); + + try { + StreamUtil.copy(new StringReader(StringUtil.collectionToString(addresses, "\n")), + new FileWriter(authFile), true); + } catch (IOException e) { + throw new RuntimeException("Failed to update " + authFile); + } + } + private Set<String> calculateLocalIPAddresses(int numNodes) { Set<String> addresses = new HashSet<String>(); diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index b222c82..b01ebe9 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -160,11 +160,6 @@ public class Deployer { return Integer.parseInt(javaVersion.substring(startIndex + 1, javaVersion.length())); } - private boolean isLaterThanJava1_6() { - String javaVersion = System.getProperty("java.version"); - return javaVersion.compareTo("1.6.0") > 0; - } - public void updateFilePerms() { File deployDir = new File(deploymentOptions.getBasedir()); File binDir = new File(deployDir, "bin"); commit 890a378fc11b04f3e7af64babfbfd1a7e306b7cd Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 20 07:56:14 2013 -0400 initial commit for cassandra-auth module This is the first cut at our IInternodeAuthenticator. It loads IP addresses from a config file. There is a JMX operation to reload the config file that can be used after the config file is updated. diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml new file mode 100644 index 0000000..c53c752 --- /dev/null +++ b/modules/common/cassandra-auth/pom.xml @@ -0,0 +1,27 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.rhq</groupId> + <artifactId>rhq-common-parent</artifactId> + <version>4.9.0-SNAPSHOT</version> + </parent> + + <artifactId>rhq-cassandra-auth</artifactId> + <name>RHQ Cassandra Authentication</name> + + <properties> + <moduleName>org.rhq.${project.artifactId}</moduleName> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.cassandra</groupId> + <artifactId>cassandra-all</artifactId> + <version>${cassandra.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> +</project> diff --git a/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticator.java b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticator.java new file mode 100644 index 0000000..56980f1 --- /dev/null +++ b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticator.java @@ -0,0 +1,78 @@ +package org.rhq.cassandra.auth; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.lang.management.ManagementFactory; +import java.net.InetAddress; +import java.net.URISyntaxException; +import java.util.HashSet; +import java.util.Set; + +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.apache.cassandra.auth.IInternodeAuthenticator; +import org.apache.cassandra.exceptions.ConfigurationException; + +/** + * @author John Sanda + */ +public class RhqInternodeAuthenticator implements IInternodeAuthenticator, RhqInternodeAuthenticatorMBean { + + private final String MBEAN_NAME = "org.rhq.cassandra.auth:type=" + RhqInternodeAuthenticator.class.getSimpleName(); + + private final String CONF_FILE = "rhq-storage-auth.conf"; + + private File authConfFile; + + private Set<InetAddress> addresses = new HashSet<InetAddress>(); + + public RhqInternodeAuthenticator() { + try { + authConfFile = new File(getClass().getResource("/" + CONF_FILE).toURI()); + if (!authConfFile.exists()) { + throw new RuntimeException(authConfFile + " does not exist"); + } + + reloadConfiguration(); + } catch (URISyntaxException e) { + throw new RuntimeException("Failed to load " + CONF_FILE, e); + } + + try { + MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); + ObjectName nameObj = new ObjectName(MBEAN_NAME); + mbs.registerMBean(this, nameObj); + } catch (Exception e) { + throw new RuntimeException("Failed to register MBean " + MBEAN_NAME, e); + } + } + + @Override + public boolean authenticate(InetAddress address, int port) { + return addresses.contains(address); + } + + @Override + public void reloadConfiguration() { + try { + addresses.clear(); + + BufferedReader reader = new BufferedReader(new FileReader(authConfFile)); + String line = reader.readLine(); + + while (line != null) { + addresses.add(InetAddress.getByName(line)); + line = reader.readLine(); + } + } catch (IOException e) { + throw new RuntimeException("Failed to load addresses from " + authConfFile, e); + } + } + + @Override + public void validateConfiguration() throws ConfigurationException { + } +} diff --git a/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticatorMBean.java b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticatorMBean.java new file mode 100644 index 0000000..5e20389 --- /dev/null +++ b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticatorMBean.java @@ -0,0 +1,10 @@ +package org.rhq.cassandra.auth; + +/** + * @author John Sanda + */ +public interface RhqInternodeAuthenticatorMBean { + + public void reloadConfiguration(); + +} diff --git a/modules/common/pom.xml b/modules/common/pom.xml index bcbf862..7d12500 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -30,6 +30,7 @@ <module>ant-bundle</module> <module>drift</module> <module>jboss-as-dmr-client</module> + <module>cassandra-auth</module> <module>cassandra-util</module> <module>cassandra-jmx</module> <module>cassandra-schema</module> commit 8cf740355dfab9832b904984aaba4e52bf759951 Author: John Sanda <jsanda(a)redhat.com> Date: Fri Jul 19 22:18:23 2013 -0400 add logic to enable jamm java agent, which mirrors logic in cassandra-env.sh diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index 1e31e14..b222c82 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -125,6 +125,13 @@ public class Deployer { properties.setProperty("thread_stack_size", "-Xss" + deploymentOptions.getStackSize()); properties.setProperty("jmx_port", deploymentOptions.getJmxPort().toString()); + String javaVersion = System.getProperty("java.version"); + // The check here is taken right from cassandra-env.sh + if ((!isOpenJDK() || javaVersion.compareTo("1.6.0") > 0) || + (javaVersion.equals("1.6.0") && getJavaPatchVersion() > 23)) { + properties.put("java_agent", "-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"); + } + propertiesUpdater.update(properties); } catch (IOException e) { log.error("An error occurred while updating " + jvmPropsFile, e); @@ -132,6 +139,32 @@ public class Deployer { } } + private boolean isOpenJDK() { + String javaVMName = System.getProperty("java.vm.name"); + return javaVMName.startsWith("OpenJDK"); + } + + private boolean isJava1_6() { + String javaVersion = System.getProperty("java.version"); + return javaVersion.startsWith("1.6.0"); + } + + private int getJavaPatchVersion() { + String javaVersion = System.getProperty("java.version"); + int startIndex = javaVersion.indexOf('_'); + + if (startIndex == -1) { + return 0; + } + + return Integer.parseInt(javaVersion.substring(startIndex + 1, javaVersion.length())); + } + + private boolean isLaterThanJava1_6() { + String javaVersion = System.getProperty("java.version"); + return javaVersion.compareTo("1.6.0") > 0; + } + public void updateFilePerms() { File deployDir = new File(deploymentOptions.getBasedir()); File binDir = new File(deployDir, "bin"); commit 0517e453381aec1d30b6aaa62bec63a322dfa350 Author: Larry O'Leary <loleary(a)redhat.com> Date: Fri Jul 19 19:05:25 2013 -0500 Updated TestLdapSettings to include changes/fixes introduced from the following BZs: Bug 707047 - LDAP Group Member search doesn't escape special characters Bug 981015 - LDAP auth fails if user's DN contains a backslash Also includes a fix in where the user auth test would fail to switch back to the directory bind account and result in ACL failures on the following group lookup steps. diff --git a/etc/dev-utils/TestLdapSettings.java b/etc/dev-utils/TestLdapSettings.java index 4df79dc..2e29b3d 100644 --- a/etc/dev-utils/TestLdapSettings.java +++ b/etc/dev-utils/TestLdapSettings.java @@ -10,12 +10,14 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.PrintWriter; import java.io.StringWriter; +import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Properties; import java.util.Set; +import javax.naming.CompositeName; import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.directory.Attribute; @@ -257,7 +259,17 @@ public class TestLdapSettings extends JFrame { SearchResult si = (SearchResult) answer.next(); // Construct the UserDN - userDN = si.getName() + "," + baseDNs[x]; + userDN = null; + + try { + userDN = si.getNameInNamespace(); + } catch (UnsupportedOperationException use) { + userDN = new CompositeName(si.getName()).get(0); + if (si.isRelative()) { + userDN += "," + baseDNs[x]; + } + } + msg = "STEP-2:PASS: The test user '" + testUserName + "' was succesfully located, and the following userDN will be used in authorization check:\n"; @@ -288,6 +300,21 @@ public class TestLdapSettings extends JFrame { log(msg); proceed=false; } + try { + ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, bindUserName); + ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, bindPassword); + ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION, "simple"); + ctx.reconnect(null); + } catch (Exception ex) { + msg = "STEP-2:WARN: There was an error when switching back to the bind user '" + + bindUserName + "'\n"; + msg += ex.getMessage(); + if(enableVerboseDebugging.isSelected()){ + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + } + } // with authentication completed, now check authorization. // validate filter components to list all available groups @@ -433,7 +460,7 @@ public class TestLdapSettings extends JFrame { Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); String filter = String.format("(&(%s)(%s=%s))", groupSearchFilter, groupMemberFilter, - userDN); + LDAPStringUtil.encodeForFilter(userDN)); msg = "STEP-4:TESTING: about to do ldap search with filter \n'" + filter + "'\n to locate groups that test user IS authorized to access."; @@ -638,3 +665,74 @@ public class TestLdapSettings extends JFrame { return constraints; } } + +class LDAPStringUtil { + + /** + * <p>Encode a string so that it can be used in an LDAP search filter.</p> + * + * <p>The following table shows the characters that are encoded and their + * encoded version.</p> + * + * <table> + * <tr><th align="center">Character</th><th>Encoded As</th></tr> + * <tr><td align="center">*</td><td>\2a</td></tr> + * <tr><td align="center">(</td><td>\28</td></tr> + * <tr><td align="center">)</td><td>\29</td></tr> + * <tr><td align="center">\</td><td>\5c</td></tr> + * <tr><td align="center"><code>null</code></td><td>\00</td></tr> + * </table> + * + * <p>In addition to encoding the above characters, any non-ASCII character + * (any character with a hex value greater then <code>0x7f</code>) is also + * encoded and rewritten as a UTF-8 character or sequence of characters in + * hex notation.</p> + * + * @param filterString a string that is to be encoded + * @return the encoded version of <code>filterString</code> suitable for use + * in a LDAP search filter + * @see <a href="http://tools.ietf.org/html/rfc4515">RFC 4515</a> + */ + public static String encodeForFilter(final String filterString) { + if (filterString != null && filterString.length() > 0) { + StringBuilder encString = new StringBuilder(filterString.length()); + for (int i = 0; i < filterString.length(); i++) { + char ch = filterString.charAt(i); + switch (ch) { + case '*': // encode a wildcard * character + encString.append("\\2a"); + break; + case '(': // encode a open parenthesis ( character + encString.append("\\28"); + break; + case ')': // encode a close parenthesis ) character + encString.append("\\29"); + break; + case '\\': // encode a backslash \ character + encString.append("\\5c"); + break; + case '\u0000': // encode a null character + encString.append("\\00"); + break; + default: + if (ch <= 0x7f) { // an ASCII character + encString.append(ch); + } else if (ch >= 0x80) { // encode to UTF-8 + try { + byte[] utf8bytes = String.valueOf(ch).getBytes("UTF8"); + for (byte b : utf8bytes) { + encString.append(String.format("\\%02x", b)); + } + } catch (UnsupportedEncodingException e) { + // ignore + } + } + } + } + return encString.toString(); + } + return filterString; + } + +} + commit 5d3b55ed04d5da4eab12704c8391872cd93421ad Author: John Sanda <jsanda(a)redhat.com> Date: Fri Jul 19 15:35:34 2013 -0400 forgot to include new test resources in previous commit diff --git a/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra-env.sh b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra-env.sh new file mode 100644 index 0000000..cd415b3 --- /dev/null +++ b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra-env.sh @@ -0,0 +1,247 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +calculate_heap_sizes() +{ + case "`uname`" in + Linux) + system_memory_in_mb=`free -m | awk '/Mem:/ {print $2}'` + system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` + ;; + FreeBSD) + system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'` + system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` + system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` + ;; + SunOS) + system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'` + system_cpu_cores=`psrinfo | wc -l` + ;; + Darwin) + system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'` + system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` + system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` + ;; + *) + # assume reasonable defaults for e.g. a modern desktop or + # cheap server + system_memory_in_mb="2048" + system_cpu_cores="2" + ;; + esac + + # some systems like the raspberry pi don't report cores, use at least 1 + if [ "$system_cpu_cores" -lt "1" ] + then + system_cpu_cores="1" + fi + + # set max heap size based on the following + # max(min(1/2 ram, 1024MB), min(1/4 ram, 8GB)) + # calculate 1/2 ram and cap to 1024MB + # calculate 1/4 ram and cap to 8192MB + # pick the max + half_system_memory_in_mb=`expr $system_memory_in_mb / 2` + quarter_system_memory_in_mb=`expr $half_system_memory_in_mb / 2` + if [ "$half_system_memory_in_mb" -gt "1024" ] + then + half_system_memory_in_mb="1024" + fi + if [ "$quarter_system_memory_in_mb" -gt "8192" ] + then + quarter_system_memory_in_mb="8192" + fi + if [ "$half_system_memory_in_mb" -gt "$quarter_system_memory_in_mb" ] + then + max_heap_size_in_mb="$half_system_memory_in_mb" + else + max_heap_size_in_mb="$quarter_system_memory_in_mb" + fi + MAX_HEAP_SIZE="${max_heap_size_in_mb}M" + + # Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4 * heap size) + max_sensible_yg_per_core_in_mb="100" + max_sensible_yg_in_mb=`expr $max_sensible_yg_per_core_in_mb "*" $system_cpu_cores` + + desired_yg_in_mb=`expr $max_heap_size_in_mb / 4` + + if [ "$desired_yg_in_mb" -gt "$max_sensible_yg_in_mb" ] + then + HEAP_NEWSIZE="${max_sensible_yg_in_mb}M" + else + HEAP_NEWSIZE="${desired_yg_in_mb}M" + fi +} + +# Determine the sort of JVM we'll be running on. + +java_ver_output=`"${JAVA:-java}" -version 2>&1` + +jvmver=`echo "$java_ver_output" | awk -F'"' 'NR==1 {print $2}'` +JVM_VERSION=${jvmver%_*} +JVM_PATCH_VERSION=${jvmver#*_} + +jvm=`echo "$java_ver_output" | awk 'NR==2 {print $1}'` +case "$jvm" in + OpenJDK) + JVM_VENDOR=OpenJDK + # this will be "64-Bit" or "32-Bit" + JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $2}'` + ;; + "Java(TM)") + JVM_VENDOR=Oracle + # this will be "64-Bit" or "32-Bit" + JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $3}'` + ;; + *) + # Help fill in other JVM values + JVM_VENDOR=other + JVM_ARCH=unknown + ;; +esac + + +# Override these to set the amount of memory to allocate to the JVM at +# start-up. For production use you may wish to adjust this for your +# environment. MAX_HEAP_SIZE is the total amount of memory dedicated +# to the Java heap; HEAP_NEWSIZE refers to the size of the young +# generation. Both MAX_HEAP_SIZE and HEAP_NEWSIZE should be either set +# or not (if you set one, set the other). +# +# The main trade-off for the young generation is that the larger it +# is, the longer GC pause times will be. The shorter it is, the more +# expensive GC will be (usually). +# +# The example HEAP_NEWSIZE assumes a modern 8-core+ machine for decent pause +# times. If in doubt, and if you do not particularly want to tweak, go with +# 100 MB per physical CPU core. + +#MAX_HEAP_SIZE="4G" +#HEAP_NEWSIZE="800M" + +if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then + calculate_heap_sizes +else + if [ "x$MAX_HEAP_SIZE" = "x" ] || [ "x$HEAP_NEWSIZE" = "x" ]; then + echo "please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs (see cassandra-env.sh)" + exit 1 + fi +fi + +# Specifies the default port over which Cassandra will be available for +# JMX connections. +JMX_PORT="7399" + + +# Here we create the arguments that will get passed to the jvm when +# starting cassandra. + +# enable assertions. disabling this in production will give a modest +# performance benefit (around 5%). +JVM_OPTS="$JVM_OPTS -ea" + +# add the jamm javaagent +if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \ + || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ] +then + JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" +fi + +# enable thread priorities, primarily so we can give periodic tasks +# a lower priority to avoid interfering with client workload +JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities" +# allows lowering thread priority without being root. see +# http://tech.stolsvik.com/2010/01/linux-java-thread-priorities-workaround.ht… +JVM_OPTS="$JVM_OPTS -XX:ThreadPriorityPolicy=42" + +# min and max heap sizes should be set to the same value to avoid +# stop-the-world GC pauses during resize, and so that we can lock the +# heap in memory on startup to prevent any of it from being swapped +# out. +JVM_OPTS="$JVM_OPTS -Xms512M" +JVM_OPTS="$JVM_OPTS -Xmx512M" +JVM_OPTS="$JVM_OPTS -Xmn128M" +JVM_OPTS="$JVM_OPTS -XX:+HeapDumpOnOutOfMemoryError" + +# set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR +if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then + JVM_OPTS="$JVM_OPTS -XX:HeapDumpPath=$CASSANDRA_HEAPDUMP_DIR/cassandra-`date +%s`-pid$$.hprof" +fi + + +startswith() { [ "${1#$2}" != "$1" ]; } + +if [ "`uname`" = "Linux" ] ; then + # reduce the per-thread stack size to minimize the impact of Thrift + # thread-per-client. (Best practice is for client connections to + # be pooled anyway.) Only do so on Linux where it is known to be + # supported. + # u34 and greater need 180k + JVM_OPTS="$JVM_OPTS -Xss180k" +fi +echo "xss = $JVM_OPTS" + +# GC tuning options +JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC" +JVM_OPTS="$JVM_OPTS -XX:+UseConcMarkSweepGC" +JVM_OPTS="$JVM_OPTS -XX:+CMSParallelRemarkEnabled" +JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8" +JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1" +JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75" +JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly" +JVM_OPTS="$JVM_OPTS -XX:+UseTLAB" +# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check +if [ "$JVM_VERSION" \> "1.7" ] ; then + JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark" +fi + +# GC logging options -- uncomment to enable +# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails" +# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps" +# JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC" +# JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution" +# JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime" +# JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure" +# JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1" +# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log" +# If you are using JDK 6u34 7u2 or later you can enable GC log rotation +# don't stick the date in the log name if rotation is on. +# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log" +# JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation" +# JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10" +# JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M" + +# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414 +# JVM_OPTS="$JVM_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1414" + +# Prefer binding to IPv4 network intefaces (when net.ipv6.bindv6only=1). See +# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6342561 (short version: +# comment out this entry to enable IPv6 support). +JVM_OPTS="$JVM_OPTS -Djava.net.preferIPv4Stack=true" + +# jmx: metrics and administration interface +# +# add this if you're having trouble connecting: +# JVM_OPTS="$JVM_OPTS -Djava.rmi.server.hostname=<public name>" +# +# see +# https://blogs.oracle.com/jmxetc/entry/troubleshooting_connection_problems_i… +# for more on configuring JMX through firewalls, etc. (Short version: +# get it working with no firewall first.) +JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT" +JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false" +JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false" +JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS" diff --git a/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra.yaml b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra.yaml new file mode 100644 index 0000000..8c9c68c --- /dev/null +++ b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra.yaml @@ -0,0 +1,690 @@ +# Cassandra storage config YAML + +# NOTE: +# See http://wiki.apache.org/cassandra/StorageConfiguration for +# full explanations of configuration directives +# /NOTE + +# The name of the cluster. This is mainly used to prevent machines in +# one logical cluster from joining another. +cluster_name: rhq + +# This defines the number of tokens randomly assigned to this node on the ring +# The more tokens, relative to other nodes, the larger the proportion of data +# that this node will store. You probably want all nodes to have the same number +# of tokens assuming they have equal hardware capability. +# +# If you leave this unspecified, Cassandra will use the default of 1 token for legacy compatibility, +# and will use the initial_token as described below. +# +# Specifying initial_token will override this setting. +# +# If you already have a cluster with 1 token per node, and wish to migrate to +# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations +num_tokens: 256 + +# If you haven't specified num_tokens, or have set it to the default of 1 then +# you should always specify InitialToken when setting up a production +# cluster for the first time, and often when adding capacity later. +# The principle is that each node should be given an equal slice of +# the token ring; see http://wiki.apache.org/cassandra/Operations +# for more details. +# +# If blank, Cassandra will request a token bisecting the range of +# the heaviest-loaded existing node. If there is no load information +# available, such as is the case with a new cluster, it will pick +# a random token, which will lead to hot spots. +#initial_token: + +# See http://wiki.apache.org/cassandra/HintedHandoff +hinted_handoff_enabled: true +# this defines the maximum amount of time a dead host will have hints +# generated. After it has been dead this long, new hints for it will not be +# created until it has been seen alive and gone down again. +max_hint_window_in_ms: 10800000 # 3 hours +# throttle in KB's per second, per delivery thread +hinted_handoff_throttle_in_kb: 1024 +# Number of threads with which to deliver hints; +# Consider increasing this number when you have multi-dc deployments, since +# cross-dc handoff tends to be slower +max_hints_delivery_threads: 2 + +# The following setting populates the page cache on memtable flush and compaction +# WARNING: Enable this setting only when the whole node's data fits in memory. +# Defaults to: false +# populate_io_cache_on_flush: false + +# Authentication backend, implementing IAuthenticator; used to identify users +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator, +# PasswordAuthenticator}. +# +# - AllowAllAuthenticator performs no checks - set it to disable authentication. +# - PasswordAuthenticator relies on username/password pairs to authenticate +# users. It keeps usernames and hashed passwords in system_auth.credentials table. +# Please increase system_auth keyspace replication factor if you use this authenticator. +authenticator: org.apache.cassandra.auth.PasswordAuthenticator + +# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer, +# CassandraAuthorizer}. +# +# - AllowAllAuthorizer allows any action to any user - set it to disable authorization. +# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please +# increase system_auth keyspace replication factor if you use this authorizer. +authorizer: org.apache.cassandra.auth.CassandraAuthorizer + +# Validity period for permissions cache (fetching permissions can be an +# expensive operation depending on the authorizer, CassandraAuthorizer is +# one example). Defaults to 2000, set to 0 to disable. +# Will be disabled automatically for AllowAllAuthorizer. +permissions_validity_in_ms: 2000 + +# The partitioner is responsible for distributing rows (by key) across +# nodes in the cluster. Any IPartitioner may be used, including your +# own as long as it is on the classpath. Out of the box, Cassandra +# provides org.apache.cassandra.dht.{Murmur3Partitioner, RandomPartitioner +# ByteOrderedPartitioner, OrderPreservingPartitioner (deprecated)}. +# +# - RandomPartitioner distributes rows across the cluster evenly by md5. +# This is the default prior to 1.2 and is retained for compatibility. +# - Murmur3Partitioner is similar to RandomPartioner but uses Murmur3_128 +# Hash Function instead of md5. When in doubt, this is the best option. +# - ByteOrderedPartitioner orders rows lexically by key bytes. BOP allows +# scanning rows in key order, but the ordering can generate hot spots +# for sequential insertion workloads. +# - OrderPreservingPartitioner is an obsolete form of BOP, that stores +# - keys in a less-efficient format and only works with keys that are +# UTF8-encoded Strings. +# - CollatingOPP colates according to EN,US rules rather than lexical byte +# ordering. Use this as an example if you need custom collation. +# +# See http://wiki.apache.org/cassandra/Operations for more on +# partitioners and token selection. +partitioner: org.apache.cassandra.dht.Murmur3Partitioner + +# directories where Cassandra should store data on disk. +data_file_directories: + - target/rhq48/rhq-storage/data + +# commit log +commitlog_directory: target/rhq48/rhq-storage/commit_log + +# policy for data disk failures: +# stop: shut down gossip and Thrift, leaving the node effectively dead, but +# still inspectable via JMX. +# best_effort: stop using the failed disk and respond to requests based on +# remaining available sstables. This means you WILL see obsolete +# data at CL.ONE! +# ignore: ignore fatal errors and let requests fail, as in pre-1.2 Cassandra +disk_failure_policy: stop + +# Maximum size of the key cache in memory. +# +# Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the +# minimum, sometimes more. The key cache is fairly tiny for the amount of +# time it saves, so it's worthwhile to use it at large numbers. +# The row cache saves even more time, but must store the whole values of +# its rows, so it is extremely space-intensive. It's best to only use the +# row cache if you have hot rows or static rows. +# +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is empty to make it "auto" (min(5% of Heap (in MB), 100MB)). Set to 0 to disable key cache. +key_cache_size_in_mb: + +# Duration in seconds after which Cassandra should +# safe the keys cache. Caches are saved to saved_caches_directory as +# specified in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 14400 or 4 hours. +key_cache_save_period: 14400 + +# Number of keys from the key cache to save +# Disabled by default, meaning all keys are going to be saved +# key_cache_keys_to_save: 100 + +# Maximum size of the row cache in memory. +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is 0, to disable row caching. +row_cache_size_in_mb: 0 + +# Duration in seconds after which Cassandra should +# safe the row cache. Caches are saved to saved_caches_directory as specified +# in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 0 to disable saving the row cache. +row_cache_save_period: 0 + +# Number of keys from the row cache to save +# Disabled by default, meaning all keys are going to be saved +# row_cache_keys_to_save: 100 + +# The provider for the row cache to use. +# +# Supported values are: ConcurrentLinkedHashCacheProvider, SerializingCacheProvider +# +# SerializingCacheProvider serialises the contents of the row and stores +# it in native memory, i.e., off the JVM Heap. Serialized rows take +# significantly less memory than "live" rows in the JVM, so you can cache +# more rows in a given memory footprint. And storing the cache off-heap +# means you can use smaller heap sizes, reducing the impact of GC pauses. +# +# It is also valid to specify the fully-qualified class name to a class +# that implements org.apache.cassandra.cache.IRowCacheProvider. +# +# Defaults to SerializingCacheProvider +row_cache_provider: SerializingCacheProvider + +# saved caches +saved_caches_directory: target/rhq48/rhq-storage/saved_caches + +# commitlog_sync may be either "periodic" or "batch." +# When in batch mode, Cassandra won't ack writes until the commit log +# has been fsynced to disk. It will wait up to +# commitlog_sync_batch_window_in_ms milliseconds for other writes, before +# performing the sync. +# +# commitlog_sync: batch +# commitlog_sync_batch_window_in_ms: 50 +# +# the other option is "periodic" where writes may be acked immediately +# and the CommitLog is simply synced every commitlog_sync_period_in_ms +# milliseconds. +commitlog_sync: periodic +commitlog_sync_period_in_ms: 10000 + +# The size of the individual commitlog file segments. A commitlog +# segment may be archived, deleted, or recycled once all the data +# in it (potentally from each columnfamily in the system) has been +# flushed to sstables. +# +# The default size is 32, which is almost always fine, but if you are +# archiving commitlog segments (see commitlog_archiving.properties), +# then you probably want a finer granularity of archiving; 8 or 16 MB +# is reasonable. +commitlog_segment_size_in_mb: 32 + +# any class that implements the SeedProvider interface and has a +# constructor that takes a Map<String, String> of parameters will do. +seed_provider: + # Addresses of hosts that are deemed contact points. + # Cassandra nodes use this list of hosts to find each other and learn + # the topology of the ring. You must change this if you are running + # multiple nodes! + - class_name: org.apache.cassandra.locator.SimpleSeedProvider + parameters: + # seeds is actually a comma-delimited list of addresses. + # Ex: "<ip1>,<ip2>,<ip3>" + - seeds: "127.0.0.1" + +# emergency pressure valve: each time heap usage after a full (CMS) +# garbage collection is above this fraction of the max, Cassandra will +# flush the largest memtables. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +# +# RELYING ON THIS AS YOUR PRIMARY TUNING MECHANISM WILL WORK POORLY: +# it is most effective under light to moderate load, or read-heavy +# workloads; under truly massive write load, it will often be too +# little, too late. +flush_largest_memtables_at: 0.75 + +# emergency pressure valve #2: the first time heap usage after a full +# (CMS) garbage collection is above this fraction of the max, +# Cassandra will reduce cache maximum _capacity_ to the given fraction +# of the current _size_. Should usually be set substantially above +# flush_largest_memtables_at, since that will have less long-term +# impact on the system. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +reduce_cache_sizes_at: 0.85 +reduce_cache_capacity_to: 0.6 + +# For workloads with more data than can fit in memory, Cassandra's +# bottleneck will be reads that need to fetch data from +# disk. "concurrent_reads" should be set to (16 * number_of_drives) in +# order to allow the operations to enqueue low enough in the stack +# that the OS and drives can reorder them. +# +# On the other hand, since writes are almost never IO bound, the ideal +# number of "concurrent_writes" is dependent on the number of cores in +# your system; (8 * number_of_cores) is a good rule of thumb. +concurrent_reads: 32 +concurrent_writes: 32 + +# Total memory to use for memtables. Cassandra will flush the largest +# memtable when this much memory is used. +# If omitted, Cassandra will set it to 1/3 of the heap. +# memtable_total_space_in_mb: 2048 + +# Total space to use for commitlogs. Since commitlog segments are +# mmapped, and hence use up address space, the default size is 32 +# on 32-bit JVMs, and 1024 on 64-bit JVMs. +# +# If space gets above this value (it will round up to the next nearest +# segment multiple), Cassandra will flush every dirty CF in the oldest +# segment and remove it. So a small total commitlog space will tend +# to cause more flush activity on less-active columnfamilies. +# commitlog_total_space_in_mb: 4096 + +# This sets the amount of memtable flush writer threads. These will +# be blocked by disk io, and each one will hold a memtable in memory +# while blocked. If you have a large heap and many data directories, +# you can increase this value for better flush performance. +# By default this will be set to the amount of data directories defined. +#memtable_flush_writers: 1 + +# the number of full memtables to allow pending flush, that is, +# waiting for a writer thread. At a minimum, this should be set to +# the maximum number of secondary indexes created on a single CF. +memtable_flush_queue_size: 4 + +# Whether to, when doing sequential writing, fsync() at intervals in +# order to force the operating system to flush the dirty +# buffers. Enable this to avoid sudden dirty buffer flushing from +# impacting read latencies. Almost always a good idea on SSD:s; not +# necessarily on platters. +trickle_fsync: false +trickle_fsync_interval_in_kb: 10240 + +# TCP port, for commands and data +storage_port: 7100 + +# SSL port, for encrypted communication. Unused unless enabled in +# encryption_options +ssl_storage_port: 7101 + +# Address to bind to and tell other Cassandra nodes to connect to. You +# _must_ change this if you want multiple nodes to be able to +# communicate! +# +# Leaving it blank leaves it up to InetAddress.getLocalHost(). This +# will always do the Right Thing *if* the node is properly configured +# (hostname, name resolution, etc), and the Right Thing is to use the +# address associated with the hostname (it might not be). +# +# Setting this to 0.0.0.0 is always wrong. +listen_address: 127.0.0.1 + +# Address to broadcast to other Cassandra nodes +# Leaving this blank will set it to the same value as listen_address +# broadcast_address: 1.2.3.4 + +# Internode authentication backend, implementing IInternodeAuthenticator; +# used to allow/disallow connections from peer nodes. +# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator + +# Whether to start the native transport server. +# Currently, only the thrift server is started by default because the native +# transport is considered beta. +# Please note that the address on which the native transport is bound is the +# same as the rpc_address. The port however is different and specified below. +start_native_transport: true +# port for the CQL native transport to listen for clients on +native_transport_port: 9142 +# The minimum and maximum threads for handling requests when the native +# transport is used. The meaning is those is similar to the one of +# rpc_min_threads and rpc_max_threads, though the default differ slightly and +# are the ones below: +# native_transport_min_threads: 16 +native_transport_max_threads: 128 + + +# Whether to start the thrift rpc server. +start_rpc: false +# The address to bind the Thrift RPC service to -- clients connect +# here. Unlike ListenAddress above, you *can* specify 0.0.0.0 here if +# you want Thrift to listen on all interfaces. +# +# Leaving this blank has the same effect it does for ListenAddress, +# (i.e. it will be based on the configured hostname of the node). +rpc_address: 127.0.0.1 +# port for Thrift to listen for clients on +rpc_port: 9160 + +# enable or disable keepalive on rpc connections +rpc_keepalive: true + +# Cassandra provides three out-of-the-box options for the RPC Server: +# +# sync -> One thread per thrift connection. For a very large number of clients, memory +# will be your limiting factor. On a 64 bit JVM, 128KB is the minimum stack size +# per thread, and that will correspond to your use of virtual memory (but physical memory +# may be limited depending on use of stack space). +# +# hsha -> Stands for "half synchronous, half asynchronous." All thrift clients are handled +# asynchronously using a small number of threads that does not vary with the amount +# of thrift clients (and thus scales well to many clients). The rpc requests are still +# synchronous (one thread per active request). +# +# The default is sync because on Windows hsha is about 30% slower. On Linux, +# sync/hsha performance is about the same, with hsha of course using less memory. +# +# Alternatively, can provide your own RPC server by providing the fully-qualified class name +# of an o.a.c.t.TServerFactory that can create an instance of it. +rpc_server_type: sync + +# Uncomment rpc_min|max_thread to set request pool size limits. +# +# Regardless of your choice of RPC server (see above), the number of maximum requests in the +# RPC thread pool dictates how many concurrent requests are possible (but if you are using the sync +# RPC server, it also dictates the number of clients that can be connected at all). +# +# The default is unlimited and thus provide no protection against clients overwhelming the server. You are +# encouraged to set a maximum that makes sense for you in production, but do keep in mind that +# rpc_max_threads represents the maximum number of client requests this server may execute concurrently. +# +# rpc_min_threads: 16 +# rpc_max_threads: 2048 + +# uncomment to set socket buffer sizes on rpc connections +# rpc_send_buff_size_in_bytes: +# rpc_recv_buff_size_in_bytes: + +# uncomment to set socket buffer size for internode communication +# Note that when setting this, the buffer size is limited by net.core.wmem_max +# and when not setting it it is defined by net.ipv4.tcp_wmem +# See: +# /proc/sys/net/core/wmem_max +# /proc/sys/net/core/rmem_max +# /proc/sys/net/ipv4/tcp_wmem +# /proc/sys/net/ipv4/tcp_wmem +# and: man tcp +# internode_send_buff_size_in_bytes: +# internode_recv_buff_size_in_bytes: + +# Frame size for thrift (maximum field length). +thrift_framed_transport_size_in_mb: 15 + +# The max length of a thrift message, including all fields and +# internal thrift overhead. +thrift_max_message_length_in_mb: 16 + +# Set to true to have Cassandra create a hard link to each sstable +# flushed or streamed locally in a backups/ subdirectory of the +# Keyspace data. Removing these links is the operator's +# responsibility. +incremental_backups: false + +# Whether or not to take a snapshot before each compaction. Be +# careful using this option, since Cassandra won't clean up the +# snapshots for you. Mostly useful if you're paranoid when there +# is a data format change. +snapshot_before_compaction: false + +# Whether or not a snapshot is taken of the data before keyspace truncation +# or dropping of column families. The STRONGLY advised default of true +# should be used to provide data safety. If you set this flag to false, you will +# lose data on truncation or drop. +auto_snapshot: true + +# Add column indexes to a row after its contents reach this size. +# Increase if your column values are large, or if you have a very large +# number of columns. The competing causes are, Cassandra has to +# deserialize this much of the row to read a single column, so you want +# it to be small - at least if you do many partial-row reads - but all +# the index data is read for each access, so you don't want to generate +# that wastefully either. +column_index_size_in_kb: 64 + +# Size limit for rows being compacted in memory. Larger rows will spill +# over to disk and use a slower two-pass compaction process. A message +# will be logged specifying the row key. +in_memory_compaction_limit_in_mb: 64 + +# Number of simultaneous compactions to allow, NOT including +# validation "compactions" for anti-entropy repair. Simultaneous +# compactions can help preserve read performance in a mixed read/write +# workload, by mitigating the tendency of small sstables to accumulate +# during a single long running compactions. The default is usually +# fine and if you experience problems with compaction running too +# slowly or too fast, you should look at +# compaction_throughput_mb_per_sec first. +# +# concurrent_compactors defaults to the number of cores. +# Uncomment to make compaction mono-threaded, the pre-0.8 default. +#concurrent_compactors: 1 + +# Multi-threaded compaction. When enabled, each compaction will use +# up to one thread per core, plus one thread per sstable being merged. +# This is usually only useful for SSD-based hardware: otherwise, +# your concern is usually to get compaction to do LESS i/o (see: +# compaction_throughput_mb_per_sec), not more. +multithreaded_compaction: false + +# Throttles compaction to the given total throughput across the entire +# system. The faster you insert data, the faster you need to compact in +# order to keep the sstable count down, but in general, setting this to +# 16 to 32 times the rate you are inserting data is more than sufficient. +# Setting this to 0 disables throttling. Note that this account for all types +# of compaction, including validation compaction. +compaction_throughput_mb_per_sec: 16 + +# Track cached row keys during compaction, and re-cache their new +# positions in the compacted sstable. Disable if you use really large +# key caches. +compaction_preheat_key_cache: true + +# Throttles all outbound streaming file transfers on this node to the +# given total throughput in Mbps. This is necessary because Cassandra does +# mostly sequential IO when streaming data during bootstrap or repair, which +# can lead to saturating the network connection and degrading rpc performance. +# When unset, the default is 200 Mbps or 25 MB/s. +# stream_throughput_outbound_megabits_per_sec: 200 + +# How long the coordinator should wait for read operations to complete +read_request_timeout_in_ms: 20000 +# How long the coordinator should wait for seq or index scans to complete +range_request_timeout_in_ms: 20000 +# How long the coordinator should wait for writes to complete +write_request_timeout_in_ms: 20000 +# How long the coordinator should wait for truncates to complete +# (This can be much longer, because we need to flush all CFs +# to make sure we can clear out anythink in the commitlog that could +# cause truncated data to reappear.) +truncate_request_timeout_in_ms: 60000 +# The default timeout for other, miscellaneous operations +request_timeout_in_ms: 20000 + +# Enable operation timeout information exchange between nodes to accurately +# measure request timeouts, If disabled cassandra will assuming the request +# was forwarded to the replica instantly by the coordinator +# +# Warning: before enabling this property make sure to ntp is installed +# and the times are synchronized between the nodes. +cross_node_timeout: false + +# Enable socket timeout for streaming operation. +# When a timeout occurs during streaming, streaming is retried from the start +# of the current file. This *can* involve re-streaming an important amount of +# data, so you should avoid setting the value too low. +# Default value is 0, which never timeout streams. +# streaming_socket_timeout_in_ms: 0 + +# phi value that must be reached for a host to be marked down. +# most users should never need to adjust this. +# phi_convict_threshold: 8 + +# endpoint_snitch -- Set this to a class that implements +# IEndpointSnitch. The snitch has two functions: +# - it teaches Cassandra enough about your network topology to route +# requests efficiently +# - it allows Cassandra to spread replicas around your cluster to avoid +# correlated failures. It does this by grouping machines into +# "datacenters" and "racks." Cassandra will do its best not to have +# more than one replica on the same "rack" (which may not actually +# be a physical location) +# +# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER, +# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS +# ARE PLACED. +# +# Out of the box, Cassandra provides +# - SimpleSnitch: +# Treats Strategy order as proximity. This improves cache locality +# when disabling read repair, which can further improve throughput. +# Only appropriate for single-datacenter deployments. +# - PropertyFileSnitch: +# Proximity is determined by rack and data center, which are +# explicitly configured in cassandra-topology.properties. +# - GossipingPropertyFileSnitch +# The rack and datacenter for the local node are defined in +# cassandra-rackdc.properties and propagated to other nodes via gossip. If +# cassandra-topology.properties exists, it is used as a fallback, allowing +# migration from the PropertyFileSnitch. +# - RackInferringSnitch: +# Proximity is determined by rack and data center, which are +# assumed to correspond to the 3rd and 2nd octet of each node's +# IP address, respectively. Unless this happens to match your +# deployment conventions (as it did Facebook's), this is best used +# as an example of writing a custom Snitch class. +# - Ec2Snitch: +# Appropriate for EC2 deployments in a single Region. Loads Region +# and Availability Zone information from the EC2 API. The Region is +# treated as the Datacenter, and the Availability Zone as the rack. +# Only private IPs are used, so this will not work across multiple +# Regions. +# - Ec2MultiRegionSnitch: +# Uses public IPs as broadcast_address to allow cross-region +# connectivity. (Thus, you should set seed addresses to the public +# IP as well.) You will need to open the storage_port or +# ssl_storage_port on the public IP firewall. (For intra-Region +# traffic, Cassandra will switch to the private IP after +# establishing a connection.) +# +# You can use a custom Snitch by setting this to the full class name +# of the snitch, which will be assumed to be on your classpath. +endpoint_snitch: SimpleSnitch + +# controls how often to perform the more expensive part of host score +# calculation +dynamic_snitch_update_interval_in_ms: 100 +# controls how often to reset all host scores, allowing a bad host to +# possibly recover +dynamic_snitch_reset_interval_in_ms: 600000 +# if set greater than zero and read_repair_chance is < 1.0, this will allow +# 'pinning' of replicas to hosts in order to increase cache capacity. +# The badness threshold will control how much worse the pinned host has to be +# before the dynamic snitch will prefer other replicas over it. This is +# expressed as a double which represents a percentage. Thus, a value of +# 0.2 means Cassandra would continue to prefer the static snitch values +# until the pinned host was 20% worse than the fastest. +dynamic_snitch_badness_threshold: 0.1 + +# request_scheduler -- Set this to a class that implements +# RequestScheduler, which will schedule incoming client requests +# according to the specific policy. This is useful for multi-tenancy +# with a single Cassandra cluster. +# NOTE: This is specifically for requests from the client and does +# not affect inter node communication. +# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place +# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of +# client requests to a node with a separate queue for each +# request_scheduler_id. The scheduler is further customized by +# request_scheduler_options as described below. +request_scheduler: org.apache.cassandra.scheduler.NoScheduler + +# Scheduler Options vary based on the type of scheduler +# NoScheduler - Has no options +# RoundRobin +# - throttle_limit -- The throttle_limit is the number of in-flight +# requests per client. Requests beyond +# that limit are queued up until +# running requests can complete. +# The value of 80 here is twice the number of +# concurrent_reads + concurrent_writes. +# - default_weight -- default_weight is optional and allows for +# overriding the default which is 1. +# - weights -- Weights are optional and will default to 1 or the +# overridden default_weight. The weight translates into how +# many requests are handled during each turn of the +# RoundRobin, based on the scheduler id. +# +# request_scheduler_options: +# throttle_limit: 80 +# default_weight: 5 +# weights: +# Keyspace1: 1 +# Keyspace2: 5 + +# request_scheduler_id -- An identifer based on which to perform +# the request scheduling. Currently the only valid option is keyspace. +# request_scheduler_id: keyspace + +# index_interval controls the sampling of entries from the primrary +# row index in terms of space versus time. The larger the interval, +# the smaller and less effective the sampling will be. In technicial +# terms, the interval coresponds to the number of index entries that +# are skipped between taking each sample. All the sampled entries +# must fit in memory. Generally, a value between 128 and 512 here +# coupled with a large key cache size on CFs results in the best trade +# offs. This value is not often changed, however if you have many +# very small rows (many to an OS page), then increasing this will +# often lower memory usage without a impact on performance. +index_interval: 128 + +# Enable or disable inter-node encryption +# Default settings are TLS v1, RSA 1024-bit keys (it is imperative that +# users generate their own keys) TLS_RSA_WITH_AES_128_CBC_SHA as the cipher +# suite for authentication, key exchange and encryption of the actual data transfers. +# NOTE: No custom encryption options are enabled at the moment +# The available internode options are : all, none, dc, rack +# +# If set to dc cassandra will encrypt the traffic between the DCs +# If set to rack cassandra will encrypt the traffic between the racks +# +# The passwords used in these options must match the passwords used when generating +# the keystore and truststore. For instructions on generating these files, see: +# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSS… +# +server_encryption_options: + internode_encryption: none + keystore: conf/.keystore + keystore_password: cassandra + truststore: conf/.truststore + truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + # require_client_auth: false + +# enable or disable client/server encryption. +client_encryption_options: + enabled: false + keystore: conf/.keystore + keystore_password: cassandra + # require_client_auth: false + # Set trustore and truststore_password if require_client_auth is true + # truststore: conf/.truststore + # truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + +# internode_compression controls whether traffic between nodes is +# compressed. +# can be: all - all traffic is compressed +# dc - traffic between different datacenters is compressed +# none - nothing is compressed. +internode_compression: all + +# Enable or disable tcp_nodelay for inter-dc communication. +# Disabling it will result in larger (but fewer) network packets being sent, +# reducing overhead from the TCP protocol itself, at the cost of increasing +# latency if you block for cross-datacenter responses. +inter_dc_tcp_nodelay: true diff --git a/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/log4j-server.properties b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/log4j-server.properties new file mode 100644 index 0000000..c2e6dab --- /dev/null +++ b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/log4j-server.properties @@ -0,0 +1,45 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# for production, you should probably set pattern to %c instead of %l. +# (%l is slower.) + +# output messages into a rolling log file as well as stdout +log4j.rootLogger=INFO,stdout,R + +# stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n + +# rolling log file +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.maxFileSize=20MB +log4j.appender.R.maxBackupIndex=50 +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n +# Edit the next line to point to your logs directory +log4j.appender.R.File=target/rhq48/rhq-storage/logs/rhq-storage.log +log4j.appender.R.Threshold=INFO + +# Application logging options +#log4j.logger.org.apache.cassandra=DEBUG +#log4j.logger.org.apache.cassandra.db=DEBUG +#log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG + +# Adding this to avoid thrift logging disconnect errors. +log4j.logger.org.apache.thrift.server.TNonblockingServer=ERROR + commit 656cc6066250f46ff51e16230c0f7c8263f55435 Author: John Sanda <jsanda(a)redhat.com> Date: Fri Jul 19 13:43:46 2013 -0400 [BZ 983226] fixing upgrade regression introduced by use of cassandra-jvm.properties This commit removes cassandra-env.sh from our Cassandra distro since we are no longer using that script. The storage installer upgrade has been cleaned up some so that it will get the jmx port from cassandra-env.sh for 4.8 installs and then update cassandra-jvm.properties. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 42f6c8b..2bde394 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -171,6 +171,7 @@ <move file="${project.build.outputDirectory}/cassandra/bin/cassandra" todir="${cassandra.dir}/bin"/> <delete dir="${project.build.outputDirectory}/cassandra"/> <delete dir="${cassandra.dir}/javadoc"/> + <delete file="${cassandra.dir}/conf/cassandra-env.sh"/> <zip basedir="${cassandra.dir}" destfile="${cassandra.distro.zip}"/> <delete dir="${cassandra.dir}"/> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra index 742d9c0..ddbc099 100755 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra @@ -106,8 +106,7 @@ if [ -z "$CASSANDRA_CONF" -o -z "$CLASSPATH" ]; then exit 1 fi -if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then - #. "$CASSANDRA_CONF/cassandra-env.sh" +if [ -f "$CASSANDRA_CONF/cassandra-jvm.properties" ]; then . "$CASSANDRA_CONF/cassandra-jvm.properties" fi diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh deleted file mode 100644 index 99b3128..0000000 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh +++ /dev/null @@ -1,247 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -calculate_heap_sizes() -{ - case "`uname`" in - Linux) - system_memory_in_mb=`free -m | awk '/Mem:/ {print $2}'` - system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` - ;; - FreeBSD) - system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - SunOS) - system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'` - system_cpu_cores=`psrinfo | wc -l` - ;; - Darwin) - system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - *) - # assume reasonable defaults for e.g. a modern desktop or - # cheap server - system_memory_in_mb="2048" - system_cpu_cores="2" - ;; - esac - - # some systems like the raspberry pi don't report cores, use at least 1 - if [ "$system_cpu_cores" -lt "1" ] - then - system_cpu_cores="1" - fi - - # set max heap size based on the following - # max(min(1/2 ram, 1024MB), min(1/4 ram, 8GB)) - # calculate 1/2 ram and cap to 1024MB - # calculate 1/4 ram and cap to 8192MB - # pick the max - half_system_memory_in_mb=`expr $system_memory_in_mb / 2` - quarter_system_memory_in_mb=`expr $half_system_memory_in_mb / 2` - if [ "$half_system_memory_in_mb" -gt "1024" ] - then - half_system_memory_in_mb="1024" - fi - if [ "$quarter_system_memory_in_mb" -gt "8192" ] - then - quarter_system_memory_in_mb="8192" - fi - if [ "$half_system_memory_in_mb" -gt "$quarter_system_memory_in_mb" ] - then - max_heap_size_in_mb="$half_system_memory_in_mb" - else - max_heap_size_in_mb="$quarter_system_memory_in_mb" - fi - MAX_HEAP_SIZE="\${max_heap_size_in_mb}M" - - # Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4 * heap size) - max_sensible_yg_per_core_in_mb="100" - max_sensible_yg_in_mb=`expr $max_sensible_yg_per_core_in_mb "*" $system_cpu_cores` - - desired_yg_in_mb=`expr $max_heap_size_in_mb / 4` - - if [ "$desired_yg_in_mb" -gt "$max_sensible_yg_in_mb" ] - then - HEAP_NEWSIZE="\${max_sensible_yg_in_mb}M" - else - HEAP_NEWSIZE="\${desired_yg_in_mb}M" - fi -} - -# Determine the sort of JVM we'll be running on. - -java_ver_output=`"\${JAVA:-java}" -version 2>&1` - -jvmver=`echo "$java_ver_output" | awk -F'"' 'NR==1 {print $2}'` -JVM_VERSION=\${jvmver%_*} -JVM_PATCH_VERSION=\${jvmver#*_} - -jvm=`echo "$java_ver_output" | awk 'NR==2 {print $1}'` -case "$jvm" in - OpenJDK) - JVM_VENDOR=OpenJDK - # this will be "64-Bit" or "32-Bit" - JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $2}'` - ;; - "Java(TM)") - JVM_VENDOR=Oracle - # this will be "64-Bit" or "32-Bit" - JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $3}'` - ;; - *) - # Help fill in other JVM values - JVM_VENDOR=other - JVM_ARCH=unknown - ;; -esac - - -# Override these to set the amount of memory to allocate to the JVM at -# start-up. For production use you may wish to adjust this for your -# environment. MAX_HEAP_SIZE is the total amount of memory dedicated -# to the Java heap; HEAP_NEWSIZE refers to the size of the young -# generation. Both MAX_HEAP_SIZE and HEAP_NEWSIZE should be either set -# or not (if you set one, set the other). -# -# The main trade-off for the young generation is that the larger it -# is, the longer GC pause times will be. The shorter it is, the more -# expensive GC will be (usually). -# -# The example HEAP_NEWSIZE assumes a modern 8-core+ machine for decent pause -# times. If in doubt, and if you do not particularly want to tweak, go with -# 100 MB per physical CPU core. - -#MAX_HEAP_SIZE="4G" -#HEAP_NEWSIZE="800M" - -if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then - calculate_heap_sizes -else - if [ "x$MAX_HEAP_SIZE" = "x" ] || [ "x$HEAP_NEWSIZE" = "x" ]; then - echo "please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs (see cassandra-env.sh)" - exit 1 - fi -fi - -# Specifies the default port over which Cassandra will be available for -# JMX connections. -JMX_PORT="${rhq.cassandra.jmx.port}" - - -# Here we create the arguments that will get passed to the jvm when -# starting cassandra. - -# enable assertions. disabling this in production will give a modest -# performance benefit (around 5%). -JVM_OPTS="$JVM_OPTS -ea" - -# add the jamm javaagent -if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \\> "1.6.0" ] \\ - || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ] -then - JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" -fi - -# enable thread priorities, primarily so we can give periodic tasks -# a lower priority to avoid interfering with client workload -JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities" -# allows lowering thread priority without being root. see -# http://tech.stolsvik.com/2010/01/linux-java-thread-priorities-workaround.ht… -JVM_OPTS="$JVM_OPTS -XX:ThreadPriorityPolicy=42" - -# min and max heap sizes should be set to the same value to avoid -# stop-the-world GC pauses during resize, and so that we can lock the -# heap in memory on startup to prevent any of it from being swapped -# out. -JVM_OPTS="$JVM_OPTS -Xms${rhq.cassandra.max.heap.size}" -JVM_OPTS="$JVM_OPTS -Xmx${rhq.cassandra.max.heap.size}" -JVM_OPTS="$JVM_OPTS -Xmn${rhq.cassandra.heap.new.size}" -JVM_OPTS="$JVM_OPTS -XX:+HeapDumpOnOutOfMemoryError" - -# set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR -if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then - JVM_OPTS="$JVM_OPTS -XX:HeapDumpPath=$CASSANDRA_HEAPDUMP_DIR/cassandra-`date +%s`-pid$$.hprof" -fi - - -startswith() { [ "\${1#$2}" != "$1" ]; } - -if [ "`uname`" = "Linux" ] ; then - # reduce the per-thread stack size to minimize the impact of Thrift - # thread-per-client. (Best practice is for client connections to - # be pooled anyway.) Only do so on Linux where it is known to be - # supported. - # u34 and greater need 180k - JVM_OPTS="$JVM_OPTS -Xss${rhq.cassandra.stack.size}" -fi -echo "xss = $JVM_OPTS" - -# GC tuning options -JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC" -JVM_OPTS="$JVM_OPTS -XX:+UseConcMarkSweepGC" -JVM_OPTS="$JVM_OPTS -XX:+CMSParallelRemarkEnabled" -JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8" -JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1" -JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75" -JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly" -JVM_OPTS="$JVM_OPTS -XX:+UseTLAB" -# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check -if [ "$JVM_VERSION" \\> "1.7" ] ; then - JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark" -fi - -# GC logging options -- uncomment to enable -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails" -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps" -# JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC" -# JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution" -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime" -# JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure" -# JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1" -# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log" -# If you are using JDK 6u34 7u2 or later you can enable GC log rotation -# don't stick the date in the log name if rotation is on. -# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log" -# JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation" -# JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10" -# JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M" - -# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414 -# JVM_OPTS="$JVM_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1414" - -# Prefer binding to IPv4 network intefaces (when net.ipv6.bindv6only=1). See -# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6342561 (short version: -# comment out this entry to enable IPv6 support). -JVM_OPTS="$JVM_OPTS -Djava.net.preferIPv4Stack=true" - -# jmx: metrics and administration interface -# -# add this if you're having trouble connecting: -# JVM_OPTS="$JVM_OPTS -Djava.rmi.server.hostname=<public name>" -# -# see -# https://blogs.oracle.com/jmxetc/entry/troubleshooting_connection_problems_i… -# for more on configuring JMX through firewalls, etc. (Short version: -# get it working with no firewall first.) -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT" -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false" -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false" -JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS" diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 63282e4..5c5ac4e 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -25,8 +25,10 @@ package org.rhq.storage.installer; +import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; +import java.io.FileReader; import java.io.IOException; import java.net.InetAddress; import java.util.ArrayList; @@ -250,15 +252,32 @@ public class StorageInstaller { File oldConfDir = new File(existingStorageDir, "conf"); File newConfDir = new File(storageBasedir, "conf"); + File cassandraEnvFile = new File(oldConfDir, "cassandra-env.sh"); + String cassandraYaml = "cassandra.yaml"; String cassandraJvmProps = "cassandra-jvm.properties"; File cassandraJvmPropsFile = new File(newConfDir, cassandraJvmProps); String log4j = "log4j-server.properties"; replaceFile(new File(oldConfDir, cassandraYaml), new File(newConfDir, cassandraYaml)); - replaceFile(new File(oldConfDir, cassandraJvmProps), cassandraJvmPropsFile); replaceFile(new File(oldConfDir, log4j), new File(newConfDir, log4j)); + if (cassandraEnvFile.exists()) { + // Then this is an RHQ 4.8 install + jmxPort = parseJmxPortFromCassandrEnv(cassandraEnvFile); + Properties jvmProps = new Properties(); + jvmProps.load(new FileInputStream(cassandraJvmPropsFile)); + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate( + cassandraJvmPropsFile.getAbsolutePath()); + jvmProps.setProperty("jmx_port", Integer.toString(jmxPort)); + + propertiesUpdater.update(jvmProps); + + } else { + jmxPort = parseJmxPort(cassandraJvmPropsFile); + replaceFile(new File(oldConfDir, cassandraJvmProps), cassandraJvmPropsFile); + } + log.info("Finished installing RHQ Storage Node."); log.info("Updating rhq-server.properties..."); @@ -268,8 +287,6 @@ public class StorageInstaller { Map<String, Object> config = (Map<String, Object>) yaml.load(new FileInputStream(yamlFile)); hostname = (String) config.get("listen_address"); - - jmxPort = parseJmxPort(cassandraJvmPropsFile); } else { if (cmdLine.hasOption("dir")) { File basedir = new File(cmdLine.getOptionValue("dir")); @@ -661,6 +678,60 @@ public class StorageInstaller { } } + private int parseJmxPortFromCassandrEnv(File cassandraEnvFile) { + Integer port = null; + if (isWindows()) { + // TODO + return defaultJmxPort; + } else { + BufferedReader reader = null; + try { + reader = new BufferedReader(new FileReader(cassandraEnvFile)); + String line = reader.readLine(); + + while (line != null) { + if (line.startsWith("JMX_PORT")) { + int startIndex = "JMX_PORT=\"".length(); + int endIndex = line.lastIndexOf("\""); + + if (startIndex == -1 || endIndex == -1) { + log.error("Failed to parse the JMX port. Make sure that you have the JMX port defined on its " + + "own line as follows, JMX_PORT=\"<jmx-port>\""); + throw new RuntimeException("Cannot determine JMX port"); + } + try { + port = Integer.parseInt(line.substring(startIndex, endIndex)); + } catch (NumberFormatException e) { + log.error("The JMX port must be an integer. [" + port + "] is an invalid value"); + throw new RuntimeException("The JMX port has an invalid value"); + } + return port; + } + line = reader.readLine(); + } + log.error("Failed to parse the JMX port. Make sure that you have the JMX port defined on its " + + "own line as follows, JMX_PORT=\"<jmx-port>\""); + throw new RuntimeException("Cannot determine JMX port"); + } catch (IOException e) { + log.error("Failed to parse JMX port. There was an unexpected IO error", e); + throw new RuntimeException("Failed to parse JMX port due to IO error: " + e.getMessage()); + } finally { + try { + if (reader != null) { + reader.close(); + } + } catch (IOException e) { + if (log.isDebugEnabled()) { + log.debug("An error occurred closing the " + BufferedReader.class.getName() + " used to " + + "parse the JMX port", e); + } else { + log.warn("There was error closing the reader used to parse the JMX port: " + e.getMessage()); + } + } + } + } + } + private int parseJmxPort(File cassandraJvmOptsFile) { Integer port = null; if (isWindows()) { diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java index 3fd13c7..a7921c0 100644 --- a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -2,11 +2,13 @@ package org.rhq.storage.installer; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; import java.io.File; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.lang.reflect.Method; import java.util.Properties; @@ -20,41 +22,53 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.rhq.cassandra.CassandraClusterManager; +import org.rhq.core.util.MessageDigestGenerator; import org.rhq.core.util.file.FileUtil; +import org.rhq.core.util.stream.StreamUtil; /** * @author John Sanda */ public class StorageInstallerTest { + private MessageDigestGenerator digestGenerator; + private File basedir; + private File serverDir; + private File storageDir; private StorageInstaller installer; @BeforeMethod public void initDirs(Method test) throws Exception { + digestGenerator = new MessageDigestGenerator(MessageDigestGenerator.SHA_256); + File dir = new File(getClass().getResource(".").toURI()); basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); FileUtil.purge(basedir, true); basedir.mkdirs(); - System.setProperty("rhq.server.basedir", basedir.getAbsolutePath()); + serverDir = new File(basedir, "rhq-server"); - File serverPropsFile = new File(basedir, "rhq-server.properties"); + System.setProperty("rhq.server.basedir", serverDir.getAbsolutePath()); + + File serverPropsFile = new File(serverDir, "rhq-server.properties"); FileUtils.touch(serverPropsFile); System.setProperty("rhq.server.properties-file", serverPropsFile.getAbsolutePath()); - storageDir = new File(basedir, "rhq-storage"); + storageDir = new File(serverDir, "rhq-storage"); installer = new StorageInstaller(); } @AfterMethod public void shutdownStorageNode() throws Exception { - CassandraClusterManager ccm = new CassandraClusterManager(); - ccm.killNode(storageDir); + if (FileUtils.getFile(storageDir, "bin", "cassandra.pid").exists()) { + CassandraClusterManager ccm = new CassandraClusterManager(); + ccm.killNode(storageDir); + } } @Test @@ -97,6 +111,65 @@ public class StorageInstallerTest { assertTrue(savedCachesDir.exists(), "Expected to find saved_caches directory at " + savedCachesDir); } + @Test + public void upgradeFromRHQ48Install() throws Exception { + File rhq48ServerDir = new File(basedir, "rhq48-server"); + File rhq48StorageDir = new File(rhq48ServerDir, "rhq-storage"); + File rhq48StorageConfDir = new File(rhq48StorageDir, "conf"); + + File oldCassandraYamlFile = new File(rhq48StorageConfDir, "cassandra.yaml"); + File oldCassandraEnvFile = new File(rhq48StorageConfDir, "cassandra-env.sh"); + File oldLog4JFile = new File(rhq48StorageConfDir, "log4j-server.properties"); + + rhq48StorageConfDir.mkdirs(); + StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/cassandra.yaml"), + new FileOutputStream(oldCassandraYamlFile), true); + StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/cassandra-env.sh"), + new FileOutputStream(oldCassandraEnvFile)); + StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/log4j-server.properties"), + new FileOutputStream(oldLog4JFile)); + + CommandLineParser parser = new PosixParser(); + + String[] args = { + "--upgrade", rhq48ServerDir.getAbsolutePath(), + "--dir", storageDir.getAbsolutePath() + }; + + CommandLine cmdLine = parser.parse(installer.getOptions(), args); + int status = installer.run(cmdLine); + + assertEquals(status, 0, "Expected to get back a status code of 0 for a successful upgrade"); + assertNodeIsRunning(); + + File binDir = new File(storageDir, "bin"); + assertTrue(binDir.exists(), "Expected to find bin directory at " + binDir); + + File libDir = new File(storageDir, "lib"); + assertTrue(libDir.exists(), "Expected to find lib directory at " + libDir); + + File confDir = new File(storageDir, "conf"); + assertTrue(confDir.exists(), "Expected to find conf directory at " + confDir); + + File newCassandraYamlFile = new File(confDir, "cassandra.yaml"); + assertEquals(sha256(oldCassandraYamlFile), sha256(newCassandraYamlFile), newCassandraYamlFile + + " does not match the original version"); + + File newLog4JFile = new File(confDir, "log4j-server.properties"); + assertEquals(sha256(oldLog4JFile), sha256(newLog4JFile), newLog4JFile + " does not match the original version"); + + assertFalse(new File(confDir, "cassandra-env.sh").exists(), "cassandra-env.sh should not be used after RHQ 4.8.0"); + + File cassandraJvmPropsFile = new File(confDir, "cassandra-jvm.properties"); + Properties properties = new Properties(); + properties.load(new FileInputStream(cassandraJvmPropsFile)); + + // If this check fails, make sure that the expected value matches the value in + // src/test/resources/rhq48/storage/conf/cassandra-env.sh + assertEquals(properties.getProperty("jmx_port"), "7399", "Failed to update the JMX port in " + + cassandraJvmPropsFile); + } + private void assertNodeIsRunning() { try { installer.verifyNodeIsUp("127.0.0.1", 7299, 3, 1000); @@ -106,7 +179,7 @@ public class StorageInstallerTest { } private void assertRhqServerPropsUpdated() { - File serverPropsFile = new File(basedir, "rhq-server.properties"); + File serverPropsFile = new File(serverDir, "rhq-server.properties"); Properties properties = new Properties(); try { @@ -120,4 +193,12 @@ public class StorageInstallerTest { assertEquals(seeds, "127.0.0.1|7299|9142"); } + private String sha256(File file) { + try { + return digestGenerator.calcDigestString(file); + } catch (IOException e) { + throw new RuntimeException("Failed to calculate SHA-256 hash for " + file.getPath(), e); + } + } + } commit 8ad6e86b9ba704eb468646fd7fffcf5dd082e2c4 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Jul 19 18:13:31 2013 +0200 Add annotation and processing for configuration properties. Also shuffle some classes around. diff --git a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/ConfigProperty.java b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/ConfigProperty.java new file mode 100644 index 0000000..4b5a3ab --- /dev/null +++ b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/ConfigProperty.java @@ -0,0 +1,49 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginAnnotations.agent; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * A configuration property for resource or plugin config. + * Currently only property simple are supported. + * @author Heiko W. Rupp + */ +(a)Retention(RetentionPolicy.RUNTIME) +@Target( { ElementType.FIELD}) +public @interface ConfigProperty { + + public Scope scope() default Scope.PLUGIN; + String property() default ""; + String displayName() default ""; + String description() default ""; + boolean readOnly() default false; + String defaultValue() default ""; + RhqType rhqType() default RhqType.VOID; + + + public enum Scope { + PLUGIN, + RESOURCE; + } +} diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java index 3c90b7b..16ec437 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java @@ -19,15 +19,23 @@ package org.rhq.helpers.pluginGen; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.List; +import org.rhq.helpers.pluginAnnotations.agent.ConfigProperty; +import org.rhq.helpers.pluginAnnotations.agent.Metric; +import org.rhq.helpers.pluginAnnotations.agent.Operation; +import org.rhq.helpers.pluginAnnotations.agent.Parameter; +import org.rhq.helpers.pluginAnnotations.agent.RhqType; + /** * Processor that scans a directory for annotated classes and generates metrics etc. from them. * @author Heiko W. Rupp */ public class AnnotationProcessor { - private List<Class> classList; private final DirectoryClassLoader classLoader; public AnnotationProcessor(String baseDirectory) { @@ -36,9 +44,119 @@ public class AnnotationProcessor { } public void populate(Props props) { - classList = classLoader.findClasses(); + List<Class> classList = classLoader.findClasses(); + + populateMetrics(props, classList); + populateOperations(props, classList); + populateConfigurations(props, classList); + } + + public void populateMetrics(Props props, List<Class> classes) { + for (Class<?> clazz : classes) { + for (Field field : clazz.getDeclaredFields()) { + Metric metricAnnot = field.getAnnotation(Metric.class); + addMetric(props, metricAnnot, field.getName()); + } + + for (Method method : clazz.getDeclaredMethods()) { + Metric metricAnnot = method.getAnnotation(Metric.class); + addMetric(props, metricAnnot, method.getName()); + } + } + } + + public void populateOperations(Props props, List<Class> classes) { + for (Class<?> clazz : classes) { + for (Method method : clazz.getDeclaredMethods()) { + Operation operationAnnot = method.getAnnotation(Operation.class); + if (operationAnnot != null) { + String property = operationAnnot.name(); + if (property.isEmpty()) { + property = method.getName(); + } + Props.OperationProps op = new Props.OperationProps(property); + op.setDisplayName(operationAnnot.displayName()); + op.setDescription(operationAnnot.description()); + RhqType type = RhqType.findType(method.getReturnType()); + if (type != RhqType.VOID) { + Props.SimpleProperty simpleProperty = new Props.SimpleProperty(type.getRhqName()); + op.setResult(simpleProperty); + } - props.populateMetrics(classList); - props.populateOperations(classList); + Class[] types = method.getParameterTypes(); + int i=0; + for (Annotation[] annotations : method.getParameterAnnotations() ) { + for (Annotation annotation : annotations) { + if (annotation instanceof Parameter) { + Parameter parameter = (Parameter) annotation; + Props.SimpleProperty simpleProperty = new Props.SimpleProperty(parameter.name()); + simpleProperty.setDescription(parameter.description()); + Class typeClass = types[i]; + RhqType rhqType = RhqType.findType(typeClass); + if (parameter.type()!=RhqType.VOID){ + rhqType = parameter.type(); + } + simpleProperty.setType(rhqType.getRhqName()); + op.getParams().add(simpleProperty); + } + } + i++; + } + props.getOperations().add(op); + } + + } + } + } + + public void populateConfigurations(Props props, List<Class> classes) { + for (Class<?> clazz : classes) { + for (Field field : clazz.getDeclaredFields()) { + ConfigProperty configProperty = field.getAnnotation(ConfigProperty.class); + if (configProperty!=null) { + String name = configProperty.property(); + if(name.isEmpty()) { + name = field.getName(); + } + Props.SimpleProperty property = new Props.SimpleProperty(name); + property.setDescription(configProperty.description()); + property.setDisplayName(configProperty.displayName()); + Class type = field.getType(); + RhqType rhqType = RhqType.findType(type); + if (configProperty.rhqType()!=RhqType.VOID) { + rhqType = configProperty.rhqType(); + } + property.setType(rhqType.getRhqName()); + + switch (configProperty.scope()){ + case PLUGIN: + props.getPluginConfig().add(property); + break; + case RESOURCE: + props.getResourceConfig().add(property); + break; + default: + throw new IllegalStateException("Unknown scope: " +configProperty.scope().name()); + } + } + } + } } + + private void addMetric(Props props, Metric metricAnnot, String name) { + if (metricAnnot != null) { + String property = metricAnnot.property(); + if (property.isEmpty()) { + property = name; + } + Props.MetricProps metric = new Props.MetricProps(property); + metric.setDisplayName(metricAnnot.displayName()); + metric.setDisplayType(metricAnnot.displayType()); + metric.setDataType(metricAnnot.dataType()); + metric.setDescription(metricAnnot.description()); + metric.setUnits(metricAnnot.units()); + props.getMetrics().add(metric); + } + } + } diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java index 95be574..c88fbc0 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java @@ -18,20 +18,12 @@ */ package org.rhq.helpers.pluginGen; -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.util.HashSet; import java.util.LinkedHashSet; -import java.util.List; import java.util.Set; import org.rhq.helpers.pluginAnnotations.agent.DataType; import org.rhq.helpers.pluginAnnotations.agent.DisplayType; -import org.rhq.helpers.pluginAnnotations.agent.Metric; -import org.rhq.helpers.pluginAnnotations.agent.Operation; -import org.rhq.helpers.pluginAnnotations.agent.Parameter; -import org.rhq.helpers.pluginAnnotations.agent.RhqType; import org.rhq.helpers.pluginAnnotations.agent.Units; /** @@ -94,7 +86,8 @@ public class Props { /** Embedded children */ private Set<Props> children = new HashSet<Props>(); - private Set<SimpleProperty> simpleProps = new LinkedHashSet<SimpleProperty>(); + private Set<SimpleProperty> pluginConfig = new LinkedHashSet<SimpleProperty>(); + private Set<SimpleProperty> resourceConfig = new LinkedHashSet<SimpleProperty>(); private Set<Template> templates = new HashSet<Template>(); @@ -291,12 +284,12 @@ public class Props { this.rhqVersion = rhqVersion; } - public Set<SimpleProperty> getSimpleProps() { - return simpleProps; + public Set<SimpleProperty> getPluginConfig() { + return pluginConfig; } - public void setSimpleProps(Set<SimpleProperty> simpleProps) { - this.simpleProps = simpleProps; + public void setPluginConfig(Set<SimpleProperty> pluginConfig) { + this.pluginConfig = pluginConfig; } public Set<Template> getTemplates() { @@ -307,7 +300,15 @@ public class Props { this.templates = templates; } - public Set<MetricProps> getMetrics() { + public Set<SimpleProperty> getResourceConfig() { + return resourceConfig; + } + + public void setResourceConfig(Set<SimpleProperty> resourceConfig) { + this.resourceConfig = resourceConfig; + } + + public Set<MetricProps> getMetrics() { return metrics; } @@ -363,79 +364,6 @@ public class Props { this.scanForAnnotations = scanForAnnotations; } - public void populateMetrics(List<Class> classes) { - for (Class<?> clazz : classes) { - for (Field field : clazz.getDeclaredFields()) { - Metric metricAnnot = field.getAnnotation(Metric.class); - addMetric(metricAnnot, field.getName()); - } - - for (Method method : clazz.getDeclaredMethods()) { - Metric metricAnnot = method.getAnnotation(Metric.class); - addMetric(metricAnnot, method.getName()); - } - } - } - - public void populateOperations(List<Class> classes) { - for (Class<?> clazz : classes) { - for (Method method : clazz.getDeclaredMethods()) { - Operation operationAnnot = method.getAnnotation(Operation.class); - if (operationAnnot != null) { - String property = operationAnnot.name(); - if (property.isEmpty()) { - property = method.getName(); - } - OperationProps op = new OperationProps(property); - op.setDisplayName(operationAnnot.displayName()); - op.setDescription(operationAnnot.description()); - RhqType type = RhqType.findType(method.getReturnType()); - if (type != RhqType.VOID) { - SimpleProperty simpleProperty = new SimpleProperty(type.getRhqName()); - op.setResult(simpleProperty); - } - - Class[] types = method.getParameterTypes(); - int i=0; - for (Annotation[] annotations : method.getParameterAnnotations() ) { - for (Annotation annotation : annotations) { - if (annotation instanceof Parameter) { - Parameter parameter = (Parameter) annotation; - SimpleProperty simpleProperty = new SimpleProperty(parameter.name()); - simpleProperty.setDescription(parameter.description()); - Class typeClass = types[i]; - RhqType rhqType = RhqType.findType(typeClass); - if (parameter.type()!=RhqType.VOID){ - rhqType = parameter.type(); - } - simpleProperty.setType(rhqType.getRhqName()); - op.getParams().add(simpleProperty); - } - } - i++; - } - operations.add(op); - } - - } - } - } - - private void addMetric(Metric metricAnnot, String name) { - if (metricAnnot != null) { - String property = metricAnnot.property(); - if (property.isEmpty()) { - property = name; - } - MetricProps metric = new MetricProps(property); - metric.setDisplayName(metricAnnot.displayName()); - metric.setDisplayType(metricAnnot.displayType()); - metric.setDataType(metricAnnot.dataType()); - metric.setDescription(metricAnnot.description()); - metric.setUnits(metricAnnot.units()); - metrics.add(metric); - } - } @Override public String toString() { @@ -466,7 +394,7 @@ public class Props { sb.append(", dependsOnJmxPlugin=").append(dependsOnJmxPlugin); sb.append(", rhqVersion='").append(rhqVersion).append('\''); sb.append(", children=").append(children); - sb.append(", simpleProps=").append(simpleProps); + sb.append(", simpleProps=").append(pluginConfig); sb.append(", templates=").append(templates); sb.append(", runsInsides=").append(runsInsides); sb.append('}'); diff --git a/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl b/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl index 5579806..ce35ebe 100644 --- a/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl +++ b/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl @@ -45,9 +45,9 @@ name="${props.name}" </runs-inside> </#if> - <#if props.simpleProps?has_content> + <#if props.pluginConfig?has_content> <plugin-configuration> - <#list props.simpleProps as simpleProps> + <#list props.pluginConfig as simpleProps> <c:simple-property name="${simpleProps.name}" description="${simpleProps.description}" <#if simpleProps.type??>type="${simpleProps.type}"</#if> <#if simpleProps.readOnly>readOnly="true"</#if>/> </#list>  @@ -106,4 +106,12 @@ name="${props.name}"  <c:simple-property name="dummy"/> </resource-configuration> - </#if> \ No newline at end of file + </#if> + +<#if props.resourceConfig?has_content> + <resource-configuration> + <#list props.resourceConfig as simpleProps> + <c:simple-property name="${simpleProps.name}" description="${simpleProps.description}" <#if simpleProps.type??>type="${simpleProps.type}"</#if> <#if simpleProps.readOnly>readOnly="true"</#if>/> + </#list> + </resource-configuration> +</#if> diff --git a/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java b/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java index fbc571b..5027dbb 100644 --- a/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java +++ b/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java @@ -19,6 +19,7 @@ package org.rhq.helpers.pluginGen.test; +import org.rhq.helpers.pluginAnnotations.agent.ConfigProperty; import org.rhq.helpers.pluginAnnotations.agent.DataType; import org.rhq.helpers.pluginAnnotations.agent.DisplayType; import org.rhq.helpers.pluginAnnotations.agent.MeasurementType; @@ -26,6 +27,7 @@ import org.rhq.helpers.pluginAnnotations.agent.Metric; import org.rhq.helpers.pluginAnnotations.agent.Operation; import org.rhq.helpers.pluginAnnotations.agent.Parameter; import org.rhq.helpers.pluginAnnotations.agent.RhqType; +import org.rhq.helpers.pluginAnnotations.agent.Units; /** * Just a sample @@ -34,7 +36,8 @@ import org.rhq.helpers.pluginAnnotations.agent.RhqType; public class FooBean { - @Metric(description = "How often was this bean invoked", displayType = DisplayType.SUMMARY, measurementType = MeasurementType.DYNAMIC) + @Metric(description = "How often was this bean invoked", displayType = DisplayType.SUMMARY, measurementType = MeasurementType.DYNAMIC, + units = Units.SECONDS) int invocationCount; @Metric(description = "Just a foo", dataType = DataType.TRAIT) @@ -51,5 +54,11 @@ public class FooBean { invocationCount -= by; } + @ConfigProperty(scope = ConfigProperty.Scope.PLUGIN, displayName="The Password", + readOnly = false, property="thePassword",description = "A password", rhqType = RhqType.PASSWORD) + String password; + + @ConfigProperty(scope = ConfigProperty.Scope.RESOURCE) + int defaultSteps; } commit 039a42a2e696bb1bb0b170bec87ed95fe13921e2 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Jul 19 16:40:48 2013 +0200 API Checks - Changing StorageNode.QUERY_FIND_BY_ADDRESS. The constants for native queries shouldn't be part of the public API. diff --git a/modules/core/domain/intentional-api-changes-since-4.8.0.xml b/modules/core/domain/intentional-api-changes-since-4.8.0.xml index f21a45f..a8a77b4 100644 --- a/modules/core/domain/intentional-api-changes-since-4.8.0.xml +++ b/modules/core/domain/intentional-api-changes-since-4.8.0.xml @@ -1,3 +1,11 @@ <?xml version="1.0"?> <differences> + <difference> + <className>org/rhq/core/domain/cloud/StorageNode</className> + <differenceType>6003</differenceType> + <field>QUERY_FIND_BY_ADDRESS</field> + <justification> + Changing StorageNode.QUERY_FIND_BY_ADDRESS. The constants for native queries shouldn't be part of the public API. + </justification> + </difference> </differences> commit 78eb557ae8f799b628769d76ccece61b6cb452a4 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Jul 19 16:17:53 2013 +0200 [BZ 959587] - Alert definition should display units when entering a value; e.g. 'seconds' or 'megabytes' - Adding "BaseUnits" field to the popup form. The tooltip displays all allowed units from the same MeasurementUnits.Family. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java index 31811ab..d66f23b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java @@ -22,6 +22,9 @@ */ package org.rhq.core.domain.measurement; +import java.util.ArrayList; +import java.util.List; + import org.rhq.core.domain.measurement.util.MeasurementConversionException; /** @@ -117,6 +120,16 @@ public enum MeasurementUnits { return null; } + + public List<MeasurementUnits> getFamilyUnits() { + List<MeasurementUnits> returnList = new ArrayList<MeasurementUnits>(); + for (MeasurementUnits units : MeasurementUnits.values()) { + if (units.family == family) { + returnList.add(units); + } + } + return returnList; + } public boolean isComparableTo(MeasurementUnits other) { return family == other.family; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java index 870140d..f4fbcad 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java @@ -44,6 +44,8 @@ import com.smartgwt.client.widgets.form.fields.SelectItem; import com.smartgwt.client.widgets.form.fields.SpacerItem; import com.smartgwt.client.widgets.form.fields.StaticTextItem; import com.smartgwt.client.widgets.form.fields.TextItem; +import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.toolbar.ToolStrip; @@ -613,6 +615,7 @@ public class ConditionEditor extends EnhancedVLayout { } absoluteValue.setShowIfCondition(ifFunc); formItems.add(absoluteValue); + formItems.add(buildBaseUnitsItem(metricDropDownMenu, ifFunc, editMode)); } else { String noMetricsStr = MSG.view_alert_definition_condition_editor_metric_nometrics(); StaticTextItem noMetrics = buildHelpTextItem(THRESHOLD_NO_METRICS_ITEMNAME, noMetricsStr, ifFunc); @@ -663,6 +666,7 @@ public class ConditionEditor extends EnhancedVLayout { formItems.add(absoluteLowValue); formItems.add(absoluteHighValue); + formItems.add(buildBaseUnitsItem(metricDropDownMenu, ifFunc, editMode)); } else { String noMetricsStr = MSG.view_alert_definition_condition_editor_metric_nometrics(); StaticTextItem noMetrics = buildHelpTextItem(RANGE_NO_METRICS_ITEMNAME, noMetricsStr, ifFunc); @@ -1220,6 +1224,40 @@ public class ConditionEditor extends EnhancedVLayout { return comparatorSelection; } + private StaticTextItem buildBaseUnitsItem(final SelectItem metricDropDownMenu, FormItemIfFunction ifFunc, + boolean editMode) { + String baseUnits = MSG.view_alert_definition_condition_editor_common_baseUnits(); + final StaticTextItem baseUnitsItem = new StaticTextItem("baseUnits", baseUnits); + baseUnitsItem.setHoverWidth(200); + baseUnitsItem.setShowIfCondition(ifFunc); + + metricDropDownMenu.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + MeasurementDefinition measDef = getMeasurementDefinition(form.getValueAsString(metricDropDownMenu + .getName())); + baseUnitsItem.setValue(measDef.getUnits() == MeasurementUnits.NONE ? MSG + .view_alert_definition_condition_editor_common_baseUnits_none() + : measDef.getUnits() == MeasurementUnits.MILLISECONDS ? MeasurementUnits.SECONDS : measDef + .getUnits()); + List<MeasurementUnits> availableUnits = measDef.getUnits().getFamilyUnits(); + baseUnitsItem.setTooltip(MSG.view_alert_definition_condition_editor_common_baseUnits_availableUnits() + + (availableUnits.isEmpty() || availableUnits.get(0) == MeasurementUnits.NONE ? MSG + .view_alert_definition_condition_editor_common_baseUnits_none() : availableUnits)); + } + }); + // initialize the field with proper value + MeasurementUnits units = editMode ? existingCondition.getMeasurementDefinition().getUnits() + : ConditionEditor.this.resourceType.getMetricDefinitions().iterator().next().getUnits(); + baseUnitsItem.setValue(units == MeasurementUnits.NONE ? MSG + .view_alert_definition_condition_editor_common_baseUnits_none() + : units == MeasurementUnits.MILLISECONDS ? MeasurementUnits.SECONDS : units); + List<MeasurementUnits> availableUnits = units.getFamilyUnits(); + baseUnitsItem.setTooltip(MSG.view_alert_definition_condition_editor_common_baseUnits_availableUnits() + + (availableUnits.isEmpty() || availableUnits.get(0) == MeasurementUnits.NONE ? MSG + .view_alert_definition_condition_editor_common_baseUnits_none() : availableUnits)); + return baseUnitsItem; + } + private StaticTextItem buildHelpTextItem(String itemName, String helpText, FormItemIfFunction ifFunc) { StaticTextItem help = new StaticTextItem(itemName); help.setShowTitle(false); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index ed6b130..19d3fa5 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -919,6 +919,9 @@ view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = T view_alert_definition_condition_editor_availability_tooltip = Specify the availability state change that will trigger the condition. view_alert_definition_condition_editor_availability_value = Availability view_alert_definition_condition_editor_common_avg = Average +view_alert_definition_condition_editor_common_baseUnits = Base Units +view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = Maximum view_alert_definition_condition_editor_common_min = Minimum view_alert_definition_condition_editor_common_regex = Regular Expression diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 1950003..f71f907 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -933,6 +933,9 @@ view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = P view_alert_definition_condition_editor_availability_tooltip = Specifikujte stav dostupnosti, který poté splní podmínku. view_alert_definition_condition_editor_availability_value = Dostupnost view_alert_definition_condition_editor_common_avg = Průměr +view_alert_definition_condition_editor_common_baseUnits = Základní jednotky +view_alert_definition_condition_editor_common_baseUnits_availableUnits = Dostupné jednotky: +view_alert_definition_condition_editor_common_baseUnits_none = Źádné view_alert_definition_condition_editor_common_max = Maximum view_alert_definition_condition_editor_common_min = Minimum view_alert_definition_condition_editor_common_regex = Regulární výraz diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index bd8e0b4..524dcc0 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -844,6 +844,9 @@ view_alert_definition_condition_editor_avilability_option_up = Wird verfügbar view_alert_definition_condition_editor_avilability_tooltip = Geben Sie die Änderung der Verfügbarkeit an, die die Bedingung auslösen soll. view_alert_definition_condition_editor_avilability_value = Verfügbarkeit view_alert_definition_condition_editor_common_avg = Durchschnitt +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = Maximum view_alert_definition_condition_editor_common_min = Minimum view_alert_definition_condition_editor_common_regex = Regulärer Ausdruck diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 1c0005b..cb0c35f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -908,6 +908,9 @@ view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = view_alert_definition_condition_editor_availability_tooltip = 条件のトリガーとなるアベイラビリティ状態の変化を指定します view_alert_definition_condition_editor_availability_value = アベイラビリティ view_alert_definition_condition_editor_common_avg = 平均 +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = 最大 view_alert_definition_condition_editor_common_min = 最小 view_alert_definition_condition_editor_common_regex = 正規表現 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 5118a2d..32dc73d 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -797,6 +797,9 @@ view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = view_alert_definition_condition_editor_availability_tooltip = 조건 트리거하는 가용성 상태의 변화를 지정합니다. view_alert_definition_condition_editor_availability_value = 가용성 view_alert_definition_condition_editor_common_avg = 평균 +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = 최대 view_alert_definition_condition_editor_common_min = 최소 view_alert_definition_condition_editor_common_regex = 정규 표현식 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index bfd95e8..f4419e1 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -916,6 +916,9 @@ view_alert_common_tab_recovery = Recupera\u00E7\u00E3o view_alert_definition_condition_editor_availability_tooltip = Especifica a mudan\u00E7a de estado na disponibilidade do recurso que ir\u00E1 disparar a condi\u00E7\u00E3o. view_alert_definition_condition_editor_availability_value = Disponibilidade view_alert_definition_condition_editor_common_avg = M\u00E9dio +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = M\u00E1ximo view_alert_definition_condition_editor_common_min = M\u00EDnimo view_alert_definition_condition_editor_common_regex = Express\u00E3o Regular diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index e03e1a9..d75b76e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -881,6 +881,9 @@ #view_alert_definition_condition_editor_availability_tooltip = Specify the availability state change that will trigger the condition. #view_alert_definition_condition_editor_availability_value = Availability #view_alert_definition_condition_editor_common_avg = Average +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None #view_alert_definition_condition_editor_common_max = Maximum #view_alert_definition_condition_editor_common_min = Minimum #view_alert_definition_condition_editor_delete_confirm = Delete the selected alert condition(s)? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 82ddc2a..a9a24df 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -902,6 +902,9 @@ view_alert_common_tab_recovery = \u8fd8\u539f view_alert_definition_condition_editor_availability_tooltip = Specify the availability state change that will trigger the condition. view_alert_definition_condition_editor_availability_value = \u53ef\u7528\u6027 view_alert_definition_condition_editor_common_avg = \u5e73\u5747 +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = \u6700\u5927 view_alert_definition_condition_editor_common_min = \u6700\u5c0f view_alert_definition_condition_editor_common_regex = \u6b63\u5219\u8868\u8fbe\u5f0f commit 1f6cf05d57599ded2d196241284b4b5167886c80 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Jul 19 12:43:35 2013 +0200 [BZ 980091] - link in the alert to the parent on which the alert was created - Adding the link to AlertDetailsView if the alert is defined by parent definition. Parent definition could mean group alert definition, autogroup alert definition or template definition diff --git a/modules/enterprise/gui/coregui/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch b/modules/enterprise/gui/coregui/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch new file mode 100644 index 0000000..627021f --- /dev/null +++ b/modules/enterprise/gui/coregui/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.wst.jsdt.core.javascriptValidator"/> +<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java index 17dd6d6..d66baea 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java @@ -57,6 +57,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.admin.templates.AlertDefinitionTemplateTypeView; import org.rhq.enterprise.gui.coregui.client.components.form.DateFilterItem; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.gwt.AlertGWTServiceAsync; @@ -74,6 +75,8 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; * @author John Mazzitelli */ public class AlertDataSource extends RPCDataSource<Alert, AlertCriteria> { + + private static final String FIELD_PARENT = "parent"; // may be template or group alert def parent public static final String PRIORITY_ICON_HIGH = ImageManager.getAlertIcon(AlertPriority.HIGH); public static final String PRIORITY_ICON_MEDIUM = ImageManager.getAlertIcon(AlertPriority.MEDIUM); @@ -359,6 +362,7 @@ public class AlertDataSource extends RPCDataSource<Alert, AlertCriteria> { } criteria.addFilterEntityContext(entityContext); criteria.fetchConditionLogs(true); +// criteria.fetchGroupAlertDefinition(true); return criteria; } @@ -410,6 +414,22 @@ public class AlertDataSource extends RPCDataSource<Alert, AlertCriteria> { record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry()); record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, resource.getResourceType().getId()); + AlertDefinition groupAlertDefinition = alertDefinition.getGroupAlertDefinition(); + Integer parentId = alertDefinition.getParentId(); + if (groupAlertDefinition != null && groupAlertDefinition.getGroup() != null) { + boolean isAutogroup = groupAlertDefinition.getGroup().getAutoGroupParentResource() != null; + record.setAttribute(FIELD_PARENT, (isAutogroup ? "#Resource/AutoGroup/" : "#ResourceGroup/") + + groupAlertDefinition.getGroup().getId() + "/Alerts/Definitions/" + groupAlertDefinition.getId()); + record.setLinkText(MSG.view_alert_definition_for_group()); + } else if (parentId != null && parentId.intValue() != 0) { + record.setAttribute( + FIELD_PARENT, + LinkManager.getAdminTemplatesEditLink(AlertDefinitionTemplateTypeView.VIEW_ID.getName(), resource + .getResourceType().getId()) + + "/" + parentId); + record.setLinkText(MSG.view_alert_definition_for_type()); + } + Set<AlertConditionLog> conditionLogs = from.getConditionLogs(); String conditionText; String conditionValue; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java index 68a0953..ed98d94 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java @@ -40,8 +40,12 @@ import com.smartgwt.client.widgets.tab.Tab; import com.smartgwt.client.widgets.tab.TabSet; import org.rhq.core.domain.alert.Alert; +import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.criteria.AlertCriteria; +import org.rhq.core.domain.criteria.AlertDefinitionCriteria; +import org.rhq.core.domain.criteria.ResourceGroupCriteria; +import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.CoreGUI; @@ -83,7 +87,14 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie @Override public void onSuccess(PageList<Alert> result) { Alert alert = result.get(0); - show(alert); + Integer parentId = alert.getAlertDefinition().getParentId(); + AlertDefinition groupAlertDefinition = alert.getAlertDefinition().getGroupAlertDefinition(); + if (groupAlertDefinition != null || (parentId != null && parentId.intValue() != 0)) { + fetchDefinitionWithGroupAndTemplate(alert); + } else { + show(alert); + } + } @Override @@ -92,6 +103,24 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie } }); } + + private void fetchDefinitionWithGroupAndTemplate(final Alert alert) { + AlertDefinitionCriteria criteria = new AlertDefinitionCriteria(); + criteria.addFilterAlertId(alert.getId()); + criteria.fetchGroupAlertDefinition(true); + criteria.fetchResourceType(true); + GWTServiceLookup.getAlertDefinitionService().findAlertDefinitionsByCriteria(criteria, new AsyncCallback<PageList<AlertDefinition>>() { + public void onSuccess(PageList<AlertDefinition> result) { + alert.getAlertDefinition().setGroupAlertDefinition(result.get(0).getGroupAlertDefinition()); + alert.getAlertDefinition().setResourceType(result.get(0).getResourceType()); + show(alert); + } + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_alert_details_loadFailed(), caught); + } + }); + } private void show(Alert alert) { destroyMembers(); @@ -102,7 +131,7 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie addMember(getDetailsTabSet(record)); } - private TabSet getDetailsTabSet(Record record) { + private TabSet getDetailsTabSet(ListGridRecord record) { TabSet tabset = new NamedTabSet(); Tab generalTab = new NamedTab(new ViewName("general", MSG.view_alert_common_tab_general())); @@ -121,7 +150,7 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie return tabset; } - private DynamicForm getDetailsTableForAlert(Record record) { + private DynamicForm getDetailsTableForAlert(ListGridRecord record) { DynamicForm form = new DynamicForm(); form.setNumCols(4); form.setHeight("15%"); @@ -189,6 +218,13 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie MSG.view_alert_details_field_resource_ancestry()); resourceAncestryItem.setValue(record.getAttribute("resourceAncestry")); items.add(resourceAncestryItem); + + String parentUrl = record.getAttribute("parent"); + if (parentUrl != null) { + StaticTextItem parentItem = new StaticTextItem("parent", "Parent Definition"); + parentItem.setValue(LinkManager.getHref(parentUrl, record.getLinkText())); + items.add(parentItem); + } form.setItems(items.toArray(new FormItem[items.size()])); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 84e9c6e..ed6b130 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1080,6 +1080,7 @@ view_alert_definitions_update_failure = Alert definition update failed view_alert_definitions_update_success = Alert definition successfully updated view_alert_details_field_ack_at = Acknowledged at view_alert_details_field_ack_by = Acknowledged by +view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = Recovery Info view_alert_details_field_resource_ancestry = Resource Ancestry view_alert_details_field_watched_resource = Watched Resource diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index d6a102b..1950003 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -1094,6 +1094,7 @@ view_alert_definitions_update_failure = Nepodařilo se změnit definici výstrah view_alert_definitions_update_success = Úspěšně změněna definice výstrahy view_alert_details_field_ack_at = Potvrzeno v view_alert_details_field_ack_by = Potvrzeno kým +view_alert_details_field_parent_definition = Definice rodiče view_alert_details_field_recovery_info = Informace o obnově view_alert_details_field_resource_ancestry = Původ zdroje view_alert_details_field_watched_resource = Sledovaný zdroj diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 9237f76..1c0005b 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -1069,6 +1069,7 @@ view_alert_definitions_update_failure = アラート定義の更新に失敗し view_alert_definitions_update_success = アラート定義の更新に成功しました view_alert_details_field_ack_at = 次の場所で確認済みです view_alert_details_field_ack_by = 次の人によって確認済みです +##view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = リカバリ情報 ##view_alert_details_field_resource_ancestry = Resource Ancestry ##view_alert_details_field_watched_resource = Watched Resource diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index bd34f9b..5118a2d 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -935,6 +935,7 @@ view_alert_definitions_table_title_group = 그룹 경고 정의 view_alert_definitions_table_title_resource = 리소스 경고 정의 view_alert_details_field_ack_at = 다음 위치에서 확인했습니다 view_alert_details_field_ack_by = 다음 사람에 의해 확인되었습니다 +##view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = 복구 정보 view_alert_details_field_resource_ancestry = 리소스 조상 view_alert_details_field_watched_resource = 관심 리소스 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 1330eb7..bfd95e8 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -1078,6 +1078,7 @@ view_alert_definitions_update_success = Defini\u00E7\u00E3o do alerta atualizada view_alert_details_breadcrumb = Detalhes view_alert_details_field_ack_at = Verificado em view_alert_details_field_ack_by = Verificado por +##view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = Informa\u00E7\u00E3o de Recupera\u00E7\u00E3o ##view_alert_details_field_resource_ancestry = Resource Ancestry ##view_alert_details_field_watched_resource = Watched Resource diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 72a287b..e03e1a9 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -1042,6 +1042,7 @@ #view_alert_definitions_update_success = Alert definition successfully updated #view_alert_details_field_ack_at = Acknowledged at #view_alert_details_field_ack_by = Acknowledged by +##view_alert_details_field_parent_definition = Parent definition #view_alert_details_field_recovery_info = Recovery Info #view_alert_details_loadFailed = Failed to fetch alert details #view_alerts_ack_confirm = Acknowledge the selected alert(s)? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 10f9b0a..82ddc2a 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -1063,6 +1063,7 @@ view_alert_definitions_update_failure = \u544a\u8b66\u5b9a\u4e49\u66f4\u65b0\u59 view_alert_definitions_update_success = \u544a\u8b66\u5b9a\u4e49\u66f4\u65b0\u6210\u529f view_alert_details_field_ack_at = \u786e\u8ba4\u4e8e view_alert_details_field_ack_by = \u786e\u8ba4\u8005 +##view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = \u8fd8\u539f\u4fe1\u606f ##view_alert_details_field_resource_ancestry = Resource Ancestry ##view_alert_details_field_watched_resource = Watched Resource commit 67c442b7baa5db4cdd3715fd89db9ea01b9e2fa8 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Jul 19 12:41:13 2013 +0200 Removing deprecated annotation, adding orphanRemoval=true attribute instead. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java index 4742c17..44a8eac 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java @@ -253,9 +253,8 @@ public class Alert implements Serializable { @ManyToOne private AlertDefinition alertDefinition; - @OneToMany(mappedBy = "alert", cascade = CascadeType.ALL) + @OneToMany(mappedBy = "alert", cascade = CascadeType.ALL, orphanRemoval=true) @OrderBy - @org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN) // primary key private Set<AlertConditionLog> conditionLogs = new LinkedHashSet<AlertConditionLog>(); diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java index 0f2d0b1..be98df5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java @@ -86,8 +86,7 @@ public class AlertDampening implements java.io.Serializable { // This is required for cascade behavior. We want to be able to cascade delete the AlertDampeningEvents when an // AlertDefinition is removed from the db, due to deleting a Resource from inventory. - @OneToMany(mappedBy = "alertDefinition", cascade = { CascadeType.REFRESH, CascadeType.REMOVE }) - @org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN) + @OneToMany(mappedBy = "alertDefinition", cascade = { CascadeType.REFRESH, CascadeType.REMOVE }, orphanRemoval = true) private Set<AlertDampeningEvent> alertDampeningEvents = new HashSet<AlertDampeningEvent>(); protected AlertDampening() { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java index 02362ce..3445d9e 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java @@ -293,7 +293,6 @@ public class AlertDefinition implements Serializable { // do not cascade remove - group removal will be detaching children alert defs from the group def, // and then letting the children be deleted slowly by existing alert def removal mechanisms - @SuppressWarnings("unused") @OneToMany(mappedBy = "groupAlertDefinition", fetch = FetchType.LAZY, cascade = { CascadeType.PERSIST }) @OrderBy private Set<AlertDefinition> groupAlertDefinitionChildren = new LinkedHashSet<AlertDefinition>(); @@ -361,11 +360,10 @@ public class AlertDefinition implements Serializable { // referencing AlertConditionLog records. private Set<AlertCondition> conditions = new LinkedHashSet<AlertCondition>(1); // Most alerts will only have one condition. - @OneToMany(mappedBy = "alertDefinition", cascade = CascadeType.ALL) + @OneToMany(mappedBy = "alertDefinition", cascade = CascadeType.ALL, orphanRemoval = true) // Although similar to AlertCondition, we do use DELETE_ORPHAN here. The reason is because AlertNotificationLog // does not refer back to the AlertNotification record and therefore the notification logs are not affected // by the loss of the AlertNotification that spawned the notification. - @org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN) private List<AlertNotification> alertNotifications = new ArrayList<AlertNotification>(); /** commit 92a286d611085d96ba1710c442035445dda5318a Author: Jirka Kremser <jkremser(a)redhat.com> Date: Thu Jul 18 18:37:48 2013 +0200 [BZ 980091] - link in the alert to the parent on which the alert was created - Adding a new filter on AlertDefinitionCriteria (filter by alert id). diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java index 854efaf..9d4e51d 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java @@ -48,6 +48,7 @@ public class AlertDefinitionCriteria extends Criteria { private String filterName; private String filterDescription; private AlertPriority filterPriority; + private Integer filterAlertId; // requires overrides private NonBindingOverrideFilter filterAlertTemplateOnly; // requires overrides - finds only alert templates private Integer filterAlertTemplateParentId; // requires overrides private Integer filterAlertTemplateResourceTypeId; // requires overrides @@ -75,6 +76,10 @@ public class AlertDefinitionCriteria extends Criteria { private PageOrdering sortResourceName; // requires sort override public AlertDefinitionCriteria() { + filterOverrides.put("alertId", "" + + "id IN ( SELECT alert.alertDefinition.id " // + + " FROM Alert alert " // + + " WHERE alert.id = ? )"); filterOverrides.put("alertTemplateOnly", "resourceType IS NOT NULL"); filterOverrides.put("alertTemplateParentId", "parentId = ?"); filterOverrides.put("alertTemplateResourceTypeId", "resourceType.id = ?"); @@ -113,6 +118,10 @@ public class AlertDefinitionCriteria extends Criteria { public void addFilterAlertTemplateParentId(Integer filterAlertTemplateParentId) { this.filterAlertTemplateParentId = filterAlertTemplateParentId; } + + public void addFilterAlertId(Integer filterAlertId) { + this.filterAlertId = filterAlertId; + } public void addFilterAlertTemplateResourceTypeId(Integer filterAlertTemplateResourceTypeId) { this.filterAlertTemplateResourceTypeId = filterAlertTemplateResourceTypeId; commit b3aa6d8a54378fad077d2052e9f9620768723a4d Author: Michael Burman <yak(a)iki.fi> Date: Fri Jul 19 12:27:38 2013 +0200 BZ980076 Check if storage is really running after a crash diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java index 8988d98..5528619 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java @@ -1,7 +1,7 @@ /* * * * RHQ Management Platform - * * Copyright (C) 2005-2012 Red Hat, Inc. + * * Copyright (C) 2005-2013 Red Hat, Inc. * * All rights reserved. * * * * This program is free software; you can redistribute it and/or modify @@ -41,6 +41,10 @@ import org.apache.commons.cli.ParseException; import org.apache.commons.cli.PosixParser; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.exec.DefaultExecutor; +import org.apache.commons.exec.ExecuteException; +import org.apache.commons.exec.Executor; +import org.apache.commons.exec.PumpStreamHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -171,10 +175,15 @@ public abstract class ControlCommand { return getStorageBasedir().exists(); } - protected String getStoragePid() throws IOException { + protected File getStoragePidFile() { File storageBasedir = getStorageBasedir(); File storageBinDir = new File(storageBasedir, "bin"); File pidFile = new File(storageBinDir, "cassandra.pid"); + return pidFile; + } + + protected String getStoragePid() throws IOException { + File pidFile = getStoragePidFile(); if (pidFile.exists()) { return StreamUtil.slurp(new FileReader(pidFile)); @@ -282,4 +291,77 @@ public abstract class ControlCommand { return inUse; } + + protected void waitForProcessToStop(String pid) throws Exception { + + if (isWindows() || pid==null) { + // For the moment we have no better way to just wait some time + Thread.sleep(10*1000L); + } else { + int tries = 5; + while (tries > 0) { + log.debug("."); + if (!isUnixPidRunning(pid)) { + break; + } + Thread.sleep(2*1000L); + tries--; + } + if (tries==0) { + throw new RHQControlException("Process [" + pid + "] did not finish yet. Terminate it manually and retry."); + } + } + + } + + protected void killPid(String pid) throws IOException { + Executor executor = new DefaultExecutor(); + executor.setWorkingDirectory(getBinDir()); + executor.setStreamHandler(new PumpStreamHandler()); + org.apache.commons.exec.CommandLine commandLine; + + commandLine = new org.apache.commons.exec.CommandLine("kill").addArgument(pid); + executor.execute(commandLine); + } + + protected boolean isUnixPidRunning(String pid) { + + Executor executor = new DefaultExecutor(); + executor.setWorkingDirectory(getBinDir()); + executor.setStreamHandler(new PumpStreamHandler()); + org.apache.commons.exec.CommandLine commandLine = new org.apache.commons.exec.CommandLine("/bin/kill") + .addArgument("-0") + .addArgument(pid); + + try { + int code = executor.execute(commandLine); + if (code!=0) { + return false; + } + } catch (ExecuteException ee ) { + if (ee.getExitValue()==1) { + // return code 1 means process does not exist + return false; + } + } catch (IOException e) { + log.error("Checking for running process failed: " + e.getMessage()); + } + return true; + } + + protected boolean isStorageRunning() throws IOException { + String pid = getStoragePid(); + if(pid == null) { + return false; + } else if(pid != null && !isUnixPidRunning(pid)) { + // There is a phantom pidfile + File pidFile = getStoragePidFile(); + if(!pidFile.delete()) { + throw new RHQControlException("Could not delete storage pidfile " + pidFile.getAbsolutePath()); + } + return false; + } else { + return true; + } + } } diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java index fe7cdd4..8c885b0 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java @@ -1,7 +1,7 @@ /* * * * RHQ Management Platform - * * Copyright (C) 2005-2012 Red Hat, Inc. + * * Copyright (C) 2005-2013 Red Hat, Inc. * * All rights reserved. * * * * This program is free software; you can redistribute it and/or modify @@ -36,16 +36,12 @@ import java.util.Properties; import org.apache.commons.cli.CommandLine; import org.apache.commons.exec.DefaultExecuteResultHandler; import org.apache.commons.exec.DefaultExecutor; -import org.apache.commons.exec.ExecuteException; import org.apache.commons.exec.Executor; import org.apache.commons.exec.PumpStreamHandler; - import org.jboss.as.controller.client.ModelControllerClient; - import org.rhq.common.jbossas.client.controller.DeploymentJBossASClient; import org.rhq.common.jbossas.client.controller.MCCHelper; import org.rhq.server.control.ControlCommand; -import org.rhq.server.control.RHQControlException; /** * Common code for commands that perform installs. Basically shared code for Install and Upgrade commands. @@ -104,55 +100,6 @@ public abstract class AbstractInstall extends ControlCommand { } } - protected void waitForProcessToStop(String pid) throws Exception { - - if (isWindows() || pid==null) { - // For the moment we have no better way to just wait some time - Thread.sleep(10*1000L); - } else { - int tries = 5; - while (tries > 0) { - log.debug("."); - if (!isUnixPidRunning(pid)) { - break; - } - Thread.sleep(2*1000L); - tries--; - } - if (tries==0) { - throw new RHQControlException("Process [" + pid + "] did not finish yet. Terminate it manually and retry."); - } - } - - } - - protected boolean isUnixPidRunning(String pid) { - - Executor executor = new DefaultExecutor(); - executor.setWorkingDirectory(getBinDir()); - executor.setStreamHandler(new PumpStreamHandler()); - org.apache.commons.exec.CommandLine commandLine; - - commandLine = new org.apache.commons.exec.CommandLine("/bin/kill") - .addArgument("-0") - .addArgument(pid); - - try { - int code = executor.execute(commandLine); - if (code!=0) { - return false; - } - } catch (ExecuteException ee ) { - if (ee.getExitValue()==1) { - // return code 1 means process does not exist - return false; - } - } catch (IOException e) { - log.error("Checking for running process failed: " + e.getMessage()); - } - return true; - } - protected void waitForRHQServerToInitialize() throws Exception { try { final long messageInterval = 30000L; diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java index 7e83c9e..f15b13e 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java @@ -1,7 +1,7 @@ /* * * * RHQ Management Platform - * * Copyright (C) 2005-2012 Red Hat, Inc. + * * Copyright (C) 2005-2013 Red Hat, Inc. * * All rights reserved. * * * * This program is free software; you can redistribute it and/or modify @@ -26,7 +26,6 @@ package org.rhq.server.control.command; import java.io.File; -import java.io.FileReader; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Options; @@ -137,14 +136,13 @@ public class Start extends ControlCommand { log.debug("Failed to start storage service", e); } } else { - File storageBinDir = new File(getStorageBasedir(), "bin"); - File pidFile = new File(storageBinDir, "cassandra.pid"); + File pidFile = getStoragePidFile(); // For now we are duplicating logic in the status command. This code will be // replaced when we implement a rhq-storage.sh script. - if (pidFile.exists()) { - String pid = StreamUtil.slurp(new FileReader(pidFile)); + if (isStorageRunning()) { + String pid = getStoragePid(); System.out.println("RHQ storage node (pid " + pid + ") is running"); } else { commandLine = getCommandLine(false, "cassandra", "-p", pidFile.getAbsolutePath()); diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java index 53d0374..908aa8e 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java @@ -1,7 +1,7 @@ /* * * * RHQ Management Platform - * * Copyright (C) 2005-2012 Red Hat, Inc. + * * Copyright (C) 2005-2013 Red Hat, Inc. * * All rights reserved. * * * * This program is free software; you can redistribute it and/or modify @@ -126,13 +126,13 @@ public class Stop extends AbstractInstall { log.debug("Failed to stop storage service", e); } } else { - String pid = getStoragePid(); - if (pid != null) { + if(isStorageRunning()) { + String pid = getStoragePid(); + System.out.println("Stopping RHQ storage node..."); System.out.println("RHQ storage node (pid=" + pid + ") is stopping..."); - commandLine = new org.apache.commons.exec.CommandLine("kill").addArgument(pid); - executor.execute(commandLine); + killPid(pid); waitForProcessToStop(pid); commit bf8587569567d261791f272a672f5722d7dca8c0 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 18 23:37:57 2013 +0200 [as7] Fix domain api version discovery Look for the first node of type element instead of simply calling getFirstChild diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java index 329246e..3c71135 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,11 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.modules.plugins.jbossas7.helper; +import static org.rhq.core.util.StringUtil.EMPTY_STRING; +import static org.w3c.dom.Node.ELEMENT_NODE; + import java.io.File; import java.io.FileInputStream; import java.io.InputStream; @@ -33,6 +36,7 @@ import javax.xml.xpath.XPathFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; +import org.w3c.dom.Node; import org.rhq.core.pluginapi.util.CommandLineOption; import org.rhq.modules.plugins.jbossas7.AS7CommandLine; @@ -234,11 +238,15 @@ public class HostConfiguration { } public String getDomainApiVersion() { - - String version = document.getFirstChild().getAttributes().getNamedItem("xmlns").getTextContent(); - - version = version.substring(version.lastIndexOf(':')+1); - return version; + // Look for the first child node of type element (<host> in domain mode or <server> in standalone mode) + // We can't just call getFirstChild because first child could be a node of type comment + for (Node childNode = document.getFirstChild(); childNode != null; childNode = childNode.getNextSibling()) { + if (childNode.getNodeType() == ELEMENT_NODE) { + String xmlns = childNode.getAttributes().getNamedItem("xmlns").getTextContent(); + return xmlns.substring(xmlns.lastIndexOf(':') + 1); + } + } + return EMPTY_STRING; } /** commit 5283e5356d2ca4bda6e3aeea9d323c186030baa9 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 18 09:41:39 2013 +0200 Bug 969621 - EAP 6 managed plug-in is unable to discover EAP servers when more then one is running on a single host diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index cc13406..cd9f276 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.modules.plugins.jbossas7; @@ -42,6 +42,7 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.resource.ResourceUpgradeReport; import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; @@ -49,6 +50,8 @@ import org.rhq.core.pluginapi.inventory.ManualAddFacet; import org.rhq.core.pluginapi.inventory.ProcessScanResult; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeContext; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeFacet; import org.rhq.core.pluginapi.util.CommandLineOption; import org.rhq.core.pluginapi.util.FileUtils; import org.rhq.core.pluginapi.util.JavaCommandLine; @@ -66,12 +69,15 @@ import org.rhq.modules.plugins.jbossas7.json.Result; * Abstract base discovery component for the two server types - "JBossAS7 Host Controller" and * "JBossAS7 Standalone Server". */ -public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent, ManualAddFacet { +public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent, ManualAddFacet, ResourceUpgradeFacet { private static final String JBOSS_AS_PREFIX = "jboss-as-"; private static final String JBOSS_EAP_PREFIX = "jboss-eap-"; private static final String WILDFLY_PREFIX = "wildfly-"; + private static final String LOCAL_RESOURCE_KEY_PREFIX = "hostConfig: "; + private static final String REMOTE_RESOURCE_KEY_PREFIX = "hostPort: "; + private static final String HOME_DIR_SYSPROP = "jboss.home.dir"; private static final String RHQADMIN = "rhqadmin"; @@ -202,7 +208,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent setStartScriptPluginConfigProps(process, commandLine, pluginConfig, agentProcess); setUserAndPasswordPluginConfigProps(serverPluginConfig, hostConfig, baseDir); - String key = baseDir.getPath(); + String key = createKeyForLocalResource(serverPluginConfig); HostPort hostPort = hostConfig.getDomainControllerHostPort(commandLine); String name = buildDefaultResourceName(hostPort, managementHostPort, productType); String description = buildDefaultResourceDescription(hostPort, productType); @@ -455,7 +461,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent HostPort managementHostPort = new HostPort(false); managementHostPort.host = hostname; managementHostPort.port = port; - String key = hostname + ":" + port; + String key = createKeyForRemoteResource(hostname + ":" + port); String name = buildDefaultResourceName(hostPort, managementHostPort, productType); String version = productInfo.getProductVersion(); String description = buildDefaultResourceDescription(hostPort, productType); @@ -469,6 +475,43 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent return detail; } + @Override + public ResourceUpgradeReport upgrade(ResourceUpgradeContext inventoriedResource) { + String currentResourceKey = inventoriedResource.getResourceKey(); + Configuration pluginConfiguration = inventoriedResource.getPluginConfiguration(); + ServerPluginConfiguration serverPluginConfiguration = new ServerPluginConfiguration(pluginConfiguration); + + if (currentResourceKey.startsWith(LOCAL_RESOURCE_KEY_PREFIX) + || currentResourceKey.startsWith(REMOTE_RESOURCE_KEY_PREFIX)) { + // Resource key already in right format + return null; + } + + ResourceUpgradeReport report = new ResourceUpgradeReport(); + + if (new File(currentResourceKey).isDirectory()) { + // Old key format for a local resource (key is base dir) + report.setNewResourceKey(createKeyForLocalResource(serverPluginConfiguration)); + } else if (currentResourceKey.contains(":")) { + // Old key format for a remote (manually added) resource (key is base dir) + report.setNewResourceKey(createKeyForRemoteResource(currentResourceKey)); + } else { + log.warn("Unknown format, cannot upgrade resource key [" + currentResourceKey + "]"); + return null; + } + + return report; + } + + private String createKeyForRemoteResource(String hostPort) { + return REMOTE_RESOURCE_KEY_PREFIX + hostPort; + } + + private String createKeyForLocalResource(ServerPluginConfiguration serverPluginConfiguration) { + return LOCAL_RESOURCE_KEY_PREFIX + + serverPluginConfiguration.getHostConfigFile().getAbsolutePath(); + } + private <T>T getServerAttribute(ASConnection connection, String attributeName) { Operation op = new ReadAttribute(null, attributeName); Result res = connection.execute(op); commit e6fa8c734c2bfee9ad46a2b7683d4c86b4897e5c Author: John Sanda <jsanda(a)redhat.com> Date: Thu Jul 18 07:23:34 2013 -0400 take 2 at dependency clean up JNA libraries were getting pulled into the ear as transitive dependencies. JNA is used by the cassandra-ccm-core module to shutdown Cassandra. This functionality though is only used in test code. diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index c648685..f418afc 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -77,6 +77,14 @@ <groupId>org.rhq</groupId> <artifactId>rhq-core-plugin-api</artifactId> </exclusion> + <exclusion> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + </exclusion> + <exclusion> + <groupId>net.java.dev.jna</groupId> + <artifactId>platform</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 2245978..97496f7 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -47,18 +47,6 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>rhq-cassandra-ccm-core</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.cassandra</groupId> - <artifactId>cassandra-clientutil</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-ccm-testng</artifactId> <version>${project.version}</version> <scope>test</scope> commit 375f6f66fcc9214cc3d13605c17859ac11e3fd45 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Jul 18 05:04:00 2013 -0500 Temporary fix for the server jar name for dev profile (it was still using the old name). diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 7c236c7..c648685 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -776,7 +776,7 @@ <properties> <rhq.rootDir>../../../..</rhq.rootDir> <rhq.containerDir>${rhq.rootDir}/${rhq.devContainerServerPath}</rhq.containerDir> - <rhq.deploymentName>${project.build.finalName}-ejb3.jar</rhq.deploymentName> + <rhq.deploymentName>rhq-server.jar</rhq.deploymentName> <rhq.deploymentDir>${rhq.containerDir}/${rhq.earDeployDir}/${rhq.deploymentName}</rhq.deploymentDir> </properties> commit b59d1684eb12c4e1c5a78309b4ec40eeb461b7d5 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 17 20:17:14 2013 -0400 fix test ear deployment error that resulted from renaming server jar The ear deployment was failing because classes were not getting added to the rhq-server.jar in the test ear. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java index 4dfbd46..2fd8624 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java @@ -341,7 +341,7 @@ public abstract class AbstractEJB3Test extends Arquillian { // merge rhq.ear into testEar but include only the EJB jars and the supporting libraries. Note that we // don't include the services sar because tests are responsible for prepare/unprepare of all required services, // we don't want the production services performing any unexpected work. - testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\\.jar.*")); + testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\\.jar.*|/rhq-server.jar.*")); // remove startup beans and shutdown listeners, we don't want this to be a full server deployment. The tests // start/stop what they need, typically with test services or mocks. testEar.delete(ArchivePaths @@ -413,7 +413,7 @@ public abstract class AbstractEJB3Test extends Arquillian { //System.out.println("** The Deployment EAR: " + testEar.toString(true) + "\n"); // Save the test EAR to a zip file for inspection (set file explicitly) - //exportZip(testEar, new File("c:/temp/test-ear.ear")); + exportZip(testEar, new File("/Users/jsanda/tmp/test-ear.ear")); return testEar; } commit c855df20b787a6db0a7b9aed7b1fb5597eb0e2d6 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jul 17 17:09:55 2013 -0400 Work on the windows rhq48 cassandra upgrade patch diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat index e0312dc..c190503 100644 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat @@ -1,14 +1,54 @@ @echo off + +rem =========================================================================== +rem RHQ Storage Node (Cassandra) Windows 4.8.0 upgrade patch script +rem +rem WHO NEEDS TO RUN THE PATCH? +rem +rem Run this patch script if you are: +rem - Running RHQ 4.8.0 on Windows +rem - Planning to upgrade and maintain your Storage node data +rem +rem PREQUISITES: +rem +rem This patch requires the installation of Python. Download Python 2.7.5 from: +rem +rem http://www.python.org/download/releases/2.7.5/ +rem +rem Install as directed. Note that Python will need to be on your PATH to run this patch. Also, +rem this patch will not work with Python3. +rem +rem Edit <rhq-install-dir>\rhq-storage\conf\cassandra.yaml to ensure the following is true: +rem +rem start_rpc: true +rem +rem Note the setting of rpc_port. By default it is 9160, which is fine. +rem +rem RUNNING THE PATCH: +rem +rem > cd <patch-dir> +rem > rhq48-storage-patch.bat <rhq-480-server-dir> <storage-node-ip-address> <thrift-rpc-port> <jmx-port> +rem +rem For example: +rem > rhq48-storage-patch.bat c:\rhq-server-4.8.0 127.0.0.1 9160 7299 +rem +rem Review the output carefully. There should be no errors (be careful, the script may still have completed). +rem If errors are encountered fix the issue and rerun the patch. +rem +rem When done, you can again edit cassandra.yaml and reset start_rpc: false +rem +rem =========================================================================== + setlocal if /i "%4" == "" ( - echo Usage: rhq48-storage-patch.bat ^<rhq-server-dir^> ^<storage-ip-address^> ^<cql-port^> ^<jmx-port^> + echo Usage: rhq48-storage-patch.bat ^<rhq-server-dir^> ^<storage-ip-address^> ^<thrift-rpc-port^> ^<jmx-port^> exit /B 1 ) set RHQ_SERVER_DIR=%1 -set CQL_HOSTNAME=%2 -set CQL_PORT=%3 +set CQLSH_HOST=%2 +set CQLSH_PORT=%3 set JMX_PORT=%4 set USERNAME="rhqadmin" set PASSWORD="rhqadmin" @@ -29,7 +69,7 @@ echo Waiting for RHQ Storage Node to start up.. rem Sleep is not implemented in all Windows prompts, this one won't work in Vista choice /n /c y /d y /t 3 -set RHQ_STORAGE_BIN=%RHQ_SERVER_DIR%\rhq-storage\bin\ +set RHQ_STORAGE_BIN=%RHQ_SERVER_DIR%\rhq-storage\bin set CQLSH_PATH=%RHQ_STORAGE_BIN%\cqlsh set NODETOOL_PATH=%RHQ_STORAGE_BIN%\nodetool.bat commit 11b8ae9cff9ca5085bfe317a01653cc8b81d8bb7 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Jul 17 14:14:02 2013 -0500 Initial implementation for the Storage Node configuration composite. The final resource operation still needs to be implemented but the rest of the functionality is implemented. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java index 14043db..575edc74 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java @@ -90,7 +90,7 @@ public class StorageNode implements Serializable { public static final long serialVersionUID = 1L; public static final String QUERY_FIND_ALL = "StorageNode.findAll"; - public static final String QUERY_FIND_BY_ADDRESS = "StorageNode.findByName"; + public static final String QUERY_FIND_BY_ADDRESS = "StorageNode.findByAddress"; public static final String QUERY_FIND_ALL_NOT_INSTALLED = "StorageNode.findAllCloudMembers"; public static final String QUERY_DELETE_BY_ID = "StorageNode.deleteById"; public static final String QUERY_FIND_ALL_NORMAL = "StorageNode.findAllNormalCloudMembers"; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java new file mode 100644 index 0000000..e2c64f9 --- /dev/null +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java @@ -0,0 +1,98 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.domain.cloud; + +import java.io.Serializable; + +/** + * @author Stefan Negrea + */ +public class StorageNodeConfigurationComposite implements Serializable { + private static final long serialVersionUID = 1L; + + private StorageNode storageNode; + private int jmxPort; + private String heapSize; + + public StorageNodeConfigurationComposite() { + // GWT needs this + } + + public StorageNodeConfigurationComposite(StorageNode storageNode) { + this.storageNode = storageNode; + } + + /** + * @return associated storage node + */ + public StorageNode getStorageNode() { + return storageNode; + } + + /** + * @param storageNode storage node + */ + protected void setStorageNode(StorageNode storageNode) { + this.storageNode = storageNode; + } + + + /** + * @return the JMX port + */ + public int getJmxPort() { + return jmxPort; + } + + /** + * @param jmxPort JMX port to set + */ + public void setJmxPort(int jmxPort) { + this.jmxPort = jmxPort; + } + + /** + * @return the heap size + */ + public String getHeapSize() { + return heapSize; + } + + /** + * @param heapSize heap size to set + */ + public void setHeapSize(String heapSize) { + this.heapSize = heapSize; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("storageNode.addresss=").append(storageNode.getAddress()).append(", "); + builder.append("heapSize=").append(heapSize).append(", "); + builder.append("jmxPort=").append(jmxPort).append(""); + return builder.toString(); + } +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index fa51fe1..3f1ec69 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -51,14 +51,18 @@ import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.cloud.Server; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.cloud.StorageNode.OperationMode; +import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.common.JobTrigger; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; +import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.measurement.MeasurementAggregate; import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.domain.operation.OperationRequestStatus; +import org.rhq.core.domain.operation.ResourceOperationHistory; import org.rhq.core.domain.operation.bean.GroupOperationSchedule; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; @@ -72,6 +76,7 @@ import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.authz.RequiredPermission; import org.rhq.enterprise.server.authz.RequiredPermissions; import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal; +import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal; import org.rhq.enterprise.server.operation.OperationManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; @@ -96,6 +101,11 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private static final String RHQ_STORAGE_JMX_PORT_PROPERTY = "jmxPort"; private static final String RHQ_STORAGE_ADDRESS_PROPERTY = "host"; + private static final int OPERATION_QUERY_TIMEOUT = 1000; + private static final int MAX_ITERATIONS = 5; + private static final String UPDATE_CONFIGURATION_OPERATION = "updateConfiguration"; + private static final String RESTART_OPERATION = "restart"; + @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) private EntityManager entityManager; @@ -120,6 +130,9 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @EJB private AlertManagerLocal alertManager; + @EJB + private ConfigurationManagerLocal configurationManager; + @Override public void linkResource(Resource resource) { List<StorageNode> storageNodes = this.getStorageNodes(); @@ -438,6 +451,19 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN entityManager.flush(); } + private StorageNode findStorageNodeByAddress(String address) { + TypedQuery<StorageNode> query = entityManager.<StorageNode> createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS, + StorageNode.class); + query.setParameter("address", address); + List<StorageNode> result = query.getResultList(); + + if (result != null && result.size() > 0) { + return result.get(0); + } + + return null; + } + private StorageNodeLoadComposite.MeasurementAggregateWithUnits getMeasurementAggregateWithUnits(Subject subject, int schedId, MeasurementUnits units, long beginTime, long endTime) { MeasurementAggregate measurementAggregate = measurementManager.getAggregate(subject, schedId, beginTime, @@ -559,4 +585,91 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return resourceIdsWithAlertDefinitions.toArray(new Integer[resourceIdsWithAlertDefinitions.size()]); } + + @Override + public StorageNodeConfigurationComposite retrieveConfiguration(Subject subject, StorageNode storageNode) { + StorageNodeConfigurationComposite configuration = new StorageNodeConfigurationComposite(storageNode); + + if (storageNode != null && storageNode.getResource() != null) { + Resource storageNodeResource = storageNode.getResource(); + Configuration storageNodeConfiguration = configurationManager.getResourceConfiguration(subject, + storageNodeResource.getId()); + + configuration.setHeapSize(storageNodeConfiguration.getSimpleValue("maxHeapSize")); + configuration.setJmxPort(storageNode.getJmxPort()); + } + + return configuration; + } + + @Override + public boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) { + StorageNode storageNode = findStorageNodeByAddress(storageNodeConfiguration.getStorageNode().getAddress()); + + if (storageNode != null && storageNode.getResource() != null) { + Resource storageNodeResource = storageNode.getResource(); + Configuration parameters = new Configuration(); + parameters.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); + parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); + + boolean updateConfigurationResult = runOperationAndWaitForResult(subject, storageNodeResource, + UPDATE_CONFIGURATION_OPERATION, parameters); + + if (updateConfigurationResult) { + boolean restartResult = runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, + null); + + if (restartResult) { + storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); + entityManager.persist(storageNode); + + return true; + } + } + } + + return false; + } + + private boolean runOperationAndWaitForResult(Subject subject, Resource storageNodeResource, String operationToRun, + Configuration parameters) { + + //scheduling the operation + long operationStartTime = System.currentTimeMillis(); + operationManager.scheduleResourceOperation(subject, storageNodeResource.getId(), operationToRun, 0, 0, 0, 0, + parameters, "Run by StorageNodeManagerBean"); + + //waiting for the operation result then return it + int iteration = 0; + boolean successResultFound = false; + while (iteration < MAX_ITERATIONS && !successResultFound) { + ResourceOperationHistoryCriteria criteria = new ResourceOperationHistoryCriteria(); + criteria.addFilterResourceIds(storageNodeResource.getId()); + criteria.addFilterStartTime(operationStartTime); + criteria.addFilterOperationName(operationToRun); + criteria.addFilterStatus(OperationRequestStatus.SUCCESS); + criteria.setPageControl(PageControl.getUnlimitedInstance()); + + PageList<ResourceOperationHistory> results = operationManager.findResourceOperationHistoriesByCriteria( + subject, criteria); + + if (results != null && results.size() > 0) { + successResultFound = true; + } + + if (successResultFound) { + break; + } else { + try { + Thread.sleep(OPERATION_QUERY_TIMEOUT); + } catch (Exception e) { + log.error(e); + } + } + + iteration++; + } + + return successResultFound; + } } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index a9b2514..6fca820 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -25,6 +25,7 @@ import javax.ejb.Local; import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.resource.Resource; @@ -56,6 +57,10 @@ public interface StorageNodeManagerLocal { */ StorageNodeLoadComposite getLoad(Subject subject, StorageNode node, long beginTime, long endTime); + StorageNodeConfigurationComposite retrieveConfiguration(Subject subject, StorageNode storageNode); + + boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration); + /** * Fetches the list of StorageNode entities based on provided criteria. * diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java index 72432db..7be1b07 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java @@ -23,6 +23,7 @@ import javax.ejb.Remote; import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.util.PageList; @@ -48,6 +49,10 @@ public interface StorageNodeManagerRemote { */ StorageNodeLoadComposite getLoad(Subject subject, StorageNode node, long beginTime, long endTime); + StorageNodeConfigurationComposite retrieveConfiguration(Subject subject, StorageNode storageNode); + + boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration); + /** * <p>Fetches the list of {@link StorageNode} entities based on provided criteria.</p> * diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java index 6b1940d..54ca4c2 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java @@ -71,7 +71,6 @@ public class StorageNodeMaintenanceJob extends AbstractStatefulJob { private final static String RUN_REPAIR_PROPERTY = "runRepair"; private final static String UPDATE_SEEDS_LIST = "updateSeedsList"; private final static String SEEDS_LIST = "seedsList"; - private final static String SUCCEED_PROPERTY = "succeed"; private static final String USERNAME_PROP = "rhq.cassandra.username"; private static final String PASSWORD_PROP = "rhq.cassandra.password"; @@ -169,8 +168,6 @@ public class StorageNodeMaintenanceJob extends AbstractStatefulJob { List<Resource> childResources = LookupUtil.getResourceManager().findResourcesByCriteria( LookupUtil.getSubjectManager().getOverlord(), c); - - for (Resource childResource : childResources) { if (STORAGE_SERVICE.equals(childResource.getName())) { try { diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 6194146..380da65 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -82,11 +82,19 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return prepareForUpgrade(parameters); } else if (name.equals("readRepair")) { return readRepair(); + } else if (name.equals("updateConfiguration")) { + return updateConfiguration(parameters); } else { return super.invokeOperation(name, parameters); } } + private OperationResult updateConfiguration(Configuration params) { + OperationResult result = new OperationResult("Configuration updated."); + //TODO: implement updates to various sub-resources here + return result; + } + private OperationResult nodeAdded(Configuration params) { boolean runRepair = params.getSimple("runRepair").getBooleanValue(); boolean updateSeedsList = params.getSimple("updateSeedsList").getBooleanValue(); @@ -222,12 +230,12 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } return result; } - + private OperationResult prepareForUpgrade(Configuration parameters) throws Exception { EmsConnection emsConnection = getEmsConnection(); EmsBean storageService = emsConnection.getBean("org.apache.cassandra.db:type=StorageService"); Class<?>[] emptyParams = new Class<?>[0]; - + if (log.isDebugEnabled()) { log.debug("Disabling native transport..."); } @@ -249,7 +257,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper snapshotName = System.currentTimeMillis() + ""; } operation.invoke(snapshotName, new String[] {}); - + // max 2 sec waitForTaskToComplete(500, 10, 150); @@ -261,7 +269,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return new OperationResult(); } - + private void waitForTaskToComplete(int initialWaiting, int maxTries, int sleepMillis) { // initial waiting try { diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 5a60d19..6ed31b7 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -73,7 +73,7 @@ </c:list-property> </results> </operation> - + <operation name="addNodeMaintenance"> <parameters> <c:simple-property name="runRepair" type="boolean" default="true"/> @@ -111,6 +111,16 @@ </parameters> </operation> + <operation name="updateConfiguration" description="Updates the node configuration. Will require a separate server restart for the settings to take effect."> + <parameters> + <c:simple-property name="heapSize" type="string" description="The heap size to be used for both -Xms and -Xmx JVM options."/> + <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> + </parameters> + <results> + <c:simple-property name="operationResult" description="Outcome of updating the configuration."/> + </results> + </operation> + <resource-configuration> <c:group name="MemorySettings"> <c:simple-property name="minHeapSize" @@ -195,3 +205,4 @@ <service name="Keyspace" sourcePlugin="Cassandra" sourceType="Keyspace"/> </server> </plugin> + commit b268d00034cb7af8d929006e8ac4688eeae58549 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 17 13:10:58 2013 -0400 Revert "cleaning up dependencies" This reverts commit e798901b83e37cd267a2d11489664569918ef90d. diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index 55dedb8..8e3b44a 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -15,6 +15,12 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-ccm-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-util</artifactId> <version>${project.version}</version> </dependency> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 97496f7..2245978 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -47,6 +47,18 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-ccm-core</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.cassandra</groupId> + <artifactId>cassandra-clientutil</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-ccm-testng</artifactId> <version>${project.version}</version> <scope>test</scope> commit a05f561f5fcac94b3308937b07d3b1e1e3f84d58 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 17 16:59:03 2013 +0200 Print simpler log message when component invocation is interrupted and log level is higher than debug diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java index a9fe1c2..3669947 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java @@ -671,8 +671,19 @@ public class ResourceContainer implements Serializable { public void markContextInterrupted() { localContext.markInterrupted(); - LOG.warn("Invocation has been marked interrupted for method [" + method + "] on resource [" - + resourceContainer.getResource() + "]"); + LOG.warn(getContextInterruptedWarningMessage(LOG.isDebugEnabled())); + } + + private String getContextInterruptedWarningMessage(boolean detailed) { + StringBuilder sb = new StringBuilder(); + sb.append("Invocation has been marked interrupted for method ["); + if (detailed) { + sb.append(method.toGenericString()); + } else { + sb.append(method.getDeclaringClass().getSimpleName()).append(".").append(method.getName()); + } + sb.append("] on resource [").append(resourceContainer.getResource()).append("]"); + return sb.toString(); } } } commit 01cd91b130f563ba62cd96a46f2cb3a2ac567a48 Author: Larry O'Leary <loleary(a)redhat.com> Date: Wed Jul 17 16:32:05 2013 +0200 BZ 981015 - Ldap auth failed if DN contained a backslash diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java index 6b7add6..0db28f7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java @@ -23,6 +23,7 @@ import java.util.Iterator; import java.util.Map.Entry; import java.util.Properties; +import javax.naming.CompositeName; import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.directory.SearchControls; @@ -194,7 +195,18 @@ public class LdapLoginModule extends UsernamePasswordLoginModule { SearchResult si = (SearchResult) answer.next(); // Construct the UserDN - String userDN = si.getName() + "," + baseDNs[x]; + String userDN = null; + + try { + userDN = si.getNameInNamespace(); + } catch (UnsupportedOperationException use) { + userDN = new CompositeName(si.getName()).get(0); + if (si.isRelative()) { + userDN += "," + baseDNs[x]; + } + } + + log.debug("Using LDAP userDN=" + userDN); ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, userDN); ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, inputPassword); @@ -209,7 +221,7 @@ public class LdapLoginModule extends UsernamePasswordLoginModule { // If we try all the BaseDN's and have not found a match, return false return false; } catch (Exception e) { - log.info("Failed to validate password: " + e.getMessage()); + log.info("Failed to validate password for [" + userName + "]: " + e.getMessage()); return false; } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index 532a944..a28c709 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.server.resource.group; @@ -33,6 +33,7 @@ import java.util.Set; import javax.ejb.EJB; import javax.ejb.Stateless; +import javax.naming.CompositeName; import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.NamingException; @@ -345,12 +346,9 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { try { userDN = si.getNameInNamespace(); } catch (UnsupportedOperationException use) { - userDN = si.getName(); - if (userDN.startsWith("\"")) { - userDN = userDN.substring(1, userDN.length()); - } - if (userDN.endsWith("\"")) { - userDN = userDN.substring(0, userDN.length() - 1); + userDN = new CompositeName(si.getName()).get(0); + if (si.isRelative()) { + userDN += "," + baseDNs[x]; } userDN = userDN + "," + baseDNs[x]; } @@ -507,7 +505,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { /** Translate SystemSettings to familiar Properties instance since we're * passing not one but multiple values. - * + * * @param systemSettings * @return */ @@ -532,7 +530,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { /** Executes the LDAP group query using the filters, context and search controls, etc. parameters passed in. * The matching groups located during processing this pages of results are added as new entries to the * groupDetailsMap passed in. - * + * * @param filter * @param groupDetailsMap * @param ctx commit 165c9c9f8da7251c0000444f04161171a7d5794f Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 17 07:37:12 2013 -0400 need to make cassandra-ccm-core a direct dependency now diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml index a55afa5..0a06610 100644 --- a/modules/helpers/metrics-simulator/pom.xml +++ b/modules/helpers/metrics-simulator/pom.xml @@ -13,6 +13,12 @@ <dependencies> <dependency> <groupId>org.rhq</groupId> + <artifactId>rhq-cassandra-ccm-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-schema</artifactId> <version>${project.version}</version> </dependency> commit fb59ea4fb09414875afcaa9543788e3cfc1b14f1 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 17 07:35:22 2013 -0400 initial commit for StorageInstallerTest This commit provides some initial test coverage for the storage installer. More tests will be added to cover various error handling situations and upgrade scenarios. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java index 7496d08..338ef3a 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java @@ -303,7 +303,7 @@ public class CassandraClusterManager { return nodeIds; } - private void killNode(File nodeDir) throws Exception { + public void killNode(File nodeDir) throws Exception { long pid = getPid(nodeDir); CLibrary.kill((int) pid, 9); } diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 2fec2dc..63282e4 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -485,7 +485,7 @@ public class StorageInstaller { private PropertiesFileUpdate getServerProperties() { String sysprop = System.getProperty("rhq.server.properties-file"); if (sysprop == null) { - throw new RuntimeException("The required system property [rhq.server.properties] is not defined."); + throw new RuntimeException("The required system property [rhq.server.properties-file] is not defined."); } File file = new File(sysprop); @@ -605,7 +605,7 @@ public class StorageInstaller { return new File(binDir, "cassandra.pid").exists(); } - private boolean verifyNodeIsUp(String address, int jmxPort, int retries, long timeout) throws Exception { + boolean verifyNodeIsUp(String address, int jmxPort, int retries, long timeout) throws Exception { String url = "service:jmx:rmi:///jndi/rmi://" + address + ":" + jmxPort + "/jmxrmi"; JMXServiceURL serviceURL = new JMXServiceURL(url); JMXConnector connector = null; diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java new file mode 100644 index 0000000..3fd13c7 --- /dev/null +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -0,0 +1,123 @@ +package org.rhq.storage.installer; + + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.Properties; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.PosixParser; +import org.apache.commons.io.FileUtils; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import org.rhq.cassandra.CassandraClusterManager; +import org.rhq.core.util.file.FileUtil; + +/** + * @author John Sanda + */ +public class StorageInstallerTest { + + private File basedir; + + private File storageDir; + + private StorageInstaller installer; + + @BeforeMethod + public void initDirs(Method test) throws Exception { + File dir = new File(getClass().getResource(".").toURI()); + basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); + FileUtil.purge(basedir, true); + basedir.mkdirs(); + + System.setProperty("rhq.server.basedir", basedir.getAbsolutePath()); + + File serverPropsFile = new File(basedir, "rhq-server.properties"); + FileUtils.touch(serverPropsFile); + System.setProperty("rhq.server.properties-file", serverPropsFile.getAbsolutePath()); + + storageDir = new File(basedir, "rhq-storage"); + + installer = new StorageInstaller(); + } + + @AfterMethod + public void shutdownStorageNode() throws Exception { + CassandraClusterManager ccm = new CassandraClusterManager(); + ccm.killNode(storageDir); + } + + @Test + public void performValidInstall() throws Exception { + CommandLineParser parser = new PosixParser(); + + String[] args = { + "--dir", storageDir.getAbsolutePath(), + "--commitlog", new File(storageDir, "commit_log").getAbsolutePath(), + "--data", new File(storageDir, "data").getAbsolutePath(), + "--saved-caches", new File(storageDir, "saved_caches").getAbsolutePath(), + "--heap-size", "256M", + "--heap-new-size", "64M", + "--hostname", "127.0.0.1" + }; + + CommandLine cmdLine = parser.parse(installer.getOptions(), args); + int status = installer.run(cmdLine); + + assertEquals(status, 0, "Expected to get back a status code of 0 for a successful install"); + assertNodeIsRunning(); + assertRhqServerPropsUpdated(); + + File binDir = new File(storageDir, "bin"); + assertTrue(binDir.exists(), "Expected to find bin directory at " + binDir); + + File confDir = new File(storageDir, "conf"); + assertTrue(confDir.exists(), "Expected to find conf directory at " + confDir); + + File libDir = new File(storageDir, "lib"); + assertTrue(libDir.exists(), "Expected to find lib directory at " + libDir); + + File commitLogDir = new File(storageDir, "commit_log"); + assertTrue(commitLogDir.exists(), "Expected to find commit_log directory at " + commitLogDir); + + File dataDir = new File(storageDir, "data"); + assertTrue(dataDir.exists(), "Expected to find data directory at " + dataDir); + + File savedCachesDir = new File(storageDir, "saved_caches"); + assertTrue(savedCachesDir.exists(), "Expected to find saved_caches directory at " + savedCachesDir); + } + + private void assertNodeIsRunning() { + try { + installer.verifyNodeIsUp("127.0.0.1", 7299, 3, 1000); + } catch (Exception e) { + fail("Failed to verify that node is up", e); + } + } + + private void assertRhqServerPropsUpdated() { + File serverPropsFile = new File(basedir, "rhq-server.properties"); + Properties properties = new Properties(); + + try { + properties.load(new FileInputStream(serverPropsFile)); + } catch (IOException e) { + fail("Failed to verify that " + serverPropsFile + " was updated", e); + } + + String seeds = properties.getProperty("rhq.cassandra.seeds"); + + assertEquals(seeds, "127.0.0.1|7299|9142"); + } + +} diff --git a/modules/common/cassandra-installer/src/test/resources/log4j.properties b/modules/common/cassandra-installer/src/test/resources/log4j.properties new file mode 100644 index 0000000..d56cc88 --- /dev/null +++ b/modules/common/cassandra-installer/src/test/resources/log4j.properties @@ -0,0 +1,41 @@ +# +# /* +# * RHQ Management Platform +# * Copyright (C) 2005-2012 Red Hat, Inc. +# * All rights reserved. +# * +# * This program is free software; you can redistribute it and/or modify +# * it under the terms of the GNU General Public License, version 2, as +# * published by the Free Software Foundation, and/or the GNU Lesser +# * General Public License, version 2.1, also as published by the Free +# * Software Foundation. +# * +# * This program is distributed in the hope that it will be useful, +# * but WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# * GNU General Public License and the GNU Lesser General Public License +# * for more details. +# * +# * You should have received a copy of the GNU General Public License +# * and the GNU Lesser General Public License along with this program; +# * if not, write to the Free Software Foundation, Inc., +# * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# */ +# + +log4j.rootCategory=WARN, FILE, CONSOLE + +log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender +log4j.appender.FILE.DatePattern='.'yyyy-MM-dd +log4j.appender.FILE.File=./target/test.log +log4j.appender.FILE.layout=org.apache.log4j.PatternLayout +log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n +#log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n +log4j.appender.FILE.Append=false + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +#log4j.appender.CONSOLE.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n + +log4j.logger.org.rhq=DEBUG commit e798901b83e37cd267a2d11489664569918ef90d Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 16 16:16:01 2013 -0400 cleaning up dependencies diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index 8e3b44a..55dedb8 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -15,12 +15,6 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>rhq-cassandra-ccm-core</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-util</artifactId> <version>${project.version}</version> </dependency> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 2245978..97496f7 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -47,18 +47,6 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>rhq-cassandra-ccm-core</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.cassandra</groupId> - <artifactId>cassandra-clientutil</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-ccm-testng</artifactId> <version>${project.version}</version> <scope>test</scope> commit ae96f1c0ad6e797e889923dc47a1f3c55c8eb394 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Jul 17 11:06:21 2013 +0200 Allow to specify a directory with classes to scan for plugin annotations and to auto-create metrics+operations from them. diff --git a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Parameter.java b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Parameter.java index 4b82a13..29dcc1e 100644 --- a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Parameter.java +++ b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Parameter.java @@ -29,13 +29,14 @@ import java.lang.annotation.Target; /** * Parameter. - * + * * @author Galder Zamarreño * @since 4.0 */ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) public @interface Parameter { - String name() default ""; + String name() ; String description() default ""; + RhqType type() default RhqType.VOID; } diff --git a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/RhqType.java b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/RhqType.java new file mode 100644 index 0000000..1487a51 --- /dev/null +++ b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/RhqType.java @@ -0,0 +1,77 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginAnnotations.agent; + +import java.io.File; + + +/** + * Base data types from RHQ for properties + * @author Heiko W. Rupp + */ +public enum RhqType { + INTEGER(new Class<?>[]{Integer.class,int.class},Boolean.class), + LONG(new Class<?>[]{Long.class,long.class},Long.class), + DOUBLE(new Class<?>[]{Double.class,double.class},Double.class), + STRING(new Class<?>[]{String.class},String.class), + LONG_STRING(new Class<?>[]{},String.class), + PASSWORD(new Class<?>[]{},String.class), + BOOLEAN(new Class<?>[]{Boolean.class, boolean.class},Boolean.class), + FLOAT(new Class<?>[]{Float.class, float.class},Float.class), + FILE(new Class<?>[]{File.class},File.class), + DIRECTORY(new Class<?>[]{},File.class), + VOID(new Class<?>[]{Void.class,void.class},Void.class) + ; + private Class<?>[] fromClasses; + private Class<?> toClass; + + private RhqType(Class<?>[] fromClasses,Class<?> toClass) { + + this.fromClasses = fromClasses; + this.toClass = toClass; + } + + public Class<?>[] getFromClasses() { + return fromClasses; + } + + public Class<?> getToClass() { + return toClass; + } + + public static RhqType findType(Class<?> clazz) { + for (RhqType type : RhqType.values()) { + for (Class from : type.getFromClasses()) { + if (clazz.equals(from)) { + return type; + } + } + } + return null; + } + + public String getRhqName() { + String name = name().toLowerCase(); + if (name.equals("long_string")) { + name = "longString"; + } + return name; + } +} diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 5aa512c..e7744e4 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -19,6 +19,11 @@ <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> + <properties> +  + <animal.sniffer.java.signature.artifactId>java17</animal.sniffer.java.signature.artifactId> + </properties> + <build> <plugins> @@ -104,7 +109,7 @@ <dependency> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-pluginAnnotations</artifactId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> </dependency> <dependency> <groupId>com.oracle</groupId> diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java new file mode 100644 index 0000000..3c90b7b --- /dev/null +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java @@ -0,0 +1,44 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginGen; + +import java.util.List; + +/** + * Processor that scans a directory for annotated classes and generates metrics etc. from them. + * @author Heiko W. Rupp + */ +public class AnnotationProcessor { + + private List<Class> classList; + private final DirectoryClassLoader classLoader; + + public AnnotationProcessor(String baseDirectory) { + classLoader = new DirectoryClassLoader(); + classLoader.setBaseDir(baseDirectory); + } + + public void populate(Props props) { + classList = classLoader.findClasses(); + + props.populateMetrics(classList); + props.populateOperations(classList); + } +} diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/DirectoryClassLoader.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/DirectoryClassLoader.java new file mode 100644 index 0000000..b4a729f --- /dev/null +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/DirectoryClassLoader.java @@ -0,0 +1,142 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginGen; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileFilter; +import java.io.FileInputStream; +import java.nio.file.FileVisitor; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.List; + +/** + * Classloader to load from a given directory + * @author Heiko W. Rupp + */ +public class DirectoryClassLoader extends ClassLoader { + private Hashtable classes = new Hashtable(); //used to cache already defined classes + private String baseDir; + + @Override + protected Class<?> findClass(String pathName) throws ClassNotFoundException { + + + if (baseDir==null) { + throw new IllegalStateException("Must set baseDir first"); + } + + byte classByte[]; + Class result = null; + + String className = pathName.substring(baseDir.length()+1); // remove base dir + className = className.substring(0,className.length()-6); // remove .class + className = className.replaceAll(File.separator,"."); // change / -> . + + result = (Class) classes.get(className); //checks in cached classes + if (result != null) { + return result; + } + try { + File classFile = new File(pathName); + FileInputStream fis = new FileInputStream(classFile); + + ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); + int nextValue = fis.read(); + while (-1 != nextValue) { + byteStream.write(nextValue); + nextValue = fis.read(); + } + + classByte = byteStream.toByteArray(); + result = defineClass(className, classByte, 0, classByte.length, null); + classes.put(className, result); + return result; + } catch (Exception e) { + return null; + } + } + + public void setBaseDir(String baseDir) { + this.baseDir = baseDir; + } + + public List<Class> findClasses() { + if (baseDir==null) { + throw new IllegalStateException("Must set baseDir first"); + } + + File baseFile = new File(baseDir); + if(!baseFile.isDirectory()) { + throw new IllegalStateException("BaseDir is no directory"); + } + if (!baseFile.canRead()) { + throw new IllegalStateException("BaseDir is not readable"); + } + + List<File> files = walk(baseFile); + + List<Class> classes = new ArrayList<>(); + for (File file : files) { + String fileName = file.getAbsolutePath(); + + Class clazz = null; + try { + clazz = findClass(fileName); + } catch (ClassNotFoundException e) { + e.printStackTrace(); // TODO: Customise this generated block + } + classes.add(clazz); + + } + + return classes; + } + + private List<File> walk(File path) { + + List<File> files = new ArrayList<>(); + + File[] list = path.listFiles(); + + if (list == null) { + return files; + } + + for ( File f : list ) { + if ( f.isDirectory() ) { + List<File> newFiles = walk( f ); + System.out.println( "Dir:" + f.getAbsoluteFile() ); + files.addAll(newFiles); + } + else { + System.out.println( "File:" + f.getAbsoluteFile() ); + if (f.getName().endsWith(".class") && !f.getName().contains("$")) { + files.add(f); + } + + } + } + return files; + } +} diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java index e7da952..21d0d4d 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java @@ -149,9 +149,12 @@ public class Generator extends Application{ Label label = new Label("Messages:"); msgBox.getChildren().add(label); errorMessage = new Text(); - errorMessage.setFont(Font.font("Arial", FontWeight.SEMI_BOLD, 12)); + errorMessage.setFont(Font.font("Arial", FontWeight.SEMI_BOLD, 15)); errorMessage.setId("errorMessage"); msgBox.getChildren().add(errorMessage); + msgBox.setPadding(new Insets(5)); + msgBox.setSpacing(3); + msgBox.setAlignment(Pos.BASELINE_LEFT); return msgBox; } @@ -172,94 +175,14 @@ public class Generator extends Application{ // Now add the field itself final Class propType = prop.getType(); if (propType.equals(String.class)) { - final Pattern pattern = Pattern.compile(prop.getValidationRegex()); - - final TextField input = new TextField(); - // Add field leave event to fill in the props with the result - input.focusedProperty().addListener(new ChangeListener<Boolean>() { - @Override - public void changed(ObservableValue<? extends Boolean> observableValue, Boolean oldState, - Boolean newState) { - if (newState) { // User entered input field - descriptionField.setText(prop.getDescription()); - } - else { // User left input field - descriptionField.setText(""); - setPropsValue(prop.getVariableName(),input.getText(), propType); // TODO right place? - } - } - }); - // Add validation of the input - input.textProperty().addListener(new ChangeListener<String>() { - @Override - public void changed(ObservableValue<? extends String> observableValue, String s, String newText) { - Matcher m = pattern.matcher(newText); - if (!m.matches()) { - setErrorMessage("Input does not match " + prop.getValidationRegex()); - } else { - clearErrorMessage(); - } - - } - }); - root.add(input, 1, row); + addStringField(root, descriptionField, row, prop); } else if (propType.equals(Boolean.class) || propType.equals(boolean.class)) { - final ChoiceBox choiceBox = new ChoiceBox(); - choiceBox.getItems().addAll("Yes", "No"); - choiceBox.getSelectionModel().selectLast(); // NO is default - choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { - @Override - public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { - setPropsValue(prop.getVariableName(), newValue.equals("Yes"), propType); - } - }); - Tooltip tooltip = new Tooltip(prop.getDescription()); // TODO make this a hover listener - choiceBox.setTooltip(tooltip); - - root.add(choiceBox, 1, row); + addBooleanField(root, row, prop); } else if (propType.equals(ResourceCategory.class)) { - final ChoiceBox choiceBox = new ChoiceBox(); - for (ResourceCategory cat : ResourceCategory.values()) { - choiceBox.getItems().add(cat.getLowerName()); - } - choiceBox.getSelectionModel().selectLast(); // service is default - choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { - @Override - public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { - ResourceCategory newCategory = ResourceCategory.valueOf(newValue.toUpperCase()); - setPropsValue(prop.getVariableName(),newCategory,propType); - } - }); - Tooltip tooltip = new Tooltip(prop.getDescription()); // TODO make this a hover listener - choiceBox.setTooltip(tooltip); - root.add(choiceBox,1,row); + addResourceTypeChooser(root, row, prop); } else if (propType.equals(File.class)) { - // Can not add this directly, so add a button to trigger it - final Text text = new Text(); - text.setText("Pick a directory"); - root.add(text,1,row); - Tooltip tooltip = new Tooltip("Pick the (parent) directory where the plugin will be put in."); - Button pickButton = new Button("Pick"); - pickButton.setTooltip(tooltip); - pickButton.setOnAction(new EventHandler<ActionEvent>() { - @Override - public void handle(ActionEvent actionEvent) { - DirectoryChooser chooser = new DirectoryChooser(); - chooser.setTitle("Pick a directory where the plugin will be put in."); - File dir = chooser.showDialog(primaryStage); - if (dir != null) { - String dirName = dir.getAbsolutePath(); - props.setFileSystemRoot(dirName); - clearErrorMessage(); - text.setText(dirName); - } else { - setErrorMessage("No directory selected"); - text.setText("Pick a directory"); - } - } - }); - - root.add(pickButton,2,row); + addDirectoryChooserField(root, row, prop, descriptionField); + } row++; @@ -269,6 +192,115 @@ public class Generator extends Application{ return row; } + private void addDirectoryChooserField(GridPane root, int row, final Prop prop, final Text descriptionField) { + // Can not add this directly, so add a button to trigger it + final TextField input = new TextField(); + root.add(input,1,row); + Tooltip tooltip = new Tooltip(prop.getDescription()); + Button pickButton = new Button("Pick"); + input.setTooltip(tooltip); + pickButton.setTooltip(tooltip); + pickButton.setOnAction(new EventHandler<ActionEvent>() { + @Override + public void handle(ActionEvent actionEvent) { + DirectoryChooser chooser = new DirectoryChooser(); + chooser.setTitle(prop.getDescription()); + File dir = chooser.showDialog(primaryStage); + if (dir != null) { + String dirName = dir.getAbsolutePath(); + setPropsValue(prop.getVariableName(), dirName, String.class); + clearErrorMessage(); + input.setText(dirName); + } else { + setErrorMessage("No directory selected"); + input.setText("Pick a directory"); + } + } + }); + input.focusedProperty().addListener(new ShowFieldDescriptionHandler(prop,descriptionField,input)); + // Add validation of the input + input.textProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newText) { + File file = new File(newText); + if (!file.isDirectory()) { + setErrorMessage(newText + " is no directory"); + } else if (prop.isDirectoryWriteable() && !file.canWrite()) { + setErrorMessage(newText + " is not writable"); + } else if (!prop.isDirectoryWriteable() && !file.canRead()) { + setErrorMessage(newText + " is not readable"); + } else { + clearErrorMessage(); + } + + } + }); + + + + root.add(pickButton,2,row); + } + + private void addResourceTypeChooser(GridPane root, int row, final Prop prop) { + final ChoiceBox choiceBox = new ChoiceBox(); + for (ResourceCategory cat : ResourceCategory.values()) { + choiceBox.getItems().add(cat.getLowerName()); + } + choiceBox.getSelectionModel().selectLast(); // service is default + choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { + ResourceCategory newCategory = ResourceCategory.valueOf(newValue.toUpperCase()); + setPropsValue(prop.getVariableName(),newCategory,prop.getType()); + } + }); + Tooltip tooltip = new Tooltip(prop.getDescription()); // TODO make this a hover listener + choiceBox.setTooltip(tooltip); + root.add(choiceBox,1,row); + } + + private void addBooleanField(GridPane root, int row, final Prop prop) { + final ChoiceBox choiceBox = new ChoiceBox(); + choiceBox.getItems().addAll("Yes", "No"); + choiceBox.getSelectionModel().selectLast(); // NO is default + choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { + setPropsValue(prop.getVariableName(), newValue.equals("Yes"), prop.getType()); + } + }); + Tooltip tooltip = new Tooltip(prop.getDescription()); // TODO make this a hover listener + choiceBox.setTooltip(tooltip); + + root.add(choiceBox, 1, row); + } + + private void addStringField(GridPane root, final Text descriptionField, int row, final Prop prop) { + final Pattern pattern = Pattern.compile(prop.getValidationRegex()); + + final TextField input = new TextField(); + if (prop.getDefaultValue()!=null && !prop.getDefaultValue().isEmpty()) { + input.setText(prop.getDefaultValue()); + setPropsValue(prop.getVariableName(),prop.getDefaultValue(),prop.getType()); + } + // Add field leave event to fill in the props with the result + input.focusedProperty().addListener(new ShowFieldDescriptionHandler(prop,descriptionField,input)); + // Add validation of the input + input.textProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newText) { + Matcher m = pattern.matcher(newText); + if (!m.matches()) { + setErrorMessage("Input does not match " + prop.getValidationRegex()); + } else { + clearErrorMessage(); + } + + } + }); + root.add(input, 1, row); + } + private void setInfoMessage(String message) { errorMessage.setText(message); errorMessage.setFill(Color.DARKGREEN); @@ -297,4 +329,29 @@ public class Generator extends Application{ } } + + private class ShowFieldDescriptionHandler implements ChangeListener<Boolean> { + + private Prop prop; + private Text descriptionField; + private TextField input; + + private ShowFieldDescriptionHandler(Prop prop,Text descriptionField, TextField input) { + this.prop = prop; + this.descriptionField = descriptionField; + this.input = input; + } + + @Override + public void changed(ObservableValue<? extends Boolean> observableValue, Boolean oldState, + Boolean newState) { + if (newState) { // User entered input field + descriptionField.setText(prop.getDescription()); + } + else { // User left input field + descriptionField.setText(""); + setPropsValue(prop.getVariableName(),input.getText(), String.class); // TODO right place? + } + } + } } diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java index 64b5509..8722446 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java @@ -51,6 +51,19 @@ public class PluginGen { private final Log log = LogFactory.getLog(PluginGen.class); public static void main(String[] arg) throws Exception { + + if (arg.length>0) { + if (arg[0].equals("-ui")) { + Generator.main(arg); + + } + else { + System.out.println("use option -ui to start the UI version"); + } + System.exit(0); + } + + PluginGen pg = new PluginGen(); pg.run(); @@ -121,10 +134,24 @@ public class PluginGen { String pkg = props.getPackagePrefix() + "." + props.getName(); props.setPkg(pkg); + String name = props.getName(); // Type name + + if (props.getComponentClass().contains("{name}")) { + props.setComponentClass(props.getComponentClass().replace("{name}",name)); + } + + if (props.getDiscoveryClass().contains("{name}")) { + props.setDiscoveryClass(props.getDiscoveryClass().replace("{name}",name)); + } + for (Props cProp : props.getChildren()) { cProp.setPkg(pkg); } + if (props.getScanForAnnotations()!=null) { + AnnotationProcessor ap = new AnnotationProcessor(props.getScanForAnnotations()); + ap.populate(props); + } } /** @@ -247,7 +274,7 @@ public class PluginGen { } boolean success; - File activeDirectory = new File(props.getFileSystemRoot(), props.getName()); + File activeDirectory = new File(props.getFileSystemRoot(), props.getPluginName()); if (!activeDirectory.exists()) { success = activeDirectory.mkdir(); @@ -260,7 +287,7 @@ public class PluginGen { // write pom.xml createFile(props, "pom", "pom.xml", activeDirectory.getAbsolutePath()); - // Create java directory hierarchie + // Create java directory hierarchy String path = activeDirectory.getAbsolutePath() + File.separator + "src" + File.separator + "main" + File.separator; diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java index 4ed019a..40e729c 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java @@ -30,48 +30,62 @@ public enum Prop { PLUGIN_NAME("pluginName", String.class,"Name of the plugin", "\\w+" , true ), PLUGIN_DESCRIPTION("pluginDescription", String.class,"Description of the plugin",".*" , true ), PACKAGE("packagePrefix", String.class,"Default Package","[a-zA-Z\\.]+",true ), - FILE_ROOT("fileSystemRoot", File.class,"Root directory to put the plugin",".*",true ), + FILE_ROOT("fileSystemRoot", File.class,"Root directory to put the plugin into",".*",true , true,null), RHQ_VERSION("rhqVersion",String.class,"RHQ version to use","[0-9][0-9\\.]+",true), CATEGORY("category", ResourceCategory.class, "Category of the resource type (platform = host level)",null), TYPE_NAME("name", String.class, "Name of the resource type", "\\w+"), DESCRIPTION("description", String.class, "Description of the type", ".*"), - DISCOVERY_CLASS("discoveryClass", String.class, "Discovery class", "[A-Z][a-zA-Z0-9]*"), - COMPONENT_CLASS("componentClass", String.class, "Discovery class", "[A-Z][a-zA-Z0-9]*"), + DISCOVERY_CLASS("discoveryClass", String.class, "Name of the Discovery class. '{name}' will be replaced with the type name", "[A-Z][a-zA-Z0-9]*",false,false,"{name}Discovery"), + COMPONENT_CLASS("componentClass", String.class, "Name of the Discovery class. '{name}' will be replaced with the type name", "[A-Z][a-zA-Z0-9]*",false,false,"{name}Component"), IS_SINGLETON("singleton",boolean.class,"Is this type a singleton, which means that" + - " there can only be one resource of that type for the given parent?",null), - HAS_METRICS("hasMetrics",boolean.class,"Does this type support taking metrics?",null), - HAS_OPERATIONS("hasOperations",boolean.class,"Does this type support operations?",null), - HAS_EVENTS("events",boolean.class,"Does this type support events?",null), - HAS_SUPPORT_FACET("supportFacet",boolean.class,"Does this type support the support facet?",null), + " there can only be one resource of that type for the given parent?"), + HAS_METRICS("hasMetrics",boolean.class,"Does this type support taking metrics?"), + HAS_OPERATIONS("hasOperations",boolean.class,"Does this type support operations?"), + HAS_EVENTS("events",boolean.class,"Does this type support events?"), + HAS_SUPPORT_FACET("supportFacet",boolean.class,"Does this type support the support facet?"), RESOURCE_CONFIGURATION("resourceConfiguration",boolean.class,"Does this type support " + - "configuring the resource?",".*"), - CAN_CREATE_CHILDREN("createChildren",boolean.class,"Can the type create child resources?",null), - CAN_DELETE_CHILDREN("deleteChildren",boolean.class,"Can the type delete child resources?",null), - - // TODO add the remaining properties from Prop.class - + "configuring the resource?"), + CAN_CREATE_CHILDREN("createChildren",boolean.class,"Can the type create child resources?"), + CAN_DELETE_CHILDREN("deleteChildren",boolean.class,"Can the type delete child resources?"), + USE_EXTENAL_JARS("usesExternalJarsInPlugin",boolean.class,"Will the plugin use external jars in the plugin jar?"), + ALLOW_MANUAL_ADD("manualAddOfResourceType",boolean.class,"Should manually adding resource be supported?"), + USE_LIFECYLE_API("usePluginLifecycleListenerApi",boolean.class,"Should the plugin lifecycle api be supported?"), + DEPENDS_ON_JMX_PLUGIN("dependsOnJmxPlugin",boolean.class,"Does the plugin use JMX and extend the JMX Plugin?"), + DEPENDS_ON_AS7_PLUGIN("dependsOnAs7Plugin",boolean.class,"Does the plugin use DMR and extend the AS7 Plugin?"), + USE_SUPPORT_FACET("supportFacet",boolean.class,"Will the support facet be used?"), + + SCAN_FOR_ANNOTATIONS("scanForAnnotations",File.class,"Directory to scan for plugin annotations to include in type",null, false,false, null) ; private String variableName; private Class type; private String description; private boolean pluginLevel; + private boolean directoryWriteable; + private String defaultValue; private String validationRegex; - private Prop(String variableName, Class type, String description, String validationRegex, boolean pluginLevel) { + private Prop(String variableName, Class type, String description, String validationRegex, boolean pluginLevel, boolean directoryWriteable, String defaultValue) { this.variableName = variableName; this.type = type; this.description = description; this.validationRegex = validationRegex; this.pluginLevel = pluginLevel; + this.directoryWriteable = directoryWriteable; + this.defaultValue = defaultValue; + } + + private Prop(String variableName, Class type, String description, String validationRegex, boolean pluginLevel) { + this(variableName,type,description,validationRegex,pluginLevel,false,null); } private Prop(String variableName, Class type, String description, String validationRegex) { - this.variableName = variableName; - this.type = type; - this.description = description; - this.validationRegex = validationRegex; + this(variableName,type,description,validationRegex,false,false,null); + } + + private Prop(String variableName, Class type, String description) { + this(variableName,type,description,null,false,false,null); } public String getVariableName() { @@ -111,4 +125,11 @@ public enum Prop { return builder.toString(); } + public boolean isDirectoryWriteable() { + return directoryWriteable; + } + + public String getDefaultValue() { + return defaultValue; + } } diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java index 237f5ad..95be574 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java @@ -18,6 +18,9 @@ */ package org.rhq.helpers.pluginGen; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; @@ -26,6 +29,9 @@ import java.util.Set; import org.rhq.helpers.pluginAnnotations.agent.DataType; import org.rhq.helpers.pluginAnnotations.agent.DisplayType; import org.rhq.helpers.pluginAnnotations.agent.Metric; +import org.rhq.helpers.pluginAnnotations.agent.Operation; +import org.rhq.helpers.pluginAnnotations.agent.Parameter; +import org.rhq.helpers.pluginAnnotations.agent.RhqType; import org.rhq.helpers.pluginAnnotations.agent.Units; /** @@ -33,6 +39,7 @@ import org.rhq.helpers.pluginAnnotations.agent.Units; * * @author Heiko W. Rupp */ +@SuppressWarnings("unused") public class Props { /** What category is this ? */ @@ -69,7 +76,7 @@ public class Props { private boolean createChildren; /** Can the service delete children ? */ private boolean deleteChildren; - /** Use externals chars in the plugin jar ? */ + /** Use externals jars in the plugin jar ? */ private boolean usesExternalJarsInPlugin; /** Does it support manual add of children ? */ private boolean manualAddOfResourceType; @@ -77,8 +84,12 @@ public class Props { private boolean usePluginLifecycleListenerApi; /** Depends on JMX plugin ? */ private boolean dependsOnJmxPlugin; + /** Depends on AS7 plugin ? */ + private boolean dependsOnAs7Plugin; + /** Directory with java files to scan for plugin annotations */ + private String scanForAnnotations; /** What version of RHQ should this plugin's pom use ? */ - private String rhqVersion = "3.0.0"; + private String rhqVersion = "4.8.0"; /** Embedded children */ private Set<Props> children = new HashSet<Props>(); @@ -336,22 +347,97 @@ public class Props { this.runsInsides = runsInsides; } + public boolean isDependsOnAs7Plugin() { + return dependsOnAs7Plugin; + } + + public void setDependsOnAs7Plugin(boolean dependsOnAs7Plugin) { + this.dependsOnAs7Plugin = dependsOnAs7Plugin; + } + + public String getScanForAnnotations() { + return scanForAnnotations; + } + + public void setScanForAnnotations(String scanForAnnotations) { + this.scanForAnnotations = scanForAnnotations; + } + public void populateMetrics(List<Class> classes) { - for (Class<?> clazz : classes) { - Metric metricAnnot = clazz.getAnnotation(Metric.class); - if (metricAnnot != null) { - MetricProps metric = new MetricProps(metricAnnot.property()); + for (Class<?> clazz : classes) { + for (Field field : clazz.getDeclaredFields()) { + Metric metricAnnot = field.getAnnotation(Metric.class); + addMetric(metricAnnot, field.getName()); + } + + for (Method method : clazz.getDeclaredMethods()) { + Metric metricAnnot = method.getAnnotation(Metric.class); + addMetric(metricAnnot, method.getName()); + } + } + } + + public void populateOperations(List<Class> classes) { + for (Class<?> clazz : classes) { + for (Method method : clazz.getDeclaredMethods()) { + Operation operationAnnot = method.getAnnotation(Operation.class); + if (operationAnnot != null) { + String property = operationAnnot.name(); + if (property.isEmpty()) { + property = method.getName(); + } + OperationProps op = new OperationProps(property); + op.setDisplayName(operationAnnot.displayName()); + op.setDescription(operationAnnot.description()); + RhqType type = RhqType.findType(method.getReturnType()); + if (type != RhqType.VOID) { + SimpleProperty simpleProperty = new SimpleProperty(type.getRhqName()); + op.setResult(simpleProperty); + } + + Class[] types = method.getParameterTypes(); + int i=0; + for (Annotation[] annotations : method.getParameterAnnotations() ) { + for (Annotation annotation : annotations) { + if (annotation instanceof Parameter) { + Parameter parameter = (Parameter) annotation; + SimpleProperty simpleProperty = new SimpleProperty(parameter.name()); + simpleProperty.setDescription(parameter.description()); + Class typeClass = types[i]; + RhqType rhqType = RhqType.findType(typeClass); + if (parameter.type()!=RhqType.VOID){ + rhqType = parameter.type(); + } + simpleProperty.setType(rhqType.getRhqName()); + op.getParams().add(simpleProperty); + } + } + i++; + } + operations.add(op); + } + + } + } + } + + private void addMetric(Metric metricAnnot, String name) { + if (metricAnnot != null) { + String property = metricAnnot.property(); + if (property.isEmpty()) { + property = name; + } + MetricProps metric = new MetricProps(property); metric.setDisplayName(metricAnnot.displayName()); metric.setDisplayType(metricAnnot.displayType()); metric.setDataType(metricAnnot.dataType()); metric.setDescription(metricAnnot.description()); + metric.setUnits(metricAnnot.units()); metrics.add(metric); - } - - } - } + } + } - @Override + @Override public String toString() { final StringBuilder sb = new StringBuilder(); sb.append("Props"); @@ -387,7 +473,7 @@ public class Props { return sb.toString(); } - public static class TypeKey { + public static class TypeKey { private String name; private String pluginName; diff --git a/modules/helpers/pluginGen/src/main/resources/component.ftl b/modules/helpers/pluginGen/src/main/resources/component.ftl index 1b3dda1..b445008 100644 --- a/modules/helpers/pluginGen/src/main/resources/component.ftl +++ b/modules/helpers/pluginGen/src/main/resources/component.ftl @@ -187,7 +187,6 @@ public class ${props.componentClass} implements ResourceComponent<#if props.pare <#if props.operations??> - public void startOperationFacet(OperationContext context) { } @@ -203,6 +202,13 @@ public class ${props.componentClass} implements ResourceComponent<#if props.pare public OperationResult invokeOperation(String name, Configuration params) throws Exception { OperationResult res = new OperationResult(); +<#if props.operations?has_content> + <#list props.operations as operation> + if (name.equals("${operation.name}") { + // TODO implement me + } + </#list> +<#else> if ("dummyOperation".equals(name)) { // TODO implement me @@ -210,6 +216,7 @@ public class ${props.componentClass} implements ResourceComponent<#if props.pare return res; } </#if> +</#if> <#if props.resourceConfiguration> diff --git a/modules/helpers/pluginGen/src/main/resources/descriptor.ftl b/modules/helpers/pluginGen/src/main/resources/descriptor.ftl index 85195e8..1fe2a6b 100644 --- a/modules/helpers/pluginGen/src/main/resources/descriptor.ftl +++ b/modules/helpers/pluginGen/src/main/resources/descriptor.ftl @@ -1,7 +1,7 @@ <#-- /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -38,6 +38,9 @@ <#if props.dependsOnJmxPlugin> <depends plugin="JMX" useClasses="true"/> </#if> +<#if props.dependsOnAs7Plugin> + <depends plugin="JBossAS7" useClasses="true"/> +</#if> <${props.category.lowerName} <#include "descriptorMain.ftl"/> diff --git a/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl b/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl index b650f7a..5579806 100644 --- a/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl +++ b/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl @@ -1,7 +1,7 @@ <#-- /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -39,6 +39,11 @@ name="${props.name}" </#list> </runs-inside> </#if> + <#if props.dependsOnAs7Plugin> + <runs-inside>  + <parent-resource-type name="JBossAS7 Standalone Server" plugin="JBossAS7"/> + </runs-inside> + </#if> <#if props.simpleProps?has_content> <plugin-configuration> @@ -57,14 +62,14 @@ name="${props.name}" </plugin-configuration> </#if> - <#if props.hasOperations> + <#if props.hasOperations || props.operations?has_content> <#if props.operations?has_content> <#list props.operations as operation> - <operation name="${operation.name}" displayName="${operation.displayName}" description="${operation.description}"> + <operation name="${operation.name}" <#if operation.displayName?has_content>displayName="${operation.displayName}"</#if> description="${operation.description}"> <#if operation.params?has_content> <parameters> <#list operation.params as param> - <c:simple-property name="${param.name}" <#if param.description??>description="${param.description}"</#if>/> + <c:simple-property name="${param.name}" <#if param.description??>description="${param.description}"</#if> type="${param.type}"/> </#list> </parameters> </#if> @@ -82,10 +87,10 @@ name="${props.name}" </#if> </#if> - <#if props.hasMetrics> + <#if props.hasMetrics || props.metrics?has_content> <#if props.metrics?has_content> <#list props.metrics as metric> - <metric property="${metric.property}" displayName="${metric.displayName}" displayType="${metric.displayType}" units="${metric.units}" dataType="${metric.dataType}" + <metric property="${metric.property}" <#if metric.displayName?has_content>displayName="${metric.displayName}"</#if> displayType="${metric.displayType}" units="${metric.units}" dataType="${metric.dataType}" description="${metric.description}" /> </#list> <#else> diff --git a/modules/helpers/pluginGen/src/main/resources/pom.ftl b/modules/helpers/pluginGen/src/main/resources/pom.ftl index 01daca1..7c799b8 100644 --- a/modules/helpers/pluginGen/src/main/resources/pom.ftl +++ b/modules/helpers/pluginGen/src/main/resources/pom.ftl @@ -2,7 +2,7 @@ <#-- /* * RHQ Management Platform - * Copyright (C) 2005-20012 Red Hat, Inc. + * Copyright (C) 2005-20013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -35,10 +35,10 @@ </parent> <groupId>org.rhq</groupId> - <artifactId>${props.name}-plugin</artifactId> + <artifactId>${props.pluginName}-plugin</artifactId> <packaging>jar</packaging> - <name>RHQ ${props.name} Plugin</name> + <name>RHQ ${props.pluginName} Plugin</name> <#if props.description??> <description>${props.description}</description> </#if> @@ -86,7 +86,6 @@ </executions> </plugin> </#if> - </plugins> </build> @@ -232,6 +231,14 @@ <scope>provided</scope> </dependency> </#if> +<#if props.dependsOnAs7Plugin> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-jboss-as-7-plugin</artifactId> + <version>${r"${project.version}"}</version> + <scope>provided</scope> + </dependency> +</#if>  diff --git a/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java b/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java new file mode 100644 index 0000000..fbc571b --- /dev/null +++ b/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java @@ -0,0 +1,55 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginGen.test; + +import org.rhq.helpers.pluginAnnotations.agent.DataType; +import org.rhq.helpers.pluginAnnotations.agent.DisplayType; +import org.rhq.helpers.pluginAnnotations.agent.MeasurementType; +import org.rhq.helpers.pluginAnnotations.agent.Metric; +import org.rhq.helpers.pluginAnnotations.agent.Operation; +import org.rhq.helpers.pluginAnnotations.agent.Parameter; +import org.rhq.helpers.pluginAnnotations.agent.RhqType; + +/** + * Just a sample + * @author Heiko W. Rupp + */ + +public class FooBean { + + @Metric(description = "How often was this bean invoked", displayType = DisplayType.SUMMARY, measurementType = MeasurementType.DYNAMIC) + int invocationCount; + + @Metric(description = "Just a foo", dataType = DataType.TRAIT) + String lastCommand; + + @Operation(description = "Increase the invocation count") + public int increaseCounter() { + invocationCount++; + return invocationCount; + } + + @Operation(description = "Decrease the counter") + public void decreaseCounter(@Parameter(description = "How much to decrease?", name = "by") int by) { + invocationCount -= by; + } + + +} commit 2ee2ef305dd71c1f2869a5a8c4e8ebe9f9bae243 Author: Michael Burman <yak(a)iki.fi> Date: Tue Jul 16 15:58:05 2013 -0400 committing windows version of RHQ 4.8 storage patch script diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat new file mode 100644 index 0000000..e0312dc --- /dev/null +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat @@ -0,0 +1,64 @@ +@echo off +setlocal + +if /i "%4" == "" ( + echo Usage: rhq48-storage-patch.bat ^<rhq-server-dir^> ^<storage-ip-address^> ^<cql-port^> ^<jmx-port^> + exit /B 1 +) + +set RHQ_SERVER_DIR=%1 +set CQL_HOSTNAME=%2 +set CQL_PORT=%3 +set JMX_PORT=%4 +set USERNAME="rhqadmin" +set PASSWORD="rhqadmin" + +set PATCH="apache-cassandra-1.2.4-patch-1.jar" + +rem swap out the Cassandra jar file with the patched version +echo Copying patch file to %RHQ_SERVER_DIR%\rhq-storage\lib +move %RHQ_SERVER_DIR%\rhq-storage\lib\apache-cassandra-1.2.4.jar . +copy %PATCH% %RHQ_SERVER_DIR%\rhq-storage\lib + +rem restart the storage node +echo Starting RHQ Storage node +call %RHQ_SERVER_DIR%\bin\rhqctl.bat start --storage + +rem sleep for a few seconds while Cassandra starts up +echo Waiting for RHQ Storage Node to start up.. +rem Sleep is not implemented in all Windows prompts, this one won't work in Vista +choice /n /c y /d y /t 3 + +set RHQ_STORAGE_BIN=%RHQ_SERVER_DIR%\rhq-storage\bin\ +set CQLSH_PATH=%RHQ_STORAGE_BIN%\cqlsh +set NODETOOL_PATH=%RHQ_STORAGE_BIN%\nodetool.bat + +rem run the CQL script +echo Running CQL script to disable table compression +python %CQLSH_PATH% -u %USERNAME% -p %PASSWORD% -f ./disable_compression.cql + +rem rewrite all sstables +echo Rebuilding data files for system keyspace +call %NODETOOL_PATH% -u rhqadmin -pw rhqadmin -p %JMX_PORT% upgradesstables --include-all-sstables system + +echo Rebuilding data files for system_traces keyspace +call %NODETOOL_PATH% -u rhqadmin -pw rhqadmin -p %JMX_PORT% upgradesstables --include-all-sstables system_traces + +echo Rebuilding data files for system_auth keyspace +call %NODETOOL_PATH% -u rhqadmin -pw rhqadmin -p %JMX_PORT% upgradesstables --include-all-sstables system_auth + +echo Rebuilding data files for rhq keyspace +call %NODETOOL_PATH% -u rhqadmin -pw rhqadmin -p %JMX_PORT% upgradesstables --include-all-sstables rhq + +rem flush memtables and commit log to ensure no data loss prior to upgrade +call %NODETOOL_PATH% -u rhqadmin -pw rhqadmin -p %JMX_PORT% drain + +echo Shutting down the RHQ Storage node +call %RHQ_SERVER_DIR%\bin\rhqctl.bat stop --storage + +echo Removing patch file +del %RHQ_SERVER_DIR%\rhq-storage\lib\%PATCH% +move apache-cassandra-1.2.4.jar %RHQ_SERVER_DIR%\rhq-storage\lib + +echo Table compression has been disabled for all keyspaces. You are now ready to upgrade your RHQ installation. +endlocal commit 9983f60ec49f72b5bb0afcfb452afde616c622a6 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Tue Jul 16 17:51:59 2013 +0200 Fix InterruptibleOperationsTest. Mock resource context needs a ComponentInvocationContext instance. diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java index 192117c..b0acf4d 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java @@ -47,6 +47,7 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.rhq.core.pluginapi.component.ComponentInvocationContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -95,6 +96,7 @@ public class InterruptibleOperationsTest { int httpPort = setupJettyServer(); setupResourceContext(httpPort); executorService = Executors.newSingleThreadExecutor(); + when(resourceContext.getComponentInvocationContext()).thenReturn(new MockComponentInvocationContext()); serverComponent.start(resourceContext); } @@ -160,6 +162,17 @@ public class InterruptibleOperationsTest { assertEquals(operationResult.getSimpleResult(), "Success"); } + private static class MockComponentInvocationContext implements ComponentInvocationContext { + @Override + public boolean isInterrupted() { + return false; + } + + @Override + public void markInterrupted() { + } + } + private class RestartJetty implements Runnable { @Override public void run() { commit fb809005b42f358d3a2090993431769649ade732 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Tue Jul 16 15:54:07 2013 +0200 Updating the list of the devs in the IRC bot diff --git a/etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java b/etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java index dd22dbf..cc10d2d 100644 --- a/etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java +++ b/etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java @@ -77,8 +77,7 @@ public class RhqIrcBotListener extends ListenerAdapter<RhqIrcBot> { private static final Set<String> JON_DEVS = new HashSet<String>(); static { - JON_DEVS.add("ccrouch"); - JON_DEVS.add("ips"); + JON_DEVS.add("theute"); JON_DEVS.add("jkremser"); JON_DEVS.add("jsanda"); JON_DEVS.add("jshaughn"); @@ -377,4 +376,4 @@ public class RhqIrcBotListener extends ListenerAdapter<RhqIrcBot> { this.docspacePassword = docspacePassword; } -} \ No newline at end of file +} commit 98258686d712608aef7a21108f6a5505ffb820b7 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Jul 16 08:16:57 2013 -0500 Add justification for the api changes to the Storage Node Manager bean. diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml new file mode 100644 index 0000000..a9ce322 --- /dev/null +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<differences> + + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findNotAcknowledgedStorageNodeAlerts(org.rhq.core.domain.auth.Subject)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findAllStorageNodeAlerts(org.rhq.core.domain.auth.Subject)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + +</differences> commit 6ad3c87c08631a00cb960a4ffa4c4929329aa6d8 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Tue Jul 16 13:42:50 2013 +0200 Bug 982804 - AS7 reload behavior includes hardcoded timeout of 20 seconds diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java index 8c708db..41a1c41 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java @@ -173,6 +173,8 @@ public class ResourceContext<T extends ResourceComponent<?>> { * @param availabilityContext a {@link AvailabilityContext} the plugin can use to interoperate with the * plugin container inventory manager * @param pluginContainerDeployment indicates where the plugin container is running + * @param componentInvocationContext a {@link ComponentInvocationContext} the plugin can use to determine if the + * current component invocation has been canceled or timed out. */ public ResourceContext(Resource resource, T parentResourceComponent, ResourceContext<?> parentResourceContext, ResourceDiscoveryComponent<T> resourceDiscoveryComponent, SystemInfo systemInfo, File temporaryDirectory, diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java index 4cb2cff..a9fe1c2 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java @@ -609,6 +609,8 @@ public class ResourceContainer implements Serializable { } private static class ComponentInvocation implements Callable { + private static final Log LOG = LogFactory.getLog(ComponentInvocation.class); + private final ResourceContainer resourceContainer; private final Method method; private final Object[] args; @@ -669,6 +671,8 @@ public class ResourceContainer implements Serializable { public void markContextInterrupted() { localContext.markInterrupted(); + LOG.warn("Invocation has been marked interrupted for method [" + method + "] on resource [" + + resourceContainer.getResource() + "]"); } } } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java index d399d1b..ccb8ce0 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java @@ -18,6 +18,8 @@ */ package org.rhq.modules.plugins.jbossas7; +import static java.util.concurrent.TimeUnit.SECONDS; + import java.io.File; import java.util.HashSet; import java.util.Map; @@ -184,39 +186,28 @@ public class StandaloneASComponent<T extends ResourceComponent<?>> extends BaseS return operationResult; } - private boolean waitUntilReloaded() { + private boolean waitUntilReloaded() throws InterruptedException { boolean reloaded = false; - int count = 0; - while (!reloaded) { Operation op = new ReadAttribute(new Address(), "release-version"); - try{ + try { Result res = getASConnection().execute(op); if (res.isSuccess() && !res.isReloadRequired()) { reloaded = true; - } else if (count > 20) { - break; } } catch (Exception e) { //do absolutely nothing //if an exception is thrown that means the server is still reloading, so consider this //a single failed attempt, equivalent to res.isSuccess == false } - if (!reloaded) { - try { - Thread.sleep(1000); // Wait 1s - } catch (InterruptedException e) { - // ignore + if (context.getComponentInvocationContext().isInterrupted()) { + // Operation canceled or timed out + throw new InterruptedException(); } + Thread.sleep(SECONDS.toMillis(1)); } - count++; } - - if (log.isDebugEnabled()) { - log.debug("waitUntilReloaded: Used " + count + " delay round(s) to reload. Reload=" + reloaded); - } - return reloaded; } commit 56f845bec82369f3032b565a8caeed751d1a4093 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Jul 16 10:13:13 2013 +0200 Fix test fallout that got introduced by my changes. diff --git a/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java b/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java index 97b9a05..ecc995d 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java +++ b/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java @@ -116,11 +116,11 @@ public class SnmpInfoTest { // String representation is constrained (even not strongly). Configuration configuration = new Configuration(); assertEquals(SnmpInfo.load(configuration).toString(), "UnknownHost:" + DEFAULT_PORT - + " (UnknownOID) (DefaultTrapOID)"); + + " (Unknown Binding Prefix) (DefaultTrapOID)"); configuration.setSimpleValue(PARAM_HOST, "pipo"); - assertEquals(SnmpInfo.load(configuration).toString(), "pipo:" + DEFAULT_PORT + " (UnknownOID) (DefaultTrapOID)"); + assertEquals(SnmpInfo.load(configuration).toString(), "pipo:" + DEFAULT_PORT + " (Unknown Binding Prefix) (DefaultTrapOID)"); configuration.setSimpleValue(PARAM_PORT, "35162"); - assertEquals(SnmpInfo.load(configuration).toString(), "pipo:35162 (UnknownOID) (DefaultTrapOID)"); + assertEquals(SnmpInfo.load(configuration).toString(), "pipo:35162 (Unknown Binding Prefix) (DefaultTrapOID)"); configuration.setSimpleValue(PARAM_VARIABLE_BINDING_PREFIX, "molo"); assertEquals(SnmpInfo.load(configuration).toString(), "pipo:35162 (molo) (DefaultTrapOID)"); configuration.setSimpleValue(PARAM_TRAP_OID, "logo"); diff --git a/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSenderTest.java b/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSenderTest.java index 38b36d7..9583a07 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSenderTest.java +++ b/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSenderTest.java @@ -95,6 +95,7 @@ public class SnmpSenderTest { private AlertManagerLocal alertManager; private TestSnmpSender snmpSender; + private Configuration pluginConfiguration; @BeforeMethod public void setUp() throws Exception { @@ -114,7 +115,7 @@ public class SnmpSenderTest { MockitoAnnotations.initMocks(this); - Configuration pluginConfiguration = new Configuration(); + pluginConfiguration = new Configuration(); pluginConfiguration.setSimpleValue("snmpVersion", "2c"); pluginConfiguration.setSimpleValue("trapOid", TEST_TRAP_OID_PLUGIN_CONFIG); pluginConfiguration.setSimpleValue("community", "public"); @@ -153,7 +154,7 @@ public class SnmpSenderTest { assertNotNull(result); assertEquals(result.getState(), FAILURE); assertEquals(result.getFailureMessages().size(), 1); - String expectedError = SnmpInfo.load(alertParameters).error; + String expectedError = SnmpInfo.load(alertParameters,pluginConfiguration).error; assertNotNull(expectedError); assertEquals(result.getFailureMessages().get(0), expectedError); } commit 609c93f0d219afd19db976d55c565c95bb96d1ab Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 15 11:03:05 2013 +0200 Display tool tips, for pick button and choice boxes diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java index 06f3fec..e7da952 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java @@ -210,11 +210,13 @@ public class Generator extends Application{ choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { @Override public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { - setPropsValue(prop.getVariableName(),newValue.equals("Yes"),propType); + setPropsValue(prop.getVariableName(), newValue.equals("Yes"), propType); } }); + Tooltip tooltip = new Tooltip(prop.getDescription()); // TODO make this a hover listener + choiceBox.setTooltip(tooltip); - root.add(choiceBox,1,row); + root.add(choiceBox, 1, row); } else if (propType.equals(ResourceCategory.class)) { final ChoiceBox choiceBox = new ChoiceBox(); for (ResourceCategory cat : ResourceCategory.values()) { @@ -228,14 +230,17 @@ public class Generator extends Application{ setPropsValue(prop.getVariableName(),newCategory,propType); } }); - + Tooltip tooltip = new Tooltip(prop.getDescription()); // TODO make this a hover listener + choiceBox.setTooltip(tooltip); root.add(choiceBox,1,row); } else if (propType.equals(File.class)) { // Can not add this directly, so add a button to trigger it final Text text = new Text(); text.setText("Pick a directory"); root.add(text,1,row); + Tooltip tooltip = new Tooltip("Pick the (parent) directory where the plugin will be put in."); Button pickButton = new Button("Pick"); + pickButton.setTooltip(tooltip); pickButton.setOnAction(new EventHandler<ActionEvent>() { @Override public void handle(ActionEvent actionEvent) { diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java index 73c4cd9..4ed019a 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java @@ -38,7 +38,7 @@ public enum Prop { DESCRIPTION("description", String.class, "Description of the type", ".*"), DISCOVERY_CLASS("discoveryClass", String.class, "Discovery class", "[A-Z][a-zA-Z0-9]*"), COMPONENT_CLASS("componentClass", String.class, "Discovery class", "[A-Z][a-zA-Z0-9]*"), - IS_SINGLETON("singleton",Boolean.class,"Is this type a singleton, which means that" + + IS_SINGLETON("singleton",boolean.class,"Is this type a singleton, which means that" + " there can only be one resource of that type for the given parent?",null), HAS_METRICS("hasMetrics",boolean.class,"Does this type support taking metrics?",null), HAS_OPERATIONS("hasOperations",boolean.class,"Does this type support operations?",null), commit f24eb1cfcb98ce8c1c4a9edb00453aef60c7e7dd Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 15 22:06:57 2013 -0400 copy cassandra-jvm.properties on upgrade. we're no longer using cassandra-env.sh. diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 9a6a1c0..2fec2dc 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -25,10 +25,8 @@ package org.rhq.storage.installer; -import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileReader; import java.io.IOException; import java.net.InetAddress; import java.util.ArrayList; @@ -37,6 +35,7 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Properties; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -65,6 +64,7 @@ import org.rhq.cassandra.DeploymentOptions; import org.rhq.cassandra.DeploymentOptionsFactory; import org.rhq.cassandra.installer.RMIContextFactory; import org.rhq.core.util.PropertiesFileUpdate; +import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.core.util.file.FileUtil; @@ -244,24 +244,19 @@ public class StorageInstaller { deployer.updateFilePerms(); // For upgrades we will copy the existing cassandra.yaml, - // log4j-server.properties, and cassandra-env.sh file from the existing + // log4j-server.properties, and cassandra-jvm.properties from the existing // storage node installation. Going forward though we need to add support - // for merging in the existing cassandra.yaml with the new one. We also - // need to do something about cassandra-env.sh. There is no easy to parse - // it and merge in changes which is problematic since that is where heap - // settings and JMX port and other JMV options are specified. Maybe we can - // replace it with a cassandra-in.sh that is essentially a properties file - // which we can easily parse and update. + // for merging in the existing cassandra.yaml with the new one. File oldConfDir = new File(existingStorageDir, "conf"); File newConfDir = new File(storageBasedir, "conf"); String cassandraYaml = "cassandra.yaml"; - String cassandraEnv = "cassandra-env.sh"; - File cassandraEnvFile = new File(newConfDir, cassandraEnv); + String cassandraJvmProps = "cassandra-jvm.properties"; + File cassandraJvmPropsFile = new File(newConfDir, cassandraJvmProps); String log4j = "log4j-server.properties"; replaceFile(new File(oldConfDir, cassandraYaml), new File(newConfDir, cassandraYaml)); - replaceFile(new File(oldConfDir, cassandraEnv), cassandraEnvFile); + replaceFile(new File(oldConfDir, cassandraJvmProps), cassandraJvmPropsFile); replaceFile(new File(oldConfDir, log4j), new File(newConfDir, log4j)); log.info("Finished installing RHQ Storage Node."); @@ -274,7 +269,7 @@ public class StorageInstaller { hostname = (String) config.get("listen_address"); - jmxPort = parseJmxPort(cassandraEnvFile); + jmxPort = parseJmxPort(cassandraJvmPropsFile); } else { if (cmdLine.hasOption("dir")) { File basedir = new File(cmdLine.getOptionValue("dir")); @@ -666,56 +661,26 @@ public class StorageInstaller { } } - private int parseJmxPort(File cassandraEnvFile) { + private int parseJmxPort(File cassandraJvmOptsFile) { Integer port = null; if (isWindows()) { // TODO return defaultJmxPort; } else { - BufferedReader reader = null; try { - reader = new BufferedReader(new FileReader(cassandraEnvFile)); - String line = reader.readLine(); - - while (line != null) { - if (line.startsWith("JMX_PORT")) { - int startIndex = line.indexOf("JMX_PORT=\"") + 1; - int endIndex = line.lastIndexOf("\""); - - if (startIndex == -1 || endIndex == -1) { - log.error("Failed to parse the JMX port. Make sure that you have the JMX port defined on its " - + "own line as follows, JMX_PORT=\"<jmx-port>\""); - throw new RuntimeException("Cannot determine JMX port"); - } - try { - port = Integer.parseInt(line.substring(startIndex, endIndex)); - } catch (NumberFormatException e) { - log.error("The JMX port must be an integer. [" + port + "] is an invalid value"); - throw new RuntimeException("The JMX port has an invalid value"); - } - return port; - } - line = reader.readLine(); + Properties properties = new Properties(); + properties.load(new FileInputStream(cassandraJvmOptsFile)); + + String jmxPort = properties.getProperty("jmx_port"); + if (StringUtil.isEmpty(jmxPort)) { + log.error("The property [jmx_port] is undefined."); + throw new RuntimeException("Cannot determine JMX port"); } - log.error("Failed to parse the JMX port. Make sure that you have the JMX port defined on its " - + "own line as follows, JMX_PORT=\"<jmx-port>\""); - throw new RuntimeException("Cannot determine JMX port"); + + return Integer.parseInt(jmxPort); } catch (IOException e) { log.error("Failed to parse JMX port. There was an unexpected IO error", e); throw new RuntimeException("Failed to parse JMX port due to IO error: " + e.getMessage()); - } finally { - try { - if (reader != null) { - reader.close(); - } - } catch (IOException e) { - if (log.isDebugEnabled()) { - log.debug("An error occurred closing the " + BufferedReader.class.getName() + " used to " - + "parse the JMX port", e); - } else { - log.warn("There was error closing the reader used to parse the JMX port: " + e.getMessage()); - } - } } } } commit 27138835d3ac9fb10fe18519fbe441fc1979387e Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 15 21:47:34 2013 -0400 fixing bug in script diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh index 7c0b88a..33984d1 100755 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh @@ -19,6 +19,9 @@ CQL_HOSTNAME=$2 CQL_PORT=$3 JMX_PORT=$4 +export CQLSH_HOST=$2 +export CQL_PORT=$3 + PATCH="apache-cassandra-1.2.4-patch-1.jar" # swap out the Cassandra jar file with the patched version @@ -36,8 +39,6 @@ sleep 3 # run the CQL script echo "Running CQL script to disable table compression" -export CQLSH_HOST=$CQLSH_HOST -export CQL_PORT=$CQL_PORT $RHQ_SERVER_DIR/rhq-storage/bin/cqlsh -u rhqadmin -p rhqadmin -f ./disable_compression.cql # rewrite all sstables commit 34514a874e079e19736bbc0fd71db099a1b9b25a Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 15 16:23:06 2013 -0400 make parsing of heap options more robust diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index a0220ba..8d1771d 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -32,18 +32,13 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { Configuration config = new Configuration(); - String heapMinProp = properties.getProperty("heap_min"); - String heapMaxProp = properties.getProperty("heap_max"); - String heapNewProp = properties.getProperty("heap_new"); - String threadStackSizeProp = properties.getProperty("thread_stack_size"); String heapDumpOnOOMError = properties.getProperty("heap_dump_on_OOMError"); String heapDumpDir = properties.getProperty("heap_dump_dir"); - config.put(new PropertySimple("minHeapSize", heapMinProp.substring(4))); - config.put(new PropertySimple("maxHeapSize", heapMaxProp.substring(4))); - config.put(new PropertySimple("heapNewSize", heapNewProp.substring(4))); - config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4, - threadStackSizeProp.length() - 1))); + config.put(new PropertySimple("minHeapSize", getHeapMinProp(properties))); + config.put(new PropertySimple("maxHeapSize", getHeapMaxProp(properties))); + config.put(new PropertySimple("heapNewSize", getHeapNewProp(properties))); + config.put(new PropertySimple("threadStackSize", getStackSizeProp(properties))); if (!StringUtil.isEmpty(heapDumpOnOOMError)) { config.put(new PropertySimple("heapDumpOnOOMError", true)); @@ -61,6 +56,62 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { return config; } + private String getHeapMinProp(Properties properties) { + String value = properties.getProperty("heap_min"); + + if (StringUtil.isEmpty(value)) { + return ""; + } + + if (!value.startsWith("-Xms")) { + return value; + } + + return value.substring(4); + } + + private String getHeapMaxProp(Properties properties) { + String value = properties.getProperty("heap_max"); + + if (StringUtil.isEmpty(value)) { + return ""; + } + + if (!value.startsWith("-Xmx")) { + return value; + } + + return value.substring(4); + } + + private String getHeapNewProp(Properties properties) { + String value = properties.getProperty("heap_new"); + + if (StringUtil.isEmpty(value)) { + return ""; + } + + if (!value.startsWith("-Xmn")) { + return value; + } + + return value.substring(4); + } + + private String getStackSizeProp(Properties properties) { + String value = properties.getProperty("thread_stack_size"); + + if (StringUtil.isEmpty(value)) { + return ""; + } + + if (!(value.startsWith("-Xss") || value.endsWith("k") || value.length() > 5)) { + return value; + } + + return value.substring(4, value.length() - 1); + } + @Override public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { try { commit 632eb18cc8984f12c794678c6d13a455048a2096 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 15 15:35:48 2013 -0400 adding validation checks for heap and thread args diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index c87d2ac..a0220ba 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -42,7 +42,8 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { config.put(new PropertySimple("minHeapSize", heapMinProp.substring(4))); config.put(new PropertySimple("maxHeapSize", heapMaxProp.substring(4))); config.put(new PropertySimple("heapNewSize", heapNewProp.substring(4))); - config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4))); + config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4, + threadStackSizeProp.length() - 1))); if (!StringUtil.isEmpty(heapDumpOnOOMError)) { config.put(new PropertySimple("heapDumpOnOOMError", true)); @@ -70,6 +71,7 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { String maxHeapSize = config.getSimpleValue("maxHeapSize"); if (!StringUtil.isEmpty(maxHeapSize)) { + validateHeapArg("maxHeapSize", maxHeapSize); // We want min and max heap to be the same properties.setProperty("heap_min", "-Xms" + maxHeapSize); properties.setProperty("heap_max", "-Xmx" + maxHeapSize); @@ -77,12 +79,14 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { String heapNewSize = config.getSimpleValue("heapNewSize"); if (!StringUtil.isEmpty(heapNewSize)) { + validateHeapArg("heapNewSize", heapNewSize); properties.setProperty("heap_new", "-Xmn" + heapNewSize); } String threadStackSize = config.getSimpleValue("threadStackSize"); if (!StringUtil.isEmpty(threadStackSize)) { - properties.setProperty("thread_stack_size", "-Xss" + threadStackSize); + validateStackArg(threadStackSize); + properties.setProperty("thread_stack_size", "-Xss" + threadStackSize + "k"); } PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); @@ -102,9 +106,36 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { propertiesUpdater.update(properties); configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); + } catch (IllegalArgumentException e) { + configurationUpdateReport.setErrorMessage("No configuration update was applied: " + e.getMessage()); } catch (IOException e) { configurationUpdateReport.setErrorMessageFromThrowable(e); } + } + + private void validateHeapArg(String name, String value) { + if (value.length() < 2) { + throw new IllegalArgumentException(value + " is not a legal value for the property [" + name + "]"); + } + + char[] chars = value.toCharArray(); + for (int i = 0; i < chars.length - 1; ++i) { + if (!Character.isDigit(chars[i])) { + throw new IllegalArgumentException(value + " is not a legal value for the property [" + name + "]"); + } + } + char lastChar = Character.toUpperCase(chars[chars.length - 1]); + if (!(lastChar == 'M' || lastChar == 'G')) { + throw new IllegalArgumentException(value + " is not a legal value for the property [" + name + "]"); + } + } + + private void validateStackArg(String value) { + try { + Integer.parseInt(value); + } catch (NumberFormatException e) { + throw new IllegalArgumentException(value + " is not a legal value for the property [threadStackSize]"); + } } } diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index c700257..5a60d19 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -118,12 +118,24 @@ description="The minimum heap size. This value will be used with the -Xms JVM option. This is read only because it is automatically set to the same value as Max Heap Size."/> <c:simple-property name="maxHeapSize" - description="The maximum heap size. This value will be used with the -Xmx JVM option."/> + description="The maximum heap size. This value will be used with the -Xmx JVM option. The + value should be an integer with a suffix of M or G to indicate megabytes or gigabytes."> + <c:constraint> + <c:regex-constraint expression="\d+[mMgG]"/> + </c:constraint> + </c:simple-property> <c:simple-property name="heapNewSize" description="The size of the new generation portion of the heap. This value will be used with - the -Xmn JVM option."/> + the -Xmn JVM option. The value should be an integer with a suffix of M or G to indicate + megabytes or gigabytes."> + <c:constraint> + <c:regex-constraint expression="\d+[mMgG]"/> + </c:constraint> + </c:simple-property> <c:simple-property name="threadStackSize" - description="The thread stack size. This memory is allocated to each thread off heap."/> + type="integer" + description="The thread stack size. This memory is allocated to each thread off heap. The + value should be an integer that will be interpreted in kilobytes."/> <c:simple-property name="heapDumpOnOOMError" displayName="Heap Dump on OutOfMemoryError" type="boolean" default="true" description="Generate a heap dump when an OutOfMemoryError occurs"/> diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java index ee34f43..64d14b2 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java @@ -13,8 +13,10 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.util.file.FileUtil; /** * @author John Sanda @@ -29,6 +31,7 @@ public class StorageNodeConfigDelegateTest { public void initDirs(Method test) throws Exception { File dir = new File(getClass().getResource(".").toURI()); basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); + FileUtil.purge(basedir, true); configDelegate = new StorageNodeConfigDelegate(basedir); } @@ -42,7 +45,7 @@ public class StorageNodeConfigDelegateTest { assertEquals(config.getSimpleValue("minHeapSize"), "512M", "Failed to load property [minHeapSize]"); assertEquals(config.getSimpleValue("maxHeapSize"), "512M", "Failed to load property [maxHepSize]"); assertEquals(config.getSimpleValue("heapNewSize"), "128M", "Failed to load property [heapNewSize]"); - assertEquals(config.getSimpleValue("threadStackSize"), "180k", "Failed to load property [threadStackSize]"); + assertEquals(config.getSimpleValue("threadStackSize"), "180", "Failed to load property [threadStackSize]"); assertEquals(config.getSimple("heapDumpOnOOMError").getBooleanValue(), (Boolean) true, "Failed to load property [heapDumpOnOOMError]"); assertEquals(new File(config.getSimpleValue("heapDumpDir")), binDir(), "Failed to load property [heapDumpDir]"); @@ -56,7 +59,7 @@ public class StorageNodeConfigDelegateTest { config.put(new PropertySimple("minHeapSize", "1024M")); config.put(new PropertySimple("maxHeapSize", "1024M")); config.put(new PropertySimple("heapNewSize", "256M")); - config.put(new PropertySimple("threadStackSize", "240k")); + config.put(new PropertySimple("threadStackSize", "240")); config.put(new PropertySimple("heapDumpOnOOMError", true)); config.put(new PropertySimple("heapDumpDir", confDir())); @@ -96,6 +99,60 @@ public class StorageNodeConfigDelegateTest { "should be the same as [maxHeapSize]."); } + @Test + public void disableHeapDumps() throws Exception { + createDefaultConfig(); + + ConfigurationUpdateReport report = new ConfigurationUpdateReport(Configuration.builder() + .addSimple("heapDumpOnOOMError", false).build()); + + configDelegate.updateResourceConfiguration(report); + + Properties properties = loadCassandraJvmProps(); + + assertEquals(properties.getProperty("heap_dump_on_OOMError"), "", "Failed to disable property " + + "[heapDumpOnOOMError]"); + } + + @Test + public void updateShouldFailWhenMaxHeapSizeIsInvalid() throws Exception { + createDefaultConfig(); + + ConfigurationUpdateReport report = new ConfigurationUpdateReport(Configuration.builder() + .addSimple("maxHeapSize", "256GB").build()); + + configDelegate.updateResourceConfiguration(report); + + assertEquals(report.getStatus(), ConfigurationUpdateStatus.FAILURE, "The configuration update should fail " + + "when [maxHeapSize] has an invalid value."); + } + + @Test + public void updateShouldFailWhenHeapNewSizeIsInvalid() throws Exception { + createDefaultConfig(); + + ConfigurationUpdateReport report = new ConfigurationUpdateReport(Configuration.builder() + .addSimple("heapNewSize", "25^G").build()); + + configDelegate.updateResourceConfiguration(report); + + assertEquals(report.getStatus(), ConfigurationUpdateStatus.FAILURE, "The configuration update should fail " + + "when [heapNewSize] has an invalid value."); + } + + @Test + public void updateShouldFailWhenThreadStackSizeIsInvalid() throws Exception { + createDefaultConfig(); + + ConfigurationUpdateReport report = new ConfigurationUpdateReport(Configuration.builder() + .addSimple("threadStackSize", "128M").build()); + + configDelegate.updateResourceConfiguration(report); + + assertEquals(report.getStatus(), ConfigurationUpdateStatus.FAILURE, "The configuration update should fail " + + "when [threadStackSize] has an invalid value."); + } + private void createDefaultConfig() throws IOException { Properties properties = new Properties(); properties.setProperty("heap_min", "-Xms512M"); commit fe38a28bd0ba7df967ec8b6a7f5f2b4a6bb839d6 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 3 12:27:55 2013 +0200 Bug 923400 - Sigar creates high number of blocked threads (unbounded) if mount is gone diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccess.java b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccess.java index 4319f9a..8c7cea9 100644 --- a/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccess.java +++ b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccess.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,17 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.system; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import org.hyperic.sigar.Sigar; import org.hyperic.sigar.SigarProxy; /** @@ -34,7 +30,6 @@ import org.hyperic.sigar.SigarProxy; * @author John Mazzitelli */ public class SigarAccess { - private static SigarAccessHandler invocationHandler; private static SigarProxy sigarProxy; @@ -83,35 +78,4 @@ public class SigarAccess { } - private static class SigarAccessHandler implements InvocationHandler { - private Sigar sigar; - - public Object invoke(Object proxy, Method meth, Object[] args) throws Throwable { - // its possible in the time between this handler's creation and now, someone disabled the native layer. - // throw a runtime exception if the native system was disabled - if (SystemInfoFactory.isNativeSystemInfoDisabled()) { - throw new SystemInfoException("Native system has been disabled"); - } - - try { - synchronized (this) { - if (sigar == null) { - this.sigar = new Sigar(); - } - - return meth.invoke(sigar, args); - } - } catch (InvocationTargetException e) { - throw e.getTargetException(); - } - } - - public synchronized void close() { - if (this.sigar != null) { - this.sigar.close(); - this.sigar = null; - } - } - } - -} \ No newline at end of file +} diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java new file mode 100644 index 0000000..a781641 --- /dev/null +++ b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java @@ -0,0 +1,201 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.core.system; + +import static java.util.concurrent.TimeUnit.MINUTES; +import static java.util.concurrent.TimeUnit.SECONDS; + +import java.lang.management.ManagementFactory; +import java.lang.management.ThreadInfo; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.locks.ReentrantLock; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hyperic.sigar.Sigar; + +/** + * An {@link InvocationHandler} for a {@link org.hyperic.sigar.SigarProxy}. + * <p>A single instance of this class will be created by the {@link SigarAccess} class.</p> + * This class holds a shared {@link Sigar} instance and serializes calls. If a thread waits more than + * 'sharedSigarLockMaxWait' seconds, it will be given a new Sigar instance, which will be destroyed at the end of the + * call. + * <p>Every 5 minutes, a background task checks that 'localSigarInstancesWarningThreshold' has not been exceeded. It it + * has, a warning message will be logged, optionally with a thread dump. + * <p>This class is configurable with System properties: + * <ul> + * <li><strong>sharedSigarLockMaxWait</strong>: maximum time in seconds a thread will wait for the shared Sigar lock + * acquistion; defaults to 2 seconds</li> + * <li><strong>localSigarInstancesWarningThreshold</strong>: threshold of currently living Sigar instances at which + * the background task will print warning messages; defaults to 50</li> + * <li><strong>maxLocalSigarInstances</strong>: maximum number of local Sigar instances which can be created, zero + * and negative values being interpreted as 'no limit'; defaults to 50</li> + * <li><strong>threadDumpOnlocalSigarInstancesWarningThreshold</strong>: if set to true (case insensitive), the + * background task will also log a thread dump when <strong>localSigarInstancesWarningThreshold</strong> is met</li> + * </ul> + * </p> + * + * @author Thomas Segismont + */ +class SigarAccessHandler implements InvocationHandler { + private static final Log LOG = LogFactory.getLog(SigarAccessHandler.class); + + private static final String LINE_SEPARATOR = System.getProperty("line.separator"); + private static final int SHARED_SIGAR_LOCK_MAX_WAIT = Integer.getInteger("sharedSigarLockMaxWait", 2); + private static final int LOCAL_SIGAR_INSTANCES_WARNING_THRESHOLD = Integer.getInteger( + "localSigarInstancesWarningThreshold", 50); + private static final int MAX_LOCAL_SIGAR_INSTANCES = Integer.getInteger("maxLocalSigarInstances", 50); + private static final boolean LIMIT_LOCAL_SIGAR_INSTANCES = MAX_LOCAL_SIGAR_INSTANCES > 0; + private static final boolean THREAD_DUMP_ON_SIGAR_INSTANCES_THRESHOLD = Boolean + .getBoolean("threadDumpOnlocalSigarInstancesWarningThreshold"); + + private final SigarFactory sigarFactory; + private final ReentrantLock sharedSigarLock; + private final ReentrantLock localSigarLock; + private final ScheduledExecutorService scheduledExecutorService; + private volatile int localSigarInstancesCount; + private Sigar sharedSigar; + + SigarAccessHandler() { + this(new DefaultSigarFactory()); + } + + SigarAccessHandler(SigarFactory sigarFactory) { + this.sigarFactory = sigarFactory; + sharedSigarLock = new ReentrantLock(); + localSigarLock = new ReentrantLock(); + scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(); + scheduledExecutorService.scheduleWithFixedDelay(new ThresholdChecker(), 1, 5, MINUTES); + localSigarInstancesCount = 0; + } + + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + // its possible in the time between this handler's creation and now, someone disabled the native layer. + // throw a runtime exception if the native system was disabled + if (SystemInfoFactory.isNativeSystemInfoDisabled()) { + throw new SystemInfoException("Native system has been disabled"); + } + + // Acquire lock for shared Sigar instance. Wait 'sharedSigarLockMaxWait' seconds at most + boolean acquiredLock = sharedSigarLock.tryLock(SHARED_SIGAR_LOCK_MAX_WAIT, SECONDS); + if (acquiredLock) { + if (sharedSigar == null) { + this.sharedSigar = sigarFactory.createSigarInstance(); + } + try { + return method.invoke(sharedSigar, args); + } catch (InvocationTargetException e) { + throw e.getTargetException(); + } finally { + sharedSigarLock.unlock(); + } + } else { + Sigar localSigar = createLocalSigarInstance(); + try { + return method.invoke(localSigar, args); + } catch (InvocationTargetException e) { + throw e.getTargetException(); + } finally { + closeLocalSigarInstance(localSigar); + } + } + } + + private Sigar createLocalSigarInstance() { + localSigarLock.lock(); + try { + if (LIMIT_LOCAL_SIGAR_INSTANCES && localSigarInstancesCount >= MAX_LOCAL_SIGAR_INSTANCES) { + throw new RuntimeException("Too many Sigar instances created"); + } + Sigar sigarInstance = sigarFactory.createSigarInstance(); + localSigarInstancesCount++; + return sigarInstance; + } finally { + localSigarLock.unlock(); + } + } + + private void closeLocalSigarInstance(Sigar sigar) { + localSigarLock.lock(); + try { + sigar.close(); + localSigarInstancesCount--; + } finally { + localSigarLock.unlock(); + } + } + + void close() { + if (sharedSigar != null) { + sharedSigarLock.lock(); + try { + sharedSigar.close(); + sharedSigar = null; + } finally { + sharedSigarLock.unlock(); + } + } + scheduledExecutorService.shutdownNow(); + } + + int localSigarInstancesCount() { + return localSigarInstancesCount; + } + + interface SigarFactory { + Sigar createSigarInstance(); + } + + private static class DefaultSigarFactory implements SigarFactory { + @Override + public Sigar createSigarInstance() { + return new Sigar(); + } + } + + private class ThresholdChecker implements Runnable { + @Override + public void run() { + int currentCount = localSigarInstancesCount; + if (currentCount > LOCAL_SIGAR_INSTANCES_WARNING_THRESHOLD) { + StringBuilder sb = new StringBuilder(); + sb.append("There are ").append(currentCount).append(" local Sigar instances currently active. ") + .append("This may indicate that a call to the shared Sigar instance did not complete."); + if (THREAD_DUMP_ON_SIGAR_INSTANCES_THRESHOLD) { + sb.append(LINE_SEPARATOR); + threadDump(sb); + } + LOG.warn(sb.toString()); + } + } + + private void threadDump(StringBuilder sb) { + ThreadInfo[] threadInfos = ManagementFactory.getThreadMXBean().dumpAllThreads(true, true); + for (ThreadInfo threadInfo : threadInfos) { + sb.append(threadInfo); + sb.append(LINE_SEPARATOR); + } + } + } +} diff --git a/modules/core/native-system/src/test/java/org/rhq/core/system/SigarAccessHandlerTest.java b/modules/core/native-system/src/test/java/org/rhq/core/system/SigarAccessHandlerTest.java new file mode 100644 index 0000000..e993725 --- /dev/null +++ b/modules/core/native-system/src/test/java/org/rhq/core/system/SigarAccessHandlerTest.java @@ -0,0 +1,172 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.core.system; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.lang.reflect.Method; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarProxy; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * @author Thomas Segismont + */ +@Test(singleThreaded = true) +public class SigarAccessHandlerTest { + private static final int THREAD_POOL_SIZE = 100; + + private Method getSwapMethod; + private Method getFileSystemMapMethod; + private Sigar sigarMock; + private ExecutorService executorService; + private SigarAccessHandler sigarAccessHandler; + + @BeforeClass + private void setFields() throws Exception { + getSwapMethod = SigarProxy.class.getMethod("getSwap", new Class[0]); + getFileSystemMapMethod = SigarProxy.class.getMethod("getFileSystemMap", new Class[0]); + sigarMock = mock(Sigar.class); + // Wait 15 seconds on call to getSwap + when(sigarMock.getSwap()).then(new Answer<Object>() { + @Override + public Object answer(InvocationOnMock invocation) throws Throwable { + Thread.sleep(1000 * 15); + return null; + } + }); + } + + @BeforeMethod + public void setUp() throws Exception { + sigarAccessHandler = new SigarAccessHandler(new SigarAccessHandler.SigarFactory() { + @Override + public Sigar createSigarInstance() { + return sigarMock; + } + }); + executorService = Executors.newFixedThreadPool(THREAD_POOL_SIZE); + } + + @AfterMethod + public void tearDown() throws Exception { + sigarAccessHandler.close(); + executorService.shutdownNow(); + + } + + @Test(timeOut = 1000 * 30) + public void testOnDemandSigarInstanceCreation() throws Throwable { + // Start concurrent invocations of the long running getSwap method + for (int i = 0; i < 10; i++) { + executorService.submit(new Runnable() { + @Override + public void run() { + try { + sigarAccessHandler.invoke(null, getSwapMethod, new Object[0]); + } catch (Throwable ignore) { + } + } + }); + } + Thread.sleep(1000 * 8); + + assertEquals(sigarAccessHandler.localSigarInstancesCount(), 9); + } + + @Test(timeOut = 1000 * 30) + public void testSigarInstanceDestruction() throws Throwable { + // Start concurrent invocations of the short running getFileSystemMapMethod method and an invocation of the long + // running getSwap method + for (int i = 0; i < 10; i++) { + if (i == 0) { + executorService.submit(new Runnable() { + @Override + public void run() { + try { + sigarAccessHandler.invoke(null, getSwapMethod, new Object[0]); + } catch (Throwable ignore) { + } + } + }); + } else { + executorService.submit(new Runnable() { + @Override + public void run() { + try { + sigarAccessHandler.invoke(null, getFileSystemMapMethod, new Object[0]); + } catch (Throwable ignore) { + } + } + }); + } + } + Thread.sleep(1000 * 8); + + assertEquals(sigarAccessHandler.localSigarInstancesCount(), 0); + } + + @Test(timeOut = 1000 * 30) + public void testMaxSigarInstanceCreation() throws Throwable { + // Start concurrent invocations of the long running getSwap method + List<Future<Throwable>> futures = new LinkedList<Future<Throwable>>(); + for (int i = 0; i < 60; i++) { + futures.add(executorService.submit(new Callable<Throwable>() { + @Override + public Throwable call() throws Exception { + try { + sigarAccessHandler.invoke(null, getSwapMethod, new Object[0]); + } catch (Throwable throwable) { + return throwable; + } + return null; + } + })); + } + Thread.sleep(1000 * 8); + + assertEquals(sigarAccessHandler.localSigarInstancesCount(), 50); + int failedCallsCount = 0; + for (Future<Throwable> future : futures) { + Throwable throwable = future.get(); + if (throwable != null) { + failedCallsCount++; + assertTrue(throwable instanceof RuntimeException); + assertEquals(throwable.getMessage(), "Too many Sigar instances created"); + } + } + assertEquals(failedCallsCount, 9); + } +} commit 05ff27a9dec1422f46c91f69d524a3b388b3e421 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Mon Jul 15 19:57:08 2013 +0200 Bug 885655 - Datasource - Security Deployment Type is by default set to "Domain and application" instead of "None" as stated in description Set default value in #createResource if needed Update resource after creation as Security deployment type value is ignored by EAP servers diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java index 0d45594..e0699b0 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java @@ -19,12 +19,15 @@ package org.rhq.plugins.jbossas5; +import static org.rhq.core.domain.resource.CreateResourceStatus.SUCCESS; + import java.io.File; import java.io.InputStream; import java.io.Serializable; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -47,13 +50,17 @@ import org.jboss.deployers.spi.management.deploy.ProgressEvent; import org.jboss.deployers.spi.management.deploy.ProgressListener; import org.jboss.managed.api.ComponentType; import org.jboss.managed.api.ManagedComponent; +import org.jboss.managed.api.ManagedProperty; +import org.jboss.metatype.api.values.MetaValue; import org.jboss.metatype.api.values.SimpleValue; import org.jboss.on.common.jbossas.JBPMWorkflowManager; import org.jboss.on.common.jbossas.JBossASPaths; import org.jboss.on.common.jbossas.JmxConnectionHelper; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.transfer.DeployPackageStep; import org.rhq.core.domain.content.transfer.DeployPackagesResponse; @@ -81,6 +88,8 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter; +import org.rhq.plugins.jbossas5.adapter.api.PropertyAdapterFactory; import org.rhq.plugins.jbossas5.connection.LocalProfileServiceConnectionProvider; import org.rhq.plugins.jbossas5.connection.ProfileServiceConnection; import org.rhq.plugins.jbossas5.connection.ProfileServiceConnectionProvider; @@ -88,6 +97,7 @@ import org.rhq.plugins.jbossas5.connection.RemoteProfileServiceConnectionProvide import org.rhq.plugins.jbossas5.helper.CreateChildResourceFacetDelegate; import org.rhq.plugins.jbossas5.helper.InPluginControlActionFacade; import org.rhq.plugins.jbossas5.helper.JBossAS5ConnectionTypeDescriptor; +import org.rhq.plugins.jbossas5.util.ConversionUtils; import org.rhq.plugins.jbossas5.util.ManagedComponentUtils; /** @@ -300,8 +310,58 @@ public class ApplicationServerComponent<T extends ResourceComponent<?>> implemen // CreateChildResourceFacet -------------------------------------------- - public CreateResourceReport createResource(CreateResourceReport createResourceReport) { - return this.createChildResourceDelegate.createResource(createResourceReport); + public CreateResourceReport createResource(CreateResourceReport report) { + if (creatingDatasourceOrConnectionFactory(report)) { + report = preCreateDatasourceOrConnectionFactory(report); + } + report = this.createChildResourceDelegate.createResource(report); + if (report.getStatus() != SUCCESS) { + return report; + } + if (creatingDatasourceOrConnectionFactory(report)) { + report = postCreateDatasourceOrConnectionFactory(report); + } + return report; + } + + private CreateResourceReport preCreateDatasourceOrConnectionFactory(CreateResourceReport report) { + Configuration resourceConfiguration = report.getResourceConfiguration(); + PropertyMap securityDomainPropertyMap = (PropertyMap) resourceConfiguration.get("security-domain"); + PropertySimple securityDeploymentType = securityDomainPropertyMap.getSimple("securityDeploymentType"); + if (securityDeploymentType.getStringValue() == null) { + securityDeploymentType.setValue("NONE"); + } + return report; + } + + private CreateResourceReport postCreateDatasourceOrConnectionFactory(CreateResourceReport report) { + Configuration resourceConfiguration = report.getResourceConfiguration(); + ConfigurationDefinition resourceConfigurationDefinition = report.getResourceType() + .getResourceConfigurationDefinition(); + ComponentType componentType = ConversionUtils.getComponentType(report.getResourceType()); + String componentName = report.getResourceKey(); + try { + ManagementView managementView = getConnection().getManagementView(); + ManagedComponent managedComponent = managementView.getComponent(componentName, componentType); + Map<String, ManagedProperty> managedProperties = managedComponent.getProperties(); + ManagedProperty managedProperty = managedProperties.get("security-domain"); + MetaValue metaValue = managedProperty.getValue(); + PropertyAdapter propertyAdapter = PropertyAdapterFactory.getPropertyAdapter(metaValue); + propertyAdapter.populateMetaValueFromProperty(resourceConfiguration.get("security-domain"), metaValue, + resourceConfigurationDefinition.get("security-domain")); + managementView.updateComponent(managedComponent); + managementView.load(); + } catch (Exception e) { + report.setErrorMessage("Resource was created but an error occured while updating security-domain property"); + report.setException(e); + } + return report; + } + + private boolean creatingDatasourceOrConnectionFactory(CreateResourceReport report) { + String resourceTypeName = report.getResourceType().getName(); + return Arrays.asList("No Tx Datasource", "Local Tx Datasource", "XA Datasource", "No Tx ConnectionFactory", + "Tx ConnectionFactory").contains(resourceTypeName); } // ProgressListener -------------------------------------------- commit 68d4c3d2c3c5eb67c09cde41ac78f77f6b32ec33 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 15 10:34:28 2013 -0400 [BZ 984433] revert changes for empty directory check diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 386cda7..9a6a1c0 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -55,7 +55,6 @@ import org.apache.commons.cli.PosixParser; import org.apache.commons.exec.DefaultExecutor; import org.apache.commons.exec.Executor; import org.apache.commons.exec.PumpStreamHandler; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.output.NullOutputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -450,7 +449,13 @@ public class StorageInstaller { } private boolean isDirectoryEmpty(File dir) { - return FileUtils.sizeOf(dir) == 0; + // TODO need to check subdirectories + if (dir.isDirectory()) { + File[] files = dir.listFiles(); + return (files == null || files.length == 0); + } else { + return true; + } } private int getPort(CommandLine cmdLine, String option, int defaultValue) { commit 0bc81e9df0976365252b5ca11795b25d78172ec4 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 15 10:13:35 2013 -0400 check that properties are set before trying to update them diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index e82f290..c87d2ac 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -68,19 +68,36 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { Configuration config = configurationUpdateReport.getConfiguration(); - // We want min and max heap to be the same - properties.setProperty("heap_min", "-Xms" + config.getSimpleValue("maxHeapSize")); - properties.setProperty("heap_max", "-Xmx" + config.getSimpleValue("maxHeapSize")); - properties.setProperty("heap_new", "-Xmn" + config.getSimpleValue("heapNewSize")); - properties.setProperty("thread_stack_size", "-Xss" + config.getSimpleValue("threadStackSize")); - - if (config.getSimple("heapDumpOnOOMError").getBooleanValue()) { - properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); - } else { - properties.setProperty("heap_dump_on_OOMError", ""); + String maxHeapSize = config.getSimpleValue("maxHeapSize"); + if (!StringUtil.isEmpty(maxHeapSize)) { + // We want min and max heap to be the same + properties.setProperty("heap_min", "-Xms" + maxHeapSize); + properties.setProperty("heap_max", "-Xmx" + maxHeapSize); } - properties.setProperty("heap_dump_dir", config.getSimpleValue("heapDumpDir")); + String heapNewSize = config.getSimpleValue("heapNewSize"); + if (!StringUtil.isEmpty(heapNewSize)) { + properties.setProperty("heap_new", "-Xmn" + heapNewSize); + } + + String threadStackSize = config.getSimpleValue("threadStackSize"); + if (!StringUtil.isEmpty(threadStackSize)) { + properties.setProperty("thread_stack_size", "-Xss" + threadStackSize); + } + + PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); + if (heapDumpOnOMMError != null) { + if (heapDumpOnOMMError.getBooleanValue()) { + properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + } else { + properties.setProperty("heap_dump_on_OOMError", ""); + } + } + + String heapDumpDir = config.getSimpleValue("heapDumpDir"); + if (!StringUtil.isEmpty(heapDumpDir)) { + properties.setProperty("heap_dump_dir", heapDumpDir); + } propertiesUpdater.update(properties); diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java index 5c5f089..ee34f43 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java @@ -23,10 +23,13 @@ public class StorageNodeConfigDelegateTest { private File basedir; + private StorageNodeConfigDelegate configDelegate; + @BeforeMethod public void initDirs(Method test) throws Exception { File dir = new File(getClass().getResource(".").toURI()); basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); + configDelegate = new StorageNodeConfigDelegate(basedir); } @@ -34,7 +37,6 @@ public class StorageNodeConfigDelegateTest { public void loadValidConfig() throws Exception { createDefaultConfig(); - StorageNodeConfigDelegate configDelegate = new StorageNodeConfigDelegate(basedir); Configuration config = configDelegate.loadResourceConfiguration(); assertEquals(config.getSimpleValue("minHeapSize"), "512M", "Failed to load property [minHeapSize]"); @@ -60,11 +62,9 @@ public class StorageNodeConfigDelegateTest { ConfigurationUpdateReport report = new ConfigurationUpdateReport(config); - StorageNodeConfigDelegate configDelegate = new StorageNodeConfigDelegate(basedir); configDelegate.updateResourceConfiguration(report); - Properties properties = new Properties(); - properties.load(new FileInputStream(new File(confDir(), "cassandra-jvm.properties"))); + Properties properties = loadCassandraJvmProps(); assertEquals(properties.getProperty("heap_min"), "-Xms1024M", "Failed to update property [minHeapSize]"); assertEquals(properties.getProperty("heap_max"), "-Xmx1024M", "Failed to update property [maxHeapSize]"); @@ -77,6 +77,25 @@ public class StorageNodeConfigDelegateTest { "Failed to update property [heap_dump_dir]"); } + @Test + public void minHeapSizeShouldBeTheSameAsMaxHeapSize() throws Exception { + createDefaultConfig(); + + Configuration config = new Configuration(); + config.put(new PropertySimple("minHeapSize", "512M")); + config.put(new PropertySimple("maxHeapSize", "768M")); + + ConfigurationUpdateReport report = new ConfigurationUpdateReport(config); + + configDelegate.updateResourceConfiguration(report); + + Properties properties = loadCassandraJvmProps(); + + assertEquals(properties.getProperty("heap_max"), "-Xmx768M", "Failed to update property [maxHeapSize]"); + assertEquals(properties.getProperty("heap_min"), "-Xms768M", "Failed to update property [maxHeapSize]. It " + + "should be the same as [maxHeapSize]."); + } + private void createDefaultConfig() throws IOException { Properties properties = new Properties(); properties.setProperty("heap_min", "-Xms512M"); @@ -84,10 +103,18 @@ public class StorageNodeConfigDelegateTest { properties.setProperty("heap_new", "-Xmn128M"); properties.setProperty("thread_stack_size", "-Xss180k"); properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + properties.setProperty("heap_dump_dir", binDir().getAbsolutePath()); properties.store(new FileOutputStream(new File(confDir(), "cassandra-jvm.properties")), ""); } + private Properties loadCassandraJvmProps() throws Exception { + Properties properties = new Properties(); + properties.load(new FileInputStream(new File(confDir(), "cassandra-jvm.properties"))); + + return properties; + } + private File confDir() { return mkdirIfNecessary(basedir, "conf"); } commit 46ae96d60f17d0215185c0f79b8e004bdbc9c1ee Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu May 23 11:03:31 2013 +0200 Trivial: javadoc clean up. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java index 13b1e32..4dae88a 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java @@ -850,10 +850,9 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM * * @return a clone of this configuration * - * @throws CloneNotSupportedException - * * @see #deepCopy() */ + @SuppressWarnings("override") //@Override //GWT trips over this, WTH! public Configuration clone() { return deepCopy(); @@ -1002,7 +1001,7 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM /** * Getter for the properties reference. * - * @return Map<String, Property> + * @return {@code Map<String, Property>} */ public Map<String, Property> getAllProperties() { return this.properties; commit b415c386059131057d91060a3bebef41699fcb3d Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu May 23 10:46:16 2013 +0200 Added missing generic type decls. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java index b006425..13b1e32 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java @@ -271,7 +271,7 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM } } - public static class MapInList<Parent extends AbstractPropertyListBuilder> extends AbstractPropertyMapBuilder<PropertyMap, MapInList<Parent>> { + public static class MapInList<Parent extends AbstractPropertyListBuilder<?>> extends AbstractPropertyMapBuilder<PropertyMap, MapInList<Parent>> { private Parent parent; public MapInList(Parent parent, String name) { @@ -307,7 +307,7 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM } } - public static class ListInList<Parent extends AbstractPropertyListBuilder> extends AbstractPropertyListBuilder<ListInList<Parent>> { + public static class ListInList<Parent extends AbstractPropertyListBuilder<?>> extends AbstractPropertyListBuilder<ListInList<Parent>> { private Parent parent; private ListInList(Parent parent, String name, String memberName) { commit abbbf13986af10b65cf812ce9b0a2a49c297934a Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed May 22 19:24:00 2013 +0200 A configuration instance builder. This should greatly simplify the process of creating complex configuration objects. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java index b1e6e22..b006425 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java @@ -143,6 +143,244 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM public static final String QUERY_DELETE_RAW_CONFIGURATIONS_CONFIGURATION_IDS = "Configuration.deleteRawByConfigurationIds"; public static final String QUERY_DELETE_CONFIGURATIONS_BY_CONFIGURATION_IDs = "Configuration.deleteByConfigurationIdS"; + private static abstract class AbstractPropertyMapBuilder<T extends AbstractPropertyMap, This extends AbstractPropertyMapBuilder<T, This>> { + private T map; + + protected AbstractPropertyMapBuilder(T map) { + this.map = map; + } + + /** + * Adds a simple property. + * @param name the name of the simple property + * @param value the value of the simple property + * @return continue with the definition + */ + public This addSimple(String name, Object value) { + getMap().put(new PropertySimple(name, value)); + return castThis(); + } + + /** + * Starts defining a new sub list. + * @param name the name of the sub list + * @param memberName the names of the member properties of the sub list + * @return the builder of the list + */ + public Builder.ListInMap<This> openList(String name, String memberName) { + return new Builder.ListInMap<This>(castThis(), name, memberName); + } + + /** + * Starts defining a new sub map. + * @param name the name of the sub map + * @return the builder of the map + */ + public Builder.MapInMap<This> openMap(String name) { + return new Builder.MapInMap<This>(castThis(), name); + } + + protected T getMap() { + return map; + } + + @SuppressWarnings("unchecked") + private This castThis() { + return (This) this; + } + } + + private static abstract class AbstractPropertyListBuilder<This extends AbstractPropertyListBuilder<This>> { + private PropertyList list; + + private AbstractPropertyListBuilder(String name, String memberName) { + this.list = new PropertyList(name); + this.list.memberPropertyName = memberName; + } + + /** + * Adds a simple property. The name of the property is the member name defined by this list. + * @param value the value of the simple property + * @return continue with the definition + */ + public This addSimple(Object value) { + list.add(new PropertySimple(list.memberPropertyName, value)); + return castThis(); + } + + /** + * Adds a number of simple properties. The names of the properties are the member name defined by this list. + * @param values the values of the simple properties + * @return continue with the definition + */ + public This addSimples(Object... values) { + for(Object v : values) { + list.add(new PropertySimple(list.memberPropertyName, v)); + } + + return castThis(); + } + + /** + * Starts defining a new sub map. + * @return the builder of the map + */ + public Builder.MapInList<This> openMap() { + return new Builder.MapInList<This>(castThis(), list.memberPropertyName); + } + + /** + * Starts defining a new sub list. + * @param memberName the names of the member properties of the sub list + * @return the builder of the list + */ + public Builder.ListInList<This> openList(String memberName) { + return new Builder.ListInList<This>(castThis(), list.memberPropertyName, memberName); + } + + protected PropertyList getList() { + return list; + } + + @SuppressWarnings("unchecked") + private This castThis() { + return (This) this; + } + } + + /** + * A builder to easily build Configuration instances using a fluent API. + */ + public static class Builder extends AbstractPropertyMapBuilder<Configuration, Builder> { + + public static class MapInMap<Parent extends AbstractPropertyMapBuilder<?, ?>> extends AbstractPropertyMapBuilder<PropertyMap, MapInMap<Parent>> { + private Parent parent; + + private MapInMap(Parent parent, String name) { + super(new PropertyMap(name)); + this.parent = parent; + } + + /** + * Closes the definition of the current map and returns to the parent context. + * @return the parent context + */ + public Parent closeMap() { + parent.getMap().put(getMap()); + return parent; + } + } + + public static class MapInList<Parent extends AbstractPropertyListBuilder> extends AbstractPropertyMapBuilder<PropertyMap, MapInList<Parent>> { + private Parent parent; + + public MapInList(Parent parent, String name) { + super(new PropertyMap(name)); + this.parent = parent; + } + + /** + * Closes the definition of the current map and returns to the parent context. + * @return the parent context + */ + public Parent closeMap() { + parent.getList().add(getMap()); + return parent; + } + } + + public static class ListInMap<Parent extends AbstractPropertyMapBuilder<?, ?>> extends AbstractPropertyListBuilder<ListInMap<Parent>> { + private Parent parent; + + private ListInMap(Parent parent, String name, String memberName) { + super(name, memberName); + this.parent = parent; + } + + /** + * Closes the definition of the current list and returns to the parent context. + * @return the parent context + */ + public Parent closeList() { + parent.getMap().put(getList()); + return parent; + } + } + + public static class ListInList<Parent extends AbstractPropertyListBuilder> extends AbstractPropertyListBuilder<ListInList<Parent>> { + private Parent parent; + + private ListInList(Parent parent, String name, String memberName) { + super(name, memberName); + this.parent = parent; + } + + /** + * Closes the definition of the current list and returns to the parent context. + * @return the parent context + */ + public Parent closeList() { + parent.getList().add(getList()); + return parent; + } + } + + public class RawConfigurationBuilder { + + private RawConfiguration rawConfig; + + public RawConfigurationBuilder() { + rawConfig = new RawConfiguration(); + rawConfig.setConfiguration(getMap()); + } + + public RawConfigurationBuilder withPath(String path) { + rawConfig.setPath(path); + return this; + } + + public RawConfigurationBuilder withContents(String content, String sha256) { + rawConfig.setContents(content, sha256); + return this; + } + + /** + * Closes the definition of the current raw configuration and returns to the parent context. + * @return the parent context + */ + public Builder closeRawConfiguration() { + getMap().getRawConfigurations().add(rawConfig); + return Builder.this; + } + } + + public Builder() { + super(new Configuration()); + } + + public Builder withNotes(String notes) { + getMap().setNotes(notes); + return this; + } + + public Builder withVersion(long version) { + getMap().setVersion(version); + return this; + } + + /** + * Starts defining a new raw configuration that will become part of this configuration. + * @return the builder of the raw configuration + */ + public RawConfigurationBuilder openRawConfiguration() { + return new RawConfigurationBuilder(); + } + + public Configuration build() { + return getMap(); + } + } + @GeneratedValue(generator = "RHQ_CONFIG_ID_SEQ", strategy = GenerationType.AUTO) @Id private int id; @@ -283,6 +521,10 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM @Column(name = "MTIME") private long mtime = System.currentTimeMillis(); + public static Builder builder() { + return new Builder(); + } + public Configuration() { } diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationBuilderTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationBuilderTest.java new file mode 100644 index 0000000..ad071ee --- /dev/null +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationBuilderTest.java @@ -0,0 +1,237 @@ +package org.rhq.core.domain.configuration; + +import org.testng.annotations.Test; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertSame; + +/** + * @author Lukas Krejci + */ +@Test +public class ConfigurationBuilderTest { + + public void testConfigurationProperties() { + Configuration config = Configuration.builder().withNotes("notes").withVersion(2).build(); + assert "notes".equals(config.getNotes()) : "Unexpected notes"; + assert 2 == config.getVersion() : "Unexpected version"; + } + + public void testSimples() { + Configuration config = Configuration.builder().addSimple("1", 1).addSimple("2", 2).build(); + + assert config.getSimpleValue("1").equals("1") : "1 != 1"; + assert config.getSimpleValue("2").equals("2") : "2 != 2"; + + assert config.getSimple("1").getConfiguration() == config : "Configuration not set on property"; + } + + public void testListOfSimples() { + Configuration config = Configuration.builder().openList("l1", "m").addSimple(1).addSimple(2).closeList() + .openList("l2", "m").addSimples(1, 2).closeList().build(); + + PropertyList l1 = config.getList("l1"); + PropertyList l2 = config.getList("l2"); + + assert l1 != null : "Could not find l1"; + assert l2 != null : "Could not find l2"; + + assert l1.getConfiguration() == config : "Configuration on l1 not set"; + assert l2.getConfiguration() == config : "Configuration on l2 not set"; + + assert l1.getList().size() == 2 : "Unexpected number of props in the list 1"; + assert l2.getList().size() == 2 : "Unexpected number of props in the list 2"; + + testSimple((PropertySimple) l1.getList().get(0), null, l1, "1"); + testSimple((PropertySimple) l1.getList().get(1), null, l1, "2"); + testSimple((PropertySimple) l2.getList().get(0), null, l2, "1"); + testSimple((PropertySimple) l2.getList().get(1), null, l2, "2"); + } + + public void testMapOfSimples() { + Configuration config = Configuration.builder().openMap("m").addSimple("1", 1).addSimple("2", 2).closeMap() + .build(); + + PropertyMap m = config.getMap("m"); + + assert m != null : "Cound not find map"; + + assert m.getConfiguration() == config : "Configuration on the map not set"; + + testSimple(m.getSimple("1"), m, null, "1"); + testSimple(m.getSimple("2"), m, null, "2"); + } + + public void testListOfLists() { + Configuration config = new Configuration.Builder().openList("l", "m").openList("ml1").addSimples(1, 2) + .closeList().openList("ml2").addSimple(1).addSimple(2).closeList().closeList().build(); + + PropertyList l = config.getList("l"); + + assert l != null : "Could not find top-level list"; + + assert l.getList().size() == 2 : "Unexpected number of props in the top level list"; + + PropertyList m1 = (PropertyList) l.getList().get(0); + PropertyList m2 = (PropertyList) l.getList().get(1); + + assert m1.getParentList() == l : "Parent list on m1 not set"; + assert m1.getParentMap() == null : "Unexpected parent map on m1"; + assert m2.getParentList() == l : "Parent list on m2 not set"; + assert m1.getParentMap() == null : "Unexpected parent map on m2"; + + assert m1.getList().size() == 2 : "Unexpected number of props in the list 1"; + assert m2.getList().size() == 2 : "Unexpected number of props in the list 2"; + + testSimple((PropertySimple) m1.getList().get(0), null, m1, "1"); + testSimple((PropertySimple) m1.getList().get(1), null, m1, "2"); + testSimple((PropertySimple) m2.getList().get(0), null, m2, "1"); + testSimple((PropertySimple) m2.getList().get(1), null, m2, "2"); + } + + public void testListOfMaps() { + Configuration config = Configuration.builder().openList("l", "m").openMap().addSimple("c1", 1) + .addSimple("c2", 2).closeMap() + .openMap().addSimple("c1", 3).addSimple("c2", 4).closeMap().closeList().build(); + + PropertyList l = config.getList("l"); + + assert l != null : "Could not find top-level list"; + + assert l.getList().size() == 2 : "Unexpected number of props in the top level list"; + + PropertyMap m1 = (PropertyMap) l.getList().get(0); + PropertyMap m2 = (PropertyMap) l.getList().get(1); + + assert m1.getParentList() == l : "Parent list on m1 not set"; + assert m1.getParentMap() == null : "Unexpected parent map on m1"; + assert m2.getParentList() == l : "Parent list on m2 not set"; + assert m1.getParentMap() == null : "Unexpected parent map on m2"; + + assert m1.getMap().size() == 2 : "Unexpected number of props in the list 1"; + assert m2.getMap().size() == 2 : "Unexpected number of props in the list 2"; + + testSimple(m1.getSimple("c1"), m1, null, "1"); + testSimple(m1.getSimple("c2"), m1, null, "2"); + testSimple(m2.getSimple("c1"), m2, null, "3"); + testSimple(m2.getSimple("c2"), m2, null, "4"); + } + + public void testMapOfMaps() { + Configuration config = Configuration.builder().openMap("m").openMap("im1").addSimple("c1", 1).addSimple("c2", 2) + .closeMap().openMap("im2").addSimple("c1", 3).addSimple("c2", 4).closeMap().closeMap().build(); + + PropertyMap m = config.getMap("m"); + + assert m != null : "Could not find the top level map"; + + assert m.getMap().size() == 2 : "Unexpected number of props in the top level map"; + + PropertyMap m1 = m.getMap("im1"); + PropertyMap m2 = m.getMap("im2"); + + assert m1 != null : "Could not find im1"; + assert m2 != null : "Could not find im2"; + + assert m1.getParentList() == null : "Unexpected parent list on m1"; + assert m1.getParentMap() == m : "Unexpected parent map on m1"; + assert m2.getParentList() == null : "Unexpected parent list on m2"; + assert m1.getParentMap() == m : "Unexpected parent map on m2"; + + testSimple(m1.getSimple("c1"), m1, null, "1"); + testSimple(m1.getSimple("c2"), m1, null, "2"); + testSimple(m2.getSimple("c1"), m2, null, "3"); + testSimple(m2.getSimple("c2"), m2, null, "4"); + } + + public void testMapOfLists() { + Configuration config = Configuration.builder().openMap("m").openList("il1", "m").addSimples(1, 2) + .closeList().openList("il2", "m").addSimples(3, 4).closeList().closeMap().build(); + + PropertyMap m = config.getMap("m"); + + assert m != null : "Could not find the top level map"; + + assert m.getMap().size() == 2 : "Unexpected number of props in the top level map"; + + PropertyList l1 = m.getList("il1"); + PropertyList l2 = m.getList("il2"); + + assert l1 != null : "Could not find il1"; + assert l2 != null : "Could not find il2"; + + assert l1.getParentList() == null : "Unexpected parent list on l1"; + assert l1.getParentMap() == m : "Unexpected parent map on l1"; + assert l2.getParentList() == null : "Unexpected parent list on l2"; + assert l2.getParentMap() == m : "Unexpected parent map on l2"; + + testSimple((PropertySimple) l1.getList().get(0), null, l1, "1"); + testSimple((PropertySimple) l1.getList().get(1), null, l1, "2"); + testSimple((PropertySimple) l2.getList().get(0), null, l2, "3"); + testSimple((PropertySimple) l2.getList().get(1), null, l2, "4"); + } + + public void testUtterMess() { + Configuration config = Configuration.builder() + .openList("l", "m") // + /**/.openMap() // + /**//**/.openMap("innerMap") // + /**//**//**/.addSimple("c1", 1) // + /**//**//**/.openList("c2", "m") // + /**//**//**/.closeList() // + /**//**/.closeMap() // + /**//**/.addSimple("simple", 2) // + /**//**/.openList("innerList", "m") // + /**//**/.closeList() // + /**/.closeMap() // + /**/.addSimple(3) // + /**/.openList("im") // + /**//**/.openList("iim") // + /**//**/.closeList() // + /**//**/.openMap() // + /**//**/.closeMap() // + /**/.closeList() // + .closeList().build(); + + PropertyList l = config.getList("l"); + PropertyMap lm = (PropertyMap) l.getList().get(0); + PropertyMap innerMap = lm.getMap("innerMap"); + PropertySimple c1 = innerMap.getSimple("c1"); + PropertyList c2 = innerMap.getList("c2"); + PropertySimple simple = lm.getSimple("simple"); + PropertyList innerList = lm.getList("innerList"); + PropertySimple ls = (PropertySimple) l.getList().get(1); + PropertyList ll = (PropertyList) l.getList().get(2); + PropertyList lll = (PropertyList) ll.getList().get(0); + PropertyMap llm = (PropertyMap) ll.getList().get(1); + + //all the aspects of the above mess have been tested in the previous tests + //this just really is here to prove the point of how messy our configs can be + + assert c1 != null; + assert c2 != null; + assert simple != null; + assert innerList != null; + assert ls != null; + assert lll != null; + assert llm != null; + } + + public void testRawConfigs() { + Configuration config = Configuration.builder().openRawConfiguration().withPath("a/b") + .withContents("asdf", "123").closeRawConfiguration().build(); + + RawConfiguration r = config.getRawConfigurations().iterator().next(); + assert r.getPath().equals("a/b") : "Unexpected path"; + assert r.getContents().equals("asdf") : "Unexpected contents"; + assert r.getSha256().equals("123") : "Unexpected sha256"; + assert r.getConfiguration() == config : "Unexpected raw config owning configuration"; + } + + private void testSimple(PropertySimple p, PropertyMap expectedParentMap, PropertyList expectedParentList, + String expectedValue) { + assertSame(p.getParentMap(), expectedParentMap, "Unexpected parent map"); + assertSame(p.getParentList(), expectedParentList, "Unexpected parent list"); + assertEquals(p.getStringValue(), expectedValue, "Unexpected value"); + } +} commit eb3c52f1ba91a70fa7bdb45405849a1af4aa524a Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 15 10:18:15 2013 +0200 Add a JavaFX frontend to the PluginGenerator. diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index e9a5e29..5aa512c 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -22,6 +22,14 @@ <build> <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.7</source> + <target>1.7</target> + </configuration> + </plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> @@ -98,6 +106,13 @@ <artifactId>rhq-pluginAnnotations</artifactId> <version>4.8.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>javafx</artifactId> + <version>2.0</version> + <systemPath>${java.home}/lib/jfxrt.jar</systemPath> + <scope>system</scope> + </dependency> </dependencies> </project> diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java new file mode 100644 index 0000000..06f3fec --- /dev/null +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java @@ -0,0 +1,295 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginGen; + +import java.io.File; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javafx.application.Application; +import javafx.beans.value.ChangeListener; +import javafx.beans.value.ObservableValue; +import javafx.collections.ObservableList; +import javafx.event.ActionEvent; +import javafx.event.EventHandler; +import javafx.geometry.Insets; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.Scene; +import javafx.scene.control.*; +import javafx.scene.layout.BorderPane; +import javafx.scene.layout.GridPane; +import javafx.scene.layout.HBox; +import javafx.scene.layout.VBox; +import javafx.scene.paint.Color; +import javafx.scene.text.Font; +import javafx.scene.text.FontPosture; +import javafx.scene.text.FontWeight; +import javafx.scene.text.Text; +import javafx.scene.text.TextAlignment; +import javafx.stage.DirectoryChooser; +import javafx.stage.Stage; + +/** + * JavaFX version of the plugin generator + * @author Heiko W. Rupp + */ +public class Generator extends Application{ + + Props props = new Props(); + private Text errorMessage; + private Stage primaryStage; + + public static void main(String[] args) { + launch(args); + } + + + @Override + public void start(Stage stage) throws Exception { + primaryStage = stage; + + Button createButton = new Button(); + createButton.setText("Create!"); + createButton.setAlignment(Pos.BOTTOM_RIGHT); + createButton.setOnAction(new EventHandler<ActionEvent>() { + @Override + public void handle(ActionEvent actionEvent) { + + PluginGen pluginGen = new PluginGen(); + pluginGen.postprocess(props); + try { + pluginGen.generate(props); + setInfoMessage("Generated!"); + + } + catch (Exception e) { + setErrorMessage("Error during generation: " + e.getMessage()); + } + } + }); + + GridPane pluginLevelPane = new GridPane(); + pluginLevelPane.setPadding(new Insets(10)); + Text pluginLevelDescription = new Text("Plugin level properties"); + pluginLevelDescription.setTextAlignment(TextAlignment.CENTER); + pluginLevelDescription.setFont(Font.font("Arial", FontWeight.BOLD, 14)); + + Text resourceLevelDescription = new Text("ResourceType level properties"); + resourceLevelDescription.setTextAlignment(TextAlignment.CENTER); + resourceLevelDescription.setFont(Font.font("Arial", FontWeight.BOLD, 14)); + + Text descriptionDescription = new Text("Field description"); + descriptionDescription.setTextAlignment(TextAlignment.CENTER); + descriptionDescription.setFont(Font.font("Arial", FontWeight.BOLD, 14)); + + HBox msgBox = getMessagesBox(); + + GridPane resourceLevelPane = new GridPane(); + resourceLevelPane.setPadding(new Insets(10)); + Text descriptionText = new Text(); + descriptionText.setFont(Font.font("Arial", FontPosture.ITALIC,12)); + + VBox innerBox = new VBox(); + innerBox.setAlignment(Pos.CENTER_LEFT); + innerBox.setPadding(new Insets(25, 25, 25, 25)); + innerBox.setSpacing(8); + + addFields(pluginLevelPane, true, descriptionText); + addFields(resourceLevelPane, false, descriptionText); + + ObservableList<Node> children = innerBox.getChildren(); + children.add(pluginLevelDescription); + children.add(pluginLevelPane); + children.add(resourceLevelDescription); + children.add(resourceLevelPane); + + + ScrollPane scrollPane = new ScrollPane(); + scrollPane.setContent(innerBox); + + BorderPane outerBox = new BorderPane(); + outerBox.setTop(msgBox); + outerBox.setPadding(new Insets(5)); + outerBox.setCenter(scrollPane); + + VBox descriptionBox = new VBox(); + descriptionBox.getChildren().add(descriptionDescription); + descriptionBox.getChildren().add(descriptionText); + outerBox.setBottom(descriptionBox); + + outerBox.setRight(createButton); + + + stage.setScene(new Scene(outerBox, 600, 550)); + stage.show(); + } + + private HBox getMessagesBox() { + HBox msgBox = new HBox(); + Label label = new Label("Messages:"); + msgBox.getChildren().add(label); + errorMessage = new Text(); + errorMessage.setFont(Font.font("Arial", FontWeight.SEMI_BOLD, 12)); + errorMessage.setId("errorMessage"); + msgBox.getChildren().add(errorMessage); + return msgBox; + } + + private int addFields(final GridPane root, boolean pluginLevel, final Text descriptionField) { + + int row = 0; + for (final Prop prop : Prop.values()) { + + if (!prop.isPluginLevel()==pluginLevel) { + continue; + } + + // Add the label + String name = prop.readableName(); + Label fieldName = new Label(name); + root.add(fieldName,0,row); + + // Now add the field itself + final Class propType = prop.getType(); + if (propType.equals(String.class)) { + final Pattern pattern = Pattern.compile(prop.getValidationRegex()); + + final TextField input = new TextField(); + // Add field leave event to fill in the props with the result + input.focusedProperty().addListener(new ChangeListener<Boolean>() { + @Override + public void changed(ObservableValue<? extends Boolean> observableValue, Boolean oldState, + Boolean newState) { + if (newState) { // User entered input field + descriptionField.setText(prop.getDescription()); + } + else { // User left input field + descriptionField.setText(""); + setPropsValue(prop.getVariableName(),input.getText(), propType); // TODO right place? + } + } + }); + // Add validation of the input + input.textProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newText) { + Matcher m = pattern.matcher(newText); + if (!m.matches()) { + setErrorMessage("Input does not match " + prop.getValidationRegex()); + } else { + clearErrorMessage(); + } + + } + }); + root.add(input, 1, row); + } else if (propType.equals(Boolean.class) || propType.equals(boolean.class)) { + final ChoiceBox choiceBox = new ChoiceBox(); + choiceBox.getItems().addAll("Yes", "No"); + choiceBox.getSelectionModel().selectLast(); // NO is default + choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { + setPropsValue(prop.getVariableName(),newValue.equals("Yes"),propType); + } + }); + + root.add(choiceBox,1,row); + } else if (propType.equals(ResourceCategory.class)) { + final ChoiceBox choiceBox = new ChoiceBox(); + for (ResourceCategory cat : ResourceCategory.values()) { + choiceBox.getItems().add(cat.getLowerName()); + } + choiceBox.getSelectionModel().selectLast(); // service is default + choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { + ResourceCategory newCategory = ResourceCategory.valueOf(newValue.toUpperCase()); + setPropsValue(prop.getVariableName(),newCategory,propType); + } + }); + + root.add(choiceBox,1,row); + } else if (propType.equals(File.class)) { + // Can not add this directly, so add a button to trigger it + final Text text = new Text(); + text.setText("Pick a directory"); + root.add(text,1,row); + Button pickButton = new Button("Pick"); + pickButton.setOnAction(new EventHandler<ActionEvent>() { + @Override + public void handle(ActionEvent actionEvent) { + DirectoryChooser chooser = new DirectoryChooser(); + chooser.setTitle("Pick a directory where the plugin will be put in."); + File dir = chooser.showDialog(primaryStage); + if (dir != null) { + String dirName = dir.getAbsolutePath(); + props.setFileSystemRoot(dirName); + clearErrorMessage(); + text.setText(dirName); + } else { + setErrorMessage("No directory selected"); + text.setText("Pick a directory"); + } + } + }); + + root.add(pickButton,2,row); + } + + row++; + + } + + return row; + } + + private void setInfoMessage(String message) { + errorMessage.setText(message); + errorMessage.setFill(Color.DARKGREEN); + } + private void setErrorMessage(String message) { + errorMessage.setText(message); + errorMessage.setFill(Color.RED); + } + + private void clearErrorMessage() { + errorMessage.setText(""); + errorMessage.setFill(Color.WHITE); + } + + private void setPropsValue(String variableName, Object value, Class type) { + + String var = variableName.substring(0,1).toUpperCase() + variableName.substring(1); + String setterName = "set"+ var; + + try { + Method setter = Props.class.getDeclaredMethod(setterName,type); + setter.invoke(props,value); + } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { + e.printStackTrace(); // TODO: Customise this generated block + setErrorMessage(e.getMessage()); + } + } + +} diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java index 223a57f..64b5509 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java @@ -115,7 +115,7 @@ public class PluginGen { * Do some post processing over the input received. * @param props The properties just recorded from the user input */ - private void postprocess(Props props) { + protected void postprocess(Props props) { // Set the package String pkg = props.getPackagePrefix() + "." + props.getName(); @@ -231,7 +231,7 @@ public class PluginGen { * Trigger the generation of the directory hierarchy. * @param props Parameters to take into account */ - private void generate(Props props) { + protected void generate(Props props) { log.info("Generating..."); diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java new file mode 100644 index 0000000..73c4cd9 --- /dev/null +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java @@ -0,0 +1,114 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginGen; + +import java.io.File; + +/** + * All the properties that can be configured along with type, description and simple validation rules + * @author Heiko W. Rupp + */ +public enum Prop { + + PLUGIN_NAME("pluginName", String.class,"Name of the plugin", "\\w+" , true ), + PLUGIN_DESCRIPTION("pluginDescription", String.class,"Description of the plugin",".*" , true ), + PACKAGE("packagePrefix", String.class,"Default Package","[a-zA-Z\\.]+",true ), + FILE_ROOT("fileSystemRoot", File.class,"Root directory to put the plugin",".*",true ), + RHQ_VERSION("rhqVersion",String.class,"RHQ version to use","[0-9][0-9\\.]+",true), + + CATEGORY("category", ResourceCategory.class, "Category of the resource type (platform = host level)",null), + TYPE_NAME("name", String.class, "Name of the resource type", "\\w+"), + DESCRIPTION("description", String.class, "Description of the type", ".*"), + DISCOVERY_CLASS("discoveryClass", String.class, "Discovery class", "[A-Z][a-zA-Z0-9]*"), + COMPONENT_CLASS("componentClass", String.class, "Discovery class", "[A-Z][a-zA-Z0-9]*"), + IS_SINGLETON("singleton",Boolean.class,"Is this type a singleton, which means that" + + " there can only be one resource of that type for the given parent?",null), + HAS_METRICS("hasMetrics",boolean.class,"Does this type support taking metrics?",null), + HAS_OPERATIONS("hasOperations",boolean.class,"Does this type support operations?",null), + HAS_EVENTS("events",boolean.class,"Does this type support events?",null), + HAS_SUPPORT_FACET("supportFacet",boolean.class,"Does this type support the support facet?",null), + RESOURCE_CONFIGURATION("resourceConfiguration",boolean.class,"Does this type support " + + "configuring the resource?",".*"), + CAN_CREATE_CHILDREN("createChildren",boolean.class,"Can the type create child resources?",null), + CAN_DELETE_CHILDREN("deleteChildren",boolean.class,"Can the type delete child resources?",null), + + // TODO add the remaining properties from Prop.class + + ; + + private String variableName; + private Class type; + private String description; + private boolean pluginLevel; + private String validationRegex; + + private Prop(String variableName, Class type, String description, String validationRegex, boolean pluginLevel) { + this.variableName = variableName; + this.type = type; + this.description = description; + this.validationRegex = validationRegex; + this.pluginLevel = pluginLevel; + } + + private Prop(String variableName, Class type, String description, String validationRegex) { + this.variableName = variableName; + this.type = type; + this.description = description; + this.validationRegex = validationRegex; + } + + public String getVariableName() { + return variableName; + } + + public Class getType() { + return type; + } + + public String getDescription() { + return description; + } + + public boolean isPluginLevel() { + return pluginLevel; + } + + public String getValidationRegex() { + return validationRegex; + } + + public String readableName() { + + String name = name(); + name = name.replaceAll("_", " "); + String[] parts = name.split(" "); + StringBuilder builder = new StringBuilder(); + for (int i = 0; i < parts.length; i++) { + String part = parts[i]; + part = part.substring(0,1).toUpperCase() + part.substring(1).toLowerCase(); + builder.append(part); + if (i < parts.length-1) { + builder.append(" "); + } + } + return builder.toString(); + } + +} diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java index 484d591..237f5ad 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java @@ -36,7 +36,7 @@ import org.rhq.helpers.pluginAnnotations.agent.Units; public class Props { /** What category is this ? */ - private ResourceCategory category; + private ResourceCategory category = ResourceCategory.SERVICE; /** The name of this item */ private String name; /** A description of the plugin */ commit 18c42dafe1e9e51a16a5ceba068a1e27cb8788c0 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 14 22:36:40 2013 -0400 adding heap dump properties to resource configuration The heap dump directory defaults to <rhq-storage-basedir>/bin and we are generating heap dumps by default. Also refactoring and updating tests some. diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index 99ba48b..e82f290 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -11,6 +11,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.util.PropertiesFileUpdate; +import org.rhq.core.util.StringUtil; /** * @author John Sanda @@ -35,12 +36,27 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { String heapMaxProp = properties.getProperty("heap_max"); String heapNewProp = properties.getProperty("heap_new"); String threadStackSizeProp = properties.getProperty("thread_stack_size"); + String heapDumpOnOOMError = properties.getProperty("heap_dump_on_OOMError"); + String heapDumpDir = properties.getProperty("heap_dump_dir"); config.put(new PropertySimple("minHeapSize", heapMinProp.substring(4))); config.put(new PropertySimple("maxHeapSize", heapMaxProp.substring(4))); config.put(new PropertySimple("heapNewSize", heapNewProp.substring(4))); config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4))); + if (!StringUtil.isEmpty(heapDumpOnOOMError)) { + config.put(new PropertySimple("heapDumpOnOOMError", true)); + } else { + config.put(new PropertySimple("heapDumpOnOOMError", false)); + } + + if (!StringUtil.isEmpty(heapDumpDir)) { + config.put(new PropertySimple("heapDumpDir", heapDumpDir)); + } else { + File basedir = jvmOptsFile.getParentFile().getParentFile(); + config.put(new PropertySimple("heapDumpDir", new File(basedir, "bin").getAbsolutePath())); + } + return config; } @@ -58,6 +74,14 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { properties.setProperty("heap_new", "-Xmn" + config.getSimpleValue("heapNewSize")); properties.setProperty("thread_stack_size", "-Xss" + config.getSimpleValue("threadStackSize")); + if (config.getSimple("heapDumpOnOOMError").getBooleanValue()) { + properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + } else { + properties.setProperty("heap_dump_on_OOMError", ""); + } + + properties.setProperty("heap_dump_dir", config.getSimpleValue("heapDumpDir")); + propertiesUpdater.update(properties); configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 5713288..c700257 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -124,6 +124,11 @@ the -Xmn JVM option."/> <c:simple-property name="threadStackSize" description="The thread stack size. This memory is allocated to each thread off heap."/> + <c:simple-property name="heapDumpOnOOMError" displayName="Heap Dump on OutOfMemoryError" type="boolean" + default="true" + description="Generate a heap dump when an OutOfMemoryError occurs"/> + <c:simple-property name="heapDumpDir" displayName="Heap Dump Directory" required="false" + description="The directory in which heap dumps will be written."/> </c:group> </resource-configuration> diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java index f8d7bdc..5c5f089 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java @@ -6,8 +6,10 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.lang.reflect.Method; import java.util.Properties; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.rhq.core.domain.configuration.Configuration; @@ -19,16 +21,18 @@ import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; */ public class StorageNodeConfigDelegateTest { + private File basedir; + + @BeforeMethod + public void initDirs(Method test) throws Exception { + File dir = new File(getClass().getResource(".").toURI()); + basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); + } @Test public void loadValidConfig() throws Exception { - File dir = new File(getClass().getResource(".").toURI()); - File basedir = new File(dir, getClass().getSimpleName() + "/loadValidConfig"); - File confDir = new File(basedir, "conf"); - - confDir.mkdirs(); - createDefaultConfig(confDir); + createDefaultConfig(); StorageNodeConfigDelegate configDelegate = new StorageNodeConfigDelegate(basedir); Configuration config = configDelegate.loadResourceConfiguration(); @@ -37,22 +41,22 @@ public class StorageNodeConfigDelegateTest { assertEquals(config.getSimpleValue("maxHeapSize"), "512M", "Failed to load property [maxHepSize]"); assertEquals(config.getSimpleValue("heapNewSize"), "128M", "Failed to load property [heapNewSize]"); assertEquals(config.getSimpleValue("threadStackSize"), "180k", "Failed to load property [threadStackSize]"); + assertEquals(config.getSimple("heapDumpOnOOMError").getBooleanValue(), (Boolean) true, + "Failed to load property [heapDumpOnOOMError]"); + assertEquals(new File(config.getSimpleValue("heapDumpDir")), binDir(), "Failed to load property [heapDumpDir]"); } @Test public void updateValidConfig() throws Exception { - File dir = new File(getClass().getResource(".").toURI()); - File basedir = new File(dir, getClass().getSimpleName() + "/updateValidConfig"); - File confDir = new File(basedir, "conf"); - - confDir.mkdirs(); - createDefaultConfig(confDir); + createDefaultConfig(); Configuration config = new Configuration(); config.put(new PropertySimple("minHeapSize", "1024M")); config.put(new PropertySimple("maxHeapSize", "1024M")); config.put(new PropertySimple("heapNewSize", "256M")); config.put(new PropertySimple("threadStackSize", "240k")); + config.put(new PropertySimple("heapDumpOnOOMError", true)); + config.put(new PropertySimple("heapDumpDir", confDir())); ConfigurationUpdateReport report = new ConfigurationUpdateReport(config); @@ -60,23 +64,44 @@ public class StorageNodeConfigDelegateTest { configDelegate.updateResourceConfiguration(report); Properties properties = new Properties(); - properties.load(new FileInputStream(new File(confDir, "cassandra-jvm.properties"))); + properties.load(new FileInputStream(new File(confDir(), "cassandra-jvm.properties"))); assertEquals(properties.getProperty("heap_min"), "-Xms1024M", "Failed to update property [minHeapSize]"); assertEquals(properties.getProperty("heap_max"), "-Xmx1024M", "Failed to update property [maxHeapSize]"); assertEquals(properties.getProperty("heap_new"), "-Xmn256M", "Failed to update property [heapNewSize]"); assertEquals(properties.getProperty("thread_stack_size"), "-Xss240k", "Failed to update property [threadStackSize]"); + assertEquals(properties.getProperty("heap_dump_on_OOMError"), "-XX:+HeapDumpOnOutOfMemoryError", + "Failed to update property [heap_dump_on_OOMError]"); + assertEquals(properties.getProperty("heap_dump_dir"), confDir().getAbsolutePath(), + "Failed to update property [heap_dump_dir]"); } - private void createDefaultConfig(File confDir) throws IOException { + private void createDefaultConfig() throws IOException { Properties properties = new Properties(); properties.setProperty("heap_min", "-Xms512M"); properties.setProperty("heap_max", "-Xmx512M"); properties.setProperty("heap_new", "-Xmn128M"); properties.setProperty("thread_stack_size", "-Xss180k"); + properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + + properties.store(new FileOutputStream(new File(confDir(), "cassandra-jvm.properties")), ""); + } + + private File confDir() { + return mkdirIfNecessary(basedir, "conf"); + } + + private File binDir() { + return mkdirIfNecessary(basedir, "bin"); + } - properties.store(new FileOutputStream(new File(confDir, "cassandra-jvm.properties")), ""); + private File mkdirIfNecessary(File parent, String path) { + File dir = new File(parent, path); + if (!dir.exists()) { + dir.mkdirs(); + } + return dir; } } commit 1130a8be9a9a44c6e4670053bd7347aed4e01f30 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 14 09:44:04 2013 -0400 adding initial support for resource config updates of StorageNodeComponent Also making minHeapSize read only as we also want it the same as maxHeapSize. diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index ea3b9ea..a88f56e 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -39,103 +39,6 @@ <profiles> <profile> - <id>integration-tests</id> - <activation> - <property> - <name>maven.test.skip</name> - <value>!true</value> - </property> - </activation> - - <build> - <plugins> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>pre-integration-test</phase> - <configuration> - <target> - <echo>Setting up plugin dependencies...</echo> - <property name="settings.localRepository" location="${user.home}/.m2/repository" /> - <mkdir dir="target/itest" /> - <mkdir dir="target/itest/plugins" /> - <mkdir dir="target/itest/lib" /> - <copy toDir="target/itest/plugins" flatten="true"> -  - <fileset dir="${settings.localRepository}/"> - <include name="org/rhq/rhq-platform-plugin/${project.version}/rhq-platform-plugin-${project.version}.jar" /> - <include name="org/rhq/rhq-jmx-plugin/${project.version}/rhq-jmx-plugin-${project.version}.jar" /> - <include name="org/rhq/rhq-jboss-as-7-jmx-plugin/${project.version}/rhq-jboss-as-7-jmx-plugin-${project.version}.jar" /> - </fileset> - <fileset dir="${project.build.directory}"> - <include name="rhq-rhqserver-plugin-${project.version}.jar" /> - </fileset> - </copy> - <unzip dest="target/itest/lib"> - <fileset dir="${settings.localRepository}/org/hyperic/sigar-dist/${sigar.version}" includes="*.zip" /> - <patternset> - <include name="**/lib/sigar.jar" /> - <include name="**/lib/bcel*.jar" /> - <include name="**/lib/*.so" /> - <include name="**/lib/*.sl" /> - <include name="**/lib/*.dll" /> - <include name="**/lib/*.dylib" /> - </patternset> - </unzip> - <move todir="target/itest/lib" flatten="true"> - <fileset dir="target/itest/lib"> - <include name="**/lib/*" /> - </fileset> - </move> - <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>${maven.test.skip}</skip> - <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> - <useSystemClassLoader>false</useSystemClassLoader> - <argLine>${jacoco.integration-test.args} -Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine> - <systemProperties> - <property> - <name>project.artifactId</name> - <value>${project.artifactId}</value> - </property> - <property> - <name>project.version</name> - <value>${project.version}</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - - <profile> <id>dev</id> <properties> diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 737dded..6194146 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -26,9 +26,7 @@ package org.rhq.plugins.storage; import java.io.File; -import java.io.FileInputStream; import java.util.List; -import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,25 +60,13 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper @Override public Configuration loadResourceConfiguration() throws Exception { - File confDir = new File(getBasedir(), "conf"); - File jvmOptsFile = new File(confDir, "cassandra-jvm.properties"); - - Properties properties = new Properties(); - properties.load(new FileInputStream(jvmOptsFile)); - - Configuration config = new Configuration(); - - String heapMinProp = properties.getProperty("heap_min"); - String heapMaxProp = properties.getProperty("heap_max"); - String heapNewProp = properties.getProperty("heap_new"); - String threadStackSizeProp = properties.getProperty("thread_stack_size"); - - config.put(new PropertySimple("minHeapSize", heapMinProp.substring(4))); - config.put(new PropertySimple("maxHeapSize", heapMaxProp.substring(4))); - config.put(new PropertySimple("heapNewSize", heapNewProp.substring(4))); - config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4))); + return new StorageNodeConfigDelegate(getBasedir()).loadResourceConfiguration(); + } - return config; + @Override + public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { + StorageNodeConfigDelegate configDelegate = new StorageNodeConfigDelegate(getBasedir()); + configDelegate.updateResourceConfiguration(configurationUpdateReport); } private File getBasedir() { @@ -89,10 +75,6 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } @Override - public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { - } - - @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if (name.equals("addNodeMaintenance")) { return nodeAdded(parameters); diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java new file mode 100644 index 0000000..99ba48b --- /dev/null +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -0,0 +1,69 @@ +package org.rhq.plugins.storage; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Properties; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.pluginapi.configuration.ConfigurationFacet; +import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.util.PropertiesFileUpdate; + +/** + * @author John Sanda + */ +public class StorageNodeConfigDelegate implements ConfigurationFacet { + + private File jvmOptsFile; + + public StorageNodeConfigDelegate(File basedir) { + File confDir = new File(basedir, "conf"); + jvmOptsFile = new File(confDir, "cassandra-jvm.properties"); + } + + @Override + public Configuration loadResourceConfiguration() throws Exception { + Properties properties = new Properties(); + properties.load(new FileInputStream(jvmOptsFile)); + + Configuration config = new Configuration(); + + String heapMinProp = properties.getProperty("heap_min"); + String heapMaxProp = properties.getProperty("heap_max"); + String heapNewProp = properties.getProperty("heap_new"); + String threadStackSizeProp = properties.getProperty("thread_stack_size"); + + config.put(new PropertySimple("minHeapSize", heapMinProp.substring(4))); + config.put(new PropertySimple("maxHeapSize", heapMaxProp.substring(4))); + config.put(new PropertySimple("heapNewSize", heapNewProp.substring(4))); + config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4))); + + return config; + } + + @Override + public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { + try { + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(jvmOptsFile.getAbsolutePath()); + Properties properties = propertiesUpdater.loadExistingProperties(); + + Configuration config = configurationUpdateReport.getConfiguration(); + + // We want min and max heap to be the same + properties.setProperty("heap_min", "-Xms" + config.getSimpleValue("maxHeapSize")); + properties.setProperty("heap_max", "-Xmx" + config.getSimpleValue("maxHeapSize")); + properties.setProperty("heap_new", "-Xmn" + config.getSimpleValue("heapNewSize")); + properties.setProperty("thread_stack_size", "-Xss" + config.getSimpleValue("threadStackSize")); + + propertiesUpdater.update(properties); + + configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); + } catch (IOException e) { + configurationUpdateReport.setErrorMessageFromThrowable(e); + } + + } +} diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index b012f1c..5713288 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -114,8 +114,9 @@ <resource-configuration> <c:group name="MemorySettings"> <c:simple-property name="minHeapSize" + readOnly="true" description="The minimum heap size. This value will be used with the -Xms JVM option. This - should always be the same as Max Heap Size."/> + is read only because it is automatically set to the same value as Max Heap Size."/> <c:simple-property name="maxHeapSize" description="The maximum heap size. This value will be used with the -Xmx JVM option."/> <c:simple-property name="heapNewSize" diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java new file mode 100644 index 0000000..f8d7bdc --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java @@ -0,0 +1,82 @@ +package org.rhq.plugins.storage; + +import static org.testng.Assert.assertEquals; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Properties; + +import org.testng.annotations.Test; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; + +/** + * @author John Sanda + */ +public class StorageNodeConfigDelegateTest { + + + + @Test + public void loadValidConfig() throws Exception { + File dir = new File(getClass().getResource(".").toURI()); + File basedir = new File(dir, getClass().getSimpleName() + "/loadValidConfig"); + File confDir = new File(basedir, "conf"); + + confDir.mkdirs(); + createDefaultConfig(confDir); + + StorageNodeConfigDelegate configDelegate = new StorageNodeConfigDelegate(basedir); + Configuration config = configDelegate.loadResourceConfiguration(); + + assertEquals(config.getSimpleValue("minHeapSize"), "512M", "Failed to load property [minHeapSize]"); + assertEquals(config.getSimpleValue("maxHeapSize"), "512M", "Failed to load property [maxHepSize]"); + assertEquals(config.getSimpleValue("heapNewSize"), "128M", "Failed to load property [heapNewSize]"); + assertEquals(config.getSimpleValue("threadStackSize"), "180k", "Failed to load property [threadStackSize]"); + } + + @Test + public void updateValidConfig() throws Exception { + File dir = new File(getClass().getResource(".").toURI()); + File basedir = new File(dir, getClass().getSimpleName() + "/updateValidConfig"); + File confDir = new File(basedir, "conf"); + + confDir.mkdirs(); + createDefaultConfig(confDir); + + Configuration config = new Configuration(); + config.put(new PropertySimple("minHeapSize", "1024M")); + config.put(new PropertySimple("maxHeapSize", "1024M")); + config.put(new PropertySimple("heapNewSize", "256M")); + config.put(new PropertySimple("threadStackSize", "240k")); + + ConfigurationUpdateReport report = new ConfigurationUpdateReport(config); + + StorageNodeConfigDelegate configDelegate = new StorageNodeConfigDelegate(basedir); + configDelegate.updateResourceConfiguration(report); + + Properties properties = new Properties(); + properties.load(new FileInputStream(new File(confDir, "cassandra-jvm.properties"))); + + assertEquals(properties.getProperty("heap_min"), "-Xms1024M", "Failed to update property [minHeapSize]"); + assertEquals(properties.getProperty("heap_max"), "-Xmx1024M", "Failed to update property [maxHeapSize]"); + assertEquals(properties.getProperty("heap_new"), "-Xmn256M", "Failed to update property [heapNewSize]"); + assertEquals(properties.getProperty("thread_stack_size"), "-Xss240k", + "Failed to update property [threadStackSize]"); + } + + private void createDefaultConfig(File confDir) throws IOException { + Properties properties = new Properties(); + properties.setProperty("heap_min", "-Xms512M"); + properties.setProperty("heap_max", "-Xmx512M"); + properties.setProperty("heap_new", "-Xmn128M"); + properties.setProperty("thread_stack_size", "-Xss180k"); + + properties.store(new FileOutputStream(new File(confDir, "cassandra-jvm.properties")), ""); + } + +} commit cabe99fea2aa6ecbd2e26f2040ed70951c451dc2 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 13 16:30:19 2013 -0400 initial support for resource configuration with StorageNodeComponent This commit introduces initial support for reading JVM options. diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index cc34fe3..737dded 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -25,7 +25,10 @@ package org.rhq.plugins.storage; +import java.io.File; +import java.io.FileInputStream; import java.util.List; +import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,6 +41,8 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.pluginapi.configuration.ConfigurationFacet; +import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.core.util.exception.ThrowableUtil; @@ -47,7 +52,7 @@ import org.rhq.plugins.cassandra.util.KeyspaceService; /** * @author John Sanda */ -public class StorageNodeComponent extends CassandraNodeComponent implements OperationFacet { +public class StorageNodeComponent extends CassandraNodeComponent implements OperationFacet, ConfigurationFacet { private Log log = LogFactory.getLog(StorageNodeComponent.class); @@ -56,6 +61,38 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper private static final String RHQ_KEYSPACE = "rhq"; @Override + public Configuration loadResourceConfiguration() throws Exception { + File confDir = new File(getBasedir(), "conf"); + File jvmOptsFile = new File(confDir, "cassandra-jvm.properties"); + + Properties properties = new Properties(); + properties.load(new FileInputStream(jvmOptsFile)); + + Configuration config = new Configuration(); + + String heapMinProp = properties.getProperty("heap_min"); + String heapMaxProp = properties.getProperty("heap_max"); + String heapNewProp = properties.getProperty("heap_new"); + String threadStackSizeProp = properties.getProperty("thread_stack_size"); + + config.put(new PropertySimple("minHeapSize", heapMinProp.substring(4))); + config.put(new PropertySimple("maxHeapSize", heapMaxProp.substring(4))); + config.put(new PropertySimple("heapNewSize", heapNewProp.substring(4))); + config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4))); + + return config; + } + + private File getBasedir() { + Configuration pluginConfig = getResourceContext().getPluginConfiguration(); + return new File(pluginConfig.getSimpleValue("baseDir")); + } + + @Override + public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { + } + + @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if (name.equals("addNodeMaintenance")) { return nodeAdded(parameters); diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index f02c8e6..b012f1c 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -111,6 +111,21 @@ </parameters> </operation> + <resource-configuration> + <c:group name="MemorySettings"> + <c:simple-property name="minHeapSize" + description="The minimum heap size. This value will be used with the -Xms JVM option. This + should always be the same as Max Heap Size."/> + <c:simple-property name="maxHeapSize" + description="The maximum heap size. This value will be used with the -Xmx JVM option."/> + <c:simple-property name="heapNewSize" + description="The size of the new generation portion of the heap. This value will be used with + the -Xmn JVM option."/> + <c:simple-property name="threadStackSize" + description="The thread stack size. This memory is allocated to each thread off heap."/> + </c:group> + </resource-configuration> + <server name="Cassandra Server JVM" sourcePlugin="JMX" sourceType="JMX Server" discovery="org.rhq.plugins.jmx.EmbeddedJMXServerDiscoveryComponent" commit 5d1cb191a0ea22dd4f24379597645aeff3934df7 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 13 13:09:41 2013 -0400 updating/fixing integration test failure diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java index 91a5459..76ff090 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java @@ -103,8 +103,8 @@ public class DeployerITest { } @Test(dependsOnMethods = "applyConfigChanges") - public void verifyConfigChangesToCassandraEnv() throws Exception { - assertFileDeployedAndUpdated("cassandra-env.sh"); + public void verifyConfigChangesToCassandraJvmOpts() throws Exception { + assertFileDeployedAndUpdated("cassandra-jvm.properties"); } private void assertFileDeployedAndUpdated(String fileName) throws Exception { diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-env.sh b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-env.sh deleted file mode 100644 index 62dc0f2..0000000 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-env.sh +++ /dev/null @@ -1,247 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -calculate_heap_sizes() -{ - case "`uname`" in - Linux) - system_memory_in_mb=`free -m | awk '/Mem:/ {print $2}'` - system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` - ;; - FreeBSD) - system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - SunOS) - system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'` - system_cpu_cores=`psrinfo | wc -l` - ;; - Darwin) - system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - *) - # assume reasonable defaults for e.g. a modern desktop or - # cheap server - system_memory_in_mb="2048" - system_cpu_cores="2" - ;; - esac - - # some systems like the raspberry pi don't report cores, use at least 1 - if [ "$system_cpu_cores" -lt "1" ] - then - system_cpu_cores="1" - fi - - # set max heap size based on the following - # max(min(1/2 ram, 1024MB), min(1/4 ram, 8GB)) - # calculate 1/2 ram and cap to 1024MB - # calculate 1/4 ram and cap to 8192MB - # pick the max - half_system_memory_in_mb=`expr $system_memory_in_mb / 2` - quarter_system_memory_in_mb=`expr $half_system_memory_in_mb / 2` - if [ "$half_system_memory_in_mb" -gt "1024" ] - then - half_system_memory_in_mb="1024" - fi - if [ "$quarter_system_memory_in_mb" -gt "8192" ] - then - quarter_system_memory_in_mb="8192" - fi - if [ "$half_system_memory_in_mb" -gt "$quarter_system_memory_in_mb" ] - then - max_heap_size_in_mb="$half_system_memory_in_mb" - else - max_heap_size_in_mb="$quarter_system_memory_in_mb" - fi - MAX_HEAP_SIZE="${max_heap_size_in_mb}M" - - # Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4 * heap size) - max_sensible_yg_per_core_in_mb="100" - max_sensible_yg_in_mb=`expr $max_sensible_yg_per_core_in_mb "*" $system_cpu_cores` - - desired_yg_in_mb=`expr $max_heap_size_in_mb / 4` - - if [ "$desired_yg_in_mb" -gt "$max_sensible_yg_in_mb" ] - then - HEAP_NEWSIZE="${max_sensible_yg_in_mb}M" - else - HEAP_NEWSIZE="${desired_yg_in_mb}M" - fi -} - -# Determine the sort of JVM we'll be running on. - -java_ver_output=`"${JAVA:-java}" -version 2>&1` - -jvmver=`echo "$java_ver_output" | awk -F'"' 'NR==1 {print $2}'` -JVM_VERSION=${jvmver%_*} -JVM_PATCH_VERSION=${jvmver#*_} - -jvm=`echo "$java_ver_output" | awk 'NR==2 {print $1}'` -case "$jvm" in - OpenJDK) - JVM_VENDOR=OpenJDK - # this will be "64-Bit" or "32-Bit" - JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $2}'` - ;; - "Java(TM)") - JVM_VENDOR=Oracle - # this will be "64-Bit" or "32-Bit" - JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $3}'` - ;; - *) - # Help fill in other JVM values - JVM_VENDOR=other - JVM_ARCH=unknown - ;; -esac - - -# Override these to set the amount of memory to allocate to the JVM at -# start-up. For production use you may wish to adjust this for your -# environment. MAX_HEAP_SIZE is the total amount of memory dedicated -# to the Java heap; HEAP_NEWSIZE refers to the size of the young -# generation. Both MAX_HEAP_SIZE and HEAP_NEWSIZE should be either set -# or not (if you set one, set the other). -# -# The main trade-off for the young generation is that the larger it -# is, the longer GC pause times will be. The shorter it is, the more -# expensive GC will be (usually). -# -# The example HEAP_NEWSIZE assumes a modern 8-core+ machine for decent pause -# times. If in doubt, and if you do not particularly want to tweak, go with -# 100 MB per physical CPU core. - -#MAX_HEAP_SIZE="4G" -#HEAP_NEWSIZE="800M" - -if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then - calculate_heap_sizes -else - if [ "x$MAX_HEAP_SIZE" = "x" ] || [ "x$HEAP_NEWSIZE" = "x" ]; then - echo "please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs (see cassandra-env.sh)" - exit 1 - fi -fi - -# Specifies the default port over which Cassandra will be available for -# JMX connections. -JMX_PORT="7200" - - -# Here we create the arguments that will get passed to the jvm when -# starting cassandra. - -# enable assertions. disabling this in production will give a modest -# performance benefit (around 5%). -JVM_OPTS="$JVM_OPTS -ea" - -# add the jamm javaagent -if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \ - || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ] -then - JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" -fi - -# enable thread priorities, primarily so we can give periodic tasks -# a lower priority to avoid interfering with client workload -JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities" -# allows lowering thread priority without being root. see -# http://tech.stolsvik.com/2010/01/linux-java-thread-priorities-workaround.ht… -JVM_OPTS="$JVM_OPTS -XX:ThreadPriorityPolicy=42" - -# min and max heap sizes should be set to the same value to avoid -# stop-the-world GC pauses during resize, and so that we can lock the -# heap in memory on startup to prevent any of it from being swapped -# out. -JVM_OPTS="$JVM_OPTS -Xms${MAX_HEAP_SIZE}" -JVM_OPTS="$JVM_OPTS -Xmx${MAX_HEAP_SIZE}" -JVM_OPTS="$JVM_OPTS -Xmn${HEAP_NEWSIZE}" -JVM_OPTS="$JVM_OPTS -XX:+HeapDumpOnOutOfMemoryError" - -# set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR -if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then - JVM_OPTS="$JVM_OPTS -XX:HeapDumpPath=$CASSANDRA_HEAPDUMP_DIR/cassandra-`date +%s`-pid$$.hprof" -fi - - -startswith() { [ "${1#$2}" != "$1" ]; } - -if [ "`uname`" = "Linux" ] ; then - # reduce the per-thread stack size to minimize the impact of Thrift - # thread-per-client. (Best practice is for client connections to - # be pooled anyway.) Only do so on Linux where it is known to be - # supported. - # u34 and greater need 180k - JVM_OPTS="$JVM_OPTS -Xss180k" -fi -echo "xss = $JVM_OPTS" - -# GC tuning options -JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC" -JVM_OPTS="$JVM_OPTS -XX:+UseConcMarkSweepGC" -JVM_OPTS="$JVM_OPTS -XX:+CMSParallelRemarkEnabled" -JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8" -JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1" -JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75" -JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly" -JVM_OPTS="$JVM_OPTS -XX:+UseTLAB" -# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check -if [ "$JVM_VERSION" \> "1.7" ] ; then - JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark" -fi - -# GC logging options -- uncomment to enable -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails" -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps" -# JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC" -# JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution" -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime" -# JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure" -# JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1" -# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log" -# If you are using JDK 6u34 7u2 or later you can enable GC log rotation -# don't stick the date in the log name if rotation is on. -# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log" -# JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation" -# JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10" -# JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M" - -# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414 -# JVM_OPTS="$JVM_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1414" - -# Prefer binding to IPv4 network intefaces (when net.ipv6.bindv6only=1). See -# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6342561 (short version: -# comment out this entry to enable IPv6 support). -JVM_OPTS="$JVM_OPTS -Djava.net.preferIPv4Stack=true" - -# jmx: metrics and administration interface -# -# add this if you're having trouble connecting: -# JVM_OPTS="$JVM_OPTS -Djava.rmi.server.hostname=<public name>" -# -# see -# https://blogs.oracle.com/jmxetc/entry/troubleshooting_connection_problems_i… -# for more on configuring JMX through firewalls, etc. (Short version: -# get it working with no firewall first.) -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT" -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false" -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false" -JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS" diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties new file mode 100644 index 0000000..a90d23c --- /dev/null +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties @@ -0,0 +1,112 @@ +enable_assertions="-ea" + +# JMX settings +jmx_port=7200 + +use_thread_priorities="-XX:+UseThreadPriorities" + +thread_priority_policy="-XX:ThreadPriorityPolicy=42" + +heap_min=-Xms${MAX_HEAP_SIZE} +heap_max=-Xmx${MAX_HEAP_SIZE} +heap_new=-Xmn${HEAP_NEWSIZE} + +heap_dump_on_OOMError="-XX:+HeapDumpOnOutOfMemoryError" + +heap_dump_dir="" + +thread_stack_size=-Xss180k + +java_agent="" +# Enable jamm when running on Java 6 patch version 23 or higher. +#java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" + +# GC tuning options +# +# Uses a parallel version of the young generation copying collector alongside +# the default collector. This minimizes pauses by using all available CPUs in +# parallel. The collector is compatible with both the default collector and the +# Concurrent Mark and Sweep (CMS) collector. +# This is a parallel collector option. +use_par_new_gc="-XX:+UseParNewGC" + +# Whether parallel remark enabled (only if ParNewGC) +# This is a parallel collector option. +cms_parallel_remark_enabled="-XX:+CMSParallelRemarkEnabled" + +# Uses the Concurrent Mark and Sweep collector. It is a mostly concurrent +# collector with a low pause time. It is a good match for multi-core systems. +use_concur_mark_sweep_gc="-XX:+UseConcMarkSweepGC" + +# Ratio of eden/survivor space size. The default value is 8. +# This is a Garbage First (G1) garbage collector option. +survivor_ratio="-XX:SurvivorRatio=8" + +# Maximum value for tenuring threshold. +# Young collection tuning option. +max_tenuring_threshold="-XX:MaxTenuringThreshold=1" + +# Percentage CMS generation occupancy to start a CMS collection cycle (A +# negative value means that CMSTirggerRatio is used). +# This is a CMS tuning option. +cms_initiating_occupancy_fraction="-XX:CMSInitiatingOccupancyFraction=75" + +# Only use occupancy as a criterion for starting a CMS collection. +# This is a CMS tuning option. +use_cms_initiating_occupancy_only="-XX:+UseCMSInitiatingOccupancyOnly" + +# Use thread local allocation blocks in young space. Enabled by default. +# This is a young collection tuning option. +use_tlab="-XX:+UseTLAB" + +##################### +# GC logging options +##################### +# Print more details at garbage collection +#print_gc_details="-XX:+PrintGCDetails" +print_gc_details="" + +# Prefix logging statements with wall clock time. +#print_gc_datestamps="XX:+PrintGCDateStamps" +print_gc_datestamps="" + +# Print heap layout before and after each garbage collection. +#print_heap_at_gc="-XX:+PrintHeapAtGC" +print_heap_at_gc="" + +# Print tenuring age information. +#print_tenuring_distribution="-XX:+PrintTenuringDistribution" +print_tenuring_distribution="" + +# Print the time the application has been stopped. +#print_gc_application_stopped_time="-XX:+PrintGCApplicationStoppedTime" +print_gc_application_stopped_time="" + +# Print more details about promotion failures. +#print_promotion_failure="-XX:+PrintPromotionFailure" +print_promotion_failure="" + +# Print statistics for CMS' FreeListSpace. +#print_flss_stats="-XX:PrintFLSStatistics=1" +print_flss_stats="" + +# Redirects GC output to file instead of console. +#gc_log_file="-Xloggc:/var/log/cassandra/gc-`date +%s`.log" +gc_log_file="" + +############################################################################### +# THE FOLLOWING IS READ ONLY +# Now build the JVM_OPTS variable. The following variables should NOT be +# directly modified. Instead update the preceding variables. The following +# variables build up the JVM_OPTS variable that is read by the cassandra and +# cassandra.bat scripts. +############################################################################### +HEAP_OPTS="${heap_min} ${heap_max} ${heap_new} ${heap_dump_on_OOMError} ${thread_stack_size}" + +GC_TUNING_OPTS="${use_par_new_gc} ${use_concur_mark_sweep_gc} ${cms_parallel_remark_enabled} ${survivor_ratio} ${max_tenuring_threshold} ${cms_initiating_occupancy_fraction} ${use_cms_initiating_occupancy_only} ${use_tlab}" + +GC_LOGGING_OPTS="${print_gc_details} ${print_gc_datestamps} ${print_heap_at_gc} ${print_tenuring_distribution} ${print_gc_application_stopped_time} ${print_promotion_failure} ${print_flss_stats} ${gc_log_file}" + +JMX_OPTS="-Dcom.sun.management.jmxremote.port=${jmx_port} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false" + +JVM_OPTS="${enable_assertions} ${java_agent} ${use_thread_priorities} ${thread_priority_policy} ${HEAP_OPTS} ${GC_TUNING_OPTS} ${GC_LOGGING_OPTS} ${JMX_OPTS}" diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml index 82778c9..15d08f2 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml @@ -681,7 +681,7 @@ client_encryption_options: # can be: all - all traffic is compressed # dc - traffic between different datacenters is compressed # none - nothing is compressed. -internode_compression: all +internode_compression: none # Enable or disable tcp_nodelay for inter-dc communication. # Disabling it will result in larger (but fewer) network packets being sent, commit bf78527f20bfeb95fe6040ae5f744bf633d08140 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 13 12:46:07 2013 -0400 remove usage of cassandra-env.sh for cassandra start up We want to manage C* heap settings and other options/arguments passed to the C* JVM command line. On linux, the JVM options are set using the JVM_OPTS shell script variable which is done in cassandra-env.sh. The cassandra-env.sh script however does not lend itself well to our structured, resource configuration. The JVM_OPTS variable is now built up in cassandra-jvm.properties which is a java properties file that also uses legal shell syntax. The file is sourced from the cassandra start script. This paves the way for resource configuration of the Cassandra JVM options. I am also hoping that we can do something similar for Windows where we can use cassandra-jvm.properties. This would substantially reduce the need for platform specific code in the storage plugin. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 0b015b4..42f6c8b 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -167,6 +167,9 @@ <copy file="${settings.localRepository}/org/xerial/snappy/snappy-java/${cassandra.snappy.version}/snappy-java-${cassandra.snappy.version}.jar" todir="${cassandra.dir}/lib"/> <move file="${project.build.outputDirectory}/cassandra/conf" todir="${cassandra.dir}"/> + <delete file="${cassandra.dir}/bin/cassandra"/> + <move file="${project.build.outputDirectory}/cassandra/bin/cassandra" todir="${cassandra.dir}/bin"/> + <delete dir="${project.build.outputDirectory}/cassandra"/> <delete dir="${cassandra.dir}/javadoc"/> <zip basedir="${cassandra.dir}" destfile="${cassandra.distro.zip}"/> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra new file mode 100755 index 0000000..742d9c0 --- /dev/null +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra @@ -0,0 +1,193 @@ +#!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# OPTIONS: +# -f: start in foreground +# -p <filename>: log the pid to a file (useful to kill it later) +# -v: print version string and exit + +# CONTROLLING STARTUP: +# +# This script relies on few environment variables to determine startup +# behavior, those variables are: +# +# CLASSPATH -- A Java classpath containing everything necessary to run. +# JVM_OPTS -- Additional arguments to the JVM for heap size, etc +# CASSANDRA_CONF -- Directory containing Cassandra configuration files. +# +# As a convenience, a fragment of shell is sourced in order to set one or +# more of these variables. This so-called `include' can be placed in a +# number of locations and will be searched for in order. The lowest +# priority search path is the same directory as the startup script, and +# since this is the location of the sample in the project tree, it should +# almost work Out Of The Box. +# +# Any serious use-case though will likely require customization of the +# include. For production installations, it is recommended that you copy +# the sample to one of /usr/share/cassandra/cassandra.in.sh, +# /usr/local/share/cassandra/cassandra.in.sh, or +# /opt/cassandra/cassandra.in.sh and make your modifications there. +# +# Another option is to specify the full path to the include file in the +# environment. For example: +# +# $ CASSANDRA_INCLUDE=/path/to/in.sh cassandra -p /var/run/cass.pid +# +# Note: This is particularly handy for running multiple instances on a +# single installation, or for quick tests. +# +# Finally, developers and enthusiasts who frequently run from an SVN +# checkout, and do not want to locally modify bin/cassandra.in.sh, can put +# a customized include file at ~/.cassandra.in.sh. +# +# If you would rather configure startup entirely from the environment, you +# can disable the include by exporting an empty CASSANDRA_INCLUDE, or by +# ensuring that no include files exist in the aforementioned search list. +# Be aware that you will be entirely responsible for populating the needed +# environment variables. + +# NB: Developers should be aware that this script should remain compatible with +# POSIX sh and Solaris sh. This means, in particular, no $(( )) and no $( ). + +# If an include wasn't specified in the environment, then search for one... +if [ "x$CASSANDRA_INCLUDE" = "x" ]; then + # Locations (in order) to use when searching for an include file. + for include in /usr/share/cassandra/cassandra.in.sh \ + /usr/local/share/cassandra/cassandra.in.sh \ + /opt/cassandra/cassandra.in.sh \ + "$HOME/.cassandra.in.sh" \ + "`dirname $0`/cassandra.in.sh"; do + if [ -r "$include" ]; then + . "$include" + break + fi + done +# ...otherwise, source the specified include. +elif [ -r "$CASSANDRA_INCLUDE" ]; then + . "$CASSANDRA_INCLUDE" +fi + +# Use JAVA_HOME if set, otherwise look for java in PATH +if [ -n "$JAVA_HOME" ]; then + JAVA="$JAVA_HOME/bin/java" +else + JAVA=java +fi + +# If numactl is available, use it. For Cassandra, the priority is to +# avoid disk I/O. Even for the purpose of CPU efficiency, we don't +# really have CPU<->data affinity anyway. Also, empirically test that numactl +# works before trying to use it (CASSANDRA-3245). +NUMACTL_ARGS="--interleave=all" +if which numactl >/dev/null 2>/dev/null && numactl $NUMACTL_ARGS ls / >/dev/null 2>/dev/null +then + NUMACTL="numactl $NUMACTL_ARGS" +else + NUMACTL="" +fi + +if [ -z "$CASSANDRA_CONF" -o -z "$CLASSPATH" ]; then + echo "You must set the CASSANDRA_CONF and CLASSPATH vars" >&2 + exit 1 +fi + +if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then + #. "$CASSANDRA_CONF/cassandra-env.sh" + . "$CASSANDRA_CONF/cassandra-jvm.properties" +fi + +# Special-case path variables. +case "`uname`" in + CYGWIN*) + CLASSPATH=`cygpath -p -w "$CLASSPATH"` + CASSANDRA_CONF=`cygpath -p -w "$CASSANDRA_CONF"` + ;; +esac + +launch_service() +{ + pidpath=$1 + foreground=$2 + props=$3 + class=$4 + cassandra_parms="-Dlog4j.configuration=log4j-server.properties -Dlog4j.defaultInitOverride=true" + + if [ "x$pidpath" != "x" ]; then + cassandra_parms="$cassandra_parms -Dcassandra-pidfile=$pidpath" + fi + + # The cassandra-foreground option will tell CassandraDaemon not + # to close stdout/stderr, but it's up to us not to background. + if [ "x$foreground" != "x" ]; then + cassandra_parms="$cassandra_parms -Dcassandra-foreground=yes" + exec $NUMACTL "$JAVA" $JVM_OPTS $cassandra_parms -cp "$CLASSPATH" $props "$class" + # Startup CassandraDaemon, background it, and write the pid. + else + exec $NUMACTL "$JAVA" $JVM_OPTS $cassandra_parms -cp "$CLASSPATH" $props "$class" <&- & + [ ! -z "$pidpath" ] && printf "%d" $! > "$pidpath" + true + fi + + return $? +} + +# Parse any command line options. +args=`getopt vfhp:bD: "$@"` +eval set -- "$args" + +classname="org.apache.cassandra.service.CassandraDaemon" + +while true; do + case "$1" in + -p) + pidfile="$2" + shift 2 + ;; + -f) + foreground="yes" + shift + ;; + -h) + echo "Usage: $0 [-f] [-h] [-p pidfile]" + exit 0 + ;; + -v) + "$JAVA" -cp "$CLASSPATH" org.apache.cassandra.tools.GetVersion + exit 0 + ;; + -D) + properties="$properties -D$2" + shift 2 + ;; + --) + shift + break + ;; + *) + echo "Error parsing arguments!" >&2 + exit 1 + ;; + esac +done + +# Start up the service +launch_service "$pidfile" "$foreground" "$properties" "$classname" + +exit $? + +# vi:ai sw=4 ts=4 tw=0 et diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties new file mode 100644 index 0000000..612c65e --- /dev/null +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties @@ -0,0 +1,112 @@ +enable_assertions="-ea" + +# JMX settings +jmx_port="7299" + +use_thread_priorities="-XX:+UseThreadPriorities" + +thread_priority_policy="-XX:ThreadPriorityPolicy=42" + +heap_min="-Xms256M" +heap_max="-Xms256M" +heap_new="-Xmn64M" + +heap_dump_on_OOMError="-XX:+HeapDumpOnOutOfMemoryError" + +heap_dump_dir="" + +thread_stack_size="-Xss180k" + +java_agent="" +# Enable jamm when running on Java 6 patch version 23 or higher. +#java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" + +# GC tuning options +# +# Uses a parallel version of the young generation copying collector alongside +# the default collector. This minimizes pauses by using all available CPUs in +# parallel. The collector is compatible with both the default collector and the +# Concurrent Mark and Sweep (CMS) collector. +# This is a parallel collector option. +use_par_new_gc="-XX:+UseParNewGC" + +# Whether parallel remark enabled (only if ParNewGC) +# This is a parallel collector option. +cms_parallel_remark_enabled="-XX:+CMSParallelRemarkEnabled" + +# Uses the Concurrent Mark and Sweep collector. It is a mostly concurrent +# collector with a low pause time. It is a good match for multi-core systems. +use_concur_mark_sweep_gc="-XX:+UseConcMarkSweepGC" + +# Ratio of eden/survivor space size. The default value is 8. +# This is a Garbage First (G1) garbage collector option. +survivor_ratio="-XX:SurvivorRatio=8" + +# Maximum value for tenuring threshold. +# Young collection tuning option. +max_tenuring_threshold="-XX:MaxTenuringThreshold=1" + +# Percentage CMS generation occupancy to start a CMS collection cycle (A +# negative value means that CMSTirggerRatio is used). +# This is a CMS tuning option. +cms_initiating_occupancy_fraction="-XX:CMSInitiatingOccupancyFraction=75" + +# Only use occupancy as a criterion for starting a CMS collection. +# This is a CMS tuning option. +use_cms_initiating_occupancy_only="-XX:+UseCMSInitiatingOccupancyOnly" + +# Use thread local allocation blocks in young space. Enabled by default. +# This is a young collection tuning option. +use_tlab="-XX:+UseTLAB" + +##################### +# GC logging options +##################### +# Print more details at garbage collection +#print_gc_details="-XX:+PrintGCDetails" +print_gc_details="" + +# Prefix logging statements with wall clock time. +#print_gc_datestamps="XX:+PrintGCDateStamps" +print_gc_datestamps="" + +# Print heap layout before and after each garbage collection. +#print_heap_at_gc="-XX:+PrintHeapAtGC" +print_heap_at_gc="" + +# Print tenuring age information. +#print_tenuring_distribution="-XX:+PrintTenuringDistribution" +print_tenuring_distribution="" + +# Print the time the application has been stopped. +#print_gc_application_stopped_time="-XX:+PrintGCApplicationStoppedTime" +print_gc_application_stopped_time="" + +# Print more details about promotion failures. +#print_promotion_failure="-XX:+PrintPromotionFailure" +print_promotion_failure="" + +# Print statistics for CMS' FreeListSpace. +#print_flss_stats="-XX:PrintFLSStatistics=1" +print_flss_stats="" + +# Redirects GC output to file instead of console. +#gc_log_file="-Xloggc:/var/log/cassandra/gc-`date +%s`.log" +gc_log_file="" + +############################################################################### +# THE FOLLOWING IS READ ONLY +# Now build the JVM_OPTS variable. The following variables should NOT be +# directly modified. Instead update the preceding variables. The following +# variables build up the JVM_OPTS variable that is read by the cassandra and +# cassandra.bat scripts. +############################################################################### +HEAP_OPTS="${heap_min} ${heap_max} ${heap_new} ${heap_dump_on_OOMError} ${thread_stack_size}" + +GC_TUNING_OPTS="${use_par_new_gc} ${use_concur_mark_sweep_gc} ${cms_parallel_remark_enabled} ${survivor_ratio} ${max_tenuring_threshold} ${cms_initiating_occupancy_fraction} ${use_cms_initiating_occupancy_only} ${use_tlab}" + +GC_LOGGING_OPTS="${print_gc_details} ${print_gc_datestamps} ${print_heap_at_gc} ${print_tenuring_distribution} ${print_gc_application_stopped_time} ${print_promotion_failure} ${print_flss_stats} ${gc_log_file}" + +JMX_OPTS="-Dcom.sun.management.jmxremote.port=${jmx_port} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false" + +JVM_OPTS="${enable_assertions} ${java_agent} ${use_thread_priorities} ${thread_priority_policy} ${HEAP_OPTS} ${GC_TUNING_OPTS} ${GC_LOGGING_OPTS} ${JMX_OPTS}" diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index e85813d..1e31e14 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -31,10 +31,12 @@ import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.util.Map; +import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.rhq.core.util.PropertiesFileUpdate; import org.rhq.core.util.TokenReplacingReader; import org.rhq.core.util.ZipUtil; import org.rhq.core.util.stream.StreamUtil; @@ -83,10 +85,13 @@ public class Deployer { applyConfigChanges(confDir, "cassandra.yaml", tokens); applyConfigChanges(confDir, "log4j-server.properties", tokens); - applyConfigChanges(confDir, "cassandra-env.sh", tokens); + applyChangesToCassandraJvmProps(confDir, deploymentOptions); +// applyConfigChanges(confDir, "cassandra-env.sh", tokens); } - private void applyConfigChanges(File confDir, String fileName, Map<String, String> tokens) throws DeploymentException { + private void applyConfigChanges(File confDir, String fileName, Map<String, String> tokens) + throws DeploymentException { + File filteredFile = new File(confDir, fileName); try { if (log.isInfoEnabled()) { @@ -104,6 +109,29 @@ public class Deployer { } } + private void applyChangesToCassandraJvmProps(File confDir, DeploymentOptions deploymentOptions) + throws DeploymentException { + + File jvmPropsFile = new File(confDir, "cassandra-jvm.properties"); + try { + log.info("Applying configuration changes to " + jvmPropsFile); + + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(jvmPropsFile.getAbsolutePath()); + Properties properties = propertiesUpdater.loadExistingProperties(); + + properties.setProperty("heap_min", "-Xms" + deploymentOptions.getHeapSize()); + properties.setProperty("heap_max", "-Xmx" + deploymentOptions.getHeapSize()); + properties.setProperty("heap_new", "-Xmn" + deploymentOptions.getHeapNewSize()); + properties.setProperty("thread_stack_size", "-Xss" + deploymentOptions.getStackSize()); + properties.setProperty("jmx_port", deploymentOptions.getJmxPort().toString()); + + propertiesUpdater.update(properties); + } catch (IOException e) { + log.error("An error occurred while updating " + jvmPropsFile, e); + throw new DeploymentException("An error occurred while updating " + jvmPropsFile, e); + } + } + public void updateFilePerms() { File deployDir = new File(deploymentOptions.getBasedir()); File binDir = new File(deployDir, "bin"); commit 7185fb3fbaf98dde194872657c7362134d342c10 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 13 10:08:22 2013 -0400 remove obsolete files that are no longer used diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/deploy.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/deploy.xml deleted file mode 100644 index 19d5647..0000000 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/deploy.xml +++ /dev/null @@ -1,221 +0,0 @@ -<project name="rhq_cassandra_bundle" - default="main" - xmlns:rhq="antlib:org.rhq.bundle"> - <rhq:bundle name="${rhq.cassandra.bundle.name}" - version="${rhq.cassandra.bundle.version}" - description="A bundle for deploying RHQ Cassandra nodes."> - -  - - <rhq:input-property name="cluster.name" - description="The name of the cluster. This is used to prevent machines in one logical cluster from joining another" - required="true" - defaultValue="rhqdev" - type="string"/> - - <rhq:input-property name="cluster.dir" - description="The directory in which Cassandra nodes will be installed" - required="true" - defaultValue="" - type="string"/> - - <rhq:input-property name="data.dir" - description="The directory where Cassandra should store data files." - required="true" - defaultValue="data" - type="string"/> - - <rhq:input-property name="commitlog.dir" - description="The directory where Cassandra stores its commit logs." - required="true" - defaultValue="commit_log" - type="string"/> - - <rhq:input-property name="saved.caches.dir" - description="The directory where Cassandra stores saved caches." - required="true" - defaultValue="saved_caches" - type="string"/> - - <rhq:input-property name="log.dir" - description="The directory where Cassandra stores log files." - required="true" - defaultValue="logs" - type="string"/> - - <rhq:input-property name="rhq.cassandra.log.file.name" - description="The name of the log file to which Cassandra writes." - required="true" - defaultValue="rhq-storage-node.log" - type="string"/> - - <rhq:input-property name="logging.level" - description="The log4j logging level to use." - required="false" - defaultValue="DEBUG" - type="string"/> - - <rhq:input-property name="seeds" - description="A comma-delimited list of IP addresses/host names that are deemed contact points. Cassandra nodes use this list of hosts to find each other and learn the topology of the ring. If you are running a local development cluster, be sure to have aliases set up for localhost." - required="false" - defaultValue="127.0.0.1" - type="string"/> - - <rhq:input-property name="rhq.cassandra.num_tokens" - description="Defines the number of tokens randomly assigned to a node on the ring. The more tokens, relative to other nodes, the larger the proportion of data that this node will store. You probably want all nodes to have the same number of tokens assuming they have equal hardware capability." - required="false" - defaultValue="256" - type="string"/> - - <rhq:input-property name="jmx.port" - description="The port over which Cassandra listens for JMX connections. Each node should be assigned a unique port." - required="false" - defaultValue="7200" - type="string"/> - - <rhq:input-property name="rhq.cassandra.storage.port" - description="The port used for inter-node communication." - required="false" - defaultValue="7000" - type="string"/> - - <rhq:input-property name="rhq.cassandra.ssl.storage.port" - description="The port used for encrypted inter-node communication." - required="false" - defaultValue="7001" - type="string"/> - - <rhq:input-property name="listen.address" - description="Address used for inter-node communication. Defaults to value of hostname property." - required="true" - defaultValue="" - type="string"/> - - <rhq:input-property name="rpc.address" - description="Address used for Thrift RPC client communication. Defaults to value of hostname property." - required="true" - defaultValue="" - type="string"/> - - <rhq:input-property name="cassandra.ring.delay.property" - required="false" - defaultValue="" - type="string"/> - - <rhq:input-property name="cassandra.ring.delay" - description="When a node initializes it contacts a seed and then sleeps for RING_DELAY (milliseconds) to learn about other nodes in the cluster. Cassandra uses a default value of 30 seconds." - required="false" - defaultValue="" - type="string"/> - - <rhq:input-property name="rhq.cassandra.native_transport_max_threads" - description="The maximum number of threads handling native CQL requests." - required="false" - defaultValue="64" - type="integer"/> - - <rhq:input-property name="rhq.cassandra.native_transport_port" - description="The port for the CQL native transport to listen for clients on." - required="false" - defaultValue="9042" - type="integer"/> - - <rhq:input-property name="rhq.cassandra.rpc_port" - description="The port to listen for Thrift clients on." - required="false" - defaultValue="9160" - type="integer"/> - - <rhq:input-property name="rhq.cassandra.authenticator" - description="A class that performs authentication. The value should be a fully qualified class name and implement IAuthenticator." - required="false" - defaultValue="org.rhq.cassandra.auth.SimpleAuthenticator" - type="string"/> - - <rhq:input-property name="rhq.cassandra.authorizer" - description="A class that performs authorization. Used to limit/provide permissions. The value should be a fully qualified class name and implement IAuthorizer." - required="false" - defaultValue="org.rhq.cassandra.auth.SimpleAuthorizer" - type="string"/> - - <rhq:input-property name="rhq.cassandra.password.properties.file" - description="The location of the password properties file used by SimpleAuthenticator. If a relative path is specified, its location is resolved relative to Cassandra's bin directory." - required="false" - defaultValue="./../conf/passwd.properties" - type="file"/> - - <rhq:input-property name="rhq.cassandra.access.properties.file" - description="The location of the authorization properties file used by SimpleAuthority. If a relative path is specified, its location is resolved relative to Cassandra's bin directory." - required="false" - defaultValue="./../conf/access.properties" - type="file"/> - - <rhq:input-property name="rhq.cassandra.username" - description="The username with which to authenticate requests to Cassandra." - required="true" - type="string"/> - - <rhq:input-property name="rhq.cassandra.password" - description="The password with which to authenticate requests to Cassandra." - required="true" - type="string"/> - - <rhq:input-property name="rhq.cassandra.max.heap.size" - required="true" - defaultValue="${MAX_HEAP_SIZE}"/> - - <rhq:input-property name="rhq.cassandra.heap.new.size" - required="true" - defaultValue="${HEAP_NEWSIZE}"/> - - <rhq:deployment-unit name="cassandra" preinstallTarget="pre-install" postinstallTarget="post-install"> - - <rhq:archive name="cassandra.zip"> - <rhq:replace> - <rhq:fileset dir="conf"> - <include name="cassandra.yaml"/> - </rhq:fileset> - <rhq:fileset dir="conf"> - <include name="cassandra-env.sh"/> - </rhq:fileset> - <rhq:fileset dir="conf"> - <include name="log4j-server.properties"/> - </rhq:fileset> - <rhq:fileset dir="conf"> - <include name="passwd.properties"/> - </rhq:fileset> - - </rhq:replace> - </rhq:archive> - </rhq:deployment-unit> - </rhq:bundle> - - <target name="main"/> - - <target name="pre-install"> - <mkdir dir="${cluster.dir}"/> - - </target> - - <target name="post-install"> - <property name="bin.dir" value="${rhq.deploy.dir}/bin"/> - - <chmod file="${bin.dir}/cassandra" perm="+x"/> - <chmod file="${bin.dir}/cqlsh" perm="+x"/> - <chmod file="${bin.dir}/cassandra-cli" perm="+x"/> - <chmod file="${bin.dir}/nodetool" perm="+x"/> - </target> - -</project> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cli/dbsetup.script b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cli/dbsetup.script deleted file mode 100644 index 73bc2a7..0000000 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cli/dbsetup.script +++ /dev/null @@ -1,40 +0,0 @@ -create keyspace rhq - with placement_strategy = 'org.apache.cassandra.locator.SimpleStrategy' and - strategy_options = {replication_factor:1}; - -use rhq; - -create column family raw_metrics - with comparator = DateType and - default_validation_class = DoubleType and - key_validation_class = Int32Type; - -create column family one_hour_metric_data - with comparator = 'CompositeType(DateType, Int32Type)' and - default_validation_class = DoubleType and - key_validation_class = Int32Type; - -create column family six_hour_metric_data - with comparator = 'CompositeType(DateType, Int32Type)' and - default_validation_class = DoubleType and - key_validation_class = Int32Type; - -create column family twenty_four_hour_metric_data - with comparator = 'CompositeType(DateType, Int32Type)' and - default_validation_class = DoubleType and - key_validation_class = Int32Type; - -create column family metrics_work_queue - with comparator = 'CompositeType(DateType, Int32Type)' and - default_validation_class = Int32Type and - key_validation_class = UTF8Type; - -create column family resource_traits - with comparator = 'CompositeType(DateType, Int32Type, Int32Type, UTF8Type, UTF8Type)' and - default_validation_class = UTF8Type and - key_validation_class = Int32Type; - -create column family traits - with comparator = DateType and - default_validation_class = UTF8Type and - key_validation_class = Int32Type; diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/create_keyspace.cql b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/create_keyspace.cql deleted file mode 100644 index 9df13a0..0000000 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/create_keyspace.cql +++ /dev/null @@ -1 +0,0 @@ -CREATE KEYSPACE rhq WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}; diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/dbsetup.cql b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/dbsetup.cql deleted file mode 100644 index 189b35b..0000000 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/dbsetup.cql +++ /dev/null @@ -1,42 +0,0 @@ -CREATE KEYSPACE rhq WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}; - -USE rhq; - -CREATE TABLE raw_metrics ( - schedule_id int, - time timestamp, - value double, - PRIMARY KEY (schedule_id, time) -); - -CREATE TABLE one_hour_metrics ( - schedule_id int, - time timestamp, - type int, - value double, - PRIMARY KEY (schedule_id, time, type) -); - -CREATE TABLE six_hour_metrics ( - schedule_id int, - time timestamp, - type int, - value double, - PRIMARY KEY (schedule_id, time, type) -); - -CREATE TABLE twenty_four_hour_metrics ( - schedule_id int, - time timestamp, - type int, - value double, - PRIMARY KEY (schedule_id, time, type) -); - -CREATE TABLE metrics_index ( - bucket varchar, - time timestamp, - schedule_id int, - null_col boolean, - PRIMARY KEY (bucket, time, schedule_id) -); commit f9f3f712f702058e0d6ef5f1b99dcbe2162e63a9 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Jul 12 11:09:16 2013 +0200 Downgrade to 1.2.3, as the jboss nexus repo does not find 1.2.5. It is more recent than 1.1.1 anyway diff --git a/pom.xml b/pom.xml index 6b1d75f..c5cf5a7 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ <augeas.zip.mask>*-${augeas.classifier}.zip</augeas.zip.mask> <ant.contrib.version>1.0b3</ant.contrib.version> <freemarker.version>2.3.18</freemarker.version> - <swagger-annotations.version>1.2.5</swagger-annotations.version> + <swagger-annotations.version>1.2.3</swagger-annotations.version> <powermock.version>1.4.12</powermock.version> <arquillian.version>1.0.3.Final</arquillian.version> <arquillian.jboss.container.version>7.2.0.Final</arquillian.jboss.container.version> commit c33f3226056333a1aaaa303306d1ce6dadcefe47 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Jul 12 10:35:44 2013 +0200 Bump swagger annotations version to a stable version and remove the snapshot repo. Thanks gaYak for reminding me. diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 2127930..7c236c7 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -439,7 +439,7 @@ <dependency> <groupId>com.wordnik</groupId> <artifactId>swagger-annotations_2.9.1</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>${swagger-annotations.version}</version> <scope>provided</scope> </dependency> @@ -686,15 +686,6 @@ </build> - <repositories> - <repository> -  - <id>sonatype-oss-snapshot</id> - <name>Sonatype OSS Snapshot repository</name> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - </repository> - - </repositories> <profiles> diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml index 9cc4fa1..c672abf 100644 --- a/modules/helpers/rest-docs-generator/pom.xml +++ b/modules/helpers/rest-docs-generator/pom.xml @@ -122,16 +122,6 @@ </plugins> </build> - <repositories> - <repository> -  - <id>sonatype-oss-snapshot</id> - <name>Sonatype OSS Snapshot repository</name> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - </repository> - - </repositories> - <dependencies> <dependency> @@ -149,7 +139,7 @@ <dependency> <groupId>com.wordnik</groupId> <artifactId>swagger-annotations_2.9.1</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>${swagger-annotations.version}</version> </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> diff --git a/pom.xml b/pom.xml index 26703d1..6b1d75f 100644 --- a/pom.xml +++ b/pom.xml @@ -151,6 +151,7 @@ <augeas.zip.mask>*-${augeas.classifier}.zip</augeas.zip.mask> <ant.contrib.version>1.0b3</ant.contrib.version> <freemarker.version>2.3.18</freemarker.version> + <swagger-annotations.version>1.2.5</swagger-annotations.version> <powermock.version>1.4.12</powermock.version> <arquillian.version>1.0.3.Final</arquillian.version> <arquillian.jboss.container.version>7.2.0.Final</arquillian.jboss.container.version> @@ -901,7 +902,7 @@ <artifactId>javax.servlet-api</artifactId> <version>3.0.1</version> </dependency> - + <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> commit 524d1b66879fa6d20788505e1c43c0e046e06e48 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Fri Jul 12 00:58:48 2013 -0500 Initial implementation for fetching all the alerts triggered for Storage Nodes resource and sub-sources. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 9d073ee..fa51fe1 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -28,8 +28,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Queue; import javax.ejb.EJB; import javax.ejb.Stateless; @@ -43,6 +45,7 @@ import org.quartz.JobDataMap; import org.quartz.SimpleTrigger; import org.quartz.Trigger; +import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.cloud.Server; @@ -51,6 +54,7 @@ import org.rhq.core.domain.cloud.StorageNode.OperationMode; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.common.JobTrigger; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.measurement.MeasurementAggregate; @@ -59,8 +63,11 @@ import org.rhq.core.domain.operation.bean.GroupOperationSchedule; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; +import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; +import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.server.RHQConstants; +import org.rhq.enterprise.server.alert.AlertManagerLocal; import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.authz.RequiredPermission; import org.rhq.enterprise.server.authz.RequiredPermissions; @@ -110,6 +117,9 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @EJB private OperationManagerLocal operationManager; + @EJB + private AlertManagerLocal alertManager; + @Override public void linkResource(Resource resource) { List<StorageNode> storageNodes = this.getStorageNodes(); @@ -427,7 +437,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN } entityManager.flush(); } - + private StorageNodeLoadComposite.MeasurementAggregateWithUnits getMeasurementAggregateWithUnits(Subject subject, int schedId, MeasurementUnits units, long beginTime, long endTime) { MeasurementAggregate measurementAggregate = measurementManager.getAggregate(subject, schedId, beginTime, @@ -472,4 +482,81 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN operationManager.scheduleGroupOperation(subjectManager.getOverlord(), schedule); } -} + + @Override + public PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject) { + return findStorageNodeAlerts(subject, false); + } + + @Override + public PageList<Alert> findAllStorageNodeAlerts(Subject subject) { + return findStorageNodeAlerts(subject, true); + } + + /** + * Find the set of alerts related to Storage Node resources and sub-resources. + * + * @param subject subject + * @param allAlerts if [true] then return all alerts; if [false] then return only alerts that are not acknowledged + * @return alerts + */ + private PageList<Alert> findStorageNodeAlerts(Subject subject, boolean allAlerts) { + Integer[] resouceIdsWithAlertDefinitions = findResourcesWithAlertDefinitions(); + PageList<Alert> alerts = new PageList<Alert>(); + + if( resouceIdsWithAlertDefinitions != null && resouceIdsWithAlertDefinitions.length != 0 ){ + AlertCriteria criteria = new AlertCriteria(); + criteria.setPageControl(PageControl.getUnlimitedInstance()); + criteria.addFilterResourceIds(resouceIdsWithAlertDefinitions); + criteria.addSortCtime(PageOrdering.DESC); + + alerts = alertManager.findAlertsByCriteria(subject, criteria); + + if (!allAlerts) { + //select on alerts that are not acknowledge + PageList<Alert> trimmedAlerts = new PageList<Alert>(); + for (Alert alert : alerts) { + if (alert.getAcknowledgeTime() == null || alert.getAcknowledgeTime() <= 0) { + trimmedAlerts.add(alert); + } + } + + alerts = trimmedAlerts; + } + } + + return alerts; + } + + /** + * Return resource Ids for all resources and sub-resources of Storage Nodes that + * have alert definitions. This will be used by the resource criteria to find + * all alerts triggered for storage nodes. + * + * @return + */ + private Integer[] findResourcesWithAlertDefinitions() { + List<Integer> resourceIdsWithAlertDefinitions = new ArrayList<Integer>(); + List<StorageNode> test2 = getStorageNodes(); + + Queue<Resource> unvisitedResources = new LinkedList<Resource>(); + for (StorageNode node : test2) { + if (node.getResource() != null) { + unvisitedResources.add(node.getResource()); + } + } + + while(!unvisitedResources.isEmpty()){ + Resource resource = unvisitedResources.poll(); + if (resource.getAlertDefinitions() != null) { + resourceIdsWithAlertDefinitions.add(resource.getId()); + } + + for(Resource child: resource.getChildResources()){ + unvisitedResources.add(child); + } + } + + return resourceIdsWithAlertDefinitions.toArray(new Integer[resourceIdsWithAlertDefinitions.size()]); + } +} \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index 5c3f092..a9b2514 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -22,6 +22,7 @@ import java.util.List; import javax.ejb.Local; +import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; @@ -65,13 +66,29 @@ public interface StorageNodeManagerLocal { * @return list of nodes */ PageList<StorageNode> findStorageNodesByCriteria(Subject subject, StorageNodeCriteria criteria); - + + /** + * Fetches the list of Storage Node related alerts that have not yet been acknowledged. + * + * @param subject subject + * @return storage nodes alerts not acknowledged + */ + PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject); + + /** + * Fetches all the Storage Node related alerts. + * + * @param subject subject + * @return all storage nodes alerts + */ + PageList<Alert> findAllStorageNodeAlerts(Subject subject); + /** * <p>Prepares the node for subsequent upgrade.</p> * <p> CAUTION: this method will set the RHQ server to maintenance mode, RHQ storage flushes all the data to disk * and backup of all the keyspaces is created</p> * <p>the subject needs to have <code>MANAGE_SETTINGS</code> and <code>MANAGE_INVENTORY</code> permissions.</p> - * + * * @param subject caller * @param storageNode storage node on which the prepareForUpgrade operation should be run */ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java index d4c9f78..72432db 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java @@ -20,6 +20,7 @@ package org.rhq.enterprise.server.cloud; import javax.ejb.Remote; +import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; @@ -28,7 +29,7 @@ import org.rhq.core.domain.util.PageList; /** * Remote interface to the manager responsible for creating and managing storage nodes. - * + * * @author Jirka Kremser */ @Remote @@ -36,9 +37,9 @@ public interface StorageNodeManagerRemote { /** * <p>Returns the summary of load of the storage node.</p> - * + * * <p>the subject needs to have <code>MANAGE_SETTINGS</code> permissions.</p> - * + * * @param subject user that must have proper permissions * @param node storage node entity (it can be a new object, but the id should be set properly) * @param beginTime the start time @@ -58,4 +59,19 @@ public interface StorageNodeManagerRemote { */ PageList<StorageNode> findStorageNodesByCriteria(Subject subject, StorageNodeCriteria criteria); + /** + * Fetches the list of Storage Node related alerts that have not yet been acknowledged. + * + * @param subject subject + * @return storage nodes alerts not acknowledged + */ + PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject); + + /** + * Fetches all the Storage Node related alerts. + * + * @param subject subject + * @return all storage nodes alerts + */ + PageList<Alert> findAllStorageNodeAlerts(Subject subject); } commit 4674c9c66fef570a0abb3961205056fed3e75097 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Jul 11 14:58:52 2013 -0500 Update the calculation for the percentage of disk space used. The percentage now represents the amount of disk used by the Cassandra data files. diff --git a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java index dcfdc37..8995ec0 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java +++ b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java @@ -300,7 +300,7 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone AlertCondition ac = new AlertCondition(); ac.setCategory(AlertConditionCategory.THRESHOLD); ac.setComparator(">"); - ac.setThreshold(0.75D); + ac.setThreshold(0.5D); List<Integer> measurementDefinitionIds = new ArrayList<Integer>(1); for (MeasurementDefinition d : resourceType.getMetricDefinitions()) { diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java index 7281f9b..e5a2283 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java @@ -60,6 +60,8 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone private static final String OWNERSHIP_METRIC_NAME = "Ownership"; private static final String PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.PartitionDiskUsedPercentage"; private static final String DATA_FILE_LOCATIONS_NAME = "AllDataFileLocations"; + private static final String LOAD_NAME = "Load"; + private Log log = LogFactory.getLog(StorageServiceComponent.class); private InetAddress host; @@ -178,23 +180,30 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone } break; } else if (PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName())) { - EmsAttribute attribute = bean.getAttribute(DATA_FILE_LOCATIONS_NAME); - Object valueObject = attribute.refresh(); - if (valueObject instanceof String[]) { + + + EmsAttribute loadAttribute = bean.getAttribute(LOAD_NAME); + Object loadValue = loadAttribute.refresh(); + + EmsAttribute dataFileLocationAttribute = bean.getAttribute(DATA_FILE_LOCATIONS_NAME); + Object dataFileLocationValue = dataFileLocationAttribute.refresh(); + + if (loadValue != null && dataFileLocationValue != null && dataFileLocationValue instanceof String[]) { //Please visit for details: https://issues.apache.org/jira/browse/CASSANDRA-2749 //The average usage of all partitions with the data will be reported. //Cassandra selects the partition with most free space for SStable flush and compaction. - report.addData(new MeasurementDataNumeric(request, - getPartitionDiskUsedPercentage((String[]) valueObject))); + double load = Double.parseDouble(loadValue.toString()); + + report.addData(new MeasurementDataNumeric(request, getPartitionDiskUsedPercentage(load, + (String[]) dataFileLocationValue))); } } } } - private double getPartitionDiskUsedPercentage(String[] paths) { + private double getPartitionDiskUsedPercentage(double dataSize, String[] paths) { List<String> visitedMountPoints = new ArrayList<String>(); long totalDiskSpace = 0; - long totalUsedDiskSpace = 0; for (String path : paths) { try { @@ -202,7 +211,6 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone if (!visitedMountPoints.contains(fileSystemInfo.getMountPoint())) { visitedMountPoints.add(fileSystemInfo.getMountPoint()); totalDiskSpace += fileSystemInfo.getFileSystemUsage().getTotal(); - totalUsedDiskSpace += fileSystemInfo.getFileSystemUsage().getUsed(); } } catch (Exception e) { log.error("Unable to determine file system usage information for data file location " + path, e); @@ -210,7 +218,7 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone } if (totalDiskSpace != 0) { - double rawPercentage = ((double) totalUsedDiskSpace) / ((double) totalDiskSpace); + double rawPercentage = dataSize / ((double) totalDiskSpace); return Math.round(rawPercentage * 100.0) / 100.0; } diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml index 3aa701b..e6bc1da 100644 --- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml @@ -187,8 +187,8 @@ </operation> <metric property="CurrentGenerationNumber" dataType="trait" displayType="summary" description="Current generation number"/> - <metric property="Calculated.PartitionDiskUsedPercentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of total disk space used for the partition that contains the data files. - If multiple data locations are specified then this will report the average utilization accross all the partitions."/> + <metric property="Calculated.PartitionDiskUsedPercentage" displayName="Data File Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of disk space used by the data files. If multiple data locations are specified then this will report + the average utilization accross all the partitions that contain data files."/> <metric property="ExceptionCount" measurementType="trendsup" dataType="measurement" displayType="summary" description="Exception Count"/> <metric property="Initialized" dataType="trait" displayType="summary" description="Initialized"/> <metric property="Joined" dataType="trait" displayType="summary" description="Joined"/> commit a1c2dcac50a7a0df8ab17898952e7fa6270dfc3b Author: John Sanda <jsanda(a)redhat.com> Date: Thu Jul 11 21:41:34 2013 -0400 use upgradesstables and not scrub command to regenerate sstables Also execute a drain operation at the end to flush all memtables and commit log to ensure no data loss prior to upgrade. diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh index 8a83320..7c0b88a 100755 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh @@ -30,24 +30,31 @@ cp $PATCH $RHQ_SERVER_DIR/rhq-storage/lib echo "Starting RHQ Storage node" $RHQ_SERVER_DIR/bin/rhqctl start --storage +# sleep for a few seconds while Cassandra starts up +echo "Waiting for RHQ Storage Node to start up..." +sleep 3 + # run the CQL script echo "Running CQL script to disable table compression" export CQLSH_HOST=$CQLSH_HOST export CQL_PORT=$CQL_PORT $RHQ_SERVER_DIR/rhq-storage/bin/cqlsh -u rhqadmin -p rhqadmin -f ./disable_compression.cql -# scrub all keyspaces +# rewrite all sstables echo "Rebuilding data files for system keyspace" -$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT scrub system +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT upgradesstables --include-all-sstables system echo "Rebuilding data files for system_traces keyspace" -$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT scrub system_traces +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT upgradesstables --include-all-sstables system_traces echo "Rebuilding data files for system_auth keyspace" -$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT scrub system_auth +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT upgradesstables --include-all-sstables system_auth echo "Rebuilding data files for rhq keyspace" -$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT scrub rhq +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT upgradesstables --include-all-sstables rhq + +# flush memtables and commit log to ensure no data loss prior to upgrade +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT drain echo "Shutting down the RHQ Storage node" $RHQ_SERVER_DIR/bin/rhqctl stop commit 957781e62543ff5023c4b59567ee76c6ab2a9d9a Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Jul 11 17:14:48 2013 -0400 BZ 983552 shorten the deployment names of the ejb3 jar and the startup subsystem diff --git a/etc/agent-versioning/build.xml b/etc/agent-versioning/build.xml index d6c18a1..7a60e51 100644 --- a/etc/agent-versioning/build.xml +++ b/etc/agent-versioning/build.xml @@ -112,7 +112,7 @@ ant -Dserver.home.dir=/my/server/rhq-agent -Dnew.version=0.0.0.GA -Dnew.build=0 <target name="init-server"> <property name="env.RHQ_SERVER_HOME" location="dev-container"/> <property name="server.home.dir" location="${env.RHQ_SERVER_HOME}"/> - <property name="server.download.dir" location="${server.home.dir}/modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/rhq-agent"/> + <property name="server.download.dir" location="${server.home.dir}/modules/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads/rhq-agent"/> <available property="_server.download.dir.exists" file="${server.download.dir}"/> <fail unless="_server.download.dir.exists" message="Cannot find the server download directory at ${server.download.dir}"/> diff --git a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml index 6d17177..481073e 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml +++ b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> - + <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" @@ -9,7 +9,7 @@ <context-param> <param-name>resteasy.jndi.resources</param-name> - <param-value>java:app/rhq-enterprise-server-ejb3/InventorySummaryHandler,java:app/rhq-enterprise-server-ejb3/AlertDefinitionHandler,java:app/rhq-enterprise-server-ejb3/ConfigurationHistoryHandler,java:app/rhq-enterprise-server-ejb3/RecentAlertHandler,java:app/rhq-enterprise-server-ejb3/SuspectMetricHandler,java:app/rhq-enterprise-server-ejb3/DriftComplianceHandler,java:app/rhq-enterprise-server-ejb3/RecentOperationsHandler,java:app/rhq-enterprise-server-ejb3/RecentDriftHandler,java:app/rhq-enterprise-server-ejb3/PlatformUtilizationHandler</param-value> + <param-value>java:app/rhq-server/InventorySummaryHandler,java:app/rhq-server/AlertDefinitionHandler,java:app/rhq-server/ConfigurationHistoryHandler,java:app/rhq-server/RecentAlertHandler,java:app/rhq-server/SuspectMetricHandler,java:app/rhq-server/DriftComplianceHandler,java:app/rhq-server/RecentOperationsHandler,java:app/rhq-server/RecentDriftHandler,java:app/rhq-server/PlatformUtilizationHandler</param-value>  </context-param> <context-param> @@ -192,7 +192,7 @@ <servlet> <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI DriftGWTService</servlet-name> <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.DriftGWTServiceImpl</servlet-class> - </servlet> + </servlet> <servlet> <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI PlatformUtilizationGWTService</servlet-name> <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.PlatformUtilizationGWTServiceImpl</servlet-class> @@ -205,7 +205,7 @@ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI TopologyGWTService</servlet-name> <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.TopologyGWTServiceImpl</servlet-class> </servlet> - + <servlet> <servlet-name>Resteasy</servlet-name> @@ -373,7 +373,7 @@ <servlet-mapping> <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI DriftGWTService</servlet-name> <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/DriftGWTService</url-pattern> - </servlet-mapping> + </servlet-mapping> <servlet-mapping> <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI PlatformUtilizationGWTService</servlet-name> <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/PlatformUtilizationGWTService</url-pattern> @@ -398,7 +398,7 @@ </welcome-file-list> -   - <sub-deployment name="rhq-enterprise-server-ejb3.jar"> + <sub-deployment name="rhq-server.jar"> <dependencies> <module name="org.jboss.msc" export="true" /> <module name="org.jboss.as.controller" export="true" /> diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java index 284ddbd..160b5dd 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java @@ -49,7 +49,7 @@ import org.rhq.enterprise.server.installer.ServerInstallUtil.SupportedDatabaseTy */ public class InstallerServiceImpl implements InstallerService { - private static final String RHQ_EXTENSION_NAME = "org.rhq.rhq-enterprise-server-startup-subsystem"; + private static final String RHQ_EXTENSION_NAME = "org.rhq.server-startup"; private static final String RHQ_SUBSYSTEM_NAME = "rhq-startup"; private static final String EAR_NAME = "rhq.ear"; private static final String SYSPROP_PROPFILE = "rhq.server.properties-file"; diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java index 334e768..1cdc1d5 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java @@ -34,7 +34,7 @@ import org.rhq.enterprise.server.system.SystemManagerBean; import org.rhq.enterprise.server.util.LookupUtil; /** - * + * * * @author Lukas Krejci */ @@ -59,21 +59,21 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { public void testEjbsAccessibleThroughPrivilegedCode() { LookupUtil.getSubjectManager().getOverlord(); } - + public void testEjbsAccessibleThroughLocalClient() throws ScriptException, IOException { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + ScriptEngine engine = getEngine(overlord); - + engine.eval("SubjectManager.getSubjectByName('rhqadmin');"); } - + public void testLocalEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + ScriptEngine engine = getEngine(overlord); - - String jndiName = "java:global/rhq/rhq-enterprise-server-ejb3/" + + String jndiName = "java:global/rhq/rhq-server/" + SystemManagerBean.class.getSimpleName() + "!" + SystemManagerBean.class.getName().replace("Bean", "Local"); @@ -85,19 +85,19 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { + jndiName + "');\n" + "systemManager.isDebugModeEnabled();"); - + Assert.fail("The script shouldn't have been able to call local SLSB method."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); } } - + public void testLocalEjbsInaccessibleThroughJndiLookupWithCustomUrlPackages() throws ScriptException, IOException { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); ScriptEngine engine = getEngine(overlord); - String jndiName = "java:global/rhq/rhq-enterprise-server-ejb3/" + String jndiName = "java:global/rhq/rhq-server/" + SystemManagerBean.class.getSimpleName() + "!" + SystemManagerBean.class.getName().replace("Bean", "Local"); @@ -122,10 +122,10 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { public void testRemoteEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + ScriptEngine engine = getEngine(overlord); - String jndiName = "java:global/rhq/rhq-enterprise-server-ejb3/" + String jndiName = "java:global/rhq/rhq-server/" + SystemManagerBean.class.getSimpleName() + "!" + SystemManagerBean.class.getName().replace("Bean", "Remote"); @@ -137,28 +137,28 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { + jndiName + "');\n" + "systemManager.getSystemSettings(subject);"); - + Assert.fail("The script shouldn't have been able to call remote SLSB method directly."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); } } - + public void testScriptCantUseSessionManagerMethods() throws Exception { - Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + final ScriptEngine engine = getEngine(overlord); - + class G { private String sessionManager = "" + "org.rhq.enterprise.server.auth.SessionManager.getInstance()."; - + public void testInvoke(String methodCall) throws ScriptException { String code = sessionManager + methodCall; try { - engine.eval(code); + engine.eval(code); Assert.fail("The script shouldn't have been able to call a method on a SessionManager: " + methodCall); } catch (ScriptException e) { checkIsDesiredSecurityException(e); @@ -166,7 +166,7 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { } }; G manager = new G(); - + manager.testInvoke("getLastAccess(0);"); manager.testInvoke("getOverlord()"); manager.testInvoke("getSubject(2);"); @@ -175,27 +175,27 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { manager.testInvoke("put(new org.rhq.core.domain.auth.Subject());"); manager.testInvoke("put(new org.rhq.core.domain.auth.Subject(), 0);"); } - + public void testScriptCantObtainRawJDBCConnectionsWithoutCredentials() throws Exception { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + ScriptEngine engine = getEngine(overlord); - + try { engine.eval("" + "var ctx = new javax.naming.InitialContext();\n" + "var datasource = ctx.lookup('" + RHQConstants.DATASOURCE_JNDI_NAME + "');\n" + "con = datasource.getConnection();"); - + Assert.fail("The script shouldn't have been able to obtain the datasource from the JNDI."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); } } - + public void testScriptCantUseEntityManager() throws Exception { - Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + ScriptEngine engine = getEngine(overlord); try { @@ -204,12 +204,12 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { + "var entityManagerFactory = ctx.lookup('" + RHQConstants.ENTITY_MANAGER_JNDI_NAME + "');\n" + "var entityManager = entityManagerFactory.createEntityManager();\n" + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));"); - + Assert.fail("The script shouldn't have been able to use the EntityManager."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); - } - + } + //try harder with manually specifying the initial context factory try { engine.eval("" @@ -220,20 +220,20 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { + "var entityManagerFactory = ctx.lookup('" + RHQConstants.ENTITY_MANAGER_JNDI_NAME + "');\n" + "var entityManager = entityManagerFactory.createEntityManager();\n" + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));"); - + Assert.fail("The script shouldn't have been able to use the EntityManager even using custom initial context factory."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); - } + } } public void testProxyFactoryWorksWithSecuredScriptEngine() throws Exception { - Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + ScriptEngine engine = getEngine(overlord); - + try { - engine.eval("var resource = ProxyFactory.getResource(10001);"); + engine.eval("var resource = ProxyFactory.getResource(10001);"); } catch (ScriptException e) { //if the script fails (there is no resource with ID 10001) //it should not be because of an access control exception @@ -243,10 +243,10 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { //THIS IS A NEW REQUIREMENT THAT DOESN'T CURRENTLY WORK... // public void testInitialContextFactoryBuilderNotReplaceableUsingScripts() throws Exception { - // Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - // + // Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + // // ScriptEngine engine = getEngine(overlord); - // + // // try { // engine.eval("" // + "var mgrCls = java.lang.Class.forName('javax.naming.spi.NamingManager');\n" @@ -262,11 +262,11 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { // NamingHack.bruteForceInitialContextFactoryBuilder(); // } // } - + private static void checkIsDesiredSecurityException(ScriptException e) { String message = e.getMessage(); String permissionTrace = "org.rhq.allow.server.internals.access"; - + if (!message.contains(permissionTrace)) { Assert .fail( @@ -278,7 +278,7 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { private static void checkIsNotASecurityException(ScriptException e) { String message = e.getMessage(); String permissionTrace = "org.rhq.allow.server.internals.access"; - + if (message.contains(permissionTrace)) { Assert .fail( diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java index 9ddba97..4dfbd46 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java @@ -124,20 +124,20 @@ public abstract class AbstractEJB3Test extends Arquillian { // we need a way to deploy dependent ears needed to support the server/jar classes. But // building this jar up (as is done in core/domain) was too difficult due to the huge number // of dependencies. It was easier, and made sense, to use the already built rhq.ear - // and run as true integration tests. We do thin rhq.ear by removing all of the WAR files, and + // and run as true integration tests. We do thin rhq.ear by removing all of the WAR files, and // deploy only the EJB jars, and the services, which are really the objects under test. @Deployment protected static EnterpriseArchive getBaseDeployment() { - // Ensure the test working dir exists + // Ensure the test working dir exists tmpdirRoot.mkdirs(); // deploy the test classes in their own jar, under /lib JavaArchive testClassesJar = ShrinkWrap.create(JavaArchive.class, "test-classes.jar"); testClassesJar = addClasses(testClassesJar, new File("target/test-classes/org"), null); - // add non itests-2 RHQ classes used by the test classes, as well as needed resources + // add non itests-2 RHQ classes used by the test classes, as well as needed resources testClassesJar.addClass(ThrowableUtil.class); testClassesJar.addClass(MessageDigestGenerator.class); testClassesJar.addClass(StreamUtil.class); @@ -340,22 +340,22 @@ public abstract class AbstractEJB3Test extends Arquillian { .withoutTransitivity().asSingle(EnterpriseArchive.class); // merge rhq.ear into testEar but include only the EJB jars and the supporting libraries. Note that we // don't include the services sar because tests are responsible for prepare/unprepare of all required services, - // we don't want the production services performing any unexpected work. + // we don't want the production services performing any unexpected work. testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\\.jar.*")); // remove startup beans and shutdown listeners, we don't want this to be a full server deployment. The tests // start/stop what they need, typically with test services or mocks. testEar.delete(ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/core/StartupBean.class")); + .create("/rhq-server.jar/org/rhq/enterprise/server/core/StartupBean.class")); testEar.delete(ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/core/StartupBean$1.class")); + .create("/rhq-server.jar/org/rhq/enterprise/server/core/StartupBean$1.class")); testEar.delete(ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/core/ShutdownListener.class")); + .create("/rhq-server.jar/org/rhq/enterprise/server/core/ShutdownListener.class")); //replace the above startup beans with stripped down versions testEar.add(new ClassAsset(StrippedDownStartupBean.class), ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/test/StrippedDownStartupBean.class")); + .create("/rhq-server.jar/org/rhq/enterprise/server/test/StrippedDownStartupBean.class")); testEar.add(new ClassAsset(StrippedDownStartupBeanPreparation.class), ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/test/" + .create("/rhq-server.jar/org/rhq/enterprise/server/test/" + "StrippedDownStartupBeanPreparation.class")); testEar.addAsManifestResource(new ByteArrayAsset("<beans/>".getBytes()), ArchivePaths.create("beans.xml")); @@ -368,7 +368,7 @@ public abstract class AbstractEJB3Test extends Arquillian { // add the application xml declaring the ejb jars testEar.setApplicationXML("application.xml"); - // add additional 3rd party dependent jars needed to support test classes + // add additional 3rd party dependent jars needed to support test classes Collection thirdPartyDeps = new ArrayList(); thirdPartyDeps.add("joda-time:joda-time"); thirdPartyDeps.add("org.jboss.shrinkwrap:shrinkwrap-impl-base"); @@ -496,15 +496,15 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * <p>DO NOT OVERRIDE.</p> * <p>DO NOT DEFINE AN @BeforeMethod</p> - * + * * Instead, override {@link #beforeMethod()}. If you must override, for example, if you * need to use special attributes on your annotation, then ensure you protect the code with * and {@link #inContainer()} call. */ @BeforeMethod protected void __beforeMethod(Method method) throws Throwable { - // Note that Arquillian calls the testng BeforeMethod twice (as of 1.0.2.Final, once - // out of container and once in container. In general the expectation is to execute it + // Note that Arquillian calls the testng BeforeMethod twice (as of 1.0.2.Final, once + // out of container and once in container. In general the expectation is to execute it // one time, and doing it in container allows for the expected injections and context. if (inContainer()) { try { @@ -539,7 +539,7 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * <p>DO NOT OVERRIDE.</p> * <p>DO NOT DEFINE AN @AfterMethod</p> - * + * * Instead, override {@link #afterMethod()}. */ @AfterMethod(alwaysRun = true) @@ -559,33 +559,33 @@ public abstract class AbstractEJB3Test extends Arquillian { } protected boolean inContainer() { - // If the injection is done we're running in the container. + // If the injection is done we're running in the container. return (null != initialContext); } /** - * Override Point! Do not implement a @BeforeMethod, instead override this method. + * Override Point! Do not implement a @BeforeMethod, instead override this method. */ protected void beforeMethod() throws Exception { // do nothing if we're not overridden } /** - * Override Point! Do not implement a @BeforeMethod, instead override this method. + * Override Point! Do not implement a @BeforeMethod, instead override this method. */ protected void beforeMethod(Method method) throws Exception { // do nothing if we're not overridden } /** - * Override Point! Do not implement an @AfterMethod, instead override this method. note: alwaysRun=true + * Override Point! Do not implement an @AfterMethod, instead override this method. note: alwaysRun=true */ protected void afterMethod() throws Exception { // do nothing if we're not overridden } /** - * Override Point! Do not implement an @AfterMethod, instead override this method. note: alwaysRun=true + * Override Point! Do not implement an @AfterMethod, instead override this method. note: alwaysRun=true */ protected void afterMethod(ITestResult result, Method meth) throws Exception { // do nothing if we're not overridden @@ -706,7 +706,7 @@ public abstract class AbstractEJB3Test extends Arquillian { } /* The old AbstractEJB3Test impl extended AssertJUnit. Continue to support the used methods - * with various call-thru methods. + * with various call-thru methods. */ protected void assertNotNull(Object o) { @@ -1020,7 +1020,7 @@ public abstract class AbstractEJB3Test extends Arquillian { scanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these scanner.setServerPluginDir("ignore no plugins here"); // we don't want to scan for these scanner.setUserPluginDir("ignore no plugins here"); // we don't want to scan for these - scanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen + scanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen return preparePluginScannerService(scanner); } @@ -1028,7 +1028,7 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * Note that the standard plugin scanner service is deployed automatically with the test rhq ear, * this is only necessary if you want a custom service. - * + * * @param scannerService */ public PluginDeploymentScannerMBean preparePluginScannerService(PluginDeploymentScannerMBean scannerService) { @@ -1072,7 +1072,7 @@ public abstract class AbstractEJB3Test extends Arquillian { * annotations by creating sessions for different users with different permissions. * * @param subject a JON subject - * @return the session activated subject, a copy of the subject passed in. + * @return the session activated subject, a copy of the subject passed in. */ public Subject createSession(Subject subject) { return SessionManager.getInstance().put(subject); @@ -1086,9 +1086,9 @@ public abstract class AbstractEJB3Test extends Arquillian { * A utility for writing out various objects that need to be persisted for use between * tests. Arquillian (1.0.2) basically "new"s the testng test class on each test, so instance * variables can not be used between tests. Instead, the db or this mechanism needs to be used. - * + * * The file will be placed in the standard temp dir. If it already exists it will be replaced. - * + * * @param filename Do not include the directory. The value will be prepended with the class name. * @param objects * @throws Exception @@ -1106,9 +1106,9 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * A utility for reading in objects written with {@link #writeObjects(String, Object...). They are * placed in the result List in the same order they were written. - * + * * @param filename The same filename used in the write. Do not include the directory. - * @param numObjects the number of objects to read out. Can be less than total written, not greater. + * @param numObjects the number of objects to read out. Can be less than total written, not greater. * @throws Exception */ protected List<Object> readObjects(String filename, int numObjects) throws Exception { @@ -1130,16 +1130,16 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * A utility for cleaning up files created with {@link #writeObjects(String, Object...). - * - * @param filename The same filename used in the write. Do not include the directory. - * @return true if deleted, false otherwise. + * + * @param filename The same filename used in the write. Do not include the directory. + * @return true if deleted, false otherwise. */ protected boolean deleteObjects(String filename) { File file = new File(getTempDir(), filename); return file.delete(); } - /** + /** * @return a temp directory for testing that is specific to this test class. Specifically tmpdirRoot/this.getClass().getSimpleName(). */ public File getTempDir() { diff --git a/modules/enterprise/server/itests-2/src/test/resources/application.xml b/modules/enterprise/server/itests-2/src/test/resources/application.xml index 06b81e6..e28f755 100644 --- a/modules/enterprise/server/itests-2/src/test/resources/application.xml +++ b/modules/enterprise/server/itests-2/src/test/resources/application.xml @@ -6,6 +6,6 @@ <ejb>rhq-core-domain-ejb3.jar</ejb> </module> <module> - <ejb>rhq-enterprise-server-ejb3.jar</ejb> - </module> + <ejb>rhq-server.jar</ejb> + </module> </application> \ No newline at end of file diff --git a/modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml b/modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml index 48a80f2..1b5ceb9 100644 --- a/modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml +++ b/modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml @@ -20,7 +20,7 @@ </deployment>  - <sub-deployment name="rhq-enterprise-server-ejb3.jar"> + <sub-deployment name="rhq-server.jar"> <dependencies> <module name="org.jboss.msc" export="true" /> <module name="org.jboss.as.controller" export="true" /> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java index 3a435ef..2602cf8 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java @@ -44,8 +44,8 @@ import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility; * Although, we execute only locals to bypass the serialization performed by a remote invocation. Even * though this handler is co-located, for remotes, remoting will serialize the return data immediately. * This is bad for us because since we return domain objects we ned to scrub the data, removing - * hibernate proxies (see {@link HibernateDetachUtility}. - * + * hibernate proxies (see {@link HibernateDetachUtility}. + * * @author Greg Hinkle * @autor Jay Shaughnessy */ @@ -103,7 +103,7 @@ public class RemoteSafeInvocationHandler implements ServerInvocationHandler { Object target = ic.lookup(jndiName); Method m = target.getClass().getMethod(methodInfo[1], sig); - // switch to the local + // switch to the local jndiName = getLocalJNDIName(remoteClass); target = ic.lookup(jndiName); @@ -146,12 +146,12 @@ public class RemoteSafeInvocationHandler implements ServerInvocationHandler { } private static <T> String getLocalJNDIName(Class<?> remoteClass) { - return ("java:global/rhq/rhq-enterprise-server-ejb3/" + remoteClass.getSimpleName().replace("Remote", "Bean") + return ("java:global/rhq/rhq-server/" + remoteClass.getSimpleName().replace("Remote", "Bean") + "!" + remoteClass.getName().replace("Remote", "Local")); } private static <T> String getRemoteJNDIName(Class<?> remoteClass) { - return ("java:global/rhq/rhq-enterprise-server-ejb3/" + remoteClass.getSimpleName().replace("Remote", "Bean") + return ("java:global/rhq/rhq-server/" + remoteClass.getSimpleName().replace("Remote", "Bean") + "!" + remoteClass.getName()); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java index 7b60e13..d597363 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java @@ -482,7 +482,7 @@ public final class LookupUtil { public static TopologyManagerLocal getTopologyManager() { return lookupLocal(TopologyManagerBean.class); } - + public static StorageNodeManagerLocal getStorageNodeManager() { return lookupLocal(StorageNodeManagerBean.class); } @@ -636,10 +636,10 @@ public final class LookupUtil { /** * Generic method to lookup an Ejb bean by name and the interface name - * + * * @param beanName the name of the EJB bean * @param interfaceName the full class name of either the remote or local interface - * + * * @return the bean accessed through specified interface */ public static Object getEjb(String beanName, String interfaceName) { @@ -656,7 +656,7 @@ public final class LookupUtil { // Private Methods private static String getLocalJNDIName(String beanName, String interfaceName) { - return "java:global/rhq/rhq-enterprise-server-ejb3/" + beanName + "!" + interfaceName; + return "java:global/rhq/rhq-server/" + beanName + "!" + interfaceName; } private static <T> String getLocalJNDIName(@NotNull @@ -673,7 +673,7 @@ public final class LookupUtil { */ private static <T> String getRemoteJNDIName(@NotNull Class<? extends T> beanClass) { - return ("java:global/rhq/rhq-enterprise-server-ejb3/" + beanClass.getSimpleName() + "!" + beanClass.getName() + return ("java:global/rhq/rhq-server/" + beanClass.getSimpleName() + "!" + beanClass.getName() .replace("Bean", "Remote")); } diff --git a/modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties b/modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties index 91ccc85..f529be9 100644 --- a/modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties +++ b/modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties @@ -1,5 +1,5 @@ # location of the plugin jars and other files agents can download directly from sever -rhq.server.agent-files-directory=${rhq.server.home}/modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads +rhq.server.agent-files-directory=${rhq.server.home}/modules/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads # location where data files can be stored rhq.communications.data-directory=${jboss.server.data.dir} # global limit on number of concurrent incoming messages allowed diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java index df07b5a..bb6aa40 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java @@ -354,7 +354,7 @@ public class Install extends AbstractInstall { private File getAgentInstaller() { File agentDownloadDir = new File(getBaseDir(), - "modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/rhq-agent"); + "modules/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads/rhq-agent"); return agentDownloadDir.listFiles(new FileFilter() { @Override public boolean accept(File file) { diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java index 37667c6..9245baf 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java @@ -571,7 +571,7 @@ public class Upgrade extends AbstractInstall { private File getFileDownload(String directory, final String fileMatch) { File downloadDir = new File(getBaseDir(), - "modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/" + "modules/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads/" + directory); return downloadDir.listFiles(new FileFilter() { @Override diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index 3b5b2ba..e69df2e 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -13,7 +13,7 @@ <relativePath>../../../../pom.xml</relativePath> </parent> - <artifactId>rhq-enterprise-server-startup-subsystem</artifactId> + <artifactId>server-startup</artifactId> <name>RHQ Server Startup AS7 Subsystem</name> @@ -106,7 +106,7 @@ <artifactId>jboss-as-ee</artifactId> <scope>provided</scope> </dependency> - +  <dependency> <groupId>org.rhq</groupId> diff --git a/pom.xml b/pom.xml index d52dcc7..26703d1 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ <rhq.defaultDevContainerPath>dev-container</rhq.defaultDevContainerPath> <rhq.devContainerServerPath>${rhq.defaultDevContainerPath}/rhq-server</rhq.devContainerServerPath>  - <rhq.earDeployDir>modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/${rhq.earName}</rhq.earDeployDir> + <rhq.earDeployDir>modules/org/rhq/server-startup/main/deployments/${rhq.earName}</rhq.earDeployDir>  <rhq.agentPluginDir>${rhq.earDeployDir}/rhq-downloads/rhq-plugins</rhq.agentPluginDir> <rhq.serverPluginDir>${rhq.earDeployDir}/rhq-serverplugins</rhq.serverPluginDir> commit d3336fcd24c36f257a0702b13114b95146d44d83 Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Jul 11 14:04:39 2013 -0400 cassandra-installer uses a commons-io 2.1 API, we need to put this up front in classpath in eclipse diff --git a/.classpath b/.classpath index f09f8ed..e5e7a21 100644 --- a/.classpath +++ b/.classpath @@ -217,6 +217,7 @@ <classpathentry kind="src" path="modules/enterprise/server/data-migration/src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.2.3/httpclient-4.2.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.2.3/httpclient-4.2.3-sources.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/commons-io/commons-io/2.1/commons-io-2.1.jar" sourcepath="M2_REPO/commons-io/commons-io/2.1/commons-io-2.1-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.2.2/httpcore-4.2.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.2.2/httpcore-4.2.2-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.2.3/httpmime-4.2.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpmime/4.2.3/httpmime-4.2.3-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.SP1/jboss-profileservice-spi-5.1.0.SP1.jar"/> commit 794d564b16b697870ca92040f27acbcdcad63522 Author: Rémy Maucherat <rmaucher(a)redhat.com> Date: Thu Jul 11 15:33:55 2013 +0200 BZ863502: Fix OOM connecting to Tomcat instance. Patch by Thomas Segismont. diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java index f1e2c51..1b595db 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.jboss.on.plugins.tomcat; @@ -195,10 +191,9 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM // to have a version compatible local install and set the install path to the local path, even though // the server url was remote. String catalinaHome = pluginConfig.getSimpleValue(PLUGIN_CONFIG_CATALINA_HOME_PATH, null); - boolean hasLocalJars = new File(catalinaHome).isDirectory(); - - if (hasLocalJars) { - connectionSettings.setLibraryURI(catalinaHome); + File libDir = getLibDir(catalinaHome); + if (libDir != null) { + connectionSettings.setLibraryURI(libDir.getAbsolutePath()); connectionFactory.discoverServerClasses(connectionSettings); // Tell EMS to make copies of jar files so that the ems classloader doesn't lock @@ -276,6 +271,22 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM return connection; } + private File getLibDir(String catalinaHome) { + if (catalinaHome != null) { + // Tomcat 6 and Tomcat 7 have Catalina JARS in CATALINA_HOME/lib + File libDir = new File(catalinaHome, "lib"); + if (libDir.isDirectory()) { + return libDir; + } + // Tomcat 5.5 has Catalina JARS in CATALINA_HOME/server/lib + libDir = new File(catalinaHome, "server" + File.separator + "lib"); + if (libDir.isDirectory()) { + return libDir; + } + } + return null; + } + public Configuration getPluginConfiguration() { return resourceContext.getPluginConfiguration(); } @@ -485,4 +496,4 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM operationParameters.put(shutdownScriptEnv); } } -} \ No newline at end of file +} commit 6b054aa471107a3894fc45ea2ed97c7f8615562f Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 11 15:29:55 2013 +0200 Improve CassandraNodeComponent availability check performance. Keep a reference of the ProcessInfo instance and get a new one only if needed. diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 90afafb..0037bfe 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -1,30 +1,25 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.plugins.cassandra; -import static org.rhq.core.domain.measurement.AvailabilityType.DOWN; -import static org.rhq.core.domain.measurement.AvailabilityType.UNKNOWN; -import static org.rhq.core.domain.measurement.AvailabilityType.UP; +import static java.util.concurrent.TimeUnit.NANOSECONDS; +import static java.util.concurrent.TimeUnit.SECONDS; import static org.rhq.core.system.OperatingSystemType.WINDOWS; import java.io.File; @@ -65,6 +60,7 @@ import org.rhq.core.pluginapi.util.ProcessExecutionUtility; import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.ProcessInfo; +import org.rhq.core.system.ProcessInfo.ProcessInfoSnapshot; import org.rhq.core.system.SystemInfo; import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; @@ -75,17 +71,19 @@ import org.rhq.plugins.jmx.JMXServerComponent; * @author John Sanda */ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent<?>> implements OperationFacet { - - private Log log = LogFactory.getLog(CassandraNodeComponent.class); + private static final Log LOG = LogFactory.getLog(CassandraNodeComponent.class); private Session cassandraSession; private String host; + private ProcessInfo processInfo; @SuppressWarnings("rawtypes") @Override public void start(ResourceContext context) throws Exception { super.start(context); + processInfo = context.getNativeProcess(); + host = context.getPluginConfiguration().getSimpleValue("host", "localhost"); String clusterName = context.getPluginConfiguration().getSimpleValue("clusterName", "unknown"); String username = context.getPluginConfiguration().getSimpleValue("username", "cassandra"); @@ -98,7 +96,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent nativePort = Integer.parseInt(context.getPluginConfiguration() .getSimpleValue("nativeTransportPort", "9042")); } catch (Exception e) { - log.debug("Native transport port parsing failed...", e); + LOG.debug("Native transport port parsing failed...", e); } @@ -115,42 +113,39 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent this.cassandraSession = clusterBuilder.build().connect(clusterName); } catch (Exception e) { - log.error("Connect to Cassandra " + host + ":" + nativePort, e); + LOG.error("Connect to Cassandra " + host + ":" + nativePort, e); throw e; } }; @Override public void stop() { - log.info("Shutting down Cassandra client"); + processInfo = null; + LOG.info("Shutting down Cassandra client"); cassandraSession.getCluster().shutdown(); - log.info("Shutdown is complete"); + LOG.info("Shutdown is complete"); } @Override public AvailabilityType getAvailability() { - long start = System.currentTimeMillis(); + long start = System.nanoTime(); try { - ResourceContext<?> context = getResourceContext(); - ProcessInfo processInfo = context.getNativeProcess(); - - if (processInfo == null) { - return UNKNOWN; - } else { - // It is safe to read prior snapshot as getNativeProcess always return a fresh instance - // ProcessInfoSnapshot processInfoSnaphot = processInfo.freshSnapshot(); - if (processInfo.priorSnaphot().isRunning()) { - return UP; - } else { - return DOWN; - } + // Get a fresh snapshot of the process + ProcessInfoSnapshot processInfoSnapshot = (processInfo == null) ? null : processInfo.freshSnapshot(); + if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { + processInfo = getResourceContext().getNativeProcess(); + // Safe to get prior snapshot here, we've just recreated the process info instance + processInfoSnapshot = (processInfo == null) ? null : processInfo.priorSnaphot(); } + return (processInfoSnapshot != null && processInfoSnapshot.isRunning()) ? AvailabilityType.UP + : AvailabilityType.DOWN; } finally { - long end = System.currentTimeMillis(); - long totalTime = end - start; - log.debug("Finished availability check in " + totalTime + " ms"); - if (totalTime > (1000 * 5)) { - log.warn("Availability check exceeded five seconds. Total time was " + totalTime + " ms"); + long totalTimeMillis = NANOSECONDS.toMillis(System.nanoTime() - start); + if (LOG.isDebugEnabled()) { + LOG.debug("Finished availability check in " + totalTimeMillis + " ms"); + } + if (totalTimeMillis > SECONDS.toMillis(5)) { + LOG.warn("Availability check exceeded five seconds. Total time was " + totalTimeMillis + " ms"); } } } @@ -175,28 +170,28 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent protected OperationResult shutdownNode() { ResourceContext<?> context = getResourceContext(); - if (log.isInfoEnabled()) { - log.info("Starting shutdown operation on " + CassandraNodeComponent.class.getName() + + if (LOG.isInfoEnabled()) { + LOG.info("Starting shutdown operation on " + CassandraNodeComponent.class.getName() + " with resource key " + context.getResourceKey()); } EmsConnection emsConnection = getEmsConnection(); EmsBean storageService = emsConnection.getBean("org.apache.cassandra.db:type=StorageService"); Class[] emptyParams = new Class[0]; - if (log.isDebugEnabled()) { - log.debug("Disabling thrift..."); + if (LOG.isDebugEnabled()) { + LOG.debug("Disabling thrift..."); } EmsOperation operation = storageService.getOperation("stopRPCServer", emptyParams); operation.invoke((Object[]) emptyParams); - if (log.isDebugEnabled()) { - log.debug("Disabling gossip..."); + if (LOG.isDebugEnabled()) { + LOG.debug("Disabling gossip..."); } operation = storageService.getOperation("stopGossiping", emptyParams); operation.invoke((Object[]) emptyParams); - if (log.isDebugEnabled()) { - log.debug("Initiating drain..."); + if (LOG.isDebugEnabled()) { + LOG.debug("Initiating drain..."); } operation = storageService.getOperation("drain", emptyParams); operation.invoke((Object[]) emptyParams); @@ -207,7 +202,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent process.kill("KILL"); return new OperationResult("Successfully shut down Cassandra daemon with pid " + pid); } catch (SigarException e) { - log.warn("Failed to shut down Cassandra node with pid " + pid, e); + LOG.warn("Failed to shut down Cassandra node with pid " + pid, e); OperationResult failure = new OperationResult("Failed to shut down Cassandra node with pid " + pid); failure.setErrorMessage(ThrowableUtil.getAllMessages(e)); return failure; @@ -256,7 +251,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent try { updateSeedsList(addresses); } catch (Exception e) { - log.error("An error occurred while updating the seeds list property", e); + LOG.error("An error occurred while updating the seeds list property", e); Throwable rootCause = ThrowableUtil.getRootCause(e); result.setErrorMessage(ThrowableUtil.getStackAsString(rootCause)); } @@ -277,7 +272,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent try { addresses = convertToIPAddresses(seeds); } catch (UnknownHostException e) { - log.error("Failed to update seeds list", e); + LOG.error("Failed to update seeds list", e); throw new IOException("Failed to update seeds list. Make sure that " + seeds + " is a list of valid " + "hostnames or IP addresses that can be resolved.", e); } @@ -329,7 +324,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent if (!yamlFile.delete()) { String msg = "Failed to delete [" + yamlFile + "] in preparation of writing updated configuration. The " + "changes will be aborted."; - log.error(msg); + LOG.error(msg); deleteYamlBackupFile(yamlFileBackup); throw new IOException(msg); } @@ -339,8 +334,8 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent yaml.dump(cassandraConfig, writer); deleteYamlBackupFile(yamlFileBackup); } catch (Exception e) { - log.error("An error occurred while trying to write the updated configuration back to " + yamlFile, e); - log.error("Reverting changes to " + yamlFile); + LOG.error("An error occurred while trying to write the updated configuration back to " + yamlFile, e); + LOG.error("Reverting changes to " + yamlFile); if (yamlFile.delete()) { StreamUtil.copy(new FileInputStream(yamlFileBackup), new FileOutputStream(yamlFile)); @@ -348,7 +343,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } else { String msg = "Failed updates to " + yamlFile.getName() + " cannot be rolled back. The file cannot be " + "deleted. " + yamlFile + " should be replaced by " + yamlFileBackup; - log.error(msg); + LOG.error(msg); throw new IOException(msg); } } finally { @@ -367,8 +362,8 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent private void deleteYamlBackupFile(File yamlBackup) { if (!yamlBackup.delete()) { - log.warn("Failed to delete Cassandra configuration backup file [" + yamlBackup + "]. This file " + - "should be deleted."); + LOG.warn("Failed to delete Cassandra configuration backup file [" + yamlBackup + "]. This file " + + "should be deleted."); } } commit 3f21a52f2eeef0e5b46f9002980e158ff26f21d9 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Jul 11 09:18:02 2013 -0400 don't use $TMPDIR since it might not be defined on all platforms diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh index 947155f..8a83320 100755 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh @@ -23,7 +23,7 @@ PATCH="apache-cassandra-1.2.4-patch-1.jar" # swap out the Cassandra jar file with the patched version echo "Copying patch file to $RHQ_SERVER_DIR/rhq-storage/lib" -mv $RHQ_SERVER_DIR/rhq-storage/lib/apache-cassandra-1.2.4.jar $TMPDIR +mv $RHQ_SERVER_DIR/rhq-storage/lib/apache-cassandra-1.2.4.jar . cp $PATCH $RHQ_SERVER_DIR/rhq-storage/lib # restart the storage node @@ -54,6 +54,6 @@ $RHQ_SERVER_DIR/bin/rhqctl stop echo "Removing patch file" rm $RHQ_SERVER_DIR/rhq-storage/lib/$PATCH -mv $TMPDIR/apache-cassandra-1.2.4.jar $RHQ_SERVER_DIR/rhq-storage/lib +mv ./apache-cassandra-1.2.4.jar $RHQ_SERVER_DIR/rhq-storage/lib echo "Table compression has been disabled for all keyspaces. You are now ready to upgrade your RHQ installation." commit 9356e5fe02c664fc758376166a95ed4b85a603cb Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Jul 11 11:19:45 2013 +0200 BZ 966294 Further improvements. Also work around BZ 983275 diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java index 7b174cc..296696c 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java +++ b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java @@ -37,6 +37,7 @@ public class SnmpInfo { // Default remote port for SNMP trap static final String DEFAULT_PORT = "162"; + private static final String DEFAULT_RHQ_BINDING = "1.3.6.1.4.1.18016.2.1"; final public String host; final public String port; @@ -84,8 +85,11 @@ public class SnmpInfo { if (host==null || host.isEmpty()) { host = preferences.getSimpleValue("defaultTargetHost",null); } - String port = configuration.getSimpleValue(PARAM_PORT, DEFAULT_PORT); - String oid = configuration.getSimpleValue(PARAM_VARIABLE_BINDING_PREFIX, null); // required + String port = configuration.getSimpleValue(PARAM_PORT, null); + if (port==null||port.isEmpty()) { + port = preferences.getSimpleValue("defaultPort",DEFAULT_PORT); + } + String oid = configuration.getSimpleValue(PARAM_VARIABLE_BINDING_PREFIX, DEFAULT_RHQ_BINDING); // required String trapOid = configuration.getSimpleValue(PARAM_TRAP_OID, null); return new SnmpInfo(host, port, oid, trapOid); @@ -94,7 +98,7 @@ public class SnmpInfo { @Override public String toString() { String hostString = (host == null ? "UnknownHost" : host); - String oidString = (oid == null ? "UnknownOID" : oid); + String oidString = (oid == null ? "Unknown Binding Prefix" : oid); String trapOidString = (trapOid == null ? "DefaultTrapOID" : trapOid); return hostString + ":" + port + " (" + oidString + ") (" + trapOidString + ")"; } diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml b/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml index 3f7a35c..8e2a4cc 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml +++ b/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml @@ -25,7 +25,7 @@ </c:property-options> </c:simple-property> - <c:simple-property name="defaultTargetHost" displayName="Default trap target host" required="false"/> + <c:simple-property name="defaultTargetHost" displayName="Default trap target host" required="false" default="localhost"/> <c:simple-property name="defaultPort" displayName="Default trap target port" required="false" type="integer" default="162" defaultValue="162"/> <c:simple-property name="transport" defaultValue="UDP"> @@ -35,7 +35,7 @@ </c:property-options> </c:simple-property> - <c:simple-property name="trapOid" displayName="Trap OID" description="OID for the trap sent" type="string" + <c:simple-property name="trapOid" displayName="Trap OID" description="OID of the trap sent" type="string" default="1.3.6.1.4.1.18016.2.1.2.0.1"/> <c:simple-property name="community" type="string" default="public" description="Community - v1 and v2c only" required="false"/> @@ -43,10 +43,10 @@ <c:simple-property name="genericId" required="false" default="6" type="integer" description="Set the generic trap type. Default is 6 (=Enterprise specific)."/> - <c:simple-property name="enterpriseOid" required="false" default="1.3.6.1.4.1.18016.2.3" + <c:simple-property name="specificId" required="false" default="0" type="integer" + description="Enterprise-specific ID of the trap. If this is set, the generic ID must be set to 6."/> + <c:simple-property name="enterpriseOid" required="false" default="1.3.6.1.4.1.18016.2.3" description="OID of the sender, identifies the type of managed object generating the trap. Default is enterprise.jboss.rhq.rhqServer"/> - <c:simple-property name="specificId" required="false" default="0" type="integer" - description="Enterprise-specific ID of the trap. If this is set, the generic ID must be set to 6."/> <c:simple-property name="agentAddress" description="Address of our SNMP agent (=the RHQ server)" required="false"/> </c:group>  + <schema-javaTask className="StorageNodeAddressUpgradeTask" /> + </schemaSpec> + </dbupgrade> </target> </project> commit d124d4589120090628c53c04c6767b948c7a270a Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 10 14:59:57 2013 -0400 remove C* native library dependencies JNA and lz4-java have been removed from our C* distro. The distro now includes a version of snappy-java that excludes the native components. We still have to include snappy-java because C* still has a runtime dependency on snappy-java classes. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 0f6eaca..0b015b4 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -97,9 +97,6 @@ <exclude>src/main/resources/cassandra/conf/cassandra-env.sh</exclude> </excludes> </resource> -  -  -  </resources> <delimiters> <delimiter>${*}</delimiter> @@ -110,6 +107,13 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + <version>${cassandra.snappy.version}</version> + </dependency> + </dependencies> <executions> <execution>  - <profile> - <id>snappy-mac-workaround</id> - <activation> - <os> - <family>Mac</family> - </os> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <inherited>false</inherited> - <dependencies> - <dependency> - <groupId>org.xerial.snappy</groupId> - <artifactId>snappy-java</artifactId> - <version>1.1.0-M3</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>setup-pkg-mac</id> - <phase>process-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <property name="cassandra.dir" - value="${project.build.outputDirectory}/cassandra-${cassandra.version}"/> - <property name="cassandra.lib.dir" value="${cassandra.dir}/lib"/> - <property name="snappy.jar.original" value="${cassandra.lib.dir}/snappy-java-1.0.4.1.jar"/> - <property name="snappy.jar.updated" - value="${local.repo}/org/xerial/snappy/snappy-java/${cassandra.driver.snappy.version}/snappy-java-${cassandra.driver.snappy.version}.jar"/> - <delete file="${snappy.jar.original}"/> - <copy file="${snappy.jar.updated}" todir="${cassandra.lib.dir}"/> - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml index bae3ecc..298db9d 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml @@ -681,7 +681,7 @@ client_encryption_options: # can be: all - all traffic is compressed # dc - traffic between different datacenters is compressed # none - nothing is compressed. -internode_compression: all +internode_compression: none # Enable or disable tcp_nodelay for inter-dc communication. # Disabling it will result in larger (but fewer) network packets being sent, diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 8062d6a..d919ee3 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -32,6 +32,7 @@ import java.io.FileReader; import java.io.IOException; import java.net.InetAddress; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -54,6 +55,7 @@ import org.apache.commons.cli.PosixParser; import org.apache.commons.exec.DefaultExecutor; import org.apache.commons.exec.Executor; import org.apache.commons.exec.PumpStreamHandler; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.output.NullOutputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -90,6 +92,8 @@ public class StorageInstaller { private final Log log = LogFactory.getLog(StorageInstaller.class); + private final String VERIFY_DATA_DIRS_EMPTY = "verify-data-dirs-empty"; + private Options options; private File serverBasedir; @@ -191,12 +195,15 @@ public class StorageInstaller { + "where the existing RHQ server is installed."); upgradeOption.setArgName("RHQ_SERVER_DIR"); + Option verifyDataDirsEmptyOption = new Option(null, VERIFY_DATA_DIRS_EMPTY, true, "Will cause the installer " + + "to abort if any of the data directories is not empty. Defaults to true."); + options = new Options().addOption(new Option("h", "help", false, "Show this message.")).addOption(hostname) .addOption(seeds).addOption(jmxPortOption).addOption(startOption).addOption(checkStatus) .addOption(commitLogOption).addOption(dataDirOption).addOption(savedCachesDirOption) .addOption(nativeTransportPortOption).addOption(storagePortOption).addOption(sslStoragePortOption) .addOption(basedirOption).addOption(heapSizeOption).addOption(heapNewSizeOption).addOption(stackSizeOption) - .addOption(upgradeOption); + .addOption(upgradeOption).addOption(verifyDataDirsEmptyOption); } public int run(CommandLine cmdLine) throws Exception { @@ -296,21 +303,25 @@ public class StorageInstaller { File dataDirFile = new File(dataDir); File savedCachesDirFile = new File(savedCachesDir); - // validate the three data directories are empty - if they are not, we are probably stepping on another storage node - if (!isDirectoryEmpty(commitLogDirFile)) { - log.error("Commitlog directory is not empty. It should not exist for a new Storage Node [" - + commitLogDirFile.getAbsolutePath() + "]"); - return STATUS_DATA_DIR_NOT_EMPTY; - } - if (!isDirectoryEmpty(dataDirFile)) { - log.error("Data directory is not empty. It should not exist for a new Storage Node [" - + dataDirFile.getAbsolutePath() + "]"); - return STATUS_DATA_DIR_NOT_EMPTY; - } - if (!isDirectoryEmpty(savedCachesDirFile)) { - log.error("Saved caches directory is not empty. It should not exist for a new Storage Node [" - + savedCachesDirFile.getAbsolutePath() + "]"); - return STATUS_DATA_DIR_NOT_EMPTY; + boolean verifyDataDirsEmpty = Boolean.valueOf(cmdLine.getOptionValue(VERIFY_DATA_DIRS_EMPTY, "true")); + if (verifyDataDirsEmpty) { + // validate the three data directories are empty - if they are not, we are probably stepping on + // another storage node + if (!isDirectoryEmpty(commitLogDirFile)) { + log.error("Commitlog directory is not empty. It should not exist for a new Storage Node [" + + commitLogDirFile.getAbsolutePath() + "]"); + return STATUS_DATA_DIR_NOT_EMPTY; + } + if (!isDirectoryEmpty(dataDirFile)) { + log.error("Data directory is not empty. It should not exist for a new Storage Node [" + + dataDirFile.getAbsolutePath() + "]"); + return STATUS_DATA_DIR_NOT_EMPTY; + } + if (!isDirectoryEmpty(savedCachesDirFile)) { + log.error("Saved caches directory is not empty. It should not exist for a new Storage Node [" + + savedCachesDirFile.getAbsolutePath() + "]"); + return STATUS_DATA_DIR_NOT_EMPTY; + } } jmxPort = getPort(cmdLine, "jmx-port", defaultJmxPort); @@ -438,12 +449,7 @@ public class StorageInstaller { } private boolean isDirectoryEmpty(File dir) { - if (dir.isDirectory()) { - File[] files = dir.listFiles(); - return (files == null || files.length == 0); - } else { - return true; - } + return FileUtils.sizeOf(dir) == 0; } private int getPort(CommandLine cmdLine, String option, int defaultValue) { @@ -709,12 +715,22 @@ public class StorageInstaller { } public void printUsage() { - Options options = getOptions(); HelpFormatter helpFormatter = new HelpFormatter(); String syntax = "rhq-storage-installer.sh|bat [options]"; String header = ""; - helpFormatter.printHelp(syntax, header, options, null); + helpFormatter.printHelp(syntax, header, getHelpOptions(), null); + } + + public Options getHelpOptions() { + Options helpOptions = new Options(); + for (Option option : (Collection<Option>)options.getOptions()) { + if (option.getLongOpt().equals(VERIFY_DATA_DIRS_EMPTY)) { + continue; + } + helpOptions.addOption(option); + } + return helpOptions; } public Options getOptions() { diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ClusterBuilder.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ClusterBuilder.java index 4687b4b..14f12e1 100644 --- a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ClusterBuilder.java +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ClusterBuilder.java @@ -94,9 +94,10 @@ public class ClusterBuilder { * @see com.datastax.driver.core.Cluster.Builder#build() */ public Cluster build() { - if (compression == null && !isIBMJRE()) { - builder.withCompression(ProtocolOptions.Compression.SNAPPY); - } +// if (compression == null && !isIBMJRE()) { +// builder.withCompression(ProtocolOptions.Compression.SNAPPY); +// } + builder.withCompression(ProtocolOptions.Compression.NONE); return builder.build(); } diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index cfe13be..bf06886 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -243,7 +243,7 @@ toDir="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main" verbose="true"/> <copy file="${settings.localRepository}/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.jar" toDir="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main" verbose="true"/> - <copy file="${settings.localRepository}/org/xerial/snappy/snappy-java/1.0.5-M3-p1/snappy-java-1.0.5-M3-p1.jar" + <copy file="${settings.localRepository}/org/xerial/snappy/snappy-java/${cassandra.snappy.version}/snappy-java-${cassandra.snappy.version}.jar" toDir="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main" verbose="true"/> <echo file="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main/module.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> @@ -258,7 +258,7 @@ <resource-root path="metrics-core-2.2.0.jar"/> <resource-root path="slf4j-api-1.7.2.jar"/> <resource-root path="slf4j-log4j12-1.7.2.jar"/> - <resource-root path="snappy-java-1.0.5-M3-p1.jar"/> + <resource-root path="snappy-java-${cassandra.snappy.version}.jar"/> <resource-root path="avro-1.4.0-cassandra-1.jar"/> </resources> diff --git a/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy b/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy index f8fae7d..ccb90b9 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy +++ b/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy @@ -97,6 +97,7 @@ heap-new-size=${heapNewSize} hostname=127.0.0.$nodeId jmx-port=${defaultJmxPort + (nodeId - 1)} seeds=${seeds} +verify-data-dirs-empty=false """ ) } diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index 1819f02..a3e9c7b 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -326,7 +326,7 @@ toDir="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main" verbose="true"/> <copy file="${settings.localRepository}/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.jar" toDir="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main" verbose="true"/> - <copy file="${settings.localRepository}/org/xerial/snappy/snappy-java/1.0.5-M3-p1/snappy-java-1.0.5-M3-p1.jar" + <copy file="${settings.localRepository}/org/xerial/snappy/snappy-java/${cassandra.snappy.version}/snappy-java-${cassandra.snappy.version}.jar" toDir="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main" verbose="true"/> <echo file="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main/module.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> @@ -341,7 +341,7 @@ <resource-root path="metrics-core-2.2.0.jar"/> <resource-root path="slf4j-api-1.7.2.jar"/> <resource-root path="slf4j-log4j12-1.7.2.jar"/> - <resource-root path="snappy-java-1.0.5-M3-p1.jar"/> + <resource-root path="snappy-java-${cassandra.snappy.version}.jar"/> <resource-root path="avro-1.4.0-cassandra-1.jar"/> </resources> diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index 76a781d..da90f09 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -27,7 +27,7 @@ <dependency> <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId> - <version>1.0.5-M3-p1</version> + <version>${cassandra.snappy.version}</version> </dependency> <dependency> <groupId>org.apache.cassandra</groupId> @@ -141,7 +141,7 @@ <artifactItem> <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId> - <version>1.0.5-M3-p1</version> + <version>${cassandra.snappy.version}</version> </artifactItem> <artifactItem> <groupId>org.codehaus.jackson</groupId> diff --git a/pom.xml b/pom.xml index 99c1bdc..d52dcc7 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ <cassandra.thrift.version>0.7.0</cassandra.thrift.version> <cassandra.driver.version>1.0.0-rhq-1.2.4</cassandra.driver.version> <cassandra.driver.netty.version>3.6.3.Final</cassandra.driver.netty.version> - <cassandra.driver.snappy.version>1.0.5-M3-p1</cassandra.driver.snappy.version> + <cassandra.snappy.version>1.0.4.1-rhq-p1</cassandra.snappy.version> <cassandra.snakeyaml.version>1.6</cassandra.snakeyaml.version> <rhq.db.admin.username>rhqadmin</rhq.db.admin.username> commit 3783018826b0ebbe069751842cde15e75bc29bb2 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Jul 10 18:44:17 2013 +0200 [BZ 966293] - Add validation for expression when creating Dynagroup Definition - adding a check to GroupDefinitionManagerBean.validate() method. Also making sure, the right message is correctly propagated to the web UI. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java index 74484dd..fed6e32 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java @@ -130,7 +130,13 @@ public class GroupDefinitionDataSource extends RPCDataSource<GroupDefinition, Re @Override public void onFailure(Throwable caught) { Map<String, String> errors = new HashMap<String, String>(); - errors.put("name", MSG.view_dynagroup_definitionAlreadyExists()); + String msg = caught.getMessage(); + String cannotParse = "Cannot parse the expression: "; + if (msg != null && msg.contains(cannotParse)) { + errors.put("expression", msg.substring(msg.indexOf(cannotParse) + cannotParse.length())); + } else { + errors.put("name", MSG.view_dynagroup_definitionAlreadyExists()); + } response.setErrors(errors); response.setStatus(RPCResponse.STATUS_VALIDATION_ERROR); processResponse(request.getRequestId(), response); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java index 1afa30d..7b36717 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java @@ -199,6 +199,7 @@ public class SingleGroupDefinitionView extends EnhancedVLayout implements Bookma @Override public void execute(DSResponse response, Object rawData, DSRequest request) { boolean hasDuplicateNameError = false; + boolean hasParseExpressionError = false; if (form.isNewRecord()) { Record[] results = response.getData(); if (results.length != 1) { @@ -212,10 +213,14 @@ public class SingleGroupDefinitionView extends EnhancedVLayout implements Bookma String errorValue = (String) thisEntry.getValue(); CoreGUI.getErrorHandler().handleError(errorValue); hasDuplicateNameError = true; + } else if (fieldKey.equals("expression")) { + String errorValue = (String) thisEntry.getValue(); + CoreGUI.getErrorHandler().handleError(errorValue); + hasParseExpressionError = true; } } - if (!hasDuplicateNameError) { + if (!hasDuplicateNameError && !hasParseExpressionError) { CoreGUI.getErrorHandler().handleError( MSG.view_dynagroup_singleSaveFailure(String.valueOf(results.length))); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java index a276efb..373368c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java @@ -175,11 +175,6 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal, throw new GroupDefinitionUpdateException(gde.getMessage()); } - ExpressionEvaluator evaluator = new ExpressionEvaluator(); - for (String expression : groupDefinition.getExpressionAsList()) { - evaluator.addExpression(expression); - } - RecursivityChangeType changeType = RecursivityChangeType.None; GroupDefinition attachedGroupDefinition = null; try { @@ -251,6 +246,15 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal, if (definition.getExpression() == null || definition.getExpression().isEmpty()) { throw new GroupDefinitionException("Expression is empty"); } + + try { + ExpressionEvaluator evaluator = new ExpressionEvaluator(); + for (String expression : definition.getExpressionAsList()) { + evaluator.addExpression(expression); + } + } catch (InvalidExpressionException e) { + throw new GroupDefinitionException("Cannot parse the expression: " + e.getMessage()); + } Query query = entityManager.createNamedQuery(GroupDefinition.QUERY_FIND_BY_NAME); query.setParameter("name", name); commit 0d1662bbbec85dbbb820cc8e778963015027caa2 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Jul 10 17:33:48 2013 +0200 [BZ 976265] - Unable to remove one dynagroup definition - Anotating method GroupDefinitionManagerBean.updateGroupDefinition() with @TransactionAttribute. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java index bb425f6..a276efb 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java @@ -162,6 +162,8 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal, } @RequiredPermission(Permission.MANAGE_INVENTORY) + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + // required for the recalculation thread (same like calculateGroupMembership) this fixes BZ 976265 public GroupDefinition updateGroupDefinition(Subject subject, GroupDefinition groupDefinition) throws GroupDefinitionAlreadyExistsException, GroupDefinitionUpdateException, InvalidExpressionException, ResourceGroupUpdateException { commit 627c48a7a18a03d9a91032a32c1833d4fcbae86a Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Jul 10 17:10:04 2013 +0200 [BZ 974501] - Its possible to create a dynaGroup definition without expression via CLI - check whether expression is null of an empty string diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java index bb2587f..bb425f6 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java @@ -230,27 +230,25 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal, if (name.equals("")) { throw new GroupDefinitionException("Name is a required property"); } - if (name.length() > 100) { throw new GroupDefinitionException("Name is limited to 100 characters"); } - if (description.length() > 100) { throw new GroupDefinitionException("Description is limited to 100 characters"); } - if (name.contains("<") || name.contains("$") || name.contains("'") || name.contains("{") || name.contains("[")) { throw new GroupDefinitionException("Name must not contain <,$,',[,{ characters"); } - if (definition.getRecalculationInterval() < 0) { throw new GroupDefinitionException("Recalculation interval cannot be negative"); } - if (definition.getRecalculationInterval() > 0 && definition.getRecalculationInterval() < 60 * 1000) { throw new GroupDefinitionException( "Recalculation interval cannot be a positive number lower than 1 minute (60000ms)"); } + if (definition.getExpression() == null || definition.getExpression().isEmpty()) { + throw new GroupDefinitionException("Expression is empty"); + } Query query = entityManager.createNamedQuery(GroupDefinition.QUERY_FIND_BY_NAME); query.setParameter("name", name); commit d1f030ca0033ce7d7a7ea4ab223214789118de99 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 10 10:48:16 2013 -0400 add some basic argument validation The script now takes as arguments the rhq server directory, the ip address of the storage node, the cql port, and the jmx port. diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh index 756ba20..947155f 100755 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh @@ -1,14 +1,23 @@ #!/bin/bash -if [ "x$1" = "x" ]; then - echo "Usage: $0 <rhq-server-dir>" +function usage() { + echo "Usage: $0 <rhq-server-dir> <storage-ip-address> <cql-port> <jmx-port>" +} + +if [ $# -ne 4 ]; then + usage + exit 1 +fi + +if [[ "x$1" = "x" ]] || [[ "x$2" = "x" ]] || [[ "x$3" = "x" ]] || [[ "x$4" = "x" ]]; then + usage exit 1 fi RHQ_SERVER_DIR=$1 CQL_HOSTNAME=$2 -CQL_PORT=9142 -JMX_PORT=7299 +CQL_PORT=$3 +JMX_PORT=$4 PATCH="apache-cassandra-1.2.4-patch-1.jar" commit 08f7934eecde748578f075d26018fcc348693fae Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Jul 10 16:44:00 2013 +0200 [BZ 977782] - Incorrect error message is shown when creating a new dynaGroup definition with incorrect name - added regexp validator to the coregui. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java index 99e0192..1afa30d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java @@ -56,6 +56,8 @@ import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; import com.smartgwt.client.widgets.form.fields.events.FormItemClickHandler; import com.smartgwt.client.widgets.form.fields.events.FormItemIconClickEvent; +import com.smartgwt.client.widgets.form.validator.RegExpValidator; +import com.smartgwt.client.widgets.form.validator.Validator; import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.HoverCustomizer; import com.smartgwt.client.widgets.grid.ListGrid; @@ -82,10 +84,10 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupsDataSource; import org.rhq.enterprise.gui.coregui.client.inventory.groups.definitions.GroupDefinitionExpressionBuilder.AddExpressionHandler; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedIButton; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; /** * @author Joseph Marques @@ -136,6 +138,10 @@ public class SingleGroupDefinitionView extends EnhancedVLayout implements Bookma description.setValue(groupDefinition.getDescription()); recalculationInterval.setValue(groupDefinition.getRecalculationInterval() / (60 * 1000)); expression.setValue(groupDefinition.getExpression()); + + Validator nameValidator = new RegExpValidator("^[^\\<\\$\\'\\{\\[]{1,100}$"); + nameValidator.setErrorMessage("Name must not contain following characters: < $ ' [ {"); + name.setValidators(nameValidator); final DynamicForm form = new DynamicForm(); form.setFields(id, name, description, templateSelectorTitleSpacer, templateSelector, expression, recursive, commit fa8e8225c6777c5d7e57c25aae3b80a180cbc58b Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Jul 10 14:54:21 2013 +0200 [BZ 975502] - Its possible to create a dynaGroup definition with recalculation Interval < 1 minute via CLI - added simple checks to the GroupDefinitionManagerBean. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java index 8713928..bb2587f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java @@ -242,6 +242,15 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal, if (name.contains("<") || name.contains("$") || name.contains("'") || name.contains("{") || name.contains("[")) { throw new GroupDefinitionException("Name must not contain <,$,',[,{ characters"); } + + if (definition.getRecalculationInterval() < 0) { + throw new GroupDefinitionException("Recalculation interval cannot be negative"); + } + + if (definition.getRecalculationInterval() > 0 && definition.getRecalculationInterval() < 60 * 1000) { + throw new GroupDefinitionException( + "Recalculation interval cannot be a positive number lower than 1 minute (60000ms)"); + } Query query = entityManager.createNamedQuery(GroupDefinition.QUERY_FIND_BY_NAME); query.setParameter("name", name); commit d61c77462f80bf1f8164341e58783ab75d3ff5f0 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Jul 10 09:17:57 2013 -0500 AllDataFileLocations is not a metric and thus no need to change the collection interval. diff --git a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java index 1cff654..dcfdc37 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java +++ b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java @@ -62,7 +62,6 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone private final Log log = LogFactory.getLog(AlertDefinitionServerPluginComponent.class); private static final String PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.PartitionDiskUsedPercentage"; - private static final String DATA_FILE_LOCATIONS_NAME = "AllDataFileLocations"; static private final List<InjectedTemplate> injectedTemplates; static private final InjectedTemplate storageNodeHighHeapTemplate; @@ -309,8 +308,6 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone measurementDefinitionIds.add(d.getId()); ac.setMeasurementDefinition(d); ac.setName(d.getDisplayName()); - } else if (DATA_FILE_LOCATIONS_NAME.equals(d.getName())) { - measurementDefinitionIds.add(d.getId()); } } assert null != ac.getMeasurementDefinition() : "Did not find expected measurement definition " @@ -331,7 +328,8 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone // is set by default. MeasurementScheduleManagerLocal measurementManager = LookupUtil.getMeasurementScheduleManager(); measurementManager.updateDefaultCollectionIntervalAndEnablementForMeasurementDefinitions( - subjectManager.getOverlord(), ArrayUtils.toPrimitive(measurementDefinitionIds.toArray(new Integer[2])), + subjectManager.getOverlord(), + ArrayUtils.toPrimitive(measurementDefinitionIds.toArray(new Integer[measurementDefinitionIds.size()])), 60000L, true, true); return newTemplateId; commit 5b0415a3703ce56bbc27fd348c9808e446207fed Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 10 15:52:07 2013 +0200 Bug 910646 - Unable to add more than 100 resources to a Compatible Group Add integration test and throw UnsupportedOperationException if criteria has unlimited PageControl diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/test/GroupMemberCandidateResourcesTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/test/GroupMemberCandidateResourcesTest.java new file mode 100644 index 0000000..3447799 --- /dev/null +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/test/GroupMemberCandidateResourcesTest.java @@ -0,0 +1,190 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.enterprise.server.resource.test; + +import static org.rhq.core.domain.util.PageOrdering.ASC; + +import java.util.Arrays; + +import javax.ejb.EJBException; + +import org.testng.annotations.Test; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.criteria.ResourceCriteria; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.server.auth.SubjectManagerLocal; +import org.rhq.enterprise.server.resource.ResourceManagerLocal; +import org.rhq.enterprise.server.test.AbstractEJB3Test; +import org.rhq.enterprise.server.test.TransactionCallback; +import org.rhq.enterprise.server.util.LookupUtil; +import org.rhq.enterprise.server.util.SessionTestHelper; + +/** + * @author Thomas Segismont + */ +public class GroupMemberCandidateResourcesTest extends AbstractEJB3Test { + + private static final String GROUP_MEMBER_CANDIDATE_NAME_PREFIX = GroupMemberCandidateResourcesTest.class + .getSimpleName() + "-"; + + private Subject overlord; + + private ResourceManagerLocal resourceManager; + + @Override + protected void beforeMethod() throws Exception { + SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager(); + overlord = subjectManager.getOverlord(); + resourceManager = LookupUtil.getResourceManager(); + } + + @Test + public void testNoCandidates() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + ResourceCriteria criteria = new ResourceCriteria(); + criteria.setCaseSensitive(false); + criteria.addFilterName(GROUP_MEMBER_CANDIDATE_NAME_PREFIX); + + PageList<Resource> groupMemberCandidateResources = resourceManager.findGroupMemberCandidateResources( + overlord, criteria, new int[0]); + + assertEquals(0, groupMemberCandidateResources.getTotalSize()); + assertEquals(0, groupMemberCandidateResources.size()); + } + }); + } + + @Test + public void testNoCandidatesWithExclusions() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + ResourceCriteria criteria = new ResourceCriteria(); + criteria.setCaseSensitive(false); + criteria.addFilterName(GROUP_MEMBER_CANDIDATE_NAME_PREFIX); + int[] alreadySelectedResourceIds = new int[100]; + for (int i = 0; i < alreadySelectedResourceIds.length; i++) { + alreadySelectedResourceIds[i] = i; + } + + PageList<Resource> groupMemberCandidateResources = resourceManager.findGroupMemberCandidateResources( + overlord, criteria, alreadySelectedResourceIds); + + assertEquals(0, groupMemberCandidateResources.getTotalSize()); + assertEquals(0, groupMemberCandidateResources.size()); + } + }); + } + + @Test + public void testUnlimitedPageControl() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + ResourceCriteria criteria = new ResourceCriteria(); + criteria.setPageControl(PageControl.getUnlimitedInstance()); + + try { + PageList<Resource> groupMemberCandidateResources = resourceManager + .findGroupMemberCandidateResources(overlord, criteria, new int[0]); + fail("findGroupMemberCandidateResources should throw UnsupportedOperationException"); + } catch (EJBException e) { + assertTrue(e.getCausedByException() instanceof UnsupportedOperationException); + } + } + }); + } + + @Test + public void testPageControl() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourcesCount = 100; + createTestResources(resourcesCount); + ResourceCriteria criteria = new ResourceCriteria(); + criteria.setCaseSensitive(false); + criteria.addFilterName(GROUP_MEMBER_CANDIDATE_NAME_PREFIX); + criteria.addSortName(ASC); + int pageNumber = 5; + int pageSize = 7; + criteria.setPaging(pageNumber, pageSize); + + PageList<Resource> groupMemberCandidateResources = resourceManager.findGroupMemberCandidateResources( + overlord, criteria, new int[0]); + + assertEquals(resourcesCount, groupMemberCandidateResources.getTotalSize()); + assertEquals(pageSize, groupMemberCandidateResources.size()); + for (Resource groupMemberCandidateResource : groupMemberCandidateResources) { + assertTrue(groupMemberCandidateResource.getName().startsWith(GROUP_MEMBER_CANDIDATE_NAME_PREFIX)); + } + assertEquals(pageNumber, groupMemberCandidateResources.getPageControl().getPageNumber()); + assertEquals(pageSize, groupMemberCandidateResources.getPageControl().getPageSize()); + } + }); + } + + @Test + public void testPageControlWithExclusions() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourcesCount = 100; + int[] resourcesIds = createTestResources(resourcesCount); + ResourceCriteria criteria = new ResourceCriteria(); + criteria.setCaseSensitive(false); + criteria.addFilterName(GROUP_MEMBER_CANDIDATE_NAME_PREFIX); + criteria.addSortName(ASC); + int pageNumber = 5; + int pageSize = 7; + criteria.setPaging(pageNumber, pageSize); + int[] alreadySelectedResourceIds = Arrays.copyOfRange(resourcesIds, 13, 59); + + PageList<Resource> groupMemberCandidateResources = resourceManager.findGroupMemberCandidateResources( + overlord, criteria, alreadySelectedResourceIds); + + assertEquals(resourcesCount, groupMemberCandidateResources.getTotalSize()); + assertEquals(pageSize, groupMemberCandidateResources.size()); + for (Resource groupMemberCandidateResource : groupMemberCandidateResources) { + assertTrue(groupMemberCandidateResource.getName().startsWith(GROUP_MEMBER_CANDIDATE_NAME_PREFIX)); + } + assertEquals(pageNumber, groupMemberCandidateResources.getPageControl().getPageNumber()); + assertEquals(pageSize, groupMemberCandidateResources.getPageControl().getPageSize()); + } + }); + } + + private int[] createTestResources(int resourcesCount) { + int[] resourcesIds = new int[resourcesCount]; + ResourceType testResourceType = SessionTestHelper.createNewResourceType(em); + for (int i = 0; i < resourcesCount; i++) { + resourcesIds[i] = SessionTestHelper.createNewResource(em, GROUP_MEMBER_CANDIDATE_NAME_PREFIX + i, + testResourceType).getId(); + } + return resourcesIds; + } + +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java index 0c8594d..0aa09a4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java @@ -2930,10 +2930,14 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage public PageList<Resource> findGroupMemberCandidateResources(Subject subject, ResourceCriteria criteria, int[] alreadySelectedResourceIds) { + PageControl originalPageControl = getPageControl(criteria); + if (originalPageControl.isUnlimited()) { + throw new UnsupportedOperationException("Supplied criteria has an unlimited PageControl"); + } + Set<Integer> alreadySelectedResourceIdSet = new HashSet<Integer>( - ArrayUtils.wrapInList(alreadySelectedResourceIds)); + ArrayUtils.wrapInList(alreadySelectedResourceIds == null ? new int[0] : alreadySelectedResourceIds)); - PageControl originalPageControl = getPageControl(criteria); PageControl pageControl = (PageControl) originalPageControl.clone(); criteria.setPageControl(pageControl); commit 07e921660b7336a96593c71b3bb57624f7645396 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Jul 10 09:05:05 2013 +0200 Don't bail out on empty plugin description. Bump default pom version diff --git a/modules/helpers/pluginGen/src/main/resources/descriptor.ftl b/modules/helpers/pluginGen/src/main/resources/descriptor.ftl index a62af11..85195e8 100644 --- a/modules/helpers/pluginGen/src/main/resources/descriptor.ftl +++ b/modules/helpers/pluginGen/src/main/resources/descriptor.ftl @@ -22,7 +22,11 @@ <?xml version="1.0"?> <plugin name="${props.pluginName}" displayName="${props.pluginName}Plugin" +<#if props.pluginDescription??> description="${props.pluginDescription}" +<#else> + description="TODO provide a description for the plugin" +</#if> <#if props.usePluginLifecycleListenerApi> pluginLifecycleListener="${props.componentClass}" </#if> diff --git a/modules/helpers/pluginGen/src/main/resources/pom.ftl b/modules/helpers/pluginGen/src/main/resources/pom.ftl index 2434ddd..01daca1 100644 --- a/modules/helpers/pluginGen/src/main/resources/pom.ftl +++ b/modules/helpers/pluginGen/src/main/resources/pom.ftl @@ -31,7 +31,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version><#if props.rhqVersion??>${props.rhqVersion}<#else >4.5.0-SNAPSHOT</#if></version> + <version><#if props.rhqVersion??>${props.rhqVersion}<#else >4.9.0-SNAPSHOT</#if></version> </parent> <groupId>org.rhq</groupId> @@ -49,8 +49,8 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>1.6</source> + <target>1.6</target> </configuration> </plugin> commit 206bc37502ef973145cf689b3a077722bb8bf2e9 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Jul 10 08:49:08 2013 +0200 BZ 981809 Disable compression when wrapping. Also some cleanup in the file. diff --git a/modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/JsonPFilter.java b/modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/JsonPFilter.java index 3a785fd..8d43f03 100644 --- a/modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/JsonPFilter.java +++ b/modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/JsonPFilter.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.rest; @@ -45,6 +45,9 @@ import javax.servlet.http.HttpServletResponseWrapper; /** * A filter to wrap json answers as jsonp + * For this to happen, the user has to pass ?<filter.jsonp.callback>=<name> in the url like + * <pre>http://localhost:7080/rest/metric/data/10001/raw.json?jsonp=foo</pre> + * The <filter.jsonp.callback> is defined in web.xml and defaults to 'jsonp'. * @author Heiko W. Rupp */ public class JsonPFilter implements Filter { @@ -132,7 +135,6 @@ public class JsonPFilter implements Filter { private static class JsonPRequestWrapper extends HttpServletRequestWrapper { int contentLength; BufferedReader reader; - String method; ByteArrayInputStream bais; Map<String, String> headers = new HashMap<String, String>(); @@ -147,6 +149,11 @@ public class JsonPFilter implements Filter { Enumeration headers = request.getHeaderNames(); while (headers.hasMoreElements()) { String key = (String) headers.nextElement(); + if (key.equalsIgnoreCase("Accept-Encoding")) { + // Filter Content codings like compression, as we would end up + // with compressed inner data and uncompressed wrapper + continue; + } String value = request.getHeader(key); this.headers.put(key, value); } @@ -157,14 +164,6 @@ public class JsonPFilter implements Filter { } -/* - public void setBody(String body) { - bais = new ByteArrayInputStream(body.getBytes()); - contentLength = body.length(); - headers.put("content-length", Integer.toString(contentLength)); - } -*/ - @Override public BufferedReader getReader() throws IOException { reader = new BufferedReader(new InputStreamReader(bais)); commit 1d75e54e136107c19d0b1163feb69e64993f7944 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Jul 9 17:46:46 2013 +0200 Bump pom versions. Allow to start the generator via mvn exec:java diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index be5e976..7ce1859 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-pluginAnnotations</artifactId> <packaging>jar</packaging> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index fb2cce6..e9a5e29 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-pluginGen</artifactId> <packaging>jar</packaging> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> @@ -62,6 +62,22 @@ <version>2.1</version> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>org.rhq.helpers.pluginGen.PluginGen</mainClass> + </configuration> + </plugin> + </plugins> </build>

1 0

[rhq] modules/enterprise
by Larry O'Leary 22 Jul '13

22 Jul '13

modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java | 37 ++++------ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 1 2 files changed, 18 insertions(+), 20 deletions(-) New commits: commit 567aee7f81c6aa0f7680d4f394cccb1974705320 Author: Larry O'Leary <loleary(a)redhat.com> Date: Mon Jul 22 16:10:09 2013 -0500 BZ 981015: Fix test failures introduced by commit 01cd91b - findLdapUserDetails was appending baseDN twice during fallback code - FakeLdapContext contained some lazy escaping on the mock group entries diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java index dad31ce..2ae6265 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java @@ -99,7 +99,6 @@ public class FakeLdapContext implements LdapContext { try { return new FakeNamingEnumeration<SearchResult>(ldapTestData.getSearchResults(attributes)); } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); return null; } @@ -516,12 +515,12 @@ public class FakeLdapContext implements LdapContext { attr = new BasicAttribute("member"); attr.add("cn=Robert Smith,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Cannon\\, Brett,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Charles H\\\\Samlin,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Charles H\\Samlin,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Craig \\#1 Sellers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Beverly \\+1 Balanger,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Bethany \\<Stuart\\> Wallace,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Zachory S\\; Balanger,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Allen \\\"The Hammer\\\" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Allen \"The Hammer\" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Sam Not \\= Smitherson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=\\ Billy The Kiddough\\ ,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=System/Integration API,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); @@ -557,12 +556,12 @@ public class FakeLdapContext implements LdapContext { attr = new BasicAttribute("member"); attr.add("cn=John Smith,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Dr. Greg Hause\\, MD,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Cindy\\\\Cynthia Groober,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Cindy\\Cynthia Groober,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Biff \\# Rogers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Steven \\+2 Reed,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Lisa \\<The Great\\> Toller,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Homer J Simpsonite\\; III,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Jessica \\\"Crouching Tiger\\\" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Jessica \"Crouching Tiger\" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Hope \\= Rein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=\\ Sue Ferguson\\ ,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Phil/Susan Carlson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); @@ -598,12 +597,12 @@ public class FakeLdapContext implements LdapContext { attr = new BasicAttribute("member"); attr.add("cn=Sheri Smith,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Walsh\\, Brad,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Jim\\\\James Kirk,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Jim\\James Kirk,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Sandra \\# Phillips,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=William Tell Overture \\+1,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Craig \\<Bison\\> Allen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Walter T Fredrick\\; The Second,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); - attr.add("cn=Stanley \\\"Short\\\" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); + attr.add("cn=Stanley \"Short\" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=Noah \\= Sadler,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=\\ Stuart Smiley\\ ,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); attr.add("cn=System/Integration API 2,ou=users,dc=test,dc=rhq,dc=redhat,dc=com"); @@ -984,7 +983,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with backslash (\\) in 'cn' in the RHQ Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Charles H\\\\Samlin,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Charles H\\Samlin,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Cindy\\Cynthia Groober,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -1033,7 +1032,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with backslash (\\) in 'cn' in the JBoss Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Cindy\\\\Cynthia Groober,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Cindy\\Cynthia Groober,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Jim\\James Kirk,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -1082,7 +1081,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with backslash (\\) in 'cn' in the JBoss Monitor Group"); attrs.put(attr); - sr = new SearchResult("cn=Jim\\\\James Kirk,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Jim\\James Kirk,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Craig \#1 Sellers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -1675,7 +1674,7 @@ public class FakeLdapContext implements LdapContext { null, attrs, true); this.add(sr); - // dn: cn=Allen \"The Hammer\" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com + // dn: cn=Allen "The Hammer" Callen,ou=users,dc=test,dc=rhq,dc=redhat,dc=com attrs = new BasicAttributes(); attr = new BasicAttribute("baseName"); @@ -1721,11 +1720,11 @@ public class FakeLdapContext implements LdapContext { attr.add("User with quote (\") in 'cn' in the RHQ Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Allen \\\"The Hammer\\\" Callen,ou=users", "javax.naming.directory.DirContext", + sr = new SearchResult("cn=Allen \"The Hammer\" Callen,ou=users", "javax.naming.directory.DirContext", null, attrs, true); this.add(sr); - // dn: cn=Jessica \"Crouching Tiger\" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com + // dn: cn=Jessica "Crouching Tiger" Mathers,ou=users,dc=test,dc=rhq,dc=redhat,dc=com attrs = new BasicAttributes(); attr = new BasicAttribute("baseName"); @@ -1771,11 +1770,11 @@ public class FakeLdapContext implements LdapContext { attr.add("User with quote (\") in 'cn' in the JBoss Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Jessica \\\"Crouching Tiger\\\" Mathers,ou=users", + sr = new SearchResult("cn=Jessica \"Crouching Tiger\" Mathers,ou=users", "javax.naming.directory.DirContext", null, attrs, true); this.add(sr); - // dn: cn=Stanley \"Short\" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com + // dn: cn=Stanley "Short" Mein,ou=users,dc=test,dc=rhq,dc=redhat,dc=com attrs = new BasicAttributes(); attr = new BasicAttribute("baseName"); @@ -1821,7 +1820,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with quote (\") in 'cn' in the JBoss Monitor Group"); attrs.put(attr); - sr = new SearchResult("cn=Stanley \\\"Short\\\" Mein,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Stanley \"Short\" Mein,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Sam Not \= Smitherson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -2160,7 +2159,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with slash (/) in 'cn' in the RHQ Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=System/Integration API,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=System\\/Integration API,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Phil/Susan Carlson,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -2209,7 +2208,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with slash (/) in 'cn' in the JBoss Admin Group"); attrs.put(attr); - sr = new SearchResult("cn=Phil/Susan Carlson,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=Phil\\/Susan Carlson,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=System/Integration API 2,ou=users,dc=test,dc=rhq,dc=redhat,dc=com @@ -2254,7 +2253,7 @@ public class FakeLdapContext implements LdapContext { attr.add("User with slash (/) in 'cn' in the JBoss Monitor Group"); attrs.put(attr); - sr = new SearchResult("cn=System/Integration API 2,ou=users", null, null, attrs, true); + sr = new SearchResult("cn=System\\/Integration API 2,ou=users", null, null, attrs, true); this.add(sr); // dn: cn=Lee -Fast- Croutche,ou=users,dc=test,dc=rhq,dc=redhat,dc=com diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index a28c709..7473321 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -350,7 +350,6 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { if (si.isRelative()) { userDN += "," + baseDNs[x]; } - userDN = userDN + "," + baseDNs[x]; } userDetails.put("dn", userDN);

1 0

[rhq] modules/enterprise
by Jay Shaughnessy 22 Jul '13

22 Jul '13

modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 8c693ee685d538a28a3c42ce813b10b49997f871 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jul 22 16:36:23 2013 -0400 get rid of the upgrade wording, it's confusing when performing an initial install. diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java index 61c8a9c..fb9bceb 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java @@ -363,14 +363,14 @@ public abstract class AbstractInstall extends ControlCommand { protected void startRHQServerForInstallation() throws IOException { try { - log.info("The RHQ Server must be started to complete its upgrade. Starting the RHQ server in preparation of running the server installer..."); + log.info("The RHQ Server must be started to complete its installation. Starting the RHQ server in preparation of running the server installer..."); // when you unzip the distro, you are getting a fresh, unadulterated, out-of-box EAP installation, which by default listens // to port 9999 for its native management subsystem. Make sure some other independent EAP server (or anything for that matter) // isn't already listening to that port. if (isPortInUse("127.0.0.1", 9999)) { throw new IOException( - "Something is already listening to port 9999 - shut it down before upgrading the server."); + "Something is already listening to port 9999 - shut it down before installing the server."); } Executor executor = new DefaultExecutor(); @@ -400,7 +400,7 @@ public abstract class AbstractInstall extends ControlCommand { } // Wait for the server to complete it's startup - log.info("Waiting for the RHQ Server to start in preparation of running the server installer for upgrade..."); + log.info("Waiting for the RHQ Server to start in preparation of running the server installer..."); commandLine = getCommandLine("rhq-installer", "--test"); Executor installerExecutor = new DefaultExecutor();

1 0

[rhq] etc/scripts
by John Sanda 22 Jul '13

22 Jul '13

etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh | 42 +++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-) New commits: commit 2409ed2dcd705c58e5024182e95445431b25acf5 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 22 15:16:49 2013 -0400 document the 4.8 storage patch script diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh index 33984d1..ae78240 100755 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh @@ -1,7 +1,43 @@ #!/bin/bash +# +# BACKGROUND: +# This patch script needs to be run against RHQ 4.8.0 installations prior to +# script. You do not need to run this script if upgrading from a version +# earlier than 4.8.0. +# +# PREREQUISITES: +# 1) Shut down the RHQ storage node and server. +# +# 2) Edit <rhq-install-dir>/rhq-storage/conf/cassandra.yaml and set the +# following property, +# +# start_rpc: true +# +# 3) Note the value of rpc_port in cassandra.yaml. By default it is 9160 which +# is fine. +# +# RUNNING THE PATCH: +# 1) cd <patch-dir> +# +# 2) ./rhq48-storage-patch.sh <rhq-480-server-dir> <storage-ip-address> <thrift-port> <jmx-port> +# +# 3) Carefully reivew the script output for any errors. +# +# 4) Edit cassandra.yaml against and reset start_rpc: false +# +# ADDITIONAL NOTES: +# The <jmx-port> defaults to 7299. If you are uncertain of what value to use, +# you can find it in the UI. Log into RHQ and go to Administration --> Storage Nodes. +# +# If you are uncertain of the value to use for the storage node IP address, you +# find the correct valu in the storage nodes admin UI as well. +# +# EXAMPLE: +# ./rhq48-storage-patch.sh /opt/rhq-4.8.0 127.0.0.1 9160 7299 +# Usage: ./rhq48-storage-patch.sh <rhq-480-server-dir> <storage-ip-address> <thrift-port> <jmx-port> function usage() { - echo "Usage: $0 <rhq-server-dir> <storage-ip-address> <cql-port> <jmx-port>" + echo "Usage: $0 <rhq-480-server-dir> <storage-ip-address> <thrift-port> <jmx-port>" } if [ $# -ne 4 ]; then @@ -16,11 +52,11 @@ fi RHQ_SERVER_DIR=$1 CQL_HOSTNAME=$2 -CQL_PORT=$3 +THRIFT_PORT=$3 JMX_PORT=$4 export CQLSH_HOST=$2 -export CQL_PORT=$3 +export CQLSH_PORT=$3 PATCH="apache-cassandra-1.2.4-patch-1.jar"

1 0

[rhq] modules/enterprise
by snegrea 22 Jul '13

22 Jul '13

modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml | 14 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 52 ++++++---- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java | 42 ++++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java | 17 +++ 4 files changed, 106 insertions(+), 19 deletions(-) New commits: commit c91c8f23416db836308b2bf3871fdda87559297e Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 14:12:08 2013 -0500 Update the storage node manager API for alerts to support UI functionality. diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml index a9ce322..58c4eda 100644 --- a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml @@ -11,8 +11,22 @@ <difference> <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findNotAcknowledgedStorageNodeAlerts(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  <method>org.rhq.core.domain.util.PageList findAllStorageNodeAlerts(org.rhq.core.domain.auth.Subject)</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findAllStorageNodeAlerts(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.cloud.StorageNode)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + </differences> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index c2a7b46..b32ab5b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -512,12 +512,22 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @Override public PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject) { - return findStorageNodeAlerts(subject, false); + return findStorageNodeAlerts(subject, false, null); + } + + @Override + public PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject, StorageNode storageNode) { + return findStorageNodeAlerts(subject, false, storageNode); } @Override public PageList<Alert> findAllStorageNodeAlerts(Subject subject) { - return findStorageNodeAlerts(subject, true); + return findStorageNodeAlerts(subject, true, null); + } + + @Override + public PageList<Alert> findAllStorageNodeAlerts(Subject subject, StorageNode storageNode) { + return findStorageNodeAlerts(subject, true, storageNode); } /** @@ -527,8 +537,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN * @param allAlerts if [true] then return all alerts; if [false] then return only alerts that are not acknowledged * @return alerts */ - private PageList<Alert> findStorageNodeAlerts(Subject subject, boolean allAlerts) { - Integer[] resouceIdsWithAlertDefinitions = findResourcesWithAlertDefinitions(); + private PageList<Alert> findStorageNodeAlerts(Subject subject, boolean allAlerts, StorageNode storageNode) { + Integer[] resouceIdsWithAlertDefinitions = findResourcesWithAlertDefinitions(storageNode); PageList<Alert> alerts = new PageList<Alert>(); if( resouceIdsWithAlertDefinitions != null && resouceIdsWithAlertDefinitions.length != 0 ){ @@ -555,31 +565,35 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return alerts; } - /** - * Return resource Ids for all resources and sub-resources of Storage Nodes that - * have alert definitions. This will be used by the resource criteria to find - * all alerts triggered for storage nodes. - * - * @return - */ - private Integer[] findResourcesWithAlertDefinitions() { - List<Integer> resourceIdsWithAlertDefinitions = new ArrayList<Integer>(); - List<StorageNode> test2 = getStorageNodes(); + @Override + public Integer[] findResourcesWithAlertDefinitions() { + return this.findResourcesWithAlertDefinitions(null); + } + + @Override + public Integer[] findResourcesWithAlertDefinitions(StorageNode storageNode) { + List<StorageNode> initialStorageNodes; + if (storageNode == null) { + initialStorageNodes = getStorageNodes(); + } else { + initialStorageNodes = Arrays.asList(storageNode); + } Queue<Resource> unvisitedResources = new LinkedList<Resource>(); - for (StorageNode node : test2) { - if (node.getResource() != null) { - unvisitedResources.add(node.getResource()); + for (StorageNode initialStorageNode : initialStorageNodes) { + if (initialStorageNode.getResource() != null) { + unvisitedResources.add(initialStorageNode.getResource()); } } - while(!unvisitedResources.isEmpty()){ + List<Integer> resourceIdsWithAlertDefinitions = new ArrayList<Integer>(); + while (!unvisitedResources.isEmpty()) { Resource resource = unvisitedResources.poll(); if (resource.getAlertDefinitions() != null) { resourceIdsWithAlertDefinitions.add(resource.getId()); } - for(Resource child: resource.getChildResources()){ + for (Resource child : resource.getChildResources()) { unvisitedResources.add(child); } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index 6fca820..69b16c4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -81,6 +81,15 @@ public interface StorageNodeManagerLocal { PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject); /** + * Fetches the list of Storage Node related alerts that have not yet been acknowledged for the + * specified storage node. + * + * @param subject subject + * @return storage nodes alerts not acknowledged + */ + PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject, StorageNode storageNode); + + /** * Fetches all the Storage Node related alerts. * * @param subject subject @@ -89,6 +98,39 @@ public interface StorageNodeManagerLocal { PageList<Alert> findAllStorageNodeAlerts(Subject subject); /** + * Fetches all the Storage Node related alerts for the specified storage node. + * + * @param subject subject + * @return all storage nodes alerts + */ + PageList<Alert> findAllStorageNodeAlerts(Subject subject, StorageNode storageNode); + + + /** + * Find ids for all resources and sub-resources of Storage Nodes that + * have alert definitions. This can be used by the resource criteria queries to find + * all alerts triggered for storage nodes resources. + * + * @return resource ids + */ + Integer[] findResourcesWithAlertDefinitions(); + + /** + * Find ids for all resources and sub-resources, of the specified storage node, that + * have alert definitions. This can be used by the resource criteria queries to find + * all alerts triggered for storage nodes resources. + * + * If storage node is null it find ids for all resources and sub-resources of Storage Nodes that + * have alert definitions. Please see {@link #findResourcesWithAlertDefinitions()} for more details. + * + * @param storageNode storage node + * + * @return resource ids + */ + Integer[] findResourcesWithAlertDefinitions(StorageNode storageNode); + + + /** * <p>Prepares the node for subsequent upgrade.</p> * <p> CAUTION: this method will set the RHQ server to maintenance mode, RHQ storage flushes all the data to disk * and backup of all the keyspaces is created</p> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java index 7be1b07..75ac02b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java @@ -73,10 +73,27 @@ public interface StorageNodeManagerRemote { PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject); /** + * Fetches the list of Storage Node related alerts that have not yet been acknowledged for the + * specified storage node. + * + * @param subject subject + * @return storage nodes alerts not acknowledged + */ + PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject, StorageNode storageNode); + + /** * Fetches all the Storage Node related alerts. * * @param subject subject * @return all storage nodes alerts */ PageList<Alert> findAllStorageNodeAlerts(Subject subject); + + /** + * Fetches all the Storage Node related alerts for the specified storage node. + * + * @param subject subject + * @return all storage nodes alerts + */ + PageList<Alert> findAllStorageNodeAlerts(Subject subject, StorageNode storageNode); }

1 0

[rhq] 2 commits - modules/common modules/enterprise modules/plugins
by Jay Shaughnessy 22 Jul '13

22 Jul '13

modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java | 44 ++- modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf | 36 +- modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env | 24 + modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc | 6 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java | 60 ++++ modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java | 18 - modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java | 142 +++++++--- 7 files changed, 258 insertions(+), 72 deletions(-) New commits: commit c6c9e50398ffb5fc6d297ceffc369975a56b3ef9 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jul 22 14:09:52 2013 -0400 Add windows support storage install options and resource config update. Introduce rhq-storage-wrapper.env to hold the configurable values (mimicing somewhat cassandra-jvm.properties) and apply the values as token replacements in rhq-storage-wrapper.conf. Note that cassandra-jvm.properties is still kept up to date on windows and can be used generically, as needed. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index 6547043..60667cc 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -91,7 +91,14 @@ public class Deployer { applyConfigChanges(confDir, "cassandra.yaml", tokens); applyConfigChanges(confDir, "log4j-server.properties", tokens); applyChangesToCassandraJvmProps(confDir, deploymentOptions); -// applyConfigChanges(confDir, "cassandra-env.sh", tokens); + + // For windows, update the service wrapper env. It may not ne necessary to have updated cassandra-jvm.properties + // as well as this file, but for now we'll update both, leaving the former as a dependably set file. + if (File.separatorChar == '\\') { + applyChangesToWindowsServiceWrapper(deployDir); + } + + // applyConfigChanges(confDir, "cassandra-env.sh", tokens); } private void applyConfigChanges(File confDir, String fileName, Map<String, String> tokens) @@ -109,8 +116,8 @@ public class Deployer { rhqFile.delete(); } catch (IOException e) { log.error("An unexpected error occurred while apply configuration changes to " + filteredFile, e); - throw new DeploymentException("An unexpected error occurred while apply configuration changes to " + - filteredFile, e); + throw new DeploymentException("An unexpected error occurred while apply configuration changes to " + + filteredFile, e); } } @@ -132,8 +139,8 @@ public class Deployer { String javaVersion = System.getProperty("java.version"); // The check here is taken right from cassandra-env.sh - if ((!isOpenJDK() || javaVersion.compareTo("1.6.0") > 0) || - (javaVersion.equals("1.6.0") && getJavaPatchVersion() > 23)) { + if ((!isOpenJDK() || javaVersion.compareTo("1.6.0") > 0) + || (javaVersion.equals("1.6.0") && getJavaPatchVersion() > 23)) { properties.put("java_agent", "-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"); } @@ -165,6 +172,29 @@ public class Deployer { return Integer.parseInt(javaVersion.substring(startIndex + 1, javaVersion.length())); } + public void applyChangesToWindowsServiceWrapper(File deployDir) throws DeploymentException { + File wrapperDir = new File(deployDir, "../bin/wrapper"); + File wrapperEnvFile = new File(wrapperDir, "rhq-storage-wrapper.env"); + + try { + log.info("Applying configuration changes to " + wrapperEnvFile); + + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(wrapperEnvFile.getAbsolutePath()); + Properties wrapperEnvProps = propertiesUpdater.loadExistingProperties(); + + wrapperEnvProps.setProperty("set.heap_min", "-Xms" + deploymentOptions.getHeapSize()); + wrapperEnvProps.setProperty("set.heap_max", "-Xmx" + deploymentOptions.getHeapSize()); + wrapperEnvProps.setProperty("set.heap_new", "-Xmn" + deploymentOptions.getHeapNewSize()); + wrapperEnvProps.setProperty("set.thread_stack_size", "-Xss" + deploymentOptions.getStackSize()); + wrapperEnvProps.setProperty("set.jmx_port", deploymentOptions.getJmxPort().toString()); + + propertiesUpdater.update(wrapperEnvProps); + } catch (IOException e) { + log.error("An error occurred while updating " + wrapperEnvFile, e); + throw new DeploymentException("An error occurred while updating " + wrapperEnvFile, e); + } + } + public void updateFilePerms() { File deployDir = new File(deploymentOptions.getBasedir()); File binDir = new File(deployDir, "bin"); @@ -187,8 +217,8 @@ public class Deployer { try { authFile.delete(); - StreamUtil.copy(new StringReader(StringUtil.collectionToString(addresses, "\n")), - new FileWriter(authFile), true); + StreamUtil.copy(new StringReader(StringUtil.collectionToString(addresses, "\n")), new FileWriter(authFile), + true); } catch (IOException e) { throw new RuntimeException("Failed to update " + authFile); } diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf index 14f2ff1..de83364 100644 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf @@ -66,23 +66,25 @@ wrapper.app.parameter.3="-Dcassandra-foreground=yes" # Additional JVM parameters (quotes ARE needed) wrapper.java.additional.1="-ea" wrapper.java.additional.2="-javaagent:"%RHQ_STORAGE_HOME%\lib\jamm-0.2.5.jar"" -wrapper.java.additional.3="-Xms1G" -wrapper.java.additional.4="-Xmx1G" -wrapper.java.additional.5="-XX:+HeapDumpOnOutOfMemoryError" -wrapper.java.additional.6="-XX:+UseParNewGC" -wrapper.java.additional.7="-XX:+UseConcMarkSweepGC" -wrapper.java.additional.8="-XX:+CMSParallelRemarkEnabled" -wrapper.java.additional.9="-XX:SurvivorRatio=8" -wrapper.java.additional.10="-XX:MaxTenuringThreshold=1" -wrapper.java.additional.11="-XX:CMSInitiatingOccupancyFraction=75" -wrapper.java.additional.12="-XX:+UseCMSInitiatingOccupancyOnly" -wrapper.java.additional.13="-Dcom.sun.management.jmxremote.port=7299" -wrapper.java.additional.14="-Dcom.sun.management.jmxremote.ssl=false" -wrapper.java.additional.15="-Dcom.sun.management.jmxremote.authenticate=false" -wrapper.java.additional.16="-Dlog4j.configuration=log4j-server.properties" -wrapper.java.additional.17="-Dlog4j.defaultInitOverride=true" - -# We want to make sure the Storage Node starts in the casandra bin directory +wrapper.java.additional.3="%heap_min%" +wrapper.java.additional.4="%heap_max%" +wrapper.java.additional.5="%heap_new%" +wrapper.java.additional.6="%heap_dump_on_OOMError%" +wrapper.java.additional.7="%heap_dump_dir%" +wrapper.java.additional.8="-XX:+UseConcMarkSweepGC" +wrapper.java.additional.9="-XX:+CMSParallelRemarkEnabled" +wrapper.java.additional.10="-XX:SurvivorRatio=8" +wrapper.java.additional.11="-XX:MaxTenuringThreshold=1" +wrapper.java.additional.12="-XX:CMSInitiatingOccupancyFraction=75" +wrapper.java.additional.13="-XX:+UseCMSInitiatingOccupancyOnly" +wrapper.java.additional.14="-XX:+UseParNewGC" +wrapper.java.additional.15="-Dcom.sun.management.jmxremote.port=%jmx_port%" +wrapper.java.additional.16="-Dcom.sun.management.jmxremote.ssl=false" +wrapper.java.additional.17="-Dcom.sun.management.jmxremote.authenticate=false" +wrapper.java.additional.18="-Dlog4j.configuration=log4j-server.properties" +wrapper.java.additional.19="-Dlog4j.defaultInitOverride=true" + +# We want to make sure the Storage Node starts in the cassandra bin directory wrapper.working.dir=%RHQ_STORAGE_HOME%/bin #***************************************************************************** diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env new file mode 100644 index 0000000..1441e0a --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.env @@ -0,0 +1,24 @@ +#***************************************************************************** +# RHQ Storage Node Java Service Wrapper Environment Settings File +# +# This file specifies a set of environment variables that will be +# applied to the Storage Node JVM. +# +# THIS FILE SHOULD NOT BE EDITED! +# +# This file represents the values managed as RHQ Storage Node resource +# configuration values. Or, set by the installer. +# +#***************************************************************************** + +set.jmx_port=7299 + +set.heap_min=-Xms512M +set.heap_max=-Xms512M +set.heap_new=-Xmn128M + +set.thread_stack_size=-Xss180k + +set.heap_dump_on_OOMError=-XX:+HeapDumpOnOutOfMemoryError + +set.heap_dump_dir= diff --git a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc index ee0d448..6941358 100644 --- a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc +++ b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc @@ -4,11 +4,11 @@ # # override and lower the initial memory profile -wrapper.java.additional.18=-Xms128M -wrapper.java.additional.19=-Xmx256M +wrapper.java.additional.20=-Xms128M +wrapper.java.additional.21=-Xmx256M # enable remote debugging -#wrapper.java.additional.20=-agentlib:jdwp=transport=dt_socket,address=8788,server=y,suspend=n +#wrapper.java.additional.22=-agentlib:jdwp=transport=dt_socket,address=8788,server=y,suspend=n # disable JVM startup timeout wrapper.startup.timeout=0 diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index 8d1771d..1667877 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -19,10 +19,17 @@ import org.rhq.core.util.StringUtil; public class StorageNodeConfigDelegate implements ConfigurationFacet { private File jvmOptsFile; + private File wrapperEnvFile; public StorageNodeConfigDelegate(File basedir) { File confDir = new File(basedir, "conf"); jvmOptsFile = new File(confDir, "cassandra-jvm.properties"); + + // for windows, config props also get propagated to the wrapper env + if (isWindows()) { + File wrapperDir = new File(basedir, "../bin/wrapper"); + wrapperEnvFile = new File(wrapperDir, "rhq-storage-wrapper.env"); + } } @Override @@ -56,6 +63,16 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { return config; } + /** + * Ensure that the path uses only forward slash. + * @param path + * @return forward-slashed path, or null if path is null + */ + private static String useForwardSlash(String path) { + + return (null != path) ? path.replace('\\', '/') : null; + } + private String getHeapMinProp(Properties properties) { String value = properties.getProperty("heap_min"); @@ -115,47 +132,14 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { @Override public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { try { - PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(jvmOptsFile.getAbsolutePath()); - Properties properties = propertiesUpdater.loadExistingProperties(); - Configuration config = configurationUpdateReport.getConfiguration(); - String maxHeapSize = config.getSimpleValue("maxHeapSize"); - if (!StringUtil.isEmpty(maxHeapSize)) { - validateHeapArg("maxHeapSize", maxHeapSize); - // We want min and max heap to be the same - properties.setProperty("heap_min", "-Xms" + maxHeapSize); - properties.setProperty("heap_max", "-Xmx" + maxHeapSize); - } - - String heapNewSize = config.getSimpleValue("heapNewSize"); - if (!StringUtil.isEmpty(heapNewSize)) { - validateHeapArg("heapNewSize", heapNewSize); - properties.setProperty("heap_new", "-Xmn" + heapNewSize); - } + updateCassandraJvmProps(config); - String threadStackSize = config.getSimpleValue("threadStackSize"); - if (!StringUtil.isEmpty(threadStackSize)) { - validateStackArg(threadStackSize); - properties.setProperty("thread_stack_size", "-Xss" + threadStackSize + "k"); + if (isWindows()) { + updateWrapperEnv(config); } - PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); - if (heapDumpOnOMMError != null) { - if (heapDumpOnOMMError.getBooleanValue()) { - properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); - } else { - properties.setProperty("heap_dump_on_OOMError", ""); - } - } - - String heapDumpDir = config.getSimpleValue("heapDumpDir"); - if (!StringUtil.isEmpty(heapDumpDir)) { - properties.setProperty("heap_dump_dir", heapDumpDir); - } - - propertiesUpdater.update(properties); - configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); } catch (IllegalArgumentException e) { configurationUpdateReport.setErrorMessage("No configuration update was applied: " + e.getMessage()); @@ -164,6 +148,88 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { } } + private void updateCassandraJvmProps(Configuration config) throws IOException { + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(jvmOptsFile.getAbsolutePath()); + Properties properties = propertiesUpdater.loadExistingProperties(); + + String maxHeapSize = config.getSimpleValue("maxHeapSize"); + if (!StringUtil.isEmpty(maxHeapSize)) { + validateHeapArg("maxHeapSize", maxHeapSize); + // We want min and max heap to be the same + properties.setProperty("heap_min", "-Xms" + maxHeapSize); + properties.setProperty("heap_max", "-Xmx" + maxHeapSize); + } + + String heapNewSize = config.getSimpleValue("heapNewSize"); + if (!StringUtil.isEmpty(heapNewSize)) { + validateHeapArg("heapNewSize", heapNewSize); + properties.setProperty("heap_new", "-Xmn" + heapNewSize); + } + + String threadStackSize = config.getSimpleValue("threadStackSize"); + if (!StringUtil.isEmpty(threadStackSize)) { + validateStackArg(threadStackSize); + properties.setProperty("thread_stack_size", "-Xss" + threadStackSize + "k"); + } + + PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); + if (heapDumpOnOMMError != null) { + if (heapDumpOnOMMError.getBooleanValue()) { + properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + } else { + properties.setProperty("heap_dump_on_OOMError", ""); + } + } + + String heapDumpDir = useForwardSlash(config.getSimpleValue("heapDumpDir")); + if (!StringUtil.isEmpty(heapDumpDir)) { + properties.setProperty("heap_dump_dir", heapDumpDir); + } + + propertiesUpdater.update(properties); + } + + private void updateWrapperEnv(Configuration config) throws IOException { + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(wrapperEnvFile.getAbsolutePath()); + Properties properties = propertiesUpdater.loadExistingProperties(); + + String maxHeapSize = config.getSimpleValue("maxHeapSize"); + if (!StringUtil.isEmpty(maxHeapSize)) { + validateHeapArg("maxHeapSize", maxHeapSize); + // We want min and max heap to be the same + properties.setProperty("set.heap_min", "-Xms" + maxHeapSize); + properties.setProperty("set.heap_max", "-Xmx" + maxHeapSize); + } + + String heapNewSize = config.getSimpleValue("heapNewSize"); + if (!StringUtil.isEmpty(heapNewSize)) { + validateHeapArg("heapNewSize", heapNewSize); + properties.setProperty("set.heap_new", "-Xmn" + heapNewSize); + } + + String threadStackSize = config.getSimpleValue("threadStackSize"); + if (!StringUtil.isEmpty(threadStackSize)) { + validateStackArg(threadStackSize); + properties.setProperty("set.thread_stack_size", "-Xss" + threadStackSize + "k"); + } + + PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); + if (heapDumpOnOMMError != null) { + if (heapDumpOnOMMError.getBooleanValue()) { + properties.setProperty("set.heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + } else { + properties.setProperty("set.heap_dump_on_OOMError", ""); + } + } + + String heapDumpDir = useForwardSlash(config.getSimpleValue("heapDumpDir")); + if (!StringUtil.isEmpty(heapDumpDir)) { + properties.setProperty("set.heap_dump_dir", heapDumpDir); + } + + propertiesUpdater.update(properties); + } + private void validateHeapArg(String name, String value) { if (value.length() < 2) { throw new IllegalArgumentException(value + " is not a legal value for the property [" + name + "]"); @@ -189,4 +255,8 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { throw new IllegalArgumentException(value + " is not a legal value for the property [threadStackSize]"); } } + + private boolean isWindows() { + return File.separatorChar == '\\'; + } } commit 969ea38e7254d61903c699380bd066d6cad3e85e Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jul 22 14:06:39 2013 -0400 When recreating win services make sure they get started appropriately. diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java index 8c885b0..61c8a9c 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java @@ -36,12 +36,16 @@ import java.util.Properties; import org.apache.commons.cli.CommandLine; import org.apache.commons.exec.DefaultExecuteResultHandler; import org.apache.commons.exec.DefaultExecutor; +import org.apache.commons.exec.ExecuteException; import org.apache.commons.exec.Executor; import org.apache.commons.exec.PumpStreamHandler; + import org.jboss.as.controller.client.ModelControllerClient; + import org.rhq.common.jbossas.client.controller.DeploymentJBossASClient; import org.rhq.common.jbossas.client.controller.MCCHelper; import org.rhq.server.control.ControlCommand; +import org.rhq.server.control.RHQControlException; /** * Common code for commands that perform installs. Basically shared code for Install and Upgrade commands. @@ -55,7 +59,7 @@ public abstract class AbstractInstall extends ControlCommand { protected final String STORAGE_CONFIG_PROP = "rhqctl.install.storage-config"; - protected void installWindowsService(File workingDir, String batFile) throws Exception { + protected void installWindowsService(File workingDir, String batFile, boolean start) throws Exception { Executor executor = new DefaultExecutor(); executor.setWorkingDirectory(workingDir); executor.setStreamHandler(new PumpStreamHandler()); @@ -69,6 +73,11 @@ public abstract class AbstractInstall extends ControlCommand { commandLine = getCommandLine(batFile, "install"); executor.execute(commandLine); + + if (start) { + commandLine = getCommandLine(batFile, "start"); + executor.execute(commandLine); + } } protected void validateCustomStorageDataDirectories(CommandLine commandLine, List<String> errors) { @@ -100,6 +109,54 @@ public abstract class AbstractInstall extends ControlCommand { } } + protected void waitForProcessToStop(String pid) throws Exception { + + if (isWindows() || pid == null) { + // For the moment we have no better way to just wait some time + Thread.sleep(10 * 1000L); + } else { + int tries = 5; + while (tries > 0) { + log.debug("."); + if (!isUnixPidRunning(pid)) { + break; + } + Thread.sleep(2 * 1000L); + tries--; + } + if (tries == 0) { + throw new RHQControlException("Process [" + pid + + "] did not finish yet. Terminate it manually and retry."); + } + } + + } + + protected boolean isUnixPidRunning(String pid) { + + Executor executor = new DefaultExecutor(); + executor.setWorkingDirectory(getBinDir()); + executor.setStreamHandler(new PumpStreamHandler()); + org.apache.commons.exec.CommandLine commandLine; + + commandLine = new org.apache.commons.exec.CommandLine("/bin/kill").addArgument("-0").addArgument(pid); + + try { + int code = executor.execute(commandLine); + if (code != 0) { + return false; + } + } catch (ExecuteException ee) { + if (ee.getExitValue() == 1) { + // return code 1 means process does not exist + return false; + } + } catch (IOException e) { + log.error("Checking for running process failed: " + e.getMessage()); + } + return true; + } + protected void waitForRHQServerToInitialize() throws Exception { try { final long messageInterval = 30000L; @@ -287,7 +344,6 @@ public abstract class AbstractInstall extends ControlCommand { log.debug("Stopping RHQ server..."); - Executor executor = new DefaultExecutor(); executor.setWorkingDirectory(serverBinDir); executor.setStreamHandler(new PumpStreamHandler()); diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java index bb6aa40..0808db2 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java @@ -142,7 +142,7 @@ public class Install extends AbstractInstall { if (!isStorageInstalled()) { installStorageNode(getStorageBasedir(), commandLine); } else if (isWindows()) { - installWindowsService(getBinDir(), "rhq-storage"); + installWindowsService(getBinDir(), "rhq-storage", true); } if (!isServerInstalled()) { @@ -150,7 +150,7 @@ public class Install extends AbstractInstall { runRHQServerInstaller(); waitForRHQServerToInitialize(); } else if (isWindows()) { - installWindowsService(getBinDir(), "rhq-server"); + installWindowsService(getBinDir(), "rhq-server", true); } if (!isAgentInstalled()) { @@ -158,13 +158,15 @@ public class Install extends AbstractInstall { File agentBasedir = getAgentBasedir(); installAgent(agentBasedir); configureAgent(agentBasedir, commandLine); - if (Boolean.parseBoolean(commandLine.getOptionValue(AGENT_AUTOSTART_OPTION, "true"))) { + boolean start = Boolean.parseBoolean(commandLine.getOptionValue(AGENT_AUTOSTART_OPTION, "true")); + if (start) { startAgent(agentBasedir, true); } else { log.info("The agent was installed but was told not to start automatically."); } } else if (isWindows()) { - installWindowsService(new File(getAgentBasedir(), "bin"), "rhq-agent-wrapper"); + boolean start = Boolean.parseBoolean(commandLine.getOptionValue(AGENT_AUTOSTART_OPTION, "true")); + installWindowsService(new File(getAgentBasedir(), "bin"), "rhq-agent-wrapper", start); } } else { @@ -173,7 +175,7 @@ public class Install extends AbstractInstall { log.info("The RHQ storage node is already installed in " + new File(getBaseDir(), "storage")); if (isWindows()) { - installWindowsService(getBinDir(), "rhq-storage"); + installWindowsService(getBinDir(), "rhq-storage", true); } else { log.info("Skipping storage node installation."); } @@ -200,7 +202,7 @@ public class Install extends AbstractInstall { log.warn("The RHQ server is already installed."); if (isWindows()) { - installWindowsService(getBinDir(), "rhq-server"); + installWindowsService(getBinDir(), "rhq-server", true); } else { log.info("Skipping server installation."); } @@ -217,8 +219,10 @@ public class Install extends AbstractInstall { if (isAgentInstalled() && !commandLine.hasOption(STORAGE_OPTION)) { log.info("The RHQ agent is already installed in [" + getAgentBasedir() + "]"); + boolean start = Boolean + .parseBoolean(commandLine.getOptionValue(AGENT_AUTOSTART_OPTION, "true")); if (isWindows()) { - installWindowsService(new File(getAgentBasedir(), "bin"), "rhq-agent-wrapper"); + installWindowsService(new File(getAgentBasedir(), "bin"), "rhq-agent-wrapper", start); } else { log.info("Skipping agent installation."); }

1 0

[rhq] 5 commits - modules/core modules/enterprise modules/plugins
by snegrea 22 Jul '13

22 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java | 34 ++++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 17 +- modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java | 45 ++++-- modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java | 68 ++++++---- modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml | 6 modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 17 ++ 6 files changed, 144 insertions(+), 43 deletions(-) New commits: commit e1461de493712c30e454fa51f946a72cadf2c257 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:47:00 2013 -0500 Fix merge rebase issue. diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 4744e96..3b0aa5b 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -41,8 +41,8 @@ import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.connection.bean.operation.EmsOperation; import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; @@ -116,7 +116,8 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper if (!configurationUpdate.getStatus().equals(ConfigurationUpdateStatus.SUCCESS)) { result.setErrorMessage(configurationUpdate.getErrorMessage()); - + } + return result; } commit 642421966cbea990df8cf0593e1fb82a4c1a98a8 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:40:53 2013 -0500 Attempt to improve the operation trigger for updates on the storage node configuration. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index c77e229..c2a7b46 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -64,6 +64,7 @@ import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.operation.OperationRequestStatus; import org.rhq.core.domain.operation.ResourceOperationHistory; import org.rhq.core.domain.operation.bean.GroupOperationSchedule; +import org.rhq.core.domain.operation.bean.ResourceOperationSchedule; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; @@ -101,8 +102,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private static final String RHQ_STORAGE_JMX_PORT_PROPERTY = "jmxPort"; private static final String RHQ_STORAGE_ADDRESS_PROPERTY = "host"; - private static final int OPERATION_QUERY_TIMEOUT = 1000; - private static final int MAX_ITERATIONS = 5; + private static final int OPERATION_QUERY_TIMEOUT = 20000; + private static final int MAX_ITERATIONS = 6; private static final String UPDATE_CONFIGURATION_OPERATION = "updateConfiguration"; private static final String RESTART_OPERATION = "restart"; @@ -636,8 +637,16 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN //scheduling the operation long operationStartTime = System.currentTimeMillis(); - operationManager.scheduleResourceOperation(subject, storageNodeResource.getId(), operationToRun, 0, 0, 0, 0, - parameters, "Run by StorageNodeManagerBean"); + + ResourceOperationSchedule newSchedule = new ResourceOperationSchedule(); + newSchedule.setJobTrigger(JobTrigger.createNowTrigger()); + newSchedule.setResource(storageNodeResource); + newSchedule.setOperationName(operationToRun); + newSchedule.setDescription("Run by StorageNodeManagerBean"); + newSchedule.setParameters(parameters); + + operationManager.scheduleResourceOperation(subject, newSchedule); + entityManager.flush(); //waiting for the operation result then return it int iteration = 0; commit a7e279884e1a7ee6c0782c1d5e79a27dcff26b76 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:39:55 2013 -0500 Implement the storage node operation for updating jvm options. diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 006dd26..4744e96 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -42,6 +42,7 @@ import org.mc4j.ems.connection.bean.operation.EmsOperation; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.Property; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; @@ -102,7 +103,20 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper private OperationResult updateConfiguration(Configuration params) { OperationResult result = new OperationResult("Configuration updated."); - //TODO: implement updates to various sub-resources here + + //update storage node jvm settings + Configuration config = new Configuration(); + config.put(new PropertySimple("minHeapSize", params.getSimpleValue("heapSize"))); + config.put(new PropertySimple("maxHeapSize", params.getSimpleValue("heapSize"))); + config.put(new PropertySimple("heapNewSize", params.getSimpleValue("heapNewSize"))); + config.put(new PropertySimple("threadStackSize", params.getSimpleValue("threadStackSize"))); + + ConfigurationUpdateReport configurationUpdate = new ConfigurationUpdateReport(config); + this.updateResourceConfiguration(configurationUpdate); + + if (!configurationUpdate.getStatus().equals(ConfigurationUpdateStatus.SUCCESS)) { + result.setErrorMessage(configurationUpdate.getErrorMessage()); + return result; } commit 26a7f7f476e03367d52e9e229f2e583c789e7bec Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:38:15 2013 -0500 Add two more properties to the list of configurable properties for the storaga node. The new properties are heap new size and thread stack size. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java index e2c64f9..32d8ab3 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java @@ -33,6 +33,8 @@ public class StorageNodeConfigurationComposite implements Serializable { private StorageNode storageNode; private int jmxPort; private String heapSize; + private String threadStackSize; + private String heapNewSize; public StorageNodeConfigurationComposite() { // GWT needs this @@ -85,14 +87,44 @@ public class StorageNodeConfigurationComposite implements Serializable { this.heapSize = heapSize; } + /** + * @return the threadStackSize + */ + public String getThreadStackSize() { + return threadStackSize; + } + + /** + * @param threadStackSize the threadStackSize to set + */ + public void setThreadStackSize(String threadStackSize) { + this.threadStackSize = threadStackSize; + } + + /** + * @return the heapNewSize + */ + public String getHeapNewSize() { + return heapNewSize; + } + + /** + * @param heapNewSize the heapNewSize to set + */ + public void setHeapNewSize(String heapNewSize) { + this.heapNewSize = heapNewSize; + } + /* (non-Javadoc) * @see java.lang.Object#toString() */ public String toString() { StringBuilder builder = new StringBuilder(); builder.append("storageNode.addresss=").append(storageNode.getAddress()).append(", "); + builder.append("jmxPort=").append(jmxPort).append(","); builder.append("heapSize=").append(heapSize).append(", "); - builder.append("jmxPort=").append(jmxPort).append(""); + builder.append("heapNewSize=").append(heapSize).append(", "); + builder.append("threadStackSize=").append(threadStackSize).append(""); return builder.toString(); } } commit a0285ac83b5b673dab0582f9ff52baaa746fd8cd Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 22 07:37:10 2013 -0500 Update the set of calculated metrics for Cassandra to incorporate latest feedback. There are three metrics now: total system used space percentage, data file disk space used percentage, and free to data disk space ratio. Also, update the alert definition for disk space to monitor all three metrics. diff --git a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java index 8995ec0..37d10a8 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java +++ b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java @@ -61,7 +61,9 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone private final Log log = LogFactory.getLog(AlertDefinitionServerPluginComponent.class); - private static final String PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.PartitionDiskUsedPercentage"; + private static final String DATA_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.DataDiskUsedPercentage"; + private static final String TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.TotalDiskUsedPercentage"; + private static final String FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME = "Calculated.FreeDiskToDataSizeRatio"; static private final List<InjectedTemplate> injectedTemplates; static private final InjectedTemplate storageNodeHighHeapTemplate; @@ -297,23 +299,42 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone newTemplate.setRecoveryId(0); newTemplate.setEnabled(true); - AlertCondition ac = new AlertCondition(); - ac.setCategory(AlertConditionCategory.THRESHOLD); - ac.setComparator(">"); - ac.setThreshold(0.5D); + + AlertCondition dataDiskUsedAlertCondition = new AlertCondition(); + dataDiskUsedAlertCondition.setCategory(AlertConditionCategory.THRESHOLD); + dataDiskUsedAlertCondition.setComparator(">"); + dataDiskUsedAlertCondition.setThreshold(0.5D); + + AlertCondition totalDiskUsedAlertCondition = new AlertCondition(); + totalDiskUsedAlertCondition.setCategory(AlertConditionCategory.THRESHOLD); + totalDiskUsedAlertCondition.setComparator(">"); + totalDiskUsedAlertCondition.setThreshold(0.75D); + + AlertCondition freeSpaveDataRatioAlertCondition = new AlertCondition(); + freeSpaveDataRatioAlertCondition.setCategory(AlertConditionCategory.THRESHOLD); + freeSpaveDataRatioAlertCondition.setComparator("<"); + freeSpaveDataRatioAlertCondition.setThreshold(1.5D); List<Integer> measurementDefinitionIds = new ArrayList<Integer>(1); for (MeasurementDefinition d : resourceType.getMetricDefinitions()) { - if (PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME.equals(d.getName())) { + if (DATA_DISK_USED_PERCENTAGE_METRIC_NAME.equals(d.getName())) { measurementDefinitionIds.add(d.getId()); - ac.setMeasurementDefinition(d); - ac.setName(d.getDisplayName()); + dataDiskUsedAlertCondition.setMeasurementDefinition(d); + dataDiskUsedAlertCondition.setName(d.getDisplayName()); + } else if (TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME.equals(d.getName())) { + measurementDefinitionIds.add(d.getId()); + totalDiskUsedAlertCondition.setMeasurementDefinition(d); + totalDiskUsedAlertCondition.setName(d.getDisplayName()); + } else if (FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME.equals(d.getName())) { + measurementDefinitionIds.add(d.getId()); + freeSpaveDataRatioAlertCondition.setMeasurementDefinition(d); + freeSpaveDataRatioAlertCondition.setName(d.getDisplayName()); } } - assert null != ac.getMeasurementDefinition() : "Did not find expected measurement definition " - + PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME + " for " - + resourceType; - newTemplate.addCondition(ac); + + newTemplate.addCondition(dataDiskUsedAlertCondition); + newTemplate.addCondition(totalDiskUsedAlertCondition); + newTemplate.addCondition(freeSpaveDataRatioAlertCondition); AlertDampening dampener = new AlertDampening(AlertDampening.Category.PARTIAL_COUNT); dampener.setPeriod(15); diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java index e5a2283..76ce2b2 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java @@ -58,7 +58,9 @@ import org.rhq.plugins.jmx.JMXComponent; public class StorageServiceComponent extends ComplexConfigurationResourceComponent { private static final String OWNERSHIP_METRIC_NAME = "Ownership"; - private static final String PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.PartitionDiskUsedPercentage"; + private static final String DATA_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.DataDiskUsedPercentage"; + private static final String TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.TotalDiskUsedPercentage"; + private static final String FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME = "Calculated.FreeDiskToDataSizeRatio"; private static final String DATA_FILE_LOCATIONS_NAME = "AllDataFileLocations"; private static final String LOAD_NAME = "Load"; @@ -156,6 +158,22 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone @Override protected void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests, EmsBean bean) { super.getValues(report, requests, bean); + + EmsAttribute loadAttribute = bean.getAttribute(LOAD_NAME); + Object loadValue = loadAttribute.refresh(); + + EmsAttribute dataFileLocationAttribute = bean.getAttribute(DATA_FILE_LOCATIONS_NAME); + Object dataFileLocationValue = dataFileLocationAttribute.refresh(); + + double load = 0; + if (loadValue != null && dataFileLocationValue != null && dataFileLocationValue instanceof String[]) { + //Please visit for details: https://issues.apache.org/jira/browse/CASSANDRA-2749 + //The average usage of all partitions with the data will be reported. + //Cassandra selects the partition with most free space for SStable flush and compaction. + load = Double.parseDouble(loadValue.toString()); + load = load / 1024d; //transform in MB + } + for (MeasurementScheduleRequest request : requests) { if (OWNERSHIP_METRIC_NAME.equals(request.getName()) && host != null) { EmsAttribute attribute = bean.getAttribute(OWNERSHIP_METRIC_NAME); @@ -179,49 +197,53 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone report.addData(new MeasurementDataNumeric(request, value.doubleValue())); } break; - } else if (PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName())) { - - - EmsAttribute loadAttribute = bean.getAttribute(LOAD_NAME); - Object loadValue = loadAttribute.refresh(); - - EmsAttribute dataFileLocationAttribute = bean.getAttribute(DATA_FILE_LOCATIONS_NAME); - Object dataFileLocationValue = dataFileLocationAttribute.refresh(); - - if (loadValue != null && dataFileLocationValue != null && dataFileLocationValue instanceof String[]) { - //Please visit for details: https://issues.apache.org/jira/browse/CASSANDRA-2749 - //The average usage of all partitions with the data will be reported. - //Cassandra selects the partition with most free space for SStable flush and compaction. - double load = Double.parseDouble(loadValue.toString()); - - report.addData(new MeasurementDataNumeric(request, getPartitionDiskUsedPercentage(load, - (String[]) dataFileLocationValue))); - } + } else if (DATA_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName()) + || TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName()) + || FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME.equals(request.getName())) { + double metricValue = getDiskUsageMetric(request, load, (String[]) dataFileLocationValue); + report.addData(new MeasurementDataNumeric(request, metricValue)); } } } - private double getPartitionDiskUsedPercentage(double dataSize, String[] paths) { + private double getDiskUsageMetric(MeasurementScheduleRequest request, double dataSize, String[] paths) { List<String> visitedMountPoints = new ArrayList<String>(); long totalDiskSpace = 0; + long totalFreeDiskSpace = 0; + long totalUsedDiskSpace = 0; for (String path : paths) { try { FileSystemInfo fileSystemInfo = this.getResourceContext().getSystemInformation().getFileSystem(path); if (!visitedMountPoints.contains(fileSystemInfo.getMountPoint())) { visitedMountPoints.add(fileSystemInfo.getMountPoint()); + + //contrary to Sigar documentation this values are reported in MB and not bytes totalDiskSpace += fileSystemInfo.getFileSystemUsage().getTotal(); + totalFreeDiskSpace += fileSystemInfo.getFileSystemUsage().getFree(); + totalUsedDiskSpace += fileSystemInfo.getFileSystemUsage().getUsed(); } } catch (Exception e) { log.error("Unable to determine file system usage information for data file location " + path, e); } } + double metricValue = 0; + + if (totalDiskSpace != 0) { - double rawPercentage = dataSize / ((double) totalDiskSpace); - return Math.round(rawPercentage * 100.0) / 100.0; + double rawPercentage = 0; + if (DATA_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName())) { + rawPercentage = dataSize / ((double) totalDiskSpace); + } else if (TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName())) { + rawPercentage = ((double) totalUsedDiskSpace) / ((double) totalDiskSpace); + } else if (FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME.equals(request.getName())) { + rawPercentage = ((double) totalFreeDiskSpace) / (double) dataSize; + } + + metricValue = Math.round(rawPercentage * 100d) / 100d; } - return 0; + return metricValue; } } diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml index a1b3412..5bbebed 100644 --- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml @@ -186,9 +186,11 @@ </parameters> </operation> + <metric property="Calculated.DataDiskUsedPercentage" displayName="Data File Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of disk space used by Cassandra data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> + <metric property="Calculated.TotalDiskUsedPercentage" displayName="Total Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of total disk space used. The metric acounts overall disk usage (including system files), not just disk space used by Cassandra. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> + <metric property="Calculated.FreeDiskToDataSizeRatio" displayName="Free Disk to Data Size Ratio" dataType="measurement" displayType="summary" description="Ratio of (Amount of Free Disk)/(Data File Size). A value below 1 is not recommended since a compaction or repair process could double the amount of disk space used by data files. The aggregate accross all the partitions will be reported if multiple data locations are specified. This is a calculated metric derived from system and Cassandra runtime information."/> + <metric property="CurrentGenerationNumber" dataType="trait" displayType="summary" description="Current generation number"/> - <metric property="Calculated.PartitionDiskUsedPercentage" displayName="Data File Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of disk space used by the data files. If multiple data locations are specified then this will report - the average utilization accross all the partitions that contain data files."/> <metric property="ExceptionCount" measurementType="trendsup" dataType="measurement" displayType="summary" description="Exception Count"/> <metric property="Initialized" dataType="trait" displayType="summary" description="Initialized"/> <metric property="Joined" dataType="trait" displayType="summary" description="Joined"/>

1 0

[rhq] modules/plugins
by Jiri Kremser 22 Jul '13

22 Jul '13

modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 82d0075ed860dcc2f2aed57191e4fa64806caa97 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Mon Jul 22 14:39:39 2013 +0200 Entities < and > in the plugin descriptor were interpreted as HTML in the ConfigurationEditor and the content between them wasn't there. diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml index e6bc1da..a1b3412 100644 --- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml @@ -159,7 +159,7 @@ <operation name="takeSnapshot" description="Takes a snapshot of all keyspaces. A snapshot first flushes all in-memory writes to disk and then creates a hard link of each SSTable file for each keyspace. Note that a column family can have multiple - SSTables on disk. By default snapshots are stored in the <cassandra_data_dir>/<keyspace_name>/<column_family_name>/snapshots + SSTables on disk. By default snapshots are stored in the [cassandra_data_dir]/[keyspace_name]/[column_family_name]/snapshots directory. On Linux/UNIX systems cassandra_data_dir defaults to /var/lib/cassandra/data"> <parameters> <c:simple-property name="snapshotName" required="false" type="string" displayName="Snapshot Name"

1 0

[rhq] modules/enterprise
by John Sanda 22 Jul '13

22 Jul '13

modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 1a520b6c33dd2bde09d58ea7e51d04c83622f481 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 22 07:17:20 2013 -0400 comment out exporting test ear Might be nice to enable exporting test ear with a system property where the location is also configurable. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java index 2fd8624..8010c2b 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java @@ -413,7 +413,8 @@ public abstract class AbstractEJB3Test extends Arquillian { //System.out.println("** The Deployment EAR: " + testEar.toString(true) + "\n"); // Save the test EAR to a zip file for inspection (set file explicitly) - exportZip(testEar, new File("/Users/jsanda/tmp/test-ear.ear")); + //String tmpDir = System.getProperty("java.io.tmpdir"); + //exportZip(testEar, new File(tmpDir, "test.ear")); return testEar; }

1 0

[rhq] modules/helpers
by Heiko W. Rupp 22 Jul '13

22 Jul '13

modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java | 12 ++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) New commits: commit df8669222aa3146b71b3252166af6bdd387806cd Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 22 10:38:44 2013 +0200 Add more units. diff --git a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java index 0ae4011..150b9e0 100644 --- a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java +++ b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat, Inc. and/or its affiliates, and + * Copyright 2009-2013, Red Hat, Inc. and/or its affiliates, and * individual contributors as indicated by the @author tags. See the * copyright.txt file in the distribution for a full listing of * individual contributors. @@ -26,10 +26,18 @@ package org.rhq.helpers.pluginAnnotations.agent; * Metric Units. * * @author Galder Zamarreño + * @author Heiko W. Rupp + * See also org.rhq.core.domain.measurement.MeasurementUnits * @since 4.0 */ +@SuppressWarnings("unused") public enum Units { - NONE, MILLISECONDS, SECONDS, PERCENTAGE; + NONE, PERCENTAGE, + BYTES, KILOBYTES, MEGABYTES, GIGABYTES, TERABYTES, PETABYTES, + BITS, KILOBITS, MEGABITS, GIGABITS, TERABITS, PETABITS, + EPOCH_MILLISECONDS, EPOCH_SECONDS, + JIFFYS, NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS, + CELSIUS, KELVIN, FAHRENHEIT; @Override public String toString() {

1 0

[rhq] modules/plugins
by John Sanda 22 Jul '13

22 Jul '13

modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 78 ++++++++++ modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 8 + 2 files changed, 86 insertions(+) New commits: commit 14edae37060b25ebcfed621deef0281c72b1cea2 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 21 21:22:43 2013 -0400 adding resource operation to update internode auth conf file The operation updates the file on disk and then invokes the JMX operation to have the authenticator reload the configuration so that the changes can be picked up without having to restart the node. diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 380da65..006dd26 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -26,7 +26,12 @@ package org.rhq.plugins.storage; import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -36,6 +41,7 @@ import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.connection.bean.operation.EmsOperation; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; @@ -43,7 +49,10 @@ import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.core.util.file.FileUtil; +import org.rhq.core.util.stream.StreamUtil; import org.rhq.plugins.cassandra.CassandraNodeComponent; import org.rhq.plugins.cassandra.util.KeyspaceService; @@ -84,6 +93,8 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return readRepair(); } else if (name.equals("updateConfiguration")) { return updateConfiguration(parameters); + } else if (name.equals("updateKnownNodes")) { + return updateKnownNodes(parameters); } else { return super.invokeOperation(name, parameters); } @@ -95,6 +106,73 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return result; } + private OperationResult updateKnownNodes(Configuration params) { + OperationResult result = new OperationResult(); + + PropertyList propertyList = params.getList("ipAddresses"); + Set<String> ipAddresses = new HashSet<String>(); + + for (Property property : propertyList.getList()) { + PropertySimple propertySimple = (PropertySimple) property; + ipAddresses.add(propertySimple.getStringValue()); + } + + log.info("Updating known nodes to " + ipAddresses); + + File confDir = new File(getBasedir(), "conf"); + File authFile = new File(confDir, "rhq-storage-auth.conf"); + File authBackupFile = new File(confDir, "." + authFile.getName() + ".bak"); + + if (authBackupFile.exists()) { + if (log.isDebugEnabled()) { + log.debug(authBackupFile + " already exists. Deleting it now in preparation of creating new backup " + + "for " + authFile.getName()); + } + if (!authBackupFile.delete()) { + String msg = "Failed to delete backup file " + authBackupFile + ". The operation will abort " + + "since " + authFile + " cannot reliably be backed up before making changes. Please delete " + + authBackupFile + " manually and reschedule the operation once the file has been removed."; + log.error(msg); + result.setErrorMessage(msg); + + return result; + } + } + + try { + FileUtil.copyFile(authFile, authBackupFile); + } catch (IOException e) { + String msg = "Failed to backup " + authFile + " prior to making updates. The operation will abort due " + + "to unexpected error"; + log.error(msg, e); + result.setErrorMessage(msg + ": " + ThrowableUtil.getRootMessage(e)); + return result; + } + + try { + StreamUtil.copy(new StringReader(StringUtil.collectionToString(ipAddresses, "\n")), + new FileWriter(authFile), true); + } catch (IOException e) { + log.error("An error occurred while updating " + authFile, e); + try { + FileUtil.copyFile(authBackupFile, authFile); + } catch (IOException e1) { + log.error("Failed to revert backup of " + authFile, e1); + } + result.setErrorMessage("There was an unexpected error while updating " + authFile + ". Make sure that " + + "it matches " + authBackupFile + " and then reschedule the operation."); + return result; + } + + EmsBean authBean = getEmsConnection().getBean("org.rhq.cassandra.auth:type=RhqInternodeAuthenticator"); + EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); + emsOperation.invoke(); + + result.setSimpleResult("Successfully updated the set of known nodes."); + + return result; + } + private OperationResult nodeAdded(Configuration params) { boolean runRepair = params.getSimple("runRepair").getBooleanValue(); boolean updateSeedsList = params.getSimple("updateSeedsList").getBooleanValue(); diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 6ed31b7..8156d02 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -93,6 +93,14 @@ </results> </operation> + <operation name="updateKnownNodes"> + <parameters> + <c:list-property name="ipAddresses"> + <c:simple-property name="ipAddress"/> + </c:list-property> + </parameters> + </operation> + <operation name="prepareForUpgrade" description="Prepares the storage node for upgrade (this operation consists of following steps: 1) turning off the RPC server, 2) turning off the gossiper, 3) taking the snapshot (backuping the data), 4) invoking the drain operation"> <parameters> <c:simple-property name="snapshotName" required="false" type="string" displayName="Snapshot Name"

1 0

[rhq] 2 commits - modules/common modules/enterprise
by John Sanda 22 Jul '13

22 Jul '13

modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties | 2 +- modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml | 2 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 38777a49e6b5c5f92c54c3f41511f5f691d2a548 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 21 21:21:45 2013 -0400 update cassandra deployer itest diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties index a90d23c..774a831 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties @@ -17,9 +17,9 @@ heap_dump_dir="" thread_stack_size=-Xss180k -java_agent="" # Enable jamm when running on Java 6 patch version 23 or higher. #java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" +java_agent=-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar # GC tuning options # diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml index 15d08f2..b9e490a 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml @@ -323,7 +323,7 @@ listen_address: localhost # Internode authentication backend, implementing IInternodeAuthenticator; # used to allow/disallow connections from peer nodes. -# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator +internode_authenticator: org.rhq.cassandra.auth.RhqInternodeAuthenticator # Whether to start the native transport server. # Currently, only the thrift server is started by default because the native commit 1750170844f6a68b11256ba001fe6cffb53439f6 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 21 21:14:48 2013 -0400 temporarily disable the quartz job that is kicked off when a new node is added I need to disable the job while working on the internode authentication stuff. If the maintenance operations run on the nodes, the cluster can actually get into a bad state because the nodes' authentication conf files have not been updated which means the new node is not actually part of the cluster. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 3f1ec69..c77e229 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -170,7 +170,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN entityManager.persist(storageNode); - scheduleQuartzJob(storageNodes.size()); +// scheduleQuartzJob(storageNodes.size()); } } }

1 0

[rhq] modules/common
by John Sanda 22 Jul '13

22 Jul '13

modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java | 19 +++++++- modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java | 23 ++++++++++ modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 16 ++++++ 3 files changed, 57 insertions(+), 1 deletion(-) New commits: commit fe6da9b5511a3b4c97c2421079db04020c33c27f Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 21 21:11:43 2013 -0400 pre-configure internode auth conf file From testing I have done thus far it appears that a storage node should have its own IP address included in the internode authentication config file. The storage installer updates the auth file to include the node's address as well as and seeds. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java index edf1430..c8bb2ef 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java @@ -34,6 +34,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; +import java.net.InetAddress; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -109,6 +110,13 @@ public class CassandraClusterManager { List<StorageNode> nodes = new ArrayList<StorageNode>(deploymentOptions.getNumNodes()); String seeds = collectionToString(calculateLocalIPAddresses(deploymentOptions.getNumNodes())); + Set<InetAddress> ipAddresses = null; + + try { + ipAddresses = getClusterIPAddresses(); + } catch (IOException e) { + throw new RuntimeException("Failed to get cluster IP addresses", e); + } for (int i = 0; i < deploymentOptions.getNumNodes(); ++i) { File basedir = new File(deploymentOptions.getClusterDir(), "node" + i); @@ -141,7 +149,7 @@ public class CassandraClusterManager { storageNode.setCqlPort(nodeOptions.getNativeTransportPort()); nodes.add(storageNode); - updateStorageAuthConf(basedir); + deployer.updateStorageAuthConf(ipAddresses); installedNodeDirs.add(basedir); } catch (Exception e) { @@ -193,6 +201,15 @@ public class CassandraClusterManager { return i <= seedsArray.length ? seedsArray[i - 1] : ("127.0.0." + i); } + private Set<InetAddress> getClusterIPAddresses() throws IOException { + Set<InetAddress> ipAddresses = new HashSet<InetAddress>(); + for (String address : calculateLocalIPAddresses(deploymentOptions.getNumNodes())) { + ipAddresses.add(InetAddress.getByName(address)); + } + + return ipAddresses; + } + private List<StorageNode> calculateNodes() { List<StorageNode> nodes = new ArrayList<StorageNode>(deploymentOptions.getNumNodes()); for (int i = 0; i < deploymentOptions.getNumNodes(); ++i) { diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index b01ebe9..6547043 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -30,13 +30,18 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; +import java.io.StringReader; +import java.net.InetAddress; +import java.util.HashSet; import java.util.Map; import java.util.Properties; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.util.PropertiesFileUpdate; +import org.rhq.core.util.StringUtil; import org.rhq.core.util.TokenReplacingReader; import org.rhq.core.util.ZipUtil; import org.rhq.core.util.stream.StreamUtil; @@ -171,4 +176,22 @@ public class Deployer { } } + public void updateStorageAuthConf(Set<InetAddress> ipAddresses) { + File confDir = new File(deploymentOptions.getBasedir(), "conf"); + File authFile = new File(confDir, "rhq-storage-auth.conf"); + + Set<String> addresses = new HashSet<String>(ipAddresses.size()); + for (InetAddress ipAddress : ipAddresses) { + addresses.add(ipAddress.getHostAddress()); + } + + try { + authFile.delete(); + StreamUtil.copy(new StringReader(StringUtil.collectionToString(addresses, "\n")), + new FileWriter(authFile), true); + } catch (IOException e) { + throw new RuntimeException("Failed to update " + authFile); + } + } + } diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 5c5ac4e..113d66b 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -34,10 +34,12 @@ import java.net.InetAddress; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Properties; +import java.util.Set; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -386,6 +388,7 @@ public class StorageInstaller { deployer.unzipDistro(); deployer.applyConfigChanges(); deployer.updateFilePerms(); + deployer.updateStorageAuthConf(getAddresses(hostname, seeds)); log.info("Finished installing RHQ Storage Node."); @@ -499,6 +502,19 @@ public class StorageInstaller { return dir; } + private Set<InetAddress> getAddresses(String hostname, String seeds) throws IOException { + Set<InetAddress> addresses = new HashSet<InetAddress>(); + addresses.add(InetAddress.getByName(hostname)); + + if (!StringUtil.isEmpty(seeds)) { + for (String seed : seeds.split(",")) { + addresses.add(InetAddress.getByName(seed)); + } + } + + return addresses; + } + private PropertiesFileUpdate getServerProperties() { String sysprop = System.getProperty("rhq.server.properties-file"); if (sysprop == null) {

1 0

[rhq] 3 commits - modules/common
by John Sanda 20 Jul '13

20 Jul '13

modules/common/cassandra-auth/pom.xml | 27 +++ modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticator.java | 78 ++++++++++ modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticatorMBean.java | 10 + modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 8 + modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties | 2 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml | 2 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java | 20 ++ modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java | 28 +++ modules/common/pom.xml | 1 9 files changed, 174 insertions(+), 2 deletions(-) New commits: commit b63c38cb0c19cd062d14c5e025164021f1e946cc Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 20 09:53:10 2013 -0400 turn on internode authentication This enabled internode authentication in cassandra.yaml and the cassandra-auth module is packaged with our Cassandra distro. The authentication config file is automatically updated for integrated tests. There is still work to be done for multi-node dev-container (and production) deployments. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 2bde394..c12c567 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -113,6 +113,11 @@ <artifactId>snappy-java</artifactId> <version>${cassandra.snappy.version}</version> </dependency> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-cassandra-auth</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <executions> <execution> @@ -166,12 +171,15 @@ <delete file="${cassandra.dir}/lib/snappy-java-1.0.4.1.jar"/> <copy file="${settings.localRepository}/org/xerial/snappy/snappy-java/${cassandra.snappy.version}/snappy-java-${cassandra.snappy.version}.jar" todir="${cassandra.dir}/lib"/> + <copy file="${settings.localRepository}/org/rhq/rhq-cassandra-auth/${project.version}/rhq-cassandra-auth-${project.version}.jar" + todir="${cassandra.dir}/lib"/> <move file="${project.build.outputDirectory}/cassandra/conf" todir="${cassandra.dir}"/> <delete file="${cassandra.dir}/bin/cassandra"/> <move file="${project.build.outputDirectory}/cassandra/bin/cassandra" todir="${cassandra.dir}/bin"/> <delete dir="${project.build.outputDirectory}/cassandra"/> <delete dir="${cassandra.dir}/javadoc"/> <delete file="${cassandra.dir}/conf/cassandra-env.sh"/> + <touch file="${cassandra.dir}/conf/rhq-storage-auth.conf"/> <zip basedir="${cassandra.dir}" destfile="${cassandra.distro.zip}"/> <delete dir="${cassandra.dir}"/> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties index 612c65e..1faee9d 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties @@ -17,9 +17,9 @@ heap_dump_dir="" thread_stack_size="-Xss180k" -java_agent="" # Enable jamm when running on Java 6 patch version 23 or higher. #java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" +java_agent= # GC tuning options # diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml index 298db9d..da09e92 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml @@ -323,7 +323,7 @@ listen_address: ${rhq.cassandra.listen.address} # Internode authentication backend, implementing IInternodeAuthenticator; # used to allow/disallow connections from peer nodes. -# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator +internode_authenticator: org.rhq.cassandra.auth.RhqInternodeAuthenticator # Whether to start the native transport server. # Currently, only the thrift server is started by default because the native diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java index 338ef3a..edf1430 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java @@ -30,7 +30,9 @@ import static org.rhq.core.util.StringUtil.collectionToString; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileReader; +import java.io.FileWriter; import java.io.IOException; +import java.io.StringReader; import java.io.StringWriter; import java.util.ArrayList; import java.util.Arrays; @@ -50,6 +52,7 @@ import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; +import org.rhq.core.util.StringUtil; import org.rhq.core.util.file.FileUtil; import org.rhq.core.util.stream.StreamUtil; @@ -138,6 +141,8 @@ public class CassandraClusterManager { storageNode.setCqlPort(nodeOptions.getNativeTransportPort()); nodes.add(storageNode); + updateStorageAuthConf(basedir); + installedNodeDirs.add(basedir); } catch (Exception e) { log.error("Failed to install node at " + basedir); @@ -152,6 +157,21 @@ public class CassandraClusterManager { return nodes; } + private void updateStorageAuthConf(File basedir) { + File confDir = new File(basedir, "conf"); + File authFile = new File(confDir, "rhq-storage-auth.conf"); + authFile.delete(); + + Set<String> addresses = calculateLocalIPAddresses(deploymentOptions.getNumNodes()); + + try { + StreamUtil.copy(new StringReader(StringUtil.collectionToString(addresses, "\n")), + new FileWriter(authFile), true); + } catch (IOException e) { + throw new RuntimeException("Failed to update " + authFile); + } + } + private Set<String> calculateLocalIPAddresses(int numNodes) { Set<String> addresses = new HashSet<String>(); diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index b222c82..b01ebe9 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -160,11 +160,6 @@ public class Deployer { return Integer.parseInt(javaVersion.substring(startIndex + 1, javaVersion.length())); } - private boolean isLaterThanJava1_6() { - String javaVersion = System.getProperty("java.version"); - return javaVersion.compareTo("1.6.0") > 0; - } - public void updateFilePerms() { File deployDir = new File(deploymentOptions.getBasedir()); File binDir = new File(deployDir, "bin"); commit 890a378fc11b04f3e7af64babfbfd1a7e306b7cd Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 20 07:56:14 2013 -0400 initial commit for cassandra-auth module This is the first cut at our IInternodeAuthenticator. It loads IP addresses from a config file. There is a JMX operation to reload the config file that can be used after the config file is updated. diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml new file mode 100644 index 0000000..c53c752 --- /dev/null +++ b/modules/common/cassandra-auth/pom.xml @@ -0,0 +1,27 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.rhq</groupId> + <artifactId>rhq-common-parent</artifactId> + <version>4.9.0-SNAPSHOT</version> + </parent> + + <artifactId>rhq-cassandra-auth</artifactId> + <name>RHQ Cassandra Authentication</name> + + <properties> + <moduleName>org.rhq.${project.artifactId}</moduleName> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.cassandra</groupId> + <artifactId>cassandra-all</artifactId> + <version>${cassandra.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> +</project> diff --git a/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticator.java b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticator.java new file mode 100644 index 0000000..56980f1 --- /dev/null +++ b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticator.java @@ -0,0 +1,78 @@ +package org.rhq.cassandra.auth; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.lang.management.ManagementFactory; +import java.net.InetAddress; +import java.net.URISyntaxException; +import java.util.HashSet; +import java.util.Set; + +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.apache.cassandra.auth.IInternodeAuthenticator; +import org.apache.cassandra.exceptions.ConfigurationException; + +/** + * @author John Sanda + */ +public class RhqInternodeAuthenticator implements IInternodeAuthenticator, RhqInternodeAuthenticatorMBean { + + private final String MBEAN_NAME = "org.rhq.cassandra.auth:type=" + RhqInternodeAuthenticator.class.getSimpleName(); + + private final String CONF_FILE = "rhq-storage-auth.conf"; + + private File authConfFile; + + private Set<InetAddress> addresses = new HashSet<InetAddress>(); + + public RhqInternodeAuthenticator() { + try { + authConfFile = new File(getClass().getResource("/" + CONF_FILE).toURI()); + if (!authConfFile.exists()) { + throw new RuntimeException(authConfFile + " does not exist"); + } + + reloadConfiguration(); + } catch (URISyntaxException e) { + throw new RuntimeException("Failed to load " + CONF_FILE, e); + } + + try { + MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); + ObjectName nameObj = new ObjectName(MBEAN_NAME); + mbs.registerMBean(this, nameObj); + } catch (Exception e) { + throw new RuntimeException("Failed to register MBean " + MBEAN_NAME, e); + } + } + + @Override + public boolean authenticate(InetAddress address, int port) { + return addresses.contains(address); + } + + @Override + public void reloadConfiguration() { + try { + addresses.clear(); + + BufferedReader reader = new BufferedReader(new FileReader(authConfFile)); + String line = reader.readLine(); + + while (line != null) { + addresses.add(InetAddress.getByName(line)); + line = reader.readLine(); + } + } catch (IOException e) { + throw new RuntimeException("Failed to load addresses from " + authConfFile, e); + } + } + + @Override + public void validateConfiguration() throws ConfigurationException { + } +} diff --git a/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticatorMBean.java b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticatorMBean.java new file mode 100644 index 0000000..5e20389 --- /dev/null +++ b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/RhqInternodeAuthenticatorMBean.java @@ -0,0 +1,10 @@ +package org.rhq.cassandra.auth; + +/** + * @author John Sanda + */ +public interface RhqInternodeAuthenticatorMBean { + + public void reloadConfiguration(); + +} diff --git a/modules/common/pom.xml b/modules/common/pom.xml index bcbf862..7d12500 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -30,6 +30,7 @@ <module>ant-bundle</module> <module>drift</module> <module>jboss-as-dmr-client</module> + <module>cassandra-auth</module> <module>cassandra-util</module> <module>cassandra-jmx</module> <module>cassandra-schema</module> commit 8cf740355dfab9832b904984aaba4e52bf759951 Author: John Sanda <jsanda(a)redhat.com> Date: Fri Jul 19 22:18:23 2013 -0400 add logic to enable jamm java agent, which mirrors logic in cassandra-env.sh diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index 1e31e14..b222c82 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -125,6 +125,13 @@ public class Deployer { properties.setProperty("thread_stack_size", "-Xss" + deploymentOptions.getStackSize()); properties.setProperty("jmx_port", deploymentOptions.getJmxPort().toString()); + String javaVersion = System.getProperty("java.version"); + // The check here is taken right from cassandra-env.sh + if ((!isOpenJDK() || javaVersion.compareTo("1.6.0") > 0) || + (javaVersion.equals("1.6.0") && getJavaPatchVersion() > 23)) { + properties.put("java_agent", "-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"); + } + propertiesUpdater.update(properties); } catch (IOException e) { log.error("An error occurred while updating " + jvmPropsFile, e); @@ -132,6 +139,32 @@ public class Deployer { } } + private boolean isOpenJDK() { + String javaVMName = System.getProperty("java.vm.name"); + return javaVMName.startsWith("OpenJDK"); + } + + private boolean isJava1_6() { + String javaVersion = System.getProperty("java.version"); + return javaVersion.startsWith("1.6.0"); + } + + private int getJavaPatchVersion() { + String javaVersion = System.getProperty("java.version"); + int startIndex = javaVersion.indexOf('_'); + + if (startIndex == -1) { + return 0; + } + + return Integer.parseInt(javaVersion.substring(startIndex + 1, javaVersion.length())); + } + + private boolean isLaterThanJava1_6() { + String javaVersion = System.getProperty("java.version"); + return javaVersion.compareTo("1.6.0") > 0; + } + public void updateFilePerms() { File deployDir = new File(deploymentOptions.getBasedir()); File binDir = new File(deployDir, "bin");

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - modules/enterprise
by mike thompson 20 Jul '13

20 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java | 259 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 58 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java | 2 5 files changed, 320 insertions(+), 3 deletions(-) New commits: commit 061d403e65ecee68831b8518022b3954bb276063 Author: Mike Thompson <mithomps(a)redhat.com> Date: Sat Jul 20 10:24:48 2013 -0700 Refactor out DashboardLinkUtility for 'add to dashboard functionality' in consolidated metrics view. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java new file mode 100644 index 0000000..e7482fe --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/DashboardLinkUtility.java @@ -0,0 +1,259 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail; + +import java.util.HashMap; +import java.util.Map; +import java.util.TreeSet; + +import com.google.gwt.http.client.Request; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.RequestCallback; +import com.google.gwt.http.client.RequestException; +import com.google.gwt.http.client.Response; +import com.google.gwt.user.client.History; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.menu.Menu; +import com.smartgwt.client.widgets.menu.MenuItem; +import com.smartgwt.client.widgets.menu.events.ClickHandler; +import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.criteria.DashboardCriteria; +import org.rhq.core.domain.criteria.SubjectCriteria; +import org.rhq.core.domain.dashboard.Dashboard; +import org.rhq.core.domain.dashboard.DashboardPortlet; +import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.measurement.MeasurementSchedule; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resource.graph.ResourceD3GraphPortlet; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; +import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; + +/** + * Utility Class to build menus for linking to the Dashboard. + * @author Jay Shaughnessy + * @author Greg Hinkle + * @author Mike Thompson + */ +public class DashboardLinkUtility { + final static Messages MSG = CoreGUI.getMessages(); + + public DashboardLinkUtility getInstance(){ + return new DashboardLinkUtility(); + } + private DashboardLinkUtility(){ } + + public static MenuItem buildMetricsMenu(final ResourceType type, final Resource resource) { + MenuItem measurements = new MenuItem(MSG.view_tree_common_contextMenu_measurements()); + final Menu measurementsSubMenu = new Menu(); + + DashboardCriteria criteria = new DashboardCriteria(); + GWTServiceLookup.getDashboardService().findDashboardsByCriteria(criteria, + new AsyncCallback<PageList<Dashboard>>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_contextMenu_loadFailed_dashboard(), + caught); + } + + public void onSuccess(PageList<Dashboard> result) { + //sort the display items alphabetically + TreeSet<String> ordered = new TreeSet<String>(); + Map<String, MeasurementDefinition> definitionMap = new HashMap<String, MeasurementDefinition>(); + for (MeasurementDefinition m : type.getMetricDefinitions()) { + ordered.add(m.getDisplayName()); + definitionMap.put(m.getDisplayName(), m); + } + + for (String displayName : ordered) { + final MeasurementDefinition def = definitionMap.get(displayName); + //only add menu items for Measurement + if (def.getDataType().equals(DataType.MEASUREMENT)) { + MenuItem defItem = new MenuItem(def.getDisplayName()); + measurementsSubMenu.addItem(defItem); + Menu defSubItem = new Menu(); + defItem.setSubmenu(defSubItem); + + for (final Dashboard d : result) { + MenuItem addToDBItem = new MenuItem(MSG + .view_tree_common_contextMenu_addChartToDashboard(d.getName())); + defSubItem.addItem(addToDBItem); + + addToDBItem.addClickHandler(new ClickHandler() { + + public void onClick(MenuItemClickEvent menuItemClickEvent) { + DashboardPortlet p = new DashboardPortlet(MSG + .view_tree_common_contextMenu_resourceGraph(), ResourceD3GraphPortlet.KEY, + 250); + p.getConfiguration() + .put( + new PropertySimple(ResourceD3GraphPortlet.CFG_RESOURCE_ID, resource + .getId())); + p.getConfiguration().put( + new PropertySimple(ResourceD3GraphPortlet.CFG_DEFINITION_ID, def.getId())); + + d.addPortlet(p); + + GWTServiceLookup.getDashboardService().storeDashboard(d, + new AsyncCallback<Dashboard>() { + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + MSG.view_tree_common_contextMenu_saveChartToDashboardFailure(), + caught); + } + + public void onSuccess(Dashboard result) { + CoreGUI + .getMessageCenter() + .notify( + new Message( + MSG.view_tree_common_contextMenu_saveChartToDashboardSuccessful(result + .getName()), Message.Severity.Info)); + } + }); + + } + + }); + + }//end dashboard iteration + + //add new menu item for adding current graphable element to view if on Monitor/Graphs tab + String currentViewPath = History.getToken(); + if (currentViewPath.contains("Monitoring/Metrics")) { + MenuItem addGraphItem = new MenuItem(MSG.common_title_add_graph_to_view()); + defSubItem.addItem(addGraphItem); + + addGraphItem.addClickHandler(new ClickHandler() { + public void onClick(MenuItemClickEvent menuItemClickEvent) { + //generate javascript to call out to. + //Ex. menuLayers.hide();addMetric('${metric.resourceId},${metric.scheduleId}') + if (getScheduleDefinitionId(resource, def.getName()) > -1) { + final String resourceGraphElements = resource.getId() + "," + + getScheduleDefinitionId(resource, def.getName()); + + //Once, the portal-war will be rewritten to GWT and operations performed + //within the iframe + JSF will update the user preferences, the following + //2 lines could be uncommented and the lines below them refactorized + //MeasurementUserPreferences measurementPreferences = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); + //String selectedView = measurementPreferences.getSelectedView(String.valueOf(resource.getId())); + + final int sid = UserSessionManager.getSessionSubject().getId(); + SubjectCriteria c = new SubjectCriteria(); + c.addFilterId(sid); + + GWTServiceLookup.getSubjectService().findSubjectsByCriteria(c, + new AsyncCallback<PageList<Subject>>() { + public void onSuccess(PageList<Subject> result) { + if (result.size() > 0) { + UserPreferences uPreferences = new UserPreferences(result + .get(0)); + MeasurementUserPreferences mPreferences = new MeasurementUserPreferences( + uPreferences); + String selectedView = mPreferences.getSelectedView(String + .valueOf(resource.getId())); + + addNewMetric(String.valueOf(resource.getId()), + selectedView, resourceGraphElements); + } else { + Log.trace("Error obtaining subject with id:" + sid); + } + } + + public void onFailure(Throwable caught) { + Log.trace("Error obtaining subject with id:" + sid, caught); + } + }); + } + } + }); + } // end add the "add to view" menu item + }//end trait exclusion + }//end measurement def iteration + + } + }); + measurements.setSubmenu(measurementsSubMenu); + return measurements; + } + + /** Locate the specific schedule definition using the definition identifier. + */ + private static int getScheduleDefinitionId(Resource resource, String definitionName) { + int id = -1; + if (resource.getSchedules() != null) { + boolean located = false; + MeasurementSchedule[] schedules = new MeasurementSchedule[resource.getSchedules().size()]; + resource.getSchedules().toArray(schedules); + for (int i = 0; (!located && i < resource.getSchedules().size()); i++) { + MeasurementSchedule schedule = schedules[i]; + MeasurementDefinition definition = schedule.getDefinition(); + if ((definition != null) && definition.getName().equals(definitionName)) { + located = true; + id = schedule.getId(); + } + } + } + return id; + } + + private static void addNewMetric(String id, String selectedView, String resourceGraphElements) { + //construct portal.war url to access + String baseUrl = "/resource/common/monitor/visibility/IndicatorCharts.do"; + baseUrl += "?id=" + id; + baseUrl += "&view=" + selectedView; + baseUrl += "&action=addChart&metric=" + resourceGraphElements; + final String url = baseUrl; + //initiate HTTP request + final RequestBuilder b = new RequestBuilder(RequestBuilder.GET, baseUrl); + + try { + b.setCallback(new RequestCallback() { + public void onResponseReceived(final Request request, final Response response) { + Log.trace("Successfully submitted request to add graph to view:" + url); + + //kick off a page reload. + String currentViewPath = History.getToken(); + CoreGUI.goToView(currentViewPath, true); + } + + @Override + public void onError(Request request, Throwable t) { + Log.trace("Error adding Metric:" + url, t); + } + }); + b.send(); + } catch (RequestException e) { + Log.warn("Error adding Metric:" + url, e); + } + + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index 08d1fd5..ae51195 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -193,7 +193,7 @@ public class ResourceDetailView extends monitoringTab = new TwoLevelTab(new ViewName("Monitoring", MSG.view_tabs_common_monitoring()), IconEnum.SUSPECT_METRICS); - monitorMetrics = new SubTab(monitoringTab, new ViewName("Metrics", "Metrics"), null); + monitorMetrics = new SubTab(monitoringTab, new ViewName("Metrics", MSG.view_tabs_common_metrics()), null); monitorTraits = new SubTab(monitoringTab, new ViewName("Traits", MSG.view_tabs_common_traits()), null); monitorSched = new SubTab(monitoringTab, new ViewName("Schedules", MSG.view_tabs_common_schedules()), null); monitorCallTime = new SubTab(monitoringTab, new ViewName("CallTime", MSG.view_tabs_common_calltime()), null); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java index 071f831..e305039 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java @@ -802,7 +802,7 @@ public class ResourceTreeView extends EnhancedVLayout { //add new menu item for adding current graphable element to view if on Monitor/Graphs tab String currentViewPath = History.getToken(); - if (currentViewPath.contains("Monitoring/NewGraphs")) { + if (currentViewPath.contains("Monitoring/Metrics")) { MenuItem addGraphItem = new MenuItem(MSG.common_title_add_graph_to_view()); defSubItem.addItem(addGraphItem); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index d6bcbaa..31534ed 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -47,12 +47,18 @@ import com.smartgwt.client.widgets.grid.events.RecordExpandHandler; import com.smartgwt.client.widgets.grid.events.SortChangedHandler; import com.smartgwt.client.widgets.grid.events.SortEvent; import com.smartgwt.client.widgets.layout.VLayout; +import com.smartgwt.client.widgets.menu.MenuItem; +import com.smartgwt.client.widgets.menu.events.ClickHandler; +import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.criteria.SubjectCriteria; import org.rhq.core.domain.measurement.MeasurementData; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.components.table.Table; @@ -67,6 +73,7 @@ import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; +import org.rhq.enterprise.gui.coregui.client.util.preferences.UserPreferences; /** * Views a resource's metrics in a tabular view with sparkline graph and optional detailed d3 graph. @@ -240,6 +247,57 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re //@todo: Add to Dashboard } + public void abc(){ + + MenuItem addGraphItem = new MenuItem(MSG.common_title_add_graph_to_view()); + defSubItem.addItem(addGraphItem); + + addGraphItem.addClickHandler(new ClickHandler() { + public void onClick(MenuItemClickEvent menuItemClickEvent) { + //generate javascript to call out to. + //Ex. menuLayers.hide();addMetric('${metric.resourceId},${metric.scheduleId}') + if (getScheduleDefinitionId(resource, def.getName()) > -1) { + final String resourceGraphElements = resource.getId() + "," + + getScheduleDefinitionId(resource, def.getName()); + + //Once, the portal-war will be rewritten to GWT and operations performed + //within the iframe + JSF will update the user preferences, the following + //2 lines could be uncommented and the lines below them refactorized + //MeasurementUserPreferences measurementPreferences = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); + //String selectedView = measurementPreferences.getSelectedView(String.valueOf(resource.getId())); + + final int sid = UserSessionManager.getSessionSubject().getId(); + SubjectCriteria c = new SubjectCriteria(); + c.addFilterId(sid); + + GWTServiceLookup.getSubjectService().findSubjectsByCriteria(c, + new AsyncCallback<PageList<Subject>>() { + public void onSuccess(PageList<Subject> result) { + if (result.size() > 0) { + UserPreferences uPreferences = new UserPreferences(result + .get(0)); + MeasurementUserPreferences mPreferences = new MeasurementUserPreferences( + uPreferences); + String selectedView = mPreferences.getSelectedView(String + .valueOf(resource.getId())); + + addNewMetric(String.valueOf(resource.getId()), + selectedView, resourceGraphElements); + } else { + Log.trace("Error obtaining subject with id:" + sid); + } + } + + public void onFailure(Throwable caught) { + Log.trace("Error obtaining subject with id:" + sid, caught); + } + }); + } + } + }); + + } + } @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java index 10505e9..a069a5d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/enhanced/Enhanced.java @@ -31,5 +31,5 @@ import org.rhq.enterprise.gui.coregui.client.Messages; */ public interface Enhanced { - Messages MSG = CoreGUI.getMessages(); + final static Messages MSG = CoreGUI.getMessages(); }

1 0

[rhq] etc/dev-utils
by Larry O'Leary 20 Jul '13

20 Jul '13

etc/dev-utils/TestLdapSettings.java | 102 +++++++++++++++++++++++++++++++++++- 1 file changed, 100 insertions(+), 2 deletions(-) New commits: commit 0517e453381aec1d30b6aaa62bec63a322dfa350 Author: Larry O'Leary <loleary(a)redhat.com> Date: Fri Jul 19 19:05:25 2013 -0500 Updated TestLdapSettings to include changes/fixes introduced from the following BZs: Bug 707047 - LDAP Group Member search doesn't escape special characters Bug 981015 - LDAP auth fails if user's DN contains a backslash Also includes a fix in where the user auth test would fail to switch back to the directory bind account and result in ACL failures on the following group lookup steps. diff --git a/etc/dev-utils/TestLdapSettings.java b/etc/dev-utils/TestLdapSettings.java index 4df79dc..2e29b3d 100644 --- a/etc/dev-utils/TestLdapSettings.java +++ b/etc/dev-utils/TestLdapSettings.java @@ -10,12 +10,14 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.PrintWriter; import java.io.StringWriter; +import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Properties; import java.util.Set; +import javax.naming.CompositeName; import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.directory.Attribute; @@ -257,7 +259,17 @@ public class TestLdapSettings extends JFrame { SearchResult si = (SearchResult) answer.next(); // Construct the UserDN - userDN = si.getName() + "," + baseDNs[x]; + userDN = null; + + try { + userDN = si.getNameInNamespace(); + } catch (UnsupportedOperationException use) { + userDN = new CompositeName(si.getName()).get(0); + if (si.isRelative()) { + userDN += "," + baseDNs[x]; + } + } + msg = "STEP-2:PASS: The test user '" + testUserName + "' was succesfully located, and the following userDN will be used in authorization check:\n"; @@ -288,6 +300,21 @@ public class TestLdapSettings extends JFrame { log(msg); proceed=false; } + try { + ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, bindUserName); + ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, bindPassword); + ctx.addToEnvironment(Context.SECURITY_AUTHENTICATION, "simple"); + ctx.reconnect(null); + } catch (Exception ex) { + msg = "STEP-2:WARN: There was an error when switching back to the bind user '" + + bindUserName + "'\n"; + msg += ex.getMessage(); + if(enableVerboseDebugging.isSelected()){ + msg = appendStacktraceToMsg(msg, ex); + } + log(msg); + } + } // with authentication completed, now check authorization. // validate filter components to list all available groups @@ -433,7 +460,7 @@ public class TestLdapSettings extends JFrame { Set<Map<String, String>> ret = new HashSet<Map<String, String>>(); String filter = String.format("(&(%s)(%s=%s))", groupSearchFilter, groupMemberFilter, - userDN); + LDAPStringUtil.encodeForFilter(userDN)); msg = "STEP-4:TESTING: about to do ldap search with filter \n'" + filter + "'\n to locate groups that test user IS authorized to access."; @@ -638,3 +665,74 @@ public class TestLdapSettings extends JFrame { return constraints; } } + +class LDAPStringUtil { + + /** + * <p>Encode a string so that it can be used in an LDAP search filter.</p> + * + * <p>The following table shows the characters that are encoded and their + * encoded version.</p> + * + * <table> + * <tr><th align="center">Character</th><th>Encoded As</th></tr> + * <tr><td align="center">*</td><td>\2a</td></tr> + * <tr><td align="center">(</td><td>\28</td></tr> + * <tr><td align="center">)</td><td>\29</td></tr> + * <tr><td align="center">\</td><td>\5c</td></tr> + * <tr><td align="center"><code>null</code></td><td>\00</td></tr> + * </table> + * + * <p>In addition to encoding the above characters, any non-ASCII character + * (any character with a hex value greater then <code>0x7f</code>) is also + * encoded and rewritten as a UTF-8 character or sequence of characters in + * hex notation.</p> + * + * @param filterString a string that is to be encoded + * @return the encoded version of <code>filterString</code> suitable for use + * in a LDAP search filter + * @see <a href="http://tools.ietf.org/html/rfc4515">RFC 4515</a> + */ + public static String encodeForFilter(final String filterString) { + if (filterString != null && filterString.length() > 0) { + StringBuilder encString = new StringBuilder(filterString.length()); + for (int i = 0; i < filterString.length(); i++) { + char ch = filterString.charAt(i); + switch (ch) { + case '*': // encode a wildcard * character + encString.append("\\2a"); + break; + case '(': // encode a open parenthesis ( character + encString.append("\\28"); + break; + case ')': // encode a close parenthesis ) character + encString.append("\\29"); + break; + case '\\': // encode a backslash \ character + encString.append("\\5c"); + break; + case '\u0000': // encode a null character + encString.append("\\00"); + break; + default: + if (ch <= 0x7f) { // an ASCII character + encString.append(ch); + } else if (ch >= 0x80) { // encode to UTF-8 + try { + byte[] utf8bytes = String.valueOf(ch).getBytes("UTF8"); + for (byte b : utf8bytes) { + encString.append(String.format("\\%02x", b)); + } + } catch (UnsupportedEncodingException e) { + // ignore + } + } + } + } + return encString.toString(); + } + return filterString; + } + +} +

1 0

[rhq] modules/common
by John Sanda 19 Jul '13

19 Jul '13

modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra-env.sh | 247 +++ modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra.yaml | 690 ++++++++++ modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/log4j-server.properties | 45 3 files changed, 982 insertions(+) New commits: commit 5d3b55ed04d5da4eab12704c8391872cd93421ad Author: John Sanda <jsanda(a)redhat.com> Date: Fri Jul 19 15:35:34 2013 -0400 forgot to include new test resources in previous commit diff --git a/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra-env.sh b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra-env.sh new file mode 100644 index 0000000..cd415b3 --- /dev/null +++ b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra-env.sh @@ -0,0 +1,247 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +calculate_heap_sizes() +{ + case "`uname`" in + Linux) + system_memory_in_mb=`free -m | awk '/Mem:/ {print $2}'` + system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` + ;; + FreeBSD) + system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'` + system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` + system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` + ;; + SunOS) + system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'` + system_cpu_cores=`psrinfo | wc -l` + ;; + Darwin) + system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'` + system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` + system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` + ;; + *) + # assume reasonable defaults for e.g. a modern desktop or + # cheap server + system_memory_in_mb="2048" + system_cpu_cores="2" + ;; + esac + + # some systems like the raspberry pi don't report cores, use at least 1 + if [ "$system_cpu_cores" -lt "1" ] + then + system_cpu_cores="1" + fi + + # set max heap size based on the following + # max(min(1/2 ram, 1024MB), min(1/4 ram, 8GB)) + # calculate 1/2 ram and cap to 1024MB + # calculate 1/4 ram and cap to 8192MB + # pick the max + half_system_memory_in_mb=`expr $system_memory_in_mb / 2` + quarter_system_memory_in_mb=`expr $half_system_memory_in_mb / 2` + if [ "$half_system_memory_in_mb" -gt "1024" ] + then + half_system_memory_in_mb="1024" + fi + if [ "$quarter_system_memory_in_mb" -gt "8192" ] + then + quarter_system_memory_in_mb="8192" + fi + if [ "$half_system_memory_in_mb" -gt "$quarter_system_memory_in_mb" ] + then + max_heap_size_in_mb="$half_system_memory_in_mb" + else + max_heap_size_in_mb="$quarter_system_memory_in_mb" + fi + MAX_HEAP_SIZE="${max_heap_size_in_mb}M" + + # Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4 * heap size) + max_sensible_yg_per_core_in_mb="100" + max_sensible_yg_in_mb=`expr $max_sensible_yg_per_core_in_mb "*" $system_cpu_cores` + + desired_yg_in_mb=`expr $max_heap_size_in_mb / 4` + + if [ "$desired_yg_in_mb" -gt "$max_sensible_yg_in_mb" ] + then + HEAP_NEWSIZE="${max_sensible_yg_in_mb}M" + else + HEAP_NEWSIZE="${desired_yg_in_mb}M" + fi +} + +# Determine the sort of JVM we'll be running on. + +java_ver_output=`"${JAVA:-java}" -version 2>&1` + +jvmver=`echo "$java_ver_output" | awk -F'"' 'NR==1 {print $2}'` +JVM_VERSION=${jvmver%_*} +JVM_PATCH_VERSION=${jvmver#*_} + +jvm=`echo "$java_ver_output" | awk 'NR==2 {print $1}'` +case "$jvm" in + OpenJDK) + JVM_VENDOR=OpenJDK + # this will be "64-Bit" or "32-Bit" + JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $2}'` + ;; + "Java(TM)") + JVM_VENDOR=Oracle + # this will be "64-Bit" or "32-Bit" + JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $3}'` + ;; + *) + # Help fill in other JVM values + JVM_VENDOR=other + JVM_ARCH=unknown + ;; +esac + + +# Override these to set the amount of memory to allocate to the JVM at +# start-up. For production use you may wish to adjust this for your +# environment. MAX_HEAP_SIZE is the total amount of memory dedicated +# to the Java heap; HEAP_NEWSIZE refers to the size of the young +# generation. Both MAX_HEAP_SIZE and HEAP_NEWSIZE should be either set +# or not (if you set one, set the other). +# +# The main trade-off for the young generation is that the larger it +# is, the longer GC pause times will be. The shorter it is, the more +# expensive GC will be (usually). +# +# The example HEAP_NEWSIZE assumes a modern 8-core+ machine for decent pause +# times. If in doubt, and if you do not particularly want to tweak, go with +# 100 MB per physical CPU core. + +#MAX_HEAP_SIZE="4G" +#HEAP_NEWSIZE="800M" + +if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then + calculate_heap_sizes +else + if [ "x$MAX_HEAP_SIZE" = "x" ] || [ "x$HEAP_NEWSIZE" = "x" ]; then + echo "please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs (see cassandra-env.sh)" + exit 1 + fi +fi + +# Specifies the default port over which Cassandra will be available for +# JMX connections. +JMX_PORT="7399" + + +# Here we create the arguments that will get passed to the jvm when +# starting cassandra. + +# enable assertions. disabling this in production will give a modest +# performance benefit (around 5%). +JVM_OPTS="$JVM_OPTS -ea" + +# add the jamm javaagent +if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \ + || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ] +then + JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" +fi + +# enable thread priorities, primarily so we can give periodic tasks +# a lower priority to avoid interfering with client workload +JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities" +# allows lowering thread priority without being root. see +# http://tech.stolsvik.com/2010/01/linux-java-thread-priorities-workaround.ht… +JVM_OPTS="$JVM_OPTS -XX:ThreadPriorityPolicy=42" + +# min and max heap sizes should be set to the same value to avoid +# stop-the-world GC pauses during resize, and so that we can lock the +# heap in memory on startup to prevent any of it from being swapped +# out. +JVM_OPTS="$JVM_OPTS -Xms512M" +JVM_OPTS="$JVM_OPTS -Xmx512M" +JVM_OPTS="$JVM_OPTS -Xmn128M" +JVM_OPTS="$JVM_OPTS -XX:+HeapDumpOnOutOfMemoryError" + +# set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR +if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then + JVM_OPTS="$JVM_OPTS -XX:HeapDumpPath=$CASSANDRA_HEAPDUMP_DIR/cassandra-`date +%s`-pid$$.hprof" +fi + + +startswith() { [ "${1#$2}" != "$1" ]; } + +if [ "`uname`" = "Linux" ] ; then + # reduce the per-thread stack size to minimize the impact of Thrift + # thread-per-client. (Best practice is for client connections to + # be pooled anyway.) Only do so on Linux where it is known to be + # supported. + # u34 and greater need 180k + JVM_OPTS="$JVM_OPTS -Xss180k" +fi +echo "xss = $JVM_OPTS" + +# GC tuning options +JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC" +JVM_OPTS="$JVM_OPTS -XX:+UseConcMarkSweepGC" +JVM_OPTS="$JVM_OPTS -XX:+CMSParallelRemarkEnabled" +JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8" +JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1" +JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75" +JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly" +JVM_OPTS="$JVM_OPTS -XX:+UseTLAB" +# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check +if [ "$JVM_VERSION" \> "1.7" ] ; then + JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark" +fi + +# GC logging options -- uncomment to enable +# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails" +# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps" +# JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC" +# JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution" +# JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime" +# JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure" +# JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1" +# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log" +# If you are using JDK 6u34 7u2 or later you can enable GC log rotation +# don't stick the date in the log name if rotation is on. +# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log" +# JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation" +# JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10" +# JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M" + +# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414 +# JVM_OPTS="$JVM_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1414" + +# Prefer binding to IPv4 network intefaces (when net.ipv6.bindv6only=1). See +# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6342561 (short version: +# comment out this entry to enable IPv6 support). +JVM_OPTS="$JVM_OPTS -Djava.net.preferIPv4Stack=true" + +# jmx: metrics and administration interface +# +# add this if you're having trouble connecting: +# JVM_OPTS="$JVM_OPTS -Djava.rmi.server.hostname=<public name>" +# +# see +# https://blogs.oracle.com/jmxetc/entry/troubleshooting_connection_problems_i… +# for more on configuring JMX through firewalls, etc. (Short version: +# get it working with no firewall first.) +JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT" +JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false" +JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false" +JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS" diff --git a/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra.yaml b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra.yaml new file mode 100644 index 0000000..8c9c68c --- /dev/null +++ b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/cassandra.yaml @@ -0,0 +1,690 @@ +# Cassandra storage config YAML + +# NOTE: +# See http://wiki.apache.org/cassandra/StorageConfiguration for +# full explanations of configuration directives +# /NOTE + +# The name of the cluster. This is mainly used to prevent machines in +# one logical cluster from joining another. +cluster_name: rhq + +# This defines the number of tokens randomly assigned to this node on the ring +# The more tokens, relative to other nodes, the larger the proportion of data +# that this node will store. You probably want all nodes to have the same number +# of tokens assuming they have equal hardware capability. +# +# If you leave this unspecified, Cassandra will use the default of 1 token for legacy compatibility, +# and will use the initial_token as described below. +# +# Specifying initial_token will override this setting. +# +# If you already have a cluster with 1 token per node, and wish to migrate to +# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations +num_tokens: 256 + +# If you haven't specified num_tokens, or have set it to the default of 1 then +# you should always specify InitialToken when setting up a production +# cluster for the first time, and often when adding capacity later. +# The principle is that each node should be given an equal slice of +# the token ring; see http://wiki.apache.org/cassandra/Operations +# for more details. +# +# If blank, Cassandra will request a token bisecting the range of +# the heaviest-loaded existing node. If there is no load information +# available, such as is the case with a new cluster, it will pick +# a random token, which will lead to hot spots. +#initial_token: + +# See http://wiki.apache.org/cassandra/HintedHandoff +hinted_handoff_enabled: true +# this defines the maximum amount of time a dead host will have hints +# generated. After it has been dead this long, new hints for it will not be +# created until it has been seen alive and gone down again. +max_hint_window_in_ms: 10800000 # 3 hours +# throttle in KB's per second, per delivery thread +hinted_handoff_throttle_in_kb: 1024 +# Number of threads with which to deliver hints; +# Consider increasing this number when you have multi-dc deployments, since +# cross-dc handoff tends to be slower +max_hints_delivery_threads: 2 + +# The following setting populates the page cache on memtable flush and compaction +# WARNING: Enable this setting only when the whole node's data fits in memory. +# Defaults to: false +# populate_io_cache_on_flush: false + +# Authentication backend, implementing IAuthenticator; used to identify users +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator, +# PasswordAuthenticator}. +# +# - AllowAllAuthenticator performs no checks - set it to disable authentication. +# - PasswordAuthenticator relies on username/password pairs to authenticate +# users. It keeps usernames and hashed passwords in system_auth.credentials table. +# Please increase system_auth keyspace replication factor if you use this authenticator. +authenticator: org.apache.cassandra.auth.PasswordAuthenticator + +# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions +# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer, +# CassandraAuthorizer}. +# +# - AllowAllAuthorizer allows any action to any user - set it to disable authorization. +# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please +# increase system_auth keyspace replication factor if you use this authorizer. +authorizer: org.apache.cassandra.auth.CassandraAuthorizer + +# Validity period for permissions cache (fetching permissions can be an +# expensive operation depending on the authorizer, CassandraAuthorizer is +# one example). Defaults to 2000, set to 0 to disable. +# Will be disabled automatically for AllowAllAuthorizer. +permissions_validity_in_ms: 2000 + +# The partitioner is responsible for distributing rows (by key) across +# nodes in the cluster. Any IPartitioner may be used, including your +# own as long as it is on the classpath. Out of the box, Cassandra +# provides org.apache.cassandra.dht.{Murmur3Partitioner, RandomPartitioner +# ByteOrderedPartitioner, OrderPreservingPartitioner (deprecated)}. +# +# - RandomPartitioner distributes rows across the cluster evenly by md5. +# This is the default prior to 1.2 and is retained for compatibility. +# - Murmur3Partitioner is similar to RandomPartioner but uses Murmur3_128 +# Hash Function instead of md5. When in doubt, this is the best option. +# - ByteOrderedPartitioner orders rows lexically by key bytes. BOP allows +# scanning rows in key order, but the ordering can generate hot spots +# for sequential insertion workloads. +# - OrderPreservingPartitioner is an obsolete form of BOP, that stores +# - keys in a less-efficient format and only works with keys that are +# UTF8-encoded Strings. +# - CollatingOPP colates according to EN,US rules rather than lexical byte +# ordering. Use this as an example if you need custom collation. +# +# See http://wiki.apache.org/cassandra/Operations for more on +# partitioners and token selection. +partitioner: org.apache.cassandra.dht.Murmur3Partitioner + +# directories where Cassandra should store data on disk. +data_file_directories: + - target/rhq48/rhq-storage/data + +# commit log +commitlog_directory: target/rhq48/rhq-storage/commit_log + +# policy for data disk failures: +# stop: shut down gossip and Thrift, leaving the node effectively dead, but +# still inspectable via JMX. +# best_effort: stop using the failed disk and respond to requests based on +# remaining available sstables. This means you WILL see obsolete +# data at CL.ONE! +# ignore: ignore fatal errors and let requests fail, as in pre-1.2 Cassandra +disk_failure_policy: stop + +# Maximum size of the key cache in memory. +# +# Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the +# minimum, sometimes more. The key cache is fairly tiny for the amount of +# time it saves, so it's worthwhile to use it at large numbers. +# The row cache saves even more time, but must store the whole values of +# its rows, so it is extremely space-intensive. It's best to only use the +# row cache if you have hot rows or static rows. +# +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is empty to make it "auto" (min(5% of Heap (in MB), 100MB)). Set to 0 to disable key cache. +key_cache_size_in_mb: + +# Duration in seconds after which Cassandra should +# safe the keys cache. Caches are saved to saved_caches_directory as +# specified in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 14400 or 4 hours. +key_cache_save_period: 14400 + +# Number of keys from the key cache to save +# Disabled by default, meaning all keys are going to be saved +# key_cache_keys_to_save: 100 + +# Maximum size of the row cache in memory. +# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. +# +# Default value is 0, to disable row caching. +row_cache_size_in_mb: 0 + +# Duration in seconds after which Cassandra should +# safe the row cache. Caches are saved to saved_caches_directory as specified +# in this configuration file. +# +# Saved caches greatly improve cold-start speeds, and is relatively cheap in +# terms of I/O for the key cache. Row cache saving is much more expensive and +# has limited use. +# +# Default is 0 to disable saving the row cache. +row_cache_save_period: 0 + +# Number of keys from the row cache to save +# Disabled by default, meaning all keys are going to be saved +# row_cache_keys_to_save: 100 + +# The provider for the row cache to use. +# +# Supported values are: ConcurrentLinkedHashCacheProvider, SerializingCacheProvider +# +# SerializingCacheProvider serialises the contents of the row and stores +# it in native memory, i.e., off the JVM Heap. Serialized rows take +# significantly less memory than "live" rows in the JVM, so you can cache +# more rows in a given memory footprint. And storing the cache off-heap +# means you can use smaller heap sizes, reducing the impact of GC pauses. +# +# It is also valid to specify the fully-qualified class name to a class +# that implements org.apache.cassandra.cache.IRowCacheProvider. +# +# Defaults to SerializingCacheProvider +row_cache_provider: SerializingCacheProvider + +# saved caches +saved_caches_directory: target/rhq48/rhq-storage/saved_caches + +# commitlog_sync may be either "periodic" or "batch." +# When in batch mode, Cassandra won't ack writes until the commit log +# has been fsynced to disk. It will wait up to +# commitlog_sync_batch_window_in_ms milliseconds for other writes, before +# performing the sync. +# +# commitlog_sync: batch +# commitlog_sync_batch_window_in_ms: 50 +# +# the other option is "periodic" where writes may be acked immediately +# and the CommitLog is simply synced every commitlog_sync_period_in_ms +# milliseconds. +commitlog_sync: periodic +commitlog_sync_period_in_ms: 10000 + +# The size of the individual commitlog file segments. A commitlog +# segment may be archived, deleted, or recycled once all the data +# in it (potentally from each columnfamily in the system) has been +# flushed to sstables. +# +# The default size is 32, which is almost always fine, but if you are +# archiving commitlog segments (see commitlog_archiving.properties), +# then you probably want a finer granularity of archiving; 8 or 16 MB +# is reasonable. +commitlog_segment_size_in_mb: 32 + +# any class that implements the SeedProvider interface and has a +# constructor that takes a Map<String, String> of parameters will do. +seed_provider: + # Addresses of hosts that are deemed contact points. + # Cassandra nodes use this list of hosts to find each other and learn + # the topology of the ring. You must change this if you are running + # multiple nodes! + - class_name: org.apache.cassandra.locator.SimpleSeedProvider + parameters: + # seeds is actually a comma-delimited list of addresses. + # Ex: "<ip1>,<ip2>,<ip3>" + - seeds: "127.0.0.1" + +# emergency pressure valve: each time heap usage after a full (CMS) +# garbage collection is above this fraction of the max, Cassandra will +# flush the largest memtables. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +# +# RELYING ON THIS AS YOUR PRIMARY TUNING MECHANISM WILL WORK POORLY: +# it is most effective under light to moderate load, or read-heavy +# workloads; under truly massive write load, it will often be too +# little, too late. +flush_largest_memtables_at: 0.75 + +# emergency pressure valve #2: the first time heap usage after a full +# (CMS) garbage collection is above this fraction of the max, +# Cassandra will reduce cache maximum _capacity_ to the given fraction +# of the current _size_. Should usually be set substantially above +# flush_largest_memtables_at, since that will have less long-term +# impact on the system. +# +# Set to 1.0 to disable. Setting this lower than +# CMSInitiatingOccupancyFraction is not likely to be useful. +reduce_cache_sizes_at: 0.85 +reduce_cache_capacity_to: 0.6 + +# For workloads with more data than can fit in memory, Cassandra's +# bottleneck will be reads that need to fetch data from +# disk. "concurrent_reads" should be set to (16 * number_of_drives) in +# order to allow the operations to enqueue low enough in the stack +# that the OS and drives can reorder them. +# +# On the other hand, since writes are almost never IO bound, the ideal +# number of "concurrent_writes" is dependent on the number of cores in +# your system; (8 * number_of_cores) is a good rule of thumb. +concurrent_reads: 32 +concurrent_writes: 32 + +# Total memory to use for memtables. Cassandra will flush the largest +# memtable when this much memory is used. +# If omitted, Cassandra will set it to 1/3 of the heap. +# memtable_total_space_in_mb: 2048 + +# Total space to use for commitlogs. Since commitlog segments are +# mmapped, and hence use up address space, the default size is 32 +# on 32-bit JVMs, and 1024 on 64-bit JVMs. +# +# If space gets above this value (it will round up to the next nearest +# segment multiple), Cassandra will flush every dirty CF in the oldest +# segment and remove it. So a small total commitlog space will tend +# to cause more flush activity on less-active columnfamilies. +# commitlog_total_space_in_mb: 4096 + +# This sets the amount of memtable flush writer threads. These will +# be blocked by disk io, and each one will hold a memtable in memory +# while blocked. If you have a large heap and many data directories, +# you can increase this value for better flush performance. +# By default this will be set to the amount of data directories defined. +#memtable_flush_writers: 1 + +# the number of full memtables to allow pending flush, that is, +# waiting for a writer thread. At a minimum, this should be set to +# the maximum number of secondary indexes created on a single CF. +memtable_flush_queue_size: 4 + +# Whether to, when doing sequential writing, fsync() at intervals in +# order to force the operating system to flush the dirty +# buffers. Enable this to avoid sudden dirty buffer flushing from +# impacting read latencies. Almost always a good idea on SSD:s; not +# necessarily on platters. +trickle_fsync: false +trickle_fsync_interval_in_kb: 10240 + +# TCP port, for commands and data +storage_port: 7100 + +# SSL port, for encrypted communication. Unused unless enabled in +# encryption_options +ssl_storage_port: 7101 + +# Address to bind to and tell other Cassandra nodes to connect to. You +# _must_ change this if you want multiple nodes to be able to +# communicate! +# +# Leaving it blank leaves it up to InetAddress.getLocalHost(). This +# will always do the Right Thing *if* the node is properly configured +# (hostname, name resolution, etc), and the Right Thing is to use the +# address associated with the hostname (it might not be). +# +# Setting this to 0.0.0.0 is always wrong. +listen_address: 127.0.0.1 + +# Address to broadcast to other Cassandra nodes +# Leaving this blank will set it to the same value as listen_address +# broadcast_address: 1.2.3.4 + +# Internode authentication backend, implementing IInternodeAuthenticator; +# used to allow/disallow connections from peer nodes. +# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator + +# Whether to start the native transport server. +# Currently, only the thrift server is started by default because the native +# transport is considered beta. +# Please note that the address on which the native transport is bound is the +# same as the rpc_address. The port however is different and specified below. +start_native_transport: true +# port for the CQL native transport to listen for clients on +native_transport_port: 9142 +# The minimum and maximum threads for handling requests when the native +# transport is used. The meaning is those is similar to the one of +# rpc_min_threads and rpc_max_threads, though the default differ slightly and +# are the ones below: +# native_transport_min_threads: 16 +native_transport_max_threads: 128 + + +# Whether to start the thrift rpc server. +start_rpc: false +# The address to bind the Thrift RPC service to -- clients connect +# here. Unlike ListenAddress above, you *can* specify 0.0.0.0 here if +# you want Thrift to listen on all interfaces. +# +# Leaving this blank has the same effect it does for ListenAddress, +# (i.e. it will be based on the configured hostname of the node). +rpc_address: 127.0.0.1 +# port for Thrift to listen for clients on +rpc_port: 9160 + +# enable or disable keepalive on rpc connections +rpc_keepalive: true + +# Cassandra provides three out-of-the-box options for the RPC Server: +# +# sync -> One thread per thrift connection. For a very large number of clients, memory +# will be your limiting factor. On a 64 bit JVM, 128KB is the minimum stack size +# per thread, and that will correspond to your use of virtual memory (but physical memory +# may be limited depending on use of stack space). +# +# hsha -> Stands for "half synchronous, half asynchronous." All thrift clients are handled +# asynchronously using a small number of threads that does not vary with the amount +# of thrift clients (and thus scales well to many clients). The rpc requests are still +# synchronous (one thread per active request). +# +# The default is sync because on Windows hsha is about 30% slower. On Linux, +# sync/hsha performance is about the same, with hsha of course using less memory. +# +# Alternatively, can provide your own RPC server by providing the fully-qualified class name +# of an o.a.c.t.TServerFactory that can create an instance of it. +rpc_server_type: sync + +# Uncomment rpc_min|max_thread to set request pool size limits. +# +# Regardless of your choice of RPC server (see above), the number of maximum requests in the +# RPC thread pool dictates how many concurrent requests are possible (but if you are using the sync +# RPC server, it also dictates the number of clients that can be connected at all). +# +# The default is unlimited and thus provide no protection against clients overwhelming the server. You are +# encouraged to set a maximum that makes sense for you in production, but do keep in mind that +# rpc_max_threads represents the maximum number of client requests this server may execute concurrently. +# +# rpc_min_threads: 16 +# rpc_max_threads: 2048 + +# uncomment to set socket buffer sizes on rpc connections +# rpc_send_buff_size_in_bytes: +# rpc_recv_buff_size_in_bytes: + +# uncomment to set socket buffer size for internode communication +# Note that when setting this, the buffer size is limited by net.core.wmem_max +# and when not setting it it is defined by net.ipv4.tcp_wmem +# See: +# /proc/sys/net/core/wmem_max +# /proc/sys/net/core/rmem_max +# /proc/sys/net/ipv4/tcp_wmem +# /proc/sys/net/ipv4/tcp_wmem +# and: man tcp +# internode_send_buff_size_in_bytes: +# internode_recv_buff_size_in_bytes: + +# Frame size for thrift (maximum field length). +thrift_framed_transport_size_in_mb: 15 + +# The max length of a thrift message, including all fields and +# internal thrift overhead. +thrift_max_message_length_in_mb: 16 + +# Set to true to have Cassandra create a hard link to each sstable +# flushed or streamed locally in a backups/ subdirectory of the +# Keyspace data. Removing these links is the operator's +# responsibility. +incremental_backups: false + +# Whether or not to take a snapshot before each compaction. Be +# careful using this option, since Cassandra won't clean up the +# snapshots for you. Mostly useful if you're paranoid when there +# is a data format change. +snapshot_before_compaction: false + +# Whether or not a snapshot is taken of the data before keyspace truncation +# or dropping of column families. The STRONGLY advised default of true +# should be used to provide data safety. If you set this flag to false, you will +# lose data on truncation or drop. +auto_snapshot: true + +# Add column indexes to a row after its contents reach this size. +# Increase if your column values are large, or if you have a very large +# number of columns. The competing causes are, Cassandra has to +# deserialize this much of the row to read a single column, so you want +# it to be small - at least if you do many partial-row reads - but all +# the index data is read for each access, so you don't want to generate +# that wastefully either. +column_index_size_in_kb: 64 + +# Size limit for rows being compacted in memory. Larger rows will spill +# over to disk and use a slower two-pass compaction process. A message +# will be logged specifying the row key. +in_memory_compaction_limit_in_mb: 64 + +# Number of simultaneous compactions to allow, NOT including +# validation "compactions" for anti-entropy repair. Simultaneous +# compactions can help preserve read performance in a mixed read/write +# workload, by mitigating the tendency of small sstables to accumulate +# during a single long running compactions. The default is usually +# fine and if you experience problems with compaction running too +# slowly or too fast, you should look at +# compaction_throughput_mb_per_sec first. +# +# concurrent_compactors defaults to the number of cores. +# Uncomment to make compaction mono-threaded, the pre-0.8 default. +#concurrent_compactors: 1 + +# Multi-threaded compaction. When enabled, each compaction will use +# up to one thread per core, plus one thread per sstable being merged. +# This is usually only useful for SSD-based hardware: otherwise, +# your concern is usually to get compaction to do LESS i/o (see: +# compaction_throughput_mb_per_sec), not more. +multithreaded_compaction: false + +# Throttles compaction to the given total throughput across the entire +# system. The faster you insert data, the faster you need to compact in +# order to keep the sstable count down, but in general, setting this to +# 16 to 32 times the rate you are inserting data is more than sufficient. +# Setting this to 0 disables throttling. Note that this account for all types +# of compaction, including validation compaction. +compaction_throughput_mb_per_sec: 16 + +# Track cached row keys during compaction, and re-cache their new +# positions in the compacted sstable. Disable if you use really large +# key caches. +compaction_preheat_key_cache: true + +# Throttles all outbound streaming file transfers on this node to the +# given total throughput in Mbps. This is necessary because Cassandra does +# mostly sequential IO when streaming data during bootstrap or repair, which +# can lead to saturating the network connection and degrading rpc performance. +# When unset, the default is 200 Mbps or 25 MB/s. +# stream_throughput_outbound_megabits_per_sec: 200 + +# How long the coordinator should wait for read operations to complete +read_request_timeout_in_ms: 20000 +# How long the coordinator should wait for seq or index scans to complete +range_request_timeout_in_ms: 20000 +# How long the coordinator should wait for writes to complete +write_request_timeout_in_ms: 20000 +# How long the coordinator should wait for truncates to complete +# (This can be much longer, because we need to flush all CFs +# to make sure we can clear out anythink in the commitlog that could +# cause truncated data to reappear.) +truncate_request_timeout_in_ms: 60000 +# The default timeout for other, miscellaneous operations +request_timeout_in_ms: 20000 + +# Enable operation timeout information exchange between nodes to accurately +# measure request timeouts, If disabled cassandra will assuming the request +# was forwarded to the replica instantly by the coordinator +# +# Warning: before enabling this property make sure to ntp is installed +# and the times are synchronized between the nodes. +cross_node_timeout: false + +# Enable socket timeout for streaming operation. +# When a timeout occurs during streaming, streaming is retried from the start +# of the current file. This *can* involve re-streaming an important amount of +# data, so you should avoid setting the value too low. +# Default value is 0, which never timeout streams. +# streaming_socket_timeout_in_ms: 0 + +# phi value that must be reached for a host to be marked down. +# most users should never need to adjust this. +# phi_convict_threshold: 8 + +# endpoint_snitch -- Set this to a class that implements +# IEndpointSnitch. The snitch has two functions: +# - it teaches Cassandra enough about your network topology to route +# requests efficiently +# - it allows Cassandra to spread replicas around your cluster to avoid +# correlated failures. It does this by grouping machines into +# "datacenters" and "racks." Cassandra will do its best not to have +# more than one replica on the same "rack" (which may not actually +# be a physical location) +# +# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER, +# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS +# ARE PLACED. +# +# Out of the box, Cassandra provides +# - SimpleSnitch: +# Treats Strategy order as proximity. This improves cache locality +# when disabling read repair, which can further improve throughput. +# Only appropriate for single-datacenter deployments. +# - PropertyFileSnitch: +# Proximity is determined by rack and data center, which are +# explicitly configured in cassandra-topology.properties. +# - GossipingPropertyFileSnitch +# The rack and datacenter for the local node are defined in +# cassandra-rackdc.properties and propagated to other nodes via gossip. If +# cassandra-topology.properties exists, it is used as a fallback, allowing +# migration from the PropertyFileSnitch. +# - RackInferringSnitch: +# Proximity is determined by rack and data center, which are +# assumed to correspond to the 3rd and 2nd octet of each node's +# IP address, respectively. Unless this happens to match your +# deployment conventions (as it did Facebook's), this is best used +# as an example of writing a custom Snitch class. +# - Ec2Snitch: +# Appropriate for EC2 deployments in a single Region. Loads Region +# and Availability Zone information from the EC2 API. The Region is +# treated as the Datacenter, and the Availability Zone as the rack. +# Only private IPs are used, so this will not work across multiple +# Regions. +# - Ec2MultiRegionSnitch: +# Uses public IPs as broadcast_address to allow cross-region +# connectivity. (Thus, you should set seed addresses to the public +# IP as well.) You will need to open the storage_port or +# ssl_storage_port on the public IP firewall. (For intra-Region +# traffic, Cassandra will switch to the private IP after +# establishing a connection.) +# +# You can use a custom Snitch by setting this to the full class name +# of the snitch, which will be assumed to be on your classpath. +endpoint_snitch: SimpleSnitch + +# controls how often to perform the more expensive part of host score +# calculation +dynamic_snitch_update_interval_in_ms: 100 +# controls how often to reset all host scores, allowing a bad host to +# possibly recover +dynamic_snitch_reset_interval_in_ms: 600000 +# if set greater than zero and read_repair_chance is < 1.0, this will allow +# 'pinning' of replicas to hosts in order to increase cache capacity. +# The badness threshold will control how much worse the pinned host has to be +# before the dynamic snitch will prefer other replicas over it. This is +# expressed as a double which represents a percentage. Thus, a value of +# 0.2 means Cassandra would continue to prefer the static snitch values +# until the pinned host was 20% worse than the fastest. +dynamic_snitch_badness_threshold: 0.1 + +# request_scheduler -- Set this to a class that implements +# RequestScheduler, which will schedule incoming client requests +# according to the specific policy. This is useful for multi-tenancy +# with a single Cassandra cluster. +# NOTE: This is specifically for requests from the client and does +# not affect inter node communication. +# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place +# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of +# client requests to a node with a separate queue for each +# request_scheduler_id. The scheduler is further customized by +# request_scheduler_options as described below. +request_scheduler: org.apache.cassandra.scheduler.NoScheduler + +# Scheduler Options vary based on the type of scheduler +# NoScheduler - Has no options +# RoundRobin +# - throttle_limit -- The throttle_limit is the number of in-flight +# requests per client. Requests beyond +# that limit are queued up until +# running requests can complete. +# The value of 80 here is twice the number of +# concurrent_reads + concurrent_writes. +# - default_weight -- default_weight is optional and allows for +# overriding the default which is 1. +# - weights -- Weights are optional and will default to 1 or the +# overridden default_weight. The weight translates into how +# many requests are handled during each turn of the +# RoundRobin, based on the scheduler id. +# +# request_scheduler_options: +# throttle_limit: 80 +# default_weight: 5 +# weights: +# Keyspace1: 1 +# Keyspace2: 5 + +# request_scheduler_id -- An identifer based on which to perform +# the request scheduling. Currently the only valid option is keyspace. +# request_scheduler_id: keyspace + +# index_interval controls the sampling of entries from the primrary +# row index in terms of space versus time. The larger the interval, +# the smaller and less effective the sampling will be. In technicial +# terms, the interval coresponds to the number of index entries that +# are skipped between taking each sample. All the sampled entries +# must fit in memory. Generally, a value between 128 and 512 here +# coupled with a large key cache size on CFs results in the best trade +# offs. This value is not often changed, however if you have many +# very small rows (many to an OS page), then increasing this will +# often lower memory usage without a impact on performance. +index_interval: 128 + +# Enable or disable inter-node encryption +# Default settings are TLS v1, RSA 1024-bit keys (it is imperative that +# users generate their own keys) TLS_RSA_WITH_AES_128_CBC_SHA as the cipher +# suite for authentication, key exchange and encryption of the actual data transfers. +# NOTE: No custom encryption options are enabled at the moment +# The available internode options are : all, none, dc, rack +# +# If set to dc cassandra will encrypt the traffic between the DCs +# If set to rack cassandra will encrypt the traffic between the racks +# +# The passwords used in these options must match the passwords used when generating +# the keystore and truststore. For instructions on generating these files, see: +# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSS… +# +server_encryption_options: + internode_encryption: none + keystore: conf/.keystore + keystore_password: cassandra + truststore: conf/.truststore + truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + # require_client_auth: false + +# enable or disable client/server encryption. +client_encryption_options: + enabled: false + keystore: conf/.keystore + keystore_password: cassandra + # require_client_auth: false + # Set trustore and truststore_password if require_client_auth is true + # truststore: conf/.truststore + # truststore_password: cassandra + # More advanced defaults below: + # protocol: TLS + # algorithm: SunX509 + # store_type: JKS + # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] + +# internode_compression controls whether traffic between nodes is +# compressed. +# can be: all - all traffic is compressed +# dc - traffic between different datacenters is compressed +# none - nothing is compressed. +internode_compression: all + +# Enable or disable tcp_nodelay for inter-dc communication. +# Disabling it will result in larger (but fewer) network packets being sent, +# reducing overhead from the TCP protocol itself, at the cost of increasing +# latency if you block for cross-datacenter responses. +inter_dc_tcp_nodelay: true diff --git a/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/log4j-server.properties b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/log4j-server.properties new file mode 100644 index 0000000..c2e6dab --- /dev/null +++ b/modules/common/cassandra-installer/src/test/resources/rhq48/storage/conf/log4j-server.properties @@ -0,0 +1,45 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# for production, you should probably set pattern to %c instead of %l. +# (%l is slower.) + +# output messages into a rolling log file as well as stdout +log4j.rootLogger=INFO,stdout,R + +# stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n + +# rolling log file +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.maxFileSize=20MB +log4j.appender.R.maxBackupIndex=50 +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n +# Edit the next line to point to your logs directory +log4j.appender.R.File=target/rhq48/rhq-storage/logs/rhq-storage.log +log4j.appender.R.Threshold=INFO + +# Application logging options +#log4j.logger.org.apache.cassandra=DEBUG +#log4j.logger.org.apache.cassandra.db=DEBUG +#log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG + +# Adding this to avoid thrift logging disconnect errors. +log4j.logger.org.apache.thrift.server.TNonblockingServer=ERROR +

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - modules/enterprise
by mike thompson 19 Jul '13

19 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java | 2 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) New commits: commit 1f2c7d34cf5a29faf13044df5a09c7b50c0d4f4b Author: Mike Thompson <mithomps(a)redhat.com> Date: Fri Jul 19 12:02:59 2013 -0700 Decrease sensitivity of when to show average line on graphs. Average line not showing up in many cases now. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java index dc054fc..5ae392f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java @@ -389,8 +389,8 @@ public class MetricGraphData implements JsonMetricProducer { * @see StackedBarMetricGraphImpl */ public boolean showBarAvgTrendLine() { + int numberOfAggBars = 0; for (MeasurementDataNumericHighLowComposite measurement : metricData) { - int numberOfAggBars = 0; boolean noValuesInCurrentBarUndefined = (!Double.isNaN(measurement.getValue()) && !Double.isNaN(measurement.getHighValue()) && !Double.isNaN(measurement.getLowValue())); boolean foundAggregateBar = (measurement.getValue() != measurement.getHighValue() || measurement.getHighValue() != measurement.getLowValue()); // if there exists a even one aggregate bar then I can short circuit this and exit diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 77aeda6..d6bcbaa 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -44,6 +44,8 @@ import com.smartgwt.client.widgets.grid.events.RecordCollapseEvent; import com.smartgwt.client.widgets.grid.events.RecordCollapseHandler; import com.smartgwt.client.widgets.grid.events.RecordExpandEvent; import com.smartgwt.client.widgets.grid.events.RecordExpandHandler; +import com.smartgwt.client.widgets.grid.events.SortChangedHandler; +import com.smartgwt.client.widgets.grid.events.SortEvent; import com.smartgwt.client.widgets.layout.VLayout; import org.rhq.core.domain.measurement.MeasurementData; @@ -282,6 +284,13 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re redrawGraphs(); } }); + addSortChangedHandler(new SortChangedHandler() { + @Override + public void onSortChanged(SortEvent sortEvent) { + Log.debug("SortChangeHandler"); + redrawGraphs(); + } + }); } @Override

1 0

[rhq] modules/common
by John Sanda 19 Jul '13

19 Jul '13

modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 1 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra | 3 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh | 247 ---------- modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 77 ++- modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java | 93 +++ 5 files changed, 163 insertions(+), 258 deletions(-) New commits: commit 656cc6066250f46ff51e16230c0f7c8263f55435 Author: John Sanda <jsanda(a)redhat.com> Date: Fri Jul 19 13:43:46 2013 -0400 [BZ 983226] fixing upgrade regression introduced by use of cassandra-jvm.properties This commit removes cassandra-env.sh from our Cassandra distro since we are no longer using that script. The storage installer upgrade has been cleaned up some so that it will get the jmx port from cassandra-env.sh for 4.8 installs and then update cassandra-jvm.properties. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 42f6c8b..2bde394 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -171,6 +171,7 @@ <move file="${project.build.outputDirectory}/cassandra/bin/cassandra" todir="${cassandra.dir}/bin"/> <delete dir="${project.build.outputDirectory}/cassandra"/> <delete dir="${cassandra.dir}/javadoc"/> + <delete file="${cassandra.dir}/conf/cassandra-env.sh"/> <zip basedir="${cassandra.dir}" destfile="${cassandra.distro.zip}"/> <delete dir="${cassandra.dir}"/> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra index 742d9c0..ddbc099 100755 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra @@ -106,8 +106,7 @@ if [ -z "$CASSANDRA_CONF" -o -z "$CLASSPATH" ]; then exit 1 fi -if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then - #. "$CASSANDRA_CONF/cassandra-env.sh" +if [ -f "$CASSANDRA_CONF/cassandra-jvm.properties" ]; then . "$CASSANDRA_CONF/cassandra-jvm.properties" fi diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh deleted file mode 100644 index 99b3128..0000000 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh +++ /dev/null @@ -1,247 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -calculate_heap_sizes() -{ - case "`uname`" in - Linux) - system_memory_in_mb=`free -m | awk '/Mem:/ {print $2}'` - system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` - ;; - FreeBSD) - system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - SunOS) - system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'` - system_cpu_cores=`psrinfo | wc -l` - ;; - Darwin) - system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - *) - # assume reasonable defaults for e.g. a modern desktop or - # cheap server - system_memory_in_mb="2048" - system_cpu_cores="2" - ;; - esac - - # some systems like the raspberry pi don't report cores, use at least 1 - if [ "$system_cpu_cores" -lt "1" ] - then - system_cpu_cores="1" - fi - - # set max heap size based on the following - # max(min(1/2 ram, 1024MB), min(1/4 ram, 8GB)) - # calculate 1/2 ram and cap to 1024MB - # calculate 1/4 ram and cap to 8192MB - # pick the max - half_system_memory_in_mb=`expr $system_memory_in_mb / 2` - quarter_system_memory_in_mb=`expr $half_system_memory_in_mb / 2` - if [ "$half_system_memory_in_mb" -gt "1024" ] - then - half_system_memory_in_mb="1024" - fi - if [ "$quarter_system_memory_in_mb" -gt "8192" ] - then - quarter_system_memory_in_mb="8192" - fi - if [ "$half_system_memory_in_mb" -gt "$quarter_system_memory_in_mb" ] - then - max_heap_size_in_mb="$half_system_memory_in_mb" - else - max_heap_size_in_mb="$quarter_system_memory_in_mb" - fi - MAX_HEAP_SIZE="\${max_heap_size_in_mb}M" - - # Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4 * heap size) - max_sensible_yg_per_core_in_mb="100" - max_sensible_yg_in_mb=`expr $max_sensible_yg_per_core_in_mb "*" $system_cpu_cores` - - desired_yg_in_mb=`expr $max_heap_size_in_mb / 4` - - if [ "$desired_yg_in_mb" -gt "$max_sensible_yg_in_mb" ] - then - HEAP_NEWSIZE="\${max_sensible_yg_in_mb}M" - else - HEAP_NEWSIZE="\${desired_yg_in_mb}M" - fi -} - -# Determine the sort of JVM we'll be running on. - -java_ver_output=`"\${JAVA:-java}" -version 2>&1` - -jvmver=`echo "$java_ver_output" | awk -F'"' 'NR==1 {print $2}'` -JVM_VERSION=\${jvmver%_*} -JVM_PATCH_VERSION=\${jvmver#*_} - -jvm=`echo "$java_ver_output" | awk 'NR==2 {print $1}'` -case "$jvm" in - OpenJDK) - JVM_VENDOR=OpenJDK - # this will be "64-Bit" or "32-Bit" - JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $2}'` - ;; - "Java(TM)") - JVM_VENDOR=Oracle - # this will be "64-Bit" or "32-Bit" - JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $3}'` - ;; - *) - # Help fill in other JVM values - JVM_VENDOR=other - JVM_ARCH=unknown - ;; -esac - - -# Override these to set the amount of memory to allocate to the JVM at -# start-up. For production use you may wish to adjust this for your -# environment. MAX_HEAP_SIZE is the total amount of memory dedicated -# to the Java heap; HEAP_NEWSIZE refers to the size of the young -# generation. Both MAX_HEAP_SIZE and HEAP_NEWSIZE should be either set -# or not (if you set one, set the other). -# -# The main trade-off for the young generation is that the larger it -# is, the longer GC pause times will be. The shorter it is, the more -# expensive GC will be (usually). -# -# The example HEAP_NEWSIZE assumes a modern 8-core+ machine for decent pause -# times. If in doubt, and if you do not particularly want to tweak, go with -# 100 MB per physical CPU core. - -#MAX_HEAP_SIZE="4G" -#HEAP_NEWSIZE="800M" - -if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then - calculate_heap_sizes -else - if [ "x$MAX_HEAP_SIZE" = "x" ] || [ "x$HEAP_NEWSIZE" = "x" ]; then - echo "please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs (see cassandra-env.sh)" - exit 1 - fi -fi - -# Specifies the default port over which Cassandra will be available for -# JMX connections. -JMX_PORT="${rhq.cassandra.jmx.port}" - - -# Here we create the arguments that will get passed to the jvm when -# starting cassandra. - -# enable assertions. disabling this in production will give a modest -# performance benefit (around 5%). -JVM_OPTS="$JVM_OPTS -ea" - -# add the jamm javaagent -if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \\> "1.6.0" ] \\ - || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ] -then - JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" -fi - -# enable thread priorities, primarily so we can give periodic tasks -# a lower priority to avoid interfering with client workload -JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities" -# allows lowering thread priority without being root. see -# http://tech.stolsvik.com/2010/01/linux-java-thread-priorities-workaround.ht… -JVM_OPTS="$JVM_OPTS -XX:ThreadPriorityPolicy=42" - -# min and max heap sizes should be set to the same value to avoid -# stop-the-world GC pauses during resize, and so that we can lock the -# heap in memory on startup to prevent any of it from being swapped -# out. -JVM_OPTS="$JVM_OPTS -Xms${rhq.cassandra.max.heap.size}" -JVM_OPTS="$JVM_OPTS -Xmx${rhq.cassandra.max.heap.size}" -JVM_OPTS="$JVM_OPTS -Xmn${rhq.cassandra.heap.new.size}" -JVM_OPTS="$JVM_OPTS -XX:+HeapDumpOnOutOfMemoryError" - -# set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR -if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then - JVM_OPTS="$JVM_OPTS -XX:HeapDumpPath=$CASSANDRA_HEAPDUMP_DIR/cassandra-`date +%s`-pid$$.hprof" -fi - - -startswith() { [ "\${1#$2}" != "$1" ]; } - -if [ "`uname`" = "Linux" ] ; then - # reduce the per-thread stack size to minimize the impact of Thrift - # thread-per-client. (Best practice is for client connections to - # be pooled anyway.) Only do so on Linux where it is known to be - # supported. - # u34 and greater need 180k - JVM_OPTS="$JVM_OPTS -Xss${rhq.cassandra.stack.size}" -fi -echo "xss = $JVM_OPTS" - -# GC tuning options -JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC" -JVM_OPTS="$JVM_OPTS -XX:+UseConcMarkSweepGC" -JVM_OPTS="$JVM_OPTS -XX:+CMSParallelRemarkEnabled" -JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8" -JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1" -JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75" -JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly" -JVM_OPTS="$JVM_OPTS -XX:+UseTLAB" -# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check -if [ "$JVM_VERSION" \\> "1.7" ] ; then - JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark" -fi - -# GC logging options -- uncomment to enable -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails" -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps" -# JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC" -# JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution" -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime" -# JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure" -# JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1" -# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log" -# If you are using JDK 6u34 7u2 or later you can enable GC log rotation -# don't stick the date in the log name if rotation is on. -# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log" -# JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation" -# JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10" -# JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M" - -# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414 -# JVM_OPTS="$JVM_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1414" - -# Prefer binding to IPv4 network intefaces (when net.ipv6.bindv6only=1). See -# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6342561 (short version: -# comment out this entry to enable IPv6 support). -JVM_OPTS="$JVM_OPTS -Djava.net.preferIPv4Stack=true" - -# jmx: metrics and administration interface -# -# add this if you're having trouble connecting: -# JVM_OPTS="$JVM_OPTS -Djava.rmi.server.hostname=<public name>" -# -# see -# https://blogs.oracle.com/jmxetc/entry/troubleshooting_connection_problems_i… -# for more on configuring JMX through firewalls, etc. (Short version: -# get it working with no firewall first.) -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT" -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false" -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false" -JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS" diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 63282e4..5c5ac4e 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -25,8 +25,10 @@ package org.rhq.storage.installer; +import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; +import java.io.FileReader; import java.io.IOException; import java.net.InetAddress; import java.util.ArrayList; @@ -250,15 +252,32 @@ public class StorageInstaller { File oldConfDir = new File(existingStorageDir, "conf"); File newConfDir = new File(storageBasedir, "conf"); + File cassandraEnvFile = new File(oldConfDir, "cassandra-env.sh"); + String cassandraYaml = "cassandra.yaml"; String cassandraJvmProps = "cassandra-jvm.properties"; File cassandraJvmPropsFile = new File(newConfDir, cassandraJvmProps); String log4j = "log4j-server.properties"; replaceFile(new File(oldConfDir, cassandraYaml), new File(newConfDir, cassandraYaml)); - replaceFile(new File(oldConfDir, cassandraJvmProps), cassandraJvmPropsFile); replaceFile(new File(oldConfDir, log4j), new File(newConfDir, log4j)); + if (cassandraEnvFile.exists()) { + // Then this is an RHQ 4.8 install + jmxPort = parseJmxPortFromCassandrEnv(cassandraEnvFile); + Properties jvmProps = new Properties(); + jvmProps.load(new FileInputStream(cassandraJvmPropsFile)); + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate( + cassandraJvmPropsFile.getAbsolutePath()); + jvmProps.setProperty("jmx_port", Integer.toString(jmxPort)); + + propertiesUpdater.update(jvmProps); + + } else { + jmxPort = parseJmxPort(cassandraJvmPropsFile); + replaceFile(new File(oldConfDir, cassandraJvmProps), cassandraJvmPropsFile); + } + log.info("Finished installing RHQ Storage Node."); log.info("Updating rhq-server.properties..."); @@ -268,8 +287,6 @@ public class StorageInstaller { Map<String, Object> config = (Map<String, Object>) yaml.load(new FileInputStream(yamlFile)); hostname = (String) config.get("listen_address"); - - jmxPort = parseJmxPort(cassandraJvmPropsFile); } else { if (cmdLine.hasOption("dir")) { File basedir = new File(cmdLine.getOptionValue("dir")); @@ -661,6 +678,60 @@ public class StorageInstaller { } } + private int parseJmxPortFromCassandrEnv(File cassandraEnvFile) { + Integer port = null; + if (isWindows()) { + // TODO + return defaultJmxPort; + } else { + BufferedReader reader = null; + try { + reader = new BufferedReader(new FileReader(cassandraEnvFile)); + String line = reader.readLine(); + + while (line != null) { + if (line.startsWith("JMX_PORT")) { + int startIndex = "JMX_PORT=\"".length(); + int endIndex = line.lastIndexOf("\""); + + if (startIndex == -1 || endIndex == -1) { + log.error("Failed to parse the JMX port. Make sure that you have the JMX port defined on its " + + "own line as follows, JMX_PORT=\"<jmx-port>\""); + throw new RuntimeException("Cannot determine JMX port"); + } + try { + port = Integer.parseInt(line.substring(startIndex, endIndex)); + } catch (NumberFormatException e) { + log.error("The JMX port must be an integer. [" + port + "] is an invalid value"); + throw new RuntimeException("The JMX port has an invalid value"); + } + return port; + } + line = reader.readLine(); + } + log.error("Failed to parse the JMX port. Make sure that you have the JMX port defined on its " + + "own line as follows, JMX_PORT=\"<jmx-port>\""); + throw new RuntimeException("Cannot determine JMX port"); + } catch (IOException e) { + log.error("Failed to parse JMX port. There was an unexpected IO error", e); + throw new RuntimeException("Failed to parse JMX port due to IO error: " + e.getMessage()); + } finally { + try { + if (reader != null) { + reader.close(); + } + } catch (IOException e) { + if (log.isDebugEnabled()) { + log.debug("An error occurred closing the " + BufferedReader.class.getName() + " used to " + + "parse the JMX port", e); + } else { + log.warn("There was error closing the reader used to parse the JMX port: " + e.getMessage()); + } + } + } + } + } + private int parseJmxPort(File cassandraJvmOptsFile) { Integer port = null; if (isWindows()) { diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java index 3fd13c7..a7921c0 100644 --- a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -2,11 +2,13 @@ package org.rhq.storage.installer; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; import java.io.File; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.lang.reflect.Method; import java.util.Properties; @@ -20,41 +22,53 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.rhq.cassandra.CassandraClusterManager; +import org.rhq.core.util.MessageDigestGenerator; import org.rhq.core.util.file.FileUtil; +import org.rhq.core.util.stream.StreamUtil; /** * @author John Sanda */ public class StorageInstallerTest { + private MessageDigestGenerator digestGenerator; + private File basedir; + private File serverDir; + private File storageDir; private StorageInstaller installer; @BeforeMethod public void initDirs(Method test) throws Exception { + digestGenerator = new MessageDigestGenerator(MessageDigestGenerator.SHA_256); + File dir = new File(getClass().getResource(".").toURI()); basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); FileUtil.purge(basedir, true); basedir.mkdirs(); - System.setProperty("rhq.server.basedir", basedir.getAbsolutePath()); + serverDir = new File(basedir, "rhq-server"); - File serverPropsFile = new File(basedir, "rhq-server.properties"); + System.setProperty("rhq.server.basedir", serverDir.getAbsolutePath()); + + File serverPropsFile = new File(serverDir, "rhq-server.properties"); FileUtils.touch(serverPropsFile); System.setProperty("rhq.server.properties-file", serverPropsFile.getAbsolutePath()); - storageDir = new File(basedir, "rhq-storage"); + storageDir = new File(serverDir, "rhq-storage"); installer = new StorageInstaller(); } @AfterMethod public void shutdownStorageNode() throws Exception { - CassandraClusterManager ccm = new CassandraClusterManager(); - ccm.killNode(storageDir); + if (FileUtils.getFile(storageDir, "bin", "cassandra.pid").exists()) { + CassandraClusterManager ccm = new CassandraClusterManager(); + ccm.killNode(storageDir); + } } @Test @@ -97,6 +111,65 @@ public class StorageInstallerTest { assertTrue(savedCachesDir.exists(), "Expected to find saved_caches directory at " + savedCachesDir); } + @Test + public void upgradeFromRHQ48Install() throws Exception { + File rhq48ServerDir = new File(basedir, "rhq48-server"); + File rhq48StorageDir = new File(rhq48ServerDir, "rhq-storage"); + File rhq48StorageConfDir = new File(rhq48StorageDir, "conf"); + + File oldCassandraYamlFile = new File(rhq48StorageConfDir, "cassandra.yaml"); + File oldCassandraEnvFile = new File(rhq48StorageConfDir, "cassandra-env.sh"); + File oldLog4JFile = new File(rhq48StorageConfDir, "log4j-server.properties"); + + rhq48StorageConfDir.mkdirs(); + StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/cassandra.yaml"), + new FileOutputStream(oldCassandraYamlFile), true); + StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/cassandra-env.sh"), + new FileOutputStream(oldCassandraEnvFile)); + StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/log4j-server.properties"), + new FileOutputStream(oldLog4JFile)); + + CommandLineParser parser = new PosixParser(); + + String[] args = { + "--upgrade", rhq48ServerDir.getAbsolutePath(), + "--dir", storageDir.getAbsolutePath() + }; + + CommandLine cmdLine = parser.parse(installer.getOptions(), args); + int status = installer.run(cmdLine); + + assertEquals(status, 0, "Expected to get back a status code of 0 for a successful upgrade"); + assertNodeIsRunning(); + + File binDir = new File(storageDir, "bin"); + assertTrue(binDir.exists(), "Expected to find bin directory at " + binDir); + + File libDir = new File(storageDir, "lib"); + assertTrue(libDir.exists(), "Expected to find lib directory at " + libDir); + + File confDir = new File(storageDir, "conf"); + assertTrue(confDir.exists(), "Expected to find conf directory at " + confDir); + + File newCassandraYamlFile = new File(confDir, "cassandra.yaml"); + assertEquals(sha256(oldCassandraYamlFile), sha256(newCassandraYamlFile), newCassandraYamlFile + + " does not match the original version"); + + File newLog4JFile = new File(confDir, "log4j-server.properties"); + assertEquals(sha256(oldLog4JFile), sha256(newLog4JFile), newLog4JFile + " does not match the original version"); + + assertFalse(new File(confDir, "cassandra-env.sh").exists(), "cassandra-env.sh should not be used after RHQ 4.8.0"); + + File cassandraJvmPropsFile = new File(confDir, "cassandra-jvm.properties"); + Properties properties = new Properties(); + properties.load(new FileInputStream(cassandraJvmPropsFile)); + + // If this check fails, make sure that the expected value matches the value in + // src/test/resources/rhq48/storage/conf/cassandra-env.sh + assertEquals(properties.getProperty("jmx_port"), "7399", "Failed to update the JMX port in " + + cassandraJvmPropsFile); + } + private void assertNodeIsRunning() { try { installer.verifyNodeIsUp("127.0.0.1", 7299, 3, 1000); @@ -106,7 +179,7 @@ public class StorageInstallerTest { } private void assertRhqServerPropsUpdated() { - File serverPropsFile = new File(basedir, "rhq-server.properties"); + File serverPropsFile = new File(serverDir, "rhq-server.properties"); Properties properties = new Properties(); try { @@ -120,4 +193,12 @@ public class StorageInstallerTest { assertEquals(seeds, "127.0.0.1|7299|9142"); } + private String sha256(File file) { + try { + return digestGenerator.calcDigestString(file); + } catch (IOException e) { + throw new RuntimeException("Failed to calculate SHA-256 hash for " + file.getPath(), e); + } + } + }

1 0

[rhq] modules/helpers
by Heiko W. Rupp 19 Jul '13

19 Jul '13

modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/ConfigProperty.java | 49 +++ modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java | 126 +++++++++- modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java | 104 +------- modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl | 14 - modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java | 11 5 files changed, 208 insertions(+), 96 deletions(-) New commits: commit 8ad6e86b9ba704eb468646fd7fffcf5dd082e2c4 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Jul 19 18:13:31 2013 +0200 Add annotation and processing for configuration properties. Also shuffle some classes around. diff --git a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/ConfigProperty.java b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/ConfigProperty.java new file mode 100644 index 0000000..4b5a3ab --- /dev/null +++ b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/ConfigProperty.java @@ -0,0 +1,49 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginAnnotations.agent; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * A configuration property for resource or plugin config. + * Currently only property simple are supported. + * @author Heiko W. Rupp + */ +(a)Retention(RetentionPolicy.RUNTIME) +@Target( { ElementType.FIELD}) +public @interface ConfigProperty { + + public Scope scope() default Scope.PLUGIN; + String property() default ""; + String displayName() default ""; + String description() default ""; + boolean readOnly() default false; + String defaultValue() default ""; + RhqType rhqType() default RhqType.VOID; + + + public enum Scope { + PLUGIN, + RESOURCE; + } +} diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java index 3c90b7b..16ec437 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java @@ -19,15 +19,23 @@ package org.rhq.helpers.pluginGen; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.List; +import org.rhq.helpers.pluginAnnotations.agent.ConfigProperty; +import org.rhq.helpers.pluginAnnotations.agent.Metric; +import org.rhq.helpers.pluginAnnotations.agent.Operation; +import org.rhq.helpers.pluginAnnotations.agent.Parameter; +import org.rhq.helpers.pluginAnnotations.agent.RhqType; + /** * Processor that scans a directory for annotated classes and generates metrics etc. from them. * @author Heiko W. Rupp */ public class AnnotationProcessor { - private List<Class> classList; private final DirectoryClassLoader classLoader; public AnnotationProcessor(String baseDirectory) { @@ -36,9 +44,119 @@ public class AnnotationProcessor { } public void populate(Props props) { - classList = classLoader.findClasses(); + List<Class> classList = classLoader.findClasses(); + + populateMetrics(props, classList); + populateOperations(props, classList); + populateConfigurations(props, classList); + } + + public void populateMetrics(Props props, List<Class> classes) { + for (Class<?> clazz : classes) { + for (Field field : clazz.getDeclaredFields()) { + Metric metricAnnot = field.getAnnotation(Metric.class); + addMetric(props, metricAnnot, field.getName()); + } + + for (Method method : clazz.getDeclaredMethods()) { + Metric metricAnnot = method.getAnnotation(Metric.class); + addMetric(props, metricAnnot, method.getName()); + } + } + } + + public void populateOperations(Props props, List<Class> classes) { + for (Class<?> clazz : classes) { + for (Method method : clazz.getDeclaredMethods()) { + Operation operationAnnot = method.getAnnotation(Operation.class); + if (operationAnnot != null) { + String property = operationAnnot.name(); + if (property.isEmpty()) { + property = method.getName(); + } + Props.OperationProps op = new Props.OperationProps(property); + op.setDisplayName(operationAnnot.displayName()); + op.setDescription(operationAnnot.description()); + RhqType type = RhqType.findType(method.getReturnType()); + if (type != RhqType.VOID) { + Props.SimpleProperty simpleProperty = new Props.SimpleProperty(type.getRhqName()); + op.setResult(simpleProperty); + } - props.populateMetrics(classList); - props.populateOperations(classList); + Class[] types = method.getParameterTypes(); + int i=0; + for (Annotation[] annotations : method.getParameterAnnotations() ) { + for (Annotation annotation : annotations) { + if (annotation instanceof Parameter) { + Parameter parameter = (Parameter) annotation; + Props.SimpleProperty simpleProperty = new Props.SimpleProperty(parameter.name()); + simpleProperty.setDescription(parameter.description()); + Class typeClass = types[i]; + RhqType rhqType = RhqType.findType(typeClass); + if (parameter.type()!=RhqType.VOID){ + rhqType = parameter.type(); + } + simpleProperty.setType(rhqType.getRhqName()); + op.getParams().add(simpleProperty); + } + } + i++; + } + props.getOperations().add(op); + } + + } + } + } + + public void populateConfigurations(Props props, List<Class> classes) { + for (Class<?> clazz : classes) { + for (Field field : clazz.getDeclaredFields()) { + ConfigProperty configProperty = field.getAnnotation(ConfigProperty.class); + if (configProperty!=null) { + String name = configProperty.property(); + if(name.isEmpty()) { + name = field.getName(); + } + Props.SimpleProperty property = new Props.SimpleProperty(name); + property.setDescription(configProperty.description()); + property.setDisplayName(configProperty.displayName()); + Class type = field.getType(); + RhqType rhqType = RhqType.findType(type); + if (configProperty.rhqType()!=RhqType.VOID) { + rhqType = configProperty.rhqType(); + } + property.setType(rhqType.getRhqName()); + + switch (configProperty.scope()){ + case PLUGIN: + props.getPluginConfig().add(property); + break; + case RESOURCE: + props.getResourceConfig().add(property); + break; + default: + throw new IllegalStateException("Unknown scope: " +configProperty.scope().name()); + } + } + } + } } + + private void addMetric(Props props, Metric metricAnnot, String name) { + if (metricAnnot != null) { + String property = metricAnnot.property(); + if (property.isEmpty()) { + property = name; + } + Props.MetricProps metric = new Props.MetricProps(property); + metric.setDisplayName(metricAnnot.displayName()); + metric.setDisplayType(metricAnnot.displayType()); + metric.setDataType(metricAnnot.dataType()); + metric.setDescription(metricAnnot.description()); + metric.setUnits(metricAnnot.units()); + props.getMetrics().add(metric); + } + } + } diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java index 95be574..c88fbc0 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java @@ -18,20 +18,12 @@ */ package org.rhq.helpers.pluginGen; -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.util.HashSet; import java.util.LinkedHashSet; -import java.util.List; import java.util.Set; import org.rhq.helpers.pluginAnnotations.agent.DataType; import org.rhq.helpers.pluginAnnotations.agent.DisplayType; -import org.rhq.helpers.pluginAnnotations.agent.Metric; -import org.rhq.helpers.pluginAnnotations.agent.Operation; -import org.rhq.helpers.pluginAnnotations.agent.Parameter; -import org.rhq.helpers.pluginAnnotations.agent.RhqType; import org.rhq.helpers.pluginAnnotations.agent.Units; /** @@ -94,7 +86,8 @@ public class Props { /** Embedded children */ private Set<Props> children = new HashSet<Props>(); - private Set<SimpleProperty> simpleProps = new LinkedHashSet<SimpleProperty>(); + private Set<SimpleProperty> pluginConfig = new LinkedHashSet<SimpleProperty>(); + private Set<SimpleProperty> resourceConfig = new LinkedHashSet<SimpleProperty>(); private Set<Template> templates = new HashSet<Template>(); @@ -291,12 +284,12 @@ public class Props { this.rhqVersion = rhqVersion; } - public Set<SimpleProperty> getSimpleProps() { - return simpleProps; + public Set<SimpleProperty> getPluginConfig() { + return pluginConfig; } - public void setSimpleProps(Set<SimpleProperty> simpleProps) { - this.simpleProps = simpleProps; + public void setPluginConfig(Set<SimpleProperty> pluginConfig) { + this.pluginConfig = pluginConfig; } public Set<Template> getTemplates() { @@ -307,7 +300,15 @@ public class Props { this.templates = templates; } - public Set<MetricProps> getMetrics() { + public Set<SimpleProperty> getResourceConfig() { + return resourceConfig; + } + + public void setResourceConfig(Set<SimpleProperty> resourceConfig) { + this.resourceConfig = resourceConfig; + } + + public Set<MetricProps> getMetrics() { return metrics; } @@ -363,79 +364,6 @@ public class Props { this.scanForAnnotations = scanForAnnotations; } - public void populateMetrics(List<Class> classes) { - for (Class<?> clazz : classes) { - for (Field field : clazz.getDeclaredFields()) { - Metric metricAnnot = field.getAnnotation(Metric.class); - addMetric(metricAnnot, field.getName()); - } - - for (Method method : clazz.getDeclaredMethods()) { - Metric metricAnnot = method.getAnnotation(Metric.class); - addMetric(metricAnnot, method.getName()); - } - } - } - - public void populateOperations(List<Class> classes) { - for (Class<?> clazz : classes) { - for (Method method : clazz.getDeclaredMethods()) { - Operation operationAnnot = method.getAnnotation(Operation.class); - if (operationAnnot != null) { - String property = operationAnnot.name(); - if (property.isEmpty()) { - property = method.getName(); - } - OperationProps op = new OperationProps(property); - op.setDisplayName(operationAnnot.displayName()); - op.setDescription(operationAnnot.description()); - RhqType type = RhqType.findType(method.getReturnType()); - if (type != RhqType.VOID) { - SimpleProperty simpleProperty = new SimpleProperty(type.getRhqName()); - op.setResult(simpleProperty); - } - - Class[] types = method.getParameterTypes(); - int i=0; - for (Annotation[] annotations : method.getParameterAnnotations() ) { - for (Annotation annotation : annotations) { - if (annotation instanceof Parameter) { - Parameter parameter = (Parameter) annotation; - SimpleProperty simpleProperty = new SimpleProperty(parameter.name()); - simpleProperty.setDescription(parameter.description()); - Class typeClass = types[i]; - RhqType rhqType = RhqType.findType(typeClass); - if (parameter.type()!=RhqType.VOID){ - rhqType = parameter.type(); - } - simpleProperty.setType(rhqType.getRhqName()); - op.getParams().add(simpleProperty); - } - } - i++; - } - operations.add(op); - } - - } - } - } - - private void addMetric(Metric metricAnnot, String name) { - if (metricAnnot != null) { - String property = metricAnnot.property(); - if (property.isEmpty()) { - property = name; - } - MetricProps metric = new MetricProps(property); - metric.setDisplayName(metricAnnot.displayName()); - metric.setDisplayType(metricAnnot.displayType()); - metric.setDataType(metricAnnot.dataType()); - metric.setDescription(metricAnnot.description()); - metric.setUnits(metricAnnot.units()); - metrics.add(metric); - } - } @Override public String toString() { @@ -466,7 +394,7 @@ public class Props { sb.append(", dependsOnJmxPlugin=").append(dependsOnJmxPlugin); sb.append(", rhqVersion='").append(rhqVersion).append('\''); sb.append(", children=").append(children); - sb.append(", simpleProps=").append(simpleProps); + sb.append(", simpleProps=").append(pluginConfig); sb.append(", templates=").append(templates); sb.append(", runsInsides=").append(runsInsides); sb.append('}'); diff --git a/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl b/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl index 5579806..ce35ebe 100644 --- a/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl +++ b/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl @@ -45,9 +45,9 @@ name="${props.name}" </runs-inside> </#if> - <#if props.simpleProps?has_content> + <#if props.pluginConfig?has_content> <plugin-configuration> - <#list props.simpleProps as simpleProps> + <#list props.pluginConfig as simpleProps> <c:simple-property name="${simpleProps.name}" description="${simpleProps.description}" <#if simpleProps.type??>type="${simpleProps.type}"</#if> <#if simpleProps.readOnly>readOnly="true"</#if>/> </#list>  @@ -106,4 +106,12 @@ name="${props.name}"  <c:simple-property name="dummy"/> </resource-configuration> - </#if> \ No newline at end of file + </#if> + +<#if props.resourceConfig?has_content> + <resource-configuration> + <#list props.resourceConfig as simpleProps> + <c:simple-property name="${simpleProps.name}" description="${simpleProps.description}" <#if simpleProps.type??>type="${simpleProps.type}"</#if> <#if simpleProps.readOnly>readOnly="true"</#if>/> + </#list> + </resource-configuration> +</#if> diff --git a/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java b/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java index fbc571b..5027dbb 100644 --- a/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java +++ b/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java @@ -19,6 +19,7 @@ package org.rhq.helpers.pluginGen.test; +import org.rhq.helpers.pluginAnnotations.agent.ConfigProperty; import org.rhq.helpers.pluginAnnotations.agent.DataType; import org.rhq.helpers.pluginAnnotations.agent.DisplayType; import org.rhq.helpers.pluginAnnotations.agent.MeasurementType; @@ -26,6 +27,7 @@ import org.rhq.helpers.pluginAnnotations.agent.Metric; import org.rhq.helpers.pluginAnnotations.agent.Operation; import org.rhq.helpers.pluginAnnotations.agent.Parameter; import org.rhq.helpers.pluginAnnotations.agent.RhqType; +import org.rhq.helpers.pluginAnnotations.agent.Units; /** * Just a sample @@ -34,7 +36,8 @@ import org.rhq.helpers.pluginAnnotations.agent.RhqType; public class FooBean { - @Metric(description = "How often was this bean invoked", displayType = DisplayType.SUMMARY, measurementType = MeasurementType.DYNAMIC) + @Metric(description = "How often was this bean invoked", displayType = DisplayType.SUMMARY, measurementType = MeasurementType.DYNAMIC, + units = Units.SECONDS) int invocationCount; @Metric(description = "Just a foo", dataType = DataType.TRAIT) @@ -51,5 +54,11 @@ public class FooBean { invocationCount -= by; } + @ConfigProperty(scope = ConfigProperty.Scope.PLUGIN, displayName="The Password", + readOnly = false, property="thePassword",description = "A password", rhqType = RhqType.PASSWORD) + String password; + + @ConfigProperty(scope = ConfigProperty.Scope.RESOURCE) + int defaultSteps; }

1 0

[rhq] modules/core
by Jiri Kremser 19 Jul '13

19 Jul '13

modules/core/domain/intentional-api-changes-since-4.8.0.xml | 8 ++++++++ 1 file changed, 8 insertions(+) New commits: commit 039a42a2e696bb1bb0b170bec87ed95fe13921e2 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Jul 19 16:40:48 2013 +0200 API Checks - Changing StorageNode.QUERY_FIND_BY_ADDRESS. The constants for native queries shouldn't be part of the public API. diff --git a/modules/core/domain/intentional-api-changes-since-4.8.0.xml b/modules/core/domain/intentional-api-changes-since-4.8.0.xml index f21a45f..a8a77b4 100644 --- a/modules/core/domain/intentional-api-changes-since-4.8.0.xml +++ b/modules/core/domain/intentional-api-changes-since-4.8.0.xml @@ -1,3 +1,11 @@ <?xml version="1.0"?> <differences> + <difference> + <className>org/rhq/core/domain/cloud/StorageNode</className> + <differenceType>6003</differenceType> + <field>QUERY_FIND_BY_ADDRESS</field> + <justification> + Changing StorageNode.QUERY_FIND_BY_ADDRESS. The constants for native queries shouldn't be part of the public API. + </justification> + </difference> </differences>

1 0

[rhq] modules/core modules/enterprise
by Jiri Kremser 19 Jul '13

19 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java | 13 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java | 38 ++++++++++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 3 10 files changed, 75 insertions(+) New commits: commit 78eb557ae8f799b628769d76ccece61b6cb452a4 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Jul 19 16:17:53 2013 +0200 [BZ 959587] - Alert definition should display units when entering a value; e.g. 'seconds' or 'megabytes' - Adding "BaseUnits" field to the popup form. The tooltip displays all allowed units from the same MeasurementUnits.Family. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java index 31811ab..d66f23b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java @@ -22,6 +22,9 @@ */ package org.rhq.core.domain.measurement; +import java.util.ArrayList; +import java.util.List; + import org.rhq.core.domain.measurement.util.MeasurementConversionException; /** @@ -117,6 +120,16 @@ public enum MeasurementUnits { return null; } + + public List<MeasurementUnits> getFamilyUnits() { + List<MeasurementUnits> returnList = new ArrayList<MeasurementUnits>(); + for (MeasurementUnits units : MeasurementUnits.values()) { + if (units.family == family) { + returnList.add(units); + } + } + return returnList; + } public boolean isComparableTo(MeasurementUnits other) { return family == other.family; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java index 870140d..f4fbcad 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java @@ -44,6 +44,8 @@ import com.smartgwt.client.widgets.form.fields.SelectItem; import com.smartgwt.client.widgets.form.fields.SpacerItem; import com.smartgwt.client.widgets.form.fields.StaticTextItem; import com.smartgwt.client.widgets.form.fields.TextItem; +import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.toolbar.ToolStrip; @@ -613,6 +615,7 @@ public class ConditionEditor extends EnhancedVLayout { } absoluteValue.setShowIfCondition(ifFunc); formItems.add(absoluteValue); + formItems.add(buildBaseUnitsItem(metricDropDownMenu, ifFunc, editMode)); } else { String noMetricsStr = MSG.view_alert_definition_condition_editor_metric_nometrics(); StaticTextItem noMetrics = buildHelpTextItem(THRESHOLD_NO_METRICS_ITEMNAME, noMetricsStr, ifFunc); @@ -663,6 +666,7 @@ public class ConditionEditor extends EnhancedVLayout { formItems.add(absoluteLowValue); formItems.add(absoluteHighValue); + formItems.add(buildBaseUnitsItem(metricDropDownMenu, ifFunc, editMode)); } else { String noMetricsStr = MSG.view_alert_definition_condition_editor_metric_nometrics(); StaticTextItem noMetrics = buildHelpTextItem(RANGE_NO_METRICS_ITEMNAME, noMetricsStr, ifFunc); @@ -1220,6 +1224,40 @@ public class ConditionEditor extends EnhancedVLayout { return comparatorSelection; } + private StaticTextItem buildBaseUnitsItem(final SelectItem metricDropDownMenu, FormItemIfFunction ifFunc, + boolean editMode) { + String baseUnits = MSG.view_alert_definition_condition_editor_common_baseUnits(); + final StaticTextItem baseUnitsItem = new StaticTextItem("baseUnits", baseUnits); + baseUnitsItem.setHoverWidth(200); + baseUnitsItem.setShowIfCondition(ifFunc); + + metricDropDownMenu.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + MeasurementDefinition measDef = getMeasurementDefinition(form.getValueAsString(metricDropDownMenu + .getName())); + baseUnitsItem.setValue(measDef.getUnits() == MeasurementUnits.NONE ? MSG + .view_alert_definition_condition_editor_common_baseUnits_none() + : measDef.getUnits() == MeasurementUnits.MILLISECONDS ? MeasurementUnits.SECONDS : measDef + .getUnits()); + List<MeasurementUnits> availableUnits = measDef.getUnits().getFamilyUnits(); + baseUnitsItem.setTooltip(MSG.view_alert_definition_condition_editor_common_baseUnits_availableUnits() + + (availableUnits.isEmpty() || availableUnits.get(0) == MeasurementUnits.NONE ? MSG + .view_alert_definition_condition_editor_common_baseUnits_none() : availableUnits)); + } + }); + // initialize the field with proper value + MeasurementUnits units = editMode ? existingCondition.getMeasurementDefinition().getUnits() + : ConditionEditor.this.resourceType.getMetricDefinitions().iterator().next().getUnits(); + baseUnitsItem.setValue(units == MeasurementUnits.NONE ? MSG + .view_alert_definition_condition_editor_common_baseUnits_none() + : units == MeasurementUnits.MILLISECONDS ? MeasurementUnits.SECONDS : units); + List<MeasurementUnits> availableUnits = units.getFamilyUnits(); + baseUnitsItem.setTooltip(MSG.view_alert_definition_condition_editor_common_baseUnits_availableUnits() + + (availableUnits.isEmpty() || availableUnits.get(0) == MeasurementUnits.NONE ? MSG + .view_alert_definition_condition_editor_common_baseUnits_none() : availableUnits)); + return baseUnitsItem; + } + private StaticTextItem buildHelpTextItem(String itemName, String helpText, FormItemIfFunction ifFunc) { StaticTextItem help = new StaticTextItem(itemName); help.setShowTitle(false); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index ed6b130..19d3fa5 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -919,6 +919,9 @@ view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = T view_alert_definition_condition_editor_availability_tooltip = Specify the availability state change that will trigger the condition. view_alert_definition_condition_editor_availability_value = Availability view_alert_definition_condition_editor_common_avg = Average +view_alert_definition_condition_editor_common_baseUnits = Base Units +view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = Maximum view_alert_definition_condition_editor_common_min = Minimum view_alert_definition_condition_editor_common_regex = Regular Expression diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 1950003..f71f907 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -933,6 +933,9 @@ view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = P view_alert_definition_condition_editor_availability_tooltip = Specifikujte stav dostupnosti, který poté splní podmínku. view_alert_definition_condition_editor_availability_value = Dostupnost view_alert_definition_condition_editor_common_avg = Průměr +view_alert_definition_condition_editor_common_baseUnits = Základní jednotky +view_alert_definition_condition_editor_common_baseUnits_availableUnits = Dostupné jednotky: +view_alert_definition_condition_editor_common_baseUnits_none = Źádné view_alert_definition_condition_editor_common_max = Maximum view_alert_definition_condition_editor_common_min = Minimum view_alert_definition_condition_editor_common_regex = Regulární výraz diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index bd8e0b4..524dcc0 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -844,6 +844,9 @@ view_alert_definition_condition_editor_avilability_option_up = Wird verfügbar view_alert_definition_condition_editor_avilability_tooltip = Geben Sie die Änderung der Verfügbarkeit an, die die Bedingung auslösen soll. view_alert_definition_condition_editor_avilability_value = Verfügbarkeit view_alert_definition_condition_editor_common_avg = Durchschnitt +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = Maximum view_alert_definition_condition_editor_common_min = Minimum view_alert_definition_condition_editor_common_regex = Regulärer Ausdruck diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 1c0005b..cb0c35f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -908,6 +908,9 @@ view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = view_alert_definition_condition_editor_availability_tooltip = 条件のトリガーとなるアベイラビリティ状態の変化を指定します view_alert_definition_condition_editor_availability_value = アベイラビリティ view_alert_definition_condition_editor_common_avg = 平均 +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = 最大 view_alert_definition_condition_editor_common_min = 最小 view_alert_definition_condition_editor_common_regex = 正規表現 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 5118a2d..32dc73d 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -797,6 +797,9 @@ view_alert_definition_condition_editor_availabilityDuration_tooltip_duration = view_alert_definition_condition_editor_availability_tooltip = 조건 트리거하는 가용성 상태의 변화를 지정합니다. view_alert_definition_condition_editor_availability_value = 가용성 view_alert_definition_condition_editor_common_avg = 평균 +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = 최대 view_alert_definition_condition_editor_common_min = 최소 view_alert_definition_condition_editor_common_regex = 정규 표현식 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index bfd95e8..f4419e1 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -916,6 +916,9 @@ view_alert_common_tab_recovery = Recupera\u00E7\u00E3o view_alert_definition_condition_editor_availability_tooltip = Especifica a mudan\u00E7a de estado na disponibilidade do recurso que ir\u00E1 disparar a condi\u00E7\u00E3o. view_alert_definition_condition_editor_availability_value = Disponibilidade view_alert_definition_condition_editor_common_avg = M\u00E9dio +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = M\u00E1ximo view_alert_definition_condition_editor_common_min = M\u00EDnimo view_alert_definition_condition_editor_common_regex = Express\u00E3o Regular diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index e03e1a9..d75b76e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -881,6 +881,9 @@ #view_alert_definition_condition_editor_availability_tooltip = Specify the availability state change that will trigger the condition. #view_alert_definition_condition_editor_availability_value = Availability #view_alert_definition_condition_editor_common_avg = Average +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None #view_alert_definition_condition_editor_common_max = Maximum #view_alert_definition_condition_editor_common_min = Minimum #view_alert_definition_condition_editor_delete_confirm = Delete the selected alert condition(s)? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 82ddc2a..a9a24df 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -902,6 +902,9 @@ view_alert_common_tab_recovery = \u8fd8\u539f view_alert_definition_condition_editor_availability_tooltip = Specify the availability state change that will trigger the condition. view_alert_definition_condition_editor_availability_value = \u53ef\u7528\u6027 view_alert_definition_condition_editor_common_avg = \u5e73\u5747 +##view_alert_definition_condition_editor_common_baseUnits = Base Units +##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units: +##view_alert_definition_condition_editor_common_baseUnits_none = None view_alert_definition_condition_editor_common_max = \u6700\u5927 view_alert_definition_condition_editor_common_min = \u6700\u5c0f view_alert_definition_condition_editor_common_regex = \u6b63\u5219\u8868\u8fbe\u5f0f

1 0

[rhq] 3 commits - modules/core modules/enterprise
by Jiri Kremser 19 Jul '13

19 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java | 3 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java | 3 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 9 ++ modules/enterprise/gui/coregui/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch | 7 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java | 20 ++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java | 42 +++++++++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 1 14 files changed, 85 insertions(+), 10 deletions(-) New commits: commit 1f6cf05d57599ded2d196241284b4b5167886c80 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Jul 19 12:43:35 2013 +0200 [BZ 980091] - link in the alert to the parent on which the alert was created - Adding the link to AlertDetailsView if the alert is defined by parent definition. Parent definition could mean group alert definition, autogroup alert definition or template definition diff --git a/modules/enterprise/gui/coregui/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch b/modules/enterprise/gui/coregui/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch new file mode 100644 index 0000000..627021f --- /dev/null +++ b/modules/enterprise/gui/coregui/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.wst.jsdt.core.javascriptValidator"/> +<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java index 17dd6d6..d66baea 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java @@ -57,6 +57,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.admin.templates.AlertDefinitionTemplateTypeView; import org.rhq.enterprise.gui.coregui.client.components.form.DateFilterItem; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.gwt.AlertGWTServiceAsync; @@ -74,6 +75,8 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; * @author John Mazzitelli */ public class AlertDataSource extends RPCDataSource<Alert, AlertCriteria> { + + private static final String FIELD_PARENT = "parent"; // may be template or group alert def parent public static final String PRIORITY_ICON_HIGH = ImageManager.getAlertIcon(AlertPriority.HIGH); public static final String PRIORITY_ICON_MEDIUM = ImageManager.getAlertIcon(AlertPriority.MEDIUM); @@ -359,6 +362,7 @@ public class AlertDataSource extends RPCDataSource<Alert, AlertCriteria> { } criteria.addFilterEntityContext(entityContext); criteria.fetchConditionLogs(true); +// criteria.fetchGroupAlertDefinition(true); return criteria; } @@ -410,6 +414,22 @@ public class AlertDataSource extends RPCDataSource<Alert, AlertCriteria> { record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, resource.getAncestry()); record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, resource.getResourceType().getId()); + AlertDefinition groupAlertDefinition = alertDefinition.getGroupAlertDefinition(); + Integer parentId = alertDefinition.getParentId(); + if (groupAlertDefinition != null && groupAlertDefinition.getGroup() != null) { + boolean isAutogroup = groupAlertDefinition.getGroup().getAutoGroupParentResource() != null; + record.setAttribute(FIELD_PARENT, (isAutogroup ? "#Resource/AutoGroup/" : "#ResourceGroup/") + + groupAlertDefinition.getGroup().getId() + "/Alerts/Definitions/" + groupAlertDefinition.getId()); + record.setLinkText(MSG.view_alert_definition_for_group()); + } else if (parentId != null && parentId.intValue() != 0) { + record.setAttribute( + FIELD_PARENT, + LinkManager.getAdminTemplatesEditLink(AlertDefinitionTemplateTypeView.VIEW_ID.getName(), resource + .getResourceType().getId()) + + "/" + parentId); + record.setLinkText(MSG.view_alert_definition_for_type()); + } + Set<AlertConditionLog> conditionLogs = from.getConditionLogs(); String conditionText; String conditionValue; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java index 68a0953..ed98d94 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java @@ -40,8 +40,12 @@ import com.smartgwt.client.widgets.tab.Tab; import com.smartgwt.client.widgets.tab.TabSet; import org.rhq.core.domain.alert.Alert; +import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.criteria.AlertCriteria; +import org.rhq.core.domain.criteria.AlertDefinitionCriteria; +import org.rhq.core.domain.criteria.ResourceGroupCriteria; +import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.CoreGUI; @@ -83,7 +87,14 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie @Override public void onSuccess(PageList<Alert> result) { Alert alert = result.get(0); - show(alert); + Integer parentId = alert.getAlertDefinition().getParentId(); + AlertDefinition groupAlertDefinition = alert.getAlertDefinition().getGroupAlertDefinition(); + if (groupAlertDefinition != null || (parentId != null && parentId.intValue() != 0)) { + fetchDefinitionWithGroupAndTemplate(alert); + } else { + show(alert); + } + } @Override @@ -92,6 +103,24 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie } }); } + + private void fetchDefinitionWithGroupAndTemplate(final Alert alert) { + AlertDefinitionCriteria criteria = new AlertDefinitionCriteria(); + criteria.addFilterAlertId(alert.getId()); + criteria.fetchGroupAlertDefinition(true); + criteria.fetchResourceType(true); + GWTServiceLookup.getAlertDefinitionService().findAlertDefinitionsByCriteria(criteria, new AsyncCallback<PageList<AlertDefinition>>() { + public void onSuccess(PageList<AlertDefinition> result) { + alert.getAlertDefinition().setGroupAlertDefinition(result.get(0).getGroupAlertDefinition()); + alert.getAlertDefinition().setResourceType(result.get(0).getResourceType()); + show(alert); + } + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_alert_details_loadFailed(), caught); + } + }); + } private void show(Alert alert) { destroyMembers(); @@ -102,7 +131,7 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie addMember(getDetailsTabSet(record)); } - private TabSet getDetailsTabSet(Record record) { + private TabSet getDetailsTabSet(ListGridRecord record) { TabSet tabset = new NamedTabSet(); Tab generalTab = new NamedTab(new ViewName("general", MSG.view_alert_common_tab_general())); @@ -121,7 +150,7 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie return tabset; } - private DynamicForm getDetailsTableForAlert(Record record) { + private DynamicForm getDetailsTableForAlert(ListGridRecord record) { DynamicForm form = new DynamicForm(); form.setNumCols(4); form.setHeight("15%"); @@ -189,6 +218,13 @@ public class AlertDetailsView extends EnhancedVLayout implements BookmarkableVie MSG.view_alert_details_field_resource_ancestry()); resourceAncestryItem.setValue(record.getAttribute("resourceAncestry")); items.add(resourceAncestryItem); + + String parentUrl = record.getAttribute("parent"); + if (parentUrl != null) { + StaticTextItem parentItem = new StaticTextItem("parent", "Parent Definition"); + parentItem.setValue(LinkManager.getHref(parentUrl, record.getLinkText())); + items.add(parentItem); + } form.setItems(items.toArray(new FormItem[items.size()])); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 84e9c6e..ed6b130 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1080,6 +1080,7 @@ view_alert_definitions_update_failure = Alert definition update failed view_alert_definitions_update_success = Alert definition successfully updated view_alert_details_field_ack_at = Acknowledged at view_alert_details_field_ack_by = Acknowledged by +view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = Recovery Info view_alert_details_field_resource_ancestry = Resource Ancestry view_alert_details_field_watched_resource = Watched Resource diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index d6a102b..1950003 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -1094,6 +1094,7 @@ view_alert_definitions_update_failure = Nepodařilo se změnit definici výstrah view_alert_definitions_update_success = Úspěšně změněna definice výstrahy view_alert_details_field_ack_at = Potvrzeno v view_alert_details_field_ack_by = Potvrzeno kým +view_alert_details_field_parent_definition = Definice rodiče view_alert_details_field_recovery_info = Informace o obnově view_alert_details_field_resource_ancestry = Původ zdroje view_alert_details_field_watched_resource = Sledovaný zdroj diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 9237f76..1c0005b 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -1069,6 +1069,7 @@ view_alert_definitions_update_failure = アラート定義の更新に失敗し view_alert_definitions_update_success = アラート定義の更新に成功しました view_alert_details_field_ack_at = 次の場所で確認済みです view_alert_details_field_ack_by = 次の人によって確認済みです +##view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = リカバリ情報 ##view_alert_details_field_resource_ancestry = Resource Ancestry ##view_alert_details_field_watched_resource = Watched Resource diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index bd34f9b..5118a2d 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -935,6 +935,7 @@ view_alert_definitions_table_title_group = 그룹 경고 정의 view_alert_definitions_table_title_resource = 리소스 경고 정의 view_alert_details_field_ack_at = 다음 위치에서 확인했습니다 view_alert_details_field_ack_by = 다음 사람에 의해 확인되었습니다 +##view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = 복구 정보 view_alert_details_field_resource_ancestry = 리소스 조상 view_alert_details_field_watched_resource = 관심 리소스 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 1330eb7..bfd95e8 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -1078,6 +1078,7 @@ view_alert_definitions_update_success = Defini\u00E7\u00E3o do alerta atualizada view_alert_details_breadcrumb = Detalhes view_alert_details_field_ack_at = Verificado em view_alert_details_field_ack_by = Verificado por +##view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = Informa\u00E7\u00E3o de Recupera\u00E7\u00E3o ##view_alert_details_field_resource_ancestry = Resource Ancestry ##view_alert_details_field_watched_resource = Watched Resource diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 72a287b..e03e1a9 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -1042,6 +1042,7 @@ #view_alert_definitions_update_success = Alert definition successfully updated #view_alert_details_field_ack_at = Acknowledged at #view_alert_details_field_ack_by = Acknowledged by +##view_alert_details_field_parent_definition = Parent definition #view_alert_details_field_recovery_info = Recovery Info #view_alert_details_loadFailed = Failed to fetch alert details #view_alerts_ack_confirm = Acknowledge the selected alert(s)? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 10f9b0a..82ddc2a 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -1063,6 +1063,7 @@ view_alert_definitions_update_failure = \u544a\u8b66\u5b9a\u4e49\u66f4\u65b0\u59 view_alert_definitions_update_success = \u544a\u8b66\u5b9a\u4e49\u66f4\u65b0\u6210\u529f view_alert_details_field_ack_at = \u786e\u8ba4\u4e8e view_alert_details_field_ack_by = \u786e\u8ba4\u8005 +##view_alert_details_field_parent_definition = Parent definition view_alert_details_field_recovery_info = \u8fd8\u539f\u4fe1\u606f ##view_alert_details_field_resource_ancestry = Resource Ancestry ##view_alert_details_field_watched_resource = Watched Resource commit 67c442b7baa5db4cdd3715fd89db9ea01b9e2fa8 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Fri Jul 19 12:41:13 2013 +0200 Removing deprecated annotation, adding orphanRemoval=true attribute instead. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java index 4742c17..44a8eac 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java @@ -253,9 +253,8 @@ public class Alert implements Serializable { @ManyToOne private AlertDefinition alertDefinition; - @OneToMany(mappedBy = "alert", cascade = CascadeType.ALL) + @OneToMany(mappedBy = "alert", cascade = CascadeType.ALL, orphanRemoval=true) @OrderBy - @org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN) // primary key private Set<AlertConditionLog> conditionLogs = new LinkedHashSet<AlertConditionLog>(); diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java index 0f2d0b1..be98df5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampening.java @@ -86,8 +86,7 @@ public class AlertDampening implements java.io.Serializable { // This is required for cascade behavior. We want to be able to cascade delete the AlertDampeningEvents when an // AlertDefinition is removed from the db, due to deleting a Resource from inventory. - @OneToMany(mappedBy = "alertDefinition", cascade = { CascadeType.REFRESH, CascadeType.REMOVE }) - @org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN) + @OneToMany(mappedBy = "alertDefinition", cascade = { CascadeType.REFRESH, CascadeType.REMOVE }, orphanRemoval = true) private Set<AlertDampeningEvent> alertDampeningEvents = new HashSet<AlertDampeningEvent>(); protected AlertDampening() { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java index 02362ce..3445d9e 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java @@ -293,7 +293,6 @@ public class AlertDefinition implements Serializable { // do not cascade remove - group removal will be detaching children alert defs from the group def, // and then letting the children be deleted slowly by existing alert def removal mechanisms - @SuppressWarnings("unused") @OneToMany(mappedBy = "groupAlertDefinition", fetch = FetchType.LAZY, cascade = { CascadeType.PERSIST }) @OrderBy private Set<AlertDefinition> groupAlertDefinitionChildren = new LinkedHashSet<AlertDefinition>(); @@ -361,11 +360,10 @@ public class AlertDefinition implements Serializable { // referencing AlertConditionLog records. private Set<AlertCondition> conditions = new LinkedHashSet<AlertCondition>(1); // Most alerts will only have one condition. - @OneToMany(mappedBy = "alertDefinition", cascade = CascadeType.ALL) + @OneToMany(mappedBy = "alertDefinition", cascade = CascadeType.ALL, orphanRemoval = true) // Although similar to AlertCondition, we do use DELETE_ORPHAN here. The reason is because AlertNotificationLog // does not refer back to the AlertNotification record and therefore the notification logs are not affected // by the loss of the AlertNotification that spawned the notification. - @org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN) private List<AlertNotification> alertNotifications = new ArrayList<AlertNotification>(); /** commit 92a286d611085d96ba1710c442035445dda5318a Author: Jirka Kremser <jkremser(a)redhat.com> Date: Thu Jul 18 18:37:48 2013 +0200 [BZ 980091] - link in the alert to the parent on which the alert was created - Adding a new filter on AlertDefinitionCriteria (filter by alert id). diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java index 854efaf..9d4e51d 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java @@ -48,6 +48,7 @@ public class AlertDefinitionCriteria extends Criteria { private String filterName; private String filterDescription; private AlertPriority filterPriority; + private Integer filterAlertId; // requires overrides private NonBindingOverrideFilter filterAlertTemplateOnly; // requires overrides - finds only alert templates private Integer filterAlertTemplateParentId; // requires overrides private Integer filterAlertTemplateResourceTypeId; // requires overrides @@ -75,6 +76,10 @@ public class AlertDefinitionCriteria extends Criteria { private PageOrdering sortResourceName; // requires sort override public AlertDefinitionCriteria() { + filterOverrides.put("alertId", "" + + "id IN ( SELECT alert.alertDefinition.id " // + + " FROM Alert alert " // + + " WHERE alert.id = ? )"); filterOverrides.put("alertTemplateOnly", "resourceType IS NOT NULL"); filterOverrides.put("alertTemplateParentId", "parentId = ?"); filterOverrides.put("alertTemplateResourceTypeId", "resourceType.id = ?"); @@ -113,6 +118,10 @@ public class AlertDefinitionCriteria extends Criteria { public void addFilterAlertTemplateParentId(Integer filterAlertTemplateParentId) { this.filterAlertTemplateParentId = filterAlertTemplateParentId; } + + public void addFilterAlertId(Integer filterAlertId) { + this.filterAlertId = filterAlertId; + } public void addFilterAlertTemplateResourceTypeId(Integer filterAlertTemplateResourceTypeId) { this.filterAlertTemplateResourceTypeId = filterAlertTemplateResourceTypeId;

1 0

[rhq] modules/enterprise
by Heiko W. Rupp 19 Jul '13

19 Jul '13

modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java | 86 +++++++++- modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java | 55 ------ modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java | 10 - modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java | 10 - 4 files changed, 94 insertions(+), 67 deletions(-) New commits: commit b3aa6d8a54378fad077d2052e9f9620768723a4d Author: Michael Burman <yak(a)iki.fi> Date: Fri Jul 19 12:27:38 2013 +0200 BZ980076 Check if storage is really running after a crash diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java index 8988d98..5528619 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java @@ -1,7 +1,7 @@ /* * * * RHQ Management Platform - * * Copyright (C) 2005-2012 Red Hat, Inc. + * * Copyright (C) 2005-2013 Red Hat, Inc. * * All rights reserved. * * * * This program is free software; you can redistribute it and/or modify @@ -41,6 +41,10 @@ import org.apache.commons.cli.ParseException; import org.apache.commons.cli.PosixParser; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.exec.DefaultExecutor; +import org.apache.commons.exec.ExecuteException; +import org.apache.commons.exec.Executor; +import org.apache.commons.exec.PumpStreamHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -171,10 +175,15 @@ public abstract class ControlCommand { return getStorageBasedir().exists(); } - protected String getStoragePid() throws IOException { + protected File getStoragePidFile() { File storageBasedir = getStorageBasedir(); File storageBinDir = new File(storageBasedir, "bin"); File pidFile = new File(storageBinDir, "cassandra.pid"); + return pidFile; + } + + protected String getStoragePid() throws IOException { + File pidFile = getStoragePidFile(); if (pidFile.exists()) { return StreamUtil.slurp(new FileReader(pidFile)); @@ -282,4 +291,77 @@ public abstract class ControlCommand { return inUse; } + + protected void waitForProcessToStop(String pid) throws Exception { + + if (isWindows() || pid==null) { + // For the moment we have no better way to just wait some time + Thread.sleep(10*1000L); + } else { + int tries = 5; + while (tries > 0) { + log.debug("."); + if (!isUnixPidRunning(pid)) { + break; + } + Thread.sleep(2*1000L); + tries--; + } + if (tries==0) { + throw new RHQControlException("Process [" + pid + "] did not finish yet. Terminate it manually and retry."); + } + } + + } + + protected void killPid(String pid) throws IOException { + Executor executor = new DefaultExecutor(); + executor.setWorkingDirectory(getBinDir()); + executor.setStreamHandler(new PumpStreamHandler()); + org.apache.commons.exec.CommandLine commandLine; + + commandLine = new org.apache.commons.exec.CommandLine("kill").addArgument(pid); + executor.execute(commandLine); + } + + protected boolean isUnixPidRunning(String pid) { + + Executor executor = new DefaultExecutor(); + executor.setWorkingDirectory(getBinDir()); + executor.setStreamHandler(new PumpStreamHandler()); + org.apache.commons.exec.CommandLine commandLine = new org.apache.commons.exec.CommandLine("/bin/kill") + .addArgument("-0") + .addArgument(pid); + + try { + int code = executor.execute(commandLine); + if (code!=0) { + return false; + } + } catch (ExecuteException ee ) { + if (ee.getExitValue()==1) { + // return code 1 means process does not exist + return false; + } + } catch (IOException e) { + log.error("Checking for running process failed: " + e.getMessage()); + } + return true; + } + + protected boolean isStorageRunning() throws IOException { + String pid = getStoragePid(); + if(pid == null) { + return false; + } else if(pid != null && !isUnixPidRunning(pid)) { + // There is a phantom pidfile + File pidFile = getStoragePidFile(); + if(!pidFile.delete()) { + throw new RHQControlException("Could not delete storage pidfile " + pidFile.getAbsolutePath()); + } + return false; + } else { + return true; + } + } } diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java index fe7cdd4..8c885b0 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java @@ -1,7 +1,7 @@ /* * * * RHQ Management Platform - * * Copyright (C) 2005-2012 Red Hat, Inc. + * * Copyright (C) 2005-2013 Red Hat, Inc. * * All rights reserved. * * * * This program is free software; you can redistribute it and/or modify @@ -36,16 +36,12 @@ import java.util.Properties; import org.apache.commons.cli.CommandLine; import org.apache.commons.exec.DefaultExecuteResultHandler; import org.apache.commons.exec.DefaultExecutor; -import org.apache.commons.exec.ExecuteException; import org.apache.commons.exec.Executor; import org.apache.commons.exec.PumpStreamHandler; - import org.jboss.as.controller.client.ModelControllerClient; - import org.rhq.common.jbossas.client.controller.DeploymentJBossASClient; import org.rhq.common.jbossas.client.controller.MCCHelper; import org.rhq.server.control.ControlCommand; -import org.rhq.server.control.RHQControlException; /** * Common code for commands that perform installs. Basically shared code for Install and Upgrade commands. @@ -104,55 +100,6 @@ public abstract class AbstractInstall extends ControlCommand { } } - protected void waitForProcessToStop(String pid) throws Exception { - - if (isWindows() || pid==null) { - // For the moment we have no better way to just wait some time - Thread.sleep(10*1000L); - } else { - int tries = 5; - while (tries > 0) { - log.debug("."); - if (!isUnixPidRunning(pid)) { - break; - } - Thread.sleep(2*1000L); - tries--; - } - if (tries==0) { - throw new RHQControlException("Process [" + pid + "] did not finish yet. Terminate it manually and retry."); - } - } - - } - - protected boolean isUnixPidRunning(String pid) { - - Executor executor = new DefaultExecutor(); - executor.setWorkingDirectory(getBinDir()); - executor.setStreamHandler(new PumpStreamHandler()); - org.apache.commons.exec.CommandLine commandLine; - - commandLine = new org.apache.commons.exec.CommandLine("/bin/kill") - .addArgument("-0") - .addArgument(pid); - - try { - int code = executor.execute(commandLine); - if (code!=0) { - return false; - } - } catch (ExecuteException ee ) { - if (ee.getExitValue()==1) { - // return code 1 means process does not exist - return false; - } - } catch (IOException e) { - log.error("Checking for running process failed: " + e.getMessage()); - } - return true; - } - protected void waitForRHQServerToInitialize() throws Exception { try { final long messageInterval = 30000L; diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java index 7e83c9e..f15b13e 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Start.java @@ -1,7 +1,7 @@ /* * * * RHQ Management Platform - * * Copyright (C) 2005-2012 Red Hat, Inc. + * * Copyright (C) 2005-2013 Red Hat, Inc. * * All rights reserved. * * * * This program is free software; you can redistribute it and/or modify @@ -26,7 +26,6 @@ package org.rhq.server.control.command; import java.io.File; -import java.io.FileReader; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Options; @@ -137,14 +136,13 @@ public class Start extends ControlCommand { log.debug("Failed to start storage service", e); } } else { - File storageBinDir = new File(getStorageBasedir(), "bin"); - File pidFile = new File(storageBinDir, "cassandra.pid"); + File pidFile = getStoragePidFile(); // For now we are duplicating logic in the status command. This code will be // replaced when we implement a rhq-storage.sh script. - if (pidFile.exists()) { - String pid = StreamUtil.slurp(new FileReader(pidFile)); + if (isStorageRunning()) { + String pid = getStoragePid(); System.out.println("RHQ storage node (pid " + pid + ") is running"); } else { commandLine = getCommandLine(false, "cassandra", "-p", pidFile.getAbsolutePath()); diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java index 53d0374..908aa8e 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Stop.java @@ -1,7 +1,7 @@ /* * * * RHQ Management Platform - * * Copyright (C) 2005-2012 Red Hat, Inc. + * * Copyright (C) 2005-2013 Red Hat, Inc. * * All rights reserved. * * * * This program is free software; you can redistribute it and/or modify @@ -126,13 +126,13 @@ public class Stop extends AbstractInstall { log.debug("Failed to stop storage service", e); } } else { - String pid = getStoragePid(); - if (pid != null) { + if(isStorageRunning()) { + String pid = getStoragePid(); + System.out.println("Stopping RHQ storage node..."); System.out.println("RHQ storage node (pid=" + pid + ") is stopping..."); - commandLine = new org.apache.commons.exec.CommandLine("kill").addArgument(pid); - executor.execute(commandLine); + killPid(pid); waitForProcessToStop(pid);

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - 2 commits - modules/enterprise
by mike thompson 19 Jul '13

19 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java | 311 ------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/LineMetricGraph.java | 158 --- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java | 401 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java | 238 ----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java | 29 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java | 6 modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js | 4 11 files changed, 36 insertions(+), 1134 deletions(-) New commits: commit 6c46aa725f0a5c81df92250b4b587aa855997fa0 Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Jul 18 20:27:10 2013 -0700 Consolidated Metrics - Dont show graph legend on treegrid charts but show them elsewhere. Removal of old code. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java index e75b65a..ace6154 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java @@ -202,6 +202,10 @@ public abstract class AbstractMetricGraph extends VLayout implements HasD3Metric return metricGraphData.getPortalId(); } + public boolean isHideLegend(){ + return metricGraphData.isHideLegend(); + } + public void setGraphListView(AbstractD3GraphListView graphListView) { this.graphListView = graphListView; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java index ecd3b46..dc054fc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java @@ -73,6 +73,7 @@ public class MetricGraphData implements JsonMetricProducer { private MeasurementOOBComposite lastOOB; private Integer chartHeight; private boolean isPortalGraph; + private boolean hideLegend; private MetricGraphData(int portalId) { @@ -249,6 +250,14 @@ public class MetricGraphData implements JsonMetricProducer { return isPortalGraph; } + public boolean isHideLegend() { + return hideLegend; + } + + public void setHideLegend(boolean hideLegend) { + this.hideLegend = hideLegend; + } + public String getChartTitle() { if(definition != null){ diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java index 9058ea5..eeb97cf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java @@ -73,7 +73,8 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getButtonBarDateTimeFormat()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getChartSingleValueLabel()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getXAxisTimeFormatHours()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getXAxisTimeFormatHoursMinutes()() + global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::getXAxisTimeFormatHoursMinutes()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::isHideLegend()() ); @@ -217,8 +218,8 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { .attr("transform", "translate(" + margin.left + "," + (+titleHeight + titleSpace + margin.top) + ")"); legendUnDefined = (typeof min === 'undefined') || (typeof avg === 'undefined') || (typeof peak === 'undefined'); - if (!useSmallCharts() && !legendUnDefined) { - createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits); + if (!(chartContext.hideLegend && !useSmallCharts())) { + createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java deleted file mode 100644 index 3d1c881..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java +++ /dev/null @@ -1,401 +0,0 @@ -/* - * RHQ Management Platform - * Copyright 2012, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail; - -import java.util.ArrayList; -import java.util.Date; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.data.DSRequest; -import com.smartgwt.client.data.DSResponse; -import com.smartgwt.client.data.Record; -import com.smartgwt.client.data.SortSpecifier; -import com.smartgwt.client.rpc.RPCResponse; -import com.smartgwt.client.types.Alignment; -import com.smartgwt.client.types.ListGridFieldType; -import com.smartgwt.client.types.SortDirection; -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.fields.FormItem; -import com.smartgwt.client.widgets.form.fields.StaticTextItem; -import com.smartgwt.client.widgets.grid.ListGridField; -import com.smartgwt.client.widgets.grid.ListGridRecord; -import com.smartgwt.client.widgets.layout.Layout; - -import org.rhq.core.domain.criteria.AvailabilityCriteria; -import org.rhq.core.domain.measurement.Availability; -import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.core.domain.resource.composite.ResourceAvailabilitySummary; -import org.rhq.core.domain.resource.composite.ResourceComposite; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; -import org.rhq.core.domain.util.PageOrdering; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.ImageManager; -import org.rhq.enterprise.gui.coregui.client.components.table.Table; -import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; -import org.rhq.enterprise.gui.coregui.client.gwt.AvailabilityGWTServiceAsync; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; -import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; - -/** - * This shows the availability history for a resource. - * - * @author Jay Shaughnessy - * @author John Mazzitelli - * @see org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table.ResourceMetricAvailabilityView - */ -@Deprecated -public class ResourceAvailabilityView extends EnhancedVLayout { - - private ResourceComposite resourceComposite; - private StaticTextItem currentField; - private StaticTextItem availField; - private StaticTextItem availTimeField; - private StaticTextItem downField; - private StaticTextItem downTimeField; - private StaticTextItem disabledField; - private StaticTextItem disabledTimeField; - private StaticTextItem failureCountField; - private StaticTextItem disabledCountField; - private StaticTextItem mtbfField; - private StaticTextItem mttrField; - private StaticTextItem unknownField; - private StaticTextItem currentTimeField; - - public ResourceAvailabilityView(ResourceComposite resourceComposite) { - super(); - - this.resourceComposite = resourceComposite; - - setWidth100(); - setHeight100(); - } - - @Override - protected void onInit() { - super.onInit(); - - addMember(createSummaryForm()); - addMember(createListView()); - } - - private DynamicForm createSummaryForm() { - DynamicForm form = new DynamicForm(); - form.setWidth100(); - form.setAutoHeight(); - form.setMargin(10); - form.setNumCols(4); - - // row 1 - currentField = new StaticTextItem("current", MSG.view_resource_monitor_availability_currentStatus()); - currentField.setWrapTitle(false); - currentField.setColSpan(4); - - // row 2 - availField = new StaticTextItem("avail", MSG.view_resource_monitor_availability_availability()); - availField.setWrapTitle(false); - prepareTooltip(availField, MSG.view_resource_monitor_availability_availability_tooltip()); - - availTimeField = new StaticTextItem("availTime", MSG.view_resource_monitor_availability_uptime()); - availTimeField.setWrapTitle(false); - prepareTooltip(availTimeField, MSG.view_resource_monitor_availability_uptime_tooltip()); - - // row 3 - downField = new StaticTextItem("down", MSG.view_resource_monitor_availability_down()); - downField.setWrapTitle(false); - prepareTooltip(downField, MSG.view_resource_monitor_availability_down_tooltip()); - - downTimeField = new StaticTextItem("downTime", MSG.view_resource_monitor_availability_downtime()); - downTimeField.setWrapTitle(false); - prepareTooltip(downTimeField, MSG.view_resource_monitor_availability_downtime_tooltip()); - - // row 4 - disabledField = new StaticTextItem("disabled", MSG.view_resource_monitor_availability_disabled()); - disabledField.setWrapTitle(false); - prepareTooltip(disabledField, MSG.view_resource_monitor_availability_disabled_tooltip()); - - disabledTimeField = new StaticTextItem("disabledTime", MSG.view_resource_monitor_availability_disabledTime()); - disabledTimeField.setWrapTitle(false); - prepareTooltip(disabledTimeField, MSG.view_resource_monitor_availability_disabledTime_tooltip()); - - // row 5 - failureCountField = new StaticTextItem("failureCount", MSG.view_resource_monitor_availability_numFailures()); - failureCountField.setWrapTitle(false); - prepareTooltip(failureCountField, MSG.view_resource_monitor_availability_numFailures_tooltip()); - - disabledCountField = new StaticTextItem("disabledCount", MSG.view_resource_monitor_availability_numDisabled()); - disabledCountField.setWrapTitle(false); - prepareTooltip(disabledCountField, MSG.view_resource_monitor_availability_numDisabled_tooltip()); - - // row 6 - mtbfField = new StaticTextItem("mtbf", MSG.view_resource_monitor_availability_mtbf()); - mtbfField.setWrapTitle(false); - prepareTooltip(mtbfField, MSG.view_resource_monitor_availability_mtbf_tooltip()); - - mttrField = new StaticTextItem("mttr", MSG.view_resource_monitor_availability_mttr()); - mttrField.setWrapTitle(false); - prepareTooltip(mttrField, MSG.view_resource_monitor_availability_mttr_tooltip()); - - // row 7 - unknownField = new StaticTextItem("unknown"); - unknownField.setWrapTitle(false); - unknownField.setColSpan(4); - unknownField.setShowTitle(false); - - // row 8 - currentTimeField = new StaticTextItem("currentTime"); - currentTimeField.setWrapTitle(false); - currentTimeField.setColSpan(4); - currentTimeField.setShowTitle(false); - - form.setItems(currentField, availField, availTimeField, downField, downTimeField, disabledField, - disabledTimeField, failureCountField, disabledCountField, mtbfField, mttrField, unknownField, - currentTimeField); - - reloadSummaryData(); - - return form; - } - - private void reloadSummaryData() { - GWTServiceLookup.getResourceService().getResourceAvailabilitySummary(resourceComposite.getResource().getId(), - new AsyncCallback<ResourceAvailabilitySummary>() { - - @Override - public void onSuccess(ResourceAvailabilitySummary result) { - - currentField.setValue(MSG.view_resource_monitor_availability_currentStatus_value(result - .getCurrent().getName(), TimestampCellFormatter.format(result.getLastChange().getTime()))); - availField.setValue(MeasurementConverterClient.format(result.getUpPercentage(), - MeasurementUnits.PERCENTAGE, true)); - availTimeField.setValue(MeasurementConverterClient.format((double) result.getUpTime(), - MeasurementUnits.MILLISECONDS, true)); - downField.setValue(MeasurementConverterClient.format(result.getDownPercentage(), - MeasurementUnits.PERCENTAGE, true)); - downTimeField.setValue(MeasurementConverterClient.format((double) result.getDownTime(), - MeasurementUnits.MILLISECONDS, true)); - disabledField.setValue(MeasurementConverterClient.format(result.getDisabledPercentage(), - MeasurementUnits.PERCENTAGE, true)); - disabledTimeField.setValue(MeasurementConverterClient.format((double) result.getDisabledTime(), - MeasurementUnits.MILLISECONDS, true)); - failureCountField.setValue(result.getFailures()); - disabledCountField.setValue(result.getDisabled()); - mtbfField.setValue(MeasurementConverterClient.format((double) result.getMTBF(), - MeasurementUnits.MILLISECONDS, true)); - mttrField.setValue(MeasurementConverterClient.format((double) result.getMTTR(), - MeasurementUnits.MILLISECONDS, true)); - - if (result.getUnknownTime() > 0L) { - unknownField.setValue(MSG.view_resource_monitor_availability_unknown(MeasurementConverterClient - .format((double) result.getUnknownTime(), MeasurementUnits.MILLISECONDS, true))); - } else { - unknownField.setValue(""); - } - - currentTimeField.setValue(MSG.view_resource_monitor_availability_currentAsOf(TimestampCellFormatter - .format(result.getCurrentTime()))); - } - - @Override - public void onFailure(Throwable caught) { - currentField.setValue(MSG.common_label_error()); - CoreGUI.getErrorHandler() - .handleError(MSG.view_resource_monitor_availability_summaryError(), caught); - } - }); - } - - private void prepareTooltip(FormItem item, String tooltip) { - item.setHoverWidth(400); - item.setPrompt(tooltip); - } - - private Table<ListView.DS> createListView() { - ListView listView = new ListView(resourceComposite.getResource().getId()); - return listView; - } - - private class ListView extends Table<ListView.DS> { - - private DS dataSource; - private int resourceId; - - public ListView(int resourceId) { - super(null, new SortSpecifier[] { new SortSpecifier("startTime", SortDirection.DESCENDING) }); - - this.resourceId = resourceId; - - setDataSource(getDataSource()); - } - - @Override - public DS getDataSource() { - if (null == this.dataSource) { - this.dataSource = new DS(resourceId); - } - return this.dataSource; - } - - @Override - public void refresh() { - super.refresh(); - reloadSummaryData(); - } - - @Override - protected void configureTableContents(Layout contents) { - super.configureTableContents(contents); - setAutoHeight(); - } - - @Override - protected void configureTable() { - ArrayList<ListGridField> dataSourceFields = getDataSource().getListGridFields(); - getListGrid().setFields(dataSourceFields.toArray(new ListGridField[dataSourceFields.size()])); - - super.configureTable(); - } - - private class DS extends RPCDataSource<Availability, AvailabilityCriteria> { - - public static final String ATTR_ID = "id"; - public static final String ATTR_AVAILABILITY = "availabilityType"; - public static final String ATTR_START_TIME = "startTime"; - public static final String ATTR_END_TIME = "endTime"; - - public static final String ATTR_DURATION = "duration"; - - private AvailabilityGWTServiceAsync availService = GWTServiceLookup.getAvailabilityService(); - private int resourceId; - - public DS(int resourceId) { - super(); - this.resourceId = resourceId; - addDataSourceFields(); - } - - /** - * The view that contains the list grid which will display this datasource's data will call this - * method to get the field information which is used to control the display of the data. - * - * @return list grid fields used to display the datasource data - */ - public ArrayList<ListGridField> getListGridFields() { - ArrayList<ListGridField> fields = new ArrayList<ListGridField>(6); - - ListGridField startTimeField = new ListGridField(ATTR_START_TIME, MSG.common_title_start()); - startTimeField.setCellFormatter(new TimestampCellFormatter()); - startTimeField.setShowHover(true); - startTimeField.setHoverCustomizer(TimestampCellFormatter.getHoverCustomizer(ATTR_START_TIME)); - startTimeField.setCanSortClientOnly(true); - fields.add(startTimeField); - - ListGridField endTimeField = new ListGridField(ATTR_END_TIME, MSG.common_title_end()); - endTimeField.setCellFormatter(new TimestampCellFormatter()); - endTimeField.setShowHover(true); - endTimeField.setHoverCustomizer(TimestampCellFormatter.getHoverCustomizer(ATTR_END_TIME)); - endTimeField.setCanSortClientOnly(true); - fields.add(endTimeField); - - ListGridField durationField = new ListGridField(ATTR_DURATION, MSG.common_title_duration()); - durationField.setAlign(Alignment.RIGHT); - fields.add(durationField); - - ListGridField availabilityField = new ListGridField(ATTR_AVAILABILITY, MSG.common_title_availability()); - availabilityField.setType(ListGridFieldType.IMAGE); - availabilityField.setAlign(Alignment.CENTER); - fields.add(availabilityField); - - return fields; - } - - @Override - protected AvailabilityCriteria getFetchCriteria(DSRequest request) { - AvailabilityCriteria c = new AvailabilityCriteria(); - c.addFilterResourceId(resourceId); - c.addFilterInitialAvailability(false); - - // This code is unlikely to be necessary as the encompassing view should be using an initial - // sort specifier. But just in case, make sure we set the initial sort. Note that we have to - // manipulate the PageControl directly as per the restrictions on getFetchCriteria() (see jdoc). - PageControl pageControl = getPageControl(request); - if (pageControl.getOrderingFields().isEmpty()) { - pageControl.initDefaultOrderingField("startTime", PageOrdering.DESC); - } - - return c; - } - - @Override - protected void executeFetch(final DSRequest request, final DSResponse response, - AvailabilityCriteria criteria) { - - this.availService.findAvailabilityByCriteria(criteria, new AsyncCallback<PageList<Availability>>() { - public void onFailure(Throwable caught) { - // TODO fix message - CoreGUI.getErrorHandler().handleError(MSG.common_label_error(), caught); - response.setStatus(RPCResponse.STATUS_FAILURE); - processResponse(request.getRequestId(), response); - } - - public void onSuccess(final PageList<Availability> result) { - response.setData(buildRecords(result)); - response.setTotalRows(result.size()); - processResponse(request.getRequestId(), response); - } - }); - } - - @Override - public Availability copyValues(Record from) { - return null; - } - - @Override - public ListGridRecord copyValues(Availability from) { - ListGridRecord record = new ListGridRecord(); - - record.setAttribute(ATTR_ID, from.getId()); - record.setAttribute(ATTR_AVAILABILITY, - ImageManager.getAvailabilityIconFromAvailType(from.getAvailabilityType())); - record.setAttribute(ATTR_START_TIME, new Date(from.getStartTime())); - if (null != from.getEndTime()) { - record.setAttribute(ATTR_END_TIME, new Date(from.getEndTime())); - long duration = from.getEndTime() - from.getStartTime(); - record.setAttribute(ATTR_DURATION, - MeasurementConverterClient.format((double) duration, MeasurementUnits.MILLISECONDS, true)); - - } else { - record.setAttribute(ATTR_END_TIME, MSG.common_label_none2()); - long duration = System.currentTimeMillis() - from.getStartTime(); - record.setAttribute(ATTR_DURATION, - MeasurementConverterClient.format((double) duration, MeasurementUnits.MILLISECONDS, true)); - - } - - return record; - } - } - } - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java deleted file mode 100644 index dd70b93..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java +++ /dev/null @@ -1,238 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Set; -import java.util.TreeSet; - -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.types.SelectionStyle; -import com.smartgwt.client.widgets.Window; -import com.smartgwt.client.widgets.events.CloseClickEvent; -import com.smartgwt.client.widgets.events.CloseClickHandler; -import com.smartgwt.client.widgets.grid.ListGrid; -import com.smartgwt.client.widgets.grid.ListGridField; -import com.smartgwt.client.widgets.grid.ListGridRecord; - -import org.rhq.core.domain.criteria.ResourceCriteria; -import org.rhq.core.domain.measurement.MeasurementData; -import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.core.domain.resource.composite.ResourceComposite; -import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasurementRangeEditor; -import org.rhq.enterprise.gui.coregui.client.components.table.Table; -import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView; -import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView.ChartViewWindow; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; - -/** - * Views a resource's measurements in a tabular view. - * - * @author John Mazzitelli - */ -@Deprecated -public class MeasurementTableView extends Table<MetricsTableDataSource> { - - private final int resourceId; - - public MeasurementTableView(int resourceId) { - super(); - this.resourceId = resourceId; - setDataSource(new MetricsTableDataSource(resourceId)); - } - - protected void configureTable() { - ArrayList<ListGridField> fields = getDataSource().getListGridFields(); - setListGridFields(fields.toArray(new ListGridField[0])); - addExtraWidget(new UserPreferencesMeasurementRangeEditor(), true); - addTableAction(MSG.view_measureTable_getLive(), new TableAction() { - @Override - public boolean isEnabled(ListGridRecord[] selection) { - return selection != null && selection.length > 0; - } - - @Override - public void executeAction(ListGridRecord[] selection, Object actionValue) { - if (selection == null || selection.length == 0) { - return; - } - // keyed on metric name - string[0] is the metric label, [1] is the units - final HashMap<String, String[]> scheduleNamesAndUnits = new HashMap<String, String[]>(); - int[] definitionIds = new int[selection.length]; - int i = 0; - for (ListGridRecord record : selection) { - Integer defId = record.getAttributeAsInt(MetricsTableDataSource.FIELD_METRIC_DEF_ID); - definitionIds[i++] = defId.intValue(); - - String name = record.getAttribute(MetricsTableDataSource.FIELD_METRIC_NAME); - String label = record.getAttribute(MetricsTableDataSource.FIELD_METRIC_LABEL); - String units = record.getAttribute(MetricsTableDataSource.FIELD_METRIC_UNITS); - if (units == null || units.length() < 1) { - units = MeasurementUnits.NONE.name(); - } - - scheduleNamesAndUnits.put(name, new String[] { label, units }); - } - - // actually go out and ask the agents for the data - GWTServiceLookup.getMeasurementDataService(60000).findLiveData(resourceId, definitionIds, - new AsyncCallback<Set<MeasurementData>>() { - @Override - public void onSuccess(Set<MeasurementData> result) { - if (result == null) { - result = new HashSet<MeasurementData>(0); - } - ArrayList<ListGridRecord> records = new ArrayList<ListGridRecord>(result.size()); - for (MeasurementData data : result) { - String[] nameAndUnits = scheduleNamesAndUnits.get(data.getName()); - if (nameAndUnits != null) { - double doubleValue; - if (data.getValue() instanceof Number) { - doubleValue = ((Number) data.getValue()).doubleValue(); - } else { - doubleValue = Double.parseDouble(data.getValue().toString()); - } - String value = MeasurementConverterClient.formatToSignificantPrecision( - new double[] { doubleValue }, MeasurementUnits.valueOf(nameAndUnits[1]), true)[0]; - - ListGridRecord record = new ListGridRecord(); - record.setAttribute("name", nameAndUnits[0]); - record.setAttribute("value", value); - records.add(record); - } - } - Collections.sort(records, new Comparator<ListGridRecord>() { - public int compare(ListGridRecord o1, ListGridRecord o2) { - return o1.getAttribute("name").compareTo(o2.getAttribute("name")); - } - }); - showLiveData(records); - } - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_measureTable_getLive_failure(), caught); - } - }); - } - }); - - - addTableAction(MSG.view_measureTable_chartMetricValues(), new TableAction() { - @Override - public boolean isEnabled(ListGridRecord[] selection) { - return selection != null && selection.length > 0; - } - - @Override - public void executeAction(ListGridRecord[] selection, Object actionValue) { - if (selection == null || selection.length == 0) { - return; - } - final TreeSet<Integer> definitionIds = new TreeSet<Integer>(); - for (ListGridRecord record : selection) { - Integer defId = record.getAttributeAsInt(MetricsTableDataSource.FIELD_METRIC_DEF_ID); - definitionIds.add(defId); - } - - ResourceCriteria criteria = new ResourceCriteria(); - criteria.addFilterId(resourceId); - criteria.fetchSchedules(true); - GWTServiceLookup.getResourceService().findResourceCompositesByCriteria(criteria, - new AsyncCallback<PageList<ResourceComposite>>() { - - @Override - public void onFailure(Throwable caught) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_inventory_resource_loadFailed(String.valueOf(resourceId)), - Message.Severity.Warning)); - - CoreGUI.goToView(InventoryView.VIEW_ID.getName()); - } - - @Override - public void onSuccess(PageList<ResourceComposite> result) { - if (result.isEmpty()) { - onFailure(new Exception(MSG.view_inventory_resource_loadFailed(String - .valueOf(resourceId)))); - } else { - final ResourceComposite resourceComposite = result.get(0); - - ChartViewWindow window = new ChartViewWindow(""); - final D3GraphListView graphListView = D3GraphListView.createMultipleGraphs( - resourceComposite.getResource(), definitionIds, true); - - window.addItem(graphListView); - window.show(); - refreshTableInfo(); - - } - } - }); - - } - }); - } - - private void showLiveData(ArrayList<ListGridRecord> records) { - final Window liveDataWindow = new Window(); - liveDataWindow.setTitle(MSG.view_measureTable_live_title()); - liveDataWindow.setShowModalMask(true); - liveDataWindow.setShowMinimizeButton(false); - liveDataWindow.setShowMaximizeButton(true); - liveDataWindow.setShowCloseButton(true); - liveDataWindow.setShowResizer(true); - liveDataWindow.setCanDragResize(true); - liveDataWindow.setDismissOnEscape(true); - liveDataWindow.setIsModal(true); - liveDataWindow.setWidth(700); - liveDataWindow.setHeight(425); - liveDataWindow.setAutoCenter(true); - liveDataWindow.centerInPage(); - liveDataWindow.addCloseClickHandler(new CloseClickHandler() { - @Override - public void onCloseClick(CloseClickEvent event) { - liveDataWindow.destroy(); - refreshTableInfo(); - } - }); - - ListGrid liveDataGrid = new ListGrid(); - liveDataGrid.setShowAllRecords(true); - liveDataGrid.setData(records.toArray(new ListGridRecord[records.size()])); - liveDataGrid.setSelectionType(SelectionStyle.NONE); - ListGridField name = new ListGridField("name", MSG.common_title_metric()); - ListGridField value = new ListGridField("value", MSG.common_title_value()); - liveDataGrid.setFields(name, value); - - liveDataWindow.addItem(liveDataGrid); - liveDataWindow.show(); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java index 5784ed4..bcea825 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -27,7 +27,6 @@ import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.Img; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; -import com.smartgwt.client.widgets.layout.VLayout; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.measurement.Availability; @@ -53,14 +52,16 @@ public class MetricsResourceView extends AbstractD3GraphListView { private static final String COLLAPSED_TOOLTIP = MSG.chart_metrics_collapse_tooltip(); private static final String EXPANDED_TOOLTIP = MSG.chart_metrics_expand_tooltip(); - private Resource resource; - private VLayout vLayout; + private final Resource resource; private Img expandCollapseArrow; - private MetricsTableView metricsTableView; - private ResourceMetricAvailabilityView availabilityDetails; + private final MetricsTableView metricsTableView; + private final ResourceMetricAvailabilityView availabilityDetails; public MetricsResourceView(Resource resource) { super(); + setOverflow(Overflow.AUTO); + setWidth100(); + setHeight100(); this.resource = resource; metricsTableView = new MetricsTableView(resource, this); availabilityDetails = new ResourceMetricAvailabilityView(resource); @@ -87,12 +88,8 @@ public class MetricsResourceView extends AbstractD3GraphListView { Log.debug("MetricResourceView.onDraw() for: " + resource.getName() + " id: " + resource.getId()); destroyMembers(); - vLayout = new VLayout(); - vLayout.setOverflow(Overflow.AUTO); - vLayout.setWidth100(); - vLayout.setHeight100(); - vLayout.addMember(buttonBarDateTimeRangeEditor); + addMember(buttonBarDateTimeRangeEditor); availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( new AvailabilityOverUnderGraphType(resource.getId())); @@ -126,19 +123,17 @@ public class MetricsResourceView extends AbstractD3GraphListView { expandCollapseHLayout.addMember(expandCollapseArrow); expandCollapseHLayout.addMember(availabilityGraph); - vLayout.addMember(expandCollapseHLayout); + addMember(expandCollapseHLayout); + availabilityDetails.hide(); - vLayout.addMember(availabilityDetails); + addMember(availabilityDetails); metricsTableView.setHeight100(); - vLayout.addMember(metricsTableView); + addMember(metricsTableView); - addMember(vLayout); - if (resource != null) { - queryAvailability(EntityContext.forResource(resource.getId()), buttonBarDateTimeRangeEditor.getStartTime(), + queryAvailability(EntityContext.forResource(resource.getId()), buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), null); - } } @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 25e430b..77aeda6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -272,8 +272,6 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re addRecordExpandHandler(new RecordExpandHandler() { @Override public void onRecordExpand(RecordExpandEvent recordExpandEvent) { - Log.debug("Record Expanded: " - + recordExpandEvent.getRecord().getAttribute(MetricsViewDataSource.FIELD_METRIC_LABEL)); redrawGraphs(); } @@ -328,6 +326,7 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re MetricGraphData metricGraphData = MetricGraphData.createForResource(resourceId, resource.getName(), measurementDefinition, measurementList, null); + metricGraphData.setHideLegend(true); StackedBarMetricGraphImpl graph = GWT.create(StackedBarMetricGraphImpl.class); graph.setMetricGraphData(metricGraphData); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java index a03ad1a..431e076 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java @@ -45,7 +45,7 @@ import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPre */ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, Criteria> { - public static final int NUMBER_OF_METRIC_POINTS = 60; + private static final int NUMBER_OF_METRIC_POINTS = 60; public static final String FIELD_SPARKLINE = "sparkline"; public static final String FIELD_METRIC_LABEL = "label"; public static final String FIELD_ALERT_COUNT = "alertCount"; @@ -58,11 +58,11 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C public static final String FIELD_METRIC_UNITS = "units"; public static final String FIELD_METRIC_NAME = "name"; public static final String FIELD_RESOURCE_ID = "resourceId"; - final private Resource resource; + private final Resource resource; private List<MetricDisplaySummary> metricDisplaySummaries; private List<List<MeasurementDataNumericHighLowComposite>> metricsDataList; private int[] definitionArrayIds; - private MeasurementUserPreferences measurementUserPrefs; + private final MeasurementUserPreferences measurementUserPrefs; public MetricsViewDataSource(Resource resource) { this.resource = resource; diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js index 40c7ca8..ef65e69 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js +++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js @@ -38,9 +38,10 @@ if (!window.console.log) window.console.log = function () { * @param singleValueLabel * @param chartXaxisTimeFormatHours * @param chartXaxisTimeFormatHoursMinutes + * @param showLegend * @constructor */ -var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel, hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { +var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel, hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes, hideLegend) { "use strict"; if (!(this instanceof ChartContext)) { throw new Error("ChartContext function cannot be called as a function.") @@ -78,6 +79,7 @@ var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, char this.buttonBarDateTimeFormat = buttonBarDateTimeFormat; this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; + this.hideLegend = hideLegend; }, /** commit 87b3c824722d38276a1d1399a14bbf4d208940a1 Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Jul 18 13:14:02 2013 -0700 Remove unused chart types - LineMetricGraph and AvailabilityLineGraphType diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java deleted file mode 100644 index 34ca60b..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype; - -import java.util.Date; -import java.util.List; - -import org.rhq.core.domain.measurement.Availability; -import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; -import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.Messages; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AvailabilityGraphType; -import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; - -/** - * This is now old and for demonstration purposes only. - * Contains the javascript chart definition for an implementation of the d3 availability chart. This implementation is - * just a line that changes color based on availability type: up=green, down=red, orange=disabled, unknown=grey, - * empty=grey, warn=yellow. This version of the availability graph shows continuous intervals. - * @deprecated - * @see AvailabilityOverUnderGraphType - * - * @author Mike Thompson - */ -public class AvailabilityLineGraphType implements AvailabilityGraphType { - - private static Messages MSG = CoreGUI.getMessages(); - private List<Availability> availabilityList; - private List<ResourceGroupAvailability> groupAvailabilityList; - private Integer entityId; - - /** - * General constructor for stacked bar graph when you have all the data needed to produce the graph. (This is true - * for all cases but the dashboard portlet). - */ - public AvailabilityLineGraphType(Integer entityId) { - this.entityId = entityId; - } - - public void setAvailabilityList(List<Availability> availabilityList) { - this.availabilityList = availabilityList; - } - - public void setGroupAvailabilityList(List<ResourceGroupAvailability> groupAvailabilityList) { - this.groupAvailabilityList = groupAvailabilityList; - } - - public String getAvailabilityJson() { - StringBuilder sb = new StringBuilder("["); - if (null != availabilityList) { - // loop through the avail intervals - for (Availability availability : availabilityList) { - sb.append("{ \"availType\":\"" + availability.getAvailabilityType() + "\", "); - sb.append(" \"availTypeMessage\":\"" + availability.getAvailabilityType()+ "\", "); - sb.append(" \"availStart\":" + availability.getStartTime() + ", "); - // last record will be null - long endTime = availability.getEndTime() != null ? availability.getEndTime() : (new Date()).getTime(); - sb.append(" \"availEnd\":" + endTime + ", "); - - long availDuration = endTime - availability.getStartTime(); - String availDurationString = MeasurementConverterClient.format((double) availDuration, - MeasurementUnits.MILLISECONDS, true); - sb.append(" \"availDuration\": \"" + availDurationString + "\" },"); - - } - sb.setLength(sb.length() - 1); - - } else if (null != groupAvailabilityList) { - // loop through the group avail down intervals - for (ResourceGroupAvailability groupAvailability : groupAvailabilityList) { - // allows substitution for situations like WARN=MIXED for easier terminology - String availabilityTypeMessage = (groupAvailability.getGroupAvailabilityType().equals(ResourceGroupComposite.GroupAvailabilityType.WARN)) - ? MSG.chart_hover_availability_type_warn() : groupAvailability.getGroupAvailabilityType().name(); - - sb.append("{ \"availType\":\"" + groupAvailability.getGroupAvailabilityType() + "\", "); - sb.append(" \"availTypeMessage\":\"" + availabilityTypeMessage + "\", "); - sb.append(" \"availStart\":" + groupAvailability.getStartTime() + ", "); - // last record will be null - long endTime = groupAvailability.getEndTime() != null ? groupAvailability.getEndTime() : (new Date()) - .getTime(); - sb.append(" \"availEnd\":" + endTime + ", "); - - long availDuration = endTime - groupAvailability.getStartTime(); - String availDurationString = MeasurementConverterClient.format((double) availDuration, - MeasurementUnits.MILLISECONDS, true); - sb.append(" \"availDuration\": \"" + availDurationString + "\" },"); - - } - sb.setLength(sb.length() - 1); - } - - sb.append("]"); - Log.debug(sb.toString()); - return sb.toString(); - } - - /** - * The magic JSNI to draw the charts with d3. - */ - public native void drawJsniChart() /*-{ - console.log("Draw Availability chart"); - - var global = this, - // tidy up all of our interactions with java (via JSNI) thru AvailChartContext class - // NOTE: rhq.js has the javascript object constructors in it. - availChartContext = new $wnd.AvailChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartId()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getAvailabilityJson()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartDateLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartTimeLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverStartLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverEndLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverBarLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverAvailabilityLabel()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverTimeFormat()(), - global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityLineGraphType::getChartHoverDateFormat()() - ); - - - var availabilityGraph = function () { - "use strict"; - // privates - - var margin = {top: 5, right: 5, bottom: 5, left: 40}, - barOffset = 10, - width = 750 - margin.left - margin.right + barOffset, - height = 20 - margin.top - margin.bottom, - pixelsOffHeight = 0, - svg; - - - function drawBars(availChartContext) { - var xAxisMin = $wnd.d3.min(availChartContext.data, function (d) { - return +d.availStart; - }), - xAxisMax = $wnd.d3.max(availChartContext.data, function (d) { - return +d.availEnd; - }), - - timeScale = $wnd.d3.time.scale() - .range([0, width]) - .domain([xAxisMin, xAxisMax]), - - yScale = $wnd.d3.scale.linear() - .clamp(true) - .rangeRound([height, 0]) - .domain([0, 4]), - - svg = $wnd.d3.select(availChartContext.chartSelection).append("g") - .attr("width", width + margin.left + margin.right) - .attr("height", height + margin.top + margin.bottom) - .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); - - - // The gray bars at the bottom leading up - svg.selectAll("rect.availBars") - .data(availChartContext.data) - .enter().append("rect") - .attr("class", "availBars") - .attr("x", function (d) { - return timeScale(+d.availStart); - }) - .attr("y", function (d) { - return yScale(0); - }) - .attr("height", function (d) { - return height - yScale(4) - pixelsOffHeight; - }) - .attr("width", function (d) { - return timeScale(+d.availEnd) - timeScale(+d.availStart); - }) - - .attr("opacity", ".9") - .attr("fill", function (d) { - if (d.availType === 'DOWN') { - return "#FF1919"; // red - } - else if (d.availType === 'DISABLED') { - return "#FF9933"; // orange - } - else if (d.availType === 'UNKNOWN') { - return "#CCC"; // gray - } - else if (d.availType === 'UP') { - return "#198C19"; // green - } - else if (d.availType === 'WARN') { - return "#FFFF00"; // yellow - } - else if (d.availType === 'EMPTY') { - return "#CCC"; // gray - } - else { - // should not ever happen, but... - console.warn("AvailabilityType not valid."); - return "#000"; //black - } - }); - } - - function createHovers() { - $wnd.jQuery('svg rect.availBars').tipsy({ - gravity: 'n', - html: true, - trigger: 'hover', - title: function () { - var d = this.__data__; - return formatHovers(d); - }, - show: function (e, el) { - el.css({ 'z-index': '990000'}) - } - }); - } - - function formatHovers(d) { - var hoverString, - timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat), - dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat), - availStart = new Date(+d.availStart), - availEnd = new Date(+d.availEnd); - - hoverString = - '<div class="chartHoverEnclosingDiv">' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + d.availTypeMessage + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' + - '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + d.availDuration + '</span></div>' + - '</div>'; - return hoverString; - - } - - return { - // Public API - draw: function (chartContext) { - "use strict"; - console.info("AvailabilityChart"); - //console.time("availabilityChart"); - - drawBars(availChartContext); - createHovers(); - //console.timeEnd("availabilityChart"); - } - }; // end public closure - - - }(); - - if (availChartContext.data !== undefined && availChartContext.data.length > 0) { - availabilityGraph.draw(availChartContext); - } - - }-*/; - - public String getChartId() { - return String.valueOf(entityId); - } - - public String getChartTimeLabel() { - return MSG.chart_time_label(); - } - - public String getChartDateLabel() { - return MSG.chart_date_label(); - } - - public String getChartHoverAvailabilityLabel() { - return MSG.chart_hover_availability_label(); - } - - public String getChartHoverStartLabel() { - return MSG.chart_hover_start_label(); - } - - public String getChartHoverEndLabel() { - return MSG.chart_hover_end_label(); - } - - public String getChartHoverBarLabel() { - return MSG.chart_hover_bar_label(); - } - - public String getChartHoverTimeFormat() { - return MSG.chart_hover_time_format(); - } - - public String getChartHoverDateFormat() { - return MSG.chart_hover_date_format(); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/LineMetricGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/LineMetricGraph.java deleted file mode 100644 index 079b2ab..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/LineMetricGraph.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype; - -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; - -/** - * Contains the javascript chart definition for a d3 Line graph chart. - * NOTE: this class isn't used just provided as an example as how to create - * other graph types. - * - * @author Mike Thompson - */ -public final class LineMetricGraph extends AbstractMetricGraph { - - /** - * General constructor for stacked bar graph when you have all the data needed to - * produce the graph. (This is true for all cases but the dashboard portlet). - */ - public LineMetricGraph(MetricGraphData metricGraphData) { - setMetricGraphData(metricGraphData); - } - - /** - * The magic JSNI to draw the charts with d3. - */ - public native void drawJsniChart() /*-{ - console.log("Draw Metric Line jsni chart"); - var global = this, - chartId = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getChartId()(), - chartHandle = "#rChart-"+chartId, - chartSelection = chartHandle + " svg", - json = $wnd.jQuery.parseJSON(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getJsonMetrics()()), - yAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getChartTitle()(), - yAxisUnits = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getYAxisUnits()(), - xAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getXAxisTitle()(); - - console.log("chart id: "+chartSelection ); - console.log(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getJsonMetrics()()); - - - function draw(data){ - "use strict"; - - var margin = {top: 10, right: 5, bottom: 30, left: 70}, - width = 400 - margin.left - margin.right, - height = 150 - margin.top - margin.bottom; - - var timeScale = $wnd.d3.time.scale() - .range([0, width]) - .domain($wnd.d3.extent(data, function(d) { return d.x; })); - - var yScale = $wnd.d3.scale.linear() - .rangeRound([height, 0]) - .domain([$wnd.d3.min(data.map(function(x) {return x.low;})), $wnd.d3.max(data.map(function(x){return x.high;}))]); - - var xAxis = $wnd.d3.svg.axis() - .scale(timeScale) - .ticks(5) - .orient("bottom"); - - var yAxis = $wnd.d3.svg.axis() - .scale(yScale) - .ticks(5) - .orient("left"); - - var interpolation = "basis"; - - var line = $wnd.d3.svg.line() - .interpolate(interpolation) - .x(function(d) { return timeScale(d.x); }) - .y(function(d) { return yScale(+d.y); }); - - var highLine = $wnd.d3.svg.line() - .interpolate(interpolation) - .x(function(d) { return timeScale(d.x); }) - .y(function(d) { return yScale(+d.high); }); - - var lowLine = $wnd.d3.svg.line() - .interpolate(interpolation) - .x(function(d) { return timeScale(d.x); }) - .y(function(d) { return yScale(+d.low); }); - - var svg = $wnd.d3.select(chartSelection).append("g") - .attr("width", width + margin.left + margin.right) - .attr("height", height + margin.top + margin.bottom) - .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); - - svg.append("g") - .attr("class", "x axis") - .attr("transform", "translate(0," + height + ")") - .call(xAxis); - - - svg.append("g") - .attr("class", "y axis") - .call(yAxis) - .append("text") - .attr("transform", "rotate(-90)") - .attr("y", -60) - .attr("dy", ".71em") - .style("text-anchor", "end") - .text(yAxisUnits === "NONE" ? "" : yAxisUnits); - - console.log("finished axes"); - - svg.append("path") - .datum(data) - .attr("class", "line") - .attr("fill", "none") - .attr("stroke", "steelblue") - .attr("stroke-width", "2") - .attr("d", line); - - svg.append("path") - .datum(data) - .attr("class", "highLine") - .attr("fill", "none") - .attr("stroke", "red") - .attr("stroke-width", "1.5") - //.attr("stroke-dasharray", "20,10,5,5,5,10") - .attr("stroke-dasharray", "5,5") - .attr("stroke-opacity", ".3") - .attr("d", highLine); - - svg.append("path") - .datum(data) - .attr("class", "lowLine") - .attr("fill", "none") - .attr("stroke", "blue") - .attr("stroke-width", "1.5") - .attr("stroke-dasharray", "5,5") - .attr("stroke-opacity", ".3") - .attr("d", lowLine); - - console.log("finished paths"); - }(data); - - }-*/; - -}

1 0

[rhq] Branch 'bug/969621' - 0 commits -
by Thomas Segismont 18 Jul '13

18 Jul '13

Rebased ref, commits from common ancestor:

1 0

[rhq] 2 commits - modules/plugins
by Thomas Segismont 18 Jul '13

18 Jul '13

modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 55 ++++++++-- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java | 24 ++-- 2 files changed, 65 insertions(+), 14 deletions(-) New commits: commit bf8587569567d261791f272a672f5722d7dca8c0 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 18 23:37:57 2013 +0200 [as7] Fix domain api version discovery Look for the first node of type element instead of simply calling getFirstChild diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java index 329246e..3c71135 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,11 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.modules.plugins.jbossas7.helper; +import static org.rhq.core.util.StringUtil.EMPTY_STRING; +import static org.w3c.dom.Node.ELEMENT_NODE; + import java.io.File; import java.io.FileInputStream; import java.io.InputStream; @@ -33,6 +36,7 @@ import javax.xml.xpath.XPathFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; +import org.w3c.dom.Node; import org.rhq.core.pluginapi.util.CommandLineOption; import org.rhq.modules.plugins.jbossas7.AS7CommandLine; @@ -234,11 +238,15 @@ public class HostConfiguration { } public String getDomainApiVersion() { - - String version = document.getFirstChild().getAttributes().getNamedItem("xmlns").getTextContent(); - - version = version.substring(version.lastIndexOf(':')+1); - return version; + // Look for the first child node of type element (<host> in domain mode or <server> in standalone mode) + // We can't just call getFirstChild because first child could be a node of type comment + for (Node childNode = document.getFirstChild(); childNode != null; childNode = childNode.getNextSibling()) { + if (childNode.getNodeType() == ELEMENT_NODE) { + String xmlns = childNode.getAttributes().getNamedItem("xmlns").getTextContent(); + return xmlns.substring(xmlns.lastIndexOf(':') + 1); + } + } + return EMPTY_STRING; } /** commit 5283e5356d2ca4bda6e3aeea9d323c186030baa9 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 18 09:41:39 2013 +0200 Bug 969621 - EAP 6 managed plug-in is unable to discover EAP servers when more then one is running on a single host diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index cc13406..cd9f276 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.modules.plugins.jbossas7; @@ -42,6 +42,7 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.resource.ResourceUpgradeReport; import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; @@ -49,6 +50,8 @@ import org.rhq.core.pluginapi.inventory.ManualAddFacet; import org.rhq.core.pluginapi.inventory.ProcessScanResult; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeContext; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeFacet; import org.rhq.core.pluginapi.util.CommandLineOption; import org.rhq.core.pluginapi.util.FileUtils; import org.rhq.core.pluginapi.util.JavaCommandLine; @@ -66,12 +69,15 @@ import org.rhq.modules.plugins.jbossas7.json.Result; * Abstract base discovery component for the two server types - "JBossAS7 Host Controller" and * "JBossAS7 Standalone Server". */ -public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent, ManualAddFacet { +public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent, ManualAddFacet, ResourceUpgradeFacet { private static final String JBOSS_AS_PREFIX = "jboss-as-"; private static final String JBOSS_EAP_PREFIX = "jboss-eap-"; private static final String WILDFLY_PREFIX = "wildfly-"; + private static final String LOCAL_RESOURCE_KEY_PREFIX = "hostConfig: "; + private static final String REMOTE_RESOURCE_KEY_PREFIX = "hostPort: "; + private static final String HOME_DIR_SYSPROP = "jboss.home.dir"; private static final String RHQADMIN = "rhqadmin"; @@ -202,7 +208,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent setStartScriptPluginConfigProps(process, commandLine, pluginConfig, agentProcess); setUserAndPasswordPluginConfigProps(serverPluginConfig, hostConfig, baseDir); - String key = baseDir.getPath(); + String key = createKeyForLocalResource(serverPluginConfig); HostPort hostPort = hostConfig.getDomainControllerHostPort(commandLine); String name = buildDefaultResourceName(hostPort, managementHostPort, productType); String description = buildDefaultResourceDescription(hostPort, productType); @@ -455,7 +461,7 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent HostPort managementHostPort = new HostPort(false); managementHostPort.host = hostname; managementHostPort.port = port; - String key = hostname + ":" + port; + String key = createKeyForRemoteResource(hostname + ":" + port); String name = buildDefaultResourceName(hostPort, managementHostPort, productType); String version = productInfo.getProductVersion(); String description = buildDefaultResourceDescription(hostPort, productType); @@ -469,6 +475,43 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent return detail; } + @Override + public ResourceUpgradeReport upgrade(ResourceUpgradeContext inventoriedResource) { + String currentResourceKey = inventoriedResource.getResourceKey(); + Configuration pluginConfiguration = inventoriedResource.getPluginConfiguration(); + ServerPluginConfiguration serverPluginConfiguration = new ServerPluginConfiguration(pluginConfiguration); + + if (currentResourceKey.startsWith(LOCAL_RESOURCE_KEY_PREFIX) + || currentResourceKey.startsWith(REMOTE_RESOURCE_KEY_PREFIX)) { + // Resource key already in right format + return null; + } + + ResourceUpgradeReport report = new ResourceUpgradeReport(); + + if (new File(currentResourceKey).isDirectory()) { + // Old key format for a local resource (key is base dir) + report.setNewResourceKey(createKeyForLocalResource(serverPluginConfiguration)); + } else if (currentResourceKey.contains(":")) { + // Old key format for a remote (manually added) resource (key is base dir) + report.setNewResourceKey(createKeyForRemoteResource(currentResourceKey)); + } else { + log.warn("Unknown format, cannot upgrade resource key [" + currentResourceKey + "]"); + return null; + } + + return report; + } + + private String createKeyForRemoteResource(String hostPort) { + return REMOTE_RESOURCE_KEY_PREFIX + hostPort; + } + + private String createKeyForLocalResource(ServerPluginConfiguration serverPluginConfiguration) { + return LOCAL_RESOURCE_KEY_PREFIX + + serverPluginConfiguration.getHostConfigFile().getAbsolutePath(); + } + private <T>T getServerAttribute(ASConnection connection, String attributeName) { Operation op = new ReadAttribute(null, attributeName); Result res = connection.execute(op);

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - modules/enterprise
by mike thompson 18 Jul '13

18 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 28 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java | 2 2 files changed, 4 insertions(+), 26 deletions(-) New commits: commit 67ad82c393152417d419ebb3c7682f09a9a27f2a Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Jul 18 09:51:38 2013 -0700 Consolidated Metrics - Remove 'Graph' and 'Availability' from monitor second level tabs. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index 8e959db..08d1fd5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -66,7 +66,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.ResourceAgentView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.CalltimeView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.ResourceAvailabilityView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.schedules.ResourceSchedulesView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table.MetricsResourceView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.traits.TraitsView; @@ -129,10 +128,8 @@ public class ResourceDetailView extends private SubTab summaryActivity; private SubTab summaryTimeline; - private SubTab monitorGraphs; private SubTab monitorMetrics; private SubTab monitorTraits; - private SubTab monitorAvail; private SubTab monitorSched; private SubTab monitorCallTime; private SubTab inventoryChildren; @@ -196,16 +193,11 @@ public class ResourceDetailView extends monitoringTab = new TwoLevelTab(new ViewName("Monitoring", MSG.view_tabs_common_monitoring()), IconEnum.SUSPECT_METRICS); - monitorGraphs = new SubTab(monitoringTab, new ViewName("Graphs", MSG.view_tabs_common_graphs()), null); - monitorMetrics = new SubTab(monitoringTab, new ViewName("Metrics", "Metrics"), null); monitorTraits = new SubTab(monitoringTab, new ViewName("Traits", MSG.view_tabs_common_traits()), null); - monitorAvail = new SubTab(monitoringTab, new ViewName("Availability", MSG.view_tabs_common_availability()), - null); monitorSched = new SubTab(monitoringTab, new ViewName("Schedules", MSG.view_tabs_common_schedules()), null); monitorCallTime = new SubTab(monitoringTab, new ViewName("CallTime", MSG.view_tabs_common_calltime()), null); - monitoringTab.registerSubTabs(monitorGraphs, monitorMetrics, monitorTraits, monitorAvail, - monitorSched, monitorCallTime); + monitoringTab.registerSubTabs( monitorMetrics, monitorTraits, monitorSched, monitorCallTime); tabs.add(monitoringTab); eventsTab = new TwoLevelTab(new ViewName("Events", MSG.view_tabs_common_events()), IconEnum.EVENTS); @@ -395,23 +387,14 @@ public class ResourceDetailView extends boolean visibleToIE8 = !BrowserUtility.isBrowserPreIE9(); - viewFactory = (!visibleToIE8) ? null : new ViewFactory() { - @Override - public Canvas createView() { - return createD3GraphListView(); - } - }; - updateSubTab(this.monitoringTab, this.monitorGraphs, visible, visibleToIE8, viewFactory); - // visible = same test as above viewFactory = (!visible) ? null : new ViewFactory() { @Override public Canvas createView() { - //return new MetricsTableView(resource.getId()); return new MetricsResourceView(resource); } }; - updateSubTab(this.monitoringTab, this.monitorMetrics, visible, true, viewFactory); + updateSubTab(this.monitoringTab, this.monitorMetrics, visible, visibleToIE8, viewFactory); visible = hasMetricsOfType(this.resourceComposite, DataType.TRAIT); viewFactory = (!visible) ? null : new ViewFactory() { @@ -422,13 +405,6 @@ public class ResourceDetailView extends }; updateSubTab(this.monitoringTab, this.monitorTraits, visible, true, viewFactory); - updateSubTab(this.monitoringTab, this.monitorAvail, true, true, new ViewFactory() { - @Override - public Canvas createView() { - return new ResourceAvailabilityView(resourceComposite); - } - }); - updateSubTab(this.monitoringTab, this.monitorSched, hasMetricsOfType(this.resourceComposite, null), true, new ViewFactory() { @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java index 6719070..3d1c881 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java @@ -62,7 +62,9 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; * * @author Jay Shaughnessy * @author John Mazzitelli + * @see org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table.ResourceMetricAvailabilityView */ +@Deprecated public class ResourceAvailabilityView extends EnhancedVLayout { private ResourceComposite resourceComposite;

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - modules/enterprise
by mike thompson 18 Jul '13

18 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java | 18 ++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 43 +++++----- 2 files changed, 34 insertions(+), 27 deletions(-) New commits: commit ec43cec8eb7ed5099b8fadafe60db8a128446ef9 Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Jul 18 09:19:09 2013 -0700 Consolidated Metrics -Bug fix for collapsing of detail graphs fails to refresh the sparkline graphs. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java index 99ad1e6..5784ed4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -38,6 +38,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; +import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedHLayout; @@ -70,6 +71,16 @@ public class MetricsResourceView extends AbstractD3GraphListView { this.onDraw(); } + public void refreshGraphs(){ + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); + BrowserUtility.graphSparkLines(); + } + }.schedule(150); + } + @Override protected void onDraw() { super.onDraw(); @@ -108,12 +119,7 @@ public class MetricsResourceView extends AbstractD3GraphListView { availabilityDetails.show(); } - new Timer() { - @Override - public void run() { - availabilityGraph.drawJsniChart(); - } - }.schedule(150); + refreshGraphs(); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 3cb9233..25e430b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -40,6 +40,8 @@ import com.smartgwt.client.widgets.events.CloseClickHandler; import com.smartgwt.client.widgets.grid.ListGrid; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.grid.events.RecordCollapseEvent; +import com.smartgwt.client.widgets.grid.events.RecordCollapseHandler; import com.smartgwt.client.widgets.grid.events.RecordExpandEvent; import com.smartgwt.client.widgets.grid.events.RecordExpandHandler; import com.smartgwt.client.widgets.layout.VLayout; @@ -99,26 +101,9 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re protected void configureTable() { ArrayList<ListGridField> fields = getDataSource().getListGridFields(); setListGridFields(fields.toArray(new ListGridField[0])); - this.getListGrid().setCanExpandRecords(true); - this.getListGrid().addRecordExpandHandler(new RecordExpandHandler() { - @Override - public void onRecordExpand(RecordExpandEvent recordExpandEvent) { - Log.debug("Record Expanded: " - + recordExpandEvent.getRecord().getAttribute(MetricsViewDataSource.FIELD_METRIC_LABEL)); - new Timer() { - - @Override - public void run() { - BrowserUtility.graphSparkLines(); - } - }.schedule(150); - - } - - }); addTableAction(MSG.view_measureTable_getLive(), new ShowLiveDataTableAction(this)); - //addTableAction(MSG.view_measureTable_addToDashboard(), new AddToDashboardTableAction(this)); + addTableAction(MSG.view_measureTable_addToDashboard(), new AddToDashboardTableAction(this)); } @@ -284,6 +269,21 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re setCanExpandRecords(true); setCanExpandMultipleRecords(true); setExpansionMode(ExpansionMode.DETAIL_FIELD); + addRecordExpandHandler(new RecordExpandHandler() { + @Override + public void onRecordExpand(RecordExpandEvent recordExpandEvent) { + Log.debug("Record Expanded: " + + recordExpandEvent.getRecord().getAttribute(MetricsViewDataSource.FIELD_METRIC_LABEL)); + redrawGraphs(); + } + + }); + addRecordCollapseHandler(new RecordCollapseHandler() { + @Override + public void onRecordCollapse(RecordCollapseEvent recordCollapseEvent) { + redrawGraphs(); + } + }); } @Override @@ -295,7 +295,8 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re final String chartId = "rChart-" + resourceId + "-" + definitionId; Log.debug("getExpansionComponent for: " + chartId); - HTMLFlow htmlFlow = new HTMLFlow(MetricD3Graph.createGraphMarkerTemplate(chartId, TREEVIEW_DETAIL_CHART_HEIGHT)); + HTMLFlow htmlFlow = new HTMLFlow(MetricD3Graph.createGraphMarkerTemplate(chartId, + TREEVIEW_DETAIL_CHART_HEIGHT)); vLayout.addMember(htmlFlow); int[] definitionArrayIds = new int[1]; @@ -316,7 +317,6 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re //load the data results for the given metric definition List<MeasurementDataNumericHighLowComposite> measurementList = results.get(0); - Log.debug("getExpansionComponent MeasurementList.size: " + measurementList.size()); MeasurementDefinition measurementDefinition = null; for (MeasurementDefinition definition : resource.getResourceType().getMetricDefinitions()) { @@ -336,12 +336,13 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re @Override public void run() { graphView.drawJsniChart(); + BrowserUtility.graphSparkLines(); } }.schedule(150); } else { - Log.warn("No chart data retrieving for resource [" + resourceId + "-"+definitionId+"]"); + Log.warn("No chart data retrieving for resource [" + resourceId + "-" + definitionId + "]"); } }

1 0

[rhq] modules/enterprise
by John Sanda 18 Jul '13

18 Jul '13

modules/enterprise/server/jar/pom.xml | 8 ++++++++ modules/enterprise/server/server-metrics/pom.xml | 12 ------------ 2 files changed, 8 insertions(+), 12 deletions(-) New commits: commit e6fa8c734c2bfee9ad46a2b7683d4c86b4897e5c Author: John Sanda <jsanda(a)redhat.com> Date: Thu Jul 18 07:23:34 2013 -0400 take 2 at dependency clean up JNA libraries were getting pulled into the ear as transitive dependencies. JNA is used by the cassandra-ccm-core module to shutdown Cassandra. This functionality though is only used in test code. diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index c648685..f418afc 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -77,6 +77,14 @@ <groupId>org.rhq</groupId> <artifactId>rhq-core-plugin-api</artifactId> </exclusion> + <exclusion> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + </exclusion> + <exclusion> + <groupId>net.java.dev.jna</groupId> + <artifactId>platform</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 2245978..97496f7 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -47,18 +47,6 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>rhq-cassandra-ccm-core</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.cassandra</groupId> - <artifactId>cassandra-clientutil</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-ccm-testng</artifactId> <version>${project.version}</version> <scope>test</scope>

1 0

[rhq] modules/enterprise
by snegrea 18 Jul '13

18 Jul '13

modules/enterprise/server/jar/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 375f6f66fcc9214cc3d13605c17859ac11e3fd45 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Jul 18 05:04:00 2013 -0500 Temporary fix for the server jar name for dev profile (it was still using the old name). diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 7c236c7..c648685 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -776,7 +776,7 @@ <properties> <rhq.rootDir>../../../..</rhq.rootDir> <rhq.containerDir>${rhq.rootDir}/${rhq.devContainerServerPath}</rhq.containerDir> - <rhq.deploymentName>${project.build.finalName}-ejb3.jar</rhq.deploymentName> + <rhq.deploymentName>rhq-server.jar</rhq.deploymentName> <rhq.deploymentDir>${rhq.containerDir}/${rhq.earDeployDir}/${rhq.deploymentName}</rhq.deploymentDir> </properties>

1 0

[rhq] Changes to 'bug/969621'
by Thomas Segismont 18 Jul '13

18 Jul '13

New branch 'bug/969621' available with the following commits: commit a6b58593992b008c1e9fa988d24b0bde71d395b1 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 18 09:41:39 2013 +0200 Bug 969621 - EAP 6 managed plug-in is unable to discover EAP servers when more then one is running on a single host

1 0

[rhq] modules/enterprise
by John Sanda 18 Jul '13

18 Jul '13

modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b59d1684eb12c4e1c5a78309b4ec40eeb461b7d5 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 17 20:17:14 2013 -0400 fix test ear deployment error that resulted from renaming server jar The ear deployment was failing because classes were not getting added to the rhq-server.jar in the test ear. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java index 4dfbd46..2fd8624 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java @@ -341,7 +341,7 @@ public abstract class AbstractEJB3Test extends Arquillian { // merge rhq.ear into testEar but include only the EJB jars and the supporting libraries. Note that we // don't include the services sar because tests are responsible for prepare/unprepare of all required services, // we don't want the production services performing any unexpected work. - testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\\.jar.*")); + testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\\.jar.*|/rhq-server.jar.*")); // remove startup beans and shutdown listeners, we don't want this to be a full server deployment. The tests // start/stop what they need, typically with test services or mocks. testEar.delete(ArchivePaths @@ -413,7 +413,7 @@ public abstract class AbstractEJB3Test extends Arquillian { //System.out.println("** The Deployment EAR: " + testEar.toString(true) + "\n"); // Save the test EAR to a zip file for inspection (set file explicitly) - //exportZip(testEar, new File("c:/temp/test-ear.ear")); + exportZip(testEar, new File("/Users/jsanda/tmp/test-ear.ear")); return testEar; }

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - modules/enterprise
by mike thompson 18 Jul '13

18 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java | 36 +++------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java | 26 ++----- 3 files changed, 23 insertions(+), 41 deletions(-) New commits: commit a80e5b2dbcd84b6ece2bd9eb02a9901035e89961 Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Jul 17 15:23:54 2013 -0700 Consolidated Metrics - Additional misc. bug fixes. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index bc35ccf..811a579 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -344,7 +344,7 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { console.log("Availability Chart Drawn"); } - }-*/; + }-*/; public String getChartId() { return String.valueOf(entityId); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java index 9273e0b..99ad1e6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -25,7 +25,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.Img; -import com.smartgwt.client.widgets.Label; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; import com.smartgwt.client.widgets.layout.VLayout; @@ -57,23 +56,15 @@ public class MetricsResourceView extends AbstractD3GraphListView { private VLayout vLayout; private Img expandCollapseArrow; private MetricsTableView metricsTableView; - private MetricsViewDataSource dataSource; private ResourceMetricAvailabilityView availabilityDetails; public MetricsResourceView(Resource resource) { super(); this.resource = resource; - dataSource = new MetricsViewDataSource(resource); metricsTableView = new MetricsTableView(resource, this); availabilityDetails = new ResourceMetricAvailabilityView(resource); } - private EnhancedHLayout createAvailabilityDetails() { - EnhancedHLayout hLayout = new EnhancedHLayout(); - hLayout.addMember(new Label("Availability Details")); - hLayout.hide(); - return hLayout; - } public void redrawGraphs() { this.onDraw(); @@ -91,6 +82,10 @@ public class MetricsResourceView extends AbstractD3GraphListView { vLayout.setHeight100(); vLayout.addMember(buttonBarDateTimeRangeEditor); + + availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( + new AvailabilityOverUnderGraphType(resource.getId())); + EnhancedHLayout expandCollapseHLayout = new EnhancedHLayout(); //add expand/collapse icon @@ -111,15 +106,18 @@ public class MetricsResourceView extends AbstractD3GraphListView { expandCollapseArrow.setSrc(IconEnum.EXPANDED_ICON.getIcon16x16Path()); expandCollapseArrow.setTooltip(EXPANDED_TOOLTIP); availabilityDetails.show(); + } - markForRedraw(); + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); + } + }.schedule(150); } }); - availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( - new AvailabilityOverUnderGraphType(resource.getId())); - expandCollapseHLayout.addMember(expandCollapseArrow); expandCollapseHLayout.addMember(availabilityGraph); vLayout.addMember(expandCollapseHLayout); @@ -138,8 +136,7 @@ public class MetricsResourceView extends AbstractD3GraphListView { } @Override - protected void queryAvailability(final EntityContext context, Long startTime, Long endTime, - final CountDownLatch countDownLatch) { + protected void queryAvailability(final EntityContext context, Long startTime, Long endTime, CountDownLatch notUsed ) { final long timerStart = System.currentTimeMillis(); @@ -149,26 +146,19 @@ public class MetricsResourceView extends AbstractD3GraphListView { @Override public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_availability_loadFailed(), caught); - if (countDownLatch != null) { - countDownLatch.countDown(); - } } @Override public void onSuccess(List<Availability> availList) { Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + " ms."); - availabilityList = availList; + availabilityGraph.setAvailabilityList(availList); new Timer() { @Override public void run() { availabilityGraph.drawJsniChart(); } }.schedule(150); - - if (countDownLatch != null) { - countDownLatch.countDown(); - } } }); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java index d8bfb64..a03ad1a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java @@ -154,41 +154,35 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C private String getCsvMetricsForSparkline(int definitionId) { StringBuilder sb = new StringBuilder(); - Log.debug("getCsvMetricsForSparkline.metricsDataList("+definitionId+"): " + metricsDataList.size()); List<MeasurementDataNumericHighLowComposite> selectedMetricsList = getMeasurementsForMeasurementDefId(definitionId); for (int i = 0; i < selectedMetricsList.size(); i++) { - // take the last 20 values - //if (i >= selectedMetricsList.size() - 20) { - MeasurementDataNumericHighLowComposite measurementData = selectedMetricsList.get(i); - if (!Double.isNaN(measurementData.getValue())) { - sb.append((int) measurementData.getValue()); - sb.append(","); - } - //} + MeasurementDataNumericHighLowComposite measurementData = selectedMetricsList.get(i); + if (!Double.isNaN(measurementData.getValue())) { + sb.append((int) measurementData.getValue()); + sb.append(","); } + } if (sb.toString().endsWith(",")) { sb.setLength(sb.length() - 1); } - Log.debug("getCsvMetricsForSparkline: " + sb.toString()); return sb.toString(); } - List<MeasurementDataNumericHighLowComposite> getMeasurementsForMeasurementDefId(int definitionId){ - List<MeasurementDataNumericHighLowComposite> selectedMetricsDataList; + List<MeasurementDataNumericHighLowComposite> getMeasurementsForMeasurementDefId(int definitionId) { int selectedIndex = 0; // find the ordinal position as specified when querying the metrics for (int i = 0; i < definitionArrayIds.length; i++) { - if(definitionArrayIds[i] == definitionId){ + if (definitionArrayIds[i] == definitionId) { selectedIndex = i; break; } } - return metricsDataList.get(selectedIndex); + return metricsDataList.get(selectedIndex); } protected String getMetricStringValue(MetricDisplayValue value) { @@ -197,7 +191,7 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C @Override protected Criteria getFetchCriteria(DSRequest request) { - // we don't use criterias for this datasource, just return null + // NOTE: we don't use criterias for this datasource, just return null return null; } @@ -228,7 +222,6 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C BrowserUtility.graphSparkLines(); } }.schedule(150); - Log.debug("Finished CountdownLatch for metrics loaded: " + metricsDataList.size()); } }); @@ -305,7 +298,6 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C if (!measurementDataList.isEmpty()) { metricsDataList = measurementDataList; - Log.debug("Retrieved metrics metricsDataList.size: " + metricsDataList.size()); countDownLatch.countDown(); } }

1 0

[rhq] etc/scripts
by Jay Shaughnessy 17 Jul '13

17 Jul '13

etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat | 48 ++++++++++++++-- 1 file changed, 44 insertions(+), 4 deletions(-) New commits: commit c855df20b787a6db0a7b9aed7b1fb5597eb0e2d6 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jul 17 17:09:55 2013 -0400 Work on the windows rhq48 cassandra upgrade patch diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat index e0312dc..c190503 100644 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat @@ -1,14 +1,54 @@ @echo off + +rem =========================================================================== +rem RHQ Storage Node (Cassandra) Windows 4.8.0 upgrade patch script +rem +rem WHO NEEDS TO RUN THE PATCH? +rem +rem Run this patch script if you are: +rem - Running RHQ 4.8.0 on Windows +rem - Planning to upgrade and maintain your Storage node data +rem +rem PREQUISITES: +rem +rem This patch requires the installation of Python. Download Python 2.7.5 from: +rem +rem http://www.python.org/download/releases/2.7.5/ +rem +rem Install as directed. Note that Python will need to be on your PATH to run this patch. Also, +rem this patch will not work with Python3. +rem +rem Edit <rhq-install-dir>\rhq-storage\conf\cassandra.yaml to ensure the following is true: +rem +rem start_rpc: true +rem +rem Note the setting of rpc_port. By default it is 9160, which is fine. +rem +rem RUNNING THE PATCH: +rem +rem > cd <patch-dir> +rem > rhq48-storage-patch.bat <rhq-480-server-dir> <storage-node-ip-address> <thrift-rpc-port> <jmx-port> +rem +rem For example: +rem > rhq48-storage-patch.bat c:\rhq-server-4.8.0 127.0.0.1 9160 7299 +rem +rem Review the output carefully. There should be no errors (be careful, the script may still have completed). +rem If errors are encountered fix the issue and rerun the patch. +rem +rem When done, you can again edit cassandra.yaml and reset start_rpc: false +rem +rem =========================================================================== + setlocal if /i "%4" == "" ( - echo Usage: rhq48-storage-patch.bat ^<rhq-server-dir^> ^<storage-ip-address^> ^<cql-port^> ^<jmx-port^> + echo Usage: rhq48-storage-patch.bat ^<rhq-server-dir^> ^<storage-ip-address^> ^<thrift-rpc-port^> ^<jmx-port^> exit /B 1 ) set RHQ_SERVER_DIR=%1 -set CQL_HOSTNAME=%2 -set CQL_PORT=%3 +set CQLSH_HOST=%2 +set CQLSH_PORT=%3 set JMX_PORT=%4 set USERNAME="rhqadmin" set PASSWORD="rhqadmin" @@ -29,7 +69,7 @@ echo Waiting for RHQ Storage Node to start up.. rem Sleep is not implemented in all Windows prompts, this one won't work in Vista choice /n /c y /d y /t 3 -set RHQ_STORAGE_BIN=%RHQ_SERVER_DIR%\rhq-storage\bin\ +set RHQ_STORAGE_BIN=%RHQ_SERVER_DIR%\rhq-storage\bin set CQLSH_PATH=%RHQ_STORAGE_BIN%\cqlsh set NODETOOL_PATH=%RHQ_STORAGE_BIN%\nodetool.bat

1 0

[rhq] modules/core modules/enterprise modules/plugins
by snegrea 17 Jul '13

17 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java | 98 ++++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 113 ++++++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java | 5 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java | 5 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java | 3 modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 16 + modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 13 + 8 files changed, 246 insertions(+), 9 deletions(-) New commits: commit 11b8ae9cff9ca5085bfe317a01653cc8b81d8bb7 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Jul 17 14:14:02 2013 -0500 Initial implementation for the Storage Node configuration composite. The final resource operation still needs to be implemented but the rest of the functionality is implemented. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java index 14043db..575edc74 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java @@ -90,7 +90,7 @@ public class StorageNode implements Serializable { public static final long serialVersionUID = 1L; public static final String QUERY_FIND_ALL = "StorageNode.findAll"; - public static final String QUERY_FIND_BY_ADDRESS = "StorageNode.findByName"; + public static final String QUERY_FIND_BY_ADDRESS = "StorageNode.findByAddress"; public static final String QUERY_FIND_ALL_NOT_INSTALLED = "StorageNode.findAllCloudMembers"; public static final String QUERY_DELETE_BY_ID = "StorageNode.deleteById"; public static final String QUERY_FIND_ALL_NORMAL = "StorageNode.findAllNormalCloudMembers"; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java new file mode 100644 index 0000000..e2c64f9 --- /dev/null +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java @@ -0,0 +1,98 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.domain.cloud; + +import java.io.Serializable; + +/** + * @author Stefan Negrea + */ +public class StorageNodeConfigurationComposite implements Serializable { + private static final long serialVersionUID = 1L; + + private StorageNode storageNode; + private int jmxPort; + private String heapSize; + + public StorageNodeConfigurationComposite() { + // GWT needs this + } + + public StorageNodeConfigurationComposite(StorageNode storageNode) { + this.storageNode = storageNode; + } + + /** + * @return associated storage node + */ + public StorageNode getStorageNode() { + return storageNode; + } + + /** + * @param storageNode storage node + */ + protected void setStorageNode(StorageNode storageNode) { + this.storageNode = storageNode; + } + + + /** + * @return the JMX port + */ + public int getJmxPort() { + return jmxPort; + } + + /** + * @param jmxPort JMX port to set + */ + public void setJmxPort(int jmxPort) { + this.jmxPort = jmxPort; + } + + /** + * @return the heap size + */ + public String getHeapSize() { + return heapSize; + } + + /** + * @param heapSize heap size to set + */ + public void setHeapSize(String heapSize) { + this.heapSize = heapSize; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("storageNode.addresss=").append(storageNode.getAddress()).append(", "); + builder.append("heapSize=").append(heapSize).append(", "); + builder.append("jmxPort=").append(jmxPort).append(""); + return builder.toString(); + } +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index fa51fe1..3f1ec69 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -51,14 +51,18 @@ import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.cloud.Server; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.cloud.StorageNode.OperationMode; +import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.common.JobTrigger; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; +import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.measurement.MeasurementAggregate; import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.domain.operation.OperationRequestStatus; +import org.rhq.core.domain.operation.ResourceOperationHistory; import org.rhq.core.domain.operation.bean.GroupOperationSchedule; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; @@ -72,6 +76,7 @@ import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.authz.RequiredPermission; import org.rhq.enterprise.server.authz.RequiredPermissions; import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal; +import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal; import org.rhq.enterprise.server.operation.OperationManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; @@ -96,6 +101,11 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private static final String RHQ_STORAGE_JMX_PORT_PROPERTY = "jmxPort"; private static final String RHQ_STORAGE_ADDRESS_PROPERTY = "host"; + private static final int OPERATION_QUERY_TIMEOUT = 1000; + private static final int MAX_ITERATIONS = 5; + private static final String UPDATE_CONFIGURATION_OPERATION = "updateConfiguration"; + private static final String RESTART_OPERATION = "restart"; + @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) private EntityManager entityManager; @@ -120,6 +130,9 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @EJB private AlertManagerLocal alertManager; + @EJB + private ConfigurationManagerLocal configurationManager; + @Override public void linkResource(Resource resource) { List<StorageNode> storageNodes = this.getStorageNodes(); @@ -438,6 +451,19 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN entityManager.flush(); } + private StorageNode findStorageNodeByAddress(String address) { + TypedQuery<StorageNode> query = entityManager.<StorageNode> createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS, + StorageNode.class); + query.setParameter("address", address); + List<StorageNode> result = query.getResultList(); + + if (result != null && result.size() > 0) { + return result.get(0); + } + + return null; + } + private StorageNodeLoadComposite.MeasurementAggregateWithUnits getMeasurementAggregateWithUnits(Subject subject, int schedId, MeasurementUnits units, long beginTime, long endTime) { MeasurementAggregate measurementAggregate = measurementManager.getAggregate(subject, schedId, beginTime, @@ -559,4 +585,91 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return resourceIdsWithAlertDefinitions.toArray(new Integer[resourceIdsWithAlertDefinitions.size()]); } + + @Override + public StorageNodeConfigurationComposite retrieveConfiguration(Subject subject, StorageNode storageNode) { + StorageNodeConfigurationComposite configuration = new StorageNodeConfigurationComposite(storageNode); + + if (storageNode != null && storageNode.getResource() != null) { + Resource storageNodeResource = storageNode.getResource(); + Configuration storageNodeConfiguration = configurationManager.getResourceConfiguration(subject, + storageNodeResource.getId()); + + configuration.setHeapSize(storageNodeConfiguration.getSimpleValue("maxHeapSize")); + configuration.setJmxPort(storageNode.getJmxPort()); + } + + return configuration; + } + + @Override + public boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) { + StorageNode storageNode = findStorageNodeByAddress(storageNodeConfiguration.getStorageNode().getAddress()); + + if (storageNode != null && storageNode.getResource() != null) { + Resource storageNodeResource = storageNode.getResource(); + Configuration parameters = new Configuration(); + parameters.setSimpleValue("jmxPort", storageNodeConfiguration.getJmxPort() + ""); + parameters.setSimpleValue("heapSize", storageNodeConfiguration.getHeapSize() + ""); + + boolean updateConfigurationResult = runOperationAndWaitForResult(subject, storageNodeResource, + UPDATE_CONFIGURATION_OPERATION, parameters); + + if (updateConfigurationResult) { + boolean restartResult = runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, + null); + + if (restartResult) { + storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); + entityManager.persist(storageNode); + + return true; + } + } + } + + return false; + } + + private boolean runOperationAndWaitForResult(Subject subject, Resource storageNodeResource, String operationToRun, + Configuration parameters) { + + //scheduling the operation + long operationStartTime = System.currentTimeMillis(); + operationManager.scheduleResourceOperation(subject, storageNodeResource.getId(), operationToRun, 0, 0, 0, 0, + parameters, "Run by StorageNodeManagerBean"); + + //waiting for the operation result then return it + int iteration = 0; + boolean successResultFound = false; + while (iteration < MAX_ITERATIONS && !successResultFound) { + ResourceOperationHistoryCriteria criteria = new ResourceOperationHistoryCriteria(); + criteria.addFilterResourceIds(storageNodeResource.getId()); + criteria.addFilterStartTime(operationStartTime); + criteria.addFilterOperationName(operationToRun); + criteria.addFilterStatus(OperationRequestStatus.SUCCESS); + criteria.setPageControl(PageControl.getUnlimitedInstance()); + + PageList<ResourceOperationHistory> results = operationManager.findResourceOperationHistoriesByCriteria( + subject, criteria); + + if (results != null && results.size() > 0) { + successResultFound = true; + } + + if (successResultFound) { + break; + } else { + try { + Thread.sleep(OPERATION_QUERY_TIMEOUT); + } catch (Exception e) { + log.error(e); + } + } + + iteration++; + } + + return successResultFound; + } } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index a9b2514..6fca820 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -25,6 +25,7 @@ import javax.ejb.Local; import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.resource.Resource; @@ -56,6 +57,10 @@ public interface StorageNodeManagerLocal { */ StorageNodeLoadComposite getLoad(Subject subject, StorageNode node, long beginTime, long endTime); + StorageNodeConfigurationComposite retrieveConfiguration(Subject subject, StorageNode storageNode); + + boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration); + /** * Fetches the list of StorageNode entities based on provided criteria. * diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java index 72432db..7be1b07 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java @@ -23,6 +23,7 @@ import javax.ejb.Remote; import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.util.PageList; @@ -48,6 +49,10 @@ public interface StorageNodeManagerRemote { */ StorageNodeLoadComposite getLoad(Subject subject, StorageNode node, long beginTime, long endTime); + StorageNodeConfigurationComposite retrieveConfiguration(Subject subject, StorageNode storageNode); + + boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration); + /** * <p>Fetches the list of {@link StorageNode} entities based on provided criteria.</p> * diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java index 6b1940d..54ca4c2 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java @@ -71,7 +71,6 @@ public class StorageNodeMaintenanceJob extends AbstractStatefulJob { private final static String RUN_REPAIR_PROPERTY = "runRepair"; private final static String UPDATE_SEEDS_LIST = "updateSeedsList"; private final static String SEEDS_LIST = "seedsList"; - private final static String SUCCEED_PROPERTY = "succeed"; private static final String USERNAME_PROP = "rhq.cassandra.username"; private static final String PASSWORD_PROP = "rhq.cassandra.password"; @@ -169,8 +168,6 @@ public class StorageNodeMaintenanceJob extends AbstractStatefulJob { List<Resource> childResources = LookupUtil.getResourceManager().findResourcesByCriteria( LookupUtil.getSubjectManager().getOverlord(), c); - - for (Resource childResource : childResources) { if (STORAGE_SERVICE.equals(childResource.getName())) { try { diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 6194146..380da65 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -82,11 +82,19 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return prepareForUpgrade(parameters); } else if (name.equals("readRepair")) { return readRepair(); + } else if (name.equals("updateConfiguration")) { + return updateConfiguration(parameters); } else { return super.invokeOperation(name, parameters); } } + private OperationResult updateConfiguration(Configuration params) { + OperationResult result = new OperationResult("Configuration updated."); + //TODO: implement updates to various sub-resources here + return result; + } + private OperationResult nodeAdded(Configuration params) { boolean runRepair = params.getSimple("runRepair").getBooleanValue(); boolean updateSeedsList = params.getSimple("updateSeedsList").getBooleanValue(); @@ -222,12 +230,12 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } return result; } - + private OperationResult prepareForUpgrade(Configuration parameters) throws Exception { EmsConnection emsConnection = getEmsConnection(); EmsBean storageService = emsConnection.getBean("org.apache.cassandra.db:type=StorageService"); Class<?>[] emptyParams = new Class<?>[0]; - + if (log.isDebugEnabled()) { log.debug("Disabling native transport..."); } @@ -249,7 +257,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper snapshotName = System.currentTimeMillis() + ""; } operation.invoke(snapshotName, new String[] {}); - + // max 2 sec waitForTaskToComplete(500, 10, 150); @@ -261,7 +269,7 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return new OperationResult(); } - + private void waitForTaskToComplete(int initialWaiting, int maxTries, int sleepMillis) { // initial waiting try { diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 5a60d19..6ed31b7 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -73,7 +73,7 @@ </c:list-property> </results> </operation> - + <operation name="addNodeMaintenance"> <parameters> <c:simple-property name="runRepair" type="boolean" default="true"/> @@ -111,6 +111,16 @@ </parameters> </operation> + <operation name="updateConfiguration" description="Updates the node configuration. Will require a separate server restart for the settings to take effect."> + <parameters> + <c:simple-property name="heapSize" type="string" description="The heap size to be used for both -Xms and -Xmx JVM options."/> + <c:simple-property name="jmxPort" type="integer" description="JMX port JVM option."/> + </parameters> + <results> + <c:simple-property name="operationResult" description="Outcome of updating the configuration."/> + </results> + </operation> + <resource-configuration> <c:group name="MemorySettings"> <c:simple-property name="minHeapSize" @@ -195,3 +205,4 @@ <service name="Keyspace" sourcePlugin="Cassandra" sourceType="Keyspace"/> </server> </plugin> +

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - modules/enterprise
by mike thompson 17 Jul '13

17 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java | 57 ++++++---- 1 file changed, 37 insertions(+), 20 deletions(-) New commits: commit 256e148f6e78a6c341809921d9c650e6f4e88ebe Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Jul 17 10:56:03 2013 -0700 Consolidated Metrics - Fix bug with sparkline graphs not showing proper values. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java index 605267d..d8bfb64 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java @@ -61,6 +61,7 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C final private Resource resource; private List<MetricDisplaySummary> metricDisplaySummaries; private List<List<MeasurementDataNumericHighLowComposite>> metricsDataList; + private int[] definitionArrayIds; private MeasurementUserPreferences measurementUserPrefs; public MetricsViewDataSource(Resource resource) { @@ -99,10 +100,6 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C nameField.setWidth("30%"); fields.add(nameField); - ListGridField alertsField = new ListGridField(FIELD_ALERT_COUNT, MSG.common_title_alerts()); - alertsField.setWidth("10%"); - fields.add(alertsField); - ListGridField minField = new ListGridField(FIELD_MIN_VALUE, MSG.view_resource_monitor_table_min()); minField.setWidth("15%"); fields.add(minField); @@ -119,6 +116,10 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C lastField.setWidth("15%"); fields.add(lastField); + ListGridField alertsField = new ListGridField(FIELD_ALERT_COUNT, MSG.common_title_alerts()); + alertsField.setWidth("10%"); + fields.add(alertsField); + return fields; } @@ -136,7 +137,7 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C MeasurementUtility.formatSimpleMetrics(from); ListGridRecord record = new ListGridRecord(); - record.setAttribute(FIELD_SPARKLINE, getCsvMetricsForSparkline()); + record.setAttribute(FIELD_SPARKLINE, getCsvMetricsForSparkline(from.getDefinitionId())); record.setAttribute(FIELD_METRIC_LABEL, from.getLabel()); record.setAttribute(FIELD_ALERT_COUNT, String.valueOf(from.getAlertCount())); record.setAttribute(FIELD_MIN_VALUE, getMetricStringValue(from.getMinMetric())); @@ -151,28 +152,45 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C return record; } - private String getCsvMetricsForSparkline() { + private String getCsvMetricsForSparkline(int definitionId) { StringBuilder sb = new StringBuilder(); - Log.debug("getCsvMetricsForSparkline.metricsDataList: " + metricsDataList.size()); - for (List<MeasurementDataNumericHighLowComposite> measurementData : metricsDataList) { - for (int i = 0; i < measurementData.size(); i++) { + Log.debug("getCsvMetricsForSparkline.metricsDataList("+definitionId+"): " + metricsDataList.size()); + List<MeasurementDataNumericHighLowComposite> selectedMetricsList = getMeasurementsForMeasurementDefId(definitionId); + + for (int i = 0; i < selectedMetricsList.size(); i++) { // take the last 20 values - if (i >= measurementData.size() - 20) { - if (!Double.isNaN(measurementData.get(i).getValue())) { - sb.append((int) measurementData.get(i).getValue()); + //if (i >= selectedMetricsList.size() - 20) { + MeasurementDataNumericHighLowComposite measurementData = selectedMetricsList.get(i); + if (!Double.isNaN(measurementData.getValue())) { + sb.append((int) measurementData.getValue()); sb.append(","); } - } - } - if (sb.toString().endsWith(",")) { - sb.setLength(sb.length() - 1); + //} } + + if (sb.toString().endsWith(",")) { + sb.setLength(sb.length() - 1); } Log.debug("getCsvMetricsForSparkline: " + sb.toString()); return sb.toString(); } + List<MeasurementDataNumericHighLowComposite> getMeasurementsForMeasurementDefId(int definitionId){ + List<MeasurementDataNumericHighLowComposite> selectedMetricsDataList; + int selectedIndex = 0; + + // find the ordinal position as specified when querying the metrics + for (int i = 0; i < definitionArrayIds.length; i++) { + if(definitionArrayIds[i] == definitionId){ + selectedIndex = i; + break; + } + } + + return metricsDataList.get(selectedIndex); + } + protected String getMetricStringValue(MetricDisplayValue value) { return (value != null) ? value.toString() : ""; } @@ -186,7 +204,6 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C @Override protected void executeFetch(final DSRequest request, final DSResponse response, final Criteria unused) { - Log.debug("***** Fetching MetricsView data :"); GWTServiceLookup.getMeasurementScheduleService().findSchedulesForResourceAndType(resource.getId(), DataType.MEASUREMENT, null, true, new AsyncCallback<ArrayList<MeasurementSchedule>>() { @Override @@ -211,7 +228,7 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C BrowserUtility.graphSparkLines(); } }.schedule(150); - Log.debug("*** Finished CountdownLatch for metrics loaded: " + metricsDataList.size()); + Log.debug("Finished CountdownLatch for metrics loaded: " + metricsDataList.size()); } }); @@ -262,7 +279,7 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C measurementDefMap.put(definition.getDisplayName(), definition); } //bundle definition ids for asynch call. - int[] definitionArrayIds = new int[definitions.size()]; + definitionArrayIds = new int[definitions.size()]; final String[] displayOrder = new String[definitions.size()]; measurementDefMap.keySet().toArray(displayOrder); //sort the charting data ex. Free Memory, Free Swap Space,..System Load @@ -288,7 +305,7 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C if (!measurementDataList.isEmpty()) { metricsDataList = measurementDataList; - Log.debug("*** Setting metricsDataList.size: " + metricsDataList.size()); + Log.debug("Retrieved metrics metricsDataList.size: " + metricsDataList.size()); countDownLatch.countDown(); } }

1 0

[rhq] modules/common modules/enterprise
by John Sanda 17 Jul '13

17 Jul '13

modules/common/cassandra-schema/pom.xml | 6 ++++++ modules/enterprise/server/server-metrics/pom.xml | 12 ++++++++++++ 2 files changed, 18 insertions(+) New commits: commit b268d00034cb7af8d929006e8ac4688eeae58549 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 17 13:10:58 2013 -0400 Revert "cleaning up dependencies" This reverts commit e798901b83e37cd267a2d11489664569918ef90d. diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index 55dedb8..8e3b44a 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -15,6 +15,12 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-ccm-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-util</artifactId> <version>${project.version}</version> </dependency> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 97496f7..2245978 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -47,6 +47,18 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-ccm-core</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.cassandra</groupId> + <artifactId>cassandra-clientutil</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-ccm-testng</artifactId> <version>${project.version}</version> <scope>test</scope>

1 0

[rhq] Changes to 'code-smell'
by lkrejci 17 Jul '13

17 Jul '13

New branch 'code-smell' available with the following commits:

1 0

[rhq] Branch 'code-smell' - 0 commits -
by lkrejci 17 Jul '13

17 Jul '13

Rebased ref, commits from common ancestor:

1 0

[rhq] modules/core
by Thomas Segismont 17 Jul '13

17 Jul '13

modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 15 ++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) New commits: commit a05f561f5fcac94b3308937b07d3b1e1e3f84d58 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 17 16:59:03 2013 +0200 Print simpler log message when component invocation is interrupted and log level is higher than debug diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java index a9fe1c2..3669947 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java @@ -671,8 +671,19 @@ public class ResourceContainer implements Serializable { public void markContextInterrupted() { localContext.markInterrupted(); - LOG.warn("Invocation has been marked interrupted for method [" + method + "] on resource [" - + resourceContainer.getResource() + "]"); + LOG.warn(getContextInterruptedWarningMessage(LOG.isDebugEnabled())); + } + + private String getContextInterruptedWarningMessage(boolean detailed) { + StringBuilder sb = new StringBuilder(); + sb.append("Invocation has been marked interrupted for method ["); + if (detailed) { + sb.append(method.toGenericString()); + } else { + sb.append(method.getDeclaringClass().getSimpleName()).append(".").append(method.getName()); + } + sb.append("] on resource [").append(resourceContainer.getResource()).append("]"); + return sb.toString(); } } }

1 0

[rhq] modules/enterprise
by Heiko W. Rupp 17 Jul '13

17 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java | 16 +++++++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 20 ++++------ 2 files changed, 23 insertions(+), 13 deletions(-) New commits: commit 01cd91b130f563ba62cd96a46f2cb3a2ac567a48 Author: Larry O'Leary <loleary(a)redhat.com> Date: Wed Jul 17 16:32:05 2013 +0200 BZ 981015 - Ldap auth failed if DN contained a backslash diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java index 6b7add6..0db28f7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java @@ -23,6 +23,7 @@ import java.util.Iterator; import java.util.Map.Entry; import java.util.Properties; +import javax.naming.CompositeName; import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.directory.SearchControls; @@ -194,7 +195,18 @@ public class LdapLoginModule extends UsernamePasswordLoginModule { SearchResult si = (SearchResult) answer.next(); // Construct the UserDN - String userDN = si.getName() + "," + baseDNs[x]; + String userDN = null; + + try { + userDN = si.getNameInNamespace(); + } catch (UnsupportedOperationException use) { + userDN = new CompositeName(si.getName()).get(0); + if (si.isRelative()) { + userDN += "," + baseDNs[x]; + } + } + + log.debug("Using LDAP userDN=" + userDN); ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, userDN); ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, inputPassword); @@ -209,7 +221,7 @@ public class LdapLoginModule extends UsernamePasswordLoginModule { // If we try all the BaseDN's and have not found a match, return false return false; } catch (Exception e) { - log.info("Failed to validate password: " + e.getMessage()); + log.info("Failed to validate password for [" + userName + "]: " + e.getMessage()); return false; } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index 532a944..a28c709 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.server.resource.group; @@ -33,6 +33,7 @@ import java.util.Set; import javax.ejb.EJB; import javax.ejb.Stateless; +import javax.naming.CompositeName; import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.NamingException; @@ -345,12 +346,9 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { try { userDN = si.getNameInNamespace(); } catch (UnsupportedOperationException use) { - userDN = si.getName(); - if (userDN.startsWith("\"")) { - userDN = userDN.substring(1, userDN.length()); - } - if (userDN.endsWith("\"")) { - userDN = userDN.substring(0, userDN.length() - 1); + userDN = new CompositeName(si.getName()).get(0); + if (si.isRelative()) { + userDN += "," + baseDNs[x]; } userDN = userDN + "," + baseDNs[x]; } @@ -507,7 +505,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { /** Translate SystemSettings to familiar Properties instance since we're * passing not one but multiple values. - * + * * @param systemSettings * @return */ @@ -532,7 +530,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { /** Executes the LDAP group query using the filters, context and search controls, etc. parameters passed in. * The matching groups located during processing this pages of results are added as new entries to the * groupDetailsMap passed in. - * + * * @param filter * @param groupDetailsMap * @param ctx

1 0

[rhq] 3 commits - modules/common modules/enterprise modules/helpers
by John Sanda 17 Jul '13

17 Jul '13

modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java | 2 modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 4 modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java | 123 ++++++++++ modules/common/cassandra-installer/src/test/resources/log4j.properties | 41 +++ modules/common/cassandra-schema/pom.xml | 6 modules/enterprise/server/server-metrics/pom.xml | 12 modules/helpers/metrics-simulator/pom.xml | 6 7 files changed, 173 insertions(+), 21 deletions(-) New commits: commit 165c9c9f8da7251c0000444f04161171a7d5794f Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 17 07:37:12 2013 -0400 need to make cassandra-ccm-core a direct dependency now diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml index a55afa5..0a06610 100644 --- a/modules/helpers/metrics-simulator/pom.xml +++ b/modules/helpers/metrics-simulator/pom.xml @@ -13,6 +13,12 @@ <dependencies> <dependency> <groupId>org.rhq</groupId> + <artifactId>rhq-cassandra-ccm-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-schema</artifactId> <version>${project.version}</version> </dependency> commit fb59ea4fb09414875afcaa9543788e3cfc1b14f1 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 17 07:35:22 2013 -0400 initial commit for StorageInstallerTest This commit provides some initial test coverage for the storage installer. More tests will be added to cover various error handling situations and upgrade scenarios. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java index 7496d08..338ef3a 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java @@ -303,7 +303,7 @@ public class CassandraClusterManager { return nodeIds; } - private void killNode(File nodeDir) throws Exception { + public void killNode(File nodeDir) throws Exception { long pid = getPid(nodeDir); CLibrary.kill((int) pid, 9); } diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 2fec2dc..63282e4 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -485,7 +485,7 @@ public class StorageInstaller { private PropertiesFileUpdate getServerProperties() { String sysprop = System.getProperty("rhq.server.properties-file"); if (sysprop == null) { - throw new RuntimeException("The required system property [rhq.server.properties] is not defined."); + throw new RuntimeException("The required system property [rhq.server.properties-file] is not defined."); } File file = new File(sysprop); @@ -605,7 +605,7 @@ public class StorageInstaller { return new File(binDir, "cassandra.pid").exists(); } - private boolean verifyNodeIsUp(String address, int jmxPort, int retries, long timeout) throws Exception { + boolean verifyNodeIsUp(String address, int jmxPort, int retries, long timeout) throws Exception { String url = "service:jmx:rmi:///jndi/rmi://" + address + ":" + jmxPort + "/jmxrmi"; JMXServiceURL serviceURL = new JMXServiceURL(url); JMXConnector connector = null; diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java new file mode 100644 index 0000000..3fd13c7 --- /dev/null +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -0,0 +1,123 @@ +package org.rhq.storage.installer; + + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.Properties; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.PosixParser; +import org.apache.commons.io.FileUtils; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import org.rhq.cassandra.CassandraClusterManager; +import org.rhq.core.util.file.FileUtil; + +/** + * @author John Sanda + */ +public class StorageInstallerTest { + + private File basedir; + + private File storageDir; + + private StorageInstaller installer; + + @BeforeMethod + public void initDirs(Method test) throws Exception { + File dir = new File(getClass().getResource(".").toURI()); + basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); + FileUtil.purge(basedir, true); + basedir.mkdirs(); + + System.setProperty("rhq.server.basedir", basedir.getAbsolutePath()); + + File serverPropsFile = new File(basedir, "rhq-server.properties"); + FileUtils.touch(serverPropsFile); + System.setProperty("rhq.server.properties-file", serverPropsFile.getAbsolutePath()); + + storageDir = new File(basedir, "rhq-storage"); + + installer = new StorageInstaller(); + } + + @AfterMethod + public void shutdownStorageNode() throws Exception { + CassandraClusterManager ccm = new CassandraClusterManager(); + ccm.killNode(storageDir); + } + + @Test + public void performValidInstall() throws Exception { + CommandLineParser parser = new PosixParser(); + + String[] args = { + "--dir", storageDir.getAbsolutePath(), + "--commitlog", new File(storageDir, "commit_log").getAbsolutePath(), + "--data", new File(storageDir, "data").getAbsolutePath(), + "--saved-caches", new File(storageDir, "saved_caches").getAbsolutePath(), + "--heap-size", "256M", + "--heap-new-size", "64M", + "--hostname", "127.0.0.1" + }; + + CommandLine cmdLine = parser.parse(installer.getOptions(), args); + int status = installer.run(cmdLine); + + assertEquals(status, 0, "Expected to get back a status code of 0 for a successful install"); + assertNodeIsRunning(); + assertRhqServerPropsUpdated(); + + File binDir = new File(storageDir, "bin"); + assertTrue(binDir.exists(), "Expected to find bin directory at " + binDir); + + File confDir = new File(storageDir, "conf"); + assertTrue(confDir.exists(), "Expected to find conf directory at " + confDir); + + File libDir = new File(storageDir, "lib"); + assertTrue(libDir.exists(), "Expected to find lib directory at " + libDir); + + File commitLogDir = new File(storageDir, "commit_log"); + assertTrue(commitLogDir.exists(), "Expected to find commit_log directory at " + commitLogDir); + + File dataDir = new File(storageDir, "data"); + assertTrue(dataDir.exists(), "Expected to find data directory at " + dataDir); + + File savedCachesDir = new File(storageDir, "saved_caches"); + assertTrue(savedCachesDir.exists(), "Expected to find saved_caches directory at " + savedCachesDir); + } + + private void assertNodeIsRunning() { + try { + installer.verifyNodeIsUp("127.0.0.1", 7299, 3, 1000); + } catch (Exception e) { + fail("Failed to verify that node is up", e); + } + } + + private void assertRhqServerPropsUpdated() { + File serverPropsFile = new File(basedir, "rhq-server.properties"); + Properties properties = new Properties(); + + try { + properties.load(new FileInputStream(serverPropsFile)); + } catch (IOException e) { + fail("Failed to verify that " + serverPropsFile + " was updated", e); + } + + String seeds = properties.getProperty("rhq.cassandra.seeds"); + + assertEquals(seeds, "127.0.0.1|7299|9142"); + } + +} diff --git a/modules/common/cassandra-installer/src/test/resources/log4j.properties b/modules/common/cassandra-installer/src/test/resources/log4j.properties new file mode 100644 index 0000000..d56cc88 --- /dev/null +++ b/modules/common/cassandra-installer/src/test/resources/log4j.properties @@ -0,0 +1,41 @@ +# +# /* +# * RHQ Management Platform +# * Copyright (C) 2005-2012 Red Hat, Inc. +# * All rights reserved. +# * +# * This program is free software; you can redistribute it and/or modify +# * it under the terms of the GNU General Public License, version 2, as +# * published by the Free Software Foundation, and/or the GNU Lesser +# * General Public License, version 2.1, also as published by the Free +# * Software Foundation. +# * +# * This program is distributed in the hope that it will be useful, +# * but WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# * GNU General Public License and the GNU Lesser General Public License +# * for more details. +# * +# * You should have received a copy of the GNU General Public License +# * and the GNU Lesser General Public License along with this program; +# * if not, write to the Free Software Foundation, Inc., +# * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# */ +# + +log4j.rootCategory=WARN, FILE, CONSOLE + +log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender +log4j.appender.FILE.DatePattern='.'yyyy-MM-dd +log4j.appender.FILE.File=./target/test.log +log4j.appender.FILE.layout=org.apache.log4j.PatternLayout +log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n +#log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n +log4j.appender.FILE.Append=false + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +#log4j.appender.CONSOLE.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n + +log4j.logger.org.rhq=DEBUG commit e798901b83e37cd267a2d11489664569918ef90d Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 16 16:16:01 2013 -0400 cleaning up dependencies diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index 8e3b44a..55dedb8 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -15,12 +15,6 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>rhq-cassandra-ccm-core</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-util</artifactId> <version>${project.version}</version> </dependency> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 2245978..97496f7 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -47,18 +47,6 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>rhq-cassandra-ccm-core</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.cassandra</groupId> - <artifactId>cassandra-clientutil</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>rhq-cassandra-ccm-testng</artifactId> <version>${project.version}</version> <scope>test</scope>

1 0

[rhq] modules/helpers
by Heiko W. Rupp 17 Jul '13

17 Jul '13

modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Parameter.java | 5 modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/RhqType.java | 77 +++ modules/helpers/pluginGen/pom.xml | 7 modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java | 44 + modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/DirectoryClassLoader.java | 142 ++++++ modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java | 229 ++++++---- modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java | 31 + modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java | 59 +- modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java | 110 ++++ modules/helpers/pluginGen/src/main/resources/component.ftl | 9 modules/helpers/pluginGen/src/main/resources/descriptor.ftl | 5 modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl | 17 modules/helpers/pluginGen/src/main/resources/pom.ftl | 15 modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java | 55 ++ 14 files changed, 671 insertions(+), 134 deletions(-) New commits: commit ae96f1c0ad6e797e889923dc47a1f3c55c8eb394 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Jul 17 11:06:21 2013 +0200 Allow to specify a directory with classes to scan for plugin annotations and to auto-create metrics+operations from them. diff --git a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Parameter.java b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Parameter.java index 4b82a13..29dcc1e 100644 --- a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Parameter.java +++ b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Parameter.java @@ -29,13 +29,14 @@ import java.lang.annotation.Target; /** * Parameter. - * + * * @author Galder Zamarreño * @since 4.0 */ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) public @interface Parameter { - String name() default ""; + String name() ; String description() default ""; + RhqType type() default RhqType.VOID; } diff --git a/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/RhqType.java b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/RhqType.java new file mode 100644 index 0000000..1487a51 --- /dev/null +++ b/modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/RhqType.java @@ -0,0 +1,77 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginAnnotations.agent; + +import java.io.File; + + +/** + * Base data types from RHQ for properties + * @author Heiko W. Rupp + */ +public enum RhqType { + INTEGER(new Class<?>[]{Integer.class,int.class},Boolean.class), + LONG(new Class<?>[]{Long.class,long.class},Long.class), + DOUBLE(new Class<?>[]{Double.class,double.class},Double.class), + STRING(new Class<?>[]{String.class},String.class), + LONG_STRING(new Class<?>[]{},String.class), + PASSWORD(new Class<?>[]{},String.class), + BOOLEAN(new Class<?>[]{Boolean.class, boolean.class},Boolean.class), + FLOAT(new Class<?>[]{Float.class, float.class},Float.class), + FILE(new Class<?>[]{File.class},File.class), + DIRECTORY(new Class<?>[]{},File.class), + VOID(new Class<?>[]{Void.class,void.class},Void.class) + ; + private Class<?>[] fromClasses; + private Class<?> toClass; + + private RhqType(Class<?>[] fromClasses,Class<?> toClass) { + + this.fromClasses = fromClasses; + this.toClass = toClass; + } + + public Class<?>[] getFromClasses() { + return fromClasses; + } + + public Class<?> getToClass() { + return toClass; + } + + public static RhqType findType(Class<?> clazz) { + for (RhqType type : RhqType.values()) { + for (Class from : type.getFromClasses()) { + if (clazz.equals(from)) { + return type; + } + } + } + return null; + } + + public String getRhqName() { + String name = name().toLowerCase(); + if (name.equals("long_string")) { + name = "longString"; + } + return name; + } +} diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 5aa512c..e7744e4 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -19,6 +19,11 @@ <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> + <properties> +  + <animal.sniffer.java.signature.artifactId>java17</animal.sniffer.java.signature.artifactId> + </properties> + <build> <plugins> @@ -104,7 +109,7 @@ <dependency> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-pluginAnnotations</artifactId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> </dependency> <dependency> <groupId>com.oracle</groupId> diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java new file mode 100644 index 0000000..3c90b7b --- /dev/null +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/AnnotationProcessor.java @@ -0,0 +1,44 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginGen; + +import java.util.List; + +/** + * Processor that scans a directory for annotated classes and generates metrics etc. from them. + * @author Heiko W. Rupp + */ +public class AnnotationProcessor { + + private List<Class> classList; + private final DirectoryClassLoader classLoader; + + public AnnotationProcessor(String baseDirectory) { + classLoader = new DirectoryClassLoader(); + classLoader.setBaseDir(baseDirectory); + } + + public void populate(Props props) { + classList = classLoader.findClasses(); + + props.populateMetrics(classList); + props.populateOperations(classList); + } +} diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/DirectoryClassLoader.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/DirectoryClassLoader.java new file mode 100644 index 0000000..b4a729f --- /dev/null +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/DirectoryClassLoader.java @@ -0,0 +1,142 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginGen; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileFilter; +import java.io.FileInputStream; +import java.nio.file.FileVisitor; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.List; + +/** + * Classloader to load from a given directory + * @author Heiko W. Rupp + */ +public class DirectoryClassLoader extends ClassLoader { + private Hashtable classes = new Hashtable(); //used to cache already defined classes + private String baseDir; + + @Override + protected Class<?> findClass(String pathName) throws ClassNotFoundException { + + + if (baseDir==null) { + throw new IllegalStateException("Must set baseDir first"); + } + + byte classByte[]; + Class result = null; + + String className = pathName.substring(baseDir.length()+1); // remove base dir + className = className.substring(0,className.length()-6); // remove .class + className = className.replaceAll(File.separator,"."); // change / -> . + + result = (Class) classes.get(className); //checks in cached classes + if (result != null) { + return result; + } + try { + File classFile = new File(pathName); + FileInputStream fis = new FileInputStream(classFile); + + ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); + int nextValue = fis.read(); + while (-1 != nextValue) { + byteStream.write(nextValue); + nextValue = fis.read(); + } + + classByte = byteStream.toByteArray(); + result = defineClass(className, classByte, 0, classByte.length, null); + classes.put(className, result); + return result; + } catch (Exception e) { + return null; + } + } + + public void setBaseDir(String baseDir) { + this.baseDir = baseDir; + } + + public List<Class> findClasses() { + if (baseDir==null) { + throw new IllegalStateException("Must set baseDir first"); + } + + File baseFile = new File(baseDir); + if(!baseFile.isDirectory()) { + throw new IllegalStateException("BaseDir is no directory"); + } + if (!baseFile.canRead()) { + throw new IllegalStateException("BaseDir is not readable"); + } + + List<File> files = walk(baseFile); + + List<Class> classes = new ArrayList<>(); + for (File file : files) { + String fileName = file.getAbsolutePath(); + + Class clazz = null; + try { + clazz = findClass(fileName); + } catch (ClassNotFoundException e) { + e.printStackTrace(); // TODO: Customise this generated block + } + classes.add(clazz); + + } + + return classes; + } + + private List<File> walk(File path) { + + List<File> files = new ArrayList<>(); + + File[] list = path.listFiles(); + + if (list == null) { + return files; + } + + for ( File f : list ) { + if ( f.isDirectory() ) { + List<File> newFiles = walk( f ); + System.out.println( "Dir:" + f.getAbsoluteFile() ); + files.addAll(newFiles); + } + else { + System.out.println( "File:" + f.getAbsoluteFile() ); + if (f.getName().endsWith(".class") && !f.getName().contains("$")) { + files.add(f); + } + + } + } + return files; + } +} diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java index e7da952..21d0d4d 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java @@ -149,9 +149,12 @@ public class Generator extends Application{ Label label = new Label("Messages:"); msgBox.getChildren().add(label); errorMessage = new Text(); - errorMessage.setFont(Font.font("Arial", FontWeight.SEMI_BOLD, 12)); + errorMessage.setFont(Font.font("Arial", FontWeight.SEMI_BOLD, 15)); errorMessage.setId("errorMessage"); msgBox.getChildren().add(errorMessage); + msgBox.setPadding(new Insets(5)); + msgBox.setSpacing(3); + msgBox.setAlignment(Pos.BASELINE_LEFT); return msgBox; } @@ -172,94 +175,14 @@ public class Generator extends Application{ // Now add the field itself final Class propType = prop.getType(); if (propType.equals(String.class)) { - final Pattern pattern = Pattern.compile(prop.getValidationRegex()); - - final TextField input = new TextField(); - // Add field leave event to fill in the props with the result - input.focusedProperty().addListener(new ChangeListener<Boolean>() { - @Override - public void changed(ObservableValue<? extends Boolean> observableValue, Boolean oldState, - Boolean newState) { - if (newState) { // User entered input field - descriptionField.setText(prop.getDescription()); - } - else { // User left input field - descriptionField.setText(""); - setPropsValue(prop.getVariableName(),input.getText(), propType); // TODO right place? - } - } - }); - // Add validation of the input - input.textProperty().addListener(new ChangeListener<String>() { - @Override - public void changed(ObservableValue<? extends String> observableValue, String s, String newText) { - Matcher m = pattern.matcher(newText); - if (!m.matches()) { - setErrorMessage("Input does not match " + prop.getValidationRegex()); - } else { - clearErrorMessage(); - } - - } - }); - root.add(input, 1, row); + addStringField(root, descriptionField, row, prop); } else if (propType.equals(Boolean.class) || propType.equals(boolean.class)) { - final ChoiceBox choiceBox = new ChoiceBox(); - choiceBox.getItems().addAll("Yes", "No"); - choiceBox.getSelectionModel().selectLast(); // NO is default - choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { - @Override - public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { - setPropsValue(prop.getVariableName(), newValue.equals("Yes"), propType); - } - }); - Tooltip tooltip = new Tooltip(prop.getDescription()); // TODO make this a hover listener - choiceBox.setTooltip(tooltip); - - root.add(choiceBox, 1, row); + addBooleanField(root, row, prop); } else if (propType.equals(ResourceCategory.class)) { - final ChoiceBox choiceBox = new ChoiceBox(); - for (ResourceCategory cat : ResourceCategory.values()) { - choiceBox.getItems().add(cat.getLowerName()); - } - choiceBox.getSelectionModel().selectLast(); // service is default - choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { - @Override - public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { - ResourceCategory newCategory = ResourceCategory.valueOf(newValue.toUpperCase()); - setPropsValue(prop.getVariableName(),newCategory,propType); - } - }); - Tooltip tooltip = new Tooltip(prop.getDescription()); // TODO make this a hover listener - choiceBox.setTooltip(tooltip); - root.add(choiceBox,1,row); + addResourceTypeChooser(root, row, prop); } else if (propType.equals(File.class)) { - // Can not add this directly, so add a button to trigger it - final Text text = new Text(); - text.setText("Pick a directory"); - root.add(text,1,row); - Tooltip tooltip = new Tooltip("Pick the (parent) directory where the plugin will be put in."); - Button pickButton = new Button("Pick"); - pickButton.setTooltip(tooltip); - pickButton.setOnAction(new EventHandler<ActionEvent>() { - @Override - public void handle(ActionEvent actionEvent) { - DirectoryChooser chooser = new DirectoryChooser(); - chooser.setTitle("Pick a directory where the plugin will be put in."); - File dir = chooser.showDialog(primaryStage); - if (dir != null) { - String dirName = dir.getAbsolutePath(); - props.setFileSystemRoot(dirName); - clearErrorMessage(); - text.setText(dirName); - } else { - setErrorMessage("No directory selected"); - text.setText("Pick a directory"); - } - } - }); - - root.add(pickButton,2,row); + addDirectoryChooserField(root, row, prop, descriptionField); + } row++; @@ -269,6 +192,115 @@ public class Generator extends Application{ return row; } + private void addDirectoryChooserField(GridPane root, int row, final Prop prop, final Text descriptionField) { + // Can not add this directly, so add a button to trigger it + final TextField input = new TextField(); + root.add(input,1,row); + Tooltip tooltip = new Tooltip(prop.getDescription()); + Button pickButton = new Button("Pick"); + input.setTooltip(tooltip); + pickButton.setTooltip(tooltip); + pickButton.setOnAction(new EventHandler<ActionEvent>() { + @Override + public void handle(ActionEvent actionEvent) { + DirectoryChooser chooser = new DirectoryChooser(); + chooser.setTitle(prop.getDescription()); + File dir = chooser.showDialog(primaryStage); + if (dir != null) { + String dirName = dir.getAbsolutePath(); + setPropsValue(prop.getVariableName(), dirName, String.class); + clearErrorMessage(); + input.setText(dirName); + } else { + setErrorMessage("No directory selected"); + input.setText("Pick a directory"); + } + } + }); + input.focusedProperty().addListener(new ShowFieldDescriptionHandler(prop,descriptionField,input)); + // Add validation of the input + input.textProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newText) { + File file = new File(newText); + if (!file.isDirectory()) { + setErrorMessage(newText + " is no directory"); + } else if (prop.isDirectoryWriteable() && !file.canWrite()) { + setErrorMessage(newText + " is not writable"); + } else if (!prop.isDirectoryWriteable() && !file.canRead()) { + setErrorMessage(newText + " is not readable"); + } else { + clearErrorMessage(); + } + + } + }); + + + + root.add(pickButton,2,row); + } + + private void addResourceTypeChooser(GridPane root, int row, final Prop prop) { + final ChoiceBox choiceBox = new ChoiceBox(); + for (ResourceCategory cat : ResourceCategory.values()) { + choiceBox.getItems().add(cat.getLowerName()); + } + choiceBox.getSelectionModel().selectLast(); // service is default + choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { + ResourceCategory newCategory = ResourceCategory.valueOf(newValue.toUpperCase()); + setPropsValue(prop.getVariableName(),newCategory,prop.getType()); + } + }); + Tooltip tooltip = new Tooltip(prop.getDescription()); // TODO make this a hover listener + choiceBox.setTooltip(tooltip); + root.add(choiceBox,1,row); + } + + private void addBooleanField(GridPane root, int row, final Prop prop) { + final ChoiceBox choiceBox = new ChoiceBox(); + choiceBox.getItems().addAll("Yes", "No"); + choiceBox.getSelectionModel().selectLast(); // NO is default + choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { + setPropsValue(prop.getVariableName(), newValue.equals("Yes"), prop.getType()); + } + }); + Tooltip tooltip = new Tooltip(prop.getDescription()); // TODO make this a hover listener + choiceBox.setTooltip(tooltip); + + root.add(choiceBox, 1, row); + } + + private void addStringField(GridPane root, final Text descriptionField, int row, final Prop prop) { + final Pattern pattern = Pattern.compile(prop.getValidationRegex()); + + final TextField input = new TextField(); + if (prop.getDefaultValue()!=null && !prop.getDefaultValue().isEmpty()) { + input.setText(prop.getDefaultValue()); + setPropsValue(prop.getVariableName(),prop.getDefaultValue(),prop.getType()); + } + // Add field leave event to fill in the props with the result + input.focusedProperty().addListener(new ShowFieldDescriptionHandler(prop,descriptionField,input)); + // Add validation of the input + input.textProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newText) { + Matcher m = pattern.matcher(newText); + if (!m.matches()) { + setErrorMessage("Input does not match " + prop.getValidationRegex()); + } else { + clearErrorMessage(); + } + + } + }); + root.add(input, 1, row); + } + private void setInfoMessage(String message) { errorMessage.setText(message); errorMessage.setFill(Color.DARKGREEN); @@ -297,4 +329,29 @@ public class Generator extends Application{ } } + + private class ShowFieldDescriptionHandler implements ChangeListener<Boolean> { + + private Prop prop; + private Text descriptionField; + private TextField input; + + private ShowFieldDescriptionHandler(Prop prop,Text descriptionField, TextField input) { + this.prop = prop; + this.descriptionField = descriptionField; + this.input = input; + } + + @Override + public void changed(ObservableValue<? extends Boolean> observableValue, Boolean oldState, + Boolean newState) { + if (newState) { // User entered input field + descriptionField.setText(prop.getDescription()); + } + else { // User left input field + descriptionField.setText(""); + setPropsValue(prop.getVariableName(),input.getText(), String.class); // TODO right place? + } + } + } } diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java index 64b5509..8722446 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java @@ -51,6 +51,19 @@ public class PluginGen { private final Log log = LogFactory.getLog(PluginGen.class); public static void main(String[] arg) throws Exception { + + if (arg.length>0) { + if (arg[0].equals("-ui")) { + Generator.main(arg); + + } + else { + System.out.println("use option -ui to start the UI version"); + } + System.exit(0); + } + + PluginGen pg = new PluginGen(); pg.run(); @@ -121,10 +134,24 @@ public class PluginGen { String pkg = props.getPackagePrefix() + "." + props.getName(); props.setPkg(pkg); + String name = props.getName(); // Type name + + if (props.getComponentClass().contains("{name}")) { + props.setComponentClass(props.getComponentClass().replace("{name}",name)); + } + + if (props.getDiscoveryClass().contains("{name}")) { + props.setDiscoveryClass(props.getDiscoveryClass().replace("{name}",name)); + } + for (Props cProp : props.getChildren()) { cProp.setPkg(pkg); } + if (props.getScanForAnnotations()!=null) { + AnnotationProcessor ap = new AnnotationProcessor(props.getScanForAnnotations()); + ap.populate(props); + } } /** @@ -247,7 +274,7 @@ public class PluginGen { } boolean success; - File activeDirectory = new File(props.getFileSystemRoot(), props.getName()); + File activeDirectory = new File(props.getFileSystemRoot(), props.getPluginName()); if (!activeDirectory.exists()) { success = activeDirectory.mkdir(); @@ -260,7 +287,7 @@ public class PluginGen { // write pom.xml createFile(props, "pom", "pom.xml", activeDirectory.getAbsolutePath()); - // Create java directory hierarchie + // Create java directory hierarchy String path = activeDirectory.getAbsolutePath() + File.separator + "src" + File.separator + "main" + File.separator; diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java index 4ed019a..40e729c 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java @@ -30,48 +30,62 @@ public enum Prop { PLUGIN_NAME("pluginName", String.class,"Name of the plugin", "\\w+" , true ), PLUGIN_DESCRIPTION("pluginDescription", String.class,"Description of the plugin",".*" , true ), PACKAGE("packagePrefix", String.class,"Default Package","[a-zA-Z\\.]+",true ), - FILE_ROOT("fileSystemRoot", File.class,"Root directory to put the plugin",".*",true ), + FILE_ROOT("fileSystemRoot", File.class,"Root directory to put the plugin into",".*",true , true,null), RHQ_VERSION("rhqVersion",String.class,"RHQ version to use","[0-9][0-9\\.]+",true), CATEGORY("category", ResourceCategory.class, "Category of the resource type (platform = host level)",null), TYPE_NAME("name", String.class, "Name of the resource type", "\\w+"), DESCRIPTION("description", String.class, "Description of the type", ".*"), - DISCOVERY_CLASS("discoveryClass", String.class, "Discovery class", "[A-Z][a-zA-Z0-9]*"), - COMPONENT_CLASS("componentClass", String.class, "Discovery class", "[A-Z][a-zA-Z0-9]*"), + DISCOVERY_CLASS("discoveryClass", String.class, "Name of the Discovery class. '{name}' will be replaced with the type name", "[A-Z][a-zA-Z0-9]*",false,false,"{name}Discovery"), + COMPONENT_CLASS("componentClass", String.class, "Name of the Discovery class. '{name}' will be replaced with the type name", "[A-Z][a-zA-Z0-9]*",false,false,"{name}Component"), IS_SINGLETON("singleton",boolean.class,"Is this type a singleton, which means that" + - " there can only be one resource of that type for the given parent?",null), - HAS_METRICS("hasMetrics",boolean.class,"Does this type support taking metrics?",null), - HAS_OPERATIONS("hasOperations",boolean.class,"Does this type support operations?",null), - HAS_EVENTS("events",boolean.class,"Does this type support events?",null), - HAS_SUPPORT_FACET("supportFacet",boolean.class,"Does this type support the support facet?",null), + " there can only be one resource of that type for the given parent?"), + HAS_METRICS("hasMetrics",boolean.class,"Does this type support taking metrics?"), + HAS_OPERATIONS("hasOperations",boolean.class,"Does this type support operations?"), + HAS_EVENTS("events",boolean.class,"Does this type support events?"), + HAS_SUPPORT_FACET("supportFacet",boolean.class,"Does this type support the support facet?"), RESOURCE_CONFIGURATION("resourceConfiguration",boolean.class,"Does this type support " + - "configuring the resource?",".*"), - CAN_CREATE_CHILDREN("createChildren",boolean.class,"Can the type create child resources?",null), - CAN_DELETE_CHILDREN("deleteChildren",boolean.class,"Can the type delete child resources?",null), - - // TODO add the remaining properties from Prop.class - + "configuring the resource?"), + CAN_CREATE_CHILDREN("createChildren",boolean.class,"Can the type create child resources?"), + CAN_DELETE_CHILDREN("deleteChildren",boolean.class,"Can the type delete child resources?"), + USE_EXTENAL_JARS("usesExternalJarsInPlugin",boolean.class,"Will the plugin use external jars in the plugin jar?"), + ALLOW_MANUAL_ADD("manualAddOfResourceType",boolean.class,"Should manually adding resource be supported?"), + USE_LIFECYLE_API("usePluginLifecycleListenerApi",boolean.class,"Should the plugin lifecycle api be supported?"), + DEPENDS_ON_JMX_PLUGIN("dependsOnJmxPlugin",boolean.class,"Does the plugin use JMX and extend the JMX Plugin?"), + DEPENDS_ON_AS7_PLUGIN("dependsOnAs7Plugin",boolean.class,"Does the plugin use DMR and extend the AS7 Plugin?"), + USE_SUPPORT_FACET("supportFacet",boolean.class,"Will the support facet be used?"), + + SCAN_FOR_ANNOTATIONS("scanForAnnotations",File.class,"Directory to scan for plugin annotations to include in type",null, false,false, null) ; private String variableName; private Class type; private String description; private boolean pluginLevel; + private boolean directoryWriteable; + private String defaultValue; private String validationRegex; - private Prop(String variableName, Class type, String description, String validationRegex, boolean pluginLevel) { + private Prop(String variableName, Class type, String description, String validationRegex, boolean pluginLevel, boolean directoryWriteable, String defaultValue) { this.variableName = variableName; this.type = type; this.description = description; this.validationRegex = validationRegex; this.pluginLevel = pluginLevel; + this.directoryWriteable = directoryWriteable; + this.defaultValue = defaultValue; + } + + private Prop(String variableName, Class type, String description, String validationRegex, boolean pluginLevel) { + this(variableName,type,description,validationRegex,pluginLevel,false,null); } private Prop(String variableName, Class type, String description, String validationRegex) { - this.variableName = variableName; - this.type = type; - this.description = description; - this.validationRegex = validationRegex; + this(variableName,type,description,validationRegex,false,false,null); + } + + private Prop(String variableName, Class type, String description) { + this(variableName,type,description,null,false,false,null); } public String getVariableName() { @@ -111,4 +125,11 @@ public enum Prop { return builder.toString(); } + public boolean isDirectoryWriteable() { + return directoryWriteable; + } + + public String getDefaultValue() { + return defaultValue; + } } diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java index 237f5ad..95be574 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java @@ -18,6 +18,9 @@ */ package org.rhq.helpers.pluginGen; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; @@ -26,6 +29,9 @@ import java.util.Set; import org.rhq.helpers.pluginAnnotations.agent.DataType; import org.rhq.helpers.pluginAnnotations.agent.DisplayType; import org.rhq.helpers.pluginAnnotations.agent.Metric; +import org.rhq.helpers.pluginAnnotations.agent.Operation; +import org.rhq.helpers.pluginAnnotations.agent.Parameter; +import org.rhq.helpers.pluginAnnotations.agent.RhqType; import org.rhq.helpers.pluginAnnotations.agent.Units; /** @@ -33,6 +39,7 @@ import org.rhq.helpers.pluginAnnotations.agent.Units; * * @author Heiko W. Rupp */ +@SuppressWarnings("unused") public class Props { /** What category is this ? */ @@ -69,7 +76,7 @@ public class Props { private boolean createChildren; /** Can the service delete children ? */ private boolean deleteChildren; - /** Use externals chars in the plugin jar ? */ + /** Use externals jars in the plugin jar ? */ private boolean usesExternalJarsInPlugin; /** Does it support manual add of children ? */ private boolean manualAddOfResourceType; @@ -77,8 +84,12 @@ public class Props { private boolean usePluginLifecycleListenerApi; /** Depends on JMX plugin ? */ private boolean dependsOnJmxPlugin; + /** Depends on AS7 plugin ? */ + private boolean dependsOnAs7Plugin; + /** Directory with java files to scan for plugin annotations */ + private String scanForAnnotations; /** What version of RHQ should this plugin's pom use ? */ - private String rhqVersion = "3.0.0"; + private String rhqVersion = "4.8.0"; /** Embedded children */ private Set<Props> children = new HashSet<Props>(); @@ -336,22 +347,97 @@ public class Props { this.runsInsides = runsInsides; } + public boolean isDependsOnAs7Plugin() { + return dependsOnAs7Plugin; + } + + public void setDependsOnAs7Plugin(boolean dependsOnAs7Plugin) { + this.dependsOnAs7Plugin = dependsOnAs7Plugin; + } + + public String getScanForAnnotations() { + return scanForAnnotations; + } + + public void setScanForAnnotations(String scanForAnnotations) { + this.scanForAnnotations = scanForAnnotations; + } + public void populateMetrics(List<Class> classes) { - for (Class<?> clazz : classes) { - Metric metricAnnot = clazz.getAnnotation(Metric.class); - if (metricAnnot != null) { - MetricProps metric = new MetricProps(metricAnnot.property()); + for (Class<?> clazz : classes) { + for (Field field : clazz.getDeclaredFields()) { + Metric metricAnnot = field.getAnnotation(Metric.class); + addMetric(metricAnnot, field.getName()); + } + + for (Method method : clazz.getDeclaredMethods()) { + Metric metricAnnot = method.getAnnotation(Metric.class); + addMetric(metricAnnot, method.getName()); + } + } + } + + public void populateOperations(List<Class> classes) { + for (Class<?> clazz : classes) { + for (Method method : clazz.getDeclaredMethods()) { + Operation operationAnnot = method.getAnnotation(Operation.class); + if (operationAnnot != null) { + String property = operationAnnot.name(); + if (property.isEmpty()) { + property = method.getName(); + } + OperationProps op = new OperationProps(property); + op.setDisplayName(operationAnnot.displayName()); + op.setDescription(operationAnnot.description()); + RhqType type = RhqType.findType(method.getReturnType()); + if (type != RhqType.VOID) { + SimpleProperty simpleProperty = new SimpleProperty(type.getRhqName()); + op.setResult(simpleProperty); + } + + Class[] types = method.getParameterTypes(); + int i=0; + for (Annotation[] annotations : method.getParameterAnnotations() ) { + for (Annotation annotation : annotations) { + if (annotation instanceof Parameter) { + Parameter parameter = (Parameter) annotation; + SimpleProperty simpleProperty = new SimpleProperty(parameter.name()); + simpleProperty.setDescription(parameter.description()); + Class typeClass = types[i]; + RhqType rhqType = RhqType.findType(typeClass); + if (parameter.type()!=RhqType.VOID){ + rhqType = parameter.type(); + } + simpleProperty.setType(rhqType.getRhqName()); + op.getParams().add(simpleProperty); + } + } + i++; + } + operations.add(op); + } + + } + } + } + + private void addMetric(Metric metricAnnot, String name) { + if (metricAnnot != null) { + String property = metricAnnot.property(); + if (property.isEmpty()) { + property = name; + } + MetricProps metric = new MetricProps(property); metric.setDisplayName(metricAnnot.displayName()); metric.setDisplayType(metricAnnot.displayType()); metric.setDataType(metricAnnot.dataType()); metric.setDescription(metricAnnot.description()); + metric.setUnits(metricAnnot.units()); metrics.add(metric); - } - - } - } + } + } - @Override + @Override public String toString() { final StringBuilder sb = new StringBuilder(); sb.append("Props"); @@ -387,7 +473,7 @@ public class Props { return sb.toString(); } - public static class TypeKey { + public static class TypeKey { private String name; private String pluginName; diff --git a/modules/helpers/pluginGen/src/main/resources/component.ftl b/modules/helpers/pluginGen/src/main/resources/component.ftl index 1b3dda1..b445008 100644 --- a/modules/helpers/pluginGen/src/main/resources/component.ftl +++ b/modules/helpers/pluginGen/src/main/resources/component.ftl @@ -187,7 +187,6 @@ public class ${props.componentClass} implements ResourceComponent<#if props.pare <#if props.operations??> - public void startOperationFacet(OperationContext context) { } @@ -203,6 +202,13 @@ public class ${props.componentClass} implements ResourceComponent<#if props.pare public OperationResult invokeOperation(String name, Configuration params) throws Exception { OperationResult res = new OperationResult(); +<#if props.operations?has_content> + <#list props.operations as operation> + if (name.equals("${operation.name}") { + // TODO implement me + } + </#list> +<#else> if ("dummyOperation".equals(name)) { // TODO implement me @@ -210,6 +216,7 @@ public class ${props.componentClass} implements ResourceComponent<#if props.pare return res; } </#if> +</#if> <#if props.resourceConfiguration> diff --git a/modules/helpers/pluginGen/src/main/resources/descriptor.ftl b/modules/helpers/pluginGen/src/main/resources/descriptor.ftl index 85195e8..1fe2a6b 100644 --- a/modules/helpers/pluginGen/src/main/resources/descriptor.ftl +++ b/modules/helpers/pluginGen/src/main/resources/descriptor.ftl @@ -1,7 +1,7 @@ <#-- /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -38,6 +38,9 @@ <#if props.dependsOnJmxPlugin> <depends plugin="JMX" useClasses="true"/> </#if> +<#if props.dependsOnAs7Plugin> + <depends plugin="JBossAS7" useClasses="true"/> +</#if> <${props.category.lowerName} <#include "descriptorMain.ftl"/> diff --git a/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl b/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl index b650f7a..5579806 100644 --- a/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl +++ b/modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl @@ -1,7 +1,7 @@ <#-- /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -39,6 +39,11 @@ name="${props.name}" </#list> </runs-inside> </#if> + <#if props.dependsOnAs7Plugin> + <runs-inside>  + <parent-resource-type name="JBossAS7 Standalone Server" plugin="JBossAS7"/> + </runs-inside> + </#if> <#if props.simpleProps?has_content> <plugin-configuration> @@ -57,14 +62,14 @@ name="${props.name}" </plugin-configuration> </#if> - <#if props.hasOperations> + <#if props.hasOperations || props.operations?has_content> <#if props.operations?has_content> <#list props.operations as operation> - <operation name="${operation.name}" displayName="${operation.displayName}" description="${operation.description}"> + <operation name="${operation.name}" <#if operation.displayName?has_content>displayName="${operation.displayName}"</#if> description="${operation.description}"> <#if operation.params?has_content> <parameters> <#list operation.params as param> - <c:simple-property name="${param.name}" <#if param.description??>description="${param.description}"</#if>/> + <c:simple-property name="${param.name}" <#if param.description??>description="${param.description}"</#if> type="${param.type}"/> </#list> </parameters> </#if> @@ -82,10 +87,10 @@ name="${props.name}" </#if> </#if> - <#if props.hasMetrics> + <#if props.hasMetrics || props.metrics?has_content> <#if props.metrics?has_content> <#list props.metrics as metric> - <metric property="${metric.property}" displayName="${metric.displayName}" displayType="${metric.displayType}" units="${metric.units}" dataType="${metric.dataType}" + <metric property="${metric.property}" <#if metric.displayName?has_content>displayName="${metric.displayName}"</#if> displayType="${metric.displayType}" units="${metric.units}" dataType="${metric.dataType}" description="${metric.description}" /> </#list> <#else> diff --git a/modules/helpers/pluginGen/src/main/resources/pom.ftl b/modules/helpers/pluginGen/src/main/resources/pom.ftl index 01daca1..7c799b8 100644 --- a/modules/helpers/pluginGen/src/main/resources/pom.ftl +++ b/modules/helpers/pluginGen/src/main/resources/pom.ftl @@ -2,7 +2,7 @@ <#-- /* * RHQ Management Platform - * Copyright (C) 2005-20012 Red Hat, Inc. + * Copyright (C) 2005-20013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -35,10 +35,10 @@ </parent> <groupId>org.rhq</groupId> - <artifactId>${props.name}-plugin</artifactId> + <artifactId>${props.pluginName}-plugin</artifactId> <packaging>jar</packaging> - <name>RHQ ${props.name} Plugin</name> + <name>RHQ ${props.pluginName} Plugin</name> <#if props.description??> <description>${props.description}</description> </#if> @@ -86,7 +86,6 @@ </executions> </plugin> </#if> - </plugins> </build> @@ -232,6 +231,14 @@ <scope>provided</scope> </dependency> </#if> +<#if props.dependsOnAs7Plugin> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-jboss-as-7-plugin</artifactId> + <version>${r"${project.version}"}</version> + <scope>provided</scope> + </dependency> +</#if>  diff --git a/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java b/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java new file mode 100644 index 0000000..fbc571b --- /dev/null +++ b/modules/helpers/pluginGen/src/test/java/org/rhq/helpers/pluginGen/test/FooBean.java @@ -0,0 +1,55 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginGen.test; + +import org.rhq.helpers.pluginAnnotations.agent.DataType; +import org.rhq.helpers.pluginAnnotations.agent.DisplayType; +import org.rhq.helpers.pluginAnnotations.agent.MeasurementType; +import org.rhq.helpers.pluginAnnotations.agent.Metric; +import org.rhq.helpers.pluginAnnotations.agent.Operation; +import org.rhq.helpers.pluginAnnotations.agent.Parameter; +import org.rhq.helpers.pluginAnnotations.agent.RhqType; + +/** + * Just a sample + * @author Heiko W. Rupp + */ + +public class FooBean { + + @Metric(description = "How often was this bean invoked", displayType = DisplayType.SUMMARY, measurementType = MeasurementType.DYNAMIC) + int invocationCount; + + @Metric(description = "Just a foo", dataType = DataType.TRAIT) + String lastCommand; + + @Operation(description = "Increase the invocation count") + public int increaseCounter() { + invocationCount++; + return invocationCount; + } + + @Operation(description = "Decrease the counter") + public void decreaseCounter(@Parameter(description = "How much to decrease?", name = "by") int by) { + invocationCount -= by; + } + + +}

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - 2 commits - modules/enterprise
by mike thompson 16 Jul '13

16 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java | 152 ------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 177 ++------ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java | 208 ++++++++++ 3 files changed, 278 insertions(+), 259 deletions(-) New commits: commit 9cd21d169957e369a2b57972face734491f84d07 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 16 15:01:37 2013 -0700 Consolidated Metrics - Add availability detail panel. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java index 25603fe..9273e0b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -58,13 +58,14 @@ public class MetricsResourceView extends AbstractD3GraphListView { private Img expandCollapseArrow; private MetricsTableView metricsTableView; private MetricsViewDataSource dataSource; - private EnhancedHLayout availabilityDetails; + private ResourceMetricAvailabilityView availabilityDetails; public MetricsResourceView(Resource resource) { super(); this.resource = resource; dataSource = new MetricsViewDataSource(resource); metricsTableView = new MetricsTableView(resource, this); + availabilityDetails = new ResourceMetricAvailabilityView(resource); } private EnhancedHLayout createAvailabilityDetails() { @@ -115,7 +116,6 @@ public class MetricsResourceView extends AbstractD3GraphListView { } }); - availabilityDetails = createAvailabilityDetails(); availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( new AvailabilityOverUnderGraphType(resource.getId())); @@ -123,6 +123,7 @@ public class MetricsResourceView extends AbstractD3GraphListView { expandCollapseHLayout.addMember(expandCollapseArrow); expandCollapseHLayout.addMember(availabilityGraph); vLayout.addMember(expandCollapseHLayout); + availabilityDetails.hide(); vLayout.addMember(availabilityDetails); metricsTableView.setHeight100(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java new file mode 100644 index 0000000..9d6b892 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java @@ -0,0 +1,208 @@ +/* + * RHQ Management Platform + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.FormItem; +import com.smartgwt.client.widgets.form.fields.StaticTextItem; + +import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.composite.ResourceAvailabilitySummary; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; + +/** + * This shows the availability history for a resource. + * + * @author Jay Shaughnessy + * @author John Mazzitelli + * @author Mike Thompson + */ +public class ResourceMetricAvailabilityView extends EnhancedVLayout { + + private Resource resource; + private StaticTextItem currentField; + private StaticTextItem availField; + private StaticTextItem availTimeField; + private StaticTextItem downField; + private StaticTextItem downTimeField; + private StaticTextItem disabledField; + private StaticTextItem disabledTimeField; + private StaticTextItem failureCountField; + private StaticTextItem disabledCountField; + private StaticTextItem mtbfField; + private StaticTextItem mttrField; + private StaticTextItem unknownField; + private StaticTextItem currentTimeField; + + public ResourceMetricAvailabilityView(Resource resource) { + super(); + + this.resource = resource; + + setWidth100(); + setHeight(165); + } + + @Override + protected void onInit() { + super.onInit(); + + addMember(createSummaryForm()); + } + + private DynamicForm createSummaryForm() { + DynamicForm form = new DynamicForm(); + form.setWidth100(); + form.setAutoHeight(); + form.setMargin(10); + form.setNumCols(4); + + // row 1 + currentField = new StaticTextItem("current", MSG.view_resource_monitor_availability_currentStatus()); + currentField.setWrapTitle(false); + currentField.setColSpan(4); + + // row 2 + availField = new StaticTextItem("avail", MSG.view_resource_monitor_availability_availability()); + availField.setWrapTitle(false); + prepareTooltip(availField, MSG.view_resource_monitor_availability_availability_tooltip()); + + availTimeField = new StaticTextItem("availTime", MSG.view_resource_monitor_availability_uptime()); + availTimeField.setWrapTitle(false); + prepareTooltip(availTimeField, MSG.view_resource_monitor_availability_uptime_tooltip()); + + // row 3 + downField = new StaticTextItem("down", MSG.view_resource_monitor_availability_down()); + downField.setWrapTitle(false); + prepareTooltip(downField, MSG.view_resource_monitor_availability_down_tooltip()); + + downTimeField = new StaticTextItem("downTime", MSG.view_resource_monitor_availability_downtime()); + downTimeField.setWrapTitle(false); + prepareTooltip(downTimeField, MSG.view_resource_monitor_availability_downtime_tooltip()); + + // row 4 + disabledField = new StaticTextItem("disabled", MSG.view_resource_monitor_availability_disabled()); + disabledField.setWrapTitle(false); + prepareTooltip(disabledField, MSG.view_resource_monitor_availability_disabled_tooltip()); + + disabledTimeField = new StaticTextItem("disabledTime", MSG.view_resource_monitor_availability_disabledTime()); + disabledTimeField.setWrapTitle(false); + prepareTooltip(disabledTimeField, MSG.view_resource_monitor_availability_disabledTime_tooltip()); + + // row 5 + failureCountField = new StaticTextItem("failureCount", MSG.view_resource_monitor_availability_numFailures()); + failureCountField.setWrapTitle(false); + prepareTooltip(failureCountField, MSG.view_resource_monitor_availability_numFailures_tooltip()); + + disabledCountField = new StaticTextItem("disabledCount", MSG.view_resource_monitor_availability_numDisabled()); + disabledCountField.setWrapTitle(false); + prepareTooltip(disabledCountField, MSG.view_resource_monitor_availability_numDisabled_tooltip()); + + // row 6 + mtbfField = new StaticTextItem("mtbf", MSG.view_resource_monitor_availability_mtbf()); + mtbfField.setWrapTitle(false); + prepareTooltip(mtbfField, MSG.view_resource_monitor_availability_mtbf_tooltip()); + + mttrField = new StaticTextItem("mttr", MSG.view_resource_monitor_availability_mttr()); + mttrField.setWrapTitle(false); + prepareTooltip(mttrField, MSG.view_resource_monitor_availability_mttr_tooltip()); + + // row 7 + unknownField = new StaticTextItem("unknown"); + unknownField.setWrapTitle(false); + unknownField.setColSpan(4); + unknownField.setShowTitle(false); + + // row 8 + currentTimeField = new StaticTextItem("currentTime"); + currentTimeField.setWrapTitle(false); + currentTimeField.setColSpan(4); + currentTimeField.setShowTitle(false); + + form.setItems(currentField, availField, availTimeField, downField, downTimeField, disabledField, + disabledTimeField, failureCountField, disabledCountField, mtbfField, mttrField, unknownField, + currentTimeField); + + reloadSummaryData(); + + return form; + } + + private void reloadSummaryData() { + GWTServiceLookup.getResourceService().getResourceAvailabilitySummary(resource.getId(), + new AsyncCallback<ResourceAvailabilitySummary>() { + + @Override + public void onSuccess(ResourceAvailabilitySummary result) { + + currentField.setValue(MSG.view_resource_monitor_availability_currentStatus_value(result + .getCurrent().getName(), TimestampCellFormatter.format(result.getLastChange().getTime()))); + availField.setValue(MeasurementConverterClient.format(result.getUpPercentage(), + MeasurementUnits.PERCENTAGE, true)); + availTimeField.setValue(MeasurementConverterClient.format((double) result.getUpTime(), + MeasurementUnits.MILLISECONDS, true)); + downField.setValue(MeasurementConverterClient.format(result.getDownPercentage(), + MeasurementUnits.PERCENTAGE, true)); + downTimeField.setValue(MeasurementConverterClient.format((double) result.getDownTime(), + MeasurementUnits.MILLISECONDS, true)); + disabledField.setValue(MeasurementConverterClient.format(result.getDisabledPercentage(), + MeasurementUnits.PERCENTAGE, true)); + disabledTimeField.setValue(MeasurementConverterClient.format((double) result.getDisabledTime(), + MeasurementUnits.MILLISECONDS, true)); + failureCountField.setValue(result.getFailures()); + disabledCountField.setValue(result.getDisabled()); + mtbfField.setValue(MeasurementConverterClient.format((double) result.getMTBF(), + MeasurementUnits.MILLISECONDS, true)); + mttrField.setValue(MeasurementConverterClient.format((double) result.getMTTR(), + MeasurementUnits.MILLISECONDS, true)); + + if (result.getUnknownTime() > 0L) { + unknownField.setValue(MSG.view_resource_monitor_availability_unknown(MeasurementConverterClient + .format((double) result.getUnknownTime(), MeasurementUnits.MILLISECONDS, true))); + } else { + unknownField.setValue(""); + } + + currentTimeField.setValue(MSG.view_resource_monitor_availability_currentAsOf(TimestampCellFormatter + .format(result.getCurrentTime()))); + } + + @Override + public void onFailure(Throwable caught) { + currentField.setValue(MSG.common_label_error()); + CoreGUI.getErrorHandler() + .handleError(MSG.view_resource_monitor_availability_summaryError(), caught); + } + }); + } + + private void prepareTooltip(FormItem item, String tooltip) { + item.setHoverWidth(400); + item.setPrompt(tooltip); + } + +} commit 46d64c5f157d18d2778fdec15909e25226513b6d Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 16 08:50:36 2013 -0700 Consolidated Metrics - more availability work. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java index e4785da..25603fe 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -18,43 +18,27 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Set; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.types.ExpansionMode; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.VerticalAlignment; -import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.Img; import com.smartgwt.client.widgets.Label; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; -import com.smartgwt.client.widgets.grid.ListGrid; -import com.smartgwt.client.widgets.grid.ListGridField; -import com.smartgwt.client.widgets.grid.ListGridRecord; -import com.smartgwt.client.widgets.grid.events.RecordExpandEvent; -import com.smartgwt.client.widgets.grid.events.RecordExpandHandler; import com.smartgwt.client.widgets.layout.VLayout; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.measurement.Availability; -import org.rhq.core.domain.measurement.MeasurementDefinition; -import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.IconEnum; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; -import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedHLayout; @@ -70,40 +54,17 @@ public class MetricsResourceView extends AbstractD3GraphListView { private static final String EXPANDED_TOOLTIP = MSG.chart_metrics_expand_tooltip(); private Resource resource; - private Set<Integer> definitionIds = null; private VLayout vLayout; private Img expandCollapseArrow; - MetricsTableListGrid metricsGrid; - MetricsViewDataSource dataSource; - EnhancedHLayout availabilityDetails; - + private MetricsTableView metricsTableView; + private MetricsViewDataSource dataSource; + private EnhancedHLayout availabilityDetails; public MetricsResourceView(Resource resource) { super(); this.resource = resource; dataSource = new MetricsViewDataSource(resource); - metricsGrid = new MetricsTableListGrid(); - - ArrayList<ListGridField> fields = dataSource.getListGridFields(); - metricsGrid.setFields(fields.toArray(new ListGridField[0])); - metricsGrid.setCanExpandRecords(true); - metricsGrid.addRecordExpandHandler(new RecordExpandHandler() { - @Override - public void onRecordExpand(RecordExpandEvent recordExpandEvent) { - Log.debug("Record Expanded: " - + recordExpandEvent.getRecord().getAttribute(MetricsViewDataSource.FIELD_METRIC_LABEL)); - new Timer() { - - @Override - public void run() { - BrowserUtility.graphSparkLines(); - } - }.schedule(150); - - } - - }); - + metricsTableView = new MetricsTableView(resource, this); } private EnhancedHLayout createAvailabilityDetails() { @@ -123,11 +84,10 @@ public class MetricsResourceView extends AbstractD3GraphListView { Log.debug("MetricResourceView.onDraw() for: " + resource.getName() + " id: " + resource.getId()); destroyMembers(); - vLayout = new VLayout(); vLayout.setOverflow(Overflow.AUTO); vLayout.setWidth100(); - vLayout.setHeight(220); + vLayout.setHeight100(); vLayout.addMember(buttonBarDateTimeRangeEditor); EnhancedHLayout expandCollapseHLayout = new EnhancedHLayout(); @@ -146,8 +106,7 @@ public class MetricsResourceView extends AbstractD3GraphListView { expandCollapseArrow.setSrc(IconEnum.COLLAPSED_ICON.getIcon16x16Path()); expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP); availabilityDetails.hide(); - } - else { + } else { expandCollapseArrow.setSrc(IconEnum.EXPANDED_ICON.getIcon16x16Path()); expandCollapseArrow.setTooltip(EXPANDED_TOOLTIP); availabilityDetails.show(); @@ -166,13 +125,14 @@ public class MetricsResourceView extends AbstractD3GraphListView { vLayout.addMember(expandCollapseHLayout); vLayout.addMember(availabilityDetails); - vLayout.addMember(metricsGrid); + metricsTableView.setHeight100(); + vLayout.addMember(metricsTableView); addMember(vLayout); if (resource != null) { queryAvailability(EntityContext.forResource(resource.getId()), buttonBarDateTimeRangeEditor.getStartTime(), - buttonBarDateTimeRangeEditor.getEndTime(), null); + buttonBarDateTimeRangeEditor.getEndTime(), null); } } @@ -212,95 +172,4 @@ public class MetricsResourceView extends AbstractD3GraphListView { }); } - private class MetricsTableListGrid extends ListGrid { - public MetricsTableListGrid() { - super(); - - setCanExpandRecords(true); - setCanExpandMultipleRecords(true); - setExpansionMode(ExpansionMode.DETAIL_FIELD); - } - - @Override - protected Canvas getExpansionComponent(final ListGridRecord record) { - final Integer definitionId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); - final Integer resourceId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_RESOURCE_ID); - VLayout vLayout = new VLayout(); - vLayout.setPadding(5); - - final String chartId = "rChart" + resourceId + "-" + definitionId; - HTMLFlow htmlFlow = new HTMLFlow(MetricD3Graph.createGraphMarkerTemplate(chartId, 200)); - vLayout.addMember(htmlFlow); - - new Timer() { - - @Override - public void run() { - BrowserUtility.graphSparkLines(); - } - }.schedule(150); - - - // Load the fully fetched ResourceType. - ResourceType resourceType = resource.getResourceType(); - - Set<MeasurementDefinition> definitions = resourceType.getMetricDefinitions(); - final MeasurementDefinition measurementDefinition; - - //build id mapping for measurementDefinition instances Ex. Free Memory -> MeasurementDefinition[100071] - final HashMap<String, MeasurementDefinition> measurementDefMap = new HashMap<String, MeasurementDefinition>(); - for (MeasurementDefinition definition : definitions) { - measurementDefMap.put(definition.getDisplayName(), definition); - if (definition.getId() == definitionId) { - measurementDefinition = definition; - break; - } - } - - int[] definitionArrayIds = new int[1]; - definitionArrayIds[0] = definitionId; - GWTServiceLookup.getMeasurementDataService().findDataForResource(resourceId, definitionArrayIds, - measurementUserPrefs.getMetricRangePreferences().begin, - measurementUserPrefs.getMetricRangePreferences().end, 60, - new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { - @Override - public void onFailure(Throwable caught) { - Log.debug("Error retrieving recent metrics charting data for resource [" + resourceId + "]:" - + caught.getMessage()); - } - - @Override - public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> results) { - if (!results.isEmpty()) { - - //load the data results for the given metric definition - List<MeasurementDataNumericHighLowComposite> data = results.get(0); - Log.debug(" *** Metric Data Results: "+data.size()); - -// MetricGraphData metricGraphData = MetricGraphData -// .createForResource(resourceId, resource.getName(), -// measurementDefinition, data, null); -// -// StackedBarMetricGraphImpl graph = GWT -// .create(StackedBarMetricGraphImpl.class); -// graph.setMetricGraphData(metricGraphData); -// final MetricD3Graph graphView = new MetricD3Graph(graph, this); -// new Timer() { -// @Override -// public void run() { -// graphView.drawJsniChart(); -// -// } -// }.schedule(150); - - } else { - Log.warn("No chart data retrieving for resource [" + resourceId + "]"); - - } - } - }); - - return vLayout; - } - } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 82fe2d2..3cb9233 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -22,7 +22,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitori import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -45,26 +44,21 @@ import com.smartgwt.client.widgets.grid.events.RecordExpandEvent; import com.smartgwt.client.widgets.grid.events.RecordExpandHandler; import com.smartgwt.client.widgets.layout.VLayout; -import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.measurement.MeasurementData; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.resource.composite.ResourceComposite; -import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.ButtonBarDateTimeRangeEditor; +import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.RedrawGraphs; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; @@ -76,20 +70,19 @@ import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPre * @author John Mazzitelli * @author Mike Thompson */ -@Deprecated -public class MetricsTableView extends Table<MetricsTableDataSource> implements RedrawGraphs { +public class MetricsTableView extends Table<MetricsViewDataSource> implements RedrawGraphs { - private final int resourceId; + private final Resource resource; + private final AbstractD3GraphListView abstractD3GraphListView; private MeasurementUserPreferences measurementUserPrefs; - private ButtonBarDateTimeRangeEditor buttonBarDateTimeRangeEditor; - public MetricsTableView(int resourceId) { + public MetricsTableView(Resource resource, AbstractD3GraphListView abstractD3GraphListView) { super(); - this.resourceId = resourceId; - setDataSource(new MetricsTableDataSource(resourceId)); + this.resource = resource; + this.abstractD3GraphListView = abstractD3GraphListView; + setDataSource(new MetricsViewDataSource(resource)); measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); - buttonBarDateTimeRangeEditor = new ButtonBarDateTimeRangeEditor(measurementUserPrefs, this); } /** @@ -100,7 +93,7 @@ public class MetricsTableView extends Table<MetricsTableDataSource> implements R */ @Override protected ListGrid createListGrid() { - return new MetricsTableListGrid(); + return new MetricsTableListGrid(resource); } protected void configureTable() { @@ -111,7 +104,7 @@ public class MetricsTableView extends Table<MetricsTableDataSource> implements R @Override public void onRecordExpand(RecordExpandEvent recordExpandEvent) { Log.debug("Record Expanded: " - + recordExpandEvent.getRecord().getAttribute(MetricsTableDataSource.FIELD_METRIC_LABEL)); + + recordExpandEvent.getRecord().getAttribute(MetricsViewDataSource.FIELD_METRIC_LABEL)); new Timer() { @Override @@ -124,9 +117,8 @@ public class MetricsTableView extends Table<MetricsTableDataSource> implements R }); - addExtraWidget(buttonBarDateTimeRangeEditor, true); addTableAction(MSG.view_measureTable_getLive(), new ShowLiveDataTableAction(this)); - addTableAction(MSG.view_measureTable_addToDashboard(), new AddToDashboardTableAction(this)); + //addTableAction(MSG.view_measureTable_addToDashboard(), new AddToDashboardTableAction(this)); } @@ -152,12 +144,12 @@ public class MetricsTableView extends Table<MetricsTableDataSource> implements R int[] definitionIds = new int[selection.length]; int i = 0; for (ListGridRecord record : selection) { - Integer defId = record.getAttributeAsInt(MetricsTableDataSource.FIELD_METRIC_DEF_ID); + Integer defId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); definitionIds[i++] = defId; - String name = record.getAttribute(MetricsTableDataSource.FIELD_METRIC_NAME); - String label = record.getAttribute(MetricsTableDataSource.FIELD_METRIC_LABEL); - String units = record.getAttribute(MetricsTableDataSource.FIELD_METRIC_UNITS); + String name = record.getAttribute(MetricsViewDataSource.FIELD_METRIC_NAME); + String label = record.getAttribute(MetricsViewDataSource.FIELD_METRIC_LABEL); + String units = record.getAttribute(MetricsViewDataSource.FIELD_METRIC_UNITS); if (units == null || units.length() < 1) { units = MeasurementUnits.NONE.name(); } @@ -166,8 +158,8 @@ public class MetricsTableView extends Table<MetricsTableDataSource> implements R } // actually go out and ask the agents for the data - GWTServiceLookup.getMeasurementDataService(60000).findLiveData(metricsTableView.resourceId, definitionIds, - new AsyncCallback<Set<MeasurementData>>() { + GWTServiceLookup.getMeasurementDataService(60000).findLiveData(metricsTableView.resource.getId(), + definitionIds, new AsyncCallback<Set<MeasurementData>>() { @Override public void onSuccess(Set<MeasurementData> result) { if (result == null) { @@ -281,9 +273,14 @@ public class MetricsTableView extends Table<MetricsTableDataSource> implements R } private class MetricsTableListGrid extends ListGrid { - public MetricsTableListGrid() { - super(); + private static final int TREEVIEW_DETAIL_CHART_HEIGHT = 205; + private static final int NUM_METRIC_POINTS = 60; + private Resource resource; + + public MetricsTableListGrid(Resource resource) { + super(); + this.resource = resource; setCanExpandRecords(true); setCanExpandMultipleRecords(true); setExpansionMode(ExpansionMode.DETAIL_FIELD); @@ -291,116 +288,60 @@ public class MetricsTableView extends Table<MetricsTableDataSource> implements R @Override protected Canvas getExpansionComponent(final ListGridRecord record) { - final Integer definitionId = record.getAttributeAsInt(MetricsTableDataSource.FIELD_METRIC_DEF_ID); - final Integer resourceId = record.getAttributeAsInt(MetricsTableDataSource.FIELD_RESOURCE_ID); + final Integer definitionId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); + final Integer resourceId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_RESOURCE_ID); VLayout vLayout = new VLayout(); vLayout.setPadding(5); - final String chartId = "rChart" + resourceId + "-" + definitionId; - HTMLFlow htmlFlow = new HTMLFlow(MetricD3Graph.createGraphMarkerTemplate(chartId, 200)); + final String chartId = "rChart-" + resourceId + "-" + definitionId; + Log.debug("getExpansionComponent for: " + chartId); + HTMLFlow htmlFlow = new HTMLFlow(MetricD3Graph.createGraphMarkerTemplate(chartId, TREEVIEW_DETAIL_CHART_HEIGHT)); vLayout.addMember(htmlFlow); - //locate resource reference - ResourceCriteria criteria = new ResourceCriteria(); - criteria.addFilterId(resourceId); - - //locate the resource - GWTServiceLookup.getResourceService().findResourceCompositesByCriteria(criteria, - new AsyncCallback<PageList<ResourceComposite>>() { + int[] definitionArrayIds = new int[1]; + definitionArrayIds[0] = definitionId; + GWTServiceLookup.getMeasurementDataService().findDataForResource(resourceId, definitionArrayIds, + measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, NUM_METRIC_POINTS, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { @Override public void onFailure(Throwable caught) { - Log.debug("Error retrieving resource resource composite for resource [" + resourceId + "]:" + Log.debug("Error retrieving recent metrics charting data for resource [" + resourceId + "]:" + caught.getMessage()); } @Override - public void onSuccess(PageList<ResourceComposite> results) { + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> results) { if (!results.isEmpty()) { - new Timer() { + //load the data results for the given metric definition + List<MeasurementDataNumericHighLowComposite> measurementList = results.get(0); + Log.debug("getExpansionComponent MeasurementList.size: " + measurementList.size()); + MeasurementDefinition measurementDefinition = null; + for (MeasurementDefinition definition : resource.getResourceType().getMetricDefinitions()) { + if (definition.getId() == definitionId) { + measurementDefinition = definition; + break; + } + } + + MetricGraphData metricGraphData = MetricGraphData.createForResource(resourceId, + resource.getName(), measurementDefinition, measurementList, null); + + StackedBarMetricGraphImpl graph = GWT.create(StackedBarMetricGraphImpl.class); + graph.setMetricGraphData(metricGraphData); + final MetricD3Graph graphView = new MetricD3Graph(graph, abstractD3GraphListView); + new Timer() { @Override public void run() { - BrowserUtility.graphSparkLines(); + graphView.drawJsniChart(); + } }.schedule(150); - final Resource resource = results.get(0).getResource(); - //D3GraphListView graphListView = D3GraphListView.createSingleGraph(resource, definitionId, false); - - // Load the fully fetched ResourceType. - ResourceType resourceType = resource.getResourceType(); - ResourceTypeRepository.Cache.getInstance().getResourceTypes( - resourceType.getId(), - EnumSet.of(ResourceTypeRepository.MetadataType.content, - ResourceTypeRepository.MetadataType.operations, - ResourceTypeRepository.MetadataType.measurements, - ResourceTypeRepository.MetadataType.events, - ResourceTypeRepository.MetadataType.resourceConfigurationDefinition), - new ResourceTypeRepository.TypeLoadedCallback() { - public void onTypesLoaded(ResourceType type) { - resource.setResourceType(type); - //metric definitions - Set<MeasurementDefinition> definitions = type.getMetricDefinitions(); - final MeasurementDefinition measurementDefinition; - - //build id mapping for measurementDefinition instances Ex. Free Memory -> MeasurementDefinition[100071] - final HashMap<String, MeasurementDefinition> measurementDefMap = new HashMap<String, MeasurementDefinition>(); - for (MeasurementDefinition definition : definitions) { - measurementDefMap.put(definition.getDisplayName(), definition); - if (definition.getId() == definitionId) { - measurementDefinition = definition; - break; - } - } - - int[] definitionArrayIds = new int[1]; - definitionArrayIds[0] = definitionId; - GWTServiceLookup.getMeasurementDataService().findDataForResource(resourceId, - definitionArrayIds, measurementUserPrefs.getMetricRangePreferences().begin, - measurementUserPrefs.getMetricRangePreferences().end, 60, - new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { - @Override - public void onFailure(Throwable caught) { - Log.debug("Error retrieving recent metrics charting data for resource [" - + resourceId + "]:" + caught.getMessage()); - } - - @Override - public void onSuccess( - List<List<MeasurementDataNumericHighLowComposite>> results) { - if (!results.isEmpty()) { - - //load the data results for the given metric definition - List<MeasurementDataNumericHighLowComposite> data = results - .get(0); - -// MetricGraphData metricGraphData = MetricGraphData -// .createForResource(resourceId, resource.getName(), -// measurementDefinition, data, null); -// -// StackedBarMetricGraphImpl graph = GWT -// .create(StackedBarMetricGraphImpl.class); -// graph.setMetricGraphData(metricGraphData); -// final MetricD3Graph graphView = new MetricD3Graph(graph, this); -// new Timer() { -// @Override -// public void run() { -// graphView.drawJsniChart(); -// -// } -// }.schedule(150); - - } else { - Log.warn("No chart data retrieving for resource [" + resourceId - + "]"); - - } - } - }); - - } - }); + } else { + Log.warn("No chart data retrieving for resource [" + resourceId + "-"+definitionId+"]"); } }

1 0

[rhq] etc/scripts
by John Sanda 16 Jul '13

16 Jul '13

etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat | 64 ++++++++++++++++ 1 file changed, 64 insertions(+) New commits: commit 2ee2ef305dd71c1f2869a5a8c4e8ebe9f9bae243 Author: Michael Burman <yak(a)iki.fi> Date: Tue Jul 16 15:58:05 2013 -0400 committing windows version of RHQ 4.8 storage patch script diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat new file mode 100644 index 0000000..e0312dc --- /dev/null +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.bat @@ -0,0 +1,64 @@ +@echo off +setlocal + +if /i "%4" == "" ( + echo Usage: rhq48-storage-patch.bat ^<rhq-server-dir^> ^<storage-ip-address^> ^<cql-port^> ^<jmx-port^> + exit /B 1 +) + +set RHQ_SERVER_DIR=%1 +set CQL_HOSTNAME=%2 +set CQL_PORT=%3 +set JMX_PORT=%4 +set USERNAME="rhqadmin" +set PASSWORD="rhqadmin" + +set PATCH="apache-cassandra-1.2.4-patch-1.jar" + +rem swap out the Cassandra jar file with the patched version +echo Copying patch file to %RHQ_SERVER_DIR%\rhq-storage\lib +move %RHQ_SERVER_DIR%\rhq-storage\lib\apache-cassandra-1.2.4.jar . +copy %PATCH% %RHQ_SERVER_DIR%\rhq-storage\lib + +rem restart the storage node +echo Starting RHQ Storage node +call %RHQ_SERVER_DIR%\bin\rhqctl.bat start --storage + +rem sleep for a few seconds while Cassandra starts up +echo Waiting for RHQ Storage Node to start up.. +rem Sleep is not implemented in all Windows prompts, this one won't work in Vista +choice /n /c y /d y /t 3 + +set RHQ_STORAGE_BIN=%RHQ_SERVER_DIR%\rhq-storage\bin\ +set CQLSH_PATH=%RHQ_STORAGE_BIN%\cqlsh +set NODETOOL_PATH=%RHQ_STORAGE_BIN%\nodetool.bat + +rem run the CQL script +echo Running CQL script to disable table compression +python %CQLSH_PATH% -u %USERNAME% -p %PASSWORD% -f ./disable_compression.cql + +rem rewrite all sstables +echo Rebuilding data files for system keyspace +call %NODETOOL_PATH% -u rhqadmin -pw rhqadmin -p %JMX_PORT% upgradesstables --include-all-sstables system + +echo Rebuilding data files for system_traces keyspace +call %NODETOOL_PATH% -u rhqadmin -pw rhqadmin -p %JMX_PORT% upgradesstables --include-all-sstables system_traces + +echo Rebuilding data files for system_auth keyspace +call %NODETOOL_PATH% -u rhqadmin -pw rhqadmin -p %JMX_PORT% upgradesstables --include-all-sstables system_auth + +echo Rebuilding data files for rhq keyspace +call %NODETOOL_PATH% -u rhqadmin -pw rhqadmin -p %JMX_PORT% upgradesstables --include-all-sstables rhq + +rem flush memtables and commit log to ensure no data loss prior to upgrade +call %NODETOOL_PATH% -u rhqadmin -pw rhqadmin -p %JMX_PORT% drain + +echo Shutting down the RHQ Storage node +call %RHQ_SERVER_DIR%\bin\rhqctl.bat stop --storage + +echo Removing patch file +del %RHQ_SERVER_DIR%\rhq-storage\lib\%PATCH% +move apache-cassandra-1.2.4.jar %RHQ_SERVER_DIR%\rhq-storage\lib + +echo Table compression has been disabled for all keyspaces. You are now ready to upgrade your RHQ installation. +endlocal

1 0

[rhq] modules/plugins
by Thomas Segismont 16 Jul '13

16 Jul '13

modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java | 13 ++++++++++ 1 file changed, 13 insertions(+) New commits: commit 9983f60ec49f72b5bb0afcfb452afde616c622a6 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Tue Jul 16 17:51:59 2013 +0200 Fix InterruptibleOperationsTest. Mock resource context needs a ComponentInvocationContext instance. diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java index 192117c..b0acf4d 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/InterruptibleOperationsTest.java @@ -47,6 +47,7 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.rhq.core.pluginapi.component.ComponentInvocationContext; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -95,6 +96,7 @@ public class InterruptibleOperationsTest { int httpPort = setupJettyServer(); setupResourceContext(httpPort); executorService = Executors.newSingleThreadExecutor(); + when(resourceContext.getComponentInvocationContext()).thenReturn(new MockComponentInvocationContext()); serverComponent.start(resourceContext); } @@ -160,6 +162,17 @@ public class InterruptibleOperationsTest { assertEquals(operationResult.getSimpleResult(), "Success"); } + private static class MockComponentInvocationContext implements ComponentInvocationContext { + @Override + public boolean isInterrupted() { + return false; + } + + @Override + public void markInterrupted() { + } + } + private class RestartJetty implements Runnable { @Override public void run() {

1 0

[rhq] etc/rhq-ircBot
by lkrejci 16 Jul '13

16 Jul '13

etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit fb809005b42f358d3a2090993431769649ade732 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Tue Jul 16 15:54:07 2013 +0200 Updating the list of the devs in the IRC bot diff --git a/etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java b/etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java index dd22dbf..cc10d2d 100644 --- a/etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java +++ b/etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java @@ -77,8 +77,7 @@ public class RhqIrcBotListener extends ListenerAdapter<RhqIrcBot> { private static final Set<String> JON_DEVS = new HashSet<String>(); static { - JON_DEVS.add("ccrouch"); - JON_DEVS.add("ips"); + JON_DEVS.add("theute"); JON_DEVS.add("jkremser"); JON_DEVS.add("jsanda"); JON_DEVS.add("jshaughn"); @@ -377,4 +376,4 @@ public class RhqIrcBotListener extends ListenerAdapter<RhqIrcBot> { this.docspacePassword = docspacePassword; } -} \ No newline at end of file +}

1 0

[rhq] modules/enterprise
by snegrea 16 Jul '13

16 Jul '13

modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml | 18 ++++++++++ 1 file changed, 18 insertions(+) New commits: commit 98258686d712608aef7a21108f6a5505ffb820b7 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Jul 16 08:16:57 2013 -0500 Add justification for the api changes to the Storage Node Manager bean. diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml new file mode 100644 index 0000000..a9ce322 --- /dev/null +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<differences> + + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findNotAcknowledgedStorageNodeAlerts(org.rhq.core.domain.auth.Subject)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + + <difference> + <className>org/rhq/enterprise/server/cloud/StorageNodeManagerRemote</className> + <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.util.PageList findAllStorageNodeAlerts(org.rhq.core.domain.auth.Subject)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + +</differences>

1 0

[rhq] modules/core modules/plugins
by Thomas Segismont 16 Jul '13

16 Jul '13

modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java | 2 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 4 + modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java | 25 +++------- 3 files changed, 14 insertions(+), 17 deletions(-) New commits: commit 6ad3c87c08631a00cb960a4ffa4c4929329aa6d8 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Tue Jul 16 13:42:50 2013 +0200 Bug 982804 - AS7 reload behavior includes hardcoded timeout of 20 seconds diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java index 8c708db..41a1c41 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java @@ -173,6 +173,8 @@ public class ResourceContext<T extends ResourceComponent<?>> { * @param availabilityContext a {@link AvailabilityContext} the plugin can use to interoperate with the * plugin container inventory manager * @param pluginContainerDeployment indicates where the plugin container is running + * @param componentInvocationContext a {@link ComponentInvocationContext} the plugin can use to determine if the + * current component invocation has been canceled or timed out. */ public ResourceContext(Resource resource, T parentResourceComponent, ResourceContext<?> parentResourceContext, ResourceDiscoveryComponent<T> resourceDiscoveryComponent, SystemInfo systemInfo, File temporaryDirectory, diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java index 4cb2cff..a9fe1c2 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java @@ -609,6 +609,8 @@ public class ResourceContainer implements Serializable { } private static class ComponentInvocation implements Callable { + private static final Log LOG = LogFactory.getLog(ComponentInvocation.class); + private final ResourceContainer resourceContainer; private final Method method; private final Object[] args; @@ -669,6 +671,8 @@ public class ResourceContainer implements Serializable { public void markContextInterrupted() { localContext.markInterrupted(); + LOG.warn("Invocation has been marked interrupted for method [" + method + "] on resource [" + + resourceContainer.getResource() + "]"); } } } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java index d399d1b..ccb8ce0 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java @@ -18,6 +18,8 @@ */ package org.rhq.modules.plugins.jbossas7; +import static java.util.concurrent.TimeUnit.SECONDS; + import java.io.File; import java.util.HashSet; import java.util.Map; @@ -184,39 +186,28 @@ public class StandaloneASComponent<T extends ResourceComponent<?>> extends BaseS return operationResult; } - private boolean waitUntilReloaded() { + private boolean waitUntilReloaded() throws InterruptedException { boolean reloaded = false; - int count = 0; - while (!reloaded) { Operation op = new ReadAttribute(new Address(), "release-version"); - try{ + try { Result res = getASConnection().execute(op); if (res.isSuccess() && !res.isReloadRequired()) { reloaded = true; - } else if (count > 20) { - break; } } catch (Exception e) { //do absolutely nothing //if an exception is thrown that means the server is still reloading, so consider this //a single failed attempt, equivalent to res.isSuccess == false } - if (!reloaded) { - try { - Thread.sleep(1000); // Wait 1s - } catch (InterruptedException e) { - // ignore + if (context.getComponentInvocationContext().isInterrupted()) { + // Operation canceled or timed out + throw new InterruptedException(); } + Thread.sleep(SECONDS.toMillis(1)); } - count++; } - - if (log.isDebugEnabled()) { - log.debug("waitUntilReloaded: Used " + count + " delay round(s) to reload. Reload=" + reloaded); - } - return reloaded; }

1 0

[rhq] 2 commits - modules/enterprise modules/helpers
by Heiko W. Rupp 16 Jul '13

16 Jul '13

modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java | 6 ++--- modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSenderTest.java | 5 ++-- modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java | 11 +++++++--- modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java | 2 - 4 files changed, 15 insertions(+), 9 deletions(-) New commits: commit 56f845bec82369f3032b565a8caeed751d1a4093 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Jul 16 10:13:13 2013 +0200 Fix test fallout that got introduced by my changes. diff --git a/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java b/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java index 97b9a05..ecc995d 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java +++ b/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java @@ -116,11 +116,11 @@ public class SnmpInfoTest { // String representation is constrained (even not strongly). Configuration configuration = new Configuration(); assertEquals(SnmpInfo.load(configuration).toString(), "UnknownHost:" + DEFAULT_PORT - + " (UnknownOID) (DefaultTrapOID)"); + + " (Unknown Binding Prefix) (DefaultTrapOID)"); configuration.setSimpleValue(PARAM_HOST, "pipo"); - assertEquals(SnmpInfo.load(configuration).toString(), "pipo:" + DEFAULT_PORT + " (UnknownOID) (DefaultTrapOID)"); + assertEquals(SnmpInfo.load(configuration).toString(), "pipo:" + DEFAULT_PORT + " (Unknown Binding Prefix) (DefaultTrapOID)"); configuration.setSimpleValue(PARAM_PORT, "35162"); - assertEquals(SnmpInfo.load(configuration).toString(), "pipo:35162 (UnknownOID) (DefaultTrapOID)"); + assertEquals(SnmpInfo.load(configuration).toString(), "pipo:35162 (Unknown Binding Prefix) (DefaultTrapOID)"); configuration.setSimpleValue(PARAM_VARIABLE_BINDING_PREFIX, "molo"); assertEquals(SnmpInfo.load(configuration).toString(), "pipo:35162 (molo) (DefaultTrapOID)"); configuration.setSimpleValue(PARAM_TRAP_OID, "logo"); diff --git a/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSenderTest.java b/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSenderTest.java index 38b36d7..9583a07 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSenderTest.java +++ b/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSenderTest.java @@ -95,6 +95,7 @@ public class SnmpSenderTest { private AlertManagerLocal alertManager; private TestSnmpSender snmpSender; + private Configuration pluginConfiguration; @BeforeMethod public void setUp() throws Exception { @@ -114,7 +115,7 @@ public class SnmpSenderTest { MockitoAnnotations.initMocks(this); - Configuration pluginConfiguration = new Configuration(); + pluginConfiguration = new Configuration(); pluginConfiguration.setSimpleValue("snmpVersion", "2c"); pluginConfiguration.setSimpleValue("trapOid", TEST_TRAP_OID_PLUGIN_CONFIG); pluginConfiguration.setSimpleValue("community", "public"); @@ -153,7 +154,7 @@ public class SnmpSenderTest { assertNotNull(result); assertEquals(result.getState(), FAILURE); assertEquals(result.getFailureMessages().size(), 1); - String expectedError = SnmpInfo.load(alertParameters).error; + String expectedError = SnmpInfo.load(alertParameters,pluginConfiguration).error; assertNotNull(expectedError); assertEquals(result.getFailureMessages().get(0), expectedError); } commit 609c93f0d219afd19db976d55c565c95bb96d1ab Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 15 11:03:05 2013 +0200 Display tool tips, for pick button and choice boxes diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java index 06f3fec..e7da952 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java @@ -210,11 +210,13 @@ public class Generator extends Application{ choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { @Override public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { - setPropsValue(prop.getVariableName(),newValue.equals("Yes"),propType); + setPropsValue(prop.getVariableName(), newValue.equals("Yes"), propType); } }); + Tooltip tooltip = new Tooltip(prop.getDescription()); // TODO make this a hover listener + choiceBox.setTooltip(tooltip); - root.add(choiceBox,1,row); + root.add(choiceBox, 1, row); } else if (propType.equals(ResourceCategory.class)) { final ChoiceBox choiceBox = new ChoiceBox(); for (ResourceCategory cat : ResourceCategory.values()) { @@ -228,14 +230,17 @@ public class Generator extends Application{ setPropsValue(prop.getVariableName(),newCategory,propType); } }); - + Tooltip tooltip = new Tooltip(prop.getDescription()); // TODO make this a hover listener + choiceBox.setTooltip(tooltip); root.add(choiceBox,1,row); } else if (propType.equals(File.class)) { // Can not add this directly, so add a button to trigger it final Text text = new Text(); text.setText("Pick a directory"); root.add(text,1,row); + Tooltip tooltip = new Tooltip("Pick the (parent) directory where the plugin will be put in."); Button pickButton = new Button("Pick"); + pickButton.setTooltip(tooltip); pickButton.setOnAction(new EventHandler<ActionEvent>() { @Override public void handle(ActionEvent actionEvent) { diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java index 73c4cd9..4ed019a 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java @@ -38,7 +38,7 @@ public enum Prop { DESCRIPTION("description", String.class, "Description of the type", ".*"), DISCOVERY_CLASS("discoveryClass", String.class, "Discovery class", "[A-Z][a-zA-Z0-9]*"), COMPONENT_CLASS("componentClass", String.class, "Discovery class", "[A-Z][a-zA-Z0-9]*"), - IS_SINGLETON("singleton",Boolean.class,"Is this type a singleton, which means that" + + IS_SINGLETON("singleton",boolean.class,"Is this type a singleton, which means that" + " there can only be one resource of that type for the given parent?",null), HAS_METRICS("hasMetrics",boolean.class,"Does this type support taking metrics?",null), HAS_OPERATIONS("hasOperations",boolean.class,"Does this type support operations?",null),

1 0

[rhq] Branch 'mtho11/consolidated-metrics' - 2 commits - modules/enterprise
by mike thompson 16 Jul '13

16 Jul '13

modules/enterprise/gui/coregui/pom.xml | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 115 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 308 ++++------ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java | 306 +++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java | 189 +++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java | 298 +++++++++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 3 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 3 18 files changed, 932 insertions(+), 336 deletions(-) New commits: commit 9387cd53d12cda3e976b99c5a0cc1b1326a3c651 Author: Mike Thompson <mithomps(a)redhat.com> Date: Mon Jul 15 12:50:48 2013 -0700 Consolidated Metrics - expandable availability graph/detail. diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index a227ed4..353f4d9 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -19,7 +19,7 @@ <properties>  - <gwt.version>2.5.0</gwt.version> + <gwt.version>${gwt.version}</gwt.version> <smartgwt.version>3.0</smartgwt.version> <!-- If this is too much memory to allocate to your gwt:debug process then override this property in diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java index d11467a..b48a712 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java @@ -114,6 +114,12 @@ public enum IconEnum { STORAGE_NODE("global/StorageNode_16.png", "global/StorageNode_24.png"), ///////////////////////////// + // General + ///////////////////////////// + EXPANDED_ICON("[SKIN]/ListGrid/row_expanded.png"), + COLLAPSED_ICON("[SKIN]/ListGrid/row_collapsed.png"), + + ///////////////////////////// // Resource Specific Tabs ///////////////////////////// CALLTIME("global/Recent_16.png", "global/Recent_24.png"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index 7c5f80a..bc35ccf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -311,13 +311,6 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { }); } - function timeFormat(formats) { - return function(date) { - var i = formats.length - 1, f = formats[i]; - while (!f[1](date)) f = formats[--i]; - return f[0](date); - } - } function formatHovers(d) { var timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat), @@ -345,8 +338,10 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { }(); - if (availChartContext.data !== undefined && availChartContext.data.length > 0) { + console.log("Avail Data records: "+availChartContext.data.length); + if (typeof availChartContext.data !== 'undefined' && availChartContext.data.length > 0) { availabilityGraph.draw(availChartContext); + console.log("Availability Chart Drawn"); } }-*/; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java index 59737ac..a9789c6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java @@ -21,7 +21,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.EnumSet; import java.util.List; import com.google.gwt.core.client.GWT; @@ -35,19 +34,17 @@ import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.measurement.DisplayType; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; -import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; @@ -55,7 +52,7 @@ import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; * Build the Group version of the View that shows the individual graph views. * @author Mike Thompson */ -public final class D3GroupGraphListView extends AbstractD3GraphListView implements AutoRefresh{ +public final class D3GroupGraphListView extends AbstractD3GraphListView implements AutoRefresh { private ResourceGroup resourceGroup; private VLayout graphsVLayout; @@ -75,7 +72,8 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen addMember(buttonBarDateTimeRangeEditor); if (showAvailabilityGraph) { - availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>(new AvailabilityOverUnderGraphType(resourceGroup.getId())); + availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( + new AvailabilityOverUnderGraphType(resourceGroup.getId())); addMember(availabilityGraph); } graphsVLayout = new VLayout(); @@ -89,7 +87,6 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen addMember(graphsVLayout); } - public void redrawGraphs() { this.onDraw(); } @@ -100,68 +97,60 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen private void buildGraphs() { queryAvailability(EntityContext.forGroup(resourceGroup), buttonBarDateTimeRangeEditor.getStartTime(), - buttonBarDateTimeRangeEditor.getEndTime(), null); + buttonBarDateTimeRangeEditor.getEndTime(), null); - ResourceTypeRepository.Cache.getInstance().getResourceTypes(resourceGroup.getResourceType().getId(), - EnumSet.of(ResourceTypeRepository.MetadataType.measurements), - new ResourceTypeRepository.TypeLoadedCallback() { - public void onTypesLoaded(final ResourceType type) { + final ArrayList<MeasurementDefinition> measurementDefinitions = new ArrayList<MeasurementDefinition>(); - final ArrayList<MeasurementDefinition> measurementDefinitions = new ArrayList<MeasurementDefinition>(); + for (MeasurementDefinition def : resourceGroup.getResourceType().getMetricDefinitions()) { + if (def.getDataType() == DataType.MEASUREMENT && def.getDisplayType() == DisplayType.SUMMARY) { + measurementDefinitions.add(def); + } + } - for (MeasurementDefinition def : type.getMetricDefinitions()) { - if (def.getDataType() == DataType.MEASUREMENT && def.getDisplayType() == DisplayType.SUMMARY) { - measurementDefinitions.add(def); - } - } + Collections.sort(measurementDefinitions, new Comparator<MeasurementDefinition>() { + public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { + return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); + } + }); - Collections.sort(measurementDefinitions, new Comparator<MeasurementDefinition>() { - public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { - return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); - } - }); + int[] measDefIdArray = new int[measurementDefinitions.size()]; + for (int i = 0; i < measDefIdArray.length; i++) { + measDefIdArray[i] = measurementDefinitions.get(i).getId(); + } - int[] measDefIdArray = new int[measurementDefinitions.size()]; - for (int i = 0; i < measDefIdArray.length; i++) { - measDefIdArray[i] = measurementDefinitions.get(i).getId(); - } + GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroup(resourceGroup.getId(), measDefIdArray, + buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), 60, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), caught); + loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); + } - GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroup(resourceGroup.getId(), - measDefIdArray, buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), 60, - new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), - caught); - loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); - } - - @Override - public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> result) { - if (result.isEmpty()) { - loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); - } else { - loadingLabel.hide(); - int i = 0; - for (List<MeasurementDataNumericHighLowComposite> data : result) { - buildIndividualGraph(measurementDefinitions.get(i++), data); - } - // There is a weird timing case when availabilityGraph can be null - if (availabilityGraph != null) { - availabilityGraph.setGroupAvailabilityList(groupAvailabilityList); - new Timer(){ - @Override - public void run() { - availabilityGraph.drawJsniChart(); - } - }.schedule(150); - } + @Override + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> result) { + if (result.isEmpty()) { + loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); + } else { + loadingLabel.hide(); + int i = 0; + for (List<MeasurementDataNumericHighLowComposite> data : result) { + buildIndividualGraph(measurementDefinitions.get(i++), data); + } + // There is a weird timing case when availabilityGraph can be null + if (availabilityGraph != null) { + availabilityGraph.setGroupAvailabilityList(groupAvailabilityList); + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); } - } - }); - + }.schedule(150); + } + } } }); + } protected void queryAvailability(final EntityContext groupContext, Long startTime, Long endTime, @@ -197,7 +186,7 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen List<MeasurementDataNumericHighLowComposite> data) { MetricGraphData metricGraphData = MetricGraphData.createForResourceGroup(resourceGroup.getId(), - resourceGroup.getName(), measurementDefinition, data ); + resourceGroup.getName(), measurementDefinition, data); StackedBarMetricGraphImpl graph = GWT.create(StackedBarMetricGraphImpl.class); graph.setMetricGraphData(metricGraphData); @@ -207,11 +196,9 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen graphView.setWidth("95%"); graphView.setHeight(MULTI_CHART_HEIGHT); - if(graphsVLayout != null){ + if (graphsVLayout != null) { graphsVLayout.addMember(graphView); } } - - } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index f8caf13..8e959db 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -68,8 +68,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitorin import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.ResourceAvailabilityView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.schedules.ResourceSchedulesView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table.MeasurementTableView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table.MetricsTableView; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table.MetricsResourceView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.traits.TraitsView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history.ResourceOperationHistoryListView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.schedule.ResourceOperationScheduleListView; @@ -408,7 +407,8 @@ public class ResourceDetailView extends viewFactory = (!visible) ? null : new ViewFactory() { @Override public Canvas createView() { - return new MetricsTableView(resource.getId()); + //return new MetricsTableView(resource.getId()); + return new MetricsResourceView(resource); } }; updateSubTab(this.monitoringTab, this.monitorMetrics, visible, true, viewFactory); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java index 65893ce..8b9f327 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -21,7 +21,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitori import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.EnumSet; import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -30,7 +29,6 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Overflow; -import com.smartgwt.client.widgets.form.fields.events.ClickHandler; import com.smartgwt.client.widgets.layout.VLayout; import org.rhq.core.domain.common.EntityContext; @@ -41,16 +39,14 @@ import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite; import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.async.Command; import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; @@ -115,17 +111,17 @@ public class D3GraphListView extends AbstractD3GraphListView { setOverflow(Overflow.HIDDEN); } - @Override protected void onDraw() { super.onDraw(); - Log.debug("D3GraphListView.onDraw() for: " + resource.getName()+ " id: "+ resource.getId()); + Log.debug("D3GraphListView.onDraw() for: " + resource.getName() + " id: " + resource.getId()); destroyMembers(); addMember(buttonBarDateTimeRangeEditor); if (showAvailabilityGraph) { - availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>(new AvailabilityOverUnderGraphType(resource.getId())); + availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( + new AvailabilityOverUnderGraphType(resource.getId())); addMember(availabilityGraph); } @@ -163,8 +159,8 @@ public class D3GraphListView extends AbstractD3GraphListView { @Override public void onSuccess(List<Availability> availList) { - Log.debug("\nSuccessfully queried availability in: " - + (System.currentTimeMillis() - timerStart) + " ms."); + Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + + " ms."); availabilityList = availList; if (countDownLatch != null) { countDownLatch.countDown(); @@ -180,193 +176,179 @@ public class D3GraphListView extends AbstractD3GraphListView { private void queryAndBuildGraphs() { final long startTimer = System.currentTimeMillis(); - if(null != availabilityGraph){ + if (null != availabilityGraph) { queryAvailability(EntityContext.forResource(resource.getId()), buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), null); } - ResourceTypeRepository.Cache.getInstance().getResourceTypes(resource.getResourceType().getId(), - EnumSet.of(ResourceTypeRepository.MetadataType.measurements), - new ResourceTypeRepository.TypeLoadedCallback() { - public void onTypesLoaded(final ResourceType type) { + final ArrayList<MeasurementDefinition> measurementDefinitions = new ArrayList<MeasurementDefinition>(); + final ArrayList<MeasurementDefinition> summaryMeasurementDefinitions = new ArrayList<MeasurementDefinition>(); - final ArrayList<MeasurementDefinition> measurementDefinitions = new ArrayList<MeasurementDefinition>(); - final ArrayList<MeasurementDefinition> summaryMeasurementDefinitions = new ArrayList<MeasurementDefinition>(); + for (MeasurementDefinition def : resource.getResourceType().getMetricDefinitions()) { + if (def.getDataType() == DataType.MEASUREMENT && def.getDisplayType() == DisplayType.SUMMARY) { + summaryMeasurementDefinitions.add(def); + } + measurementDefinitions.add(def); + } - for (MeasurementDefinition def : type.getMetricDefinitions()) { - if (def.getDataType() == DataType.MEASUREMENT && def.getDisplayType() == DisplayType.SUMMARY) { - summaryMeasurementDefinitions.add(def); - } - measurementDefinitions.add(def); - } + Collections.sort(measurementDefinitions, new Comparator<MeasurementDefinition>() { + @Override + public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { + return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); + } + }); + Collections.sort(summaryMeasurementDefinitions, new Comparator<MeasurementDefinition>() { + @Override + public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { + return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); + } + }); + + int[] measDefIdArray = new int[measurementDefinitions.size()]; + for (int i = 0; i < measDefIdArray.length; i++) { + measDefIdArray[i] = measurementDefinitions.get(i).getId(); + } - Collections.sort(measurementDefinitions, new Comparator<MeasurementDefinition>() { - @Override - public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { - return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); - } - }); - Collections.sort(summaryMeasurementDefinitions, new Comparator<MeasurementDefinition>() { - @Override - public int compare(MeasurementDefinition o1, MeasurementDefinition o2) { - return new Integer(o1.getDisplayOrder()).compareTo(o2.getDisplayOrder()); - } - }); - - int[] measDefIdArray = new int[measurementDefinitions.size()]; - for (int i = 0; i < measDefIdArray.length; i++) { - measDefIdArray[i] = measurementDefinitions.get(i).getId(); + // setting up a deferred Command to execute after all resource queries have completed (successfully or unsuccessfully) + // we know there are exactly 2 resources + final CountDownLatch countDownLatch = CountDownLatch.create(NUM_ASYNC_CALLS, new Command() { + @Override + /** + * Satisfied only after ALL of the metric queries AND availability have completed + */ + public void execute() { + Log.debug("Total Time for async metrics/avail query: " + (System.currentTimeMillis() - startTimer)); + if (null == metricsDataList || metricsDataList.isEmpty()) { + loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); + } else { + loadingLabel.hide(); + if (useSummaryData) { + buildSummaryGraphs(metricsDataList, summaryMeasurementDefinitions, measurementDefinitions); + } else { + determineGraphsToBuild(metricsDataList, measurementDefinitions, definitionIds); } - - // setting up a deferred Command to execute after all resource queries have completed (successfully or unsuccessfully) - // we know there are exactly 2 resources - final CountDownLatch countDownLatch = CountDownLatch.create(NUM_ASYNC_CALLS, new Command() { - @Override - /** - * Satisfied only after ALL of the metric queries AND availability have completed - */ - public void execute() { - Log.debug("Total Time for async metrics/avail query: " - + (System.currentTimeMillis() - startTimer)); - if (null == metricsDataList || metricsDataList.isEmpty()) { - loadingLabel.setContents(MSG.view_resource_monitor_graphs_noneAvailable()); - } else { - loadingLabel.hide(); - if (useSummaryData) { - buildSummaryGraphs(metricsDataList, summaryMeasurementDefinitions, - measurementDefinitions); - } else { - determineGraphsToBuild(metricsDataList, measurementDefinitions, definitionIds); - } - // There is a weird timing case when availabilityGraph can be null - if (null != availabilityGraph) { - // we only need the first metricData since we are only taking the - // availability data set in there for the dropdowns already - availabilityGraph.setAvailabilityList(availabilityList); - new Timer(){ - @Override - public void run() { - availabilityGraph.drawJsniChart(); - } - }.schedule(150); - } + // There is a weird timing case when availabilityGraph can be null + if (null != availabilityGraph) { + // we only need the first metricData since we are only taking the + // availability data set in there for the dropdowns already + availabilityGraph.setAvailabilityList(availabilityList); + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); } + }.schedule(150); + } + } - } - }); + } + }); - queryMetricData(measDefIdArray, countDownLatch); - queryOOBMetrics(resource, countDownLatch); - // now the countDown latch will run sometime asynchronously + queryMetricData(measDefIdArray, countDownLatch); + queryOOBMetrics(resource, countDownLatch); + // now the countDown latch will run sometime asynchronously + } + private void queryMetricData(final int[] measDefIdArray, final CountDownLatch countDownLatch) { + GWTServiceLookup.getMeasurementDataService().findDataForResource(resource.getId(), measDefIdArray, + buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), 60, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), caught); + loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); + countDownLatch.countDown(); } - private void queryMetricData(final int[] measDefIdArray, final CountDownLatch countDownLatch) { - GWTServiceLookup.getMeasurementDataService().findDataForResource(resource.getId(), measDefIdArray, - buttonBarDateTimeRangeEditor.getStartTime(), buttonBarDateTimeRangeEditor.getEndTime(), 60, - new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), - caught); - loadingLabel.setContents(MSG.view_resource_monitor_graphs_loadFailed()); - countDownLatch.countDown(); - } - - @Override - public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> metrics) { - metricsDataList = metrics; - Log.debug("Regular Metric graph data queried in: " - + (System.currentTimeMillis() - startTimer + " ms.")); - countDownLatch.countDown(); + @Override + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> metrics) { + metricsDataList = metrics; + countDownLatch.countDown(); - } - }); } + }); + } - private void queryOOBMetrics(final Resource resource, final CountDownLatch countDownLatch) { + private void queryOOBMetrics(final Resource resource, final CountDownLatch countDownLatch) { - final long startTime = System.currentTimeMillis(); + final long startTime = System.currentTimeMillis(); - GWTServiceLookup.getMeasurementDataService().getHighestNOOBsForResource(resource.getId(), 60, + GWTServiceLookup.getMeasurementDataService().getHighestNOOBsForResource(resource.getId(), 60, - new AsyncCallback<PageList<MeasurementOOBComposite>>() { - @Override - public void onSuccess(PageList<MeasurementOOBComposite> measurementOOBComposites) { + new AsyncCallback<PageList<MeasurementOOBComposite>>() { + @Override + public void onSuccess(PageList<MeasurementOOBComposite> measurementOOBComposites) { - measurementOOBCompositeList = measurementOOBComposites; - Log.debug("\nSuccessfully queried "+measurementOOBCompositeList.size() +" OOB records in: " + (System.currentTimeMillis() - startTime) - + " ms."); - countDownLatch.countDown(); - } + measurementOOBCompositeList = measurementOOBComposites; + Log.debug("\nSuccessfully queried " + measurementOOBCompositeList.size() + " OOB records in: " + + (System.currentTimeMillis() - startTime) + " ms."); + countDownLatch.countDown(); + } - @Override - public void onFailure(Throwable caught) { - Log.debug("Error retrieving out of bound metrics for resource [" + resource.getId() + "]:" - + caught.getMessage()); - countDownLatch.countDown(); - } - }); + @Override + public void onFailure(Throwable caught) { + Log.debug("Error retrieving out of bound metrics for resource [" + resource.getId() + "]:" + + caught.getMessage()); + countDownLatch.countDown(); + } + }); - } + } - /** - * Spin through the measurement definitions (in order) checking to see if they are in the - * summary measurement definition set and if so build a graph. - * @param measurementData - * @param summaryMeasurementDefinitions - * @param measurementDefinitions - */ - private void buildSummaryGraphs(List<List<MeasurementDataNumericHighLowComposite>> measurementData, - List<MeasurementDefinition> summaryMeasurementDefinitions, - List<MeasurementDefinition> measurementDefinitions) { - Set<Integer> summaryIds = new TreeSet<Integer>(); - for (MeasurementDefinition summaryMeasurementDefinition : summaryMeasurementDefinitions) { - summaryIds.add(summaryMeasurementDefinition.getId()); - } + /** + * Spin through the measurement definitions (in order) checking to see if they are in the + * summary measurement definition set and if so build a graph. + * @param measurementData + * @param summaryMeasurementDefinitions + * @param measurementDefinitions + */ + private void buildSummaryGraphs(List<List<MeasurementDataNumericHighLowComposite>> measurementData, + List<MeasurementDefinition> summaryMeasurementDefinitions, List<MeasurementDefinition> measurementDefinitions) { + Set<Integer> summaryIds = new TreeSet<Integer>(); + for (MeasurementDefinition summaryMeasurementDefinition : summaryMeasurementDefinitions) { + summaryIds.add(summaryMeasurementDefinition.getId()); + } - int i = 0; - for (MeasurementDefinition measurementDefinition : measurementDefinitions) { - if (summaryIds.contains(measurementDefinition.getId())) { - buildSingleGraph(measurementOOBCompositeList, measurementDefinition, - measurementData.get(i), MULTI_CHART_HEIGHT); - } - i++; - } + int i = 0; + for (MeasurementDefinition measurementDefinition : measurementDefinitions) { + if (summaryIds.contains(measurementDefinition.getId())) { + buildSingleGraph(measurementOOBCompositeList, measurementDefinition, measurementData.get(i), + MULTI_CHART_HEIGHT); + } + i++; + } - } + } - private void determineGraphsToBuild(List<List<MeasurementDataNumericHighLowComposite>> measurementData, - List<MeasurementDefinition> measurementDefinitions, Set<Integer> definitionIds) { - int i = 0; - for (List<MeasurementDataNumericHighLowComposite> metric : measurementData) { - - for (Integer selectedDefinitionId : definitionIds) { - final MeasurementDefinition measurementDefinition = measurementDefinitions.get(i); - final int measurementId = measurementDefinition.getId(); - - if (null != selectedDefinitionId) { - // single graph case - if (measurementId == selectedDefinitionId) { - buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, SINGLE_CHART_HEIGHT); - } - } else { - // multiple graph case - buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, MULTI_CHART_HEIGHT); - } - } - i++; + private void determineGraphsToBuild(List<List<MeasurementDataNumericHighLowComposite>> measurementData, + List<MeasurementDefinition> measurementDefinitions, Set<Integer> definitionIds) { + int i = 0; + for (List<MeasurementDataNumericHighLowComposite> metric : measurementData) { + + for (Integer selectedDefinitionId : definitionIds) { + final MeasurementDefinition measurementDefinition = measurementDefinitions.get(i); + final int measurementId = measurementDefinition.getId(); + + if (null != selectedDefinitionId) { + // single graph case + if (measurementId == selectedDefinitionId) { + buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, + SINGLE_CHART_HEIGHT); } + } else { + // multiple graph case + buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, MULTI_CHART_HEIGHT); } - }); - + } + i++; + } } private void buildSingleGraph(PageList<MeasurementOOBComposite> measurementOOBCompositeList, MeasurementDefinition measurementDefinition, List<MeasurementDataNumericHighLowComposite> data, int height) { MetricGraphData metricGraphData = MetricGraphData.createForResource(resource.getId(), resource.getName(), - measurementDefinition, data, measurementOOBCompositeList ); + measurementDefinition, data, measurementOOBCompositeList); StackedBarMetricGraphImpl graph = GWT.create(StackedBarMetricGraphImpl.class); graph.setMetricGraphData(metricGraphData); graph.setGraphListView(this); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java new file mode 100644 index 0000000..e4785da --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -0,0 +1,306 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Set; + +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.types.ExpansionMode; +import com.smartgwt.client.types.Overflow; +import com.smartgwt.client.types.VerticalAlignment; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.HTMLFlow; +import com.smartgwt.client.widgets.Img; +import com.smartgwt.client.widgets.Label; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.events.ClickHandler; +import com.smartgwt.client.widgets.grid.ListGrid; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.grid.events.RecordExpandEvent; +import com.smartgwt.client.widgets.grid.events.RecordExpandHandler; +import com.smartgwt.client.widgets.layout.VLayout; + +import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.IconEnum; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; +import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.AvailabilityOverUnderGraphType; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3GraphView; +import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedHLayout; + +/** + * The consolidated metrics view showing metric graphs and availability data both in graphical and tabular form. + * + * @author Mike Thompson + */ +public class MetricsResourceView extends AbstractD3GraphListView { + + private static final String COLLAPSED_TOOLTIP = MSG.chart_metrics_collapse_tooltip(); + private static final String EXPANDED_TOOLTIP = MSG.chart_metrics_expand_tooltip(); + + private Resource resource; + private Set<Integer> definitionIds = null; + private VLayout vLayout; + private Img expandCollapseArrow; + MetricsTableListGrid metricsGrid; + MetricsViewDataSource dataSource; + EnhancedHLayout availabilityDetails; + + + public MetricsResourceView(Resource resource) { + super(); + this.resource = resource; + dataSource = new MetricsViewDataSource(resource); + metricsGrid = new MetricsTableListGrid(); + + ArrayList<ListGridField> fields = dataSource.getListGridFields(); + metricsGrid.setFields(fields.toArray(new ListGridField[0])); + metricsGrid.setCanExpandRecords(true); + metricsGrid.addRecordExpandHandler(new RecordExpandHandler() { + @Override + public void onRecordExpand(RecordExpandEvent recordExpandEvent) { + Log.debug("Record Expanded: " + + recordExpandEvent.getRecord().getAttribute(MetricsViewDataSource.FIELD_METRIC_LABEL)); + new Timer() { + + @Override + public void run() { + BrowserUtility.graphSparkLines(); + } + }.schedule(150); + + } + + }); + + } + + private EnhancedHLayout createAvailabilityDetails() { + EnhancedHLayout hLayout = new EnhancedHLayout(); + hLayout.addMember(new Label("Availability Details")); + hLayout.hide(); + return hLayout; + } + + public void redrawGraphs() { + this.onDraw(); + } + + @Override + protected void onDraw() { + super.onDraw(); + Log.debug("MetricResourceView.onDraw() for: " + resource.getName() + " id: " + resource.getId()); + destroyMembers(); + + + vLayout = new VLayout(); + vLayout.setOverflow(Overflow.AUTO); + vLayout.setWidth100(); + vLayout.setHeight(220); + vLayout.addMember(buttonBarDateTimeRangeEditor); + + EnhancedHLayout expandCollapseHLayout = new EnhancedHLayout(); + + //add expand/collapse icon + expandCollapseArrow = new Img(IconEnum.COLLAPSED_ICON.getIcon16x16Path(), 16, 16); + expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP); + expandCollapseArrow.setLayoutAlign(VerticalAlignment.BOTTOM); + expandCollapseArrow.addClickHandler(new ClickHandler() { + private boolean collapsed = true; + + @Override + public void onClick(ClickEvent event) { + collapsed = !collapsed; + if (collapsed) { + expandCollapseArrow.setSrc(IconEnum.COLLAPSED_ICON.getIcon16x16Path()); + expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP); + availabilityDetails.hide(); + } + else { + expandCollapseArrow.setSrc(IconEnum.EXPANDED_ICON.getIcon16x16Path()); + expandCollapseArrow.setTooltip(EXPANDED_TOOLTIP); + availabilityDetails.show(); + } + markForRedraw(); + } + }); + + availabilityDetails = createAvailabilityDetails(); + + availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( + new AvailabilityOverUnderGraphType(resource.getId())); + + expandCollapseHLayout.addMember(expandCollapseArrow); + expandCollapseHLayout.addMember(availabilityGraph); + vLayout.addMember(expandCollapseHLayout); + vLayout.addMember(availabilityDetails); + + vLayout.addMember(metricsGrid); + + addMember(vLayout); + + if (resource != null) { + queryAvailability(EntityContext.forResource(resource.getId()), buttonBarDateTimeRangeEditor.getStartTime(), + buttonBarDateTimeRangeEditor.getEndTime(), null); + } + } + + @Override + protected void queryAvailability(final EntityContext context, Long startTime, Long endTime, + final CountDownLatch countDownLatch) { + + final long timerStart = System.currentTimeMillis(); + + // now return the availability + GWTServiceLookup.getAvailabilityService().getAvailabilitiesForResource(context.getResourceId(), startTime, + endTime, new AsyncCallback<List<Availability>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_availability_loadFailed(), caught); + if (countDownLatch != null) { + countDownLatch.countDown(); + } + } + + @Override + public void onSuccess(List<Availability> availList) { + Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + + " ms."); + availabilityList = availList; + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); + } + }.schedule(150); + + if (countDownLatch != null) { + countDownLatch.countDown(); + } + } + }); + } + + private class MetricsTableListGrid extends ListGrid { + public MetricsTableListGrid() { + super(); + + setCanExpandRecords(true); + setCanExpandMultipleRecords(true); + setExpansionMode(ExpansionMode.DETAIL_FIELD); + } + + @Override + protected Canvas getExpansionComponent(final ListGridRecord record) { + final Integer definitionId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); + final Integer resourceId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_RESOURCE_ID); + VLayout vLayout = new VLayout(); + vLayout.setPadding(5); + + final String chartId = "rChart" + resourceId + "-" + definitionId; + HTMLFlow htmlFlow = new HTMLFlow(MetricD3Graph.createGraphMarkerTemplate(chartId, 200)); + vLayout.addMember(htmlFlow); + + new Timer() { + + @Override + public void run() { + BrowserUtility.graphSparkLines(); + } + }.schedule(150); + + + // Load the fully fetched ResourceType. + ResourceType resourceType = resource.getResourceType(); + + Set<MeasurementDefinition> definitions = resourceType.getMetricDefinitions(); + final MeasurementDefinition measurementDefinition; + + //build id mapping for measurementDefinition instances Ex. Free Memory -> MeasurementDefinition[100071] + final HashMap<String, MeasurementDefinition> measurementDefMap = new HashMap<String, MeasurementDefinition>(); + for (MeasurementDefinition definition : definitions) { + measurementDefMap.put(definition.getDisplayName(), definition); + if (definition.getId() == definitionId) { + measurementDefinition = definition; + break; + } + } + + int[] definitionArrayIds = new int[1]; + definitionArrayIds[0] = definitionId; + GWTServiceLookup.getMeasurementDataService().findDataForResource(resourceId, definitionArrayIds, + measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, 60, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + Log.debug("Error retrieving recent metrics charting data for resource [" + resourceId + "]:" + + caught.getMessage()); + } + + @Override + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> results) { + if (!results.isEmpty()) { + + //load the data results for the given metric definition + List<MeasurementDataNumericHighLowComposite> data = results.get(0); + Log.debug(" *** Metric Data Results: "+data.size()); + +// MetricGraphData metricGraphData = MetricGraphData +// .createForResource(resourceId, resource.getName(), +// measurementDefinition, data, null); +// +// StackedBarMetricGraphImpl graph = GWT +// .create(StackedBarMetricGraphImpl.class); +// graph.setMetricGraphData(metricGraphData); +// final MetricD3Graph graphView = new MetricD3Graph(graph, this); +// new Timer() { +// @Override +// public void run() { +// graphView.drawJsniChart(); +// +// } +// }.schedule(150); + + } else { + Log.warn("No chart data retrieving for resource [" + resourceId + "]"); + + } + } + }); + + return vLayout; + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java index 0586702..57e62ab 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java @@ -48,7 +48,9 @@ import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPre * * @author John Mazzitelli * @author Mike Thompson + * @todo: get rid of this once we have tested the new screen out */ +@Deprecated public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, Criteria> { public static final String FIELD_SPARKLINE = "sparkline"; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 163b191..82fe2d2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -76,6 +76,7 @@ import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPre * @author John Mazzitelli * @author Mike Thompson */ +@Deprecated public class MetricsTableView extends Table<MetricsTableDataSource> implements RedrawGraphs { private final int resourceId; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java new file mode 100644 index 0000000..605267d --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java @@ -0,0 +1,298 @@ +package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Set; + +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.criteria.Criteria; +import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.measurement.MeasurementSchedule; +import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; +import org.rhq.core.domain.measurement.ui.MetricDisplaySummary; +import org.rhq.core.domain.measurement.ui.MetricDisplayValue; +import org.rhq.core.domain.resource.Resource; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.UserSessionManager; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; +import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; +import org.rhq.enterprise.gui.coregui.client.util.async.Command; +import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; +import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; + +/** + * A simple data source to read in metric data summaries for a resource. + * This doesn't support paging - everything is returned in one query. Since + * the number of metrics per resource is relatively small (never more than tens of them), + * we just load them all in at once. + * + * @author John Mazzitelli + * @author Mike Thompson + */ +public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, Criteria> { + + public static final int NUMBER_OF_METRIC_POINTS = 60; + public static final String FIELD_SPARKLINE = "sparkline"; + public static final String FIELD_METRIC_LABEL = "label"; + public static final String FIELD_ALERT_COUNT = "alertCount"; + public static final String FIELD_MIN_VALUE = "min"; + public static final String FIELD_MAX_VALUE = "max"; + public static final String FIELD_AVG_VALUE = "avg"; + public static final String FIELD_LAST_VALUE = "last"; + public static final String FIELD_METRIC_DEF_ID = "defId"; + public static final String FIELD_METRIC_SCHED_ID = "schedId"; + public static final String FIELD_METRIC_UNITS = "units"; + public static final String FIELD_METRIC_NAME = "name"; + public static final String FIELD_RESOURCE_ID = "resourceId"; + final private Resource resource; + private List<MetricDisplaySummary> metricDisplaySummaries; + private List<List<MeasurementDataNumericHighLowComposite>> metricsDataList; + private MeasurementUserPreferences measurementUserPrefs; + + public MetricsViewDataSource(Resource resource) { + this.resource = resource; + measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); + } + + /** + * The view that contains the list grid which will display this datasource's data will call this + * method to get the field information which is used to control the display of the data. + * + * @return list grid fields used to display the datasource data + */ + public ArrayList<ListGridField> getListGridFields() { + ArrayList<ListGridField> fields = new ArrayList<ListGridField>(7); + + ListGridField sparklineField = new ListGridField(FIELD_SPARKLINE, "chart"); + sparklineField.setCellFormatter(new CellFormatter() { + @Override + public String format(Object value, ListGridRecord record, int rowNum, int colNum) { + if (value == null) { + return ""; + } + String contents = "<span id='sparkline_" + resource.getId() + "-" + + record.getAttributeAsInt(FIELD_METRIC_DEF_ID) + "' class='dynamicsparkline' width='70' " + + "values='" + record.getAttribute(FIELD_SPARKLINE) + "'></span>"; + return contents; + + } + }); + + sparklineField.setWidth(80); + fields.add(sparklineField); + + ListGridField nameField = new ListGridField(FIELD_METRIC_LABEL, MSG.common_title_name()); + nameField.setWidth("30%"); + fields.add(nameField); + + ListGridField alertsField = new ListGridField(FIELD_ALERT_COUNT, MSG.common_title_alerts()); + alertsField.setWidth("10%"); + fields.add(alertsField); + + ListGridField minField = new ListGridField(FIELD_MIN_VALUE, MSG.view_resource_monitor_table_min()); + minField.setWidth("15%"); + fields.add(minField); + + ListGridField maxField = new ListGridField(FIELD_MAX_VALUE, MSG.view_resource_monitor_table_max()); + maxField.setWidth("15%"); + fields.add(maxField); + + ListGridField avgField = new ListGridField(FIELD_AVG_VALUE, MSG.view_resource_monitor_table_avg()); + avgField.setWidth("15%"); + fields.add(avgField); + + ListGridField lastField = new ListGridField(FIELD_LAST_VALUE, MSG.view_resource_monitor_table_last()); + lastField.setWidth("15%"); + fields.add(lastField); + + return fields; + } + + @Override + public MetricDisplaySummary copyValues(Record from) { + // we should never need this method - we only go in one direction + // if we ever need this, just have copyValues store an "object" attribute whose value is "from" + // which this method then just reads out. Since we don't need this now, save memory by not + // keeping the MetricDisplayValue around + return null; + } + + @Override + public ListGridRecord copyValues(MetricDisplaySummary from) { + MeasurementUtility.formatSimpleMetrics(from); + + ListGridRecord record = new ListGridRecord(); + record.setAttribute(FIELD_SPARKLINE, getCsvMetricsForSparkline()); + record.setAttribute(FIELD_METRIC_LABEL, from.getLabel()); + record.setAttribute(FIELD_ALERT_COUNT, String.valueOf(from.getAlertCount())); + record.setAttribute(FIELD_MIN_VALUE, getMetricStringValue(from.getMinMetric())); + record.setAttribute(FIELD_MAX_VALUE, getMetricStringValue(from.getMaxMetric())); + record.setAttribute(FIELD_AVG_VALUE, getMetricStringValue(from.getAvgMetric())); + record.setAttribute(FIELD_LAST_VALUE, getMetricStringValue(from.getLastMetric())); + record.setAttribute(FIELD_METRIC_DEF_ID, from.getDefinitionId()); + record.setAttribute(FIELD_METRIC_SCHED_ID, from.getScheduleId()); + record.setAttribute(FIELD_METRIC_UNITS, from.getUnits()); + record.setAttribute(FIELD_METRIC_NAME, from.getMetricName()); + record.setAttribute(FIELD_RESOURCE_ID, resource.getId()); + return record; + } + + private String getCsvMetricsForSparkline() { + StringBuilder sb = new StringBuilder(); + Log.debug("getCsvMetricsForSparkline.metricsDataList: " + metricsDataList.size()); + for (List<MeasurementDataNumericHighLowComposite> measurementData : metricsDataList) { + for (int i = 0; i < measurementData.size(); i++) { + // take the last 20 values + if (i >= measurementData.size() - 20) { + if (!Double.isNaN(measurementData.get(i).getValue())) { + sb.append((int) measurementData.get(i).getValue()); + sb.append(","); + } + } + } + if (sb.toString().endsWith(",")) { + sb.setLength(sb.length() - 1); + } + } + Log.debug("getCsvMetricsForSparkline: " + sb.toString()); + + return sb.toString(); + } + + protected String getMetricStringValue(MetricDisplayValue value) { + return (value != null) ? value.toString() : ""; + } + + @Override + protected Criteria getFetchCriteria(DSRequest request) { + // we don't use criterias for this datasource, just return null + return null; + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response, final Criteria unused) { + + Log.debug("***** Fetching MetricsView data :"); + GWTServiceLookup.getMeasurementScheduleService().findSchedulesForResourceAndType(resource.getId(), + DataType.MEASUREMENT, null, true, new AsyncCallback<ArrayList<MeasurementSchedule>>() { + @Override + public void onSuccess(ArrayList<MeasurementSchedule> measurementSchedules) { + int[] scheduleIds = new int[measurementSchedules.size()]; + int i = 0; + for (MeasurementSchedule measurementSchedule : measurementSchedules) { + scheduleIds[i++] = measurementSchedule.getId(); + } + + final CountDownLatch countDownLatch = CountDownLatch.create(2, new Command() { + + @Override + public void execute() { + response.setData(buildRecords(metricDisplaySummaries)); + processResponse(request.getRequestId(), response); + + new Timer() { + + @Override + public void run() { + BrowserUtility.graphSparkLines(); + } + }.schedule(150); + Log.debug("*** Finished CountdownLatch for metrics loaded: " + metricsDataList.size()); + } + }); + + queryResourceMetrics(resource, measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, countDownLatch); + queryMetricDisplaySummaries(scheduleIds, measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, countDownLatch); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError("Cannot load schedules", caught); + } + }); + } + + private void queryMetricDisplaySummaries(int[] scheduleIds, Long startTime, Long endTime, + final CountDownLatch countDownLatch) { + GWTServiceLookup.getMeasurementChartsService().getMetricDisplaySummariesForResource(resource.getId(), + scheduleIds, startTime, endTime, new AsyncCallback<ArrayList<MetricDisplaySummary>>() { + @Override + public void onSuccess(ArrayList<MetricDisplaySummary> metricDisplaySummaries) { + setMetricDisplaySummaries(metricDisplaySummaries); + countDownLatch.countDown(); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError("Cannot load metrics", caught); + countDownLatch.countDown(); + } + } + + ); + } + + void setMetricDisplaySummaries(List<MetricDisplaySummary> metricDisplaySummaries) { + this.metricDisplaySummaries = metricDisplaySummaries; + } + + public void queryResourceMetrics(final Resource resource, Long startTime, Long endTime, + final CountDownLatch countDownLatch) { + Set<MeasurementDefinition> definitions = resource.getResourceType().getMetricDefinitions(); + + //build id mapping for measurementDefinition instances Ex. Free Memory -> MeasurementDefinition[100071] + final HashMap<String, MeasurementDefinition> measurementDefMap = new HashMap<String, MeasurementDefinition>(); + for (MeasurementDefinition definition : definitions) { + measurementDefMap.put(definition.getDisplayName(), definition); + } + //bundle definition ids for asynch call. + int[] definitionArrayIds = new int[definitions.size()]; + final String[] displayOrder = new String[definitions.size()]; + measurementDefMap.keySet().toArray(displayOrder); + //sort the charting data ex. Free Memory, Free Swap Space,..System Load + Arrays.sort(displayOrder); + + //organize definitionArrayIds for ordered request on server. + int index = 0; + for (String definitionToDisplay : displayOrder) { + definitionArrayIds[index++] = measurementDefMap.get(definitionToDisplay).getId(); + } + + GWTServiceLookup.getMeasurementDataService().findDataForResource(resource.getId(), definitionArrayIds, + startTime, endTime, NUMBER_OF_METRIC_POINTS, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + Log.warn("Error retrieving recent metrics charting data for resource [" + resource.getId() + "]:" + + caught.getMessage()); + } + + @Override + public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> measurementDataList) { + + if (!measurementDataList.isEmpty()) { + metricsDataList = measurementDataList; + Log.debug("*** Setting metricsDataList.size: " + metricsDataList.size()); + countDownLatch.countDown(); + } + } + }); + + } +} diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 84e9c6e..ee4f817 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -20,6 +20,9 @@ chart_hover_period_label = Period chart_hover_start_label = Start chart_hover_time_format = %I:%M:%S %p chart_ie_not_supported = Charting is not available for this browser. +chart_metrics= Metrics +chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +chart_metrics_expand_tooltip= Click here to collapse additional availability detail. chart_no_data_label = No Data chart_single_value_label = Value chart_slider_button_bar_day = Day diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index d6a102b..058da5a 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -48,6 +48,9 @@ chart_hover_date_format = %d.%m.%y ##chart_hover_start_label = Start chart_hover_time_format = %H:%M:%S ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_day = Day diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index bd8e0b4..06f0040 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -23,6 +23,9 @@ chart_hover_period_label = Zeitraum chart_hover_start_label = Start chart_hover_time_format = %H:%M:%S chart_ie_not_supported = Charting ist bei diesem Browser nicht unterstützt +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. chart_no_data_label = Keine Daten vorhanden ##chart_single_value_label = Value chart_slider_button_bar_day = Tag diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 9237f76..80bb10e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -24,6 +24,9 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index bd34f9b..45e9d84 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -22,6 +22,9 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 1330eb7..4fc33cd 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -21,6 +21,9 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 72a287b..9e68d15 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -21,6 +21,9 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 10f9b0a..d8363ba 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -21,6 +21,9 @@ ##chart_hover_date_format = %m/%d/%y ##chart_hover_time_format = %I:%M:%S %p ##chart_ie_not_supported = Charting is not available for this browser. +##chart_metrics= Metrics +##chart_metrics_collapse_tooltip= Click here to see additional tabular availability data. +##chart_metrics_expand_tooltip= Click here to collapse additional availability detail. ##chart_no_data_label = No Data ##chart_single_value_label = Value ##chart_slider_button_bar_minute = Min commit 2574ddc2499670da832610c58a6706688a76f45b Author: Mike Thompson <mithomps(a)redhat.com> Date: Fri Jul 12 11:06:48 2013 -0700 Consolidated Metrics expandable tree grid detail chart display. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java index 1d04c36..0586702 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableDataSource.java @@ -89,7 +89,6 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, if (value == null) { return ""; } - //String formattedValue = StringUtility.escapeHtml(value.toString()); String contents = "<span id='sparkline_" + resourceId + "-" + record.getAttributeAsInt(FIELD_METRIC_DEF_ID) + "' class='dynamicsparkline' width='70' " + "values='" + record.getAttribute(FIELD_SPARKLINE) + "'></span>"; @@ -158,25 +157,25 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, } private String getCsvMetricsForSparkline() { - StringBuilder sb = new StringBuilder(); - Log.debug("getCsvMetricsForSparkline.metricsDataList: "+metricsDataList.size()); - for (List<MeasurementDataNumericHighLowComposite> measurementData: metricsDataList) { - int i = 0; - for (MeasurementDataNumericHighLowComposite measurementDataComposite : measurementData) { - // take the last 10 values - if(i >= 50) { - sb.append(measurementDataComposite.getValue()); - sb.append(","); - i++; + StringBuilder sb = new StringBuilder(); + Log.debug("getCsvMetricsForSparkline.metricsDataList: " + metricsDataList.size()); + for (List<MeasurementDataNumericHighLowComposite> measurementData : metricsDataList) { + for (int i = 0; i < measurementData.size(); i++) { + // take the last 20 values + if (i >= measurementData.size() - 20) { + if (!Double.isNaN(measurementData.get(i).getValue())) { + sb.append((int) measurementData.get(i).getValue()); + sb.append(","); + } } } - if(sb.toString().endsWith(",")){ + if (sb.toString().endsWith(",")) { sb.setLength(sb.length() - 1); } } - Log.debug("getCsvMetricsForSparkline: "+sb.toString()); + Log.debug("getCsvMetricsForSparkline: " + sb.toString()); - return sb.toString(); + return sb.toString(); } protected String getMetricStringValue(MetricDisplayValue value) { @@ -216,28 +215,28 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, BrowserUtility.graphSparkLines(); } }.schedule(150); - Log.debug("*** Finished CountdownLatch for metrics loaded: "+ metricsDataList.size()); + Log.debug("*** Finished CountdownLatch for metrics loaded: " + metricsDataList.size()); } }); retrieveResourceMetrics(resourceId, countDownLatch); - GWTServiceLookup.getMeasurementChartsService(). - getMetricDisplaySummariesForResource(resourceId, scheduleIds, - measurementUserPrefs.getMetricRangePreferences().begin, measurementUserPrefs.getMetricRangePreferences().end, - new AsyncCallback<ArrayList<MetricDisplaySummary>>() { - @Override - public void onSuccess(ArrayList<MetricDisplaySummary> metricDisplaySummaries) { - setMetricDisplaySummaries(metricDisplaySummaries); - countDownLatch.countDown(); - } + GWTServiceLookup.getMeasurementChartsService().getMetricDisplaySummariesForResource(resourceId, + scheduleIds, measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, + new AsyncCallback<ArrayList<MetricDisplaySummary>>() { + @Override + public void onSuccess(ArrayList<MetricDisplaySummary> metricDisplaySummaries) { + setMetricDisplaySummaries(metricDisplaySummaries); + countDownLatch.countDown(); + } - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Cannot load metrics", caught); - countDownLatch.countDown(); + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError("Cannot load metrics", caught); + countDownLatch.countDown(); + } } - } ); } @@ -253,86 +252,82 @@ public class MetricsTableDataSource extends RPCDataSource<MetricDisplaySummary, this.metricDisplaySummaries = metricDisplaySummaries; } - - - public void retrieveResourceMetrics(final Integer resourceId, final CountDownLatch countDownLatch){ + public void retrieveResourceMetrics(final Integer resourceId, final CountDownLatch countDownLatch) { ResourceCriteria criteria = new ResourceCriteria(); criteria.addFilterId(resourceId); //locate the resource GWTServiceLookup.getResourceService().findResourceCompositesByCriteria(criteria, - new AsyncCallback<PageList<ResourceComposite>>() { - @Override - public void onFailure(Throwable caught) { - Log.debug("Error retrieving resource resource composite for resource [" + resourceId + "]:" - + caught.getMessage()); - } + new AsyncCallback<PageList<ResourceComposite>>() { + @Override + public void onFailure(Throwable caught) { + Log.debug("Error retrieving resource resource composite for resource [" + resourceId + "]:" + + caught.getMessage()); + } - @Override - public void onSuccess(PageList<ResourceComposite> resourceCompositePageList) { - if (!resourceCompositePageList.isEmpty()) { - final ResourceComposite resourceComposite = resourceCompositePageList.get(0); - final Resource resource = resourceComposite.getResource(); - // Load the fully fetched ResourceType. - ResourceType resourceType = resource.getResourceType(); - ResourceTypeRepository.Cache.getInstance().getResourceTypes( - resourceType.getId(), - EnumSet.of(ResourceTypeRepository.MetadataType.measurements), - new ResourceTypeRepository.TypeLoadedCallback() { - public void onTypesLoaded(ResourceType type) { - resource.setResourceType(type); - //metric definitions - Set<MeasurementDefinition> definitions = type.getMetricDefinitions(); - - //build id mapping for measurementDefinition instances Ex. Free Memory -> MeasurementDefinition[100071] - final HashMap<String, MeasurementDefinition> measurementDefMap = new HashMap<String, MeasurementDefinition>(); - for (MeasurementDefinition definition : definitions) { - measurementDefMap.put(definition.getDisplayName(), definition); - } - //bundle definition ids for asynch call. - int[] definitionArrayIds = new int[definitions.size()]; - final String[] displayOrder = new String[definitions.size()]; - measurementDefMap.keySet().toArray(displayOrder); - //sort the charting data ex. Free Memory, Free Swap Space,..System Load - Arrays.sort(displayOrder); - - //organize definitionArrayIds for ordered request on server. - int index = 0; - for (String definitionToDisplay : displayOrder) { - definitionArrayIds[index++] = measurementDefMap.get(definitionToDisplay) - .getId(); + @Override + public void onSuccess(PageList<ResourceComposite> resourceCompositePageList) { + if (!resourceCompositePageList.isEmpty()) { + final ResourceComposite resourceComposite = resourceCompositePageList.get(0); + final Resource resource = resourceComposite.getResource(); + // Load the fully fetched ResourceType. + ResourceType resourceType = resource.getResourceType(); + ResourceTypeRepository.Cache.getInstance().getResourceTypes(resourceType.getId(), + EnumSet.of(ResourceTypeRepository.MetadataType.measurements), + new ResourceTypeRepository.TypeLoadedCallback() { + public void onTypesLoaded(ResourceType type) { + resource.setResourceType(type); + //metric definitions + Set<MeasurementDefinition> definitions = type.getMetricDefinitions(); + + //build id mapping for measurementDefinition instances Ex. Free Memory -> MeasurementDefinition[100071] + final HashMap<String, MeasurementDefinition> measurementDefMap = new HashMap<String, MeasurementDefinition>(); + for (MeasurementDefinition definition : definitions) { + measurementDefMap.put(definition.getDisplayName(), definition); + } + //bundle definition ids for asynch call. + int[] definitionArrayIds = new int[definitions.size()]; + final String[] displayOrder = new String[definitions.size()]; + measurementDefMap.keySet().toArray(displayOrder); + //sort the charting data ex. Free Memory, Free Swap Space,..System Load + Arrays.sort(displayOrder); + + //organize definitionArrayIds for ordered request on server. + int index = 0; + for (String definitionToDisplay : displayOrder) { + definitionArrayIds[index++] = measurementDefMap.get(definitionToDisplay) + .getId(); + } + + GWTServiceLookup.getMeasurementDataService().findDataForResource(resourceId, + definitionArrayIds, measurementUserPrefs.getMetricRangePreferences().begin, + measurementUserPrefs.getMetricRangePreferences().end, 60, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + Log.warn("Error retrieving recent metrics charting data for resource [" + + resourceId + "]:" + caught.getMessage()); } + @Override + public void onSuccess( + List<List<MeasurementDataNumericHighLowComposite>> measurementDataList) { - GWTServiceLookup.getMeasurementDataService().findDataForResource(resourceId, definitionArrayIds, - measurementUserPrefs.getMetricRangePreferences().begin, - measurementUserPrefs.getMetricRangePreferences().end, 60, - new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { - @Override - public void onFailure(Throwable caught) { - Log.warn("Error retrieving recent metrics charting data for resource [" - + resourceId + "]:" + caught.getMessage()); - } - - @Override - public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> measurementDataList) { - - if (!measurementDataList.isEmpty()) { - metricsDataList = measurementDataList; - Log.debug("*** Setting metricsDataList.size: "+metricsDataList.size()); - countDownLatch.countDown(); - } + if (!measurementDataList.isEmpty()) { + metricsDataList = measurementDataList; + Log.debug("*** Setting metricsDataList.size: " + + metricsDataList.size()); + countDownLatch.countDown(); } - }); - - + } + }); - } - }); - } + } + }); } - }); + } + }); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index cee9d8d..163b191 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -285,7 +285,7 @@ public class MetricsTableView extends Table<MetricsTableDataSource> implements R setCanExpandRecords(true); setCanExpandMultipleRecords(true); - setExpansionMode(ExpansionMode.RELATED); + setExpansionMode(ExpansionMode.DETAIL_FIELD); } @Override

1 0

[rhq] modules/common
by John Sanda 16 Jul '13

16 Jul '13

modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 71 ++-------- 1 file changed, 18 insertions(+), 53 deletions(-) New commits: commit f24eb1cfcb98ce8c1c4a9edb00453aef60c7e7dd Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 15 22:06:57 2013 -0400 copy cassandra-jvm.properties on upgrade. we're no longer using cassandra-env.sh. diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 9a6a1c0..2fec2dc 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -25,10 +25,8 @@ package org.rhq.storage.installer; -import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileReader; import java.io.IOException; import java.net.InetAddress; import java.util.ArrayList; @@ -37,6 +35,7 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Properties; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -65,6 +64,7 @@ import org.rhq.cassandra.DeploymentOptions; import org.rhq.cassandra.DeploymentOptionsFactory; import org.rhq.cassandra.installer.RMIContextFactory; import org.rhq.core.util.PropertiesFileUpdate; +import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.core.util.file.FileUtil; @@ -244,24 +244,19 @@ public class StorageInstaller { deployer.updateFilePerms(); // For upgrades we will copy the existing cassandra.yaml, - // log4j-server.properties, and cassandra-env.sh file from the existing + // log4j-server.properties, and cassandra-jvm.properties from the existing // storage node installation. Going forward though we need to add support - // for merging in the existing cassandra.yaml with the new one. We also - // need to do something about cassandra-env.sh. There is no easy to parse - // it and merge in changes which is problematic since that is where heap - // settings and JMX port and other JMV options are specified. Maybe we can - // replace it with a cassandra-in.sh that is essentially a properties file - // which we can easily parse and update. + // for merging in the existing cassandra.yaml with the new one. File oldConfDir = new File(existingStorageDir, "conf"); File newConfDir = new File(storageBasedir, "conf"); String cassandraYaml = "cassandra.yaml"; - String cassandraEnv = "cassandra-env.sh"; - File cassandraEnvFile = new File(newConfDir, cassandraEnv); + String cassandraJvmProps = "cassandra-jvm.properties"; + File cassandraJvmPropsFile = new File(newConfDir, cassandraJvmProps); String log4j = "log4j-server.properties"; replaceFile(new File(oldConfDir, cassandraYaml), new File(newConfDir, cassandraYaml)); - replaceFile(new File(oldConfDir, cassandraEnv), cassandraEnvFile); + replaceFile(new File(oldConfDir, cassandraJvmProps), cassandraJvmPropsFile); replaceFile(new File(oldConfDir, log4j), new File(newConfDir, log4j)); log.info("Finished installing RHQ Storage Node."); @@ -274,7 +269,7 @@ public class StorageInstaller { hostname = (String) config.get("listen_address"); - jmxPort = parseJmxPort(cassandraEnvFile); + jmxPort = parseJmxPort(cassandraJvmPropsFile); } else { if (cmdLine.hasOption("dir")) { File basedir = new File(cmdLine.getOptionValue("dir")); @@ -666,56 +661,26 @@ public class StorageInstaller { } } - private int parseJmxPort(File cassandraEnvFile) { + private int parseJmxPort(File cassandraJvmOptsFile) { Integer port = null; if (isWindows()) { // TODO return defaultJmxPort; } else { - BufferedReader reader = null; try { - reader = new BufferedReader(new FileReader(cassandraEnvFile)); - String line = reader.readLine(); - - while (line != null) { - if (line.startsWith("JMX_PORT")) { - int startIndex = line.indexOf("JMX_PORT=\"") + 1; - int endIndex = line.lastIndexOf("\""); - - if (startIndex == -1 || endIndex == -1) { - log.error("Failed to parse the JMX port. Make sure that you have the JMX port defined on its " - + "own line as follows, JMX_PORT=\"<jmx-port>\""); - throw new RuntimeException("Cannot determine JMX port"); - } - try { - port = Integer.parseInt(line.substring(startIndex, endIndex)); - } catch (NumberFormatException e) { - log.error("The JMX port must be an integer. [" + port + "] is an invalid value"); - throw new RuntimeException("The JMX port has an invalid value"); - } - return port; - } - line = reader.readLine(); + Properties properties = new Properties(); + properties.load(new FileInputStream(cassandraJvmOptsFile)); + + String jmxPort = properties.getProperty("jmx_port"); + if (StringUtil.isEmpty(jmxPort)) { + log.error("The property [jmx_port] is undefined."); + throw new RuntimeException("Cannot determine JMX port"); } - log.error("Failed to parse the JMX port. Make sure that you have the JMX port defined on its " - + "own line as follows, JMX_PORT=\"<jmx-port>\""); - throw new RuntimeException("Cannot determine JMX port"); + + return Integer.parseInt(jmxPort); } catch (IOException e) { log.error("Failed to parse JMX port. There was an unexpected IO error", e); throw new RuntimeException("Failed to parse JMX port due to IO error: " + e.getMessage()); - } finally { - try { - if (reader != null) { - reader.close(); - } - } catch (IOException e) { - if (log.isDebugEnabled()) { - log.debug("An error occurred closing the " + BufferedReader.class.getName() + " used to " - + "parse the JMX port", e); - } else { - log.warn("There was error closing the reader used to parse the JMX port: " + e.getMessage()); - } - } } } }

1 0

[rhq] etc/scripts
by John Sanda 16 Jul '13

16 Jul '13

etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 27138835d3ac9fb10fe18519fbe441fc1979387e Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 15 21:47:34 2013 -0400 fixing bug in script diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh index 7c0b88a..33984d1 100755 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh @@ -19,6 +19,9 @@ CQL_HOSTNAME=$2 CQL_PORT=$3 JMX_PORT=$4 +export CQLSH_HOST=$2 +export CQL_PORT=$3 + PATCH="apache-cassandra-1.2.4-patch-1.jar" # swap out the Cassandra jar file with the patched version @@ -36,8 +39,6 @@ sleep 3 # run the CQL script echo "Running CQL script to disable table compression" -export CQLSH_HOST=$CQLSH_HOST -export CQL_PORT=$CQL_PORT $RHQ_SERVER_DIR/rhq-storage/bin/cqlsh -u rhqadmin -p rhqadmin -f ./disable_compression.cql # rewrite all sstables

1 0

[rhq] modules/plugins
by John Sanda 15 Jul '13

15 Jul '13

modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java | 69 ++++++++-- 1 file changed, 60 insertions(+), 9 deletions(-) New commits: commit 34514a874e079e19736bbc0fd71db099a1b9b25a Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 15 16:23:06 2013 -0400 make parsing of heap options more robust diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index a0220ba..8d1771d 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -32,18 +32,13 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { Configuration config = new Configuration(); - String heapMinProp = properties.getProperty("heap_min"); - String heapMaxProp = properties.getProperty("heap_max"); - String heapNewProp = properties.getProperty("heap_new"); - String threadStackSizeProp = properties.getProperty("thread_stack_size"); String heapDumpOnOOMError = properties.getProperty("heap_dump_on_OOMError"); String heapDumpDir = properties.getProperty("heap_dump_dir"); - config.put(new PropertySimple("minHeapSize", heapMinProp.substring(4))); - config.put(new PropertySimple("maxHeapSize", heapMaxProp.substring(4))); - config.put(new PropertySimple("heapNewSize", heapNewProp.substring(4))); - config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4, - threadStackSizeProp.length() - 1))); + config.put(new PropertySimple("minHeapSize", getHeapMinProp(properties))); + config.put(new PropertySimple("maxHeapSize", getHeapMaxProp(properties))); + config.put(new PropertySimple("heapNewSize", getHeapNewProp(properties))); + config.put(new PropertySimple("threadStackSize", getStackSizeProp(properties))); if (!StringUtil.isEmpty(heapDumpOnOOMError)) { config.put(new PropertySimple("heapDumpOnOOMError", true)); @@ -61,6 +56,62 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { return config; } + private String getHeapMinProp(Properties properties) { + String value = properties.getProperty("heap_min"); + + if (StringUtil.isEmpty(value)) { + return ""; + } + + if (!value.startsWith("-Xms")) { + return value; + } + + return value.substring(4); + } + + private String getHeapMaxProp(Properties properties) { + String value = properties.getProperty("heap_max"); + + if (StringUtil.isEmpty(value)) { + return ""; + } + + if (!value.startsWith("-Xmx")) { + return value; + } + + return value.substring(4); + } + + private String getHeapNewProp(Properties properties) { + String value = properties.getProperty("heap_new"); + + if (StringUtil.isEmpty(value)) { + return ""; + } + + if (!value.startsWith("-Xmn")) { + return value; + } + + return value.substring(4); + } + + private String getStackSizeProp(Properties properties) { + String value = properties.getProperty("thread_stack_size"); + + if (StringUtil.isEmpty(value)) { + return ""; + } + + if (!(value.startsWith("-Xss") || value.endsWith("k") || value.length() > 5)) { + return value; + } + + return value.substring(4, value.length() - 1); + } + @Override public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { try {

1 0

[rhq] modules/plugins
by John Sanda 15 Jul '13

15 Jul '13

modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java | 35 +++++ modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 18 ++ modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java | 61 +++++++++- 3 files changed, 107 insertions(+), 7 deletions(-) New commits: commit 632eb18cc8984f12c794678c6d13a455048a2096 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 15 15:35:48 2013 -0400 adding validation checks for heap and thread args diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index c87d2ac..a0220ba 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -42,7 +42,8 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { config.put(new PropertySimple("minHeapSize", heapMinProp.substring(4))); config.put(new PropertySimple("maxHeapSize", heapMaxProp.substring(4))); config.put(new PropertySimple("heapNewSize", heapNewProp.substring(4))); - config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4))); + config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4, + threadStackSizeProp.length() - 1))); if (!StringUtil.isEmpty(heapDumpOnOOMError)) { config.put(new PropertySimple("heapDumpOnOOMError", true)); @@ -70,6 +71,7 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { String maxHeapSize = config.getSimpleValue("maxHeapSize"); if (!StringUtil.isEmpty(maxHeapSize)) { + validateHeapArg("maxHeapSize", maxHeapSize); // We want min and max heap to be the same properties.setProperty("heap_min", "-Xms" + maxHeapSize); properties.setProperty("heap_max", "-Xmx" + maxHeapSize); @@ -77,12 +79,14 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { String heapNewSize = config.getSimpleValue("heapNewSize"); if (!StringUtil.isEmpty(heapNewSize)) { + validateHeapArg("heapNewSize", heapNewSize); properties.setProperty("heap_new", "-Xmn" + heapNewSize); } String threadStackSize = config.getSimpleValue("threadStackSize"); if (!StringUtil.isEmpty(threadStackSize)) { - properties.setProperty("thread_stack_size", "-Xss" + threadStackSize); + validateStackArg(threadStackSize); + properties.setProperty("thread_stack_size", "-Xss" + threadStackSize + "k"); } PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); @@ -102,9 +106,36 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { propertiesUpdater.update(properties); configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); + } catch (IllegalArgumentException e) { + configurationUpdateReport.setErrorMessage("No configuration update was applied: " + e.getMessage()); } catch (IOException e) { configurationUpdateReport.setErrorMessageFromThrowable(e); } + } + + private void validateHeapArg(String name, String value) { + if (value.length() < 2) { + throw new IllegalArgumentException(value + " is not a legal value for the property [" + name + "]"); + } + + char[] chars = value.toCharArray(); + for (int i = 0; i < chars.length - 1; ++i) { + if (!Character.isDigit(chars[i])) { + throw new IllegalArgumentException(value + " is not a legal value for the property [" + name + "]"); + } + } + char lastChar = Character.toUpperCase(chars[chars.length - 1]); + if (!(lastChar == 'M' || lastChar == 'G')) { + throw new IllegalArgumentException(value + " is not a legal value for the property [" + name + "]"); + } + } + + private void validateStackArg(String value) { + try { + Integer.parseInt(value); + } catch (NumberFormatException e) { + throw new IllegalArgumentException(value + " is not a legal value for the property [threadStackSize]"); + } } } diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index c700257..5a60d19 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -118,12 +118,24 @@ description="The minimum heap size. This value will be used with the -Xms JVM option. This is read only because it is automatically set to the same value as Max Heap Size."/> <c:simple-property name="maxHeapSize" - description="The maximum heap size. This value will be used with the -Xmx JVM option."/> + description="The maximum heap size. This value will be used with the -Xmx JVM option. The + value should be an integer with a suffix of M or G to indicate megabytes or gigabytes."> + <c:constraint> + <c:regex-constraint expression="\d+[mMgG]"/> + </c:constraint> + </c:simple-property> <c:simple-property name="heapNewSize" description="The size of the new generation portion of the heap. This value will be used with - the -Xmn JVM option."/> + the -Xmn JVM option. The value should be an integer with a suffix of M or G to indicate + megabytes or gigabytes."> + <c:constraint> + <c:regex-constraint expression="\d+[mMgG]"/> + </c:constraint> + </c:simple-property> <c:simple-property name="threadStackSize" - description="The thread stack size. This memory is allocated to each thread off heap."/> + type="integer" + description="The thread stack size. This memory is allocated to each thread off heap. The + value should be an integer that will be interpreted in kilobytes."/> <c:simple-property name="heapDumpOnOOMError" displayName="Heap Dump on OutOfMemoryError" type="boolean" default="true" description="Generate a heap dump when an OutOfMemoryError occurs"/> diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java index ee34f43..64d14b2 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java @@ -13,8 +13,10 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.util.file.FileUtil; /** * @author John Sanda @@ -29,6 +31,7 @@ public class StorageNodeConfigDelegateTest { public void initDirs(Method test) throws Exception { File dir = new File(getClass().getResource(".").toURI()); basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); + FileUtil.purge(basedir, true); configDelegate = new StorageNodeConfigDelegate(basedir); } @@ -42,7 +45,7 @@ public class StorageNodeConfigDelegateTest { assertEquals(config.getSimpleValue("minHeapSize"), "512M", "Failed to load property [minHeapSize]"); assertEquals(config.getSimpleValue("maxHeapSize"), "512M", "Failed to load property [maxHepSize]"); assertEquals(config.getSimpleValue("heapNewSize"), "128M", "Failed to load property [heapNewSize]"); - assertEquals(config.getSimpleValue("threadStackSize"), "180k", "Failed to load property [threadStackSize]"); + assertEquals(config.getSimpleValue("threadStackSize"), "180", "Failed to load property [threadStackSize]"); assertEquals(config.getSimple("heapDumpOnOOMError").getBooleanValue(), (Boolean) true, "Failed to load property [heapDumpOnOOMError]"); assertEquals(new File(config.getSimpleValue("heapDumpDir")), binDir(), "Failed to load property [heapDumpDir]"); @@ -56,7 +59,7 @@ public class StorageNodeConfigDelegateTest { config.put(new PropertySimple("minHeapSize", "1024M")); config.put(new PropertySimple("maxHeapSize", "1024M")); config.put(new PropertySimple("heapNewSize", "256M")); - config.put(new PropertySimple("threadStackSize", "240k")); + config.put(new PropertySimple("threadStackSize", "240")); config.put(new PropertySimple("heapDumpOnOOMError", true)); config.put(new PropertySimple("heapDumpDir", confDir())); @@ -96,6 +99,60 @@ public class StorageNodeConfigDelegateTest { "should be the same as [maxHeapSize]."); } + @Test + public void disableHeapDumps() throws Exception { + createDefaultConfig(); + + ConfigurationUpdateReport report = new ConfigurationUpdateReport(Configuration.builder() + .addSimple("heapDumpOnOOMError", false).build()); + + configDelegate.updateResourceConfiguration(report); + + Properties properties = loadCassandraJvmProps(); + + assertEquals(properties.getProperty("heap_dump_on_OOMError"), "", "Failed to disable property " + + "[heapDumpOnOOMError]"); + } + + @Test + public void updateShouldFailWhenMaxHeapSizeIsInvalid() throws Exception { + createDefaultConfig(); + + ConfigurationUpdateReport report = new ConfigurationUpdateReport(Configuration.builder() + .addSimple("maxHeapSize", "256GB").build()); + + configDelegate.updateResourceConfiguration(report); + + assertEquals(report.getStatus(), ConfigurationUpdateStatus.FAILURE, "The configuration update should fail " + + "when [maxHeapSize] has an invalid value."); + } + + @Test + public void updateShouldFailWhenHeapNewSizeIsInvalid() throws Exception { + createDefaultConfig(); + + ConfigurationUpdateReport report = new ConfigurationUpdateReport(Configuration.builder() + .addSimple("heapNewSize", "25^G").build()); + + configDelegate.updateResourceConfiguration(report); + + assertEquals(report.getStatus(), ConfigurationUpdateStatus.FAILURE, "The configuration update should fail " + + "when [heapNewSize] has an invalid value."); + } + + @Test + public void updateShouldFailWhenThreadStackSizeIsInvalid() throws Exception { + createDefaultConfig(); + + ConfigurationUpdateReport report = new ConfigurationUpdateReport(Configuration.builder() + .addSimple("threadStackSize", "128M").build()); + + configDelegate.updateResourceConfiguration(report); + + assertEquals(report.getStatus(), ConfigurationUpdateStatus.FAILURE, "The configuration update should fail " + + "when [threadStackSize] has an invalid value."); + } + private void createDefaultConfig() throws IOException { Properties properties = new Properties(); properties.setProperty("heap_min", "-Xms512M");

1 0

[rhq] modules/core
by Thomas Segismont 15 Jul '13

15 Jul '13

modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccess.java | 44 -- modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java | 201 ++++++++++ modules/core/native-system/src/test/java/org/rhq/core/system/SigarAccessHandlerTest.java | 172 ++++++++ 3 files changed, 377 insertions(+), 40 deletions(-) New commits: commit fe38a28bd0ba7df967ec8b6a7f5f2b4a6bb839d6 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 3 12:27:55 2013 +0200 Bug 923400 - Sigar creates high number of blocked threads (unbounded) if mount is gone diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccess.java b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccess.java index 4319f9a..8c7cea9 100644 --- a/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccess.java +++ b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccess.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,17 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.system; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import org.hyperic.sigar.Sigar; import org.hyperic.sigar.SigarProxy; /** @@ -34,7 +30,6 @@ import org.hyperic.sigar.SigarProxy; * @author John Mazzitelli */ public class SigarAccess { - private static SigarAccessHandler invocationHandler; private static SigarProxy sigarProxy; @@ -83,35 +78,4 @@ public class SigarAccess { } - private static class SigarAccessHandler implements InvocationHandler { - private Sigar sigar; - - public Object invoke(Object proxy, Method meth, Object[] args) throws Throwable { - // its possible in the time between this handler's creation and now, someone disabled the native layer. - // throw a runtime exception if the native system was disabled - if (SystemInfoFactory.isNativeSystemInfoDisabled()) { - throw new SystemInfoException("Native system has been disabled"); - } - - try { - synchronized (this) { - if (sigar == null) { - this.sigar = new Sigar(); - } - - return meth.invoke(sigar, args); - } - } catch (InvocationTargetException e) { - throw e.getTargetException(); - } - } - - public synchronized void close() { - if (this.sigar != null) { - this.sigar.close(); - this.sigar = null; - } - } - } - -} \ No newline at end of file +} diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java new file mode 100644 index 0000000..a781641 --- /dev/null +++ b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java @@ -0,0 +1,201 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.core.system; + +import static java.util.concurrent.TimeUnit.MINUTES; +import static java.util.concurrent.TimeUnit.SECONDS; + +import java.lang.management.ManagementFactory; +import java.lang.management.ThreadInfo; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.locks.ReentrantLock; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hyperic.sigar.Sigar; + +/** + * An {@link InvocationHandler} for a {@link org.hyperic.sigar.SigarProxy}. + * <p>A single instance of this class will be created by the {@link SigarAccess} class.</p> + * This class holds a shared {@link Sigar} instance and serializes calls. If a thread waits more than + * 'sharedSigarLockMaxWait' seconds, it will be given a new Sigar instance, which will be destroyed at the end of the + * call. + * <p>Every 5 minutes, a background task checks that 'localSigarInstancesWarningThreshold' has not been exceeded. It it + * has, a warning message will be logged, optionally with a thread dump. + * <p>This class is configurable with System properties: + * <ul> + * <li><strong>sharedSigarLockMaxWait</strong>: maximum time in seconds a thread will wait for the shared Sigar lock + * acquistion; defaults to 2 seconds</li> + * <li><strong>localSigarInstancesWarningThreshold</strong>: threshold of currently living Sigar instances at which + * the background task will print warning messages; defaults to 50</li> + * <li><strong>maxLocalSigarInstances</strong>: maximum number of local Sigar instances which can be created, zero + * and negative values being interpreted as 'no limit'; defaults to 50</li> + * <li><strong>threadDumpOnlocalSigarInstancesWarningThreshold</strong>: if set to true (case insensitive), the + * background task will also log a thread dump when <strong>localSigarInstancesWarningThreshold</strong> is met</li> + * </ul> + * </p> + * + * @author Thomas Segismont + */ +class SigarAccessHandler implements InvocationHandler { + private static final Log LOG = LogFactory.getLog(SigarAccessHandler.class); + + private static final String LINE_SEPARATOR = System.getProperty("line.separator"); + private static final int SHARED_SIGAR_LOCK_MAX_WAIT = Integer.getInteger("sharedSigarLockMaxWait", 2); + private static final int LOCAL_SIGAR_INSTANCES_WARNING_THRESHOLD = Integer.getInteger( + "localSigarInstancesWarningThreshold", 50); + private static final int MAX_LOCAL_SIGAR_INSTANCES = Integer.getInteger("maxLocalSigarInstances", 50); + private static final boolean LIMIT_LOCAL_SIGAR_INSTANCES = MAX_LOCAL_SIGAR_INSTANCES > 0; + private static final boolean THREAD_DUMP_ON_SIGAR_INSTANCES_THRESHOLD = Boolean + .getBoolean("threadDumpOnlocalSigarInstancesWarningThreshold"); + + private final SigarFactory sigarFactory; + private final ReentrantLock sharedSigarLock; + private final ReentrantLock localSigarLock; + private final ScheduledExecutorService scheduledExecutorService; + private volatile int localSigarInstancesCount; + private Sigar sharedSigar; + + SigarAccessHandler() { + this(new DefaultSigarFactory()); + } + + SigarAccessHandler(SigarFactory sigarFactory) { + this.sigarFactory = sigarFactory; + sharedSigarLock = new ReentrantLock(); + localSigarLock = new ReentrantLock(); + scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(); + scheduledExecutorService.scheduleWithFixedDelay(new ThresholdChecker(), 1, 5, MINUTES); + localSigarInstancesCount = 0; + } + + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + // its possible in the time between this handler's creation and now, someone disabled the native layer. + // throw a runtime exception if the native system was disabled + if (SystemInfoFactory.isNativeSystemInfoDisabled()) { + throw new SystemInfoException("Native system has been disabled"); + } + + // Acquire lock for shared Sigar instance. Wait 'sharedSigarLockMaxWait' seconds at most + boolean acquiredLock = sharedSigarLock.tryLock(SHARED_SIGAR_LOCK_MAX_WAIT, SECONDS); + if (acquiredLock) { + if (sharedSigar == null) { + this.sharedSigar = sigarFactory.createSigarInstance(); + } + try { + return method.invoke(sharedSigar, args); + } catch (InvocationTargetException e) { + throw e.getTargetException(); + } finally { + sharedSigarLock.unlock(); + } + } else { + Sigar localSigar = createLocalSigarInstance(); + try { + return method.invoke(localSigar, args); + } catch (InvocationTargetException e) { + throw e.getTargetException(); + } finally { + closeLocalSigarInstance(localSigar); + } + } + } + + private Sigar createLocalSigarInstance() { + localSigarLock.lock(); + try { + if (LIMIT_LOCAL_SIGAR_INSTANCES && localSigarInstancesCount >= MAX_LOCAL_SIGAR_INSTANCES) { + throw new RuntimeException("Too many Sigar instances created"); + } + Sigar sigarInstance = sigarFactory.createSigarInstance(); + localSigarInstancesCount++; + return sigarInstance; + } finally { + localSigarLock.unlock(); + } + } + + private void closeLocalSigarInstance(Sigar sigar) { + localSigarLock.lock(); + try { + sigar.close(); + localSigarInstancesCount--; + } finally { + localSigarLock.unlock(); + } + } + + void close() { + if (sharedSigar != null) { + sharedSigarLock.lock(); + try { + sharedSigar.close(); + sharedSigar = null; + } finally { + sharedSigarLock.unlock(); + } + } + scheduledExecutorService.shutdownNow(); + } + + int localSigarInstancesCount() { + return localSigarInstancesCount; + } + + interface SigarFactory { + Sigar createSigarInstance(); + } + + private static class DefaultSigarFactory implements SigarFactory { + @Override + public Sigar createSigarInstance() { + return new Sigar(); + } + } + + private class ThresholdChecker implements Runnable { + @Override + public void run() { + int currentCount = localSigarInstancesCount; + if (currentCount > LOCAL_SIGAR_INSTANCES_WARNING_THRESHOLD) { + StringBuilder sb = new StringBuilder(); + sb.append("There are ").append(currentCount).append(" local Sigar instances currently active. ") + .append("This may indicate that a call to the shared Sigar instance did not complete."); + if (THREAD_DUMP_ON_SIGAR_INSTANCES_THRESHOLD) { + sb.append(LINE_SEPARATOR); + threadDump(sb); + } + LOG.warn(sb.toString()); + } + } + + private void threadDump(StringBuilder sb) { + ThreadInfo[] threadInfos = ManagementFactory.getThreadMXBean().dumpAllThreads(true, true); + for (ThreadInfo threadInfo : threadInfos) { + sb.append(threadInfo); + sb.append(LINE_SEPARATOR); + } + } + } +} diff --git a/modules/core/native-system/src/test/java/org/rhq/core/system/SigarAccessHandlerTest.java b/modules/core/native-system/src/test/java/org/rhq/core/system/SigarAccessHandlerTest.java new file mode 100644 index 0000000..e993725 --- /dev/null +++ b/modules/core/native-system/src/test/java/org/rhq/core/system/SigarAccessHandlerTest.java @@ -0,0 +1,172 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.core.system; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.lang.reflect.Method; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarProxy; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * @author Thomas Segismont + */ +@Test(singleThreaded = true) +public class SigarAccessHandlerTest { + private static final int THREAD_POOL_SIZE = 100; + + private Method getSwapMethod; + private Method getFileSystemMapMethod; + private Sigar sigarMock; + private ExecutorService executorService; + private SigarAccessHandler sigarAccessHandler; + + @BeforeClass + private void setFields() throws Exception { + getSwapMethod = SigarProxy.class.getMethod("getSwap", new Class[0]); + getFileSystemMapMethod = SigarProxy.class.getMethod("getFileSystemMap", new Class[0]); + sigarMock = mock(Sigar.class); + // Wait 15 seconds on call to getSwap + when(sigarMock.getSwap()).then(new Answer<Object>() { + @Override + public Object answer(InvocationOnMock invocation) throws Throwable { + Thread.sleep(1000 * 15); + return null; + } + }); + } + + @BeforeMethod + public void setUp() throws Exception { + sigarAccessHandler = new SigarAccessHandler(new SigarAccessHandler.SigarFactory() { + @Override + public Sigar createSigarInstance() { + return sigarMock; + } + }); + executorService = Executors.newFixedThreadPool(THREAD_POOL_SIZE); + } + + @AfterMethod + public void tearDown() throws Exception { + sigarAccessHandler.close(); + executorService.shutdownNow(); + + } + + @Test(timeOut = 1000 * 30) + public void testOnDemandSigarInstanceCreation() throws Throwable { + // Start concurrent invocations of the long running getSwap method + for (int i = 0; i < 10; i++) { + executorService.submit(new Runnable() { + @Override + public void run() { + try { + sigarAccessHandler.invoke(null, getSwapMethod, new Object[0]); + } catch (Throwable ignore) { + } + } + }); + } + Thread.sleep(1000 * 8); + + assertEquals(sigarAccessHandler.localSigarInstancesCount(), 9); + } + + @Test(timeOut = 1000 * 30) + public void testSigarInstanceDestruction() throws Throwable { + // Start concurrent invocations of the short running getFileSystemMapMethod method and an invocation of the long + // running getSwap method + for (int i = 0; i < 10; i++) { + if (i == 0) { + executorService.submit(new Runnable() { + @Override + public void run() { + try { + sigarAccessHandler.invoke(null, getSwapMethod, new Object[0]); + } catch (Throwable ignore) { + } + } + }); + } else { + executorService.submit(new Runnable() { + @Override + public void run() { + try { + sigarAccessHandler.invoke(null, getFileSystemMapMethod, new Object[0]); + } catch (Throwable ignore) { + } + } + }); + } + } + Thread.sleep(1000 * 8); + + assertEquals(sigarAccessHandler.localSigarInstancesCount(), 0); + } + + @Test(timeOut = 1000 * 30) + public void testMaxSigarInstanceCreation() throws Throwable { + // Start concurrent invocations of the long running getSwap method + List<Future<Throwable>> futures = new LinkedList<Future<Throwable>>(); + for (int i = 0; i < 60; i++) { + futures.add(executorService.submit(new Callable<Throwable>() { + @Override + public Throwable call() throws Exception { + try { + sigarAccessHandler.invoke(null, getSwapMethod, new Object[0]); + } catch (Throwable throwable) { + return throwable; + } + return null; + } + })); + } + Thread.sleep(1000 * 8); + + assertEquals(sigarAccessHandler.localSigarInstancesCount(), 50); + int failedCallsCount = 0; + for (Future<Throwable> future : futures) { + Throwable throwable = future.get(); + if (throwable != null) { + failedCallsCount++; + assertTrue(throwable instanceof RuntimeException); + assertEquals(throwable.getMessage(), "Too many Sigar instances created"); + } + } + assertEquals(failedCallsCount, 9); + } +}

1 0

[rhq] Branch 'bug/923400' - 0 commits -
by Thomas Segismont 15 Jul '13

15 Jul '13

Rebased ref, commits from common ancestor:

1 0

[rhq] modules/plugins
by Thomas Segismont 15 Jul '13

15 Jul '13

modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java | 64 +++++++++- 1 file changed, 62 insertions(+), 2 deletions(-) New commits: commit 05ff27a9dec1422f46c91f69d524a3b388b3e421 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Mon Jul 15 19:57:08 2013 +0200 Bug 885655 - Datasource - Security Deployment Type is by default set to "Domain and application" instead of "None" as stated in description Set default value in #createResource if needed Update resource after creation as Security deployment type value is ignored by EAP servers diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java index 0d45594..e0699b0 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java @@ -19,12 +19,15 @@ package org.rhq.plugins.jbossas5; +import static org.rhq.core.domain.resource.CreateResourceStatus.SUCCESS; + import java.io.File; import java.io.InputStream; import java.io.Serializable; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -47,13 +50,17 @@ import org.jboss.deployers.spi.management.deploy.ProgressEvent; import org.jboss.deployers.spi.management.deploy.ProgressListener; import org.jboss.managed.api.ComponentType; import org.jboss.managed.api.ManagedComponent; +import org.jboss.managed.api.ManagedProperty; +import org.jboss.metatype.api.values.MetaValue; import org.jboss.metatype.api.values.SimpleValue; import org.jboss.on.common.jbossas.JBPMWorkflowManager; import org.jboss.on.common.jbossas.JBossASPaths; import org.jboss.on.common.jbossas.JmxConnectionHelper; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.transfer.DeployPackageStep; import org.rhq.core.domain.content.transfer.DeployPackagesResponse; @@ -81,6 +88,8 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter; +import org.rhq.plugins.jbossas5.adapter.api.PropertyAdapterFactory; import org.rhq.plugins.jbossas5.connection.LocalProfileServiceConnectionProvider; import org.rhq.plugins.jbossas5.connection.ProfileServiceConnection; import org.rhq.plugins.jbossas5.connection.ProfileServiceConnectionProvider; @@ -88,6 +97,7 @@ import org.rhq.plugins.jbossas5.connection.RemoteProfileServiceConnectionProvide import org.rhq.plugins.jbossas5.helper.CreateChildResourceFacetDelegate; import org.rhq.plugins.jbossas5.helper.InPluginControlActionFacade; import org.rhq.plugins.jbossas5.helper.JBossAS5ConnectionTypeDescriptor; +import org.rhq.plugins.jbossas5.util.ConversionUtils; import org.rhq.plugins.jbossas5.util.ManagedComponentUtils; /** @@ -300,8 +310,58 @@ public class ApplicationServerComponent<T extends ResourceComponent<?>> implemen // CreateChildResourceFacet -------------------------------------------- - public CreateResourceReport createResource(CreateResourceReport createResourceReport) { - return this.createChildResourceDelegate.createResource(createResourceReport); + public CreateResourceReport createResource(CreateResourceReport report) { + if (creatingDatasourceOrConnectionFactory(report)) { + report = preCreateDatasourceOrConnectionFactory(report); + } + report = this.createChildResourceDelegate.createResource(report); + if (report.getStatus() != SUCCESS) { + return report; + } + if (creatingDatasourceOrConnectionFactory(report)) { + report = postCreateDatasourceOrConnectionFactory(report); + } + return report; + } + + private CreateResourceReport preCreateDatasourceOrConnectionFactory(CreateResourceReport report) { + Configuration resourceConfiguration = report.getResourceConfiguration(); + PropertyMap securityDomainPropertyMap = (PropertyMap) resourceConfiguration.get("security-domain"); + PropertySimple securityDeploymentType = securityDomainPropertyMap.getSimple("securityDeploymentType"); + if (securityDeploymentType.getStringValue() == null) { + securityDeploymentType.setValue("NONE"); + } + return report; + } + + private CreateResourceReport postCreateDatasourceOrConnectionFactory(CreateResourceReport report) { + Configuration resourceConfiguration = report.getResourceConfiguration(); + ConfigurationDefinition resourceConfigurationDefinition = report.getResourceType() + .getResourceConfigurationDefinition(); + ComponentType componentType = ConversionUtils.getComponentType(report.getResourceType()); + String componentName = report.getResourceKey(); + try { + ManagementView managementView = getConnection().getManagementView(); + ManagedComponent managedComponent = managementView.getComponent(componentName, componentType); + Map<String, ManagedProperty> managedProperties = managedComponent.getProperties(); + ManagedProperty managedProperty = managedProperties.get("security-domain"); + MetaValue metaValue = managedProperty.getValue(); + PropertyAdapter propertyAdapter = PropertyAdapterFactory.getPropertyAdapter(metaValue); + propertyAdapter.populateMetaValueFromProperty(resourceConfiguration.get("security-domain"), metaValue, + resourceConfigurationDefinition.get("security-domain")); + managementView.updateComponent(managedComponent); + managementView.load(); + } catch (Exception e) { + report.setErrorMessage("Resource was created but an error occured while updating security-domain property"); + report.setException(e); + } + return report; + } + + private boolean creatingDatasourceOrConnectionFactory(CreateResourceReport report) { + String resourceTypeName = report.getResourceType().getName(); + return Arrays.asList("No Tx Datasource", "Local Tx Datasource", "XA Datasource", "No Tx ConnectionFactory", + "Tx ConnectionFactory").contains(resourceTypeName); } // ProgressListener --------------------------------------------

1 0

[rhq] 2 commits - modules/common modules/plugins
by John Sanda 15 Jul '13

15 Jul '13

modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 9 +- modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java | 39 +++++++--- modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java | 35 +++++++- 3 files changed, 66 insertions(+), 17 deletions(-) New commits: commit 68d4c3d2c3c5eb67c09cde41ac78f77f6b32ec33 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 15 10:34:28 2013 -0400 [BZ 984433] revert changes for empty directory check diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 386cda7..9a6a1c0 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -55,7 +55,6 @@ import org.apache.commons.cli.PosixParser; import org.apache.commons.exec.DefaultExecutor; import org.apache.commons.exec.Executor; import org.apache.commons.exec.PumpStreamHandler; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.output.NullOutputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -450,7 +449,13 @@ public class StorageInstaller { } private boolean isDirectoryEmpty(File dir) { - return FileUtils.sizeOf(dir) == 0; + // TODO need to check subdirectories + if (dir.isDirectory()) { + File[] files = dir.listFiles(); + return (files == null || files.length == 0); + } else { + return true; + } } private int getPort(CommandLine cmdLine, String option, int defaultValue) { commit 0bc81e9df0976365252b5ca11795b25d78172ec4 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 15 10:13:35 2013 -0400 check that properties are set before trying to update them diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index e82f290..c87d2ac 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -68,19 +68,36 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { Configuration config = configurationUpdateReport.getConfiguration(); - // We want min and max heap to be the same - properties.setProperty("heap_min", "-Xms" + config.getSimpleValue("maxHeapSize")); - properties.setProperty("heap_max", "-Xmx" + config.getSimpleValue("maxHeapSize")); - properties.setProperty("heap_new", "-Xmn" + config.getSimpleValue("heapNewSize")); - properties.setProperty("thread_stack_size", "-Xss" + config.getSimpleValue("threadStackSize")); - - if (config.getSimple("heapDumpOnOOMError").getBooleanValue()) { - properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); - } else { - properties.setProperty("heap_dump_on_OOMError", ""); + String maxHeapSize = config.getSimpleValue("maxHeapSize"); + if (!StringUtil.isEmpty(maxHeapSize)) { + // We want min and max heap to be the same + properties.setProperty("heap_min", "-Xms" + maxHeapSize); + properties.setProperty("heap_max", "-Xmx" + maxHeapSize); } - properties.setProperty("heap_dump_dir", config.getSimpleValue("heapDumpDir")); + String heapNewSize = config.getSimpleValue("heapNewSize"); + if (!StringUtil.isEmpty(heapNewSize)) { + properties.setProperty("heap_new", "-Xmn" + heapNewSize); + } + + String threadStackSize = config.getSimpleValue("threadStackSize"); + if (!StringUtil.isEmpty(threadStackSize)) { + properties.setProperty("thread_stack_size", "-Xss" + threadStackSize); + } + + PropertySimple heapDumpOnOMMError = config.getSimple("heapDumpOnOOMError"); + if (heapDumpOnOMMError != null) { + if (heapDumpOnOMMError.getBooleanValue()) { + properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + } else { + properties.setProperty("heap_dump_on_OOMError", ""); + } + } + + String heapDumpDir = config.getSimpleValue("heapDumpDir"); + if (!StringUtil.isEmpty(heapDumpDir)) { + properties.setProperty("heap_dump_dir", heapDumpDir); + } propertiesUpdater.update(properties); diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java index 5c5f089..ee34f43 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java @@ -23,10 +23,13 @@ public class StorageNodeConfigDelegateTest { private File basedir; + private StorageNodeConfigDelegate configDelegate; + @BeforeMethod public void initDirs(Method test) throws Exception { File dir = new File(getClass().getResource(".").toURI()); basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); + configDelegate = new StorageNodeConfigDelegate(basedir); } @@ -34,7 +37,6 @@ public class StorageNodeConfigDelegateTest { public void loadValidConfig() throws Exception { createDefaultConfig(); - StorageNodeConfigDelegate configDelegate = new StorageNodeConfigDelegate(basedir); Configuration config = configDelegate.loadResourceConfiguration(); assertEquals(config.getSimpleValue("minHeapSize"), "512M", "Failed to load property [minHeapSize]"); @@ -60,11 +62,9 @@ public class StorageNodeConfigDelegateTest { ConfigurationUpdateReport report = new ConfigurationUpdateReport(config); - StorageNodeConfigDelegate configDelegate = new StorageNodeConfigDelegate(basedir); configDelegate.updateResourceConfiguration(report); - Properties properties = new Properties(); - properties.load(new FileInputStream(new File(confDir(), "cassandra-jvm.properties"))); + Properties properties = loadCassandraJvmProps(); assertEquals(properties.getProperty("heap_min"), "-Xms1024M", "Failed to update property [minHeapSize]"); assertEquals(properties.getProperty("heap_max"), "-Xmx1024M", "Failed to update property [maxHeapSize]"); @@ -77,6 +77,25 @@ public class StorageNodeConfigDelegateTest { "Failed to update property [heap_dump_dir]"); } + @Test + public void minHeapSizeShouldBeTheSameAsMaxHeapSize() throws Exception { + createDefaultConfig(); + + Configuration config = new Configuration(); + config.put(new PropertySimple("minHeapSize", "512M")); + config.put(new PropertySimple("maxHeapSize", "768M")); + + ConfigurationUpdateReport report = new ConfigurationUpdateReport(config); + + configDelegate.updateResourceConfiguration(report); + + Properties properties = loadCassandraJvmProps(); + + assertEquals(properties.getProperty("heap_max"), "-Xmx768M", "Failed to update property [maxHeapSize]"); + assertEquals(properties.getProperty("heap_min"), "-Xms768M", "Failed to update property [maxHeapSize]. It " + + "should be the same as [maxHeapSize]."); + } + private void createDefaultConfig() throws IOException { Properties properties = new Properties(); properties.setProperty("heap_min", "-Xms512M"); @@ -84,10 +103,18 @@ public class StorageNodeConfigDelegateTest { properties.setProperty("heap_new", "-Xmn128M"); properties.setProperty("thread_stack_size", "-Xss180k"); properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + properties.setProperty("heap_dump_dir", binDir().getAbsolutePath()); properties.store(new FileOutputStream(new File(confDir(), "cassandra-jvm.properties")), ""); } + private Properties loadCassandraJvmProps() throws Exception { + Properties properties = new Properties(); + properties.load(new FileInputStream(new File(confDir(), "cassandra-jvm.properties"))); + + return properties; + } + private File confDir() { return mkdirIfNecessary(basedir, "conf"); }

1 0

[rhq] 3 commits - modules/core
by lkrejci 15 Jul '13

15 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java | 247 +++++++++- modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationBuilderTest.java | 237 +++++++++ 2 files changed, 481 insertions(+), 3 deletions(-) New commits: commit 46ae96d60f17d0215185c0f79b8e004bdbc9c1ee Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu May 23 11:03:31 2013 +0200 Trivial: javadoc clean up. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java index 13b1e32..4dae88a 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java @@ -850,10 +850,9 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM * * @return a clone of this configuration * - * @throws CloneNotSupportedException - * * @see #deepCopy() */ + @SuppressWarnings("override") //@Override //GWT trips over this, WTH! public Configuration clone() { return deepCopy(); @@ -1002,7 +1001,7 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM /** * Getter for the properties reference. * - * @return Map<String, Property> + * @return {@code Map<String, Property>} */ public Map<String, Property> getAllProperties() { return this.properties; commit b415c386059131057d91060a3bebef41699fcb3d Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu May 23 10:46:16 2013 +0200 Added missing generic type decls. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java index b006425..13b1e32 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java @@ -271,7 +271,7 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM } } - public static class MapInList<Parent extends AbstractPropertyListBuilder> extends AbstractPropertyMapBuilder<PropertyMap, MapInList<Parent>> { + public static class MapInList<Parent extends AbstractPropertyListBuilder<?>> extends AbstractPropertyMapBuilder<PropertyMap, MapInList<Parent>> { private Parent parent; public MapInList(Parent parent, String name) { @@ -307,7 +307,7 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM } } - public static class ListInList<Parent extends AbstractPropertyListBuilder> extends AbstractPropertyListBuilder<ListInList<Parent>> { + public static class ListInList<Parent extends AbstractPropertyListBuilder<?>> extends AbstractPropertyListBuilder<ListInList<Parent>> { private Parent parent; private ListInList(Parent parent, String name, String memberName) { commit abbbf13986af10b65cf812ce9b0a2a49c297934a Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed May 22 19:24:00 2013 +0200 A configuration instance builder. This should greatly simplify the process of creating complex configuration objects. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java index b1e6e22..b006425 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java @@ -143,6 +143,244 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM public static final String QUERY_DELETE_RAW_CONFIGURATIONS_CONFIGURATION_IDS = "Configuration.deleteRawByConfigurationIds"; public static final String QUERY_DELETE_CONFIGURATIONS_BY_CONFIGURATION_IDs = "Configuration.deleteByConfigurationIdS"; + private static abstract class AbstractPropertyMapBuilder<T extends AbstractPropertyMap, This extends AbstractPropertyMapBuilder<T, This>> { + private T map; + + protected AbstractPropertyMapBuilder(T map) { + this.map = map; + } + + /** + * Adds a simple property. + * @param name the name of the simple property + * @param value the value of the simple property + * @return continue with the definition + */ + public This addSimple(String name, Object value) { + getMap().put(new PropertySimple(name, value)); + return castThis(); + } + + /** + * Starts defining a new sub list. + * @param name the name of the sub list + * @param memberName the names of the member properties of the sub list + * @return the builder of the list + */ + public Builder.ListInMap<This> openList(String name, String memberName) { + return new Builder.ListInMap<This>(castThis(), name, memberName); + } + + /** + * Starts defining a new sub map. + * @param name the name of the sub map + * @return the builder of the map + */ + public Builder.MapInMap<This> openMap(String name) { + return new Builder.MapInMap<This>(castThis(), name); + } + + protected T getMap() { + return map; + } + + @SuppressWarnings("unchecked") + private This castThis() { + return (This) this; + } + } + + private static abstract class AbstractPropertyListBuilder<This extends AbstractPropertyListBuilder<This>> { + private PropertyList list; + + private AbstractPropertyListBuilder(String name, String memberName) { + this.list = new PropertyList(name); + this.list.memberPropertyName = memberName; + } + + /** + * Adds a simple property. The name of the property is the member name defined by this list. + * @param value the value of the simple property + * @return continue with the definition + */ + public This addSimple(Object value) { + list.add(new PropertySimple(list.memberPropertyName, value)); + return castThis(); + } + + /** + * Adds a number of simple properties. The names of the properties are the member name defined by this list. + * @param values the values of the simple properties + * @return continue with the definition + */ + public This addSimples(Object... values) { + for(Object v : values) { + list.add(new PropertySimple(list.memberPropertyName, v)); + } + + return castThis(); + } + + /** + * Starts defining a new sub map. + * @return the builder of the map + */ + public Builder.MapInList<This> openMap() { + return new Builder.MapInList<This>(castThis(), list.memberPropertyName); + } + + /** + * Starts defining a new sub list. + * @param memberName the names of the member properties of the sub list + * @return the builder of the list + */ + public Builder.ListInList<This> openList(String memberName) { + return new Builder.ListInList<This>(castThis(), list.memberPropertyName, memberName); + } + + protected PropertyList getList() { + return list; + } + + @SuppressWarnings("unchecked") + private This castThis() { + return (This) this; + } + } + + /** + * A builder to easily build Configuration instances using a fluent API. + */ + public static class Builder extends AbstractPropertyMapBuilder<Configuration, Builder> { + + public static class MapInMap<Parent extends AbstractPropertyMapBuilder<?, ?>> extends AbstractPropertyMapBuilder<PropertyMap, MapInMap<Parent>> { + private Parent parent; + + private MapInMap(Parent parent, String name) { + super(new PropertyMap(name)); + this.parent = parent; + } + + /** + * Closes the definition of the current map and returns to the parent context. + * @return the parent context + */ + public Parent closeMap() { + parent.getMap().put(getMap()); + return parent; + } + } + + public static class MapInList<Parent extends AbstractPropertyListBuilder> extends AbstractPropertyMapBuilder<PropertyMap, MapInList<Parent>> { + private Parent parent; + + public MapInList(Parent parent, String name) { + super(new PropertyMap(name)); + this.parent = parent; + } + + /** + * Closes the definition of the current map and returns to the parent context. + * @return the parent context + */ + public Parent closeMap() { + parent.getList().add(getMap()); + return parent; + } + } + + public static class ListInMap<Parent extends AbstractPropertyMapBuilder<?, ?>> extends AbstractPropertyListBuilder<ListInMap<Parent>> { + private Parent parent; + + private ListInMap(Parent parent, String name, String memberName) { + super(name, memberName); + this.parent = parent; + } + + /** + * Closes the definition of the current list and returns to the parent context. + * @return the parent context + */ + public Parent closeList() { + parent.getMap().put(getList()); + return parent; + } + } + + public static class ListInList<Parent extends AbstractPropertyListBuilder> extends AbstractPropertyListBuilder<ListInList<Parent>> { + private Parent parent; + + private ListInList(Parent parent, String name, String memberName) { + super(name, memberName); + this.parent = parent; + } + + /** + * Closes the definition of the current list and returns to the parent context. + * @return the parent context + */ + public Parent closeList() { + parent.getList().add(getList()); + return parent; + } + } + + public class RawConfigurationBuilder { + + private RawConfiguration rawConfig; + + public RawConfigurationBuilder() { + rawConfig = new RawConfiguration(); + rawConfig.setConfiguration(getMap()); + } + + public RawConfigurationBuilder withPath(String path) { + rawConfig.setPath(path); + return this; + } + + public RawConfigurationBuilder withContents(String content, String sha256) { + rawConfig.setContents(content, sha256); + return this; + } + + /** + * Closes the definition of the current raw configuration and returns to the parent context. + * @return the parent context + */ + public Builder closeRawConfiguration() { + getMap().getRawConfigurations().add(rawConfig); + return Builder.this; + } + } + + public Builder() { + super(new Configuration()); + } + + public Builder withNotes(String notes) { + getMap().setNotes(notes); + return this; + } + + public Builder withVersion(long version) { + getMap().setVersion(version); + return this; + } + + /** + * Starts defining a new raw configuration that will become part of this configuration. + * @return the builder of the raw configuration + */ + public RawConfigurationBuilder openRawConfiguration() { + return new RawConfigurationBuilder(); + } + + public Configuration build() { + return getMap(); + } + } + @GeneratedValue(generator = "RHQ_CONFIG_ID_SEQ", strategy = GenerationType.AUTO) @Id private int id; @@ -283,6 +521,10 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM @Column(name = "MTIME") private long mtime = System.currentTimeMillis(); + public static Builder builder() { + return new Builder(); + } + public Configuration() { } diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationBuilderTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationBuilderTest.java new file mode 100644 index 0000000..ad071ee --- /dev/null +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationBuilderTest.java @@ -0,0 +1,237 @@ +package org.rhq.core.domain.configuration; + +import org.testng.annotations.Test; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertSame; + +/** + * @author Lukas Krejci + */ +@Test +public class ConfigurationBuilderTest { + + public void testConfigurationProperties() { + Configuration config = Configuration.builder().withNotes("notes").withVersion(2).build(); + assert "notes".equals(config.getNotes()) : "Unexpected notes"; + assert 2 == config.getVersion() : "Unexpected version"; + } + + public void testSimples() { + Configuration config = Configuration.builder().addSimple("1", 1).addSimple("2", 2).build(); + + assert config.getSimpleValue("1").equals("1") : "1 != 1"; + assert config.getSimpleValue("2").equals("2") : "2 != 2"; + + assert config.getSimple("1").getConfiguration() == config : "Configuration not set on property"; + } + + public void testListOfSimples() { + Configuration config = Configuration.builder().openList("l1", "m").addSimple(1).addSimple(2).closeList() + .openList("l2", "m").addSimples(1, 2).closeList().build(); + + PropertyList l1 = config.getList("l1"); + PropertyList l2 = config.getList("l2"); + + assert l1 != null : "Could not find l1"; + assert l2 != null : "Could not find l2"; + + assert l1.getConfiguration() == config : "Configuration on l1 not set"; + assert l2.getConfiguration() == config : "Configuration on l2 not set"; + + assert l1.getList().size() == 2 : "Unexpected number of props in the list 1"; + assert l2.getList().size() == 2 : "Unexpected number of props in the list 2"; + + testSimple((PropertySimple) l1.getList().get(0), null, l1, "1"); + testSimple((PropertySimple) l1.getList().get(1), null, l1, "2"); + testSimple((PropertySimple) l2.getList().get(0), null, l2, "1"); + testSimple((PropertySimple) l2.getList().get(1), null, l2, "2"); + } + + public void testMapOfSimples() { + Configuration config = Configuration.builder().openMap("m").addSimple("1", 1).addSimple("2", 2).closeMap() + .build(); + + PropertyMap m = config.getMap("m"); + + assert m != null : "Cound not find map"; + + assert m.getConfiguration() == config : "Configuration on the map not set"; + + testSimple(m.getSimple("1"), m, null, "1"); + testSimple(m.getSimple("2"), m, null, "2"); + } + + public void testListOfLists() { + Configuration config = new Configuration.Builder().openList("l", "m").openList("ml1").addSimples(1, 2) + .closeList().openList("ml2").addSimple(1).addSimple(2).closeList().closeList().build(); + + PropertyList l = config.getList("l"); + + assert l != null : "Could not find top-level list"; + + assert l.getList().size() == 2 : "Unexpected number of props in the top level list"; + + PropertyList m1 = (PropertyList) l.getList().get(0); + PropertyList m2 = (PropertyList) l.getList().get(1); + + assert m1.getParentList() == l : "Parent list on m1 not set"; + assert m1.getParentMap() == null : "Unexpected parent map on m1"; + assert m2.getParentList() == l : "Parent list on m2 not set"; + assert m1.getParentMap() == null : "Unexpected parent map on m2"; + + assert m1.getList().size() == 2 : "Unexpected number of props in the list 1"; + assert m2.getList().size() == 2 : "Unexpected number of props in the list 2"; + + testSimple((PropertySimple) m1.getList().get(0), null, m1, "1"); + testSimple((PropertySimple) m1.getList().get(1), null, m1, "2"); + testSimple((PropertySimple) m2.getList().get(0), null, m2, "1"); + testSimple((PropertySimple) m2.getList().get(1), null, m2, "2"); + } + + public void testListOfMaps() { + Configuration config = Configuration.builder().openList("l", "m").openMap().addSimple("c1", 1) + .addSimple("c2", 2).closeMap() + .openMap().addSimple("c1", 3).addSimple("c2", 4).closeMap().closeList().build(); + + PropertyList l = config.getList("l"); + + assert l != null : "Could not find top-level list"; + + assert l.getList().size() == 2 : "Unexpected number of props in the top level list"; + + PropertyMap m1 = (PropertyMap) l.getList().get(0); + PropertyMap m2 = (PropertyMap) l.getList().get(1); + + assert m1.getParentList() == l : "Parent list on m1 not set"; + assert m1.getParentMap() == null : "Unexpected parent map on m1"; + assert m2.getParentList() == l : "Parent list on m2 not set"; + assert m1.getParentMap() == null : "Unexpected parent map on m2"; + + assert m1.getMap().size() == 2 : "Unexpected number of props in the list 1"; + assert m2.getMap().size() == 2 : "Unexpected number of props in the list 2"; + + testSimple(m1.getSimple("c1"), m1, null, "1"); + testSimple(m1.getSimple("c2"), m1, null, "2"); + testSimple(m2.getSimple("c1"), m2, null, "3"); + testSimple(m2.getSimple("c2"), m2, null, "4"); + } + + public void testMapOfMaps() { + Configuration config = Configuration.builder().openMap("m").openMap("im1").addSimple("c1", 1).addSimple("c2", 2) + .closeMap().openMap("im2").addSimple("c1", 3).addSimple("c2", 4).closeMap().closeMap().build(); + + PropertyMap m = config.getMap("m"); + + assert m != null : "Could not find the top level map"; + + assert m.getMap().size() == 2 : "Unexpected number of props in the top level map"; + + PropertyMap m1 = m.getMap("im1"); + PropertyMap m2 = m.getMap("im2"); + + assert m1 != null : "Could not find im1"; + assert m2 != null : "Could not find im2"; + + assert m1.getParentList() == null : "Unexpected parent list on m1"; + assert m1.getParentMap() == m : "Unexpected parent map on m1"; + assert m2.getParentList() == null : "Unexpected parent list on m2"; + assert m1.getParentMap() == m : "Unexpected parent map on m2"; + + testSimple(m1.getSimple("c1"), m1, null, "1"); + testSimple(m1.getSimple("c2"), m1, null, "2"); + testSimple(m2.getSimple("c1"), m2, null, "3"); + testSimple(m2.getSimple("c2"), m2, null, "4"); + } + + public void testMapOfLists() { + Configuration config = Configuration.builder().openMap("m").openList("il1", "m").addSimples(1, 2) + .closeList().openList("il2", "m").addSimples(3, 4).closeList().closeMap().build(); + + PropertyMap m = config.getMap("m"); + + assert m != null : "Could not find the top level map"; + + assert m.getMap().size() == 2 : "Unexpected number of props in the top level map"; + + PropertyList l1 = m.getList("il1"); + PropertyList l2 = m.getList("il2"); + + assert l1 != null : "Could not find il1"; + assert l2 != null : "Could not find il2"; + + assert l1.getParentList() == null : "Unexpected parent list on l1"; + assert l1.getParentMap() == m : "Unexpected parent map on l1"; + assert l2.getParentList() == null : "Unexpected parent list on l2"; + assert l2.getParentMap() == m : "Unexpected parent map on l2"; + + testSimple((PropertySimple) l1.getList().get(0), null, l1, "1"); + testSimple((PropertySimple) l1.getList().get(1), null, l1, "2"); + testSimple((PropertySimple) l2.getList().get(0), null, l2, "3"); + testSimple((PropertySimple) l2.getList().get(1), null, l2, "4"); + } + + public void testUtterMess() { + Configuration config = Configuration.builder() + .openList("l", "m") // + /**/.openMap() // + /**//**/.openMap("innerMap") // + /**//**//**/.addSimple("c1", 1) // + /**//**//**/.openList("c2", "m") // + /**//**//**/.closeList() // + /**//**/.closeMap() // + /**//**/.addSimple("simple", 2) // + /**//**/.openList("innerList", "m") // + /**//**/.closeList() // + /**/.closeMap() // + /**/.addSimple(3) // + /**/.openList("im") // + /**//**/.openList("iim") // + /**//**/.closeList() // + /**//**/.openMap() // + /**//**/.closeMap() // + /**/.closeList() // + .closeList().build(); + + PropertyList l = config.getList("l"); + PropertyMap lm = (PropertyMap) l.getList().get(0); + PropertyMap innerMap = lm.getMap("innerMap"); + PropertySimple c1 = innerMap.getSimple("c1"); + PropertyList c2 = innerMap.getList("c2"); + PropertySimple simple = lm.getSimple("simple"); + PropertyList innerList = lm.getList("innerList"); + PropertySimple ls = (PropertySimple) l.getList().get(1); + PropertyList ll = (PropertyList) l.getList().get(2); + PropertyList lll = (PropertyList) ll.getList().get(0); + PropertyMap llm = (PropertyMap) ll.getList().get(1); + + //all the aspects of the above mess have been tested in the previous tests + //this just really is here to prove the point of how messy our configs can be + + assert c1 != null; + assert c2 != null; + assert simple != null; + assert innerList != null; + assert ls != null; + assert lll != null; + assert llm != null; + } + + public void testRawConfigs() { + Configuration config = Configuration.builder().openRawConfiguration().withPath("a/b") + .withContents("asdf", "123").closeRawConfiguration().build(); + + RawConfiguration r = config.getRawConfigurations().iterator().next(); + assert r.getPath().equals("a/b") : "Unexpected path"; + assert r.getContents().equals("asdf") : "Unexpected contents"; + assert r.getSha256().equals("123") : "Unexpected sha256"; + assert r.getConfiguration() == config : "Unexpected raw config owning configuration"; + } + + private void testSimple(PropertySimple p, PropertyMap expectedParentMap, PropertyList expectedParentList, + String expectedValue) { + assertSame(p.getParentMap(), expectedParentMap, "Unexpected parent map"); + assertSame(p.getParentList(), expectedParentList, "Unexpected parent list"); + assertEquals(p.getStringValue(), expectedValue, "Unexpected value"); + } +}

1 0

[rhq] modules/helpers
by Heiko W. Rupp 15 Jul '13

15 Jul '13

modules/helpers/pluginGen/pom.xml | 15 modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java | 295 ++++++++++ modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java | 4 modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java | 114 +++ modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java | 2 5 files changed, 427 insertions(+), 3 deletions(-) New commits: commit eb3c52f1ba91a70fa7bdb45405849a1af4aa524a Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 15 10:18:15 2013 +0200 Add a JavaFX frontend to the PluginGenerator. diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index e9a5e29..5aa512c 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -22,6 +22,14 @@ <build> <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.7</source> + <target>1.7</target> + </configuration> + </plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> @@ -98,6 +106,13 @@ <artifactId>rhq-pluginAnnotations</artifactId> <version>4.8.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>javafx</artifactId> + <version>2.0</version> + <systemPath>${java.home}/lib/jfxrt.jar</systemPath> + <scope>system</scope> + </dependency> </dependencies> </project> diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java new file mode 100644 index 0000000..06f3fec --- /dev/null +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Generator.java @@ -0,0 +1,295 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginGen; + +import java.io.File; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javafx.application.Application; +import javafx.beans.value.ChangeListener; +import javafx.beans.value.ObservableValue; +import javafx.collections.ObservableList; +import javafx.event.ActionEvent; +import javafx.event.EventHandler; +import javafx.geometry.Insets; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.Scene; +import javafx.scene.control.*; +import javafx.scene.layout.BorderPane; +import javafx.scene.layout.GridPane; +import javafx.scene.layout.HBox; +import javafx.scene.layout.VBox; +import javafx.scene.paint.Color; +import javafx.scene.text.Font; +import javafx.scene.text.FontPosture; +import javafx.scene.text.FontWeight; +import javafx.scene.text.Text; +import javafx.scene.text.TextAlignment; +import javafx.stage.DirectoryChooser; +import javafx.stage.Stage; + +/** + * JavaFX version of the plugin generator + * @author Heiko W. Rupp + */ +public class Generator extends Application{ + + Props props = new Props(); + private Text errorMessage; + private Stage primaryStage; + + public static void main(String[] args) { + launch(args); + } + + + @Override + public void start(Stage stage) throws Exception { + primaryStage = stage; + + Button createButton = new Button(); + createButton.setText("Create!"); + createButton.setAlignment(Pos.BOTTOM_RIGHT); + createButton.setOnAction(new EventHandler<ActionEvent>() { + @Override + public void handle(ActionEvent actionEvent) { + + PluginGen pluginGen = new PluginGen(); + pluginGen.postprocess(props); + try { + pluginGen.generate(props); + setInfoMessage("Generated!"); + + } + catch (Exception e) { + setErrorMessage("Error during generation: " + e.getMessage()); + } + } + }); + + GridPane pluginLevelPane = new GridPane(); + pluginLevelPane.setPadding(new Insets(10)); + Text pluginLevelDescription = new Text("Plugin level properties"); + pluginLevelDescription.setTextAlignment(TextAlignment.CENTER); + pluginLevelDescription.setFont(Font.font("Arial", FontWeight.BOLD, 14)); + + Text resourceLevelDescription = new Text("ResourceType level properties"); + resourceLevelDescription.setTextAlignment(TextAlignment.CENTER); + resourceLevelDescription.setFont(Font.font("Arial", FontWeight.BOLD, 14)); + + Text descriptionDescription = new Text("Field description"); + descriptionDescription.setTextAlignment(TextAlignment.CENTER); + descriptionDescription.setFont(Font.font("Arial", FontWeight.BOLD, 14)); + + HBox msgBox = getMessagesBox(); + + GridPane resourceLevelPane = new GridPane(); + resourceLevelPane.setPadding(new Insets(10)); + Text descriptionText = new Text(); + descriptionText.setFont(Font.font("Arial", FontPosture.ITALIC,12)); + + VBox innerBox = new VBox(); + innerBox.setAlignment(Pos.CENTER_LEFT); + innerBox.setPadding(new Insets(25, 25, 25, 25)); + innerBox.setSpacing(8); + + addFields(pluginLevelPane, true, descriptionText); + addFields(resourceLevelPane, false, descriptionText); + + ObservableList<Node> children = innerBox.getChildren(); + children.add(pluginLevelDescription); + children.add(pluginLevelPane); + children.add(resourceLevelDescription); + children.add(resourceLevelPane); + + + ScrollPane scrollPane = new ScrollPane(); + scrollPane.setContent(innerBox); + + BorderPane outerBox = new BorderPane(); + outerBox.setTop(msgBox); + outerBox.setPadding(new Insets(5)); + outerBox.setCenter(scrollPane); + + VBox descriptionBox = new VBox(); + descriptionBox.getChildren().add(descriptionDescription); + descriptionBox.getChildren().add(descriptionText); + outerBox.setBottom(descriptionBox); + + outerBox.setRight(createButton); + + + stage.setScene(new Scene(outerBox, 600, 550)); + stage.show(); + } + + private HBox getMessagesBox() { + HBox msgBox = new HBox(); + Label label = new Label("Messages:"); + msgBox.getChildren().add(label); + errorMessage = new Text(); + errorMessage.setFont(Font.font("Arial", FontWeight.SEMI_BOLD, 12)); + errorMessage.setId("errorMessage"); + msgBox.getChildren().add(errorMessage); + return msgBox; + } + + private int addFields(final GridPane root, boolean pluginLevel, final Text descriptionField) { + + int row = 0; + for (final Prop prop : Prop.values()) { + + if (!prop.isPluginLevel()==pluginLevel) { + continue; + } + + // Add the label + String name = prop.readableName(); + Label fieldName = new Label(name); + root.add(fieldName,0,row); + + // Now add the field itself + final Class propType = prop.getType(); + if (propType.equals(String.class)) { + final Pattern pattern = Pattern.compile(prop.getValidationRegex()); + + final TextField input = new TextField(); + // Add field leave event to fill in the props with the result + input.focusedProperty().addListener(new ChangeListener<Boolean>() { + @Override + public void changed(ObservableValue<? extends Boolean> observableValue, Boolean oldState, + Boolean newState) { + if (newState) { // User entered input field + descriptionField.setText(prop.getDescription()); + } + else { // User left input field + descriptionField.setText(""); + setPropsValue(prop.getVariableName(),input.getText(), propType); // TODO right place? + } + } + }); + // Add validation of the input + input.textProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newText) { + Matcher m = pattern.matcher(newText); + if (!m.matches()) { + setErrorMessage("Input does not match " + prop.getValidationRegex()); + } else { + clearErrorMessage(); + } + + } + }); + root.add(input, 1, row); + } else if (propType.equals(Boolean.class) || propType.equals(boolean.class)) { + final ChoiceBox choiceBox = new ChoiceBox(); + choiceBox.getItems().addAll("Yes", "No"); + choiceBox.getSelectionModel().selectLast(); // NO is default + choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { + setPropsValue(prop.getVariableName(),newValue.equals("Yes"),propType); + } + }); + + root.add(choiceBox,1,row); + } else if (propType.equals(ResourceCategory.class)) { + final ChoiceBox choiceBox = new ChoiceBox(); + for (ResourceCategory cat : ResourceCategory.values()) { + choiceBox.getItems().add(cat.getLowerName()); + } + choiceBox.getSelectionModel().selectLast(); // service is default + choiceBox.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() { + @Override + public void changed(ObservableValue<? extends String> observableValue, String s, String newValue) { + ResourceCategory newCategory = ResourceCategory.valueOf(newValue.toUpperCase()); + setPropsValue(prop.getVariableName(),newCategory,propType); + } + }); + + root.add(choiceBox,1,row); + } else if (propType.equals(File.class)) { + // Can not add this directly, so add a button to trigger it + final Text text = new Text(); + text.setText("Pick a directory"); + root.add(text,1,row); + Button pickButton = new Button("Pick"); + pickButton.setOnAction(new EventHandler<ActionEvent>() { + @Override + public void handle(ActionEvent actionEvent) { + DirectoryChooser chooser = new DirectoryChooser(); + chooser.setTitle("Pick a directory where the plugin will be put in."); + File dir = chooser.showDialog(primaryStage); + if (dir != null) { + String dirName = dir.getAbsolutePath(); + props.setFileSystemRoot(dirName); + clearErrorMessage(); + text.setText(dirName); + } else { + setErrorMessage("No directory selected"); + text.setText("Pick a directory"); + } + } + }); + + root.add(pickButton,2,row); + } + + row++; + + } + + return row; + } + + private void setInfoMessage(String message) { + errorMessage.setText(message); + errorMessage.setFill(Color.DARKGREEN); + } + private void setErrorMessage(String message) { + errorMessage.setText(message); + errorMessage.setFill(Color.RED); + } + + private void clearErrorMessage() { + errorMessage.setText(""); + errorMessage.setFill(Color.WHITE); + } + + private void setPropsValue(String variableName, Object value, Class type) { + + String var = variableName.substring(0,1).toUpperCase() + variableName.substring(1); + String setterName = "set"+ var; + + try { + Method setter = Props.class.getDeclaredMethod(setterName,type); + setter.invoke(props,value); + } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { + e.printStackTrace(); // TODO: Customise this generated block + setErrorMessage(e.getMessage()); + } + } + +} diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java index 223a57f..64b5509 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java @@ -115,7 +115,7 @@ public class PluginGen { * Do some post processing over the input received. * @param props The properties just recorded from the user input */ - private void postprocess(Props props) { + protected void postprocess(Props props) { // Set the package String pkg = props.getPackagePrefix() + "." + props.getName(); @@ -231,7 +231,7 @@ public class PluginGen { * Trigger the generation of the directory hierarchy. * @param props Parameters to take into account */ - private void generate(Props props) { + protected void generate(Props props) { log.info("Generating..."); diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java new file mode 100644 index 0000000..73c4cd9 --- /dev/null +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Prop.java @@ -0,0 +1,114 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.helpers.pluginGen; + +import java.io.File; + +/** + * All the properties that can be configured along with type, description and simple validation rules + * @author Heiko W. Rupp + */ +public enum Prop { + + PLUGIN_NAME("pluginName", String.class,"Name of the plugin", "\\w+" , true ), + PLUGIN_DESCRIPTION("pluginDescription", String.class,"Description of the plugin",".*" , true ), + PACKAGE("packagePrefix", String.class,"Default Package","[a-zA-Z\\.]+",true ), + FILE_ROOT("fileSystemRoot", File.class,"Root directory to put the plugin",".*",true ), + RHQ_VERSION("rhqVersion",String.class,"RHQ version to use","[0-9][0-9\\.]+",true), + + CATEGORY("category", ResourceCategory.class, "Category of the resource type (platform = host level)",null), + TYPE_NAME("name", String.class, "Name of the resource type", "\\w+"), + DESCRIPTION("description", String.class, "Description of the type", ".*"), + DISCOVERY_CLASS("discoveryClass", String.class, "Discovery class", "[A-Z][a-zA-Z0-9]*"), + COMPONENT_CLASS("componentClass", String.class, "Discovery class", "[A-Z][a-zA-Z0-9]*"), + IS_SINGLETON("singleton",Boolean.class,"Is this type a singleton, which means that" + + " there can only be one resource of that type for the given parent?",null), + HAS_METRICS("hasMetrics",boolean.class,"Does this type support taking metrics?",null), + HAS_OPERATIONS("hasOperations",boolean.class,"Does this type support operations?",null), + HAS_EVENTS("events",boolean.class,"Does this type support events?",null), + HAS_SUPPORT_FACET("supportFacet",boolean.class,"Does this type support the support facet?",null), + RESOURCE_CONFIGURATION("resourceConfiguration",boolean.class,"Does this type support " + + "configuring the resource?",".*"), + CAN_CREATE_CHILDREN("createChildren",boolean.class,"Can the type create child resources?",null), + CAN_DELETE_CHILDREN("deleteChildren",boolean.class,"Can the type delete child resources?",null), + + // TODO add the remaining properties from Prop.class + + ; + + private String variableName; + private Class type; + private String description; + private boolean pluginLevel; + private String validationRegex; + + private Prop(String variableName, Class type, String description, String validationRegex, boolean pluginLevel) { + this.variableName = variableName; + this.type = type; + this.description = description; + this.validationRegex = validationRegex; + this.pluginLevel = pluginLevel; + } + + private Prop(String variableName, Class type, String description, String validationRegex) { + this.variableName = variableName; + this.type = type; + this.description = description; + this.validationRegex = validationRegex; + } + + public String getVariableName() { + return variableName; + } + + public Class getType() { + return type; + } + + public String getDescription() { + return description; + } + + public boolean isPluginLevel() { + return pluginLevel; + } + + public String getValidationRegex() { + return validationRegex; + } + + public String readableName() { + + String name = name(); + name = name.replaceAll("_", " "); + String[] parts = name.split(" "); + StringBuilder builder = new StringBuilder(); + for (int i = 0; i < parts.length; i++) { + String part = parts[i]; + part = part.substring(0,1).toUpperCase() + part.substring(1).toLowerCase(); + builder.append(part); + if (i < parts.length-1) { + builder.append(" "); + } + } + return builder.toString(); + } + +} diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java index 484d591..237f5ad 100644 --- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java +++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java @@ -36,7 +36,7 @@ import org.rhq.helpers.pluginAnnotations.agent.Units; public class Props { /** What category is this ? */ - private ResourceCategory category; + private ResourceCategory category = ResourceCategory.SERVICE; /** The name of this item */ private String name; /** A description of the plugin */

1 0

[rhq] modules/plugins
by John Sanda 15 Jul '13

15 Jul '13

modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java | 24 ++++ modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 5 modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java | 55 +++++++--- 3 files changed, 69 insertions(+), 15 deletions(-) New commits: commit 18c42dafe1e9e51a16a5ceba068a1e27cb8788c0 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 14 22:36:40 2013 -0400 adding heap dump properties to resource configuration The heap dump directory defaults to <rhq-storage-basedir>/bin and we are generating heap dumps by default. Also refactoring and updating tests some. diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java index 99ba48b..e82f290 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -11,6 +11,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.configuration.ConfigurationFacet; import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.util.PropertiesFileUpdate; +import org.rhq.core.util.StringUtil; /** * @author John Sanda @@ -35,12 +36,27 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { String heapMaxProp = properties.getProperty("heap_max"); String heapNewProp = properties.getProperty("heap_new"); String threadStackSizeProp = properties.getProperty("thread_stack_size"); + String heapDumpOnOOMError = properties.getProperty("heap_dump_on_OOMError"); + String heapDumpDir = properties.getProperty("heap_dump_dir"); config.put(new PropertySimple("minHeapSize", heapMinProp.substring(4))); config.put(new PropertySimple("maxHeapSize", heapMaxProp.substring(4))); config.put(new PropertySimple("heapNewSize", heapNewProp.substring(4))); config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4))); + if (!StringUtil.isEmpty(heapDumpOnOOMError)) { + config.put(new PropertySimple("heapDumpOnOOMError", true)); + } else { + config.put(new PropertySimple("heapDumpOnOOMError", false)); + } + + if (!StringUtil.isEmpty(heapDumpDir)) { + config.put(new PropertySimple("heapDumpDir", heapDumpDir)); + } else { + File basedir = jvmOptsFile.getParentFile().getParentFile(); + config.put(new PropertySimple("heapDumpDir", new File(basedir, "bin").getAbsolutePath())); + } + return config; } @@ -58,6 +74,14 @@ public class StorageNodeConfigDelegate implements ConfigurationFacet { properties.setProperty("heap_new", "-Xmn" + config.getSimpleValue("heapNewSize")); properties.setProperty("thread_stack_size", "-Xss" + config.getSimpleValue("threadStackSize")); + if (config.getSimple("heapDumpOnOOMError").getBooleanValue()) { + properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + } else { + properties.setProperty("heap_dump_on_OOMError", ""); + } + + properties.setProperty("heap_dump_dir", config.getSimpleValue("heapDumpDir")); + propertiesUpdater.update(properties); configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 5713288..c700257 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -124,6 +124,11 @@ the -Xmn JVM option."/> <c:simple-property name="threadStackSize" description="The thread stack size. This memory is allocated to each thread off heap."/> + <c:simple-property name="heapDumpOnOOMError" displayName="Heap Dump on OutOfMemoryError" type="boolean" + default="true" + description="Generate a heap dump when an OutOfMemoryError occurs"/> + <c:simple-property name="heapDumpDir" displayName="Heap Dump Directory" required="false" + description="The directory in which heap dumps will be written."/> </c:group> </resource-configuration> diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java index f8d7bdc..5c5f089 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java @@ -6,8 +6,10 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.lang.reflect.Method; import java.util.Properties; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.rhq.core.domain.configuration.Configuration; @@ -19,16 +21,18 @@ import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; */ public class StorageNodeConfigDelegateTest { + private File basedir; + + @BeforeMethod + public void initDirs(Method test) throws Exception { + File dir = new File(getClass().getResource(".").toURI()); + basedir = new File(dir, getClass().getSimpleName() + "/" + test.getName()); + } @Test public void loadValidConfig() throws Exception { - File dir = new File(getClass().getResource(".").toURI()); - File basedir = new File(dir, getClass().getSimpleName() + "/loadValidConfig"); - File confDir = new File(basedir, "conf"); - - confDir.mkdirs(); - createDefaultConfig(confDir); + createDefaultConfig(); StorageNodeConfigDelegate configDelegate = new StorageNodeConfigDelegate(basedir); Configuration config = configDelegate.loadResourceConfiguration(); @@ -37,22 +41,22 @@ public class StorageNodeConfigDelegateTest { assertEquals(config.getSimpleValue("maxHeapSize"), "512M", "Failed to load property [maxHepSize]"); assertEquals(config.getSimpleValue("heapNewSize"), "128M", "Failed to load property [heapNewSize]"); assertEquals(config.getSimpleValue("threadStackSize"), "180k", "Failed to load property [threadStackSize]"); + assertEquals(config.getSimple("heapDumpOnOOMError").getBooleanValue(), (Boolean) true, + "Failed to load property [heapDumpOnOOMError]"); + assertEquals(new File(config.getSimpleValue("heapDumpDir")), binDir(), "Failed to load property [heapDumpDir]"); } @Test public void updateValidConfig() throws Exception { - File dir = new File(getClass().getResource(".").toURI()); - File basedir = new File(dir, getClass().getSimpleName() + "/updateValidConfig"); - File confDir = new File(basedir, "conf"); - - confDir.mkdirs(); - createDefaultConfig(confDir); + createDefaultConfig(); Configuration config = new Configuration(); config.put(new PropertySimple("minHeapSize", "1024M")); config.put(new PropertySimple("maxHeapSize", "1024M")); config.put(new PropertySimple("heapNewSize", "256M")); config.put(new PropertySimple("threadStackSize", "240k")); + config.put(new PropertySimple("heapDumpOnOOMError", true)); + config.put(new PropertySimple("heapDumpDir", confDir())); ConfigurationUpdateReport report = new ConfigurationUpdateReport(config); @@ -60,23 +64,44 @@ public class StorageNodeConfigDelegateTest { configDelegate.updateResourceConfiguration(report); Properties properties = new Properties(); - properties.load(new FileInputStream(new File(confDir, "cassandra-jvm.properties"))); + properties.load(new FileInputStream(new File(confDir(), "cassandra-jvm.properties"))); assertEquals(properties.getProperty("heap_min"), "-Xms1024M", "Failed to update property [minHeapSize]"); assertEquals(properties.getProperty("heap_max"), "-Xmx1024M", "Failed to update property [maxHeapSize]"); assertEquals(properties.getProperty("heap_new"), "-Xmn256M", "Failed to update property [heapNewSize]"); assertEquals(properties.getProperty("thread_stack_size"), "-Xss240k", "Failed to update property [threadStackSize]"); + assertEquals(properties.getProperty("heap_dump_on_OOMError"), "-XX:+HeapDumpOnOutOfMemoryError", + "Failed to update property [heap_dump_on_OOMError]"); + assertEquals(properties.getProperty("heap_dump_dir"), confDir().getAbsolutePath(), + "Failed to update property [heap_dump_dir]"); } - private void createDefaultConfig(File confDir) throws IOException { + private void createDefaultConfig() throws IOException { Properties properties = new Properties(); properties.setProperty("heap_min", "-Xms512M"); properties.setProperty("heap_max", "-Xmx512M"); properties.setProperty("heap_new", "-Xmn128M"); properties.setProperty("thread_stack_size", "-Xss180k"); + properties.setProperty("heap_dump_on_OOMError", "-XX:+HeapDumpOnOutOfMemoryError"); + + properties.store(new FileOutputStream(new File(confDir(), "cassandra-jvm.properties")), ""); + } + + private File confDir() { + return mkdirIfNecessary(basedir, "conf"); + } + + private File binDir() { + return mkdirIfNecessary(basedir, "bin"); + } - properties.store(new FileOutputStream(new File(confDir, "cassandra-jvm.properties")), ""); + private File mkdirIfNecessary(File parent, String path) { + File dir = new File(parent, path); + if (!dir.exists()) { + dir.mkdirs(); + } + return dir; } }

1 0

[rhq] modules/plugins
by John Sanda 14 Jul '13

14 Jul '13

modules/plugins/rhq-storage/pom.xml | 97 ---------- modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 30 --- modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java | 69 +++++++ modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 3 modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java | 82 ++++++++ 5 files changed, 159 insertions(+), 122 deletions(-) New commits: commit 1130a8be9a9a44c6e4670053bd7347aed4e01f30 Author: John Sanda <jsanda(a)redhat.com> Date: Sun Jul 14 09:44:04 2013 -0400 adding initial support for resource config updates of StorageNodeComponent Also making minHeapSize read only as we also want it the same as maxHeapSize. diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index ea3b9ea..a88f56e 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -39,103 +39,6 @@ <profiles> <profile> - <id>integration-tests</id> - <activation> - <property> - <name>maven.test.skip</name> - <value>!true</value> - </property> - </activation> - - <build> - <plugins> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>pre-integration-test</phase> - <configuration> - <target> - <echo>Setting up plugin dependencies...</echo> - <property name="settings.localRepository" location="${user.home}/.m2/repository" /> - <mkdir dir="target/itest" /> - <mkdir dir="target/itest/plugins" /> - <mkdir dir="target/itest/lib" /> - <copy toDir="target/itest/plugins" flatten="true"> -  - <fileset dir="${settings.localRepository}/"> - <include name="org/rhq/rhq-platform-plugin/${project.version}/rhq-platform-plugin-${project.version}.jar" /> - <include name="org/rhq/rhq-jmx-plugin/${project.version}/rhq-jmx-plugin-${project.version}.jar" /> - <include name="org/rhq/rhq-jboss-as-7-jmx-plugin/${project.version}/rhq-jboss-as-7-jmx-plugin-${project.version}.jar" /> - </fileset> - <fileset dir="${project.build.directory}"> - <include name="rhq-rhqserver-plugin-${project.version}.jar" /> - </fileset> - </copy> - <unzip dest="target/itest/lib"> - <fileset dir="${settings.localRepository}/org/hyperic/sigar-dist/${sigar.version}" includes="*.zip" /> - <patternset> - <include name="**/lib/sigar.jar" /> - <include name="**/lib/bcel*.jar" /> - <include name="**/lib/*.so" /> - <include name="**/lib/*.sl" /> - <include name="**/lib/*.dll" /> - <include name="**/lib/*.dylib" /> - </patternset> - </unzip> - <move todir="target/itest/lib" flatten="true"> - <fileset dir="target/itest/lib"> - <include name="**/lib/*" /> - </fileset> - </move> - <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>${maven.test.skip}</skip> - <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> - <useSystemClassLoader>false</useSystemClassLoader> - <argLine>${jacoco.integration-test.args} -Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine> - <systemProperties> - <property> - <name>project.artifactId</name> - <value>${project.artifactId}</value> - </property> - <property> - <name>project.version</name> - <value>${project.version}</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - - <profile> <id>dev</id> <properties> diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 737dded..6194146 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -26,9 +26,7 @@ package org.rhq.plugins.storage; import java.io.File; -import java.io.FileInputStream; import java.util.List; -import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,25 +60,13 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper @Override public Configuration loadResourceConfiguration() throws Exception { - File confDir = new File(getBasedir(), "conf"); - File jvmOptsFile = new File(confDir, "cassandra-jvm.properties"); - - Properties properties = new Properties(); - properties.load(new FileInputStream(jvmOptsFile)); - - Configuration config = new Configuration(); - - String heapMinProp = properties.getProperty("heap_min"); - String heapMaxProp = properties.getProperty("heap_max"); - String heapNewProp = properties.getProperty("heap_new"); - String threadStackSizeProp = properties.getProperty("thread_stack_size"); - - config.put(new PropertySimple("minHeapSize", heapMinProp.substring(4))); - config.put(new PropertySimple("maxHeapSize", heapMaxProp.substring(4))); - config.put(new PropertySimple("heapNewSize", heapNewProp.substring(4))); - config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4))); + return new StorageNodeConfigDelegate(getBasedir()).loadResourceConfiguration(); + } - return config; + @Override + public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { + StorageNodeConfigDelegate configDelegate = new StorageNodeConfigDelegate(getBasedir()); + configDelegate.updateResourceConfiguration(configurationUpdateReport); } private File getBasedir() { @@ -89,10 +75,6 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper } @Override - public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { - } - - @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if (name.equals("addNodeMaintenance")) { return nodeAdded(parameters); diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java new file mode 100644 index 0000000..99ba48b --- /dev/null +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeConfigDelegate.java @@ -0,0 +1,69 @@ +package org.rhq.plugins.storage; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Properties; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.pluginapi.configuration.ConfigurationFacet; +import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.util.PropertiesFileUpdate; + +/** + * @author John Sanda + */ +public class StorageNodeConfigDelegate implements ConfigurationFacet { + + private File jvmOptsFile; + + public StorageNodeConfigDelegate(File basedir) { + File confDir = new File(basedir, "conf"); + jvmOptsFile = new File(confDir, "cassandra-jvm.properties"); + } + + @Override + public Configuration loadResourceConfiguration() throws Exception { + Properties properties = new Properties(); + properties.load(new FileInputStream(jvmOptsFile)); + + Configuration config = new Configuration(); + + String heapMinProp = properties.getProperty("heap_min"); + String heapMaxProp = properties.getProperty("heap_max"); + String heapNewProp = properties.getProperty("heap_new"); + String threadStackSizeProp = properties.getProperty("thread_stack_size"); + + config.put(new PropertySimple("minHeapSize", heapMinProp.substring(4))); + config.put(new PropertySimple("maxHeapSize", heapMaxProp.substring(4))); + config.put(new PropertySimple("heapNewSize", heapNewProp.substring(4))); + config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4))); + + return config; + } + + @Override + public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { + try { + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(jvmOptsFile.getAbsolutePath()); + Properties properties = propertiesUpdater.loadExistingProperties(); + + Configuration config = configurationUpdateReport.getConfiguration(); + + // We want min and max heap to be the same + properties.setProperty("heap_min", "-Xms" + config.getSimpleValue("maxHeapSize")); + properties.setProperty("heap_max", "-Xmx" + config.getSimpleValue("maxHeapSize")); + properties.setProperty("heap_new", "-Xmn" + config.getSimpleValue("heapNewSize")); + properties.setProperty("thread_stack_size", "-Xss" + config.getSimpleValue("threadStackSize")); + + propertiesUpdater.update(properties); + + configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); + } catch (IOException e) { + configurationUpdateReport.setErrorMessageFromThrowable(e); + } + + } +} diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index b012f1c..5713288 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -114,8 +114,9 @@ <resource-configuration> <c:group name="MemorySettings"> <c:simple-property name="minHeapSize" + readOnly="true" description="The minimum heap size. This value will be used with the -Xms JVM option. This - should always be the same as Max Heap Size."/> + is read only because it is automatically set to the same value as Max Heap Size."/> <c:simple-property name="maxHeapSize" description="The maximum heap size. This value will be used with the -Xmx JVM option."/> <c:simple-property name="heapNewSize" diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java new file mode 100644 index 0000000..f8d7bdc --- /dev/null +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeConfigDelegateTest.java @@ -0,0 +1,82 @@ +package org.rhq.plugins.storage; + +import static org.testng.Assert.assertEquals; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Properties; + +import org.testng.annotations.Test; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; + +/** + * @author John Sanda + */ +public class StorageNodeConfigDelegateTest { + + + + @Test + public void loadValidConfig() throws Exception { + File dir = new File(getClass().getResource(".").toURI()); + File basedir = new File(dir, getClass().getSimpleName() + "/loadValidConfig"); + File confDir = new File(basedir, "conf"); + + confDir.mkdirs(); + createDefaultConfig(confDir); + + StorageNodeConfigDelegate configDelegate = new StorageNodeConfigDelegate(basedir); + Configuration config = configDelegate.loadResourceConfiguration(); + + assertEquals(config.getSimpleValue("minHeapSize"), "512M", "Failed to load property [minHeapSize]"); + assertEquals(config.getSimpleValue("maxHeapSize"), "512M", "Failed to load property [maxHepSize]"); + assertEquals(config.getSimpleValue("heapNewSize"), "128M", "Failed to load property [heapNewSize]"); + assertEquals(config.getSimpleValue("threadStackSize"), "180k", "Failed to load property [threadStackSize]"); + } + + @Test + public void updateValidConfig() throws Exception { + File dir = new File(getClass().getResource(".").toURI()); + File basedir = new File(dir, getClass().getSimpleName() + "/updateValidConfig"); + File confDir = new File(basedir, "conf"); + + confDir.mkdirs(); + createDefaultConfig(confDir); + + Configuration config = new Configuration(); + config.put(new PropertySimple("minHeapSize", "1024M")); + config.put(new PropertySimple("maxHeapSize", "1024M")); + config.put(new PropertySimple("heapNewSize", "256M")); + config.put(new PropertySimple("threadStackSize", "240k")); + + ConfigurationUpdateReport report = new ConfigurationUpdateReport(config); + + StorageNodeConfigDelegate configDelegate = new StorageNodeConfigDelegate(basedir); + configDelegate.updateResourceConfiguration(report); + + Properties properties = new Properties(); + properties.load(new FileInputStream(new File(confDir, "cassandra-jvm.properties"))); + + assertEquals(properties.getProperty("heap_min"), "-Xms1024M", "Failed to update property [minHeapSize]"); + assertEquals(properties.getProperty("heap_max"), "-Xmx1024M", "Failed to update property [maxHeapSize]"); + assertEquals(properties.getProperty("heap_new"), "-Xmn256M", "Failed to update property [heapNewSize]"); + assertEquals(properties.getProperty("thread_stack_size"), "-Xss240k", + "Failed to update property [threadStackSize]"); + } + + private void createDefaultConfig(File confDir) throws IOException { + Properties properties = new Properties(); + properties.setProperty("heap_min", "-Xms512M"); + properties.setProperty("heap_max", "-Xmx512M"); + properties.setProperty("heap_new", "-Xmn128M"); + properties.setProperty("thread_stack_size", "-Xss180k"); + + properties.store(new FileOutputStream(new File(confDir, "cassandra-jvm.properties")), ""); + } + +}

1 0

[rhq] 4 commits - modules/common modules/plugins
by John Sanda 13 Jul '13

13 Jul '13

modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 3 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra | 193 +++++++ modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties | 112 ++++ modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/deploy.xml | 221 -------- modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cli/dbsetup.script | 40 - modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/create_keyspace.cql | 1 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/dbsetup.cql | 42 - modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java | 32 + modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java | 4 modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-env.sh | 247 ---------- modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties | 112 ++++ modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml | 2 modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 39 + modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 15 14 files changed, 506 insertions(+), 557 deletions(-) New commits: commit cabe99fea2aa6ecbd2e26f2040ed70951c451dc2 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 13 16:30:19 2013 -0400 initial support for resource configuration with StorageNodeComponent This commit introduces initial support for reading JVM options. diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index cc34fe3..737dded 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -25,7 +25,10 @@ package org.rhq.plugins.storage; +import java.io.File; +import java.io.FileInputStream; import java.util.List; +import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,6 +41,8 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.pluginapi.configuration.ConfigurationFacet; +import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.core.util.exception.ThrowableUtil; @@ -47,7 +52,7 @@ import org.rhq.plugins.cassandra.util.KeyspaceService; /** * @author John Sanda */ -public class StorageNodeComponent extends CassandraNodeComponent implements OperationFacet { +public class StorageNodeComponent extends CassandraNodeComponent implements OperationFacet, ConfigurationFacet { private Log log = LogFactory.getLog(StorageNodeComponent.class); @@ -56,6 +61,38 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper private static final String RHQ_KEYSPACE = "rhq"; @Override + public Configuration loadResourceConfiguration() throws Exception { + File confDir = new File(getBasedir(), "conf"); + File jvmOptsFile = new File(confDir, "cassandra-jvm.properties"); + + Properties properties = new Properties(); + properties.load(new FileInputStream(jvmOptsFile)); + + Configuration config = new Configuration(); + + String heapMinProp = properties.getProperty("heap_min"); + String heapMaxProp = properties.getProperty("heap_max"); + String heapNewProp = properties.getProperty("heap_new"); + String threadStackSizeProp = properties.getProperty("thread_stack_size"); + + config.put(new PropertySimple("minHeapSize", heapMinProp.substring(4))); + config.put(new PropertySimple("maxHeapSize", heapMaxProp.substring(4))); + config.put(new PropertySimple("heapNewSize", heapNewProp.substring(4))); + config.put(new PropertySimple("threadStackSize", threadStackSizeProp.substring(4))); + + return config; + } + + private File getBasedir() { + Configuration pluginConfig = getResourceContext().getPluginConfiguration(); + return new File(pluginConfig.getSimpleValue("baseDir")); + } + + @Override + public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { + } + + @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if (name.equals("addNodeMaintenance")) { return nodeAdded(parameters); diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index f02c8e6..b012f1c 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -111,6 +111,21 @@ </parameters> </operation> + <resource-configuration> + <c:group name="MemorySettings"> + <c:simple-property name="minHeapSize" + description="The minimum heap size. This value will be used with the -Xms JVM option. This + should always be the same as Max Heap Size."/> + <c:simple-property name="maxHeapSize" + description="The maximum heap size. This value will be used with the -Xmx JVM option."/> + <c:simple-property name="heapNewSize" + description="The size of the new generation portion of the heap. This value will be used with + the -Xmn JVM option."/> + <c:simple-property name="threadStackSize" + description="The thread stack size. This memory is allocated to each thread off heap."/> + </c:group> + </resource-configuration> + <server name="Cassandra Server JVM" sourcePlugin="JMX" sourceType="JMX Server" discovery="org.rhq.plugins.jmx.EmbeddedJMXServerDiscoveryComponent" commit 5d1cb191a0ea22dd4f24379597645aeff3934df7 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 13 13:09:41 2013 -0400 updating/fixing integration test failure diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java index 91a5459..76ff090 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java @@ -103,8 +103,8 @@ public class DeployerITest { } @Test(dependsOnMethods = "applyConfigChanges") - public void verifyConfigChangesToCassandraEnv() throws Exception { - assertFileDeployedAndUpdated("cassandra-env.sh"); + public void verifyConfigChangesToCassandraJvmOpts() throws Exception { + assertFileDeployedAndUpdated("cassandra-jvm.properties"); } private void assertFileDeployedAndUpdated(String fileName) throws Exception { diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-env.sh b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-env.sh deleted file mode 100644 index 62dc0f2..0000000 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-env.sh +++ /dev/null @@ -1,247 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -calculate_heap_sizes() -{ - case "`uname`" in - Linux) - system_memory_in_mb=`free -m | awk '/Mem:/ {print $2}'` - system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` - ;; - FreeBSD) - system_memory_in_bytes=`sysctl hw.physmem | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - SunOS) - system_memory_in_mb=`prtconf | awk '/Memory size:/ {print $3}'` - system_cpu_cores=`psrinfo | wc -l` - ;; - Darwin) - system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'` - system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024` - system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'` - ;; - *) - # assume reasonable defaults for e.g. a modern desktop or - # cheap server - system_memory_in_mb="2048" - system_cpu_cores="2" - ;; - esac - - # some systems like the raspberry pi don't report cores, use at least 1 - if [ "$system_cpu_cores" -lt "1" ] - then - system_cpu_cores="1" - fi - - # set max heap size based on the following - # max(min(1/2 ram, 1024MB), min(1/4 ram, 8GB)) - # calculate 1/2 ram and cap to 1024MB - # calculate 1/4 ram and cap to 8192MB - # pick the max - half_system_memory_in_mb=`expr $system_memory_in_mb / 2` - quarter_system_memory_in_mb=`expr $half_system_memory_in_mb / 2` - if [ "$half_system_memory_in_mb" -gt "1024" ] - then - half_system_memory_in_mb="1024" - fi - if [ "$quarter_system_memory_in_mb" -gt "8192" ] - then - quarter_system_memory_in_mb="8192" - fi - if [ "$half_system_memory_in_mb" -gt "$quarter_system_memory_in_mb" ] - then - max_heap_size_in_mb="$half_system_memory_in_mb" - else - max_heap_size_in_mb="$quarter_system_memory_in_mb" - fi - MAX_HEAP_SIZE="${max_heap_size_in_mb}M" - - # Young gen: min(max_sensible_per_modern_cpu_core * num_cores, 1/4 * heap size) - max_sensible_yg_per_core_in_mb="100" - max_sensible_yg_in_mb=`expr $max_sensible_yg_per_core_in_mb "*" $system_cpu_cores` - - desired_yg_in_mb=`expr $max_heap_size_in_mb / 4` - - if [ "$desired_yg_in_mb" -gt "$max_sensible_yg_in_mb" ] - then - HEAP_NEWSIZE="${max_sensible_yg_in_mb}M" - else - HEAP_NEWSIZE="${desired_yg_in_mb}M" - fi -} - -# Determine the sort of JVM we'll be running on. - -java_ver_output=`"${JAVA:-java}" -version 2>&1` - -jvmver=`echo "$java_ver_output" | awk -F'"' 'NR==1 {print $2}'` -JVM_VERSION=${jvmver%_*} -JVM_PATCH_VERSION=${jvmver#*_} - -jvm=`echo "$java_ver_output" | awk 'NR==2 {print $1}'` -case "$jvm" in - OpenJDK) - JVM_VENDOR=OpenJDK - # this will be "64-Bit" or "32-Bit" - JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $2}'` - ;; - "Java(TM)") - JVM_VENDOR=Oracle - # this will be "64-Bit" or "32-Bit" - JVM_ARCH=`echo "$java_ver_output" | awk 'NR==3 {print $3}'` - ;; - *) - # Help fill in other JVM values - JVM_VENDOR=other - JVM_ARCH=unknown - ;; -esac - - -# Override these to set the amount of memory to allocate to the JVM at -# start-up. For production use you may wish to adjust this for your -# environment. MAX_HEAP_SIZE is the total amount of memory dedicated -# to the Java heap; HEAP_NEWSIZE refers to the size of the young -# generation. Both MAX_HEAP_SIZE and HEAP_NEWSIZE should be either set -# or not (if you set one, set the other). -# -# The main trade-off for the young generation is that the larger it -# is, the longer GC pause times will be. The shorter it is, the more -# expensive GC will be (usually). -# -# The example HEAP_NEWSIZE assumes a modern 8-core+ machine for decent pause -# times. If in doubt, and if you do not particularly want to tweak, go with -# 100 MB per physical CPU core. - -#MAX_HEAP_SIZE="4G" -#HEAP_NEWSIZE="800M" - -if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then - calculate_heap_sizes -else - if [ "x$MAX_HEAP_SIZE" = "x" ] || [ "x$HEAP_NEWSIZE" = "x" ]; then - echo "please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs (see cassandra-env.sh)" - exit 1 - fi -fi - -# Specifies the default port over which Cassandra will be available for -# JMX connections. -JMX_PORT="7200" - - -# Here we create the arguments that will get passed to the jvm when -# starting cassandra. - -# enable assertions. disabling this in production will give a modest -# performance benefit (around 5%). -JVM_OPTS="$JVM_OPTS -ea" - -# add the jamm javaagent -if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \ - || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ] -then - JVM_OPTS="$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" -fi - -# enable thread priorities, primarily so we can give periodic tasks -# a lower priority to avoid interfering with client workload -JVM_OPTS="$JVM_OPTS -XX:+UseThreadPriorities" -# allows lowering thread priority without being root. see -# http://tech.stolsvik.com/2010/01/linux-java-thread-priorities-workaround.ht… -JVM_OPTS="$JVM_OPTS -XX:ThreadPriorityPolicy=42" - -# min and max heap sizes should be set to the same value to avoid -# stop-the-world GC pauses during resize, and so that we can lock the -# heap in memory on startup to prevent any of it from being swapped -# out. -JVM_OPTS="$JVM_OPTS -Xms${MAX_HEAP_SIZE}" -JVM_OPTS="$JVM_OPTS -Xmx${MAX_HEAP_SIZE}" -JVM_OPTS="$JVM_OPTS -Xmn${HEAP_NEWSIZE}" -JVM_OPTS="$JVM_OPTS -XX:+HeapDumpOnOutOfMemoryError" - -# set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR -if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then - JVM_OPTS="$JVM_OPTS -XX:HeapDumpPath=$CASSANDRA_HEAPDUMP_DIR/cassandra-`date +%s`-pid$$.hprof" -fi - - -startswith() { [ "${1#$2}" != "$1" ]; } - -if [ "`uname`" = "Linux" ] ; then - # reduce the per-thread stack size to minimize the impact of Thrift - # thread-per-client. (Best practice is for client connections to - # be pooled anyway.) Only do so on Linux where it is known to be - # supported. - # u34 and greater need 180k - JVM_OPTS="$JVM_OPTS -Xss180k" -fi -echo "xss = $JVM_OPTS" - -# GC tuning options -JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC" -JVM_OPTS="$JVM_OPTS -XX:+UseConcMarkSweepGC" -JVM_OPTS="$JVM_OPTS -XX:+CMSParallelRemarkEnabled" -JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8" -JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1" -JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75" -JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly" -JVM_OPTS="$JVM_OPTS -XX:+UseTLAB" -# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check -if [ "$JVM_VERSION" \> "1.7" ] ; then - JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark" -fi - -# GC logging options -- uncomment to enable -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails" -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCDateStamps" -# JVM_OPTS="$JVM_OPTS -XX:+PrintHeapAtGC" -# JVM_OPTS="$JVM_OPTS -XX:+PrintTenuringDistribution" -# JVM_OPTS="$JVM_OPTS -XX:+PrintGCApplicationStoppedTime" -# JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure" -# JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1" -# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log" -# If you are using JDK 6u34 7u2 or later you can enable GC log rotation -# don't stick the date in the log name if rotation is on. -# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log" -# JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation" -# JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10" -# JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M" - -# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414 -# JVM_OPTS="$JVM_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1414" - -# Prefer binding to IPv4 network intefaces (when net.ipv6.bindv6only=1). See -# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6342561 (short version: -# comment out this entry to enable IPv6 support). -JVM_OPTS="$JVM_OPTS -Djava.net.preferIPv4Stack=true" - -# jmx: metrics and administration interface -# -# add this if you're having trouble connecting: -# JVM_OPTS="$JVM_OPTS -Djava.rmi.server.hostname=<public name>" -# -# see -# https://blogs.oracle.com/jmxetc/entry/troubleshooting_connection_problems_i… -# for more on configuring JMX through firewalls, etc. (Short version: -# get it working with no firewall first.) -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT" -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false" -JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false" -JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS" diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties new file mode 100644 index 0000000..a90d23c --- /dev/null +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties @@ -0,0 +1,112 @@ +enable_assertions="-ea" + +# JMX settings +jmx_port=7200 + +use_thread_priorities="-XX:+UseThreadPriorities" + +thread_priority_policy="-XX:ThreadPriorityPolicy=42" + +heap_min=-Xms${MAX_HEAP_SIZE} +heap_max=-Xmx${MAX_HEAP_SIZE} +heap_new=-Xmn${HEAP_NEWSIZE} + +heap_dump_on_OOMError="-XX:+HeapDumpOnOutOfMemoryError" + +heap_dump_dir="" + +thread_stack_size=-Xss180k + +java_agent="" +# Enable jamm when running on Java 6 patch version 23 or higher. +#java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" + +# GC tuning options +# +# Uses a parallel version of the young generation copying collector alongside +# the default collector. This minimizes pauses by using all available CPUs in +# parallel. The collector is compatible with both the default collector and the +# Concurrent Mark and Sweep (CMS) collector. +# This is a parallel collector option. +use_par_new_gc="-XX:+UseParNewGC" + +# Whether parallel remark enabled (only if ParNewGC) +# This is a parallel collector option. +cms_parallel_remark_enabled="-XX:+CMSParallelRemarkEnabled" + +# Uses the Concurrent Mark and Sweep collector. It is a mostly concurrent +# collector with a low pause time. It is a good match for multi-core systems. +use_concur_mark_sweep_gc="-XX:+UseConcMarkSweepGC" + +# Ratio of eden/survivor space size. The default value is 8. +# This is a Garbage First (G1) garbage collector option. +survivor_ratio="-XX:SurvivorRatio=8" + +# Maximum value for tenuring threshold. +# Young collection tuning option. +max_tenuring_threshold="-XX:MaxTenuringThreshold=1" + +# Percentage CMS generation occupancy to start a CMS collection cycle (A +# negative value means that CMSTirggerRatio is used). +# This is a CMS tuning option. +cms_initiating_occupancy_fraction="-XX:CMSInitiatingOccupancyFraction=75" + +# Only use occupancy as a criterion for starting a CMS collection. +# This is a CMS tuning option. +use_cms_initiating_occupancy_only="-XX:+UseCMSInitiatingOccupancyOnly" + +# Use thread local allocation blocks in young space. Enabled by default. +# This is a young collection tuning option. +use_tlab="-XX:+UseTLAB" + +##################### +# GC logging options +##################### +# Print more details at garbage collection +#print_gc_details="-XX:+PrintGCDetails" +print_gc_details="" + +# Prefix logging statements with wall clock time. +#print_gc_datestamps="XX:+PrintGCDateStamps" +print_gc_datestamps="" + +# Print heap layout before and after each garbage collection. +#print_heap_at_gc="-XX:+PrintHeapAtGC" +print_heap_at_gc="" + +# Print tenuring age information. +#print_tenuring_distribution="-XX:+PrintTenuringDistribution" +print_tenuring_distribution="" + +# Print the time the application has been stopped. +#print_gc_application_stopped_time="-XX:+PrintGCApplicationStoppedTime" +print_gc_application_stopped_time="" + +# Print more details about promotion failures. +#print_promotion_failure="-XX:+PrintPromotionFailure" +print_promotion_failure="" + +# Print statistics for CMS' FreeListSpace. +#print_flss_stats="-XX:PrintFLSStatistics=1" +print_flss_stats="" + +# Redirects GC output to file instead of console. +#gc_log_file="-Xloggc:/var/log/cassandra/gc-`date +%s`.log" +gc_log_file="" + +############################################################################### +# THE FOLLOWING IS READ ONLY +# Now build the JVM_OPTS variable. The following variables should NOT be +# directly modified. Instead update the preceding variables. The following +# variables build up the JVM_OPTS variable that is read by the cassandra and +# cassandra.bat scripts. +############################################################################### +HEAP_OPTS="${heap_min} ${heap_max} ${heap_new} ${heap_dump_on_OOMError} ${thread_stack_size}" + +GC_TUNING_OPTS="${use_par_new_gc} ${use_concur_mark_sweep_gc} ${cms_parallel_remark_enabled} ${survivor_ratio} ${max_tenuring_threshold} ${cms_initiating_occupancy_fraction} ${use_cms_initiating_occupancy_only} ${use_tlab}" + +GC_LOGGING_OPTS="${print_gc_details} ${print_gc_datestamps} ${print_heap_at_gc} ${print_tenuring_distribution} ${print_gc_application_stopped_time} ${print_promotion_failure} ${print_flss_stats} ${gc_log_file}" + +JMX_OPTS="-Dcom.sun.management.jmxremote.port=${jmx_port} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false" + +JVM_OPTS="${enable_assertions} ${java_agent} ${use_thread_priorities} ${thread_priority_policy} ${HEAP_OPTS} ${GC_TUNING_OPTS} ${GC_LOGGING_OPTS} ${JMX_OPTS}" diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml index 82778c9..15d08f2 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml @@ -681,7 +681,7 @@ client_encryption_options: # can be: all - all traffic is compressed # dc - traffic between different datacenters is compressed # none - nothing is compressed. -internode_compression: all +internode_compression: none # Enable or disable tcp_nodelay for inter-dc communication. # Disabling it will result in larger (but fewer) network packets being sent, commit bf78527f20bfeb95fe6040ae5f744bf633d08140 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 13 12:46:07 2013 -0400 remove usage of cassandra-env.sh for cassandra start up We want to manage C* heap settings and other options/arguments passed to the C* JVM command line. On linux, the JVM options are set using the JVM_OPTS shell script variable which is done in cassandra-env.sh. The cassandra-env.sh script however does not lend itself well to our structured, resource configuration. The JVM_OPTS variable is now built up in cassandra-jvm.properties which is a java properties file that also uses legal shell syntax. The file is sourced from the cassandra start script. This paves the way for resource configuration of the Cassandra JVM options. I am also hoping that we can do something similar for Windows where we can use cassandra-jvm.properties. This would substantially reduce the need for platform specific code in the storage plugin. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 0b015b4..42f6c8b 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -167,6 +167,9 @@ <copy file="${settings.localRepository}/org/xerial/snappy/snappy-java/${cassandra.snappy.version}/snappy-java-${cassandra.snappy.version}.jar" todir="${cassandra.dir}/lib"/> <move file="${project.build.outputDirectory}/cassandra/conf" todir="${cassandra.dir}"/> + <delete file="${cassandra.dir}/bin/cassandra"/> + <move file="${project.build.outputDirectory}/cassandra/bin/cassandra" todir="${cassandra.dir}/bin"/> + <delete dir="${project.build.outputDirectory}/cassandra"/> <delete dir="${cassandra.dir}/javadoc"/> <zip basedir="${cassandra.dir}" destfile="${cassandra.distro.zip}"/> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra new file mode 100755 index 0000000..742d9c0 --- /dev/null +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/bin/cassandra @@ -0,0 +1,193 @@ +#!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# OPTIONS: +# -f: start in foreground +# -p <filename>: log the pid to a file (useful to kill it later) +# -v: print version string and exit + +# CONTROLLING STARTUP: +# +# This script relies on few environment variables to determine startup +# behavior, those variables are: +# +# CLASSPATH -- A Java classpath containing everything necessary to run. +# JVM_OPTS -- Additional arguments to the JVM for heap size, etc +# CASSANDRA_CONF -- Directory containing Cassandra configuration files. +# +# As a convenience, a fragment of shell is sourced in order to set one or +# more of these variables. This so-called `include' can be placed in a +# number of locations and will be searched for in order. The lowest +# priority search path is the same directory as the startup script, and +# since this is the location of the sample in the project tree, it should +# almost work Out Of The Box. +# +# Any serious use-case though will likely require customization of the +# include. For production installations, it is recommended that you copy +# the sample to one of /usr/share/cassandra/cassandra.in.sh, +# /usr/local/share/cassandra/cassandra.in.sh, or +# /opt/cassandra/cassandra.in.sh and make your modifications there. +# +# Another option is to specify the full path to the include file in the +# environment. For example: +# +# $ CASSANDRA_INCLUDE=/path/to/in.sh cassandra -p /var/run/cass.pid +# +# Note: This is particularly handy for running multiple instances on a +# single installation, or for quick tests. +# +# Finally, developers and enthusiasts who frequently run from an SVN +# checkout, and do not want to locally modify bin/cassandra.in.sh, can put +# a customized include file at ~/.cassandra.in.sh. +# +# If you would rather configure startup entirely from the environment, you +# can disable the include by exporting an empty CASSANDRA_INCLUDE, or by +# ensuring that no include files exist in the aforementioned search list. +# Be aware that you will be entirely responsible for populating the needed +# environment variables. + +# NB: Developers should be aware that this script should remain compatible with +# POSIX sh and Solaris sh. This means, in particular, no $(( )) and no $( ). + +# If an include wasn't specified in the environment, then search for one... +if [ "x$CASSANDRA_INCLUDE" = "x" ]; then + # Locations (in order) to use when searching for an include file. + for include in /usr/share/cassandra/cassandra.in.sh \ + /usr/local/share/cassandra/cassandra.in.sh \ + /opt/cassandra/cassandra.in.sh \ + "$HOME/.cassandra.in.sh" \ + "`dirname $0`/cassandra.in.sh"; do + if [ -r "$include" ]; then + . "$include" + break + fi + done +# ...otherwise, source the specified include. +elif [ -r "$CASSANDRA_INCLUDE" ]; then + . "$CASSANDRA_INCLUDE" +fi + +# Use JAVA_HOME if set, otherwise look for java in PATH +if [ -n "$JAVA_HOME" ]; then + JAVA="$JAVA_HOME/bin/java" +else + JAVA=java +fi + +# If numactl is available, use it. For Cassandra, the priority is to +# avoid disk I/O. Even for the purpose of CPU efficiency, we don't +# really have CPU<->data affinity anyway. Also, empirically test that numactl +# works before trying to use it (CASSANDRA-3245). +NUMACTL_ARGS="--interleave=all" +if which numactl >/dev/null 2>/dev/null && numactl $NUMACTL_ARGS ls / >/dev/null 2>/dev/null +then + NUMACTL="numactl $NUMACTL_ARGS" +else + NUMACTL="" +fi + +if [ -z "$CASSANDRA_CONF" -o -z "$CLASSPATH" ]; then + echo "You must set the CASSANDRA_CONF and CLASSPATH vars" >&2 + exit 1 +fi + +if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then + #. "$CASSANDRA_CONF/cassandra-env.sh" + . "$CASSANDRA_CONF/cassandra-jvm.properties" +fi + +# Special-case path variables. +case "`uname`" in + CYGWIN*) + CLASSPATH=`cygpath -p -w "$CLASSPATH"` + CASSANDRA_CONF=`cygpath -p -w "$CASSANDRA_CONF"` + ;; +esac + +launch_service() +{ + pidpath=$1 + foreground=$2 + props=$3 + class=$4 + cassandra_parms="-Dlog4j.configuration=log4j-server.properties -Dlog4j.defaultInitOverride=true" + + if [ "x$pidpath" != "x" ]; then + cassandra_parms="$cassandra_parms -Dcassandra-pidfile=$pidpath" + fi + + # The cassandra-foreground option will tell CassandraDaemon not + # to close stdout/stderr, but it's up to us not to background. + if [ "x$foreground" != "x" ]; then + cassandra_parms="$cassandra_parms -Dcassandra-foreground=yes" + exec $NUMACTL "$JAVA" $JVM_OPTS $cassandra_parms -cp "$CLASSPATH" $props "$class" + # Startup CassandraDaemon, background it, and write the pid. + else + exec $NUMACTL "$JAVA" $JVM_OPTS $cassandra_parms -cp "$CLASSPATH" $props "$class" <&- & + [ ! -z "$pidpath" ] && printf "%d" $! > "$pidpath" + true + fi + + return $? +} + +# Parse any command line options. +args=`getopt vfhp:bD: "$@"` +eval set -- "$args" + +classname="org.apache.cassandra.service.CassandraDaemon" + +while true; do + case "$1" in + -p) + pidfile="$2" + shift 2 + ;; + -f) + foreground="yes" + shift + ;; + -h) + echo "Usage: $0 [-f] [-h] [-p pidfile]" + exit 0 + ;; + -v) + "$JAVA" -cp "$CLASSPATH" org.apache.cassandra.tools.GetVersion + exit 0 + ;; + -D) + properties="$properties -D$2" + shift 2 + ;; + --) + shift + break + ;; + *) + echo "Error parsing arguments!" >&2 + exit 1 + ;; + esac +done + +# Start up the service +launch_service "$pidfile" "$foreground" "$properties" "$classname" + +exit $? + +# vi:ai sw=4 ts=4 tw=0 et diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties new file mode 100644 index 0000000..612c65e --- /dev/null +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties @@ -0,0 +1,112 @@ +enable_assertions="-ea" + +# JMX settings +jmx_port="7299" + +use_thread_priorities="-XX:+UseThreadPriorities" + +thread_priority_policy="-XX:ThreadPriorityPolicy=42" + +heap_min="-Xms256M" +heap_max="-Xms256M" +heap_new="-Xmn64M" + +heap_dump_on_OOMError="-XX:+HeapDumpOnOutOfMemoryError" + +heap_dump_dir="" + +thread_stack_size="-Xss180k" + +java_agent="" +# Enable jamm when running on Java 6 patch version 23 or higher. +#java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" + +# GC tuning options +# +# Uses a parallel version of the young generation copying collector alongside +# the default collector. This minimizes pauses by using all available CPUs in +# parallel. The collector is compatible with both the default collector and the +# Concurrent Mark and Sweep (CMS) collector. +# This is a parallel collector option. +use_par_new_gc="-XX:+UseParNewGC" + +# Whether parallel remark enabled (only if ParNewGC) +# This is a parallel collector option. +cms_parallel_remark_enabled="-XX:+CMSParallelRemarkEnabled" + +# Uses the Concurrent Mark and Sweep collector. It is a mostly concurrent +# collector with a low pause time. It is a good match for multi-core systems. +use_concur_mark_sweep_gc="-XX:+UseConcMarkSweepGC" + +# Ratio of eden/survivor space size. The default value is 8. +# This is a Garbage First (G1) garbage collector option. +survivor_ratio="-XX:SurvivorRatio=8" + +# Maximum value for tenuring threshold. +# Young collection tuning option. +max_tenuring_threshold="-XX:MaxTenuringThreshold=1" + +# Percentage CMS generation occupancy to start a CMS collection cycle (A +# negative value means that CMSTirggerRatio is used). +# This is a CMS tuning option. +cms_initiating_occupancy_fraction="-XX:CMSInitiatingOccupancyFraction=75" + +# Only use occupancy as a criterion for starting a CMS collection. +# This is a CMS tuning option. +use_cms_initiating_occupancy_only="-XX:+UseCMSInitiatingOccupancyOnly" + +# Use thread local allocation blocks in young space. Enabled by default. +# This is a young collection tuning option. +use_tlab="-XX:+UseTLAB" + +##################### +# GC logging options +##################### +# Print more details at garbage collection +#print_gc_details="-XX:+PrintGCDetails" +print_gc_details="" + +# Prefix logging statements with wall clock time. +#print_gc_datestamps="XX:+PrintGCDateStamps" +print_gc_datestamps="" + +# Print heap layout before and after each garbage collection. +#print_heap_at_gc="-XX:+PrintHeapAtGC" +print_heap_at_gc="" + +# Print tenuring age information. +#print_tenuring_distribution="-XX:+PrintTenuringDistribution" +print_tenuring_distribution="" + +# Print the time the application has been stopped. +#print_gc_application_stopped_time="-XX:+PrintGCApplicationStoppedTime" +print_gc_application_stopped_time="" + +# Print more details about promotion failures. +#print_promotion_failure="-XX:+PrintPromotionFailure" +print_promotion_failure="" + +# Print statistics for CMS' FreeListSpace. +#print_flss_stats="-XX:PrintFLSStatistics=1" +print_flss_stats="" + +# Redirects GC output to file instead of console. +#gc_log_file="-Xloggc:/var/log/cassandra/gc-`date +%s`.log" +gc_log_file="" + +############################################################################### +# THE FOLLOWING IS READ ONLY +# Now build the JVM_OPTS variable. The following variables should NOT be +# directly modified. Instead update the preceding variables. The following +# variables build up the JVM_OPTS variable that is read by the cassandra and +# cassandra.bat scripts. +############################################################################### +HEAP_OPTS="${heap_min} ${heap_max} ${heap_new} ${heap_dump_on_OOMError} ${thread_stack_size}" + +GC_TUNING_OPTS="${use_par_new_gc} ${use_concur_mark_sweep_gc} ${cms_parallel_remark_enabled} ${survivor_ratio} ${max_tenuring_threshold} ${cms_initiating_occupancy_fraction} ${use_cms_initiating_occupancy_only} ${use_tlab}" + +GC_LOGGING_OPTS="${print_gc_details} ${print_gc_datestamps} ${print_heap_at_gc} ${print_tenuring_distribution} ${print_gc_application_stopped_time} ${print_promotion_failure} ${print_flss_stats} ${gc_log_file}" + +JMX_OPTS="-Dcom.sun.management.jmxremote.port=${jmx_port} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false" + +JVM_OPTS="${enable_assertions} ${java_agent} ${use_thread_priorities} ${thread_priority_policy} ${HEAP_OPTS} ${GC_TUNING_OPTS} ${GC_LOGGING_OPTS} ${JMX_OPTS}" diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java index e85813d..1e31e14 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java @@ -31,10 +31,12 @@ import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.util.Map; +import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.rhq.core.util.PropertiesFileUpdate; import org.rhq.core.util.TokenReplacingReader; import org.rhq.core.util.ZipUtil; import org.rhq.core.util.stream.StreamUtil; @@ -83,10 +85,13 @@ public class Deployer { applyConfigChanges(confDir, "cassandra.yaml", tokens); applyConfigChanges(confDir, "log4j-server.properties", tokens); - applyConfigChanges(confDir, "cassandra-env.sh", tokens); + applyChangesToCassandraJvmProps(confDir, deploymentOptions); +// applyConfigChanges(confDir, "cassandra-env.sh", tokens); } - private void applyConfigChanges(File confDir, String fileName, Map<String, String> tokens) throws DeploymentException { + private void applyConfigChanges(File confDir, String fileName, Map<String, String> tokens) + throws DeploymentException { + File filteredFile = new File(confDir, fileName); try { if (log.isInfoEnabled()) { @@ -104,6 +109,29 @@ public class Deployer { } } + private void applyChangesToCassandraJvmProps(File confDir, DeploymentOptions deploymentOptions) + throws DeploymentException { + + File jvmPropsFile = new File(confDir, "cassandra-jvm.properties"); + try { + log.info("Applying configuration changes to " + jvmPropsFile); + + PropertiesFileUpdate propertiesUpdater = new PropertiesFileUpdate(jvmPropsFile.getAbsolutePath()); + Properties properties = propertiesUpdater.loadExistingProperties(); + + properties.setProperty("heap_min", "-Xms" + deploymentOptions.getHeapSize()); + properties.setProperty("heap_max", "-Xmx" + deploymentOptions.getHeapSize()); + properties.setProperty("heap_new", "-Xmn" + deploymentOptions.getHeapNewSize()); + properties.setProperty("thread_stack_size", "-Xss" + deploymentOptions.getStackSize()); + properties.setProperty("jmx_port", deploymentOptions.getJmxPort().toString()); + + propertiesUpdater.update(properties); + } catch (IOException e) { + log.error("An error occurred while updating " + jvmPropsFile, e); + throw new DeploymentException("An error occurred while updating " + jvmPropsFile, e); + } + } + public void updateFilePerms() { File deployDir = new File(deploymentOptions.getBasedir()); File binDir = new File(deployDir, "bin"); commit 7185fb3fbaf98dde194872657c7362134d342c10 Author: John Sanda <jsanda(a)redhat.com> Date: Sat Jul 13 10:08:22 2013 -0400 remove obsolete files that are no longer used diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/deploy.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/deploy.xml deleted file mode 100644 index 19d5647..0000000 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/deploy.xml +++ /dev/null @@ -1,221 +0,0 @@ -<project name="rhq_cassandra_bundle" - default="main" - xmlns:rhq="antlib:org.rhq.bundle"> - <rhq:bundle name="${rhq.cassandra.bundle.name}" - version="${rhq.cassandra.bundle.version}" - description="A bundle for deploying RHQ Cassandra nodes."> - -  - - <rhq:input-property name="cluster.name" - description="The name of the cluster. This is used to prevent machines in one logical cluster from joining another" - required="true" - defaultValue="rhqdev" - type="string"/> - - <rhq:input-property name="cluster.dir" - description="The directory in which Cassandra nodes will be installed" - required="true" - defaultValue="" - type="string"/> - - <rhq:input-property name="data.dir" - description="The directory where Cassandra should store data files." - required="true" - defaultValue="data" - type="string"/> - - <rhq:input-property name="commitlog.dir" - description="The directory where Cassandra stores its commit logs." - required="true" - defaultValue="commit_log" - type="string"/> - - <rhq:input-property name="saved.caches.dir" - description="The directory where Cassandra stores saved caches." - required="true" - defaultValue="saved_caches" - type="string"/> - - <rhq:input-property name="log.dir" - description="The directory where Cassandra stores log files." - required="true" - defaultValue="logs" - type="string"/> - - <rhq:input-property name="rhq.cassandra.log.file.name" - description="The name of the log file to which Cassandra writes." - required="true" - defaultValue="rhq-storage-node.log" - type="string"/> - - <rhq:input-property name="logging.level" - description="The log4j logging level to use." - required="false" - defaultValue="DEBUG" - type="string"/> - - <rhq:input-property name="seeds" - description="A comma-delimited list of IP addresses/host names that are deemed contact points. Cassandra nodes use this list of hosts to find each other and learn the topology of the ring. If you are running a local development cluster, be sure to have aliases set up for localhost." - required="false" - defaultValue="127.0.0.1" - type="string"/> - - <rhq:input-property name="rhq.cassandra.num_tokens" - description="Defines the number of tokens randomly assigned to a node on the ring. The more tokens, relative to other nodes, the larger the proportion of data that this node will store. You probably want all nodes to have the same number of tokens assuming they have equal hardware capability." - required="false" - defaultValue="256" - type="string"/> - - <rhq:input-property name="jmx.port" - description="The port over which Cassandra listens for JMX connections. Each node should be assigned a unique port." - required="false" - defaultValue="7200" - type="string"/> - - <rhq:input-property name="rhq.cassandra.storage.port" - description="The port used for inter-node communication." - required="false" - defaultValue="7000" - type="string"/> - - <rhq:input-property name="rhq.cassandra.ssl.storage.port" - description="The port used for encrypted inter-node communication." - required="false" - defaultValue="7001" - type="string"/> - - <rhq:input-property name="listen.address" - description="Address used for inter-node communication. Defaults to value of hostname property." - required="true" - defaultValue="" - type="string"/> - - <rhq:input-property name="rpc.address" - description="Address used for Thrift RPC client communication. Defaults to value of hostname property." - required="true" - defaultValue="" - type="string"/> - - <rhq:input-property name="cassandra.ring.delay.property" - required="false" - defaultValue="" - type="string"/> - - <rhq:input-property name="cassandra.ring.delay" - description="When a node initializes it contacts a seed and then sleeps for RING_DELAY (milliseconds) to learn about other nodes in the cluster. Cassandra uses a default value of 30 seconds." - required="false" - defaultValue="" - type="string"/> - - <rhq:input-property name="rhq.cassandra.native_transport_max_threads" - description="The maximum number of threads handling native CQL requests." - required="false" - defaultValue="64" - type="integer"/> - - <rhq:input-property name="rhq.cassandra.native_transport_port" - description="The port for the CQL native transport to listen for clients on." - required="false" - defaultValue="9042" - type="integer"/> - - <rhq:input-property name="rhq.cassandra.rpc_port" - description="The port to listen for Thrift clients on." - required="false" - defaultValue="9160" - type="integer"/> - - <rhq:input-property name="rhq.cassandra.authenticator" - description="A class that performs authentication. The value should be a fully qualified class name and implement IAuthenticator." - required="false" - defaultValue="org.rhq.cassandra.auth.SimpleAuthenticator" - type="string"/> - - <rhq:input-property name="rhq.cassandra.authorizer" - description="A class that performs authorization. Used to limit/provide permissions. The value should be a fully qualified class name and implement IAuthorizer." - required="false" - defaultValue="org.rhq.cassandra.auth.SimpleAuthorizer" - type="string"/> - - <rhq:input-property name="rhq.cassandra.password.properties.file" - description="The location of the password properties file used by SimpleAuthenticator. If a relative path is specified, its location is resolved relative to Cassandra's bin directory." - required="false" - defaultValue="./../conf/passwd.properties" - type="file"/> - - <rhq:input-property name="rhq.cassandra.access.properties.file" - description="The location of the authorization properties file used by SimpleAuthority. If a relative path is specified, its location is resolved relative to Cassandra's bin directory." - required="false" - defaultValue="./../conf/access.properties" - type="file"/> - - <rhq:input-property name="rhq.cassandra.username" - description="The username with which to authenticate requests to Cassandra." - required="true" - type="string"/> - - <rhq:input-property name="rhq.cassandra.password" - description="The password with which to authenticate requests to Cassandra." - required="true" - type="string"/> - - <rhq:input-property name="rhq.cassandra.max.heap.size" - required="true" - defaultValue="${MAX_HEAP_SIZE}"/> - - <rhq:input-property name="rhq.cassandra.heap.new.size" - required="true" - defaultValue="${HEAP_NEWSIZE}"/> - - <rhq:deployment-unit name="cassandra" preinstallTarget="pre-install" postinstallTarget="post-install"> - - <rhq:archive name="cassandra.zip"> - <rhq:replace> - <rhq:fileset dir="conf"> - <include name="cassandra.yaml"/> - </rhq:fileset> - <rhq:fileset dir="conf"> - <include name="cassandra-env.sh"/> - </rhq:fileset> - <rhq:fileset dir="conf"> - <include name="log4j-server.properties"/> - </rhq:fileset> - <rhq:fileset dir="conf"> - <include name="passwd.properties"/> - </rhq:fileset> - - </rhq:replace> - </rhq:archive> - </rhq:deployment-unit> - </rhq:bundle> - - <target name="main"/> - - <target name="pre-install"> - <mkdir dir="${cluster.dir}"/> - - </target> - - <target name="post-install"> - <property name="bin.dir" value="${rhq.deploy.dir}/bin"/> - - <chmod file="${bin.dir}/cassandra" perm="+x"/> - <chmod file="${bin.dir}/cqlsh" perm="+x"/> - <chmod file="${bin.dir}/cassandra-cli" perm="+x"/> - <chmod file="${bin.dir}/nodetool" perm="+x"/> - </target> - -</project> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cli/dbsetup.script b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cli/dbsetup.script deleted file mode 100644 index 73bc2a7..0000000 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cli/dbsetup.script +++ /dev/null @@ -1,40 +0,0 @@ -create keyspace rhq - with placement_strategy = 'org.apache.cassandra.locator.SimpleStrategy' and - strategy_options = {replication_factor:1}; - -use rhq; - -create column family raw_metrics - with comparator = DateType and - default_validation_class = DoubleType and - key_validation_class = Int32Type; - -create column family one_hour_metric_data - with comparator = 'CompositeType(DateType, Int32Type)' and - default_validation_class = DoubleType and - key_validation_class = Int32Type; - -create column family six_hour_metric_data - with comparator = 'CompositeType(DateType, Int32Type)' and - default_validation_class = DoubleType and - key_validation_class = Int32Type; - -create column family twenty_four_hour_metric_data - with comparator = 'CompositeType(DateType, Int32Type)' and - default_validation_class = DoubleType and - key_validation_class = Int32Type; - -create column family metrics_work_queue - with comparator = 'CompositeType(DateType, Int32Type)' and - default_validation_class = Int32Type and - key_validation_class = UTF8Type; - -create column family resource_traits - with comparator = 'CompositeType(DateType, Int32Type, Int32Type, UTF8Type, UTF8Type)' and - default_validation_class = UTF8Type and - key_validation_class = Int32Type; - -create column family traits - with comparator = DateType and - default_validation_class = UTF8Type and - key_validation_class = Int32Type; diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/create_keyspace.cql b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/create_keyspace.cql deleted file mode 100644 index 9df13a0..0000000 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/create_keyspace.cql +++ /dev/null @@ -1 +0,0 @@ -CREATE KEYSPACE rhq WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}; diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/dbsetup.cql b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/dbsetup.cql deleted file mode 100644 index 189b35b..0000000 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/cassandra/cql/dbsetup.cql +++ /dev/null @@ -1,42 +0,0 @@ -CREATE KEYSPACE rhq WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}; - -USE rhq; - -CREATE TABLE raw_metrics ( - schedule_id int, - time timestamp, - value double, - PRIMARY KEY (schedule_id, time) -); - -CREATE TABLE one_hour_metrics ( - schedule_id int, - time timestamp, - type int, - value double, - PRIMARY KEY (schedule_id, time, type) -); - -CREATE TABLE six_hour_metrics ( - schedule_id int, - time timestamp, - type int, - value double, - PRIMARY KEY (schedule_id, time, type) -); - -CREATE TABLE twenty_four_hour_metrics ( - schedule_id int, - time timestamp, - type int, - value double, - PRIMARY KEY (schedule_id, time, type) -); - -CREATE TABLE metrics_index ( - bucket varchar, - time timestamp, - schedule_id int, - null_col boolean, - PRIMARY KEY (bucket, time, schedule_id) -);

1 0

[rhq] pom.xml
by Heiko W. Rupp 12 Jul '13

12 Jul '13

pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f9f3f712f702058e0d6ef5f1b99dcbe2162e63a9 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Jul 12 11:09:16 2013 +0200 Downgrade to 1.2.3, as the jboss nexus repo does not find 1.2.5. It is more recent than 1.1.1 anyway diff --git a/pom.xml b/pom.xml index 6b1d75f..c5cf5a7 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ <augeas.zip.mask>*-${augeas.classifier}.zip</augeas.zip.mask> <ant.contrib.version>1.0b3</ant.contrib.version> <freemarker.version>2.3.18</freemarker.version> - <swagger-annotations.version>1.2.5</swagger-annotations.version> + <swagger-annotations.version>1.2.3</swagger-annotations.version> <powermock.version>1.4.12</powermock.version> <arquillian.version>1.0.3.Final</arquillian.version> <arquillian.jboss.container.version>7.2.0.Final</arquillian.jboss.container.version>

1 0

[rhq] modules/enterprise modules/helpers pom.xml
by Heiko W. Rupp 12 Jul '13

12 Jul '13

modules/enterprise/server/jar/pom.xml | 11 +---------- modules/helpers/rest-docs-generator/pom.xml | 12 +----------- pom.xml | 3 ++- 3 files changed, 4 insertions(+), 22 deletions(-) New commits: commit c33f3226056333a1aaaa303306d1ce6dadcefe47 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Jul 12 10:35:44 2013 +0200 Bump swagger annotations version to a stable version and remove the snapshot repo. Thanks gaYak for reminding me. diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 2127930..7c236c7 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -439,7 +439,7 @@ <dependency> <groupId>com.wordnik</groupId> <artifactId>swagger-annotations_2.9.1</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>${swagger-annotations.version}</version> <scope>provided</scope> </dependency> @@ -686,15 +686,6 @@ </build> - <repositories> - <repository> -  - <id>sonatype-oss-snapshot</id> - <name>Sonatype OSS Snapshot repository</name> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - </repository> - - </repositories> <profiles> diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml index 9cc4fa1..c672abf 100644 --- a/modules/helpers/rest-docs-generator/pom.xml +++ b/modules/helpers/rest-docs-generator/pom.xml @@ -122,16 +122,6 @@ </plugins> </build> - <repositories> - <repository> -  - <id>sonatype-oss-snapshot</id> - <name>Sonatype OSS Snapshot repository</name> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - </repository> - - </repositories> - <dependencies> <dependency> @@ -149,7 +139,7 @@ <dependency> <groupId>com.wordnik</groupId> <artifactId>swagger-annotations_2.9.1</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>${swagger-annotations.version}</version> </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> diff --git a/pom.xml b/pom.xml index 26703d1..6b1d75f 100644 --- a/pom.xml +++ b/pom.xml @@ -151,6 +151,7 @@ <augeas.zip.mask>*-${augeas.classifier}.zip</augeas.zip.mask> <ant.contrib.version>1.0b3</ant.contrib.version> <freemarker.version>2.3.18</freemarker.version> + <swagger-annotations.version>1.2.5</swagger-annotations.version> <powermock.version>1.4.12</powermock.version> <arquillian.version>1.0.3.Final</arquillian.version> <arquillian.jboss.container.version>7.2.0.Final</arquillian.jboss.container.version> @@ -901,7 +902,7 @@ <artifactId>javax.servlet-api</artifactId> <version>3.0.1</version> </dependency> - + <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId>

1 0

[rhq] 2 commits - modules/enterprise modules/plugins
by snegrea 12 Jul '13

12 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 91 +++++++++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java | 21 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java | 22 ++ modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java | 2 modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java | 26 +- modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml | 4 6 files changed, 147 insertions(+), 19 deletions(-) New commits: commit 524d1b66879fa6d20788505e1c43c0e046e06e48 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Fri Jul 12 00:58:48 2013 -0500 Initial implementation for fetching all the alerts triggered for Storage Nodes resource and sub-sources. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 9d073ee..fa51fe1 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -28,8 +28,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Queue; import javax.ejb.EJB; import javax.ejb.Stateless; @@ -43,6 +45,7 @@ import org.quartz.JobDataMap; import org.quartz.SimpleTrigger; import org.quartz.Trigger; +import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.cloud.Server; @@ -51,6 +54,7 @@ import org.rhq.core.domain.cloud.StorageNode.OperationMode; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.common.JobTrigger; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.measurement.MeasurementAggregate; @@ -59,8 +63,11 @@ import org.rhq.core.domain.operation.bean.GroupOperationSchedule; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; +import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; +import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.server.RHQConstants; +import org.rhq.enterprise.server.alert.AlertManagerLocal; import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.authz.RequiredPermission; import org.rhq.enterprise.server.authz.RequiredPermissions; @@ -110,6 +117,9 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @EJB private OperationManagerLocal operationManager; + @EJB + private AlertManagerLocal alertManager; + @Override public void linkResource(Resource resource) { List<StorageNode> storageNodes = this.getStorageNodes(); @@ -427,7 +437,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN } entityManager.flush(); } - + private StorageNodeLoadComposite.MeasurementAggregateWithUnits getMeasurementAggregateWithUnits(Subject subject, int schedId, MeasurementUnits units, long beginTime, long endTime) { MeasurementAggregate measurementAggregate = measurementManager.getAggregate(subject, schedId, beginTime, @@ -472,4 +482,81 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN operationManager.scheduleGroupOperation(subjectManager.getOverlord(), schedule); } -} + + @Override + public PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject) { + return findStorageNodeAlerts(subject, false); + } + + @Override + public PageList<Alert> findAllStorageNodeAlerts(Subject subject) { + return findStorageNodeAlerts(subject, true); + } + + /** + * Find the set of alerts related to Storage Node resources and sub-resources. + * + * @param subject subject + * @param allAlerts if [true] then return all alerts; if [false] then return only alerts that are not acknowledged + * @return alerts + */ + private PageList<Alert> findStorageNodeAlerts(Subject subject, boolean allAlerts) { + Integer[] resouceIdsWithAlertDefinitions = findResourcesWithAlertDefinitions(); + PageList<Alert> alerts = new PageList<Alert>(); + + if( resouceIdsWithAlertDefinitions != null && resouceIdsWithAlertDefinitions.length != 0 ){ + AlertCriteria criteria = new AlertCriteria(); + criteria.setPageControl(PageControl.getUnlimitedInstance()); + criteria.addFilterResourceIds(resouceIdsWithAlertDefinitions); + criteria.addSortCtime(PageOrdering.DESC); + + alerts = alertManager.findAlertsByCriteria(subject, criteria); + + if (!allAlerts) { + //select on alerts that are not acknowledge + PageList<Alert> trimmedAlerts = new PageList<Alert>(); + for (Alert alert : alerts) { + if (alert.getAcknowledgeTime() == null || alert.getAcknowledgeTime() <= 0) { + trimmedAlerts.add(alert); + } + } + + alerts = trimmedAlerts; + } + } + + return alerts; + } + + /** + * Return resource Ids for all resources and sub-resources of Storage Nodes that + * have alert definitions. This will be used by the resource criteria to find + * all alerts triggered for storage nodes. + * + * @return + */ + private Integer[] findResourcesWithAlertDefinitions() { + List<Integer> resourceIdsWithAlertDefinitions = new ArrayList<Integer>(); + List<StorageNode> test2 = getStorageNodes(); + + Queue<Resource> unvisitedResources = new LinkedList<Resource>(); + for (StorageNode node : test2) { + if (node.getResource() != null) { + unvisitedResources.add(node.getResource()); + } + } + + while(!unvisitedResources.isEmpty()){ + Resource resource = unvisitedResources.poll(); + if (resource.getAlertDefinitions() != null) { + resourceIdsWithAlertDefinitions.add(resource.getId()); + } + + for(Resource child: resource.getChildResources()){ + unvisitedResources.add(child); + } + } + + return resourceIdsWithAlertDefinitions.toArray(new Integer[resourceIdsWithAlertDefinitions.size()]); + } +} \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index 5c3f092..a9b2514 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -22,6 +22,7 @@ import java.util.List; import javax.ejb.Local; +import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; @@ -65,13 +66,29 @@ public interface StorageNodeManagerLocal { * @return list of nodes */ PageList<StorageNode> findStorageNodesByCriteria(Subject subject, StorageNodeCriteria criteria); - + + /** + * Fetches the list of Storage Node related alerts that have not yet been acknowledged. + * + * @param subject subject + * @return storage nodes alerts not acknowledged + */ + PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject); + + /** + * Fetches all the Storage Node related alerts. + * + * @param subject subject + * @return all storage nodes alerts + */ + PageList<Alert> findAllStorageNodeAlerts(Subject subject); + /** * <p>Prepares the node for subsequent upgrade.</p> * <p> CAUTION: this method will set the RHQ server to maintenance mode, RHQ storage flushes all the data to disk * and backup of all the keyspaces is created</p> * <p>the subject needs to have <code>MANAGE_SETTINGS</code> and <code>MANAGE_INVENTORY</code> permissions.</p> - * + * * @param subject caller * @param storageNode storage node on which the prepareForUpgrade operation should be run */ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java index d4c9f78..72432db 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java @@ -20,6 +20,7 @@ package org.rhq.enterprise.server.cloud; import javax.ejb.Remote; +import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; @@ -28,7 +29,7 @@ import org.rhq.core.domain.util.PageList; /** * Remote interface to the manager responsible for creating and managing storage nodes. - * + * * @author Jirka Kremser */ @Remote @@ -36,9 +37,9 @@ public interface StorageNodeManagerRemote { /** * <p>Returns the summary of load of the storage node.</p> - * + * * <p>the subject needs to have <code>MANAGE_SETTINGS</code> permissions.</p> - * + * * @param subject user that must have proper permissions * @param node storage node entity (it can be a new object, but the id should be set properly) * @param beginTime the start time @@ -58,4 +59,19 @@ public interface StorageNodeManagerRemote { */ PageList<StorageNode> findStorageNodesByCriteria(Subject subject, StorageNodeCriteria criteria); + /** + * Fetches the list of Storage Node related alerts that have not yet been acknowledged. + * + * @param subject subject + * @return storage nodes alerts not acknowledged + */ + PageList<Alert> findNotAcknowledgedStorageNodeAlerts(Subject subject); + + /** + * Fetches all the Storage Node related alerts. + * + * @param subject subject + * @return all storage nodes alerts + */ + PageList<Alert> findAllStorageNodeAlerts(Subject subject); } commit 4674c9c66fef570a0abb3961205056fed3e75097 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Jul 11 14:58:52 2013 -0500 Update the calculation for the percentage of disk space used. The percentage now represents the amount of disk used by the Cassandra data files. diff --git a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java index dcfdc37..8995ec0 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java +++ b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java @@ -300,7 +300,7 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone AlertCondition ac = new AlertCondition(); ac.setCategory(AlertConditionCategory.THRESHOLD); ac.setComparator(">"); - ac.setThreshold(0.75D); + ac.setThreshold(0.5D); List<Integer> measurementDefinitionIds = new ArrayList<Integer>(1); for (MeasurementDefinition d : resourceType.getMetricDefinitions()) { diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java index 7281f9b..e5a2283 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java @@ -60,6 +60,8 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone private static final String OWNERSHIP_METRIC_NAME = "Ownership"; private static final String PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.PartitionDiskUsedPercentage"; private static final String DATA_FILE_LOCATIONS_NAME = "AllDataFileLocations"; + private static final String LOAD_NAME = "Load"; + private Log log = LogFactory.getLog(StorageServiceComponent.class); private InetAddress host; @@ -178,23 +180,30 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone } break; } else if (PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName())) { - EmsAttribute attribute = bean.getAttribute(DATA_FILE_LOCATIONS_NAME); - Object valueObject = attribute.refresh(); - if (valueObject instanceof String[]) { + + + EmsAttribute loadAttribute = bean.getAttribute(LOAD_NAME); + Object loadValue = loadAttribute.refresh(); + + EmsAttribute dataFileLocationAttribute = bean.getAttribute(DATA_FILE_LOCATIONS_NAME); + Object dataFileLocationValue = dataFileLocationAttribute.refresh(); + + if (loadValue != null && dataFileLocationValue != null && dataFileLocationValue instanceof String[]) { //Please visit for details: https://issues.apache.org/jira/browse/CASSANDRA-2749 //The average usage of all partitions with the data will be reported. //Cassandra selects the partition with most free space for SStable flush and compaction. - report.addData(new MeasurementDataNumeric(request, - getPartitionDiskUsedPercentage((String[]) valueObject))); + double load = Double.parseDouble(loadValue.toString()); + + report.addData(new MeasurementDataNumeric(request, getPartitionDiskUsedPercentage(load, + (String[]) dataFileLocationValue))); } } } } - private double getPartitionDiskUsedPercentage(String[] paths) { + private double getPartitionDiskUsedPercentage(double dataSize, String[] paths) { List<String> visitedMountPoints = new ArrayList<String>(); long totalDiskSpace = 0; - long totalUsedDiskSpace = 0; for (String path : paths) { try { @@ -202,7 +211,6 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone if (!visitedMountPoints.contains(fileSystemInfo.getMountPoint())) { visitedMountPoints.add(fileSystemInfo.getMountPoint()); totalDiskSpace += fileSystemInfo.getFileSystemUsage().getTotal(); - totalUsedDiskSpace += fileSystemInfo.getFileSystemUsage().getUsed(); } } catch (Exception e) { log.error("Unable to determine file system usage information for data file location " + path, e); @@ -210,7 +218,7 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone } if (totalDiskSpace != 0) { - double rawPercentage = ((double) totalUsedDiskSpace) / ((double) totalDiskSpace); + double rawPercentage = dataSize / ((double) totalDiskSpace); return Math.round(rawPercentage * 100.0) / 100.0; } diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml index 3aa701b..e6bc1da 100644 --- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml @@ -187,8 +187,8 @@ </operation> <metric property="CurrentGenerationNumber" dataType="trait" displayType="summary" description="Current generation number"/> - <metric property="Calculated.PartitionDiskUsedPercentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of total disk space used for the partition that contains the data files. - If multiple data locations are specified then this will report the average utilization accross all the partitions."/> + <metric property="Calculated.PartitionDiskUsedPercentage" displayName="Data File Disk Used Percentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of disk space used by the data files. If multiple data locations are specified then this will report + the average utilization accross all the partitions that contain data files."/> <metric property="ExceptionCount" measurementType="trendsup" dataType="measurement" displayType="summary" description="Exception Count"/> <metric property="Initialized" dataType="trait" displayType="summary" description="Initialized"/> <metric property="Joined" dataType="trait" displayType="summary" description="Joined"/>

1 0

[rhq] Changes to 'mtho11/consolidated-metrics'
by mike thompson 12 Jul '13

12 Jul '13

New branch 'mtho11/consolidated-metrics' available with the following commits: commit 5d9da9ae01c89cd847796d291bb5b2b448ef3ef6 Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Jul 11 13:45:51 2013 -0700 Consolidated Metrics sparkline treegrid. commit 75955e4041caa62fae669379ee0f4dd6bd066ae7 Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Jul 11 11:36:22 2013 -0700 CoreGui maven pom.xml made the gwt maven plugin correspond to the gwt.version as the two should always be aligned. This way, any changes in .m2/settings.xml will be set properly. commit 297f6ff0df17e9fc3edae63fc54de1c9ec677296 Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Jul 11 11:12:11 2013 -0700 Remove GFlot from coregui maven pom. commit 67d21606618c9f1a3ab9e51f3ed1ef3cecaff839 Author: Mike Thompson <mithomps(a)redhat.com> Date: Thu Jul 11 08:42:51 2013 -0700 Search - remove unnecessary logging. commit 1e8e2e5c8ad669175ee0dd1b6de703b3baa2b5c2 Merge: 289638f fd4316e Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Jul 10 10:03:04 2013 -0700 Merge master to consolidated-metrics on 7/8/13. commit 289638fee0f5eb8454c1e7b75d86407273d73cac Author: Mike Thompson <mithomps(a)redhat.com> Date: Fri Jun 28 15:54:06 2013 -0700 Add sparklines to new consolidated metrics tab. commit 07075035245b52f027b9f8d9a4065a3bfcc16083 Author: Mike Thompson <mithomps(a)redhat.com> Date: Fri Jun 28 09:45:20 2013 -0700 [BZ 958754] On Multi-resource graph, time units should have minutes when appropriate.

1 0

[rhq] etc/scripts
by John Sanda 12 Jul '13

12 Jul '13

etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) New commits: commit a1c2dcac50a7a0df8ab17898952e7fa6270dfc3b Author: John Sanda <jsanda(a)redhat.com> Date: Thu Jul 11 21:41:34 2013 -0400 use upgradesstables and not scrub command to regenerate sstables Also execute a drain operation at the end to flush all memtables and commit log to ensure no data loss prior to upgrade. diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh index 8a83320..7c0b88a 100755 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh @@ -30,24 +30,31 @@ cp $PATCH $RHQ_SERVER_DIR/rhq-storage/lib echo "Starting RHQ Storage node" $RHQ_SERVER_DIR/bin/rhqctl start --storage +# sleep for a few seconds while Cassandra starts up +echo "Waiting for RHQ Storage Node to start up..." +sleep 3 + # run the CQL script echo "Running CQL script to disable table compression" export CQLSH_HOST=$CQLSH_HOST export CQL_PORT=$CQL_PORT $RHQ_SERVER_DIR/rhq-storage/bin/cqlsh -u rhqadmin -p rhqadmin -f ./disable_compression.cql -# scrub all keyspaces +# rewrite all sstables echo "Rebuilding data files for system keyspace" -$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT scrub system +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT upgradesstables --include-all-sstables system echo "Rebuilding data files for system_traces keyspace" -$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT scrub system_traces +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT upgradesstables --include-all-sstables system_traces echo "Rebuilding data files for system_auth keyspace" -$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT scrub system_auth +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT upgradesstables --include-all-sstables system_auth echo "Rebuilding data files for rhq keyspace" -$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT scrub rhq +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT upgradesstables --include-all-sstables rhq + +# flush memtables and commit log to ensure no data loss prior to upgrade +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT drain echo "Shutting down the RHQ Storage node" $RHQ_SERVER_DIR/bin/rhqctl stop

1 0

[rhq] etc/agent-versioning modules/enterprise pom.xml
by mazz 11 Jul '13

11 Jul '13

etc/agent-versioning/build.xml | 2 modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 12 - modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.bat | 14 - modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.sh | 14 - modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 4 modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy | 4 modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java | 22 +- modules/enterprise/server/ear/pom.xml | 4 modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml | 2 modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 2 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java | 86 +++++----- modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 62 +++---- modules/enterprise/server/itests-2/src/test/resources/application.xml | 4 modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java | 10 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 10 - modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties | 2 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java | 2 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java | 2 modules/enterprise/server/startup-subsystem/pom.xml | 4 pom.xml | 2 21 files changed, 133 insertions(+), 133 deletions(-) New commits: commit 957781e62543ff5023c4b59567ee76c6ab2a9d9a Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Jul 11 17:14:48 2013 -0400 BZ 983552 shorten the deployment names of the ejb3 jar and the startup subsystem diff --git a/etc/agent-versioning/build.xml b/etc/agent-versioning/build.xml index d6c18a1..7a60e51 100644 --- a/etc/agent-versioning/build.xml +++ b/etc/agent-versioning/build.xml @@ -112,7 +112,7 @@ ant -Dserver.home.dir=/my/server/rhq-agent -Dnew.version=0.0.0.GA -Dnew.build=0 <target name="init-server"> <property name="env.RHQ_SERVER_HOME" location="dev-container"/> <property name="server.home.dir" location="${env.RHQ_SERVER_HOME}"/> - <property name="server.download.dir" location="${server.home.dir}/modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/rhq-agent"/> + <property name="server.download.dir" location="${server.home.dir}/modules/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads/rhq-agent"/> <available property="_server.download.dir.exists" file="${server.download.dir}"/> <fail unless="_server.download.dir.exists" message="Cannot find the server download directory at ${server.download.dir}"/> diff --git a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml index 6d17177..481073e 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml +++ b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> - + <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" @@ -9,7 +9,7 @@ <context-param> <param-name>resteasy.jndi.resources</param-name> - <param-value>java:app/rhq-enterprise-server-ejb3/InventorySummaryHandler,java:app/rhq-enterprise-server-ejb3/AlertDefinitionHandler,java:app/rhq-enterprise-server-ejb3/ConfigurationHistoryHandler,java:app/rhq-enterprise-server-ejb3/RecentAlertHandler,java:app/rhq-enterprise-server-ejb3/SuspectMetricHandler,java:app/rhq-enterprise-server-ejb3/DriftComplianceHandler,java:app/rhq-enterprise-server-ejb3/RecentOperationsHandler,java:app/rhq-enterprise-server-ejb3/RecentDriftHandler,java:app/rhq-enterprise-server-ejb3/PlatformUtilizationHandler</param-value> + <param-value>java:app/rhq-server/InventorySummaryHandler,java:app/rhq-server/AlertDefinitionHandler,java:app/rhq-server/ConfigurationHistoryHandler,java:app/rhq-server/RecentAlertHandler,java:app/rhq-server/SuspectMetricHandler,java:app/rhq-server/DriftComplianceHandler,java:app/rhq-server/RecentOperationsHandler,java:app/rhq-server/RecentDriftHandler,java:app/rhq-server/PlatformUtilizationHandler</param-value>  </context-param> <context-param> @@ -192,7 +192,7 @@ <servlet> <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI DriftGWTService</servlet-name> <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.DriftGWTServiceImpl</servlet-class> - </servlet> + </servlet> <servlet> <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI PlatformUtilizationGWTService</servlet-name> <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.PlatformUtilizationGWTServiceImpl</servlet-class> @@ -205,7 +205,7 @@ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI TopologyGWTService</servlet-name> <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.TopologyGWTServiceImpl</servlet-class> </servlet> - + <servlet> <servlet-name>Resteasy</servlet-name> @@ -373,7 +373,7 @@ <servlet-mapping> <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI DriftGWTService</servlet-name> <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/DriftGWTService</url-pattern> - </servlet-mapping> + </servlet-mapping> <servlet-mapping> <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI PlatformUtilizationGWTService</servlet-name> <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/PlatformUtilizationGWTService</url-pattern> @@ -398,7 +398,7 @@ </welcome-file-list> -   - <sub-deployment name="rhq-enterprise-server-ejb3.jar"> + <sub-deployment name="rhq-server.jar"> <dependencies> <module name="org.jboss.msc" export="true" /> <module name="org.jboss.as.controller" export="true" /> diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java index 284ddbd..160b5dd 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java @@ -49,7 +49,7 @@ import org.rhq.enterprise.server.installer.ServerInstallUtil.SupportedDatabaseTy */ public class InstallerServiceImpl implements InstallerService { - private static final String RHQ_EXTENSION_NAME = "org.rhq.rhq-enterprise-server-startup-subsystem"; + private static final String RHQ_EXTENSION_NAME = "org.rhq.server-startup"; private static final String RHQ_SUBSYSTEM_NAME = "rhq-startup"; private static final String EAR_NAME = "rhq.ear"; private static final String SYSPROP_PROPFILE = "rhq.server.properties-file"; diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java index 334e768..1cdc1d5 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java @@ -34,7 +34,7 @@ import org.rhq.enterprise.server.system.SystemManagerBean; import org.rhq.enterprise.server.util.LookupUtil; /** - * + * * * @author Lukas Krejci */ @@ -59,21 +59,21 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { public void testEjbsAccessibleThroughPrivilegedCode() { LookupUtil.getSubjectManager().getOverlord(); } - + public void testEjbsAccessibleThroughLocalClient() throws ScriptException, IOException { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + ScriptEngine engine = getEngine(overlord); - + engine.eval("SubjectManager.getSubjectByName('rhqadmin');"); } - + public void testLocalEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + ScriptEngine engine = getEngine(overlord); - - String jndiName = "java:global/rhq/rhq-enterprise-server-ejb3/" + + String jndiName = "java:global/rhq/rhq-server/" + SystemManagerBean.class.getSimpleName() + "!" + SystemManagerBean.class.getName().replace("Bean", "Local"); @@ -85,19 +85,19 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { + jndiName + "');\n" + "systemManager.isDebugModeEnabled();"); - + Assert.fail("The script shouldn't have been able to call local SLSB method."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); } } - + public void testLocalEjbsInaccessibleThroughJndiLookupWithCustomUrlPackages() throws ScriptException, IOException { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); ScriptEngine engine = getEngine(overlord); - String jndiName = "java:global/rhq/rhq-enterprise-server-ejb3/" + String jndiName = "java:global/rhq/rhq-server/" + SystemManagerBean.class.getSimpleName() + "!" + SystemManagerBean.class.getName().replace("Bean", "Local"); @@ -122,10 +122,10 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { public void testRemoteEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + ScriptEngine engine = getEngine(overlord); - String jndiName = "java:global/rhq/rhq-enterprise-server-ejb3/" + String jndiName = "java:global/rhq/rhq-server/" + SystemManagerBean.class.getSimpleName() + "!" + SystemManagerBean.class.getName().replace("Bean", "Remote"); @@ -137,28 +137,28 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { + jndiName + "');\n" + "systemManager.getSystemSettings(subject);"); - + Assert.fail("The script shouldn't have been able to call remote SLSB method directly."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); } } - + public void testScriptCantUseSessionManagerMethods() throws Exception { - Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + final ScriptEngine engine = getEngine(overlord); - + class G { private String sessionManager = "" + "org.rhq.enterprise.server.auth.SessionManager.getInstance()."; - + public void testInvoke(String methodCall) throws ScriptException { String code = sessionManager + methodCall; try { - engine.eval(code); + engine.eval(code); Assert.fail("The script shouldn't have been able to call a method on a SessionManager: " + methodCall); } catch (ScriptException e) { checkIsDesiredSecurityException(e); @@ -166,7 +166,7 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { } }; G manager = new G(); - + manager.testInvoke("getLastAccess(0);"); manager.testInvoke("getOverlord()"); manager.testInvoke("getSubject(2);"); @@ -175,27 +175,27 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { manager.testInvoke("put(new org.rhq.core.domain.auth.Subject());"); manager.testInvoke("put(new org.rhq.core.domain.auth.Subject(), 0);"); } - + public void testScriptCantObtainRawJDBCConnectionsWithoutCredentials() throws Exception { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + ScriptEngine engine = getEngine(overlord); - + try { engine.eval("" + "var ctx = new javax.naming.InitialContext();\n" + "var datasource = ctx.lookup('" + RHQConstants.DATASOURCE_JNDI_NAME + "');\n" + "con = datasource.getConnection();"); - + Assert.fail("The script shouldn't have been able to obtain the datasource from the JNDI."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); } } - + public void testScriptCantUseEntityManager() throws Exception { - Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + ScriptEngine engine = getEngine(overlord); try { @@ -204,12 +204,12 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { + "var entityManagerFactory = ctx.lookup('" + RHQConstants.ENTITY_MANAGER_JNDI_NAME + "');\n" + "var entityManager = entityManagerFactory.createEntityManager();\n" + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));"); - + Assert.fail("The script shouldn't have been able to use the EntityManager."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); - } - + } + //try harder with manually specifying the initial context factory try { engine.eval("" @@ -220,20 +220,20 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { + "var entityManagerFactory = ctx.lookup('" + RHQConstants.ENTITY_MANAGER_JNDI_NAME + "');\n" + "var entityManager = entityManagerFactory.createEntityManager();\n" + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));"); - + Assert.fail("The script shouldn't have been able to use the EntityManager even using custom initial context factory."); } catch (ScriptException e) { checkIsDesiredSecurityException(e); - } + } } public void testProxyFactoryWorksWithSecuredScriptEngine() throws Exception { - Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + ScriptEngine engine = getEngine(overlord); - + try { - engine.eval("var resource = ProxyFactory.getResource(10001);"); + engine.eval("var resource = ProxyFactory.getResource(10001);"); } catch (ScriptException e) { //if the script fails (there is no resource with ID 10001) //it should not be because of an access control exception @@ -243,10 +243,10 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { //THIS IS A NEW REQUIREMENT THAT DOESN'T CURRENTLY WORK... // public void testInitialContextFactoryBuilderNotReplaceableUsingScripts() throws Exception { - // Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - // + // Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + // // ScriptEngine engine = getEngine(overlord); - // + // // try { // engine.eval("" // + "var mgrCls = java.lang.Class.forName('javax.naming.spi.NamingManager');\n" @@ -262,11 +262,11 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { // NamingHack.bruteForceInitialContextFactoryBuilder(); // } // } - + private static void checkIsDesiredSecurityException(ScriptException e) { String message = e.getMessage(); String permissionTrace = "org.rhq.allow.server.internals.access"; - + if (!message.contains(permissionTrace)) { Assert .fail( @@ -278,7 +278,7 @@ public class JndiAccessTest extends ScriptableAbstractEJB3Test { private static void checkIsNotASecurityException(ScriptException e) { String message = e.getMessage(); String permissionTrace = "org.rhq.allow.server.internals.access"; - + if (message.contains(permissionTrace)) { Assert .fail( diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java index 9ddba97..4dfbd46 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java @@ -124,20 +124,20 @@ public abstract class AbstractEJB3Test extends Arquillian { // we need a way to deploy dependent ears needed to support the server/jar classes. But // building this jar up (as is done in core/domain) was too difficult due to the huge number // of dependencies. It was easier, and made sense, to use the already built rhq.ear - // and run as true integration tests. We do thin rhq.ear by removing all of the WAR files, and + // and run as true integration tests. We do thin rhq.ear by removing all of the WAR files, and // deploy only the EJB jars, and the services, which are really the objects under test. @Deployment protected static EnterpriseArchive getBaseDeployment() { - // Ensure the test working dir exists + // Ensure the test working dir exists tmpdirRoot.mkdirs(); // deploy the test classes in their own jar, under /lib JavaArchive testClassesJar = ShrinkWrap.create(JavaArchive.class, "test-classes.jar"); testClassesJar = addClasses(testClassesJar, new File("target/test-classes/org"), null); - // add non itests-2 RHQ classes used by the test classes, as well as needed resources + // add non itests-2 RHQ classes used by the test classes, as well as needed resources testClassesJar.addClass(ThrowableUtil.class); testClassesJar.addClass(MessageDigestGenerator.class); testClassesJar.addClass(StreamUtil.class); @@ -340,22 +340,22 @@ public abstract class AbstractEJB3Test extends Arquillian { .withoutTransitivity().asSingle(EnterpriseArchive.class); // merge rhq.ear into testEar but include only the EJB jars and the supporting libraries. Note that we // don't include the services sar because tests are responsible for prepare/unprepare of all required services, - // we don't want the production services performing any unexpected work. + // we don't want the production services performing any unexpected work. testEar = testEar.merge(rhqEar, Filters.include("/lib.*|/rhq.*ejb3\\.jar.*")); // remove startup beans and shutdown listeners, we don't want this to be a full server deployment. The tests // start/stop what they need, typically with test services or mocks. testEar.delete(ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/core/StartupBean.class")); + .create("/rhq-server.jar/org/rhq/enterprise/server/core/StartupBean.class")); testEar.delete(ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/core/StartupBean$1.class")); + .create("/rhq-server.jar/org/rhq/enterprise/server/core/StartupBean$1.class")); testEar.delete(ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/core/ShutdownListener.class")); + .create("/rhq-server.jar/org/rhq/enterprise/server/core/ShutdownListener.class")); //replace the above startup beans with stripped down versions testEar.add(new ClassAsset(StrippedDownStartupBean.class), ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/test/StrippedDownStartupBean.class")); + .create("/rhq-server.jar/org/rhq/enterprise/server/test/StrippedDownStartupBean.class")); testEar.add(new ClassAsset(StrippedDownStartupBeanPreparation.class), ArchivePaths - .create("/rhq-enterprise-server-ejb3.jar/org/rhq/enterprise/server/test/" + .create("/rhq-server.jar/org/rhq/enterprise/server/test/" + "StrippedDownStartupBeanPreparation.class")); testEar.addAsManifestResource(new ByteArrayAsset("<beans/>".getBytes()), ArchivePaths.create("beans.xml")); @@ -368,7 +368,7 @@ public abstract class AbstractEJB3Test extends Arquillian { // add the application xml declaring the ejb jars testEar.setApplicationXML("application.xml"); - // add additional 3rd party dependent jars needed to support test classes + // add additional 3rd party dependent jars needed to support test classes Collection thirdPartyDeps = new ArrayList(); thirdPartyDeps.add("joda-time:joda-time"); thirdPartyDeps.add("org.jboss.shrinkwrap:shrinkwrap-impl-base"); @@ -496,15 +496,15 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * <p>DO NOT OVERRIDE.</p> * <p>DO NOT DEFINE AN @BeforeMethod</p> - * + * * Instead, override {@link #beforeMethod()}. If you must override, for example, if you * need to use special attributes on your annotation, then ensure you protect the code with * and {@link #inContainer()} call. */ @BeforeMethod protected void __beforeMethod(Method method) throws Throwable { - // Note that Arquillian calls the testng BeforeMethod twice (as of 1.0.2.Final, once - // out of container and once in container. In general the expectation is to execute it + // Note that Arquillian calls the testng BeforeMethod twice (as of 1.0.2.Final, once + // out of container and once in container. In general the expectation is to execute it // one time, and doing it in container allows for the expected injections and context. if (inContainer()) { try { @@ -539,7 +539,7 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * <p>DO NOT OVERRIDE.</p> * <p>DO NOT DEFINE AN @AfterMethod</p> - * + * * Instead, override {@link #afterMethod()}. */ @AfterMethod(alwaysRun = true) @@ -559,33 +559,33 @@ public abstract class AbstractEJB3Test extends Arquillian { } protected boolean inContainer() { - // If the injection is done we're running in the container. + // If the injection is done we're running in the container. return (null != initialContext); } /** - * Override Point! Do not implement a @BeforeMethod, instead override this method. + * Override Point! Do not implement a @BeforeMethod, instead override this method. */ protected void beforeMethod() throws Exception { // do nothing if we're not overridden } /** - * Override Point! Do not implement a @BeforeMethod, instead override this method. + * Override Point! Do not implement a @BeforeMethod, instead override this method. */ protected void beforeMethod(Method method) throws Exception { // do nothing if we're not overridden } /** - * Override Point! Do not implement an @AfterMethod, instead override this method. note: alwaysRun=true + * Override Point! Do not implement an @AfterMethod, instead override this method. note: alwaysRun=true */ protected void afterMethod() throws Exception { // do nothing if we're not overridden } /** - * Override Point! Do not implement an @AfterMethod, instead override this method. note: alwaysRun=true + * Override Point! Do not implement an @AfterMethod, instead override this method. note: alwaysRun=true */ protected void afterMethod(ITestResult result, Method meth) throws Exception { // do nothing if we're not overridden @@ -706,7 +706,7 @@ public abstract class AbstractEJB3Test extends Arquillian { } /* The old AbstractEJB3Test impl extended AssertJUnit. Continue to support the used methods - * with various call-thru methods. + * with various call-thru methods. */ protected void assertNotNull(Object o) { @@ -1020,7 +1020,7 @@ public abstract class AbstractEJB3Test extends Arquillian { scanner.setAgentPluginDir(pluginDirPath); // we don't want to scan for these scanner.setServerPluginDir("ignore no plugins here"); // we don't want to scan for these scanner.setUserPluginDir("ignore no plugins here"); // we don't want to scan for these - scanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen + scanner.setScanPeriod("9999999"); // we want to manually scan - don't allow for auto-scan to happen return preparePluginScannerService(scanner); } @@ -1028,7 +1028,7 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * Note that the standard plugin scanner service is deployed automatically with the test rhq ear, * this is only necessary if you want a custom service. - * + * * @param scannerService */ public PluginDeploymentScannerMBean preparePluginScannerService(PluginDeploymentScannerMBean scannerService) { @@ -1072,7 +1072,7 @@ public abstract class AbstractEJB3Test extends Arquillian { * annotations by creating sessions for different users with different permissions. * * @param subject a JON subject - * @return the session activated subject, a copy of the subject passed in. + * @return the session activated subject, a copy of the subject passed in. */ public Subject createSession(Subject subject) { return SessionManager.getInstance().put(subject); @@ -1086,9 +1086,9 @@ public abstract class AbstractEJB3Test extends Arquillian { * A utility for writing out various objects that need to be persisted for use between * tests. Arquillian (1.0.2) basically "new"s the testng test class on each test, so instance * variables can not be used between tests. Instead, the db or this mechanism needs to be used. - * + * * The file will be placed in the standard temp dir. If it already exists it will be replaced. - * + * * @param filename Do not include the directory. The value will be prepended with the class name. * @param objects * @throws Exception @@ -1106,9 +1106,9 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * A utility for reading in objects written with {@link #writeObjects(String, Object...). They are * placed in the result List in the same order they were written. - * + * * @param filename The same filename used in the write. Do not include the directory. - * @param numObjects the number of objects to read out. Can be less than total written, not greater. + * @param numObjects the number of objects to read out. Can be less than total written, not greater. * @throws Exception */ protected List<Object> readObjects(String filename, int numObjects) throws Exception { @@ -1130,16 +1130,16 @@ public abstract class AbstractEJB3Test extends Arquillian { /** * A utility for cleaning up files created with {@link #writeObjects(String, Object...). - * - * @param filename The same filename used in the write. Do not include the directory. - * @return true if deleted, false otherwise. + * + * @param filename The same filename used in the write. Do not include the directory. + * @return true if deleted, false otherwise. */ protected boolean deleteObjects(String filename) { File file = new File(getTempDir(), filename); return file.delete(); } - /** + /** * @return a temp directory for testing that is specific to this test class. Specifically tmpdirRoot/this.getClass().getSimpleName(). */ public File getTempDir() { diff --git a/modules/enterprise/server/itests-2/src/test/resources/application.xml b/modules/enterprise/server/itests-2/src/test/resources/application.xml index 06b81e6..e28f755 100644 --- a/modules/enterprise/server/itests-2/src/test/resources/application.xml +++ b/modules/enterprise/server/itests-2/src/test/resources/application.xml @@ -6,6 +6,6 @@ <ejb>rhq-core-domain-ejb3.jar</ejb> </module> <module> - <ejb>rhq-enterprise-server-ejb3.jar</ejb> - </module> + <ejb>rhq-server.jar</ejb> + </module> </application> \ No newline at end of file diff --git a/modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml b/modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml index 48a80f2..1b5ceb9 100644 --- a/modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml +++ b/modules/enterprise/server/itests-2/src/test/resources/jboss-deployment-structure.xml @@ -20,7 +20,7 @@ </deployment>  - <sub-deployment name="rhq-enterprise-server-ejb3.jar"> + <sub-deployment name="rhq-server.jar"> <dependencies> <module name="org.jboss.msc" export="true" /> <module name="org.jboss.as.controller" export="true" /> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java index 3a435ef..2602cf8 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java @@ -44,8 +44,8 @@ import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility; * Although, we execute only locals to bypass the serialization performed by a remote invocation. Even * though this handler is co-located, for remotes, remoting will serialize the return data immediately. * This is bad for us because since we return domain objects we ned to scrub the data, removing - * hibernate proxies (see {@link HibernateDetachUtility}. - * + * hibernate proxies (see {@link HibernateDetachUtility}. + * * @author Greg Hinkle * @autor Jay Shaughnessy */ @@ -103,7 +103,7 @@ public class RemoteSafeInvocationHandler implements ServerInvocationHandler { Object target = ic.lookup(jndiName); Method m = target.getClass().getMethod(methodInfo[1], sig); - // switch to the local + // switch to the local jndiName = getLocalJNDIName(remoteClass); target = ic.lookup(jndiName); @@ -146,12 +146,12 @@ public class RemoteSafeInvocationHandler implements ServerInvocationHandler { } private static <T> String getLocalJNDIName(Class<?> remoteClass) { - return ("java:global/rhq/rhq-enterprise-server-ejb3/" + remoteClass.getSimpleName().replace("Remote", "Bean") + return ("java:global/rhq/rhq-server/" + remoteClass.getSimpleName().replace("Remote", "Bean") + "!" + remoteClass.getName().replace("Remote", "Local")); } private static <T> String getRemoteJNDIName(Class<?> remoteClass) { - return ("java:global/rhq/rhq-enterprise-server-ejb3/" + remoteClass.getSimpleName().replace("Remote", "Bean") + return ("java:global/rhq/rhq-server/" + remoteClass.getSimpleName().replace("Remote", "Bean") + "!" + remoteClass.getName()); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java index 7b60e13..d597363 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java @@ -482,7 +482,7 @@ public final class LookupUtil { public static TopologyManagerLocal getTopologyManager() { return lookupLocal(TopologyManagerBean.class); } - + public static StorageNodeManagerLocal getStorageNodeManager() { return lookupLocal(StorageNodeManagerBean.class); } @@ -636,10 +636,10 @@ public final class LookupUtil { /** * Generic method to lookup an Ejb bean by name and the interface name - * + * * @param beanName the name of the EJB bean * @param interfaceName the full class name of either the remote or local interface - * + * * @return the bean accessed through specified interface */ public static Object getEjb(String beanName, String interfaceName) { @@ -656,7 +656,7 @@ public final class LookupUtil { // Private Methods private static String getLocalJNDIName(String beanName, String interfaceName) { - return "java:global/rhq/rhq-enterprise-server-ejb3/" + beanName + "!" + interfaceName; + return "java:global/rhq/rhq-server/" + beanName + "!" + interfaceName; } private static <T> String getLocalJNDIName(@NotNull @@ -673,7 +673,7 @@ public final class LookupUtil { */ private static <T> String getRemoteJNDIName(@NotNull Class<? extends T> beanClass) { - return ("java:global/rhq/rhq-enterprise-server-ejb3/" + beanClass.getSimpleName() + "!" + beanClass.getName() + return ("java:global/rhq/rhq-server/" + beanClass.getSimpleName() + "!" + beanClass.getName() .replace("Bean", "Remote")); } diff --git a/modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties b/modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties index 91ccc85..f529be9 100644 --- a/modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties +++ b/modules/enterprise/server/jar/src/main/resources/server-comm-configuration-overrides.properties @@ -1,5 +1,5 @@ # location of the plugin jars and other files agents can download directly from sever -rhq.server.agent-files-directory=${rhq.server.home}/modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads +rhq.server.agent-files-directory=${rhq.server.home}/modules/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads # location where data files can be stored rhq.communications.data-directory=${jboss.server.data.dir} # global limit on number of concurrent incoming messages allowed diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java index df07b5a..bb6aa40 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java @@ -354,7 +354,7 @@ public class Install extends AbstractInstall { private File getAgentInstaller() { File agentDownloadDir = new File(getBaseDir(), - "modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/rhq-agent"); + "modules/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads/rhq-agent"); return agentDownloadDir.listFiles(new FileFilter() { @Override public boolean accept(File file) { diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java index 37667c6..9245baf 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java @@ -571,7 +571,7 @@ public class Upgrade extends AbstractInstall { private File getFileDownload(String directory, final String fileMatch) { File downloadDir = new File(getBaseDir(), - "modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/" + "modules/org/rhq/server-startup/main/deployments/rhq.ear/rhq-downloads/" + directory); return downloadDir.listFiles(new FileFilter() { @Override diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index 3b5b2ba..e69df2e 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -13,7 +13,7 @@ <relativePath>../../../../pom.xml</relativePath> </parent> - <artifactId>rhq-enterprise-server-startup-subsystem</artifactId> + <artifactId>server-startup</artifactId> <name>RHQ Server Startup AS7 Subsystem</name> @@ -106,7 +106,7 @@ <artifactId>jboss-as-ee</artifactId> <scope>provided</scope> </dependency> - +  <dependency> <groupId>org.rhq</groupId> diff --git a/pom.xml b/pom.xml index d52dcc7..26703d1 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ <rhq.defaultDevContainerPath>dev-container</rhq.defaultDevContainerPath> <rhq.devContainerServerPath>${rhq.defaultDevContainerPath}/rhq-server</rhq.devContainerServerPath>  - <rhq.earDeployDir>modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/${rhq.earName}</rhq.earDeployDir> + <rhq.earDeployDir>modules/org/rhq/server-startup/main/deployments/${rhq.earName}</rhq.earDeployDir>  <rhq.agentPluginDir>${rhq.earDeployDir}/rhq-downloads/rhq-plugins</rhq.agentPluginDir> <rhq.serverPluginDir>${rhq.earDeployDir}/rhq-serverplugins</rhq.serverPluginDir>

1 0

[rhq] .classpath
by mazz 11 Jul '13

11 Jul '13

.classpath | 1 + 1 file changed, 1 insertion(+) New commits: commit d3336fcd24c36f257a0702b13114b95146d44d83 Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Jul 11 14:04:39 2013 -0400 cassandra-installer uses a commons-io 2.1 API, we need to put this up front in classpath in eclipse diff --git a/.classpath b/.classpath index f09f8ed..e5e7a21 100644 --- a/.classpath +++ b/.classpath @@ -217,6 +217,7 @@ <classpathentry kind="src" path="modules/enterprise/server/data-migration/src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.2.3/httpclient-4.2.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.2.3/httpclient-4.2.3-sources.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/commons-io/commons-io/2.1/commons-io-2.1.jar" sourcepath="M2_REPO/commons-io/commons-io/2.1/commons-io-2.1-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.2.2/httpcore-4.2.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.2.2/httpcore-4.2.2-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.2.3/httpmime-4.2.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpmime/4.2.3/httpmime-4.2.3-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.SP1/jboss-profileservice-spi-5.1.0.SP1.jar"/>

1 0

[rhq] modules/plugins
by Remy Maucherat 11 Jul '13

11 Jul '13

modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java | 41 ++++++---- 1 file changed, 26 insertions(+), 15 deletions(-) New commits: commit 794d564b16b697870ca92040f27acbcdcad63522 Author: Rémy Maucherat <rmaucher(a)redhat.com> Date: Thu Jul 11 15:33:55 2013 +0200 BZ863502: Fix OOM connecting to Tomcat instance. Patch by Thomas Segismont. diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java index f1e2c51..1b595db 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.jboss.on.plugins.tomcat; @@ -195,10 +191,9 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM // to have a version compatible local install and set the install path to the local path, even though // the server url was remote. String catalinaHome = pluginConfig.getSimpleValue(PLUGIN_CONFIG_CATALINA_HOME_PATH, null); - boolean hasLocalJars = new File(catalinaHome).isDirectory(); - - if (hasLocalJars) { - connectionSettings.setLibraryURI(catalinaHome); + File libDir = getLibDir(catalinaHome); + if (libDir != null) { + connectionSettings.setLibraryURI(libDir.getAbsolutePath()); connectionFactory.discoverServerClasses(connectionSettings); // Tell EMS to make copies of jar files so that the ems classloader doesn't lock @@ -276,6 +271,22 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM return connection; } + private File getLibDir(String catalinaHome) { + if (catalinaHome != null) { + // Tomcat 6 and Tomcat 7 have Catalina JARS in CATALINA_HOME/lib + File libDir = new File(catalinaHome, "lib"); + if (libDir.isDirectory()) { + return libDir; + } + // Tomcat 5.5 has Catalina JARS in CATALINA_HOME/server/lib + libDir = new File(catalinaHome, "server" + File.separator + "lib"); + if (libDir.isDirectory()) { + return libDir; + } + } + return null; + } + public Configuration getPluginConfiguration() { return resourceContext.getPluginConfiguration(); } @@ -485,4 +496,4 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM operationParameters.put(shutdownScriptEnv); } } -} \ No newline at end of file +}

1 0

[rhq] modules/plugins
by Thomas Segismont 11 Jul '13

11 Jul '13

modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 105 ++++------ 1 file changed, 50 insertions(+), 55 deletions(-) New commits: commit 6b054aa471107a3894fc45ea2ed97c7f8615562f Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jul 11 15:29:55 2013 +0200 Improve CassandraNodeComponent availability check performance. Keep a reference of the ProcessInfo instance and get a new one only if needed. diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 90afafb..0037bfe 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -1,30 +1,25 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.plugins.cassandra; -import static org.rhq.core.domain.measurement.AvailabilityType.DOWN; -import static org.rhq.core.domain.measurement.AvailabilityType.UNKNOWN; -import static org.rhq.core.domain.measurement.AvailabilityType.UP; +import static java.util.concurrent.TimeUnit.NANOSECONDS; +import static java.util.concurrent.TimeUnit.SECONDS; import static org.rhq.core.system.OperatingSystemType.WINDOWS; import java.io.File; @@ -65,6 +60,7 @@ import org.rhq.core.pluginapi.util.ProcessExecutionUtility; import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.ProcessInfo; +import org.rhq.core.system.ProcessInfo.ProcessInfoSnapshot; import org.rhq.core.system.SystemInfo; import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; @@ -75,17 +71,19 @@ import org.rhq.plugins.jmx.JMXServerComponent; * @author John Sanda */ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent<?>> implements OperationFacet { - - private Log log = LogFactory.getLog(CassandraNodeComponent.class); + private static final Log LOG = LogFactory.getLog(CassandraNodeComponent.class); private Session cassandraSession; private String host; + private ProcessInfo processInfo; @SuppressWarnings("rawtypes") @Override public void start(ResourceContext context) throws Exception { super.start(context); + processInfo = context.getNativeProcess(); + host = context.getPluginConfiguration().getSimpleValue("host", "localhost"); String clusterName = context.getPluginConfiguration().getSimpleValue("clusterName", "unknown"); String username = context.getPluginConfiguration().getSimpleValue("username", "cassandra"); @@ -98,7 +96,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent nativePort = Integer.parseInt(context.getPluginConfiguration() .getSimpleValue("nativeTransportPort", "9042")); } catch (Exception e) { - log.debug("Native transport port parsing failed...", e); + LOG.debug("Native transport port parsing failed...", e); } @@ -115,42 +113,39 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent this.cassandraSession = clusterBuilder.build().connect(clusterName); } catch (Exception e) { - log.error("Connect to Cassandra " + host + ":" + nativePort, e); + LOG.error("Connect to Cassandra " + host + ":" + nativePort, e); throw e; } }; @Override public void stop() { - log.info("Shutting down Cassandra client"); + processInfo = null; + LOG.info("Shutting down Cassandra client"); cassandraSession.getCluster().shutdown(); - log.info("Shutdown is complete"); + LOG.info("Shutdown is complete"); } @Override public AvailabilityType getAvailability() { - long start = System.currentTimeMillis(); + long start = System.nanoTime(); try { - ResourceContext<?> context = getResourceContext(); - ProcessInfo processInfo = context.getNativeProcess(); - - if (processInfo == null) { - return UNKNOWN; - } else { - // It is safe to read prior snapshot as getNativeProcess always return a fresh instance - // ProcessInfoSnapshot processInfoSnaphot = processInfo.freshSnapshot(); - if (processInfo.priorSnaphot().isRunning()) { - return UP; - } else { - return DOWN; - } + // Get a fresh snapshot of the process + ProcessInfoSnapshot processInfoSnapshot = (processInfo == null) ? null : processInfo.freshSnapshot(); + if (processInfoSnapshot == null || !processInfoSnapshot.isRunning()) { + processInfo = getResourceContext().getNativeProcess(); + // Safe to get prior snapshot here, we've just recreated the process info instance + processInfoSnapshot = (processInfo == null) ? null : processInfo.priorSnaphot(); } + return (processInfoSnapshot != null && processInfoSnapshot.isRunning()) ? AvailabilityType.UP + : AvailabilityType.DOWN; } finally { - long end = System.currentTimeMillis(); - long totalTime = end - start; - log.debug("Finished availability check in " + totalTime + " ms"); - if (totalTime > (1000 * 5)) { - log.warn("Availability check exceeded five seconds. Total time was " + totalTime + " ms"); + long totalTimeMillis = NANOSECONDS.toMillis(System.nanoTime() - start); + if (LOG.isDebugEnabled()) { + LOG.debug("Finished availability check in " + totalTimeMillis + " ms"); + } + if (totalTimeMillis > SECONDS.toMillis(5)) { + LOG.warn("Availability check exceeded five seconds. Total time was " + totalTimeMillis + " ms"); } } } @@ -175,28 +170,28 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent protected OperationResult shutdownNode() { ResourceContext<?> context = getResourceContext(); - if (log.isInfoEnabled()) { - log.info("Starting shutdown operation on " + CassandraNodeComponent.class.getName() + + if (LOG.isInfoEnabled()) { + LOG.info("Starting shutdown operation on " + CassandraNodeComponent.class.getName() + " with resource key " + context.getResourceKey()); } EmsConnection emsConnection = getEmsConnection(); EmsBean storageService = emsConnection.getBean("org.apache.cassandra.db:type=StorageService"); Class[] emptyParams = new Class[0]; - if (log.isDebugEnabled()) { - log.debug("Disabling thrift..."); + if (LOG.isDebugEnabled()) { + LOG.debug("Disabling thrift..."); } EmsOperation operation = storageService.getOperation("stopRPCServer", emptyParams); operation.invoke((Object[]) emptyParams); - if (log.isDebugEnabled()) { - log.debug("Disabling gossip..."); + if (LOG.isDebugEnabled()) { + LOG.debug("Disabling gossip..."); } operation = storageService.getOperation("stopGossiping", emptyParams); operation.invoke((Object[]) emptyParams); - if (log.isDebugEnabled()) { - log.debug("Initiating drain..."); + if (LOG.isDebugEnabled()) { + LOG.debug("Initiating drain..."); } operation = storageService.getOperation("drain", emptyParams); operation.invoke((Object[]) emptyParams); @@ -207,7 +202,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent process.kill("KILL"); return new OperationResult("Successfully shut down Cassandra daemon with pid " + pid); } catch (SigarException e) { - log.warn("Failed to shut down Cassandra node with pid " + pid, e); + LOG.warn("Failed to shut down Cassandra node with pid " + pid, e); OperationResult failure = new OperationResult("Failed to shut down Cassandra node with pid " + pid); failure.setErrorMessage(ThrowableUtil.getAllMessages(e)); return failure; @@ -256,7 +251,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent try { updateSeedsList(addresses); } catch (Exception e) { - log.error("An error occurred while updating the seeds list property", e); + LOG.error("An error occurred while updating the seeds list property", e); Throwable rootCause = ThrowableUtil.getRootCause(e); result.setErrorMessage(ThrowableUtil.getStackAsString(rootCause)); } @@ -277,7 +272,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent try { addresses = convertToIPAddresses(seeds); } catch (UnknownHostException e) { - log.error("Failed to update seeds list", e); + LOG.error("Failed to update seeds list", e); throw new IOException("Failed to update seeds list. Make sure that " + seeds + " is a list of valid " + "hostnames or IP addresses that can be resolved.", e); } @@ -329,7 +324,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent if (!yamlFile.delete()) { String msg = "Failed to delete [" + yamlFile + "] in preparation of writing updated configuration. The " + "changes will be aborted."; - log.error(msg); + LOG.error(msg); deleteYamlBackupFile(yamlFileBackup); throw new IOException(msg); } @@ -339,8 +334,8 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent yaml.dump(cassandraConfig, writer); deleteYamlBackupFile(yamlFileBackup); } catch (Exception e) { - log.error("An error occurred while trying to write the updated configuration back to " + yamlFile, e); - log.error("Reverting changes to " + yamlFile); + LOG.error("An error occurred while trying to write the updated configuration back to " + yamlFile, e); + LOG.error("Reverting changes to " + yamlFile); if (yamlFile.delete()) { StreamUtil.copy(new FileInputStream(yamlFileBackup), new FileOutputStream(yamlFile)); @@ -348,7 +343,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } else { String msg = "Failed updates to " + yamlFile.getName() + " cannot be rolled back. The file cannot be " + "deleted. " + yamlFile + " should be replaced by " + yamlFileBackup; - log.error(msg); + LOG.error(msg); throw new IOException(msg); } } finally { @@ -367,8 +362,8 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent private void deleteYamlBackupFile(File yamlBackup) { if (!yamlBackup.delete()) { - log.warn("Failed to delete Cassandra configuration backup file [" + yamlBackup + "]. This file " + - "should be deleted."); + LOG.warn("Failed to delete Cassandra configuration backup file [" + yamlBackup + "]. This file " + + "should be deleted."); } }

1 0

[rhq] etc/scripts
by John Sanda 11 Jul '13

11 Jul '13

etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 3f21a52f2eeef0e5b46f9002980e158ff26f21d9 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Jul 11 09:18:02 2013 -0400 don't use $TMPDIR since it might not be defined on all platforms diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh index 947155f..8a83320 100755 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh @@ -23,7 +23,7 @@ PATCH="apache-cassandra-1.2.4-patch-1.jar" # swap out the Cassandra jar file with the patched version echo "Copying patch file to $RHQ_SERVER_DIR/rhq-storage/lib" -mv $RHQ_SERVER_DIR/rhq-storage/lib/apache-cassandra-1.2.4.jar $TMPDIR +mv $RHQ_SERVER_DIR/rhq-storage/lib/apache-cassandra-1.2.4.jar . cp $PATCH $RHQ_SERVER_DIR/rhq-storage/lib # restart the storage node @@ -54,6 +54,6 @@ $RHQ_SERVER_DIR/bin/rhqctl stop echo "Removing patch file" rm $RHQ_SERVER_DIR/rhq-storage/lib/$PATCH -mv $TMPDIR/apache-cassandra-1.2.4.jar $RHQ_SERVER_DIR/rhq-storage/lib +mv ./apache-cassandra-1.2.4.jar $RHQ_SERVER_DIR/rhq-storage/lib echo "Table compression has been disabled for all keyspaces. You are now ready to upgrade your RHQ installation."

1 0

[rhq] modules/enterprise
by Heiko W. Rupp 11 Jul '13

11 Jul '13

modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java | 10 ++++-- modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml | 16 +++++----- 2 files changed, 15 insertions(+), 11 deletions(-) New commits: commit 9356e5fe02c664fc758376166a95ed4b85a603cb Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Jul 11 11:19:45 2013 +0200 BZ 966294 Further improvements. Also work around BZ 983275 diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java index 7b174cc..296696c 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java +++ b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java @@ -37,6 +37,7 @@ public class SnmpInfo { // Default remote port for SNMP trap static final String DEFAULT_PORT = "162"; + private static final String DEFAULT_RHQ_BINDING = "1.3.6.1.4.1.18016.2.1"; final public String host; final public String port; @@ -84,8 +85,11 @@ public class SnmpInfo { if (host==null || host.isEmpty()) { host = preferences.getSimpleValue("defaultTargetHost",null); } - String port = configuration.getSimpleValue(PARAM_PORT, DEFAULT_PORT); - String oid = configuration.getSimpleValue(PARAM_VARIABLE_BINDING_PREFIX, null); // required + String port = configuration.getSimpleValue(PARAM_PORT, null); + if (port==null||port.isEmpty()) { + port = preferences.getSimpleValue("defaultPort",DEFAULT_PORT); + } + String oid = configuration.getSimpleValue(PARAM_VARIABLE_BINDING_PREFIX, DEFAULT_RHQ_BINDING); // required String trapOid = configuration.getSimpleValue(PARAM_TRAP_OID, null); return new SnmpInfo(host, port, oid, trapOid); @@ -94,7 +98,7 @@ public class SnmpInfo { @Override public String toString() { String hostString = (host == null ? "UnknownHost" : host); - String oidString = (oid == null ? "UnknownOID" : oid); + String oidString = (oid == null ? "Unknown Binding Prefix" : oid); String trapOidString = (trapOid == null ? "DefaultTrapOID" : trapOid); return hostString + ":" + port + " (" + oidString + ") (" + trapOidString + ")"; } diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml b/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml index 3f7a35c..8e2a4cc 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml +++ b/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml @@ -25,7 +25,7 @@ </c:property-options> </c:simple-property> - <c:simple-property name="defaultTargetHost" displayName="Default trap target host" required="false"/> + <c:simple-property name="defaultTargetHost" displayName="Default trap target host" required="false" default="localhost"/> <c:simple-property name="defaultPort" displayName="Default trap target port" required="false" type="integer" default="162" defaultValue="162"/> <c:simple-property name="transport" defaultValue="UDP"> @@ -35,7 +35,7 @@ </c:property-options> </c:simple-property> - <c:simple-property name="trapOid" displayName="Trap OID" description="OID for the trap sent" type="string" + <c:simple-property name="trapOid" displayName="Trap OID" description="OID of the trap sent" type="string" default="1.3.6.1.4.1.18016.2.1.2.0.1"/> <c:simple-property name="community" type="string" default="public" description="Community - v1 and v2c only" required="false"/> @@ -43,10 +43,10 @@ <c:simple-property name="genericId" required="false" default="6" type="integer" description="Set the generic trap type. Default is 6 (=Enterprise specific)."/> - <c:simple-property name="enterpriseOid" required="false" default="1.3.6.1.4.1.18016.2.3" + <c:simple-property name="specificId" required="false" default="0" type="integer" + description="Enterprise-specific ID of the trap. If this is set, the generic ID must be set to 6."/> + <c:simple-property name="enterpriseOid" required="false" default="1.3.6.1.4.1.18016.2.3" description="OID of the sender, identifies the type of managed object generating the trap. Default is enterprise.jboss.rhq.rhqServer"/> - <c:simple-property name="specificId" required="false" default="0" type="integer" - description="Enterprise-specific ID of the trap. If this is set, the generic ID must be set to 6."/> <c:simple-property name="agentAddress" description="Address of our SNMP agent (=the RHQ server)" required="false"/> </c:group> <!-- @@ -91,7 +91,7 @@ sender-wide preferences"/> <c:simple-property name="port" type="integer" required="false" default="162" description="Trap target port"/> <c:simple-property name="oid" displayName="Variable bindings prefix" type="string" required="true" - defaultValue="1.3.6.1.4.1.18016.2.1"> + defaultValue="1.3.6.1.4.1.18016.2.1" default="1.3.6.1.4.1.18016.2.1"> <c:description> <![CDATA[ <p>RHQ will send alert notification details as a list of variable bindings in the @@ -103,11 +103,11 @@ <c:simple-property name="trapOid" required="false"> <c:description> <![CDATA[ - <p>If set, the value of this paramater will override the value of the Trap Oid parameter defined globally + <p>If set, the value of this parameter will override the value of the Trap Oid parameter defined globally in the server plugin configuration. The Trap OID is sent as the second variable binding in the SNMP trap PDU.</p> <p><strong>Only applicable to v2c and v3 traps.</strong></p> - <p><strong>Do not confuse this paramater with 'Variable bindings prefix'.</strong></p> + <p><strong>Do not confuse this parameter with 'Variable bindings prefix'.</strong></p> ]]> </c:description> </c:simple-property>

1 0

[rhq] modules/plugins
by John Sanda 11 Jul '13

11 Jul '13

modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 23 +++++++++- modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml | 6 ++ 2 files changed, 26 insertions(+), 3 deletions(-) New commits: commit 9320e9df35f7dfeba8c6ddcf0dc16df11b2f162b Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 10 22:10:35 2013 -0400 add verification to updateSeedsList resource operation The updateSeedsList operation will convert each seed to an InetAddress to 1) make sure it is a valid hostname/IP address and 2) convert it to an IP address to ensure the seeds property in cassandra.yaml uses IP addresses. diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 5e7692b..90afafb 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -32,6 +32,8 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -63,7 +65,6 @@ import org.rhq.core.pluginapi.util.ProcessExecutionUtility; import org.rhq.core.system.ProcessExecution; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.ProcessInfo; -import org.rhq.core.system.ProcessInfo.ProcessInfoSnapshot; import org.rhq.core.system.SystemInfo; import org.rhq.core.util.StringUtil; import org.rhq.core.util.exception.ThrowableUtil; @@ -271,7 +272,16 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent return addresses; } - protected void updateSeedsList(List<String> addresses) throws IOException { + protected void updateSeedsList(List<String> seeds) throws IOException { + List<String> addresses = null; + try { + addresses = convertToIPAddresses(seeds); + } catch (UnknownHostException e) { + log.error("Failed to update seeds list", e); + throw new IOException("Failed to update seeds list. Make sure that " + seeds + " is a list of valid " + + "hostnames or IP addresses that can be resolved.", e); + } + ResourceContext<?> context = getResourceContext(); Configuration pluginConfig = context.getPluginConfiguration(); @@ -346,6 +356,15 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent } } + private List<String> convertToIPAddresses(List<String> seeds) throws UnknownHostException { + List<String> ipAddresses = new ArrayList<String>(seeds.size()); + for (String seed : seeds) { + InetAddress address = InetAddress.getByName(seed); + ipAddresses.add(address.getHostAddress()); + } + return ipAddresses; + } + private void deleteYamlBackupFile(File yamlBackup) { if (!yamlBackup.delete()) { log.warn("Failed to delete Cassandra configuration backup file [" + yamlBackup + "]. This file " + diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml index cac0a8d..3aa701b 100644 --- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml @@ -75,7 +75,11 @@ </results> </operation> - <operation name="updateSeedsList" description="Updatess the node's seeds property in cassandra.yaml"> + <operation name="updateSeedsList" + description="Updates the node's seeds property in cassandra.yaml. seedsList must be a list of valid + hostnames or IP addresses that are reachable from the agent machine. Note that if hostnames are + specified they will be converted to IP addresses so that the seeds property will consist solely of IP + addresses."> <parameters> <c:list-property name="seedsList"> <c:simple-property name="seed" type="string"/>

1 0

[rhq] modules/core
by John Sanda 11 Jul '13

11 Jul '13

modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/StorageNodeAddressUpgradeTask.java | 54 ++++++++++ 1 file changed, 54 insertions(+) New commits: commit 6430ccb39805a3b1de2fe7a57d303a6b640ce059 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 10 21:32:43 2013 -0400 adding custom java dbupgrade task for updating storage node addresss Forgot to include this file in my previous commit. diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/StorageNodeAddressUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/StorageNodeAddressUpgradeTask.java new file mode 100644 index 0000000..9fc90ed --- /dev/null +++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/StorageNodeAddressUpgradeTask.java @@ -0,0 +1,54 @@ +package org.rhq.core.db.upgrade; + +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.List; + +import org.rhq.core.db.DatabaseType; +import org.rhq.core.db.DbUtilsI18NFactory; +import org.rhq.core.db.DbUtilsI18NResourceKeys; + +import mazz.i18n.Logger; + +/** + * Updates the address field of storage node entities to ensure we are storing IP addresses and not hostnames. We want + * to store the IP address since that is what Cassandra uses for inter-node communication. JMX operations that return + * nodes will return the node IP addresses and not hostnames. + * + * @author John Sanda + */ +public class StorageNodeAddressUpgradeTask implements DatabaseUpgradeTask { + + private final Logger log = DbUtilsI18NFactory.getLogger(StorageNodeAddressUpgradeTask.class); + + @Override + public void execute(DatabaseType databaseType, Connection connection) throws SQLException { + String sql = "SELECT id, address FROM rhq_storage_node"; + + log.debug(DbUtilsI18NResourceKeys.EXECUTING_SQL, sql); + List<Object[]> results = databaseType.executeSelectSql(connection, sql); + + Integer id = null; + String storageNodeAddress = null; + try { + for (Object[] row : results) { + id = (Integer) row[0]; + storageNodeAddress = (String) row[1]; + InetAddress address = InetAddress.getByName(storageNodeAddress); + if (!storageNodeAddress.equals(address.getHostAddress())) { + log.debug(DbUtilsI18NResourceKeys.MESSAGE, "Updating address for StorageNode[id= " + id + ", ]" + + "address= " + storageNodeAddress + "]"); + String update = "UPDATE rhq_storage_node SET address = '" + address.getHostAddress() + "' " + + "WHERE id = " + id; + log.debug(DbUtilsI18NResourceKeys.EXECUTING_SQL, update); + databaseType.executeSql(connection, update); + } + } + } catch (UnknownHostException e) { + throw new RuntimeException("Failed to look up IP address for StorageNode[id =" + id + ", address=" + + storageNodeAddress + "]", e); + } + } +}

1 0

[rhq] modules/common modules/core
by John Sanda 11 Jul '13

11 Jul '13

modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 5 +++-- modules/core/dbutils/pom.xml | 2 +- modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) New commits: commit b1c1f6de18af6c1e598268944e2b41100cbb1a3d Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 10 21:23:06 2013 -0400 make sure that we store the IP address of storage nodes and not hostnames When doing cluster maintenance on the server, we make calls to get C* node addresses. C* returns IP addresses since it uses IP addresses for gossip; consequently, we want to make sure we store the IP address to avoid having to perform any hostname/IP address mapping. diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index d919ee3..386cda7 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -132,7 +132,8 @@ public class StorageInstaller { Option hostname = new Option("n", "hostname", true, "The hostname or IP address on which the node will listen for " - + "requests. If not specified, defaults to the hostname for localhost."); + + "requests. Note that if a hostname is specified, the IP address is used. Defaults to the IP " + + "address of the local host (which depending on hostname configuration may not be localhost)."); hostname.setArgName("HOSTNAME"); Option seeds = new Option("s", "seeds", true, "A comma-delimited list of hostnames or IP addresses that " @@ -282,7 +283,7 @@ public class StorageInstaller { } if (cmdLine.hasOption("n")) { - hostname = cmdLine.getOptionValue("n"); + hostname = InetAddress.getByName(cmdLine.getOptionValue("n")).getHostAddress(); } else { hostname = InetAddress.getLocalHost().getHostAddress(); } diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 356ff48..483688f 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -17,7 +17,7 @@ <description>Database schema setup, upgrade and other utilities</description> <properties> - <db.schema.version>2.133</db.schema.version> + <db.schema.version>2.134</db.schema.version> <rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping> <rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name> <rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name> diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index 0e1afd3..bb5fa50 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -2074,6 +2074,11 @@ </schema-directSQL> </schemaSpec> + <schemaSpec version="2.134"> +  + <schema-javaTask className="StorageNodeAddressUpgradeTask" /> + </schemaSpec> + </dbupgrade> </target> </project>

1 0

[rhq] modules/common modules/enterprise modules/plugins pom.xml
by John Sanda 10 Jul '13

10 Jul '13

modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 77 +--------- modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml | 2 modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 64 +++++--- modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ClusterBuilder.java | 7 modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 4 modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy | 1 modules/enterprise/server/itests-2/pom.xml | 4 modules/plugins/cassandra/pom.xml | 4 pom.xml | 2 9 files changed, 64 insertions(+), 101 deletions(-) New commits: commit d124d4589120090628c53c04c6767b948c7a270a Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 10 14:59:57 2013 -0400 remove C* native library dependencies JNA and lz4-java have been removed from our C* distro. The distro now includes a version of snappy-java that excludes the native components. We still have to include snappy-java because C* still has a runtime dependency on snappy-java classes. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 0f6eaca..0b015b4 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -97,9 +97,6 @@ <exclude>src/main/resources/cassandra/conf/cassandra-env.sh</exclude> </excludes> </resource> -  -  -  </resources> <delimiters> <delimiter>${*}</delimiter> @@ -110,6 +107,13 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + <version>${cassandra.snappy.version}</version> + </dependency> + </dependencies> <executions> <execution>  - <profile> - <id>snappy-mac-workaround</id> - <activation> - <os> - <family>Mac</family> - </os> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <inherited>false</inherited> - <dependencies> - <dependency> - <groupId>org.xerial.snappy</groupId> - <artifactId>snappy-java</artifactId> - <version>1.1.0-M3</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>setup-pkg-mac</id> - <phase>process-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <property name="cassandra.dir" - value="${project.build.outputDirectory}/cassandra-${cassandra.version}"/> - <property name="cassandra.lib.dir" value="${cassandra.dir}/lib"/> - <property name="snappy.jar.original" value="${cassandra.lib.dir}/snappy-java-1.0.4.1.jar"/> - <property name="snappy.jar.updated" - value="${local.repo}/org/xerial/snappy/snappy-java/${cassandra.driver.snappy.version}/snappy-java-${cassandra.driver.snappy.version}.jar"/> - <delete file="${snappy.jar.original}"/> - <copy file="${snappy.jar.updated}" todir="${cassandra.lib.dir}"/> - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml index bae3ecc..298db9d 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml @@ -681,7 +681,7 @@ client_encryption_options: # can be: all - all traffic is compressed # dc - traffic between different datacenters is compressed # none - nothing is compressed. -internode_compression: all +internode_compression: none # Enable or disable tcp_nodelay for inter-dc communication. # Disabling it will result in larger (but fewer) network packets being sent, diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 8062d6a..d919ee3 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -32,6 +32,7 @@ import java.io.FileReader; import java.io.IOException; import java.net.InetAddress; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -54,6 +55,7 @@ import org.apache.commons.cli.PosixParser; import org.apache.commons.exec.DefaultExecutor; import org.apache.commons.exec.Executor; import org.apache.commons.exec.PumpStreamHandler; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.output.NullOutputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -90,6 +92,8 @@ public class StorageInstaller { private final Log log = LogFactory.getLog(StorageInstaller.class); + private final String VERIFY_DATA_DIRS_EMPTY = "verify-data-dirs-empty"; + private Options options; private File serverBasedir; @@ -191,12 +195,15 @@ public class StorageInstaller { + "where the existing RHQ server is installed."); upgradeOption.setArgName("RHQ_SERVER_DIR"); + Option verifyDataDirsEmptyOption = new Option(null, VERIFY_DATA_DIRS_EMPTY, true, "Will cause the installer " + + "to abort if any of the data directories is not empty. Defaults to true."); + options = new Options().addOption(new Option("h", "help", false, "Show this message.")).addOption(hostname) .addOption(seeds).addOption(jmxPortOption).addOption(startOption).addOption(checkStatus) .addOption(commitLogOption).addOption(dataDirOption).addOption(savedCachesDirOption) .addOption(nativeTransportPortOption).addOption(storagePortOption).addOption(sslStoragePortOption) .addOption(basedirOption).addOption(heapSizeOption).addOption(heapNewSizeOption).addOption(stackSizeOption) - .addOption(upgradeOption); + .addOption(upgradeOption).addOption(verifyDataDirsEmptyOption); } public int run(CommandLine cmdLine) throws Exception { @@ -296,21 +303,25 @@ public class StorageInstaller { File dataDirFile = new File(dataDir); File savedCachesDirFile = new File(savedCachesDir); - // validate the three data directories are empty - if they are not, we are probably stepping on another storage node - if (!isDirectoryEmpty(commitLogDirFile)) { - log.error("Commitlog directory is not empty. It should not exist for a new Storage Node [" - + commitLogDirFile.getAbsolutePath() + "]"); - return STATUS_DATA_DIR_NOT_EMPTY; - } - if (!isDirectoryEmpty(dataDirFile)) { - log.error("Data directory is not empty. It should not exist for a new Storage Node [" - + dataDirFile.getAbsolutePath() + "]"); - return STATUS_DATA_DIR_NOT_EMPTY; - } - if (!isDirectoryEmpty(savedCachesDirFile)) { - log.error("Saved caches directory is not empty. It should not exist for a new Storage Node [" - + savedCachesDirFile.getAbsolutePath() + "]"); - return STATUS_DATA_DIR_NOT_EMPTY; + boolean verifyDataDirsEmpty = Boolean.valueOf(cmdLine.getOptionValue(VERIFY_DATA_DIRS_EMPTY, "true")); + if (verifyDataDirsEmpty) { + // validate the three data directories are empty - if they are not, we are probably stepping on + // another storage node + if (!isDirectoryEmpty(commitLogDirFile)) { + log.error("Commitlog directory is not empty. It should not exist for a new Storage Node [" + + commitLogDirFile.getAbsolutePath() + "]"); + return STATUS_DATA_DIR_NOT_EMPTY; + } + if (!isDirectoryEmpty(dataDirFile)) { + log.error("Data directory is not empty. It should not exist for a new Storage Node [" + + dataDirFile.getAbsolutePath() + "]"); + return STATUS_DATA_DIR_NOT_EMPTY; + } + if (!isDirectoryEmpty(savedCachesDirFile)) { + log.error("Saved caches directory is not empty. It should not exist for a new Storage Node [" + + savedCachesDirFile.getAbsolutePath() + "]"); + return STATUS_DATA_DIR_NOT_EMPTY; + } } jmxPort = getPort(cmdLine, "jmx-port", defaultJmxPort); @@ -438,12 +449,7 @@ public class StorageInstaller { } private boolean isDirectoryEmpty(File dir) { - if (dir.isDirectory()) { - File[] files = dir.listFiles(); - return (files == null || files.length == 0); - } else { - return true; - } + return FileUtils.sizeOf(dir) == 0; } private int getPort(CommandLine cmdLine, String option, int defaultValue) { @@ -709,12 +715,22 @@ public class StorageInstaller { } public void printUsage() { - Options options = getOptions(); HelpFormatter helpFormatter = new HelpFormatter(); String syntax = "rhq-storage-installer.sh|bat [options]"; String header = ""; - helpFormatter.printHelp(syntax, header, options, null); + helpFormatter.printHelp(syntax, header, getHelpOptions(), null); + } + + public Options getHelpOptions() { + Options helpOptions = new Options(); + for (Option option : (Collection<Option>)options.getOptions()) { + if (option.getLongOpt().equals(VERIFY_DATA_DIRS_EMPTY)) { + continue; + } + helpOptions.addOption(option); + } + return helpOptions; } public Options getOptions() { diff --git a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ClusterBuilder.java b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ClusterBuilder.java index 4687b4b..14f12e1 100644 --- a/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ClusterBuilder.java +++ b/modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ClusterBuilder.java @@ -94,9 +94,10 @@ public class ClusterBuilder { * @see com.datastax.driver.core.Cluster.Builder#build() */ public Cluster build() { - if (compression == null && !isIBMJRE()) { - builder.withCompression(ProtocolOptions.Compression.SNAPPY); - } +// if (compression == null && !isIBMJRE()) { +// builder.withCompression(ProtocolOptions.Compression.SNAPPY); +// } + builder.withCompression(ProtocolOptions.Compression.NONE); return builder.build(); } diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index cfe13be..bf06886 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -243,7 +243,7 @@ toDir="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main" verbose="true"/> <copy file="${settings.localRepository}/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.jar" toDir="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main" verbose="true"/> - <copy file="${settings.localRepository}/org/xerial/snappy/snappy-java/1.0.5-M3-p1/snappy-java-1.0.5-M3-p1.jar" + <copy file="${settings.localRepository}/org/xerial/snappy/snappy-java/${cassandra.snappy.version}/snappy-java-${cassandra.snappy.version}.jar" toDir="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main" verbose="true"/> <echo file="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main/module.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> @@ -258,7 +258,7 @@ <resource-root path="metrics-core-2.2.0.jar"/> <resource-root path="slf4j-api-1.7.2.jar"/> <resource-root path="slf4j-log4j12-1.7.2.jar"/> - <resource-root path="snappy-java-1.0.5-M3-p1.jar"/> + <resource-root path="snappy-java-${cassandra.snappy.version}.jar"/> <resource-root path="avro-1.4.0-cassandra-1.jar"/> </resources> diff --git a/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy b/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy index f8fae7d..ccb90b9 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy +++ b/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy @@ -97,6 +97,7 @@ heap-new-size=${heapNewSize} hostname=127.0.0.$nodeId jmx-port=${defaultJmxPort + (nodeId - 1)} seeds=${seeds} +verify-data-dirs-empty=false """ ) } diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index 1819f02..a3e9c7b 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -326,7 +326,7 @@ toDir="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main" verbose="true"/> <copy file="${settings.localRepository}/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.jar" toDir="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main" verbose="true"/> - <copy file="${settings.localRepository}/org/xerial/snappy/snappy-java/1.0.5-M3-p1/snappy-java-1.0.5-M3-p1.jar" + <copy file="${settings.localRepository}/org/xerial/snappy/snappy-java/${cassandra.snappy.version}/snappy-java-${cassandra.snappy.version}.jar" toDir="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main" verbose="true"/> <echo file="${jboss.modules.dir}/com/datastax/cassandra/cassandra-driver-core/main/module.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> @@ -341,7 +341,7 @@ <resource-root path="metrics-core-2.2.0.jar"/> <resource-root path="slf4j-api-1.7.2.jar"/> <resource-root path="slf4j-log4j12-1.7.2.jar"/> - <resource-root path="snappy-java-1.0.5-M3-p1.jar"/> + <resource-root path="snappy-java-${cassandra.snappy.version}.jar"/> <resource-root path="avro-1.4.0-cassandra-1.jar"/> </resources> diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index 76a781d..da90f09 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -27,7 +27,7 @@ <dependency> <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId> - <version>1.0.5-M3-p1</version> + <version>${cassandra.snappy.version}</version> </dependency> <dependency> <groupId>org.apache.cassandra</groupId> @@ -141,7 +141,7 @@ <artifactItem> <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId> - <version>1.0.5-M3-p1</version> + <version>${cassandra.snappy.version}</version> </artifactItem> <artifactItem> <groupId>org.codehaus.jackson</groupId> diff --git a/pom.xml b/pom.xml index 99c1bdc..d52dcc7 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ <cassandra.thrift.version>0.7.0</cassandra.thrift.version> <cassandra.driver.version>1.0.0-rhq-1.2.4</cassandra.driver.version> <cassandra.driver.netty.version>3.6.3.Final</cassandra.driver.netty.version> - <cassandra.driver.snappy.version>1.0.5-M3-p1</cassandra.driver.snappy.version> + <cassandra.snappy.version>1.0.4.1-rhq-p1</cassandra.snappy.version> <cassandra.snakeyaml.version>1.6</cassandra.snakeyaml.version> <rhq.db.admin.username>rhqadmin</rhq.db.admin.username>

1 0

[rhq] modules/enterprise
by Jiri Kremser 10 Jul '13

10 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java | 8 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 7 ++++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java | 14 ++++++---- 3 files changed, 22 insertions(+), 7 deletions(-) New commits: commit 3783018826b0ebbe069751842cde15e75bc29bb2 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Jul 10 18:44:17 2013 +0200 [BZ 966293] - Add validation for expression when creating Dynagroup Definition - adding a check to GroupDefinitionManagerBean.validate() method. Also making sure, the right message is correctly propagated to the web UI. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java index 74484dd..fed6e32 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java @@ -130,7 +130,13 @@ public class GroupDefinitionDataSource extends RPCDataSource<GroupDefinition, Re @Override public void onFailure(Throwable caught) { Map<String, String> errors = new HashMap<String, String>(); - errors.put("name", MSG.view_dynagroup_definitionAlreadyExists()); + String msg = caught.getMessage(); + String cannotParse = "Cannot parse the expression: "; + if (msg != null && msg.contains(cannotParse)) { + errors.put("expression", msg.substring(msg.indexOf(cannotParse) + cannotParse.length())); + } else { + errors.put("name", MSG.view_dynagroup_definitionAlreadyExists()); + } response.setErrors(errors); response.setStatus(RPCResponse.STATUS_VALIDATION_ERROR); processResponse(request.getRequestId(), response); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java index 1afa30d..7b36717 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java @@ -199,6 +199,7 @@ public class SingleGroupDefinitionView extends EnhancedVLayout implements Bookma @Override public void execute(DSResponse response, Object rawData, DSRequest request) { boolean hasDuplicateNameError = false; + boolean hasParseExpressionError = false; if (form.isNewRecord()) { Record[] results = response.getData(); if (results.length != 1) { @@ -212,10 +213,14 @@ public class SingleGroupDefinitionView extends EnhancedVLayout implements Bookma String errorValue = (String) thisEntry.getValue(); CoreGUI.getErrorHandler().handleError(errorValue); hasDuplicateNameError = true; + } else if (fieldKey.equals("expression")) { + String errorValue = (String) thisEntry.getValue(); + CoreGUI.getErrorHandler().handleError(errorValue); + hasParseExpressionError = true; } } - if (!hasDuplicateNameError) { + if (!hasDuplicateNameError && !hasParseExpressionError) { CoreGUI.getErrorHandler().handleError( MSG.view_dynagroup_singleSaveFailure(String.valueOf(results.length))); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java index a276efb..373368c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java @@ -175,11 +175,6 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal, throw new GroupDefinitionUpdateException(gde.getMessage()); } - ExpressionEvaluator evaluator = new ExpressionEvaluator(); - for (String expression : groupDefinition.getExpressionAsList()) { - evaluator.addExpression(expression); - } - RecursivityChangeType changeType = RecursivityChangeType.None; GroupDefinition attachedGroupDefinition = null; try { @@ -251,6 +246,15 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal, if (definition.getExpression() == null || definition.getExpression().isEmpty()) { throw new GroupDefinitionException("Expression is empty"); } + + try { + ExpressionEvaluator evaluator = new ExpressionEvaluator(); + for (String expression : definition.getExpressionAsList()) { + evaluator.addExpression(expression); + } + } catch (InvalidExpressionException e) { + throw new GroupDefinitionException("Cannot parse the expression: " + e.getMessage()); + } Query query = entityManager.createNamedQuery(GroupDefinition.QUERY_FIND_BY_NAME); query.setParameter("name", name);

1 0

[rhq] Changes to 'bug/923400'
by Thomas Segismont 10 Jul '13

10 Jul '13

New branch 'bug/923400' available with the following commits: commit 3a65e09ac935bc75bb5a416a274273ef477f1a3c Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 3 12:27:55 2013 +0200 Bug 923400 - Sigar creates high number of blocked threads (unbounded) if mount is gone

1 0

[rhq] Branch 'bug/923400' - 0 commits -
by Thomas Segismont 10 Jul '13

10 Jul '13

Rebased ref, commits from common ancestor:

1 0

[rhq] Branch 'bug/923400' - modules/core
by Thomas Segismont 10 Jul '13

10 Jul '13

modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java | 109 +++++----- modules/core/native-system/src/test/java/org/rhq/core/system/SigarAccessHandlerTest.java | 49 +++- 2 files changed, 105 insertions(+), 53 deletions(-) New commits: commit a6e0c42c046095f05ddf364e5d4dad50e8d32d88 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 10 18:11:45 2013 +0200 Bug 923400 - Sigar creates high number of blocked threads (unbounded) if mount is gone Add a parameter to switch on a limit of Sigar instances. diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java index 0fcacb7..a781641 100644 --- a/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java +++ b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java @@ -29,7 +29,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; import org.apache.commons.logging.Log; @@ -42,16 +41,18 @@ import org.hyperic.sigar.Sigar; * This class holds a shared {@link Sigar} instance and serializes calls. If a thread waits more than * 'sharedSigarLockMaxWait' seconds, it will be given a new Sigar instance, which will be destroyed at the end of the * call. - * <p>Every 5 minutes, a background task checks that 'sigarInstancesThreshold' has not been exceeded. It it has, a - * warning message will be logged, optionally with a thread dump. + * <p>Every 5 minutes, a background task checks that 'localSigarInstancesWarningThreshold' has not been exceeded. It it + * has, a warning message will be logged, optionally with a thread dump. * <p>This class is configurable with System properties: * <ul> - * <li><strong>sharedSigarLockMaxWait</strong>: maximum time a thread will wait for the shared Sigar lock - * acquistion; defaults to 5</li> - * <li><strong>sigarInstancesThreshold</strong>: threshold of currently living Sigar instances at which the - * background task will print warning messages; defaults to 50</li> - * <li><strong>threadDumpOnSigarInstancesThreshold</strong>: if set to true (case insensitive), the background task - * will also log a thread dump when <strong>sigarInstancesThreshold</strong> is met</li> + * <li><strong>sharedSigarLockMaxWait</strong>: maximum time in seconds a thread will wait for the shared Sigar lock + * acquistion; defaults to 2 seconds</li> + * <li><strong>localSigarInstancesWarningThreshold</strong>: threshold of currently living Sigar instances at which + * the background task will print warning messages; defaults to 50</li> + * <li><strong>maxLocalSigarInstances</strong>: maximum number of local Sigar instances which can be created, zero + * and negative values being interpreted as 'no limit'; defaults to 50</li> + * <li><strong>threadDumpOnlocalSigarInstancesWarningThreshold</strong>: if set to true (case insensitive), the + * background task will also log a thread dump when <strong>localSigarInstancesWarningThreshold</strong> is met</li> * </ul> * </p> * @@ -60,15 +61,20 @@ import org.hyperic.sigar.Sigar; class SigarAccessHandler implements InvocationHandler { private static final Log LOG = LogFactory.getLog(SigarAccessHandler.class); - private static final int sharedSigarLockMaxWait = Integer.getInteger("sharedSigarLockMaxWait", 5); - private static final int sigarInstancesThreshold = Integer.getInteger("sigarInstancesThreshold", 50); - private static final boolean threadDumpOnSigarInstancesThreshold = Boolean - .getBoolean("threadDumpOnSigarInstancesThreshold"); + private static final String LINE_SEPARATOR = System.getProperty("line.separator"); + private static final int SHARED_SIGAR_LOCK_MAX_WAIT = Integer.getInteger("sharedSigarLockMaxWait", 2); + private static final int LOCAL_SIGAR_INSTANCES_WARNING_THRESHOLD = Integer.getInteger( + "localSigarInstancesWarningThreshold", 50); + private static final int MAX_LOCAL_SIGAR_INSTANCES = Integer.getInteger("maxLocalSigarInstances", 50); + private static final boolean LIMIT_LOCAL_SIGAR_INSTANCES = MAX_LOCAL_SIGAR_INSTANCES > 0; + private static final boolean THREAD_DUMP_ON_SIGAR_INSTANCES_THRESHOLD = Boolean + .getBoolean("threadDumpOnlocalSigarInstancesWarningThreshold"); private final SigarFactory sigarFactory; private final ReentrantLock sharedSigarLock; - private final AtomicInteger sigarInstancesCount; + private final ReentrantLock localSigarLock; private final ScheduledExecutorService scheduledExecutorService; + private volatile int localSigarInstancesCount; private Sigar sharedSigar; SigarAccessHandler() { @@ -76,11 +82,12 @@ class SigarAccessHandler implements InvocationHandler { } SigarAccessHandler(SigarFactory sigarFactory) { + this.sigarFactory = sigarFactory; sharedSigarLock = new ReentrantLock(); - sigarInstancesCount = new AtomicInteger(0); + localSigarLock = new ReentrantLock(); scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(); scheduledExecutorService.scheduleWithFixedDelay(new ThresholdChecker(), 1, 5, MINUTES); - this.sigarFactory = sigarFactory; + localSigarInstancesCount = 0; } public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { @@ -91,13 +98,10 @@ class SigarAccessHandler implements InvocationHandler { } // Acquire lock for shared Sigar instance. Wait 'sharedSigarLockMaxWait' seconds at most - boolean acquiredLock = sharedSigarLock.tryLock(sharedSigarLockMaxWait, SECONDS); + boolean acquiredLock = sharedSigarLock.tryLock(SHARED_SIGAR_LOCK_MAX_WAIT, SECONDS); if (acquiredLock) { - if (LOG.isDebugEnabled()) { - LOG.debug("Using shared Sigar instance for " + method); - } if (sharedSigar == null) { - this.sharedSigar = createSigarInstance(); + this.sharedSigar = sigarFactory.createSigarInstance(); } try { return method.invoke(sharedSigar, args); @@ -107,36 +111,46 @@ class SigarAccessHandler implements InvocationHandler { sharedSigarLock.unlock(); } } else { - if (LOG.isDebugEnabled()) { - LOG.debug("Using local Sigar instance for " + method); - } - Sigar localSigar = createSigarInstance(); + Sigar localSigar = createLocalSigarInstance(); try { return method.invoke(localSigar, args); } catch (InvocationTargetException e) { throw e.getTargetException(); } finally { - closeSigarInstance(localSigar); + closeLocalSigarInstance(localSigar); } } } - private Sigar createSigarInstance() { - Sigar sigar = sigarFactory.createSigarInstance(); - sigarInstancesCount.incrementAndGet(); - return sigar; + private Sigar createLocalSigarInstance() { + localSigarLock.lock(); + try { + if (LIMIT_LOCAL_SIGAR_INSTANCES && localSigarInstancesCount >= MAX_LOCAL_SIGAR_INSTANCES) { + throw new RuntimeException("Too many Sigar instances created"); + } + Sigar sigarInstance = sigarFactory.createSigarInstance(); + localSigarInstancesCount++; + return sigarInstance; + } finally { + localSigarLock.unlock(); + } } - private void closeSigarInstance(Sigar sigar) { - sigar.close(); - sigarInstancesCount.decrementAndGet(); + private void closeLocalSigarInstance(Sigar sigar) { + localSigarLock.lock(); + try { + sigar.close(); + localSigarInstancesCount--; + } finally { + localSigarLock.unlock(); + } } void close() { if (sharedSigar != null) { sharedSigarLock.lock(); try { - closeSigarInstance(sharedSigar); + sharedSigar.close(); sharedSigar = null; } finally { sharedSigarLock.unlock(); @@ -145,8 +159,8 @@ class SigarAccessHandler implements InvocationHandler { scheduledExecutorService.shutdownNow(); } - int currentSigarInstancesCount() { - return sigarInstancesCount.get(); + int localSigarInstancesCount() { + return localSigarInstancesCount; } interface SigarFactory { @@ -163,24 +177,25 @@ class SigarAccessHandler implements InvocationHandler { private class ThresholdChecker implements Runnable { @Override public void run() { - int currentSigarInstancesCount = sigarInstancesCount.get(); - if (currentSigarInstancesCount > sigarInstancesThreshold) { - LOG.warn("There are " + currentSigarInstancesCount + " Sigar instances currently active. " - + "This may indicate that a call to the shared Sigar instance did not complete."); - if (threadDumpOnSigarInstancesThreshold) { - LOG.warn("threadDumpOnSigarInstancesThreshold is on." + System.getProperty("line.separator") - + threadDump()); + int currentCount = localSigarInstancesCount; + if (currentCount > LOCAL_SIGAR_INSTANCES_WARNING_THRESHOLD) { + StringBuilder sb = new StringBuilder(); + sb.append("There are ").append(currentCount).append(" local Sigar instances currently active. ") + .append("This may indicate that a call to the shared Sigar instance did not complete."); + if (THREAD_DUMP_ON_SIGAR_INSTANCES_THRESHOLD) { + sb.append(LINE_SEPARATOR); + threadDump(sb); } + LOG.warn(sb.toString()); } } - private String threadDump() { - StringBuilder dump = new StringBuilder(); + private void threadDump(StringBuilder sb) { ThreadInfo[] threadInfos = ManagementFactory.getThreadMXBean().dumpAllThreads(true, true); for (ThreadInfo threadInfo : threadInfos) { - dump.append(threadInfo); + sb.append(threadInfo); + sb.append(LINE_SEPARATOR); } - return dump.toString(); } } } diff --git a/modules/core/native-system/src/test/java/org/rhq/core/system/SigarAccessHandlerTest.java b/modules/core/native-system/src/test/java/org/rhq/core/system/SigarAccessHandlerTest.java index ef5f970..e993725 100644 --- a/modules/core/native-system/src/test/java/org/rhq/core/system/SigarAccessHandlerTest.java +++ b/modules/core/native-system/src/test/java/org/rhq/core/system/SigarAccessHandlerTest.java @@ -22,10 +22,15 @@ package org.rhq.core.system; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; import java.lang.reflect.Method; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.Future; import org.hyperic.sigar.Sigar; import org.hyperic.sigar.SigarProxy; @@ -41,7 +46,7 @@ import org.testng.annotations.Test; */ @Test(singleThreaded = true) public class SigarAccessHandlerTest { - private static final int THREAD_POOL_SIZE = 10; + private static final int THREAD_POOL_SIZE = 100; private Method getSwapMethod; private Method getFileSystemMapMethod; @@ -50,7 +55,7 @@ public class SigarAccessHandlerTest { private SigarAccessHandler sigarAccessHandler; @BeforeClass - public void setMethodFields() throws Exception { + private void setFields() throws Exception { getSwapMethod = SigarProxy.class.getMethod("getSwap", new Class[0]); getFileSystemMapMethod = SigarProxy.class.getMethod("getFileSystemMap", new Class[0]); sigarMock = mock(Sigar.class); @@ -85,7 +90,7 @@ public class SigarAccessHandlerTest { @Test(timeOut = 1000 * 30) public void testOnDemandSigarInstanceCreation() throws Throwable { // Start concurrent invocations of the long running getSwap method - for (int i = 0; i < THREAD_POOL_SIZE; i++) { + for (int i = 0; i < 10; i++) { executorService.submit(new Runnable() { @Override public void run() { @@ -98,14 +103,14 @@ public class SigarAccessHandlerTest { } Thread.sleep(1000 * 8); - assertEquals(sigarAccessHandler.currentSigarInstancesCount(), THREAD_POOL_SIZE); + assertEquals(sigarAccessHandler.localSigarInstancesCount(), 9); } @Test(timeOut = 1000 * 30) public void testSigarInstanceDestruction() throws Throwable { // Start concurrent invocations of the short running getFileSystemMapMethod method and an invocation of the long // running getSwap method - for (int i = 0; i < THREAD_POOL_SIZE; i++) { + for (int i = 0; i < 10; i++) { if (i == 0) { executorService.submit(new Runnable() { @Override @@ -130,6 +135,38 @@ public class SigarAccessHandlerTest { } Thread.sleep(1000 * 8); - assertEquals(sigarAccessHandler.currentSigarInstancesCount(), 1); + assertEquals(sigarAccessHandler.localSigarInstancesCount(), 0); + } + + @Test(timeOut = 1000 * 30) + public void testMaxSigarInstanceCreation() throws Throwable { + // Start concurrent invocations of the long running getSwap method + List<Future<Throwable>> futures = new LinkedList<Future<Throwable>>(); + for (int i = 0; i < 60; i++) { + futures.add(executorService.submit(new Callable<Throwable>() { + @Override + public Throwable call() throws Exception { + try { + sigarAccessHandler.invoke(null, getSwapMethod, new Object[0]); + } catch (Throwable throwable) { + return throwable; + } + return null; + } + })); + } + Thread.sleep(1000 * 8); + + assertEquals(sigarAccessHandler.localSigarInstancesCount(), 50); + int failedCallsCount = 0; + for (Future<Throwable> future : futures) { + Throwable throwable = future.get(); + if (throwable != null) { + failedCallsCount++; + assertTrue(throwable instanceof RuntimeException); + assertEquals(throwable.getMessage(), "Too many Sigar instances created"); + } + } + assertEquals(failedCallsCount, 9); } }

1 0

[rhq] modules/enterprise
by Jiri Kremser 10 Jul '13

10 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java | 2 ++ 1 file changed, 2 insertions(+) New commits: commit 0d1662bbbec85dbbb820cc8e778963015027caa2 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Jul 10 17:33:48 2013 +0200 [BZ 976265] - Unable to remove one dynagroup definition - Anotating method GroupDefinitionManagerBean.updateGroupDefinition() with @TransactionAttribute. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java index bb425f6..a276efb 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java @@ -162,6 +162,8 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal, } @RequiredPermission(Permission.MANAGE_INVENTORY) + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + // required for the recalculation thread (same like calculateGroupMembership) this fixes BZ 976265 public GroupDefinition updateGroupDefinition(Subject subject, GroupDefinition groupDefinition) throws GroupDefinitionAlreadyExistsException, GroupDefinitionUpdateException, InvalidExpressionException, ResourceGroupUpdateException {

1 0

[rhq] modules/enterprise
by Jiri Kremser 10 Jul '13

10 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit 627c48a7a18a03d9a91032a32c1833d4fcbae86a Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Jul 10 17:10:04 2013 +0200 [BZ 974501] - Its possible to create a dynaGroup definition without expression via CLI - check whether expression is null of an empty string diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java index bb2587f..bb425f6 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java @@ -230,27 +230,25 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal, if (name.equals("")) { throw new GroupDefinitionException("Name is a required property"); } - if (name.length() > 100) { throw new GroupDefinitionException("Name is limited to 100 characters"); } - if (description.length() > 100) { throw new GroupDefinitionException("Description is limited to 100 characters"); } - if (name.contains("<") || name.contains("$") || name.contains("'") || name.contains("{") || name.contains("[")) { throw new GroupDefinitionException("Name must not contain <,$,',[,{ characters"); } - if (definition.getRecalculationInterval() < 0) { throw new GroupDefinitionException("Recalculation interval cannot be negative"); } - if (definition.getRecalculationInterval() > 0 && definition.getRecalculationInterval() < 60 * 1000) { throw new GroupDefinitionException( "Recalculation interval cannot be a positive number lower than 1 minute (60000ms)"); } + if (definition.getExpression() == null || definition.getExpression().isEmpty()) { + throw new GroupDefinitionException("Expression is empty"); + } Query query = entityManager.createNamedQuery(GroupDefinition.QUERY_FIND_BY_NAME); query.setParameter("name", name);

1 0

[rhq] etc/scripts
by John Sanda 10 Jul '13

10 Jul '13

etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) New commits: commit d1f030ca0033ce7d7a7ea4ab223214789118de99 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 10 10:48:16 2013 -0400 add some basic argument validation The script now takes as arguments the rhq server directory, the ip address of the storage node, the cql port, and the jmx port. diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh index 756ba20..947155f 100755 --- a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh @@ -1,14 +1,23 @@ #!/bin/bash -if [ "x$1" = "x" ]; then - echo "Usage: $0 <rhq-server-dir>" +function usage() { + echo "Usage: $0 <rhq-server-dir> <storage-ip-address> <cql-port> <jmx-port>" +} + +if [ $# -ne 4 ]; then + usage + exit 1 +fi + +if [[ "x$1" = "x" ]] || [[ "x$2" = "x" ]] || [[ "x$3" = "x" ]] || [[ "x$4" = "x" ]]; then + usage exit 1 fi RHQ_SERVER_DIR=$1 CQL_HOSTNAME=$2 -CQL_PORT=9142 -JMX_PORT=7299 +CQL_PORT=$3 +JMX_PORT=$4 PATCH="apache-cassandra-1.2.4-patch-1.jar"

1 0

[rhq] 2 commits - modules/enterprise
by Jiri Kremser 10 Jul '13

10 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 10 ++++++++-- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java | 9 +++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) New commits: commit 08f7934eecde748578f075d26018fcc348693fae Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Jul 10 16:44:00 2013 +0200 [BZ 977782] - Incorrect error message is shown when creating a new dynaGroup definition with incorrect name - added regexp validator to the coregui. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java index 99e0192..1afa30d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java @@ -56,6 +56,8 @@ import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; import com.smartgwt.client.widgets.form.fields.events.FormItemClickHandler; import com.smartgwt.client.widgets.form.fields.events.FormItemIconClickEvent; +import com.smartgwt.client.widgets.form.validator.RegExpValidator; +import com.smartgwt.client.widgets.form.validator.Validator; import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.HoverCustomizer; import com.smartgwt.client.widgets.grid.ListGrid; @@ -82,10 +84,10 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupsDataSource; import org.rhq.enterprise.gui.coregui.client.inventory.groups.definitions.GroupDefinitionExpressionBuilder.AddExpressionHandler; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedIButton; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; /** * @author Joseph Marques @@ -136,6 +138,10 @@ public class SingleGroupDefinitionView extends EnhancedVLayout implements Bookma description.setValue(groupDefinition.getDescription()); recalculationInterval.setValue(groupDefinition.getRecalculationInterval() / (60 * 1000)); expression.setValue(groupDefinition.getExpression()); + + Validator nameValidator = new RegExpValidator("^[^\\<\\$\\'\\{\\[]{1,100}$"); + nameValidator.setErrorMessage("Name must not contain following characters: < $ ' [ {"); + name.setValidators(nameValidator); final DynamicForm form = new DynamicForm(); form.setFields(id, name, description, templateSelectorTitleSpacer, templateSelector, expression, recursive, commit fa8e8225c6777c5d7e57c25aae3b80a180cbc58b Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Jul 10 14:54:21 2013 +0200 [BZ 975502] - Its possible to create a dynaGroup definition with recalculation Interval < 1 minute via CLI - added simple checks to the GroupDefinitionManagerBean. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java index 8713928..bb2587f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java @@ -242,6 +242,15 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal, if (name.contains("<") || name.contains("$") || name.contains("'") || name.contains("{") || name.contains("[")) { throw new GroupDefinitionException("Name must not contain <,$,',[,{ characters"); } + + if (definition.getRecalculationInterval() < 0) { + throw new GroupDefinitionException("Recalculation interval cannot be negative"); + } + + if (definition.getRecalculationInterval() > 0 && definition.getRecalculationInterval() < 60 * 1000) { + throw new GroupDefinitionException( + "Recalculation interval cannot be a positive number lower than 1 minute (60000ms)"); + } Query query = entityManager.createNamedQuery(GroupDefinition.QUERY_FIND_BY_NAME); query.setParameter("name", name);

1 0

[rhq] modules/enterprise
by snegrea 10 Jul '13

10 Jul '13

modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit d61c77462f80bf1f8164341e58783ab75d3ff5f0 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Jul 10 09:17:57 2013 -0500 AllDataFileLocations is not a metric and thus no need to change the collection interval. diff --git a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java index 1cff654..dcfdc37 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java +++ b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java @@ -62,7 +62,6 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone private final Log log = LogFactory.getLog(AlertDefinitionServerPluginComponent.class); private static final String PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.PartitionDiskUsedPercentage"; - private static final String DATA_FILE_LOCATIONS_NAME = "AllDataFileLocations"; static private final List<InjectedTemplate> injectedTemplates; static private final InjectedTemplate storageNodeHighHeapTemplate; @@ -309,8 +308,6 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone measurementDefinitionIds.add(d.getId()); ac.setMeasurementDefinition(d); ac.setName(d.getDisplayName()); - } else if (DATA_FILE_LOCATIONS_NAME.equals(d.getName())) { - measurementDefinitionIds.add(d.getId()); } } assert null != ac.getMeasurementDefinition() : "Did not find expected measurement definition " @@ -331,7 +328,8 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone // is set by default. MeasurementScheduleManagerLocal measurementManager = LookupUtil.getMeasurementScheduleManager(); measurementManager.updateDefaultCollectionIntervalAndEnablementForMeasurementDefinitions( - subjectManager.getOverlord(), ArrayUtils.toPrimitive(measurementDefinitionIds.toArray(new Integer[2])), + subjectManager.getOverlord(), + ArrayUtils.toPrimitive(measurementDefinitionIds.toArray(new Integer[measurementDefinitionIds.size()])), 60000L, true, true); return newTemplateId;

1 0

[rhq] modules/enterprise
by Thomas Segismont 10 Jul '13

10 Jul '13

modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/test/GroupMemberCandidateResourcesTest.java | 190 ++++++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 8 2 files changed, 196 insertions(+), 2 deletions(-) New commits: commit 5b0415a3703ce56bbc27fd348c9808e446207fed Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 10 15:52:07 2013 +0200 Bug 910646 - Unable to add more than 100 resources to a Compatible Group Add integration test and throw UnsupportedOperationException if criteria has unlimited PageControl diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/test/GroupMemberCandidateResourcesTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/test/GroupMemberCandidateResourcesTest.java new file mode 100644 index 0000000..3447799 --- /dev/null +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/test/GroupMemberCandidateResourcesTest.java @@ -0,0 +1,190 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.enterprise.server.resource.test; + +import static org.rhq.core.domain.util.PageOrdering.ASC; + +import java.util.Arrays; + +import javax.ejb.EJBException; + +import org.testng.annotations.Test; + +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.criteria.ResourceCriteria; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.server.auth.SubjectManagerLocal; +import org.rhq.enterprise.server.resource.ResourceManagerLocal; +import org.rhq.enterprise.server.test.AbstractEJB3Test; +import org.rhq.enterprise.server.test.TransactionCallback; +import org.rhq.enterprise.server.util.LookupUtil; +import org.rhq.enterprise.server.util.SessionTestHelper; + +/** + * @author Thomas Segismont + */ +public class GroupMemberCandidateResourcesTest extends AbstractEJB3Test { + + private static final String GROUP_MEMBER_CANDIDATE_NAME_PREFIX = GroupMemberCandidateResourcesTest.class + .getSimpleName() + "-"; + + private Subject overlord; + + private ResourceManagerLocal resourceManager; + + @Override + protected void beforeMethod() throws Exception { + SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager(); + overlord = subjectManager.getOverlord(); + resourceManager = LookupUtil.getResourceManager(); + } + + @Test + public void testNoCandidates() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + ResourceCriteria criteria = new ResourceCriteria(); + criteria.setCaseSensitive(false); + criteria.addFilterName(GROUP_MEMBER_CANDIDATE_NAME_PREFIX); + + PageList<Resource> groupMemberCandidateResources = resourceManager.findGroupMemberCandidateResources( + overlord, criteria, new int[0]); + + assertEquals(0, groupMemberCandidateResources.getTotalSize()); + assertEquals(0, groupMemberCandidateResources.size()); + } + }); + } + + @Test + public void testNoCandidatesWithExclusions() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + ResourceCriteria criteria = new ResourceCriteria(); + criteria.setCaseSensitive(false); + criteria.addFilterName(GROUP_MEMBER_CANDIDATE_NAME_PREFIX); + int[] alreadySelectedResourceIds = new int[100]; + for (int i = 0; i < alreadySelectedResourceIds.length; i++) { + alreadySelectedResourceIds[i] = i; + } + + PageList<Resource> groupMemberCandidateResources = resourceManager.findGroupMemberCandidateResources( + overlord, criteria, alreadySelectedResourceIds); + + assertEquals(0, groupMemberCandidateResources.getTotalSize()); + assertEquals(0, groupMemberCandidateResources.size()); + } + }); + } + + @Test + public void testUnlimitedPageControl() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + ResourceCriteria criteria = new ResourceCriteria(); + criteria.setPageControl(PageControl.getUnlimitedInstance()); + + try { + PageList<Resource> groupMemberCandidateResources = resourceManager + .findGroupMemberCandidateResources(overlord, criteria, new int[0]); + fail("findGroupMemberCandidateResources should throw UnsupportedOperationException"); + } catch (EJBException e) { + assertTrue(e.getCausedByException() instanceof UnsupportedOperationException); + } + } + }); + } + + @Test + public void testPageControl() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourcesCount = 100; + createTestResources(resourcesCount); + ResourceCriteria criteria = new ResourceCriteria(); + criteria.setCaseSensitive(false); + criteria.addFilterName(GROUP_MEMBER_CANDIDATE_NAME_PREFIX); + criteria.addSortName(ASC); + int pageNumber = 5; + int pageSize = 7; + criteria.setPaging(pageNumber, pageSize); + + PageList<Resource> groupMemberCandidateResources = resourceManager.findGroupMemberCandidateResources( + overlord, criteria, new int[0]); + + assertEquals(resourcesCount, groupMemberCandidateResources.getTotalSize()); + assertEquals(pageSize, groupMemberCandidateResources.size()); + for (Resource groupMemberCandidateResource : groupMemberCandidateResources) { + assertTrue(groupMemberCandidateResource.getName().startsWith(GROUP_MEMBER_CANDIDATE_NAME_PREFIX)); + } + assertEquals(pageNumber, groupMemberCandidateResources.getPageControl().getPageNumber()); + assertEquals(pageSize, groupMemberCandidateResources.getPageControl().getPageSize()); + } + }); + } + + @Test + public void testPageControlWithExclusions() { + executeInTransaction(new TransactionCallback() { + @Override + public void execute() throws Exception { + int resourcesCount = 100; + int[] resourcesIds = createTestResources(resourcesCount); + ResourceCriteria criteria = new ResourceCriteria(); + criteria.setCaseSensitive(false); + criteria.addFilterName(GROUP_MEMBER_CANDIDATE_NAME_PREFIX); + criteria.addSortName(ASC); + int pageNumber = 5; + int pageSize = 7; + criteria.setPaging(pageNumber, pageSize); + int[] alreadySelectedResourceIds = Arrays.copyOfRange(resourcesIds, 13, 59); + + PageList<Resource> groupMemberCandidateResources = resourceManager.findGroupMemberCandidateResources( + overlord, criteria, alreadySelectedResourceIds); + + assertEquals(resourcesCount, groupMemberCandidateResources.getTotalSize()); + assertEquals(pageSize, groupMemberCandidateResources.size()); + for (Resource groupMemberCandidateResource : groupMemberCandidateResources) { + assertTrue(groupMemberCandidateResource.getName().startsWith(GROUP_MEMBER_CANDIDATE_NAME_PREFIX)); + } + assertEquals(pageNumber, groupMemberCandidateResources.getPageControl().getPageNumber()); + assertEquals(pageSize, groupMemberCandidateResources.getPageControl().getPageSize()); + } + }); + } + + private int[] createTestResources(int resourcesCount) { + int[] resourcesIds = new int[resourcesCount]; + ResourceType testResourceType = SessionTestHelper.createNewResourceType(em); + for (int i = 0; i < resourcesCount; i++) { + resourcesIds[i] = SessionTestHelper.createNewResource(em, GROUP_MEMBER_CANDIDATE_NAME_PREFIX + i, + testResourceType).getId(); + } + return resourcesIds; + } + +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java index 0c8594d..0aa09a4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java @@ -2930,10 +2930,14 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage public PageList<Resource> findGroupMemberCandidateResources(Subject subject, ResourceCriteria criteria, int[] alreadySelectedResourceIds) { + PageControl originalPageControl = getPageControl(criteria); + if (originalPageControl.isUnlimited()) { + throw new UnsupportedOperationException("Supplied criteria has an unlimited PageControl"); + } + Set<Integer> alreadySelectedResourceIdSet = new HashSet<Integer>( - ArrayUtils.wrapInList(alreadySelectedResourceIds)); + ArrayUtils.wrapInList(alreadySelectedResourceIds == null ? new int[0] : alreadySelectedResourceIds)); - PageControl originalPageControl = getPageControl(criteria); PageControl pageControl = (PageControl) originalPageControl.clone(); criteria.setPageControl(pageControl);

1 0

[rhq] 3 commits - modules/enterprise modules/helpers
by Heiko W. Rupp 10 Jul '13

10 Jul '13

modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/JsonPFilter.java | 23 ++++------ modules/helpers/pluginAnnotations/pom.xml | 4 - modules/helpers/pluginGen/pom.xml | 20 +++++++- modules/helpers/pluginGen/src/main/resources/descriptor.ftl | 4 + modules/helpers/pluginGen/src/main/resources/pom.ftl | 6 +- 5 files changed, 38 insertions(+), 19 deletions(-) New commits: commit 07e921660b7336a96593c71b3bb57624f7645396 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Jul 10 09:05:05 2013 +0200 Don't bail out on empty plugin description. Bump default pom version diff --git a/modules/helpers/pluginGen/src/main/resources/descriptor.ftl b/modules/helpers/pluginGen/src/main/resources/descriptor.ftl index a62af11..85195e8 100644 --- a/modules/helpers/pluginGen/src/main/resources/descriptor.ftl +++ b/modules/helpers/pluginGen/src/main/resources/descriptor.ftl @@ -22,7 +22,11 @@ <?xml version="1.0"?> <plugin name="${props.pluginName}" displayName="${props.pluginName}Plugin" +<#if props.pluginDescription??> description="${props.pluginDescription}" +<#else> + description="TODO provide a description for the plugin" +</#if> <#if props.usePluginLifecycleListenerApi> pluginLifecycleListener="${props.componentClass}" </#if> diff --git a/modules/helpers/pluginGen/src/main/resources/pom.ftl b/modules/helpers/pluginGen/src/main/resources/pom.ftl index 2434ddd..01daca1 100644 --- a/modules/helpers/pluginGen/src/main/resources/pom.ftl +++ b/modules/helpers/pluginGen/src/main/resources/pom.ftl @@ -31,7 +31,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version><#if props.rhqVersion??>${props.rhqVersion}<#else >4.5.0-SNAPSHOT</#if></version> + <version><#if props.rhqVersion??>${props.rhqVersion}<#else >4.9.0-SNAPSHOT</#if></version> </parent> <groupId>org.rhq</groupId> @@ -49,8 +49,8 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>1.6</source> + <target>1.6</target> </configuration> </plugin> commit 206bc37502ef973145cf689b3a077722bb8bf2e9 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Jul 10 08:49:08 2013 +0200 BZ 981809 Disable compression when wrapping. Also some cleanup in the file. diff --git a/modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/JsonPFilter.java b/modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/JsonPFilter.java index 3a785fd..8d43f03 100644 --- a/modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/JsonPFilter.java +++ b/modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/JsonPFilter.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.rest; @@ -45,6 +45,9 @@ import javax.servlet.http.HttpServletResponseWrapper; /** * A filter to wrap json answers as jsonp + * For this to happen, the user has to pass ?<filter.jsonp.callback>=<name> in the url like + * <pre>http://localhost:7080/rest/metric/data/10001/raw.json?jsonp=foo</pre> + * The <filter.jsonp.callback> is defined in web.xml and defaults to 'jsonp'. * @author Heiko W. Rupp */ public class JsonPFilter implements Filter { @@ -132,7 +135,6 @@ public class JsonPFilter implements Filter { private static class JsonPRequestWrapper extends HttpServletRequestWrapper { int contentLength; BufferedReader reader; - String method; ByteArrayInputStream bais; Map<String, String> headers = new HashMap<String, String>(); @@ -147,6 +149,11 @@ public class JsonPFilter implements Filter { Enumeration headers = request.getHeaderNames(); while (headers.hasMoreElements()) { String key = (String) headers.nextElement(); + if (key.equalsIgnoreCase("Accept-Encoding")) { + // Filter Content codings like compression, as we would end up + // with compressed inner data and uncompressed wrapper + continue; + } String value = request.getHeader(key); this.headers.put(key, value); } @@ -157,14 +164,6 @@ public class JsonPFilter implements Filter { } -/* - public void setBody(String body) { - bais = new ByteArrayInputStream(body.getBytes()); - contentLength = body.length(); - headers.put("content-length", Integer.toString(contentLength)); - } -*/ - @Override public BufferedReader getReader() throws IOException { reader = new BufferedReader(new InputStreamReader(bais)); commit 1d75e54e136107c19d0b1163feb69e64993f7944 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Jul 9 17:46:46 2013 +0200 Bump pom versions. Allow to start the generator via mvn exec:java diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index be5e976..7ce1859 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-pluginAnnotations</artifactId> <packaging>jar</packaging> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <name>RHQ plugin annotations</name> <description>Annotations to help generate plugin descriptors</description> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index fb2cce6..e9a5e29 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-pluginGen</artifactId> <packaging>jar</packaging> - <version>4.8.0-SNAPSHOT</version> + <version>4.9.0-SNAPSHOT</version> <name>RHQ plugin generator</name> <description>Helper to generate plugin skeletons</description> @@ -62,6 +62,22 @@ <version>2.1</version> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>org.rhq.helpers.pluginGen.PluginGen</mainClass> + </configuration> + </plugin> + </plugins> </build>

1 0

[rhq] 11 commits - modules/enterprise
by mike thompson 10 Jul '13

10 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/MetricNvd3MultiLineGraph.java | 92 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java | 36 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java | 232 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java | 324 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java | 79 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 1 modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.js |13048 ---------- modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.min.js | 6 modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js | 234 15 files changed, 646 insertions(+), 13450 deletions(-) New commits: commit fd4316e643321b5571389e5707771e69722e2c13 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 14:19:41 2013 -0700 [BZ 924725] Graph refresh also refreshes screen behind graph dialog. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index 0e63274..204d2ec 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -142,7 +142,6 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl Log.warn("# of charted graphs: " + measurementForEachResource.size()); } drawGraph(); - redraw(); } }); commit 2fc86b70b19ae7aea2f25bb52c0318dd40eb08eb Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 14:11:35 2013 -0700 On multi-resource graph normalize units to highest scale (ex. GB instead of MB units if possible). diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index a5a0c9d..0e63274 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -32,6 +32,7 @@ import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; +import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; @@ -47,6 +48,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.ButtonBarDat import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.RedrawGraphs; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; import org.rhq.enterprise.gui.coregui.client.util.async.Command; import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedHLayout; @@ -77,6 +79,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl private MeasurementDefinition definition; private MeasurementUserPreferences measurementUserPreferences; private ButtonBarDateTimeRangeEditor buttonBarDateTimeRangeEditor; + private String adjustedMeasurementUnits; /** * measurementForEachResource is a list of a list of single Measurement data for multiple resources. */ @@ -292,9 +295,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl return definition.getName(); } - public String getYAxisUnits() { - return definition.getUnits().toString(); - } + public String getXAxisTitle() { return MSG.view_charts_time_axis_label(); @@ -353,7 +354,11 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl for (MeasurementDataNumericHighLowComposite measurement : measurementList) { if (!Double.isNaN(measurement.getValue())) { sb.append("{ \"x\":" + measurement.getTimestamp() + ","); - sb.append(" \"y\":" + MeasurementUnits.scaleUp(measurement.getValue(), definition.getUnits()) + "},"); + MeasurementNumericValueAndUnits dataValue = normalizeUnitsAndValues(measurement.getValue(), + definition.getUnits()); + //sb.append(" \"y\":" + MeasurementUnits.scaleUp(measurement.getValue(), definition.getUnits()) + "},"); + sb.append(" \"y\":" + dataValue.getValue() + "},"); + adjustedMeasurementUnits = dataValue.getUnits().toString(); } } sb.setLength(sb.length() - 1); // delete the last ',' @@ -380,6 +385,29 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl return sb.toString(); } + protected MeasurementNumericValueAndUnits normalizeUnitsAndValues(double value, MeasurementUnits measurementUnits) { + MeasurementNumericValueAndUnits newValue = MeasurementConverterClient.fit(value, measurementUnits); + MeasurementNumericValueAndUnits returnValue; + + // adjust for percentage numbers + if (measurementUnits.equals(MeasurementUnits.PERCENTAGE)) { + returnValue = new MeasurementNumericValueAndUnits(newValue.getValue() * 100, newValue.getUnits()); + } else { + returnValue = new MeasurementNumericValueAndUnits(newValue.getValue(), newValue.getUnits()); + } + + return returnValue; + } + + public String getYAxisUnits() { + if (adjustedMeasurementUnits == null) { + Log.warn("ResourceMetricD3GraphView.adjustedMeasurementUnits is populated by getJsonMetrics. Make sure it is called first."); + return ""; + } else { + return adjustedMeasurementUnits; + } + } + protected String getXAxisTimeFormatHoursMinutes() { return MSG.chart_xaxis_time_format_hours_minutes(); } commit 746007a5df10d15da2e42891b9921ef3d7fc1bcc Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 13:33:59 2013 -0700 [BZ 980014] Syntax error for Empty group charts. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java index fca4e80..ecd3b46 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java @@ -294,9 +294,10 @@ public class MetricGraphData implements JsonMetricProducer { * @todo: future: this should really use GSON or some Json marshaller */ public String getJsonMetrics() { - StringBuilder sb = new StringBuilder("["); + StringBuilder sb = new StringBuilder(); boolean gotAdjustedMeasurementUnits = false; if (null != metricData) { + sb = new StringBuilder("["); long firstBarTime = metricData.get(0).getTimestamp(); long secondBarTime = metricData.get(1).getTimestamp(); long barDuration = secondBarTime - firstBarTime; @@ -341,8 +342,8 @@ public class MetricGraphData implements JsonMetricProducer { } } sb.setLength(sb.length() - 1); // delete the last ',' + sb.append("]"); } - sb.append("]"); Log.debug("Json data for: "+getChartTitle()); Log.debug(sb.toString()); return sb.toString(); commit e4acf0fc299e0c37173cf70f573f583bcb81a714 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 13:02:08 2013 -0700 Remove nvd3.js charting library in favor of base d3.js. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupNvD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupNvD3MultiLineGraph.java deleted file mode 100644 index d2ae7ef..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupNvD3MultiLineGraph.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table; - - - -/** - * A MultiLine version of the Composite group single metric multiple resource charts. - * - * @author Mike Thompson - */ -@Deprecated -public final class CompositeGroupNvD3MultiLineGraph extends CompositeGroupD3GraphListView -{ - - public CompositeGroupNvD3MultiLineGraph(int groupId, int defId, boolean isAutogroup) - { - super(groupId, defId, isAutogroup); - } - - - - @Override - public native void drawJsniChart() /*-{ - console.log("Draw nvd3 charts for composite multiline graph"); - var chartId = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), - chartHandle = "#mChart-"+chartId, - chartSelection = chartHandle + " svg", - yAxisUnits = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getYAxisUnits()(), - xAxisLabel = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTitle()(), - xAxisTimeFormat = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3MultiLineGraph::getXAxisTimeFormatHoursMinutes()(); - json = eval(this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getJsonMetrics()()); - - $wnd.nv.addGraph(function() { - var chart = $wnd.nv.models.lineChart(); - - chart.xAxis.axisLabel(xAxisLabel) - .tickFormat(function(d) { return $wnd.d3.time.format(xAxisTimeFormat)(new Date(d)) }); - - chart.yAxis - .axisLabel(yAxisUnits) - .tickFormat($wnd.d3.format('.02f')); - - $wnd.d3.select(chartSelection) - .datum(json) - .transition().duration(300) - .call(chart); - - $wnd.nv.utils.windowResize(chart.update); - - return chart; - }); - - }-*/; - - - -} diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml index 51bec0a..8ef78e0 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml @@ -58,7 +58,6 @@ <script src="/coregui/js/jquery-1.7.2.min.js"/> <script src="/coregui/js/jquery.sparkline-2.1.min.js"/> <script src="/coregui/js/d3.v3.min.js"/> - <script src="/coregui/js/nv.d3.min.js"/> <script src="/coregui/js/jquery.tipsy.js"/> diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.js b/modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.js deleted file mode 100755 index 62ca71e..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.js +++ /dev/null @@ -1,13048 +0,0 @@ -(function(){ - -var nv = window.nv || {}; - -nv.version = '0.0.1a'; -nv.dev = true //set false when in production - -window.nv = nv; - -nv.tooltip = {}; // For the tooltip system -nv.utils = {}; // Utility subsystem -nv.models = {}; //stores all the possible models/components -nv.charts = {}; //stores all the ready to use charts -nv.graphs = []; //stores all the graphs currently on the page -nv.logs = {}; //stores some statistics and potential error messages - -nv.dispatch = d3.dispatch('render_start', 'render_end'); - -// ************************************************************************* -// Development render timers - disabled if dev = false - -if (nv.dev) { - nv.dispatch.on('render_start', function(e) { - nv.logs.startTime = +new Date(); - }); - - nv.dispatch.on('render_end', function(e) { - nv.logs.endTime = +new Date(); - nv.logs.totalTime = nv.logs.endTime - nv.logs.startTime; - nv.log('total', nv.logs.totalTime); // used for development, to keep track of graph generation times - }); -} - -// ******************************************** -// Public Core NV functions - -// Logs all arguments, and returns the last so you can test things in place -nv.log = function() { - if (nv.dev && console.log && console.log.apply) - console.log.apply(console, arguments) - else if (nv.dev && console.log && Function.prototype.bind) { - var log = Function.prototype.bind.call(console.log, console); - log.apply(console, arguments); - } - return arguments[arguments.length - 1]; -}; - - -nv.render = function render(step) { - step = step || 1; // number of graphs to generate in each timeout loop - - nv.render.active = true; - nv.dispatch.render_start(); - - setTimeout(function() { - var chart, graph; - - for (var i = 0; i < step && (graph = nv.render.queue[i]); i++) { - chart = graph.generate(); - if (typeof graph.callback == typeof(Function)) graph.callback(chart); - nv.graphs.push(chart); - } - - nv.render.queue.splice(0, i); - - if (nv.render.queue.length) setTimeout(arguments.callee, 0); - else { nv.render.active = false; nv.dispatch.render_end(); } - }, 0); -}; - -nv.render.active = false; -nv.render.queue = []; - -nv.addGraph = function(obj) { - if (typeof arguments[0] === typeof(Function)) - obj = {generate: arguments[0], callback: arguments[1]}; - - nv.render.queue.push(obj); - - if (!nv.render.active) nv.render(); -}; - -nv.identity = function(d) { return d; }; - -nv.strip = function(s) { return s.replace(/(\s|&)/g,''); }; - -function daysInMonth(month,year) { - return (new Date(year, month+1, 0)).getDate(); -} - -function d3_time_range(floor, step, number) { - return function(t0, t1, dt) { - var time = floor(t0), times = []; - if (time < t0) step(time); - if (dt > 1) { - while (time < t1) { - var date = new Date(+time); - if ((number(date) % dt === 0)) times.push(date); - step(time); - } - } else { - while (time < t1) { times.push(new Date(+time)); step(time); } - } - return times; - }; -} - -d3.time.monthEnd = function(date) { - return new Date(date.getFullYear(), date.getMonth(), 0); -}; - -d3.time.monthEnds = d3_time_range(d3.time.monthEnd, function(date) { - date.setUTCDate(date.getUTCDate() + 1); - date.setDate(daysInMonth(date.getMonth() + 1, date.getFullYear())); - }, function(date) { - return date.getMonth(); - } -); - - -/***** - * A no-frills tooltip implementation. - *****/ - - -(function() { - - var nvtooltip = window.nv.tooltip = {}; - - nvtooltip.show = function(pos, content, gravity, dist, parentContainer, classes) { - - var container = document.createElement('div'); - container.className = 'nvtooltip ' + (classes ? classes : 'xy-tooltip'); - - gravity = gravity || 's'; - dist = dist || 20; - - var body = parentContainer; - if ( !parentContainer || parentContainer.tagName.match(/g|svg/i)) { - //If the parent element is an SVG element, place tooltip in the <body> element. - body = document.getElementsByTagName('body')[0]; - } - - container.innerHTML = content; - container.style.left = 0; - container.style.top = 0; - container.style.opacity = 0; - - body.appendChild(container); - - var height = parseInt(container.offsetHeight), - width = parseInt(container.offsetWidth), - windowWidth = nv.utils.windowSize().width, - windowHeight = nv.utils.windowSize().height, - scrollTop = window.scrollY, - scrollLeft = window.scrollX, - left, top; - - windowHeight = window.innerWidth >= document.body.scrollWidth ? windowHeight : windowHeight - 16; - windowWidth = window.innerHeight >= document.body.scrollHeight ? windowWidth : windowWidth - 16; - - var tooltipTop = function ( Elem ) { - var offsetTop = top; - do { - if( !isNaN( Elem.offsetTop ) ) { - offsetTop += (Elem.offsetTop); - } - } while( Elem = Elem.offsetParent ); - return offsetTop; - } - - var tooltipLeft = function ( Elem ) { - var offsetLeft = left; - do { - if( !isNaN( Elem.offsetLeft ) ) { - offsetLeft += (Elem.offsetLeft); - } - } while( Elem = Elem.offsetParent ); - return offsetLeft; - } - - switch (gravity) { - case 'e': - left = pos[0] - width - dist; - top = pos[1] - (height / 2); - var tLeft = tooltipLeft(container); - var tTop = tooltipTop(container); - if (tLeft < scrollLeft) left = pos[0] + dist > scrollLeft ? pos[0] + dist : scrollLeft - tLeft + left; - if (tTop < scrollTop) top = scrollTop - tTop + top; - if (tTop + height > scrollTop + windowHeight) top = scrollTop + windowHeight - tTop + top - height; - break; - case 'w': - left = pos[0] + dist; - top = pos[1] - (height / 2); - if (tLeft + width > windowWidth) left = pos[0] - width - dist; - if (tTop < scrollTop) top = scrollTop + 5; - if (tTop + height > scrollTop + windowHeight) top = scrollTop - height - 5; - break; - case 'n': - left = pos[0] - (width / 2) - 5; - top = pos[1] + dist; - var tLeft = tooltipLeft(container); - var tTop = tooltipTop(container); - if (tLeft < scrollLeft) left = scrollLeft + 5; - if (tLeft + width > windowWidth) left = left - width/2 + 5; - if (tTop + height > scrollTop + windowHeight) top = scrollTop + windowHeight - tTop + top - height; - break; - case 's': - left = pos[0] - (width / 2); - top = pos[1] - height - dist; - var tLeft = tooltipLeft(container); - var tTop = tooltipTop(container); - if (tLeft < scrollLeft) left = scrollLeft + 5; - if (tLeft + width > windowWidth) left = left - width/2 + 5; - if (scrollTop > tTop) top = scrollTop; - break; - } - - - container.style.left = left+'px'; - container.style.top = top+'px'; - container.style.opacity = 1; - container.style.position = 'absolute'; //fix scroll bar issue - container.style.pointerEvents = 'none'; //fix scroll bar issue - - return container; - }; - - nvtooltip.cleanup = function() { - - // Find the tooltips, mark them for removal by this class (so others cleanups won't find it) - var tooltips = document.getElementsByClassName('nvtooltip'); - var purging = []; - while(tooltips.length) { - purging.push(tooltips[0]); - tooltips[0].style.transitionDelay = '0 !important'; - tooltips[0].style.opacity = 0; - tooltips[0].className = 'nvtooltip-pending-removal'; - } - - - setTimeout(function() { - - while (purging.length) { - var removeMe = purging.pop(); - removeMe.parentNode.removeChild(removeMe); - } - }, 500); - }; - - -})(); - -nv.utils.windowSize = function() { - // Sane defaults - var size = {width: 640, height: 480}; - - // Earlier IE uses Doc.body - if (document.body && document.body.offsetWidth) { - size.width = document.body.offsetWidth; - size.height = document.body.offsetHeight; - } - - // IE can use depending on mode it is in - if (document.compatMode=='CSS1Compat' && - document.documentElement && - document.documentElement.offsetWidth ) { - size.width = document.documentElement.offsetWidth; - size.height = document.documentElement.offsetHeight; - } - - // Most recent browsers use - if (window.innerWidth && window.innerHeight) { - size.width = window.innerWidth; - size.height = window.innerHeight; - } - return (size); -}; - - - -// Easy way to bind multiple functions to window.onresize -// TODO: give a way to remove a function after its bound, other than removing all of them -nv.utils.windowResize = function(fun){ - var oldresize = window.onresize; - - window.onresize = function(e) { - if (typeof oldresize == 'function') oldresize(e); - fun(e); - } -} - -// Backwards compatible way to implement more d3-like coloring of graphs. -// If passed an array, wrap it in a function which implements the old default -// behavior -nv.utils.getColor = function(color) { - if (!arguments.length) return nv.utils.defaultColor(); //if you pass in nothing, get default colors back - - if( Object.prototype.toString.call( color ) === '[object Array]' ) - return function(d, i) { return d.color || color[i % color.length]; }; - else - return color; - //can't really help it if someone passes rubbish as color -} - -// Default color chooser uses the index of an object as before. -nv.utils.defaultColor = function() { - var colors = d3.scale.category20().range(); - return function(d, i) { return d.color || colors[i % colors.length] }; -} - - -// Returns a color function that takes the result of 'getKey' for each series and -// looks for a corresponding color from the dictionary, -nv.utils.customTheme = function(dictionary, getKey, defaultColors) { - getKey = getKey || function(series) { return series.key }; // use default series.key if getKey is undefined - defaultColors = defaultColors || d3.scale.category20().range(); //default color function - - var defIndex = defaultColors.length; //current default color (going in reverse) - - return function(series, index) { - var key = getKey(series); - - if (!defIndex) defIndex = defaultColors.length; //used all the default colors, start over - - if (typeof dictionary[key] !== "undefined") - return (typeof dictionary[key] === "function") ? dictionary[key]() : dictionary[key]; - else - return defaultColors[--defIndex]; // no match in dictionary, use default color - } -} - - - -// From the PJAX example on d3js.org, while this is not really directly needed -// it's a very cool method for doing pjax, I may expand upon it a little bit, -// open to suggestions on anything that may be useful -nv.utils.pjax = function(links, content) { - d3.selectAll(links).on("click", function() { - history.pushState(this.href, this.textContent, this.href); - load(this.href); - d3.event.preventDefault(); - }); - - function load(href) { - d3.html(href, function(fragment) { - var target = d3.select(content).node(); - target.parentNode.replaceChild(d3.select(fragment).select(content).node(), target); - nv.utils.pjax(links, content); - }); - } - - d3.select(window).on("popstate", function() { - if (d3.event.state) load(d3.event.state); - }); -} - -/* For situations where we want to approximate the width in pixels for an SVG:text element. -Most common instance is when the element is in a display:none; container. -Forumla is : text.length * font-size * constant_factor -*/ -nv.utils.calcApproxTextWidth = function (svgTextElem) { - if (svgTextElem instanceof d3.selection) { - var fontSize = parseInt(svgTextElem.style("font-size").replace("px","")); - var textLength = svgTextElem.text().length; - - return textLength * fontSize * 0.5; - } - return 0; -}; -nv.models.axis = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var axis = d3.svg.axis() - ; - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 75 //only used for tickLabel currently - , height = 60 //only used for tickLabel currently - , scale = d3.scale.linear() - , axisLabelText = null - , showMaxMin = true //TODO: showMaxMin should be disabled on all ordinal scaled axes - , highlightZero = true - , rotateLabels = 0 - , rotateYLabel = true - , staggerLabels = false - , isOrdinal = false - , ticks = null - ; - - axis - .scale(scale) - .orient('bottom') - .tickFormat(function(d) { return d }) - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var scale0; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this); - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-axis').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-axis'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g') - - //------------------------------------------------------------ - - - if (ticks !== null) - axis.ticks(ticks); - else if (axis.orient() == 'top' || axis.orient() == 'bottom') - axis.ticks(Math.abs(scale.range()[1] - scale.range()[0]) / 100); - - - //TODO: consider calculating width/height based on whether or not label is added, for reference in charts using this component - - - d3.transition(g) - .call(axis); - - scale0 = scale0 || axis.scale(); - - var fmt = axis.tickFormat(); - if (fmt == null) { - fmt = scale0.tickFormat(); - } - - var axisLabel = g.selectAll('text.nv-axislabel') - .data([axisLabelText || null]); - axisLabel.exit().remove(); - switch (axis.orient()) { - case 'top': - axisLabel.enter().append('text').attr('class', 'nv-axislabel'); - var w = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0])); - axisLabel - .attr('text-anchor', 'middle') - .attr('y', 0) - .attr('x', w/2); - if (showMaxMin) { - var axisMaxMin = wrap.selectAll('g.nv-axisMaxMin') - .data(scale.domain()); - axisMaxMin.enter().append('g').attr('class', 'nv-axisMaxMin').append('text'); - axisMaxMin.exit().remove(); - axisMaxMin - .attr('transform', function(d,i) { - return 'translate(' + scale(d) + ',0)' - }) - .select('text') - .attr('dy', '0em') - .attr('y', -axis.tickPadding()) - .attr('text-anchor', 'middle') - .text(function(d,i) { - var v = fmt(d); - return ('' + v).match('NaN') ? '' : v; - }); - d3.transition(axisMaxMin) - .attr('transform', function(d,i) { - return 'translate(' + scale.range()[i] + ',0)' - }); - } - break; - case 'bottom': - var xLabelMargin = 36; - var maxTextWidth = 30; - var xTicks = g.selectAll('g').select("text"); - if (rotateLabels%360) { - //Calculate the longest xTick width - xTicks.each(function(d,i){ - var width = this.getBBox().width; - if(width > maxTextWidth) maxTextWidth = width; - }); - //Convert to radians before calculating sin. Add 30 to margin for healthy padding. - var sin = Math.abs(Math.sin(rotateLabels*Math.PI/180)); - var xLabelMargin = (sin ? sin*maxTextWidth : maxTextWidth)+30; - //Rotate all xTicks - xTicks - .attr('transform', function(d,i,j) { return 'rotate(' + rotateLabels + ' 0,0)' }) - .attr('text-anchor', rotateLabels%360 > 0 ? 'start' : 'end'); - } - axisLabel.enter().append('text').attr('class', 'nv-axislabel'); - var w = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0])); - axisLabel - .attr('text-anchor', 'middle') - .attr('y', xLabelMargin) - .attr('x', w/2); - if (showMaxMin) { - //if (showMaxMin && !isOrdinal) { - var axisMaxMin = wrap.selectAll('g.nv-axisMaxMin') - //.data(scale.domain()) - .data([scale.domain()[0], scale.domain()[scale.domain().length - 1]]); - axisMaxMin.enter().append('g').attr('class', 'nv-axisMaxMin').append('text'); - axisMaxMin.exit().remove(); - axisMaxMin - .attr('transform', function(d,i) { - return 'translate(' + (scale(d) + (isOrdinal ? scale.rangeBand() / 2 : 0)) + ',0)' - }) - .select('text') - .attr('dy', '.71em') - .attr('y', axis.tickPadding()) - .attr('transform', function(d,i,j) { return 'rotate(' + rotateLabels + ' 0,0)' }) - .attr('text-anchor', rotateLabels ? (rotateLabels%360 > 0 ? 'start' : 'end') : 'middle') - .text(function(d,i) { - var v = fmt(d); - return ('' + v).match('NaN') ? '' : v; - }); - d3.transition(axisMaxMin) - .attr('transform', function(d,i) { - //return 'translate(' + scale.range()[i] + ',0)' - //return 'translate(' + scale(d) + ',0)' - return 'translate(' + (scale(d) + (isOrdinal ? scale.rangeBand() / 2 : 0)) + ',0)' - }); - } - if (staggerLabels) - xTicks - .attr('transform', function(d,i) { return 'translate(0,' + (i % 2 == 0 ? '0' : '12') + ')' }); - - break; - case 'right': - axisLabel.enter().append('text').attr('class', 'nv-axislabel'); - axisLabel - .attr('text-anchor', rotateYLabel ? 'middle' : 'begin') - .attr('transform', rotateYLabel ? 'rotate(90)' : '') - .attr('y', rotateYLabel ? (-Math.max(margin.right,width) + 12) : -10) //TODO: consider calculating this based on largest tick width... OR at least expose this on chart - .attr('x', rotateYLabel ? (scale.range()[0] / 2) : axis.tickPadding()); - if (showMaxMin) { - var axisMaxMin = wrap.selectAll('g.nv-axisMaxMin') - .data(scale.domain()); - axisMaxMin.enter().append('g').attr('class', 'nv-axisMaxMin').append('text') - .style('opacity', 0); - axisMaxMin.exit().remove(); - axisMaxMin - .attr('transform', function(d,i) { - return 'translate(0,' + scale(d) + ')' - }) - .select('text') - .attr('dy', '.32em') - .attr('y', 0) - .attr('x', axis.tickPadding()) - .attr('text-anchor', 'start') - .text(function(d,i) { - var v = fmt(d); - return ('' + v).match('NaN') ? '' : v; - }); - d3.transition(axisMaxMin) - .attr('transform', function(d,i) { - return 'translate(0,' + scale.range()[i] + ')' - }) - .select('text') - .style('opacity', 1); - } - break; - case 'left': - /* - //For dynamically placing the label. Can be used with dynamically-sized chart axis margins - var yTicks = g.selectAll('g').select("text"); - yTicks.each(function(d,i){ - var labelPadding = this.getBBox().width + axis.tickPadding() + 16; - if(labelPadding > width) width = labelPadding; - }); - */ - axisLabel.enter().append('text').attr('class', 'nv-axislabel'); - axisLabel - .attr('text-anchor', rotateYLabel ? 'middle' : 'end') - .attr('transform', rotateYLabel ? 'rotate(-90)' : '') - .attr('y', rotateYLabel ? (-Math.max(margin.left,width) + 12) : -10) //TODO: consider calculating this based on largest tick width... OR at least expose this on chart - .attr('x', rotateYLabel ? (-scale.range()[0] / 2) : -axis.tickPadding()); - if (showMaxMin) { - var axisMaxMin = wrap.selectAll('g.nv-axisMaxMin') - .data(scale.domain()); - axisMaxMin.enter().append('g').attr('class', 'nv-axisMaxMin').append('text') - .style('opacity', 0); - axisMaxMin.exit().remove(); - axisMaxMin - .attr('transform', function(d,i) { - return 'translate(0,' + scale0(d) + ')' - }) - .select('text') - .attr('dy', '.32em') - .attr('y', 0) - .attr('x', -axis.tickPadding()) - .attr('text-anchor', 'end') - .text(function(d,i) { - var v = fmt(d); - return ('' + v).match('NaN') ? '' : v; - }); - d3.transition(axisMaxMin) - .attr('transform', function(d,i) { - return 'translate(0,' + scale.range()[i] + ')' - }) - .select('text') - .style('opacity', 1); - } - break; - } - axisLabel - .text(function(d) { return d }); - - - if (showMaxMin && (axis.orient() === 'left' || axis.orient() === 'right')) { - //check if max and min overlap other values, if so, hide the values that overlap - g.selectAll('g') // the g's wrapping each tick - .each(function(d,i) { - d3.select(this).select('text').attr('opacity', 1); - if (scale(d) < scale.range()[1] + 10 || scale(d) > scale.range()[0] - 10) { // 10 is assuming text height is 16... if d is 0, leave it! - if (d > 1e-10 || d < -1e-10) // accounts for minor floating point errors... though could be problematic if the scale is EXTREMELY SMALL - d3.select(this).attr('opacity', 0); - - d3.select(this).select('text').attr('opacity', 0); // Don't remove the ZERO line!! - } - }); - - //if Max and Min = 0 only show min, Issue #281 - if (scale.domain()[0] == scale.domain()[1] && scale.domain()[0] == 0) - wrap.selectAll('g.nv-axisMaxMin') - .style('opacity', function(d,i) { return !i ? 1 : 0 }); - - } - - if (showMaxMin && (axis.orient() === 'top' || axis.orient() === 'bottom')) { - var maxMinRange = []; - wrap.selectAll('g.nv-axisMaxMin') - .each(function(d,i) { - try { - if (i) // i== 1, max position - maxMinRange.push(scale(d) - this.getBBox().width - 4) //assuming the max and min labels are as wide as the next tick (with an extra 4 pixels just in case) - else // i==0, min position - maxMinRange.push(scale(d) + this.getBBox().width + 4) - }catch (err) { - if (i) // i== 1, max position - maxMinRange.push(scale(d) - 4) //assuming the max and min labels are as wide as the next tick (with an extra 4 pixels just in case) - else // i==0, min position - maxMinRange.push(scale(d) + 4) - } - }); - g.selectAll('g') // the g's wrapping each tick - .each(function(d,i) { - if (scale(d) < maxMinRange[0] || scale(d) > maxMinRange[1]) { - if (d > 1e-10 || d < -1e-10) // accounts for minor floating point errors... though could be problematic if the scale is EXTREMELY SMALL - d3.select(this).remove(); - else - d3.select(this).select('text').remove(); // Don't remove the ZERO line!! - } - }); - } - - - //highlight zero line ... Maybe should not be an option and should just be in CSS? - if (highlightZero) - g.selectAll('.tick') - .filter(function(d) { return !parseFloat(Math.round(d.__data__*100000)/1000000) && (d.__data__ !== undefined) }) //this is because sometimes the 0 tick is a very small fraction, TODO: think of cleaner technique - .classed('zero', true); - - //store old scales for use in transitions on update - scale0 = scale.copy(); - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.axis = axis; - - d3.rebind(chart, axis, 'orient', 'tickValues', 'tickSubdivide', 'tickSize', 'tickPadding', 'tickFormat'); - d3.rebind(chart, scale, 'domain', 'range', 'rangeBand', 'rangeBands'); //these are also accessible by chart.scale(), but added common ones directly for ease of use - - chart.margin = function(_) { - if(!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - } - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.ticks = function(_) { - if (!arguments.length) return ticks; - ticks = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.axisLabel = function(_) { - if (!arguments.length) return axisLabelText; - axisLabelText = _; - return chart; - } - - chart.showMaxMin = function(_) { - if (!arguments.length) return showMaxMin; - showMaxMin = _; - return chart; - } - - chart.highlightZero = function(_) { - if (!arguments.length) return highlightZero; - highlightZero = _; - return chart; - } - - chart.scale = function(_) { - if (!arguments.length) return scale; - scale = _; - axis.scale(scale); - isOrdinal = typeof scale.rangeBands === 'function'; - d3.rebind(chart, scale, 'domain', 'range', 'rangeBand', 'rangeBands'); - return chart; - } - - chart.rotateYLabel = function(_) { - if(!arguments.length) return rotateYLabel; - rotateYLabel = _; - return chart; - } - - chart.rotateLabels = function(_) { - if(!arguments.length) return rotateLabels; - rotateLabels = _; - return chart; - } - - chart.staggerLabels = function(_) { - if (!arguments.length) return staggerLabels; - staggerLabels = _; - return chart; - }; - - - //============================================================ - - - return chart; -} - -// Chart design based on the recommendations of Stephen Few. Implementation -// based on the work of Clint Ivy, Jamie Love, and Jason Davies. -// http://projects.instantcognition.com/protovis/bulletchart/ - -nv.models.bullet = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , orient = 'left' // TODO top & bottom - , reverse = false - , ranges = function(d) { return d.ranges } - , markers = function(d) { return d.markers } - , measures = function(d) { return d.measures } - , forceX = [0] // List of numbers to Force into the X scale (ie. 0, or a max / min, etc.) - , width = 380 - , height = 30 - , tickFormat = null - , color = nv.utils.getColor(['#1f77b4']) - , dispatch = d3.dispatch('elementMouseover', 'elementMouseout') - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(d, i) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - var rangez = ranges.call(this, d, i).slice().sort(d3.descending), - markerz = markers.call(this, d, i).slice().sort(d3.descending), - measurez = measures.call(this, d, i).slice().sort(d3.descending); - - - //------------------------------------------------------------ - // Setup Scales - - // Compute the new x-scale. - var x1 = d3.scale.linear() - .domain( d3.extent(d3.merge([forceX, rangez])) ) - .range(reverse ? [availableWidth, 0] : [0, availableWidth]); - - // Retrieve the old x-scale, if this is an update. - var x0 = this.__chart__ || d3.scale.linear() - .domain([0, Infinity]) - .range(x1.range()); - - // Stash the new scale. - this.__chart__ = x1; - - - var rangeMin = d3.min(rangez), //rangez[2] - rangeMax = d3.max(rangez), //rangez[0] - rangeAvg = rangez[1]; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-bullet').data([d]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-bullet'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('rect').attr('class', 'nv-range nv-rangeMax'); - gEnter.append('rect').attr('class', 'nv-range nv-rangeAvg'); - gEnter.append('rect').attr('class', 'nv-range nv-rangeMin'); - gEnter.append('rect').attr('class', 'nv-measure'); - gEnter.append('path').attr('class', 'nv-markerTriangle'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - - var w0 = function(d) { return Math.abs(x0(d) - x0(0)) }, // TODO: could optimize by precalculating x0(0) and x1(0) - w1 = function(d) { return Math.abs(x1(d) - x1(0)) }; - var xp0 = function(d) { return d < 0 ? x0(d) : x0(0) }, - xp1 = function(d) { return d < 0 ? x1(d) : x1(0) }; - - - g.select('rect.nv-rangeMax') - .attr('height', availableHeight) - .attr('width', w1(rangeMax > 0 ? rangeMax : rangeMin)) - .attr('x', xp1(rangeMax > 0 ? rangeMax : rangeMin)) - .datum(rangeMax > 0 ? rangeMax : rangeMin) - /* - .attr('x', rangeMin < 0 ? - rangeMax > 0 ? - x1(rangeMin) - : x1(rangeMax) - : x1(0)) - */ - - g.select('rect.nv-rangeAvg') - .attr('height', availableHeight) - .attr('width', w1(rangeAvg)) - .attr('x', xp1(rangeAvg)) - .datum(rangeAvg) - /* - .attr('width', rangeMax <= 0 ? - x1(rangeMax) - x1(rangeAvg) - : x1(rangeAvg) - x1(rangeMin)) - .attr('x', rangeMax <= 0 ? - x1(rangeAvg) - : x1(rangeMin)) - */ - - g.select('rect.nv-rangeMin') - .attr('height', availableHeight) - .attr('width', w1(rangeMax)) - .attr('x', xp1(rangeMax)) - .attr('width', w1(rangeMax > 0 ? rangeMin : rangeMax)) - .attr('x', xp1(rangeMax > 0 ? rangeMin : rangeMax)) - .datum(rangeMax > 0 ? rangeMin : rangeMax) - /* - .attr('width', rangeMax <= 0 ? - x1(rangeAvg) - x1(rangeMin) - : x1(rangeMax) - x1(rangeAvg)) - .attr('x', rangeMax <= 0 ? - x1(rangeMin) - : x1(rangeAvg)) - */ - - g.select('rect.nv-measure') - .style('fill', color) - .attr('height', availableHeight / 3) - .attr('y', availableHeight / 3) - .attr('width', measurez < 0 ? - x1(0) - x1(measurez[0]) - : x1(measurez[0]) - x1(0)) - .attr('x', xp1(measurez)) - .on('mouseover', function() { - dispatch.elementMouseover({ - value: measurez[0], - label: 'Current', - pos: [x1(measurez[0]), availableHeight/2] - }) - }) - .on('mouseout', function() { - dispatch.elementMouseout({ - value: measurez[0], - label: 'Current' - }) - }) - - var h3 = availableHeight / 6; - if (markerz[0]) { - g.selectAll('path.nv-markerTriangle') - .attr('transform', function(d) { return 'translate(' + x1(markerz[0]) + ',' + (availableHeight / 2) + ')' }) - .attr('d', 'M0,' + h3 + 'L' + h3 + ',' + (-h3) + ' ' + (-h3) + ',' + (-h3) + 'Z') - .on('mouseover', function() { - dispatch.elementMouseover({ - value: markerz[0], - label: 'Previous', - pos: [x1(markerz[0]), availableHeight/2] - }) - }) - .on('mouseout', function() { - dispatch.elementMouseout({ - value: markerz[0], - label: 'Previous' - }) - }); - } else { - g.selectAll('path.nv-markerTriangle').remove(); - } - - - wrap.selectAll('.nv-range') - .on('mouseover', function(d,i) { - var label = !i ? "Maximum" : i == 1 ? "Mean" : "Minimum"; - - dispatch.elementMouseover({ - value: d, - label: label, - pos: [x1(d), availableHeight/2] - }) - }) - .on('mouseout', function(d,i) { - var label = !i ? "Maximum" : i == 1 ? "Mean" : "Minimum"; - - dispatch.elementMouseout({ - value: d, - label: label - }) - }) - -/* // THIS IS THE PREVIOUS BULLET IMPLEMENTATION, WILL REMOVE SHORTLY - // Update the range rects. - var range = g.selectAll('rect.nv-range') - .data(rangez); - - range.enter().append('rect') - .attr('class', function(d, i) { return 'nv-range nv-s' + i; }) - .attr('width', w0) - .attr('height', availableHeight) - .attr('x', reverse ? x0 : 0) - .on('mouseover', function(d,i) { - dispatch.elementMouseover({ - value: d, - label: (i <= 0) ? 'Maximum' : (i > 1) ? 'Minimum' : 'Mean', //TODO: make these labels a variable - pos: [x1(d), availableHeight/2] - }) - }) - .on('mouseout', function(d,i) { - dispatch.elementMouseout({ - value: d, - label: (i <= 0) ? 'Minimum' : (i >=1) ? 'Maximum' : 'Mean' //TODO: make these labels a variable - }) - }) - - d3.transition(range) - .attr('x', reverse ? x1 : 0) - .attr('width', w1) - .attr('height', availableHeight); - - - // Update the measure rects. - var measure = g.selectAll('rect.nv-measure') - .data(measurez); - - measure.enter().append('rect') - .attr('class', function(d, i) { return 'nv-measure nv-s' + i; }) - .style('fill', function(d,i) { return color(d,i ) }) - .attr('width', w0) - .attr('height', availableHeight / 3) - .attr('x', reverse ? x0 : 0) - .attr('y', availableHeight / 3) - .on('mouseover', function(d) { - dispatch.elementMouseover({ - value: d, - label: 'Current', //TODO: make these labels a variable - pos: [x1(d), availableHeight/2] - }) - }) - .on('mouseout', function(d) { - dispatch.elementMouseout({ - value: d, - label: 'Current' //TODO: make these labels a variable - }) - }) - - d3.transition(measure) - .attr('width', w1) - .attr('height', availableHeight / 3) - .attr('x', reverse ? x1 : 0) - .attr('y', availableHeight / 3); - - - - // Update the marker lines. - var marker = g.selectAll('path.nv-markerTriangle') - .data(markerz); - - var h3 = availableHeight / 6; - marker.enter().append('path') - .attr('class', 'nv-markerTriangle') - .attr('transform', function(d) { return 'translate(' + x0(d) + ',' + (availableHeight / 2) + ')' }) - .attr('d', 'M0,' + h3 + 'L' + h3 + ',' + (-h3) + ' ' + (-h3) + ',' + (-h3) + 'Z') - .on('mouseover', function(d,i) { - dispatch.elementMouseover({ - value: d, - label: 'Previous', - pos: [x1(d), availableHeight/2] - }) - }) - .on('mouseout', function(d,i) { - dispatch.elementMouseout({ - value: d, - label: 'Previous' - }) - }); - - d3.transition(marker) - .attr('transform', function(d) { return 'translate(' + (x1(d) - x1(0)) + ',' + (availableHeight / 2) + ')' }); - - marker.exit().remove(); -*/ - - }); - - // d3.timer.flush(); // Not needed? - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - // left, right, top, bottom - chart.orient = function(_) { - if (!arguments.length) return orient; - orient = _; - reverse = orient == 'right' || orient == 'bottom'; - return chart; - }; - - // ranges (bad, satisfactory, good) - chart.ranges = function(_) { - if (!arguments.length) return ranges; - ranges = _; - return chart; - }; - - // markers (previous, goal) - chart.markers = function(_) { - if (!arguments.length) return markers; - markers = _; - return chart; - }; - - // measures (actual, forecast) - chart.measures = function(_) { - if (!arguments.length) return measures; - measures = _; - return chart; - }; - - chart.forceX = function(_) { - if (!arguments.length) return forceX; - forceX = _; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.tickFormat = function(_) { - if (!arguments.length) return tickFormat; - tickFormat = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - //============================================================ - - - return chart; -}; - - - -// Chart design based on the recommendations of Stephen Few. Implementation -// based on the work of Clint Ivy, Jamie Love, and Jason Davies. -// http://projects.instantcognition.com/protovis/bulletchart/ -nv.models.bulletChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var bullet = nv.models.bullet() - ; - - var orient = 'left' // TODO top & bottom - , reverse = false - , margin = {top: 5, right: 40, bottom: 20, left: 120} - , ranges = function(d) { return d.ranges } - , markers = function(d) { return d.markers } - , measures = function(d) { return d.measures } - , width = null - , height = 55 - , tickFormat = null - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + x + '</h3>' + - '<p>' + y + '</p>' - } - , noData = 'No Data Available.' - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ) + margin.left, - top = e.pos[1] + ( offsetElement.offsetTop || 0) + margin.top, - content = tooltip(e.key, e.label, e.value, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'e' : 'w', null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(d, i) { - var container = d3.select(this); - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - that = this; - - - chart.update = function() { chart(selection) }; - chart.container = this; - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!d || !ranges.call(this, d, i)) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', 18 + margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - - var rangez = ranges.call(this, d, i).slice().sort(d3.descending), - markerz = markers.call(this, d, i).slice().sort(d3.descending), - measurez = measures.call(this, d, i).slice().sort(d3.descending); - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-bulletChart').data([d]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-bulletChart'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-bulletWrap'); - gEnter.append('g').attr('class', 'nv-titles'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - // Compute the new x-scale. - var x1 = d3.scale.linear() - .domain([0, Math.max(rangez[0], markerz[0], measurez[0])]) // TODO: need to allow forceX and forceY, and xDomain, yDomain - .range(reverse ? [availableWidth, 0] : [0, availableWidth]); - - // Retrieve the old x-scale, if this is an update. - var x0 = this.__chart__ || d3.scale.linear() - .domain([0, Infinity]) - .range(x1.range()); - - // Stash the new scale. - this.__chart__ = x1; - - /* - // Derive width-scales from the x-scales. - var w0 = bulletWidth(x0), - w1 = bulletWidth(x1); - - function bulletWidth(x) { - var x0 = x(0); - return function(d) { - return Math.abs(x(d) - x(0)); - }; - } - - function bulletTranslate(x) { - return function(d) { - return 'translate(' + x(d) + ',0)'; - }; - } - */ - - var w0 = function(d) { return Math.abs(x0(d) - x0(0)) }, // TODO: could optimize by precalculating x0(0) and x1(0) - w1 = function(d) { return Math.abs(x1(d) - x1(0)) }; - - - var title = gEnter.select('.nv-titles').append('g') - .attr('text-anchor', 'end') - .attr('transform', 'translate(-6,' + (height - margin.top - margin.bottom) / 2 + ')'); - title.append('text') - .attr('class', 'nv-title') - .text(function(d) { return d.title; }); - - title.append('text') - .attr('class', 'nv-subtitle') - .attr('dy', '1em') - .text(function(d) { return d.subtitle; }); - - - - bullet - .width(availableWidth) - .height(availableHeight) - - var bulletWrap = g.select('.nv-bulletWrap'); - - d3.transition(bulletWrap).call(bullet); - - - - // Compute the tick format. - var format = tickFormat || x1.tickFormat( availableWidth / 100 ); - - // Update the tick groups. - var tick = g.selectAll('g.nv-tick') - .data(x1.ticks( availableWidth / 50 ), function(d) { - return this.textContent || format(d); - }); - - // Initialize the ticks with the old scale, x0. - var tickEnter = tick.enter().append('g') - .attr('class', 'nv-tick') - .attr('transform', function(d) { return 'translate(' + x0(d) + ',0)' }) - .style('opacity', 1e-6); - - tickEnter.append('line') - .attr('y1', availableHeight) - .attr('y2', availableHeight * 7 / 6); - - tickEnter.append('text') - .attr('text-anchor', 'middle') - .attr('dy', '1em') - .attr('y', availableHeight * 7 / 6) - .text(format); - - - // Transition the updating ticks to the new scale, x1. - var tickUpdate = d3.transition(tick) - .attr('transform', function(d) { return 'translate(' + x1(d) + ',0)' }) - .style('opacity', 1); - - tickUpdate.select('line') - .attr('y1', availableHeight) - .attr('y2', availableHeight * 7 / 6); - - tickUpdate.select('text') - .attr('y', availableHeight * 7 / 6); - - // Transition the exiting ticks to the new scale, x1. - d3.transition(tick.exit()) - .attr('transform', function(d) { return 'translate(' + x1(d) + ',0)' }) - .style('opacity', 1e-6) - .remove(); - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - dispatch.on('tooltipShow', function(e) { - e.key = d.title; - if (tooltips) showTooltip(e, that.parentNode); - }); - - //============================================================ - - }); - - d3.timer.flush(); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - bullet.dispatch.on('elementMouseover.tooltip', function(e) { - dispatch.tooltipShow(e); - }); - - bullet.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - chart.bullet = bullet; - - d3.rebind(chart, bullet, 'color'); - - // left, right, top, bottom - chart.orient = function(x) { - if (!arguments.length) return orient; - orient = x; - reverse = orient == 'right' || orient == 'bottom'; - return chart; - }; - - // ranges (bad, satisfactory, good) - chart.ranges = function(x) { - if (!arguments.length) return ranges; - ranges = x; - return chart; - }; - - // markers (previous, goal) - chart.markers = function(x) { - if (!arguments.length) return markers; - markers = x; - return chart; - }; - - // measures (actual, forecast) - chart.measures = function(x) { - if (!arguments.length) return measures; - measures = x; - return chart; - }; - - chart.width = function(x) { - if (!arguments.length) return width; - width = x; - return chart; - }; - - chart.height = function(x) { - if (!arguments.length) return height; - height = x; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.tickFormat = function(x) { - if (!arguments.length) return tickFormat; - tickFormat = x; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -}; - - - -nv.models.cumulativeLineChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var lines = nv.models.line() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - , controls = nv.models.legend() - ; - - var margin = {top: 30, right: 30, bottom: 50, left: 60} - , color = nv.utils.defaultColor() - , width = null - , height = null - , showLegend = true - , tooltips = true - , showControls = true - , rescaleY = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>' - } - , x //can be accessed via chart.xScale() - , y //can be accessed via chart.yScale() - , id = lines.id() - , state = { index: 0, rescaleY: rescaleY } - , defaultState = null - , noData = 'No Data Available.' - , average = function(d) { return d.average } - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - ; - - xAxis - .orient('bottom') - .tickPadding(7) - ; - yAxis - .orient('left') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var dx = d3.scale.linear() - , index = {i: 0, x: 0} - ; - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(lines.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(lines.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, null, null, offsetElement); - }; - -/* - //Moved to see if we can get better behavior to fix issue #315 - var indexDrag = d3.behavior.drag() - .on('dragstart', dragStart) - .on('drag', dragMove) - .on('dragend', dragEnd); - - function dragStart(d,i) { - d3.select(chart.container) - .style('cursor', 'ew-resize'); - } - - function dragMove(d,i) { - d.x += d3.event.dx; - d.i = Math.round(dx.invert(d.x)); - - d3.select(this).attr('transform', 'translate(' + dx(d.i) + ',0)'); - chart.update(); - } - - function dragEnd(d,i) { - d3.select(chart.container) - .style('cursor', 'auto'); - chart.update(); - } -*/ - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this).classed('nv-chart-' + id, true), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - - chart.update = function() { container.transition().call(chart) }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - var indexDrag = d3.behavior.drag() - .on('dragstart', dragStart) - .on('drag', dragMove) - .on('dragend', dragEnd); - - - function dragStart(d,i) { - d3.select(chart.container) - .style('cursor', 'ew-resize'); - } - - function dragMove(d,i) { - index.x = d3.event.x; - index.i = Math.round(dx.invert(index.x)); - updateZero(); - } - - function dragEnd(d,i) { - d3.select(chart.container) - .style('cursor', 'auto'); - - // update state and send stateChange with new index - state.index = index.i; - dispatch.stateChange(state); - } - - - - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = lines.xScale(); - y = lines.yScale(); - - - if (!rescaleY) { - var seriesDomains = data - .filter(function(series) { return !series.disabled }) - .map(function(series,i) { - var initialDomain = d3.extent(series.values, lines.y()); - - //account for series being disabled when losing 95% or more - if (initialDomain[0] < -.95) initialDomain[0] = -.95; - - return [ - (initialDomain[0] - initialDomain[1]) / (1 + initialDomain[1]), - (initialDomain[1] - initialDomain[0]) / (1 + initialDomain[0]) - ]; - }); - - var completeDomain = [ - d3.min(seriesDomains, function(d) { return d[0] }), - d3.max(seriesDomains, function(d) { return d[1] }) - ] - - lines.yDomain(completeDomain); - } else { - lines.yDomain(null); - } - - - dx .domain([0, data[0].values.length - 1]) //Assumes all series have same length - .range([0, availableWidth]) - .clamp(true); - - //------------------------------------------------------------ - - - var data = indexify(index.i, data); - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-cumulativeLine').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-cumulativeLine').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-background'); - gEnter.append('g').attr('class', 'nv-linesWrap'); - gEnter.append('g').attr('class', 'nv-avgLinesWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - gEnter.append('g').attr('class', 'nv-controlsWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width(availableWidth); - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(0,' + (-margin.top) +')') - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Controls - - if (showControls) { - var controlsData = [ - { key: 'Re-scale y-axis', disabled: !rescaleY } - ]; - - controls.width(140).color(['#444', '#444', '#444']); - g.select('.nv-controlsWrap') - .datum(controlsData) - .attr('transform', 'translate(0,' + (-margin.top) +')') - .call(controls); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - // Show error if series goes below 100% - var tempDisabled = data.filter(function(d) { return d.tempDisabled }); - - wrap.select('.tempDisabled').remove(); //clean-up and prevent duplicates - if (tempDisabled.length) { - wrap.append('text').attr('class', 'tempDisabled') - .attr('x', availableWidth / 2) - .attr('y', '-.71em') - .style('text-anchor', 'end') - .text(tempDisabled.map(function(d) { return d.key }).join(', ') + ' values cannot be calculated for this time period.'); - } - - //------------------------------------------------------------ - // Main Chart Component(s) - - gEnter.select('.nv-background') - .append('rect'); - - g.select('.nv-background rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - lines - //.x(function(d) { return d.x }) - .y(function(d) { return d.display.y }) - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && !data[i].tempDisabled; })); - - - - var linesWrap = g.select('.nv-linesWrap') - .datum(data.filter(function(d) { return !d.disabled && !d.tempDisabled })); - - //d3.transition(linesWrap).call(lines); - linesWrap.call(lines); - - /*Handle average lines [AN-612] ----------------------------*/ - - //Store a series index number in the data array. - data.forEach(function(d,i) { - d.seriesIndex = i; - }); - - var avgLineData = data.filter(function(d) { - return !d.disabled && !!average(d); - }); - - var avgLines = g.select(".nv-avgLinesWrap").selectAll("line") - .data(avgLineData, function(d) { return d.key; }); - - avgLines.enter() - .append('line') - .style('stroke-width',2) - .style('stroke-dasharray','10,10') - .style('stroke',function (d,i) { - return lines.color()(d,d.seriesIndex); - }) - .attr('x1',0) - .attr('x2',availableWidth) - .attr('y1', function(d) { return y(average(d)); }) - .attr('y2', function(d) { return y(average(d)); }); - - avgLines - .attr('x1',0) - .attr('x2',availableWidth) - .attr('y1', function(d) { return y(average(d)); }) - .attr('y2', function(d) { return y(average(d)); }); - - avgLines.exit().remove(); - - //Create index line ----------------------------------------- - - var indexLine = linesWrap.selectAll('.nv-indexLine') - .data([index]); - indexLine.enter().append('rect').attr('class', 'nv-indexLine') - .attr('width', 3) - .attr('x', -2) - .attr('fill', 'red') - .attr('fill-opacity', .5) - .call(indexDrag) - - indexLine - .attr('transform', function(d) { return 'translate(' + dx(d.i) + ',0)' }) - .attr('height', availableHeight) - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - //Suggest how many ticks based on the chart width and D3 should listen (70 is the optimal number for MM/DD/YY dates) - .ticks( Math.min(data[0].values.length,availableWidth/70) ) - .tickSize(-availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y.range()[0] + ')'); - d3.transition(g.select('.nv-x.nv-axis')) - .call(xAxis); - - - yAxis - .scale(y) - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - d3.transition(g.select('.nv-y.nv-axis')) - .call(yAxis); - - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - - function updateZero() { - indexLine - .data([index]); - - container.call(chart); - } - - g.select('.nv-background rect') - .on('click', function() { - index.x = d3.mouse(this)[0]; - index.i = Math.round(dx.invert(index.x)); - - // update state and send stateChange with new index - state.index = index.i; - dispatch.stateChange(state); - - updateZero(); - }); - - lines.dispatch.on('elementClick', function(e) { - index.i = e.pointIndex; - index.x = dx(index.i); - - // update state and send stateChange with new index - state.index = index.i; - dispatch.stateChange(state); - - updateZero(); - }); - - controls.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - rescaleY = !d.disabled; - - state.rescaleY = rescaleY; - dispatch.stateChange(state); - - //selection.transition().call(chart); - chart.update(); - }); - - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - //selection.transition().call(chart); - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - -/* - // - legend.dispatch.on('legendMouseover', function(d, i) { - d.hover = true; - selection.transition().call(chart) - }); - - legend.dispatch.on('legendMouseout', function(d, i) { - d.hover = false; - selection.transition().call(chart) - }); -*/ - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - - if (typeof e.index !== 'undefined') { - index.i = e.index; - index.x = dx(index.i); - - state.index = e.index; - - indexLine - .data([index]); - } - - - if (typeof e.rescaleY !== 'undefined') { - rescaleY = e.rescaleY; - } - - chart.update(); - }); - - //============================================================ - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - lines.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.lines = lines; - chart.legend = legend; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, lines, 'defined', 'isArea', 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.rescaleY = function(_) { - if (!arguments.length) return rescaleY; - rescaleY = _ - return rescaleY; - }; - - chart.showControls = function(_) { - if (!arguments.length) return showControls; - showControls = _; - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - chart.average = function(_) { - if(!arguments.length) return average; - average = _; - return chart; - }; - - //============================================================ - - - //============================================================ - // Functions - //------------------------------------------------------------ - - /* Normalize the data according to an index point. */ - function indexify(idx, data) { - return data.map(function(line, i) { - if (!line.values) { - return line; - } - var v = lines.y()(line.values[idx], idx); - - //TODO: implement check below, and disable series if series loses 100% or more cause divide by 0 issue - if (v < -.95) { - //if a series loses more than 100%, calculations fail.. anything close can cause major distortion (but is mathematically correct till it hits 100) - line.tempDisabled = true; - return line; - } - - line.tempDisabled = false; - - line.values = line.values.map(function(point, pointIndex) { - point.display = {'y': (lines.y()(point, pointIndex) - v) / (1 + v) }; - return point; - }) - - return line; - }) - } - - //============================================================ - - - return chart; -} -//TODO: consider deprecating by adding necessary features to multiBar model -nv.models.discreteBar = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one - , x = d3.scale.ordinal() - , y = d3.scale.linear() - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , forceY = [0] // 0 is forced by default.. this makes sense for the majority of bar graphs... user can always do chart.forceY([]) to remove - , color = nv.utils.defaultColor() - , showValues = false - , valueFormat = d3.format(',.2f') - , xDomain - , yDomain - , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout') - , rectClass = 'discreteBar' - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - - //add series index to each data point for reference - data = data.map(function(series, i) { - series.values = series.values.map(function(point) { - point.series = i; - return point; - }); - return series; - }); - - - //------------------------------------------------------------ - // Setup Scales - - // remap and flatten the data for use in calculating the scales' domains - var seriesData = (xDomain && yDomain) ? [] : // if we know xDomain and yDomain, no need to calculate - data.map(function(d) { - return d.values.map(function(d,i) { - return { x: getX(d,i), y: getY(d,i), y0: d.y0 } - }) - }); - - x .domain(xDomain || d3.merge(seriesData).map(function(d) { return d.x })) - .rangeBands([0, availableWidth], .1); - - y .domain(yDomain || d3.extent(d3.merge(seriesData).map(function(d) { return d.y }).concat(forceY))); - - - // If showValues, pad the Y axis range to account for label height - if (showValues) y.range([availableHeight - (y.domain()[0] < 0 ? 12 : 0), y.domain()[1] > 0 ? 12 : 0]); - else y.range([availableHeight, 0]); - - //store old scales if they exist - x0 = x0 || x; - y0 = y0 || y.copy().range([y(0),y(0)]); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-discretebar').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-discretebar'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-groups'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - - //TODO: by definition, the discrete bar should not have multiple groups, will modify/remove later - var groups = wrap.select('.nv-groups').selectAll('.nv-group') - .data(function(d) { return d }, function(d) { return d.key }); - groups.enter().append('g') - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6); - d3.transition(groups.exit()) - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6) - .remove(); - groups - .attr('class', function(d,i) { return 'nv-group nv-series-' + i }) - .classed('hover', function(d) { return d.hover }); - d3.transition(groups) - .style('stroke-opacity', 1) - .style('fill-opacity', .75); - - - var bars = groups.selectAll('g.nv-bar') - .data(function(d) { return d.values }); - - bars.exit().remove(); - - - var barsEnter = bars.enter().append('g') - .attr('transform', function(d,i,j) { - return 'translate(' + (x(getX(d,i)) + x.rangeBand() * .05 ) + ', ' + y(0) + ')' - }) - .on('mouseover', function(d,i) { //TODO: figure out why j works above, but not here - d3.select(this).classed('hover', true); - dispatch.elementMouseover({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (d.series + .5) / data.length), y(getY(d,i))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - }) - .on('mouseout', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.elementMouseout({ - value: getY(d,i), - point: d, - series: data[d.series], - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - }) - .on('click', function(d,i) { - dispatch.elementClick({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (d.series + .5) / data.length), y(getY(d,i))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - d3.event.stopPropagation(); - }) - .on('dblclick', function(d,i) { - dispatch.elementDblClick({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (d.series + .5) / data.length), y(getY(d,i))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - d3.event.stopPropagation(); - }); - - barsEnter.append('rect') - .attr('height', 0) - .attr('width', x.rangeBand() * .9 / data.length ) - - if (showValues) { - barsEnter.append('text') - .attr('text-anchor', 'middle') - bars.select('text') - .attr('x', x.rangeBand() * .9 / 2) - .attr('y', function(d,i) { return getY(d,i) < 0 ? y(getY(d,i)) - y(0) + 12 : -4 }) - .text(function(d,i) { return valueFormat(getY(d,i)) }); - } else { - bars.selectAll('text').remove(); - } - - bars - .attr('class', function(d,i) { return getY(d,i) < 0 ? 'nv-bar negative' : 'nv-bar positive' }) - .style('fill', function(d,i) { return d.color || color(d,i) }) - .style('stroke', function(d,i) { return d.color || color(d,i) }) - .select('rect') - .attr('class', rectClass) - .attr('width', x.rangeBand() * .9 / data.length); - d3.transition(bars) - //.delay(function(d,i) { return i * 1200 / data[0].values.length }) - .attr('transform', function(d,i) { - var left = x(getX(d,i)) + x.rangeBand() * .05, - top = getY(d,i) < 0 ? - y(0) : - y(0) - y(getY(d,i)) < 1 ? - y(0) - 1 : //make 1 px positive bars show up above y=0 - y(getY(d,i)); - - return 'translate(' + left + ', ' + top + ')' - }) - .select('rect') - .attr('height', function(d,i) { - return Math.max(Math.abs(y(getY(d,i)) - y(0)) || 1) - }); - - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.forceY = function(_) { - if (!arguments.length) return forceY; - forceY = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - chart.showValues = function(_) { - if (!arguments.length) return showValues; - showValues = _; - return chart; - }; - - chart.valueFormat= function(_) { - if (!arguments.length) return valueFormat; - valueFormat = _; - return chart; - }; - - chart.rectClass= function(_) { - if (!arguments.length) return rectClass; - rectClass = _; - return chart; - } - //============================================================ - - - return chart; -} - -nv.models.discreteBarChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var discretebar = nv.models.discreteBar() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - ; - - var margin = {top: 15, right: 10, bottom: 50, left: 60} - , width = null - , height = null - , color = nv.utils.getColor() - , staggerLabels = false - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + x + '</h3>' + - '<p>' + y + '</p>' - } - , x - , y - , noData = "No Data Available." - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'beforeUpdate') - ; - - xAxis - .orient('bottom') - .highlightZero(false) - .showMaxMin(false) - .tickFormat(function(d) { return d }) - ; - yAxis - .orient('left') - .tickFormat(d3.format(',.1f')) - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(discretebar.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(discretebar.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - - chart.update = function() { dispatch.beforeUpdate(); container.transition().call(chart); }; - chart.container = this; - - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = discretebar.xScale(); - y = discretebar.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-discreteBarWithAxes').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-discreteBarWithAxes').append('g'); - var defsEnter = gEnter.append('defs'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-barsWrap'); - - g.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Main Chart Component(s) - - discretebar - .width(availableWidth) - .height(availableHeight); - - - var barsWrap = g.select('.nv-barsWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(barsWrap).call(discretebar); - - //------------------------------------------------------------ - - - - defsEnter.append('clipPath') - .attr('id', 'nv-x-label-clip-' + discretebar.id()) - .append('rect'); - - g.select('#nv-x-label-clip-' + discretebar.id() + ' rect') - .attr('width', x.rangeBand() * (staggerLabels ? 2 : 1)) - .attr('height', 16) - .attr('x', -x.rangeBand() / (staggerLabels ? 1 : 2 )); - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + (y.range()[0] + ((discretebar.showValues() && y.domain()[0] < 0) ? 16 : 0)) + ')'); - //d3.transition(g.select('.nv-x.nv-axis')) - g.select('.nv-x.nv-axis').transition().duration(0) - .call(xAxis); - - - var xTicks = g.select('.nv-x.nv-axis').selectAll('g'); - - if (staggerLabels) { - xTicks - .selectAll('text') - .attr('transform', function(d,i,j) { return 'translate(0,' + (j % 2 == 0 ? '5' : '17') + ')' }) - } - - yAxis - .scale(y) - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - d3.transition(g.select('.nv-y.nv-axis')) - .call(yAxis); - - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - //============================================================ - - - }); - - return chart; - } - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - discretebar.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - discretebar.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.discretebar = discretebar; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, discretebar, 'x', 'y', 'xDomain', 'yDomain', 'forceX', 'forceY', 'id', 'showValues', 'valueFormat'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - discretebar.color(color); - return chart; - }; - - chart.staggerLabels = function(_) { - if (!arguments.length) return staggerLabels; - staggerLabels = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.distribution = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 400 //technically width or height depending on x or y.... - , size = 8 - , axis = 'x' // 'x' or 'y'... horizontal or vertical - , getData = function(d) { return d[axis] } // defaults d.x or d.y - , color = nv.utils.defaultColor() - , scale = d3.scale.linear() - , domain - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var scale0; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableLength = width - (axis === 'x' ? margin.left + margin.right : margin.top + margin.bottom), - naxis = axis == 'x' ? 'y' : 'x', - container = d3.select(this); - - - //------------------------------------------------------------ - // Setup Scales - - scale0 = scale0 || scale; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-distribution').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-distribution'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')') - - //------------------------------------------------------------ - - - var distWrap = g.selectAll('g.nv-dist') - .data(function(d) { return d }, function(d) { return d.key }); - - distWrap.enter().append('g'); - distWrap - .attr('class', function(d,i) { return 'nv-dist nv-series-' + i }) - .style('stroke', function(d,i) { return color(d, i) }); - - var dist = distWrap.selectAll('line.nv-dist' + axis) - .data(function(d) { return d.values }) - dist.enter().append('line') - .attr(axis + '1', function(d,i) { return scale0(getData(d,i)) }) - .attr(axis + '2', function(d,i) { return scale0(getData(d,i)) }) - d3.transition(distWrap.exit().selectAll('line.nv-dist' + axis)) - .attr(axis + '1', function(d,i) { return scale(getData(d,i)) }) - .attr(axis + '2', function(d,i) { return scale(getData(d,i)) }) - .style('stroke-opacity', 0) - .remove(); - dist - .attr('class', function(d,i) { return 'nv-dist' + axis + ' nv-dist' + axis + '-' + i }) - .attr(naxis + '1', 0) - .attr(naxis + '2', size); - d3.transition(dist) - .attr(axis + '1', function(d,i) { return scale(getData(d,i)) }) - .attr(axis + '2', function(d,i) { return scale(getData(d,i)) }) - - - scale0 = scale.copy(); - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.axis = function(_) { - if (!arguments.length) return axis; - axis = _; - return chart; - }; - - chart.size = function(_) { - if (!arguments.length) return size; - size = _; - return chart; - }; - - chart.getData = function(_) { - if (!arguments.length) return getData; - getData = d3.functor(_); - return chart; - }; - - chart.scale = function(_) { - if (!arguments.length) return scale; - scale = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - //============================================================ - - - return chart; -} -//TODO: consider deprecating and using multibar with single series for this -nv.models.historicalBar = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one - , x = d3.scale.linear() - , y = d3.scale.linear() - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , forceX = [] - , forceY = [0] - , padData = false - , clipEdge = true - , color = nv.utils.defaultColor() - , xDomain - , yDomain - , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout') - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - - //------------------------------------------------------------ - // Setup Scales - - x .domain(xDomain || d3.extent(data[0].values.map(getX).concat(forceX) )) - - if (padData) - x.range([availableWidth * .5 / data[0].values.length, availableWidth * (data[0].values.length - .5) / data[0].values.length ]); - else - x.range([0, availableWidth]); - - y .domain(yDomain || d3.extent(data[0].values.map(getY).concat(forceY) )) - .range([availableHeight, 0]); - - // If scale's domain don't have a range, slightly adjust to make one... so a chart can show a single data point - if (x.domain()[0] === x.domain()[1] || y.domain()[0] === y.domain()[1]) singlePoint = true; - if (x.domain()[0] === x.domain()[1]) - x.domain()[0] ? - x.domain([x.domain()[0] - x.domain()[0] * 0.01, x.domain()[1] + x.domain()[1] * 0.01]) - : x.domain([-1,1]); - - if (y.domain()[0] === y.domain()[1]) - y.domain()[0] ? - y.domain([y.domain()[0] + y.domain()[0] * 0.01, y.domain()[1] - y.domain()[1] * 0.01]) - : y.domain([-1,1]); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-bar').data([data[0].values]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-bar'); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-bars'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - container - .on('click', function(d,i) { - dispatch.chartClick({ - data: d, - index: i, - pos: d3.event, - id: id - }); - }); - - - defsEnter.append('clipPath') - .attr('id', 'nv-chart-clip-path-' + id) - .append('rect'); - - wrap.select('#nv-chart-clip-path-' + id + ' rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g .attr('clip-path', clipEdge ? 'url(#nv-chart-clip-path-' + id + ')' : ''); - - - - var bars = wrap.select('.nv-bars').selectAll('.nv-bar') - .data(function(d) { return d }); - - bars.exit().remove(); - - - var barsEnter = bars.enter().append('rect') - //.attr('class', function(d,i,j) { return (getY(d,i) < 0 ? 'nv-bar negative' : 'nv-bar positive') + ' nv-bar-' + j + '-' + i }) - .attr('x', 0 ) - .attr('y', function(d,i) { return y(Math.max(0, getY(d,i))) }) - .attr('height', function(d,i) { return Math.abs(y(getY(d,i)) - y(0)) }) - .on('mouseover', function(d,i) { - d3.select(this).classed('hover', true); - dispatch.elementMouseover({ - point: d, - series: data[0], - pos: [x(getX(d,i)), y(getY(d,i))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: 0, - e: d3.event - }); - - }) - .on('mouseout', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.elementMouseout({ - point: d, - series: data[0], - pointIndex: i, - seriesIndex: 0, - e: d3.event - }); - }) - .on('click', function(d,i) { - dispatch.elementClick({ - //label: d[label], - value: getY(d,i), - data: d, - index: i, - pos: [x(getX(d,i)), y(getY(d,i))], - e: d3.event, - id: id - }); - d3.event.stopPropagation(); - }) - .on('dblclick', function(d,i) { - dispatch.elementDblClick({ - //label: d[label], - value: getY(d,i), - data: d, - index: i, - pos: [x(getX(d,i)), y(getY(d,i))], - e: d3.event, - id: id - }); - d3.event.stopPropagation(); - }); - - bars - .attr('fill', function(d,i) { return color(d, i); }) - .attr('class', function(d,i,j) { return (getY(d,i) < 0 ? 'nv-bar negative' : 'nv-bar positive') + ' nv-bar-' + j + '-' + i }) - .attr('transform', function(d,i) { return 'translate(' + (x(getX(d,i)) - availableWidth / data[0].values.length * .45) + ',0)'; }) //TODO: better width calculations that don't assume always uniform data spacing;w - .attr('width', (availableWidth / data[0].values.length) * .9 ) - - - d3.transition(bars) - //.attr('y', function(d,i) { return y(Math.max(0, getY(d,i))) }) - .attr('y', function(d,i) { - return getY(d,i) < 0 ? - y(0) : - y(0) - y(getY(d,i)) < 1 ? - y(0) - 1 : - y(getY(d,i)) - }) - .attr('height', function(d,i) { return Math.max(Math.abs(y(getY(d,i)) - y(0)),1) }); - //.order(); // not sure if this makes any sense for this model - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.forceX = function(_) { - if (!arguments.length) return forceX; - forceX = _; - return chart; - }; - - chart.forceY = function(_) { - if (!arguments.length) return forceY; - forceY = _; - return chart; - }; - - chart.padData = function(_) { - if (!arguments.length) return padData; - padData = _; - return chart; - }; - - chart.clipEdge = function(_) { - if (!arguments.length) return clipEdge; - clipEdge = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.historicalBarChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var bars = nv.models.historicalBar() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - ; - - - var margin = {top: 30, right: 90, bottom: 50, left: 90} - , color = nv.utils.defaultColor() - , width = null - , height = null - , showLegend = false - , showXAxis = true - , showYAxis = true - , rightAlignYAxis = false - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>' - } - , x - , y - , state = {} - , defaultState = null - , noData = 'No Data Available.' - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - ; - - xAxis - .orient('bottom') - .tickPadding(7) - ; - yAxis - .orient( (rightAlignYAxis) ? 'right' : 'left') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - - // New addition to calculate position if SVG is scaled with viewBox, may move TODO: consider implementing everywhere else - if (offsetElement) { - var svg = d3.select(offsetElement).select('svg'); - var viewBox = (svg.node()) ? svg.attr('viewBox') : null; - if (viewBox) { - viewBox = viewBox.split(' '); - var ratio = parseInt(svg.style('width')) / viewBox[2]; - e.pos[0] = e.pos[0] * ratio; - e.pos[1] = e.pos[1] * ratio; - } - } - - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(bars.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(bars.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, null, null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - - chart.update = function() { chart(selection) }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display noData message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = bars.xScale(); - y = bars.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-lineChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-lineChart').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-barsWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width(availableWidth); - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - wrap.select('.nv-legendWrap') - .attr('transform', 'translate(0,' + (-margin.top) +')') - } - - //------------------------------------------------------------ - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - if (rightAlignYAxis) { - g.select(".nv-y.nv-axis") - .attr("transform", "translate(" + availableWidth + ",0)"); - } - - - //------------------------------------------------------------ - // Main Chart Component(s) - - bars - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - - - var barsWrap = g.select('.nv-barsWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(barsWrap).call(bars); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - if (showXAxis) { - xAxis - .scale(x) - .tickSize(-availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y.range()[0] + ')'); - g.select('.nv-x.nv-axis') - .transition() - .call(xAxis); - } - - if (showYAxis) { - yAxis - .scale(y) - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - g.select('.nv-y.nv-axis') - .transition().duration(0) - .call(yAxis); - } - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - selection.transition().call(chart); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - -/* - legend.dispatch.on('legendMouseover', function(d, i) { - d.hover = true; - selection.transition().call(chart) - }); - - legend.dispatch.on('legendMouseout', function(d, i) { - d.hover = false; - selection.transition().call(chart) - }); -*/ - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - selection.call(chart); - }); - - //============================================================ - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - bars.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - bars.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.bars = bars; - chart.legend = legend; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, bars, 'defined', 'isArea', 'x', 'y', 'size', 'xScale', 'yScale', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id', 'interpolate'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.showXAxis = function(_) { - if (!arguments.length) return showXAxis; - showXAxis = _; - return chart; - }; - - chart.showYAxis = function(_) { - if (!arguments.length) return showYAxis; - showYAxis = _; - return chart; - }; - - chart.rightAlignYAxis = function(_) { - if(!arguments.length) return rightAlignYAxis; - rightAlignYAxis = _; - yAxis.orient( (_) ? 'right' : 'left'); - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} -nv.models.indentedTree = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} //TODO: implement, maybe as margin on the containing div - , width = 960 - , height = 500 - , color = nv.utils.defaultColor() - , id = Math.floor(Math.random() * 10000) - , header = true - , filterZero = false - , noData = "No Data Available." - , childIndent = 20 - , columns = [{key:'key', label: 'Name', type:'text'}] //TODO: consider functions like chart.addColumn, chart.removeColumn, instead of a block like this - , tableClass = null - , iconOpen = 'images/grey-plus.png' //TODO: consider removing this and replacing with a '+' or '-' unless user defines images - , iconClose = 'images/grey-minus.png' - , dispatch = d3.dispatch('elementClick', 'elementDblclick', 'elementMouseover', 'elementMouseout') - ; - - //============================================================ - - var idx = 0; - - function chart(selection) { - selection.each(function(data) { - var depth = 1, - container = d3.select(this); - - var tree = d3.layout.tree() - .children(function(d) { return d.values }) - .size([height, childIndent]); //Not sure if this is needed now that the result is HTML - - chart.update = function() { container.transition().duration(600).call(chart) }; - - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - if (!data[0]) data[0] = {key: noData}; - - //------------------------------------------------------------ - - - var nodes = tree.nodes(data[0]); - - // nodes.map(function(d) { - // d.id = i++; - // }) - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = d3.select(this).selectAll('div').data([[nodes]]); - var wrapEnter = wrap.enter().append('div').attr('class', 'nvd3 nv-wrap nv-indentedtree'); - var tableEnter = wrapEnter.append('table'); - var table = wrap.select('table').attr('width', '100%').attr('class', tableClass); - - //------------------------------------------------------------ - - - if (header) { - var thead = tableEnter.append('thead'); - - var theadRow1 = thead.append('tr'); - - columns.forEach(function(column) { - theadRow1 - .append('th') - .attr('width', column.width ? column.width : '10%') - .style('text-align', column.type == 'numeric' ? 'right' : 'left') - .append('span') - .text(column.label); - }); - } - - - var tbody = table.selectAll('tbody') - .data(function(d) { return d }); - tbody.enter().append('tbody'); - - - - //compute max generations - depth = d3.max(nodes, function(node) { return node.depth }); - tree.size([height, depth * childIndent]); //TODO: see if this is necessary at all - - - // Update the nodes… - var node = tbody.selectAll('tr') - // .data(function(d) { return d; }, function(d) { return d.id || (d.id == ++i)}); - .data(function(d) { return d.filter(function(d) { return (filterZero && !d.children) ? filterZero(d) : true; } )}, function(d,i) { return d.id || (d.id || ++idx)}); - //.style('display', 'table-row'); //TODO: see if this does anything - - node.exit().remove(); - - node.select('img.nv-treeicon') - .attr('src', icon) - .classed('folded', folded); - - var nodeEnter = node.enter().append('tr'); - - - columns.forEach(function(column, index) { - - var nodeName = nodeEnter.append('td') - .style('padding-left', function(d) { return (index ? 0 : d.depth * childIndent + 12 + (icon(d) ? 0 : 16)) + 'px' }, 'important') //TODO: check why I did the ternary here - .style('text-align', column.type == 'numeric' ? 'right' : 'left'); - - - if (index == 0) { - nodeName.append('img') - .classed('nv-treeicon', true) - .classed('nv-folded', folded) - .attr('src', icon) - .style('width', '14px') - .style('height', '14px') - .style('padding', '0 1px') - .style('display', function(d) { return icon(d) ? 'inline-block' : 'none'; }) - .on('click', click); - } - - - nodeName.append('span') - .attr('class', d3.functor(column.classes) ) - .text(function(d) { return column.format ? column.format(d) : - (d[column.key] || '-') }); - - if (column.showCount) { - nodeName.append('span') - .attr('class', 'nv-childrenCount'); - - node.selectAll('span.nv-childrenCount').text(function(d) { - return ((d.values && d.values.length) || (d._values && d._values.length)) ? //If this is a parent - '(' + ((d.values && (d.values.filter(function(d) { return filterZero ? filterZero(d) : true; }).length)) //If children are in values check its children and filter - || (d._values && d._values.filter(function(d) { return filterZero ? filterZero(d) : true; }).length) //Otherwise, do the same, but with the other name, _values... - || 0) + ')' //This is the catch-all in case there are no children after a filter - : '' //If this is not a parent, just give an empty string - }); - } - - if (column.click) - nodeName.select('span').on('click', column.click); - - }); - - node - .order() - .on('click', function(d) { - dispatch.elementClick({ - row: this, //TODO: decide whether or not this should be consistent with scatter/line events or should be an html link (a href) - data: d, - pos: [d.x, d.y] - }); - }) - .on('dblclick', function(d) { - dispatch.elementDblclick({ - row: this, - data: d, - pos: [d.x, d.y] - }); - }) - .on('mouseover', function(d) { - dispatch.elementMouseover({ - row: this, - data: d, - pos: [d.x, d.y] - }); - }) - .on('mouseout', function(d) { - dispatch.elementMouseout({ - row: this, - data: d, - pos: [d.x, d.y] - }); - }); - - - - - // Toggle children on click. - function click(d, _, unshift) { - d3.event.stopPropagation(); - - if(d3.event.shiftKey && !unshift) { - //If you shift-click, it'll toggle fold all the children, instead of itself - d3.event.shiftKey = false; - d.values && d.values.forEach(function(node){ - if (node.values || node._values) { - click(node, 0, true); - } - }); - return true; - } - if(!hasChildren(d)) { - //download file - //window.location.href = d.url; - return true; - } - if (d.values) { - d._values = d.values; - d.values = null; - } else { - d.values = d._values; - d._values = null; - } - chart.update(); - } - - - function icon(d) { - return (d._values && d._values.length) ? iconOpen : (d.values && d.values.length) ? iconClose : ''; - } - - function folded(d) { - return (d._values && d._values.length); - } - - function hasChildren(d) { - var values = d.values || d._values; - - return (values && values.length); - } - - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - scatter.color(color); - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - chart.header = function(_) { - if (!arguments.length) return header; - header = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - chart.filterZero = function(_) { - if (!arguments.length) return filterZero; - filterZero = _; - return chart; - }; - - chart.columns = function(_) { - if (!arguments.length) return columns; - columns = _; - return chart; - }; - - chart.tableClass = function(_) { - if (!arguments.length) return tableClass; - tableClass = _; - return chart; - }; - - chart.iconOpen = function(_){ - if (!arguments.length) return iconOpen; - iconOpen = _; - return chart; - } - - chart.iconClose = function(_){ - if (!arguments.length) return iconClose; - iconClose = _; - return chart; - } - - //============================================================ - - - return chart; -};nv.models.legend = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 5, right: 0, bottom: 5, left: 0} - , width = 400 - , height = 20 - , getKey = function(d) { return d.key } - , color = nv.utils.defaultColor() - , align = true - , dispatch = d3.dispatch('legendClick', 'legendDblclick', 'legendMouseover', 'legendMouseout') - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - container = d3.select(this); - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-legend').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-legend').append('g'); - var g = wrap.select('g'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - var series = g.selectAll('.nv-series') - .data(function(d) { return d }); - var seriesEnter = series.enter().append('g').attr('class', 'nv-series') - .on('mouseover', function(d,i) { - dispatch.legendMouseover(d,i); //TODO: Make consistent with other event objects - }) - .on('mouseout', function(d,i) { - dispatch.legendMouseout(d,i); - }) - .on('click', function(d,i) { - dispatch.legendClick(d,i); - }) - .on('dblclick', function(d,i) { - dispatch.legendDblclick(d,i); - }); - seriesEnter.append('circle') - .style('stroke-width', 2) - .attr('r', 5); - seriesEnter.append('text') - .attr('text-anchor', 'start') - .attr('dy', '.32em') - .attr('dx', '8'); - series.classed('disabled', function(d) { return d.disabled }); - series.exit().remove(); - series.select('circle') - .style('fill', function(d,i) { return d.color || color(d,i)}) - .style('stroke', function(d,i) { return d.color || color(d, i) }); - series.select('text').text(getKey); - - - //TODO: implement fixed-width and max-width options (max-width is especially useful with the align option) - - // NEW ALIGNING CODE, TODO: clean up - if (align) { - - var seriesWidths = []; - series.each(function(d,i) { - var legendText = d3.select(this).select('text'); - var svgComputedTextLength = legendText.node().getComputedTextLength() - || nv.utils.calcApproxTextWidth(legendText); - seriesWidths.push(svgComputedTextLength + 28); // 28 is ~ the width of the circle plus some padding - }); - - //nv.log('Series Widths: ', JSON.stringify(seriesWidths)); - - var seriesPerRow = 0; - var legendWidth = 0; - var columnWidths = []; - - while ( legendWidth < availableWidth && seriesPerRow < seriesWidths.length) { - columnWidths[seriesPerRow] = seriesWidths[seriesPerRow]; - legendWidth += seriesWidths[seriesPerRow++]; - } - - - while ( legendWidth > availableWidth && seriesPerRow > 1 ) { - columnWidths = []; - seriesPerRow--; - - for (k = 0; k < seriesWidths.length; k++) { - if (seriesWidths[k] > (columnWidths[k % seriesPerRow] || 0) ) - columnWidths[k % seriesPerRow] = seriesWidths[k]; - } - - legendWidth = columnWidths.reduce(function(prev, cur, index, array) { - return prev + cur; - }); - } - //console.log(columnWidths, legendWidth, seriesPerRow); - - var xPositions = []; - for (var i = 0, curX = 0; i < seriesPerRow; i++) { - xPositions[i] = curX; - curX += columnWidths[i]; - } - - series - .attr('transform', function(d, i) { - return 'translate(' + xPositions[i % seriesPerRow] + ',' + (5 + Math.floor(i / seriesPerRow) * 20) + ')'; - }); - - //position legend as far right as possible within the total width - g.attr('transform', 'translate(' + (width - margin.right - legendWidth) + ',' + margin.top + ')'); - - height = margin.top + margin.bottom + (Math.ceil(seriesWidths.length / seriesPerRow) * 20); - - } else { - - var ypos = 5, - newxpos = 5, - maxwidth = 0, - xpos; - series - .attr('transform', function(d, i) { - var length = d3.select(this).select('text').node().getComputedTextLength() + 28; - xpos = newxpos; - - if (width < margin.left + margin.right + xpos + length) { - newxpos = xpos = 5; - ypos += 20; - } - - newxpos += length; - if (newxpos > maxwidth) maxwidth = newxpos; - - return 'translate(' + xpos + ',' + ypos + ')'; - }); - - //position legend as far right as possible within the total width - g.attr('transform', 'translate(' + (width - margin.right - maxwidth) + ',' + margin.top + ')'); - - height = margin.top + margin.bottom + ypos + 15; - - } - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.key = function(_) { - if (!arguments.length) return getKey; - getKey = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.align = function(_) { - if (!arguments.length) return align; - align = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.line = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var scatter = nv.models.scatter() - ; - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , color = nv.utils.defaultColor() // a function that returns a color - , getX = function(d) { return d.x } // accessor to get the x value from a data point - , getY = function(d) { return d.y } // accessor to get the y value from a data point - , defined = function(d,i) { return !isNaN(getY(d,i)) && getY(d,i) !== null } // allows a line to be not continuous when it is not defined - , isArea = function(d) { return d.area } // decides if a line is an area or just a line - , clipEdge = false // if true, masks lines within x and y scale - , x //can be accessed via chart.xScale() - , y //can be accessed via chart.yScale() - , interpolate = "linear" // controls the line interpolation - ; - - scatter - .size(16) // default size - .sizeDomain([16,256]) //set to speed up calculation, needs to be unset if there is a custom size accessor - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0 //used to store previous scales - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - //------------------------------------------------------------ - // Setup Scales - - x = scatter.xScale(); - y = scatter.yScale(); - - x0 = x0 || x; - y0 = y0 || y; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-line').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-line'); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g') - - gEnter.append('g').attr('class', 'nv-groups'); - gEnter.append('g').attr('class', 'nv-scatterWrap'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - - - scatter - .width(availableWidth) - .height(availableHeight) - - var scatterWrap = wrap.select('.nv-scatterWrap'); - //.datum(data); // Data automatically trickles down from the wrap - - d3.transition(scatterWrap).call(scatter); - - - - defsEnter.append('clipPath') - .attr('id', 'nv-edge-clip-' + scatter.id()) - .append('rect'); - - wrap.select('#nv-edge-clip-' + scatter.id() + ' rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g .attr('clip-path', clipEdge ? 'url(#nv-edge-clip-' + scatter.id() + ')' : ''); - scatterWrap - .attr('clip-path', clipEdge ? 'url(#nv-edge-clip-' + scatter.id() + ')' : ''); - - - - - var groups = wrap.select('.nv-groups').selectAll('.nv-group') - .data(function(d) { return d }, function(d) { return d.key }); - groups.enter().append('g') - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6); - d3.transition(groups.exit()) - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6) - .remove(); - groups - .attr('class', function(d,i) { return 'nv-group nv-series-' + i }) - .classed('hover', function(d) { return d.hover }) - .style('fill', function(d,i){ return color(d, i) }) - .style('stroke', function(d,i){ return color(d, i)}); - d3.transition(groups) - .style('stroke-opacity', 1) - .style('fill-opacity', .5); - - - - var areaPaths = groups.selectAll('path.nv-area') - .data(function(d) { return isArea(d) ? [d] : [] }); // this is done differently than lines because I need to check if series is an area - areaPaths.enter().append('path') - .attr('class', 'nv-area') - .attr('d', function(d) { - return d3.svg.area() - .interpolate(interpolate) - .defined(defined) - .x(function(d,i) { return x0(getX(d,i)) }) - .y0(function(d,i) { return y0(getY(d,i)) }) - .y1(function(d,i) { return y0( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) }) - //.y1(function(d,i) { return y0(0) }) //assuming 0 is within y domain.. may need to tweak this - .apply(this, [d.values]) - }); - d3.transition(groups.exit().selectAll('path.nv-area')) - .attr('d', function(d) { - return d3.svg.area() - .interpolate(interpolate) - .defined(defined) - .x(function(d,i) { return x(getX(d,i)) }) - .y0(function(d,i) { return y(getY(d,i)) }) - .y1(function(d,i) { return y( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) }) - //.y1(function(d,i) { return y0(0) }) //assuming 0 is within y domain.. may need to tweak this - .apply(this, [d.values]) - }); - d3.transition(areaPaths) - .attr('d', function(d) { - return d3.svg.area() - .interpolate(interpolate) - .defined(defined) - .x(function(d,i) { return x(getX(d,i)) }) - .y0(function(d,i) { return y(getY(d,i)) }) - .y1(function(d,i) { return y( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) }) - //.y1(function(d,i) { return y0(0) }) //assuming 0 is within y domain.. may need to tweak this - .apply(this, [d.values]) - }); - - - - var linePaths = groups.selectAll('path.nv-line') - .data(function(d) { return [d.values] }); - linePaths.enter().append('path') - .attr('class', 'nv-line') - .attr('d', - d3.svg.line() - .interpolate(interpolate) - .defined(defined) - .x(function(d,i) { return x0(getX(d,i)) }) - .y(function(d,i) { return y0(getY(d,i)) }) - ); - d3.transition(groups.exit().selectAll('path.nv-line')) - .attr('d', - d3.svg.line() - .interpolate(interpolate) - .defined(defined) - .x(function(d,i) { return x(getX(d,i)) }) - .y(function(d,i) { return y(getY(d,i)) }) - ); - d3.transition(linePaths) - .attr('d', - d3.svg.line() - .interpolate(interpolate) - .defined(defined) - .x(function(d,i) { return x(getX(d,i)) }) - .y(function(d,i) { return y(getY(d,i)) }) - ); - - - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = scatter.dispatch; - chart.scatter = scatter; - - d3.rebind(chart, scatter, 'id', 'interactive', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'sizeDomain', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'clipRadius', 'padData'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - scatter.x(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - scatter.y(_); - return chart; - }; - - chart.clipEdge = function(_) { - if (!arguments.length) return clipEdge; - clipEdge = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - scatter.color(color); - return chart; - }; - - chart.interpolate = function(_) { - if (!arguments.length) return interpolate; - interpolate = _; - return chart; - }; - - chart.defined = function(_) { - if (!arguments.length) return defined; - defined = _; - return chart; - }; - - chart.isArea = function(_) { - if (!arguments.length) return isArea; - isArea = d3.functor(_); - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.lineChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var lines = nv.models.line() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - ; - -//set margin.right to 23 to fit dates on the x-axis within the chart - var margin = {top: 30, right: 20, bottom: 50, left: 60} - , color = nv.utils.defaultColor() - , width = null - , height = null - , showLegend = true - , showXAxis = true - , showYAxis = true - , rightAlignYAxis = false - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>' - } - , x - , y - , state = {} - , defaultState = null - , noData = 'No Data Available.' - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - ; - - xAxis - .orient('bottom') - .tickPadding(7) - ; - yAxis - .orient((rightAlignYAxis) ? 'right' : 'left') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - - // New addition to calculate position if SVG is scaled with viewBox, may move TODO: consider implementing everywhere else - if (offsetElement) { - var svg = d3.select(offsetElement).select('svg'); - var viewBox = (svg.node()) ? svg.attr('viewBox') : null; - if (viewBox) { - viewBox = viewBox.split(' '); - var ratio = parseInt(svg.style('width')) / viewBox[2]; - e.pos[0] = e.pos[0] * ratio; - e.pos[1] = e.pos[1] * ratio; - } - } - - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(lines.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(lines.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, null, null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - - chart.update = function() { container.transition().call(chart) }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display noData message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = lines.xScale(); - y = lines.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-lineChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-lineChart').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-linesWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width(availableWidth); - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - wrap.select('.nv-legendWrap') - .attr('transform', 'translate(0,' + (-margin.top) +')') - } - - //------------------------------------------------------------ - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - if (rightAlignYAxis) { - g.select(".nv-y.nv-axis") - .attr("transform", "translate(" + availableWidth + ",0)"); - } - - //------------------------------------------------------------ - // Main Chart Component(s) - - lines - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - - - var linesWrap = g.select('.nv-linesWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(linesWrap).call(lines); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - if (showXAxis) { - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y.range()[0] + ')'); - d3.transition(g.select('.nv-x.nv-axis')) - .call(xAxis); - } - - if (showYAxis) { - yAxis - .scale(y) - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - d3.transition(g.select('.nv-y.nv-axis')) - .call(yAxis); - } - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - // container.transition().call(chart); - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - -/* - legend.dispatch.on('legendMouseover', function(d, i) { - d.hover = true; - selection.transition().call(chart) - }); - - legend.dispatch.on('legendMouseout', function(d, i) { - d.hover = false; - selection.transition().call(chart) - }); -*/ - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - chart.update(); - }); - - //============================================================ - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - lines.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.lines = lines; - chart.legend = legend; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, lines, 'defined', 'isArea', 'x', 'y', 'size', 'xScale', 'yScale', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id', 'interpolate'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.showXAxis = function(_) { - if (!arguments.length) return showXAxis; - showXAxis = _; - return chart; - }; - - chart.showYAxis = function(_) { - if (!arguments.length) return showYAxis; - showYAxis = _; - return chart; - }; - - chart.rightAlignYAxis = function(_) { - if(!arguments.length) return rightAlignYAxis; - rightAlignYAxis = _; - yAxis.orient( (_) ? 'right' : 'left'); - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.linePlusBarChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var lines = nv.models.line() - , bars = nv.models.historicalBar() - , xAxis = nv.models.axis() - , y1Axis = nv.models.axis() - , y2Axis = nv.models.axis() - , legend = nv.models.legend() - ; - - var margin = {top: 30, right: 60, bottom: 50, left: 60} - , width = null - , height = null - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , color = nv.utils.defaultColor() - , showLegend = true - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>'; - } - , x - , y1 - , y2 - , state = {} - , defaultState = null - , noData = "No Data Available." - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - ; - - bars - .padData(true) - ; - lines - .clipEdge(false) - .padData(true) - ; - xAxis - .orient('bottom') - .tickPadding(7) - .highlightZero(false) - ; - y1Axis - .orient('left') - ; - y2Axis - .orient('right') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(lines.x()(e.point, e.pointIndex)), - y = (e.series.bar ? y1Axis : y2Axis).tickFormat()(lines.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement); - } - ; - - //------------------------------------------------------------ - - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart); }; - // chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - var dataBars = data.filter(function(d) { return !d.disabled && d.bar }); - var dataLines = data.filter(function(d) { return !d.bar }); // removed the !d.disabled clause here to fix Issue #240 - - //x = xAxis.scale(); - x = dataLines.filter(function(d) { return !d.disabled; }).length && dataLines.filter(function(d) { return !d.disabled; })[0].values.length ? lines.xScale() : bars.xScale(); - //x = dataLines.filter(function(d) { return !d.disabled; }).length ? lines.xScale() : bars.xScale(); //old code before change above - y1 = bars.yScale(); - y2 = lines.yScale(); - - //------------------------------------------------------------ - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = d3.select(this).selectAll('g.nv-wrap.nv-linePlusBar').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-linePlusBar').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y1 nv-axis'); - gEnter.append('g').attr('class', 'nv-y2 nv-axis'); - gEnter.append('g').attr('class', 'nv-barsWrap'); - gEnter.append('g').attr('class', 'nv-linesWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width( availableWidth / 2 ); - - g.select('.nv-legendWrap') - .datum(data.map(function(series) { - series.originalKey = series.originalKey === undefined ? series.key : series.originalKey; - series.key = series.originalKey + (series.bar ? ' (left axis)' : ' (right axis)'); - return series; - })) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(' + ( availableWidth / 2 ) + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - - lines - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && !data[i].bar })) - - bars - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && data[i].bar })) - - - - var barsWrap = g.select('.nv-barsWrap') - .datum(dataBars.length ? dataBars : [{values:[]}]) - - var linesWrap = g.select('.nv-linesWrap') - .datum(dataLines[0] && !dataLines[0].disabled ? dataLines : [{values:[]}] ); - //.datum(!dataLines[0].disabled ? dataLines : [{values:dataLines[0].values.map(function(d) { return [d[0], null] }) }] ); - - d3.transition(barsWrap).call(bars); - d3.transition(linesWrap).call(lines); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y1.range()[0] + ')'); - d3.transition(g.select('.nv-x.nv-axis')) - .call(xAxis); - - - y1Axis - .scale(y1) - .ticks( availableHeight / 36 ) - .tickSize(-availableWidth, 0); - - d3.transition(g.select('.nv-y1.nv-axis')) - .style('opacity', dataBars.length ? 1 : 0) - .call(y1Axis); - - - y2Axis - .scale(y2) - .ticks( availableHeight / 36 ) - .tickSize(dataBars.length ? 0 : -availableWidth, 0); // Show the y2 rules only if y1 has none - - g.select('.nv-y2.nv-axis') - .style('opacity', dataLines.length ? 1 : 0) - .attr('transform', 'translate(' + availableWidth + ',0)'); - //.attr('transform', 'translate(' + x.range()[1] + ',0)'); - - d3.transition(g.select('.nv-y2.nv-axis')) - .call(y2Axis); - - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - chart.update(); - }); - - //============================================================ - - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - lines.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - bars.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - bars.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.legend = legend; - chart.lines = lines; - chart.bars = bars; - chart.xAxis = xAxis; - chart.y1Axis = y1Axis; - chart.y2Axis = y2Axis; - - d3.rebind(chart, lines, 'defined', 'size', 'clipVoronoi', 'interpolate'); - //TODO: consider rebinding x, y and some other stuff, and simply do soemthign lile bars.x(lines.x()), etc. - //d3.rebind(chart, lines, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id'); - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - lines.x(_); - bars.x(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - lines.y(_); - bars.y(_); - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.lineWithFocusChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var lines = nv.models.line() - , lines2 = nv.models.line() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , x2Axis = nv.models.axis() - , y2Axis = nv.models.axis() - , legend = nv.models.legend() - , brush = d3.svg.brush() - ; - - var margin = {top: 30, right: 30, bottom: 30, left: 60} - , margin2 = {top: 0, right: 30, bottom: 20, left: 60} - , color = nv.utils.defaultColor() - , width = null - , height = null - , height2 = 100 - , x - , y - , x2 - , y2 - , showLegend = true - , brushExtent = null - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>' - } - , noData = "No Data Available." - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'brush') - ; - - lines - .clipEdge(true) - ; - lines2 - .interactive(false) - ; - xAxis - .orient('bottom') - .tickPadding(5) - ; - yAxis - .orient('left') - ; - x2Axis - .orient('bottom') - .tickPadding(5) - ; - y2Axis - .orient('left') - ; - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(lines.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(lines.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, null, null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight1 = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom - height2, - availableHeight2 = height2 - margin2.top - margin2.bottom; - - chart.update = function() { container.transition().call(chart) }; - chart.container = this; - - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight1 / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = lines.xScale(); - y = lines.yScale(); - x2 = lines2.xScale(); - y2 = lines2.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-lineWithFocusChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-lineWithFocusChart').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-legendWrap'); - - var focusEnter = gEnter.append('g').attr('class', 'nv-focus'); - focusEnter.append('g').attr('class', 'nv-x nv-axis'); - focusEnter.append('g').attr('class', 'nv-y nv-axis'); - focusEnter.append('g').attr('class', 'nv-linesWrap'); - - var contextEnter = gEnter.append('g').attr('class', 'nv-context'); - contextEnter.append('g').attr('class', 'nv-x nv-axis'); - contextEnter.append('g').attr('class', 'nv-y nv-axis'); - contextEnter.append('g').attr('class', 'nv-linesWrap'); - contextEnter.append('g').attr('class', 'nv-brushBackground'); - contextEnter.append('g').attr('class', 'nv-x nv-brush'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width(availableWidth); - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight1 = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom - height2; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(0,' + (-margin.top) +')') - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - lines - .width(availableWidth) - .height(availableHeight1) - .color( - data - .map(function(d,i) { - return d.color || color(d, i); - }) - .filter(function(d,i) { - return !data[i].disabled; - }) - ); - - lines2 - .defined(lines.defined()) - .width(availableWidth) - .height(availableHeight2) - .color( - data - .map(function(d,i) { - return d.color || color(d, i); - }) - .filter(function(d,i) { - return !data[i].disabled; - }) - ); - - g.select('.nv-context') - .attr('transform', 'translate(0,' + ( availableHeight1 + margin.bottom + margin2.top) + ')') - - var contextLinesWrap = g.select('.nv-context .nv-linesWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(contextLinesWrap).call(lines2); - - //------------------------------------------------------------ - - - /* - var focusLinesWrap = g.select('.nv-focus .nv-linesWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(focusLinesWrap).call(lines); - */ - - - //------------------------------------------------------------ - // Setup Main (Focus) Axes - - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight1, 0); - - yAxis - .scale(y) - .ticks( availableHeight1 / 36 ) - .tickSize( -availableWidth, 0); - - g.select('.nv-focus .nv-x.nv-axis') - .attr('transform', 'translate(0,' + availableHeight1 + ')'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Brush - - brush - .x(x2) - .on('brush', onBrush); - - if (brushExtent) brush.extent(brushExtent); - - var brushBG = g.select('.nv-brushBackground').selectAll('g') - .data([brushExtent || brush.extent()]) - - var brushBGenter = brushBG.enter() - .append('g'); - - brushBGenter.append('rect') - .attr('class', 'left') - .attr('x', 0) - .attr('y', 0) - .attr('height', availableHeight2); - - brushBGenter.append('rect') - .attr('class', 'right') - .attr('x', 0) - .attr('y', 0) - .attr('height', availableHeight2); - - gBrush = g.select('.nv-x.nv-brush') - .call(brush); - gBrush.selectAll('rect') - //.attr('y', -5) - .attr('height', availableHeight2); - gBrush.selectAll('.resize').append('path').attr('d', resizePath); - - onBrush(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Secondary (Context) Axes - - x2Axis - .scale(x2) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight2, 0); - - g.select('.nv-context .nv-x.nv-axis') - .attr('transform', 'translate(0,' + y2.range()[0] + ')'); - d3.transition(g.select('.nv-context .nv-x.nv-axis')) - .call(x2Axis); - - - y2Axis - .scale(y2) - .ticks( availableHeight2 / 36 ) - .tickSize( -availableWidth, 0); - - d3.transition(g.select('.nv-context .nv-y.nv-axis')) - .call(y2Axis); - - g.select('.nv-context .nv-x.nv-axis') - .attr('transform', 'translate(0,' + y2.range()[0] + ')'); - - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - container.transition().call(chart); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - //============================================================ - - - //============================================================ - // Functions - //------------------------------------------------------------ - - // Taken from crossfilter (http://square.github.com/crossfilter/) - function resizePath(d) { - var e = +(d == 'e'), - x = e ? 1 : -1, - y = availableHeight2 / 3; - return 'M' + (.5 * x) + ',' + y - + 'A6,6 0 0 ' + e + ' ' + (6.5 * x) + ',' + (y + 6) - + 'V' + (2 * y - 6) - + 'A6,6 0 0 ' + e + ' ' + (.5 * x) + ',' + (2 * y) - + 'Z' - + 'M' + (2.5 * x) + ',' + (y + 8) - + 'V' + (2 * y - 8) - + 'M' + (4.5 * x) + ',' + (y + 8) - + 'V' + (2 * y - 8); - } - - - function updateBrushBG() { - if (!brush.empty()) brush.extent(brushExtent); - brushBG - .data([brush.empty() ? x2.domain() : brushExtent]) - .each(function(d,i) { - var leftWidth = x2(d[0]) - x.range()[0], - rightWidth = x.range()[1] - x2(d[1]); - d3.select(this).select('.left') - .attr('width', leftWidth < 0 ? 0 : leftWidth); - - d3.select(this).select('.right') - .attr('x', x2(d[1])) - .attr('width', rightWidth < 0 ? 0 : rightWidth); - }); - } - - - function onBrush() { - brushExtent = brush.empty() ? null : brush.extent(); - extent = brush.empty() ? x2.domain() : brush.extent(); - - - dispatch.brush({extent: extent, brush: brush}); - - - updateBrushBG(); - - // Update Main (Focus) - var focusLinesWrap = g.select('.nv-focus .nv-linesWrap') - .datum( - data - .filter(function(d) { return !d.disabled }) - .map(function(d,i) { - return { - key: d.key, - values: d.values.filter(function(d,i) { - return lines.x()(d,i) >= extent[0] && lines.x()(d,i) <= extent[1]; - }) - } - }) - ); - d3.transition(focusLinesWrap).call(lines); - - - // Update Main (Focus) Axes - d3.transition(g.select('.nv-focus .nv-x.nv-axis')) - .call(xAxis); - d3.transition(g.select('.nv-focus .nv-y.nv-axis')) - .call(yAxis); - } - - //============================================================ - - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - lines.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.legend = legend; - chart.lines = lines; - chart.lines2 = lines2; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - chart.x2Axis = x2Axis; - chart.y2Axis = y2Axis; - - d3.rebind(chart, lines, 'defined', 'isArea', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id'); - - chart.x = function(_) { - if (!arguments.length) return lines.x; - lines.x(_); - lines2.x(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return lines.y; - lines.y(_); - lines2.y(_); - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.margin2 = function(_) { - if (!arguments.length) return margin2; - margin2 = _; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.height2 = function(_) { - if (!arguments.length) return height2; - height2 = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color =nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.interpolate = function(_) { - if (!arguments.length) return lines.interpolate(); - lines.interpolate(_); - lines2.interpolate(_); - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - // Chart has multiple similar Axes, to prevent code duplication, probably need to link all axis functions manually like below - chart.xTickFormat = function(_) { - if (!arguments.length) return xAxis.tickFormat(); - xAxis.tickFormat(_); - x2Axis.tickFormat(_); - return chart; - }; - - chart.yTickFormat = function(_) { - if (!arguments.length) return yAxis.tickFormat(); - yAxis.tickFormat(_); - y2Axis.tickFormat(_); - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.linePlusBarWithFocusChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var lines = nv.models.line() - , lines2 = nv.models.line() - , bars = nv.models.historicalBar() - , bars2 = nv.models.historicalBar() - , xAxis = nv.models.axis() - , x2Axis = nv.models.axis() - , y1Axis = nv.models.axis() - , y2Axis = nv.models.axis() - , y3Axis = nv.models.axis() - , y4Axis = nv.models.axis() - , legend = nv.models.legend() - , brush = d3.svg.brush() - ; - - var margin = {top: 30, right: 30, bottom: 30, left: 60} - , margin2 = {top: 0, right: 30, bottom: 20, left: 60} - , width = null - , height = null - , height2 = 100 - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , color = nv.utils.defaultColor() - , showLegend = true - , extent - , brushExtent = null - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>'; - } - , x - , x2 - , y1 - , y2 - , y3 - , y4 - , noData = "No Data Available." - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'brush') - ; - - lines - .clipEdge(true) - ; - lines2 - .interactive(false) - ; - xAxis - .orient('bottom') - .tickPadding(5) - ; - y1Axis - .orient('left') - ; - y2Axis - .orient('right') - ; - x2Axis - .orient('bottom') - .tickPadding(5) - ; - y3Axis - .orient('left') - ; - y4Axis - .orient('right') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - if (extent) { - e.pointIndex += Math.ceil(extent[0]); - } - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(lines.x()(e.point, e.pointIndex)), - y = (e.series.bar ? y1Axis : y2Axis).tickFormat()(lines.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - //------------------------------------------------------------ - - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight1 = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom - height2, - availableHeight2 = height2 - margin2.top - margin2.bottom; - - chart.update = function() { container.transition().call(chart); }; - chart.container = this; - - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight1 / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - var dataBars = data.filter(function(d) { return !d.disabled && d.bar }); - var dataLines = data.filter(function(d) { return !d.bar }); // removed the !d.disabled clause here to fix Issue #240 - - x = bars.xScale(); - x2 = x2Axis.scale(); - y1 = bars.yScale(); - y2 = lines.yScale(); - y3 = bars2.yScale(); - y4 = lines2.yScale(); - - var series1 = data - .filter(function(d) { return !d.disabled && d.bar }) - .map(function(d) { - return d.values.map(function(d,i) { - return { x: getX(d,i), y: getY(d,i) } - }) - }); - - var series2 = data - .filter(function(d) { return !d.disabled && !d.bar }) - .map(function(d) { - return d.values.map(function(d,i) { - return { x: getX(d,i), y: getY(d,i) } - }) - }); - - x .range([0, availableWidth]); - - x2 .domain(d3.extent(d3.merge(series1.concat(series2)), function(d) { return d.x } )) - .range([0, availableWidth]); - - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-linePlusBar').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-linePlusBar').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-legendWrap'); - - var focusEnter = gEnter.append('g').attr('class', 'nv-focus'); - focusEnter.append('g').attr('class', 'nv-x nv-axis'); - focusEnter.append('g').attr('class', 'nv-y1 nv-axis'); - focusEnter.append('g').attr('class', 'nv-y2 nv-axis'); - focusEnter.append('g').attr('class', 'nv-barsWrap'); - focusEnter.append('g').attr('class', 'nv-linesWrap'); - - var contextEnter = gEnter.append('g').attr('class', 'nv-context'); - contextEnter.append('g').attr('class', 'nv-x nv-axis'); - contextEnter.append('g').attr('class', 'nv-y1 nv-axis'); - contextEnter.append('g').attr('class', 'nv-y2 nv-axis'); - contextEnter.append('g').attr('class', 'nv-barsWrap'); - contextEnter.append('g').attr('class', 'nv-linesWrap'); - contextEnter.append('g').attr('class', 'nv-brushBackground'); - contextEnter.append('g').attr('class', 'nv-x nv-brush'); - - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width( availableWidth / 2 ); - - g.select('.nv-legendWrap') - .datum(data.map(function(series) { - series.originalKey = series.originalKey === undefined ? series.key : series.originalKey; - series.key = series.originalKey + (series.bar ? ' (left axis)' : ' (right axis)'); - return series; - })) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight1 = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom - height2; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(' + ( availableWidth / 2 ) + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Context Components - - bars2 - .width(availableWidth) - .height(availableHeight2) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && data[i].bar })); - - lines2 - .width(availableWidth) - .height(availableHeight2) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && !data[i].bar })); - - var bars2Wrap = g.select('.nv-context .nv-barsWrap') - .datum(dataBars.length ? dataBars : [{values:[]}]); - - var lines2Wrap = g.select('.nv-context .nv-linesWrap') - .datum(!dataLines[0].disabled ? dataLines : [{values:[]}]); - - g.select('.nv-context') - .attr('transform', 'translate(0,' + ( availableHeight1 + margin.bottom + margin2.top) + ')') - - d3.transition(bars2Wrap).call(bars2); - d3.transition(lines2Wrap).call(lines2); - - //------------------------------------------------------------ - - - - //------------------------------------------------------------ - // Setup Brush - - brush - .x(x2) - .on('brush', onBrush); - - if (brushExtent) brush.extent(brushExtent); - - var brushBG = g.select('.nv-brushBackground').selectAll('g') - .data([brushExtent || brush.extent()]) - - var brushBGenter = brushBG.enter() - .append('g'); - - brushBGenter.append('rect') - .attr('class', 'left') - .attr('x', 0) - .attr('y', 0) - .attr('height', availableHeight2); - - brushBGenter.append('rect') - .attr('class', 'right') - .attr('x', 0) - .attr('y', 0) - .attr('height', availableHeight2); - - var gBrush = g.select('.nv-x.nv-brush') - .call(brush); - gBrush.selectAll('rect') - //.attr('y', -5) - .attr('height', availableHeight2); - gBrush.selectAll('.resize').append('path').attr('d', resizePath); - - //------------------------------------------------------------ - - //------------------------------------------------------------ - // Setup Secondary (Context) Axes - - x2Axis - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight2, 0); - - g.select('.nv-context .nv-x.nv-axis') - .attr('transform', 'translate(0,' + y3.range()[0] + ')'); - d3.transition(g.select('.nv-context .nv-x.nv-axis')) - .call(x2Axis); - - - y3Axis - .scale(y3) - .ticks( availableHeight2 / 36 ) - .tickSize( -availableWidth, 0); - - g.select('.nv-context .nv-y1.nv-axis') - .style('opacity', dataBars.length ? 1 : 0) - .attr('transform', 'translate(0,' + x2.range()[0] + ')'); - - d3.transition(g.select('.nv-context .nv-y1.nv-axis')) - .call(y3Axis); - - - y4Axis - .scale(y4) - .ticks( availableHeight2 / 36 ) - .tickSize(dataBars.length ? 0 : -availableWidth, 0); // Show the y2 rules only if y1 has none - - g.select('.nv-context .nv-y2.nv-axis') - .style('opacity', dataLines.length ? 1 : 0) - .attr('transform', 'translate(' + x2.range()[1] + ',0)'); - - d3.transition(g.select('.nv-context .nv-y2.nv-axis')) - .call(y4Axis); - - //------------------------------------------------------------ - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - chart.update(); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - //============================================================ - - - //============================================================ - // Functions - //------------------------------------------------------------ - - // Taken from crossfilter (http://square.github.com/crossfilter/) - function resizePath(d) { - var e = +(d == 'e'), - x = e ? 1 : -1, - y = availableHeight2 / 3; - return 'M' + (.5 * x) + ',' + y - + 'A6,6 0 0 ' + e + ' ' + (6.5 * x) + ',' + (y + 6) - + 'V' + (2 * y - 6) - + 'A6,6 0 0 ' + e + ' ' + (.5 * x) + ',' + (2 * y) - + 'Z' - + 'M' + (2.5 * x) + ',' + (y + 8) - + 'V' + (2 * y - 8) - + 'M' + (4.5 * x) + ',' + (y + 8) - + 'V' + (2 * y - 8); - } - - - function updateBrushBG() { - if (!brush.empty()) brush.extent(brushExtent); - brushBG - .data([brush.empty() ? x2.domain() : brushExtent]) - .each(function(d,i) { - var leftWidth = x2(d[0]) - x2.range()[0], - rightWidth = x2.range()[1] - x2(d[1]); - d3.select(this).select('.left') - .attr('width', leftWidth < 0 ? 0 : leftWidth); - - d3.select(this).select('.right') - .attr('x', x2(d[1])) - .attr('width', rightWidth < 0 ? 0 : rightWidth); - }); - } - - - function onBrush() { - brushExtent = brush.empty() ? null : brush.extent(); - extent = brush.empty() ? x2.domain() : brush.extent(); - - - dispatch.brush({extent: extent, brush: brush}); - - updateBrushBG(); - - - //------------------------------------------------------------ - // Prepare Main (Focus) Bars and Lines - - bars - .width(availableWidth) - .height(availableHeight1) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && data[i].bar })); - - - lines - .width(availableWidth) - .height(availableHeight1) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && !data[i].bar })); - - var focusBarsWrap = g.select('.nv-focus .nv-barsWrap') - .datum(!dataBars.length ? [{values:[]}] : - dataBars - .map(function(d,i) { - return { - key: d.key, - values: d.values.filter(function(d,i) { - return bars.x()(d,i) >= extent[0] && bars.x()(d,i) <= extent[1]; - }) - } - }) - ); - - var focusLinesWrap = g.select('.nv-focus .nv-linesWrap') - .datum(dataLines[0].disabled ? [{values:[]}] : - dataLines - .map(function(d,i) { - return { - key: d.key, - values: d.values.filter(function(d,i) { - return lines.x()(d,i) >= extent[0] && lines.x()(d,i) <= extent[1]; - }) - } - }) - ); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Update Main (Focus) X Axis - - if (dataBars.length) { - x = bars.xScale(); - } else { - x = lines.xScale(); - } - - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight1, 0); - - xAxis.domain([Math.ceil(extent[0]), Math.floor(extent[1])]); - - d3.transition(g.select('.nv-x.nv-axis')) - .call(xAxis); - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Update Main (Focus) Bars and Lines - - d3.transition(focusBarsWrap).call(bars); - d3.transition(focusLinesWrap).call(lines); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup and Update Main (Focus) Y Axes - - g.select('.nv-focus .nv-x.nv-axis') - .attr('transform', 'translate(0,' + y1.range()[0] + ')'); - - - y1Axis - .scale(y1) - .ticks( availableHeight1 / 36 ) - .tickSize(-availableWidth, 0); - - g.select('.nv-focus .nv-y1.nv-axis') - .style('opacity', dataBars.length ? 1 : 0); - - - y2Axis - .scale(y2) - .ticks( availableHeight1 / 36 ) - .tickSize(dataBars.length ? 0 : -availableWidth, 0); // Show the y2 rules only if y1 has none - - g.select('.nv-focus .nv-y2.nv-axis') - .style('opacity', dataLines.length ? 1 : 0) - .attr('transform', 'translate(' + x.range()[1] + ',0)'); - - d3.transition(g.select('.nv-focus .nv-y1.nv-axis')) - .call(y1Axis); - d3.transition(g.select('.nv-focus .nv-y2.nv-axis')) - .call(y2Axis); - } - - //============================================================ - - onBrush(); - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - lines.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - bars.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - bars.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.legend = legend; - chart.lines = lines; - chart.lines2 = lines2; - chart.bars = bars; - chart.bars2 = bars2; - chart.xAxis = xAxis; - chart.x2Axis = x2Axis; - chart.y1Axis = y1Axis; - chart.y2Axis = y2Axis; - chart.y3Axis = y3Axis; - chart.y4Axis = y4Axis; - - d3.rebind(chart, lines, 'defined', 'size', 'clipVoronoi', 'interpolate'); - //TODO: consider rebinding x, y and some other stuff, and simply do soemthign lile bars.x(lines.x()), etc. - //d3.rebind(chart, lines, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id'); - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - lines.x(_); - bars.x(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - lines.y(_); - bars.y(_); - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - chart.brushExtent = function(_) { - if (!arguments.length) return brushExtent; - brushExtent = _; - return chart; - }; - - - //============================================================ - - - return chart; -} - -nv.models.multiBar = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , x = d3.scale.ordinal() - , y = d3.scale.linear() - , id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , forceY = [0] // 0 is forced by default.. this makes sense for the majority of bar graphs... user can always do chart.forceY([]) to remove - , clipEdge = true - , stacked = false - , color = nv.utils.defaultColor() - , hideable = false - , barColor = null // adding the ability to set the color for each rather than the whole group - , disabled // used in conjunction with barColor to communicate from multiBarHorizontalChart what series are disabled - , delay = 1200 - , drawTime = 500 - , xDomain - , yDomain - , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0 //used to store previous scales - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - if(hideable && data.length) hideable = [{ - values: data[0].values.map(function(d) { - return { - x: d.x, - y: 0, - series: d.series, - size: 0.01 - };} - )}]; - - if (stacked) - data = d3.layout.stack() - .offset('zero') - .values(function(d){ return d.values }) - .y(getY) - (!data.length && hideable ? hideable : data); - - - //add series index to each data point for reference - data = data.map(function(series, i) { - series.values = series.values.map(function(point) { - point.series = i; - return point; - }); - return series; - }); - - - //------------------------------------------------------------ - // HACK for negative value stacking - if (stacked) - data[0].values.map(function(d,i) { - var posBase = 0, negBase = 0; - data.map(function(d) { - var f = d.values[i] - f.size = Math.abs(f.y); - if (f.y<0) { - f.y1 = negBase; - negBase = negBase - f.size; - } else - { - f.y1 = f.size + posBase; - posBase = posBase + f.size; - } - }); - }); - - //------------------------------------------------------------ - // Setup Scales - - // remap and flatten the data for use in calculating the scales' domains - var seriesData = (xDomain && yDomain) ? [] : // if we know xDomain and yDomain, no need to calculate - data.map(function(d) { - return d.values.map(function(d,i) { - return { x: getX(d,i), y: getY(d,i), y0: d.y0, y1: d.y1 } - }) - }); - - x .domain(d3.merge(seriesData).map(function(d) { return d.x })) - .rangeBands([0, availableWidth], .1); - - //y .domain(yDomain || d3.extent(d3.merge(seriesData).map(function(d) { return d.y + (stacked ? d.y1 : 0) }).concat(forceY))) - y .domain(yDomain || d3.extent(d3.merge(seriesData).map(function(d) { return stacked ? (d.y > 0 ? d.y1 : d.y1 + d.y ) : d.y }).concat(forceY))) - .range([availableHeight, 0]); - - // If scale's domain don't have a range, slightly adjust to make one... so a chart can show a single data point - if (x.domain()[0] === x.domain()[1] || y.domain()[0] === y.domain()[1]) singlePoint = true; - if (x.domain()[0] === x.domain()[1]) - x.domain()[0] ? - x.domain([x.domain()[0] - x.domain()[0] * 0.01, x.domain()[1] + x.domain()[1] * 0.01]) - : x.domain([-1,1]); - - if (y.domain()[0] === y.domain()[1]) - y.domain()[0] ? - y.domain([y.domain()[0] + y.domain()[0] * 0.01, y.domain()[1] - y.domain()[1] * 0.01]) - : y.domain([-1,1]); - - - x0 = x0 || x; - y0 = y0 || y; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-multibar').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-multibar'); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g') - - gEnter.append('g').attr('class', 'nv-groups'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - - defsEnter.append('clipPath') - .attr('id', 'nv-edge-clip-' + id) - .append('rect'); - wrap.select('#nv-edge-clip-' + id + ' rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g .attr('clip-path', clipEdge ? 'url(#nv-edge-clip-' + id + ')' : ''); - - - - var groups = wrap.select('.nv-groups').selectAll('.nv-group') - .data(function(d) { return d }, function(d) { return d.key }); - groups.enter().append('g') - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6); - - - groups.exit() - .selectAll('rect.nv-bar') - .transition() - .delay(function(d,i) { return i * delay/ data[0].values.length }) - .attr('y', function(d) { return stacked ? y0(d.y0) : y0(0) }) - .attr('height', 0) - .remove(); - groups - .attr('class', function(d,i) { return 'nv-group nv-series-' + i }) - .classed('hover', function(d) { return d.hover }) - .style('fill', function(d,i){ return color(d, i) }) - .style('stroke', function(d,i){ return color(d, i) }); - d3.transition(groups) - .style('stroke-opacity', 1) - .style('fill-opacity', .75); - - - var bars = groups.selectAll('rect.nv-bar') - .data(function(d) { return (hideable && !data.length) ? hideable.values : d.values }); - - bars.exit().remove(); - - - var barsEnter = bars.enter().append('rect') - .attr('class', function(d,i) { return getY(d,i) < 0 ? 'nv-bar negative' : 'nv-bar positive'}) - .attr('x', function(d,i,j) { - return stacked ? 0 : (j * x.rangeBand() / data.length ) - }) - .attr('y', function(d) { return y0(stacked ? d.y0 : 0) }) - .attr('height', 0) - .attr('width', x.rangeBand() / (stacked ? 1 : data.length) ); - bars - .style('fill', function(d,i,j){ return color(d, j, i); }) - .style('stroke', function(d,i,j){ return color(d, j, i); }) - .on('mouseover', function(d,i) { //TODO: figure out why j works above, but not here - d3.select(this).classed('hover', true); - dispatch.elementMouseover({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length), y(getY(d,i) + (stacked ? d.y0 : 0))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - }) - .on('mouseout', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.elementMouseout({ - value: getY(d,i), - point: d, - series: data[d.series], - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - }) - .on('click', function(d,i) { - dispatch.elementClick({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length), y(getY(d,i) + (stacked ? d.y0 : 0))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - d3.event.stopPropagation(); - }) - .on('dblclick', function(d,i) { - dispatch.elementDblClick({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length), y(getY(d,i) + (stacked ? d.y0 : 0))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - d3.event.stopPropagation(); - }); - bars - .attr('class', function(d,i) { return getY(d,i) < 0 ? 'nv-bar negative' : 'nv-bar positive'}) - .attr('transform', function(d,i) { return 'translate(' + x(getX(d,i)) + ',0)'; }) - - if (barColor) { - if (!disabled) disabled = data.map(function() { return true }); - bars - //.style('fill', barColor) - //.style('stroke', barColor) - //.style('fill', function(d,i,j) { return d3.rgb(barColor(d,i)).darker(j).toString(); }) - //.style('stroke', function(d,i,j) { return d3.rgb(barColor(d,i)).darker(j).toString(); }) - .style('fill', function(d,i,j) { return d3.rgb(barColor(d,i)).darker( disabled.map(function(d,i) { return i }).filter(function(d,i){ return !disabled[i] })[j] ).toString(); }) - .style('stroke', function(d,i,j) { return d3.rgb(barColor(d,i)).darker( disabled.map(function(d,i) { return i }).filter(function(d,i){ return !disabled[i] })[j] ).toString(); }); - } - - - if (stacked) - bars.transition() - - .delay(function(d,i) { return i * delay / data[0].values.length }) - .attr('y', function(d,i) { - - return y((stacked ? d.y1 : 0)); - }) - .attr('height', function(d,i) { - return Math.max(Math.abs(y(d.y + (stacked ? d.y0 : 0)) - y((stacked ? d.y0 : 0))),1); - }) - .each('end', function() { - d3.select(this).transition().duration(drawTime) - .attr('x', function(d,i) { - return stacked ? 0 : (d.series * x.rangeBand() / data.length ) - }) - .attr('width', x.rangeBand() / (stacked ? 1 : data.length) ); - }) - else - d3.transition(bars).duration(drawTime) - .delay(function(d,i) { return i * delay/ data[0].values.length }) - .attr('x', function(d,i) { - return d.series * x.rangeBand() / data.length - }) - .attr('width', x.rangeBand() / data.length) - .each('end', function() { - d3.select(this).transition().duration(drawTime) - .attr('y', function(d,i) { - return getY(d,i) < 0 ? - y(0) : - y(0) - y(getY(d,i)) < 1 ? - y(0) - 1 : - y(getY(d,i)) || 0; - }) - .attr('height', function(d,i) { - return Math.max(Math.abs(y(getY(d,i)) - y(0)),1) || 0; - }); - }) - - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.forceY = function(_) { - if (!arguments.length) return forceY; - forceY = _; - return chart; - }; - - chart.stacked = function(_) { - if (!arguments.length) return stacked; - stacked = _; - return chart; - }; - - chart.clipEdge = function(_) { - if (!arguments.length) return clipEdge; - clipEdge = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.barColor = function(_) { - if (!arguments.length) return barColor; - barColor = nv.utils.getColor(_); - return chart; - }; - - chart.disabled = function(_) { - if (!arguments.length) return disabled; - disabled = _; - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - chart.hideable = function(_) { - if (!arguments.length) return hideable; - hideable = _; - return chart; - }; - - chart.delay = function(_) { - if (!arguments.length) return delay; - delay = _; - return chart; - }; - - chart.drawTime = function(_) { - if (!arguments.length) return drawTime; - drawTime = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.multiBarChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var multibar = nv.models.multiBar() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - , controls = nv.models.legend() - ; - - var margin = {top: 30, right: 20, bottom: 50, left: 60} - , width = null - , height = null - , color = nv.utils.defaultColor() - , showControls = true - , showLegend = true - , reduceXTicks = true // if false a tick will show for every data point - , staggerLabels = false - , rotateLabels = 0 - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' on ' + x + '</p>' - } - , x //can be accessed via chart.xScale() - , y //can be accessed via chart.yScale() - , state = { stacked: false } - , defaultState = null - , noData = "No Data Available." - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - , controlWidth = function() { return showControls ? 180 : 0 } - ; - - multibar - .stacked(false) - ; - xAxis - .orient('bottom') - .tickPadding(7) - .highlightZero(true) - .showMaxMin(false) - .tickFormat(function(d) { return d }) - ; - yAxis - .orient('left') - .tickFormat(d3.format(',.1f')) - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(multibar.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(multibar.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart) }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - //------------------------------------------------------------ - // Display noData message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = multibar.xScale(); - y = multibar.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-multiBarWithLegend').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-multiBarWithLegend').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-barsWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - gEnter.append('g').attr('class', 'nv-controlsWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width(availableWidth - controlWidth()); - - if (multibar.barColor()) - data.forEach(function(series,i) { - series.color = d3.rgb('#ccc').darker(i * 1.5).toString(); - }) - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(' + controlWidth() + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Controls - - if (showControls) { - var controlsData = [ - { key: 'Grouped', disabled: multibar.stacked() }, - { key: 'Stacked', disabled: !multibar.stacked() } - ]; - - controls.width(controlWidth()).color(['#444', '#444', '#444']); - g.select('.nv-controlsWrap') - .datum(controlsData) - .attr('transform', 'translate(0,' + (-margin.top) +')') - .call(controls); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - multibar - .disabled(data.map(function(series) { return series.disabled })) - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })) - - - var barsWrap = g.select('.nv-barsWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(barsWrap).call(multibar); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y.range()[0] + ')'); - d3.transition(g.select('.nv-x.nv-axis')) - .call(xAxis); - - var xTicks = g.select('.nv-x.nv-axis > g').selectAll('g'); - - xTicks - .selectAll('line, text') - .style('opacity', 1) - - if (staggerLabels) { - var getTranslate = function(x,y) { - return "translate(" + x + "," + y + ")"; - }; - - var staggerUp = 5, staggerDown = 17; //pixels to stagger by - // Issue #140 - xTicks - .selectAll("text") - .attr('transform', function(d,i,j) { - return getTranslate(0, (j % 2 == 0 ? staggerUp : staggerDown)); - }); - - var totalInBetweenTicks = d3.selectAll(".nv-x.nv-axis .nv-wrap g g text")[0].length; - g.selectAll(".nv-x.nv-axis .nv-axisMaxMin text") - .attr("transform", function(d,i) { - return getTranslate(0, (i === 0 || totalInBetweenTicks % 2 !== 0) ? staggerDown : staggerUp); - }); - } - - - if (reduceXTicks) - xTicks - .filter(function(d,i) { - return i % Math.ceil(data[0].values.length / (availableWidth / 100)) !== 0; - }) - .selectAll('text, line') - .style('opacity', 0); - - if(rotateLabels) - xTicks - .selectAll('text') - .attr('transform', 'rotate(' + rotateLabels + ' 0,0)') - .attr('text-anchor', rotateLabels > 0 ? 'start' : 'end'); - - g.select('.nv-x.nv-axis').selectAll('g.nv-axisMaxMin text') - .style('opacity', 1); - - yAxis - .scale(y) - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - d3.transition(g.select('.nv-y.nv-axis')) - .call(yAxis); - - //------------------------------------------------------------ - - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - - controls.dispatch.on('legendClick', function(d,i) { - if (!d.disabled) return; - controlsData = controlsData.map(function(s) { - s.disabled = true; - return s; - }); - d.disabled = false; - - switch (d.key) { - case 'Grouped': - multibar.stacked(false); - break; - case 'Stacked': - multibar.stacked(true); - break; - } - - state.stacked = multibar.stacked(); - dispatch.stateChange(state); - - chart.update(); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode) - }); - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - if (typeof e.stacked !== 'undefined') { - multibar.stacked(e.stacked); - state.stacked = e.stacked; - } - - chart.update(); - }); - - //============================================================ - - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - multibar.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - multibar.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.multibar = multibar; - chart.legend = legend; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, multibar, 'x', 'y', 'xDomain', 'yDomain', 'forceX', 'forceY', 'clipEdge', 'id', 'stacked', 'delay', 'barColor'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showControls = function(_) { - if (!arguments.length) return showControls; - showControls = _; - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.reduceXTicks= function(_) { - if (!arguments.length) return reduceXTicks; - reduceXTicks = _; - return chart; - }; - - chart.rotateLabels = function(_) { - if (!arguments.length) return rotateLabels; - rotateLabels = _; - return chart; - } - - chart.staggerLabels = function(_) { - if (!arguments.length) return staggerLabels; - staggerLabels = _; - return chart; - }; - - chart.tooltip = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.multiBarHorizontal = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one - , x = d3.scale.ordinal() - , y = d3.scale.linear() - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , forceY = [0] // 0 is forced by default.. this makes sense for the majority of bar graphs... user can always do chart.forceY([]) to remove - , color = nv.utils.defaultColor() - , barColor = null // adding the ability to set the color for each rather than the whole group - , disabled // used in conjunction with barColor to communicate from multiBarHorizontalChart what series are disabled - , stacked = false - , showValues = false - , valuePadding = 60 - , valueFormat = d3.format(',.2f') - , delay = 1200 - , xDomain - , yDomain - , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0 //used to store previous scales - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - - if (stacked) - data = d3.layout.stack() - .offset('zero') - .values(function(d){ return d.values }) - .y(getY) - (data); - - - //add series index to each data point for reference - data = data.map(function(series, i) { - series.values = series.values.map(function(point) { - point.series = i; - return point; - }); - return series; - }); - - - - //------------------------------------------------------------ - // HACK for negative value stacking - if (stacked) - data[0].values.map(function(d,i) { - var posBase = 0, negBase = 0; - data.map(function(d) { - var f = d.values[i] - f.size = Math.abs(f.y); - if (f.y<0) { - f.y1 = negBase - f.size; - negBase = negBase - f.size; - } else - { - f.y1 = posBase; - posBase = posBase + f.size; - } - }); - }); - - - - //------------------------------------------------------------ - // Setup Scales - - // remap and flatten the data for use in calculating the scales' domains - var seriesData = (xDomain && yDomain) ? [] : // if we know xDomain and yDomain, no need to calculate - data.map(function(d) { - return d.values.map(function(d,i) { - return { x: getX(d,i), y: getY(d,i), y0: d.y0, y1: d.y1 } - }) - }); - - x .domain(xDomain || d3.merge(seriesData).map(function(d) { return d.x })) - .rangeBands([0, availableHeight], .1); - - //y .domain(yDomain || d3.extent(d3.merge(seriesData).map(function(d) { return d.y + (stacked ? d.y0 : 0) }).concat(forceY))) - y .domain(yDomain || d3.extent(d3.merge(seriesData).map(function(d) { return stacked ? (d.y > 0 ? d.y1 + d.y : d.y1 ) : d.y }).concat(forceY))) - - if (showValues && !stacked) - y.range([(y.domain()[0] < 0 ? valuePadding : 0), availableWidth - (y.domain()[1] > 0 ? valuePadding : 0) ]); - else - y.range([0, availableWidth]); - - x0 = x0 || x; - y0 = y0 || d3.scale.linear().domain(y.domain()).range([y(0),y(0)]); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = d3.select(this).selectAll('g.nv-wrap.nv-multibarHorizontal').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-multibarHorizontal'); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-groups'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - - var groups = wrap.select('.nv-groups').selectAll('.nv-group') - .data(function(d) { return d }, function(d) { return d.key }); - groups.enter().append('g') - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6); - d3.transition(groups.exit()) - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6) - .remove(); - groups - .attr('class', function(d,i) { return 'nv-group nv-series-' + i }) - .classed('hover', function(d) { return d.hover }) - .style('fill', function(d,i){ return color(d, i) }) - .style('stroke', function(d,i){ return color(d, i) }); - d3.transition(groups) - .style('stroke-opacity', 1) - .style('fill-opacity', .75); - - - var bars = groups.selectAll('g.nv-bar') - .data(function(d) { return d.values }); - - bars.exit().remove(); - - - var barsEnter = bars.enter().append('g') - .attr('transform', function(d,i,j) { - return 'translate(' + y0(stacked ? d.y0 : 0) + ',' + (stacked ? 0 : (j * x.rangeBand() / data.length ) + x(getX(d,i))) + ')' - }); - - barsEnter.append('rect') - .attr('width', 0) - .attr('height', x.rangeBand() / (stacked ? 1 : data.length) ) - - bars - .on('mouseover', function(d,i) { //TODO: figure out why j works above, but not here - d3.select(this).classed('hover', true); - dispatch.elementMouseover({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [ y(getY(d,i) + (stacked ? d.y0 : 0)), x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length) ], - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - }) - .on('mouseout', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.elementMouseout({ - value: getY(d,i), - point: d, - series: data[d.series], - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - }) - .on('click', function(d,i) { - dispatch.elementClick({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length), y(getY(d,i) + (stacked ? d.y0 : 0))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - d3.event.stopPropagation(); - }) - .on('dblclick', function(d,i) { - dispatch.elementDblClick({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length), y(getY(d,i) + (stacked ? d.y0 : 0))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - d3.event.stopPropagation(); - }); - - - barsEnter.append('text'); - - if (showValues && !stacked) { - bars.select('text') - .attr('text-anchor', function(d,i) { return getY(d,i) < 0 ? 'end' : 'start' }) - .attr('y', x.rangeBand() / (data.length * 2)) - .attr('dy', '.32em') - .text(function(d,i) { return valueFormat(getY(d,i)) }) - d3.transition(bars) - //.delay(function(d,i) { return i * delay / data[0].values.length }) - .select('text') - .attr('x', function(d,i) { return getY(d,i) < 0 ? -4 : y(getY(d,i)) - y(0) + 4 }) - } else { - //bars.selectAll('text').remove(); - bars.selectAll('text').text(''); - } - - bars - .attr('class', function(d,i) { return getY(d,i) < 0 ? 'nv-bar negative' : 'nv-bar positive'}) - - if (barColor) { - if (!disabled) disabled = data.map(function() { return true }); - bars - //.style('fill', barColor) - //.style('stroke', barColor) - //.style('fill', function(d,i,j) { return d3.rgb(barColor(d,i)).darker(j).toString(); }) - //.style('stroke', function(d,i,j) { return d3.rgb(barColor(d,i)).darker(j).toString(); }) - .style('fill', function(d,i,j) { return d3.rgb(barColor(d,i)).darker( disabled.map(function(d,i) { return i }).filter(function(d,i){ return !disabled[i] })[j] ).toString(); }) - .style('stroke', function(d,i,j) { return d3.rgb(barColor(d,i)).darker( disabled.map(function(d,i) { return i }).filter(function(d,i){ return !disabled[i] })[j] ).toString(); }); - } - - if (stacked) - d3.transition(bars) - //.delay(function(d,i) { return i * delay / data[0].values.length }) - .attr('transform', function(d,i) { - //return 'translate(' + y(d.y0) + ',0)' - //return 'translate(' + y(d.y0) + ',' + x(getX(d,i)) + ')' - return 'translate(' + y(d.y1) + ',' + x(getX(d,i)) + ')' - }) - .select('rect') - .attr('width', function(d,i) { - return Math.abs(y(getY(d,i) + d.y0) - y(d.y0)) - }) - .attr('height', x.rangeBand() ); - else - d3.transition(bars) - //.delay(function(d,i) { return i * delay / data[0].values.length }) - .attr('transform', function(d,i) { - //TODO: stacked must be all positive or all negative, not both? - return 'translate(' + - (getY(d,i) < 0 ? y(getY(d,i)) : y(0)) - + ',' + - (d.series * x.rangeBand() / data.length - + - x(getX(d,i)) ) - + ')' - }) - .select('rect') - .attr('height', x.rangeBand() / data.length ) - .attr('width', function(d,i) { - return Math.max(Math.abs(y(getY(d,i)) - y(0)),1) - }); - - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.forceY = function(_) { - if (!arguments.length) return forceY; - forceY = _; - return chart; - }; - - chart.stacked = function(_) { - if (!arguments.length) return stacked; - stacked = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.barColor = function(_) { - if (!arguments.length) return barColor; - barColor = nv.utils.getColor(_); - return chart; - }; - - chart.disabled = function(_) { - if (!arguments.length) return disabled; - disabled = _; - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - chart.delay = function(_) { - if (!arguments.length) return delay; - delay = _; - return chart; - }; - - chart.showValues = function(_) { - if (!arguments.length) return showValues; - showValues = _; - return chart; - }; - - chart.valueFormat= function(_) { - if (!arguments.length) return valueFormat; - valueFormat = _; - return chart; - }; - - chart.valuePadding = function(_) { - if (!arguments.length) return valuePadding; - valuePadding = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.multiBarHorizontalChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var multibar = nv.models.multiBarHorizontal() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend().height(30) - , controls = nv.models.legend().height(30) - ; - - var margin = {top: 30, right: 20, bottom: 50, left: 60} - , width = null - , height = null - , color = nv.utils.defaultColor() - , showControls = true - , showLegend = true - , stacked = false - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + ' - ' + x + '</h3>' + - '<p>' + y + '</p>' - } - , x //can be accessed via chart.xScale() - , y //can be accessed via chart.yScale() - , state = { stacked: stacked } - , defaultState = null - , noData = 'No Data Available.' - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - , controlWidth = function() { return showControls ? 180 : 0 } - ; - - multibar - .stacked(stacked) - ; - xAxis - .orient('left') - .tickPadding(5) - .highlightZero(false) - .showMaxMin(false) - .tickFormat(function(d) { return d }) - ; - yAxis - .orient('bottom') - .tickFormat(d3.format(',.1f')) - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(multibar.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(multibar.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'e' : 'w', null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart) }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = multibar.xScale(); - y = multibar.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-multiBarHorizontalChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-multiBarHorizontalChart').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-barsWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - gEnter.append('g').attr('class', 'nv-controlsWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width(availableWidth - controlWidth()); - - if (multibar.barColor()) - data.forEach(function(series,i) { - series.color = d3.rgb('#ccc').darker(i * 1.5).toString(); - }) - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(' + controlWidth() + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Controls - - if (showControls) { - var controlsData = [ - { key: 'Grouped', disabled: multibar.stacked() }, - { key: 'Stacked', disabled: !multibar.stacked() } - ]; - - controls.width(controlWidth()).color(['#444', '#444', '#444']); - g.select('.nv-controlsWrap') - .datum(controlsData) - .attr('transform', 'translate(0,' + (-margin.top) +')') - .call(controls); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - multibar - .disabled(data.map(function(series) { return series.disabled })) - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })) - - - var barsWrap = g.select('.nv-barsWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(barsWrap).call(multibar); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( availableHeight / 24 ) - .tickSize(-availableWidth, 0); - - d3.transition(g.select('.nv-x.nv-axis')) - .call(xAxis); - - var xTicks = g.select('.nv-x.nv-axis').selectAll('g'); - - xTicks - .selectAll('line, text') - .style('opacity', 1) - - - yAxis - .scale(y) - .ticks( availableWidth / 100 ) - .tickSize( -availableHeight, 0); - - g.select('.nv-y.nv-axis') - .attr('transform', 'translate(0,' + availableHeight + ')'); - d3.transition(g.select('.nv-y.nv-axis')) - .call(yAxis); - - //------------------------------------------------------------ - - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - controls.dispatch.on('legendClick', function(d,i) { - if (!d.disabled) return; - controlsData = controlsData.map(function(s) { - s.disabled = true; - return s; - }); - d.disabled = false; - - switch (d.key) { - case 'Grouped': - multibar.stacked(false); - break; - case 'Stacked': - multibar.stacked(true); - break; - } - - state.stacked = multibar.stacked(); - dispatch.stateChange(state); - - chart.update(); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - if (typeof e.stacked !== 'undefined') { - multibar.stacked(e.stacked); - state.stacked = e.stacked; - } - - selection.call(chart); - }); - //============================================================ - - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - multibar.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - multibar.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.multibar = multibar; - chart.legend = legend; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, multibar, 'x', 'y', 'xDomain', 'yDomain', 'forceX', 'forceY', 'clipEdge', 'id', 'delay', 'showValues', 'valueFormat', 'stacked', 'barColor'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showControls = function(_) { - if (!arguments.length) return showControls; - showControls = _; - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltip = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} -nv.models.multiChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 30, right: 20, bottom: 50, left: 60}, - color = d3.scale.category20().range(), - width = null, - height = null, - showLegend = true, - tooltips = true, - tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>' - }, - x, y; //can be accessed via chart.lines.[x/y]Scale() - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x = d3.scale.linear(), - yScale1 = d3.scale.linear(), - yScale2 = d3.scale.linear(), - - lines1 = nv.models.line().yScale(yScale1), - lines2 = nv.models.line().yScale(yScale2), - - bars1 = nv.models.multiBar().stacked(false).yScale(yScale1), - bars2 = nv.models.multiBar().stacked(false).yScale(yScale2), - - stack1 = nv.models.stackedArea().yScale(yScale1), - stack2 = nv.models.stackedArea().yScale(yScale2), - - xAxis = nv.models.axis().scale(x).orient('bottom').tickPadding(5), - yAxis1 = nv.models.axis().scale(yScale1).orient('left'), - yAxis2 = nv.models.axis().scale(yScale2).orient('right'), - - legend = nv.models.legend().height(30), - dispatch = d3.dispatch('tooltipShow', 'tooltipHide'); - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(lines1.x()(e.point, e.pointIndex)), - y = ((e.series.yAxis == 2) ? yAxis2 : yAxis1).tickFormat()(lines1.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, undefined, undefined, offsetElement.offsetParent); - }; - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - chart.update = function() { container.transition().call(chart); }; - chart.container = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - var dataLines1 = data.filter(function(d) {return !d.disabled && d.type == 'line' && d.yAxis == 1}) - var dataLines2 = data.filter(function(d) {return !d.disabled && d.type == 'line' && d.yAxis == 2}) - var dataBars1 = data.filter(function(d) {return !d.disabled && d.type == 'bar' && d.yAxis == 1}) - var dataBars2 = data.filter(function(d) {return !d.disabled && d.type == 'bar' && d.yAxis == 2}) - var dataStack1 = data.filter(function(d) {return !d.disabled && d.type == 'area' && d.yAxis == 1}) - var dataStack2 = data.filter(function(d) {return !d.disabled && d.type == 'area' && d.yAxis == 2}) - - var series1 = data.filter(function(d) {return !d.disabled && d.yAxis == 1}) - .map(function(d) { - return d.values.map(function(d,i) { - return { x: d.x, y: d.y } - }) - }) - - var series2 = data.filter(function(d) {return !d.disabled && d.yAxis == 2}) - .map(function(d) { - return d.values.map(function(d,i) { - return { x: d.x, y: d.y } - }) - }) - - x .domain(d3.extent(d3.merge(series1.concat(series2)), function(d) { return d.x } )) - .range([0, availableWidth]); - - var wrap = container.selectAll('g.wrap.multiChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'wrap nvd3 multiChart').append('g'); - - gEnter.append('g').attr('class', 'x axis'); - gEnter.append('g').attr('class', 'y1 axis'); - gEnter.append('g').attr('class', 'y2 axis'); - gEnter.append('g').attr('class', 'lines1Wrap'); - gEnter.append('g').attr('class', 'lines2Wrap'); - gEnter.append('g').attr('class', 'bars1Wrap'); - gEnter.append('g').attr('class', 'bars2Wrap'); - gEnter.append('g').attr('class', 'stack1Wrap'); - gEnter.append('g').attr('class', 'stack2Wrap'); - gEnter.append('g').attr('class', 'legendWrap'); - - var g = wrap.select('g'); - - if (showLegend) { - legend.width( availableWidth / 2 ); - - g.select('.legendWrap') - .datum(data.map(function(series) { - series.originalKey = series.originalKey === undefined ? series.key : series.originalKey; - series.key = series.originalKey + (series.yAxis == 1 ? '' : ' (right axis)'); - return series; - })) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - g.select('.legendWrap') - .attr('transform', 'translate(' + ( availableWidth / 2 ) + ',' + (-margin.top) +')'); - } - - - lines1 - .width(availableWidth) - .height(availableHeight) - .interpolate("monotone") - .color(data.map(function(d,i) { - return d.color || color[i % color.length]; - }).filter(function(d,i) { return !data[i].disabled && data[i].yAxis == 1 && data[i].type == 'line'})); - - lines2 - .width(availableWidth) - .height(availableHeight) - .interpolate("monotone") - .color(data.map(function(d,i) { - return d.color || color[i % color.length]; - }).filter(function(d,i) { return !data[i].disabled && data[i].yAxis == 2 && data[i].type == 'line'})); - - bars1 - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color[i % color.length]; - }).filter(function(d,i) { return !data[i].disabled && data[i].yAxis == 1 && data[i].type == 'bar'})); - - bars2 - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color[i % color.length]; - }).filter(function(d,i) { return !data[i].disabled && data[i].yAxis == 2 && data[i].type == 'bar'})); - - stack1 - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color[i % color.length]; - }).filter(function(d,i) { return !data[i].disabled && data[i].yAxis == 1 && data[i].type == 'area'})); - - stack2 - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color[i % color.length]; - }).filter(function(d,i) { return !data[i].disabled && data[i].yAxis == 2 && data[i].type == 'area'})); - - g.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - var lines1Wrap = g.select('.lines1Wrap') - .datum(dataLines1) - var bars1Wrap = g.select('.bars1Wrap') - .datum(dataBars1) - var stack1Wrap = g.select('.stack1Wrap') - .datum(dataStack1) - - var lines2Wrap = g.select('.lines2Wrap') - .datum(dataLines2) - var bars2Wrap = g.select('.bars2Wrap') - .datum(dataBars2) - var stack2Wrap = g.select('.stack2Wrap') - .datum(dataStack2) - - var extraValue1 = dataStack1.length ? dataStack1.map(function(a){return a.values}).reduce(function(a,b){ - return a.map(function(aVal,i){return {x: aVal.x, y: aVal.y + b[i].y}}) - }).concat([{x:0, y:0}]) : [] - var extraValue2 = dataStack2.length ? dataStack2.map(function(a){return a.values}).reduce(function(a,b){ - return a.map(function(aVal,i){return {x: aVal.x, y: aVal.y + b[i].y}}) - }).concat([{x:0, y:0}]) : [] - - yScale1 .domain(d3.extent(d3.merge(series1).concat(extraValue1), function(d) { return d.y } )) - .range([0, availableHeight]) - - yScale2 .domain(d3.extent(d3.merge(series2).concat(extraValue2), function(d) { return d.y } )) - .range([0, availableHeight]) - - lines1.yDomain(yScale1.domain()) - bars1.yDomain(yScale1.domain()) - stack1.yDomain(yScale1.domain()) - - lines2.yDomain(yScale2.domain()) - bars2.yDomain(yScale2.domain()) - stack2.yDomain(yScale2.domain()) - - if(dataStack1.length){d3.transition(stack1Wrap).call(stack1);} - if(dataStack2.length){d3.transition(stack2Wrap).call(stack2);} - - if(dataBars1.length){d3.transition(bars1Wrap).call(bars1);} - if(dataBars2.length){d3.transition(bars2Wrap).call(bars2);} - - if(dataLines1.length){d3.transition(lines1Wrap).call(lines1);} - if(dataLines2.length){d3.transition(lines2Wrap).call(lines2);} - - - - xAxis - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight, 0); - - g.select('.x.axis') - .attr('transform', 'translate(0,' + availableHeight + ')'); - d3.transition(g.select('.x.axis')) - .call(xAxis); - - yAxis1 - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - - d3.transition(g.select('.y1.axis')) - .call(yAxis1); - - yAxis2 - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - d3.transition(g.select('.y2.axis')) - .call(yAxis2); - - g.select('.y2.axis') - .style('opacity', series2.length ? 1 : 0) - .attr('transform', 'translate(' + x.range()[1] + ',0)'); - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.series').classed('disabled', false); - return d; - }); - } - chart.update(); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - lines1.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines1.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - lines2.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines2.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - bars1.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - bars1.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - bars2.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - bars2.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - stack1.dispatch.on('tooltipShow', function(e) { - //disable tooltips when value ~= 0 - //// TODO: consider removing points from voronoi that have 0 value instead of this hack - if (!Math.round(stack1.y()(e.point) * 100)) { // 100 will not be good for very small numbers... will have to think about making this valu dynamic, based on data range - setTimeout(function() { d3.selectAll('.point.hover').classed('hover', false) }, 0); - return false; - } - - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top], - dispatch.tooltipShow(e); - }); - - stack1.dispatch.on('tooltipHide', function(e) { - dispatch.tooltipHide(e); - }); - - stack2.dispatch.on('tooltipShow', function(e) { - //disable tooltips when value ~= 0 - //// TODO: consider removing points from voronoi that have 0 value instead of this hack - if (!Math.round(stack2.y()(e.point) * 100)) { // 100 will not be good for very small numbers... will have to think about making this valu dynamic, based on data range - setTimeout(function() { d3.selectAll('.point.hover').classed('hover', false) }, 0); - return false; - } - - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top], - dispatch.tooltipShow(e); - }); - - stack2.dispatch.on('tooltipHide', function(e) { - dispatch.tooltipHide(e); - }); - - lines1.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines1.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - lines2.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines2.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - - - //============================================================ - // Global getters and setters - //------------------------------------------------------------ - - chart.dispatch = dispatch; - chart.lines1 = lines1; - chart.lines2 = lines2; - chart.bars1 = bars1; - chart.bars2 = bars2; - chart.stack1 = stack1; - chart.stack2 = stack2; - chart.xAxis = xAxis; - chart.yAxis1 = yAxis1; - chart.yAxis2 = yAxis2; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - lines1.x(_); - bars1.x(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - lines1.y(_); - bars1.y(_); - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin = _; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = _; - legend.color(_); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - return chart; -} - - -nv.models.ohlcBar = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one - , x = d3.scale.linear() - , y = d3.scale.linear() - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , getOpen = function(d) { return d.open } - , getClose = function(d) { return d.close } - , getHigh = function(d) { return d.high } - , getLow = function(d) { return d.low } - , forceX = [] - , forceY = [] - , padData = false // If true, adds half a data points width to front and back, for lining up a line chart with a bar chart - , clipEdge = true - , color = nv.utils.defaultColor() - , xDomain - , yDomain - , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout') - ; - - //============================================================ - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - //TODO: store old scales for transitions - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - - //------------------------------------------------------------ - // Setup Scales - - x .domain(xDomain || d3.extent(data[0].values.map(getX).concat(forceX) )); - - if (padData) - x.range([availableWidth * .5 / data[0].values.length, availableWidth * (data[0].values.length - .5) / data[0].values.length ]); - else - x.range([0, availableWidth]); - - y .domain(yDomain || [ - d3.min(data[0].values.map(getLow).concat(forceY)), - d3.max(data[0].values.map(getHigh).concat(forceY)) - ]) - .range([availableHeight, 0]); - - // If scale's domain don't have a range, slightly adjust to make one... so a chart can show a single data point - if (x.domain()[0] === x.domain()[1] || y.domain()[0] === y.domain()[1]) singlePoint = true; - if (x.domain()[0] === x.domain()[1]) - x.domain()[0] ? - x.domain([x.domain()[0] - x.domain()[0] * 0.01, x.domain()[1] + x.domain()[1] * 0.01]) - : x.domain([-1,1]); - - if (y.domain()[0] === y.domain()[1]) - y.domain()[0] ? - y.domain([y.domain()[0] + y.domain()[0] * 0.01, y.domain()[1] - y.domain()[1] * 0.01]) - : y.domain([-1,1]); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = d3.select(this).selectAll('g.nv-wrap.nv-ohlcBar').data([data[0].values]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-ohlcBar'); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-ticks'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - container - .on('click', function(d,i) { - dispatch.chartClick({ - data: d, - index: i, - pos: d3.event, - id: id - }); - }); - - - defsEnter.append('clipPath') - .attr('id', 'nv-chart-clip-path-' + id) - .append('rect'); - - wrap.select('#nv-chart-clip-path-' + id + ' rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g .attr('clip-path', clipEdge ? 'url(#nv-chart-clip-path-' + id + ')' : ''); - - - - var ticks = wrap.select('.nv-ticks').selectAll('.nv-tick') - .data(function(d) { return d }); - - ticks.exit().remove(); - - - var ticksEnter = ticks.enter().append('path') - .attr('class', function(d,i,j) { return (getOpen(d,i) > getClose(d,i) ? 'nv-tick negative' : 'nv-tick positive') + ' nv-tick-' + j + '-' + i }) - .attr('d', function(d,i) { - var w = (availableWidth / data[0].values.length) * .9; - return 'm0,0l0,' - + (y(getOpen(d,i)) - - y(getHigh(d,i))) - + 'l' - + (-w/2) - + ',0l' - + (w/2) - + ',0l0,' - + (y(getLow(d,i)) - y(getOpen(d,i))) - + 'l0,' - + (y(getClose(d,i)) - - y(getLow(d,i))) - + 'l' - + (w/2) - + ',0l' - + (-w/2) - + ',0z'; - }) - .attr('transform', function(d,i) { return 'translate(' + x(getX(d,i)) + ',' + y(getHigh(d,i)) + ')'; }) - //.attr('fill', function(d,i) { return color[0]; }) - //.attr('stroke', function(d,i) { return color[0]; }) - //.attr('x', 0 ) - //.attr('y', function(d,i) { return y(Math.max(0, getY(d,i))) }) - //.attr('height', function(d,i) { return Math.abs(y(getY(d,i)) - y(0)) }) - .on('mouseover', function(d,i) { - d3.select(this).classed('hover', true); - dispatch.elementMouseover({ - point: d, - series: data[0], - pos: [x(getX(d,i)), y(getY(d,i))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: 0, - e: d3.event - }); - - }) - .on('mouseout', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.elementMouseout({ - point: d, - series: data[0], - pointIndex: i, - seriesIndex: 0, - e: d3.event - }); - }) - .on('click', function(d,i) { - dispatch.elementClick({ - //label: d[label], - value: getY(d,i), - data: d, - index: i, - pos: [x(getX(d,i)), y(getY(d,i))], - e: d3.event, - id: id - }); - d3.event.stopPropagation(); - }) - .on('dblclick', function(d,i) { - dispatch.elementDblClick({ - //label: d[label], - value: getY(d,i), - data: d, - index: i, - pos: [x(getX(d,i)), y(getY(d,i))], - e: d3.event, - id: id - }); - d3.event.stopPropagation(); - }); - - ticks - .attr('class', function(d,i,j) { return (getOpen(d,i) > getClose(d,i) ? 'nv-tick negative' : 'nv-tick positive') + ' nv-tick-' + j + '-' + i }) - d3.transition(ticks) - .attr('transform', function(d,i) { return 'translate(' + x(getX(d,i)) + ',' + y(getHigh(d,i)) + ')'; }) - .attr('d', function(d,i) { - var w = (availableWidth / data[0].values.length) * .9; - return 'm0,0l0,' - + (y(getOpen(d,i)) - - y(getHigh(d,i))) - + 'l' - + (-w/2) - + ',0l' - + (w/2) - + ',0l0,' - + (y(getLow(d,i)) - - y(getOpen(d,i))) - + 'l0,' - + (y(getClose(d,i)) - - y(getLow(d,i))) - + 'l' - + (w/2) - + ',0l' - + (-w/2) - + ',0z'; - }) - //.attr('width', (availableWidth / data[0].values.length) * .9 ) - - - //d3.transition(ticks) - //.attr('y', function(d,i) { return y(Math.max(0, getY(d,i))) }) - //.attr('height', function(d,i) { return Math.abs(y(getY(d,i)) - y(0)) }); - //.order(); // not sure if this makes any sense for this model - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - return chart; - }; - - chart.open = function(_) { - if (!arguments.length) return getOpen; - getOpen = _; - return chart; - }; - - chart.close = function(_) { - if (!arguments.length) return getClose; - getClose = _; - return chart; - }; - - chart.high = function(_) { - if (!arguments.length) return getHigh; - getHigh = _; - return chart; - }; - - chart.low = function(_) { - if (!arguments.length) return getLow; - getLow = _; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.forceX = function(_) { - if (!arguments.length) return forceX; - forceX = _; - return chart; - }; - - chart.forceY = function(_) { - if (!arguments.length) return forceY; - forceY = _; - return chart; - }; - - chart.padData = function(_) { - if (!arguments.length) return padData; - padData = _; - return chart; - }; - - chart.clipEdge = function(_) { - if (!arguments.length) return clipEdge; - clipEdge = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - //============================================================ - - - return chart; -} -nv.models.pie = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 500 - , height = 500 - , getValues = function(d) { return d.values } - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , getDescription = function(d) { return d.description } - , id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one - , color = nv.utils.defaultColor() - , valueFormat = d3.format(',.2f') - , showLabels = true - , pieLabelsOutside = true - , donutLabelsOutside = false - , labelThreshold = .02 //if slice percentage is under this, don't show label - , donut = false - , labelSunbeamLayout = false - , startAngle = false - , endAngle = false - , donutRatio = 0.5 - , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout') - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - radius = Math.min(availableWidth, availableHeight) / 2, - arcRadius = radius-(radius / 5), - container = d3.select(this); - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - //var wrap = container.selectAll('.nv-wrap.nv-pie').data([data]); - var wrap = container.selectAll('.nv-wrap.nv-pie').data([getValues(data[0])]); - var wrapEnter = wrap.enter().append('g').attr('class','nvd3 nv-wrap nv-pie nv-chart-' + id); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-pie'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - g.select('.nv-pie').attr('transform', 'translate(' + availableWidth / 2 + ',' + availableHeight / 2 + ')'); - - //------------------------------------------------------------ - - - container - .on('click', function(d,i) { - dispatch.chartClick({ - data: d, - index: i, - pos: d3.event, - id: id - }); - }); - - - var arc = d3.svg.arc() - .outerRadius(arcRadius); - - if (startAngle) arc.startAngle(startAngle) - if (endAngle) arc.endAngle(endAngle); - if (donut) arc.innerRadius(radius * donutRatio); - - // Setup the Pie chart and choose the data element - var pie = d3.layout.pie() - .sort(null) - .value(function(d) { return d.disabled ? 0 : getY(d) }); - - var slices = wrap.select('.nv-pie').selectAll('.nv-slice') - .data(pie); - - slices.exit().remove(); - - var ae = slices.enter().append('g') - .attr('class', 'nv-slice') - .on('mouseover', function(d,i){ - d3.select(this).classed('hover', true); - dispatch.elementMouseover({ - label: getX(d.data), - value: getY(d.data), - point: d.data, - pointIndex: i, - pos: [d3.event.pageX, d3.event.pageY], - id: id - }); - }) - .on('mouseout', function(d,i){ - d3.select(this).classed('hover', false); - dispatch.elementMouseout({ - label: getX(d.data), - value: getY(d.data), - point: d.data, - index: i, - id: id - }); - }) - .on('click', function(d,i) { - dispatch.elementClick({ - label: getX(d.data), - value: getY(d.data), - point: d.data, - index: i, - pos: d3.event, - id: id - }); - d3.event.stopPropagation(); - }) - .on('dblclick', function(d,i) { - dispatch.elementDblClick({ - label: getX(d.data), - value: getY(d.data), - point: d.data, - index: i, - pos: d3.event, - id: id - }); - d3.event.stopPropagation(); - }); - - slices - .attr('fill', function(d,i) { return color(d, i); }) - .attr('stroke', function(d,i) { return color(d, i); }); - - var paths = ae.append('path') - .each(function(d) { this._current = d; }); - //.attr('d', arc); - - d3.transition(slices.select('path')) - .attr('d', arc) - .attrTween('d', arcTween); - - if (showLabels) { - // This does the normal label - var labelsArc = d3.svg.arc().innerRadius(0); - - if (pieLabelsOutside){ labelsArc = arc; } - - if (donutLabelsOutside) { labelsArc = d3.svg.arc().outerRadius(arc.outerRadius()); } - - ae.append("g").classed("nv-label", true) - .each(function(d, i) { - var group = d3.select(this); - - group - .attr('transform', function(d) { - if (labelSunbeamLayout) { - d.outerRadius = arcRadius + 10; // Set Outer Coordinate - d.innerRadius = arcRadius + 15; // Set Inner Coordinate - var rotateAngle = (d.startAngle + d.endAngle) / 2 * (180 / Math.PI); - if ((d.startAngle+d.endAngle)/2 < Math.PI) { - rotateAngle -= 90; - } else { - rotateAngle += 90; - } - return 'translate(' + labelsArc.centroid(d) + ') rotate(' + rotateAngle + ')'; - } else { - d.outerRadius = radius + 10; // Set Outer Coordinate - d.innerRadius = radius + 15; // Set Inner Coordinate - return 'translate(' + labelsArc.centroid(d) + ')' - } - }); - - group.append('rect') - .style('stroke', '#fff') - .style('fill', '#fff') - .attr("rx", 3) - .attr("ry", 3); - - group.append('text') - .style('text-anchor', labelSunbeamLayout ? ((d.startAngle + d.endAngle) / 2 < Math.PI ? 'start' : 'end') : 'middle') //center the text on it's origin or begin/end if orthogonal aligned - .style('fill', '#000') - - - }); - - slices.select(".nv-label").transition() - .attr('transform', function(d) { - if (labelSunbeamLayout) { - d.outerRadius = arcRadius + 10; // Set Outer Coordinate - d.innerRadius = arcRadius + 15; // Set Inner Coordinate - var rotateAngle = (d.startAngle + d.endAngle) / 2 * (180 / Math.PI); - if ((d.startAngle+d.endAngle)/2 < Math.PI) { - rotateAngle -= 90; - } else { - rotateAngle += 90; - } - return 'translate(' + labelsArc.centroid(d) + ') rotate(' + rotateAngle + ')'; - } else { - d.outerRadius = radius + 10; // Set Outer Coordinate - d.innerRadius = radius + 15; // Set Inner Coordinate - return 'translate(' + labelsArc.centroid(d) + ')' - } - }); - - slices.each(function(d, i) { - var slice = d3.select(this); - - slice - .select(".nv-label text") - .style('text-anchor', labelSunbeamLayout ? ((d.startAngle + d.endAngle) / 2 < Math.PI ? 'start' : 'end') : 'middle') //center the text on it's origin or begin/end if orthogonal aligned - .text(function(d, i) { - var percent = (d.endAngle - d.startAngle) / (2 * Math.PI); - return (d.value && percent > labelThreshold) ? getX(d.data) : ''; - }); - - var textBox = slice.select('text').node().getBBox(); - slice.select(".nv-label rect") - .attr("width", textBox.width + 10) - .attr("height", textBox.height + 10) - .attr("transform", function() { - return "translate(" + [textBox.x - 5, textBox.y - 5] + ")"; - }); - }); - } - - - // Computes the angle of an arc, converting from radians to degrees. - function angle(d) { - var a = (d.startAngle + d.endAngle) * 90 / Math.PI - 90; - return a > 90 ? a - 180 : a; - } - - function arcTween(a) { - a.endAngle = isNaN(a.endAngle) ? 0 : a.endAngle; - a.startAngle = isNaN(a.startAngle) ? 0 : a.startAngle; - if (!donut) a.innerRadius = 0; - var i = d3.interpolate(this._current, a); - this._current = i(0); - return function(t) { - return arc(i(t)); - }; - } - - function tweenPie(b) { - b.innerRadius = 0; - var i = d3.interpolate({startAngle: 0, endAngle: 0}, b); - return function(t) { - return arc(i(t)); - }; - } - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.values = function(_) { - if (!arguments.length) return getValues; - getValues = _; - return chart; - }; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = d3.functor(_); - return chart; - }; - - chart.description = function(_) { - if (!arguments.length) return getDescription; - getDescription = _; - return chart; - }; - - chart.showLabels = function(_) { - if (!arguments.length) return showLabels; - showLabels = _; - return chart; - }; - - chart.labelSunbeamLayout = function(_) { - if (!arguments.length) return labelSunbeamLayout; - labelSunbeamLayout = _; - return chart; - }; - - chart.donutLabelsOutside = function(_) { - if (!arguments.length) return donutLabelsOutside; - donutLabelsOutside = _; - return chart; - }; - - chart.pieLabelsOutside = function(_) { - if (!arguments.length) return pieLabelsOutside; - pieLabelsOutside = _; - return chart; - }; - - chart.donut = function(_) { - if (!arguments.length) return donut; - donut = _; - return chart; - }; - - chart.donutRatio = function(_) { - if (!arguments.length) return donutRatio; - donutRatio = _; - return chart; - }; - - chart.startAngle = function(_) { - if (!arguments.length) return startAngle; - startAngle = _; - return chart; - }; - - chart.endAngle = function(_) { - if (!arguments.length) return endAngle; - endAngle = _; - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.valueFormat = function(_) { - if (!arguments.length) return valueFormat; - valueFormat = _; - return chart; - }; - - chart.labelThreshold = function(_) { - if (!arguments.length) return labelThreshold; - labelThreshold = _; - return chart; - }; - //============================================================ - - - return chart; -} -nv.models.pieChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var pie = nv.models.pie() - , legend = nv.models.legend() - ; - - var margin = {top: 30, right: 20, bottom: 20, left: 20} - , width = null - , height = null - , showLegend = true - , color = nv.utils.defaultColor() - , tooltips = true - , tooltip = function(key, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + '</p>' - } - , state = {} - , defaultState = null - , noData = "No Data Available." - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var tooltipLabel = pie.description()(e.point) || pie.x()(e.point) - var left = e.pos[0] + ( (offsetElement && offsetElement.offsetLeft) || 0 ), - top = e.pos[1] + ( (offsetElement && offsetElement.offsetTop) || 0), - y = pie.valueFormat()(pie.y()(e.point)), - content = tooltip(tooltipLabel, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart); }; - chart.container = this; - - //set state.disabled - state.disabled = data[0].map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data[0] || !data[0].length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-pieChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-pieChart').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-pieWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend - .width( availableWidth ) - .key(pie.x()); - - wrap.select('.nv-legendWrap') - .datum(pie.values()(data[0])) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - wrap.select('.nv-legendWrap') - .attr('transform', 'translate(0,' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - pie - .width(availableWidth) - .height(availableHeight); - - - var pieWrap = g.select('.nv-pieWrap') - .datum(data); - - d3.transition(pieWrap).call(pie); - - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i, that) { - d.disabled = !d.disabled; - - if (!pie.values()(data[0]).filter(function(d) { return !d.disabled }).length) { - pie.values()(data[0]).map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data[0].map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - chart.update(); - }); - - pie.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data[0].forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - chart.update(); - }); - - //============================================================ - - - }); - - return chart; - } - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - pie.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.legend = legend; - chart.dispatch = dispatch; - chart.pie = pie; - - d3.rebind(chart, pie, 'valueFormat', 'values', 'x', 'y', 'description', 'id', 'showLabels', 'donutLabelsOutside', 'pieLabelsOutside', 'donut', 'donutRatio', 'labelThreshold'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - pie.color(color); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.scatter = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , color = nv.utils.defaultColor() // chooses color - , id = Math.floor(Math.random() * 100000) //Create semi-unique ID incase user doesn't select one - , x = d3.scale.linear() - , y = d3.scale.linear() - , z = d3.scale.linear() //linear because d3.svg.shape.size is treated as area - , getX = function(d) { return d.x } // accessor to get the x value - , getY = function(d) { return d.y } // accessor to get the y value - , getSize = function(d) { return d.size || 1} // accessor to get the point size - , getShape = function(d) { return d.shape || 'circle' } // accessor to get point shape - , onlyCircles = true // Set to false to use shapes - , forceX = [] // List of numbers to Force into the X scale (ie. 0, or a max / min, etc.) - , forceY = [] // List of numbers to Force into the Y scale - , forceSize = [] // List of numbers to Force into the Size scale - , interactive = true // If true, plots a voronoi overlay for advanced point intersection - , pointKey = null - , pointActive = function(d) { return !d.notActive } // any points that return false will be filtered out - , padData = false // If true, adds half a data points width to front and back, for lining up a line chart with a bar chart - , padDataOuter = .1 //outerPadding to imitate ordinal scale outer padding - , clipEdge = false // if true, masks points within x and y scale - , clipVoronoi = true // if true, masks each point with a circle... can turn off to slightly increase performance - , clipRadius = function() { return 25 } // function to get the radius for voronoi point clips - , xDomain = null // Override x domain (skips the calculation from data) - , yDomain = null // Override y domain - , sizeDomain = null // Override point size domain - , sizeRange = null - , singlePoint = false - , dispatch = d3.dispatch('elementClick', 'elementMouseover', 'elementMouseout') - , useVoronoi = true - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0, z0 // used to store previous scales - , timeoutID - , needsUpdate = false // Flag for when the points are visually updating, but the interactive layer is behind, to disable tooltips - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - //add series index to each data point for reference - data = data.map(function(series, i) { - series.values = series.values.map(function(point) { - point.series = i; - return point; - }); - return series; - }); - - //------------------------------------------------------------ - // Setup Scales - - // remap and flatten the data for use in calculating the scales' domains - var seriesData = (xDomain && yDomain && sizeDomain) ? [] : // if we know xDomain and yDomain and sizeDomain, no need to calculate.... if Size is constant remember to set sizeDomain to speed up performance - d3.merge( - data.map(function(d) { - return d.values.map(function(d,i) { - return { x: getX(d,i), y: getY(d,i), size: getSize(d,i) } - }) - }) - ); - - x .domain(xDomain || d3.extent(seriesData.map(function(d) { return d.x; }).concat(forceX))) - - if (padData && data[0]) - x.range([(availableWidth * padDataOuter + availableWidth) / (2 *data[0].values.length), availableWidth - availableWidth * (1 + padDataOuter) / (2 * data[0].values.length) ]); - //x.range([availableWidth * .5 / data[0].values.length, availableWidth * (data[0].values.length - .5) / data[0].values.length ]); - else - x.range([0, availableWidth]); - - y .domain(yDomain || d3.extent(seriesData.map(function(d) { return d.y }).concat(forceY))) - .range([availableHeight, 0]); - - z .domain(sizeDomain || d3.extent(seriesData.map(function(d) { return d.size }).concat(forceSize))) - .range(sizeRange || [16, 256]); - - // If scale's domain don't have a range, slightly adjust to make one... so a chart can show a single data point - if (x.domain()[0] === x.domain()[1] || y.domain()[0] === y.domain()[1]) singlePoint = true; - if (x.domain()[0] === x.domain()[1]) - x.domain()[0] ? - x.domain([x.domain()[0] - x.domain()[0] * 0.01, x.domain()[1] + x.domain()[1] * 0.01]) - : x.domain([-1,1]); - - if (y.domain()[0] === y.domain()[1]) - y.domain()[0] ? - y.domain([y.domain()[0] + y.domain()[0] * 0.01, y.domain()[1] - y.domain()[1] * 0.01]) - : y.domain([-1,1]); - - if ( isNaN(x.domain()[0])) { - x.domain([-1,1]); - } - - if ( isNaN(y.domain()[0])) { - y.domain([-1,1]); - } - - - x0 = x0 || x; - y0 = y0 || y; - z0 = z0 || z; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-scatter').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-scatter nv-chart-' + id + (singlePoint ? ' nv-single-point' : '')); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-groups'); - gEnter.append('g').attr('class', 'nv-point-paths'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - defsEnter.append('clipPath') - .attr('id', 'nv-edge-clip-' + id) - .append('rect'); - - wrap.select('#nv-edge-clip-' + id + ' rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g .attr('clip-path', clipEdge ? 'url(#nv-edge-clip-' + id + ')' : ''); - - - function updateInteractiveLayer() { - - if (!interactive) return false; - - var eventElements; - - var vertices = d3.merge(data.map(function(group, groupIndex) { - return group.values - .map(function(point, pointIndex) { - // *Adding noise to make duplicates very unlikely - // *Injecting series and point index for reference - /* *Adding a 'jitter' to the points, because there's an issue in d3.geom.voronoi. - */ - var pX = getX(point,pointIndex) + Math.random() * 1e-7; - var pY = getY(point,pointIndex) + Math.random() * 1e-7; - - return [x(pX), - y(pY), - groupIndex, - pointIndex, point]; //temp hack to add noise untill I think of a better way so there are no duplicates - }) - .filter(function(pointArray, pointIndex) { - return pointActive(pointArray[4], pointIndex); // Issue #237.. move filter to after map, so pointIndex is correct! - }) - }) - ); - - - - //inject series and point index for reference into voronoi - if (useVoronoi === true) { - - if (clipVoronoi) { - var pointClipsEnter = wrap.select('defs').selectAll('.nv-point-clips') - .data([id]) - .enter(); - - pointClipsEnter.append('clipPath') - .attr('class', 'nv-point-clips') - .attr('id', 'nv-points-clip-' + id); - - var pointClips = wrap.select('#nv-points-clip-' + id).selectAll('circle') - .data(vertices); - pointClips.enter().append('circle') - .attr('r', clipRadius); - pointClips.exit().remove(); - pointClips - .attr('cx', function(d) { return d[0] }) - .attr('cy', function(d) { return d[1] }); - - wrap.select('.nv-point-paths') - .attr('clip-path', 'url(#nv-points-clip-' + id + ')'); - } - - - if(vertices.length) { - // Issue #283 - Adding 2 dummy points to the voronoi b/c voronoi requires min 3 points to work - vertices.push([x.range()[0] - 20, y.range()[0] - 20, null, null]); - vertices.push([x.range()[1] + 20, y.range()[1] + 20, null, null]); - vertices.push([x.range()[0] - 20, y.range()[0] + 20, null, null]); - vertices.push([x.range()[1] + 20, y.range()[1] - 20, null, null]); - } - - var bounds = d3.geom.polygon([ - [-10,-10], - [-10,height + 10], - [width + 10,height + 10], - [width + 10,-10] - ]); - - var voronoi = d3.geom.voronoi(vertices).map(function(d, i) { - return { - 'data': bounds.clip(d), - 'series': vertices[i][2], - 'point': vertices[i][3] - } - }); - - - var pointPaths = wrap.select('.nv-point-paths').selectAll('path') - .data(voronoi); - pointPaths.enter().append('path') - .attr('class', function(d,i) { return 'nv-path-'+i; }); - pointPaths.exit().remove(); - pointPaths - .attr('d', function(d) { - if (d.data.length === 0) - return 'M 0 0' - else - return 'M' + d.data.join('L') + 'Z'; - }); - - pointPaths - .on('click', function(d) { - if (needsUpdate) return 0; - var series = data[d.series], - point = series.values[d.point]; - - dispatch.elementClick({ - point: point, - series: series, - pos: [x(getX(point, d.point)) + margin.left, y(getY(point, d.point)) + margin.top], - seriesIndex: d.series, - pointIndex: d.point - }); - }) - .on('mouseover', function(d) { - if (needsUpdate) return 0; - var series = data[d.series], - point = series.values[d.point]; - - dispatch.elementMouseover({ - point: point, - series: series, - pos: [x(getX(point, d.point)) + margin.left, y(getY(point, d.point)) + margin.top], - seriesIndex: d.series, - pointIndex: d.point - }); - }) - .on('mouseout', function(d, i) { - if (needsUpdate) return 0; - var series = data[d.series], - point = series.values[d.point]; - - dispatch.elementMouseout({ - point: point, - series: series, - seriesIndex: d.series, - pointIndex: d.point - }); - }); - - - } else { - /* - // bring data in form needed for click handlers - var dataWithPoints = vertices.map(function(d, i) { - return { - 'data': d, - 'series': vertices[i][2], - 'point': vertices[i][3] - } - }); - */ - - // add event handlers to points instead voronoi paths - wrap.select('.nv-groups').selectAll('.nv-group') - .selectAll('.nv-point') - //.data(dataWithPoints) - //.style('pointer-events', 'auto') // recativate events, disabled by css - .on('click', function(d,i) { - //nv.log('test', d, i); - if (needsUpdate || !data[d.series]) return 0; //check if this is a dummy point - var series = data[d.series], - point = series.values[i]; - - dispatch.elementClick({ - point: point, - series: series, - pos: [x(getX(point, i)) + margin.left, y(getY(point, i)) + margin.top], - seriesIndex: d.series, - pointIndex: i - }); - }) - .on('mouseover', function(d,i) { - if (needsUpdate || !data[d.series]) return 0; //check if this is a dummy point - var series = data[d.series], - point = series.values[i]; - - dispatch.elementMouseover({ - point: point, - series: series, - pos: [x(getX(point, i)) + margin.left, y(getY(point, i)) + margin.top], - seriesIndex: d.series, - pointIndex: i - }); - }) - .on('mouseout', function(d,i) { - if (needsUpdate || !data[d.series]) return 0; //check if this is a dummy point - var series = data[d.series], - point = series.values[i]; - - dispatch.elementMouseout({ - point: point, - series: series, - seriesIndex: d.series, - pointIndex: i - }); - }); - } - - needsUpdate = false; - } - - needsUpdate = true; - - var groups = wrap.select('.nv-groups').selectAll('.nv-group') - .data(function(d) { return d }, function(d) { return d.key }); - groups.enter().append('g') - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6); - d3.transition(groups.exit()) - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6) - .remove(); - groups - .attr('class', function(d,i) { return 'nv-group nv-series-' + i }) - .classed('hover', function(d) { return d.hover }); - d3.transition(groups) - .style('fill', function(d,i) { return color(d, i) }) - .style('stroke', function(d,i) { return color(d, i) }) - .style('stroke-opacity', 1) - .style('fill-opacity', .5); - - - if (onlyCircles) { - - var points = groups.selectAll('circle.nv-point') - .data(function(d) { return d.values }, pointKey); - points.enter().append('circle') - .attr('cx', function(d,i) { return x0(getX(d,i)) }) - .attr('cy', function(d,i) { return y0(getY(d,i)) }) - .attr('r', function(d,i) { return Math.sqrt(z(getSize(d,i))/Math.PI) }); - points.exit().remove(); - groups.exit().selectAll('path.nv-point').transition() - .attr('cx', function(d,i) { return x(getX(d,i)) }) - .attr('cy', function(d,i) { return y(getY(d,i)) }) - .remove(); - points.each(function(d,i) { - d3.select(this) - .classed('nv-point', true) - .classed('nv-point-' + i, true); - }); - points.transition() - .attr('cx', function(d,i) { return x(getX(d,i)) }) - .attr('cy', function(d,i) { return y(getY(d,i)) }) - .attr('r', function(d,i) { return Math.sqrt(z(getSize(d,i))/Math.PI) }); - - } else { - - var points = groups.selectAll('path.nv-point') - .data(function(d) { return d.values }); - points.enter().append('path') - .attr('transform', function(d,i) { - return 'translate(' + x0(getX(d,i)) + ',' + y0(getY(d,i)) + ')' - }) - .attr('d', - d3.svg.symbol() - .type(getShape) - .size(function(d,i) { return z(getSize(d,i)) }) - ); - points.exit().remove(); - d3.transition(groups.exit().selectAll('path.nv-point')) - .attr('transform', function(d,i) { - return 'translate(' + x(getX(d,i)) + ',' + y(getY(d,i)) + ')' - }) - .remove(); - points.each(function(d,i) { - d3.select(this) - .classed('nv-point', true) - .classed('nv-point-' + i, true); - }); - points.transition() - .attr('transform', function(d,i) { - //nv.log(d,i,getX(d,i), x(getX(d,i))); - return 'translate(' + x(getX(d,i)) + ',' + y(getY(d,i)) + ')' - }) - .attr('d', - d3.svg.symbol() - .type(getShape) - .size(function(d,i) { return z(getSize(d,i)) }) - ); - } - - - // Delay updating the invisible interactive layer for smoother animation - clearTimeout(timeoutID); // stop repeat calls to updateInteractiveLayer - timeoutID = setTimeout(updateInteractiveLayer, 300); - //updateInteractiveLayer(); - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - z0 = z.copy(); - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - dispatch.on('elementMouseover.point', function(d) { - if (interactive) - d3.select('.nv-chart-' + id + ' .nv-series-' + d.seriesIndex + ' .nv-point-' + d.pointIndex) - .classed('hover', true); - }); - - dispatch.on('elementMouseout.point', function(d) { - if (interactive) - d3.select('.nv-chart-' + id + ' .nv-series-' + d.seriesIndex + ' .nv-point-' + d.pointIndex) - .classed('hover', false); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = d3.functor(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = d3.functor(_); - return chart; - }; - - chart.size = function(_) { - if (!arguments.length) return getSize; - getSize = d3.functor(_); - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.zScale = function(_) { - if (!arguments.length) return z; - z = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.sizeDomain = function(_) { - if (!arguments.length) return sizeDomain; - sizeDomain = _; - return chart; - }; - - chart.sizeRange = function(_) { - if (!arguments.length) return sizeRange; - sizeRange = _; - return chart; - }; - - chart.forceX = function(_) { - if (!arguments.length) return forceX; - forceX = _; - return chart; - }; - - chart.forceY = function(_) { - if (!arguments.length) return forceY; - forceY = _; - return chart; - }; - - chart.forceSize = function(_) { - if (!arguments.length) return forceSize; - forceSize = _; - return chart; - }; - - chart.interactive = function(_) { - if (!arguments.length) return interactive; - interactive = _; - return chart; - }; - - chart.pointKey = function(_) { - if (!arguments.length) return pointKey; - pointKey = _; - return chart; - }; - - chart.pointActive = function(_) { - if (!arguments.length) return pointActive; - pointActive = _; - return chart; - }; - - chart.padData = function(_) { - if (!arguments.length) return padData; - padData = _; - return chart; - }; - - chart.padDataOuter = function(_) { - if (!arguments.length) return padDataOuter; - padDataOuter = _; - return chart; - }; - - chart.clipEdge = function(_) { - if (!arguments.length) return clipEdge; - clipEdge = _; - return chart; - }; - - chart.clipVoronoi= function(_) { - if (!arguments.length) return clipVoronoi; - clipVoronoi = _; - return chart; - }; - - chart.useVoronoi= function(_) { - if (!arguments.length) return useVoronoi; - useVoronoi = _; - if (useVoronoi === false) { - clipVoronoi = false; - } - return chart; - }; - - chart.clipRadius = function(_) { - if (!arguments.length) return clipRadius; - clipRadius = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.shape = function(_) { - if (!arguments.length) return getShape; - getShape = _; - return chart; - }; - - chart.onlyCircles = function(_) { - if (!arguments.length) return onlyCircles; - onlyCircles = _; - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - chart.singlePoint = function(_) { - if (!arguments.length) return singlePoint; - singlePoint = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.scatterChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var scatter = nv.models.scatter() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - , controls = nv.models.legend() - , distX = nv.models.distribution() - , distY = nv.models.distribution() - ; - - var margin = {top: 30, right: 20, bottom: 50, left: 75} - , width = null - , height = null - , color = nv.utils.defaultColor() - , x = d3.fisheye ? d3.fisheye.scale(d3.scale.linear).distortion(0) : scatter.xScale() - , y = d3.fisheye ? d3.fisheye.scale(d3.scale.linear).distortion(0) : scatter.yScale() - , xPadding = 0 - , yPadding = 0 - , showDistX = false - , showDistY = false - , showLegend = true - , showControls = !!d3.fisheye - , fisheye = 0 - , pauseFisheye = false - , tooltips = true - , tooltipX = function(key, x, y) { return '<strong>' + x + '</strong>' } - , tooltipY = function(key, x, y) { return '<strong>' + y + '</strong>' } - //, tooltip = function(key, x, y) { return '<h3>' + key + '</h3>' } - , tooltip = null - , state = {} - , defaultState = null - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - , noData = "No Data Available." - ; - - scatter - .xScale(x) - .yScale(y) - ; - xAxis - .orient('bottom') - .tickPadding(10) - ; - yAxis - .orient('left') - .tickPadding(10) - ; - distX - .axis('x') - ; - distY - .axis('y') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0; - - var showTooltip = function(e, offsetElement) { - //TODO: make tooltip style an option between single or dual on axes (maybe on all charts with axes?) - - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - leftX = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - topX = y.range()[0] + margin.top + ( offsetElement.offsetTop || 0), - leftY = x.range()[0] + margin.left + ( offsetElement.offsetLeft || 0 ), - topY = e.pos[1] + ( offsetElement.offsetTop || 0), - xVal = xAxis.tickFormat()(scatter.x()(e.point, e.pointIndex)), - yVal = yAxis.tickFormat()(scatter.y()(e.point, e.pointIndex)); - - if( tooltipX != null ) - nv.tooltip.show([leftX, topX], tooltipX(e.series.key, xVal, yVal, e, chart), 'n', 1, offsetElement, 'x-nvtooltip'); - if( tooltipY != null ) - nv.tooltip.show([leftY, topY], tooltipY(e.series.key, xVal, yVal, e, chart), 'e', 1, offsetElement, 'y-nvtooltip'); - if( tooltip != null ) - nv.tooltip.show([left, top], tooltip(e.series.key, xVal, yVal, e, chart), e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - var controlsData = [ - { key: 'Magnify', disabled: true } - ]; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart); }; - // chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display noData message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x0 = x0 || x; - y0 = y0 || y; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-scatterChart').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-scatterChart nv-chart-' + scatter.id()); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - // background for pointer events - gEnter.append('rect').attr('class', 'nvd3 nv-background'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-scatterWrap'); - gEnter.append('g').attr('class', 'nv-distWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - gEnter.append('g').attr('class', 'nv-controlsWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width( availableWidth / 2 ); - - wrap.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - wrap.select('.nv-legendWrap') - .attr('transform', 'translate(' + (availableWidth / 2) + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Controls - - if (showControls) { - controls.width(180).color(['#444']); - g.select('.nv-controlsWrap') - .datum(controlsData) - .attr('transform', 'translate(0,' + (-margin.top) +')') - .call(controls); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - scatter - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })) - .xDomain(null) - .yDomain(null) - - wrap.select('.nv-scatterWrap') - .datum(data.filter(function(d) { return !d.disabled })) - .call(scatter); - - - //Adjust for x and y padding - if (xPadding) { - var xRange = x.domain()[1] - x.domain()[0]; - scatter.xDomain([x.domain()[0] - (xPadding * xRange), x.domain()[1] + (xPadding * xRange)]); - } - - if (yPadding) { - var yRange = y.domain()[1] - y.domain()[0]; - scatter.yDomain([y.domain()[0] - (yPadding * yRange), y.domain()[1] + (yPadding * yRange)]); - } - - wrap.select('.nv-scatterWrap') - .datum(data.filter(function(d) { return !d.disabled })) - .call(scatter); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( xAxis.ticks() && xAxis.ticks().length ? xAxis.ticks() : availableWidth / 100 ) - .tickSize( -availableHeight , 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y.range()[0] + ')') - .call(xAxis); - - - yAxis - .scale(y) - .ticks( yAxis.ticks() && yAxis.ticks().length ? yAxis.ticks() : availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - g.select('.nv-y.nv-axis') - .call(yAxis); - - - if (showDistX) { - distX - .getData(scatter.x()) - .scale(x) - .width(availableWidth) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - gEnter.select('.nv-distWrap').append('g') - .attr('class', 'nv-distributionX'); - g.select('.nv-distributionX') - .attr('transform', 'translate(0,' + y.range()[0] + ')') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distX); - } - - if (showDistY) { - distY - .getData(scatter.y()) - .scale(y) - .width(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - gEnter.select('.nv-distWrap').append('g') - .attr('class', 'nv-distributionY'); - g.select('.nv-distributionY') - .attr('transform', 'translate(-' + distY.size() + ',0)') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distY); - } - - //------------------------------------------------------------ - - - - - if (d3.fisheye) { - g.select('.nv-background') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g.select('.nv-background').on('mousemove', updateFisheye); - g.select('.nv-background').on('click', function() { pauseFisheye = !pauseFisheye;}); - scatter.dispatch.on('elementClick.freezeFisheye', function() { - pauseFisheye = !pauseFisheye; - }); - } - - - function updateFisheye() { - if (pauseFisheye) { - g.select('.nv-point-paths').style('pointer-events', 'all'); - return false; - } - - g.select('.nv-point-paths').style('pointer-events', 'none' ); - - var mouse = d3.mouse(this); - x.distortion(fisheye).focus(mouse[0]); - y.distortion(fisheye).focus(mouse[1]); - - g.select('.nv-scatterWrap') - .call(scatter); - - g.select('.nv-x.nv-axis').call(xAxis); - g.select('.nv-y.nv-axis').call(yAxis); - g.select('.nv-distributionX') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distX); - g.select('.nv-distributionY') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distY); - } - - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - controls.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - fisheye = d.disabled ? 0 : 2.5; - g.select('.nv-background') .style('pointer-events', d.disabled ? 'none' : 'all'); - g.select('.nv-point-paths').style('pointer-events', d.disabled ? 'all' : 'none' ); - - if (d.disabled) { - x.distortion(fisheye).focus(0); - y.distortion(fisheye).focus(0); - - g.select('.nv-scatterWrap').call(scatter); - g.select('.nv-x.nv-axis').call(xAxis); - g.select('.nv-y.nv-axis').call(yAxis); - } else { - pauseFisheye = false; - } - - chart.update(); - }); - - legend.dispatch.on('legendClick', function(d,i, that) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - - /* - legend.dispatch.on('legendMouseover', function(d, i) { - d.hover = true; - chart(selection); - }); - - legend.dispatch.on('legendMouseout', function(d, i) { - d.hover = false; - chart(selection); - }); - */ - - scatter.dispatch.on('elementMouseover.tooltip', function(e) { - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-distx-' + e.pointIndex) - .attr('y1', function(d,i) { return e.pos[1] - availableHeight;}); - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-disty-' + e.pointIndex) - .attr('x2', e.pos[0] + distX.size()); - - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - chart.update(); - }); - - //============================================================ - - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - scatter.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-distx-' + e.pointIndex) - .attr('y1', 0); - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-disty-' + e.pointIndex) - .attr('x2', distY.size()); - }); - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.scatter = scatter; - chart.legend = legend; - chart.controls = controls; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - chart.distX = distX; - chart.distY = distY; - - d3.rebind(chart, scatter, 'id', 'interactive', 'pointActive', 'x', 'y', 'shape', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'sizeDomain', 'sizeRange', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'clipRadius', 'useVoronoi'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - distX.color(color); - distY.color(color); - return chart; - }; - - chart.showDistX = function(_) { - if (!arguments.length) return showDistX; - showDistX = _; - return chart; - }; - - chart.showDistY = function(_) { - if (!arguments.length) return showDistY; - showDistY = _; - return chart; - }; - - chart.showControls = function(_) { - if (!arguments.length) return showControls; - showControls = _; - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.fisheye = function(_) { - if (!arguments.length) return fisheye; - fisheye = _; - return chart; - }; - - chart.xPadding = function(_) { - if (!arguments.length) return xPadding; - xPadding = _; - return chart; - }; - - chart.yPadding = function(_) { - if (!arguments.length) return yPadding; - yPadding = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.tooltipXContent = function(_) { - if (!arguments.length) return tooltipX; - tooltipX = _; - return chart; - }; - - chart.tooltipYContent = function(_) { - if (!arguments.length) return tooltipY; - tooltipY = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.scatterPlusLineChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var scatter = nv.models.scatter() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - , controls = nv.models.legend() - , distX = nv.models.distribution() - , distY = nv.models.distribution() - ; - - var margin = {top: 30, right: 20, bottom: 50, left: 75} - , width = null - , height = null - , color = nv.utils.defaultColor() - , x = d3.fisheye ? d3.fisheye.scale(d3.scale.linear).distortion(0) : scatter.xScale() - , y = d3.fisheye ? d3.fisheye.scale(d3.scale.linear).distortion(0) : scatter.yScale() - , showDistX = false - , showDistY = false - , showLegend = true - , showControls = !!d3.fisheye - , fisheye = 0 - , pauseFisheye = false - , tooltips = true - , tooltipX = function(key, x, y) { return '<strong>' + x + '</strong>' } - , tooltipY = function(key, x, y) { return '<strong>' + y + '</strong>' } - , tooltip = function(key, x, y, date) { return '<h3>' + key + '</h3>' - + '<p>' + date + '</p>' } - //, tooltip = null - , state = {} - , defaultState = null - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - , noData = "No Data Available." - ; - - scatter - .xScale(x) - .yScale(y) - ; - xAxis - .orient('bottom') - .tickPadding(10) - ; - yAxis - .orient('left') - .tickPadding(10) - ; - distX - .axis('x') - ; - distY - .axis('y') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0; - - var showTooltip = function(e, offsetElement) { - //TODO: make tooltip style an option between single or dual on axes (maybe on all charts with axes?) - - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - leftX = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - topX = y.range()[0] + margin.top + ( offsetElement.offsetTop || 0), - leftY = x.range()[0] + margin.left + ( offsetElement.offsetLeft || 0 ), - topY = e.pos[1] + ( offsetElement.offsetTop || 0), - xVal = xAxis.tickFormat()(scatter.x()(e.point, e.pointIndex)), - yVal = yAxis.tickFormat()(scatter.y()(e.point, e.pointIndex)); - - if( tooltipX != null ) - nv.tooltip.show([leftX, topX], tooltipX(e.series.key, xVal, yVal, e, chart), 'n', 1, offsetElement, 'x-nvtooltip'); - if( tooltipY != null ) - nv.tooltip.show([leftY, topY], tooltipY(e.series.key, xVal, yVal, e, chart), 'e', 1, offsetElement, 'y-nvtooltip'); - if( tooltip != null ) - nv.tooltip.show([left, top], tooltip(e.series.key, xVal, yVal, e.point.tooltip, e, chart), e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - var controlsData = [ - { key: 'Magnify', disabled: true } - ]; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart); }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display noData message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = scatter.xScale(); - y = scatter.yScale(); - - x0 = x0 || x; - y0 = y0 || y; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-scatterChart').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-scatterChart nv-chart-' + scatter.id()); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g') - - // background for pointer events - gEnter.append('rect').attr('class', 'nvd3 nv-background') - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-scatterWrap'); - gEnter.append('g').attr('class', 'nv-regressionLinesWrap'); - gEnter.append('g').attr('class', 'nv-distWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - gEnter.append('g').attr('class', 'nv-controlsWrap'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width( availableWidth / 2 ); - - wrap.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - wrap.select('.nv-legendWrap') - .attr('transform', 'translate(' + (availableWidth / 2) + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Controls - - if (showControls) { - controls.width(180).color(['#444']); - g.select('.nv-controlsWrap') - .datum(controlsData) - .attr('transform', 'translate(0,' + (-margin.top) +')') - .call(controls); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Main Chart Component(s) - - scatter - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })) - - wrap.select('.nv-scatterWrap') - .datum(data.filter(function(d) { return !d.disabled })) - .call(scatter); - - - wrap.select('.nv-regressionLinesWrap') - .attr('clip-path', 'url(#nv-edge-clip-' + scatter.id() + ')'); - - var regWrap = wrap.select('.nv-regressionLinesWrap').selectAll('.nv-regLines') - .data(function(d) { return d }); - - var reglines = regWrap.enter() - .append('g').attr('class', 'nv-regLines') - .append('line').attr('class', 'nv-regLine') - .style('stroke-opacity', 0); - - //d3.transition(regWrap.selectAll('.nv-regLines line')) - regWrap.selectAll('.nv-regLines line') - .attr('x1', x.range()[0]) - .attr('x2', x.range()[1]) - .attr('y1', function(d,i) { return y(x.domain()[0] * d.slope + d.intercept) }) - .attr('y2', function(d,i) { return y(x.domain()[1] * d.slope + d.intercept) }) - .style('stroke', function(d,i,j) { return color(d,j) }) - .style('stroke-opacity', function(d,i) { - return (d.disabled || typeof d.slope === 'undefined' || typeof d.intercept === 'undefined') ? 0 : 1 - }); - - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( xAxis.ticks() ? xAxis.ticks() : availableWidth / 100 ) - .tickSize( -availableHeight , 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y.range()[0] + ')') - .call(xAxis); - - - yAxis - .scale(y) - .ticks( yAxis.ticks() ? yAxis.ticks() : availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - g.select('.nv-y.nv-axis') - .call(yAxis); - - - if (showDistX) { - distX - .getData(scatter.x()) - .scale(x) - .width(availableWidth) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - gEnter.select('.nv-distWrap').append('g') - .attr('class', 'nv-distributionX'); - g.select('.nv-distributionX') - .attr('transform', 'translate(0,' + y.range()[0] + ')') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distX); - } - - if (showDistY) { - distY - .getData(scatter.y()) - .scale(y) - .width(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - gEnter.select('.nv-distWrap').append('g') - .attr('class', 'nv-distributionY'); - g.select('.nv-distributionY') - .attr('transform', 'translate(-' + distY.size() + ',0)') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distY); - } - - //------------------------------------------------------------ - - - - - if (d3.fisheye) { - g.select('.nv-background') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g.select('.nv-background').on('mousemove', updateFisheye); - g.select('.nv-background').on('click', function() { pauseFisheye = !pauseFisheye;}); - scatter.dispatch.on('elementClick.freezeFisheye', function() { - pauseFisheye = !pauseFisheye; - }); - } - - - function updateFisheye() { - if (pauseFisheye) { - g.select('.nv-point-paths').style('pointer-events', 'all'); - return false; - } - - g.select('.nv-point-paths').style('pointer-events', 'none' ); - - var mouse = d3.mouse(this); - x.distortion(fisheye).focus(mouse[0]); - y.distortion(fisheye).focus(mouse[1]); - - g.select('.nv-scatterWrap') - .datum(data.filter(function(d) { return !d.disabled })) - .call(scatter); - g.select('.nv-x.nv-axis').call(xAxis); - g.select('.nv-y.nv-axis').call(yAxis); - g.select('.nv-distributionX') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distX); - g.select('.nv-distributionY') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distY); - } - - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - controls.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - fisheye = d.disabled ? 0 : 2.5; - g.select('.nv-background') .style('pointer-events', d.disabled ? 'none' : 'all'); - g.select('.nv-point-paths').style('pointer-events', d.disabled ? 'all' : 'none' ); - - if (d.disabled) { - x.distortion(fisheye).focus(0); - y.distortion(fisheye).focus(0); - - g.select('.nv-scatterWrap').call(scatter); - g.select('.nv-x.nv-axis').call(xAxis); - g.select('.nv-y.nv-axis').call(yAxis); - } else { - pauseFisheye = false; - } - - chart.update(); - }); - - legend.dispatch.on('legendClick', function(d,i, that) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - - /* - legend.dispatch.on('legendMouseover', function(d, i) { - d.hover = true; - chart(selection); - }); - - legend.dispatch.on('legendMouseout', function(d, i) { - d.hover = false; - chart(selection); - }); - */ - - scatter.dispatch.on('elementMouseover.tooltip', function(e) { - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-distx-' + e.pointIndex) - .attr('y1', e.pos[1] - availableHeight); - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-disty-' + e.pointIndex) - .attr('x2', e.pos[0] + distX.size()); - - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - chart.update(); - }); - - //============================================================ - - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - scatter.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-distx-' + e.pointIndex) - .attr('y1', 0); - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-disty-' + e.pointIndex) - .attr('x2', distY.size()); - }); - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.scatter = scatter; - chart.legend = legend; - chart.controls = controls; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - chart.distX = distX; - chart.distY = distY; - - d3.rebind(chart, scatter, 'id', 'interactive', 'pointActive', 'x', 'y', 'shape', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'sizeDomain', 'sizeRange', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'clipRadius', 'useVoronoi'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - distX.color(color); - distY.color(color); - return chart; - }; - - chart.showDistX = function(_) { - if (!arguments.length) return showDistX; - showDistX = _; - return chart; - }; - - chart.showDistY = function(_) { - if (!arguments.length) return showDistY; - showDistY = _; - return chart; - }; - - chart.showControls = function(_) { - if (!arguments.length) return showControls; - showControls = _; - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.fisheye = function(_) { - if (!arguments.length) return fisheye; - fisheye = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.tooltipXContent = function(_) { - if (!arguments.length) return tooltipX; - tooltipX = _; - return chart; - }; - - chart.tooltipYContent = function(_) { - if (!arguments.length) return tooltipY; - tooltipY = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.sparkline = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 2, right: 0, bottom: 2, left: 0} - , width = 400 - , height = 32 - , animate = true - , x = d3.scale.linear() - , y = d3.scale.linear() - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , color = nv.utils.getColor(['#000']) - , xDomain - , yDomain - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - - //------------------------------------------------------------ - // Setup Scales - - x .domain(xDomain || d3.extent(data, getX )) - .range([0, availableWidth]); - - y .domain(yDomain || d3.extent(data, getY )) - .range([availableHeight, 0]); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-sparkline').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-sparkline'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')') - - //------------------------------------------------------------ - - - var paths = wrap.selectAll('path') - .data(function(d) { return [d] }); - paths.enter().append('path'); - paths.exit().remove(); - paths - .style('stroke', function(d,i) { return d.color || color(d, i) }) - .attr('d', d3.svg.line() - .x(function(d,i) { return x(getX(d,i)) }) - .y(function(d,i) { return y(getY(d,i)) }) - ); - - - // TODO: Add CURRENT data point (Need Min, Mac, Current / Most recent) - var points = wrap.selectAll('circle.nv-point') - .data(function(data) { - var yValues = data.map(function(d, i) { return getY(d,i); }); - function pointIndex(index) { - if (index != -1) { - var result = data[index]; - result.pointIndex = index; - return result; - } else { - return null; - } - } - var maxPoint = pointIndex(yValues.lastIndexOf(y.domain()[1])), - minPoint = pointIndex(yValues.indexOf(y.domain()[0])), - currentPoint = pointIndex(yValues.length - 1); - return [minPoint, maxPoint, currentPoint].filter(function (d) {return d != null;}); - }); - points.enter().append('circle'); - points.exit().remove(); - points - .attr('cx', function(d,i) { return x(getX(d,d.pointIndex)) }) - .attr('cy', function(d,i) { return y(getY(d,d.pointIndex)) }) - .attr('r', 2) - .attr('class', function(d,i) { - return getX(d, d.pointIndex) == x.domain()[1] ? 'nv-point nv-currentValue' : - getY(d, d.pointIndex) == y.domain()[0] ? 'nv-point nv-minValue' : 'nv-point nv-maxValue' - }); - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = d3.functor(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = d3.functor(_); - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.animate = function(_) { - if (!arguments.length) return animate; - animate = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.sparklinePlus = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var sparkline = nv.models.sparkline(); - - var margin = {top: 15, right: 100, bottom: 10, left: 50} - , width = null - , height = null - , x - , y - , index = [] - , paused = false - , xTickFormat = d3.format(',r') - , yTickFormat = d3.format(',.2f') - , showValue = true - , alignValue = true - , rightAlignValue = false - , noData = "No Data Available." - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this); - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - - - chart.update = function() { chart(selection) }; - chart.container = this; - - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - var currentValue = sparkline.y()(data[data.length-1], data.length-1); - - //------------------------------------------------------------ - - - - //------------------------------------------------------------ - // Setup Scales - - x = sparkline.xScale(); - y = sparkline.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-sparklineplus').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-sparklineplus'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-sparklineWrap'); - gEnter.append('g').attr('class', 'nv-valueWrap'); - gEnter.append('g').attr('class', 'nv-hoverArea'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Main Chart Component(s) - - var sparklineWrap = g.select('.nv-sparklineWrap'); - - sparkline - .width(availableWidth) - .height(availableHeight); - - sparklineWrap - .call(sparkline); - - //------------------------------------------------------------ - - - var valueWrap = g.select('.nv-valueWrap'); - - var value = valueWrap.selectAll('.nv-currentValue') - .data([currentValue]); - - value.enter().append('text').attr('class', 'nv-currentValue') - .attr('dx', rightAlignValue ? -8 : 8) - .attr('dy', '.9em') - .style('text-anchor', rightAlignValue ? 'end' : 'start'); - - value - .attr('x', availableWidth + (rightAlignValue ? margin.right : 0)) - .attr('y', alignValue ? function(d) { return y(d) } : 0) - .style('fill', sparkline.color()(data[data.length-1], data.length-1)) - .text(yTickFormat(currentValue)); - - - - gEnter.select('.nv-hoverArea').append('rect') - .on('mousemove', sparklineHover) - .on('click', function() { paused = !paused }) - .on('mouseout', function() { index = []; updateValueLine(); }); - //.on('mouseout', function() { index = null; updateValueLine(); }); - - g.select('.nv-hoverArea rect') - .attr('transform', function(d) { return 'translate(' + -margin.left + ',' + -margin.top + ')' }) - .attr('width', availableWidth + margin.left + margin.right) - .attr('height', availableHeight + margin.top); - - - - function updateValueLine() { //index is currently global (within the chart), may or may not keep it that way - if (paused) return; - - var hoverValue = g.selectAll('.nv-hoverValue').data(index) - - var hoverEnter = hoverValue.enter() - .append('g').attr('class', 'nv-hoverValue') - .style('stroke-opacity', 0) - .style('fill-opacity', 0); - - hoverValue.exit() - .transition().duration(250) - .style('stroke-opacity', 0) - .style('fill-opacity', 0) - .remove(); - - hoverValue - .attr('transform', function(d) { return 'translate(' + x(sparkline.x()(data[d],d)) + ',0)' }) - .transition().duration(250) - .style('stroke-opacity', 1) - .style('fill-opacity', 1); - - if (!index.length) return; - - hoverEnter.append('line') - .attr('x1', 0) - .attr('y1', -margin.top) - .attr('x2', 0) - .attr('y2', availableHeight); - - - hoverEnter.append('text').attr('class', 'nv-xValue') - .attr('x', -6) - .attr('y', -margin.top) - .attr('text-anchor', 'end') - .attr('dy', '.9em') - - - g.select('.nv-hoverValue .nv-xValue') - .text(xTickFormat(sparkline.x()(data[index[0]], index[0]))); - - hoverEnter.append('text').attr('class', 'nv-yValue') - .attr('x', 6) - .attr('y', -margin.top) - .attr('text-anchor', 'start') - .attr('dy', '.9em') - - g.select('.nv-hoverValue .nv-yValue') - .text(yTickFormat(sparkline.y()(data[index[0]], index[0]))); - - } - - - function sparklineHover() { - if (paused) return; - - var pos = d3.mouse(this)[0] - margin.left; - - function getClosestIndex(data, x) { - var distance = Math.abs(sparkline.x()(data[0], 0) - x); - var closestIndex = 0; - for (var i = 0; i < data.length; i++){ - if (Math.abs(sparkline.x()(data[i], i) - x) < distance) { - distance = Math.abs(sparkline.x()(data[i], i) - x); - closestIndex = i; - } - } - return closestIndex; - } - - index = [getClosestIndex(data, Math.round(x.invert(pos)))]; - - updateValueLine(); - } - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.sparkline = sparkline; - - d3.rebind(chart, sparkline, 'x', 'y', 'xScale', 'yScale', 'color'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xTickFormat = function(_) { - if (!arguments.length) return xTickFormat; - xTickFormat = _; - return chart; - }; - - chart.yTickFormat = function(_) { - if (!arguments.length) return yTickFormat; - yTickFormat = _; - return chart; - }; - - chart.showValue = function(_) { - if (!arguments.length) return showValue; - showValue = _; - return chart; - }; - - chart.alignValue = function(_) { - if (!arguments.length) return alignValue; - alignValue = _; - return chart; - }; - - chart.rightAlignValue = function(_) { - if (!arguments.length) return rightAlignValue; - rightAlignValue = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.stackedArea = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , color = nv.utils.defaultColor() // a function that computes the color - , id = Math.floor(Math.random() * 100000) //Create semi-unique ID incase user doesn't selet one - , getX = function(d) { return d.x } // accessor to get the x value from a data point - , getY = function(d) { return d.y } // accessor to get the y value from a data point - , style = 'stack' - , offset = 'zero' - , order = 'default' - , interpolate = 'linear' // controls the line interpolation - , clipEdge = false // if true, masks lines within x and y scale - , x //can be accessed via chart.xScale() - , y //can be accessed via chart.yScale() - , scatter = nv.models.scatter() - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'areaClick', 'areaMouseover', 'areaMouseout') - ; - - scatter - .size(2.2) // default size - .sizeDomain([2.2,2.2]) // all the same size by default - ; - - /************************************ - * offset: - * 'wiggle' (stream) - * 'zero' (stacked) - * 'expand' (normalize to 100%) - * 'silhouette' (simple centered) - * - * order: - * 'inside-out' (stream) - * 'default' (input order) - ************************************/ - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - //------------------------------------------------------------ - // Setup Scales - - x = scatter.xScale(); - y = scatter.yScale(); - - //------------------------------------------------------------ - - - // Injecting point index into each point because d3.layout.stack().out does not give index - // ***Also storing getY(d,i) as stackedY so that it can be set to 0 if series is disabled - data = data.map(function(aseries, i) { - aseries.values = aseries.values.map(function(d, j) { - d.index = j; - d.stackedY = aseries.disabled ? 0 : getY(d,j); - return d; - }) - return aseries; - }); - - - data = d3.layout.stack() - .order(order) - .offset(offset) - .values(function(d) { return d.values }) //TODO: make values customizeable in EVERY model in this fashion - .x(getX) - .y(function(d) { return d.stackedY }) - .out(function(d, y0, y) { - d.display = { - y: y, - y0: y0 - }; - }) - (data); - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-stackedarea').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-stackedarea'); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-areaWrap'); - gEnter.append('g').attr('class', 'nv-scatterWrap'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - scatter - .width(availableWidth) - .height(availableHeight) - .x(getX) - .y(function(d) { return d.display.y + d.display.y0 }) - .forceY([0]) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - - - var scatterWrap = g.select('.nv-scatterWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - //d3.transition(scatterWrap).call(scatter); - scatterWrap.call(scatter); - - - - - - defsEnter.append('clipPath') - .attr('id', 'nv-edge-clip-' + id) - .append('rect'); - - wrap.select('#nv-edge-clip-' + id + ' rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g .attr('clip-path', clipEdge ? 'url(#nv-edge-clip-' + id + ')' : ''); - - - - - var area = d3.svg.area() - .x(function(d,i) { return x(getX(d,i)) }) - .y0(function(d) { return y(d.display.y0) }) - .y1(function(d) { return y(d.display.y + d.display.y0) }) - .interpolate(interpolate); - - var zeroArea = d3.svg.area() - .x(function(d,i) { return x(getX(d,i)) }) - .y0(function(d) { return y(d.display.y0) }) - .y1(function(d) { return y(d.display.y0) }); - - - var path = g.select('.nv-areaWrap').selectAll('path.nv-area') - .data(function(d) { return d }); - //.data(function(d) { return d }, function(d) { return d.key }); - path.enter().append('path').attr('class', function(d,i) { return 'nv-area nv-area-' + i }) - .on('mouseover', function(d,i) { - d3.select(this).classed('hover', true); - dispatch.areaMouseover({ - point: d, - series: d.key, - pos: [d3.event.pageX, d3.event.pageY], - seriesIndex: i - }); - }) - .on('mouseout', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.areaMouseout({ - point: d, - series: d.key, - pos: [d3.event.pageX, d3.event.pageY], - seriesIndex: i - }); - }) - .on('click', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.areaClick({ - point: d, - series: d.key, - pos: [d3.event.pageX, d3.event.pageY], - seriesIndex: i - }); - }) - //d3.transition(path.exit()) - path.exit() - .attr('d', function(d,i) { return zeroArea(d.values,i) }) - .remove(); - path - .style('fill', function(d,i){ return d.color || color(d, i) }) - .style('stroke', function(d,i){ return d.color || color(d, i) }); - //d3.transition(path) - path - .attr('d', function(d,i) { return area(d.values,i) }) - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - scatter.dispatch.on('elementMouseover.area', function(e) { - g.select('.nv-chart-' + id + ' .nv-area-' + e.seriesIndex).classed('hover', true); - }); - scatter.dispatch.on('elementMouseout.area', function(e) { - g.select('.nv-chart-' + id + ' .nv-area-' + e.seriesIndex).classed('hover', false); - }); - - //============================================================ - - }); - - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - scatter.dispatch.on('elementClick.area', function(e) { - dispatch.areaClick(e); - }) - scatter.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top], - dispatch.tooltipShow(e); - }); - scatter.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - //============================================================ - - - //============================================================ - // Global getters and setters - //------------------------------------------------------------ - - chart.dispatch = dispatch; - chart.scatter = scatter; - - d3.rebind(chart, scatter, 'interactive', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'sizeDomain', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'clipRadius'); - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = d3.functor(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = d3.functor(_); - return chart; - } - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.clipEdge = function(_) { - if (!arguments.length) return clipEdge; - clipEdge = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.offset = function(_) { - if (!arguments.length) return offset; - offset = _; - return chart; - }; - - chart.order = function(_) { - if (!arguments.length) return order; - order = _; - return chart; - }; - - //shortcut for offset + order - chart.style = function(_) { - if (!arguments.length) return style; - style = _; - - switch (style) { - case 'stack': - chart.offset('zero'); - chart.order('default'); - break; - case 'stream': - chart.offset('wiggle'); - chart.order('inside-out'); - break; - case 'stream-center': - chart.offset('silhouette'); - chart.order('inside-out'); - break; - case 'expand': - chart.offset('expand'); - chart.order('default'); - break; - } - - return chart; - }; - - chart.interpolate = function(_) { - if (!arguments.length) return interpolate; - interpolate = _; - return interpolate; - - }; - - //============================================================ - - - return chart; -} - -nv.models.stackedAreaChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var stacked = nv.models.stackedArea() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - , controls = nv.models.legend() - ; - - var margin = {top: 30, right: 25, bottom: 50, left: 60} - , width = null - , height = null - , color = nv.utils.defaultColor() // a function that takes in d, i and returns color - , showControls = true - , showLegend = true - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' on ' + x + '</p>' - } - , x //can be accessed via chart.xScale() - , y //can be accessed via chart.yScale() - , yAxisTickFormat = d3.format(',.2f') - , state = { style: stacked.style() } - , defaultState = null - , noData = 'No Data Available.' - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - , controlWidth = 250 - ; - - xAxis - .orient('bottom') - .tickPadding(7) - ; - yAxis - .orient('left') - ; - stacked.scatter - .pointActive(function(d) { - //console.log(stacked.y()(d), !!Math.round(stacked.y()(d) * 100)); - return !!Math.round(stacked.y()(d) * 100); - }) - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(stacked.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(stacked.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart); }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = stacked.xScale(); - y = stacked.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-stackedAreaChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-stackedAreaChart').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-stackedWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - gEnter.append('g').attr('class', 'nv-controlsWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend - .width( availableWidth - controlWidth ); - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(' + controlWidth + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Controls - - if (showControls) { - var controlsData = [ - { key: 'Stacked', disabled: stacked.offset() != 'zero' }, - { key: 'Stream', disabled: stacked.offset() != 'wiggle' }, - { key: 'Expanded', disabled: stacked.offset() != 'expand' } - ]; - - controls - .width( controlWidth ) - .color(['#444', '#444', '#444']); - - g.select('.nv-controlsWrap') - .datum(controlsData) - .call(controls); - - - if ( margin.top != Math.max(controls.height(), legend.height()) ) { - margin.top = Math.max(controls.height(), legend.height()); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - - g.select('.nv-controlsWrap') - .attr('transform', 'translate(0,' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - stacked - .width(availableWidth) - .height(availableHeight) - - var stackedWrap = g.select('.nv-stackedWrap') - .datum(data); - //d3.transition(stackedWrap).call(stacked); - stackedWrap.call(stacked); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize( -availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + availableHeight + ')'); - //d3.transition(g.select('.nv-x.nv-axis')) - g.select('.nv-x.nv-axis') - .transition().duration(0) - .call(xAxis); - - yAxis - .scale(y) - .ticks(stacked.offset() == 'wiggle' ? 0 : availableHeight / 36) - .tickSize(-availableWidth, 0) - .setTickFormat(stacked.offset() == 'expand' ? d3.format('%') : yAxisTickFormat); - - //d3.transition(g.select('.nv-y.nv-axis')) - g.select('.nv-y.nv-axis') - .transition().duration(0) - .call(yAxis); - - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - stacked.dispatch.on('areaClick.toggle', function(e) { - if (data.filter(function(d) { return !d.disabled }).length === 1) - data = data.map(function(d) { - d.disabled = false; - return d - }); - else - data = data.map(function(d,i) { - d.disabled = (i != e.seriesIndex); - return d - }); - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - //selection.transition().call(chart); - chart.update(); - }); - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - //selection.transition().call(chart); - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - controls.dispatch.on('legendClick', function(d,i) { - if (!d.disabled) return; - - controlsData = controlsData.map(function(s) { - s.disabled = true; - return s; - }); - d.disabled = false; - - switch (d.key) { - case 'Stacked': - stacked.style('stack'); - break; - case 'Stream': - stacked.style('stream'); - break; - case 'Expanded': - stacked.style('expand'); - break; - } - - state.style = stacked.style(); - dispatch.stateChange(state); - - //selection.transition().call(chart); - chart.update(); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - if (typeof e.style !== 'undefined') { - stacked.style(e.style); - } - - chart.update(); - }); - - }); - - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - stacked.dispatch.on('tooltipShow', function(e) { - //disable tooltips when value ~= 0 - //// TODO: consider removing points from voronoi that have 0 value instead of this hack - /* - if (!Math.round(stacked.y()(e.point) * 100)) { // 100 will not be good for very small numbers... will have to think about making this valu dynamic, based on data range - setTimeout(function() { d3.selectAll('.point.hover').classed('hover', false) }, 0); - return false; - } - */ - - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top], - dispatch.tooltipShow(e); - }); - - stacked.dispatch.on('tooltipHide', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.stacked = stacked; - chart.legend = legend; - chart.controls = controls; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, stacked, 'x', 'y', 'size', 'xScale', 'yScale', 'xDomain', 'yDomain', 'sizeDomain', 'interactive', 'offset', 'order', 'style', 'clipEdge', 'forceX', 'forceY', 'forceSize', 'interpolate'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return getWidth; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return getHeight; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - stacked.color(color); - return chart; - }; - - chart.showControls = function(_) { - if (!arguments.length) return showControls; - showControls = _; - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltip = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - yAxis.setTickFormat = yAxis.tickFormat; - - yAxis.tickFormat = function(_) { - if (!arguments.length) return yAxisTickFormat; - yAxisTickFormat = _; - return yAxis; - }; - - //============================================================ - - return chart; -} -})(); \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.min.js b/modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.min.js deleted file mode 100755 index 309108b..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.min.js +++ /dev/null @@ -1,6 +0,0 @@ -(function(){function t(e,t){return(new Date(t,e+1,0)).getDate()}function n(e,t,n){return function(r,i,s){var o=e(r),u=[];o<r&&t(o);if(s>1)while(o<i){var a=new Date(+o);n(a)%s===0&&u.push(a),t(o)}else while(o<i)u.push(new Date(+o)),t(o);return u}}var e=window.nv||{};e.version="0.0.1a",e.dev=!0,window.nv=e,e.tooltip={},e.utils={},e.models={},e.charts={},e.graphs=[],e.logs={},e.dispatch=d3.dispatch("render_start","render_end"),e.dev&&(e.dispatch.on("render_start",function(t){e.logs.startTime=+(new Date)}),e.dispatch.on("render_end",function(t){e.logs.endTime=+(new Date),e.logs.totalTime=e.logs.endTime-e.logs.startTime,e.log("total",e.logs.totalTime)})),e.log=function(){if(e.dev&&console.log&&console.log.apply)console.log.apply(console,arguments);else if(e.dev&&console.log&&Function.prototype.bind){var t=Function.prototype.bind.call(console.log,console);t.apply(console,arguments)}return arguments[arguments.length-1]},e.render=function(n){n=n||1,e.render.active=!0,e.dispatch.rend er_start(),setTimeout(function(){var t,r;for(var i=0;i<n&&(r=e.render.queue[i]);i++)t=r.generate(),typeof r.callback==typeof Function&&r.callback(t),e.graphs.push(t);e.render.queue.splice(0,i),e.render.queue.length?setTimeout(arguments.callee,0):(e.render.active=!1,e.dispatch.render_end())},0)},e.render.active=!1,e.render.queue=[],e.addGraph=function(t){typeof arguments[0]==typeof Function&&(t={generate:arguments[0],callback:arguments[1]}),e.render.queue.push(t),e.render.active||e.render()},e.identity=function(e){return e},e.strip=function(e){return e.replace(/(\s|&)/g,"")},d3.time.monthEnd=function(e){return new Date(e.getFullYear(),e.getMonth(),0)},d3.time.monthEnds=n(d3.time.monthEnd,function(e){e.setUTCDate(e.getUTCDate()+1),e.setDate(t(e.getMonth()+1,e.getFullYear()))},function(e){return e.getMonth()}),function(){var t=window.nv.tooltip={};t.show=function(t,n,r,i,s,o){var u=document.createElement("div");u.className="nvtooltip "+(o?o:"xy-tooltip"),r=r||"s",i=i||20;var a= s;if(!s||s.tagName.match(/g|svg/i))a=document.getElementsByTagName("body")[0];u.innerHTML=n,u.style.left=0,u.style.top=0,u.style.opacity=0,a.appendChild(u);var f=parseInt(u.offsetHeight),l=parseInt(u.offsetWidth),c=e.utils.windowSize().width,h=e.utils.windowSize().height,p=window.scrollY,d=window.scrollX,v,m;h=window.innerWidth>=document.body.scrollWidth?h:h-16,c=window.innerHeight>=document.body.scrollHeight?c:c-16;var g=function(e){var t=m;do isNaN(e.offsetTop)||(t+=e.offsetTop);while(e=e.offsetParent);return t},y=function(e){var t=v;do isNaN(e.offsetLeft)||(t+=e.offsetLeft);while(e=e.offsetParent);return t};switch(r){case"e":v=t[0]-l-i,m=t[1]-f/2;var b=y(u),w=g(u);b<d&&(v=t[0]+i>d?t[0]+i:d-b+v),w<p&&(m=p-w+m),w+f>p+h&&(m=p+h-w+m-f);break;case"w":v=t[0]+i,m=t[1]-f/2,b+l>c&&(v=t[0]-l-i),w<p&&(m=p+5),w+f>p+h&&(m=p-f-5);break;case"n":v=t[0]-l/2-5,m=t[1]+i;var b=y(u),w=g(u);b<d&&(v=d+5),b+l>c&&(v=v-l/2+5),w+f>p+h&&(m=p+h-w+m-f);break;case"s":v=t[0]-l/2,m=t[1]-f-i;var b=y(u),w= g(u);b<d&&(v=d+5),b+l>c&&(v=v-l/2+5),p>w&&(m=p)}return u.style.left=v+"px",u.style.top=m+"px",u.style.opacity=1,u.style.position="absolute",u.style.pointerEvents="none",u},t.cleanup=function(){var e=document.getElementsByClassName("nvtooltip"),t=[];while(e.length)t.push(e[0]),e[0].style.transitionDelay="0 !important",e[0].style.opacity=0,e[0].className="nvtooltip-pending-removal";setTimeout(function(){while(t.length){var e=t.pop();e.parentNode.removeChild(e)}},500)}}(),e.utils.windowSize=function(){var e={width:640,height:480};return document.body&&document.body.offsetWidth&&(e.width=document.body.offsetWidth,e.height=document.body.offsetHeight),document.compatMode=="CSS1Compat"&&document.documentElement&&document.documentElement.offsetWidth&&(e.width=document.documentElement.offsetWidth,e.height=document.documentElement.offsetHeight),window.innerWidth&&window.innerHeight&&(e.width=window.innerWidth,e.height=window.innerHeight),e},e.utils.windowResize=function(e){var t=windo w.onresize;window.onresize=function(n){typeof t=="function"&&t(n),e(n)}},e.utils.getColor=function(t){return arguments.length?Object.prototype.toString.call(t)==="[object Array]"?function(e,n){return e.color||t[n%t.length]}:t:e.utils.defaultColor()},e.utils.defaultColor=function(){var e=d3.scale.category20().range();return function(t,n){return t.color||e[n%e.length]}},e.utils.customTheme=function(e,t,n){t=t||function(e){return e.key},n=n||d3.scale.category20().range();var r=n.length;return function(i,s){var o=t(i);return r||(r=n.length),typeof e[o]!="undefined"?typeof e[o]=="function"?e[o]():e[o]:n[--r]}},e.utils.pjax=function(t,n){function r(r){d3.html(r,function(r){var i=d3.select(n).node();i.parentNode.replaceChild(d3.select(r).select(n).node(),i),e.utils.pjax(t,n)})}d3.selectAll(t).on("click",function(){history.pushState(this.href,this.textContent,this.href),r(this.href),d3.event.preventDefault()}),d3.select(window).on("popstate",function(){d3.event.state&&r(d3.event.sta te)})},e.utils.calcApproxTextWidth=function(e){if(e instanceof d3.selection){var t=parseInt(e.style("font-size").replace("px","")),n=e.text().length;return n*t*.5}return 0},e.models.axis=function(){function d(r){return r.each(function(r){var d=d3.select(this),v=d.selectAll("g.nv-wrap.nv-axis").data([r]),m=v.enter().append("g").attr("class","nvd3 nv-wrap nv-axis"),g=m.append("g"),y=v.select("g");h!==null?e.ticks(h):(e.orient()=="top"||e.orient()=="bottom")&&e.ticks(Math.abs(i.range()[1]-i.range()[0])/100),d3.transition(y).call(e),p=p||e.scale();var b=e.tickFormat();b==null&&(b=p.tickFormat());var w=y.selectAll("text.nv-axislabel").data([s||null]);w.exit().remove();switch(e.orient()){case"top":w.enter().append("text").attr("class","nv-axislabel");var E=i.range().length==2?i.range()[1]:i.range()[i.range().length-1]+(i.range()[1]-i.range()[0]);w.attr("text-anchor","middle").attr("y",0).attr("x",E/2);if(o){var S=v.selectAll("g.nv-axisMaxMin").data(i.domain());S.enter().append("g" ).attr("class","nv-axisMaxMin").append("text"),S.exit().remove(),S.attr("transform",function(e,t){return"translate("+i(e)+",0)"}).select("text").attr("dy","0em").attr("y",-e.tickPadding()).attr("text-anchor","middle").text(function(e,t){var n=b(e);return(""+n).match("NaN")?"":n}),d3.transition(S).attr("transform",function(e,t){return"translate("+i.range()[t]+",0)"})}break;case"bottom":var x=36,T=30,N=y.selectAll("g").select("text");if(a%360){N.each(function(e,t){var n=this.getBBox().width;n>T&&(T=n)});var C=Math.abs(Math.sin(a*Math.PI/180)),x=(C?C*T:T)+30;N.attr("transform",function(e,t,n){return"rotate("+a+" 0,0)"}).attr("text-anchor",a%360>0?"start":"end")}w.enter().append("text").attr("class","nv-axislabel");var E=i.range().length==2?i.range()[1]:i.range()[i.range().length-1]+(i.range()[1]-i.range()[0]);w.attr("text-anchor","middle").attr("y",x).attr("x",E/2);if(o){var S=v.selectAll("g.nv-axisMaxMin").data([i.domain()[0],i.domain()[i.domain().length-1]]);S.enter().append( "g").attr("class","nv-axisMaxMin").append("text"),S.exit().remove(),S.attr("transform",function(e,t){return"translate("+(i(e)+(c?i.rangeBand()/2:0))+",0)"}).select("text").attr("dy",".71em").attr("y",e.tickPadding()).attr("transform",function(e,t,n){return"rotate("+a+" 0,0)"}).attr("text-anchor",a?a%360>0?"start":"end":"middle").text(function(e,t){var n=b(e);return(""+n).match("NaN")?"":n}),d3.transition(S).attr("transform",function(e,t){return"translate("+(i(e)+(c?i.rangeBand()/2:0))+",0)"})}l&&N.attr("transform",function(e,t){return"translate(0,"+(t%2==0?"0":"12")+")"});break;case"right":w.enter().append("text").attr("class","nv-axislabel"),w.attr("text-anchor",f?"middle":"begin").attr("transform",f?"rotate(90)":"").attr("y",f?-Math.max(t.right,n)+12:-10).attr("x",f?i.range()[0]/2:e.tickPadding());if(o){var S=v.selectAll("g.nv-axisMaxMin").data(i.domain());S.enter().append("g").attr("class","nv-axisMaxMin").append("text").style("opacity",0),S.exit().remove(),S.attr("transf orm",function(e,t){return"translate(0,"+i(e)+")"}).select("text").attr("dy",".32em").attr("y",0).attr("x",e.tickPadding()).attr("text-anchor","start").text(function(e,t){var n=b(e);return(""+n).match("NaN")?"":n}),d3.transition(S).attr("transform",function(e,t){return"translate(0,"+i.range()[t]+")"}).select("text").style("opacity",1)}break;case"left":w.enter().append("text").attr("class","nv-axislabel"),w.attr("text-anchor",f?"middle":"end").attr("transform",f?"rotate(-90)":"").attr("y",f?-Math.max(t.left,n)+12:-10).attr("x",f?-i.range()[0]/2:-e.tickPadding());if(o){var S=v.selectAll("g.nv-axisMaxMin").data(i.domain());S.enter().append("g").attr("class","nv-axisMaxMin").append("text").style("opacity",0),S.exit().remove(),S.attr("transform",function(e,t){return"translate(0,"+p(e)+")"}).select("text").attr("dy",".32em").attr("y",0).attr("x",-e.tickPadding()).attr("text-anchor","end").text(function(e,t){var n=b(e);return(""+n).match("NaN")?"":n}),d3.transition(S).attr("transfor m",function(e,t){return"translate(0,"+i.range()[t]+")"}).select("text").style("opacity",1)}}w.text(function(e){return e}),o&&(e.orient()==="left"||e.orient()==="right")&&(y.selectAll("g").each(function(e,t){d3.select(this).select("text").attr("opacity",1);if(i(e)<i.range()[1]+10||i(e)>i.range()[0]-10)(e>1e-10||e<-1e-10)&&d3.select(this).attr("opacity",0),d3.select(this).select("text").attr("opacity",0)}),i.domain()[0]==i.domain()[1]&&i.domain()[0]==0&&v.selectAll("g.nv-axisMaxMin").style("opacity",function(e,t){return t?0:1}));if(o&&(e.orient()==="top"||e.orient()==="bottom")){var k=[];v.selectAll("g.nv-axisMaxMin").each(function(e,t){try{t?k.push(i(e)-this.getBBox().width-4):k.push(i(e)+this.getBBox().width+4)}catch(n){t?k.push(i(e)-4):k.push(i(e)+4)}}),y.selectAll("g").each(function(e,t){if(i(e)<k[0]||i(e)>k[1])e>1e-10||e<-1e-10?d3.select(this).remove():d3.select(this).select("text").remove()})}u&&y.selectAll(".tick").filter(function(e){return!parseFloat(Math.round(e.__dat a__*1e5)/1e6)&&e.__data__!==undefined}).classed("zero",!0),p=i.copy()}),d}var e=d3.svg.axis(),t={top:0,right:0,bottom:0,left:0},n=75,r=60,i=d3.scale.linear(),s=null,o=!0,u=!0,a=0,f=!0,l=!1,c=!1,h=null;e.scale(i).orient("bottom").tickFormat(function(e){return e});var p;return d.axis=e,d3.rebind(d,e,"orient","tickValues","tickSubdivide","tickSize","tickPadding","tickFormat"),d3.rebind(d,i,"domain","range","rangeBand","rangeBands"),d.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,d):t},d.width=function(e){return arguments.length?(n=e,d):n},d.ticks=function(e){return arguments.length?(h=e,d):h},d.height=function(e){return arguments.length?(r=e,d):r},d.axisLabel=function(e){return arguments.length?(s=e,d):s},d.showMaxMin=function(e){return arguments.length?(o=e,d):o},d.highlightZero=fun ction(e){return arguments.length?(u=e,d):u},d.scale=function(t){return arguments.length?(i=t,e.scale(i),c=typeof i.rangeBands=="function",d3.rebind(d,i,"domain","range","rangeBand","rangeBands"),d):i},d.rotateYLabel=function(e){return arguments.length?(f=e,d):f},d.rotateLabels=function(e){return arguments.length?(a=e,d):a},d.staggerLabels=function(e){return arguments.length?(l=e,d):l},d},e.models.bullet=function(){function p(e){return e.each(function(e,n){var l=a-t.left-t.right,p=f-t.top-t.bottom,d=d3.select(this),v=i.call(this,e,n).slice().sort(d3.descending),m=s.call(this,e,n).slice().sort(d3.descending),g=o.call(this,e,n).slice().sort(d3.descending),y=d3.scale.linear().domain(d3.extent(d3.merge([u,v]))).range(r?[l,0]:[0,l]),b=this.__chart__||d3.scale.linear().domain([0,Infinity]).range(y.range());this.__chart__=y;var w=d3.min(v),E=d3.max(v),S=v[1],x=d.selectAll("g.nv-wrap.nv-bullet").data([e]),T=x.enter().append("g").attr("class","nvd3 nv-wrap nv-bullet"),N=T.append("g"), C=x.select("g");N.append("rect").attr("class","nv-range nv-rangeMax"),N.append("rect").attr("class","nv-range nv-rangeAvg"),N.append("rect").attr("class","nv-range nv-rangeMin"),N.append("rect").attr("class","nv-measure"),N.append("path").attr("class","nv-markerTriangle"),x.attr("transform","translate("+t.left+","+t.top+")");var k=function(e){return Math.abs(b(e)-b(0))},L=function(e){return Math.abs(y(e)-y(0))},A=function(e){return e<0?b(e):b(0)},O=function(e){return e<0?y(e):y(0)};C.select("rect.nv-rangeMax").attr("height",p).attr("width",L(E>0?E:w)).attr("x",O(E>0?E:w)).datum(E>0?E:w),C.select("rect.nv-rangeAvg").attr("height",p).attr("width",L(S)).attr("x",O(S)).datum(S),C.select("rect.nv-rangeMin").attr("height",p).attr("width",L(E)).attr("x",O(E)).attr("width",L(E>0?w:E)).attr("x",O(E>0?w:E)).datum(E>0?w:E),C.select("rect.nv-measure").style("fill",c).attr("height",p/3).attr("y",p/3).attr("width",g<0?y(0)-y(g[0]):y(g[0])-y(0)).attr("x",O(g)).on("mouseover",function(){h.e lementMouseover({value:g[0],label:"Current",pos:[y(g[0]),p/2]})}).on("mouseout",function(){h.elementMouseout({value:g[0],label:"Current"})});var M=p/6;m[0]?C.selectAll("path.nv-markerTriangle").attr("transform",function(e){return"translate("+y(m[0])+","+p/2+")"}).attr("d","M0,"+M+"L"+M+","+ -M+" "+ -M+","+ -M+"Z").on("mouseover",function(){h.elementMouseover({value:m[0],label:"Previous",pos:[y(m[0]),p/2]})}).on("mouseout",function(){h.elementMouseout({value:m[0],label:"Previous"})}):C.selectAll("path.nv-markerTriangle").remove(),x.selectAll(".nv-range").on("mouseover",function(e,t){var n=t?t==1?"Mean":"Minimum":"Maximum";h.elementMouseover({value:e,label:n,pos:[y(e),p/2]})}).on("mouseout",function(e,t){var n=t?t==1?"Mean":"Minimum":"Maximum";h.elementMouseout({value:e,label:n})})}),p}var t={top:0,right:0,bottom:0,left:0},n="left",r=!1,i=function(e){return e.ranges},s=function(e){return e.markers},o=function(e){return e.measures},u=[0],a=380,f=30,l=null,c=e.utils.getColor(["# 1f77b4"]),h=d3.dispatch("elementMouseover","elementMouseout");return p.dispatch=h,p.orient=function(e){return arguments.length?(n=e,r=n=="right"||n=="bottom",p):n},p.ranges=function(e){return arguments.length?(i=e,p):i},p.markers=function(e){return arguments.length?(s=e,p):s},p.measures=function(e){return arguments.length?(o=e,p):o},p.forceX=function(e){return arguments.length?(u=e,p):u},p.width=function(e){return arguments.length?(a=e,p):a},p.height=function(e){return arguments.length?(f=e,p):f},p.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,p):t},p.tickFormat=function(e){return arguments.length?(l=e,p):l},p.color=function(t){return arguments.length?(c=e.utils.getColor(t),p):c},p},e.models.bulletChart=function(){function m(e){return e.each(function(n,h){var g=d3.select(this),y=( a||parseInt(g.style("width"))||960)-i.left-i.right,b=f-i.top-i.bottom,w=this;m.update=function(){m(e)},m.container=this;if(!n||!s.call(this,n,h)){var E=g.selectAll(".nv-noData").data([p]);return E.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),E.attr("x",i.left+y/2).attr("y",18+i.top+b/2).text(function(e){return e}),m}g.selectAll(".nv-noData").remove();var S=s.call(this,n,h).slice().sort(d3.descending),x=o.call(this,n,h).slice().sort(d3.descending),T=u.call(this,n,h).slice().sort(d3.descending),N=g.selectAll("g.nv-wrap.nv-bulletChart").data([n]),C=N.enter().append("g").attr("class","nvd3 nv-wrap nv-bulletChart"),k=C.append("g"),L=N.select("g");k.append("g").attr("class","nv-bulletWrap"),k.append("g").attr("class","nv-titles"),N.attr("transform","translate("+i.left+","+i.top+")");var A=d3.scale.linear().domain([0,Math.max(S[0],x[0],T[0])]).range(r?[y,0]:[0,y]),O=this.__chart__||d3.scale.linear().domain([0,Infinity]).rang e(A.range());this.__chart__=A;var M=function(e){return Math.abs(O(e)-O(0))},_=function(e){return Math.abs(A(e)-A(0))},D=k.select(".nv-titles").append("g").attr("text-anchor","end").attr("transform","translate(-6,"+(f-i.top-i.bottom)/2+")");D.append("text").attr("class","nv-title").text(function(e){return e.title}),D.append("text").attr("class","nv-subtitle").attr("dy","1em").text(function(e){return e.subtitle}),t.width(y).height(b);var P=L.select(".nv-bulletWrap");d3.transition(P).call(t);var H=l||A.tickFormat(y/100),B=L.selectAll("g.nv-tick").data(A.ticks(y/50),function(e){return this.textContent||H(e)}),j=B.enter().append("g").attr("class","nv-tick").attr("transform",function(e){return"translate("+O(e)+",0)"}).style("opacity",1e-6);j.append("line").attr("y1",b).attr("y2",b*7/6),j.append("text").attr("text-anchor","middle").attr("dy","1em").attr("y",b*7/6).text(H);var F=d3.transition(B).attr("transform",function(e){return"translate("+A(e)+",0)"}).style("opacity",1);F.select ("line").attr("y1",b).attr("y2",b*7/6),F.select("text").attr("y",b*7/6),d3.transition(B.exit()).attr("transform",function(e){return"translate("+A(e)+",0)"}).style("opacity",1e-6).remove(),d.on("tooltipShow",function(e){e.key=n.title,c&&v(e,w.parentNode)})}),d3.timer.flush(),m}var t=e.models.bullet(),n="left",r=!1,i={top:5,right:40,bottom:20,left:120},s=function(e){return e.ranges},o=function(e){return e.markers},u=function(e){return e.measures},a=null,f=55,l=null,c=!0,h=function(e,t,n,r,i){return"<h3>"+t+"</h3>"+"<p>"+n+"</p>"},p="No Data Available.",d=d3.dispatch("tooltipShow","tooltipHide"),v=function(t,n){var r=t.pos[0]+(n.offsetLeft||0)+i.left,s=t.pos[1]+(n.offsetTop||0)+i.top,o=h(t.key,t.label,t.value,t,m);e.tooltip.show([r,s],o,t.value<0?"e":"w",null,n)};return t.dispatch.on("elementMouseover.tooltip",function(e){d.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){d.tooltipHide(e)}),d.on("tooltipHide",function(){c&&e.tooltip.cleanup()}),m.dispatch=d, m.bullet=t,d3.rebind(m,t,"color"),m.orient=function(e){return arguments.length?(n=e,r=n=="right"||n=="bottom",m):n},m.ranges=function(e){return arguments.length?(s=e,m):s},m.markers=function(e){return arguments.length?(o=e,m):o},m.measures=function(e){return arguments.length?(u=e,m):u},m.width=function(e){return arguments.length?(a=e,m):a},m.height=function(e){return arguments.length?(f=e,m):f},m.margin=function(e){return arguments.length?(i.top=typeof e.top!="undefined"?e.top:i.top,i.right=typeof e.right!="undefined"?e.right:i.right,i.bottom=typeof e.bottom!="undefined"?e.bottom:i.bottom,i.left=typeof e.left!="undefined"?e.left:i.left,m):i},m.tickFormat=function(e){return arguments.length?(l=e,m):l},m.tooltips=function(e){return arguments.length?(c=e,m):c},m.tooltipContent=function(e){return arguments.length?(h=e,m):h},m.noData=function(e){return arguments.length?(p=e,m):p},m},e.models.cumulativeLineChart=function(){function C(e){return e.each(function(e){function D(e,t){d3 .select(C.container).style("cursor","ew-resize")}function P(e,t){T.x=d3.event.x,T.i=Math.round(x.invert(T.x)),J()}function H(e,t){d3.select(C.container).style("cursor","auto"),y.index=T.i,S.stateChange(y)}function J(){$.data([T]),d.call(C)}var d=d3.select(this).classed("nv-chart-"+g,!0),L=this,A=(a||parseInt(d.style("width"))||960)-o.left-o.right,O=(f||parseInt(d.style("height"))||400)-o.top-o.bottom;C.update=function(){d.transition().call(C)},C.container=this,y.disabled=e.map(function(e){return!!e.disabled});if(!b){var M;b={};for(M in y)y[M]instanceof Array?b[M]=y[M].slice(0):b[M]=y[M]}var _=d3.behavior.drag().on("dragstart",D).on("drag",P).on("dragend",H);if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var B=d.selectAll(".nv-noData").data([w]);return B.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),B.attr("x",o.left+A/2).attr("y",o.top+O/2).text(function(e){return e}),C}d.selectAll(".nv-noData ").remove(),v=t.xScale(),m=t.yScale();if(!p){var j=e.filter(function(e){return!e.disabled}).map(function(e,n){var r=d3.extent(e.values,t.y());return r[0]<-0.95&&(r[0]=-0.95),[(r[0]-r[1])/(1+r[1]),(r[1]-r[0])/(1+r[0])]}),F=[d3.min(j,function(e){return e[0]}),d3.max(j,function(e){return e[1]})];t.yDomain(F)}else t.yDomain(null);x.domain([0,e[0].values.length-1]).range([0,A]).clamp(!0);var e=k(T.i,e),I=d.selectAll("g.nv-wrap.nv-cumulativeLine").data([e]),q=I.enter().append("g").attr("class","nvd3 nv-wrap nv-cumulativeLine").append("g"),R=I.select("g");q.append("g").attr("class","nv-x nv-axis"),q.append("g").attr("class","nv-y nv-axis"),q.append("g").attr("class","nv-background"),q.append("g").attr("class","nv-linesWrap"),q.append("g").attr("class","nv-avgLinesWrap"),q.append("g").attr("class","nv-legendWrap"),q.append("g").attr("class","nv-controlsWrap"),l&&(i.width(A),R.select(".nv-legendWrap").datum(e).call(i),o.top!=i.height()&&(o.top=i.height(),O=(f||parseInt(d.style("heigh t"))||400)-o.top-o.bottom),R.select(".nv-legendWrap").attr("transform","translate(0,"+ -o.top+")"));if(h){var U=[{key:"Re-scale y-axis",disabled:!p}];s.width(140).color(["#444","#444","#444"]),R.select(".nv-controlsWrap").datum(U).attr("transform","translate(0,"+ -o.top+")").call(s)}I.attr("transform","translate("+o.left+","+o.top+")");var z=e.filter(function(e){return e.tempDisabled});I.select(".tempDisabled").remove(),z.length&&I.append("text").attr("class","tempDisabled").attr("x",A/2).attr("y","-.71em").style("text-anchor","end").text(z.map(function(e){return e.key}).join(", ")+" values cannot be calculated for this time period."),q.select(".nv-background").append("rect"),R.select(".nv-background rect").attr("width",A).attr("height",O),t.y(function(e){return e.display.y}).width(A).height(O).color(e.map(function(e,t){return e.color||u(e,t)}).filter(function(t,n){return!e[n].disabled&&!e[n].tempDisabled}));var W=R.select(".nv-linesWrap").datum(e.filter(function(e){return!e .disabled&&!e.tempDisabled}));W.call(t),e.forEach(function(e,t){e.seriesIndex=t});var X=e.filter(function(e){return!e.disabled&&!!E(e)}),V=R.select(".nv-avgLinesWrap").selectAll("line").data(X,function(e){return e.key});V.enter().append("line").style("stroke-width",2).style("stroke-dasharray","10,10").style("stroke",function(e,n){return t.color()(e,e.seriesIndex)}).attr("x1",0).attr("x2",A).attr("y1",function(e){return m(E(e))}).attr("y2",function(e){return m(E(e))}),V.attr("x1",0).attr("x2",A).attr("y1",function(e){return m(E(e))}).attr("y2",function(e){return m(E(e))}),V.exit().remove();var $=W.selectAll(".nv-indexLine").data([T]);$.enter().append("rect").attr("class","nv-indexLine").attr("width",3).attr("x",-2).attr("fill","red").attr("fill-opacity",.5).call(_),$.attr("transform",function(e){return"translate("+x(e.i)+",0)"}).attr("height",O),n.scale(v).ticks(Math.min(e[0].values.length,A/70)).tickSize(-O,0),R.select(".nv-x.nv-axis").attr("transform","translate(0,"+m.range ()[0]+")"),d3.transition(R.select(".nv-x.nv-axis")).call(n),r.scale(m).ticks(O/36).tickSize(-A,0),d3.transition(R.select(".nv-y.nv-axis")).call(r),R.select(".nv-background rect").on("click",function(){T.x=d3.mouse(this)[0],T.i=Math.round(x.invert(T.x)),y.index=T.i,S.stateChange(y),J()}),t.dispatch.on("elementClick",function(e){T.i=e.pointIndex,T.x=x(T.i),y.index=T.i,S.stateChange(y),J()}),s.dispatch.on("legendClick",function(e,t){e.disabled=!e.disabled,p=!e.disabled,y.rescaleY=p,S.stateChange(y),C.update()}),i.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,I.selectAll(".nv-series").classed("disabled",!1),e}),y.disabled=e.map(function(e){return!!e.disabled}),S.stateChange(y),C.update()}),i.dispatch.on("legendDblclick",function(t){e.forEach(function(e){e.disabled=!0}),t.disabled=!1,y.disabled=e.map(function(e){return!!e.disabled}),S.stateChange(y),C.update()}),S.on("tooltipS how",function(e){c&&N(e,L.parentNode)}),S.on("changeState",function(t){typeof t.disabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),y.disabled=t.disabled),typeof t.index!="undefined"&&(T.i=t.index,T.x=x(T.i),y.index=t.index,$.data([T])),typeof t.rescaleY!="undefined"&&(p=t.rescaleY),C.update()})}),C}function k(e,n){return n.map(function(n,r){if(!n.values)return n;var i=t.y()(n.values[e],e);return i<-0.95?(n.tempDisabled=!0,n):(n.tempDisabled=!1,n.values=n.values.map(function(e,n){return e.display={y:(t.y()(e,n)-i)/(1+i)},e}),n)})}var t=e.models.line(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o={top:30,right:30,bottom:50,left:60},u=e.utils.defaultColor(),a=null,f=null,l=!0,c=!0,h=!0,p=!0,d=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},v,m,g=t.id(),y={index:0,rescaleY:p},b=null,w="No Data Available.",E=function(e){return e.average},S=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeStat e");n.orient("bottom").tickPadding(7),r.orient("left");var x=d3.scale.linear(),T={i:0,x:0},N=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=d(i.series.key,a,f,i,C);e.tooltip.show([o,u],l,null,null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+o.left,e.pos[1]+o.top],S.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),S.on("tooltipHide",function(){c&&e.tooltip.cleanup()}),C.dispatch=S,C.lines=t,C.legend=i,C.xAxis=n,C.yAxis=r,d3.rebind(C,t,"defined","isArea","x","y","size","xDomain","yDomain","forceX","forceY","interactive","clipEdge","clipVoronoi","id"),C.margin=function(e){return arguments.length?(o.top=typeof e.top!="undefined"?e.top:o.top,o.right=typeof e.right!="undefined"?e.right:o.right,o.bottom=typeof e.bottom!="undefined"?e.bottom:o.bottom,o.left=typeof e.left!="undefined"?e.lef t:o.left,C):o},C.width=function(e){return arguments.length?(a=e,C):a},C.height=function(e){return arguments.length?(f=e,C):f},C.color=function(t){return arguments.length?(u=e.utils.getColor(t),i.color(u),C):u},C.rescaleY=function(e){return arguments.length?(p=e,p):p},C.showControls=function(e){return arguments.length?(h=e,C):h},C.showLegend=function(e){return arguments.length?(l=e,C):l},C.tooltips=function(e){return arguments.length?(c=e,C):c},C.tooltipContent=function(e){return arguments.length?(d=e,C):d},C.state=function(e){return arguments.length?(y=e,C):y},C.defaultState=function(e){return arguments.length?(b=e,C):b},C.noData=function(e){return arguments.length?(w=e,C):w},C.average=function(e){return arguments.length?(E=e,C):E},C},e.models.discreteBar=function(){function b(e){return e.each(function(e){var i=n-t.left-t.right,b=r-t.top-t.bottom,w=d3.select(this);e=e.map(function(e,t){return e.values=e.values.map(function(e){return e.series=t,e}),e});var E=p&&d?[]:e.map(fun ction(e){return e.values.map(function(e,t){return{x:u(e,t),y:a(e,t),y0:e.y0}})});s.domain(p||d3.merge(E).map(function(e){return e.x})).rangeBands([0,i],.1),o.domain(d||d3.extent(d3.merge(E).map(function(e){return e.y}).concat(f))),c?o.range([b-(o.domain()[0]<0?12:0),o.domain()[1]>0?12:0]):o.range([b,0]),g=g||s,y=y||o.copy().range([o(0),o(0)]);var S=w.selectAll("g.nv-wrap.nv-discretebar").data([e]),T=S.enter().append("g").attr("class","nvd3 nv-wrap nv-discretebar"),N=T.append("g"),C=S.select("g");N.append("g").attr("class","nv-groups"),S.attr("transform","translate("+t.left+","+t.top+")");var k=S.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e){return e.key});k.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(k.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),k.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}),d3.transition(k ).style("stroke-opacity",1).style("fill-opacity",.75);var L=k.selectAll("g.nv-bar").data(function(e){return e.values});L.exit().remove();var A=L.enter().append("g").attr("transform",function(e,t,n){return"translate("+(s(u(e,t))+s.rangeBand()*.05)+", "+o(0)+")"}).on("mouseover",function(t,n){d3.select(this).classed("hover",!0),v.elementMouseover({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t,n))+s.rangeBand()*(t.series+.5)/e.length,o(a(t,n))],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),v.elementMouseout({value:a(t,n),point:t,series:e[t.series],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("click",function(t,n){v.elementClick({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t,n))+s.rangeBand()*(t.series+.5)/e.length,o(a(t,n))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}).on("dblclick",function(t,n){v.elementDblClick({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t ,n))+s.rangeBand()*(t.series+.5)/e.length,o(a(t,n))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()});A.append("rect").attr("height",0).attr("width",s.rangeBand()*.9/e.length),c?(A.append("text").attr("text-anchor","middle"),L.select("text").attr("x",s.rangeBand()*.9/2).attr("y",function(e,t){return a(e,t)<0?o(a(e,t))-o(0)+12:-4}).text(function(e,t){return h(a(e,t))})):L.selectAll("text").remove(),L.attr("class",function(e,t){return a(e,t)<0?"nv-bar negative":"nv-bar positive"}).style("fill",function(e,t){return e.color||l(e,t)}).style("stroke",function(e,t){return e.color||l(e,t)}).select("rect").attr("class",m).attr("width",s.rangeBand()*.9/e.length),d3.transition(L).attr("transform",function(e,t){var n=s(u(e,t))+s.rangeBand()*.05,r=a(e,t)<0?o(0):o(0)-o(a(e,t))<1?o(0)-1:o(a(e,t));return"translate("+n+", "+r+")"}).select("rect").attr("height",function(e,t){return Math.max(Math.abs(o(a(e,t))-o(0))||1)}),g=s.copy(),y=o.copy()}),b}var t={top:0,right: 0,bottom:0,left:0},n=960,r=500,i=Math.floor(Math.random()*1e4),s=d3.scale.ordinal(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=[0],l=e.utils.defaultColor(),c=!1,h=d3.format(",.2f"),p,d,v=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout"),m="discreteBar",g,y;return b.dispatch=v,b.x=function(e){return arguments.length?(u=e,b):u},b.y=function(e){return arguments.length?(a=e,b):a},b.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,b):t},b.width=function(e){return arguments.length?(n=e,b):n},b.height=function(e){return arguments.length?(r=e,b):r},b.xScale=function(e){return arguments.length?(s=e,b):s},b.yScale=function(e){return arguments.length?(o=e,b):o},b.xDomain=function(e){return arguments.length?(p=e,b):p},b .yDomain=function(e){return arguments.length?(d=e,b):d},b.forceY=function(e){return arguments.length?(f=e,b):f},b.color=function(t){return arguments.length?(l=e.utils.getColor(t),b):l},b.id=function(e){return arguments.length?(i=e,b):i},b.showValues=function(e){return arguments.length?(c=e,b):c},b.valueFormat=function(e){return arguments.length?(h=e,b):h},b.rectClass=function(e){return arguments.length?(m=e,b):m},b},e.models.discreteBarChart=function(){function m(e){return e.each(function(e){var u=d3.select(this),l=this,g=(s||parseInt(u.style("width"))||960)-i.left-i.right,b=(o||parseInt(u.style("height"))||400)-i.top-i.bottom;m.update=function(){d.beforeUpdate(),u.transition().call(m)},m.container=this;if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var w=u.selectAll(".nv-noData").data([p]);return w.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),w.attr("x",i.left+g/2).attr("y",i.top+b/2).text(f unction(e){return e}),m}u.selectAll(".nv-noData").remove(),c=t.xScale(),h=t.yScale();var E=u.selectAll("g.nv-wrap.nv-discreteBarWithAxes").data([e]),S=E.enter().append("g").attr("class","nvd3 nv-wrap nv-discreteBarWithAxes").append("g"),T=S.append("defs"),N=E.select("g");S.append("g").attr("class","nv-x nv-axis"),S.append("g").attr("class","nv-y nv-axis"),S.append("g").attr("class","nv-barsWrap"),N.attr("transform","translate("+i.left+","+i.top+")"),t.width(g).height(b);var C=N.select(".nv-barsWrap").datum(e.filter(function(e){return!e.disabled}));d3.transition(C).call(t),T.append("clipPath").attr("id","nv-x-label-clip-"+t.id()).append("rect"),N.select("#nv-x-label-clip-"+t.id()+" rect").attr("width",c.rangeBand()*(a?2:1)).attr("height",16).attr("x",-c.rangeBand()/(a?1:2)),n.scale(c).ticks(g/100).tickSize(-b,0),N.select(".nv-x.nv-axis").attr("transform","translate(0,"+(h.range()[0]+(t.showValues()&&h.domain()[0]<0?16:0))+")"),N.select(".nv-x.nv-axis").transition().duration(0 ).call(n);var k=N.select(".nv-x.nv-axis").selectAll("g");a&&k.selectAll("text").attr("transform",function(e,t,n){return"translate(0,"+ -(n%2==0?"5":"17")+")"}),r.scale(h).ticks(b/36).tickSize(-g,0),d3.transition(N.select(".nv-y.nv-axis")).call(r),d.on("tooltipShow",function(e){f&&v(e,l.parentNode)})}),m}var t=e.models.discreteBar(),n=e.models.axis(),r=e.models.axis(),i={top:15,right:10,bottom:50,left:60},s=null,o=null,u=e.utils.getColor(),a=!1,f=!0,l=function(e,t,n,r,i){return"<h3>"+t+"</h3>"+"<p>"+n+"</p>"},c,h,p="No Data Available.",d=d3.dispatch("tooltipShow","tooltipHide","beforeUpdate");n.orient("bottom").highlightZero(!1).showMaxMin(!1).tickFormat(function(e){return e}),r.orient("left").tickFormat(d3.format(",.1f"));var v=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),c=l(i.series.key,a,f,i,m);e.tooltip.show([o,u],c,i.value<0?"n":"s",null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+i.left,e.pos[1]+i.top],d.tooltipShow(e)}),t.dispatch.on("elementMous eout.tooltip",function(e){d.tooltipHide(e)}),d.on("tooltipHide",function(){f&&e.tooltip.cleanup()}),m.dispatch=d,m.discretebar=t,m.xAxis=n,m.yAxis=r,d3.rebind(m,t,"x","y","xDomain","yDomain","forceX","forceY","id","showValues","valueFormat"),m.margin=function(e){return arguments.length?(i.top=typeof e.top!="undefined"?e.top:i.top,i.right=typeof e.right!="undefined"?e.right:i.right,i.bottom=typeof e.bottom!="undefined"?e.bottom:i.bottom,i.left=typeof e.left!="undefined"?e.left:i.left,m):i},m.width=function(e){return arguments.length?(s=e,m):s},m.height=function(e){return arguments.length?(o=e,m):o},m.color=function(n){return arguments.length?(u=e.utils.getColor(n),t.color(u),m):u},m.staggerLabels=function(e){return arguments.length?(a=e,m):a},m.tooltips=function(e){return arguments.length?(f=e,m):f},m.tooltipContent=function(e){return arguments.length?(l=e,m):l},m.noData=function(e){return arguments.length?(p=e,m):p},m},e.models.distribution=function(){function l(e){return e. each(function(e){var a=n-(i==="x"?t.left+t.right:t.top+t.bottom),l=i=="x"?"y":"x",c=d3.select(this);f=f||u;var h=c.selectAll("g.nv-distribution").data([e]),p=h.enter().append("g").attr("class","nvd3 nv-distribution"),d=p.append("g"),v=h.select("g");h.attr("transform","translate("+t.left+","+t.top+")");var m=v.selectAll("g.nv-dist").data(function(e){return e},function(e){return e.key});m.enter().append("g"),m.attr("class",function(e,t){return"nv-dist nv-series-"+t}).style("stroke",function(e,t){return o(e,t)});var g=m.selectAll("line.nv-dist"+i).data(function(e){return e.values});g.enter().append("line").attr(i+"1",function(e,t){return f(s(e,t))}).attr(i+"2",function(e,t){return f(s(e,t))}),d3.transition(m.exit().selectAll("line.nv-dist"+i)).attr(i+"1",function(e,t){return u(s(e,t))}).attr(i+"2",function(e,t){return u(s(e,t))}).style("stroke-opacity",0).remove(),g.attr("class",function(e,t){return"nv-dist"+i+" nv-dist"+i+"-"+t}).attr(l+"1",0).attr(l+"2",r),d3.transition(g).at tr(i+"1",function(e,t){return u(s(e,t))}).attr(i+"2",function(e,t){return u(s(e,t))}),f=u.copy()}),l}var t={top:0,right:0,bottom:0,left:0},n=400,r=8,i="x",s=function(e){return e[i]},o=e.utils.defaultColor(),u=d3.scale.linear(),a,f;return l.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,l):t},l.width=function(e){return arguments.length?(n=e,l):n},l.axis=function(e){return arguments.length?(i=e,l):i},l.size=function(e){return arguments.length?(r=e,l):r},l.getData=function(e){return arguments.length?(s=d3.functor(e),l):s},l.scale=function(e){return arguments.length?(u=e,l):u},l.color=function(t){return arguments.length?(o=e.utils.getColor(t),l):o},l},e.models.historicalBar=function(){function g(e){return e.each(function(e){var g=n-t.left-t.right,b=r-t.top-t.bottom,w=d3.select(this);s. domain(d||d3.extent(e[0].values.map(u).concat(f))),c?s.range([g*.5/e[0].values.length,g*(e[0].values.length-.5)/e[0].values.length]):s.range([0,g]),o.domain(v||d3.extent(e[0].values.map(a).concat(l))).range([b,0]);if(s.domain()[0]===s.domain()[1]||o.domain()[0]===o.domain()[1])singlePoint=!0;s.domain()[0]===s.domain()[1]&&(s.domain()[0]?s.domain([s.domain()[0]-s.domain()[0]*.01,s.domain()[1]+s.domain()[1]*.01]):s.domain([-1,1])),o.domain()[0]===o.domain()[1]&&(o.domain()[0]?o.domain([o.domain()[0]+o.domain()[0]*.01,o.domain()[1]-o.domain()[1]*.01]):o.domain([-1,1]));var E=w.selectAll("g.nv-wrap.nv-bar").data([e[0].values]),S=E.enter().append("g").attr("class","nvd3 nv-wrap nv-bar"),T=S.append("defs"),N=S.append("g"),C=E.select("g");N.append("g").attr("class","nv-bars"),E.attr("transform","translate("+t.left+","+t.top+")"),w.on("click",function(e,t){m.chartClick({data:e,index:t,pos:d3.event,id:i})}),T.append("clipPath").attr("id","nv-chart-clip-path-"+i).append("rect"),E.sele ct("#nv-chart-clip-path-"+i+" rect").attr("width",g).attr("height",b),C.attr("clip-path",h?"url(#nv-chart-clip-path-"+i+")":"");var k=E.select(".nv-bars").selectAll(".nv-bar").data(function(e){return e});k.exit().remove();var L=k.enter().append("rect").attr("x",0).attr("y",function(e,t){return o(Math.max(0,a(e,t)))}).attr("height",function(e,t){return Math.abs(o(a(e,t))-o(0))}).on("mouseover",function(t,n){d3.select(this).classed("hover",!0),m.elementMouseover({point:t,series:e[0],pos:[s(u(t,n)),o(a(t,n))],pointIndex:n,seriesIndex:0,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),m.elementMouseout({point:t,series:e[0],pointIndex:n,seriesIndex:0,e:d3.event})}).on("click",function(e,t){m.elementClick({value:a(e,t),data:e,index:t,pos:[s(u(e,t)),o(a(e,t))],e:d3.event,id:i}),d3.event.stopPropagation()}).on("dblclick",function(e,t){m.elementDblClick({value:a(e,t),data:e,index:t,pos:[s(u(e,t)),o(a(e,t))],e:d3.event,id:i}),d3.event.stopPropagation()}); k.attr("fill",function(e,t){return p(e,t)}).attr("class",function(e,t,n){return(a(e,t)<0?"nv-bar negative":"nv-bar positive")+" nv-bar-"+n+"-"+t}).attr("transform",function(t,n){return"translate("+(s(u(t,n))-g/e[0].values.length*.45)+",0)"}).attr("width",g/e[0].values.length*.9),d3.transition(k).attr("y",function(e,t){return a(e,t)<0?o(0):o(0)-o(a(e,t))<1?o(0)-1:o(a(e,t))}).attr("height",function(e,t){return Math.max(Math.abs(o(a(e,t))-o(0)),1)})}),g}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=Math.floor(Math.random()*1e4),s=d3.scale.linear(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=[],l=[0],c=!1,h=!0,p=e.utils.defaultColor(),d,v,m=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout");return g.dispatch=m,g.x=function(e){return arguments.length?(u=e,g):u},g.y=function(e){return arguments.length?(a=e,g):a},g.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top, t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,g):t},g.width=function(e){return arguments.length?(n=e,g):n},g.height=function(e){return arguments.length?(r=e,g):r},g.xScale=function(e){return arguments.length?(s=e,g):s},g.yScale=function(e){return arguments.length?(o=e,g):o},g.xDomain=function(e){return arguments.length?(d=e,g):d},g.yDomain=function(e){return arguments.length?(v=e,g):v},g.forceX=function(e){return arguments.length?(f=e,g):f},g.forceY=function(e){return arguments.length?(l=e,g):l},g.padData=function(e){return arguments.length?(c=e,g):c},g.clipEdge=function(e){return arguments.length?(h=e,g):h},g.color=function(t){return arguments.length?(p=e.utils.getColor(t),g):p},g.id=function(e){return arguments.length?(i=e,g):i},g},e.models.historicalBarChart=function(){function S(e){return e.each(function(d){var T=d3.select(this),N=this,C=(u||parseInt(T.style("wid th"))||960)-s.left-s.right,k=(a||parseInt(T.style("height"))||400)-s.top-s.bottom;S.update=function(){S(e)},S.container=this,g.disabled=d.map(function(e){return!!e.disabled});if(!y){var L;y={};for(L in g)g[L]instanceof Array?y[L]=g[L].slice(0):y[L]=g[L]}if(!d||!d.length||!d.filter(function(e){return e.values.length}).length){var A=T.selectAll(".nv-noData").data([b]);return A.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),A.attr("x",s.left+C/2).attr("y",s.top+k/2).text(function(e){return e}),S}T.selectAll(".nv-noData").remove(),v=t.xScale(),m=t.yScale();var O=T.selectAll("g.nv-wrap.nv-lineChart").data([d]),M=O.enter().append("g").attr("class","nvd3 nv-wrap nv-lineChart").append("g"),_=O.select("g");M.append("g").attr("class","nv-x nv-axis"),M.append("g").attr("class","nv-y nv-axis"),M.append("g").attr("class","nv-barsWrap"),M.append("g").attr("class","nv-legendWrap"),f&&(i.width(C),_.select(".nv-legendWrap").datum(d).cal l(i),s.top!=i.height()&&(s.top=i.height(),k=(a||parseInt(T.style("height"))||400)-s.top-s.bottom),O.select(".nv-legendWrap").attr("transform","translate(0,"+ -s.top+")")),O.attr("transform","translate("+s.left+","+s.top+")"),h&&_.select(".nv-y.nv-axis").attr("transform","translate("+C+",0)"),t.width(C).height(k).color(d.map(function(e,t){return e.color||o(e,t)}).filter(function(e,t){return!d[t].disabled}));var D=_.select(".nv-barsWrap").datum(d.filter(function(e){return!e.disabled}));d3.transition(D).call(t),l&&(n.scale(v).tickSize(-k,0),_.select(".nv-x.nv-axis").attr("transform","translate(0,"+m.range()[0]+")"),_.select(".nv-x.nv-axis").transition().call(n)),c&&(r.scale(m).ticks(k/36).tickSize(-C,0),_.select(".nv-y.nv-axis").transition().duration(0).call(r)),i.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,d.filter(function(e){return!e.disabled}).length||d.map(function(e){return e.disabled=!1,O.selectAll(".nv-series").classed("disabled",!1),e}),g.disabled=d. map(function(e){return!!e.disabled}),w.stateChange(g),e.transition().call(S)}),i.dispatch.on("legendDblclick",function(e){d.forEach(function(e){e.disabled=!0}),e.disabled=!1,g.disabled=d.map(function(e){return!!e.disabled}),w.stateChange(g),S.update()}),w.on("tooltipShow",function(e){p&&E(e,N.parentNode)}),w.on("changeState",function(t){typeof t.disabled!="undefined"&&(d.forEach(function(e,n){e.disabled=t.disabled[n]}),g.disabled=t.disabled),e.call(S)})}),S}var t=e.models.historicalBar(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s={top:30,right:90,bottom:50,left:90},o=e.utils.defaultColor(),u=null,a=null,f=!1,l=!0,c=!0,h=!1,p=!0,d=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},v,m,g={},y=null,b="No Data Available.",w=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState");n.orient("bottom").tickPadding(7),r.orient(h?"right":"left");var E=function(i,s){if(s){var o=d3.select(s).select("svg"),u=o.node()?o.attr("viewBox"):null;if(u ){u=u.split(" ");var a=parseInt(o.style("width"))/u[2];i.pos[0]=i.pos[0]*a,i.pos[1]=i.pos[1]*a}}var f=i.pos[0]+(s.offsetLeft||0),l=i.pos[1]+(s.offsetTop||0),c=n.tickFormat()(t.x()(i.point,i.pointIndex)),h=r.tickFormat()(t.y()(i.point,i.pointIndex)),p=d(i.series.key,c,h,i,S);e.tooltip.show([f,l],p,null,null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+s.left,e.pos[1]+s.top],w.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){w.tooltipHide(e)}),w.on("tooltipHide",function(){p&&e.tooltip.cleanup()}),S.dispatch=w,S.bars=t,S.legend=i,S.xAxis=n,S.yAxis=r,d3.rebind(S,t,"defined","isArea","x","y","size","xScale","yScale","xDomain","yDomain","forceX","forceY","interactive","clipEdge","clipVoronoi","id","interpolate"),S.margin=function(e){return arguments.length?(s.top=typeof e.top!="undefined"?e.top:s.top,s.right=typeof e.right!="undefined"?e.right:s.right,s.bottom=typeof e.bottom!="undefined"?e.bottom:s.bottom,s.left=typeof e.lef t!="undefined"?e.left:s.left,S):s},S.width=function(e){return arguments.length?(u=e,S):u},S.height=function(e){return arguments.length?(a=e,S):a},S.color=function(t){return arguments.length?(o=e.utils.getColor(t),i.color(o),S):o},S.showLegend=function(e){return arguments.length?(f=e,S):f},S.showXAxis=function(e){return arguments.length?(l=e,S):l},S.showYAxis=function(e){return arguments.length?(c=e,S):c},S.rightAlignYAxis=function(e){return arguments.length?(h=e,r.orient(e?"right":"left"),S):h},S.tooltips=function(e){return arguments.length?(p=e,S):p},S.tooltipContent=function(e){return arguments.length?(d=e,S):d},S.state=function(e){return arguments.length?(g=e,S):g},S.defaultState=function(e){return arguments.length?(y=e,S):y},S.noData=function(e){return arguments.length?(b=e,S):b},S},e.models.indentedTree=function(){function m(e){return e.each(function(e){function C(e,t,n){d3.event.stopPropagation();if(d3.event.shiftKey&&!n)return d3.event.shiftKey=!1,e.values&&e.values.f orEach(function(e){(e.values||e._values)&&C(e,0,!0)}),!0;if(!A(e))return!0;e.values?(e._values=e.values,e.values=null):(e.values=e._values,e._values=null),m.update()}function k(e){return e._values&&e._values.length?h:e.values&&e.values.length?p:""}function L(e){return e._values&&e._values.length}function A(e){var t=e.values||e._values;return t&&t.length}var t=1,n=d3.select(this),i=d3.layout.tree().children(function(e){return e.values}).size([r,f]);m.update=function(){n.transition().duration(600).call(m)},e[0]||(e[0]={key:a});var s=i.nodes(e[0]),g=d3.select(this).selectAll("div").data([[s]]),y=g.enter().append("div").attr("class","nvd3 nv-wrap nv-indentedtree"),b=y.append("table"),w=g.select("table").attr("width","100%").attr("class",c);if(o){var E=b.append("thead"),S=E.append("tr");l.forEach(function(e){S.append("th").attr("width",e.width?e.width:"10%").style("text-align",e.type=="numeric"?"right":"left").append("span").text(e.label)})}var x=w.selectAll("tbody").data(functio n(e){return e});x.enter().append("tbody"),t=d3.max(s,function(e){return e.depth}),i.size([r,t*f]);var T=x.selectAll("tr").data(function(e){return e.filter(function(e){return u&&!e.children?u(e):!0})},function(e,t){return e.id||e.id||++v});T.exit().remove(),T.select("img.nv-treeicon").attr("src",k).classed("folded",L);var N=T.enter().append("tr");l.forEach(function(e,t){var n=N.append("td").style("padding-left",function(e){return(t?0:e.depth*f+12+(k(e)?0:16))+"px"},"important").style("text-align",e.type=="numeric"?"right":"left");t==0&&n.append("img").classed("nv-treeicon",!0).classed("nv-folded",L).attr("src",k).style("width","14px").style("height","14px").style("padding","0 1px").style("display",function(e){return k(e)?"inline-block":"none"}).on("click",C),n.append("span").attr("class",d3.functor(e.classes)).text(function(t){return e.format?e.format(t):t[e.key]||"-"}),e.showCount&&(n.append("span").attr("class","nv-childrenCount"),T.selectAll("span.nv-childrenCount").text(f unction(e){return e.values&&e.values.length||e._values&&e._values.length?"("+(e.values&&e.values.filter(function(e){return u?u(e):!0}).length||e._values&&e._values.filter(function(e){return u?u(e):!0}).length||0)+")":""})),e.click&&n.select("span").on("click",e.click)}),T.order().on("click",function(e){d.elementClick({row:this,data:e,pos:[e.x,e.y]})}).on("dblclick",function(e){d.elementDblclick({row:this,data:e,pos:[e.x,e.y]})}).on("mouseover",function(e){d.elementMouseover({row:this,data:e,pos:[e.x,e.y]})}).on("mouseout",function(e){d.elementMouseout({row:this,data:e,pos:[e.x,e.y]})})}),m}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=e.utils.defaultColor(),s=Math.floor(Math.random()*1e4),o=!0,u=!1,a="No Data Available.",f=20,l=[{key:"key",label:"Name",type:"text"}],c=null,h="images/grey-plus.png",p="images/grey-minus.png",d=d3.dispatch("elementClick","elementDblclick","elementMouseover","elementMouseout"),v=0;return m.margin=function(e){return arguments.length?(t.top= typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,m):t},m.width=function(e){return arguments.length?(n=e,m):n},m.height=function(e){return arguments.length?(r=e,m):r},m.color=function(t){return arguments.length?(i=e.utils.getColor(t),scatter.color(i),m):i},m.id=function(e){return arguments.length?(s=e,m):s},m.header=function(e){return arguments.length?(o=e,m):o},m.noData=function(e){return arguments.length?(a=e,m):a},m.filterZero=function(e){return arguments.length?(u=e,m):u},m.columns=function(e){return arguments.length?(l=e,m):l},m.tableClass=function(e){return arguments.length?(c=e,m):c},m.iconOpen=function(e){return arguments.length?(h=e,m):h},m.iconClose=function(e){return arguments.length?(p=e,m):p},m},e.models.legend=function(){function a(f){return f.each(function(a){var f=n-t.left-t.right,l=d3.select(this),c=l.selectAll("g.nv -legend").data([a]),h=c.enter().append("g").attr("class","nvd3 nv-legend").append("g"),p=c.select("g");c.attr("transform","translate("+t.left+","+t.top+")");var d=p.selectAll(".nv-series").data(function(e){return e}),v=d.enter().append("g").attr("class","nv-series").on("mouseover",function(e,t){u.legendMouseover(e,t)}).on("mouseout",function(e,t){u.legendMouseout(e,t)}).on("click",function(e,t){u.legendClick(e,t)}).on("dblclick",function(e,t){u.legendDblclick(e,t)});v.append("circle").style("stroke-width",2).attr("r",5),v.append("text").attr("text-anchor","start").attr("dy",".32em").attr("dx","8"),d.classed("disabled",function(e){return e.disabled}),d.exit().remove(),d.select("circle").style("fill",function(e,t){return e.color||s(e,t)}).style("stroke",function(e,t){return e.color||s(e,t)}),d.select("text").text(i);if(o){var m=[];d.each(function(t,n){var r=d3.select(this).select("text"),i=r.node().getComputedTextLength()||e.utils.calcApproxTextWidth(r);m.push(i+28)});var g=0, y=0,b=[];while(y<f&&g<m.length)b[g]=m[g],y+=m[g++];while(y>f&&g>1){b=[],g--;for(k=0;k<m.length;k++)m[k]>(b[k%g]||0)&&(b[k%g]=m[k]);y=b.reduce(function(e,t,n,r){return e+t})}var w=[];for(var E=0,S=0;E<g;E++)w[E]=S,S+=b[E];d.attr("transform",function(e,t){return"translate("+w[t%g]+","+(5+Math.floor(t/g)*20)+")"}),p.attr("transform","translate("+(n-t.right-y)+","+t.top+")"),r=t.top+t.bottom+Math.ceil(m.length/g)*20}else{var x=5,T=5,N=0,C;d.attr("transform",function(e,r){var i=d3.select(this).select("text").node().getComputedTextLength()+28;return C=T,n<t.left+t.right+C+i&&(T=C=5,x+=20),T+=i,T>N&&(N=T),"translate("+C+","+x+")"}),p.attr("transform","translate("+(n-t.right-N)+","+t.top+")"),r=t.top+t.bottom+x+15}}),a}var t={top:5,right:0,bottom:5,left:0},n=400,r=20,i=function(e){return e.key},s=e.utils.defaultColor(),o=!0,u=d3.dispatch("legendClick","legendDblclick","legendMouseover","legendMouseout");return a.dispatch=u,a.margin=function(e){return arguments.length?(t.top=typeof e .top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,a):t},a.width=function(e){return arguments.length?(n=e,a):n},a.height=function(e){return arguments.length?(r=e,a):r},a.key=function(e){return arguments.length?(i=e,a):i},a.color=function(t){return arguments.length?(s=e.utils.getColor(t),a):s},a.align=function(e){return arguments.length?(o=e,a):o},a},e.models.line=function(){function m(e){return e.each(function(e){var m=r-n.left-n.right,g=i-n.top-n.bottom,b=d3.select(this);c=t.xScale(),h=t.yScale(),d=d||c,v=v||h;var w=b.selectAll("g.nv-wrap.nv-line").data([e]),E=w.enter().append("g").attr("class","nvd3 nv-wrap nv-line"),S=E.append("defs"),T=E.append("g"),N=w.select("g");T.append("g").attr("class","nv-groups"),T.append("g").attr("class","nv-scatterWrap"),w.attr("transform","translate("+n.left+","+n.top+")"),t.width(m).height(g);var C=w.select(" .nv-scatterWrap");d3.transition(C).call(t),S.append("clipPath").attr("id","nv-edge-clip-"+t.id()).append("rect"),w.select("#nv-edge-clip-"+t.id()+" rect").attr("width",m).attr("height",g),N.attr("clip-path",l?"url(#nv-edge-clip-"+t.id()+")":""),C.attr("clip-path",l?"url(#nv-edge-clip-"+t.id()+")":"");var k=w.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e){return e.key});k.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(k.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),k.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}).style("fill",function(e,t){return s(e,t)}).style("stroke",function(e,t){return s(e,t)}),d3.transition(k).style("stroke-opacity",1).style("fill-opacity",.5);var L=k.selectAll("path.nv-area").data(function(e){return f(e)?[e]:[]});L.enter().append("path").attr("class","nv-area").attr("d",function(e){return d3. svg.area().interpolate(p).defined(a).x(function(e,t){return d(o(e,t))}).y0(function(e,t){return v(u(e,t))}).y1(function(e,t){return v(h.domain()[0]<=0?h.domain()[1]>=0?0:h.domain()[1]:h.domain()[0])}).apply(this,[e.values])}),d3.transition(k.exit().selectAll("path.nv-area")).attr("d",function(e){return d3.svg.area().interpolate(p).defined(a).x(function(e,t){return c(o(e,t))}).y0(function(e,t){return h(u(e,t))}).y1(function(e,t){return h(h.domain()[0]<=0?h.domain()[1]>=0?0:h.domain()[1]:h.domain()[0])}).apply(this,[e.values])}),d3.transition(L).attr("d",function(e){return d3.svg.area().interpolate(p).defined(a).x(function(e,t){return c(o(e,t))}).y0(function(e,t){return h(u(e,t))}).y1(function(e,t){return h(h.domain()[0]<=0?h.domain()[1]>=0?0:h.domain()[1]:h.domain()[0])}).apply(this,[e.values])});var A=k.selectAll("path.nv-line").data(function(e){return[e.values]});A.enter().append("path").attr("class","nv-line").attr("d",d3.svg.line().interpolate(p).defined(a).x(function(e,t ){return d(o(e,t))}).y(function(e,t){return v(u(e,t))})),d3.transition(k.exit().selectAll("path.nv-line")).attr("d",d3.svg.line().interpolate(p).defined(a).x(function(e,t){return c(o(e,t))}).y(function(e,t){return h(u(e,t))})),d3.transition(A).attr("d",d3.svg.line().interpolate(p).defined(a).x(function(e,t){return c(o(e,t))}).y(function(e,t){return h(u(e,t))})),d=c.copy(),v=h.copy()}),m}var t=e.models.scatter(),n={top:0,right:0,bottom:0,left:0},r=960,i=500,s=e.utils.defaultColor(),o=function(e){return e.x},u=function(e){return e.y},a=function(e,t){return!isNaN(u(e,t))&&u(e,t)!==null},f=function(e){return e.area},l=!1,c,h,p="linear";t.size(16).sizeDomain([16,256]);var d,v;return m.dispatch=t.dispatch,m.scatter=t,d3.rebind(m,t,"id","interactive","size","xScale","yScale","zScale","xDomain","yDomain","sizeDomain","forceX","forceY","forceSize","clipVoronoi","clipRadius","padData"),m.margin=function(e){return arguments.length?(n.top=typeof e.top!="undefined"?e.top:n.top,n.right=ty peof e.right!="undefined"?e.right:n.right,n.bottom=typeof e.bottom!="undefined"?e.bottom:n.bottom,n.left=typeof e.left!="undefined"?e.left:n.left,m):n},m.width=function(e){return arguments.length?(r=e,m):r},m.height=function(e){return arguments.length?(i=e,m):i},m.x=function(e){return arguments.length?(o=e,t.x(e),m):o},m.y=function(e){return arguments.length?(u=e,t.y(e),m):u},m.clipEdge=function(e){return arguments.length?(l=e,m):l},m.color=function(n){return arguments.length?(s=e.utils.getColor(n),t.color(s),m):s},m.interpolate=function(e){return arguments.length?(p=e,m):p},m.defined=function(e){return arguments.length?(a=e,m):a},m.isArea=function(e){return arguments.length?(f=d3.functor(e),m):f},m},e.models.lineChart=function(){function S(e){return e.each(function(e){var d=d3.select(this),T=this,N=(u||parseInt(d.style("width"))||960)-s.left-s.right,C=(a||parseInt(d.style("height"))||400)-s.top-s.bottom;S.update=function(){d.transition().call(S)},S.container=this,g.disabled =e.map(function(e){return!!e.disabled});if(!y){var k;y={};for(k in g)g[k]instanceof Array?y[k]=g[k].slice(0):y[k]=g[k]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var L=d.selectAll(".nv-noData").data([b]);return L.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),L.attr("x",s.left+N/2).attr("y",s.top+C/2).text(function(e){return e}),S}d.selectAll(".nv-noData").remove(),v=t.xScale(),m=t.yScale();var A=d.selectAll("g.nv-wrap.nv-lineChart").data([e]),O=A.enter().append("g").attr("class","nvd3 nv-wrap nv-lineChart").append("g"),M=A.select("g");O.append("g").attr("class","nv-x nv-axis"),O.append("g").attr("class","nv-y nv-axis"),O.append("g").attr("class","nv-linesWrap"),O.append("g").attr("class","nv-legendWrap"),f&&(i.width(N),M.select(".nv-legendWrap").datum(e).call(i),s.top!=i.height()&&(s.top=i.height(),C=(a||parseInt(d.style("height"))||400)-s.top-s.bottom),A.select(".nv-legendWrap").attr("tra nsform","translate(0,"+ -s.top+")")),A.attr("transform","translate("+s.left+","+s.top+")"),h&&M.select(".nv-y.nv-axis").attr("transform","translate("+N+",0)"),t.width(N).height(C).color(e.map(function(e,t){return e.color||o(e,t)}).filter(function(t,n){return!e[n].disabled}));var _=M.select(".nv-linesWrap").datum(e.filter(function(e){return!e.disabled}));d3.transition(_).call(t),l&&(n.scale(v).ticks(N/100).tickSize(-C,0),M.select(".nv-x.nv-axis").attr("transform","translate(0,"+m.range()[0]+")"),d3.transition(M.select(".nv-x.nv-axis")).call(n)),c&&(r.scale(m).ticks(C/36).tickSize(-N,0),d3.transition(M.select(".nv-y.nv-axis")).call(r)),i.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,A.selectAll(".nv-series").classed("disabled",!1),e}),g.disabled=e.map(function(e){return!!e.disabled}),w.stateChange(g),S.update()}),i.dispatch.on("legendDblclick",function(t){e.forEach(function (e){e.disabled=!0}),t.disabled=!1,g.disabled=e.map(function(e){return!!e.disabled}),w.stateChange(g),S.update()}),w.on("tooltipShow",function(e){p&&E(e,T.parentNode)}),w.on("changeState",function(t){typeof t.disabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),g.disabled=t.disabled),S.update()})}),S}var t=e.models.line(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s={top:30,right:20,bottom:50,left:60},o=e.utils.defaultColor(),u=null,a=null,f=!0,l=!0,c=!0,h=!1,p=!0,d=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},v,m,g={},y=null,b="No Data Available.",w=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState");n.orient("bottom").tickPadding(7),r.orient(h?"right":"left");var E=function(i,s){if(s){var o=d3.select(s).select("svg"),u=o.node()?o.attr("viewBox"):null;if(u){u=u.split(" ");var a=parseInt(o.style("width"))/u[2];i.pos[0]=i.pos[0]*a,i.pos[1]=i.pos[1]*a}}var f=i.pos[0]+(s.offsetLeft||0),l=i.pos[1]+(s.offse tTop||0),c=n.tickFormat()(t.x()(i.point,i.pointIndex)),h=r.tickFormat()(t.y()(i.point,i.pointIndex)),p=d(i.series.key,c,h,i,S);e.tooltip.show([f,l],p,null,null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+s.left,e.pos[1]+s.top],w.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){w.tooltipHide(e)}),w.on("tooltipHide",function(){p&&e.tooltip.cleanup()}),S.dispatch=w,S.lines=t,S.legend=i,S.xAxis=n,S.yAxis=r,d3.rebind(S,t,"defined","isArea","x","y","size","xScale","yScale","xDomain","yDomain","forceX","forceY","interactive","clipEdge","clipVoronoi","id","interpolate"),S.margin=function(e){return arguments.length?(s.top=typeof e.top!="undefined"?e.top:s.top,s.right=typeof e.right!="undefined"?e.right:s.right,s.bottom=typeof e.bottom!="undefined"?e.bottom:s.bottom,s.left=typeof e.left!="undefined"?e.left:s.left,S):s},S.width=function(e){return arguments.length?(u=e,S):u},S.height=function(e){return arguments.length?(a=e,S):a},S .color=function(t){return arguments.length?(o=e.utils.getColor(t),i.color(o),S):o},S.showLegend=function(e){return arguments.length?(f=e,S):f},S.showXAxis=function(e){return arguments.length?(l=e,S):l},S.showYAxis=function(e){return arguments.length?(c=e,S):c},S.rightAlignYAxis=function(e){return arguments.length?(h=e,r.orient(e?"right":"left"),S):h},S.tooltips=function(e){return arguments.length?(p=e,S):p},S.tooltipContent=function(e){return arguments.length?(d=e,S):d},S.state=function(e){return arguments.length?(g=e,S):g},S.defaultState=function(e){return arguments.length?(y=e,S):y},S.noData=function(e){return arguments.length?(b=e,S):b},S},e.models.linePlusBarChart=function(){function T(e){return e.each(function(e){var l=d3.select(this),c=this,v=(a||parseInt(l.style("width"))||960)-u.left-u.right,N=(f||parseInt(l.style("height"))||400)-u.top-u.bottom;T.update=function(){l.transition().call(T)},b.disabled=e.map(function(e){return!!e.disabled});if(!w){var C;w={};for(C in b) b[C]instanceof Array?w[C]=b[C].slice(0):w[C]=b[C]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var k=l.selectAll(".nv-noData").data([E]);return k.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),k.attr("x",u.left+v/2).attr("y",u.top+N/2).text(function(e){return e}),T}l.selectAll(".nv-noData").remove();var L=e.filter(function(e){return!e.disabled&&e.bar}),A=e.filter(function(e){return!e.bar});m=A.filter(function(e){return!e.disabled}).length&&A.filter(function(e){return!e.disabled})[0].values.length?t.xScale():n.xScale(),g=n.yScale(),y=t.yScale();var O=d3.select(this).selectAll("g.nv-wrap.nv-linePlusBar").data([e]),M=O.enter().append("g").attr("class","nvd3 nv-wrap nv-linePlusBar").append("g"),_=O.select("g");M.append("g").attr("class","nv-x nv-axis"),M.append("g").attr("class","nv-y1 nv-axis"),M.append("g").attr("class","nv-y2 nv-axis"),M.append("g").attr("class","nv-barsWrap"),M.append("g").at tr("class","nv-linesWrap"),M.append("g").attr("class","nv-legendWrap"),p&&(o.width(v/2),_.select(".nv-legendWrap").datum(e.map(function(e){return e.originalKey=e.originalKey===undefined?e.key:e.originalKey,e.key=e.originalKey+(e.bar?" (left axis)":" (right axis)"),e})).call(o),u.top!=o.height()&&(u.top=o.height(),N=(f||parseInt(l.style("height"))||400)-u.top-u.bottom),_.select(".nv-legendWrap").attr("transform","translate("+v/2+","+ -u.top+")")),O.attr("transform","translate("+u.left+","+u.top+")"),t.width(v).height(N).color(e.map(function(e,t){return e.color||h(e,t)}).filter(function(t,n){return!e[n].disabled&&!e[n].bar})),n.width(v).height(N).color(e.map(function(e,t){return e.color||h(e,t)}).filter(function(t,n){return!e[n].disabled&&e[n].bar}));var D=_.select(".nv-barsWrap").datum(L.length?L:[{values:[]}]),P=_.select(".nv-linesWrap").datum(A[0]&&!A[0].disabled?A:[{values:[]}]);d3.transition(D).call(n),d3.transition(P).call(t),r.scale(m).ticks(v/100).tickSize(-N,0),_.sele ct(".nv-x.nv-axis").attr("transform","translate(0,"+g.range()[0]+")"),d3.transition(_.select(".nv-x.nv-axis")).call(r),i.scale(g).ticks(N/36).tickSize(-v,0),d3.transition(_.select(".nv-y1.nv-axis")).style("opacity",L.length?1:0).call(i),s.scale(y).ticks(N/36).tickSize(L.length?0:-v,0),_.select(".nv-y2.nv-axis").style("opacity",A.length?1:0).attr("transform","translate("+v+",0)"),d3.transition(_.select(".nv-y2.nv-axis")).call(s),o.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,O.selectAll(".nv-series").classed("disabled",!1),e}),b.disabled=e.map(function(e){return!!e.disabled}),S.stateChange(b),T.update()}),o.dispatch.on("legendDblclick",function(t){e.forEach(function(e){e.disabled=!0}),t.disabled=!1,b.disabled=e.map(function(e){return!!e.disabled}),S.stateChange(b),T.update()}),S.on("tooltipShow",function(e){d&&x(e,c.parentNode)}),S.on("changeState",function(t){typeof t.di sabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),b.disabled=t.disabled),T.update()})}),T}var t=e.models.line(),n=e.models.historicalBar(),r=e.models.axis(),i=e.models.axis(),s=e.models.axis(),o=e.models.legend(),u={top:30,right:60,bottom:50,left:60},a=null,f=null,l=function(e){return e.x},c=function(e){return e.y},h=e.utils.defaultColor(),p=!0,d=!0,v=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},m,g,y,b={},w=null,E="No Data Available.",S=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState");n.padData(!0),t.clipEdge(!1).padData(!0),r.orient("bottom").tickPadding(7).highlightZero(!1),i.orient("left"),s.orient("right");var x=function(n,o){var u=n.pos[0]+(o.offsetLeft||0),a=n.pos[1]+(o.offsetTop||0),f=r.tickFormat()(t.x()(n.point,n.pointIndex)),l=(n.series.bar?i:s).tickFormat()(t.y()(n.point,n.pointIndex)),c=v(n.series.key,f,l,n,T);e.tooltip.show([u,a],c,n.value<0?"n":"s",null,o)};return t.dispatch.on("elementMouseover .tooltip",function(e){e.pos=[e.pos[0]+u.left,e.pos[1]+u.top],S.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){ -S.tooltipHide(e)}),n.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+u.left,e.pos[1]+u.top],S.tooltipShow(e)}),n.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),S.on("tooltipHide",function(){d&&e.tooltip.cleanup()}),T.dispatch=S,T.legend=o,T.lines=t,T.bars=n,T.xAxis=r,T.y1Axis=i,T.y2Axis=s,d3.rebind(T,t,"defined","size","clipVoronoi","interpolate"),T.x=function(e){return arguments.length?(l=e,t.x(e),n.x(e),T):l},T.y=function(e){return arguments.length?(c=e,t.y(e),n.y(e),T):c},T.margin=function(e){return arguments.length?(u.top=typeof e.top!="undefined"?e.top:u.top,u.right=typeof e.right!="undefined"?e.right:u.right,u.bottom=typeof e.bottom!="undefined"?e.bottom:u.bottom,u.left=typeof e.left!="undefined"?e.left:u.left,T):u},T.width=function(e){return arguments.length?(a=e,T):a},T.height=function(e){return arguments.length?(f=e,T):f},T.color=function(t){return arguments.length?(h=e.utils.getColor(t),o.color(h),T):h},T.showLegend=function (e){return arguments.length?(p=e,T):p},T.tooltips=function(e){return arguments.length?(d=e,T):d},T.tooltipContent=function(e){return arguments.length?(v=e,T):v},T.state=function(e){return arguments.length?(b=e,T):b},T.defaultState=function(e){return arguments.length?(w=e,T):w},T.noData=function(e){return arguments.length?(E=e,T):E},T},e.models.lineWithFocusChart=function(){function C(e){return e.each(function(e){function q(e){var t=+(e=="e"),n=t?1:-1,r=O/3;return"M"+.5*n+","+r+"A6,6 0 0 "+t+" "+6.5*n+","+(r+6)+"V"+(2*r-6)+"A6,6 0 0 "+t+" "+.5*n+","+2*r+"Z"+"M"+2.5*n+","+(r+8)+"V"+(2*r-8)+"M"+4.5*n+","+(r+8)+"V"+(2*r-8)}function R(){a.empty()||a.extent(w),F.data([a.empty()?g.domain():w]).each(function(e,t){var n=g(e[0])-v.range()[0],r=v.range()[1]-g(e[1]);d3.select(this).select(".left").attr("width",n<0?0:n),d3.select(this).select(".right").attr("x",g(e[1])).attr("width",r<0?0:r)})}function U(){w=a.empty()?null:a.extent(),extent=a.empty()?g.domain():a.extent(),T.brush({extent :extent,brush:a}),R();var n=P.select(".nv-focus .nv-linesWrap").datum(e.filter(function(e){return!e.disabled}).map(function(e,n){return{key:e.key,values:e.values.filter(function(e,n){return t.x()(e,n)>=extent[0]&&t.x()(e,n)<=extent[1]})}}));d3.transition(n).call(t),d3.transition(P.select(".nv-focus .nv-x.nv-axis")).call(r),d3.transition(P.select(".nv-focus .nv-y.nv-axis")).call(i)}var S=d3.select(this),k=this,L=(h||parseInt(S.style("width"))||960)-f.left-f.right,A=(p||parseInt(S.style("height"))||400)-f.top-f.bottom-d,O=d-l.top-l.bottom;C.update=function(){S.transition().call(C)},C.container=this;if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var M=S.selectAll(".nv-noData").data([x]);return M.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),M.attr("x",f.left+L/2).attr("y",f.top+A/2).text(function(e){return e}),C}S.selectAll(".nv-noData").remove(),v=t.xScale(),m=t.yScale(),g=n.xScale(),y=n.yScale( );var _=S.selectAll("g.nv-wrap.nv-lineWithFocusChart").data([e]),D=_.enter().append("g").attr("class","nvd3 nv-wrap nv-lineWithFocusChart").append("g"),P=_.select("g");D.append("g").attr("class","nv-legendWrap");var H=D.append("g").attr("class","nv-focus");H.append("g").attr("class","nv-x nv-axis"),H.append("g").attr("class","nv-y nv-axis"),H.append("g").attr("class","nv-linesWrap");var B=D.append("g").attr("class","nv-context");B.append("g").attr("class","nv-x nv-axis"),B.append("g").attr("class","nv-y nv-axis"),B.append("g").attr("class","nv-linesWrap"),B.append("g").attr("class","nv-brushBackground"),B.append("g").attr("class","nv-x nv-brush"),b&&(u.width(L),P.select(".nv-legendWrap").datum(e).call(u),f.top!=u.height()&&(f.top=u.height(),A=(p||parseInt(S.style("height"))||400)-f.top-f.bottom-d),P.select(".nv-legendWrap").attr("transform","translate(0,"+ -f.top+")")),_.attr("transform","translate("+f.left+","+f.top+")"),t.width(L).height(A).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),n.defined(t.defined()).width(L).height(O).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),P.select(".nv-context").attr("transform","translate(0,"+(A+f.bottom+l.top)+")");var j=P.select(".nv-context .nv-linesWrap").datum(e.filter(function(e){return!e.disabled}));d3.transition(j).call(n),r.scale(v).ticks(L/100).tickSize(-A,0),i.scale(m).ticks(A/36).tickSize(-L,0),P.select(".nv-focus .nv-x.nv-axis").attr("transform","translate(0,"+A+")"),a.x(g).on("brush",U),w&&a.extent(w);var F=P.select(".nv-brushBackground").selectAll("g").data([w||a.extent()]),I=F.enter().append("g");I.append("rect").attr("class","left").attr("x",0).attr("y",0).attr("height",O),I.append("rect").attr("class","right").attr("x",0).attr("y",0).attr("height",O),gBrush=P.select(".nv-x.nv-brush").call(a),gBrush.selectAll("rect").attr("height",O),gBrush.selectAll(".resize").append("path").attr("d",q),U(),s .scale(g).ticks(L/100).tickSize(-O,0),P.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+y.range()[0]+")"),d3.transition(P.select(".nv-context .nv-x.nv-axis")).call(s),o.scale(y).ticks(O/36).tickSize(-L,0),d3.transition(P.select(".nv-context .nv-y.nv-axis")).call(o),P.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+y.range()[0]+")"),u.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,_.selectAll(".nv-series").classed("disabled",!1),e}),S.transition().call(C)}),T.on("tooltipShow",function(e){E&&N(e,k.parentNode)})}),C}var t=e.models.line(),n=e.models.line(),r=e.models.axis(),i=e.models.axis(),s=e.models.axis(),o=e.models.axis(),u=e.models.legend(),a=d3.svg.brush(),f={top:30,right:30,bottom:30,left:60},l={top:0,right:30,bottom:20,left:60},c=e.utils.defaultColor(),h=null,p=null,d=100,v,m,g,y,b=!0,w=null,E=!0,S=function(e,t,n,r,i){return"<h3 >"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},x="No Data Available.",T=d3.dispatch("tooltipShow","tooltipHide","brush");t.clipEdge(!0),n.interactive(!1),r.orient("bottom").tickPadding(5),i.orient("left"),s.orient("bottom").tickPadding(5),o.orient("left");var N=function(n,s){var o=n.pos[0]+(s.offsetLeft||0),u=n.pos[1]+(s.offsetTop||0),a=r.tickFormat()(t.x()(n.point,n.pointIndex)),f=i.tickFormat()(t.y()(n.point,n.pointIndex)),l=S(n.series.key,a,f,n,C);e.tooltip.show([o,u],l,null,null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+f.left,e.pos[1]+f.top],T.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){T.tooltipHide(e)}),T.on("tooltipHide",function(){E&&e.tooltip.cleanup()}),C.dispatch=T,C.legend=u,C.lines=t,C.lines2=n,C.xAxis=r,C.yAxis=i,C.x2Axis=s,C.y2Axis=o,d3.rebind(C,t,"defined","isArea","size","xDomain","yDomain","forceX","forceY","interactive","clipEdge","clipVoronoi","id"),C.x=function(e){return arguments.length?(t.x(e),n.x( e),C):t.x},C.y=function(e){return arguments.length?(t.y(e),n.y(e),C):t.y},C.margin=function(e){return arguments.length?(f.top=typeof e.top!="undefined"?e.top:f.top,f.right=typeof e.right!="undefined"?e.right:f.right,f.bottom=typeof e.bottom!="undefined"?e.bottom:f.bottom,f.left=typeof e.left!="undefined"?e.left:f.left,C):f},C.margin2=function(e){return arguments.length?(l=e,C):l},C.width=function(e){return arguments.length?(h=e,C):h},C.height=function(e){return arguments.length?(p=e,C):p},C.height2=function(e){return arguments.length?(d=e,C):d},C.color=function(t){return arguments.length?(c=e.utils.getColor(t),u.color(c),C):c},C.showLegend=function(e){return arguments.length?(b=e,C):b},C.tooltips=function(e){return arguments.length?(E=e,C):E},C.tooltipContent=function(e){return arguments.length?(S=e,C):S},C.interpolate=function(e){return arguments.length?(t.interpolate(e),n.interpolate(e),C):t.interpolate()},C.noData=function(e){return arguments.length?(x=e,C):x},C.xTickForm at=function(e){return arguments.length?(r.tickFormat(e),s.tickFormat(e),C):r.tickFormat()},C.yTickFormat=function(e){return arguments.length?(i.tickFormat(e),o.tickFormat(e),C):i.tickFormat()},C},e.models.linePlusBarWithFocusChart=function(){function H(e){return e.each(function(e){function tt(e){var t=+(e=="e"),n=t?1:-1,r=I/3;return"M"+.5*n+","+r+"A6,6 0 0 "+t+" "+6.5*n+","+(r+6)+"V"+(2*r-6)+"A6,6 0 0 "+t+" "+.5*n+","+2*r+"Z"+"M"+2.5*n+","+(r+8)+"V"+(2*r-8)+"M"+4.5*n+","+(r+8)+"V"+(2*r-8)}function nt(){h.empty()||h.extent(x),Y.data([h.empty()?k.domain():x]).each(function(e,t){var n=k(e[0])-k.range()[0],r=k.range()[1]-k(e[1]);d3.select(this).select(".left").attr("width",n<0?0:n),d3.select(this).select(".right").attr("x",k(e[1])).attr("width",r<0?0:r)})}function rt(){x=h.empty()?null:h.extent(),S=h.empty()?k.domain():h.extent(),D.brush({extent:S,brush:h}),nt(),r.width(j).height(F).color(e.map(function(e,t){return e.color||w(e,t)}).filter(function(t,n){return!e[n].disabled&&e[n ].bar})),t.width(j).height(F).color(e.map(function(e,t){return e.color||w(e,t)}).filter(function(t,n){return!e[n].disabled&&!e[n].bar}));var n=$.select(".nv-focus .nv-barsWrap").datum(R.length?R.map(function(e,t){return{key:e.key,values:e.values.filter(function(e,t){return r.x()(e,t)>=S[0]&&r.x()(e,t)<=S[1]})}}):[{values:[]}]),i=$.select(".nv-focus .nv-linesWrap").datum(U[0].disabled?[{values:[]}]:U.map(function(e,n){return{key:e.key,values:e.values.filter(function(e,n){return t.x()(e,n)>=S[0]&&t.x()(e,n)<=S[1]})}}));R.length?C=r.xScale():C=t.xScale(),s.scale(C).ticks(j/100).tickSize(-F,0),s.domain([Math.ceil(S[0]),Math.floor(S[1])]),d3.transition($.select(".nv-x.nv-axis")).call(s),d3.transition(n).call(r),d3.transition(i).call(t),$.select(".nv-focus .nv-x.nv-axis").attr("transform","translate(0,"+L.range()[0]+")"),u.scale(L).ticks(F/36).tickSize(-j,0),$.select(".nv-focus .nv-y1.nv-axis").style("opacity",R.length?1:0),a.scale(A).ticks(F/36).tickSize(R.length?0:-j,0),$.select (".nv-focus .nv-y2.nv-axis").style("opacity",U.length?1:0).attr("transform","translate("+C.range()[1]+",0)"),d3.transition($.select(".nv-focus .nv-y1.nv-axis")).call(u),d3.transition($.select(".nv-focus .nv-y2.nv-axis")).call(a)}var N=d3.select(this),B=this,j=(v||parseInt(N.style("width"))||960)-p.left-p.right,F=(m||parseInt(N.style("height"))||400)-p.top-p.bottom-g,I=g-d.top-d.bottom;H.update=function(){N.transition().call(H)},H.container=this;if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var q=N.selectAll(".nv-noData").data([_]);return q.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),q.attr("x",p.left+j/2).attr("y",p.top+F/2).text(function(e){return e}),H}N.selectAll(".nv-noData").remove();var R=e.filter(function(e){return!e.disabled&&e.bar}),U=e.filter(function(e){return!e.bar});C=r.xScale(),k=o.scale(),L=r.yScale(),A=t.yScale(),O=i.yScale(),M=n.yScale();var z=e.filter(function(e){return!e. disabled&&e.bar}).map(function(e){return e.values.map(function(e,t){return{x:y(e,t),y:b(e,t)}})}),W=e.filter(function(e){return!e.disabled&&!e.bar}).map(function(e){return e.values.map(function(e,t){return{x:y(e,t),y:b(e,t)}})});C.range([0,j]),k.domain(d3.extent(d3.merge(z.concat(W)),function(e){return e.x})).range([0,j]);var X=N.selectAll("g.nv-wrap.nv-linePlusBar").data([e]),V=X.enter().append("g").attr("class","nvd3 nv-wrap nv-linePlusBar").append("g"),$=X.select("g");V.append("g").attr("class","nv-legendWrap");var J=V.append("g").attr("class","nv-focus");J.append("g").attr("class","nv-x nv-axis"),J.append("g").attr("class","nv-y1 nv-axis"),J.append("g").attr("class","nv-y2 nv-axis"),J.append("g").attr("class","nv-barsWrap"),J.append("g").attr("class","nv-linesWrap");var K=V.append("g").attr("class","nv-context");K.append("g").attr("class","nv-x nv-axis"),K.append("g").attr("class","nv-y1 nv-axis"),K.append("g").attr("class","nv-y2 nv-axis"),K.append("g").attr("class","nv -barsWrap"),K.append("g").attr("class","nv-linesWrap"),K.append("g").attr("class","nv-brushBackground"),K.append("g").attr("class","nv-x nv-brush"),E&&(c.width(j/2),$.select(".nv-legendWrap").datum(e.map(function(e){return e.originalKey=e.originalKey===undefined?e.key:e.originalKey,e.key=e.originalKey+(e.bar?" (left axis)":" (right axis)"),e})).call(c),p.top!=c.height()&&(p.top=c.height(),F=(m||parseInt(N.style("height"))||400)-p.top-p.bottom-g),$.select(".nv-legendWrap").attr("transform","translate("+j/2+","+ -p.top+")")),X.attr("transform","translate("+p.left+","+p.top+")"),i.width(j).height(I).color(e.map(function(e,t){return e.color||w(e,t)}).filter(function(t,n){return!e[n].disabled&&e[n].bar})),n.width(j).height(I).color(e.map(function(e,t){return e.color||w(e,t)}).filter(function(t,n){return!e[n].disabled&&!e[n].bar}));var Q=$.select(".nv-context .nv-barsWrap").datum(R.length?R:[{values:[]}]),G=$.select(".nv-context .nv-linesWrap").datum(U[0].disabled?[{values:[]}]:U) ;$.select(".nv-context").attr("transform","translate(0,"+(F+p.bottom+d.top)+")"),d3.transition(Q).call(i),d3.transition(G).call(n),h.x(k).on("brush",rt),x&&h.extent(x);var Y=$.select(".nv-brushBackground").selectAll("g").data([x||h.extent()]),Z=Y.enter().append("g");Z.append("rect").attr("class","left").attr("x",0).attr("y",0).attr("height",I),Z.append("rect").attr("class","right").attr("x",0).attr("y",0).attr("height",I);var et=$.select(".nv-x.nv-brush").call(h);et.selectAll("rect").attr("height",I),et.selectAll(".resize").append("path").attr("d",tt),o.ticks(j/100).tickSize(-I,0),$.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+O.range()[0]+")"),d3.transition($.select(".nv-context .nv-x.nv-axis")).call(o),f.scale(O).ticks(I/36).tickSize(-j,0),$.select(".nv-context .nv-y1.nv-axis").style("opacity",R.length?1:0).attr("transform","translate(0,"+k.range()[0]+")"),d3.transition($.select(".nv-context .nv-y1.nv-axis")).call(f),l.scale(M).ticks(I/36).tickSize(R .length?0:-j,0),$.select(".nv-context .nv-y2.nv-axis").style("opacity",U.length?1:0).attr("transform","translate("+k.range()[1]+",0)"),d3.transition($.select(".nv-context .nv-y2.nv-axis")).call(l),c.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,X.selectAll(".nv-series").classed("disabled",!1),e}),H.update()}),D.on("tooltipShow",function(e){T&&P(e,B.parentNode)}),rt()}),H}var t=e.models.line(),n=e.models.line(),r=e.models.historicalBar(),i=e.models.historicalBar(),s=e.models.axis(),o=e.models.axis(),u=e.models.axis(),a=e.models.axis(),f=e.models.axis(),l=e.models.axis(),c=e.models.legend(),h=d3.svg.brush(),p={top:30,right:30,bottom:30,left:60},d={top:0,right:30,bottom:20,left:60},v=null,m=null,g=100,y=function(e){return e.x},b=function(e){return e.y},w=e.utils.defaultColor(),E=!0,S,x=null,T=!0,N=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},C,k,L,A,O, M,_="No Data Available.",D=d3.dispatch("tooltipShow","tooltipHide","brush");t.clipEdge(!0),n.interactive(!1),s.orient("bottom").tickPadding(5),u.orient("left"),a.orient("right"),o.orient("bottom").tickPadding(5),f.orient("left"),l.orient("right");var P=function(n,r){S&&(n.pointIndex+=Math.ceil(S[0]));var i=n.pos[0]+(r.offsetLeft||0),o=n.pos[1]+(r.offsetTop||0),f=s.tickFormat()(t.x()(n.point,n.pointIndex)),l=(n.series.bar?u:a).tickFormat()(t.y()(n.point,n.pointIndex)),c=N(n.series.key,f,l,n,H);e.tooltip.show([i,o],c,n.value<0?"n":"s",null,r)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+p.left,e.pos[1]+p.top],D.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){D.tooltipHide(e)}),r.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+p.left,e.pos[1]+p.top],D.tooltipShow(e)}),r.dispatch.on("elementMouseout.tooltip",function(e){D.tooltipHide(e)}),D.on("tooltipHide",function(){T&&e.tooltip.cleanup()}),H.dispatch=D,H. legend=c,H.lines=t,H.lines2=n,H.bars=r,H.bars2=i,H.xAxis=s,H.x2Axis=o,H.y1Axis=u,H.y2Axis=a,H.y3Axis=f,H.y4Axis=l,d3.rebind(H,t,"defined","size","clipVoronoi","interpolate"),H.x=function(e){return arguments.length?(y=e,t.x(e),r.x(e),H):y},H.y=function(e){return arguments.length?(b=e,t.y(e),r.y(e),H):b},H.margin=function(e){return arguments.length?(p.top=typeof e.top!="undefined"?e.top:p.top,p.right=typeof e.right!="undefined"?e.right:p.right,p.bottom=typeof e.bottom!="undefined"?e.bottom:p.bottom,p.left=typeof e.left!="undefined"?e.left:p.left,H):p},H.width=function(e){return arguments.length?(v=e,H):v},H.height=function(e){return arguments.length?(m=e,H):m},H.color=function(t){return arguments.length?(w=e.utils.getColor(t),c.color(w),H):w},H.showLegend=function(e){return arguments.length?(E=e,H):E},H.tooltips=function(e){return arguments.length?(T=e,H):T},H.tooltipContent=function(e){return arguments.length?(N=e,H):N},H.noData=function(e){return arguments.length?(_=e,H):_}, H.brushExtent=function(e){return arguments.length?(x=e,H):x},H},e.models.multiBar=function(){function x(e){return e.each(function(e){var x=n-t.left-t.right,T=r-t.top-t.bottom,N=d3.select(this);p&&e.length&&(p=[{values:e[0].values.map(function(e){return{x:e.x,y:0,series:e.series,size:.01}})}]),c&&(e=d3.layout.stack().offset("zero").values(function(e){return e.values}).y(a)(!e.length&&p?p:e)),e=e.map(function(e,t){return e.values=e.values.map(function(e){return e.series=t,e}),e}),c&&e[0].values.map(function(t,n){var r=0,i=0;e.map(function(e){var t=e.values[n];t.size=Math.abs(t.y),t.y<0?(t.y1=i,i-=t.size):(t.y1=t.size+r,r+=t.size)})});var C=y&&b?[]:e.map(function(e){return e.values.map(function(e,t){return{x:u(e,t),y:a(e,t),y0:e.y0,y1:e.y1}})});i.domain(d3.merge(C).map(function(e){return e.x})).rangeBands([0,x],.1),s.domain(b||d3.extent(d3.merge(C).map(function(e){return c?e.y>0?e.y1:e.y1+e.y:e.y}).concat(f))).range([T,0]);if(i.domain()[0]===i.domain()[1]||s.domain()[0]===s.dom ain()[1])singlePoint=!0;i.domain()[0]===i.domain()[1]&&(i.domain()[0]?i.domain([i.domain()[0]-i.domain()[0]*.01,i.domain()[1]+i.domain()[1]*.01]):i.domain([-1,1])),s.domain()[0]===s.domain()[1]&&(s.domain()[0]?s.domain([s.domain()[0]+s.domain()[0]*.01,s.domain()[1]-s.domain()[1]*.01]):s.domain([-1,1])),E=E||i,S=S||s;var k=N.selectAll("g.nv-wrap.nv-multibar").data([e]),L=k.enter().append("g").attr("class","nvd3 nv-wrap nv-multibar"),A=L.append("defs"),O=L.append("g"),M=k.select("g");O.append("g").attr("class","nv-groups"),k.attr("transform","translate("+t.left+","+t.top+")"),A.append("clipPath").attr("id","nv-edge-clip-"+o).append("rect"),k.select("#nv-edge-clip-"+o+" rect").attr("width",x).attr("height",T),M.attr("clip-path",l?"url(#nv-edge-clip-"+o+")":"");var _=k.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e){return e.key});_.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),_.exit().selectAll("rect.nv-bar").tra nsition().delay(function(t,n){return n*m/e[0].values.length}).attr("y",function(e){return c?S(e.y0):S(0)}).attr("height",0).remove(),_.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}).style("fill",function(e,t){return h(e,t)}).style("stroke",function(e,t){return h(e,t)}),d3.transition(_).style("stroke-opacity",1).style("fill-opacity",.75);var D=_.selectAll("rect.nv-bar").data(function(t){return p&&!e.length?p.values:t.values});D.exit().remove();var P=D.enter().append("rect").attr("class",function(e,t){return a(e,t)<0?"nv-bar negative":"nv-bar positive"}).attr("x",function(t,n,r){return c?0:r*i.rangeBand()/e.length}).attr("y",function(e){return S(c?e.y0:0)}).attr("height",0).attr("width",i.rangeBand()/(c?1:e.length));D.style("fill",function(e,t,n){return h(e,n,t)}).style("stroke",function(e,t,n){return h(e,n,t)}).on("mouseover",function(t,n){d3.select(this).classed("hover",!0),w.elementMouseover({value:a(t,n),point:t,seri es:e[t.series],pos:[i(u(t,n))+i.rangeBand()*(c?e.length/2:t.series+.5)/e.length,s(a(t,n)+(c?t.y0:0))],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),w.elementMouseout({value:a(t,n),point:t,series:e[t.series],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("click",function(t,n){w.elementClick({value:a(t,n),point:t,series:e[t.series],pos:[i(u(t,n))+i.rangeBand()*(c?e.length/2:t.series+.5)/e.length,s(a(t,n)+(c?t.y0:0))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}).on("dblclick",function(t,n){w.elementDblClick({value:a(t,n),point:t,series:e[t.series],pos:[i(u(t,n))+i.rangeBand()*(c?e.length/2:t.series+.5)/e.length,s(a(t,n)+(c?t.y0:0))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}),D.attr("class",function(e,t){return a(e,t)<0?"nv-bar negative":"nv-bar positive"}).attr("transform",function(e,t){return"translate("+i(u(e,t))+",0)"}),d&&(v||(v=e.map(funct ion(){return!0})),D.style("fill",function(e,t,n){return d3.rgb(d(e,t)).darker(v.map(function(e,t){return t}).filter(function(e,t){return!v[t]})[n]).toString()}).style("stroke",function(e,t,n){return d3.rgb(d(e,t)).darker(v.map(function(e,t){return t}).filter(function(e,t){return!v[t]})[n]).toString()})),c?D.transition().delay(function(t,n){return n*m/e[0].values.length}).attr("y",function(e,t){return s(c?e.y1:0)}).attr("height",function(e,t){return Math.max(Math.abs(s(e.y+(c?e.y0:0))-s(c?e.y0:0)),1)}).each("end",function(){d3.select(this).transition().duration(g).attr("x",function(t,n){return c?0:t.series*i.rangeBand()/e.length}).attr("width",i.rangeBand()/(c?1:e.length))}):d3.transition(D).duration(g).delay(function(t,n){return n*m/e[0].values.length}).attr("x",function(t,n){return t.series*i.rangeBand()/e.length}).attr("width",i.rangeBand()/e.length).each("end",function(){d3.select(this).transition().duration(g).attr("y",function(e,t){return a(e,t)<0?s(0):s(0)-s(a(e,t))<1? s(0)-1:s(a(e,t))||0}).attr("height",function(e,t){return Math.max(Math.abs(s(a(e,t))-s(0)),1)||0})}),E=i.copy(),S=s.copy()}),x}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=d3.scale.ordinal(),s=d3.scale.linear(),o=Math.floor(Math.random()*1e4),u=function(e){return e.x},a=function(e){return e.y},f=[0],l=!0,c=!1,h=e.utils.defaultColor(),p=!1,d=null,v,m=1200,g=500,y,b,w=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout"),E,S;return x.dispatch=w,x.x=function(e){return arguments.length?(u=e,x):u},x.y=function(e){return arguments.length?(a=e,x):a},x.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,x):t},x.width=function(e){return arguments.length?(n=e,x):n},x.height=function(e){return arguments.length?(r=e,x):r},x.xScale=function(e){return arguments.length?(i=e,x):i},x.yScale=function(e){return arguments.length?(s=e,x):s},x.xDomain=function(e){return arguments.length?(y=e,x):y},x.yDomain=function(e){return arguments.length?(b=e,x):b},x.forceY=function(e){return arguments.length?(f=e,x):f},x.stacked=function(e){return arguments.length?(c=e,x):c},x.clipEdge=function(e){return arguments.length?(l=e,x):l},x.color=function(t){return arguments.length?(h=e.utils.getColor(t),x):h},x.barColor=function(t){return arguments.length?(d=e.utils.getColor(t),x):d},x.disabled=function(e){return arguments.length?(v=e,x):v},x.id=function(e){return arguments.length?(o=e,x):o},x.hideable=function(e){return arguments.length?(p=e,x):p},x.delay=function(e){return arguments.length?(m=e,x):m},x.drawTime=function(e){return arguments.length?(g=e,x):g},x},e.models.multiBarChart=function(){function N(e){return e.each(function(e){var m=d3.select(this),C=this,k=(u||parseInt(m.style("width"))||960)-o.left-o.right,L=(a||parseInt(m.style("height "))||400)-o.top-o.bottom;N.update=function(){m.transition().call(N)},N.container=this,b.disabled=e.map(function(e){return!!e.disabled});if(!w){var A;w={};for(A in b)b[A]instanceof Array?w[A]=b[A].slice(0):w[A]=b[A]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var O=m.selectAll(".nv-noData").data([E]);return O.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),O.attr("x",o.left+k/2).attr("y",o.top+L/2).text(function(e){return e}),N}m.selectAll(".nv-noData").remove(),g=t.xScale(),y=t.yScale();var M=m.selectAll("g.nv-wrap.nv-multiBarWithLegend").data([e]),_=M.enter().append("g").attr("class","nvd3 nv-wrap nv-multiBarWithLegend").append("g"),D=M.select("g");_.append("g").attr("class","nv-x nv-axis"),_.append("g").attr("class","nv-y nv-axis"),_.append("g").attr("class","nv-barsWrap"),_.append("g").attr("class","nv-legendWrap"),_.append("g").attr("class","nv-controlsWrap"),c&&(i.width(k-x()),t.barColor ()&&e.forEach(function(e,t){e.color=d3.rgb("#ccc").darker(t*1.5).toString()}),D.select(".nv-legendWrap").datum(e).call(i),o.top!=i.height()&&(o.top=i.height(),L=(a||parseInt(m.style("height"))||400)-o.top-o.bottom),D.select(".nv-legendWrap").attr("transform","translate("+x()+","+ -o.top+")"));if(l){var P=[{key:"Grouped",disabled:t.stacked()},{key:"Stacked",disabled:!t.stacked()}];s.width(x()).color(["#444","#444","#444"]),D.select(".nv-controlsWrap").datum(P).attr("transform","translate(0,"+ -o.top+")").call(s)}M.attr("transform","translate("+o.left+","+o.top+")"),t.disabled(e.map(function(e){return e.disabled})).width(k).height(L).color(e.map(function(e,t){return e.color||f(e,t)}).filter(function(t,n){return!e[n].disabled}));var H=D.select(".nv-barsWrap").datum(e.filter(function(e){return!e.disabled}));d3.transition(H).call(t),n.scale(g).ticks(k/100).tickSize(-L,0),D.select(".nv-x.nv-axis").attr("transform","translate(0,"+y.range()[0]+")"),d3.transition(D.select(".nv-x.nv-a xis")).call(n);var B=D.select(".nv-x.nv-axis > g").selectAll("g");B.selectAll("line, text").style("opacity",1);if(p){var j=function(e,t){return"translate("+e+","+t+")"},F=5,I=17;B.selectAll("text").attr("transform",function(e,t,n){return j(0,n%2==0?F:I)});var q=d3.selectAll(".nv-x.nv-axis .nv-wrap g g text")[0].length;D.selectAll(".nv-x.nv-axis .nv-axisMaxMin text").attr("transform",function(e,t){return j(0,t===0||q%2!==0?I:F)})}h&&B.filter(function(t,n){return n%Math.ceil(e[0].values.length/(k/100))!==0}).selectAll("text, line").style("opacity",0),d&&B.selectAll("text").attr("transform","rotate("+d+" 0,0)").attr("text-anchor",d>0?"start":"end"),D.select(".nv-x.nv-axis").selectAll("g.nv-axisMaxMin text").style("opacity",1),r.scale(y).ticks(L/36).tickSize(-k,0),d3.transition(D.select(".nv-y.nv-axis")).call(r),i.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,M.selectAll(".nv -series").classed("disabled",!1),e}),b.disabled=e.map(function(e){return!!e.disabled}),S.stateChange(b),N.update()}),i.dispatch.on("legendDblclick",function(t){e.forEach(function(e){e.disabled=!0}),t.disabled=!1,b.disabled=e.map(function(e){return!!e.disabled}),S.stateChange(b),N.update()}),s.dispatch.on("legendClick",function(e,n){if(!e.disabled)return;P=P.map(function(e){return e.disabled=!0,e}),e.disabled=!1;switch(e.key){case"Grouped":t.stacked(!1);break;case"Stacked":t.stacked(!0)}b.stacked=t.stacked(),S.stateChange(b),N.update()}),S.on("tooltipShow",function(e){v&&T(e,C.parentNode)}),S.on("changeState",function(n){typeof n.disabled!="undefined"&&(e.forEach(function(e,t){e.disabled=n.disabled[t]}),b.disabled=n.disabled),typeof n.stacked!="undefined"&&(t.stacked(n.stacked),b.stacked=n.stacked),N.update()})}),N}var t=e.models.multiBar(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o={top:30,right:20,bottom:50,left:60},u=null,a=null,f=e.utils .defaultColor(),l=!0,c=!0,h=!0,p=!1,d=0,v=!0,m=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" on "+t+"</p>"},g,y,b={stacked:!1},w=null,E="No Data Available.",S=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),x=function(){return l?180:0};t.stacked(!1),n.orient("bottom").tickPadding(7).highlightZero(!0).showMaxMin(!1).tickFormat(function(e){return e}),r.orient("left").tickFormat(d3.format(",.1f"));var T=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=m(i.series.key,a,f,i,N);e.tooltip.show([o,u],l,i.value<0?"n":"s",null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+o.left,e.pos[1]+o.top],S.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),S.on("tooltipHide",function(){v&&e.tooltip.cleanup()}),N.dispatch=S,N.multibar=t,N.legend=i,N.xAxis=n,N.yAxis=r,d3.rebind(N,t ,"x","y","xDomain","yDomain","forceX","forceY","clipEdge","id","stacked","delay","barColor"),N.margin=function(e){return arguments.length?(o.top=typeof e.top!="undefined"?e.top:o.top,o.right=typeof e.right!="undefined"?e.right:o.right,o.bottom=typeof e.bottom!="undefined"?e.bottom:o.bottom,o.left=typeof e.left!="undefined"?e.left:o.left,N):o},N.width=function(e){return arguments.length?(u=e,N):u},N.height=function(e){return arguments.length?(a=e,N):a},N.color=function(t){return arguments.length?(f=e.utils.getColor(t),i.color(f),N):f},N.showControls=function(e){return arguments.length?(l=e,N):l},N.showLegend=function(e){return arguments.length?(c=e,N):c},N.reduceXTicks=function(e){return arguments.length?(h=e,N):h},N.rotateLabels=function(e){return arguments.length?(d=e,N):d},N.staggerLabels=function(e){return arguments.length?(p=e,N):p},N.tooltip=function(e){return arguments.length?(m=e,N):m},N.tooltips=function(e){return arguments.length?(v=e,N):v},N.tooltipContent=function (e){return arguments.length?(m=e,N):m},N.state=function(e){return arguments.length?(b=e,N):b},N.defaultState=function(e){return arguments.length?(w=e,N):w},N.noData=function(e){return arguments.length?(E=e,N):E},N},e.models.multiBarHorizontal=function(){function x(e){return e.each(function(e){var i=n-t.left-t.right,g=r-t.top-t.bottom,x=d3.select(this);p&&(e=d3.layout.stack().offset("zero").values(function(e){return e.values}).y(a)(e)),e=e.map(function(e,t){return e.values=e.values.map(function(e){return e.series=t,e}),e}),p&&e[0].values.map(function(t,n){var r=0,i=0;e.map(function(e){var t=e.values[n];t.size=Math.abs(t.y),t.y<0?(t.y1=i-t.size,i-=t.size):(t.y1=r,r+=t.size)})});var T=y&&b?[]:e.map(function(e){return e.values.map(function(e,t){return{x:u(e,t),y:a(e,t),y0:e.y0,y1:e.y1}})});s.domain(y||d3.merge(T).map(function(e){return e.x})).rangeBands([0,g],.1),o.domain(b||d3.extent(d3.merge(T).map(function(e){return p?e.y>0?e.y1+e.y:e.y1:e.y}).concat(f))),d&&!p?o.range([o.dom ain()[0]<0?v:0,i-(o.domain()[1]>0?v:0)]):o.range([0,i]),E=E||s,S=S||d3.scale.linear().domain(o.domain()).range([o(0),o(0)]);var N=d3.select(this).selectAll("g.nv-wrap.nv-multibarHorizontal").data([e]),C=N.enter().append("g").attr("class","nvd3 nv-wrap nv-multibarHorizontal"),k=C.append("defs"),L=C.append("g"),A=N.select("g");L.append("g").attr("class","nv-groups"),N.attr("transform","translate("+t.left+","+t.top+")");var O=N.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e){return e.key});O.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(O.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),O.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}).style("fill",function(e,t){return l(e,t)}).style("stroke",function(e,t){return l(e,t)}),d3.transition(O).style("stroke-opacity",1).style("fill-opacity",.75);var M=O.selectAll("g.nv-bar").da ta(function(e){return e.values});M.exit().remove();var _=M.enter().append("g").attr("transform",function(t,n,r){return"translate("+S(p?t.y0:0)+","+(p?0:r*s.rangeBand()/e.length+s(u(t,n)))+")"});_.append("rect").attr("width",0).attr("height",s.rangeBand()/(p?1:e.length)),M.on("mouseover",function(t,n){d3.select(this).classed("hover",!0),w.elementMouseover({value:a(t,n),point:t,series:e[t.series],pos:[o(a(t,n)+(p?t.y0:0)),s(u(t,n))+s.rangeBand()*(p?e.length/2:t.series+.5)/e.length],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),w.elementMouseout({value:a(t,n),point:t,series:e[t.series],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("click",function(t,n){w.elementClick({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t,n))+s.rangeBand()*(p?e.length/2:t.series+.5)/e.length,o(a(t,n)+(p?t.y0:0))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}).on("dblclick",function(t,n){w.elementDb lClick({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t,n))+s.rangeBand()*(p?e.length/2:t.series+.5)/e.length,o(a(t,n)+(p?t.y0:0) -)],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}),_.append("text"),d&&!p?(M.select("text").attr("text-anchor",function(e,t){return a(e,t)<0?"end":"start"}).attr("y",s.rangeBand()/(e.length*2)).attr("dy",".32em").text(function(e,t){return m(a(e,t))}),d3.transition(M).select("text").attr("x",function(e,t){return a(e,t)<0?-4:o(a(e,t))-o(0)+4})):M.selectAll("text").text(""),M.attr("class",function(e,t){return a(e,t)<0?"nv-bar negative":"nv-bar positive"}),c&&(h||(h=e.map(function(){return!0})),M.style("fill",function(e,t,n){return d3.rgb(c(e,t)).darker(h.map(function(e,t){return t}).filter(function(e,t){return!h[t]})[n]).toString()}).style("stroke",function(e,t,n){return d3.rgb(c(e,t)).darker(h.map(function(e,t){return t}).filter(function(e,t){return!h[t]})[n]).toString()})),p?d3.transition(M).attr("transform",function(e,t){return"translate("+o(e.y1)+","+s(u(e,t))+")"}).select("rect").attr("width",function(e,t){return Math.abs(o(a(e,t)+e.y0)-o(e.y0)) }).attr("height",s.rangeBand()):d3.transition(M).attr("transform",function(t,n){return"translate("+(a(t,n)<0?o(a(t,n)):o(0))+","+(t.series*s.rangeBand()/e.length+s(u(t,n)))+")"}).select("rect").attr("height",s.rangeBand()/e.length).attr("width",function(e,t){return Math.max(Math.abs(o(a(e,t))-o(0)),1)}),E=s.copy(),S=o.copy()}),x}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=Math.floor(Math.random()*1e4),s=d3.scale.ordinal(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=[0],l=e.utils.defaultColor(),c=null,h,p=!1,d=!1,v=60,m=d3.format(",.2f"),g=1200,y,b,w=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout"),E,S;return x.dispatch=w,x.x=function(e){return arguments.length?(u=e,x):u},x.y=function(e){return arguments.length?(a=e,x):a},x.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="unde fined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,x):t},x.width=function(e){return arguments.length?(n=e,x):n},x.height=function(e){return arguments.length?(r=e,x):r},x.xScale=function(e){return arguments.length?(s=e,x):s},x.yScale=function(e){return arguments.length?(o=e,x):o},x.xDomain=function(e){return arguments.length?(y=e,x):y},x.yDomain=function(e){return arguments.length?(b=e,x):b},x.forceY=function(e){return arguments.length?(f=e,x):f},x.stacked=function(e){return arguments.length?(p=e,x):p},x.color=function(t){return arguments.length?(l=e.utils.getColor(t),x):l},x.barColor=function(t){return arguments.length?(c=e.utils.getColor(t),x):c},x.disabled=function(e){return arguments.length?(h=e,x):h},x.id=function(e){return arguments.length?(i=e,x):i},x.delay=function(e){return arguments.length?(g=e,x):g},x.showValues=function(e){return arguments.length?(d=e,x):d},x.valueFormat=function(e){return arguments.length?(m=e,x):m},x.valuePadding=function(e ){return arguments.length?(v=e,x):v},x},e.models.multiBarHorizontalChart=function(){function x(e){return e.each(function(h){var d=d3.select(this),T=this,N=(u||parseInt(d.style("width"))||960)-o.left-o.right,C=(a||parseInt(d.style("height"))||400)-o.top-o.bottom;x.update=function(){d.transition().call(x)},x.container=this,g.disabled=h.map(function(e){return!!e.disabled});if(!y){var k;y={};for(k in g)g[k]instanceof Array?y[k]=g[k].slice(0):y[k]=g[k]}if(!h||!h.length||!h.filter(function(e){return e.values.length}).length){var L=d.selectAll(".nv-noData").data([b]);return L.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),L.attr("x",o.left+N/2).attr("y",o.top+C/2).text(function(e){return e}),x}d.selectAll(".nv-noData").remove(),v=t.xScale(),m=t.yScale();var A=d.selectAll("g.nv-wrap.nv-multiBarHorizontalChart").data([h]),O=A.enter().append("g").attr("class","nvd3 nv-wrap nv-multiBarHorizontalChart").append("g"),M=A.select("g"); O.append("g").attr("class","nv-x nv-axis"),O.append("g").attr("class","nv-y nv-axis"),O.append("g").attr("class","nv-barsWrap"),O.append("g").attr("class","nv-legendWrap"),O.append("g").attr("class","nv-controlsWrap"),c&&(i.width(N-E()),t.barColor()&&h.forEach(function(e,t){e.color=d3.rgb("#ccc").darker(t*1.5).toString()}),M.select(".nv-legendWrap").datum(h).call(i),o.top!=i.height()&&(o.top=i.height(),C=(a||parseInt(d.style("height"))||400)-o.top-o.bottom),M.select(".nv-legendWrap").attr("transform","translate("+E()+","+ -o.top+")"));if(l){var _=[{key:"Grouped",disabled:t.stacked()},{key:"Stacked",disabled:!t.stacked()}];s.width(E()).color(["#444","#444","#444"]),M.select(".nv-controlsWrap").datum(_).attr("transform","translate(0,"+ -o.top+")").call(s)}A.attr("transform","translate("+o.left+","+o.top+")"),t.disabled(h.map(function(e){return e.disabled})).width(N).height(C).color(h.map(function(e,t){return e.color||f(e,t)}).filter(function(e,t){return!h[t].disabled}));var D= M.select(".nv-barsWrap").datum(h.filter(function(e){return!e.disabled}));d3.transition(D).call(t),n.scale(v).ticks(C/24).tickSize(-N,0),d3.transition(M.select(".nv-x.nv-axis")).call(n);var P=M.select(".nv-x.nv-axis").selectAll("g");P.selectAll("line, text").style("opacity",1),r.scale(m).ticks(N/100).tickSize(-C,0),M.select(".nv-y.nv-axis").attr("transform","translate(0,"+C+")"),d3.transition(M.select(".nv-y.nv-axis")).call(r),i.dispatch.on("legendClick",function(e,t){e.disabled=!e.disabled,h.filter(function(e){return!e.disabled}).length||h.map(function(e){return e.disabled=!1,A.selectAll(".nv-series").classed("disabled",!1),e}),g.disabled=h.map(function(e){return!!e.disabled}),w.stateChange(g),x.update()}),i.dispatch.on("legendDblclick",function(e){h.forEach(function(e){e.disabled=!0}),e.disabled=!1,g.disabled=h.map(function(e){return!!e.disabled}),w.stateChange(g),x.update()}),s.dispatch.on("legendClick",function(e,n){if(!e.disabled)return;_=_.map(function(e){return e.disab led=!0,e}),e.disabled=!1;switch(e.key){case"Grouped":t.stacked(!1);break;case"Stacked":t.stacked(!0)}g.stacked=t.stacked(),w.stateChange(g),x.update()}),w.on("tooltipShow",function(e){p&&S(e,T.parentNode)}),w.on("changeState",function(n){typeof n.disabled!="undefined"&&(h.forEach(function(e,t){e.disabled=n.disabled[t]}),g.disabled=n.disabled),typeof n.stacked!="undefined"&&(t.stacked(n.stacked),g.stacked=n.stacked),e.call(x)})}),x}var t=e.models.multiBarHorizontal(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend().height(30),s=e.models.legend().height(30),o={top:30,right:20,bottom:50,left:60},u=null,a=null,f=e.utils.defaultColor(),l=!0,c=!0,h=!1,p=!0,d=function(e,t,n,r,i){return"<h3>"+e+" - "+t+"</h3>"+"<p>"+n+"</p>"},v,m,g={stacked:h},y=null,b="No Data Available.",w=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),E=function(){return l?180:0};t.stacked(h),n.orient("left").tickPadding(5).highlightZero(!1).showMaxMin(!1).tickFormat(function(e){retur n e}),r.orient("bottom").tickFormat(d3.format(",.1f"));var S=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=d(i.series.key,a,f,i,x);e.tooltip.show([o,u],l,i.value<0?"e":"w",null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+o.left,e.pos[1]+o.top],w.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){w.tooltipHide(e)}),w.on("tooltipHide",function(){p&&e.tooltip.cleanup()}),x.dispatch=w,x.multibar=t,x.legend=i,x.xAxis=n,x.yAxis=r,d3.rebind(x,t,"x","y","xDomain","yDomain","forceX","forceY","clipEdge","id","delay","showValues","valueFormat","stacked","barColor"),x.margin=function(e){return arguments.length?(o.top=typeof e.top!="undefined"?e.top:o.top,o.right=typeof e.right!="undefined"?e.right:o.right,o.bottom=typeof e.bottom!="undefined"?e.bottom:o.bottom,o.left=typeof e.left!="undefined"?e.left:o.left,x):o} ,x.width=function(e){return arguments.length?(u=e,x):u},x.height=function(e){return arguments.length?(a=e,x):a},x.color=function(t){return arguments.length?(f=e.utils.getColor(t),i.color(f),x):f},x.showControls=function(e){return arguments.length?(l=e,x):l},x.showLegend=function(e){return arguments.length?(c=e,x):c},x.tooltip=function(e){return arguments.length?(d=e,x):d},x.tooltips=function(e){return arguments.length?(p=e,x):p},x.tooltipContent=function(e){return arguments.length?(d=e,x):d},x.state=function(e){return arguments.length?(g=e,x):g},x.defaultState=function(e){return arguments.length?(y=e,x):y},x.noData=function(e){return arguments.length?(b=e,x):b},x},e.models.multiChart=function(){function T(e){return e.each(function(e){var u=d3.select(this),f=this;T.update=function(){u.transition().call(T)},T.container=this;var N=(r||parseInt(u.style("width"))||960)-t.left-t.right,C=(i||parseInt(u.style("height"))||400)-t.top-t.bottom,k=e.filter(function(e){return!e.disabled&& e.type=="line"&&e.yAxis==1}),L=e.filter(function(e){return!e.disabled&&e.type=="line"&&e.yAxis==2}),A=e.filter(function(e){return!e.disabled&&e.type=="bar"&&e.yAxis==1}),O=e.filter(function(e){return!e.disabled&&e.type=="bar"&&e.yAxis==2}),M=e.filter(function(e){return!e.disabled&&e.type=="area"&&e.yAxis==1}),_=e.filter(function(e){return!e.disabled&&e.type=="area"&&e.yAxis==2}),D=e.filter(function(e){return!e.disabled&&e.yAxis==1}).map(function(e){return e.values.map(function(e,t){return{x:e.x,y:e.y}})}),P=e.filter(function(e){return!e.disabled&&e.yAxis==2}).map(function(e){return e.values.map(function(e,t){return{x:e.x,y:e.y}})});a.domain(d3.extent(d3.merge(D.concat(P)),function(e){return e.x})).range([0,N]);var H=u.selectAll("g.wrap.multiChart").data([e]),B=H.enter().append("g").attr("class","wrap nvd3 multiChart").append("g");B.append("g").attr("class","x axis"),B.append("g").attr("class","y1 axis"),B.append("g").attr("class","y2 axis"),B.append("g").attr("class","lines1 Wrap"),B.append("g").attr("class","lines2Wrap"),B.append("g").attr("class","bars1Wrap"),B.append("g").attr("class","bars2Wrap"),B.append("g").attr("class","stack1Wrap"),B.append("g").attr("class","stack2Wrap"),B.append("g").attr("class","legendWrap");var j=H.select("g");s&&(E.width(N/2),j.select(".legendWrap").datum(e.map(function(e){return e.originalKey=e.originalKey===undefined?e.key:e.originalKey,e.key=e.originalKey+(e.yAxis==1?"":" (right axis)"),e})).call(E),t.top!=E.height()&&(t.top=E.height(),C=(i||parseInt(u.style("height"))||400)-t.top-t.bottom),j.select(".legendWrap").attr("transform","translate("+N/2+","+ -t.top+")")),h.width(N).height(C).interpolate("monotone").color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==1&&e[n].type=="line"})),p.width(N).height(C).interpolate("monotone").color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==2&&e[n].type =="line"})),d.width(N).height(C).color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==1&&e[n].type=="bar"})),v.width(N).height(C).color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==2&&e[n].type=="bar"})),m.width(N).height(C).color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==1&&e[n].type=="area"})),g.width(N).height(C).color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==2&&e[n].type=="area"})),j.attr("transform","translate("+t.left+","+t.top+")");var F=j.select(".lines1Wrap").datum(k),I=j.select(".bars1Wrap").datum(A),q=j.select(".stack1Wrap").datum(M),R=j.select(".lines2Wrap").datum(L),U=j.select(".bars2Wrap").datum(O),z=j.select(".stack2Wrap").datum(_),W=M.length?M.map(function(e){return e.values}).reduce(function(e,t){return e.map( function(e,n){return{x:e.x,y:e.y+t[n].y}})}).concat([{x:0,y:0}]):[],X=_.length?_.map(function(e){return e.values}).reduce(function(e,t){return e.map(function(e,n){return{x:e.x,y:e.y+t[n].y}})}).concat([{x:0,y:0}]):[];l.domain(d3.extent(d3.merge(D).concat(W),function(e){return e.y})).range([0,C]),c.domain(d3.extent(d3.merge(P).concat(X),function(e){return e.y})).range([0,C]),h.yDomain(l.domain()),d.yDomain(l.domain()),m.yDomain(l.domain()),p.yDomain(c.domain()),v.yDomain(c.domain()),g.yDomain(c.domain()),M.length&&d3.transition(q).call(m),_.length&&d3.transition(z).call(g),A.length&&d3.transition(I).call(d),O.length&&d3.transition(U).call(v),k.length&&d3.transition(F).call(h),L.length&&d3.transition(R).call(p),y.ticks(N/100).tickSize(-C,0),j.select(".x.axis").attr("transform","translate(0,"+C+")"),d3.transition(j.select(".x.axis")).call(y),b.ticks(C/36).tickSize(-N,0),d3.transition(j.select(".y1.axis")).call(b),w.ticks(C/36).tickSize(-N,0),d3.transition(j.select(".y2.axis")). call(w),j.select(".y2.axis").style("opacity",P.length?1:0).attr("transform","translate("+a.range()[1]+",0)"),E.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,H.selectAll(".series").classed("disabled",!1),e}),T.update()}),S.on("tooltipShow",function(e){o&&x(e,f.parentNode)})}),T}var t={top:30,right:20,bottom:50,left:60},n=d3.scale.category20().range(),r=null,i=null,s=!0,o=!0,u=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},a,f,a=d3.scale.linear(),l=d3.scale.linear(),c=d3.scale.linear(),h=e.models.line().yScale(l),p=e.models.line().yScale(c),d=e.models.multiBar().stacked(!1).yScale(l),v=e.models.multiBar().stacked(!1).yScale(c),m=e.models.stackedArea().yScale(l),g=e.models.stackedArea().yScale(c),y=e.models.axis().scale(a).orient("bottom").tickPadding(5),b=e.models.axis().scale(l).orient("left"),w=e.models.axis().scale(c).orient("right"),E=e.models.legen d().height(30),S=d3.dispatch("tooltipShow","tooltipHide"),x=function(t,n){var r=t.pos[0]+(n.offsetLeft||0),i=t.pos[1]+(n.offsetTop||0),s=y.tickFormat()(h.x()(t.point,t.pointIndex)),o=(t.series.yAxis==2?w:b).tickFormat()(h.y()(t.point,t.pointIndex)),a=u(t.series.key,s,o,t,T);e.tooltip.show([r,i],a,undefined,undefined,n.offsetParent)};return h.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),h.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),p.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),p.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),d.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),d.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),v.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltip Show(e)}),v.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),m.dispatch.on("tooltipShow",function(e){if(!Math.round(m.y()(e.point)*100))return setTimeout(function(){d3.selectAll(".point.hover").classed("hover",!1)},0),!1;e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),m.dispatch.on("tooltipHide",function(e){S.tooltipHide(e)}),g.dispatch.on("tooltipShow",function(e){if(!Math.round(g.y()(e.point)*100))return setTimeout(function(){d3.selectAll(".point.hover").classed("hover",!1)},0),!1;e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),g.dispatch.on("tooltipHide",function(e){S.tooltipHide(e)}),h.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),h.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),p.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),p.dispatch.on("elementMouseout.tooltip",function(e){S.tooltip Hide(e)}),S.on("tooltipHide",function(){o&&e.tooltip.cleanup()}),T.dispatch=S,T.lines1=h,T.lines2=p,T.bars1=d,T.bars2=v,T.stack1=m,T.stack2=g,T.xAxis=y,T.yAxis1=b,T.yAxis2=w,T.x=function(e){return arguments.length?(getX=e,h.x(e),d.x(e),T):getX},T.y=function(e){return arguments.length?(getY=e,h.y(e),d.y(e),T):getY},T.margin=function(e){return arguments.length?(t=e,T):t},T.width=function(e){return arguments.length?(r=e,T):r},T.height=function(e){return arguments.length?(i=e,T):i},T.color=function(e){return arguments.length?(n=e,E.color(e),T):n},T.showLegend=function(e){return arguments.length?(s=e,T):s},T.tooltips=function(e){return arguments.length?(o=e,T):o},T.tooltipContent=function(e){return arguments.length?(u=e,T):u},T},e.models.ohlcBar=function(){function E(e){return e.each(function(e){var g=n-t.left-t.right,E=r-t.top-t.bottom,S=d3.select(this);s.domain(y||d3.extent(e[0].values.map(u).concat(p))),v?s.range([g*.5/e[0].values.length,g*(e[0].values.length-.5)/e[0].values.l ength]):s.range([0,g]),o.domain(b||[d3.min(e[0].values.map(h).concat(d)),d3.max(e[0].values.map(c).concat(d))]).range([E,0]);if(s.domain()[0]===s.domain()[1]||o.domain()[0]===o.domain()[1])singlePoint=!0;s.domain()[0]===s.domain()[1]&&(s.domain()[0]?s.domain([s.domain()[0]-s.domain()[0]*.01,s.domain()[1]+s.domain()[1]*.01]):s.domain([-1,1])),o.domain()[0]===o.domain()[1]&&(o.domain()[0]?o.domain([o.domain()[0]+o.domain()[0]*.01,o.domain()[1]-o.domain()[1]*.01]):o.domain([-1,1]));var T=d3.select(this).selectAll("g.nv-wrap.nv-ohlcBar").data([e[0].values]),N=T.enter().append("g").attr("class","nvd3 nv-wrap nv-ohlcBar"),C=N.append("defs"),k=N.append("g"),L=T.select("g");k.append("g").attr("class","nv-ticks"),T.attr("transform","translate("+t.left+","+t.top+")"),S.on("click",function(e,t){w.chartClick({data:e,index:t,pos:d3.event,id:i})}),C.append("clipPath").attr("id","nv-chart-clip-path-"+i).append("rect"),T.select("#nv-chart-clip-path-"+i+" rect").attr("width",g).attr("height" ,E),L.attr("clip-path",m?"url(#nv-chart-clip-path-"+i+")":"");var A=T.select(".nv-ticks").selectAll(".nv-tick").data(function(e){return e});A.exit().remove();var O=A.enter().append("path").attr("class",function(e,t,n){return(f(e,t)>l(e,t)?"nv-tick negative":"nv-tick positive")+" nv-tick-"+n+"-"+t}).attr("d",function(t,n){var r=g/e[0].values.length*.9;return"m0,0l0,"+(o(f(t,n))-o(c(t,n)))+"l"+ -r/2+",0l"+r/2+",0l0,"+(o(h(t,n))-o(f(t,n)))+"l0,"+(o(l(t,n))-o(h(t,n)))+"l"+r/2+",0l"+ -r/2+",0z"}).attr("transform",function(e,t){return"translate("+s(u(e,t))+","+o(c(e,t))+")"}).on("mouseover",function(t,n){d3.select(this).classed("hover",!0),w.elementMouseover({point:t,series:e[0],pos:[s(u(t,n)),o(a(t,n))],pointIndex:n,seriesIndex:0,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),w.elementMouseout({point:t,series:e[0],pointIndex:n,seriesIndex:0,e:d3.event})}).on("click",function(e,t){w.elementClick({value:a(e,t),data:e,index:t,pos:[s(u(e,t)),o(a(e,t))] ,e:d3.event,id:i}),d3.event.stopPropagation()}).on("dblclick",function(e,t){w.elementDblClick({value:a(e,t),data:e,index:t,pos:[s(u(e,t)),o(a(e,t))],e:d3.event,id:i}),d3.event.stopPropagation()});A.attr("class",function(e,t,n){return(f(e,t)>l(e,t)?"nv-tick negative":"nv-tick positive")+" nv-tick-"+n+"-"+t}),d3.transition(A).attr("transform",function(e,t){return"translate("+s(u(e,t))+","+o(c(e,t))+")"}).attr("d",function(t,n){var r=g/e[0].values.length*.9;return"m0,0l0,"+(o(f(t,n))-o(c(t,n)))+"l"+ -r/2+",0l"+r/2+",0l0,"+(o(h(t,n))-o(f(t,n)))+"l0,"+(o(l(t,n))-o(h(t,n)))+"l"+r/2+",0l"+ -r/2+",0z"})}),E}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=Math.floor(Math.random()*1e4),s=d3.scale.linear(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=function(e){return e.open},l=function(e){return e.close},c=function(e){return e.high},h=function(e){return e.low},p=[],d=[],v=!1,m=!0,g=e.utils.defaultColor(),y,b,w=d3.dispatch("chartClick","elementClick"," elementDblClick","elementMouseover","elementMouseout");return E.dispatch=w,E.x=function(e){return arguments.length?(u=e,E):u},E.y=function(e){return arguments.length?(a=e,E):a},E.open=function(e){return arguments.length?(f=e,E):f},E.close=function(e){return arguments.length?(l=e,E):l},E.high=function(e){return arguments.length?(c=e,E):c},E.low=function(e){return arguments.length?(h=e,E):h},E.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,E):t},E.width=function(e){return arguments.length?(n=e,E):n},E.height=function(e){return arguments.length?(r=e,E):r},E.xScale=function(e){return arguments.length?(s=e,E):s},E.yScale=function(e){return arguments.length?(o=e,E):o},E.xDomain=function(e){return arguments.length?(y=e,E):y},E.yDomain=function(e){return arguments.length?(b=e,E):b},E.force X=function(e){return arguments.length?(p=e,E):p},E.forceY=function(e){return arguments.length?(d=e,E):d},E.padData=function(e){return arguments.length?(v=e,E):v},E.clipEdge=function(e){return arguments.length?(m=e,E):m},E.color=function(t){return arguments.length?(g=e.utils.getColor(t),E):g},E.id=function(e){return arguments.length?(i=e,E):i},E},e.models.pie=function(){function E(e){return e.each(function(e){function P(e){var t=(e.startAngle+e.endAngle)*90/Math.PI-90;return t>90?t-180:t}function H(e){e.endAngle=isNaN(e.endAngle)?0:e.endAngle,e.startAngle=isNaN(e.startAngle)?0:e.startAngle,v||(e.innerRadius=0);var t=d3.interpolate(this._current,e);return this._current=t(0),function(e){return L(t(e))}}function B(e){e.innerRadius=0;var t=d3.interpolate({startAngle:0,endAngle:0},e);return function(e){return L(t(e))}}var u=n-t.left-t.right,l=r-t.top-t.bottom,E=Math.min(u,l)/2,S=E-E/5,x=d3.select(this),T=x.selectAll(".nv-wrap.nv-pie").data([i(e[0])]),N=T.enter().append("g").attr(" class","nvd3 nv-wrap nv-pie nv-chart-"+a),C=N.append("g"),k=T.select("g");C.append("g").attr("class","nv-pie"),T.attr("transform","translate("+t.left+","+t.top+")"),k.select(".nv-pie").attr("transform","translate("+u/2+","+l/2+")"),x.on("click",function(e,t){w.chartClick({data:e,index:t,pos:d3.event,id:a})});var L=d3.svg.arc().outerRadius(S);g&&L.startAngle(g),y&&L.endAngle(y),v&&L.innerRadius(E*b);var A=d3.layout.pie().sort(null).value(function(e){return e.disabled?0:o(e)}),O=T.select(".nv-pie").selectAll(".nv-slice").data(A);O.exit().remove();var M=O.enter().append("g").attr("class","nv-slice").on("mouseover",function(e,t){d3.select(this).classed("hover",!0),w.elementMouseover({label:s(e.data),value:o(e.data),point:e.data,pointIndex:t,pos:[d3.event.pageX,d3.event.pageY],id:a})}).on("mouseout",function(e,t){d3.select(this).classed("hover",!1),w.elementMouseout({label:s(e.data),value:o(e.data),point:e.data,index:t,id:a})}).on("click",function(e,t){w.elementClick({label:s(e.d ata),value:o(e.data),point:e.data,index:t,pos:d3.event,id:a}),d3.event.stopPropagation()}).on("dblclick",function(e,t){w.elementDblClick({label:s(e.data),value:o(e.data),point:e.data,index:t,pos:d3.event,id:a}),d3.event.stopPropagation()});O.attr("fill",function(e,t){return f(e,t)}).attr("stroke",function(e,t){return f(e,t)});var _=M.append("path").each(function(e){this._current=e});d3.transition(O.select("path")).attr("d",L).attrTween("d",H);if(c){var D=d3.svg.arc().innerRadius(0);h&&(D=L),p&&(D=d3.svg.arc().outerRadius(L.outerRadius())),M.append("g").classed("nv-label",!0).each(function(e,t){var n=d3.select(this);n.attr("transform",function(e){if(m){e.outerRadius=S+10,e.innerRadius=S+15;var t=(e.startAngle+e.endAngle)/2*(180/Math.PI);return(e.startAngle+e.endAngle)/2<Math.PI?t-=90:t+=90,"translate("+D.centroid(e)+") rotate("+t+")"}return e.outerRadius=E+10,e.innerRadius=E+15,"translate("+D.centroid(e)+")"}),n.append("rect").style("stroke","#fff").style("fill","#fff").attr( "rx",3).attr("ry",3),n.append("text").style("text-anchor",m?(e.startAngle+e.endAngle)/2<Math.PI?"start":"end":"middle").style("fill","#000")}),O.select(".nv-label").transition().attr("transform",function(e){if(m){e.outerRadius=S+10,e.innerRadius=S+15;var t=(e.startAngle+e.endAngle)/2*(180/Math.PI);return(e.startAngle+e.endAngle)/2<Math.PI?t-=90:t+=90,"translate("+D.centroid(e)+") rotate("+t+")"}return e.outerRadius=E+10,e.innerRadius=E+15,"translate("+D.centroid(e)+")"}),O.each(function(e,t){var n=d3.select(this);n.select(".nv-label text").style("text-anchor",m?(e.startAngle+e.endAngle)/2<Math.PI?"start":"end":"middle").text(function(e,t){var n=(e.endAngle-e.startAngle)/(2*Math.PI);return e.value&&n>d?s(e.data):""});var r=n.select("text").node().getBBox();n.select(".nv-label rect").attr("width",r.width+10).attr("height",r.height+10).attr("transform",function(){return"translate("+[r.x-5,r.y-5]+")"})})}}),E}var t={top:0,right:0,bottom:0,left:0},n=500,r=500,i=function(e){return e.values},s=function(e){return e.x},o=function(e){return e.y},u=function(e){return e.description},a=Math.floor(Math.random()*1e4),f=e.utils.defaultColor(),l=d3.format(",.2f"),c=!0,h=!0,p=!1,d=.02,v=!1,m=!1,g=!1,y=!1,b=.5,w=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout");return E.dispatch=w,E.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,E):t},E.width=function(e){return arguments.length?(n=e,E):n},E.height=function(e){return arguments.length?(r=e,E):r},E.values=function(e){return arguments.length?(i=e,E):i},E.x=function(e){return arguments.length?(s=e,E):s},E.y=function(e){return arguments.length?(o=d3.functor(e),E):o},E.description=function(e){return arguments.length?(u=e,E):u},E.showLabels=function(e){return arguments.length?(c=e,E ):c},E.labelSunbeamLayout=function(e){return arguments.length?(m=e,E):m},E.donutLabelsOutside=function(e){return arguments.length?(p=e,E):p},E.pieLabelsOutside=function(e){return arguments.length?(h=e,E):h},E.donut=function(e){return arguments.length?(v=e,E):v},E.donutRatio=function(e){return arguments.length?(b=e,E):b},E.startAngle=function(e){return arguments.length?(g=e,E):g},E.endAngle=function(e){return arguments.length?(y=e,E):y},E.id=function(e){return arguments.length?(a=e,E):a},E.color=function(t){return arguments.length?(f=e.utils.getColor(t),E):f},E.valueFormat=function(e){return arguments.length?(l=e,E):l},E.labelThreshold=function(e){return arguments.length?(d=e,E):d},E},e.models.pieChart=function(){function v(e){return e.each(function(e){var u=d3.select(this),a=this,f=(i||parseInt(u.style("width"))||960)-r.left-r.right,d=(s||parseInt(u.style("height"))||400)-r.top-r.bottom;v.update=function(){u.transition().call(v)},v.container=this,l.disabled=e[0].map(function (e){return!!e.disabled});if(!c){var m;c={};for(m in l)l[m]instanceof Array?c[m]=l[m].slice(0):c[m]=l[m]}if(!e[0]||!e[0].length){var g=u.selectAll(".nv-noData").data([h]);return g.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),g.attr("x",r.left+f/2).attr("y",r.top+d/2).text(function(e){return e}),v}u.selectAll(".nv-noData").remove();var y=u.selectAll("g.nv-wrap.nv-pieChart").data([e]),b=y.enter().append("g").attr("class","nvd3 nv-wrap nv-pieChart").append("g"),w=y.select("g");b.append("g").attr("class","nv-pieWrap"),b.append("g").attr("class","nv-legendWrap"),o&&(n.width(f).key(t.x()),y.select(".nv-legendWrap").datum(t.values()(e[0])).call(n),r.top!=n.height()&&(r.top=n.height(),d=(s||parseInt(u.style("height"))||400)-r.top-r.bottom),y.select(".nv-legendWrap").attr("transform","translate(0,"+ -r.top+")")),y.attr("transform","translate("+r.left+","+r.top+")"),t.width(f).height(d);var E=w.select(".nv-pieWrap").datum(e);d3. transition(E).call(t),n.dispatch.on("legendClick",function(n,r,i){n.disabled=!n.disabled,t.values()(e[0]).filter(function(e){return!e.disabled}).length||t.values()(e[0]).map(function(e){return e.disabled=!1,y.selectAll(".nv-series").classed("disabled",!1),e}),l.disabled=e[0].map(function(e){return!!e.disabled}),p.stateChange(l),v.update()}),t.dispatch.on("elementMouseout.tooltip",function(e){p.tooltipHide(e)}),p.on("changeState",function(t){typeof t.disabled!="undefined"&&(e[0].forEach(function(e,n){e.disabled=t.disabled[n]}),l.disabled=t.disabled),v.update()})}),v}var t=e.models.pie(),n=e.models.legend(),r={top:30,right:20,bottom:20,left:20},i=null,s=null,o=!0,u=e.utils.defaultColor(),a=!0,f=function(e,t,n,r){return"<h3>"+e+"</h3>"+"<p>"+t+"</p>"},l={},c=null,h="No Data Available.",p=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),d=function(n,r){var i=t.description()(n.point)||t.x()(n.point),s=n.pos[0]+(r&&r.offsetLeft||0),o=n.pos[1]+(r&&r.offsetTop||0 ),u=t.valueFormat()(t.y()(n.point)),a=f(i,u,n,v);e.tooltip.show([s,o],a,n.value<0?"n":"s",null,r)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+r.left,e.pos[1]+r.top],p.tooltipShow(e)}),p.on("tooltipShow",function(e){a&&d(e)}),p.on("tooltipHide",function(){a&&e.tooltip.cleanup()}),v.legend=n,v.dispatch=p,v.pie=t,d3.rebind(v,t,"valueFormat","values","x","y","description","id","showLabels","donutLabelsOutside","pieLabelsOutside","donut","donutRatio","labelThreshold"),v.margin=function(e){return arguments.length?(r.top=typeof e.top!="undefined"?e.top:r.top,r.right=typeof e.right!="undefined"?e.right:r.right,r.bottom=typeof e.bottom!="undefined"?e.bottom:r.bottom,r.left=typeof e.left!="undefined"?e.left:r.left,v):r},v.width=function(e){return arguments.length?(i=e,v):i},v.height=function(e){return arguments.length?(s=e,v):s},v.color=function(r){return arguments.length?(u=e.utils.getColor(r),n.color(u),t.color(u),v):u},v.showLegend=function(e){retur n arguments.length?(o=e,v):o},v.tooltips=function(e){return arguments.length?(a=e,v):a},v.tooltipContent=function(e){return arguments.length?(f=e,v):f},v.state=function(e){return arguments.length?(l=e,v):l},v.defaultState=function(e){return arguments.length?(c=e,v):c},v.noData=function(e){return arguments.length?(h=e,v):h},v},e.models.scatter=function(){function j(e){return e.each(function(e){function $(){if(!g)return!1;var i,a=d3.merge(e.map(function(e,t){return e.values.map(function(e,n){var r=f(e,n)+Math.random()*1e-7,i=l(e,n)+Math.random()*1e-7;return[o(r),u(i),t,n,e]}).filter(function(e,t){return b(e[4],t)})}));if(M===!0){if(x){var c=R.select("defs").selectAll(".nv-point-clips").data([s]).enter();c.append("clipPath").attr("class","nv-point-clips").attr("id","nv-points-clip-"+s);var h=R.select("#nv-points-clip-"+s).selectAll("circle").data(a);h.enter().append("circle").attr("r",T),h.exit().remove(),h.attr("cx",function(e){return e[0]}).attr("cy",function(e){return e[1]}) ,R.select(".nv-point-paths").attr("clip-path","url(#nv-points-clip-"+s+")")}a.length&&(a.push([o.range()[0]-20,u.range()[0]-20,null,null]),a.push([o.range()[1]+20,u.range()[1]+20,null,null]),a.push([o.range()[0]-20,u.range()[0]+20,null,null]),a.push([o.range()[1]+20,u.range()[1]-20,null,null]));var p=d3.geom.polygon([[-10,-10],[-10,r+10],[n+10,r+10],[n+10,-10]]),d=d3.geom.voronoi(a).map(function(e,t){return{data:p.clip(e),series:a[t][2],point:a[t][3]}}),v=R.select(".nv-point-paths").selectAll("path").data(d);v.enter().append("path").attr("class",function(e,t){return"nv-path-"+t}),v.exit().remove(),v.attr("d",function(e){return e.data.length===0?"M 0 0":"M"+e.data.join("L")+"Z"}),v.on("click",function(n){if(B)return 0;var r=e[n.series],i=r.values[n.point];O.elementClick({point:i,series:r,pos:[o(f(i,n.point))+t.left,u(l(i,n.point))+t.top],seriesIndex:n.series,pointIndex:n.point})}).on("mouseover",function(n){if(B)return 0;var r=e[n.series],i=r.values[n.point];O.elementMouseove r({point:i,series:r,pos:[o(f(i,n.point))+t.left,u(l(i,n.point))+t.top],seriesIndex:n.series,pointIndex:n.point})}).on("mouseout",function(t,n){if(B)return 0;var r=e[t.series],i=r.values[t.point];O.elementMouseout({point:i,series:r,seriesIndex:t.series,pointIndex:t.point})})}else R.select(".nv-groups").selectAll(".nv-group").selectAll(".nv-point").on("click",function(n,r){if(B||!e[n.series])return 0;var i=e[n.series],s=i.values[r];O.elementClick({point:s,series:i,pos:[o(f(s,r))+t.left,u(l(s,r))+t.top],seriesIndex:n.series,pointIndex:r})}).on("mouseover",function(n,r){if(B||!e[n.series])return 0;var i=e[n.series],s=i.values[r];O.elementMouseover({point:s,series:i,pos:[o(f(s,r))+t.left,u(l(s,r))+t.top],seriesIndex:n.series,pointIndex:r})}).on("mouseout",function(t,n){if(B||!e[t.series])return 0;var r=e[t.series],i=r.values[n];O.elementMouseout({point:i,series:r,seriesIndex:t.series,pointIndex:n})});B=!1}var j=n-t.left-t.right,F=r-t.top-t.bottom,I=d3.select(this);e=e.map(functio n(e,t){return e.values=e.values.map(function(e){return e.series=t,e}),e});var q=N&&C&&k?[]:d3.merge(e.map(function(e){return e.values -.map(function(e,t){return{x:f(e,t),y:l(e,t),size:c(e,t)}})}));o.domain(N||d3.extent(q.map(function(e){return e.x}).concat(d))),w&&e[0]?o.range([(j*E+j)/(2*e[0].values.length),j-j*(1+E)/(2*e[0].values.length)]):o.range([0,j]),u.domain(C||d3.extent(q.map(function(e){return e.y}).concat(v))).range([F,0]),a.domain(k||d3.extent(q.map(function(e){return e.size}).concat(m))).range(L||[16,256]);if(o.domain()[0]===o.domain()[1]||u.domain()[0]===u.domain()[1])A=!0;o.domain()[0]===o.domain()[1]&&(o.domain()[0]?o.domain([o.domain()[0]-o.domain()[0]*.01,o.domain()[1]+o.domain()[1]*.01]):o.domain([-1,1])),u.domain()[0]===u.domain()[1]&&(u.domain()[0]?u.domain([u.domain()[0]+u.domain()[0]*.01,u.domain()[1]-u.domain()[1]*.01]):u.domain([-1,1])),isNaN(o.domain()[0])&&o.domain([-1,1]),isNaN(u.domain()[0])&&u.domain([-1,1]),_=_||o,D=D||u,P=P||a;var R=I.selectAll("g.nv-wrap.nv-scatter").data([e]),U=R.enter().append("g").attr("class","nvd3 nv-wrap nv-scatter nv-chart-"+s+(A?" nv-single-point":"" )),W=U.append("defs"),X=U.append("g"),V=R.select("g");X.append("g").attr("class","nv-groups"),X.append("g").attr("class","nv-point-paths"),R.attr("transform","translate("+t.left+","+t.top+")"),W.append("clipPath").attr("id","nv-edge-clip-"+s).append("rect"),R.select("#nv-edge-clip-"+s+" rect").attr("width",j).attr("height",F),V.attr("clip-path",S?"url(#nv-edge-clip-"+s+")":""),B=!0;var J=R.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e){return e.key});J.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(J.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),J.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}),d3.transition(J).style("fill",function(e,t){return i(e,t)}).style("stroke",function(e,t){return i(e,t)}).style("stroke-opacity",1).style("fill-opacity",.5);if(p){var K=J.selectAll("circle.nv-point").data(function(e){return e. values},y);K.enter().append("circle").attr("cx",function(e,t){return _(f(e,t))}).attr("cy",function(e,t){return D(l(e,t))}).attr("r",function(e,t){return Math.sqrt(a(c(e,t))/Math.PI)}),K.exit().remove(),J.exit().selectAll("path.nv-point").transition().attr("cx",function(e,t){return o(f(e,t))}).attr("cy",function(e,t){return u(l(e,t))}).remove(),K.each(function(e,t){d3.select(this).classed("nv-point",!0).classed("nv-point-"+t,!0)}),K.transition().attr("cx",function(e,t){return o(f(e,t))}).attr("cy",function(e,t){return u(l(e,t))}).attr("r",function(e,t){return Math.sqrt(a(c(e,t))/Math.PI)})}else{var K=J.selectAll("path.nv-point").data(function(e){return e.values});K.enter().append("path").attr("transform",function(e,t){return"translate("+_(f(e,t))+","+D(l(e,t))+")"}).attr("d",d3.svg.symbol().type(h).size(function(e,t){return a(c(e,t))})),K.exit().remove(),d3.transition(J.exit().selectAll("path.nv-point")).attr("transform",function(e,t){return"translate("+o(f(e,t))+","+u(l(e,t ))+")"}).remove(),K.each(function(e,t){d3.select(this).classed("nv-point",!0).classed("nv-point-"+t,!0)}),K.transition().attr("transform",function(e,t){return"translate("+o(f(e,t))+","+u(l(e,t))+")"}).attr("d",d3.svg.symbol().type(h).size(function(e,t){return a(c(e,t))}))}clearTimeout(H),H=setTimeout($,300),_=o.copy(),D=u.copy(),P=a.copy()}),j}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=e.utils.defaultColor(),s=Math.floor(Math.random()*1e5),o=d3.scale.linear(),u=d3.scale.linear(),a=d3.scale.linear(),f=function(e){return e.x},l=function(e){return e.y},c=function(e){return e.size||1},h=function(e){return e.shape||"circle"},p=!0,d=[],v=[],m=[],g=!0,y=null,b=function(e){return!e.notActive},w=!1,E=.1,S=!1,x=!0,T=function(){return 25},N=null,C=null,k=null,L=null,A=!1,O=d3.dispatch("elementClick","elementMouseover","elementMouseout"),M=!0,_,D,P,H,B=!1;return O.on("elementMouseover.point",function(e){g&&d3.select(".nv-chart-"+s+" .nv-series-"+e.seriesIndex+" .nv-point-"+e.po intIndex).classed("hover",!0)}),O.on("elementMouseout.point",function(e){g&&d3.select(".nv-chart-"+s+" .nv-series-"+e.seriesIndex+" .nv-point-"+e.pointIndex).classed("hover",!1)}),j.dispatch=O,j.x=function(e){return arguments.length?(f=d3.functor(e),j):f},j.y=function(e){return arguments.length?(l=d3.functor(e),j):l},j.size=function(e){return arguments.length?(c=d3.functor(e),j):c},j.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,j):t},j.width=function(e){return arguments.length?(n=e,j):n},j.height=function(e){return arguments.length?(r=e,j):r},j.xScale=function(e){return arguments.length?(o=e,j):o},j.yScale=function(e){return arguments.length?(u=e,j):u},j.zScale=function(e){return arguments.length?(a=e,j):a},j.xDomain=function(e){return arguments.length?(N=e,j):N},j.yDomain=functi on(e){return arguments.length?(C=e,j):C},j.sizeDomain=function(e){return arguments.length?(k=e,j):k},j.sizeRange=function(e){return arguments.length?(L=e,j):L},j.forceX=function(e){return arguments.length?(d=e,j):d},j.forceY=function(e){return arguments.length?(v=e,j):v},j.forceSize=function(e){return arguments.length?(m=e,j):m},j.interactive=function(e){return arguments.length?(g=e,j):g},j.pointKey=function(e){return arguments.length?(y=e,j):y},j.pointActive=function(e){return arguments.length?(b=e,j):b},j.padData=function(e){return arguments.length?(w=e,j):w},j.padDataOuter=function(e){return arguments.length?(E=e,j):E},j.clipEdge=function(e){return arguments.length?(S=e,j):S},j.clipVoronoi=function(e){return arguments.length?(x=e,j):x},j.useVoronoi=function(e){return arguments.length?(M=e,M===!1&&(x=!1),j):M},j.clipRadius=function(e){return arguments.length?(T=e,j):T},j.color=function(t){return arguments.length?(i=e.utils.getColor(t),j):i},j.shape=function(e){return argum ents.length?(h=e,j):h},j.onlyCircles=function(e){return arguments.length?(p=e,j):p},j.id=function(e){return arguments.length?(s=e,j):s},j.singlePoint=function(e){return arguments.length?(A=e,j):A},j},e.models.scatterChart=function(){function P(e){return e.each(function(e){function W(){if(E)return R.select(".nv-point-paths").style("pointer-events","all"),!1;R.select(".nv-point-paths").style("pointer-events","none");var i=d3.mouse(this);h.distortion(w).focus(i[0]),p.distortion(w).focus(i[1]),R.select(".nv-scatterWrap").call(t),R.select(".nv-x.nv-axis").call(n),R.select(".nv-y.nv-axis").call(r),R.select(".nv-distributionX").datum(e.filter(function(e){return!e.disabled})).call(o),R.select(".nv-distributionY").datum(e.filter(function(e){return!e.disabled})).call(u)}var x=d3.select(this),T=this,N=(f||parseInt(x.style("width"))||960)-a.left-a.right,H=(l||parseInt(x.style("height"))||400)-a.top-a.bottom;P.update=function(){x.transition().call(P)},C.disabled=e.map(function(e){return! !e.disabled});if(!k){var B;k={};for(B in C)C[B]instanceof Array?k[B]=C[B].slice(0):k[B]=C[B]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var j=x.selectAll(".nv-noData").data([A]);return j.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),j.attr("x",a.left+N/2).attr("y",a.top+H/2).text(function(e){return e}),P}x.selectAll(".nv-noData").remove(),O=O||h,M=M||p;var F=x.selectAll("g.nv-wrap.nv-scatterChart").data([e]),I=F.enter().append("g").attr("class","nvd3 nv-wrap nv-scatterChart nv-chart-"+t.id()),q=I.append("g"),R=F.select("g");q.append("rect").attr("class","nvd3 nv-background"),q.append("g").attr("class","nv-x nv-axis"),q.append("g").attr("class","nv-y nv-axis"),q.append("g").attr("class","nv-scatterWrap"),q.append("g").attr("class","nv-distWrap"),q.append("g").attr("class","nv-legendWrap"),q.append("g").attr("class","nv-controlsWrap"),y&&(i.width(N/2),F.select(".nv-legendWrap").datum(e).call (i),a.top!=i.height()&&(a.top=i.height(),H=(l||parseInt(x.style("height"))||400)-a.top-a.bottom),F.select(".nv-legendWrap").attr("transform","translate("+N/2+","+ -a.top+")")),b&&(s.width(180).color(["#444"]),R.select(".nv-controlsWrap").datum(D).attr("transform","translate(0,"+ -a.top+")").call(s)),F.attr("transform","translate("+a.left+","+a.top+")"),t.width(N).height(H).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})).xDomain(null).yDomain(null),F.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled})).call(t);if(d){var U=h.domain()[1]-h.domain()[0];t.xDomain([h.domain()[0]-d*U,h.domain()[1]+d*U])}if(v){var z=p.domain()[1]-p.domain()[0];t.yDomain([p.domain()[0]-v*z,p.domain()[1]+v*z])}F.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled})).call(t),n.scale(h).ticks(n.ticks()&&n.ticks().length?n.ticks():N/100).tickSize(-H,0),R.select(".nv-x.nv-axis").attr("transform","translate(0,"+p.range( )[0]+")").call(n),r.scale(p).ticks(r.ticks()&&r.ticks().length?r.ticks():H/36).tickSize(-N,0),R.select(".nv-y.nv-axis").call(r),m&&(o.getData(t.x()).scale(h).width(N).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),q.select(".nv-distWrap").append("g").attr("class","nv-distributionX"),R.select(".nv-distributionX").attr("transform","translate(0,"+p.range()[0]+")").datum(e.filter(function(e){return!e.disabled})).call(o)),g&&(u.getData(t.y()).scale(p).width(H).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),q.select(".nv-distWrap").append("g").attr("class","nv-distributionY"),R.select(".nv-distributionY").attr("transform","translate(-"+u.size()+",0)").datum(e.filter(function(e){return!e.disabled})).call(u)),d3.fisheye&&(R.select(".nv-background").attr("width",N).attr("height",H),R.select(".nv-background").on("mousemove",W),R.select(".nv-background").on("click",function(){E=!E}),t.disp atch.on("elementClick.freezeFisheye",function(){E=!E})),s.dispatch.on("legendClick",function(e,i){e.disabled=!e.disabled,w=e.disabled?0:2.5,R.select(".nv-background").style("pointer-events",e.disabled?"none":"all"),R.select(".nv-point-paths").style("pointer-events",e.disabled?"all":"none"),e.disabled?(h.distortion(w).focus(0),p.distortion(w).focus(0),R.select(".nv-scatterWrap").call(t),R.select(".nv-x.nv-axis").call(n),R.select(".nv-y.nv-axis").call(r)):E=!1,P.update()}),i.dispatch.on("legendClick",function(t,n,r){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,F.selectAll(".nv-series").classed("disabled",!1),e}),C.disabled=e.map(function(e){return!!e.disabled}),L.stateChange(C),P.update()}),i.dispatch.on("legendDblclick",function(t){e.forEach(function(e){e.disabled=!0}),t.disabled=!1,C.disabled=e.map(function(e){return!!e.disabled}),L.stateChange(C),P.update()}),t.dispatch.on("elementMouseover.tooltip",function( e){d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-distx-"+e.pointIndex).attr("y1",function(t,n){return e.pos[1]-H}),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-disty-"+e.pointIndex).attr("x2",e.pos[0]+o.size()),e.pos=[e.pos[0]+a.left,e.pos[1]+a.top],L.tooltipShow(e)}),L.on("tooltipShow",function(e){S&&_(e,T.parentNode)}),L.on("changeState",function(t){typeof t.disabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),C.disabled=t.disabled),P.update()}),O=h.copy(),M=p.copy()}),P}var t=e.models.scatter(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o=e.models.distribution(),u=e.models.distribution(),a={top:30,right:20,bottom:50,left:75},f=null,l=null,c=e.utils.defaultColor(),h=d3.fisheye?d3.fisheye.scale(d3.scale.linear).distortion(0):t.xScale(),p=d3.fisheye?d3.fisheye.scale(d3.scale.linear).distortion(0):t.yScale(),d=0,v=0,m=!1,g=!1,y=!0,b=!!d3.fisheye,w=0,E=!1,S=!0,x=function(e,t,n){return "<strong>"+t+"</strong>"},T=function(e,t,n){return"<strong>"+n+"</strong>"},N=null,C={},k=null,L=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),A="No Data Available.";t.xScale(h).yScale(p),n.orient("bottom").tickPadding(10),r.orient("left").tickPadding(10),o.axis("x"),u.axis("y");var O,M,_=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),f=i.pos[0]+(s.offsetLeft||0),l=p.range()[0]+a.top+(s.offsetTop||0),c=h.range()[0]+a.left+(s.offsetLeft||0),d=i.pos[1]+(s.offsetTop||0),v=n.tickFormat()(t.x()(i.point,i.pointIndex)),m=r.tickFormat()(t.y()(i.point,i.pointIndex));x!=null&&e.tooltip.show([f,l],x(i.series.key,v,m,i,P),"n",1,s,"x-nvtooltip"),T!=null&&e.tooltip.show([c,d],T(i.series.key,v,m,i,P),"e",1,s,"y-nvtooltip"),N!=null&&e.tooltip.show([o,u],N(i.series.key,v,m,i,P),i.value<0?"n":"s",null,s)},D=[{key:"Magnify",disabled:!0}];return t.dispatch.on("elementMouseout.tooltip",function(e){L.tooltipHide(e),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-distx-"+e.pointIndex).attr("y1",0),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-disty-"+e.pointIndex).attr("x2",u.size())}),L.on("tooltipHide",function(){S&&e.tooltip.cleanup()}),P.dispatch=L,P.scatter=t,P.legend=i,P.controls=s,P.xAxis=n,P.yAxis=r,P.distX=o,P.distY=u,d3.rebind(P,t,"id","interactive","pointActive","x","y","shape","size","xScale","yScale","zScale","xDomain","yDomain","sizeDomain","sizeRange","forceX","forceY","forceSize","clipVoronoi","clipRadius","useVoronoi"),P.margin=function(e){return arguments.length?(a.top=typeof e.top!="undefined"?e.top:a.top,a.right=typeof e.right!="undefined"?e.right:a.right,a.bottom=typeof e.bottom!="undefined"?e.bottom:a.bottom,a.left=typeof e.left!="undefined"?e.left:a.left,P):a},P.width=function(e){return arguments.length?(f=e,P):f},P.height=function(e){return arguments.length?(l=e,P):l},P.color=function(t){return arguments.length?(c=e.utils.getColor(t),i.color(c),o.color(c),u. color(c),P):c},P.showDistX=function(e){return arguments.length?(m=e,P):m},P.showDistY=function(e){return arguments.length?(g=e,P):g},P.showControls=function(e){return arguments.length?(b=e,P):b},P.showLegend=function(e){return arguments.length?(y=e,P):y},P.fisheye=function(e){return arguments.length?(w=e,P):w},P.xPadding=function(e){return arguments.length?(d=e,P):d},P.yPadding=function(e){return arguments.length?(v=e,P):v},P.tooltips=function(e){return arguments.length?(S=e,P):S},P.tooltipContent=function(e){return arguments.length?(N=e,P):N},P.tooltipXContent=function(e){return arguments.length?(x=e,P):x},P.tooltipYContent=function(e){return arguments.length?(T=e,P):T},P.state=function(e){return arguments.length?(C=e,P):C},P.defaultState=function(e){return arguments.length?(k=e,P):k},P.noData=function(e){return arguments.length?(A=e,P):A},P},e.models.scatterPlusLineChart=function(){function _(e){return e.each(function(e){function U(){if(b)return I.select(".nv-point-paths") .style("pointer-events","all"),!1;I.select(".nv-point-paths").style("pointer-events","none");var i=d3.mouse(this);h.distortion(y).focus(i[0]),p.distortion(y).focus(i[1]),I.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled})).call(t),I.select(".nv-x.nv-axis").call(n),I.select(".nv-y.nv-axis").call(r),I.select(".nv-distributionX").datum(e.filter(function(e){return!e.disabled})).call(o),I.select(".nv-distributionY").datum(e.filter(function(e){return!e.disabled})).call(u)}var E=d3.select(this),S=this,x=(f||parseInt(E.style("width"))||960)-a.left-a.right,D=(l||parseInt(E.style("height"))||400)-a.top-a.bottom;_.update=function(){E.transition().call(_)},_.container=this,T.disabled=e.map(function(e){return!!e.disabled});if(!N){var P;N={};for(P in T)T[P]instanceof Array?N[P]=T[P].slice(0):N[P]=T[P]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var H=E.selectAll(".nv-noData").data([k]);return H.enter().append("text").attr("class","nvd3 n v-noData").attr("dy","-.7em").style("text-anchor","middle"),H.attr("x",a.left+x/2).attr("y",a.top+D/2).text(function(e){return e}),_}E.selectAll(".nv-noData").remove(),h=t.xScale(),p=t.yScale(),L=L||h,A=A||p;var B=E.selectAll("g.nv-wrap.nv-scatterChart").data([e]),j=B.enter().append("g").attr("class","nvd3 nv-wrap nv-scatterChart nv-chart-"+t.id()),F=j.append("g"),I=B.select("g");F.append("rect").attr("class","nvd3 nv-background"),F.append("g").attr("class","nv-x nv-axis"),F.append("g").attr("class","nv-y nv-axis"),F.append("g").attr("class","nv-scatterWrap"),F.append("g").attr("class","nv-regressionLinesWrap"),F.append("g").attr("class","nv-distWrap"),F.append("g").attr("class","nv-legendWrap"),F.append("g").attr("class","nv-controlsWrap"),B.attr("transform","translate("+a.left+","+a.top+")"),m&&(i.width(x/2),B.select(".nv-legendWrap").datum(e).call(i),a.top!=i.height()&&(a.top=i.height(),D=(l||parseInt(E.style("height"))||400)-a.top-a.bottom),B.select(".nv-legendWrap").att r("transform","translate("+x/2+","+ -a.top+")")),g&&(s.width(180).color(["#444"]),I.select(".nv-controlsWrap").datum(M).attr("transform","translate(0,"+ -a.top+")").call(s)),t.width(x).height(D).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),B.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled})).call(t),B.select(".nv-regressionLinesWrap").attr("clip-path","url(#nv-edge-clip-"+t.id()+")");var q=B.select(".nv-regressionLinesWrap").selectAll(".nv-regLines").data(function(e){return e}),R=q.enter().append("g").attr("class","nv-regLines").append("line").attr("class","nv-regLine").style("stroke-opacity",0);q.selectAll(".nv-regLines line").attr("x1",h.range()[0]).attr("x2",h.range()[1]).attr("y1",function(e,t){return p(h.domain()[0]*e.slope+e.intercept)}).attr("y2",function(e,t){return p(h.domain()[1]*e.slope+e.intercept)}).style("stroke",function(e,t,n){return c(e,n)}).style("stroke-opacity",function(e,t){return e.disabled||typeof e.slope=="undefined"||typeof e.intercept=="undefined"?0:1}),n.scale(h).ticks(n.ticks()?n.ticks():x/100).tickSize(-D,0),I.select(".nv-x.nv-axis").attr("transform","translate(0,"+p.range()[0]+")").call(n),r.scale(p).ticks(r.ticks()?r.ticks():D/36).tickSize(-x,0),I.select(".nv-y.nv-axis").call(r),d&&(o.getData(t.x()).scale(h).width(x).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),F.select(".nv-distWrap").append("g").attr("class","nv-distributionX"),I.select(".nv-distributionX").attr("transform","translate(0,"+p.range()[0]+")").datum(e.filter(function(e){return!e.disabled})).call(o)),v&&(u.getData(t.y()).scale(p).width(D).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),F.select(".nv-distWrap").append("g").attr("class","nv-distributionY"),I.select(".nv-distributionY").attr("transform","translate(-"+u.size()+",0)").datum(e.filter(function(e){return!e.disabled})).cal l(u)),d3.fisheye&&(I.select(".nv-background").attr("width",x).attr("height",D),I.select(".nv-background").on("mousemove",U),I.select(".nv-background").on("click",function(){b=!b}),t.dispatch.on("elementClick.freezeFisheye",function(){b=!b})),s.dispatch.on("legendClick",function(e,i){e.disabled=!e.disabled,y=e.disabled?0:2.5,I.select(".nv-background").style("pointer-events",e.disabled?"none":"all"),I.select(".nv-point-paths").style("pointer-events",e.disabled?"all":"none"),e.disabled?(h.distortion(y).focus(0),p.distortion(y).focus(0),I.select(".nv-scatterWrap").call(t),I.select(".nv-x.nv-axis").call(n),I.select(".nv-y.nv-axis").call(r)):b=!1,_.update()}),i.dispatch.on("legendClick",function(t,n,r){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,B.selectAll(".nv-series").classed("disabled",!1),e}),T.disabled=e.map(function(e){return!!e.disabled}),C.stateChange(T),_.update()}),i.dispatch.on("legendDblclick",function (t){e.forEach(function(e){e.disabled=!0}),t.disabled=!1,T.disabled=e.map(function(e){return!!e.disabled}),C.stateChange(T),_.update()}),t.dispatch.on("elementMouseover.tooltip",function(e){d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-distx-"+e.pointIndex).attr("y1",e.pos[1]-D),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-disty-"+e.pointIndex).attr("x2",e.pos[0]+o.size()),e.pos=[e.pos[0]+a.left,e.pos[1]+a.top],C.tooltipShow(e)}),C.on("tooltipShow",function(e){w&&O(e,S.parentNode)}),C.on("changeState",function(t){typeof t.disabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),T.disabled=t.disabled),_.update()}),L=h.copy(),A=p.copy()}),_}var t=e.models.scatter(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o=e.models.distribution(),u=e.models.distribution(),a={top:30,right:20,bottom:50,left:75},f=null,l=null,c=e.utils.defaultColor(),h=d3.fisheye?d3.fisheye.scale(d3.scale.linear).distortio n(0):t.xScale(),p=d3.fisheye?d3.fisheye.scale(d3.scale.linear).distortion(0):t.yScale(),d=!1,v=!1,m=!0,g=!!d3.fisheye,y=0,b=!1,w=!0,E=function(e,t,n){return"<strong>"+t+"</strong>"},S=function(e,t,n){return"<strong>"+n+"</strong>"},x=function(e,t,n,r){return"<h3>"+e+"</h3>"+"<p>"+r+"</p>"},T={},N=null,C=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),k="No Data Available.";t.xScale(h).yScale(p),n.orient("bottom").tickPadding(10),r.orient("left").tickPadding(10),o.axis("x"),u.axis("y");var L,A,O=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),f=i.pos[0]+(s.offsetLeft||0),l=p.range()[0]+a.top+(s.offsetTop||0),c=h.range()[0]+a.left+(s.offsetLeft||0),d=i.pos[1]+(s.offsetTop||0),v=n.tickFormat()(t.x()(i.point,i.pointIndex)),m=r.tickFormat()(t.y()(i.point,i.pointIndex));E!=null&&e.tooltip.show([f,l],E(i.series.key,v,m,i,_),"n",1,s,"x-nvtooltip"),S!=null&&e.tooltip.show([c,d],S(i.series.key,v,m,i,_),"e",1,s,"y-nvtooltip"),x!=null&&e.t ooltip.show([o,u],x(i.series.key,v,m,i.point.tooltip,i,_),i.value<0?"n":"s",null,s)},M=[{key:"Magnify",disabled:!0}];return t.dispatch.on("elementMouseout.tooltip",function(e){C.tooltipHide(e),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-distx-"+e.pointIndex).attr("y1",0),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-disty-"+e.pointIndex).attr("x2",u.size())}),C.on("tooltipHide",function(){w&&e.tooltip.cleanup()}),_.dispatch=C,_.scatter=t,_.legend=i,_.controls=s,_.xAxis=n,_.yAxis=r,_.distX=o,_.distY=u,d3.rebind(_,t,"id","interactive","pointActive","x","y","shape","size","xScale","yScale","zScale","xDomain","yDomain","sizeDomain","sizeRange","forceX","forceY","forceSize","clipVoronoi","clipRadius","useVoronoi"),_.margin=function(e){return arguments.length?(a.top=typeof e.top!="undefined"?e.top:a.top,a.right=typeof e.right!="undefined"?e.right:a.right,a.bottom=typeof e.bottom!="undefined"?e.bottom:a.bottom,a.left=typeof e.left!="undefined "?e.left:a.left,_):a},_.width=function(e){return arguments.length?(f=e,_):f},_.height=function(e){return arguments.length?(l=e,_):l},_.color=function(t){return arguments.length?(c=e.utils.getColor(t),i.color(c),o.color(c),u.color(c),_):c},_.showDistX=function(e){return arguments.length?(d=e,_):d},_.showDistY=function(e){return arguments.length?(v=e,_):v},_.showControls=function(e){return arguments.length?(g=e,_):g},_.showLegend=function(e){return arguments.length?(m=e,_):m},_.fisheye=function(e){return arguments.length?(y=e,_):y},_.tooltips=function(e){return arguments.length?(w=e,_):w},_.tooltipContent=function(e){return arguments.length?(x=e,_):x},_.tooltipXContent=function(e){return arguments.length?(E=e,_):E},_.tooltipYContent=function(e){return arguments.length?(S=e,_):S},_.state=function(e){return arguments.length?(T=e,_):T},_.defaultState=function(e){return arguments.length?(N=e,_):N},_.noData=function(e){return arguments.length?(k=e,_):k},_},e.models.sparkline=functi on(){function h(e){return e.each(function(e){var i=n-t.left-t.right,h=r-t.top-t.bottom,p=d3.select(this);s.domain(l||d3.extent(e,u)).range([0,i]),o.domain(c||d3.extent(e,a)).range([h,0]);var d=p.selectAll("g.nv-wrap.nv-sparkline").data([e]),v=d.enter().append("g").attr("class","nvd3 nv-wrap nv-sparkline"),m=v.append("g"),g=d.select("g");d.attr("transform","translate("+t.left+","+t.top+")");var b=d.selectAll("path").data(function(e){return[e]});b.enter().append("path"),b.exit().remove(),b.style("stroke",function(e,t){return e.color||f(e,t)}).attr("d",d3.svg.line().x(function(e,t){return s(u(e,t))}).y(function(e,t){return o(a(e,t))}));var w=d.selectAll("circle.nv-point").data(function(e){function n(t){if(t!=-1){var n=e[t];return n.pointIndex=t,n}return null}var t=e.map(function(e,t){return a(e,t)}),r=n(t.lastIndexOf(o.domain()[1])),i=n(t.indexOf(o.domain()[0])),s=n(t.length-1);return[i,r,s].filter(function(e){return e!=null})});w.enter().append("circle"),w.exit().remove(),w.at tr("cx",function(e,t){return s(u(e,e.pointIndex))}).attr("cy",function(e,t){return o(a(e,e.pointIndex))}).attr("r",2).attr("class",function(e,t){return u(e,e.pointIndex)==s.domain()[1]?"nv-point nv-currentValue":a(e,e.pointIndex)==o.domain()[0]?"nv-point nv-minValue":"nv-point nv-maxValue"})}),h}var t={top:2,right:0,bottom:2,left:0},n=400,r=32,i=!0,s=d3.scale.linear(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=e.utils.getColor(["#000"]),l,c;return h.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,h):t},h.width=function(e){return arguments.length?(n=e,h):n},h.height=function(e){return arguments.length?(r=e,h):r},h.x=function(e){return arguments.length?(u=d3.functor(e),h):u},h.y=function(e){return arguments.length?(a=d3.functor(e),h):a},h.xScale=function (e){return arguments.length?(s=e,h):s},h.yScale=function(e){return arguments.length?(o=e,h):o},h.xDomain=function(e){return arguments.length?(l=e,h):l},h.yDomain=function(e){return arguments.length?(c=e,h):c},h.animate=function(e){return arguments.length?(i=e,h):i},h.color=function(t){return arguments.length?(f=e.utils.getColor(t),h):f},h},e.models.sparklinePlus=function(){function v(e){return e.each(function(c){function O(){if(a)return;var e=C.selectAll(".nv-hoverValue").data(u),r=e.enter().append("g").attr("class","nv-hoverValue").style("stroke-opacity",0).style("fill-opacity",0);e.exit().transition().duration(250).style("stroke-opacity",0).style("fill-opacity",0).remove(),e.attr("transform",function(e){return"translate("+s(t.x()(c[e],e))+",0)"}).transition().duration(250).style("stroke-opacity",1).style("fill-opacity",1);if(!u.length)return;r.append("line").attr("x1",0).attr("y1",-n.top).attr("x2",0).attr("y2",b),r.append("text").attr("class","nv-xValue").attr("x",-6).att r("y",-n.top).attr("text-anchor","end").attr("dy",".9em"),C.select(".nv-hoverValue .nv-xValue").text(f(t.x()(c[u[0]],u[0]))),r.append("text").attr("class","nv-yValue").attr("x",6).attr("y",-n.top).attr("text-anchor","start").attr("dy",".9em"),C.select(".nv-hoverValue .nv-yValue").text(l(t.y()(c[u[0]],u[0])))}function M(){function r(e,n){var r=Math.abs(t.x()(e[0],0)-n),i=0;for(var s=0;s<e.length;s++)Math.abs(t.x()(e[s],s)-n)<r&&(r=Math.abs(t.x()(e[s],s)-n),i=s);return i}if(a)return;var e=d3.mouse(this)[0]-n.left;u=[r(c,Math.round(s.invert(e)))],O()}var m=d3.select(this),g=(r||parseInt(m.style("width"))||960)-n.left-n.right,b=(i||parseInt(m.style("height"))||400)-n.top-n.bottom;v.update=function(){v(e)},v.container=this;if(!c||!c.length){var w=m.selectAll(".nv-noData").data([d]);return w.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),w.attr("x",n.left+g/2).attr("y",n.top+b/2).text(function(e){return e}),v}m.selectAll(".nv -noData").remove();var E=t.y()(c[c.length-1],c.length-1);s=t.xScale(),o=t.yScale();var S=m.selectAll("g.nv-wrap.nv-sparklineplus").data([c]),T=S.enter().append("g").attr("class","nvd3 nv-wrap nv-sparklineplus"),N=T.append("g"),C=S.select("g");N.append("g").attr("class","nv-sparklineWrap"),N.append("g").attr("class","nv-valueWrap"),N.append("g").attr("class","nv-hoverArea"),S.attr("transform","translate("+n.left+","+n.top+")");var k=C.select(".nv-sparklineWrap");t.width(g).height(b),k.call(t);var L=C.select(".nv-valueWrap"),A=L.selectAll(".nv-currentValue").data([E]);A.enter().append("text").attr("class","nv-currentValue").attr("dx",p?-8:8).attr("dy",".9em").style("text-anchor",p?"end":"start"),A.attr("x",g+(p?n.right:0)).attr("y",h?function(e){return o(e)}:0).style("fill",t.color()(c[c.length-1],c.length-1)).text(l(E)),N.select(".nv-hoverArea").append("rect").on("mousemove",M).on("click",function(){a=!a}).on("mouseout",function(){u=[],O()}),C.select(".nv-hoverArea rect").att r("transform",function(e){return"translate("+ -n.left+","+ -n.top+")"}).attr("width",g+n.left+n.right).attr("height",b+n.top)}),v}var t=e.models.sparkline(),n={top:15,right:100,bottom:10,left:50},r=null,i=null,s,o,u=[],a=!1,f=d3.format(",r"),l=d3.format(",.2f"),c=!0,h=!0,p=!1,d="No Data Available.";return v.sparkline=t,d3.rebind(v,t,"x","y","xScale","yScale","color"),v.margin=function(e){return arguments.length?(n.top=typeof e.top!="undefined"?e.top:n.top,n.right=typeof e.right!="undefined"?e.right:n.right,n.bottom=typeof e.bottom!="undefined"?e.bottom:n.bottom,n.left=typeof e.left!="undefined"?e.left:n.left,v):n},v.width=function(e){return arguments.length?(r=e,v):r},v.height=function(e){return arguments.length?(i=e,v):i},v.xTickFormat=function(e){return arguments.length?(f=e,v):f},v.yTickFormat=function(e){return arguments.length?(l=e,v):l},v.showValue=function(e){return arguments.length?(c=e,v):c},v.alignValue=function(e){return arguments.length?(h=e,v):h},v.rightAlignVal ue=function(e){return arguments.length?(p=e,v):p},v.noData=function(e){return arguments.length?(d=e,v):d},v},e.models.stackedArea=function(){function g(e){return e.each(function(e){var a=n-t.left-t.right,g=r-t.top-t.bottom,b=d3.select(this);p=v.xScale(),d=v.yScale(),e=e.map(function(e,t){return e.values=e.values.map(function(t,n){return t.index=n,t.stackedY=e.disabled?0:u(t,n),t}),e}),e=d3.layout.stack().order(l).offset(f).values(function(e){return e.values}).x(o).y(function(e){return e.stackedY}).out(function(e,t,n){e.display={y:n,y0:t}})(e);var w=b.selectAll("g.nv-wrap.nv-stackedarea").data([e]),E=w.enter().append("g").attr("class","nvd3 nv-wrap nv-stackedarea"),S=E.append("defs"),T=E.append("g"),N=w.select("g");T.append("g").attr("class","nv-areaWrap"),T.append("g").attr("class","nv-scatterWrap"),w.attr("transform","translate("+t.left+","+t.top+")"),v.width(a).height(g).x(o).y(function(e){return e.display.y+e.display.y0}).forceY([0]).color(e.map(function(e,t){return e.col or||i(e,t)}).filter(function(t,n){return!e[n].disabled}));var C=N.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled}));C.call(v),S.append("clipPath").attr("id","nv-edge-clip-"+s).append("rect"),w.select("#nv-edge-clip-"+s+" rect").attr("width",a).attr("height",g),N.attr("clip-path",h?"url(#nv-edge-clip-"+s+")":"");var k=d3.svg.area().x(function(e,t){return p(o(e,t))}).y0(function(e){return d(e.display.y0)}).y1(function(e){return d(e.display.y+e.display.y0)}).interpolate(c),L=d3.svg.area().x(function(e,t){return p(o(e,t))}).y0(function(e){return d(e.display.y0)}).y1(function(e){return d(e.display.y0)}),A=N.select(".nv-areaWrap").selectAll("path.nv-area").data(function(e){return e});A.enter().append("path").attr("class",function(e,t){return"nv-area nv-area-"+t}).on("mouseover",function(e,t){d3.select(this).classed("hover",!0),m.areaMouseover({point:e,series:e.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:t})}).on("mouseout",function(e,t){d3.select(th is).classed("hover",!1),m.areaMouseout({point:e,series:e.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:t})}).on("click",function(e,t){d3.select(this).classed("hover",!1),m.areaClick({point:e,series:e.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:t})}),A.exit().attr("d",function(e,t){return L(e.values,t)}).remove(),A.style("fill",function(e,t){return e.color||i(e,t)}).style("stroke",function(e,t){return e.color||i(e,t)}),A.attr("d",function(e,t){return k(e.values,t)}),v.dispatch.on("elementMouseover.area",function(e){N.select(".nv-chart-"+s+" .nv-area-"+e.seriesIndex).classed("hover",!0)}),v.dispatch.on("elementMouseout.area",function(e){N.select(".nv-chart-"+s+" .nv-area-"+e.seriesIndex).classed("hover",!1)})}),g}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=e.utils.defaultColor(),s=Math.floor(Math.random()*1e5),o=function(e){return e.x},u=function(e){return e.y},a="stack",f="zero",l="default",c="linear",h=!1,p,d,v=e.models.scatter(),m=d3.dispatch("tooltipS how","tooltipHide","areaClick","areaMouseover","areaMouseout");return v.size(2.2).sizeDomain([2.2,2.2]),v.dispatch.on("elementClick.area" -,function(e){m.areaClick(e)}),v.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],m.tooltipShow(e)}),v.dispatch.on("elementMouseout.tooltip",function(e){m.tooltipHide(e)}),g.dispatch=m,g.scatter=v,d3.rebind(g,v,"interactive","size","xScale","yScale","zScale","xDomain","yDomain","sizeDomain","forceX","forceY","forceSize","clipVoronoi","clipRadius"),g.x=function(e){return arguments.length?(o=d3.functor(e),g):o},g.y=function(e){return arguments.length?(u=d3.functor(e),g):u},g.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,g):t},g.width=function(e){return arguments.length?(n=e,g):n},g.height=function(e){return arguments.length?(r=e,g):r},g.clipEdge=function(e){return arguments.length?(h=e,g):h},g.color=function(t){return arguments.length?(i=e.uti ls.getColor(t),g):i},g.offset=function(e){return arguments.length?(f=e,g):f},g.order=function(e){return arguments.length?(l=e,g):l},g.style=function(e){if(!arguments.length)return a;a=e;switch(a){case"stack":g.offset("zero"),g.order("default");break;case"stream":g.offset("wiggle"),g.order("inside-out");break;case"stream-center":g.offset("silhouette"),g.order("inside-out");break;case"expand":g.offset("expand"),g.order("default")}return g},g.interpolate=function(e){return arguments.length?(c=e,c):c},g},e.models.stackedAreaChart=function(){function x(e){return e.each(function(e){var f=d3.select(this),p=this,T=(u||parseInt(f.style("width"))||960)-o.left-o.right,N=(a||parseInt(f.style("height"))||400)-o.top-o.bottom;x.update=function(){f.transition().call(x)},x.container=this,g.disabled=e.map(function(e){return!!e.disabled});if(!y){var C;y={};for(C in g)g[C]instanceof Array?y[C]=g[C].slice(0):y[C]=g[C]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var k =f.selectAll(".nv-noData").data([b]);return k.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),k.attr("x",o.left+T/2).attr("y",o.top+N/2).text(function(e){return e}),x}f.selectAll(".nv-noData").remove(),d=t.xScale(),v=t.yScale();var L=f.selectAll("g.nv-wrap.nv-stackedAreaChart").data([e]),A=L.enter().append("g").attr("class","nvd3 nv-wrap nv-stackedAreaChart").append("g"),O=L.select("g");A.append("g").attr("class","nv-x nv-axis"),A.append("g").attr("class","nv-y nv-axis"),A.append("g").attr("class","nv-stackedWrap"),A.append("g").attr("class","nv-legendWrap"),A.append("g").attr("class","nv-controlsWrap"),c&&(i.width(T-E),O.select(".nv-legendWrap").datum(e).call(i),o.top!=i.height()&&(o.top=i.height(),N=(a||parseInt(f.style("height"))||400)-o.top-o.bottom),O.select(".nv-legendWrap").attr("transform","translate("+E+","+ -o.top+")"));if(l){var M=[{key:"Stacked",disabled:t.offset()!="zero"},{key:"Stream",disabled:t.offset()!= "wiggle"},{key:"Expanded",disabled:t.offset()!="expand"}];s.width(E).color(["#444","#444","#444"]),O.select(".nv-controlsWrap").datum(M).call(s),o.top!=Math.max(s.height(),i.height())&&(o.top=Math.max(s.height(),i.height()),N=(a||parseInt(f.style("height"))||400)-o.top-o.bottom),O.select(".nv-controlsWrap").attr("transform","translate(0,"+ -o.top+")")}L.attr("transform","translate("+o.left+","+o.top+")"),t.width(T).height(N);var _=O.select(".nv-stackedWrap").datum(e);_.call(t),n.scale(d).ticks(T/100).tickSize(-N,0),O.select(".nv-x.nv-axis").attr("transform","translate(0,"+N+")"),O.select(".nv-x.nv-axis").transition().duration(0).call(n),r.scale(v).ticks(t.offset()=="wiggle"?0:N/36).tickSize(-T,0).setTickFormat(t.offset()=="expand"?d3.format("%"):m),O.select(".nv-y.nv-axis").transition().duration(0).call(r),t.dispatch.on("areaClick.toggle",function(t){e.filter(function(e){return!e.disabled}).length===1?e=e.map(function(e){return e.disabled=!1,e}):e=e.map(function(e,n){return e.disabled=n!=t.seriesIndex,e}),g.disabled=e.map(function(e){return!!e.disabled}),w.stateChange(g),x.update()}),i.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,e}),g.disabled=e.map(function(e){return!!e.disabled}),w.stateChange(g),x.update()}),i.dispatch.on("legendDblclick",function(t){e.forEach(function(e){e.disabled=!0}),t.disabled=!1,g.disabled=e.map(function(e){return!!e.disabled}),w.stateChange(g),x.update()}),s.dispatch.on("legendClick",function(e,n){if(!e.disabled)return;M=M.map(function(e){return e.disabled=!0,e}),e.disabled=!1;switch(e.key){case"Stacked":t.style("stack");break;case"Stream":t.style("stream");break;case"Expanded":t.style("expand")}g.style=t.style(),w.stateChange(g),x.update()}),w.on("tooltipShow",function(e){h&&S(e,p.parentNode)}),w.on("changeState",function(n){typeof n.disabled!="undefined"&&(e.forEach(function(e,t){e.disabled=n.disabled[t]}),g.di sabled=n.disabled),typeof n.style!="undefined"&&t.style(n.style),x.update()})}),x}var t=e.models.stackedArea(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o={top:30,right:25,bottom:50,left:60},u=null,a=null,f=e.utils.defaultColor(),l=!0,c=!0,h=!0,p=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" on "+t+"</p>"},d,v,m=d3.format(",.2f"),g={style:t.style()},y=null,b="No Data Available.",w=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),E=250;n.orient("bottom").tickPadding(7),r.orient("left"),t.scatter.pointActive(function(e){return!!Math.round(t.y()(e)*100)});var S=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=p(i.series.key,a,f,i,x);e.tooltip.show([o,u],l,i.value<0?"n":"s",null,s)};return t.dispatch.on("tooltipShow",function(e){e.pos=[e.pos[0]+o.left,e.pos[1]+o.top],w.tooltipShow(e)}),t.dispatch.on(" tooltipHide",function(e){w.tooltipHide(e)}),w.on("tooltipHide",function(){h&&e.tooltip.cleanup()}),x.dispatch=w,x.stacked=t,x.legend=i,x.controls=s,x.xAxis=n,x.yAxis=r,d3.rebind(x,t,"x","y","size","xScale","yScale","xDomain","yDomain","sizeDomain","interactive","offset","order","style","clipEdge","forceX","forceY","forceSize","interpolate"),x.margin=function(e){return arguments.length?(o.top=typeof e.top!="undefined"?e.top:o.top,o.right=typeof e.right!="undefined"?e.right:o.right,o.bottom=typeof e.bottom!="undefined"?e.bottom:o.bottom,o.left=typeof e.left!="undefined"?e.left:o.left,x):o},x.width=function(e){return arguments.length?(u=e,x):getWidth},x.height=function(e){return arguments.length?(a=e,x):getHeight},x.color=function(n){return arguments.length?(f=e.utils.getColor(n),i.color(f),t.color(f),x):f},x.showControls=function(e){return arguments.length?(l=e,x):l},x.showLegend=function(e){return arguments.length?(c=e,x):c},x.tooltip=function(e){return arguments.length?(p=e, x):p},x.tooltips=function(e){return arguments.length?(h=e,x):h},x.tooltipContent=function(e){return arguments.length?(p=e,x):p},x.state=function(e){return arguments.length?(g=e,x):g},x.defaultState=function(e){return arguments.length?(y=e,x):y},x.noData=function(e){return arguments.length?(b=e,x):b},r.setTickFormat=r.tickFormat,r.tickFormat=function(e){return arguments.length?(m=e,r):m},x}})(); \ No newline at end of file commit 1a8d7e50edd4878adadce504c03f92a599dfaf1b Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 12:36:39 2013 -0700 On multi-resource chart add sort to legend to show alphabetically. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java index a62cb5c..b89cc71 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java @@ -40,7 +40,9 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } this.chartId = chartId; this.chartHeight = chartHeight; - this.data = $wnd.jQuery.parseJSON(metricsData); // make into json + if(typeof metricsData !== 'undefined' && metricsData.length > 0){ + this.data = $wnd.jQuery.parseJSON(metricsData); + } this.xAxisLabel = xAxisLabel; this.chartTitle = chartTitle; this.yAxisUnits = yAxisUnits; @@ -57,14 +59,13 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; - }; - - var global = this, + }, + global = this; // create a chartContext object (from rhq.js) with the data required to render to a chart // this same data could be passed to different chart types // This way, we are decoupled from the dependency on globals and JSNI and kept all the java interaction right here. - chartContext = new MultiLineChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), + chartContext = new MultiLineChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartHeight()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getJsonMetrics()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTitle()(), @@ -102,14 +103,13 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie function determineScale() { - var xTicks, xTickSubDivide, minY, maxY; + var xTicks, xTickSubDivide; console.log("DetermineScale for # resources: "+ chartContext.data.length); if (chartContext.data.length > 0) { xTicks = 8; xTickSubDivide = 5; var myExtent = getExtentFromNestedValues(chartContext.data); - console.info("minY, maxY: "+myExtent[0] + ", "+myExtent[1] ); yScale = $wnd.d3.scale.linear() .clamp(true) @@ -210,13 +210,14 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie // add legend var legend = svg.append("g") .attr("class", "legend") - .attr("x", width + 30) + .attr("x", width + 100) .attr("y", 70) .attr("height", 240) .attr("width", 150); legend.selectAll('g').data(chartContext.data) .enter() + .append('g') .each(function (d, i) { var g = $wnd.d3.select(this); @@ -277,6 +278,8 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie return yScale(d.y); }); + chartContext.data.sort(function(a,b){return ((a.key < b.key) ? -1 : ((a.key > b.key) ? 1 : 0));}); + svg.selectAll(".multiLine") .data(chartContext.data) .enter() commit 48fed3e97aa03337bf8fd2461064b2fb07241d8b Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 12:36:25 2013 -0700 Keep Global exception from occuring in multi resource graph when metrics return empty data. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index 3ac3758..a5a0c9d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -363,17 +363,20 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl @Override public String getJsonMetrics() { - StringBuilder sb = new StringBuilder("["); - for (MultiLineGraphData multiLineGraphData : measurementForEachResource) { - sb.append("{ \"key\": \""); - sb.append(multiLineGraphData.getResourceName()); - sb.append("\",\"value\" : "); - sb.append(produceInnerValuesArray(multiLineGraphData.getMeasurementData())); - sb.append("},"); + StringBuilder sb = new StringBuilder(); + if (null != measurementForEachResource && !measurementForEachResource.isEmpty()) { + sb = new StringBuilder("["); + for (MultiLineGraphData multiLineGraphData : measurementForEachResource) { + sb.append("{ \"key\": \""); + sb.append(multiLineGraphData.getResourceName()); + sb.append("\",\"value\" : "); + sb.append(produceInnerValuesArray(multiLineGraphData.getMeasurementData())); + sb.append("},"); + } + sb.setLength(sb.length() - 1); // delete the last ',' + sb.append("]"); } - sb.setLength(sb.length() - 1); // delete the last ',' - sb.append("]"); - Log.debug("Multi-resource Graph json: "+ sb.toString()); + Log.debug("Multi-resource Graph json: " + sb.toString()); return sb.toString(); } commit a2d8542774237ebc6af878832567c93d10d71e52 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 08:16:49 2013 -0700 Add legend to new multi-line graph. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java index 31f5b8b..a62cb5c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java @@ -205,6 +205,44 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } + function createLegend() { + + // add legend + var legend = svg.append("g") + .attr("class", "legend") + .attr("x", width + 30) + .attr("y", 70) + .attr("height", 240) + .attr("width", 150); + + legend.selectAll('g').data(chartContext.data) + .enter() + .append('g') + .each(function (d, i) { + var g = $wnd.d3.select(this); + g.append("rect") + .attr("x", width + 10) + .attr("y", (i * 15) - 8) + .attr("width", 10) + .attr("height", 10) + .style("fill", function(){return colorScale(i);}); + + g.append("text") + .attr("x", width + 30) + .attr("y", i * 15) + .attr("height", 10) + .attr("width", 135) + .style("font-size", "10px") + .style("font-family", "Arial, Helvetica, sans-serif") + .style("fill", "#50505A") + .text(function (d) { + return d.key; + }); + + + }); + } + function createHeader(titleName) { var title = chart.append("g").append("rect") @@ -266,6 +304,7 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie createYAxisGridLines(); createMultiLines(chartContext); createXandYAxes(); + createLegend(); console.log("finished drawing multi-line graph"); } } commit 568b5c8ffc36e41aaddfa99b29b351b8cd0b0ef2 Author: Mike Thompson <mithomps(a)redhat.com> Date: Mon Jul 8 13:48:42 2013 -0700 Fix new d3 multi-line graph scaling issues. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java index 31b1667..b22907e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java @@ -634,7 +634,7 @@ public abstract class AbstractActivityView extends EnhancedVLayout implements Re setIsModal(true); setShowModalMask(true); setWidth(950); - setHeight(390); + setHeight(420); setShowResizer(true); setCanDragResize(true); centerInPage(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java index b8c63f4..9058ea5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java @@ -251,7 +251,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { .attr("y", yBase) .text(highLabel + " - "); - if(highValue !== undefined){ + if(typeof highValue !== 'undefined'){ chart.append("text") .attr("class", "highText") .attr("x", xValue) @@ -267,7 +267,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { .attr("y", yBase + yInc) .text(avgLabel + " - "); - if(avgValue !== undefined){ + if(typeof avgValue !== 'undefined'){ chart.append("text") .attr("class", "avgText") .attr("x", xValue) @@ -282,7 +282,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { .attr("y", yBase + 2 * yInc) .text(minLabel + " - "); - if(minValue !== undefined){ + if(typeof minValue !== 'undefined'){ chart.append("text") .attr("class", "minText") .attr("x", xValue) @@ -606,7 +606,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { function formatHovers(chartContext, d) { var hoverString, - xValue = (d.x == undefined) ? 0 : +d.x, + xValue = (typeof d.x === 'undefined') ? 0 : +d.x, date = new Date(+xValue), barDuration = d.barDuration, timeFormatter = $wnd.d3.time.format(chartContext.chartHoverTimeFormat), diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index 7ade3f7..3ac3758 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -249,9 +249,8 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl @Override public void redrawGraphs() { - drawGraph(); populateData(); - markForRedraw(); + drawGraph(); } private void drawGraph() { @@ -281,7 +280,6 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl @Override public void run() { - //markForRedraw(); drawJsniChart(); } }.schedule(200); @@ -375,7 +373,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl } sb.setLength(sb.length() - 1); // delete the last ',' sb.append("]"); - Log.debug("*** Multi-resource Graph json: "+ sb.toString()); + Log.debug("Multi-resource Graph json: "+ sb.toString()); return sb.toString(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java index 42e5f0c..31f5b8b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java @@ -96,26 +96,25 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie yAxis, timeScale, xAxis, + colorScale = $wnd.d3.scale.category20(), chart, svg; function determineScale() { - var xTicks, xTickSubDivide; + var xTicks, xTickSubDivide, minY, maxY; console.log("DetermineScale for # resources: "+ chartContext.data.length); if (chartContext.data.length > 0) { xTicks = 8; xTickSubDivide = 5; + var myExtent = getExtentFromNestedValues(chartContext.data); + console.info("minY, maxY: "+myExtent[0] + ", "+myExtent[1] ); yScale = $wnd.d3.scale.linear() .clamp(true) .rangeRound([height, 0]) - .domain([$wnd.d3.min(chartContext.data[0], function (d) { - return d.y; - }), $wnd.d3.max(chartContext.data[0], function (d) { - return d.y; - })]); + .domain([myExtent[0],myExtent[1]]); yAxis = $wnd.d3.svg.axis() .scale(yScale) @@ -124,10 +123,10 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie .tickSize(4, 4, 0) .orient("left"); - + var firstDataset = chartContext.data[0].value; timeScale = $wnd.d3.time.scale() .range([0, width]) - .domain($wnd.d3.extent(chartContext.data[0], function (d) { + .domain($wnd.d3.extent(firstDataset, function(d){ return d.x; })); @@ -150,6 +149,24 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } + function getExtentFromNestedValues(data){ + var tempArray = [], + mergedArray = [], + resultArray = [], + max = 0, + min = 0; + + for(var i=0; i< data.length;i++){ + tempArray.push(data[i].value); + } + mergedArray = $wnd.d3.merge(tempArray, function(d){ return d.y;}); + max = $wnd.d3.max(mergedArray, function(d){ return d.y}); + min = $wnd.d3.min(mergedArray, function(d){ return d.y}); + resultArray.push(min); + resultArray.push(max); + return resultArray; + } + function createYAxisGridLines() { // create the y axis grid lines svg.append("g").classed("grid y_grid", true) @@ -164,7 +181,7 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie function createXandYAxes() { - xAxis.tickFormat($wnd.rhqCommon.getD3CustomTimeFormat(chartContext.chartXaxisTimeFormatHours, chartContext.chartXaxisTimeFormatHoursMinutes)); + //xAxis.tickFormat($wnd.rhqCommon.getD3CustomTimeFormat(chartContext.chartXaxisTimeFormatHours, chartContext.chartXaxisTimeFormatHoursMinutes)); // create x-axis svg.append("g") @@ -189,8 +206,6 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } - - function createHeader(titleName) { var title = chart.append("g").append("rect") .attr("class", "title") @@ -224,14 +239,14 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie return yScale(d.y); }); - chart.selectAll(".multiLine") + svg.selectAll(".multiLine") .data(chartContext.data) .enter() .append('path') .attr("class", "multiLine") .attr("fill", "none") - .attr("stroke", "#2e376a") - .attr("stroke-width", "1.5") + .attr("stroke", function(d,i){ return colorScale(i);}) + .attr("stroke-width", "2") .attr("stroke-opacity", ".9") .attr("d", function(d) { return graphLine(d.value);}); @@ -244,21 +259,20 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie "use strict"; // Guard condition that can occur when a portlet has not been configured yet console.log("multi-resource chart handle:" + chartContext.chartHandle); - //console.dir(chartContext.data); if (chartContext.data.length > 0) { console.log("Creating MultiLine Chart: " + chartContext.chartSelection + " --> " + chartContext.chartTitle); determineScale(); createHeader(chartContext.chartTitle); - console.log("created multi-header"); createYAxisGridLines(); createMultiLines(chartContext); createXandYAxes(); + console.log("finished drawing multi-line graph"); } } }; // end public closure }(); - if (chartContext.data !== undefined && chartContext.data.length > 0) { + if (typeof chartContext.data !== 'undefined' && chartContext.data.length > 0) { multiLineGraph.draw(chartContext); } commit 83f7d3d726d2c3ef78f3f104f204ed01fafe1b1a Author: Mike Thompson <mithomps(a)redhat.com> Date: Sun Jul 7 14:15:08 2013 -0700 Consolidate the d3 time format stuff into rhq.js so all graphs have access. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java index 60b5e26..34ca60b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java @@ -32,9 +32,12 @@ import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; /** + * This is now old and for demonstration purposes only. * Contains the javascript chart definition for an implementation of the d3 availability chart. This implementation is * just a line that changes color based on availability type: up=green, down=red, orange=disabled, unknown=grey, * empty=grey, warn=yellow. This version of the availability graph shows continuous intervals. + * @deprecated + * @see AvailabilityOverUnderGraphType * * @author Mike Thompson */ diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index 3822b59..7c5f80a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -171,7 +171,6 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { .tickSize(13, 0, 0) .orient("bottom"), - customTimeFormat, calcBarY = function (d) { var ABOVE = -6, @@ -253,17 +252,7 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { return calcBarFill(d); }); - customTimeFormat = timeFormat([ - [$wnd.d3.time.format("%Y"), function() { return true; }], - [$wnd.d3.time.format("%B"), function(d) { return d.getMonth(); }], - [$wnd.d3.time.format("%b %d"), function(d) { return d.getDate() != 1; }], - [$wnd.d3.time.format("%a %d"), function(d) { return d.getDay() && d.getDate() != 1; }], - [$wnd.d3.time.format(availChartContext.chartXaxisTimeFormatHours), function(d) { return d.getHours(); }], - [$wnd.d3.time.format(availChartContext.chartXaxisTimeFormatHoursMinutes), function(d) { return d.getMinutes(); }], - [$wnd.d3.time.format(":%S"), function(d) { return d.getSeconds(); }], - [$wnd.d3.time.format(".%L"), function(d) { return d.getMilliseconds(); }] - ]); - xAxis.tickFormat(customTimeFormat); + xAxis.tickFormat($wnd.rhqCommon.getD3CustomTimeFormat(availChartContext.chartXaxisTimeFormatHours, availChartContext.chartXaxisTimeFormatHoursMinutes)); // create x-axis svg.append("g") diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java index 0178f93..b8c63f4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java @@ -461,17 +461,8 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { } function createXandYAxes() { - var customTimeFormat = timeFormat([ - [$wnd.d3.time.format("%Y"), function() { return true; }], - [$wnd.d3.time.format("%B"), function(d) { return d.getMonth(); }], - [$wnd.d3.time.format("%b %d"), function(d) { return d.getDate() != 1; }], - [$wnd.d3.time.format("%a %d"), function(d) { return d.getDay() && d.getDate() != 1; }], - [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHours), function(d) { return d.getHours(); }], - [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHoursMinutes), function(d) { return d.getMinutes(); }], - [$wnd.d3.time.format(":%S"), function(d) { return d.getSeconds(); }], - [$wnd.d3.time.format(".%L"), function(d) { return d.getMilliseconds(); }] - ]); - xAxis.tickFormat(customTimeFormat); + + xAxis.tickFormat($wnd.rhqCommon.getD3CustomTimeFormat(chartContext.chartXaxisTimeFormatHours, chartContext.chartXaxisTimeFormatHoursMinutes)); // create x-axis svg.append("g") @@ -495,15 +486,6 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { } - function timeFormat(formats) { - return function(date) { - var i = formats.length - 1, f = formats[i]; - while (!f[1](date)) f = formats[--i]; - return f[0](date); - } - } - - function createAvgLines() { var showBarAvgTrendline = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::showBarAvgTrendLine()(), diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index 7a4232a..7ade3f7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -73,7 +73,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl private final String chartHoverDateFormat = MSG.chart_hover_date_format(); private int groupId; private int definitionId; - private boolean isAutogroup; + private boolean isAutoGroup; private MeasurementDefinition definition; private MeasurementUserPreferences measurementUserPreferences; private ButtonBarDateTimeRangeEditor buttonBarDateTimeRangeEditor; @@ -86,10 +86,10 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl private String chartTitle; private Integer chartHeight; - public CompositeGroupD3GraphListView(int groupId, int defId, boolean isAutogroup) { + public CompositeGroupD3GraphListView(int groupId, int defId, boolean isAutoGroup) { super(); this.groupId = groupId; - this.isAutogroup = isAutogroup; + this.isAutoGroup = isAutoGroup; setDefinitionId(defId); measurementForEachResource = new ArrayList<MultiLineGraphData>(); measurementUserPreferences = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); @@ -105,7 +105,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl ResourceGroupCriteria criteria = new ResourceGroupCriteria(); criteria.addFilterId(groupId); criteria.fetchResourceType(true); - criteria.addFilterVisible(!isAutogroup); + criteria.addFilterVisible(!isAutoGroup); criteria.fetchExplicitResources(true); measurementForEachResource.clear(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java index be6d110..42e5f0c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java @@ -163,33 +163,8 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } function createXandYAxes() { - var customTimeFormat = timeFormat([ - [$wnd.d3.time.format("%Y"), function () { - return true; - }], - [$wnd.d3.time.format("%B"), function (d) { - return d.getMonth(); - }], - [$wnd.d3.time.format("%b %d"), function (d) { - return d.getDate() != 1; - }], - [$wnd.d3.time.format("%a %d"), function (d) { - return d.getDay() && d.getDate() != 1; - }], - [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHours), function (d) { - return d.getHours(); - }], - [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHoursMinutes), function (d) { - return d.getMinutes(); - }], - [$wnd.d3.time.format(":%S"), function (d) { - return d.getSeconds(); - }], - [$wnd.d3.time.format(".%L"), function (d) { - return d.getMilliseconds(); - }] - ]); - xAxis.tickFormat(customTimeFormat); + + xAxis.tickFormat($wnd.rhqCommon.getD3CustomTimeFormat(chartContext.chartXaxisTimeFormatHours, chartContext.chartXaxisTimeFormatHoursMinutes)); // create x-axis svg.append("g") @@ -213,13 +188,7 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } - function timeFormat(formats) { - return function (date) { - var i = formats.length - 1, f = formats[i]; - while (!f[1](date)) f = formats[--i]; - return f[0](date); - } - } + function createHeader(titleName) { diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js index 435fd67..40c7ca8 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js +++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js @@ -4,7 +4,8 @@ // Handle browsers not supporting console object if (!window.console) window.console = {}; -if (!window.console.log) window.console.log = function () { }; +if (!window.console.log) window.console.log = function () { +}; /** * ChartContext Constructor Object @@ -39,101 +40,146 @@ if (!window.console.log) window.console.log = function () { }; * @param chartXaxisTimeFormatHoursMinutes * @constructor */ -var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel,hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes ) -{ - "use strict"; - if(!(this instanceof ChartContext)){ - throw new Error("ChartContext function cannot be called as a function.") - } - this.chartId = chartId; - this.chartHeight = chartHeight; - this.data = jQuery.parseJSON(metricsData); // make into json - this.xAxisLabel = xAxisLabel; - this.chartTitle = chartTitle; - this.yAxisUnits = yAxisUnits; - this.minChartTitle = minChartTitle; - this.avgChartTitle = avgChartTitle; - this.peakChartTitle = peakChartTitle; - this.dateLabel = dateLabel; - this.timeLabel = timeLabel; - this.downLabel = downLabel; - this.unknownLabel = unknownLabel; - this.singleValueLabel = singleValueLabel; - this.noDataLabel = noDataLabel; - this.hoverStartLabel = hoverStartLabel; - this.hoverEndLabel = hoverEndLabel; - this.hoverPeriodLabel = hoverPeriodLabel; - this.hoverBarLabel = hoverBarLabel; - this.chartHoverTimeFormat = chartHoverTimeFormat; - this.chartHoverDateFormat = chartHoverDateFormat; - this.isPortalGraph = isPortalGraph; - this.portalId = portalId; - if(isPortalGraph){ - this.chartHandle = "rChart-"+chartId+"-"+portalId; - }else { - this.chartHandle = "rChart-"+chartId; - } - this.chartSelection = this.chartHandle + " svg"; - this.buttonBarDateTimeFormat = buttonBarDateTimeFormat; - this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; - this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; +var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel, hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { + "use strict"; + if (!(this instanceof ChartContext)) { + throw new Error("ChartContext function cannot be called as a function.") + } + this.chartId = chartId; + this.chartHeight = chartHeight; + this.data = jQuery.parseJSON(metricsData); // make into json + this.xAxisLabel = xAxisLabel; + this.chartTitle = chartTitle; + this.yAxisUnits = yAxisUnits; + this.minChartTitle = minChartTitle; + this.avgChartTitle = avgChartTitle; + this.peakChartTitle = peakChartTitle; + this.dateLabel = dateLabel; + this.timeLabel = timeLabel; + this.downLabel = downLabel; + this.unknownLabel = unknownLabel; + this.singleValueLabel = singleValueLabel; + this.noDataLabel = noDataLabel; + this.hoverStartLabel = hoverStartLabel; + this.hoverEndLabel = hoverEndLabel; + this.hoverPeriodLabel = hoverPeriodLabel; + this.hoverBarLabel = hoverBarLabel; + this.chartHoverTimeFormat = chartHoverTimeFormat; + this.chartHoverDateFormat = chartHoverDateFormat; + this.isPortalGraph = isPortalGraph; + this.portalId = portalId; + if (isPortalGraph) { + this.chartHandle = "rChart-" + chartId + "-" + portalId; + } + else { + this.chartHandle = "rChart-" + chartId; + } + this.chartSelection = this.chartHandle + " svg"; + this.buttonBarDateTimeFormat = buttonBarDateTimeFormat; + this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; + this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; -}, -/** - * Availability Context object constructor - * @param chartId - * @param availData - * @param dateLabel - * @param timeLabel - * @param hoverStartLabel - * @param hoverBarLabel - * @param availabilityLabel - * @param chartHoverTimeFormat - * @param chartHoverDateFormat - * @param chartTitle - * @param chartUpLabel - * @param chartDownLabel - * @param chartXaxisTimeFormatHours - * @param chartXaxisTimeFormatHoursMinutes - * @constructor - */ -AvailChartContext = function (chartId, availData, dateLabel, timeLabel, hoverStartLabel, hoverBarLabel, availabilityLabel, chartHoverTimeFormat, chartHoverDateFormat, chartTitle, chartUpLabel, chartDownLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { - "use strict"; - if (!(this instanceof AvailChartContext)) { - throw new Error("AvailChartContext function cannot be called as a function.") - } - this.chartId = chartId; - this.chartHandle = "#availChart-" + this.chartId; - this.chartSelection = this.chartHandle + " svg"; - this.data = jQuery.parseJSON(availData); // make into json - this.dateLabel = dateLabel; - this.timeLabel = timeLabel; - this.hoverStartLabel = hoverStartLabel; - this.hoverBarLabel = hoverBarLabel; - this.hoverBarAvailabilityLabel = availabilityLabel; - this.chartHoverTimeFormat = chartHoverTimeFormat; - this.chartHoverDateFormat = chartHoverDateFormat; - this.chartTitle = chartTitle; - this.chartDownLabel = chartDownLabel; - this.chartUpLabel = chartUpLabel; - this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; - this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; + }, + /** + * Availability Context object constructor + * @param chartId + * @param availData + * @param dateLabel + * @param timeLabel + * @param hoverStartLabel + * @param hoverBarLabel + * @param availabilityLabel + * @param chartHoverTimeFormat + * @param chartHoverDateFormat + * @param chartTitle + * @param chartUpLabel + * @param chartDownLabel + * @param chartXaxisTimeFormatHours + * @param chartXaxisTimeFormatHoursMinutes + * @constructor + */ + AvailChartContext = function (chartId, availData, dateLabel, timeLabel, hoverStartLabel, hoverBarLabel, availabilityLabel, chartHoverTimeFormat, chartHoverDateFormat, chartTitle, chartUpLabel, chartDownLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { + "use strict"; + if (!(this instanceof AvailChartContext)) { + throw new Error("AvailChartContext function cannot be called as a function.") + } + this.chartId = chartId; + this.chartHandle = "#availChart-" + this.chartId; + this.chartSelection = this.chartHandle + " svg"; + this.data = jQuery.parseJSON(availData); // make into json + this.dateLabel = dateLabel; + this.timeLabel = timeLabel; + this.hoverStartLabel = hoverStartLabel; + this.hoverBarLabel = hoverBarLabel; + this.hoverBarAvailabilityLabel = availabilityLabel; + this.chartHoverTimeFormat = chartHoverTimeFormat; + this.chartHoverDateFormat = chartHoverDateFormat; + this.chartTitle = chartTitle; + this.chartDownLabel = chartDownLabel; + this.chartUpLabel = chartUpLabel; + this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; + this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; + + }, + + /** + * GraphDateContext object constructor. + * @param startDate moment object representing startDate range + * @param endDate moment object representing endDate range + * @constructor + */ + GraphDateContext = function (startDate, endDate) { + "use strict"; + if (!(this instanceof GraphDateContext)) { + throw new Error("GraphDateContext function cannot be called as a function.") + } + this.startDate = startDate; + this.endDate = endDate; + }, + rhqCommon = (function () { + + + var timeFormat = function (formats) { + return function(date) { + var i = formats.length - 1, f = formats[i]; + while (!f[1](date)) f = formats[--i]; + return f[0](date); + } + }; + + return { + getD3CustomTimeFormat: function (xAxisTimeFormatHours, xAxisTimeFormatHoursMinutes) { + return timeFormat([ + [d3.time.format("%Y"), function () { + return true; + }], + [d3.time.format("%B"), function (d) { + return d.getMonth(); + }], + [d3.time.format("%b %d"), function (d) { + return d.getDate() != 1; + }], + [d3.time.format("%a %d"), function (d) { + return d.getDay() && d.getDate() != 1; + }], + [d3.time.format(xAxisTimeFormatHours), function (d) { + return d.getHours(); + }], + [d3.time.format(xAxisTimeFormatHoursMinutes), function (d) { + return d.getMinutes(); + }], + [d3.time.format(":%S"), function (d) { + return d.getSeconds(); + }], + [d3.time.format(".%L"), function (d) { + return d.getMilliseconds(); + }] + ]); + } + + } + })(); -}, -/** - * GraphDateContext object constructor. - * @param startDate moment object representing startDate range - * @param endDate moment object representing endDate range - * @constructor - */ -GraphDateContext = function (startDate, endDate){ - "use strict"; - if (!(this instanceof GraphDateContext)) { - throw new Error("GraphDateContext function cannot be called as a function.") - } - this.startDate = startDate; - this.endDate = endDate; -}; commit 6dac7937e5cf8b9606d5e0e149e2228cf9ab423e Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Jul 3 15:33:11 2013 -0700 Second iteration at new Multi-resource graph using d3 instead of nvd3. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java index f81fb4f..0178f93 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java @@ -171,7 +171,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { lowBound = determineLowBound(min, peak); highBound = peak + ((peak - min) * 0.1); oobMax = $wnd.d3.max(chartContext.data.map(function (d) { - if (d.baselineMax == undefined) { + if (typeof d.baselineMax === 'undefined') { return 0; } else { @@ -216,7 +216,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { .attr("height", height + margin.top - titleHeight - titleSpace + margin.bottom) .attr("transform", "translate(" + margin.left + "," + (+titleHeight + titleSpace + margin.top) + ")"); - legendUnDefined = (typeof min === undefined) || (typeof avg === undefined) || (typeof peak === undefined); + legendUnDefined = (typeof min === 'undefined') || (typeof avg === 'undefined') || (typeof peak === 'undefined'); if (!useSmallCharts() && !legendUnDefined) { createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits); } @@ -711,7 +711,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { }; // end public closure }(); - if(chartContext.data !== undefined && chartContext.data.length > 0){ + if(typeof chartContext.data !== 'undefined' && chartContext.data.length > 0){ metricStackedBarGraph.draw(chartContext); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index 1ca63ce..7a4232a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -339,7 +339,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl } public int getChartHeight() { - return chartHeight != null ? chartHeight : 210; + return chartHeight != null ? chartHeight : 300; } public void setChartHeight(Integer chartHeight) { @@ -369,7 +369,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl for (MultiLineGraphData multiLineGraphData : measurementForEachResource) { sb.append("{ \"key\": \""); sb.append(multiLineGraphData.getResourceName()); - sb.append("\",\"values\" : "); + sb.append("\",\"value\" : "); sb.append(produceInnerValuesArray(multiLineGraphData.getMeasurementData())); sb.append("},"); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java index 9d595a7..be6d110 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java @@ -92,11 +92,6 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie adjustedChartHeight = chartContext.chartHeight - 50, height = adjustedChartHeight - margin.top - margin.bottom, titleHeight = 30, titleSpace = 10, - chartData, - lowBound, - min, high, - newLow = 0, - highBound, yScale, yAxis, timeScale, @@ -104,40 +99,21 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie chart, svg; - // adjust the min scale so blue low line is not in axis - function determineLowBound(min, peak) { - //var newLow = min - ((peak - min) * 0.1); - newLow = min; - if (newLow < 0) { - return 0; - } - else { - return newLow; - } - } - function determineScale() { var xTicks, xTickSubDivide; - console.log("DetermineScale!"); + console.log("DetermineScale for # resources: "+ chartContext.data.length); if (chartContext.data.length > 0) { xTicks = 8; xTickSubDivide = 5; - chartData = chartContext.data; - min = $wnd.d3.min(function (d) { - return d.y; - }); - high = $wnd.d3.max(function (d) { - return d.y; - }); yScale = $wnd.d3.scale.linear() .clamp(true) .rangeRound([height, 0]) - .domain([$wnd.d3.min(chartContext.data, function (d) { + .domain([$wnd.d3.min(chartContext.data[0], function (d) { return d.y; - }), $wnd.d3.max(chartContext.data, function (d) { + }), $wnd.d3.max(chartContext.data[0], function (d) { return d.y; })]); @@ -151,7 +127,7 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie timeScale = $wnd.d3.time.scale() .range([0, width]) - .domain($wnd.d3.extent(chartData, function (d) { + .domain($wnd.d3.extent(chartContext.data[0], function (d) { return d.x; })); @@ -187,33 +163,33 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } function createXandYAxes() { -// var customTimeFormat = timeFormat([ -// [$wnd.d3.time.format("%Y"), function () { -// return true; -// }], -// [$wnd.d3.time.format("%B"), function (d) { -// return d.getMonth(); -// }], -// [$wnd.d3.time.format("%b %d"), function (d) { -// return d.getDate() != 1; -// }], -// [$wnd.d3.time.format("%a %d"), function (d) { -// return d.getDay() && d.getDate() != 1; -// }], -// [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHours), function (d) { -// return d.getHours(); -// }], -// [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHoursMinutes), function (d) { -// return d.getMinutes(); -// }], -// [$wnd.d3.time.format(":%S"), function (d) { -// return d.getSeconds(); -// }], -// [$wnd.d3.time.format(".%L"), function (d) { -// return d.getMilliseconds(); -// }] -// ]); -// xAxis.tickFormat(customTimeFormat); + var customTimeFormat = timeFormat([ + [$wnd.d3.time.format("%Y"), function () { + return true; + }], + [$wnd.d3.time.format("%B"), function (d) { + return d.getMonth(); + }], + [$wnd.d3.time.format("%b %d"), function (d) { + return d.getDate() != 1; + }], + [$wnd.d3.time.format("%a %d"), function (d) { + return d.getDay() && d.getDate() != 1; + }], + [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHours), function (d) { + return d.getHours(); + }], + [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHoursMinutes), function (d) { + return d.getMinutes(); + }], + [$wnd.d3.time.format(":%S"), function (d) { + return d.getSeconds(); + }], + [$wnd.d3.time.format(".%L"), function (d) { + return d.getMilliseconds(); + }] + ]); + xAxis.tickFormat(customTimeFormat); // create x-axis svg.append("g") @@ -269,8 +245,8 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } - function createAvgLines() { - var barAvgLine = $wnd.d3.svg.line() + function createMultiLines(chartContext) { + var graphLine = $wnd.d3.svg.line() .interpolate("linear") .x(function (d) { return timeScale(d.x); @@ -279,15 +255,16 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie return yScale(d.y); }); - // Bar avg line - svg.append("path") - .datum(chartData) - .attr("class", "barAvgLine") + chart.selectAll(".multiLine") + .data(chartContext.data) + .enter() + .append('path') + .attr("class", "multiLine") .attr("fill", "none") .attr("stroke", "#2e376a") .attr("stroke-width", "1.5") - .attr("stroke-opacity", ".7") - .attr("d", barAvgLine); + .attr("stroke-opacity", ".9") + .attr("d", function(d) { return graphLine(d.value);}); } @@ -305,7 +282,7 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie createHeader(chartContext.chartTitle); console.log("created multi-header"); createYAxisGridLines(); - createAvgLines(); + createMultiLines(chartContext); createXandYAxes(); } } commit c2265e55bec42062329fdfdf30c586da381b99d4 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 2 14:33:21 2013 -0700 First pass at new Multi-resource graph using d3 instead of nvd3. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java index d226cbe..5ac5e9e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java @@ -56,7 +56,6 @@ import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane; import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil; @@ -70,7 +69,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView; import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView.ChartViewWindow; import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView; -import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupMultiLineGraphListView; +import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3MultiLineGraph; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility; import org.rhq.enterprise.gui.coregui.client.util.Log; @@ -407,7 +406,7 @@ public class GroupMetricsPortlet extends EnhancedVLayout implements CustomSettin @Override public void onClick(ClickEvent event) { ChartViewWindow window = new ChartViewWindow(title); - CompositeGroupD3GraphListView graph = new CompositeGroupMultiLineGraphListView( + CompositeGroupD3GraphListView graph = new CompositeGroupD3MultiLineGraph( groupId, md.getId(), isAutoGroup); window.addItem(graph); graph.populateData(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java index 16f3e4a..fca4e80 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java @@ -428,20 +428,6 @@ public class MetricGraphData implements JsonMetricProducer { } - - /** - * If there is more than 2 days time window then return true so we can show day of week - * in axis labels. Function to switch the timescale to whichever is more appropriate hours - * or hours with days of week. - * @return true if difference between startTime and endTime is >= x days - */ - public boolean shouldDisplayDayOfWeekInXAxisLabel() { - Long startTime = metricData.get(0).getTimestamp(); - Long endTime = metricData.get(metricData.size() - 1).getTimestamp(); - long timeThreshold = 24 * 60 * 60 * 1000; // 1 days - return startTime + timeThreshold < endTime; - } - @Override public String toString() { final StringBuilder sb = new StringBuilder(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/MetricNvd3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/MetricNvd3MultiLineGraph.java deleted file mode 100644 index 22b6feb..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/MetricNvd3MultiLineGraph.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype; - -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph; -import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData; - -/** - * Contains the chart definition for a MultiLine Graph. - * - * @author Mike Thompson - */ -public final class MetricNvd3MultiLineGraph extends AbstractMetricGraph -{ - /** - * General constructor for stacked bar graph when you have all the data needed to - * produce the graph. (This is true for all cases but the dashboard portlet). - */ - public MetricNvd3MultiLineGraph(MetricGraphData metricGraphData){ - setMetricGraphData(metricGraphData); - } - - - /** - * The magic JSNI to draw the charts with d3. - */ - public native void drawJsniChart() /*-{ - console.log("Draw NVD3 Bar jsni chart"); - console.time("multiChart"); - var global = this, - chartId = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getChartId()(), - chartHandle = "#rChart-"+chartId, - chartSelection = chartHandle + " svg", - json = $wnd.jQuery.parseJSON(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getJsonMetrics()()), - yAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getChartTitle()(), - yAxisUnits = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getYAxisUnits()(), - xAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::getXAxisTitle()(), - displayDayOfWeek = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.MetricGraphData::shouldDisplayDayOfWeekInXAxisLabel()(), - xAxisTimeFormat = (displayDayOfWeek) ? "%a %I %p" : "%I : %M %p", - - // nvd3 defines their json models a standard way (same model for other graphs) - data = function() { - return [ - { - values: json, - key: yAxisLabel , - color: '#ff7f0e' - } - ]; - }; - $wnd.nv.addGraph(function() { - var chart = $wnd.nv.models.multiBarChart() - .showControls(true) - .tooltips(true); - - chart.xAxis.axisLabel(xAxisLabel) - .tickFormat(function(d) { return $wnd.d3.time.format(xAxisTimeFormat)(new Date(d)) }); - - chart.yAxis - .axisLabel(yAxisUnits) - .tickFormat($wnd.d3.format(',f')); - - $wnd.d3.select(chartSelection) - .datum(data()) - .transition().duration(300) - .call(chart); - - $wnd.nv.utils.windowResize(chart.update); - - return chart; - }); - console.timeEnd("multiChart") - - }-*/; - -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index faeb476..1ca63ce 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -23,6 +23,7 @@ import java.util.EnumSet; import java.util.List; import java.util.Set; +import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.layout.HLayout; @@ -38,6 +39,7 @@ import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.JsonMetricProducer; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync; @@ -60,22 +62,29 @@ import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPre */ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout implements JsonMetricProducer, RedrawGraphs { + static protected final Messages MSG = CoreGUI.getMessages(); + // string labels + private final String chartTitleMinLabel = MSG.chart_title_min_label(); + private final String chartTitleAvgLabel = MSG.chart_title_avg_label(); + private final String chartTitlePeakLabel = MSG.chart_title_peak_label(); + private final String chartDateLabel = MSG.chart_date_label(); + private final String chartTimeLabel = MSG.chart_time_label(); + private final String chartHoverTimeFormat = MSG.chart_hover_time_format(); + private final String chartHoverDateFormat = MSG.chart_hover_date_format(); private int groupId; private int definitionId; private boolean isAutogroup; - private MeasurementDefinition definition; - private MeasurementUserPreferences measurementUserPreferences; private ButtonBarDateTimeRangeEditor buttonBarDateTimeRangeEditor; - /** * measurementForEachResource is a list of a list of single Measurement data for multiple resources. */ private List<MultiLineGraphData> measurementForEachResource; private HLayout titleHLayout; - private HTMLFlow title; private HTMLFlow graph; + private String chartTitle; + private Integer chartHeight; public CompositeGroupD3GraphListView(int groupId, int defId, boolean isAutogroup) { super(); @@ -114,8 +123,8 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl } final ResourceGroup parentGroup = result.get(0).getResourceGroup(); + chartTitle = parentGroup.getName(); Log.debug("group name: " + parentGroup.getName()); - Log.debug("# of child resources: " + parentGroup.getExplicitResources().size()); // setting up a deferred Command to execute after all resource queries have completed (successfully or unsuccessfully) final CountDownLatch countDownLatch = CountDownLatch.create(parentGroup.getExplicitResources() .size(), new Command() { @@ -124,6 +133,11 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl * Do this only after ALL of the metric queries for each resource */ public void execute() { + if (parentGroup.getExplicitResources().size() != measurementForEachResource.size()) { + Log.warn("Number of graphs doesn't match number of resources"); + Log.warn("# of child resources: " + parentGroup.getExplicitResources().size()); + Log.warn("# of charted graphs: " + measurementForEachResource.size()); + } drawGraph(); redraw(); } @@ -167,9 +181,9 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl @Override public void onSuccess( - List<List<MeasurementDataNumericHighLowComposite>> result) { + List<List<MeasurementDataNumericHighLowComposite>> measurements) { addMeasurementForEachResource(childResource.getName(), - childResource.getId(), result.get(0)); + childResource.getId(), measurements.get(0)); countDownLatch.countDown(); } }); @@ -184,34 +198,6 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl } /** - * Immutable data for each graph line. - */ - private final class MultiLineGraphData { - private String resourceName; - private int resourceId; - private List<MeasurementDataNumericHighLowComposite> measurementData; - - private MultiLineGraphData(String resourceName, int resourceId, - List<MeasurementDataNumericHighLowComposite> measurmentData) { - this.resourceName = resourceName; - this.resourceId = resourceId; - this.measurementData = measurmentData; - } - - public String getResourceName() { - return resourceName; - } - - public int getResourceId() { - return resourceId; - } - - public List<MeasurementDataNumericHighLowComposite> getMeasurementData() { - return measurementData; - } - } - - /** * Adding is done asynchronously, so we must synchronize the add. * @param resourceMeasurementList */ @@ -238,19 +224,16 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl return definitionId; } - public String getChartId() { - return groupId + "-" + definition.getId(); - } - public void setDefinitionId(int definitionId) { this.definitionId = definitionId; this.definition = null; } - public MeasurementDefinition getDefinition() { - return definition; + public String getChartId() { + return String.valueOf(definition.getId()); } + public void setDefinition(MeasurementDefinition definition) { this.definition = definition; } @@ -260,8 +243,6 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl removeMember(buttonBarDateTimeRangeEditor); if (null != titleHLayout) removeMember(titleHLayout); - if (null != title) - removeMember(title); if (null != graph) removeMember(graph); } @@ -274,7 +255,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl } private void drawGraph() { - Log.debug("drawGraph in CompositeGroupD3GraphListView for: " + definition + "," + definitionId); + Log.debug("drawGraph in CompositeGroupD3GraphListView for: " + definition + " (" + definitionId+")"); if (null != titleHLayout) { removeMembers(); @@ -290,17 +271,20 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl addMember(titleHLayout); - title = new HTMLFlow("<b>" + definition.getDisplayName() + "</b> " + definition.getDescription()); - title.setWidth100(); - addMember(title); graph = new HTMLFlow("<div id=\"mChart-" + getChartId() + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:95%;\"></svg></div>"); graph.setWidth100(); graph.setHeight100(); addMember(graph); - drawJsniChart(); - markForRedraw(); + new Timer(){ + + @Override + public void run() { + //markForRedraw(); + drawJsniChart(); + } + }.schedule(200); } @@ -318,6 +302,50 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl return MSG.view_charts_time_axis_label(); } + public String getChartTitleMinLabel() { + return chartTitleMinLabel; + } + + public String getChartTitleAvgLabel() { + return chartTitleAvgLabel; + } + + public String getChartTitlePeakLabel() { + return chartTitlePeakLabel; + } + + public String getChartDateLabel() { + return chartDateLabel; + } + + public String getChartTimeLabel() { + return chartTimeLabel; + } + + public String getChartHoverTimeFormat() { + return chartHoverTimeFormat; + } + + public String getChartHoverDateFormat() { + return chartHoverDateFormat; + } + + public String getButtonBarDateTimeFormat() { + return MSG.common_buttonbar_datetime_format_moment_js(); + } + + public String getChartTitle() { + return chartTitle; + } + + public int getChartHeight() { + return chartHeight != null ? chartHeight : 210; + } + + public void setChartHeight(Integer chartHeight) { + this.chartHeight = chartHeight; + } + /** * Takes a measurementList for each resource and turn it into an array. * @return String @@ -326,8 +354,8 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl StringBuilder sb = new StringBuilder("["); for (MeasurementDataNumericHighLowComposite measurement : measurementList) { if (!Double.isNaN(measurement.getValue())) { - sb.append("{ x:" + measurement.getTimestamp() + ","); - sb.append(" y:" + MeasurementUnits.scaleUp(measurement.getValue(), definition.getUnits()) + "},"); + sb.append("{ \"x\":" + measurement.getTimestamp() + ","); + sb.append(" \"y\":" + MeasurementUnits.scaleUp(measurement.getValue(), definition.getUnits()) + "},"); } } sb.setLength(sb.length() - 1); // delete the last ',' @@ -339,21 +367,57 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl public String getJsonMetrics() { StringBuilder sb = new StringBuilder("["); for (MultiLineGraphData multiLineGraphData : measurementForEachResource) { - sb.append("{ values: "); - sb.append(produceInnerValuesArray(multiLineGraphData.getMeasurementData())); - sb.append(",key: '"); + sb.append("{ \"key\": \""); sb.append(multiLineGraphData.getResourceName()); - sb.append("'},"); + sb.append("\",\"values\" : "); + sb.append(produceInnerValuesArray(multiLineGraphData.getMeasurementData())); + sb.append("},"); } sb.setLength(sb.length() - 1); // delete the last ',' sb.append("]"); + Log.debug("*** Multi-resource Graph json: "+ sb.toString()); return sb.toString(); } + protected String getXAxisTimeFormatHoursMinutes() { + return MSG.chart_xaxis_time_format_hours_minutes(); + } + + protected String getXAxisTimeFormatHours() { + return MSG.chart_xaxis_time_format_hours(); + } /** * Client can choose which graph types to render. */ public abstract void drawJsniChart(); + /** + * Immutable data for each graph line. + */ + private final class MultiLineGraphData { + private String resourceName; + private int resourceId; + private List<MeasurementDataNumericHighLowComposite> measurementData; + + private MultiLineGraphData(String resourceName, int resourceId, + List<MeasurementDataNumericHighLowComposite> measurmentData) { + this.resourceName = resourceName; + this.resourceId = resourceId; + this.measurementData = measurmentData; + } + + public String getResourceName() { + return resourceName; + } + + public int getResourceId() { + return resourceId; + } + + public List<MeasurementDataNumericHighLowComposite> getMeasurementData() { + return measurementData; + } + } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java new file mode 100644 index 0000000..9d595a7 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java @@ -0,0 +1,322 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table; + +/** + * D3 rendition of group composite graphs for single metric multiple resources. + * + * @author Mike Thompson + */ +public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListView { + + public CompositeGroupD3MultiLineGraph(int groupId, int defId, boolean isAutogroup) { + super(groupId, defId, isAutogroup); + } + + @Override + public native void drawJsniChart() /*-{ + console.log("Draw d3 MultiLine jsni chart"); + + var MultiLineChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { + "use strict"; + if (!(this instanceof MultiLineChartContext)) { + throw new Error("MultiLineChartContext function cannot be called as a function.") + } + this.chartId = chartId; + this.chartHeight = chartHeight; + this.data = $wnd.jQuery.parseJSON(metricsData); // make into json + this.xAxisLabel = xAxisLabel; + this.chartTitle = chartTitle; + this.yAxisUnits = yAxisUnits; + this.minChartTitle = minChartTitle; + this.avgChartTitle = avgChartTitle; + this.peakChartTitle = peakChartTitle; + this.dateLabel = dateLabel; + this.timeLabel = timeLabel; + this.chartHoverTimeFormat = chartHoverTimeFormat; + this.chartHoverDateFormat = chartHoverDateFormat; + this.chartHandle = "mChart-" + chartId; + this.chartSelection = this.chartHandle + " svg"; + this.buttonBarDateTimeFormat = buttonBarDateTimeFormat; + this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; + this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; + + }; + + var global = this, + + // create a chartContext object (from rhq.js) with the data required to render to a chart + // this same data could be passed to different chart types + // This way, we are decoupled from the dependency on globals and JSNI and kept all the java interaction right here. + chartContext = new MultiLineChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartHeight()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getJsonMetrics()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTitle()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartTitle()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getYAxisUnits()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartTitleMinLabel()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartTitleAvgLabel()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartTitlePeakLabel()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartDateLabel()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartTimeLabel()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartHoverTimeFormat()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartHoverDateFormat()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getButtonBarDateTimeFormat()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTimeFormatHours()(), + global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTimeFormatHoursMinutes()() + ); + + + // Define the Stacked Bar Graph function using the module pattern + var multiLineGraph = function () { + "use strict"; + // privates + var margin = {top: 10, right: 5, bottom: 5, left: 40}, + width = 750 - margin.left - margin.right, + adjustedChartHeight = chartContext.chartHeight - 50, + height = adjustedChartHeight - margin.top - margin.bottom, + titleHeight = 30, titleSpace = 10, + chartData, + lowBound, + min, high, + newLow = 0, + highBound, + yScale, + yAxis, + timeScale, + xAxis, + chart, + svg; + + // adjust the min scale so blue low line is not in axis + function determineLowBound(min, peak) { + //var newLow = min - ((peak - min) * 0.1); + newLow = min; + if (newLow < 0) { + return 0; + } + else { + return newLow; + } + } + + + function determineScale() { + var xTicks, xTickSubDivide; + console.log("DetermineScale!"); + + if (chartContext.data.length > 0) { + xTicks = 8; + xTickSubDivide = 5; + chartData = chartContext.data; + min = $wnd.d3.min(function (d) { + return d.y; + }); + high = $wnd.d3.max(function (d) { + return d.y; + }); + + yScale = $wnd.d3.scale.linear() + .clamp(true) + .rangeRound([height, 0]) + .domain([$wnd.d3.min(chartContext.data, function (d) { + return d.y; + }), $wnd.d3.max(chartContext.data, function (d) { + return d.y; + })]); + + yAxis = $wnd.d3.svg.axis() + .scale(yScale) + .tickSubdivide(1) + .ticks(5) + .tickSize(4, 4, 0) + .orient("left"); + + + timeScale = $wnd.d3.time.scale() + .range([0, width]) + .domain($wnd.d3.extent(chartData, function (d) { + return d.x; + })); + + xAxis = $wnd.d3.svg.axis() + .scale(timeScale) + .ticks(xTicks) + .tickSubdivide(xTickSubDivide) + .tickSize(4, 4, 0) + .orient("bottom"); + + // create the actual chart group + chart = $wnd.d3.select("#" + chartContext.chartSelection); + + svg = chart.append("g") + .attr("width", width + margin.left + margin.right) + .attr("height", height + margin.top - titleHeight - titleSpace + margin.bottom) + .attr("transform", "translate(" + margin.left + "," + (+titleHeight + titleSpace + margin.top) + ")"); + + } + + } + + function createYAxisGridLines() { + // create the y axis grid lines + svg.append("g").classed("grid y_grid", true) + .call($wnd.d3.svg.axis() + .scale(yScale) + .orient("left") + .ticks(10) + .tickSize(-width, 0, 0) + .tickFormat("") + ); + } + + function createXandYAxes() { +// var customTimeFormat = timeFormat([ +// [$wnd.d3.time.format("%Y"), function () { +// return true; +// }], +// [$wnd.d3.time.format("%B"), function (d) { +// return d.getMonth(); +// }], +// [$wnd.d3.time.format("%b %d"), function (d) { +// return d.getDate() != 1; +// }], +// [$wnd.d3.time.format("%a %d"), function (d) { +// return d.getDay() && d.getDate() != 1; +// }], +// [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHours), function (d) { +// return d.getHours(); +// }], +// [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHoursMinutes), function (d) { +// return d.getMinutes(); +// }], +// [$wnd.d3.time.format(":%S"), function (d) { +// return d.getSeconds(); +// }], +// [$wnd.d3.time.format(".%L"), function (d) { +// return d.getMilliseconds(); +// }] +// ]); +// xAxis.tickFormat(customTimeFormat); + + // create x-axis + svg.append("g") + .attr("class", "x axis") + .attr("transform", "translate(0," + height + ")") + .attr("letter-spacing", "3") + .style("text-anchor", "end") + .call(xAxis); + + + // create y-axis + svg.append("g") + .attr("class", "y axis") + .call(yAxis) + .append("text") + .attr("transform", "rotate(-90),translate( -60,0)") + .attr("y", -30) + .attr("letter-spacing", "3") + .style("text-anchor", "end") + .text(chartContext.yAxisUnits === "NONE" ? "" : chartContext.yAxisUnits); + + } + + function timeFormat(formats) { + return function (date) { + var i = formats.length - 1, f = formats[i]; + while (!f[1](date)) f = formats[--i]; + return f[0](date); + } + } + + + function createHeader(titleName) { + var title = chart.append("g").append("rect") + .attr("class", "title") + .attr("x", 10) + .attr("y", margin.top) + .attr("height", titleHeight) + .attr("width", width + 30 + margin.left) + .attr("fill", "none"); + + chart.append("text") + .attr("class", "titleName") + .attr("x", 40) + .attr("y", 37) + .attr("font-size", "12") + .attr("font-weight", "bold") + .attr("text-anchor", "left") + .text(titleName) + .attr("fill", "#003168"); + + return title; + + } + + function createAvgLines() { + var barAvgLine = $wnd.d3.svg.line() + .interpolate("linear") + .x(function (d) { + return timeScale(d.x); + }) + .y(function (d) { + return yScale(d.y); + }); + + // Bar avg line + svg.append("path") + .datum(chartData) + .attr("class", "barAvgLine") + .attr("fill", "none") + .attr("stroke", "#2e376a") + .attr("stroke-width", "1.5") + .attr("stroke-opacity", ".7") + .attr("d", barAvgLine); + + } + + + return { + // Public API + draw: function (chartContext) { + "use strict"; + // Guard condition that can occur when a portlet has not been configured yet + console.log("multi-resource chart handle:" + chartContext.chartHandle); + //console.dir(chartContext.data); + if (chartContext.data.length > 0) { + console.log("Creating MultiLine Chart: " + chartContext.chartSelection + " --> " + chartContext.chartTitle); + determineScale(); + createHeader(chartContext.chartTitle); + console.log("created multi-header"); + createYAxisGridLines(); + createAvgLines(); + createXandYAxes(); + } + } + }; // end public closure + }(); + + if (chartContext.data !== undefined && chartContext.data.length > 0) { + multiLineGraph.draw(chartContext); + } + + }-*/; + + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java deleted file mode 100644 index 2804af0..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table; - - -import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.Messages; - -/** - * A MultiLine version of the Composite group single metric multiple resource charts. - * - * @author Mike Thompson - */ -public final class CompositeGroupMultiLineGraphListView extends CompositeGroupD3GraphListView -{ - private static final Messages MSG = CoreGUI.getMessages(); - - public CompositeGroupMultiLineGraphListView(int groupId, int defId, boolean isAutogroup) - { - super(groupId, defId, isAutogroup); - } - - - - @Override - public native void drawJsniChart() /*-{ - console.log("Draw nvd3 charts for composite multiline graph"); - var chartId = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), - chartHandle = "#mChart-"+chartId, - chartSelection = chartHandle + " svg", - yAxisUnits = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getYAxisUnits()(), - xAxisLabel = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTitle()(), - xAxisTimeFormat = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupMultiLineGraphListView::getXAxisTimeFormatHoursMinutes()(); - json = eval(this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getJsonMetrics()()); - - $wnd.nv.addGraph(function() { - var chart = $wnd.nv.models.lineChart(); - - chart.xAxis.axisLabel(xAxisLabel) - .tickFormat(function(d) { return $wnd.d3.time.format(xAxisTimeFormat)(new Date(d)) }); - - chart.yAxis - .axisLabel(yAxisUnits) - .tickFormat($wnd.d3.format('.02f')); - - $wnd.d3.select(chartSelection) - .datum(json) - .transition().duration(300) - .call(chart); - - $wnd.nv.utils.windowResize(chart.update); - - return chart; - }); - - }-*/; - - - - public String getXAxisTimeFormatHoursMinutes() { - return MSG.chart_xaxis_time_format_hours_minutes(); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupNvD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupNvD3MultiLineGraph.java new file mode 100644 index 0000000..d2ae7ef --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupNvD3MultiLineGraph.java @@ -0,0 +1,74 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table; + + + +/** + * A MultiLine version of the Composite group single metric multiple resource charts. + * + * @author Mike Thompson + */ +@Deprecated +public final class CompositeGroupNvD3MultiLineGraph extends CompositeGroupD3GraphListView +{ + + public CompositeGroupNvD3MultiLineGraph(int groupId, int defId, boolean isAutogroup) + { + super(groupId, defId, isAutogroup); + } + + + + @Override + public native void drawJsniChart() /*-{ + console.log("Draw nvd3 charts for composite multiline graph"); + var chartId = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), + chartHandle = "#mChart-"+chartId, + chartSelection = chartHandle + " svg", + yAxisUnits = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getYAxisUnits()(), + xAxisLabel = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTitle()(), + xAxisTimeFormat = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3MultiLineGraph::getXAxisTimeFormatHoursMinutes()(); + json = eval(this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getJsonMetrics()()); + + $wnd.nv.addGraph(function() { + var chart = $wnd.nv.models.lineChart(); + + chart.xAxis.axisLabel(xAxisLabel) + .tickFormat(function(d) { return $wnd.d3.time.format(xAxisTimeFormat)(new Date(d)) }); + + chart.yAxis + .axisLabel(yAxisUnits) + .tickFormat($wnd.d3.format('.02f')); + + $wnd.d3.select(chartSelection) + .datum(json) + .transition().duration(300) + .call(chart); + + $wnd.nv.utils.windowResize(chart.update); + + return chart; + }); + + }-*/; + + + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java index 1e73f0d..efb7b72 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java @@ -65,7 +65,7 @@ public class GroupMeasurementTableView extends Table<GroupMetricsTableDataSource ChartViewWindow window = new ChartViewWindow("MeasurementTableFrame", title); int defId = record.getAttributeAsInt(GroupMetricsTableDataSource.FIELD_METRIC_DEF_ID); - CompositeGroupD3GraphListView graph = new CompositeGroupMultiLineGraphListView(groupId, defId, isAutogroup); + CompositeGroupD3GraphListView graph = new CompositeGroupD3MultiLineGraph(groupId, defId, isAutogroup); window.addItem(graph); graph.populateData(); window.show();

1 0

[rhq] etc/scripts
by John Sanda 10 Jul '13

10 Jul '13

etc/scripts/rhq48-storage-patch/apache-cassandra-1.2.4-patch-1.jar |binary etc/scripts/rhq48-storage-patch/disable_compression.cql | 31 ++++++ etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh | 50 ++++++++++ 3 files changed, 81 insertions(+) New commits: commit 0b7e56cbe371944587db03a200fd98075d30a95d Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 9 22:11:21 2013 -0400 initial commit for RHQ 4.8 storage node patch to disable all table compression diff --git a/etc/scripts/rhq48-storage-patch/apache-cassandra-1.2.4-patch-1.jar b/etc/scripts/rhq48-storage-patch/apache-cassandra-1.2.4-patch-1.jar new file mode 100644 index 0000000..9bc5e4a Binary files /dev/null and b/etc/scripts/rhq48-storage-patch/apache-cassandra-1.2.4-patch-1.jar differ diff --git a/etc/scripts/rhq48-storage-patch/disable_compression.cql b/etc/scripts/rhq48-storage-patch/disable_compression.cql new file mode 100644 index 0000000..eccb962 --- /dev/null +++ b/etc/scripts/rhq48-storage-patch/disable_compression.cql @@ -0,0 +1,31 @@ +alter table rhq.raw_metrics with compression = {'sstable_compression': ''}; +alter table rhq.one_hour_metrics with compression = {'sstable_compression': ''}; +alter table rhq.six_hour_metrics with compression = {'sstable_compression': ''}; +alter table rhq.twenty_four_hour_metrics with compression = {'sstable_compression': ''}; +alter table rhq.metrics_index with compression = {'sstable_compression': ''}; +alter table rhq.schema_version with compression = {'sstable_compression': ''}; + +alter table system_auth.credentials with compression = {'sstable_compression': ''}; +alter table system_auth.permissions with compression = {'sstable_compression': ''}; +alter table system_auth.users with compression = {'sstable_compression': ''}; +alter table system_auth.users with compression = {'sstable_compression': ''}; + +alter table system_traces.events with compression = {'sstable_compression': ''}; +alter table system_traces.sessions with compression = {'sstable_compression': ''}; +alter table system_traces.sessions with compression = {'sstable_compression': ''}; + +alter table system."HintsColumnFamily" with compression = {'sstable_compression': ''}; +alter table system."IndexInfo" with compression = {'sstable_compression': ''}; +alter table system."LocationInfo" with compression = {'sstable_compression': ''}; +alter table system."Migrations" with compression = {'sstable_compression': ''}; +alter table system."NodeIdInfo" with compression = {'sstable_compression': ''}; +alter table system."Schema" with compression = {'sstable_compression': ''}; +alter table system.batchlog with compression = {'sstable_compression': ''}; +alter table system.hints with compression = {'sstable_compression': ''}; +alter table system.local with compression = {'sstable_compression': ''}; +alter table system.peer_events with compression = {'sstable_compression': ''}; +alter table system.peers with compression = {'sstable_compression': ''}; +alter table system.range_xfers with compression = {'sstable_compression': ''}; +alter table system.schema_columnfamilies with compression = {'sstable_compression': ''}; +alter table system.schema_columns with compression = {'sstable_compression': ''}; +alter table system.schema_keyspaces with compression = {'sstable_compression': ''}; diff --git a/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh new file mode 100755 index 0000000..756ba20 --- /dev/null +++ b/etc/scripts/rhq48-storage-patch/rhq48-storage-patch.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +if [ "x$1" = "x" ]; then + echo "Usage: $0 <rhq-server-dir>" + exit 1 +fi + +RHQ_SERVER_DIR=$1 +CQL_HOSTNAME=$2 +CQL_PORT=9142 +JMX_PORT=7299 + +PATCH="apache-cassandra-1.2.4-patch-1.jar" + +# swap out the Cassandra jar file with the patched version +echo "Copying patch file to $RHQ_SERVER_DIR/rhq-storage/lib" +mv $RHQ_SERVER_DIR/rhq-storage/lib/apache-cassandra-1.2.4.jar $TMPDIR +cp $PATCH $RHQ_SERVER_DIR/rhq-storage/lib + +# restart the storage node +echo "Starting RHQ Storage node" +$RHQ_SERVER_DIR/bin/rhqctl start --storage + +# run the CQL script +echo "Running CQL script to disable table compression" +export CQLSH_HOST=$CQLSH_HOST +export CQL_PORT=$CQL_PORT +$RHQ_SERVER_DIR/rhq-storage/bin/cqlsh -u rhqadmin -p rhqadmin -f ./disable_compression.cql + +# scrub all keyspaces +echo "Rebuilding data files for system keyspace" +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT scrub system + +echo "Rebuilding data files for system_traces keyspace" +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT scrub system_traces + +echo "Rebuilding data files for system_auth keyspace" +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT scrub system_auth + +echo "Rebuilding data files for rhq keyspace" +$RHQ_SERVER_DIR/rhq-storage/bin/nodetool -u rhqadmin -pw rhqadmin -p $JMX_PORT scrub rhq + +echo "Shutting down the RHQ Storage node" +$RHQ_SERVER_DIR/bin/rhqctl stop + +echo "Removing patch file" +rm $RHQ_SERVER_DIR/rhq-storage/lib/$PATCH +mv $TMPDIR/apache-cassandra-1.2.4.jar $RHQ_SERVER_DIR/rhq-storage/lib + +echo "Table compression has been disabled for all keyspaces. You are now ready to upgrade your RHQ installation."

1 0

[rhq] Branch 'mtho11/d3-multiline-graph' - 3 commits - modules/enterprise
by mike thompson 09 Jul '13

09 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java | 5 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java | 37 ++++++++-- 2 files changed, 35 insertions(+), 7 deletions(-) New commits: commit 08c73a64983cad71504baf97585d9be90348f015 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 14:19:41 2013 -0700 [BZ 924725] Graph refresh also refreshes screen behind graph dialog. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index 0e63274..204d2ec 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -142,7 +142,6 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl Log.warn("# of charted graphs: " + measurementForEachResource.size()); } drawGraph(); - redraw(); } }); commit 90c76df9f97288554506c7852b4f5b0d9365b9c1 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 14:11:35 2013 -0700 On multi-resource graph normalize units to highest scale (ex. GB instead of MB units if possible). diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index a5a0c9d..0e63274 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -32,6 +32,7 @@ import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; +import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; @@ -47,6 +48,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.ButtonBarDat import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.RedrawGraphs; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; import org.rhq.enterprise.gui.coregui.client.util.async.Command; import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedHLayout; @@ -77,6 +79,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl private MeasurementDefinition definition; private MeasurementUserPreferences measurementUserPreferences; private ButtonBarDateTimeRangeEditor buttonBarDateTimeRangeEditor; + private String adjustedMeasurementUnits; /** * measurementForEachResource is a list of a list of single Measurement data for multiple resources. */ @@ -292,9 +295,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl return definition.getName(); } - public String getYAxisUnits() { - return definition.getUnits().toString(); - } + public String getXAxisTitle() { return MSG.view_charts_time_axis_label(); @@ -353,7 +354,11 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl for (MeasurementDataNumericHighLowComposite measurement : measurementList) { if (!Double.isNaN(measurement.getValue())) { sb.append("{ \"x\":" + measurement.getTimestamp() + ","); - sb.append(" \"y\":" + MeasurementUnits.scaleUp(measurement.getValue(), definition.getUnits()) + "},"); + MeasurementNumericValueAndUnits dataValue = normalizeUnitsAndValues(measurement.getValue(), + definition.getUnits()); + //sb.append(" \"y\":" + MeasurementUnits.scaleUp(measurement.getValue(), definition.getUnits()) + "},"); + sb.append(" \"y\":" + dataValue.getValue() + "},"); + adjustedMeasurementUnits = dataValue.getUnits().toString(); } } sb.setLength(sb.length() - 1); // delete the last ',' @@ -380,6 +385,29 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl return sb.toString(); } + protected MeasurementNumericValueAndUnits normalizeUnitsAndValues(double value, MeasurementUnits measurementUnits) { + MeasurementNumericValueAndUnits newValue = MeasurementConverterClient.fit(value, measurementUnits); + MeasurementNumericValueAndUnits returnValue; + + // adjust for percentage numbers + if (measurementUnits.equals(MeasurementUnits.PERCENTAGE)) { + returnValue = new MeasurementNumericValueAndUnits(newValue.getValue() * 100, newValue.getUnits()); + } else { + returnValue = new MeasurementNumericValueAndUnits(newValue.getValue(), newValue.getUnits()); + } + + return returnValue; + } + + public String getYAxisUnits() { + if (adjustedMeasurementUnits == null) { + Log.warn("ResourceMetricD3GraphView.adjustedMeasurementUnits is populated by getJsonMetrics. Make sure it is called first."); + return ""; + } else { + return adjustedMeasurementUnits; + } + } + protected String getXAxisTimeFormatHoursMinutes() { return MSG.chart_xaxis_time_format_hours_minutes(); } commit f386b05821c9b4d8f01e9e0165290fa139086859 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 13:33:59 2013 -0700 [BZ 980014] Syntax error for Empty group charts. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java index fca4e80..ecd3b46 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java @@ -294,9 +294,10 @@ public class MetricGraphData implements JsonMetricProducer { * @todo: future: this should really use GSON or some Json marshaller */ public String getJsonMetrics() { - StringBuilder sb = new StringBuilder("["); + StringBuilder sb = new StringBuilder(); boolean gotAdjustedMeasurementUnits = false; if (null != metricData) { + sb = new StringBuilder("["); long firstBarTime = metricData.get(0).getTimestamp(); long secondBarTime = metricData.get(1).getTimestamp(); long barDuration = secondBarTime - firstBarTime; @@ -341,8 +342,8 @@ public class MetricGraphData implements JsonMetricProducer { } } sb.setLength(sb.length() - 1); // delete the last ',' + sb.append("]"); } - sb.append("]"); Log.debug("Json data for: "+getChartTitle()); Log.debug(sb.toString()); return sb.toString();

1 0

[rhq] Branch 'mtho11/d3-multiline-graph' - 4 commits - modules/enterprise
by mike thompson 09 Jul '13

09 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java | 23 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java | 56 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupNvD3MultiLineGraph.java | 74 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 1 modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.js |13048 ---------- modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.min.js | 6 6 files changed, 62 insertions(+), 13146 deletions(-) New commits: commit a05f4c169c67035d6466713be5a3a753f1119c8d Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 13:02:08 2013 -0700 Remove nvd3.js charting library in favor of base d3.js. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupNvD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupNvD3MultiLineGraph.java deleted file mode 100644 index d2ae7ef..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupNvD3MultiLineGraph.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table; - - - -/** - * A MultiLine version of the Composite group single metric multiple resource charts. - * - * @author Mike Thompson - */ -@Deprecated -public final class CompositeGroupNvD3MultiLineGraph extends CompositeGroupD3GraphListView -{ - - public CompositeGroupNvD3MultiLineGraph(int groupId, int defId, boolean isAutogroup) - { - super(groupId, defId, isAutogroup); - } - - - - @Override - public native void drawJsniChart() /*-{ - console.log("Draw nvd3 charts for composite multiline graph"); - var chartId = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), - chartHandle = "#mChart-"+chartId, - chartSelection = chartHandle + " svg", - yAxisUnits = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getYAxisUnits()(), - xAxisLabel = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTitle()(), - xAxisTimeFormat = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3MultiLineGraph::getXAxisTimeFormatHoursMinutes()(); - json = eval(this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getJsonMetrics()()); - - $wnd.nv.addGraph(function() { - var chart = $wnd.nv.models.lineChart(); - - chart.xAxis.axisLabel(xAxisLabel) - .tickFormat(function(d) { return $wnd.d3.time.format(xAxisTimeFormat)(new Date(d)) }); - - chart.yAxis - .axisLabel(yAxisUnits) - .tickFormat($wnd.d3.format('.02f')); - - $wnd.d3.select(chartSelection) - .datum(json) - .transition().duration(300) - .call(chart); - - $wnd.nv.utils.windowResize(chart.update); - - return chart; - }); - - }-*/; - - - -} diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml index 51bec0a..8ef78e0 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml @@ -58,7 +58,6 @@ <script src="/coregui/js/jquery-1.7.2.min.js"/> <script src="/coregui/js/jquery.sparkline-2.1.min.js"/> <script src="/coregui/js/d3.v3.min.js"/> - <script src="/coregui/js/nv.d3.min.js"/> <script src="/coregui/js/jquery.tipsy.js"/> diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.js b/modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.js deleted file mode 100755 index 62ca71e..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.js +++ /dev/null @@ -1,13048 +0,0 @@ -(function(){ - -var nv = window.nv || {}; - -nv.version = '0.0.1a'; -nv.dev = true //set false when in production - -window.nv = nv; - -nv.tooltip = {}; // For the tooltip system -nv.utils = {}; // Utility subsystem -nv.models = {}; //stores all the possible models/components -nv.charts = {}; //stores all the ready to use charts -nv.graphs = []; //stores all the graphs currently on the page -nv.logs = {}; //stores some statistics and potential error messages - -nv.dispatch = d3.dispatch('render_start', 'render_end'); - -// ************************************************************************* -// Development render timers - disabled if dev = false - -if (nv.dev) { - nv.dispatch.on('render_start', function(e) { - nv.logs.startTime = +new Date(); - }); - - nv.dispatch.on('render_end', function(e) { - nv.logs.endTime = +new Date(); - nv.logs.totalTime = nv.logs.endTime - nv.logs.startTime; - nv.log('total', nv.logs.totalTime); // used for development, to keep track of graph generation times - }); -} - -// ******************************************** -// Public Core NV functions - -// Logs all arguments, and returns the last so you can test things in place -nv.log = function() { - if (nv.dev && console.log && console.log.apply) - console.log.apply(console, arguments) - else if (nv.dev && console.log && Function.prototype.bind) { - var log = Function.prototype.bind.call(console.log, console); - log.apply(console, arguments); - } - return arguments[arguments.length - 1]; -}; - - -nv.render = function render(step) { - step = step || 1; // number of graphs to generate in each timeout loop - - nv.render.active = true; - nv.dispatch.render_start(); - - setTimeout(function() { - var chart, graph; - - for (var i = 0; i < step && (graph = nv.render.queue[i]); i++) { - chart = graph.generate(); - if (typeof graph.callback == typeof(Function)) graph.callback(chart); - nv.graphs.push(chart); - } - - nv.render.queue.splice(0, i); - - if (nv.render.queue.length) setTimeout(arguments.callee, 0); - else { nv.render.active = false; nv.dispatch.render_end(); } - }, 0); -}; - -nv.render.active = false; -nv.render.queue = []; - -nv.addGraph = function(obj) { - if (typeof arguments[0] === typeof(Function)) - obj = {generate: arguments[0], callback: arguments[1]}; - - nv.render.queue.push(obj); - - if (!nv.render.active) nv.render(); -}; - -nv.identity = function(d) { return d; }; - -nv.strip = function(s) { return s.replace(/(\s|&)/g,''); }; - -function daysInMonth(month,year) { - return (new Date(year, month+1, 0)).getDate(); -} - -function d3_time_range(floor, step, number) { - return function(t0, t1, dt) { - var time = floor(t0), times = []; - if (time < t0) step(time); - if (dt > 1) { - while (time < t1) { - var date = new Date(+time); - if ((number(date) % dt === 0)) times.push(date); - step(time); - } - } else { - while (time < t1) { times.push(new Date(+time)); step(time); } - } - return times; - }; -} - -d3.time.monthEnd = function(date) { - return new Date(date.getFullYear(), date.getMonth(), 0); -}; - -d3.time.monthEnds = d3_time_range(d3.time.monthEnd, function(date) { - date.setUTCDate(date.getUTCDate() + 1); - date.setDate(daysInMonth(date.getMonth() + 1, date.getFullYear())); - }, function(date) { - return date.getMonth(); - } -); - - -/***** - * A no-frills tooltip implementation. - *****/ - - -(function() { - - var nvtooltip = window.nv.tooltip = {}; - - nvtooltip.show = function(pos, content, gravity, dist, parentContainer, classes) { - - var container = document.createElement('div'); - container.className = 'nvtooltip ' + (classes ? classes : 'xy-tooltip'); - - gravity = gravity || 's'; - dist = dist || 20; - - var body = parentContainer; - if ( !parentContainer || parentContainer.tagName.match(/g|svg/i)) { - //If the parent element is an SVG element, place tooltip in the <body> element. - body = document.getElementsByTagName('body')[0]; - } - - container.innerHTML = content; - container.style.left = 0; - container.style.top = 0; - container.style.opacity = 0; - - body.appendChild(container); - - var height = parseInt(container.offsetHeight), - width = parseInt(container.offsetWidth), - windowWidth = nv.utils.windowSize().width, - windowHeight = nv.utils.windowSize().height, - scrollTop = window.scrollY, - scrollLeft = window.scrollX, - left, top; - - windowHeight = window.innerWidth >= document.body.scrollWidth ? windowHeight : windowHeight - 16; - windowWidth = window.innerHeight >= document.body.scrollHeight ? windowWidth : windowWidth - 16; - - var tooltipTop = function ( Elem ) { - var offsetTop = top; - do { - if( !isNaN( Elem.offsetTop ) ) { - offsetTop += (Elem.offsetTop); - } - } while( Elem = Elem.offsetParent ); - return offsetTop; - } - - var tooltipLeft = function ( Elem ) { - var offsetLeft = left; - do { - if( !isNaN( Elem.offsetLeft ) ) { - offsetLeft += (Elem.offsetLeft); - } - } while( Elem = Elem.offsetParent ); - return offsetLeft; - } - - switch (gravity) { - case 'e': - left = pos[0] - width - dist; - top = pos[1] - (height / 2); - var tLeft = tooltipLeft(container); - var tTop = tooltipTop(container); - if (tLeft < scrollLeft) left = pos[0] + dist > scrollLeft ? pos[0] + dist : scrollLeft - tLeft + left; - if (tTop < scrollTop) top = scrollTop - tTop + top; - if (tTop + height > scrollTop + windowHeight) top = scrollTop + windowHeight - tTop + top - height; - break; - case 'w': - left = pos[0] + dist; - top = pos[1] - (height / 2); - if (tLeft + width > windowWidth) left = pos[0] - width - dist; - if (tTop < scrollTop) top = scrollTop + 5; - if (tTop + height > scrollTop + windowHeight) top = scrollTop - height - 5; - break; - case 'n': - left = pos[0] - (width / 2) - 5; - top = pos[1] + dist; - var tLeft = tooltipLeft(container); - var tTop = tooltipTop(container); - if (tLeft < scrollLeft) left = scrollLeft + 5; - if (tLeft + width > windowWidth) left = left - width/2 + 5; - if (tTop + height > scrollTop + windowHeight) top = scrollTop + windowHeight - tTop + top - height; - break; - case 's': - left = pos[0] - (width / 2); - top = pos[1] - height - dist; - var tLeft = tooltipLeft(container); - var tTop = tooltipTop(container); - if (tLeft < scrollLeft) left = scrollLeft + 5; - if (tLeft + width > windowWidth) left = left - width/2 + 5; - if (scrollTop > tTop) top = scrollTop; - break; - } - - - container.style.left = left+'px'; - container.style.top = top+'px'; - container.style.opacity = 1; - container.style.position = 'absolute'; //fix scroll bar issue - container.style.pointerEvents = 'none'; //fix scroll bar issue - - return container; - }; - - nvtooltip.cleanup = function() { - - // Find the tooltips, mark them for removal by this class (so others cleanups won't find it) - var tooltips = document.getElementsByClassName('nvtooltip'); - var purging = []; - while(tooltips.length) { - purging.push(tooltips[0]); - tooltips[0].style.transitionDelay = '0 !important'; - tooltips[0].style.opacity = 0; - tooltips[0].className = 'nvtooltip-pending-removal'; - } - - - setTimeout(function() { - - while (purging.length) { - var removeMe = purging.pop(); - removeMe.parentNode.removeChild(removeMe); - } - }, 500); - }; - - -})(); - -nv.utils.windowSize = function() { - // Sane defaults - var size = {width: 640, height: 480}; - - // Earlier IE uses Doc.body - if (document.body && document.body.offsetWidth) { - size.width = document.body.offsetWidth; - size.height = document.body.offsetHeight; - } - - // IE can use depending on mode it is in - if (document.compatMode=='CSS1Compat' && - document.documentElement && - document.documentElement.offsetWidth ) { - size.width = document.documentElement.offsetWidth; - size.height = document.documentElement.offsetHeight; - } - - // Most recent browsers use - if (window.innerWidth && window.innerHeight) { - size.width = window.innerWidth; - size.height = window.innerHeight; - } - return (size); -}; - - - -// Easy way to bind multiple functions to window.onresize -// TODO: give a way to remove a function after its bound, other than removing all of them -nv.utils.windowResize = function(fun){ - var oldresize = window.onresize; - - window.onresize = function(e) { - if (typeof oldresize == 'function') oldresize(e); - fun(e); - } -} - -// Backwards compatible way to implement more d3-like coloring of graphs. -// If passed an array, wrap it in a function which implements the old default -// behavior -nv.utils.getColor = function(color) { - if (!arguments.length) return nv.utils.defaultColor(); //if you pass in nothing, get default colors back - - if( Object.prototype.toString.call( color ) === '[object Array]' ) - return function(d, i) { return d.color || color[i % color.length]; }; - else - return color; - //can't really help it if someone passes rubbish as color -} - -// Default color chooser uses the index of an object as before. -nv.utils.defaultColor = function() { - var colors = d3.scale.category20().range(); - return function(d, i) { return d.color || colors[i % colors.length] }; -} - - -// Returns a color function that takes the result of 'getKey' for each series and -// looks for a corresponding color from the dictionary, -nv.utils.customTheme = function(dictionary, getKey, defaultColors) { - getKey = getKey || function(series) { return series.key }; // use default series.key if getKey is undefined - defaultColors = defaultColors || d3.scale.category20().range(); //default color function - - var defIndex = defaultColors.length; //current default color (going in reverse) - - return function(series, index) { - var key = getKey(series); - - if (!defIndex) defIndex = defaultColors.length; //used all the default colors, start over - - if (typeof dictionary[key] !== "undefined") - return (typeof dictionary[key] === "function") ? dictionary[key]() : dictionary[key]; - else - return defaultColors[--defIndex]; // no match in dictionary, use default color - } -} - - - -// From the PJAX example on d3js.org, while this is not really directly needed -// it's a very cool method for doing pjax, I may expand upon it a little bit, -// open to suggestions on anything that may be useful -nv.utils.pjax = function(links, content) { - d3.selectAll(links).on("click", function() { - history.pushState(this.href, this.textContent, this.href); - load(this.href); - d3.event.preventDefault(); - }); - - function load(href) { - d3.html(href, function(fragment) { - var target = d3.select(content).node(); - target.parentNode.replaceChild(d3.select(fragment).select(content).node(), target); - nv.utils.pjax(links, content); - }); - } - - d3.select(window).on("popstate", function() { - if (d3.event.state) load(d3.event.state); - }); -} - -/* For situations where we want to approximate the width in pixels for an SVG:text element. -Most common instance is when the element is in a display:none; container. -Forumla is : text.length * font-size * constant_factor -*/ -nv.utils.calcApproxTextWidth = function (svgTextElem) { - if (svgTextElem instanceof d3.selection) { - var fontSize = parseInt(svgTextElem.style("font-size").replace("px","")); - var textLength = svgTextElem.text().length; - - return textLength * fontSize * 0.5; - } - return 0; -}; -nv.models.axis = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var axis = d3.svg.axis() - ; - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 75 //only used for tickLabel currently - , height = 60 //only used for tickLabel currently - , scale = d3.scale.linear() - , axisLabelText = null - , showMaxMin = true //TODO: showMaxMin should be disabled on all ordinal scaled axes - , highlightZero = true - , rotateLabels = 0 - , rotateYLabel = true - , staggerLabels = false - , isOrdinal = false - , ticks = null - ; - - axis - .scale(scale) - .orient('bottom') - .tickFormat(function(d) { return d }) - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var scale0; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this); - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-axis').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-axis'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g') - - //------------------------------------------------------------ - - - if (ticks !== null) - axis.ticks(ticks); - else if (axis.orient() == 'top' || axis.orient() == 'bottom') - axis.ticks(Math.abs(scale.range()[1] - scale.range()[0]) / 100); - - - //TODO: consider calculating width/height based on whether or not label is added, for reference in charts using this component - - - d3.transition(g) - .call(axis); - - scale0 = scale0 || axis.scale(); - - var fmt = axis.tickFormat(); - if (fmt == null) { - fmt = scale0.tickFormat(); - } - - var axisLabel = g.selectAll('text.nv-axislabel') - .data([axisLabelText || null]); - axisLabel.exit().remove(); - switch (axis.orient()) { - case 'top': - axisLabel.enter().append('text').attr('class', 'nv-axislabel'); - var w = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0])); - axisLabel - .attr('text-anchor', 'middle') - .attr('y', 0) - .attr('x', w/2); - if (showMaxMin) { - var axisMaxMin = wrap.selectAll('g.nv-axisMaxMin') - .data(scale.domain()); - axisMaxMin.enter().append('g').attr('class', 'nv-axisMaxMin').append('text'); - axisMaxMin.exit().remove(); - axisMaxMin - .attr('transform', function(d,i) { - return 'translate(' + scale(d) + ',0)' - }) - .select('text') - .attr('dy', '0em') - .attr('y', -axis.tickPadding()) - .attr('text-anchor', 'middle') - .text(function(d,i) { - var v = fmt(d); - return ('' + v).match('NaN') ? '' : v; - }); - d3.transition(axisMaxMin) - .attr('transform', function(d,i) { - return 'translate(' + scale.range()[i] + ',0)' - }); - } - break; - case 'bottom': - var xLabelMargin = 36; - var maxTextWidth = 30; - var xTicks = g.selectAll('g').select("text"); - if (rotateLabels%360) { - //Calculate the longest xTick width - xTicks.each(function(d,i){ - var width = this.getBBox().width; - if(width > maxTextWidth) maxTextWidth = width; - }); - //Convert to radians before calculating sin. Add 30 to margin for healthy padding. - var sin = Math.abs(Math.sin(rotateLabels*Math.PI/180)); - var xLabelMargin = (sin ? sin*maxTextWidth : maxTextWidth)+30; - //Rotate all xTicks - xTicks - .attr('transform', function(d,i,j) { return 'rotate(' + rotateLabels + ' 0,0)' }) - .attr('text-anchor', rotateLabels%360 > 0 ? 'start' : 'end'); - } - axisLabel.enter().append('text').attr('class', 'nv-axislabel'); - var w = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0])); - axisLabel - .attr('text-anchor', 'middle') - .attr('y', xLabelMargin) - .attr('x', w/2); - if (showMaxMin) { - //if (showMaxMin && !isOrdinal) { - var axisMaxMin = wrap.selectAll('g.nv-axisMaxMin') - //.data(scale.domain()) - .data([scale.domain()[0], scale.domain()[scale.domain().length - 1]]); - axisMaxMin.enter().append('g').attr('class', 'nv-axisMaxMin').append('text'); - axisMaxMin.exit().remove(); - axisMaxMin - .attr('transform', function(d,i) { - return 'translate(' + (scale(d) + (isOrdinal ? scale.rangeBand() / 2 : 0)) + ',0)' - }) - .select('text') - .attr('dy', '.71em') - .attr('y', axis.tickPadding()) - .attr('transform', function(d,i,j) { return 'rotate(' + rotateLabels + ' 0,0)' }) - .attr('text-anchor', rotateLabels ? (rotateLabels%360 > 0 ? 'start' : 'end') : 'middle') - .text(function(d,i) { - var v = fmt(d); - return ('' + v).match('NaN') ? '' : v; - }); - d3.transition(axisMaxMin) - .attr('transform', function(d,i) { - //return 'translate(' + scale.range()[i] + ',0)' - //return 'translate(' + scale(d) + ',0)' - return 'translate(' + (scale(d) + (isOrdinal ? scale.rangeBand() / 2 : 0)) + ',0)' - }); - } - if (staggerLabels) - xTicks - .attr('transform', function(d,i) { return 'translate(0,' + (i % 2 == 0 ? '0' : '12') + ')' }); - - break; - case 'right': - axisLabel.enter().append('text').attr('class', 'nv-axislabel'); - axisLabel - .attr('text-anchor', rotateYLabel ? 'middle' : 'begin') - .attr('transform', rotateYLabel ? 'rotate(90)' : '') - .attr('y', rotateYLabel ? (-Math.max(margin.right,width) + 12) : -10) //TODO: consider calculating this based on largest tick width... OR at least expose this on chart - .attr('x', rotateYLabel ? (scale.range()[0] / 2) : axis.tickPadding()); - if (showMaxMin) { - var axisMaxMin = wrap.selectAll('g.nv-axisMaxMin') - .data(scale.domain()); - axisMaxMin.enter().append('g').attr('class', 'nv-axisMaxMin').append('text') - .style('opacity', 0); - axisMaxMin.exit().remove(); - axisMaxMin - .attr('transform', function(d,i) { - return 'translate(0,' + scale(d) + ')' - }) - .select('text') - .attr('dy', '.32em') - .attr('y', 0) - .attr('x', axis.tickPadding()) - .attr('text-anchor', 'start') - .text(function(d,i) { - var v = fmt(d); - return ('' + v).match('NaN') ? '' : v; - }); - d3.transition(axisMaxMin) - .attr('transform', function(d,i) { - return 'translate(0,' + scale.range()[i] + ')' - }) - .select('text') - .style('opacity', 1); - } - break; - case 'left': - /* - //For dynamically placing the label. Can be used with dynamically-sized chart axis margins - var yTicks = g.selectAll('g').select("text"); - yTicks.each(function(d,i){ - var labelPadding = this.getBBox().width + axis.tickPadding() + 16; - if(labelPadding > width) width = labelPadding; - }); - */ - axisLabel.enter().append('text').attr('class', 'nv-axislabel'); - axisLabel - .attr('text-anchor', rotateYLabel ? 'middle' : 'end') - .attr('transform', rotateYLabel ? 'rotate(-90)' : '') - .attr('y', rotateYLabel ? (-Math.max(margin.left,width) + 12) : -10) //TODO: consider calculating this based on largest tick width... OR at least expose this on chart - .attr('x', rotateYLabel ? (-scale.range()[0] / 2) : -axis.tickPadding()); - if (showMaxMin) { - var axisMaxMin = wrap.selectAll('g.nv-axisMaxMin') - .data(scale.domain()); - axisMaxMin.enter().append('g').attr('class', 'nv-axisMaxMin').append('text') - .style('opacity', 0); - axisMaxMin.exit().remove(); - axisMaxMin - .attr('transform', function(d,i) { - return 'translate(0,' + scale0(d) + ')' - }) - .select('text') - .attr('dy', '.32em') - .attr('y', 0) - .attr('x', -axis.tickPadding()) - .attr('text-anchor', 'end') - .text(function(d,i) { - var v = fmt(d); - return ('' + v).match('NaN') ? '' : v; - }); - d3.transition(axisMaxMin) - .attr('transform', function(d,i) { - return 'translate(0,' + scale.range()[i] + ')' - }) - .select('text') - .style('opacity', 1); - } - break; - } - axisLabel - .text(function(d) { return d }); - - - if (showMaxMin && (axis.orient() === 'left' || axis.orient() === 'right')) { - //check if max and min overlap other values, if so, hide the values that overlap - g.selectAll('g') // the g's wrapping each tick - .each(function(d,i) { - d3.select(this).select('text').attr('opacity', 1); - if (scale(d) < scale.range()[1] + 10 || scale(d) > scale.range()[0] - 10) { // 10 is assuming text height is 16... if d is 0, leave it! - if (d > 1e-10 || d < -1e-10) // accounts for minor floating point errors... though could be problematic if the scale is EXTREMELY SMALL - d3.select(this).attr('opacity', 0); - - d3.select(this).select('text').attr('opacity', 0); // Don't remove the ZERO line!! - } - }); - - //if Max and Min = 0 only show min, Issue #281 - if (scale.domain()[0] == scale.domain()[1] && scale.domain()[0] == 0) - wrap.selectAll('g.nv-axisMaxMin') - .style('opacity', function(d,i) { return !i ? 1 : 0 }); - - } - - if (showMaxMin && (axis.orient() === 'top' || axis.orient() === 'bottom')) { - var maxMinRange = []; - wrap.selectAll('g.nv-axisMaxMin') - .each(function(d,i) { - try { - if (i) // i== 1, max position - maxMinRange.push(scale(d) - this.getBBox().width - 4) //assuming the max and min labels are as wide as the next tick (with an extra 4 pixels just in case) - else // i==0, min position - maxMinRange.push(scale(d) + this.getBBox().width + 4) - }catch (err) { - if (i) // i== 1, max position - maxMinRange.push(scale(d) - 4) //assuming the max and min labels are as wide as the next tick (with an extra 4 pixels just in case) - else // i==0, min position - maxMinRange.push(scale(d) + 4) - } - }); - g.selectAll('g') // the g's wrapping each tick - .each(function(d,i) { - if (scale(d) < maxMinRange[0] || scale(d) > maxMinRange[1]) { - if (d > 1e-10 || d < -1e-10) // accounts for minor floating point errors... though could be problematic if the scale is EXTREMELY SMALL - d3.select(this).remove(); - else - d3.select(this).select('text').remove(); // Don't remove the ZERO line!! - } - }); - } - - - //highlight zero line ... Maybe should not be an option and should just be in CSS? - if (highlightZero) - g.selectAll('.tick') - .filter(function(d) { return !parseFloat(Math.round(d.__data__*100000)/1000000) && (d.__data__ !== undefined) }) //this is because sometimes the 0 tick is a very small fraction, TODO: think of cleaner technique - .classed('zero', true); - - //store old scales for use in transitions on update - scale0 = scale.copy(); - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.axis = axis; - - d3.rebind(chart, axis, 'orient', 'tickValues', 'tickSubdivide', 'tickSize', 'tickPadding', 'tickFormat'); - d3.rebind(chart, scale, 'domain', 'range', 'rangeBand', 'rangeBands'); //these are also accessible by chart.scale(), but added common ones directly for ease of use - - chart.margin = function(_) { - if(!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - } - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.ticks = function(_) { - if (!arguments.length) return ticks; - ticks = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.axisLabel = function(_) { - if (!arguments.length) return axisLabelText; - axisLabelText = _; - return chart; - } - - chart.showMaxMin = function(_) { - if (!arguments.length) return showMaxMin; - showMaxMin = _; - return chart; - } - - chart.highlightZero = function(_) { - if (!arguments.length) return highlightZero; - highlightZero = _; - return chart; - } - - chart.scale = function(_) { - if (!arguments.length) return scale; - scale = _; - axis.scale(scale); - isOrdinal = typeof scale.rangeBands === 'function'; - d3.rebind(chart, scale, 'domain', 'range', 'rangeBand', 'rangeBands'); - return chart; - } - - chart.rotateYLabel = function(_) { - if(!arguments.length) return rotateYLabel; - rotateYLabel = _; - return chart; - } - - chart.rotateLabels = function(_) { - if(!arguments.length) return rotateLabels; - rotateLabels = _; - return chart; - } - - chart.staggerLabels = function(_) { - if (!arguments.length) return staggerLabels; - staggerLabels = _; - return chart; - }; - - - //============================================================ - - - return chart; -} - -// Chart design based on the recommendations of Stephen Few. Implementation -// based on the work of Clint Ivy, Jamie Love, and Jason Davies. -// http://projects.instantcognition.com/protovis/bulletchart/ - -nv.models.bullet = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , orient = 'left' // TODO top & bottom - , reverse = false - , ranges = function(d) { return d.ranges } - , markers = function(d) { return d.markers } - , measures = function(d) { return d.measures } - , forceX = [0] // List of numbers to Force into the X scale (ie. 0, or a max / min, etc.) - , width = 380 - , height = 30 - , tickFormat = null - , color = nv.utils.getColor(['#1f77b4']) - , dispatch = d3.dispatch('elementMouseover', 'elementMouseout') - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(d, i) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - var rangez = ranges.call(this, d, i).slice().sort(d3.descending), - markerz = markers.call(this, d, i).slice().sort(d3.descending), - measurez = measures.call(this, d, i).slice().sort(d3.descending); - - - //------------------------------------------------------------ - // Setup Scales - - // Compute the new x-scale. - var x1 = d3.scale.linear() - .domain( d3.extent(d3.merge([forceX, rangez])) ) - .range(reverse ? [availableWidth, 0] : [0, availableWidth]); - - // Retrieve the old x-scale, if this is an update. - var x0 = this.__chart__ || d3.scale.linear() - .domain([0, Infinity]) - .range(x1.range()); - - // Stash the new scale. - this.__chart__ = x1; - - - var rangeMin = d3.min(rangez), //rangez[2] - rangeMax = d3.max(rangez), //rangez[0] - rangeAvg = rangez[1]; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-bullet').data([d]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-bullet'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('rect').attr('class', 'nv-range nv-rangeMax'); - gEnter.append('rect').attr('class', 'nv-range nv-rangeAvg'); - gEnter.append('rect').attr('class', 'nv-range nv-rangeMin'); - gEnter.append('rect').attr('class', 'nv-measure'); - gEnter.append('path').attr('class', 'nv-markerTriangle'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - - var w0 = function(d) { return Math.abs(x0(d) - x0(0)) }, // TODO: could optimize by precalculating x0(0) and x1(0) - w1 = function(d) { return Math.abs(x1(d) - x1(0)) }; - var xp0 = function(d) { return d < 0 ? x0(d) : x0(0) }, - xp1 = function(d) { return d < 0 ? x1(d) : x1(0) }; - - - g.select('rect.nv-rangeMax') - .attr('height', availableHeight) - .attr('width', w1(rangeMax > 0 ? rangeMax : rangeMin)) - .attr('x', xp1(rangeMax > 0 ? rangeMax : rangeMin)) - .datum(rangeMax > 0 ? rangeMax : rangeMin) - /* - .attr('x', rangeMin < 0 ? - rangeMax > 0 ? - x1(rangeMin) - : x1(rangeMax) - : x1(0)) - */ - - g.select('rect.nv-rangeAvg') - .attr('height', availableHeight) - .attr('width', w1(rangeAvg)) - .attr('x', xp1(rangeAvg)) - .datum(rangeAvg) - /* - .attr('width', rangeMax <= 0 ? - x1(rangeMax) - x1(rangeAvg) - : x1(rangeAvg) - x1(rangeMin)) - .attr('x', rangeMax <= 0 ? - x1(rangeAvg) - : x1(rangeMin)) - */ - - g.select('rect.nv-rangeMin') - .attr('height', availableHeight) - .attr('width', w1(rangeMax)) - .attr('x', xp1(rangeMax)) - .attr('width', w1(rangeMax > 0 ? rangeMin : rangeMax)) - .attr('x', xp1(rangeMax > 0 ? rangeMin : rangeMax)) - .datum(rangeMax > 0 ? rangeMin : rangeMax) - /* - .attr('width', rangeMax <= 0 ? - x1(rangeAvg) - x1(rangeMin) - : x1(rangeMax) - x1(rangeAvg)) - .attr('x', rangeMax <= 0 ? - x1(rangeMin) - : x1(rangeAvg)) - */ - - g.select('rect.nv-measure') - .style('fill', color) - .attr('height', availableHeight / 3) - .attr('y', availableHeight / 3) - .attr('width', measurez < 0 ? - x1(0) - x1(measurez[0]) - : x1(measurez[0]) - x1(0)) - .attr('x', xp1(measurez)) - .on('mouseover', function() { - dispatch.elementMouseover({ - value: measurez[0], - label: 'Current', - pos: [x1(measurez[0]), availableHeight/2] - }) - }) - .on('mouseout', function() { - dispatch.elementMouseout({ - value: measurez[0], - label: 'Current' - }) - }) - - var h3 = availableHeight / 6; - if (markerz[0]) { - g.selectAll('path.nv-markerTriangle') - .attr('transform', function(d) { return 'translate(' + x1(markerz[0]) + ',' + (availableHeight / 2) + ')' }) - .attr('d', 'M0,' + h3 + 'L' + h3 + ',' + (-h3) + ' ' + (-h3) + ',' + (-h3) + 'Z') - .on('mouseover', function() { - dispatch.elementMouseover({ - value: markerz[0], - label: 'Previous', - pos: [x1(markerz[0]), availableHeight/2] - }) - }) - .on('mouseout', function() { - dispatch.elementMouseout({ - value: markerz[0], - label: 'Previous' - }) - }); - } else { - g.selectAll('path.nv-markerTriangle').remove(); - } - - - wrap.selectAll('.nv-range') - .on('mouseover', function(d,i) { - var label = !i ? "Maximum" : i == 1 ? "Mean" : "Minimum"; - - dispatch.elementMouseover({ - value: d, - label: label, - pos: [x1(d), availableHeight/2] - }) - }) - .on('mouseout', function(d,i) { - var label = !i ? "Maximum" : i == 1 ? "Mean" : "Minimum"; - - dispatch.elementMouseout({ - value: d, - label: label - }) - }) - -/* // THIS IS THE PREVIOUS BULLET IMPLEMENTATION, WILL REMOVE SHORTLY - // Update the range rects. - var range = g.selectAll('rect.nv-range') - .data(rangez); - - range.enter().append('rect') - .attr('class', function(d, i) { return 'nv-range nv-s' + i; }) - .attr('width', w0) - .attr('height', availableHeight) - .attr('x', reverse ? x0 : 0) - .on('mouseover', function(d,i) { - dispatch.elementMouseover({ - value: d, - label: (i <= 0) ? 'Maximum' : (i > 1) ? 'Minimum' : 'Mean', //TODO: make these labels a variable - pos: [x1(d), availableHeight/2] - }) - }) - .on('mouseout', function(d,i) { - dispatch.elementMouseout({ - value: d, - label: (i <= 0) ? 'Minimum' : (i >=1) ? 'Maximum' : 'Mean' //TODO: make these labels a variable - }) - }) - - d3.transition(range) - .attr('x', reverse ? x1 : 0) - .attr('width', w1) - .attr('height', availableHeight); - - - // Update the measure rects. - var measure = g.selectAll('rect.nv-measure') - .data(measurez); - - measure.enter().append('rect') - .attr('class', function(d, i) { return 'nv-measure nv-s' + i; }) - .style('fill', function(d,i) { return color(d,i ) }) - .attr('width', w0) - .attr('height', availableHeight / 3) - .attr('x', reverse ? x0 : 0) - .attr('y', availableHeight / 3) - .on('mouseover', function(d) { - dispatch.elementMouseover({ - value: d, - label: 'Current', //TODO: make these labels a variable - pos: [x1(d), availableHeight/2] - }) - }) - .on('mouseout', function(d) { - dispatch.elementMouseout({ - value: d, - label: 'Current' //TODO: make these labels a variable - }) - }) - - d3.transition(measure) - .attr('width', w1) - .attr('height', availableHeight / 3) - .attr('x', reverse ? x1 : 0) - .attr('y', availableHeight / 3); - - - - // Update the marker lines. - var marker = g.selectAll('path.nv-markerTriangle') - .data(markerz); - - var h3 = availableHeight / 6; - marker.enter().append('path') - .attr('class', 'nv-markerTriangle') - .attr('transform', function(d) { return 'translate(' + x0(d) + ',' + (availableHeight / 2) + ')' }) - .attr('d', 'M0,' + h3 + 'L' + h3 + ',' + (-h3) + ' ' + (-h3) + ',' + (-h3) + 'Z') - .on('mouseover', function(d,i) { - dispatch.elementMouseover({ - value: d, - label: 'Previous', - pos: [x1(d), availableHeight/2] - }) - }) - .on('mouseout', function(d,i) { - dispatch.elementMouseout({ - value: d, - label: 'Previous' - }) - }); - - d3.transition(marker) - .attr('transform', function(d) { return 'translate(' + (x1(d) - x1(0)) + ',' + (availableHeight / 2) + ')' }); - - marker.exit().remove(); -*/ - - }); - - // d3.timer.flush(); // Not needed? - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - // left, right, top, bottom - chart.orient = function(_) { - if (!arguments.length) return orient; - orient = _; - reverse = orient == 'right' || orient == 'bottom'; - return chart; - }; - - // ranges (bad, satisfactory, good) - chart.ranges = function(_) { - if (!arguments.length) return ranges; - ranges = _; - return chart; - }; - - // markers (previous, goal) - chart.markers = function(_) { - if (!arguments.length) return markers; - markers = _; - return chart; - }; - - // measures (actual, forecast) - chart.measures = function(_) { - if (!arguments.length) return measures; - measures = _; - return chart; - }; - - chart.forceX = function(_) { - if (!arguments.length) return forceX; - forceX = _; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.tickFormat = function(_) { - if (!arguments.length) return tickFormat; - tickFormat = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - //============================================================ - - - return chart; -}; - - - -// Chart design based on the recommendations of Stephen Few. Implementation -// based on the work of Clint Ivy, Jamie Love, and Jason Davies. -// http://projects.instantcognition.com/protovis/bulletchart/ -nv.models.bulletChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var bullet = nv.models.bullet() - ; - - var orient = 'left' // TODO top & bottom - , reverse = false - , margin = {top: 5, right: 40, bottom: 20, left: 120} - , ranges = function(d) { return d.ranges } - , markers = function(d) { return d.markers } - , measures = function(d) { return d.measures } - , width = null - , height = 55 - , tickFormat = null - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + x + '</h3>' + - '<p>' + y + '</p>' - } - , noData = 'No Data Available.' - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ) + margin.left, - top = e.pos[1] + ( offsetElement.offsetTop || 0) + margin.top, - content = tooltip(e.key, e.label, e.value, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'e' : 'w', null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(d, i) { - var container = d3.select(this); - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - that = this; - - - chart.update = function() { chart(selection) }; - chart.container = this; - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!d || !ranges.call(this, d, i)) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', 18 + margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - - var rangez = ranges.call(this, d, i).slice().sort(d3.descending), - markerz = markers.call(this, d, i).slice().sort(d3.descending), - measurez = measures.call(this, d, i).slice().sort(d3.descending); - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-bulletChart').data([d]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-bulletChart'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-bulletWrap'); - gEnter.append('g').attr('class', 'nv-titles'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - // Compute the new x-scale. - var x1 = d3.scale.linear() - .domain([0, Math.max(rangez[0], markerz[0], measurez[0])]) // TODO: need to allow forceX and forceY, and xDomain, yDomain - .range(reverse ? [availableWidth, 0] : [0, availableWidth]); - - // Retrieve the old x-scale, if this is an update. - var x0 = this.__chart__ || d3.scale.linear() - .domain([0, Infinity]) - .range(x1.range()); - - // Stash the new scale. - this.__chart__ = x1; - - /* - // Derive width-scales from the x-scales. - var w0 = bulletWidth(x0), - w1 = bulletWidth(x1); - - function bulletWidth(x) { - var x0 = x(0); - return function(d) { - return Math.abs(x(d) - x(0)); - }; - } - - function bulletTranslate(x) { - return function(d) { - return 'translate(' + x(d) + ',0)'; - }; - } - */ - - var w0 = function(d) { return Math.abs(x0(d) - x0(0)) }, // TODO: could optimize by precalculating x0(0) and x1(0) - w1 = function(d) { return Math.abs(x1(d) - x1(0)) }; - - - var title = gEnter.select('.nv-titles').append('g') - .attr('text-anchor', 'end') - .attr('transform', 'translate(-6,' + (height - margin.top - margin.bottom) / 2 + ')'); - title.append('text') - .attr('class', 'nv-title') - .text(function(d) { return d.title; }); - - title.append('text') - .attr('class', 'nv-subtitle') - .attr('dy', '1em') - .text(function(d) { return d.subtitle; }); - - - - bullet - .width(availableWidth) - .height(availableHeight) - - var bulletWrap = g.select('.nv-bulletWrap'); - - d3.transition(bulletWrap).call(bullet); - - - - // Compute the tick format. - var format = tickFormat || x1.tickFormat( availableWidth / 100 ); - - // Update the tick groups. - var tick = g.selectAll('g.nv-tick') - .data(x1.ticks( availableWidth / 50 ), function(d) { - return this.textContent || format(d); - }); - - // Initialize the ticks with the old scale, x0. - var tickEnter = tick.enter().append('g') - .attr('class', 'nv-tick') - .attr('transform', function(d) { return 'translate(' + x0(d) + ',0)' }) - .style('opacity', 1e-6); - - tickEnter.append('line') - .attr('y1', availableHeight) - .attr('y2', availableHeight * 7 / 6); - - tickEnter.append('text') - .attr('text-anchor', 'middle') - .attr('dy', '1em') - .attr('y', availableHeight * 7 / 6) - .text(format); - - - // Transition the updating ticks to the new scale, x1. - var tickUpdate = d3.transition(tick) - .attr('transform', function(d) { return 'translate(' + x1(d) + ',0)' }) - .style('opacity', 1); - - tickUpdate.select('line') - .attr('y1', availableHeight) - .attr('y2', availableHeight * 7 / 6); - - tickUpdate.select('text') - .attr('y', availableHeight * 7 / 6); - - // Transition the exiting ticks to the new scale, x1. - d3.transition(tick.exit()) - .attr('transform', function(d) { return 'translate(' + x1(d) + ',0)' }) - .style('opacity', 1e-6) - .remove(); - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - dispatch.on('tooltipShow', function(e) { - e.key = d.title; - if (tooltips) showTooltip(e, that.parentNode); - }); - - //============================================================ - - }); - - d3.timer.flush(); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - bullet.dispatch.on('elementMouseover.tooltip', function(e) { - dispatch.tooltipShow(e); - }); - - bullet.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - chart.bullet = bullet; - - d3.rebind(chart, bullet, 'color'); - - // left, right, top, bottom - chart.orient = function(x) { - if (!arguments.length) return orient; - orient = x; - reverse = orient == 'right' || orient == 'bottom'; - return chart; - }; - - // ranges (bad, satisfactory, good) - chart.ranges = function(x) { - if (!arguments.length) return ranges; - ranges = x; - return chart; - }; - - // markers (previous, goal) - chart.markers = function(x) { - if (!arguments.length) return markers; - markers = x; - return chart; - }; - - // measures (actual, forecast) - chart.measures = function(x) { - if (!arguments.length) return measures; - measures = x; - return chart; - }; - - chart.width = function(x) { - if (!arguments.length) return width; - width = x; - return chart; - }; - - chart.height = function(x) { - if (!arguments.length) return height; - height = x; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.tickFormat = function(x) { - if (!arguments.length) return tickFormat; - tickFormat = x; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -}; - - - -nv.models.cumulativeLineChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var lines = nv.models.line() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - , controls = nv.models.legend() - ; - - var margin = {top: 30, right: 30, bottom: 50, left: 60} - , color = nv.utils.defaultColor() - , width = null - , height = null - , showLegend = true - , tooltips = true - , showControls = true - , rescaleY = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>' - } - , x //can be accessed via chart.xScale() - , y //can be accessed via chart.yScale() - , id = lines.id() - , state = { index: 0, rescaleY: rescaleY } - , defaultState = null - , noData = 'No Data Available.' - , average = function(d) { return d.average } - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - ; - - xAxis - .orient('bottom') - .tickPadding(7) - ; - yAxis - .orient('left') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var dx = d3.scale.linear() - , index = {i: 0, x: 0} - ; - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(lines.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(lines.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, null, null, offsetElement); - }; - -/* - //Moved to see if we can get better behavior to fix issue #315 - var indexDrag = d3.behavior.drag() - .on('dragstart', dragStart) - .on('drag', dragMove) - .on('dragend', dragEnd); - - function dragStart(d,i) { - d3.select(chart.container) - .style('cursor', 'ew-resize'); - } - - function dragMove(d,i) { - d.x += d3.event.dx; - d.i = Math.round(dx.invert(d.x)); - - d3.select(this).attr('transform', 'translate(' + dx(d.i) + ',0)'); - chart.update(); - } - - function dragEnd(d,i) { - d3.select(chart.container) - .style('cursor', 'auto'); - chart.update(); - } -*/ - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this).classed('nv-chart-' + id, true), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - - chart.update = function() { container.transition().call(chart) }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - var indexDrag = d3.behavior.drag() - .on('dragstart', dragStart) - .on('drag', dragMove) - .on('dragend', dragEnd); - - - function dragStart(d,i) { - d3.select(chart.container) - .style('cursor', 'ew-resize'); - } - - function dragMove(d,i) { - index.x = d3.event.x; - index.i = Math.round(dx.invert(index.x)); - updateZero(); - } - - function dragEnd(d,i) { - d3.select(chart.container) - .style('cursor', 'auto'); - - // update state and send stateChange with new index - state.index = index.i; - dispatch.stateChange(state); - } - - - - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = lines.xScale(); - y = lines.yScale(); - - - if (!rescaleY) { - var seriesDomains = data - .filter(function(series) { return !series.disabled }) - .map(function(series,i) { - var initialDomain = d3.extent(series.values, lines.y()); - - //account for series being disabled when losing 95% or more - if (initialDomain[0] < -.95) initialDomain[0] = -.95; - - return [ - (initialDomain[0] - initialDomain[1]) / (1 + initialDomain[1]), - (initialDomain[1] - initialDomain[0]) / (1 + initialDomain[0]) - ]; - }); - - var completeDomain = [ - d3.min(seriesDomains, function(d) { return d[0] }), - d3.max(seriesDomains, function(d) { return d[1] }) - ] - - lines.yDomain(completeDomain); - } else { - lines.yDomain(null); - } - - - dx .domain([0, data[0].values.length - 1]) //Assumes all series have same length - .range([0, availableWidth]) - .clamp(true); - - //------------------------------------------------------------ - - - var data = indexify(index.i, data); - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-cumulativeLine').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-cumulativeLine').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-background'); - gEnter.append('g').attr('class', 'nv-linesWrap'); - gEnter.append('g').attr('class', 'nv-avgLinesWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - gEnter.append('g').attr('class', 'nv-controlsWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width(availableWidth); - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(0,' + (-margin.top) +')') - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Controls - - if (showControls) { - var controlsData = [ - { key: 'Re-scale y-axis', disabled: !rescaleY } - ]; - - controls.width(140).color(['#444', '#444', '#444']); - g.select('.nv-controlsWrap') - .datum(controlsData) - .attr('transform', 'translate(0,' + (-margin.top) +')') - .call(controls); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - // Show error if series goes below 100% - var tempDisabled = data.filter(function(d) { return d.tempDisabled }); - - wrap.select('.tempDisabled').remove(); //clean-up and prevent duplicates - if (tempDisabled.length) { - wrap.append('text').attr('class', 'tempDisabled') - .attr('x', availableWidth / 2) - .attr('y', '-.71em') - .style('text-anchor', 'end') - .text(tempDisabled.map(function(d) { return d.key }).join(', ') + ' values cannot be calculated for this time period.'); - } - - //------------------------------------------------------------ - // Main Chart Component(s) - - gEnter.select('.nv-background') - .append('rect'); - - g.select('.nv-background rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - lines - //.x(function(d) { return d.x }) - .y(function(d) { return d.display.y }) - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && !data[i].tempDisabled; })); - - - - var linesWrap = g.select('.nv-linesWrap') - .datum(data.filter(function(d) { return !d.disabled && !d.tempDisabled })); - - //d3.transition(linesWrap).call(lines); - linesWrap.call(lines); - - /*Handle average lines [AN-612] ----------------------------*/ - - //Store a series index number in the data array. - data.forEach(function(d,i) { - d.seriesIndex = i; - }); - - var avgLineData = data.filter(function(d) { - return !d.disabled && !!average(d); - }); - - var avgLines = g.select(".nv-avgLinesWrap").selectAll("line") - .data(avgLineData, function(d) { return d.key; }); - - avgLines.enter() - .append('line') - .style('stroke-width',2) - .style('stroke-dasharray','10,10') - .style('stroke',function (d,i) { - return lines.color()(d,d.seriesIndex); - }) - .attr('x1',0) - .attr('x2',availableWidth) - .attr('y1', function(d) { return y(average(d)); }) - .attr('y2', function(d) { return y(average(d)); }); - - avgLines - .attr('x1',0) - .attr('x2',availableWidth) - .attr('y1', function(d) { return y(average(d)); }) - .attr('y2', function(d) { return y(average(d)); }); - - avgLines.exit().remove(); - - //Create index line ----------------------------------------- - - var indexLine = linesWrap.selectAll('.nv-indexLine') - .data([index]); - indexLine.enter().append('rect').attr('class', 'nv-indexLine') - .attr('width', 3) - .attr('x', -2) - .attr('fill', 'red') - .attr('fill-opacity', .5) - .call(indexDrag) - - indexLine - .attr('transform', function(d) { return 'translate(' + dx(d.i) + ',0)' }) - .attr('height', availableHeight) - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - //Suggest how many ticks based on the chart width and D3 should listen (70 is the optimal number for MM/DD/YY dates) - .ticks( Math.min(data[0].values.length,availableWidth/70) ) - .tickSize(-availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y.range()[0] + ')'); - d3.transition(g.select('.nv-x.nv-axis')) - .call(xAxis); - - - yAxis - .scale(y) - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - d3.transition(g.select('.nv-y.nv-axis')) - .call(yAxis); - - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - - function updateZero() { - indexLine - .data([index]); - - container.call(chart); - } - - g.select('.nv-background rect') - .on('click', function() { - index.x = d3.mouse(this)[0]; - index.i = Math.round(dx.invert(index.x)); - - // update state and send stateChange with new index - state.index = index.i; - dispatch.stateChange(state); - - updateZero(); - }); - - lines.dispatch.on('elementClick', function(e) { - index.i = e.pointIndex; - index.x = dx(index.i); - - // update state and send stateChange with new index - state.index = index.i; - dispatch.stateChange(state); - - updateZero(); - }); - - controls.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - rescaleY = !d.disabled; - - state.rescaleY = rescaleY; - dispatch.stateChange(state); - - //selection.transition().call(chart); - chart.update(); - }); - - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - //selection.transition().call(chart); - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - -/* - // - legend.dispatch.on('legendMouseover', function(d, i) { - d.hover = true; - selection.transition().call(chart) - }); - - legend.dispatch.on('legendMouseout', function(d, i) { - d.hover = false; - selection.transition().call(chart) - }); -*/ - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - - if (typeof e.index !== 'undefined') { - index.i = e.index; - index.x = dx(index.i); - - state.index = e.index; - - indexLine - .data([index]); - } - - - if (typeof e.rescaleY !== 'undefined') { - rescaleY = e.rescaleY; - } - - chart.update(); - }); - - //============================================================ - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - lines.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.lines = lines; - chart.legend = legend; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, lines, 'defined', 'isArea', 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.rescaleY = function(_) { - if (!arguments.length) return rescaleY; - rescaleY = _ - return rescaleY; - }; - - chart.showControls = function(_) { - if (!arguments.length) return showControls; - showControls = _; - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - chart.average = function(_) { - if(!arguments.length) return average; - average = _; - return chart; - }; - - //============================================================ - - - //============================================================ - // Functions - //------------------------------------------------------------ - - /* Normalize the data according to an index point. */ - function indexify(idx, data) { - return data.map(function(line, i) { - if (!line.values) { - return line; - } - var v = lines.y()(line.values[idx], idx); - - //TODO: implement check below, and disable series if series loses 100% or more cause divide by 0 issue - if (v < -.95) { - //if a series loses more than 100%, calculations fail.. anything close can cause major distortion (but is mathematically correct till it hits 100) - line.tempDisabled = true; - return line; - } - - line.tempDisabled = false; - - line.values = line.values.map(function(point, pointIndex) { - point.display = {'y': (lines.y()(point, pointIndex) - v) / (1 + v) }; - return point; - }) - - return line; - }) - } - - //============================================================ - - - return chart; -} -//TODO: consider deprecating by adding necessary features to multiBar model -nv.models.discreteBar = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one - , x = d3.scale.ordinal() - , y = d3.scale.linear() - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , forceY = [0] // 0 is forced by default.. this makes sense for the majority of bar graphs... user can always do chart.forceY([]) to remove - , color = nv.utils.defaultColor() - , showValues = false - , valueFormat = d3.format(',.2f') - , xDomain - , yDomain - , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout') - , rectClass = 'discreteBar' - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - - //add series index to each data point for reference - data = data.map(function(series, i) { - series.values = series.values.map(function(point) { - point.series = i; - return point; - }); - return series; - }); - - - //------------------------------------------------------------ - // Setup Scales - - // remap and flatten the data for use in calculating the scales' domains - var seriesData = (xDomain && yDomain) ? [] : // if we know xDomain and yDomain, no need to calculate - data.map(function(d) { - return d.values.map(function(d,i) { - return { x: getX(d,i), y: getY(d,i), y0: d.y0 } - }) - }); - - x .domain(xDomain || d3.merge(seriesData).map(function(d) { return d.x })) - .rangeBands([0, availableWidth], .1); - - y .domain(yDomain || d3.extent(d3.merge(seriesData).map(function(d) { return d.y }).concat(forceY))); - - - // If showValues, pad the Y axis range to account for label height - if (showValues) y.range([availableHeight - (y.domain()[0] < 0 ? 12 : 0), y.domain()[1] > 0 ? 12 : 0]); - else y.range([availableHeight, 0]); - - //store old scales if they exist - x0 = x0 || x; - y0 = y0 || y.copy().range([y(0),y(0)]); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-discretebar').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-discretebar'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-groups'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - - //TODO: by definition, the discrete bar should not have multiple groups, will modify/remove later - var groups = wrap.select('.nv-groups').selectAll('.nv-group') - .data(function(d) { return d }, function(d) { return d.key }); - groups.enter().append('g') - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6); - d3.transition(groups.exit()) - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6) - .remove(); - groups - .attr('class', function(d,i) { return 'nv-group nv-series-' + i }) - .classed('hover', function(d) { return d.hover }); - d3.transition(groups) - .style('stroke-opacity', 1) - .style('fill-opacity', .75); - - - var bars = groups.selectAll('g.nv-bar') - .data(function(d) { return d.values }); - - bars.exit().remove(); - - - var barsEnter = bars.enter().append('g') - .attr('transform', function(d,i,j) { - return 'translate(' + (x(getX(d,i)) + x.rangeBand() * .05 ) + ', ' + y(0) + ')' - }) - .on('mouseover', function(d,i) { //TODO: figure out why j works above, but not here - d3.select(this).classed('hover', true); - dispatch.elementMouseover({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (d.series + .5) / data.length), y(getY(d,i))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - }) - .on('mouseout', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.elementMouseout({ - value: getY(d,i), - point: d, - series: data[d.series], - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - }) - .on('click', function(d,i) { - dispatch.elementClick({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (d.series + .5) / data.length), y(getY(d,i))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - d3.event.stopPropagation(); - }) - .on('dblclick', function(d,i) { - dispatch.elementDblClick({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (d.series + .5) / data.length), y(getY(d,i))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - d3.event.stopPropagation(); - }); - - barsEnter.append('rect') - .attr('height', 0) - .attr('width', x.rangeBand() * .9 / data.length ) - - if (showValues) { - barsEnter.append('text') - .attr('text-anchor', 'middle') - bars.select('text') - .attr('x', x.rangeBand() * .9 / 2) - .attr('y', function(d,i) { return getY(d,i) < 0 ? y(getY(d,i)) - y(0) + 12 : -4 }) - .text(function(d,i) { return valueFormat(getY(d,i)) }); - } else { - bars.selectAll('text').remove(); - } - - bars - .attr('class', function(d,i) { return getY(d,i) < 0 ? 'nv-bar negative' : 'nv-bar positive' }) - .style('fill', function(d,i) { return d.color || color(d,i) }) - .style('stroke', function(d,i) { return d.color || color(d,i) }) - .select('rect') - .attr('class', rectClass) - .attr('width', x.rangeBand() * .9 / data.length); - d3.transition(bars) - //.delay(function(d,i) { return i * 1200 / data[0].values.length }) - .attr('transform', function(d,i) { - var left = x(getX(d,i)) + x.rangeBand() * .05, - top = getY(d,i) < 0 ? - y(0) : - y(0) - y(getY(d,i)) < 1 ? - y(0) - 1 : //make 1 px positive bars show up above y=0 - y(getY(d,i)); - - return 'translate(' + left + ', ' + top + ')' - }) - .select('rect') - .attr('height', function(d,i) { - return Math.max(Math.abs(y(getY(d,i)) - y(0)) || 1) - }); - - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.forceY = function(_) { - if (!arguments.length) return forceY; - forceY = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - chart.showValues = function(_) { - if (!arguments.length) return showValues; - showValues = _; - return chart; - }; - - chart.valueFormat= function(_) { - if (!arguments.length) return valueFormat; - valueFormat = _; - return chart; - }; - - chart.rectClass= function(_) { - if (!arguments.length) return rectClass; - rectClass = _; - return chart; - } - //============================================================ - - - return chart; -} - -nv.models.discreteBarChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var discretebar = nv.models.discreteBar() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - ; - - var margin = {top: 15, right: 10, bottom: 50, left: 60} - , width = null - , height = null - , color = nv.utils.getColor() - , staggerLabels = false - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + x + '</h3>' + - '<p>' + y + '</p>' - } - , x - , y - , noData = "No Data Available." - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'beforeUpdate') - ; - - xAxis - .orient('bottom') - .highlightZero(false) - .showMaxMin(false) - .tickFormat(function(d) { return d }) - ; - yAxis - .orient('left') - .tickFormat(d3.format(',.1f')) - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(discretebar.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(discretebar.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - - chart.update = function() { dispatch.beforeUpdate(); container.transition().call(chart); }; - chart.container = this; - - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = discretebar.xScale(); - y = discretebar.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-discreteBarWithAxes').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-discreteBarWithAxes').append('g'); - var defsEnter = gEnter.append('defs'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-barsWrap'); - - g.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Main Chart Component(s) - - discretebar - .width(availableWidth) - .height(availableHeight); - - - var barsWrap = g.select('.nv-barsWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(barsWrap).call(discretebar); - - //------------------------------------------------------------ - - - - defsEnter.append('clipPath') - .attr('id', 'nv-x-label-clip-' + discretebar.id()) - .append('rect'); - - g.select('#nv-x-label-clip-' + discretebar.id() + ' rect') - .attr('width', x.rangeBand() * (staggerLabels ? 2 : 1)) - .attr('height', 16) - .attr('x', -x.rangeBand() / (staggerLabels ? 1 : 2 )); - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + (y.range()[0] + ((discretebar.showValues() && y.domain()[0] < 0) ? 16 : 0)) + ')'); - //d3.transition(g.select('.nv-x.nv-axis')) - g.select('.nv-x.nv-axis').transition().duration(0) - .call(xAxis); - - - var xTicks = g.select('.nv-x.nv-axis').selectAll('g'); - - if (staggerLabels) { - xTicks - .selectAll('text') - .attr('transform', function(d,i,j) { return 'translate(0,' + (j % 2 == 0 ? '5' : '17') + ')' }) - } - - yAxis - .scale(y) - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - d3.transition(g.select('.nv-y.nv-axis')) - .call(yAxis); - - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - //============================================================ - - - }); - - return chart; - } - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - discretebar.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - discretebar.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.discretebar = discretebar; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, discretebar, 'x', 'y', 'xDomain', 'yDomain', 'forceX', 'forceY', 'id', 'showValues', 'valueFormat'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - discretebar.color(color); - return chart; - }; - - chart.staggerLabels = function(_) { - if (!arguments.length) return staggerLabels; - staggerLabels = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.distribution = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 400 //technically width or height depending on x or y.... - , size = 8 - , axis = 'x' // 'x' or 'y'... horizontal or vertical - , getData = function(d) { return d[axis] } // defaults d.x or d.y - , color = nv.utils.defaultColor() - , scale = d3.scale.linear() - , domain - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var scale0; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableLength = width - (axis === 'x' ? margin.left + margin.right : margin.top + margin.bottom), - naxis = axis == 'x' ? 'y' : 'x', - container = d3.select(this); - - - //------------------------------------------------------------ - // Setup Scales - - scale0 = scale0 || scale; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-distribution').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-distribution'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')') - - //------------------------------------------------------------ - - - var distWrap = g.selectAll('g.nv-dist') - .data(function(d) { return d }, function(d) { return d.key }); - - distWrap.enter().append('g'); - distWrap - .attr('class', function(d,i) { return 'nv-dist nv-series-' + i }) - .style('stroke', function(d,i) { return color(d, i) }); - - var dist = distWrap.selectAll('line.nv-dist' + axis) - .data(function(d) { return d.values }) - dist.enter().append('line') - .attr(axis + '1', function(d,i) { return scale0(getData(d,i)) }) - .attr(axis + '2', function(d,i) { return scale0(getData(d,i)) }) - d3.transition(distWrap.exit().selectAll('line.nv-dist' + axis)) - .attr(axis + '1', function(d,i) { return scale(getData(d,i)) }) - .attr(axis + '2', function(d,i) { return scale(getData(d,i)) }) - .style('stroke-opacity', 0) - .remove(); - dist - .attr('class', function(d,i) { return 'nv-dist' + axis + ' nv-dist' + axis + '-' + i }) - .attr(naxis + '1', 0) - .attr(naxis + '2', size); - d3.transition(dist) - .attr(axis + '1', function(d,i) { return scale(getData(d,i)) }) - .attr(axis + '2', function(d,i) { return scale(getData(d,i)) }) - - - scale0 = scale.copy(); - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.axis = function(_) { - if (!arguments.length) return axis; - axis = _; - return chart; - }; - - chart.size = function(_) { - if (!arguments.length) return size; - size = _; - return chart; - }; - - chart.getData = function(_) { - if (!arguments.length) return getData; - getData = d3.functor(_); - return chart; - }; - - chart.scale = function(_) { - if (!arguments.length) return scale; - scale = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - //============================================================ - - - return chart; -} -//TODO: consider deprecating and using multibar with single series for this -nv.models.historicalBar = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one - , x = d3.scale.linear() - , y = d3.scale.linear() - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , forceX = [] - , forceY = [0] - , padData = false - , clipEdge = true - , color = nv.utils.defaultColor() - , xDomain - , yDomain - , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout') - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - - //------------------------------------------------------------ - // Setup Scales - - x .domain(xDomain || d3.extent(data[0].values.map(getX).concat(forceX) )) - - if (padData) - x.range([availableWidth * .5 / data[0].values.length, availableWidth * (data[0].values.length - .5) / data[0].values.length ]); - else - x.range([0, availableWidth]); - - y .domain(yDomain || d3.extent(data[0].values.map(getY).concat(forceY) )) - .range([availableHeight, 0]); - - // If scale's domain don't have a range, slightly adjust to make one... so a chart can show a single data point - if (x.domain()[0] === x.domain()[1] || y.domain()[0] === y.domain()[1]) singlePoint = true; - if (x.domain()[0] === x.domain()[1]) - x.domain()[0] ? - x.domain([x.domain()[0] - x.domain()[0] * 0.01, x.domain()[1] + x.domain()[1] * 0.01]) - : x.domain([-1,1]); - - if (y.domain()[0] === y.domain()[1]) - y.domain()[0] ? - y.domain([y.domain()[0] + y.domain()[0] * 0.01, y.domain()[1] - y.domain()[1] * 0.01]) - : y.domain([-1,1]); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-bar').data([data[0].values]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-bar'); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-bars'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - container - .on('click', function(d,i) { - dispatch.chartClick({ - data: d, - index: i, - pos: d3.event, - id: id - }); - }); - - - defsEnter.append('clipPath') - .attr('id', 'nv-chart-clip-path-' + id) - .append('rect'); - - wrap.select('#nv-chart-clip-path-' + id + ' rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g .attr('clip-path', clipEdge ? 'url(#nv-chart-clip-path-' + id + ')' : ''); - - - - var bars = wrap.select('.nv-bars').selectAll('.nv-bar') - .data(function(d) { return d }); - - bars.exit().remove(); - - - var barsEnter = bars.enter().append('rect') - //.attr('class', function(d,i,j) { return (getY(d,i) < 0 ? 'nv-bar negative' : 'nv-bar positive') + ' nv-bar-' + j + '-' + i }) - .attr('x', 0 ) - .attr('y', function(d,i) { return y(Math.max(0, getY(d,i))) }) - .attr('height', function(d,i) { return Math.abs(y(getY(d,i)) - y(0)) }) - .on('mouseover', function(d,i) { - d3.select(this).classed('hover', true); - dispatch.elementMouseover({ - point: d, - series: data[0], - pos: [x(getX(d,i)), y(getY(d,i))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: 0, - e: d3.event - }); - - }) - .on('mouseout', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.elementMouseout({ - point: d, - series: data[0], - pointIndex: i, - seriesIndex: 0, - e: d3.event - }); - }) - .on('click', function(d,i) { - dispatch.elementClick({ - //label: d[label], - value: getY(d,i), - data: d, - index: i, - pos: [x(getX(d,i)), y(getY(d,i))], - e: d3.event, - id: id - }); - d3.event.stopPropagation(); - }) - .on('dblclick', function(d,i) { - dispatch.elementDblClick({ - //label: d[label], - value: getY(d,i), - data: d, - index: i, - pos: [x(getX(d,i)), y(getY(d,i))], - e: d3.event, - id: id - }); - d3.event.stopPropagation(); - }); - - bars - .attr('fill', function(d,i) { return color(d, i); }) - .attr('class', function(d,i,j) { return (getY(d,i) < 0 ? 'nv-bar negative' : 'nv-bar positive') + ' nv-bar-' + j + '-' + i }) - .attr('transform', function(d,i) { return 'translate(' + (x(getX(d,i)) - availableWidth / data[0].values.length * .45) + ',0)'; }) //TODO: better width calculations that don't assume always uniform data spacing;w - .attr('width', (availableWidth / data[0].values.length) * .9 ) - - - d3.transition(bars) - //.attr('y', function(d,i) { return y(Math.max(0, getY(d,i))) }) - .attr('y', function(d,i) { - return getY(d,i) < 0 ? - y(0) : - y(0) - y(getY(d,i)) < 1 ? - y(0) - 1 : - y(getY(d,i)) - }) - .attr('height', function(d,i) { return Math.max(Math.abs(y(getY(d,i)) - y(0)),1) }); - //.order(); // not sure if this makes any sense for this model - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.forceX = function(_) { - if (!arguments.length) return forceX; - forceX = _; - return chart; - }; - - chart.forceY = function(_) { - if (!arguments.length) return forceY; - forceY = _; - return chart; - }; - - chart.padData = function(_) { - if (!arguments.length) return padData; - padData = _; - return chart; - }; - - chart.clipEdge = function(_) { - if (!arguments.length) return clipEdge; - clipEdge = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.historicalBarChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var bars = nv.models.historicalBar() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - ; - - - var margin = {top: 30, right: 90, bottom: 50, left: 90} - , color = nv.utils.defaultColor() - , width = null - , height = null - , showLegend = false - , showXAxis = true - , showYAxis = true - , rightAlignYAxis = false - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>' - } - , x - , y - , state = {} - , defaultState = null - , noData = 'No Data Available.' - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - ; - - xAxis - .orient('bottom') - .tickPadding(7) - ; - yAxis - .orient( (rightAlignYAxis) ? 'right' : 'left') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - - // New addition to calculate position if SVG is scaled with viewBox, may move TODO: consider implementing everywhere else - if (offsetElement) { - var svg = d3.select(offsetElement).select('svg'); - var viewBox = (svg.node()) ? svg.attr('viewBox') : null; - if (viewBox) { - viewBox = viewBox.split(' '); - var ratio = parseInt(svg.style('width')) / viewBox[2]; - e.pos[0] = e.pos[0] * ratio; - e.pos[1] = e.pos[1] * ratio; - } - } - - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(bars.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(bars.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, null, null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - - chart.update = function() { chart(selection) }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display noData message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = bars.xScale(); - y = bars.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-lineChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-lineChart').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-barsWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width(availableWidth); - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - wrap.select('.nv-legendWrap') - .attr('transform', 'translate(0,' + (-margin.top) +')') - } - - //------------------------------------------------------------ - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - if (rightAlignYAxis) { - g.select(".nv-y.nv-axis") - .attr("transform", "translate(" + availableWidth + ",0)"); - } - - - //------------------------------------------------------------ - // Main Chart Component(s) - - bars - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - - - var barsWrap = g.select('.nv-barsWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(barsWrap).call(bars); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - if (showXAxis) { - xAxis - .scale(x) - .tickSize(-availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y.range()[0] + ')'); - g.select('.nv-x.nv-axis') - .transition() - .call(xAxis); - } - - if (showYAxis) { - yAxis - .scale(y) - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - g.select('.nv-y.nv-axis') - .transition().duration(0) - .call(yAxis); - } - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - selection.transition().call(chart); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - -/* - legend.dispatch.on('legendMouseover', function(d, i) { - d.hover = true; - selection.transition().call(chart) - }); - - legend.dispatch.on('legendMouseout', function(d, i) { - d.hover = false; - selection.transition().call(chart) - }); -*/ - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - selection.call(chart); - }); - - //============================================================ - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - bars.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - bars.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.bars = bars; - chart.legend = legend; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, bars, 'defined', 'isArea', 'x', 'y', 'size', 'xScale', 'yScale', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id', 'interpolate'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.showXAxis = function(_) { - if (!arguments.length) return showXAxis; - showXAxis = _; - return chart; - }; - - chart.showYAxis = function(_) { - if (!arguments.length) return showYAxis; - showYAxis = _; - return chart; - }; - - chart.rightAlignYAxis = function(_) { - if(!arguments.length) return rightAlignYAxis; - rightAlignYAxis = _; - yAxis.orient( (_) ? 'right' : 'left'); - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} -nv.models.indentedTree = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} //TODO: implement, maybe as margin on the containing div - , width = 960 - , height = 500 - , color = nv.utils.defaultColor() - , id = Math.floor(Math.random() * 10000) - , header = true - , filterZero = false - , noData = "No Data Available." - , childIndent = 20 - , columns = [{key:'key', label: 'Name', type:'text'}] //TODO: consider functions like chart.addColumn, chart.removeColumn, instead of a block like this - , tableClass = null - , iconOpen = 'images/grey-plus.png' //TODO: consider removing this and replacing with a '+' or '-' unless user defines images - , iconClose = 'images/grey-minus.png' - , dispatch = d3.dispatch('elementClick', 'elementDblclick', 'elementMouseover', 'elementMouseout') - ; - - //============================================================ - - var idx = 0; - - function chart(selection) { - selection.each(function(data) { - var depth = 1, - container = d3.select(this); - - var tree = d3.layout.tree() - .children(function(d) { return d.values }) - .size([height, childIndent]); //Not sure if this is needed now that the result is HTML - - chart.update = function() { container.transition().duration(600).call(chart) }; - - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - if (!data[0]) data[0] = {key: noData}; - - //------------------------------------------------------------ - - - var nodes = tree.nodes(data[0]); - - // nodes.map(function(d) { - // d.id = i++; - // }) - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = d3.select(this).selectAll('div').data([[nodes]]); - var wrapEnter = wrap.enter().append('div').attr('class', 'nvd3 nv-wrap nv-indentedtree'); - var tableEnter = wrapEnter.append('table'); - var table = wrap.select('table').attr('width', '100%').attr('class', tableClass); - - //------------------------------------------------------------ - - - if (header) { - var thead = tableEnter.append('thead'); - - var theadRow1 = thead.append('tr'); - - columns.forEach(function(column) { - theadRow1 - .append('th') - .attr('width', column.width ? column.width : '10%') - .style('text-align', column.type == 'numeric' ? 'right' : 'left') - .append('span') - .text(column.label); - }); - } - - - var tbody = table.selectAll('tbody') - .data(function(d) { return d }); - tbody.enter().append('tbody'); - - - - //compute max generations - depth = d3.max(nodes, function(node) { return node.depth }); - tree.size([height, depth * childIndent]); //TODO: see if this is necessary at all - - - // Update the nodes… - var node = tbody.selectAll('tr') - // .data(function(d) { return d; }, function(d) { return d.id || (d.id == ++i)}); - .data(function(d) { return d.filter(function(d) { return (filterZero && !d.children) ? filterZero(d) : true; } )}, function(d,i) { return d.id || (d.id || ++idx)}); - //.style('display', 'table-row'); //TODO: see if this does anything - - node.exit().remove(); - - node.select('img.nv-treeicon') - .attr('src', icon) - .classed('folded', folded); - - var nodeEnter = node.enter().append('tr'); - - - columns.forEach(function(column, index) { - - var nodeName = nodeEnter.append('td') - .style('padding-left', function(d) { return (index ? 0 : d.depth * childIndent + 12 + (icon(d) ? 0 : 16)) + 'px' }, 'important') //TODO: check why I did the ternary here - .style('text-align', column.type == 'numeric' ? 'right' : 'left'); - - - if (index == 0) { - nodeName.append('img') - .classed('nv-treeicon', true) - .classed('nv-folded', folded) - .attr('src', icon) - .style('width', '14px') - .style('height', '14px') - .style('padding', '0 1px') - .style('display', function(d) { return icon(d) ? 'inline-block' : 'none'; }) - .on('click', click); - } - - - nodeName.append('span') - .attr('class', d3.functor(column.classes) ) - .text(function(d) { return column.format ? column.format(d) : - (d[column.key] || '-') }); - - if (column.showCount) { - nodeName.append('span') - .attr('class', 'nv-childrenCount'); - - node.selectAll('span.nv-childrenCount').text(function(d) { - return ((d.values && d.values.length) || (d._values && d._values.length)) ? //If this is a parent - '(' + ((d.values && (d.values.filter(function(d) { return filterZero ? filterZero(d) : true; }).length)) //If children are in values check its children and filter - || (d._values && d._values.filter(function(d) { return filterZero ? filterZero(d) : true; }).length) //Otherwise, do the same, but with the other name, _values... - || 0) + ')' //This is the catch-all in case there are no children after a filter - : '' //If this is not a parent, just give an empty string - }); - } - - if (column.click) - nodeName.select('span').on('click', column.click); - - }); - - node - .order() - .on('click', function(d) { - dispatch.elementClick({ - row: this, //TODO: decide whether or not this should be consistent with scatter/line events or should be an html link (a href) - data: d, - pos: [d.x, d.y] - }); - }) - .on('dblclick', function(d) { - dispatch.elementDblclick({ - row: this, - data: d, - pos: [d.x, d.y] - }); - }) - .on('mouseover', function(d) { - dispatch.elementMouseover({ - row: this, - data: d, - pos: [d.x, d.y] - }); - }) - .on('mouseout', function(d) { - dispatch.elementMouseout({ - row: this, - data: d, - pos: [d.x, d.y] - }); - }); - - - - - // Toggle children on click. - function click(d, _, unshift) { - d3.event.stopPropagation(); - - if(d3.event.shiftKey && !unshift) { - //If you shift-click, it'll toggle fold all the children, instead of itself - d3.event.shiftKey = false; - d.values && d.values.forEach(function(node){ - if (node.values || node._values) { - click(node, 0, true); - } - }); - return true; - } - if(!hasChildren(d)) { - //download file - //window.location.href = d.url; - return true; - } - if (d.values) { - d._values = d.values; - d.values = null; - } else { - d.values = d._values; - d._values = null; - } - chart.update(); - } - - - function icon(d) { - return (d._values && d._values.length) ? iconOpen : (d.values && d.values.length) ? iconClose : ''; - } - - function folded(d) { - return (d._values && d._values.length); - } - - function hasChildren(d) { - var values = d.values || d._values; - - return (values && values.length); - } - - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - scatter.color(color); - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - chart.header = function(_) { - if (!arguments.length) return header; - header = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - chart.filterZero = function(_) { - if (!arguments.length) return filterZero; - filterZero = _; - return chart; - }; - - chart.columns = function(_) { - if (!arguments.length) return columns; - columns = _; - return chart; - }; - - chart.tableClass = function(_) { - if (!arguments.length) return tableClass; - tableClass = _; - return chart; - }; - - chart.iconOpen = function(_){ - if (!arguments.length) return iconOpen; - iconOpen = _; - return chart; - } - - chart.iconClose = function(_){ - if (!arguments.length) return iconClose; - iconClose = _; - return chart; - } - - //============================================================ - - - return chart; -};nv.models.legend = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 5, right: 0, bottom: 5, left: 0} - , width = 400 - , height = 20 - , getKey = function(d) { return d.key } - , color = nv.utils.defaultColor() - , align = true - , dispatch = d3.dispatch('legendClick', 'legendDblclick', 'legendMouseover', 'legendMouseout') - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - container = d3.select(this); - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-legend').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-legend').append('g'); - var g = wrap.select('g'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - var series = g.selectAll('.nv-series') - .data(function(d) { return d }); - var seriesEnter = series.enter().append('g').attr('class', 'nv-series') - .on('mouseover', function(d,i) { - dispatch.legendMouseover(d,i); //TODO: Make consistent with other event objects - }) - .on('mouseout', function(d,i) { - dispatch.legendMouseout(d,i); - }) - .on('click', function(d,i) { - dispatch.legendClick(d,i); - }) - .on('dblclick', function(d,i) { - dispatch.legendDblclick(d,i); - }); - seriesEnter.append('circle') - .style('stroke-width', 2) - .attr('r', 5); - seriesEnter.append('text') - .attr('text-anchor', 'start') - .attr('dy', '.32em') - .attr('dx', '8'); - series.classed('disabled', function(d) { return d.disabled }); - series.exit().remove(); - series.select('circle') - .style('fill', function(d,i) { return d.color || color(d,i)}) - .style('stroke', function(d,i) { return d.color || color(d, i) }); - series.select('text').text(getKey); - - - //TODO: implement fixed-width and max-width options (max-width is especially useful with the align option) - - // NEW ALIGNING CODE, TODO: clean up - if (align) { - - var seriesWidths = []; - series.each(function(d,i) { - var legendText = d3.select(this).select('text'); - var svgComputedTextLength = legendText.node().getComputedTextLength() - || nv.utils.calcApproxTextWidth(legendText); - seriesWidths.push(svgComputedTextLength + 28); // 28 is ~ the width of the circle plus some padding - }); - - //nv.log('Series Widths: ', JSON.stringify(seriesWidths)); - - var seriesPerRow = 0; - var legendWidth = 0; - var columnWidths = []; - - while ( legendWidth < availableWidth && seriesPerRow < seriesWidths.length) { - columnWidths[seriesPerRow] = seriesWidths[seriesPerRow]; - legendWidth += seriesWidths[seriesPerRow++]; - } - - - while ( legendWidth > availableWidth && seriesPerRow > 1 ) { - columnWidths = []; - seriesPerRow--; - - for (k = 0; k < seriesWidths.length; k++) { - if (seriesWidths[k] > (columnWidths[k % seriesPerRow] || 0) ) - columnWidths[k % seriesPerRow] = seriesWidths[k]; - } - - legendWidth = columnWidths.reduce(function(prev, cur, index, array) { - return prev + cur; - }); - } - //console.log(columnWidths, legendWidth, seriesPerRow); - - var xPositions = []; - for (var i = 0, curX = 0; i < seriesPerRow; i++) { - xPositions[i] = curX; - curX += columnWidths[i]; - } - - series - .attr('transform', function(d, i) { - return 'translate(' + xPositions[i % seriesPerRow] + ',' + (5 + Math.floor(i / seriesPerRow) * 20) + ')'; - }); - - //position legend as far right as possible within the total width - g.attr('transform', 'translate(' + (width - margin.right - legendWidth) + ',' + margin.top + ')'); - - height = margin.top + margin.bottom + (Math.ceil(seriesWidths.length / seriesPerRow) * 20); - - } else { - - var ypos = 5, - newxpos = 5, - maxwidth = 0, - xpos; - series - .attr('transform', function(d, i) { - var length = d3.select(this).select('text').node().getComputedTextLength() + 28; - xpos = newxpos; - - if (width < margin.left + margin.right + xpos + length) { - newxpos = xpos = 5; - ypos += 20; - } - - newxpos += length; - if (newxpos > maxwidth) maxwidth = newxpos; - - return 'translate(' + xpos + ',' + ypos + ')'; - }); - - //position legend as far right as possible within the total width - g.attr('transform', 'translate(' + (width - margin.right - maxwidth) + ',' + margin.top + ')'); - - height = margin.top + margin.bottom + ypos + 15; - - } - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.key = function(_) { - if (!arguments.length) return getKey; - getKey = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.align = function(_) { - if (!arguments.length) return align; - align = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.line = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var scatter = nv.models.scatter() - ; - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , color = nv.utils.defaultColor() // a function that returns a color - , getX = function(d) { return d.x } // accessor to get the x value from a data point - , getY = function(d) { return d.y } // accessor to get the y value from a data point - , defined = function(d,i) { return !isNaN(getY(d,i)) && getY(d,i) !== null } // allows a line to be not continuous when it is not defined - , isArea = function(d) { return d.area } // decides if a line is an area or just a line - , clipEdge = false // if true, masks lines within x and y scale - , x //can be accessed via chart.xScale() - , y //can be accessed via chart.yScale() - , interpolate = "linear" // controls the line interpolation - ; - - scatter - .size(16) // default size - .sizeDomain([16,256]) //set to speed up calculation, needs to be unset if there is a custom size accessor - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0 //used to store previous scales - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - //------------------------------------------------------------ - // Setup Scales - - x = scatter.xScale(); - y = scatter.yScale(); - - x0 = x0 || x; - y0 = y0 || y; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-line').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-line'); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g') - - gEnter.append('g').attr('class', 'nv-groups'); - gEnter.append('g').attr('class', 'nv-scatterWrap'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - - - scatter - .width(availableWidth) - .height(availableHeight) - - var scatterWrap = wrap.select('.nv-scatterWrap'); - //.datum(data); // Data automatically trickles down from the wrap - - d3.transition(scatterWrap).call(scatter); - - - - defsEnter.append('clipPath') - .attr('id', 'nv-edge-clip-' + scatter.id()) - .append('rect'); - - wrap.select('#nv-edge-clip-' + scatter.id() + ' rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g .attr('clip-path', clipEdge ? 'url(#nv-edge-clip-' + scatter.id() + ')' : ''); - scatterWrap - .attr('clip-path', clipEdge ? 'url(#nv-edge-clip-' + scatter.id() + ')' : ''); - - - - - var groups = wrap.select('.nv-groups').selectAll('.nv-group') - .data(function(d) { return d }, function(d) { return d.key }); - groups.enter().append('g') - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6); - d3.transition(groups.exit()) - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6) - .remove(); - groups - .attr('class', function(d,i) { return 'nv-group nv-series-' + i }) - .classed('hover', function(d) { return d.hover }) - .style('fill', function(d,i){ return color(d, i) }) - .style('stroke', function(d,i){ return color(d, i)}); - d3.transition(groups) - .style('stroke-opacity', 1) - .style('fill-opacity', .5); - - - - var areaPaths = groups.selectAll('path.nv-area') - .data(function(d) { return isArea(d) ? [d] : [] }); // this is done differently than lines because I need to check if series is an area - areaPaths.enter().append('path') - .attr('class', 'nv-area') - .attr('d', function(d) { - return d3.svg.area() - .interpolate(interpolate) - .defined(defined) - .x(function(d,i) { return x0(getX(d,i)) }) - .y0(function(d,i) { return y0(getY(d,i)) }) - .y1(function(d,i) { return y0( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) }) - //.y1(function(d,i) { return y0(0) }) //assuming 0 is within y domain.. may need to tweak this - .apply(this, [d.values]) - }); - d3.transition(groups.exit().selectAll('path.nv-area')) - .attr('d', function(d) { - return d3.svg.area() - .interpolate(interpolate) - .defined(defined) - .x(function(d,i) { return x(getX(d,i)) }) - .y0(function(d,i) { return y(getY(d,i)) }) - .y1(function(d,i) { return y( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) }) - //.y1(function(d,i) { return y0(0) }) //assuming 0 is within y domain.. may need to tweak this - .apply(this, [d.values]) - }); - d3.transition(areaPaths) - .attr('d', function(d) { - return d3.svg.area() - .interpolate(interpolate) - .defined(defined) - .x(function(d,i) { return x(getX(d,i)) }) - .y0(function(d,i) { return y(getY(d,i)) }) - .y1(function(d,i) { return y( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) }) - //.y1(function(d,i) { return y0(0) }) //assuming 0 is within y domain.. may need to tweak this - .apply(this, [d.values]) - }); - - - - var linePaths = groups.selectAll('path.nv-line') - .data(function(d) { return [d.values] }); - linePaths.enter().append('path') - .attr('class', 'nv-line') - .attr('d', - d3.svg.line() - .interpolate(interpolate) - .defined(defined) - .x(function(d,i) { return x0(getX(d,i)) }) - .y(function(d,i) { return y0(getY(d,i)) }) - ); - d3.transition(groups.exit().selectAll('path.nv-line')) - .attr('d', - d3.svg.line() - .interpolate(interpolate) - .defined(defined) - .x(function(d,i) { return x(getX(d,i)) }) - .y(function(d,i) { return y(getY(d,i)) }) - ); - d3.transition(linePaths) - .attr('d', - d3.svg.line() - .interpolate(interpolate) - .defined(defined) - .x(function(d,i) { return x(getX(d,i)) }) - .y(function(d,i) { return y(getY(d,i)) }) - ); - - - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = scatter.dispatch; - chart.scatter = scatter; - - d3.rebind(chart, scatter, 'id', 'interactive', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'sizeDomain', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'clipRadius', 'padData'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - scatter.x(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - scatter.y(_); - return chart; - }; - - chart.clipEdge = function(_) { - if (!arguments.length) return clipEdge; - clipEdge = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - scatter.color(color); - return chart; - }; - - chart.interpolate = function(_) { - if (!arguments.length) return interpolate; - interpolate = _; - return chart; - }; - - chart.defined = function(_) { - if (!arguments.length) return defined; - defined = _; - return chart; - }; - - chart.isArea = function(_) { - if (!arguments.length) return isArea; - isArea = d3.functor(_); - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.lineChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var lines = nv.models.line() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - ; - -//set margin.right to 23 to fit dates on the x-axis within the chart - var margin = {top: 30, right: 20, bottom: 50, left: 60} - , color = nv.utils.defaultColor() - , width = null - , height = null - , showLegend = true - , showXAxis = true - , showYAxis = true - , rightAlignYAxis = false - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>' - } - , x - , y - , state = {} - , defaultState = null - , noData = 'No Data Available.' - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - ; - - xAxis - .orient('bottom') - .tickPadding(7) - ; - yAxis - .orient((rightAlignYAxis) ? 'right' : 'left') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - - // New addition to calculate position if SVG is scaled with viewBox, may move TODO: consider implementing everywhere else - if (offsetElement) { - var svg = d3.select(offsetElement).select('svg'); - var viewBox = (svg.node()) ? svg.attr('viewBox') : null; - if (viewBox) { - viewBox = viewBox.split(' '); - var ratio = parseInt(svg.style('width')) / viewBox[2]; - e.pos[0] = e.pos[0] * ratio; - e.pos[1] = e.pos[1] * ratio; - } - } - - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(lines.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(lines.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, null, null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - - chart.update = function() { container.transition().call(chart) }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display noData message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = lines.xScale(); - y = lines.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-lineChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-lineChart').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-linesWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width(availableWidth); - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - wrap.select('.nv-legendWrap') - .attr('transform', 'translate(0,' + (-margin.top) +')') - } - - //------------------------------------------------------------ - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - if (rightAlignYAxis) { - g.select(".nv-y.nv-axis") - .attr("transform", "translate(" + availableWidth + ",0)"); - } - - //------------------------------------------------------------ - // Main Chart Component(s) - - lines - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - - - var linesWrap = g.select('.nv-linesWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(linesWrap).call(lines); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - if (showXAxis) { - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y.range()[0] + ')'); - d3.transition(g.select('.nv-x.nv-axis')) - .call(xAxis); - } - - if (showYAxis) { - yAxis - .scale(y) - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - d3.transition(g.select('.nv-y.nv-axis')) - .call(yAxis); - } - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - // container.transition().call(chart); - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - -/* - legend.dispatch.on('legendMouseover', function(d, i) { - d.hover = true; - selection.transition().call(chart) - }); - - legend.dispatch.on('legendMouseout', function(d, i) { - d.hover = false; - selection.transition().call(chart) - }); -*/ - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - chart.update(); - }); - - //============================================================ - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - lines.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.lines = lines; - chart.legend = legend; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, lines, 'defined', 'isArea', 'x', 'y', 'size', 'xScale', 'yScale', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id', 'interpolate'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.showXAxis = function(_) { - if (!arguments.length) return showXAxis; - showXAxis = _; - return chart; - }; - - chart.showYAxis = function(_) { - if (!arguments.length) return showYAxis; - showYAxis = _; - return chart; - }; - - chart.rightAlignYAxis = function(_) { - if(!arguments.length) return rightAlignYAxis; - rightAlignYAxis = _; - yAxis.orient( (_) ? 'right' : 'left'); - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.linePlusBarChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var lines = nv.models.line() - , bars = nv.models.historicalBar() - , xAxis = nv.models.axis() - , y1Axis = nv.models.axis() - , y2Axis = nv.models.axis() - , legend = nv.models.legend() - ; - - var margin = {top: 30, right: 60, bottom: 50, left: 60} - , width = null - , height = null - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , color = nv.utils.defaultColor() - , showLegend = true - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>'; - } - , x - , y1 - , y2 - , state = {} - , defaultState = null - , noData = "No Data Available." - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - ; - - bars - .padData(true) - ; - lines - .clipEdge(false) - .padData(true) - ; - xAxis - .orient('bottom') - .tickPadding(7) - .highlightZero(false) - ; - y1Axis - .orient('left') - ; - y2Axis - .orient('right') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(lines.x()(e.point, e.pointIndex)), - y = (e.series.bar ? y1Axis : y2Axis).tickFormat()(lines.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement); - } - ; - - //------------------------------------------------------------ - - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart); }; - // chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - var dataBars = data.filter(function(d) { return !d.disabled && d.bar }); - var dataLines = data.filter(function(d) { return !d.bar }); // removed the !d.disabled clause here to fix Issue #240 - - //x = xAxis.scale(); - x = dataLines.filter(function(d) { return !d.disabled; }).length && dataLines.filter(function(d) { return !d.disabled; })[0].values.length ? lines.xScale() : bars.xScale(); - //x = dataLines.filter(function(d) { return !d.disabled; }).length ? lines.xScale() : bars.xScale(); //old code before change above - y1 = bars.yScale(); - y2 = lines.yScale(); - - //------------------------------------------------------------ - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = d3.select(this).selectAll('g.nv-wrap.nv-linePlusBar').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-linePlusBar').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y1 nv-axis'); - gEnter.append('g').attr('class', 'nv-y2 nv-axis'); - gEnter.append('g').attr('class', 'nv-barsWrap'); - gEnter.append('g').attr('class', 'nv-linesWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width( availableWidth / 2 ); - - g.select('.nv-legendWrap') - .datum(data.map(function(series) { - series.originalKey = series.originalKey === undefined ? series.key : series.originalKey; - series.key = series.originalKey + (series.bar ? ' (left axis)' : ' (right axis)'); - return series; - })) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(' + ( availableWidth / 2 ) + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - - lines - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && !data[i].bar })) - - bars - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && data[i].bar })) - - - - var barsWrap = g.select('.nv-barsWrap') - .datum(dataBars.length ? dataBars : [{values:[]}]) - - var linesWrap = g.select('.nv-linesWrap') - .datum(dataLines[0] && !dataLines[0].disabled ? dataLines : [{values:[]}] ); - //.datum(!dataLines[0].disabled ? dataLines : [{values:dataLines[0].values.map(function(d) { return [d[0], null] }) }] ); - - d3.transition(barsWrap).call(bars); - d3.transition(linesWrap).call(lines); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y1.range()[0] + ')'); - d3.transition(g.select('.nv-x.nv-axis')) - .call(xAxis); - - - y1Axis - .scale(y1) - .ticks( availableHeight / 36 ) - .tickSize(-availableWidth, 0); - - d3.transition(g.select('.nv-y1.nv-axis')) - .style('opacity', dataBars.length ? 1 : 0) - .call(y1Axis); - - - y2Axis - .scale(y2) - .ticks( availableHeight / 36 ) - .tickSize(dataBars.length ? 0 : -availableWidth, 0); // Show the y2 rules only if y1 has none - - g.select('.nv-y2.nv-axis') - .style('opacity', dataLines.length ? 1 : 0) - .attr('transform', 'translate(' + availableWidth + ',0)'); - //.attr('transform', 'translate(' + x.range()[1] + ',0)'); - - d3.transition(g.select('.nv-y2.nv-axis')) - .call(y2Axis); - - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - chart.update(); - }); - - //============================================================ - - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - lines.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - bars.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - bars.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.legend = legend; - chart.lines = lines; - chart.bars = bars; - chart.xAxis = xAxis; - chart.y1Axis = y1Axis; - chart.y2Axis = y2Axis; - - d3.rebind(chart, lines, 'defined', 'size', 'clipVoronoi', 'interpolate'); - //TODO: consider rebinding x, y and some other stuff, and simply do soemthign lile bars.x(lines.x()), etc. - //d3.rebind(chart, lines, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id'); - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - lines.x(_); - bars.x(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - lines.y(_); - bars.y(_); - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.lineWithFocusChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var lines = nv.models.line() - , lines2 = nv.models.line() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , x2Axis = nv.models.axis() - , y2Axis = nv.models.axis() - , legend = nv.models.legend() - , brush = d3.svg.brush() - ; - - var margin = {top: 30, right: 30, bottom: 30, left: 60} - , margin2 = {top: 0, right: 30, bottom: 20, left: 60} - , color = nv.utils.defaultColor() - , width = null - , height = null - , height2 = 100 - , x - , y - , x2 - , y2 - , showLegend = true - , brushExtent = null - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>' - } - , noData = "No Data Available." - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'brush') - ; - - lines - .clipEdge(true) - ; - lines2 - .interactive(false) - ; - xAxis - .orient('bottom') - .tickPadding(5) - ; - yAxis - .orient('left') - ; - x2Axis - .orient('bottom') - .tickPadding(5) - ; - y2Axis - .orient('left') - ; - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(lines.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(lines.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, null, null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight1 = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom - height2, - availableHeight2 = height2 - margin2.top - margin2.bottom; - - chart.update = function() { container.transition().call(chart) }; - chart.container = this; - - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight1 / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = lines.xScale(); - y = lines.yScale(); - x2 = lines2.xScale(); - y2 = lines2.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-lineWithFocusChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-lineWithFocusChart').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-legendWrap'); - - var focusEnter = gEnter.append('g').attr('class', 'nv-focus'); - focusEnter.append('g').attr('class', 'nv-x nv-axis'); - focusEnter.append('g').attr('class', 'nv-y nv-axis'); - focusEnter.append('g').attr('class', 'nv-linesWrap'); - - var contextEnter = gEnter.append('g').attr('class', 'nv-context'); - contextEnter.append('g').attr('class', 'nv-x nv-axis'); - contextEnter.append('g').attr('class', 'nv-y nv-axis'); - contextEnter.append('g').attr('class', 'nv-linesWrap'); - contextEnter.append('g').attr('class', 'nv-brushBackground'); - contextEnter.append('g').attr('class', 'nv-x nv-brush'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width(availableWidth); - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight1 = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom - height2; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(0,' + (-margin.top) +')') - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - lines - .width(availableWidth) - .height(availableHeight1) - .color( - data - .map(function(d,i) { - return d.color || color(d, i); - }) - .filter(function(d,i) { - return !data[i].disabled; - }) - ); - - lines2 - .defined(lines.defined()) - .width(availableWidth) - .height(availableHeight2) - .color( - data - .map(function(d,i) { - return d.color || color(d, i); - }) - .filter(function(d,i) { - return !data[i].disabled; - }) - ); - - g.select('.nv-context') - .attr('transform', 'translate(0,' + ( availableHeight1 + margin.bottom + margin2.top) + ')') - - var contextLinesWrap = g.select('.nv-context .nv-linesWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(contextLinesWrap).call(lines2); - - //------------------------------------------------------------ - - - /* - var focusLinesWrap = g.select('.nv-focus .nv-linesWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(focusLinesWrap).call(lines); - */ - - - //------------------------------------------------------------ - // Setup Main (Focus) Axes - - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight1, 0); - - yAxis - .scale(y) - .ticks( availableHeight1 / 36 ) - .tickSize( -availableWidth, 0); - - g.select('.nv-focus .nv-x.nv-axis') - .attr('transform', 'translate(0,' + availableHeight1 + ')'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Brush - - brush - .x(x2) - .on('brush', onBrush); - - if (brushExtent) brush.extent(brushExtent); - - var brushBG = g.select('.nv-brushBackground').selectAll('g') - .data([brushExtent || brush.extent()]) - - var brushBGenter = brushBG.enter() - .append('g'); - - brushBGenter.append('rect') - .attr('class', 'left') - .attr('x', 0) - .attr('y', 0) - .attr('height', availableHeight2); - - brushBGenter.append('rect') - .attr('class', 'right') - .attr('x', 0) - .attr('y', 0) - .attr('height', availableHeight2); - - gBrush = g.select('.nv-x.nv-brush') - .call(brush); - gBrush.selectAll('rect') - //.attr('y', -5) - .attr('height', availableHeight2); - gBrush.selectAll('.resize').append('path').attr('d', resizePath); - - onBrush(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Secondary (Context) Axes - - x2Axis - .scale(x2) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight2, 0); - - g.select('.nv-context .nv-x.nv-axis') - .attr('transform', 'translate(0,' + y2.range()[0] + ')'); - d3.transition(g.select('.nv-context .nv-x.nv-axis')) - .call(x2Axis); - - - y2Axis - .scale(y2) - .ticks( availableHeight2 / 36 ) - .tickSize( -availableWidth, 0); - - d3.transition(g.select('.nv-context .nv-y.nv-axis')) - .call(y2Axis); - - g.select('.nv-context .nv-x.nv-axis') - .attr('transform', 'translate(0,' + y2.range()[0] + ')'); - - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - container.transition().call(chart); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - //============================================================ - - - //============================================================ - // Functions - //------------------------------------------------------------ - - // Taken from crossfilter (http://square.github.com/crossfilter/) - function resizePath(d) { - var e = +(d == 'e'), - x = e ? 1 : -1, - y = availableHeight2 / 3; - return 'M' + (.5 * x) + ',' + y - + 'A6,6 0 0 ' + e + ' ' + (6.5 * x) + ',' + (y + 6) - + 'V' + (2 * y - 6) - + 'A6,6 0 0 ' + e + ' ' + (.5 * x) + ',' + (2 * y) - + 'Z' - + 'M' + (2.5 * x) + ',' + (y + 8) - + 'V' + (2 * y - 8) - + 'M' + (4.5 * x) + ',' + (y + 8) - + 'V' + (2 * y - 8); - } - - - function updateBrushBG() { - if (!brush.empty()) brush.extent(brushExtent); - brushBG - .data([brush.empty() ? x2.domain() : brushExtent]) - .each(function(d,i) { - var leftWidth = x2(d[0]) - x.range()[0], - rightWidth = x.range()[1] - x2(d[1]); - d3.select(this).select('.left') - .attr('width', leftWidth < 0 ? 0 : leftWidth); - - d3.select(this).select('.right') - .attr('x', x2(d[1])) - .attr('width', rightWidth < 0 ? 0 : rightWidth); - }); - } - - - function onBrush() { - brushExtent = brush.empty() ? null : brush.extent(); - extent = brush.empty() ? x2.domain() : brush.extent(); - - - dispatch.brush({extent: extent, brush: brush}); - - - updateBrushBG(); - - // Update Main (Focus) - var focusLinesWrap = g.select('.nv-focus .nv-linesWrap') - .datum( - data - .filter(function(d) { return !d.disabled }) - .map(function(d,i) { - return { - key: d.key, - values: d.values.filter(function(d,i) { - return lines.x()(d,i) >= extent[0] && lines.x()(d,i) <= extent[1]; - }) - } - }) - ); - d3.transition(focusLinesWrap).call(lines); - - - // Update Main (Focus) Axes - d3.transition(g.select('.nv-focus .nv-x.nv-axis')) - .call(xAxis); - d3.transition(g.select('.nv-focus .nv-y.nv-axis')) - .call(yAxis); - } - - //============================================================ - - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - lines.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.legend = legend; - chart.lines = lines; - chart.lines2 = lines2; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - chart.x2Axis = x2Axis; - chart.y2Axis = y2Axis; - - d3.rebind(chart, lines, 'defined', 'isArea', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id'); - - chart.x = function(_) { - if (!arguments.length) return lines.x; - lines.x(_); - lines2.x(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return lines.y; - lines.y(_); - lines2.y(_); - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.margin2 = function(_) { - if (!arguments.length) return margin2; - margin2 = _; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.height2 = function(_) { - if (!arguments.length) return height2; - height2 = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color =nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.interpolate = function(_) { - if (!arguments.length) return lines.interpolate(); - lines.interpolate(_); - lines2.interpolate(_); - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - // Chart has multiple similar Axes, to prevent code duplication, probably need to link all axis functions manually like below - chart.xTickFormat = function(_) { - if (!arguments.length) return xAxis.tickFormat(); - xAxis.tickFormat(_); - x2Axis.tickFormat(_); - return chart; - }; - - chart.yTickFormat = function(_) { - if (!arguments.length) return yAxis.tickFormat(); - yAxis.tickFormat(_); - y2Axis.tickFormat(_); - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.linePlusBarWithFocusChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var lines = nv.models.line() - , lines2 = nv.models.line() - , bars = nv.models.historicalBar() - , bars2 = nv.models.historicalBar() - , xAxis = nv.models.axis() - , x2Axis = nv.models.axis() - , y1Axis = nv.models.axis() - , y2Axis = nv.models.axis() - , y3Axis = nv.models.axis() - , y4Axis = nv.models.axis() - , legend = nv.models.legend() - , brush = d3.svg.brush() - ; - - var margin = {top: 30, right: 30, bottom: 30, left: 60} - , margin2 = {top: 0, right: 30, bottom: 20, left: 60} - , width = null - , height = null - , height2 = 100 - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , color = nv.utils.defaultColor() - , showLegend = true - , extent - , brushExtent = null - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>'; - } - , x - , x2 - , y1 - , y2 - , y3 - , y4 - , noData = "No Data Available." - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'brush') - ; - - lines - .clipEdge(true) - ; - lines2 - .interactive(false) - ; - xAxis - .orient('bottom') - .tickPadding(5) - ; - y1Axis - .orient('left') - ; - y2Axis - .orient('right') - ; - x2Axis - .orient('bottom') - .tickPadding(5) - ; - y3Axis - .orient('left') - ; - y4Axis - .orient('right') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - if (extent) { - e.pointIndex += Math.ceil(extent[0]); - } - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(lines.x()(e.point, e.pointIndex)), - y = (e.series.bar ? y1Axis : y2Axis).tickFormat()(lines.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - //------------------------------------------------------------ - - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight1 = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom - height2, - availableHeight2 = height2 - margin2.top - margin2.bottom; - - chart.update = function() { container.transition().call(chart); }; - chart.container = this; - - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight1 / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - var dataBars = data.filter(function(d) { return !d.disabled && d.bar }); - var dataLines = data.filter(function(d) { return !d.bar }); // removed the !d.disabled clause here to fix Issue #240 - - x = bars.xScale(); - x2 = x2Axis.scale(); - y1 = bars.yScale(); - y2 = lines.yScale(); - y3 = bars2.yScale(); - y4 = lines2.yScale(); - - var series1 = data - .filter(function(d) { return !d.disabled && d.bar }) - .map(function(d) { - return d.values.map(function(d,i) { - return { x: getX(d,i), y: getY(d,i) } - }) - }); - - var series2 = data - .filter(function(d) { return !d.disabled && !d.bar }) - .map(function(d) { - return d.values.map(function(d,i) { - return { x: getX(d,i), y: getY(d,i) } - }) - }); - - x .range([0, availableWidth]); - - x2 .domain(d3.extent(d3.merge(series1.concat(series2)), function(d) { return d.x } )) - .range([0, availableWidth]); - - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-linePlusBar').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-linePlusBar').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-legendWrap'); - - var focusEnter = gEnter.append('g').attr('class', 'nv-focus'); - focusEnter.append('g').attr('class', 'nv-x nv-axis'); - focusEnter.append('g').attr('class', 'nv-y1 nv-axis'); - focusEnter.append('g').attr('class', 'nv-y2 nv-axis'); - focusEnter.append('g').attr('class', 'nv-barsWrap'); - focusEnter.append('g').attr('class', 'nv-linesWrap'); - - var contextEnter = gEnter.append('g').attr('class', 'nv-context'); - contextEnter.append('g').attr('class', 'nv-x nv-axis'); - contextEnter.append('g').attr('class', 'nv-y1 nv-axis'); - contextEnter.append('g').attr('class', 'nv-y2 nv-axis'); - contextEnter.append('g').attr('class', 'nv-barsWrap'); - contextEnter.append('g').attr('class', 'nv-linesWrap'); - contextEnter.append('g').attr('class', 'nv-brushBackground'); - contextEnter.append('g').attr('class', 'nv-x nv-brush'); - - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width( availableWidth / 2 ); - - g.select('.nv-legendWrap') - .datum(data.map(function(series) { - series.originalKey = series.originalKey === undefined ? series.key : series.originalKey; - series.key = series.originalKey + (series.bar ? ' (left axis)' : ' (right axis)'); - return series; - })) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight1 = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom - height2; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(' + ( availableWidth / 2 ) + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Context Components - - bars2 - .width(availableWidth) - .height(availableHeight2) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && data[i].bar })); - - lines2 - .width(availableWidth) - .height(availableHeight2) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && !data[i].bar })); - - var bars2Wrap = g.select('.nv-context .nv-barsWrap') - .datum(dataBars.length ? dataBars : [{values:[]}]); - - var lines2Wrap = g.select('.nv-context .nv-linesWrap') - .datum(!dataLines[0].disabled ? dataLines : [{values:[]}]); - - g.select('.nv-context') - .attr('transform', 'translate(0,' + ( availableHeight1 + margin.bottom + margin2.top) + ')') - - d3.transition(bars2Wrap).call(bars2); - d3.transition(lines2Wrap).call(lines2); - - //------------------------------------------------------------ - - - - //------------------------------------------------------------ - // Setup Brush - - brush - .x(x2) - .on('brush', onBrush); - - if (brushExtent) brush.extent(brushExtent); - - var brushBG = g.select('.nv-brushBackground').selectAll('g') - .data([brushExtent || brush.extent()]) - - var brushBGenter = brushBG.enter() - .append('g'); - - brushBGenter.append('rect') - .attr('class', 'left') - .attr('x', 0) - .attr('y', 0) - .attr('height', availableHeight2); - - brushBGenter.append('rect') - .attr('class', 'right') - .attr('x', 0) - .attr('y', 0) - .attr('height', availableHeight2); - - var gBrush = g.select('.nv-x.nv-brush') - .call(brush); - gBrush.selectAll('rect') - //.attr('y', -5) - .attr('height', availableHeight2); - gBrush.selectAll('.resize').append('path').attr('d', resizePath); - - //------------------------------------------------------------ - - //------------------------------------------------------------ - // Setup Secondary (Context) Axes - - x2Axis - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight2, 0); - - g.select('.nv-context .nv-x.nv-axis') - .attr('transform', 'translate(0,' + y3.range()[0] + ')'); - d3.transition(g.select('.nv-context .nv-x.nv-axis')) - .call(x2Axis); - - - y3Axis - .scale(y3) - .ticks( availableHeight2 / 36 ) - .tickSize( -availableWidth, 0); - - g.select('.nv-context .nv-y1.nv-axis') - .style('opacity', dataBars.length ? 1 : 0) - .attr('transform', 'translate(0,' + x2.range()[0] + ')'); - - d3.transition(g.select('.nv-context .nv-y1.nv-axis')) - .call(y3Axis); - - - y4Axis - .scale(y4) - .ticks( availableHeight2 / 36 ) - .tickSize(dataBars.length ? 0 : -availableWidth, 0); // Show the y2 rules only if y1 has none - - g.select('.nv-context .nv-y2.nv-axis') - .style('opacity', dataLines.length ? 1 : 0) - .attr('transform', 'translate(' + x2.range()[1] + ',0)'); - - d3.transition(g.select('.nv-context .nv-y2.nv-axis')) - .call(y4Axis); - - //------------------------------------------------------------ - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - chart.update(); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - //============================================================ - - - //============================================================ - // Functions - //------------------------------------------------------------ - - // Taken from crossfilter (http://square.github.com/crossfilter/) - function resizePath(d) { - var e = +(d == 'e'), - x = e ? 1 : -1, - y = availableHeight2 / 3; - return 'M' + (.5 * x) + ',' + y - + 'A6,6 0 0 ' + e + ' ' + (6.5 * x) + ',' + (y + 6) - + 'V' + (2 * y - 6) - + 'A6,6 0 0 ' + e + ' ' + (.5 * x) + ',' + (2 * y) - + 'Z' - + 'M' + (2.5 * x) + ',' + (y + 8) - + 'V' + (2 * y - 8) - + 'M' + (4.5 * x) + ',' + (y + 8) - + 'V' + (2 * y - 8); - } - - - function updateBrushBG() { - if (!brush.empty()) brush.extent(brushExtent); - brushBG - .data([brush.empty() ? x2.domain() : brushExtent]) - .each(function(d,i) { - var leftWidth = x2(d[0]) - x2.range()[0], - rightWidth = x2.range()[1] - x2(d[1]); - d3.select(this).select('.left') - .attr('width', leftWidth < 0 ? 0 : leftWidth); - - d3.select(this).select('.right') - .attr('x', x2(d[1])) - .attr('width', rightWidth < 0 ? 0 : rightWidth); - }); - } - - - function onBrush() { - brushExtent = brush.empty() ? null : brush.extent(); - extent = brush.empty() ? x2.domain() : brush.extent(); - - - dispatch.brush({extent: extent, brush: brush}); - - updateBrushBG(); - - - //------------------------------------------------------------ - // Prepare Main (Focus) Bars and Lines - - bars - .width(availableWidth) - .height(availableHeight1) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && data[i].bar })); - - - lines - .width(availableWidth) - .height(availableHeight1) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled && !data[i].bar })); - - var focusBarsWrap = g.select('.nv-focus .nv-barsWrap') - .datum(!dataBars.length ? [{values:[]}] : - dataBars - .map(function(d,i) { - return { - key: d.key, - values: d.values.filter(function(d,i) { - return bars.x()(d,i) >= extent[0] && bars.x()(d,i) <= extent[1]; - }) - } - }) - ); - - var focusLinesWrap = g.select('.nv-focus .nv-linesWrap') - .datum(dataLines[0].disabled ? [{values:[]}] : - dataLines - .map(function(d,i) { - return { - key: d.key, - values: d.values.filter(function(d,i) { - return lines.x()(d,i) >= extent[0] && lines.x()(d,i) <= extent[1]; - }) - } - }) - ); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Update Main (Focus) X Axis - - if (dataBars.length) { - x = bars.xScale(); - } else { - x = lines.xScale(); - } - - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight1, 0); - - xAxis.domain([Math.ceil(extent[0]), Math.floor(extent[1])]); - - d3.transition(g.select('.nv-x.nv-axis')) - .call(xAxis); - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Update Main (Focus) Bars and Lines - - d3.transition(focusBarsWrap).call(bars); - d3.transition(focusLinesWrap).call(lines); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup and Update Main (Focus) Y Axes - - g.select('.nv-focus .nv-x.nv-axis') - .attr('transform', 'translate(0,' + y1.range()[0] + ')'); - - - y1Axis - .scale(y1) - .ticks( availableHeight1 / 36 ) - .tickSize(-availableWidth, 0); - - g.select('.nv-focus .nv-y1.nv-axis') - .style('opacity', dataBars.length ? 1 : 0); - - - y2Axis - .scale(y2) - .ticks( availableHeight1 / 36 ) - .tickSize(dataBars.length ? 0 : -availableWidth, 0); // Show the y2 rules only if y1 has none - - g.select('.nv-focus .nv-y2.nv-axis') - .style('opacity', dataLines.length ? 1 : 0) - .attr('transform', 'translate(' + x.range()[1] + ',0)'); - - d3.transition(g.select('.nv-focus .nv-y1.nv-axis')) - .call(y1Axis); - d3.transition(g.select('.nv-focus .nv-y2.nv-axis')) - .call(y2Axis); - } - - //============================================================ - - onBrush(); - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - lines.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - bars.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - bars.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.legend = legend; - chart.lines = lines; - chart.lines2 = lines2; - chart.bars = bars; - chart.bars2 = bars2; - chart.xAxis = xAxis; - chart.x2Axis = x2Axis; - chart.y1Axis = y1Axis; - chart.y2Axis = y2Axis; - chart.y3Axis = y3Axis; - chart.y4Axis = y4Axis; - - d3.rebind(chart, lines, 'defined', 'size', 'clipVoronoi', 'interpolate'); - //TODO: consider rebinding x, y and some other stuff, and simply do soemthign lile bars.x(lines.x()), etc. - //d3.rebind(chart, lines, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id'); - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - lines.x(_); - bars.x(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - lines.y(_); - bars.y(_); - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - chart.brushExtent = function(_) { - if (!arguments.length) return brushExtent; - brushExtent = _; - return chart; - }; - - - //============================================================ - - - return chart; -} - -nv.models.multiBar = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , x = d3.scale.ordinal() - , y = d3.scale.linear() - , id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , forceY = [0] // 0 is forced by default.. this makes sense for the majority of bar graphs... user can always do chart.forceY([]) to remove - , clipEdge = true - , stacked = false - , color = nv.utils.defaultColor() - , hideable = false - , barColor = null // adding the ability to set the color for each rather than the whole group - , disabled // used in conjunction with barColor to communicate from multiBarHorizontalChart what series are disabled - , delay = 1200 - , drawTime = 500 - , xDomain - , yDomain - , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0 //used to store previous scales - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - if(hideable && data.length) hideable = [{ - values: data[0].values.map(function(d) { - return { - x: d.x, - y: 0, - series: d.series, - size: 0.01 - };} - )}]; - - if (stacked) - data = d3.layout.stack() - .offset('zero') - .values(function(d){ return d.values }) - .y(getY) - (!data.length && hideable ? hideable : data); - - - //add series index to each data point for reference - data = data.map(function(series, i) { - series.values = series.values.map(function(point) { - point.series = i; - return point; - }); - return series; - }); - - - //------------------------------------------------------------ - // HACK for negative value stacking - if (stacked) - data[0].values.map(function(d,i) { - var posBase = 0, negBase = 0; - data.map(function(d) { - var f = d.values[i] - f.size = Math.abs(f.y); - if (f.y<0) { - f.y1 = negBase; - negBase = negBase - f.size; - } else - { - f.y1 = f.size + posBase; - posBase = posBase + f.size; - } - }); - }); - - //------------------------------------------------------------ - // Setup Scales - - // remap and flatten the data for use in calculating the scales' domains - var seriesData = (xDomain && yDomain) ? [] : // if we know xDomain and yDomain, no need to calculate - data.map(function(d) { - return d.values.map(function(d,i) { - return { x: getX(d,i), y: getY(d,i), y0: d.y0, y1: d.y1 } - }) - }); - - x .domain(d3.merge(seriesData).map(function(d) { return d.x })) - .rangeBands([0, availableWidth], .1); - - //y .domain(yDomain || d3.extent(d3.merge(seriesData).map(function(d) { return d.y + (stacked ? d.y1 : 0) }).concat(forceY))) - y .domain(yDomain || d3.extent(d3.merge(seriesData).map(function(d) { return stacked ? (d.y > 0 ? d.y1 : d.y1 + d.y ) : d.y }).concat(forceY))) - .range([availableHeight, 0]); - - // If scale's domain don't have a range, slightly adjust to make one... so a chart can show a single data point - if (x.domain()[0] === x.domain()[1] || y.domain()[0] === y.domain()[1]) singlePoint = true; - if (x.domain()[0] === x.domain()[1]) - x.domain()[0] ? - x.domain([x.domain()[0] - x.domain()[0] * 0.01, x.domain()[1] + x.domain()[1] * 0.01]) - : x.domain([-1,1]); - - if (y.domain()[0] === y.domain()[1]) - y.domain()[0] ? - y.domain([y.domain()[0] + y.domain()[0] * 0.01, y.domain()[1] - y.domain()[1] * 0.01]) - : y.domain([-1,1]); - - - x0 = x0 || x; - y0 = y0 || y; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-multibar').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-multibar'); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g') - - gEnter.append('g').attr('class', 'nv-groups'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - - defsEnter.append('clipPath') - .attr('id', 'nv-edge-clip-' + id) - .append('rect'); - wrap.select('#nv-edge-clip-' + id + ' rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g .attr('clip-path', clipEdge ? 'url(#nv-edge-clip-' + id + ')' : ''); - - - - var groups = wrap.select('.nv-groups').selectAll('.nv-group') - .data(function(d) { return d }, function(d) { return d.key }); - groups.enter().append('g') - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6); - - - groups.exit() - .selectAll('rect.nv-bar') - .transition() - .delay(function(d,i) { return i * delay/ data[0].values.length }) - .attr('y', function(d) { return stacked ? y0(d.y0) : y0(0) }) - .attr('height', 0) - .remove(); - groups - .attr('class', function(d,i) { return 'nv-group nv-series-' + i }) - .classed('hover', function(d) { return d.hover }) - .style('fill', function(d,i){ return color(d, i) }) - .style('stroke', function(d,i){ return color(d, i) }); - d3.transition(groups) - .style('stroke-opacity', 1) - .style('fill-opacity', .75); - - - var bars = groups.selectAll('rect.nv-bar') - .data(function(d) { return (hideable && !data.length) ? hideable.values : d.values }); - - bars.exit().remove(); - - - var barsEnter = bars.enter().append('rect') - .attr('class', function(d,i) { return getY(d,i) < 0 ? 'nv-bar negative' : 'nv-bar positive'}) - .attr('x', function(d,i,j) { - return stacked ? 0 : (j * x.rangeBand() / data.length ) - }) - .attr('y', function(d) { return y0(stacked ? d.y0 : 0) }) - .attr('height', 0) - .attr('width', x.rangeBand() / (stacked ? 1 : data.length) ); - bars - .style('fill', function(d,i,j){ return color(d, j, i); }) - .style('stroke', function(d,i,j){ return color(d, j, i); }) - .on('mouseover', function(d,i) { //TODO: figure out why j works above, but not here - d3.select(this).classed('hover', true); - dispatch.elementMouseover({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length), y(getY(d,i) + (stacked ? d.y0 : 0))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - }) - .on('mouseout', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.elementMouseout({ - value: getY(d,i), - point: d, - series: data[d.series], - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - }) - .on('click', function(d,i) { - dispatch.elementClick({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length), y(getY(d,i) + (stacked ? d.y0 : 0))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - d3.event.stopPropagation(); - }) - .on('dblclick', function(d,i) { - dispatch.elementDblClick({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length), y(getY(d,i) + (stacked ? d.y0 : 0))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - d3.event.stopPropagation(); - }); - bars - .attr('class', function(d,i) { return getY(d,i) < 0 ? 'nv-bar negative' : 'nv-bar positive'}) - .attr('transform', function(d,i) { return 'translate(' + x(getX(d,i)) + ',0)'; }) - - if (barColor) { - if (!disabled) disabled = data.map(function() { return true }); - bars - //.style('fill', barColor) - //.style('stroke', barColor) - //.style('fill', function(d,i,j) { return d3.rgb(barColor(d,i)).darker(j).toString(); }) - //.style('stroke', function(d,i,j) { return d3.rgb(barColor(d,i)).darker(j).toString(); }) - .style('fill', function(d,i,j) { return d3.rgb(barColor(d,i)).darker( disabled.map(function(d,i) { return i }).filter(function(d,i){ return !disabled[i] })[j] ).toString(); }) - .style('stroke', function(d,i,j) { return d3.rgb(barColor(d,i)).darker( disabled.map(function(d,i) { return i }).filter(function(d,i){ return !disabled[i] })[j] ).toString(); }); - } - - - if (stacked) - bars.transition() - - .delay(function(d,i) { return i * delay / data[0].values.length }) - .attr('y', function(d,i) { - - return y((stacked ? d.y1 : 0)); - }) - .attr('height', function(d,i) { - return Math.max(Math.abs(y(d.y + (stacked ? d.y0 : 0)) - y((stacked ? d.y0 : 0))),1); - }) - .each('end', function() { - d3.select(this).transition().duration(drawTime) - .attr('x', function(d,i) { - return stacked ? 0 : (d.series * x.rangeBand() / data.length ) - }) - .attr('width', x.rangeBand() / (stacked ? 1 : data.length) ); - }) - else - d3.transition(bars).duration(drawTime) - .delay(function(d,i) { return i * delay/ data[0].values.length }) - .attr('x', function(d,i) { - return d.series * x.rangeBand() / data.length - }) - .attr('width', x.rangeBand() / data.length) - .each('end', function() { - d3.select(this).transition().duration(drawTime) - .attr('y', function(d,i) { - return getY(d,i) < 0 ? - y(0) : - y(0) - y(getY(d,i)) < 1 ? - y(0) - 1 : - y(getY(d,i)) || 0; - }) - .attr('height', function(d,i) { - return Math.max(Math.abs(y(getY(d,i)) - y(0)),1) || 0; - }); - }) - - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.forceY = function(_) { - if (!arguments.length) return forceY; - forceY = _; - return chart; - }; - - chart.stacked = function(_) { - if (!arguments.length) return stacked; - stacked = _; - return chart; - }; - - chart.clipEdge = function(_) { - if (!arguments.length) return clipEdge; - clipEdge = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.barColor = function(_) { - if (!arguments.length) return barColor; - barColor = nv.utils.getColor(_); - return chart; - }; - - chart.disabled = function(_) { - if (!arguments.length) return disabled; - disabled = _; - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - chart.hideable = function(_) { - if (!arguments.length) return hideable; - hideable = _; - return chart; - }; - - chart.delay = function(_) { - if (!arguments.length) return delay; - delay = _; - return chart; - }; - - chart.drawTime = function(_) { - if (!arguments.length) return drawTime; - drawTime = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.multiBarChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var multibar = nv.models.multiBar() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - , controls = nv.models.legend() - ; - - var margin = {top: 30, right: 20, bottom: 50, left: 60} - , width = null - , height = null - , color = nv.utils.defaultColor() - , showControls = true - , showLegend = true - , reduceXTicks = true // if false a tick will show for every data point - , staggerLabels = false - , rotateLabels = 0 - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' on ' + x + '</p>' - } - , x //can be accessed via chart.xScale() - , y //can be accessed via chart.yScale() - , state = { stacked: false } - , defaultState = null - , noData = "No Data Available." - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - , controlWidth = function() { return showControls ? 180 : 0 } - ; - - multibar - .stacked(false) - ; - xAxis - .orient('bottom') - .tickPadding(7) - .highlightZero(true) - .showMaxMin(false) - .tickFormat(function(d) { return d }) - ; - yAxis - .orient('left') - .tickFormat(d3.format(',.1f')) - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(multibar.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(multibar.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart) }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - //------------------------------------------------------------ - // Display noData message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = multibar.xScale(); - y = multibar.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-multiBarWithLegend').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-multiBarWithLegend').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-barsWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - gEnter.append('g').attr('class', 'nv-controlsWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width(availableWidth - controlWidth()); - - if (multibar.barColor()) - data.forEach(function(series,i) { - series.color = d3.rgb('#ccc').darker(i * 1.5).toString(); - }) - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(' + controlWidth() + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Controls - - if (showControls) { - var controlsData = [ - { key: 'Grouped', disabled: multibar.stacked() }, - { key: 'Stacked', disabled: !multibar.stacked() } - ]; - - controls.width(controlWidth()).color(['#444', '#444', '#444']); - g.select('.nv-controlsWrap') - .datum(controlsData) - .attr('transform', 'translate(0,' + (-margin.top) +')') - .call(controls); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - multibar - .disabled(data.map(function(series) { return series.disabled })) - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })) - - - var barsWrap = g.select('.nv-barsWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(barsWrap).call(multibar); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y.range()[0] + ')'); - d3.transition(g.select('.nv-x.nv-axis')) - .call(xAxis); - - var xTicks = g.select('.nv-x.nv-axis > g').selectAll('g'); - - xTicks - .selectAll('line, text') - .style('opacity', 1) - - if (staggerLabels) { - var getTranslate = function(x,y) { - return "translate(" + x + "," + y + ")"; - }; - - var staggerUp = 5, staggerDown = 17; //pixels to stagger by - // Issue #140 - xTicks - .selectAll("text") - .attr('transform', function(d,i,j) { - return getTranslate(0, (j % 2 == 0 ? staggerUp : staggerDown)); - }); - - var totalInBetweenTicks = d3.selectAll(".nv-x.nv-axis .nv-wrap g g text")[0].length; - g.selectAll(".nv-x.nv-axis .nv-axisMaxMin text") - .attr("transform", function(d,i) { - return getTranslate(0, (i === 0 || totalInBetweenTicks % 2 !== 0) ? staggerDown : staggerUp); - }); - } - - - if (reduceXTicks) - xTicks - .filter(function(d,i) { - return i % Math.ceil(data[0].values.length / (availableWidth / 100)) !== 0; - }) - .selectAll('text, line') - .style('opacity', 0); - - if(rotateLabels) - xTicks - .selectAll('text') - .attr('transform', 'rotate(' + rotateLabels + ' 0,0)') - .attr('text-anchor', rotateLabels > 0 ? 'start' : 'end'); - - g.select('.nv-x.nv-axis').selectAll('g.nv-axisMaxMin text') - .style('opacity', 1); - - yAxis - .scale(y) - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - d3.transition(g.select('.nv-y.nv-axis')) - .call(yAxis); - - //------------------------------------------------------------ - - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - - controls.dispatch.on('legendClick', function(d,i) { - if (!d.disabled) return; - controlsData = controlsData.map(function(s) { - s.disabled = true; - return s; - }); - d.disabled = false; - - switch (d.key) { - case 'Grouped': - multibar.stacked(false); - break; - case 'Stacked': - multibar.stacked(true); - break; - } - - state.stacked = multibar.stacked(); - dispatch.stateChange(state); - - chart.update(); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode) - }); - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - if (typeof e.stacked !== 'undefined') { - multibar.stacked(e.stacked); - state.stacked = e.stacked; - } - - chart.update(); - }); - - //============================================================ - - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - multibar.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - multibar.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.multibar = multibar; - chart.legend = legend; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, multibar, 'x', 'y', 'xDomain', 'yDomain', 'forceX', 'forceY', 'clipEdge', 'id', 'stacked', 'delay', 'barColor'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showControls = function(_) { - if (!arguments.length) return showControls; - showControls = _; - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.reduceXTicks= function(_) { - if (!arguments.length) return reduceXTicks; - reduceXTicks = _; - return chart; - }; - - chart.rotateLabels = function(_) { - if (!arguments.length) return rotateLabels; - rotateLabels = _; - return chart; - } - - chart.staggerLabels = function(_) { - if (!arguments.length) return staggerLabels; - staggerLabels = _; - return chart; - }; - - chart.tooltip = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.multiBarHorizontal = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one - , x = d3.scale.ordinal() - , y = d3.scale.linear() - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , forceY = [0] // 0 is forced by default.. this makes sense for the majority of bar graphs... user can always do chart.forceY([]) to remove - , color = nv.utils.defaultColor() - , barColor = null // adding the ability to set the color for each rather than the whole group - , disabled // used in conjunction with barColor to communicate from multiBarHorizontalChart what series are disabled - , stacked = false - , showValues = false - , valuePadding = 60 - , valueFormat = d3.format(',.2f') - , delay = 1200 - , xDomain - , yDomain - , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0 //used to store previous scales - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - - if (stacked) - data = d3.layout.stack() - .offset('zero') - .values(function(d){ return d.values }) - .y(getY) - (data); - - - //add series index to each data point for reference - data = data.map(function(series, i) { - series.values = series.values.map(function(point) { - point.series = i; - return point; - }); - return series; - }); - - - - //------------------------------------------------------------ - // HACK for negative value stacking - if (stacked) - data[0].values.map(function(d,i) { - var posBase = 0, negBase = 0; - data.map(function(d) { - var f = d.values[i] - f.size = Math.abs(f.y); - if (f.y<0) { - f.y1 = negBase - f.size; - negBase = negBase - f.size; - } else - { - f.y1 = posBase; - posBase = posBase + f.size; - } - }); - }); - - - - //------------------------------------------------------------ - // Setup Scales - - // remap and flatten the data for use in calculating the scales' domains - var seriesData = (xDomain && yDomain) ? [] : // if we know xDomain and yDomain, no need to calculate - data.map(function(d) { - return d.values.map(function(d,i) { - return { x: getX(d,i), y: getY(d,i), y0: d.y0, y1: d.y1 } - }) - }); - - x .domain(xDomain || d3.merge(seriesData).map(function(d) { return d.x })) - .rangeBands([0, availableHeight], .1); - - //y .domain(yDomain || d3.extent(d3.merge(seriesData).map(function(d) { return d.y + (stacked ? d.y0 : 0) }).concat(forceY))) - y .domain(yDomain || d3.extent(d3.merge(seriesData).map(function(d) { return stacked ? (d.y > 0 ? d.y1 + d.y : d.y1 ) : d.y }).concat(forceY))) - - if (showValues && !stacked) - y.range([(y.domain()[0] < 0 ? valuePadding : 0), availableWidth - (y.domain()[1] > 0 ? valuePadding : 0) ]); - else - y.range([0, availableWidth]); - - x0 = x0 || x; - y0 = y0 || d3.scale.linear().domain(y.domain()).range([y(0),y(0)]); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = d3.select(this).selectAll('g.nv-wrap.nv-multibarHorizontal').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-multibarHorizontal'); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-groups'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - - var groups = wrap.select('.nv-groups').selectAll('.nv-group') - .data(function(d) { return d }, function(d) { return d.key }); - groups.enter().append('g') - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6); - d3.transition(groups.exit()) - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6) - .remove(); - groups - .attr('class', function(d,i) { return 'nv-group nv-series-' + i }) - .classed('hover', function(d) { return d.hover }) - .style('fill', function(d,i){ return color(d, i) }) - .style('stroke', function(d,i){ return color(d, i) }); - d3.transition(groups) - .style('stroke-opacity', 1) - .style('fill-opacity', .75); - - - var bars = groups.selectAll('g.nv-bar') - .data(function(d) { return d.values }); - - bars.exit().remove(); - - - var barsEnter = bars.enter().append('g') - .attr('transform', function(d,i,j) { - return 'translate(' + y0(stacked ? d.y0 : 0) + ',' + (stacked ? 0 : (j * x.rangeBand() / data.length ) + x(getX(d,i))) + ')' - }); - - barsEnter.append('rect') - .attr('width', 0) - .attr('height', x.rangeBand() / (stacked ? 1 : data.length) ) - - bars - .on('mouseover', function(d,i) { //TODO: figure out why j works above, but not here - d3.select(this).classed('hover', true); - dispatch.elementMouseover({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [ y(getY(d,i) + (stacked ? d.y0 : 0)), x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length) ], - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - }) - .on('mouseout', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.elementMouseout({ - value: getY(d,i), - point: d, - series: data[d.series], - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - }) - .on('click', function(d,i) { - dispatch.elementClick({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length), y(getY(d,i) + (stacked ? d.y0 : 0))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - d3.event.stopPropagation(); - }) - .on('dblclick', function(d,i) { - dispatch.elementDblClick({ - value: getY(d,i), - point: d, - series: data[d.series], - pos: [x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length), y(getY(d,i) + (stacked ? d.y0 : 0))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: d.series, - e: d3.event - }); - d3.event.stopPropagation(); - }); - - - barsEnter.append('text'); - - if (showValues && !stacked) { - bars.select('text') - .attr('text-anchor', function(d,i) { return getY(d,i) < 0 ? 'end' : 'start' }) - .attr('y', x.rangeBand() / (data.length * 2)) - .attr('dy', '.32em') - .text(function(d,i) { return valueFormat(getY(d,i)) }) - d3.transition(bars) - //.delay(function(d,i) { return i * delay / data[0].values.length }) - .select('text') - .attr('x', function(d,i) { return getY(d,i) < 0 ? -4 : y(getY(d,i)) - y(0) + 4 }) - } else { - //bars.selectAll('text').remove(); - bars.selectAll('text').text(''); - } - - bars - .attr('class', function(d,i) { return getY(d,i) < 0 ? 'nv-bar negative' : 'nv-bar positive'}) - - if (barColor) { - if (!disabled) disabled = data.map(function() { return true }); - bars - //.style('fill', barColor) - //.style('stroke', barColor) - //.style('fill', function(d,i,j) { return d3.rgb(barColor(d,i)).darker(j).toString(); }) - //.style('stroke', function(d,i,j) { return d3.rgb(barColor(d,i)).darker(j).toString(); }) - .style('fill', function(d,i,j) { return d3.rgb(barColor(d,i)).darker( disabled.map(function(d,i) { return i }).filter(function(d,i){ return !disabled[i] })[j] ).toString(); }) - .style('stroke', function(d,i,j) { return d3.rgb(barColor(d,i)).darker( disabled.map(function(d,i) { return i }).filter(function(d,i){ return !disabled[i] })[j] ).toString(); }); - } - - if (stacked) - d3.transition(bars) - //.delay(function(d,i) { return i * delay / data[0].values.length }) - .attr('transform', function(d,i) { - //return 'translate(' + y(d.y0) + ',0)' - //return 'translate(' + y(d.y0) + ',' + x(getX(d,i)) + ')' - return 'translate(' + y(d.y1) + ',' + x(getX(d,i)) + ')' - }) - .select('rect') - .attr('width', function(d,i) { - return Math.abs(y(getY(d,i) + d.y0) - y(d.y0)) - }) - .attr('height', x.rangeBand() ); - else - d3.transition(bars) - //.delay(function(d,i) { return i * delay / data[0].values.length }) - .attr('transform', function(d,i) { - //TODO: stacked must be all positive or all negative, not both? - return 'translate(' + - (getY(d,i) < 0 ? y(getY(d,i)) : y(0)) - + ',' + - (d.series * x.rangeBand() / data.length - + - x(getX(d,i)) ) - + ')' - }) - .select('rect') - .attr('height', x.rangeBand() / data.length ) - .attr('width', function(d,i) { - return Math.max(Math.abs(y(getY(d,i)) - y(0)),1) - }); - - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.forceY = function(_) { - if (!arguments.length) return forceY; - forceY = _; - return chart; - }; - - chart.stacked = function(_) { - if (!arguments.length) return stacked; - stacked = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.barColor = function(_) { - if (!arguments.length) return barColor; - barColor = nv.utils.getColor(_); - return chart; - }; - - chart.disabled = function(_) { - if (!arguments.length) return disabled; - disabled = _; - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - chart.delay = function(_) { - if (!arguments.length) return delay; - delay = _; - return chart; - }; - - chart.showValues = function(_) { - if (!arguments.length) return showValues; - showValues = _; - return chart; - }; - - chart.valueFormat= function(_) { - if (!arguments.length) return valueFormat; - valueFormat = _; - return chart; - }; - - chart.valuePadding = function(_) { - if (!arguments.length) return valuePadding; - valuePadding = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.multiBarHorizontalChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var multibar = nv.models.multiBarHorizontal() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend().height(30) - , controls = nv.models.legend().height(30) - ; - - var margin = {top: 30, right: 20, bottom: 50, left: 60} - , width = null - , height = null - , color = nv.utils.defaultColor() - , showControls = true - , showLegend = true - , stacked = false - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + ' - ' + x + '</h3>' + - '<p>' + y + '</p>' - } - , x //can be accessed via chart.xScale() - , y //can be accessed via chart.yScale() - , state = { stacked: stacked } - , defaultState = null - , noData = 'No Data Available.' - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - , controlWidth = function() { return showControls ? 180 : 0 } - ; - - multibar - .stacked(stacked) - ; - xAxis - .orient('left') - .tickPadding(5) - .highlightZero(false) - .showMaxMin(false) - .tickFormat(function(d) { return d }) - ; - yAxis - .orient('bottom') - .tickFormat(d3.format(',.1f')) - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(multibar.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(multibar.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'e' : 'w', null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart) }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = multibar.xScale(); - y = multibar.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-multiBarHorizontalChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-multiBarHorizontalChart').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-barsWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - gEnter.append('g').attr('class', 'nv-controlsWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width(availableWidth - controlWidth()); - - if (multibar.barColor()) - data.forEach(function(series,i) { - series.color = d3.rgb('#ccc').darker(i * 1.5).toString(); - }) - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(' + controlWidth() + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Controls - - if (showControls) { - var controlsData = [ - { key: 'Grouped', disabled: multibar.stacked() }, - { key: 'Stacked', disabled: !multibar.stacked() } - ]; - - controls.width(controlWidth()).color(['#444', '#444', '#444']); - g.select('.nv-controlsWrap') - .datum(controlsData) - .attr('transform', 'translate(0,' + (-margin.top) +')') - .call(controls); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - multibar - .disabled(data.map(function(series) { return series.disabled })) - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })) - - - var barsWrap = g.select('.nv-barsWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - d3.transition(barsWrap).call(multibar); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( availableHeight / 24 ) - .tickSize(-availableWidth, 0); - - d3.transition(g.select('.nv-x.nv-axis')) - .call(xAxis); - - var xTicks = g.select('.nv-x.nv-axis').selectAll('g'); - - xTicks - .selectAll('line, text') - .style('opacity', 1) - - - yAxis - .scale(y) - .ticks( availableWidth / 100 ) - .tickSize( -availableHeight, 0); - - g.select('.nv-y.nv-axis') - .attr('transform', 'translate(0,' + availableHeight + ')'); - d3.transition(g.select('.nv-y.nv-axis')) - .call(yAxis); - - //------------------------------------------------------------ - - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - controls.dispatch.on('legendClick', function(d,i) { - if (!d.disabled) return; - controlsData = controlsData.map(function(s) { - s.disabled = true; - return s; - }); - d.disabled = false; - - switch (d.key) { - case 'Grouped': - multibar.stacked(false); - break; - case 'Stacked': - multibar.stacked(true); - break; - } - - state.stacked = multibar.stacked(); - dispatch.stateChange(state); - - chart.update(); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - if (typeof e.stacked !== 'undefined') { - multibar.stacked(e.stacked); - state.stacked = e.stacked; - } - - selection.call(chart); - }); - //============================================================ - - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - multibar.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - multibar.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.multibar = multibar; - chart.legend = legend; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, multibar, 'x', 'y', 'xDomain', 'yDomain', 'forceX', 'forceY', 'clipEdge', 'id', 'delay', 'showValues', 'valueFormat', 'stacked', 'barColor'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - return chart; - }; - - chart.showControls = function(_) { - if (!arguments.length) return showControls; - showControls = _; - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltip = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} -nv.models.multiChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 30, right: 20, bottom: 50, left: 60}, - color = d3.scale.category20().range(), - width = null, - height = null, - showLegend = true, - tooltips = true, - tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' at ' + x + '</p>' - }, - x, y; //can be accessed via chart.lines.[x/y]Scale() - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x = d3.scale.linear(), - yScale1 = d3.scale.linear(), - yScale2 = d3.scale.linear(), - - lines1 = nv.models.line().yScale(yScale1), - lines2 = nv.models.line().yScale(yScale2), - - bars1 = nv.models.multiBar().stacked(false).yScale(yScale1), - bars2 = nv.models.multiBar().stacked(false).yScale(yScale2), - - stack1 = nv.models.stackedArea().yScale(yScale1), - stack2 = nv.models.stackedArea().yScale(yScale2), - - xAxis = nv.models.axis().scale(x).orient('bottom').tickPadding(5), - yAxis1 = nv.models.axis().scale(yScale1).orient('left'), - yAxis2 = nv.models.axis().scale(yScale2).orient('right'), - - legend = nv.models.legend().height(30), - dispatch = d3.dispatch('tooltipShow', 'tooltipHide'); - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(lines1.x()(e.point, e.pointIndex)), - y = ((e.series.yAxis == 2) ? yAxis2 : yAxis1).tickFormat()(lines1.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, undefined, undefined, offsetElement.offsetParent); - }; - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - chart.update = function() { container.transition().call(chart); }; - chart.container = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - var dataLines1 = data.filter(function(d) {return !d.disabled && d.type == 'line' && d.yAxis == 1}) - var dataLines2 = data.filter(function(d) {return !d.disabled && d.type == 'line' && d.yAxis == 2}) - var dataBars1 = data.filter(function(d) {return !d.disabled && d.type == 'bar' && d.yAxis == 1}) - var dataBars2 = data.filter(function(d) {return !d.disabled && d.type == 'bar' && d.yAxis == 2}) - var dataStack1 = data.filter(function(d) {return !d.disabled && d.type == 'area' && d.yAxis == 1}) - var dataStack2 = data.filter(function(d) {return !d.disabled && d.type == 'area' && d.yAxis == 2}) - - var series1 = data.filter(function(d) {return !d.disabled && d.yAxis == 1}) - .map(function(d) { - return d.values.map(function(d,i) { - return { x: d.x, y: d.y } - }) - }) - - var series2 = data.filter(function(d) {return !d.disabled && d.yAxis == 2}) - .map(function(d) { - return d.values.map(function(d,i) { - return { x: d.x, y: d.y } - }) - }) - - x .domain(d3.extent(d3.merge(series1.concat(series2)), function(d) { return d.x } )) - .range([0, availableWidth]); - - var wrap = container.selectAll('g.wrap.multiChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'wrap nvd3 multiChart').append('g'); - - gEnter.append('g').attr('class', 'x axis'); - gEnter.append('g').attr('class', 'y1 axis'); - gEnter.append('g').attr('class', 'y2 axis'); - gEnter.append('g').attr('class', 'lines1Wrap'); - gEnter.append('g').attr('class', 'lines2Wrap'); - gEnter.append('g').attr('class', 'bars1Wrap'); - gEnter.append('g').attr('class', 'bars2Wrap'); - gEnter.append('g').attr('class', 'stack1Wrap'); - gEnter.append('g').attr('class', 'stack2Wrap'); - gEnter.append('g').attr('class', 'legendWrap'); - - var g = wrap.select('g'); - - if (showLegend) { - legend.width( availableWidth / 2 ); - - g.select('.legendWrap') - .datum(data.map(function(series) { - series.originalKey = series.originalKey === undefined ? series.key : series.originalKey; - series.key = series.originalKey + (series.yAxis == 1 ? '' : ' (right axis)'); - return series; - })) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - g.select('.legendWrap') - .attr('transform', 'translate(' + ( availableWidth / 2 ) + ',' + (-margin.top) +')'); - } - - - lines1 - .width(availableWidth) - .height(availableHeight) - .interpolate("monotone") - .color(data.map(function(d,i) { - return d.color || color[i % color.length]; - }).filter(function(d,i) { return !data[i].disabled && data[i].yAxis == 1 && data[i].type == 'line'})); - - lines2 - .width(availableWidth) - .height(availableHeight) - .interpolate("monotone") - .color(data.map(function(d,i) { - return d.color || color[i % color.length]; - }).filter(function(d,i) { return !data[i].disabled && data[i].yAxis == 2 && data[i].type == 'line'})); - - bars1 - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color[i % color.length]; - }).filter(function(d,i) { return !data[i].disabled && data[i].yAxis == 1 && data[i].type == 'bar'})); - - bars2 - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color[i % color.length]; - }).filter(function(d,i) { return !data[i].disabled && data[i].yAxis == 2 && data[i].type == 'bar'})); - - stack1 - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color[i % color.length]; - }).filter(function(d,i) { return !data[i].disabled && data[i].yAxis == 1 && data[i].type == 'area'})); - - stack2 - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color[i % color.length]; - }).filter(function(d,i) { return !data[i].disabled && data[i].yAxis == 2 && data[i].type == 'area'})); - - g.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - var lines1Wrap = g.select('.lines1Wrap') - .datum(dataLines1) - var bars1Wrap = g.select('.bars1Wrap') - .datum(dataBars1) - var stack1Wrap = g.select('.stack1Wrap') - .datum(dataStack1) - - var lines2Wrap = g.select('.lines2Wrap') - .datum(dataLines2) - var bars2Wrap = g.select('.bars2Wrap') - .datum(dataBars2) - var stack2Wrap = g.select('.stack2Wrap') - .datum(dataStack2) - - var extraValue1 = dataStack1.length ? dataStack1.map(function(a){return a.values}).reduce(function(a,b){ - return a.map(function(aVal,i){return {x: aVal.x, y: aVal.y + b[i].y}}) - }).concat([{x:0, y:0}]) : [] - var extraValue2 = dataStack2.length ? dataStack2.map(function(a){return a.values}).reduce(function(a,b){ - return a.map(function(aVal,i){return {x: aVal.x, y: aVal.y + b[i].y}}) - }).concat([{x:0, y:0}]) : [] - - yScale1 .domain(d3.extent(d3.merge(series1).concat(extraValue1), function(d) { return d.y } )) - .range([0, availableHeight]) - - yScale2 .domain(d3.extent(d3.merge(series2).concat(extraValue2), function(d) { return d.y } )) - .range([0, availableHeight]) - - lines1.yDomain(yScale1.domain()) - bars1.yDomain(yScale1.domain()) - stack1.yDomain(yScale1.domain()) - - lines2.yDomain(yScale2.domain()) - bars2.yDomain(yScale2.domain()) - stack2.yDomain(yScale2.domain()) - - if(dataStack1.length){d3.transition(stack1Wrap).call(stack1);} - if(dataStack2.length){d3.transition(stack2Wrap).call(stack2);} - - if(dataBars1.length){d3.transition(bars1Wrap).call(bars1);} - if(dataBars2.length){d3.transition(bars2Wrap).call(bars2);} - - if(dataLines1.length){d3.transition(lines1Wrap).call(lines1);} - if(dataLines2.length){d3.transition(lines2Wrap).call(lines2);} - - - - xAxis - .ticks( availableWidth / 100 ) - .tickSize(-availableHeight, 0); - - g.select('.x.axis') - .attr('transform', 'translate(0,' + availableHeight + ')'); - d3.transition(g.select('.x.axis')) - .call(xAxis); - - yAxis1 - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - - d3.transition(g.select('.y1.axis')) - .call(yAxis1); - - yAxis2 - .ticks( availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - d3.transition(g.select('.y2.axis')) - .call(yAxis2); - - g.select('.y2.axis') - .style('opacity', series2.length ? 1 : 0) - .attr('transform', 'translate(' + x.range()[1] + ',0)'); - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.series').classed('disabled', false); - return d; - }); - } - chart.update(); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - lines1.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines1.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - lines2.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines2.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - bars1.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - bars1.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - bars2.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - bars2.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - stack1.dispatch.on('tooltipShow', function(e) { - //disable tooltips when value ~= 0 - //// TODO: consider removing points from voronoi that have 0 value instead of this hack - if (!Math.round(stack1.y()(e.point) * 100)) { // 100 will not be good for very small numbers... will have to think about making this valu dynamic, based on data range - setTimeout(function() { d3.selectAll('.point.hover').classed('hover', false) }, 0); - return false; - } - - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top], - dispatch.tooltipShow(e); - }); - - stack1.dispatch.on('tooltipHide', function(e) { - dispatch.tooltipHide(e); - }); - - stack2.dispatch.on('tooltipShow', function(e) { - //disable tooltips when value ~= 0 - //// TODO: consider removing points from voronoi that have 0 value instead of this hack - if (!Math.round(stack2.y()(e.point) * 100)) { // 100 will not be good for very small numbers... will have to think about making this valu dynamic, based on data range - setTimeout(function() { d3.selectAll('.point.hover').classed('hover', false) }, 0); - return false; - } - - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top], - dispatch.tooltipShow(e); - }); - - stack2.dispatch.on('tooltipHide', function(e) { - dispatch.tooltipHide(e); - }); - - lines1.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines1.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - lines2.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - lines2.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - - - //============================================================ - // Global getters and setters - //------------------------------------------------------------ - - chart.dispatch = dispatch; - chart.lines1 = lines1; - chart.lines2 = lines2; - chart.bars1 = bars1; - chart.bars2 = bars2; - chart.stack1 = stack1; - chart.stack2 = stack2; - chart.xAxis = xAxis; - chart.yAxis1 = yAxis1; - chart.yAxis2 = yAxis2; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - lines1.x(_); - bars1.x(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - lines1.y(_); - bars1.y(_); - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin = _; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = _; - legend.color(_); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - return chart; -} - - -nv.models.ohlcBar = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one - , x = d3.scale.linear() - , y = d3.scale.linear() - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , getOpen = function(d) { return d.open } - , getClose = function(d) { return d.close } - , getHigh = function(d) { return d.high } - , getLow = function(d) { return d.low } - , forceX = [] - , forceY = [] - , padData = false // If true, adds half a data points width to front and back, for lining up a line chart with a bar chart - , clipEdge = true - , color = nv.utils.defaultColor() - , xDomain - , yDomain - , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout') - ; - - //============================================================ - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - //TODO: store old scales for transitions - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - - //------------------------------------------------------------ - // Setup Scales - - x .domain(xDomain || d3.extent(data[0].values.map(getX).concat(forceX) )); - - if (padData) - x.range([availableWidth * .5 / data[0].values.length, availableWidth * (data[0].values.length - .5) / data[0].values.length ]); - else - x.range([0, availableWidth]); - - y .domain(yDomain || [ - d3.min(data[0].values.map(getLow).concat(forceY)), - d3.max(data[0].values.map(getHigh).concat(forceY)) - ]) - .range([availableHeight, 0]); - - // If scale's domain don't have a range, slightly adjust to make one... so a chart can show a single data point - if (x.domain()[0] === x.domain()[1] || y.domain()[0] === y.domain()[1]) singlePoint = true; - if (x.domain()[0] === x.domain()[1]) - x.domain()[0] ? - x.domain([x.domain()[0] - x.domain()[0] * 0.01, x.domain()[1] + x.domain()[1] * 0.01]) - : x.domain([-1,1]); - - if (y.domain()[0] === y.domain()[1]) - y.domain()[0] ? - y.domain([y.domain()[0] + y.domain()[0] * 0.01, y.domain()[1] - y.domain()[1] * 0.01]) - : y.domain([-1,1]); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = d3.select(this).selectAll('g.nv-wrap.nv-ohlcBar').data([data[0].values]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-ohlcBar'); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-ticks'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - container - .on('click', function(d,i) { - dispatch.chartClick({ - data: d, - index: i, - pos: d3.event, - id: id - }); - }); - - - defsEnter.append('clipPath') - .attr('id', 'nv-chart-clip-path-' + id) - .append('rect'); - - wrap.select('#nv-chart-clip-path-' + id + ' rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g .attr('clip-path', clipEdge ? 'url(#nv-chart-clip-path-' + id + ')' : ''); - - - - var ticks = wrap.select('.nv-ticks').selectAll('.nv-tick') - .data(function(d) { return d }); - - ticks.exit().remove(); - - - var ticksEnter = ticks.enter().append('path') - .attr('class', function(d,i,j) { return (getOpen(d,i) > getClose(d,i) ? 'nv-tick negative' : 'nv-tick positive') + ' nv-tick-' + j + '-' + i }) - .attr('d', function(d,i) { - var w = (availableWidth / data[0].values.length) * .9; - return 'm0,0l0,' - + (y(getOpen(d,i)) - - y(getHigh(d,i))) - + 'l' - + (-w/2) - + ',0l' - + (w/2) - + ',0l0,' - + (y(getLow(d,i)) - y(getOpen(d,i))) - + 'l0,' - + (y(getClose(d,i)) - - y(getLow(d,i))) - + 'l' - + (w/2) - + ',0l' - + (-w/2) - + ',0z'; - }) - .attr('transform', function(d,i) { return 'translate(' + x(getX(d,i)) + ',' + y(getHigh(d,i)) + ')'; }) - //.attr('fill', function(d,i) { return color[0]; }) - //.attr('stroke', function(d,i) { return color[0]; }) - //.attr('x', 0 ) - //.attr('y', function(d,i) { return y(Math.max(0, getY(d,i))) }) - //.attr('height', function(d,i) { return Math.abs(y(getY(d,i)) - y(0)) }) - .on('mouseover', function(d,i) { - d3.select(this).classed('hover', true); - dispatch.elementMouseover({ - point: d, - series: data[0], - pos: [x(getX(d,i)), y(getY(d,i))], // TODO: Figure out why the value appears to be shifted - pointIndex: i, - seriesIndex: 0, - e: d3.event - }); - - }) - .on('mouseout', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.elementMouseout({ - point: d, - series: data[0], - pointIndex: i, - seriesIndex: 0, - e: d3.event - }); - }) - .on('click', function(d,i) { - dispatch.elementClick({ - //label: d[label], - value: getY(d,i), - data: d, - index: i, - pos: [x(getX(d,i)), y(getY(d,i))], - e: d3.event, - id: id - }); - d3.event.stopPropagation(); - }) - .on('dblclick', function(d,i) { - dispatch.elementDblClick({ - //label: d[label], - value: getY(d,i), - data: d, - index: i, - pos: [x(getX(d,i)), y(getY(d,i))], - e: d3.event, - id: id - }); - d3.event.stopPropagation(); - }); - - ticks - .attr('class', function(d,i,j) { return (getOpen(d,i) > getClose(d,i) ? 'nv-tick negative' : 'nv-tick positive') + ' nv-tick-' + j + '-' + i }) - d3.transition(ticks) - .attr('transform', function(d,i) { return 'translate(' + x(getX(d,i)) + ',' + y(getHigh(d,i)) + ')'; }) - .attr('d', function(d,i) { - var w = (availableWidth / data[0].values.length) * .9; - return 'm0,0l0,' - + (y(getOpen(d,i)) - - y(getHigh(d,i))) - + 'l' - + (-w/2) - + ',0l' - + (w/2) - + ',0l0,' - + (y(getLow(d,i)) - - y(getOpen(d,i))) - + 'l0,' - + (y(getClose(d,i)) - - y(getLow(d,i))) - + 'l' - + (w/2) - + ',0l' - + (-w/2) - + ',0z'; - }) - //.attr('width', (availableWidth / data[0].values.length) * .9 ) - - - //d3.transition(ticks) - //.attr('y', function(d,i) { return y(Math.max(0, getY(d,i))) }) - //.attr('height', function(d,i) { return Math.abs(y(getY(d,i)) - y(0)) }); - //.order(); // not sure if this makes any sense for this model - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = _; - return chart; - }; - - chart.open = function(_) { - if (!arguments.length) return getOpen; - getOpen = _; - return chart; - }; - - chart.close = function(_) { - if (!arguments.length) return getClose; - getClose = _; - return chart; - }; - - chart.high = function(_) { - if (!arguments.length) return getHigh; - getHigh = _; - return chart; - }; - - chart.low = function(_) { - if (!arguments.length) return getLow; - getLow = _; - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.forceX = function(_) { - if (!arguments.length) return forceX; - forceX = _; - return chart; - }; - - chart.forceY = function(_) { - if (!arguments.length) return forceY; - forceY = _; - return chart; - }; - - chart.padData = function(_) { - if (!arguments.length) return padData; - padData = _; - return chart; - }; - - chart.clipEdge = function(_) { - if (!arguments.length) return clipEdge; - clipEdge = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - //============================================================ - - - return chart; -} -nv.models.pie = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 500 - , height = 500 - , getValues = function(d) { return d.values } - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , getDescription = function(d) { return d.description } - , id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one - , color = nv.utils.defaultColor() - , valueFormat = d3.format(',.2f') - , showLabels = true - , pieLabelsOutside = true - , donutLabelsOutside = false - , labelThreshold = .02 //if slice percentage is under this, don't show label - , donut = false - , labelSunbeamLayout = false - , startAngle = false - , endAngle = false - , donutRatio = 0.5 - , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout') - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - radius = Math.min(availableWidth, availableHeight) / 2, - arcRadius = radius-(radius / 5), - container = d3.select(this); - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - //var wrap = container.selectAll('.nv-wrap.nv-pie').data([data]); - var wrap = container.selectAll('.nv-wrap.nv-pie').data([getValues(data[0])]); - var wrapEnter = wrap.enter().append('g').attr('class','nvd3 nv-wrap nv-pie nv-chart-' + id); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-pie'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - g.select('.nv-pie').attr('transform', 'translate(' + availableWidth / 2 + ',' + availableHeight / 2 + ')'); - - //------------------------------------------------------------ - - - container - .on('click', function(d,i) { - dispatch.chartClick({ - data: d, - index: i, - pos: d3.event, - id: id - }); - }); - - - var arc = d3.svg.arc() - .outerRadius(arcRadius); - - if (startAngle) arc.startAngle(startAngle) - if (endAngle) arc.endAngle(endAngle); - if (donut) arc.innerRadius(radius * donutRatio); - - // Setup the Pie chart and choose the data element - var pie = d3.layout.pie() - .sort(null) - .value(function(d) { return d.disabled ? 0 : getY(d) }); - - var slices = wrap.select('.nv-pie').selectAll('.nv-slice') - .data(pie); - - slices.exit().remove(); - - var ae = slices.enter().append('g') - .attr('class', 'nv-slice') - .on('mouseover', function(d,i){ - d3.select(this).classed('hover', true); - dispatch.elementMouseover({ - label: getX(d.data), - value: getY(d.data), - point: d.data, - pointIndex: i, - pos: [d3.event.pageX, d3.event.pageY], - id: id - }); - }) - .on('mouseout', function(d,i){ - d3.select(this).classed('hover', false); - dispatch.elementMouseout({ - label: getX(d.data), - value: getY(d.data), - point: d.data, - index: i, - id: id - }); - }) - .on('click', function(d,i) { - dispatch.elementClick({ - label: getX(d.data), - value: getY(d.data), - point: d.data, - index: i, - pos: d3.event, - id: id - }); - d3.event.stopPropagation(); - }) - .on('dblclick', function(d,i) { - dispatch.elementDblClick({ - label: getX(d.data), - value: getY(d.data), - point: d.data, - index: i, - pos: d3.event, - id: id - }); - d3.event.stopPropagation(); - }); - - slices - .attr('fill', function(d,i) { return color(d, i); }) - .attr('stroke', function(d,i) { return color(d, i); }); - - var paths = ae.append('path') - .each(function(d) { this._current = d; }); - //.attr('d', arc); - - d3.transition(slices.select('path')) - .attr('d', arc) - .attrTween('d', arcTween); - - if (showLabels) { - // This does the normal label - var labelsArc = d3.svg.arc().innerRadius(0); - - if (pieLabelsOutside){ labelsArc = arc; } - - if (donutLabelsOutside) { labelsArc = d3.svg.arc().outerRadius(arc.outerRadius()); } - - ae.append("g").classed("nv-label", true) - .each(function(d, i) { - var group = d3.select(this); - - group - .attr('transform', function(d) { - if (labelSunbeamLayout) { - d.outerRadius = arcRadius + 10; // Set Outer Coordinate - d.innerRadius = arcRadius + 15; // Set Inner Coordinate - var rotateAngle = (d.startAngle + d.endAngle) / 2 * (180 / Math.PI); - if ((d.startAngle+d.endAngle)/2 < Math.PI) { - rotateAngle -= 90; - } else { - rotateAngle += 90; - } - return 'translate(' + labelsArc.centroid(d) + ') rotate(' + rotateAngle + ')'; - } else { - d.outerRadius = radius + 10; // Set Outer Coordinate - d.innerRadius = radius + 15; // Set Inner Coordinate - return 'translate(' + labelsArc.centroid(d) + ')' - } - }); - - group.append('rect') - .style('stroke', '#fff') - .style('fill', '#fff') - .attr("rx", 3) - .attr("ry", 3); - - group.append('text') - .style('text-anchor', labelSunbeamLayout ? ((d.startAngle + d.endAngle) / 2 < Math.PI ? 'start' : 'end') : 'middle') //center the text on it's origin or begin/end if orthogonal aligned - .style('fill', '#000') - - - }); - - slices.select(".nv-label").transition() - .attr('transform', function(d) { - if (labelSunbeamLayout) { - d.outerRadius = arcRadius + 10; // Set Outer Coordinate - d.innerRadius = arcRadius + 15; // Set Inner Coordinate - var rotateAngle = (d.startAngle + d.endAngle) / 2 * (180 / Math.PI); - if ((d.startAngle+d.endAngle)/2 < Math.PI) { - rotateAngle -= 90; - } else { - rotateAngle += 90; - } - return 'translate(' + labelsArc.centroid(d) + ') rotate(' + rotateAngle + ')'; - } else { - d.outerRadius = radius + 10; // Set Outer Coordinate - d.innerRadius = radius + 15; // Set Inner Coordinate - return 'translate(' + labelsArc.centroid(d) + ')' - } - }); - - slices.each(function(d, i) { - var slice = d3.select(this); - - slice - .select(".nv-label text") - .style('text-anchor', labelSunbeamLayout ? ((d.startAngle + d.endAngle) / 2 < Math.PI ? 'start' : 'end') : 'middle') //center the text on it's origin or begin/end if orthogonal aligned - .text(function(d, i) { - var percent = (d.endAngle - d.startAngle) / (2 * Math.PI); - return (d.value && percent > labelThreshold) ? getX(d.data) : ''; - }); - - var textBox = slice.select('text').node().getBBox(); - slice.select(".nv-label rect") - .attr("width", textBox.width + 10) - .attr("height", textBox.height + 10) - .attr("transform", function() { - return "translate(" + [textBox.x - 5, textBox.y - 5] + ")"; - }); - }); - } - - - // Computes the angle of an arc, converting from radians to degrees. - function angle(d) { - var a = (d.startAngle + d.endAngle) * 90 / Math.PI - 90; - return a > 90 ? a - 180 : a; - } - - function arcTween(a) { - a.endAngle = isNaN(a.endAngle) ? 0 : a.endAngle; - a.startAngle = isNaN(a.startAngle) ? 0 : a.startAngle; - if (!donut) a.innerRadius = 0; - var i = d3.interpolate(this._current, a); - this._current = i(0); - return function(t) { - return arc(i(t)); - }; - } - - function tweenPie(b) { - b.innerRadius = 0; - var i = d3.interpolate({startAngle: 0, endAngle: 0}, b); - return function(t) { - return arc(i(t)); - }; - } - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.values = function(_) { - if (!arguments.length) return getValues; - getValues = _; - return chart; - }; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = _; - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = d3.functor(_); - return chart; - }; - - chart.description = function(_) { - if (!arguments.length) return getDescription; - getDescription = _; - return chart; - }; - - chart.showLabels = function(_) { - if (!arguments.length) return showLabels; - showLabels = _; - return chart; - }; - - chart.labelSunbeamLayout = function(_) { - if (!arguments.length) return labelSunbeamLayout; - labelSunbeamLayout = _; - return chart; - }; - - chart.donutLabelsOutside = function(_) { - if (!arguments.length) return donutLabelsOutside; - donutLabelsOutside = _; - return chart; - }; - - chart.pieLabelsOutside = function(_) { - if (!arguments.length) return pieLabelsOutside; - pieLabelsOutside = _; - return chart; - }; - - chart.donut = function(_) { - if (!arguments.length) return donut; - donut = _; - return chart; - }; - - chart.donutRatio = function(_) { - if (!arguments.length) return donutRatio; - donutRatio = _; - return chart; - }; - - chart.startAngle = function(_) { - if (!arguments.length) return startAngle; - startAngle = _; - return chart; - }; - - chart.endAngle = function(_) { - if (!arguments.length) return endAngle; - endAngle = _; - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.valueFormat = function(_) { - if (!arguments.length) return valueFormat; - valueFormat = _; - return chart; - }; - - chart.labelThreshold = function(_) { - if (!arguments.length) return labelThreshold; - labelThreshold = _; - return chart; - }; - //============================================================ - - - return chart; -} -nv.models.pieChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var pie = nv.models.pie() - , legend = nv.models.legend() - ; - - var margin = {top: 30, right: 20, bottom: 20, left: 20} - , width = null - , height = null - , showLegend = true - , color = nv.utils.defaultColor() - , tooltips = true - , tooltip = function(key, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + '</p>' - } - , state = {} - , defaultState = null - , noData = "No Data Available." - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var tooltipLabel = pie.description()(e.point) || pie.x()(e.point) - var left = e.pos[0] + ( (offsetElement && offsetElement.offsetLeft) || 0 ), - top = e.pos[1] + ( (offsetElement && offsetElement.offsetTop) || 0), - y = pie.valueFormat()(pie.y()(e.point)), - content = tooltip(tooltipLabel, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart); }; - chart.container = this; - - //set state.disabled - state.disabled = data[0].map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data[0] || !data[0].length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-pieChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-pieChart').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-pieWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend - .width( availableWidth ) - .key(pie.x()); - - wrap.select('.nv-legendWrap') - .datum(pie.values()(data[0])) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - wrap.select('.nv-legendWrap') - .attr('transform', 'translate(0,' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - pie - .width(availableWidth) - .height(availableHeight); - - - var pieWrap = g.select('.nv-pieWrap') - .datum(data); - - d3.transition(pieWrap).call(pie); - - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - legend.dispatch.on('legendClick', function(d,i, that) { - d.disabled = !d.disabled; - - if (!pie.values()(data[0]).filter(function(d) { return !d.disabled }).length) { - pie.values()(data[0]).map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data[0].map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - chart.update(); - }); - - pie.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data[0].forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - chart.update(); - }); - - //============================================================ - - - }); - - return chart; - } - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - pie.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.legend = legend; - chart.dispatch = dispatch; - chart.pie = pie; - - d3.rebind(chart, pie, 'valueFormat', 'values', 'x', 'y', 'description', 'id', 'showLabels', 'donutLabelsOutside', 'pieLabelsOutside', 'donut', 'donutRatio', 'labelThreshold'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - pie.color(color); - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.scatter = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , color = nv.utils.defaultColor() // chooses color - , id = Math.floor(Math.random() * 100000) //Create semi-unique ID incase user doesn't select one - , x = d3.scale.linear() - , y = d3.scale.linear() - , z = d3.scale.linear() //linear because d3.svg.shape.size is treated as area - , getX = function(d) { return d.x } // accessor to get the x value - , getY = function(d) { return d.y } // accessor to get the y value - , getSize = function(d) { return d.size || 1} // accessor to get the point size - , getShape = function(d) { return d.shape || 'circle' } // accessor to get point shape - , onlyCircles = true // Set to false to use shapes - , forceX = [] // List of numbers to Force into the X scale (ie. 0, or a max / min, etc.) - , forceY = [] // List of numbers to Force into the Y scale - , forceSize = [] // List of numbers to Force into the Size scale - , interactive = true // If true, plots a voronoi overlay for advanced point intersection - , pointKey = null - , pointActive = function(d) { return !d.notActive } // any points that return false will be filtered out - , padData = false // If true, adds half a data points width to front and back, for lining up a line chart with a bar chart - , padDataOuter = .1 //outerPadding to imitate ordinal scale outer padding - , clipEdge = false // if true, masks points within x and y scale - , clipVoronoi = true // if true, masks each point with a circle... can turn off to slightly increase performance - , clipRadius = function() { return 25 } // function to get the radius for voronoi point clips - , xDomain = null // Override x domain (skips the calculation from data) - , yDomain = null // Override y domain - , sizeDomain = null // Override point size domain - , sizeRange = null - , singlePoint = false - , dispatch = d3.dispatch('elementClick', 'elementMouseover', 'elementMouseout') - , useVoronoi = true - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0, z0 // used to store previous scales - , timeoutID - , needsUpdate = false // Flag for when the points are visually updating, but the interactive layer is behind, to disable tooltips - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - //add series index to each data point for reference - data = data.map(function(series, i) { - series.values = series.values.map(function(point) { - point.series = i; - return point; - }); - return series; - }); - - //------------------------------------------------------------ - // Setup Scales - - // remap and flatten the data for use in calculating the scales' domains - var seriesData = (xDomain && yDomain && sizeDomain) ? [] : // if we know xDomain and yDomain and sizeDomain, no need to calculate.... if Size is constant remember to set sizeDomain to speed up performance - d3.merge( - data.map(function(d) { - return d.values.map(function(d,i) { - return { x: getX(d,i), y: getY(d,i), size: getSize(d,i) } - }) - }) - ); - - x .domain(xDomain || d3.extent(seriesData.map(function(d) { return d.x; }).concat(forceX))) - - if (padData && data[0]) - x.range([(availableWidth * padDataOuter + availableWidth) / (2 *data[0].values.length), availableWidth - availableWidth * (1 + padDataOuter) / (2 * data[0].values.length) ]); - //x.range([availableWidth * .5 / data[0].values.length, availableWidth * (data[0].values.length - .5) / data[0].values.length ]); - else - x.range([0, availableWidth]); - - y .domain(yDomain || d3.extent(seriesData.map(function(d) { return d.y }).concat(forceY))) - .range([availableHeight, 0]); - - z .domain(sizeDomain || d3.extent(seriesData.map(function(d) { return d.size }).concat(forceSize))) - .range(sizeRange || [16, 256]); - - // If scale's domain don't have a range, slightly adjust to make one... so a chart can show a single data point - if (x.domain()[0] === x.domain()[1] || y.domain()[0] === y.domain()[1]) singlePoint = true; - if (x.domain()[0] === x.domain()[1]) - x.domain()[0] ? - x.domain([x.domain()[0] - x.domain()[0] * 0.01, x.domain()[1] + x.domain()[1] * 0.01]) - : x.domain([-1,1]); - - if (y.domain()[0] === y.domain()[1]) - y.domain()[0] ? - y.domain([y.domain()[0] + y.domain()[0] * 0.01, y.domain()[1] - y.domain()[1] * 0.01]) - : y.domain([-1,1]); - - if ( isNaN(x.domain()[0])) { - x.domain([-1,1]); - } - - if ( isNaN(y.domain()[0])) { - y.domain([-1,1]); - } - - - x0 = x0 || x; - y0 = y0 || y; - z0 = z0 || z; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-scatter').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-scatter nv-chart-' + id + (singlePoint ? ' nv-single-point' : '')); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-groups'); - gEnter.append('g').attr('class', 'nv-point-paths'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - defsEnter.append('clipPath') - .attr('id', 'nv-edge-clip-' + id) - .append('rect'); - - wrap.select('#nv-edge-clip-' + id + ' rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g .attr('clip-path', clipEdge ? 'url(#nv-edge-clip-' + id + ')' : ''); - - - function updateInteractiveLayer() { - - if (!interactive) return false; - - var eventElements; - - var vertices = d3.merge(data.map(function(group, groupIndex) { - return group.values - .map(function(point, pointIndex) { - // *Adding noise to make duplicates very unlikely - // *Injecting series and point index for reference - /* *Adding a 'jitter' to the points, because there's an issue in d3.geom.voronoi. - */ - var pX = getX(point,pointIndex) + Math.random() * 1e-7; - var pY = getY(point,pointIndex) + Math.random() * 1e-7; - - return [x(pX), - y(pY), - groupIndex, - pointIndex, point]; //temp hack to add noise untill I think of a better way so there are no duplicates - }) - .filter(function(pointArray, pointIndex) { - return pointActive(pointArray[4], pointIndex); // Issue #237.. move filter to after map, so pointIndex is correct! - }) - }) - ); - - - - //inject series and point index for reference into voronoi - if (useVoronoi === true) { - - if (clipVoronoi) { - var pointClipsEnter = wrap.select('defs').selectAll('.nv-point-clips') - .data([id]) - .enter(); - - pointClipsEnter.append('clipPath') - .attr('class', 'nv-point-clips') - .attr('id', 'nv-points-clip-' + id); - - var pointClips = wrap.select('#nv-points-clip-' + id).selectAll('circle') - .data(vertices); - pointClips.enter().append('circle') - .attr('r', clipRadius); - pointClips.exit().remove(); - pointClips - .attr('cx', function(d) { return d[0] }) - .attr('cy', function(d) { return d[1] }); - - wrap.select('.nv-point-paths') - .attr('clip-path', 'url(#nv-points-clip-' + id + ')'); - } - - - if(vertices.length) { - // Issue #283 - Adding 2 dummy points to the voronoi b/c voronoi requires min 3 points to work - vertices.push([x.range()[0] - 20, y.range()[0] - 20, null, null]); - vertices.push([x.range()[1] + 20, y.range()[1] + 20, null, null]); - vertices.push([x.range()[0] - 20, y.range()[0] + 20, null, null]); - vertices.push([x.range()[1] + 20, y.range()[1] - 20, null, null]); - } - - var bounds = d3.geom.polygon([ - [-10,-10], - [-10,height + 10], - [width + 10,height + 10], - [width + 10,-10] - ]); - - var voronoi = d3.geom.voronoi(vertices).map(function(d, i) { - return { - 'data': bounds.clip(d), - 'series': vertices[i][2], - 'point': vertices[i][3] - } - }); - - - var pointPaths = wrap.select('.nv-point-paths').selectAll('path') - .data(voronoi); - pointPaths.enter().append('path') - .attr('class', function(d,i) { return 'nv-path-'+i; }); - pointPaths.exit().remove(); - pointPaths - .attr('d', function(d) { - if (d.data.length === 0) - return 'M 0 0' - else - return 'M' + d.data.join('L') + 'Z'; - }); - - pointPaths - .on('click', function(d) { - if (needsUpdate) return 0; - var series = data[d.series], - point = series.values[d.point]; - - dispatch.elementClick({ - point: point, - series: series, - pos: [x(getX(point, d.point)) + margin.left, y(getY(point, d.point)) + margin.top], - seriesIndex: d.series, - pointIndex: d.point - }); - }) - .on('mouseover', function(d) { - if (needsUpdate) return 0; - var series = data[d.series], - point = series.values[d.point]; - - dispatch.elementMouseover({ - point: point, - series: series, - pos: [x(getX(point, d.point)) + margin.left, y(getY(point, d.point)) + margin.top], - seriesIndex: d.series, - pointIndex: d.point - }); - }) - .on('mouseout', function(d, i) { - if (needsUpdate) return 0; - var series = data[d.series], - point = series.values[d.point]; - - dispatch.elementMouseout({ - point: point, - series: series, - seriesIndex: d.series, - pointIndex: d.point - }); - }); - - - } else { - /* - // bring data in form needed for click handlers - var dataWithPoints = vertices.map(function(d, i) { - return { - 'data': d, - 'series': vertices[i][2], - 'point': vertices[i][3] - } - }); - */ - - // add event handlers to points instead voronoi paths - wrap.select('.nv-groups').selectAll('.nv-group') - .selectAll('.nv-point') - //.data(dataWithPoints) - //.style('pointer-events', 'auto') // recativate events, disabled by css - .on('click', function(d,i) { - //nv.log('test', d, i); - if (needsUpdate || !data[d.series]) return 0; //check if this is a dummy point - var series = data[d.series], - point = series.values[i]; - - dispatch.elementClick({ - point: point, - series: series, - pos: [x(getX(point, i)) + margin.left, y(getY(point, i)) + margin.top], - seriesIndex: d.series, - pointIndex: i - }); - }) - .on('mouseover', function(d,i) { - if (needsUpdate || !data[d.series]) return 0; //check if this is a dummy point - var series = data[d.series], - point = series.values[i]; - - dispatch.elementMouseover({ - point: point, - series: series, - pos: [x(getX(point, i)) + margin.left, y(getY(point, i)) + margin.top], - seriesIndex: d.series, - pointIndex: i - }); - }) - .on('mouseout', function(d,i) { - if (needsUpdate || !data[d.series]) return 0; //check if this is a dummy point - var series = data[d.series], - point = series.values[i]; - - dispatch.elementMouseout({ - point: point, - series: series, - seriesIndex: d.series, - pointIndex: i - }); - }); - } - - needsUpdate = false; - } - - needsUpdate = true; - - var groups = wrap.select('.nv-groups').selectAll('.nv-group') - .data(function(d) { return d }, function(d) { return d.key }); - groups.enter().append('g') - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6); - d3.transition(groups.exit()) - .style('stroke-opacity', 1e-6) - .style('fill-opacity', 1e-6) - .remove(); - groups - .attr('class', function(d,i) { return 'nv-group nv-series-' + i }) - .classed('hover', function(d) { return d.hover }); - d3.transition(groups) - .style('fill', function(d,i) { return color(d, i) }) - .style('stroke', function(d,i) { return color(d, i) }) - .style('stroke-opacity', 1) - .style('fill-opacity', .5); - - - if (onlyCircles) { - - var points = groups.selectAll('circle.nv-point') - .data(function(d) { return d.values }, pointKey); - points.enter().append('circle') - .attr('cx', function(d,i) { return x0(getX(d,i)) }) - .attr('cy', function(d,i) { return y0(getY(d,i)) }) - .attr('r', function(d,i) { return Math.sqrt(z(getSize(d,i))/Math.PI) }); - points.exit().remove(); - groups.exit().selectAll('path.nv-point').transition() - .attr('cx', function(d,i) { return x(getX(d,i)) }) - .attr('cy', function(d,i) { return y(getY(d,i)) }) - .remove(); - points.each(function(d,i) { - d3.select(this) - .classed('nv-point', true) - .classed('nv-point-' + i, true); - }); - points.transition() - .attr('cx', function(d,i) { return x(getX(d,i)) }) - .attr('cy', function(d,i) { return y(getY(d,i)) }) - .attr('r', function(d,i) { return Math.sqrt(z(getSize(d,i))/Math.PI) }); - - } else { - - var points = groups.selectAll('path.nv-point') - .data(function(d) { return d.values }); - points.enter().append('path') - .attr('transform', function(d,i) { - return 'translate(' + x0(getX(d,i)) + ',' + y0(getY(d,i)) + ')' - }) - .attr('d', - d3.svg.symbol() - .type(getShape) - .size(function(d,i) { return z(getSize(d,i)) }) - ); - points.exit().remove(); - d3.transition(groups.exit().selectAll('path.nv-point')) - .attr('transform', function(d,i) { - return 'translate(' + x(getX(d,i)) + ',' + y(getY(d,i)) + ')' - }) - .remove(); - points.each(function(d,i) { - d3.select(this) - .classed('nv-point', true) - .classed('nv-point-' + i, true); - }); - points.transition() - .attr('transform', function(d,i) { - //nv.log(d,i,getX(d,i), x(getX(d,i))); - return 'translate(' + x(getX(d,i)) + ',' + y(getY(d,i)) + ')' - }) - .attr('d', - d3.svg.symbol() - .type(getShape) - .size(function(d,i) { return z(getSize(d,i)) }) - ); - } - - - // Delay updating the invisible interactive layer for smoother animation - clearTimeout(timeoutID); // stop repeat calls to updateInteractiveLayer - timeoutID = setTimeout(updateInteractiveLayer, 300); - //updateInteractiveLayer(); - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - z0 = z.copy(); - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - dispatch.on('elementMouseover.point', function(d) { - if (interactive) - d3.select('.nv-chart-' + id + ' .nv-series-' + d.seriesIndex + ' .nv-point-' + d.pointIndex) - .classed('hover', true); - }); - - dispatch.on('elementMouseout.point', function(d) { - if (interactive) - d3.select('.nv-chart-' + id + ' .nv-series-' + d.seriesIndex + ' .nv-point-' + d.pointIndex) - .classed('hover', false); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.dispatch = dispatch; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = d3.functor(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = d3.functor(_); - return chart; - }; - - chart.size = function(_) { - if (!arguments.length) return getSize; - getSize = d3.functor(_); - return chart; - }; - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.zScale = function(_) { - if (!arguments.length) return z; - z = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.sizeDomain = function(_) { - if (!arguments.length) return sizeDomain; - sizeDomain = _; - return chart; - }; - - chart.sizeRange = function(_) { - if (!arguments.length) return sizeRange; - sizeRange = _; - return chart; - }; - - chart.forceX = function(_) { - if (!arguments.length) return forceX; - forceX = _; - return chart; - }; - - chart.forceY = function(_) { - if (!arguments.length) return forceY; - forceY = _; - return chart; - }; - - chart.forceSize = function(_) { - if (!arguments.length) return forceSize; - forceSize = _; - return chart; - }; - - chart.interactive = function(_) { - if (!arguments.length) return interactive; - interactive = _; - return chart; - }; - - chart.pointKey = function(_) { - if (!arguments.length) return pointKey; - pointKey = _; - return chart; - }; - - chart.pointActive = function(_) { - if (!arguments.length) return pointActive; - pointActive = _; - return chart; - }; - - chart.padData = function(_) { - if (!arguments.length) return padData; - padData = _; - return chart; - }; - - chart.padDataOuter = function(_) { - if (!arguments.length) return padDataOuter; - padDataOuter = _; - return chart; - }; - - chart.clipEdge = function(_) { - if (!arguments.length) return clipEdge; - clipEdge = _; - return chart; - }; - - chart.clipVoronoi= function(_) { - if (!arguments.length) return clipVoronoi; - clipVoronoi = _; - return chart; - }; - - chart.useVoronoi= function(_) { - if (!arguments.length) return useVoronoi; - useVoronoi = _; - if (useVoronoi === false) { - clipVoronoi = false; - } - return chart; - }; - - chart.clipRadius = function(_) { - if (!arguments.length) return clipRadius; - clipRadius = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.shape = function(_) { - if (!arguments.length) return getShape; - getShape = _; - return chart; - }; - - chart.onlyCircles = function(_) { - if (!arguments.length) return onlyCircles; - onlyCircles = _; - return chart; - }; - - chart.id = function(_) { - if (!arguments.length) return id; - id = _; - return chart; - }; - - chart.singlePoint = function(_) { - if (!arguments.length) return singlePoint; - singlePoint = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.scatterChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var scatter = nv.models.scatter() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - , controls = nv.models.legend() - , distX = nv.models.distribution() - , distY = nv.models.distribution() - ; - - var margin = {top: 30, right: 20, bottom: 50, left: 75} - , width = null - , height = null - , color = nv.utils.defaultColor() - , x = d3.fisheye ? d3.fisheye.scale(d3.scale.linear).distortion(0) : scatter.xScale() - , y = d3.fisheye ? d3.fisheye.scale(d3.scale.linear).distortion(0) : scatter.yScale() - , xPadding = 0 - , yPadding = 0 - , showDistX = false - , showDistY = false - , showLegend = true - , showControls = !!d3.fisheye - , fisheye = 0 - , pauseFisheye = false - , tooltips = true - , tooltipX = function(key, x, y) { return '<strong>' + x + '</strong>' } - , tooltipY = function(key, x, y) { return '<strong>' + y + '</strong>' } - //, tooltip = function(key, x, y) { return '<h3>' + key + '</h3>' } - , tooltip = null - , state = {} - , defaultState = null - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - , noData = "No Data Available." - ; - - scatter - .xScale(x) - .yScale(y) - ; - xAxis - .orient('bottom') - .tickPadding(10) - ; - yAxis - .orient('left') - .tickPadding(10) - ; - distX - .axis('x') - ; - distY - .axis('y') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0; - - var showTooltip = function(e, offsetElement) { - //TODO: make tooltip style an option between single or dual on axes (maybe on all charts with axes?) - - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - leftX = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - topX = y.range()[0] + margin.top + ( offsetElement.offsetTop || 0), - leftY = x.range()[0] + margin.left + ( offsetElement.offsetLeft || 0 ), - topY = e.pos[1] + ( offsetElement.offsetTop || 0), - xVal = xAxis.tickFormat()(scatter.x()(e.point, e.pointIndex)), - yVal = yAxis.tickFormat()(scatter.y()(e.point, e.pointIndex)); - - if( tooltipX != null ) - nv.tooltip.show([leftX, topX], tooltipX(e.series.key, xVal, yVal, e, chart), 'n', 1, offsetElement, 'x-nvtooltip'); - if( tooltipY != null ) - nv.tooltip.show([leftY, topY], tooltipY(e.series.key, xVal, yVal, e, chart), 'e', 1, offsetElement, 'y-nvtooltip'); - if( tooltip != null ) - nv.tooltip.show([left, top], tooltip(e.series.key, xVal, yVal, e, chart), e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - var controlsData = [ - { key: 'Magnify', disabled: true } - ]; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart); }; - // chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display noData message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x0 = x0 || x; - y0 = y0 || y; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-scatterChart').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-scatterChart nv-chart-' + scatter.id()); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - // background for pointer events - gEnter.append('rect').attr('class', 'nvd3 nv-background'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-scatterWrap'); - gEnter.append('g').attr('class', 'nv-distWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - gEnter.append('g').attr('class', 'nv-controlsWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width( availableWidth / 2 ); - - wrap.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - wrap.select('.nv-legendWrap') - .attr('transform', 'translate(' + (availableWidth / 2) + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Controls - - if (showControls) { - controls.width(180).color(['#444']); - g.select('.nv-controlsWrap') - .datum(controlsData) - .attr('transform', 'translate(0,' + (-margin.top) +')') - .call(controls); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - scatter - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })) - .xDomain(null) - .yDomain(null) - - wrap.select('.nv-scatterWrap') - .datum(data.filter(function(d) { return !d.disabled })) - .call(scatter); - - - //Adjust for x and y padding - if (xPadding) { - var xRange = x.domain()[1] - x.domain()[0]; - scatter.xDomain([x.domain()[0] - (xPadding * xRange), x.domain()[1] + (xPadding * xRange)]); - } - - if (yPadding) { - var yRange = y.domain()[1] - y.domain()[0]; - scatter.yDomain([y.domain()[0] - (yPadding * yRange), y.domain()[1] + (yPadding * yRange)]); - } - - wrap.select('.nv-scatterWrap') - .datum(data.filter(function(d) { return !d.disabled })) - .call(scatter); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( xAxis.ticks() && xAxis.ticks().length ? xAxis.ticks() : availableWidth / 100 ) - .tickSize( -availableHeight , 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y.range()[0] + ')') - .call(xAxis); - - - yAxis - .scale(y) - .ticks( yAxis.ticks() && yAxis.ticks().length ? yAxis.ticks() : availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - g.select('.nv-y.nv-axis') - .call(yAxis); - - - if (showDistX) { - distX - .getData(scatter.x()) - .scale(x) - .width(availableWidth) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - gEnter.select('.nv-distWrap').append('g') - .attr('class', 'nv-distributionX'); - g.select('.nv-distributionX') - .attr('transform', 'translate(0,' + y.range()[0] + ')') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distX); - } - - if (showDistY) { - distY - .getData(scatter.y()) - .scale(y) - .width(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - gEnter.select('.nv-distWrap').append('g') - .attr('class', 'nv-distributionY'); - g.select('.nv-distributionY') - .attr('transform', 'translate(-' + distY.size() + ',0)') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distY); - } - - //------------------------------------------------------------ - - - - - if (d3.fisheye) { - g.select('.nv-background') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g.select('.nv-background').on('mousemove', updateFisheye); - g.select('.nv-background').on('click', function() { pauseFisheye = !pauseFisheye;}); - scatter.dispatch.on('elementClick.freezeFisheye', function() { - pauseFisheye = !pauseFisheye; - }); - } - - - function updateFisheye() { - if (pauseFisheye) { - g.select('.nv-point-paths').style('pointer-events', 'all'); - return false; - } - - g.select('.nv-point-paths').style('pointer-events', 'none' ); - - var mouse = d3.mouse(this); - x.distortion(fisheye).focus(mouse[0]); - y.distortion(fisheye).focus(mouse[1]); - - g.select('.nv-scatterWrap') - .call(scatter); - - g.select('.nv-x.nv-axis').call(xAxis); - g.select('.nv-y.nv-axis').call(yAxis); - g.select('.nv-distributionX') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distX); - g.select('.nv-distributionY') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distY); - } - - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - controls.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - fisheye = d.disabled ? 0 : 2.5; - g.select('.nv-background') .style('pointer-events', d.disabled ? 'none' : 'all'); - g.select('.nv-point-paths').style('pointer-events', d.disabled ? 'all' : 'none' ); - - if (d.disabled) { - x.distortion(fisheye).focus(0); - y.distortion(fisheye).focus(0); - - g.select('.nv-scatterWrap').call(scatter); - g.select('.nv-x.nv-axis').call(xAxis); - g.select('.nv-y.nv-axis').call(yAxis); - } else { - pauseFisheye = false; - } - - chart.update(); - }); - - legend.dispatch.on('legendClick', function(d,i, that) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - - /* - legend.dispatch.on('legendMouseover', function(d, i) { - d.hover = true; - chart(selection); - }); - - legend.dispatch.on('legendMouseout', function(d, i) { - d.hover = false; - chart(selection); - }); - */ - - scatter.dispatch.on('elementMouseover.tooltip', function(e) { - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-distx-' + e.pointIndex) - .attr('y1', function(d,i) { return e.pos[1] - availableHeight;}); - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-disty-' + e.pointIndex) - .attr('x2', e.pos[0] + distX.size()); - - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - chart.update(); - }); - - //============================================================ - - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - scatter.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-distx-' + e.pointIndex) - .attr('y1', 0); - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-disty-' + e.pointIndex) - .attr('x2', distY.size()); - }); - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.scatter = scatter; - chart.legend = legend; - chart.controls = controls; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - chart.distX = distX; - chart.distY = distY; - - d3.rebind(chart, scatter, 'id', 'interactive', 'pointActive', 'x', 'y', 'shape', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'sizeDomain', 'sizeRange', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'clipRadius', 'useVoronoi'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - distX.color(color); - distY.color(color); - return chart; - }; - - chart.showDistX = function(_) { - if (!arguments.length) return showDistX; - showDistX = _; - return chart; - }; - - chart.showDistY = function(_) { - if (!arguments.length) return showDistY; - showDistY = _; - return chart; - }; - - chart.showControls = function(_) { - if (!arguments.length) return showControls; - showControls = _; - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.fisheye = function(_) { - if (!arguments.length) return fisheye; - fisheye = _; - return chart; - }; - - chart.xPadding = function(_) { - if (!arguments.length) return xPadding; - xPadding = _; - return chart; - }; - - chart.yPadding = function(_) { - if (!arguments.length) return yPadding; - yPadding = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.tooltipXContent = function(_) { - if (!arguments.length) return tooltipX; - tooltipX = _; - return chart; - }; - - chart.tooltipYContent = function(_) { - if (!arguments.length) return tooltipY; - tooltipY = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.scatterPlusLineChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var scatter = nv.models.scatter() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - , controls = nv.models.legend() - , distX = nv.models.distribution() - , distY = nv.models.distribution() - ; - - var margin = {top: 30, right: 20, bottom: 50, left: 75} - , width = null - , height = null - , color = nv.utils.defaultColor() - , x = d3.fisheye ? d3.fisheye.scale(d3.scale.linear).distortion(0) : scatter.xScale() - , y = d3.fisheye ? d3.fisheye.scale(d3.scale.linear).distortion(0) : scatter.yScale() - , showDistX = false - , showDistY = false - , showLegend = true - , showControls = !!d3.fisheye - , fisheye = 0 - , pauseFisheye = false - , tooltips = true - , tooltipX = function(key, x, y) { return '<strong>' + x + '</strong>' } - , tooltipY = function(key, x, y) { return '<strong>' + y + '</strong>' } - , tooltip = function(key, x, y, date) { return '<h3>' + key + '</h3>' - + '<p>' + date + '</p>' } - //, tooltip = null - , state = {} - , defaultState = null - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - , noData = "No Data Available." - ; - - scatter - .xScale(x) - .yScale(y) - ; - xAxis - .orient('bottom') - .tickPadding(10) - ; - yAxis - .orient('left') - .tickPadding(10) - ; - distX - .axis('x') - ; - distY - .axis('y') - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var x0, y0; - - var showTooltip = function(e, offsetElement) { - //TODO: make tooltip style an option between single or dual on axes (maybe on all charts with axes?) - - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - leftX = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - topX = y.range()[0] + margin.top + ( offsetElement.offsetTop || 0), - leftY = x.range()[0] + margin.left + ( offsetElement.offsetLeft || 0 ), - topY = e.pos[1] + ( offsetElement.offsetTop || 0), - xVal = xAxis.tickFormat()(scatter.x()(e.point, e.pointIndex)), - yVal = yAxis.tickFormat()(scatter.y()(e.point, e.pointIndex)); - - if( tooltipX != null ) - nv.tooltip.show([leftX, topX], tooltipX(e.series.key, xVal, yVal, e, chart), 'n', 1, offsetElement, 'x-nvtooltip'); - if( tooltipY != null ) - nv.tooltip.show([leftY, topY], tooltipY(e.series.key, xVal, yVal, e, chart), 'e', 1, offsetElement, 'y-nvtooltip'); - if( tooltip != null ) - nv.tooltip.show([left, top], tooltip(e.series.key, xVal, yVal, e.point.tooltip, e, chart), e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - var controlsData = [ - { key: 'Magnify', disabled: true } - ]; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart); }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display noData message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = scatter.xScale(); - y = scatter.yScale(); - - x0 = x0 || x; - y0 = y0 || y; - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-scatterChart').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-scatterChart nv-chart-' + scatter.id()); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g') - - // background for pointer events - gEnter.append('rect').attr('class', 'nvd3 nv-background') - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-scatterWrap'); - gEnter.append('g').attr('class', 'nv-regressionLinesWrap'); - gEnter.append('g').attr('class', 'nv-distWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - gEnter.append('g').attr('class', 'nv-controlsWrap'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend.width( availableWidth / 2 ); - - wrap.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - wrap.select('.nv-legendWrap') - .attr('transform', 'translate(' + (availableWidth / 2) + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Controls - - if (showControls) { - controls.width(180).color(['#444']); - g.select('.nv-controlsWrap') - .datum(controlsData) - .attr('transform', 'translate(0,' + (-margin.top) +')') - .call(controls); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Main Chart Component(s) - - scatter - .width(availableWidth) - .height(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })) - - wrap.select('.nv-scatterWrap') - .datum(data.filter(function(d) { return !d.disabled })) - .call(scatter); - - - wrap.select('.nv-regressionLinesWrap') - .attr('clip-path', 'url(#nv-edge-clip-' + scatter.id() + ')'); - - var regWrap = wrap.select('.nv-regressionLinesWrap').selectAll('.nv-regLines') - .data(function(d) { return d }); - - var reglines = regWrap.enter() - .append('g').attr('class', 'nv-regLines') - .append('line').attr('class', 'nv-regLine') - .style('stroke-opacity', 0); - - //d3.transition(regWrap.selectAll('.nv-regLines line')) - regWrap.selectAll('.nv-regLines line') - .attr('x1', x.range()[0]) - .attr('x2', x.range()[1]) - .attr('y1', function(d,i) { return y(x.domain()[0] * d.slope + d.intercept) }) - .attr('y2', function(d,i) { return y(x.domain()[1] * d.slope + d.intercept) }) - .style('stroke', function(d,i,j) { return color(d,j) }) - .style('stroke-opacity', function(d,i) { - return (d.disabled || typeof d.slope === 'undefined' || typeof d.intercept === 'undefined') ? 0 : 1 - }); - - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( xAxis.ticks() ? xAxis.ticks() : availableWidth / 100 ) - .tickSize( -availableHeight , 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + y.range()[0] + ')') - .call(xAxis); - - - yAxis - .scale(y) - .ticks( yAxis.ticks() ? yAxis.ticks() : availableHeight / 36 ) - .tickSize( -availableWidth, 0); - - g.select('.nv-y.nv-axis') - .call(yAxis); - - - if (showDistX) { - distX - .getData(scatter.x()) - .scale(x) - .width(availableWidth) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - gEnter.select('.nv-distWrap').append('g') - .attr('class', 'nv-distributionX'); - g.select('.nv-distributionX') - .attr('transform', 'translate(0,' + y.range()[0] + ')') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distX); - } - - if (showDistY) { - distY - .getData(scatter.y()) - .scale(y) - .width(availableHeight) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - gEnter.select('.nv-distWrap').append('g') - .attr('class', 'nv-distributionY'); - g.select('.nv-distributionY') - .attr('transform', 'translate(-' + distY.size() + ',0)') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distY); - } - - //------------------------------------------------------------ - - - - - if (d3.fisheye) { - g.select('.nv-background') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g.select('.nv-background').on('mousemove', updateFisheye); - g.select('.nv-background').on('click', function() { pauseFisheye = !pauseFisheye;}); - scatter.dispatch.on('elementClick.freezeFisheye', function() { - pauseFisheye = !pauseFisheye; - }); - } - - - function updateFisheye() { - if (pauseFisheye) { - g.select('.nv-point-paths').style('pointer-events', 'all'); - return false; - } - - g.select('.nv-point-paths').style('pointer-events', 'none' ); - - var mouse = d3.mouse(this); - x.distortion(fisheye).focus(mouse[0]); - y.distortion(fisheye).focus(mouse[1]); - - g.select('.nv-scatterWrap') - .datum(data.filter(function(d) { return !d.disabled })) - .call(scatter); - g.select('.nv-x.nv-axis').call(xAxis); - g.select('.nv-y.nv-axis').call(yAxis); - g.select('.nv-distributionX') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distX); - g.select('.nv-distributionY') - .datum(data.filter(function(d) { return !d.disabled })) - .call(distY); - } - - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - controls.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - fisheye = d.disabled ? 0 : 2.5; - g.select('.nv-background') .style('pointer-events', d.disabled ? 'none' : 'all'); - g.select('.nv-point-paths').style('pointer-events', d.disabled ? 'all' : 'none' ); - - if (d.disabled) { - x.distortion(fisheye).focus(0); - y.distortion(fisheye).focus(0); - - g.select('.nv-scatterWrap').call(scatter); - g.select('.nv-x.nv-axis').call(xAxis); - g.select('.nv-y.nv-axis').call(yAxis); - } else { - pauseFisheye = false; - } - - chart.update(); - }); - - legend.dispatch.on('legendClick', function(d,i, that) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - wrap.selectAll('.nv-series').classed('disabled', false); - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - - /* - legend.dispatch.on('legendMouseover', function(d, i) { - d.hover = true; - chart(selection); - }); - - legend.dispatch.on('legendMouseout', function(d, i) { - d.hover = false; - chart(selection); - }); - */ - - scatter.dispatch.on('elementMouseover.tooltip', function(e) { - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-distx-' + e.pointIndex) - .attr('y1', e.pos[1] - availableHeight); - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-disty-' + e.pointIndex) - .attr('x2', e.pos[0] + distX.size()); - - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; - dispatch.tooltipShow(e); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - chart.update(); - }); - - //============================================================ - - - //store old scales for use in transitions on update - x0 = x.copy(); - y0 = y.copy(); - - - }); - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - scatter.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-distx-' + e.pointIndex) - .attr('y1', 0); - d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-disty-' + e.pointIndex) - .attr('x2', distY.size()); - }); - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.scatter = scatter; - chart.legend = legend; - chart.controls = controls; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - chart.distX = distX; - chart.distY = distY; - - d3.rebind(chart, scatter, 'id', 'interactive', 'pointActive', 'x', 'y', 'shape', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'sizeDomain', 'sizeRange', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'clipRadius', 'useVoronoi'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - distX.color(color); - distY.color(color); - return chart; - }; - - chart.showDistX = function(_) { - if (!arguments.length) return showDistX; - showDistX = _; - return chart; - }; - - chart.showDistY = function(_) { - if (!arguments.length) return showDistY; - showDistY = _; - return chart; - }; - - chart.showControls = function(_) { - if (!arguments.length) return showControls; - showControls = _; - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.fisheye = function(_) { - if (!arguments.length) return fisheye; - fisheye = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.tooltipXContent = function(_) { - if (!arguments.length) return tooltipX; - tooltipX = _; - return chart; - }; - - chart.tooltipYContent = function(_) { - if (!arguments.length) return tooltipY; - tooltipY = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.sparkline = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 2, right: 0, bottom: 2, left: 0} - , width = 400 - , height = 32 - , animate = true - , x = d3.scale.linear() - , y = d3.scale.linear() - , getX = function(d) { return d.x } - , getY = function(d) { return d.y } - , color = nv.utils.getColor(['#000']) - , xDomain - , yDomain - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - - //------------------------------------------------------------ - // Setup Scales - - x .domain(xDomain || d3.extent(data, getX )) - .range([0, availableWidth]); - - y .domain(yDomain || d3.extent(data, getY )) - .range([availableHeight, 0]); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-sparkline').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-sparkline'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')') - - //------------------------------------------------------------ - - - var paths = wrap.selectAll('path') - .data(function(d) { return [d] }); - paths.enter().append('path'); - paths.exit().remove(); - paths - .style('stroke', function(d,i) { return d.color || color(d, i) }) - .attr('d', d3.svg.line() - .x(function(d,i) { return x(getX(d,i)) }) - .y(function(d,i) { return y(getY(d,i)) }) - ); - - - // TODO: Add CURRENT data point (Need Min, Mac, Current / Most recent) - var points = wrap.selectAll('circle.nv-point') - .data(function(data) { - var yValues = data.map(function(d, i) { return getY(d,i); }); - function pointIndex(index) { - if (index != -1) { - var result = data[index]; - result.pointIndex = index; - return result; - } else { - return null; - } - } - var maxPoint = pointIndex(yValues.lastIndexOf(y.domain()[1])), - minPoint = pointIndex(yValues.indexOf(y.domain()[0])), - currentPoint = pointIndex(yValues.length - 1); - return [minPoint, maxPoint, currentPoint].filter(function (d) {return d != null;}); - }); - points.enter().append('circle'); - points.exit().remove(); - points - .attr('cx', function(d,i) { return x(getX(d,d.pointIndex)) }) - .attr('cy', function(d,i) { return y(getY(d,d.pointIndex)) }) - .attr('r', 2) - .attr('class', function(d,i) { - return getX(d, d.pointIndex) == x.domain()[1] ? 'nv-point nv-currentValue' : - getY(d, d.pointIndex) == y.domain()[0] ? 'nv-point nv-minValue' : 'nv-point nv-maxValue' - }); - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = d3.functor(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = d3.functor(_); - return chart; - }; - - chart.xScale = function(_) { - if (!arguments.length) return x; - x = _; - return chart; - }; - - chart.yScale = function(_) { - if (!arguments.length) return y; - y = _; - return chart; - }; - - chart.xDomain = function(_) { - if (!arguments.length) return xDomain; - xDomain = _; - return chart; - }; - - chart.yDomain = function(_) { - if (!arguments.length) return yDomain; - yDomain = _; - return chart; - }; - - chart.animate = function(_) { - if (!arguments.length) return animate; - animate = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.sparklinePlus = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var sparkline = nv.models.sparkline(); - - var margin = {top: 15, right: 100, bottom: 10, left: 50} - , width = null - , height = null - , x - , y - , index = [] - , paused = false - , xTickFormat = d3.format(',r') - , yTickFormat = d3.format(',.2f') - , showValue = true - , alignValue = true - , rightAlignValue = false - , noData = "No Data Available." - ; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this); - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - - - chart.update = function() { chart(selection) }; - chart.container = this; - - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - var currentValue = sparkline.y()(data[data.length-1], data.length-1); - - //------------------------------------------------------------ - - - - //------------------------------------------------------------ - // Setup Scales - - x = sparkline.xScale(); - y = sparkline.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-sparklineplus').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-sparklineplus'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-sparklineWrap'); - gEnter.append('g').attr('class', 'nv-valueWrap'); - gEnter.append('g').attr('class', 'nv-hoverArea'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Main Chart Component(s) - - var sparklineWrap = g.select('.nv-sparklineWrap'); - - sparkline - .width(availableWidth) - .height(availableHeight); - - sparklineWrap - .call(sparkline); - - //------------------------------------------------------------ - - - var valueWrap = g.select('.nv-valueWrap'); - - var value = valueWrap.selectAll('.nv-currentValue') - .data([currentValue]); - - value.enter().append('text').attr('class', 'nv-currentValue') - .attr('dx', rightAlignValue ? -8 : 8) - .attr('dy', '.9em') - .style('text-anchor', rightAlignValue ? 'end' : 'start'); - - value - .attr('x', availableWidth + (rightAlignValue ? margin.right : 0)) - .attr('y', alignValue ? function(d) { return y(d) } : 0) - .style('fill', sparkline.color()(data[data.length-1], data.length-1)) - .text(yTickFormat(currentValue)); - - - - gEnter.select('.nv-hoverArea').append('rect') - .on('mousemove', sparklineHover) - .on('click', function() { paused = !paused }) - .on('mouseout', function() { index = []; updateValueLine(); }); - //.on('mouseout', function() { index = null; updateValueLine(); }); - - g.select('.nv-hoverArea rect') - .attr('transform', function(d) { return 'translate(' + -margin.left + ',' + -margin.top + ')' }) - .attr('width', availableWidth + margin.left + margin.right) - .attr('height', availableHeight + margin.top); - - - - function updateValueLine() { //index is currently global (within the chart), may or may not keep it that way - if (paused) return; - - var hoverValue = g.selectAll('.nv-hoverValue').data(index) - - var hoverEnter = hoverValue.enter() - .append('g').attr('class', 'nv-hoverValue') - .style('stroke-opacity', 0) - .style('fill-opacity', 0); - - hoverValue.exit() - .transition().duration(250) - .style('stroke-opacity', 0) - .style('fill-opacity', 0) - .remove(); - - hoverValue - .attr('transform', function(d) { return 'translate(' + x(sparkline.x()(data[d],d)) + ',0)' }) - .transition().duration(250) - .style('stroke-opacity', 1) - .style('fill-opacity', 1); - - if (!index.length) return; - - hoverEnter.append('line') - .attr('x1', 0) - .attr('y1', -margin.top) - .attr('x2', 0) - .attr('y2', availableHeight); - - - hoverEnter.append('text').attr('class', 'nv-xValue') - .attr('x', -6) - .attr('y', -margin.top) - .attr('text-anchor', 'end') - .attr('dy', '.9em') - - - g.select('.nv-hoverValue .nv-xValue') - .text(xTickFormat(sparkline.x()(data[index[0]], index[0]))); - - hoverEnter.append('text').attr('class', 'nv-yValue') - .attr('x', 6) - .attr('y', -margin.top) - .attr('text-anchor', 'start') - .attr('dy', '.9em') - - g.select('.nv-hoverValue .nv-yValue') - .text(yTickFormat(sparkline.y()(data[index[0]], index[0]))); - - } - - - function sparklineHover() { - if (paused) return; - - var pos = d3.mouse(this)[0] - margin.left; - - function getClosestIndex(data, x) { - var distance = Math.abs(sparkline.x()(data[0], 0) - x); - var closestIndex = 0; - for (var i = 0; i < data.length; i++){ - if (Math.abs(sparkline.x()(data[i], i) - x) < distance) { - distance = Math.abs(sparkline.x()(data[i], i) - x); - closestIndex = i; - } - } - return closestIndex; - } - - index = [getClosestIndex(data, Math.round(x.invert(pos)))]; - - updateValueLine(); - } - - }); - - return chart; - } - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.sparkline = sparkline; - - d3.rebind(chart, sparkline, 'x', 'y', 'xScale', 'yScale', 'color'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.xTickFormat = function(_) { - if (!arguments.length) return xTickFormat; - xTickFormat = _; - return chart; - }; - - chart.yTickFormat = function(_) { - if (!arguments.length) return yTickFormat; - yTickFormat = _; - return chart; - }; - - chart.showValue = function(_) { - if (!arguments.length) return showValue; - showValue = _; - return chart; - }; - - chart.alignValue = function(_) { - if (!arguments.length) return alignValue; - alignValue = _; - return chart; - }; - - chart.rightAlignValue = function(_) { - if (!arguments.length) return rightAlignValue; - rightAlignValue = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - //============================================================ - - - return chart; -} - -nv.models.stackedArea = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var margin = {top: 0, right: 0, bottom: 0, left: 0} - , width = 960 - , height = 500 - , color = nv.utils.defaultColor() // a function that computes the color - , id = Math.floor(Math.random() * 100000) //Create semi-unique ID incase user doesn't selet one - , getX = function(d) { return d.x } // accessor to get the x value from a data point - , getY = function(d) { return d.y } // accessor to get the y value from a data point - , style = 'stack' - , offset = 'zero' - , order = 'default' - , interpolate = 'linear' // controls the line interpolation - , clipEdge = false // if true, masks lines within x and y scale - , x //can be accessed via chart.xScale() - , y //can be accessed via chart.yScale() - , scatter = nv.models.scatter() - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'areaClick', 'areaMouseover', 'areaMouseout') - ; - - scatter - .size(2.2) // default size - .sizeDomain([2.2,2.2]) // all the same size by default - ; - - /************************************ - * offset: - * 'wiggle' (stream) - * 'zero' (stacked) - * 'expand' (normalize to 100%) - * 'silhouette' (simple centered) - * - * order: - * 'inside-out' (stream) - * 'default' (input order) - ************************************/ - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var availableWidth = width - margin.left - margin.right, - availableHeight = height - margin.top - margin.bottom, - container = d3.select(this); - - //------------------------------------------------------------ - // Setup Scales - - x = scatter.xScale(); - y = scatter.yScale(); - - //------------------------------------------------------------ - - - // Injecting point index into each point because d3.layout.stack().out does not give index - // ***Also storing getY(d,i) as stackedY so that it can be set to 0 if series is disabled - data = data.map(function(aseries, i) { - aseries.values = aseries.values.map(function(d, j) { - d.index = j; - d.stackedY = aseries.disabled ? 0 : getY(d,j); - return d; - }) - return aseries; - }); - - - data = d3.layout.stack() - .order(order) - .offset(offset) - .values(function(d) { return d.values }) //TODO: make values customizeable in EVERY model in this fashion - .x(getX) - .y(function(d) { return d.stackedY }) - .out(function(d, y0, y) { - d.display = { - y: y, - y0: y0 - }; - }) - (data); - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-stackedarea').data([data]); - var wrapEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-stackedarea'); - var defsEnter = wrapEnter.append('defs'); - var gEnter = wrapEnter.append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-areaWrap'); - gEnter.append('g').attr('class', 'nv-scatterWrap'); - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - //------------------------------------------------------------ - - - scatter - .width(availableWidth) - .height(availableHeight) - .x(getX) - .y(function(d) { return d.display.y + d.display.y0 }) - .forceY([0]) - .color(data.map(function(d,i) { - return d.color || color(d, i); - }).filter(function(d,i) { return !data[i].disabled })); - - - var scatterWrap = g.select('.nv-scatterWrap') - .datum(data.filter(function(d) { return !d.disabled })) - - //d3.transition(scatterWrap).call(scatter); - scatterWrap.call(scatter); - - - - - - defsEnter.append('clipPath') - .attr('id', 'nv-edge-clip-' + id) - .append('rect'); - - wrap.select('#nv-edge-clip-' + id + ' rect') - .attr('width', availableWidth) - .attr('height', availableHeight); - - g .attr('clip-path', clipEdge ? 'url(#nv-edge-clip-' + id + ')' : ''); - - - - - var area = d3.svg.area() - .x(function(d,i) { return x(getX(d,i)) }) - .y0(function(d) { return y(d.display.y0) }) - .y1(function(d) { return y(d.display.y + d.display.y0) }) - .interpolate(interpolate); - - var zeroArea = d3.svg.area() - .x(function(d,i) { return x(getX(d,i)) }) - .y0(function(d) { return y(d.display.y0) }) - .y1(function(d) { return y(d.display.y0) }); - - - var path = g.select('.nv-areaWrap').selectAll('path.nv-area') - .data(function(d) { return d }); - //.data(function(d) { return d }, function(d) { return d.key }); - path.enter().append('path').attr('class', function(d,i) { return 'nv-area nv-area-' + i }) - .on('mouseover', function(d,i) { - d3.select(this).classed('hover', true); - dispatch.areaMouseover({ - point: d, - series: d.key, - pos: [d3.event.pageX, d3.event.pageY], - seriesIndex: i - }); - }) - .on('mouseout', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.areaMouseout({ - point: d, - series: d.key, - pos: [d3.event.pageX, d3.event.pageY], - seriesIndex: i - }); - }) - .on('click', function(d,i) { - d3.select(this).classed('hover', false); - dispatch.areaClick({ - point: d, - series: d.key, - pos: [d3.event.pageX, d3.event.pageY], - seriesIndex: i - }); - }) - //d3.transition(path.exit()) - path.exit() - .attr('d', function(d,i) { return zeroArea(d.values,i) }) - .remove(); - path - .style('fill', function(d,i){ return d.color || color(d, i) }) - .style('stroke', function(d,i){ return d.color || color(d, i) }); - //d3.transition(path) - path - .attr('d', function(d,i) { return area(d.values,i) }) - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - scatter.dispatch.on('elementMouseover.area', function(e) { - g.select('.nv-chart-' + id + ' .nv-area-' + e.seriesIndex).classed('hover', true); - }); - scatter.dispatch.on('elementMouseout.area', function(e) { - g.select('.nv-chart-' + id + ' .nv-area-' + e.seriesIndex).classed('hover', false); - }); - - //============================================================ - - }); - - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - scatter.dispatch.on('elementClick.area', function(e) { - dispatch.areaClick(e); - }) - scatter.dispatch.on('elementMouseover.tooltip', function(e) { - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top], - dispatch.tooltipShow(e); - }); - scatter.dispatch.on('elementMouseout.tooltip', function(e) { - dispatch.tooltipHide(e); - }); - - //============================================================ - - - //============================================================ - // Global getters and setters - //------------------------------------------------------------ - - chart.dispatch = dispatch; - chart.scatter = scatter; - - d3.rebind(chart, scatter, 'interactive', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'sizeDomain', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'clipRadius'); - - chart.x = function(_) { - if (!arguments.length) return getX; - getX = d3.functor(_); - return chart; - }; - - chart.y = function(_) { - if (!arguments.length) return getY; - getY = d3.functor(_); - return chart; - } - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return width; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return height; - height = _; - return chart; - }; - - chart.clipEdge = function(_) { - if (!arguments.length) return clipEdge; - clipEdge = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - return chart; - }; - - chart.offset = function(_) { - if (!arguments.length) return offset; - offset = _; - return chart; - }; - - chart.order = function(_) { - if (!arguments.length) return order; - order = _; - return chart; - }; - - //shortcut for offset + order - chart.style = function(_) { - if (!arguments.length) return style; - style = _; - - switch (style) { - case 'stack': - chart.offset('zero'); - chart.order('default'); - break; - case 'stream': - chart.offset('wiggle'); - chart.order('inside-out'); - break; - case 'stream-center': - chart.offset('silhouette'); - chart.order('inside-out'); - break; - case 'expand': - chart.offset('expand'); - chart.order('default'); - break; - } - - return chart; - }; - - chart.interpolate = function(_) { - if (!arguments.length) return interpolate; - interpolate = _; - return interpolate; - - }; - - //============================================================ - - - return chart; -} - -nv.models.stackedAreaChart = function() { - - //============================================================ - // Public Variables with Default Settings - //------------------------------------------------------------ - - var stacked = nv.models.stackedArea() - , xAxis = nv.models.axis() - , yAxis = nv.models.axis() - , legend = nv.models.legend() - , controls = nv.models.legend() - ; - - var margin = {top: 30, right: 25, bottom: 50, left: 60} - , width = null - , height = null - , color = nv.utils.defaultColor() // a function that takes in d, i and returns color - , showControls = true - , showLegend = true - , tooltips = true - , tooltip = function(key, x, y, e, graph) { - return '<h3>' + key + '</h3>' + - '<p>' + y + ' on ' + x + '</p>' - } - , x //can be accessed via chart.xScale() - , y //can be accessed via chart.yScale() - , yAxisTickFormat = d3.format(',.2f') - , state = { style: stacked.style() } - , defaultState = null - , noData = 'No Data Available.' - , dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState') - , controlWidth = 250 - ; - - xAxis - .orient('bottom') - .tickPadding(7) - ; - yAxis - .orient('left') - ; - stacked.scatter - .pointActive(function(d) { - //console.log(stacked.y()(d), !!Math.round(stacked.y()(d) * 100)); - return !!Math.round(stacked.y()(d) * 100); - }) - ; - - //============================================================ - - - //============================================================ - // Private Variables - //------------------------------------------------------------ - - var showTooltip = function(e, offsetElement) { - var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ), - top = e.pos[1] + ( offsetElement.offsetTop || 0), - x = xAxis.tickFormat()(stacked.x()(e.point, e.pointIndex)), - y = yAxis.tickFormat()(stacked.y()(e.point, e.pointIndex)), - content = tooltip(e.series.key, x, y, e, chart); - - nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement); - }; - - //============================================================ - - - function chart(selection) { - selection.each(function(data) { - var container = d3.select(this), - that = this; - - var availableWidth = (width || parseInt(container.style('width')) || 960) - - margin.left - margin.right, - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - - chart.update = function() { container.transition().call(chart); }; - chart.container = this; - - //set state.disabled - state.disabled = data.map(function(d) { return !!d.disabled }); - - if (!defaultState) { - var key; - defaultState = {}; - for (key in state) { - if (state[key] instanceof Array) - defaultState[key] = state[key].slice(0); - else - defaultState[key] = state[key]; - } - } - - //------------------------------------------------------------ - // Display No Data message if there's nothing to show. - - if (!data || !data.length || !data.filter(function(d) { return d.values.length }).length) { - var noDataText = container.selectAll('.nv-noData').data([noData]); - - noDataText.enter().append('text') - .attr('class', 'nvd3 nv-noData') - .attr('dy', '-.7em') - .style('text-anchor', 'middle'); - - noDataText - .attr('x', margin.left + availableWidth / 2) - .attr('y', margin.top + availableHeight / 2) - .text(function(d) { return d }); - - return chart; - } else { - container.selectAll('.nv-noData').remove(); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Scales - - x = stacked.xScale(); - y = stacked.yScale(); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup containers and skeleton of chart - - var wrap = container.selectAll('g.nv-wrap.nv-stackedAreaChart').data([data]); - var gEnter = wrap.enter().append('g').attr('class', 'nvd3 nv-wrap nv-stackedAreaChart').append('g'); - var g = wrap.select('g'); - - gEnter.append('g').attr('class', 'nv-x nv-axis'); - gEnter.append('g').attr('class', 'nv-y nv-axis'); - gEnter.append('g').attr('class', 'nv-stackedWrap'); - gEnter.append('g').attr('class', 'nv-legendWrap'); - gEnter.append('g').attr('class', 'nv-controlsWrap'); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Legend - - if (showLegend) { - legend - .width( availableWidth - controlWidth ); - - g.select('.nv-legendWrap') - .datum(data) - .call(legend); - - if ( margin.top != legend.height()) { - margin.top = legend.height(); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - g.select('.nv-legendWrap') - .attr('transform', 'translate(' + controlWidth + ',' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Controls - - if (showControls) { - var controlsData = [ - { key: 'Stacked', disabled: stacked.offset() != 'zero' }, - { key: 'Stream', disabled: stacked.offset() != 'wiggle' }, - { key: 'Expanded', disabled: stacked.offset() != 'expand' } - ]; - - controls - .width( controlWidth ) - .color(['#444', '#444', '#444']); - - g.select('.nv-controlsWrap') - .datum(controlsData) - .call(controls); - - - if ( margin.top != Math.max(controls.height(), legend.height()) ) { - margin.top = Math.max(controls.height(), legend.height()); - availableHeight = (height || parseInt(container.style('height')) || 400) - - margin.top - margin.bottom; - } - - - g.select('.nv-controlsWrap') - .attr('transform', 'translate(0,' + (-margin.top) +')'); - } - - //------------------------------------------------------------ - - - wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); - - - //------------------------------------------------------------ - // Main Chart Component(s) - - stacked - .width(availableWidth) - .height(availableHeight) - - var stackedWrap = g.select('.nv-stackedWrap') - .datum(data); - //d3.transition(stackedWrap).call(stacked); - stackedWrap.call(stacked); - - //------------------------------------------------------------ - - - //------------------------------------------------------------ - // Setup Axes - - xAxis - .scale(x) - .ticks( availableWidth / 100 ) - .tickSize( -availableHeight, 0); - - g.select('.nv-x.nv-axis') - .attr('transform', 'translate(0,' + availableHeight + ')'); - //d3.transition(g.select('.nv-x.nv-axis')) - g.select('.nv-x.nv-axis') - .transition().duration(0) - .call(xAxis); - - yAxis - .scale(y) - .ticks(stacked.offset() == 'wiggle' ? 0 : availableHeight / 36) - .tickSize(-availableWidth, 0) - .setTickFormat(stacked.offset() == 'expand' ? d3.format('%') : yAxisTickFormat); - - //d3.transition(g.select('.nv-y.nv-axis')) - g.select('.nv-y.nv-axis') - .transition().duration(0) - .call(yAxis); - - //------------------------------------------------------------ - - - //============================================================ - // Event Handling/Dispatching (in chart's scope) - //------------------------------------------------------------ - - stacked.dispatch.on('areaClick.toggle', function(e) { - if (data.filter(function(d) { return !d.disabled }).length === 1) - data = data.map(function(d) { - d.disabled = false; - return d - }); - else - data = data.map(function(d,i) { - d.disabled = (i != e.seriesIndex); - return d - }); - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - //selection.transition().call(chart); - chart.update(); - }); - - legend.dispatch.on('legendClick', function(d,i) { - d.disabled = !d.disabled; - - if (!data.filter(function(d) { return !d.disabled }).length) { - data.map(function(d) { - d.disabled = false; - return d; - }); - } - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - - //selection.transition().call(chart); - chart.update(); - }); - - legend.dispatch.on('legendDblclick', function(d) { - //Double clicking should always enable current series, and disabled all others. - data.forEach(function(d) { - d.disabled = true; - }); - d.disabled = false; - - state.disabled = data.map(function(d) { return !!d.disabled }); - dispatch.stateChange(state); - chart.update(); - }); - - controls.dispatch.on('legendClick', function(d,i) { - if (!d.disabled) return; - - controlsData = controlsData.map(function(s) { - s.disabled = true; - return s; - }); - d.disabled = false; - - switch (d.key) { - case 'Stacked': - stacked.style('stack'); - break; - case 'Stream': - stacked.style('stream'); - break; - case 'Expanded': - stacked.style('expand'); - break; - } - - state.style = stacked.style(); - dispatch.stateChange(state); - - //selection.transition().call(chart); - chart.update(); - }); - - dispatch.on('tooltipShow', function(e) { - if (tooltips) showTooltip(e, that.parentNode); - }); - - // Update chart from a state object passed to event handler - dispatch.on('changeState', function(e) { - - if (typeof e.disabled !== 'undefined') { - data.forEach(function(series,i) { - series.disabled = e.disabled[i]; - }); - - state.disabled = e.disabled; - } - - if (typeof e.style !== 'undefined') { - stacked.style(e.style); - } - - chart.update(); - }); - - }); - - - return chart; - } - - - //============================================================ - // Event Handling/Dispatching (out of chart's scope) - //------------------------------------------------------------ - - stacked.dispatch.on('tooltipShow', function(e) { - //disable tooltips when value ~= 0 - //// TODO: consider removing points from voronoi that have 0 value instead of this hack - /* - if (!Math.round(stacked.y()(e.point) * 100)) { // 100 will not be good for very small numbers... will have to think about making this valu dynamic, based on data range - setTimeout(function() { d3.selectAll('.point.hover').classed('hover', false) }, 0); - return false; - } - */ - - e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top], - dispatch.tooltipShow(e); - }); - - stacked.dispatch.on('tooltipHide', function(e) { - dispatch.tooltipHide(e); - }); - - dispatch.on('tooltipHide', function() { - if (tooltips) nv.tooltip.cleanup(); - }); - - //============================================================ - - - //============================================================ - // Expose Public Variables - //------------------------------------------------------------ - - // expose chart's sub-components - chart.dispatch = dispatch; - chart.stacked = stacked; - chart.legend = legend; - chart.controls = controls; - chart.xAxis = xAxis; - chart.yAxis = yAxis; - - d3.rebind(chart, stacked, 'x', 'y', 'size', 'xScale', 'yScale', 'xDomain', 'yDomain', 'sizeDomain', 'interactive', 'offset', 'order', 'style', 'clipEdge', 'forceX', 'forceY', 'forceSize', 'interpolate'); - - chart.margin = function(_) { - if (!arguments.length) return margin; - margin.top = typeof _.top != 'undefined' ? _.top : margin.top; - margin.right = typeof _.right != 'undefined' ? _.right : margin.right; - margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; - margin.left = typeof _.left != 'undefined' ? _.left : margin.left; - return chart; - }; - - chart.width = function(_) { - if (!arguments.length) return getWidth; - width = _; - return chart; - }; - - chart.height = function(_) { - if (!arguments.length) return getHeight; - height = _; - return chart; - }; - - chart.color = function(_) { - if (!arguments.length) return color; - color = nv.utils.getColor(_); - legend.color(color); - stacked.color(color); - return chart; - }; - - chart.showControls = function(_) { - if (!arguments.length) return showControls; - showControls = _; - return chart; - }; - - chart.showLegend = function(_) { - if (!arguments.length) return showLegend; - showLegend = _; - return chart; - }; - - chart.tooltip = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.tooltips = function(_) { - if (!arguments.length) return tooltips; - tooltips = _; - return chart; - }; - - chart.tooltipContent = function(_) { - if (!arguments.length) return tooltip; - tooltip = _; - return chart; - }; - - chart.state = function(_) { - if (!arguments.length) return state; - state = _; - return chart; - }; - - chart.defaultState = function(_) { - if (!arguments.length) return defaultState; - defaultState = _; - return chart; - }; - - chart.noData = function(_) { - if (!arguments.length) return noData; - noData = _; - return chart; - }; - - yAxis.setTickFormat = yAxis.tickFormat; - - yAxis.tickFormat = function(_) { - if (!arguments.length) return yAxisTickFormat; - yAxisTickFormat = _; - return yAxis; - }; - - //============================================================ - - return chart; -} -})(); \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.min.js b/modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.min.js deleted file mode 100755 index 309108b..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/nv.d3.min.js +++ /dev/null @@ -1,6 +0,0 @@ -(function(){function t(e,t){return(new Date(t,e+1,0)).getDate()}function n(e,t,n){return function(r,i,s){var o=e(r),u=[];o<r&&t(o);if(s>1)while(o<i){var a=new Date(+o);n(a)%s===0&&u.push(a),t(o)}else while(o<i)u.push(new Date(+o)),t(o);return u}}var e=window.nv||{};e.version="0.0.1a",e.dev=!0,window.nv=e,e.tooltip={},e.utils={},e.models={},e.charts={},e.graphs=[],e.logs={},e.dispatch=d3.dispatch("render_start","render_end"),e.dev&&(e.dispatch.on("render_start",function(t){e.logs.startTime=+(new Date)}),e.dispatch.on("render_end",function(t){e.logs.endTime=+(new Date),e.logs.totalTime=e.logs.endTime-e.logs.startTime,e.log("total",e.logs.totalTime)})),e.log=function(){if(e.dev&&console.log&&console.log.apply)console.log.apply(console,arguments);else if(e.dev&&console.log&&Function.prototype.bind){var t=Function.prototype.bind.call(console.log,console);t.apply(console,arguments)}return arguments[arguments.length-1]},e.render=function(n){n=n||1,e.render.active=!0,e.dispatch.rend er_start(),setTimeout(function(){var t,r;for(var i=0;i<n&&(r=e.render.queue[i]);i++)t=r.generate(),typeof r.callback==typeof Function&&r.callback(t),e.graphs.push(t);e.render.queue.splice(0,i),e.render.queue.length?setTimeout(arguments.callee,0):(e.render.active=!1,e.dispatch.render_end())},0)},e.render.active=!1,e.render.queue=[],e.addGraph=function(t){typeof arguments[0]==typeof Function&&(t={generate:arguments[0],callback:arguments[1]}),e.render.queue.push(t),e.render.active||e.render()},e.identity=function(e){return e},e.strip=function(e){return e.replace(/(\s|&)/g,"")},d3.time.monthEnd=function(e){return new Date(e.getFullYear(),e.getMonth(),0)},d3.time.monthEnds=n(d3.time.monthEnd,function(e){e.setUTCDate(e.getUTCDate()+1),e.setDate(t(e.getMonth()+1,e.getFullYear()))},function(e){return e.getMonth()}),function(){var t=window.nv.tooltip={};t.show=function(t,n,r,i,s,o){var u=document.createElement("div");u.className="nvtooltip "+(o?o:"xy-tooltip"),r=r||"s",i=i||20;var a= s;if(!s||s.tagName.match(/g|svg/i))a=document.getElementsByTagName("body")[0];u.innerHTML=n,u.style.left=0,u.style.top=0,u.style.opacity=0,a.appendChild(u);var f=parseInt(u.offsetHeight),l=parseInt(u.offsetWidth),c=e.utils.windowSize().width,h=e.utils.windowSize().height,p=window.scrollY,d=window.scrollX,v,m;h=window.innerWidth>=document.body.scrollWidth?h:h-16,c=window.innerHeight>=document.body.scrollHeight?c:c-16;var g=function(e){var t=m;do isNaN(e.offsetTop)||(t+=e.offsetTop);while(e=e.offsetParent);return t},y=function(e){var t=v;do isNaN(e.offsetLeft)||(t+=e.offsetLeft);while(e=e.offsetParent);return t};switch(r){case"e":v=t[0]-l-i,m=t[1]-f/2;var b=y(u),w=g(u);b<d&&(v=t[0]+i>d?t[0]+i:d-b+v),w<p&&(m=p-w+m),w+f>p+h&&(m=p+h-w+m-f);break;case"w":v=t[0]+i,m=t[1]-f/2,b+l>c&&(v=t[0]-l-i),w<p&&(m=p+5),w+f>p+h&&(m=p-f-5);break;case"n":v=t[0]-l/2-5,m=t[1]+i;var b=y(u),w=g(u);b<d&&(v=d+5),b+l>c&&(v=v-l/2+5),w+f>p+h&&(m=p+h-w+m-f);break;case"s":v=t[0]-l/2,m=t[1]-f-i;var b=y(u),w= g(u);b<d&&(v=d+5),b+l>c&&(v=v-l/2+5),p>w&&(m=p)}return u.style.left=v+"px",u.style.top=m+"px",u.style.opacity=1,u.style.position="absolute",u.style.pointerEvents="none",u},t.cleanup=function(){var e=document.getElementsByClassName("nvtooltip"),t=[];while(e.length)t.push(e[0]),e[0].style.transitionDelay="0 !important",e[0].style.opacity=0,e[0].className="nvtooltip-pending-removal";setTimeout(function(){while(t.length){var e=t.pop();e.parentNode.removeChild(e)}},500)}}(),e.utils.windowSize=function(){var e={width:640,height:480};return document.body&&document.body.offsetWidth&&(e.width=document.body.offsetWidth,e.height=document.body.offsetHeight),document.compatMode=="CSS1Compat"&&document.documentElement&&document.documentElement.offsetWidth&&(e.width=document.documentElement.offsetWidth,e.height=document.documentElement.offsetHeight),window.innerWidth&&window.innerHeight&&(e.width=window.innerWidth,e.height=window.innerHeight),e},e.utils.windowResize=function(e){var t=windo w.onresize;window.onresize=function(n){typeof t=="function"&&t(n),e(n)}},e.utils.getColor=function(t){return arguments.length?Object.prototype.toString.call(t)==="[object Array]"?function(e,n){return e.color||t[n%t.length]}:t:e.utils.defaultColor()},e.utils.defaultColor=function(){var e=d3.scale.category20().range();return function(t,n){return t.color||e[n%e.length]}},e.utils.customTheme=function(e,t,n){t=t||function(e){return e.key},n=n||d3.scale.category20().range();var r=n.length;return function(i,s){var o=t(i);return r||(r=n.length),typeof e[o]!="undefined"?typeof e[o]=="function"?e[o]():e[o]:n[--r]}},e.utils.pjax=function(t,n){function r(r){d3.html(r,function(r){var i=d3.select(n).node();i.parentNode.replaceChild(d3.select(r).select(n).node(),i),e.utils.pjax(t,n)})}d3.selectAll(t).on("click",function(){history.pushState(this.href,this.textContent,this.href),r(this.href),d3.event.preventDefault()}),d3.select(window).on("popstate",function(){d3.event.state&&r(d3.event.sta te)})},e.utils.calcApproxTextWidth=function(e){if(e instanceof d3.selection){var t=parseInt(e.style("font-size").replace("px","")),n=e.text().length;return n*t*.5}return 0},e.models.axis=function(){function d(r){return r.each(function(r){var d=d3.select(this),v=d.selectAll("g.nv-wrap.nv-axis").data([r]),m=v.enter().append("g").attr("class","nvd3 nv-wrap nv-axis"),g=m.append("g"),y=v.select("g");h!==null?e.ticks(h):(e.orient()=="top"||e.orient()=="bottom")&&e.ticks(Math.abs(i.range()[1]-i.range()[0])/100),d3.transition(y).call(e),p=p||e.scale();var b=e.tickFormat();b==null&&(b=p.tickFormat());var w=y.selectAll("text.nv-axislabel").data([s||null]);w.exit().remove();switch(e.orient()){case"top":w.enter().append("text").attr("class","nv-axislabel");var E=i.range().length==2?i.range()[1]:i.range()[i.range().length-1]+(i.range()[1]-i.range()[0]);w.attr("text-anchor","middle").attr("y",0).attr("x",E/2);if(o){var S=v.selectAll("g.nv-axisMaxMin").data(i.domain());S.enter().append("g" ).attr("class","nv-axisMaxMin").append("text"),S.exit().remove(),S.attr("transform",function(e,t){return"translate("+i(e)+",0)"}).select("text").attr("dy","0em").attr("y",-e.tickPadding()).attr("text-anchor","middle").text(function(e,t){var n=b(e);return(""+n).match("NaN")?"":n}),d3.transition(S).attr("transform",function(e,t){return"translate("+i.range()[t]+",0)"})}break;case"bottom":var x=36,T=30,N=y.selectAll("g").select("text");if(a%360){N.each(function(e,t){var n=this.getBBox().width;n>T&&(T=n)});var C=Math.abs(Math.sin(a*Math.PI/180)),x=(C?C*T:T)+30;N.attr("transform",function(e,t,n){return"rotate("+a+" 0,0)"}).attr("text-anchor",a%360>0?"start":"end")}w.enter().append("text").attr("class","nv-axislabel");var E=i.range().length==2?i.range()[1]:i.range()[i.range().length-1]+(i.range()[1]-i.range()[0]);w.attr("text-anchor","middle").attr("y",x).attr("x",E/2);if(o){var S=v.selectAll("g.nv-axisMaxMin").data([i.domain()[0],i.domain()[i.domain().length-1]]);S.enter().append( "g").attr("class","nv-axisMaxMin").append("text"),S.exit().remove(),S.attr("transform",function(e,t){return"translate("+(i(e)+(c?i.rangeBand()/2:0))+",0)"}).select("text").attr("dy",".71em").attr("y",e.tickPadding()).attr("transform",function(e,t,n){return"rotate("+a+" 0,0)"}).attr("text-anchor",a?a%360>0?"start":"end":"middle").text(function(e,t){var n=b(e);return(""+n).match("NaN")?"":n}),d3.transition(S).attr("transform",function(e,t){return"translate("+(i(e)+(c?i.rangeBand()/2:0))+",0)"})}l&&N.attr("transform",function(e,t){return"translate(0,"+(t%2==0?"0":"12")+")"});break;case"right":w.enter().append("text").attr("class","nv-axislabel"),w.attr("text-anchor",f?"middle":"begin").attr("transform",f?"rotate(90)":"").attr("y",f?-Math.max(t.right,n)+12:-10).attr("x",f?i.range()[0]/2:e.tickPadding());if(o){var S=v.selectAll("g.nv-axisMaxMin").data(i.domain());S.enter().append("g").attr("class","nv-axisMaxMin").append("text").style("opacity",0),S.exit().remove(),S.attr("transf orm",function(e,t){return"translate(0,"+i(e)+")"}).select("text").attr("dy",".32em").attr("y",0).attr("x",e.tickPadding()).attr("text-anchor","start").text(function(e,t){var n=b(e);return(""+n).match("NaN")?"":n}),d3.transition(S).attr("transform",function(e,t){return"translate(0,"+i.range()[t]+")"}).select("text").style("opacity",1)}break;case"left":w.enter().append("text").attr("class","nv-axislabel"),w.attr("text-anchor",f?"middle":"end").attr("transform",f?"rotate(-90)":"").attr("y",f?-Math.max(t.left,n)+12:-10).attr("x",f?-i.range()[0]/2:-e.tickPadding());if(o){var S=v.selectAll("g.nv-axisMaxMin").data(i.domain());S.enter().append("g").attr("class","nv-axisMaxMin").append("text").style("opacity",0),S.exit().remove(),S.attr("transform",function(e,t){return"translate(0,"+p(e)+")"}).select("text").attr("dy",".32em").attr("y",0).attr("x",-e.tickPadding()).attr("text-anchor","end").text(function(e,t){var n=b(e);return(""+n).match("NaN")?"":n}),d3.transition(S).attr("transfor m",function(e,t){return"translate(0,"+i.range()[t]+")"}).select("text").style("opacity",1)}}w.text(function(e){return e}),o&&(e.orient()==="left"||e.orient()==="right")&&(y.selectAll("g").each(function(e,t){d3.select(this).select("text").attr("opacity",1);if(i(e)<i.range()[1]+10||i(e)>i.range()[0]-10)(e>1e-10||e<-1e-10)&&d3.select(this).attr("opacity",0),d3.select(this).select("text").attr("opacity",0)}),i.domain()[0]==i.domain()[1]&&i.domain()[0]==0&&v.selectAll("g.nv-axisMaxMin").style("opacity",function(e,t){return t?0:1}));if(o&&(e.orient()==="top"||e.orient()==="bottom")){var k=[];v.selectAll("g.nv-axisMaxMin").each(function(e,t){try{t?k.push(i(e)-this.getBBox().width-4):k.push(i(e)+this.getBBox().width+4)}catch(n){t?k.push(i(e)-4):k.push(i(e)+4)}}),y.selectAll("g").each(function(e,t){if(i(e)<k[0]||i(e)>k[1])e>1e-10||e<-1e-10?d3.select(this).remove():d3.select(this).select("text").remove()})}u&&y.selectAll(".tick").filter(function(e){return!parseFloat(Math.round(e.__dat a__*1e5)/1e6)&&e.__data__!==undefined}).classed("zero",!0),p=i.copy()}),d}var e=d3.svg.axis(),t={top:0,right:0,bottom:0,left:0},n=75,r=60,i=d3.scale.linear(),s=null,o=!0,u=!0,a=0,f=!0,l=!1,c=!1,h=null;e.scale(i).orient("bottom").tickFormat(function(e){return e});var p;return d.axis=e,d3.rebind(d,e,"orient","tickValues","tickSubdivide","tickSize","tickPadding","tickFormat"),d3.rebind(d,i,"domain","range","rangeBand","rangeBands"),d.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,d):t},d.width=function(e){return arguments.length?(n=e,d):n},d.ticks=function(e){return arguments.length?(h=e,d):h},d.height=function(e){return arguments.length?(r=e,d):r},d.axisLabel=function(e){return arguments.length?(s=e,d):s},d.showMaxMin=function(e){return arguments.length?(o=e,d):o},d.highlightZero=fun ction(e){return arguments.length?(u=e,d):u},d.scale=function(t){return arguments.length?(i=t,e.scale(i),c=typeof i.rangeBands=="function",d3.rebind(d,i,"domain","range","rangeBand","rangeBands"),d):i},d.rotateYLabel=function(e){return arguments.length?(f=e,d):f},d.rotateLabels=function(e){return arguments.length?(a=e,d):a},d.staggerLabels=function(e){return arguments.length?(l=e,d):l},d},e.models.bullet=function(){function p(e){return e.each(function(e,n){var l=a-t.left-t.right,p=f-t.top-t.bottom,d=d3.select(this),v=i.call(this,e,n).slice().sort(d3.descending),m=s.call(this,e,n).slice().sort(d3.descending),g=o.call(this,e,n).slice().sort(d3.descending),y=d3.scale.linear().domain(d3.extent(d3.merge([u,v]))).range(r?[l,0]:[0,l]),b=this.__chart__||d3.scale.linear().domain([0,Infinity]).range(y.range());this.__chart__=y;var w=d3.min(v),E=d3.max(v),S=v[1],x=d.selectAll("g.nv-wrap.nv-bullet").data([e]),T=x.enter().append("g").attr("class","nvd3 nv-wrap nv-bullet"),N=T.append("g"), C=x.select("g");N.append("rect").attr("class","nv-range nv-rangeMax"),N.append("rect").attr("class","nv-range nv-rangeAvg"),N.append("rect").attr("class","nv-range nv-rangeMin"),N.append("rect").attr("class","nv-measure"),N.append("path").attr("class","nv-markerTriangle"),x.attr("transform","translate("+t.left+","+t.top+")");var k=function(e){return Math.abs(b(e)-b(0))},L=function(e){return Math.abs(y(e)-y(0))},A=function(e){return e<0?b(e):b(0)},O=function(e){return e<0?y(e):y(0)};C.select("rect.nv-rangeMax").attr("height",p).attr("width",L(E>0?E:w)).attr("x",O(E>0?E:w)).datum(E>0?E:w),C.select("rect.nv-rangeAvg").attr("height",p).attr("width",L(S)).attr("x",O(S)).datum(S),C.select("rect.nv-rangeMin").attr("height",p).attr("width",L(E)).attr("x",O(E)).attr("width",L(E>0?w:E)).attr("x",O(E>0?w:E)).datum(E>0?w:E),C.select("rect.nv-measure").style("fill",c).attr("height",p/3).attr("y",p/3).attr("width",g<0?y(0)-y(g[0]):y(g[0])-y(0)).attr("x",O(g)).on("mouseover",function(){h.e lementMouseover({value:g[0],label:"Current",pos:[y(g[0]),p/2]})}).on("mouseout",function(){h.elementMouseout({value:g[0],label:"Current"})});var M=p/6;m[0]?C.selectAll("path.nv-markerTriangle").attr("transform",function(e){return"translate("+y(m[0])+","+p/2+")"}).attr("d","M0,"+M+"L"+M+","+ -M+" "+ -M+","+ -M+"Z").on("mouseover",function(){h.elementMouseover({value:m[0],label:"Previous",pos:[y(m[0]),p/2]})}).on("mouseout",function(){h.elementMouseout({value:m[0],label:"Previous"})}):C.selectAll("path.nv-markerTriangle").remove(),x.selectAll(".nv-range").on("mouseover",function(e,t){var n=t?t==1?"Mean":"Minimum":"Maximum";h.elementMouseover({value:e,label:n,pos:[y(e),p/2]})}).on("mouseout",function(e,t){var n=t?t==1?"Mean":"Minimum":"Maximum";h.elementMouseout({value:e,label:n})})}),p}var t={top:0,right:0,bottom:0,left:0},n="left",r=!1,i=function(e){return e.ranges},s=function(e){return e.markers},o=function(e){return e.measures},u=[0],a=380,f=30,l=null,c=e.utils.getColor(["# 1f77b4"]),h=d3.dispatch("elementMouseover","elementMouseout");return p.dispatch=h,p.orient=function(e){return arguments.length?(n=e,r=n=="right"||n=="bottom",p):n},p.ranges=function(e){return arguments.length?(i=e,p):i},p.markers=function(e){return arguments.length?(s=e,p):s},p.measures=function(e){return arguments.length?(o=e,p):o},p.forceX=function(e){return arguments.length?(u=e,p):u},p.width=function(e){return arguments.length?(a=e,p):a},p.height=function(e){return arguments.length?(f=e,p):f},p.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,p):t},p.tickFormat=function(e){return arguments.length?(l=e,p):l},p.color=function(t){return arguments.length?(c=e.utils.getColor(t),p):c},p},e.models.bulletChart=function(){function m(e){return e.each(function(n,h){var g=d3.select(this),y=( a||parseInt(g.style("width"))||960)-i.left-i.right,b=f-i.top-i.bottom,w=this;m.update=function(){m(e)},m.container=this;if(!n||!s.call(this,n,h)){var E=g.selectAll(".nv-noData").data([p]);return E.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),E.attr("x",i.left+y/2).attr("y",18+i.top+b/2).text(function(e){return e}),m}g.selectAll(".nv-noData").remove();var S=s.call(this,n,h).slice().sort(d3.descending),x=o.call(this,n,h).slice().sort(d3.descending),T=u.call(this,n,h).slice().sort(d3.descending),N=g.selectAll("g.nv-wrap.nv-bulletChart").data([n]),C=N.enter().append("g").attr("class","nvd3 nv-wrap nv-bulletChart"),k=C.append("g"),L=N.select("g");k.append("g").attr("class","nv-bulletWrap"),k.append("g").attr("class","nv-titles"),N.attr("transform","translate("+i.left+","+i.top+")");var A=d3.scale.linear().domain([0,Math.max(S[0],x[0],T[0])]).range(r?[y,0]:[0,y]),O=this.__chart__||d3.scale.linear().domain([0,Infinity]).rang e(A.range());this.__chart__=A;var M=function(e){return Math.abs(O(e)-O(0))},_=function(e){return Math.abs(A(e)-A(0))},D=k.select(".nv-titles").append("g").attr("text-anchor","end").attr("transform","translate(-6,"+(f-i.top-i.bottom)/2+")");D.append("text").attr("class","nv-title").text(function(e){return e.title}),D.append("text").attr("class","nv-subtitle").attr("dy","1em").text(function(e){return e.subtitle}),t.width(y).height(b);var P=L.select(".nv-bulletWrap");d3.transition(P).call(t);var H=l||A.tickFormat(y/100),B=L.selectAll("g.nv-tick").data(A.ticks(y/50),function(e){return this.textContent||H(e)}),j=B.enter().append("g").attr("class","nv-tick").attr("transform",function(e){return"translate("+O(e)+",0)"}).style("opacity",1e-6);j.append("line").attr("y1",b).attr("y2",b*7/6),j.append("text").attr("text-anchor","middle").attr("dy","1em").attr("y",b*7/6).text(H);var F=d3.transition(B).attr("transform",function(e){return"translate("+A(e)+",0)"}).style("opacity",1);F.select ("line").attr("y1",b).attr("y2",b*7/6),F.select("text").attr("y",b*7/6),d3.transition(B.exit()).attr("transform",function(e){return"translate("+A(e)+",0)"}).style("opacity",1e-6).remove(),d.on("tooltipShow",function(e){e.key=n.title,c&&v(e,w.parentNode)})}),d3.timer.flush(),m}var t=e.models.bullet(),n="left",r=!1,i={top:5,right:40,bottom:20,left:120},s=function(e){return e.ranges},o=function(e){return e.markers},u=function(e){return e.measures},a=null,f=55,l=null,c=!0,h=function(e,t,n,r,i){return"<h3>"+t+"</h3>"+"<p>"+n+"</p>"},p="No Data Available.",d=d3.dispatch("tooltipShow","tooltipHide"),v=function(t,n){var r=t.pos[0]+(n.offsetLeft||0)+i.left,s=t.pos[1]+(n.offsetTop||0)+i.top,o=h(t.key,t.label,t.value,t,m);e.tooltip.show([r,s],o,t.value<0?"e":"w",null,n)};return t.dispatch.on("elementMouseover.tooltip",function(e){d.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){d.tooltipHide(e)}),d.on("tooltipHide",function(){c&&e.tooltip.cleanup()}),m.dispatch=d, m.bullet=t,d3.rebind(m,t,"color"),m.orient=function(e){return arguments.length?(n=e,r=n=="right"||n=="bottom",m):n},m.ranges=function(e){return arguments.length?(s=e,m):s},m.markers=function(e){return arguments.length?(o=e,m):o},m.measures=function(e){return arguments.length?(u=e,m):u},m.width=function(e){return arguments.length?(a=e,m):a},m.height=function(e){return arguments.length?(f=e,m):f},m.margin=function(e){return arguments.length?(i.top=typeof e.top!="undefined"?e.top:i.top,i.right=typeof e.right!="undefined"?e.right:i.right,i.bottom=typeof e.bottom!="undefined"?e.bottom:i.bottom,i.left=typeof e.left!="undefined"?e.left:i.left,m):i},m.tickFormat=function(e){return arguments.length?(l=e,m):l},m.tooltips=function(e){return arguments.length?(c=e,m):c},m.tooltipContent=function(e){return arguments.length?(h=e,m):h},m.noData=function(e){return arguments.length?(p=e,m):p},m},e.models.cumulativeLineChart=function(){function C(e){return e.each(function(e){function D(e,t){d3 .select(C.container).style("cursor","ew-resize")}function P(e,t){T.x=d3.event.x,T.i=Math.round(x.invert(T.x)),J()}function H(e,t){d3.select(C.container).style("cursor","auto"),y.index=T.i,S.stateChange(y)}function J(){$.data([T]),d.call(C)}var d=d3.select(this).classed("nv-chart-"+g,!0),L=this,A=(a||parseInt(d.style("width"))||960)-o.left-o.right,O=(f||parseInt(d.style("height"))||400)-o.top-o.bottom;C.update=function(){d.transition().call(C)},C.container=this,y.disabled=e.map(function(e){return!!e.disabled});if(!b){var M;b={};for(M in y)y[M]instanceof Array?b[M]=y[M].slice(0):b[M]=y[M]}var _=d3.behavior.drag().on("dragstart",D).on("drag",P).on("dragend",H);if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var B=d.selectAll(".nv-noData").data([w]);return B.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),B.attr("x",o.left+A/2).attr("y",o.top+O/2).text(function(e){return e}),C}d.selectAll(".nv-noData ").remove(),v=t.xScale(),m=t.yScale();if(!p){var j=e.filter(function(e){return!e.disabled}).map(function(e,n){var r=d3.extent(e.values,t.y());return r[0]<-0.95&&(r[0]=-0.95),[(r[0]-r[1])/(1+r[1]),(r[1]-r[0])/(1+r[0])]}),F=[d3.min(j,function(e){return e[0]}),d3.max(j,function(e){return e[1]})];t.yDomain(F)}else t.yDomain(null);x.domain([0,e[0].values.length-1]).range([0,A]).clamp(!0);var e=k(T.i,e),I=d.selectAll("g.nv-wrap.nv-cumulativeLine").data([e]),q=I.enter().append("g").attr("class","nvd3 nv-wrap nv-cumulativeLine").append("g"),R=I.select("g");q.append("g").attr("class","nv-x nv-axis"),q.append("g").attr("class","nv-y nv-axis"),q.append("g").attr("class","nv-background"),q.append("g").attr("class","nv-linesWrap"),q.append("g").attr("class","nv-avgLinesWrap"),q.append("g").attr("class","nv-legendWrap"),q.append("g").attr("class","nv-controlsWrap"),l&&(i.width(A),R.select(".nv-legendWrap").datum(e).call(i),o.top!=i.height()&&(o.top=i.height(),O=(f||parseInt(d.style("heigh t"))||400)-o.top-o.bottom),R.select(".nv-legendWrap").attr("transform","translate(0,"+ -o.top+")"));if(h){var U=[{key:"Re-scale y-axis",disabled:!p}];s.width(140).color(["#444","#444","#444"]),R.select(".nv-controlsWrap").datum(U).attr("transform","translate(0,"+ -o.top+")").call(s)}I.attr("transform","translate("+o.left+","+o.top+")");var z=e.filter(function(e){return e.tempDisabled});I.select(".tempDisabled").remove(),z.length&&I.append("text").attr("class","tempDisabled").attr("x",A/2).attr("y","-.71em").style("text-anchor","end").text(z.map(function(e){return e.key}).join(", ")+" values cannot be calculated for this time period."),q.select(".nv-background").append("rect"),R.select(".nv-background rect").attr("width",A).attr("height",O),t.y(function(e){return e.display.y}).width(A).height(O).color(e.map(function(e,t){return e.color||u(e,t)}).filter(function(t,n){return!e[n].disabled&&!e[n].tempDisabled}));var W=R.select(".nv-linesWrap").datum(e.filter(function(e){return!e .disabled&&!e.tempDisabled}));W.call(t),e.forEach(function(e,t){e.seriesIndex=t});var X=e.filter(function(e){return!e.disabled&&!!E(e)}),V=R.select(".nv-avgLinesWrap").selectAll("line").data(X,function(e){return e.key});V.enter().append("line").style("stroke-width",2).style("stroke-dasharray","10,10").style("stroke",function(e,n){return t.color()(e,e.seriesIndex)}).attr("x1",0).attr("x2",A).attr("y1",function(e){return m(E(e))}).attr("y2",function(e){return m(E(e))}),V.attr("x1",0).attr("x2",A).attr("y1",function(e){return m(E(e))}).attr("y2",function(e){return m(E(e))}),V.exit().remove();var $=W.selectAll(".nv-indexLine").data([T]);$.enter().append("rect").attr("class","nv-indexLine").attr("width",3).attr("x",-2).attr("fill","red").attr("fill-opacity",.5).call(_),$.attr("transform",function(e){return"translate("+x(e.i)+",0)"}).attr("height",O),n.scale(v).ticks(Math.min(e[0].values.length,A/70)).tickSize(-O,0),R.select(".nv-x.nv-axis").attr("transform","translate(0,"+m.range ()[0]+")"),d3.transition(R.select(".nv-x.nv-axis")).call(n),r.scale(m).ticks(O/36).tickSize(-A,0),d3.transition(R.select(".nv-y.nv-axis")).call(r),R.select(".nv-background rect").on("click",function(){T.x=d3.mouse(this)[0],T.i=Math.round(x.invert(T.x)),y.index=T.i,S.stateChange(y),J()}),t.dispatch.on("elementClick",function(e){T.i=e.pointIndex,T.x=x(T.i),y.index=T.i,S.stateChange(y),J()}),s.dispatch.on("legendClick",function(e,t){e.disabled=!e.disabled,p=!e.disabled,y.rescaleY=p,S.stateChange(y),C.update()}),i.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,I.selectAll(".nv-series").classed("disabled",!1),e}),y.disabled=e.map(function(e){return!!e.disabled}),S.stateChange(y),C.update()}),i.dispatch.on("legendDblclick",function(t){e.forEach(function(e){e.disabled=!0}),t.disabled=!1,y.disabled=e.map(function(e){return!!e.disabled}),S.stateChange(y),C.update()}),S.on("tooltipS how",function(e){c&&N(e,L.parentNode)}),S.on("changeState",function(t){typeof t.disabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),y.disabled=t.disabled),typeof t.index!="undefined"&&(T.i=t.index,T.x=x(T.i),y.index=t.index,$.data([T])),typeof t.rescaleY!="undefined"&&(p=t.rescaleY),C.update()})}),C}function k(e,n){return n.map(function(n,r){if(!n.values)return n;var i=t.y()(n.values[e],e);return i<-0.95?(n.tempDisabled=!0,n):(n.tempDisabled=!1,n.values=n.values.map(function(e,n){return e.display={y:(t.y()(e,n)-i)/(1+i)},e}),n)})}var t=e.models.line(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o={top:30,right:30,bottom:50,left:60},u=e.utils.defaultColor(),a=null,f=null,l=!0,c=!0,h=!0,p=!0,d=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},v,m,g=t.id(),y={index:0,rescaleY:p},b=null,w="No Data Available.",E=function(e){return e.average},S=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeStat e");n.orient("bottom").tickPadding(7),r.orient("left");var x=d3.scale.linear(),T={i:0,x:0},N=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=d(i.series.key,a,f,i,C);e.tooltip.show([o,u],l,null,null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+o.left,e.pos[1]+o.top],S.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),S.on("tooltipHide",function(){c&&e.tooltip.cleanup()}),C.dispatch=S,C.lines=t,C.legend=i,C.xAxis=n,C.yAxis=r,d3.rebind(C,t,"defined","isArea","x","y","size","xDomain","yDomain","forceX","forceY","interactive","clipEdge","clipVoronoi","id"),C.margin=function(e){return arguments.length?(o.top=typeof e.top!="undefined"?e.top:o.top,o.right=typeof e.right!="undefined"?e.right:o.right,o.bottom=typeof e.bottom!="undefined"?e.bottom:o.bottom,o.left=typeof e.left!="undefined"?e.lef t:o.left,C):o},C.width=function(e){return arguments.length?(a=e,C):a},C.height=function(e){return arguments.length?(f=e,C):f},C.color=function(t){return arguments.length?(u=e.utils.getColor(t),i.color(u),C):u},C.rescaleY=function(e){return arguments.length?(p=e,p):p},C.showControls=function(e){return arguments.length?(h=e,C):h},C.showLegend=function(e){return arguments.length?(l=e,C):l},C.tooltips=function(e){return arguments.length?(c=e,C):c},C.tooltipContent=function(e){return arguments.length?(d=e,C):d},C.state=function(e){return arguments.length?(y=e,C):y},C.defaultState=function(e){return arguments.length?(b=e,C):b},C.noData=function(e){return arguments.length?(w=e,C):w},C.average=function(e){return arguments.length?(E=e,C):E},C},e.models.discreteBar=function(){function b(e){return e.each(function(e){var i=n-t.left-t.right,b=r-t.top-t.bottom,w=d3.select(this);e=e.map(function(e,t){return e.values=e.values.map(function(e){return e.series=t,e}),e});var E=p&&d?[]:e.map(fun ction(e){return e.values.map(function(e,t){return{x:u(e,t),y:a(e,t),y0:e.y0}})});s.domain(p||d3.merge(E).map(function(e){return e.x})).rangeBands([0,i],.1),o.domain(d||d3.extent(d3.merge(E).map(function(e){return e.y}).concat(f))),c?o.range([b-(o.domain()[0]<0?12:0),o.domain()[1]>0?12:0]):o.range([b,0]),g=g||s,y=y||o.copy().range([o(0),o(0)]);var S=w.selectAll("g.nv-wrap.nv-discretebar").data([e]),T=S.enter().append("g").attr("class","nvd3 nv-wrap nv-discretebar"),N=T.append("g"),C=S.select("g");N.append("g").attr("class","nv-groups"),S.attr("transform","translate("+t.left+","+t.top+")");var k=S.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e){return e.key});k.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(k.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),k.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}),d3.transition(k ).style("stroke-opacity",1).style("fill-opacity",.75);var L=k.selectAll("g.nv-bar").data(function(e){return e.values});L.exit().remove();var A=L.enter().append("g").attr("transform",function(e,t,n){return"translate("+(s(u(e,t))+s.rangeBand()*.05)+", "+o(0)+")"}).on("mouseover",function(t,n){d3.select(this).classed("hover",!0),v.elementMouseover({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t,n))+s.rangeBand()*(t.series+.5)/e.length,o(a(t,n))],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),v.elementMouseout({value:a(t,n),point:t,series:e[t.series],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("click",function(t,n){v.elementClick({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t,n))+s.rangeBand()*(t.series+.5)/e.length,o(a(t,n))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}).on("dblclick",function(t,n){v.elementDblClick({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t ,n))+s.rangeBand()*(t.series+.5)/e.length,o(a(t,n))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()});A.append("rect").attr("height",0).attr("width",s.rangeBand()*.9/e.length),c?(A.append("text").attr("text-anchor","middle"),L.select("text").attr("x",s.rangeBand()*.9/2).attr("y",function(e,t){return a(e,t)<0?o(a(e,t))-o(0)+12:-4}).text(function(e,t){return h(a(e,t))})):L.selectAll("text").remove(),L.attr("class",function(e,t){return a(e,t)<0?"nv-bar negative":"nv-bar positive"}).style("fill",function(e,t){return e.color||l(e,t)}).style("stroke",function(e,t){return e.color||l(e,t)}).select("rect").attr("class",m).attr("width",s.rangeBand()*.9/e.length),d3.transition(L).attr("transform",function(e,t){var n=s(u(e,t))+s.rangeBand()*.05,r=a(e,t)<0?o(0):o(0)-o(a(e,t))<1?o(0)-1:o(a(e,t));return"translate("+n+", "+r+")"}).select("rect").attr("height",function(e,t){return Math.max(Math.abs(o(a(e,t))-o(0))||1)}),g=s.copy(),y=o.copy()}),b}var t={top:0,right: 0,bottom:0,left:0},n=960,r=500,i=Math.floor(Math.random()*1e4),s=d3.scale.ordinal(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=[0],l=e.utils.defaultColor(),c=!1,h=d3.format(",.2f"),p,d,v=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout"),m="discreteBar",g,y;return b.dispatch=v,b.x=function(e){return arguments.length?(u=e,b):u},b.y=function(e){return arguments.length?(a=e,b):a},b.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,b):t},b.width=function(e){return arguments.length?(n=e,b):n},b.height=function(e){return arguments.length?(r=e,b):r},b.xScale=function(e){return arguments.length?(s=e,b):s},b.yScale=function(e){return arguments.length?(o=e,b):o},b.xDomain=function(e){return arguments.length?(p=e,b):p},b .yDomain=function(e){return arguments.length?(d=e,b):d},b.forceY=function(e){return arguments.length?(f=e,b):f},b.color=function(t){return arguments.length?(l=e.utils.getColor(t),b):l},b.id=function(e){return arguments.length?(i=e,b):i},b.showValues=function(e){return arguments.length?(c=e,b):c},b.valueFormat=function(e){return arguments.length?(h=e,b):h},b.rectClass=function(e){return arguments.length?(m=e,b):m},b},e.models.discreteBarChart=function(){function m(e){return e.each(function(e){var u=d3.select(this),l=this,g=(s||parseInt(u.style("width"))||960)-i.left-i.right,b=(o||parseInt(u.style("height"))||400)-i.top-i.bottom;m.update=function(){d.beforeUpdate(),u.transition().call(m)},m.container=this;if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var w=u.selectAll(".nv-noData").data([p]);return w.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),w.attr("x",i.left+g/2).attr("y",i.top+b/2).text(f unction(e){return e}),m}u.selectAll(".nv-noData").remove(),c=t.xScale(),h=t.yScale();var E=u.selectAll("g.nv-wrap.nv-discreteBarWithAxes").data([e]),S=E.enter().append("g").attr("class","nvd3 nv-wrap nv-discreteBarWithAxes").append("g"),T=S.append("defs"),N=E.select("g");S.append("g").attr("class","nv-x nv-axis"),S.append("g").attr("class","nv-y nv-axis"),S.append("g").attr("class","nv-barsWrap"),N.attr("transform","translate("+i.left+","+i.top+")"),t.width(g).height(b);var C=N.select(".nv-barsWrap").datum(e.filter(function(e){return!e.disabled}));d3.transition(C).call(t),T.append("clipPath").attr("id","nv-x-label-clip-"+t.id()).append("rect"),N.select("#nv-x-label-clip-"+t.id()+" rect").attr("width",c.rangeBand()*(a?2:1)).attr("height",16).attr("x",-c.rangeBand()/(a?1:2)),n.scale(c).ticks(g/100).tickSize(-b,0),N.select(".nv-x.nv-axis").attr("transform","translate(0,"+(h.range()[0]+(t.showValues()&&h.domain()[0]<0?16:0))+")"),N.select(".nv-x.nv-axis").transition().duration(0 ).call(n);var k=N.select(".nv-x.nv-axis").selectAll("g");a&&k.selectAll("text").attr("transform",function(e,t,n){return"translate(0,"+ -(n%2==0?"5":"17")+")"}),r.scale(h).ticks(b/36).tickSize(-g,0),d3.transition(N.select(".nv-y.nv-axis")).call(r),d.on("tooltipShow",function(e){f&&v(e,l.parentNode)})}),m}var t=e.models.discreteBar(),n=e.models.axis(),r=e.models.axis(),i={top:15,right:10,bottom:50,left:60},s=null,o=null,u=e.utils.getColor(),a=!1,f=!0,l=function(e,t,n,r,i){return"<h3>"+t+"</h3>"+"<p>"+n+"</p>"},c,h,p="No Data Available.",d=d3.dispatch("tooltipShow","tooltipHide","beforeUpdate");n.orient("bottom").highlightZero(!1).showMaxMin(!1).tickFormat(function(e){return e}),r.orient("left").tickFormat(d3.format(",.1f"));var v=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),c=l(i.series.key,a,f,i,m);e.tooltip.show([o,u],c,i.value<0?"n":"s",null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+i.left,e.pos[1]+i.top],d.tooltipShow(e)}),t.dispatch.on("elementMous eout.tooltip",function(e){d.tooltipHide(e)}),d.on("tooltipHide",function(){f&&e.tooltip.cleanup()}),m.dispatch=d,m.discretebar=t,m.xAxis=n,m.yAxis=r,d3.rebind(m,t,"x","y","xDomain","yDomain","forceX","forceY","id","showValues","valueFormat"),m.margin=function(e){return arguments.length?(i.top=typeof e.top!="undefined"?e.top:i.top,i.right=typeof e.right!="undefined"?e.right:i.right,i.bottom=typeof e.bottom!="undefined"?e.bottom:i.bottom,i.left=typeof e.left!="undefined"?e.left:i.left,m):i},m.width=function(e){return arguments.length?(s=e,m):s},m.height=function(e){return arguments.length?(o=e,m):o},m.color=function(n){return arguments.length?(u=e.utils.getColor(n),t.color(u),m):u},m.staggerLabels=function(e){return arguments.length?(a=e,m):a},m.tooltips=function(e){return arguments.length?(f=e,m):f},m.tooltipContent=function(e){return arguments.length?(l=e,m):l},m.noData=function(e){return arguments.length?(p=e,m):p},m},e.models.distribution=function(){function l(e){return e. each(function(e){var a=n-(i==="x"?t.left+t.right:t.top+t.bottom),l=i=="x"?"y":"x",c=d3.select(this);f=f||u;var h=c.selectAll("g.nv-distribution").data([e]),p=h.enter().append("g").attr("class","nvd3 nv-distribution"),d=p.append("g"),v=h.select("g");h.attr("transform","translate("+t.left+","+t.top+")");var m=v.selectAll("g.nv-dist").data(function(e){return e},function(e){return e.key});m.enter().append("g"),m.attr("class",function(e,t){return"nv-dist nv-series-"+t}).style("stroke",function(e,t){return o(e,t)});var g=m.selectAll("line.nv-dist"+i).data(function(e){return e.values});g.enter().append("line").attr(i+"1",function(e,t){return f(s(e,t))}).attr(i+"2",function(e,t){return f(s(e,t))}),d3.transition(m.exit().selectAll("line.nv-dist"+i)).attr(i+"1",function(e,t){return u(s(e,t))}).attr(i+"2",function(e,t){return u(s(e,t))}).style("stroke-opacity",0).remove(),g.attr("class",function(e,t){return"nv-dist"+i+" nv-dist"+i+"-"+t}).attr(l+"1",0).attr(l+"2",r),d3.transition(g).at tr(i+"1",function(e,t){return u(s(e,t))}).attr(i+"2",function(e,t){return u(s(e,t))}),f=u.copy()}),l}var t={top:0,right:0,bottom:0,left:0},n=400,r=8,i="x",s=function(e){return e[i]},o=e.utils.defaultColor(),u=d3.scale.linear(),a,f;return l.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,l):t},l.width=function(e){return arguments.length?(n=e,l):n},l.axis=function(e){return arguments.length?(i=e,l):i},l.size=function(e){return arguments.length?(r=e,l):r},l.getData=function(e){return arguments.length?(s=d3.functor(e),l):s},l.scale=function(e){return arguments.length?(u=e,l):u},l.color=function(t){return arguments.length?(o=e.utils.getColor(t),l):o},l},e.models.historicalBar=function(){function g(e){return e.each(function(e){var g=n-t.left-t.right,b=r-t.top-t.bottom,w=d3.select(this);s. domain(d||d3.extent(e[0].values.map(u).concat(f))),c?s.range([g*.5/e[0].values.length,g*(e[0].values.length-.5)/e[0].values.length]):s.range([0,g]),o.domain(v||d3.extent(e[0].values.map(a).concat(l))).range([b,0]);if(s.domain()[0]===s.domain()[1]||o.domain()[0]===o.domain()[1])singlePoint=!0;s.domain()[0]===s.domain()[1]&&(s.domain()[0]?s.domain([s.domain()[0]-s.domain()[0]*.01,s.domain()[1]+s.domain()[1]*.01]):s.domain([-1,1])),o.domain()[0]===o.domain()[1]&&(o.domain()[0]?o.domain([o.domain()[0]+o.domain()[0]*.01,o.domain()[1]-o.domain()[1]*.01]):o.domain([-1,1]));var E=w.selectAll("g.nv-wrap.nv-bar").data([e[0].values]),S=E.enter().append("g").attr("class","nvd3 nv-wrap nv-bar"),T=S.append("defs"),N=S.append("g"),C=E.select("g");N.append("g").attr("class","nv-bars"),E.attr("transform","translate("+t.left+","+t.top+")"),w.on("click",function(e,t){m.chartClick({data:e,index:t,pos:d3.event,id:i})}),T.append("clipPath").attr("id","nv-chart-clip-path-"+i).append("rect"),E.sele ct("#nv-chart-clip-path-"+i+" rect").attr("width",g).attr("height",b),C.attr("clip-path",h?"url(#nv-chart-clip-path-"+i+")":"");var k=E.select(".nv-bars").selectAll(".nv-bar").data(function(e){return e});k.exit().remove();var L=k.enter().append("rect").attr("x",0).attr("y",function(e,t){return o(Math.max(0,a(e,t)))}).attr("height",function(e,t){return Math.abs(o(a(e,t))-o(0))}).on("mouseover",function(t,n){d3.select(this).classed("hover",!0),m.elementMouseover({point:t,series:e[0],pos:[s(u(t,n)),o(a(t,n))],pointIndex:n,seriesIndex:0,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),m.elementMouseout({point:t,series:e[0],pointIndex:n,seriesIndex:0,e:d3.event})}).on("click",function(e,t){m.elementClick({value:a(e,t),data:e,index:t,pos:[s(u(e,t)),o(a(e,t))],e:d3.event,id:i}),d3.event.stopPropagation()}).on("dblclick",function(e,t){m.elementDblClick({value:a(e,t),data:e,index:t,pos:[s(u(e,t)),o(a(e,t))],e:d3.event,id:i}),d3.event.stopPropagation()}); k.attr("fill",function(e,t){return p(e,t)}).attr("class",function(e,t,n){return(a(e,t)<0?"nv-bar negative":"nv-bar positive")+" nv-bar-"+n+"-"+t}).attr("transform",function(t,n){return"translate("+(s(u(t,n))-g/e[0].values.length*.45)+",0)"}).attr("width",g/e[0].values.length*.9),d3.transition(k).attr("y",function(e,t){return a(e,t)<0?o(0):o(0)-o(a(e,t))<1?o(0)-1:o(a(e,t))}).attr("height",function(e,t){return Math.max(Math.abs(o(a(e,t))-o(0)),1)})}),g}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=Math.floor(Math.random()*1e4),s=d3.scale.linear(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=[],l=[0],c=!1,h=!0,p=e.utils.defaultColor(),d,v,m=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout");return g.dispatch=m,g.x=function(e){return arguments.length?(u=e,g):u},g.y=function(e){return arguments.length?(a=e,g):a},g.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top, t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,g):t},g.width=function(e){return arguments.length?(n=e,g):n},g.height=function(e){return arguments.length?(r=e,g):r},g.xScale=function(e){return arguments.length?(s=e,g):s},g.yScale=function(e){return arguments.length?(o=e,g):o},g.xDomain=function(e){return arguments.length?(d=e,g):d},g.yDomain=function(e){return arguments.length?(v=e,g):v},g.forceX=function(e){return arguments.length?(f=e,g):f},g.forceY=function(e){return arguments.length?(l=e,g):l},g.padData=function(e){return arguments.length?(c=e,g):c},g.clipEdge=function(e){return arguments.length?(h=e,g):h},g.color=function(t){return arguments.length?(p=e.utils.getColor(t),g):p},g.id=function(e){return arguments.length?(i=e,g):i},g},e.models.historicalBarChart=function(){function S(e){return e.each(function(d){var T=d3.select(this),N=this,C=(u||parseInt(T.style("wid th"))||960)-s.left-s.right,k=(a||parseInt(T.style("height"))||400)-s.top-s.bottom;S.update=function(){S(e)},S.container=this,g.disabled=d.map(function(e){return!!e.disabled});if(!y){var L;y={};for(L in g)g[L]instanceof Array?y[L]=g[L].slice(0):y[L]=g[L]}if(!d||!d.length||!d.filter(function(e){return e.values.length}).length){var A=T.selectAll(".nv-noData").data([b]);return A.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),A.attr("x",s.left+C/2).attr("y",s.top+k/2).text(function(e){return e}),S}T.selectAll(".nv-noData").remove(),v=t.xScale(),m=t.yScale();var O=T.selectAll("g.nv-wrap.nv-lineChart").data([d]),M=O.enter().append("g").attr("class","nvd3 nv-wrap nv-lineChart").append("g"),_=O.select("g");M.append("g").attr("class","nv-x nv-axis"),M.append("g").attr("class","nv-y nv-axis"),M.append("g").attr("class","nv-barsWrap"),M.append("g").attr("class","nv-legendWrap"),f&&(i.width(C),_.select(".nv-legendWrap").datum(d).cal l(i),s.top!=i.height()&&(s.top=i.height(),k=(a||parseInt(T.style("height"))||400)-s.top-s.bottom),O.select(".nv-legendWrap").attr("transform","translate(0,"+ -s.top+")")),O.attr("transform","translate("+s.left+","+s.top+")"),h&&_.select(".nv-y.nv-axis").attr("transform","translate("+C+",0)"),t.width(C).height(k).color(d.map(function(e,t){return e.color||o(e,t)}).filter(function(e,t){return!d[t].disabled}));var D=_.select(".nv-barsWrap").datum(d.filter(function(e){return!e.disabled}));d3.transition(D).call(t),l&&(n.scale(v).tickSize(-k,0),_.select(".nv-x.nv-axis").attr("transform","translate(0,"+m.range()[0]+")"),_.select(".nv-x.nv-axis").transition().call(n)),c&&(r.scale(m).ticks(k/36).tickSize(-C,0),_.select(".nv-y.nv-axis").transition().duration(0).call(r)),i.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,d.filter(function(e){return!e.disabled}).length||d.map(function(e){return e.disabled=!1,O.selectAll(".nv-series").classed("disabled",!1),e}),g.disabled=d. map(function(e){return!!e.disabled}),w.stateChange(g),e.transition().call(S)}),i.dispatch.on("legendDblclick",function(e){d.forEach(function(e){e.disabled=!0}),e.disabled=!1,g.disabled=d.map(function(e){return!!e.disabled}),w.stateChange(g),S.update()}),w.on("tooltipShow",function(e){p&&E(e,N.parentNode)}),w.on("changeState",function(t){typeof t.disabled!="undefined"&&(d.forEach(function(e,n){e.disabled=t.disabled[n]}),g.disabled=t.disabled),e.call(S)})}),S}var t=e.models.historicalBar(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s={top:30,right:90,bottom:50,left:90},o=e.utils.defaultColor(),u=null,a=null,f=!1,l=!0,c=!0,h=!1,p=!0,d=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},v,m,g={},y=null,b="No Data Available.",w=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState");n.orient("bottom").tickPadding(7),r.orient(h?"right":"left");var E=function(i,s){if(s){var o=d3.select(s).select("svg"),u=o.node()?o.attr("viewBox"):null;if(u ){u=u.split(" ");var a=parseInt(o.style("width"))/u[2];i.pos[0]=i.pos[0]*a,i.pos[1]=i.pos[1]*a}}var f=i.pos[0]+(s.offsetLeft||0),l=i.pos[1]+(s.offsetTop||0),c=n.tickFormat()(t.x()(i.point,i.pointIndex)),h=r.tickFormat()(t.y()(i.point,i.pointIndex)),p=d(i.series.key,c,h,i,S);e.tooltip.show([f,l],p,null,null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+s.left,e.pos[1]+s.top],w.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){w.tooltipHide(e)}),w.on("tooltipHide",function(){p&&e.tooltip.cleanup()}),S.dispatch=w,S.bars=t,S.legend=i,S.xAxis=n,S.yAxis=r,d3.rebind(S,t,"defined","isArea","x","y","size","xScale","yScale","xDomain","yDomain","forceX","forceY","interactive","clipEdge","clipVoronoi","id","interpolate"),S.margin=function(e){return arguments.length?(s.top=typeof e.top!="undefined"?e.top:s.top,s.right=typeof e.right!="undefined"?e.right:s.right,s.bottom=typeof e.bottom!="undefined"?e.bottom:s.bottom,s.left=typeof e.lef t!="undefined"?e.left:s.left,S):s},S.width=function(e){return arguments.length?(u=e,S):u},S.height=function(e){return arguments.length?(a=e,S):a},S.color=function(t){return arguments.length?(o=e.utils.getColor(t),i.color(o),S):o},S.showLegend=function(e){return arguments.length?(f=e,S):f},S.showXAxis=function(e){return arguments.length?(l=e,S):l},S.showYAxis=function(e){return arguments.length?(c=e,S):c},S.rightAlignYAxis=function(e){return arguments.length?(h=e,r.orient(e?"right":"left"),S):h},S.tooltips=function(e){return arguments.length?(p=e,S):p},S.tooltipContent=function(e){return arguments.length?(d=e,S):d},S.state=function(e){return arguments.length?(g=e,S):g},S.defaultState=function(e){return arguments.length?(y=e,S):y},S.noData=function(e){return arguments.length?(b=e,S):b},S},e.models.indentedTree=function(){function m(e){return e.each(function(e){function C(e,t,n){d3.event.stopPropagation();if(d3.event.shiftKey&&!n)return d3.event.shiftKey=!1,e.values&&e.values.f orEach(function(e){(e.values||e._values)&&C(e,0,!0)}),!0;if(!A(e))return!0;e.values?(e._values=e.values,e.values=null):(e.values=e._values,e._values=null),m.update()}function k(e){return e._values&&e._values.length?h:e.values&&e.values.length?p:""}function L(e){return e._values&&e._values.length}function A(e){var t=e.values||e._values;return t&&t.length}var t=1,n=d3.select(this),i=d3.layout.tree().children(function(e){return e.values}).size([r,f]);m.update=function(){n.transition().duration(600).call(m)},e[0]||(e[0]={key:a});var s=i.nodes(e[0]),g=d3.select(this).selectAll("div").data([[s]]),y=g.enter().append("div").attr("class","nvd3 nv-wrap nv-indentedtree"),b=y.append("table"),w=g.select("table").attr("width","100%").attr("class",c);if(o){var E=b.append("thead"),S=E.append("tr");l.forEach(function(e){S.append("th").attr("width",e.width?e.width:"10%").style("text-align",e.type=="numeric"?"right":"left").append("span").text(e.label)})}var x=w.selectAll("tbody").data(functio n(e){return e});x.enter().append("tbody"),t=d3.max(s,function(e){return e.depth}),i.size([r,t*f]);var T=x.selectAll("tr").data(function(e){return e.filter(function(e){return u&&!e.children?u(e):!0})},function(e,t){return e.id||e.id||++v});T.exit().remove(),T.select("img.nv-treeicon").attr("src",k).classed("folded",L);var N=T.enter().append("tr");l.forEach(function(e,t){var n=N.append("td").style("padding-left",function(e){return(t?0:e.depth*f+12+(k(e)?0:16))+"px"},"important").style("text-align",e.type=="numeric"?"right":"left");t==0&&n.append("img").classed("nv-treeicon",!0).classed("nv-folded",L).attr("src",k).style("width","14px").style("height","14px").style("padding","0 1px").style("display",function(e){return k(e)?"inline-block":"none"}).on("click",C),n.append("span").attr("class",d3.functor(e.classes)).text(function(t){return e.format?e.format(t):t[e.key]||"-"}),e.showCount&&(n.append("span").attr("class","nv-childrenCount"),T.selectAll("span.nv-childrenCount").text(f unction(e){return e.values&&e.values.length||e._values&&e._values.length?"("+(e.values&&e.values.filter(function(e){return u?u(e):!0}).length||e._values&&e._values.filter(function(e){return u?u(e):!0}).length||0)+")":""})),e.click&&n.select("span").on("click",e.click)}),T.order().on("click",function(e){d.elementClick({row:this,data:e,pos:[e.x,e.y]})}).on("dblclick",function(e){d.elementDblclick({row:this,data:e,pos:[e.x,e.y]})}).on("mouseover",function(e){d.elementMouseover({row:this,data:e,pos:[e.x,e.y]})}).on("mouseout",function(e){d.elementMouseout({row:this,data:e,pos:[e.x,e.y]})})}),m}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=e.utils.defaultColor(),s=Math.floor(Math.random()*1e4),o=!0,u=!1,a="No Data Available.",f=20,l=[{key:"key",label:"Name",type:"text"}],c=null,h="images/grey-plus.png",p="images/grey-minus.png",d=d3.dispatch("elementClick","elementDblclick","elementMouseover","elementMouseout"),v=0;return m.margin=function(e){return arguments.length?(t.top= typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,m):t},m.width=function(e){return arguments.length?(n=e,m):n},m.height=function(e){return arguments.length?(r=e,m):r},m.color=function(t){return arguments.length?(i=e.utils.getColor(t),scatter.color(i),m):i},m.id=function(e){return arguments.length?(s=e,m):s},m.header=function(e){return arguments.length?(o=e,m):o},m.noData=function(e){return arguments.length?(a=e,m):a},m.filterZero=function(e){return arguments.length?(u=e,m):u},m.columns=function(e){return arguments.length?(l=e,m):l},m.tableClass=function(e){return arguments.length?(c=e,m):c},m.iconOpen=function(e){return arguments.length?(h=e,m):h},m.iconClose=function(e){return arguments.length?(p=e,m):p},m},e.models.legend=function(){function a(f){return f.each(function(a){var f=n-t.left-t.right,l=d3.select(this),c=l.selectAll("g.nv -legend").data([a]),h=c.enter().append("g").attr("class","nvd3 nv-legend").append("g"),p=c.select("g");c.attr("transform","translate("+t.left+","+t.top+")");var d=p.selectAll(".nv-series").data(function(e){return e}),v=d.enter().append("g").attr("class","nv-series").on("mouseover",function(e,t){u.legendMouseover(e,t)}).on("mouseout",function(e,t){u.legendMouseout(e,t)}).on("click",function(e,t){u.legendClick(e,t)}).on("dblclick",function(e,t){u.legendDblclick(e,t)});v.append("circle").style("stroke-width",2).attr("r",5),v.append("text").attr("text-anchor","start").attr("dy",".32em").attr("dx","8"),d.classed("disabled",function(e){return e.disabled}),d.exit().remove(),d.select("circle").style("fill",function(e,t){return e.color||s(e,t)}).style("stroke",function(e,t){return e.color||s(e,t)}),d.select("text").text(i);if(o){var m=[];d.each(function(t,n){var r=d3.select(this).select("text"),i=r.node().getComputedTextLength()||e.utils.calcApproxTextWidth(r);m.push(i+28)});var g=0, y=0,b=[];while(y<f&&g<m.length)b[g]=m[g],y+=m[g++];while(y>f&&g>1){b=[],g--;for(k=0;k<m.length;k++)m[k]>(b[k%g]||0)&&(b[k%g]=m[k]);y=b.reduce(function(e,t,n,r){return e+t})}var w=[];for(var E=0,S=0;E<g;E++)w[E]=S,S+=b[E];d.attr("transform",function(e,t){return"translate("+w[t%g]+","+(5+Math.floor(t/g)*20)+")"}),p.attr("transform","translate("+(n-t.right-y)+","+t.top+")"),r=t.top+t.bottom+Math.ceil(m.length/g)*20}else{var x=5,T=5,N=0,C;d.attr("transform",function(e,r){var i=d3.select(this).select("text").node().getComputedTextLength()+28;return C=T,n<t.left+t.right+C+i&&(T=C=5,x+=20),T+=i,T>N&&(N=T),"translate("+C+","+x+")"}),p.attr("transform","translate("+(n-t.right-N)+","+t.top+")"),r=t.top+t.bottom+x+15}}),a}var t={top:5,right:0,bottom:5,left:0},n=400,r=20,i=function(e){return e.key},s=e.utils.defaultColor(),o=!0,u=d3.dispatch("legendClick","legendDblclick","legendMouseover","legendMouseout");return a.dispatch=u,a.margin=function(e){return arguments.length?(t.top=typeof e .top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,a):t},a.width=function(e){return arguments.length?(n=e,a):n},a.height=function(e){return arguments.length?(r=e,a):r},a.key=function(e){return arguments.length?(i=e,a):i},a.color=function(t){return arguments.length?(s=e.utils.getColor(t),a):s},a.align=function(e){return arguments.length?(o=e,a):o},a},e.models.line=function(){function m(e){return e.each(function(e){var m=r-n.left-n.right,g=i-n.top-n.bottom,b=d3.select(this);c=t.xScale(),h=t.yScale(),d=d||c,v=v||h;var w=b.selectAll("g.nv-wrap.nv-line").data([e]),E=w.enter().append("g").attr("class","nvd3 nv-wrap nv-line"),S=E.append("defs"),T=E.append("g"),N=w.select("g");T.append("g").attr("class","nv-groups"),T.append("g").attr("class","nv-scatterWrap"),w.attr("transform","translate("+n.left+","+n.top+")"),t.width(m).height(g);var C=w.select(" .nv-scatterWrap");d3.transition(C).call(t),S.append("clipPath").attr("id","nv-edge-clip-"+t.id()).append("rect"),w.select("#nv-edge-clip-"+t.id()+" rect").attr("width",m).attr("height",g),N.attr("clip-path",l?"url(#nv-edge-clip-"+t.id()+")":""),C.attr("clip-path",l?"url(#nv-edge-clip-"+t.id()+")":"");var k=w.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e){return e.key});k.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(k.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),k.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}).style("fill",function(e,t){return s(e,t)}).style("stroke",function(e,t){return s(e,t)}),d3.transition(k).style("stroke-opacity",1).style("fill-opacity",.5);var L=k.selectAll("path.nv-area").data(function(e){return f(e)?[e]:[]});L.enter().append("path").attr("class","nv-area").attr("d",function(e){return d3. svg.area().interpolate(p).defined(a).x(function(e,t){return d(o(e,t))}).y0(function(e,t){return v(u(e,t))}).y1(function(e,t){return v(h.domain()[0]<=0?h.domain()[1]>=0?0:h.domain()[1]:h.domain()[0])}).apply(this,[e.values])}),d3.transition(k.exit().selectAll("path.nv-area")).attr("d",function(e){return d3.svg.area().interpolate(p).defined(a).x(function(e,t){return c(o(e,t))}).y0(function(e,t){return h(u(e,t))}).y1(function(e,t){return h(h.domain()[0]<=0?h.domain()[1]>=0?0:h.domain()[1]:h.domain()[0])}).apply(this,[e.values])}),d3.transition(L).attr("d",function(e){return d3.svg.area().interpolate(p).defined(a).x(function(e,t){return c(o(e,t))}).y0(function(e,t){return h(u(e,t))}).y1(function(e,t){return h(h.domain()[0]<=0?h.domain()[1]>=0?0:h.domain()[1]:h.domain()[0])}).apply(this,[e.values])});var A=k.selectAll("path.nv-line").data(function(e){return[e.values]});A.enter().append("path").attr("class","nv-line").attr("d",d3.svg.line().interpolate(p).defined(a).x(function(e,t ){return d(o(e,t))}).y(function(e,t){return v(u(e,t))})),d3.transition(k.exit().selectAll("path.nv-line")).attr("d",d3.svg.line().interpolate(p).defined(a).x(function(e,t){return c(o(e,t))}).y(function(e,t){return h(u(e,t))})),d3.transition(A).attr("d",d3.svg.line().interpolate(p).defined(a).x(function(e,t){return c(o(e,t))}).y(function(e,t){return h(u(e,t))})),d=c.copy(),v=h.copy()}),m}var t=e.models.scatter(),n={top:0,right:0,bottom:0,left:0},r=960,i=500,s=e.utils.defaultColor(),o=function(e){return e.x},u=function(e){return e.y},a=function(e,t){return!isNaN(u(e,t))&&u(e,t)!==null},f=function(e){return e.area},l=!1,c,h,p="linear";t.size(16).sizeDomain([16,256]);var d,v;return m.dispatch=t.dispatch,m.scatter=t,d3.rebind(m,t,"id","interactive","size","xScale","yScale","zScale","xDomain","yDomain","sizeDomain","forceX","forceY","forceSize","clipVoronoi","clipRadius","padData"),m.margin=function(e){return arguments.length?(n.top=typeof e.top!="undefined"?e.top:n.top,n.right=ty peof e.right!="undefined"?e.right:n.right,n.bottom=typeof e.bottom!="undefined"?e.bottom:n.bottom,n.left=typeof e.left!="undefined"?e.left:n.left,m):n},m.width=function(e){return arguments.length?(r=e,m):r},m.height=function(e){return arguments.length?(i=e,m):i},m.x=function(e){return arguments.length?(o=e,t.x(e),m):o},m.y=function(e){return arguments.length?(u=e,t.y(e),m):u},m.clipEdge=function(e){return arguments.length?(l=e,m):l},m.color=function(n){return arguments.length?(s=e.utils.getColor(n),t.color(s),m):s},m.interpolate=function(e){return arguments.length?(p=e,m):p},m.defined=function(e){return arguments.length?(a=e,m):a},m.isArea=function(e){return arguments.length?(f=d3.functor(e),m):f},m},e.models.lineChart=function(){function S(e){return e.each(function(e){var d=d3.select(this),T=this,N=(u||parseInt(d.style("width"))||960)-s.left-s.right,C=(a||parseInt(d.style("height"))||400)-s.top-s.bottom;S.update=function(){d.transition().call(S)},S.container=this,g.disabled =e.map(function(e){return!!e.disabled});if(!y){var k;y={};for(k in g)g[k]instanceof Array?y[k]=g[k].slice(0):y[k]=g[k]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var L=d.selectAll(".nv-noData").data([b]);return L.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),L.attr("x",s.left+N/2).attr("y",s.top+C/2).text(function(e){return e}),S}d.selectAll(".nv-noData").remove(),v=t.xScale(),m=t.yScale();var A=d.selectAll("g.nv-wrap.nv-lineChart").data([e]),O=A.enter().append("g").attr("class","nvd3 nv-wrap nv-lineChart").append("g"),M=A.select("g");O.append("g").attr("class","nv-x nv-axis"),O.append("g").attr("class","nv-y nv-axis"),O.append("g").attr("class","nv-linesWrap"),O.append("g").attr("class","nv-legendWrap"),f&&(i.width(N),M.select(".nv-legendWrap").datum(e).call(i),s.top!=i.height()&&(s.top=i.height(),C=(a||parseInt(d.style("height"))||400)-s.top-s.bottom),A.select(".nv-legendWrap").attr("tra nsform","translate(0,"+ -s.top+")")),A.attr("transform","translate("+s.left+","+s.top+")"),h&&M.select(".nv-y.nv-axis").attr("transform","translate("+N+",0)"),t.width(N).height(C).color(e.map(function(e,t){return e.color||o(e,t)}).filter(function(t,n){return!e[n].disabled}));var _=M.select(".nv-linesWrap").datum(e.filter(function(e){return!e.disabled}));d3.transition(_).call(t),l&&(n.scale(v).ticks(N/100).tickSize(-C,0),M.select(".nv-x.nv-axis").attr("transform","translate(0,"+m.range()[0]+")"),d3.transition(M.select(".nv-x.nv-axis")).call(n)),c&&(r.scale(m).ticks(C/36).tickSize(-N,0),d3.transition(M.select(".nv-y.nv-axis")).call(r)),i.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,A.selectAll(".nv-series").classed("disabled",!1),e}),g.disabled=e.map(function(e){return!!e.disabled}),w.stateChange(g),S.update()}),i.dispatch.on("legendDblclick",function(t){e.forEach(function (e){e.disabled=!0}),t.disabled=!1,g.disabled=e.map(function(e){return!!e.disabled}),w.stateChange(g),S.update()}),w.on("tooltipShow",function(e){p&&E(e,T.parentNode)}),w.on("changeState",function(t){typeof t.disabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),g.disabled=t.disabled),S.update()})}),S}var t=e.models.line(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s={top:30,right:20,bottom:50,left:60},o=e.utils.defaultColor(),u=null,a=null,f=!0,l=!0,c=!0,h=!1,p=!0,d=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},v,m,g={},y=null,b="No Data Available.",w=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState");n.orient("bottom").tickPadding(7),r.orient(h?"right":"left");var E=function(i,s){if(s){var o=d3.select(s).select("svg"),u=o.node()?o.attr("viewBox"):null;if(u){u=u.split(" ");var a=parseInt(o.style("width"))/u[2];i.pos[0]=i.pos[0]*a,i.pos[1]=i.pos[1]*a}}var f=i.pos[0]+(s.offsetLeft||0),l=i.pos[1]+(s.offse tTop||0),c=n.tickFormat()(t.x()(i.point,i.pointIndex)),h=r.tickFormat()(t.y()(i.point,i.pointIndex)),p=d(i.series.key,c,h,i,S);e.tooltip.show([f,l],p,null,null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+s.left,e.pos[1]+s.top],w.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){w.tooltipHide(e)}),w.on("tooltipHide",function(){p&&e.tooltip.cleanup()}),S.dispatch=w,S.lines=t,S.legend=i,S.xAxis=n,S.yAxis=r,d3.rebind(S,t,"defined","isArea","x","y","size","xScale","yScale","xDomain","yDomain","forceX","forceY","interactive","clipEdge","clipVoronoi","id","interpolate"),S.margin=function(e){return arguments.length?(s.top=typeof e.top!="undefined"?e.top:s.top,s.right=typeof e.right!="undefined"?e.right:s.right,s.bottom=typeof e.bottom!="undefined"?e.bottom:s.bottom,s.left=typeof e.left!="undefined"?e.left:s.left,S):s},S.width=function(e){return arguments.length?(u=e,S):u},S.height=function(e){return arguments.length?(a=e,S):a},S .color=function(t){return arguments.length?(o=e.utils.getColor(t),i.color(o),S):o},S.showLegend=function(e){return arguments.length?(f=e,S):f},S.showXAxis=function(e){return arguments.length?(l=e,S):l},S.showYAxis=function(e){return arguments.length?(c=e,S):c},S.rightAlignYAxis=function(e){return arguments.length?(h=e,r.orient(e?"right":"left"),S):h},S.tooltips=function(e){return arguments.length?(p=e,S):p},S.tooltipContent=function(e){return arguments.length?(d=e,S):d},S.state=function(e){return arguments.length?(g=e,S):g},S.defaultState=function(e){return arguments.length?(y=e,S):y},S.noData=function(e){return arguments.length?(b=e,S):b},S},e.models.linePlusBarChart=function(){function T(e){return e.each(function(e){var l=d3.select(this),c=this,v=(a||parseInt(l.style("width"))||960)-u.left-u.right,N=(f||parseInt(l.style("height"))||400)-u.top-u.bottom;T.update=function(){l.transition().call(T)},b.disabled=e.map(function(e){return!!e.disabled});if(!w){var C;w={};for(C in b) b[C]instanceof Array?w[C]=b[C].slice(0):w[C]=b[C]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var k=l.selectAll(".nv-noData").data([E]);return k.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),k.attr("x",u.left+v/2).attr("y",u.top+N/2).text(function(e){return e}),T}l.selectAll(".nv-noData").remove();var L=e.filter(function(e){return!e.disabled&&e.bar}),A=e.filter(function(e){return!e.bar});m=A.filter(function(e){return!e.disabled}).length&&A.filter(function(e){return!e.disabled})[0].values.length?t.xScale():n.xScale(),g=n.yScale(),y=t.yScale();var O=d3.select(this).selectAll("g.nv-wrap.nv-linePlusBar").data([e]),M=O.enter().append("g").attr("class","nvd3 nv-wrap nv-linePlusBar").append("g"),_=O.select("g");M.append("g").attr("class","nv-x nv-axis"),M.append("g").attr("class","nv-y1 nv-axis"),M.append("g").attr("class","nv-y2 nv-axis"),M.append("g").attr("class","nv-barsWrap"),M.append("g").at tr("class","nv-linesWrap"),M.append("g").attr("class","nv-legendWrap"),p&&(o.width(v/2),_.select(".nv-legendWrap").datum(e.map(function(e){return e.originalKey=e.originalKey===undefined?e.key:e.originalKey,e.key=e.originalKey+(e.bar?" (left axis)":" (right axis)"),e})).call(o),u.top!=o.height()&&(u.top=o.height(),N=(f||parseInt(l.style("height"))||400)-u.top-u.bottom),_.select(".nv-legendWrap").attr("transform","translate("+v/2+","+ -u.top+")")),O.attr("transform","translate("+u.left+","+u.top+")"),t.width(v).height(N).color(e.map(function(e,t){return e.color||h(e,t)}).filter(function(t,n){return!e[n].disabled&&!e[n].bar})),n.width(v).height(N).color(e.map(function(e,t){return e.color||h(e,t)}).filter(function(t,n){return!e[n].disabled&&e[n].bar}));var D=_.select(".nv-barsWrap").datum(L.length?L:[{values:[]}]),P=_.select(".nv-linesWrap").datum(A[0]&&!A[0].disabled?A:[{values:[]}]);d3.transition(D).call(n),d3.transition(P).call(t),r.scale(m).ticks(v/100).tickSize(-N,0),_.sele ct(".nv-x.nv-axis").attr("transform","translate(0,"+g.range()[0]+")"),d3.transition(_.select(".nv-x.nv-axis")).call(r),i.scale(g).ticks(N/36).tickSize(-v,0),d3.transition(_.select(".nv-y1.nv-axis")).style("opacity",L.length?1:0).call(i),s.scale(y).ticks(N/36).tickSize(L.length?0:-v,0),_.select(".nv-y2.nv-axis").style("opacity",A.length?1:0).attr("transform","translate("+v+",0)"),d3.transition(_.select(".nv-y2.nv-axis")).call(s),o.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,O.selectAll(".nv-series").classed("disabled",!1),e}),b.disabled=e.map(function(e){return!!e.disabled}),S.stateChange(b),T.update()}),o.dispatch.on("legendDblclick",function(t){e.forEach(function(e){e.disabled=!0}),t.disabled=!1,b.disabled=e.map(function(e){return!!e.disabled}),S.stateChange(b),T.update()}),S.on("tooltipShow",function(e){d&&x(e,c.parentNode)}),S.on("changeState",function(t){typeof t.di sabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),b.disabled=t.disabled),T.update()})}),T}var t=e.models.line(),n=e.models.historicalBar(),r=e.models.axis(),i=e.models.axis(),s=e.models.axis(),o=e.models.legend(),u={top:30,right:60,bottom:50,left:60},a=null,f=null,l=function(e){return e.x},c=function(e){return e.y},h=e.utils.defaultColor(),p=!0,d=!0,v=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},m,g,y,b={},w=null,E="No Data Available.",S=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState");n.padData(!0),t.clipEdge(!1).padData(!0),r.orient("bottom").tickPadding(7).highlightZero(!1),i.orient("left"),s.orient("right");var x=function(n,o){var u=n.pos[0]+(o.offsetLeft||0),a=n.pos[1]+(o.offsetTop||0),f=r.tickFormat()(t.x()(n.point,n.pointIndex)),l=(n.series.bar?i:s).tickFormat()(t.y()(n.point,n.pointIndex)),c=v(n.series.key,f,l,n,T);e.tooltip.show([u,a],c,n.value<0?"n":"s",null,o)};return t.dispatch.on("elementMouseover .tooltip",function(e){e.pos=[e.pos[0]+u.left,e.pos[1]+u.top],S.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){ -S.tooltipHide(e)}),n.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+u.left,e.pos[1]+u.top],S.tooltipShow(e)}),n.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),S.on("tooltipHide",function(){d&&e.tooltip.cleanup()}),T.dispatch=S,T.legend=o,T.lines=t,T.bars=n,T.xAxis=r,T.y1Axis=i,T.y2Axis=s,d3.rebind(T,t,"defined","size","clipVoronoi","interpolate"),T.x=function(e){return arguments.length?(l=e,t.x(e),n.x(e),T):l},T.y=function(e){return arguments.length?(c=e,t.y(e),n.y(e),T):c},T.margin=function(e){return arguments.length?(u.top=typeof e.top!="undefined"?e.top:u.top,u.right=typeof e.right!="undefined"?e.right:u.right,u.bottom=typeof e.bottom!="undefined"?e.bottom:u.bottom,u.left=typeof e.left!="undefined"?e.left:u.left,T):u},T.width=function(e){return arguments.length?(a=e,T):a},T.height=function(e){return arguments.length?(f=e,T):f},T.color=function(t){return arguments.length?(h=e.utils.getColor(t),o.color(h),T):h},T.showLegend=function (e){return arguments.length?(p=e,T):p},T.tooltips=function(e){return arguments.length?(d=e,T):d},T.tooltipContent=function(e){return arguments.length?(v=e,T):v},T.state=function(e){return arguments.length?(b=e,T):b},T.defaultState=function(e){return arguments.length?(w=e,T):w},T.noData=function(e){return arguments.length?(E=e,T):E},T},e.models.lineWithFocusChart=function(){function C(e){return e.each(function(e){function q(e){var t=+(e=="e"),n=t?1:-1,r=O/3;return"M"+.5*n+","+r+"A6,6 0 0 "+t+" "+6.5*n+","+(r+6)+"V"+(2*r-6)+"A6,6 0 0 "+t+" "+.5*n+","+2*r+"Z"+"M"+2.5*n+","+(r+8)+"V"+(2*r-8)+"M"+4.5*n+","+(r+8)+"V"+(2*r-8)}function R(){a.empty()||a.extent(w),F.data([a.empty()?g.domain():w]).each(function(e,t){var n=g(e[0])-v.range()[0],r=v.range()[1]-g(e[1]);d3.select(this).select(".left").attr("width",n<0?0:n),d3.select(this).select(".right").attr("x",g(e[1])).attr("width",r<0?0:r)})}function U(){w=a.empty()?null:a.extent(),extent=a.empty()?g.domain():a.extent(),T.brush({extent :extent,brush:a}),R();var n=P.select(".nv-focus .nv-linesWrap").datum(e.filter(function(e){return!e.disabled}).map(function(e,n){return{key:e.key,values:e.values.filter(function(e,n){return t.x()(e,n)>=extent[0]&&t.x()(e,n)<=extent[1]})}}));d3.transition(n).call(t),d3.transition(P.select(".nv-focus .nv-x.nv-axis")).call(r),d3.transition(P.select(".nv-focus .nv-y.nv-axis")).call(i)}var S=d3.select(this),k=this,L=(h||parseInt(S.style("width"))||960)-f.left-f.right,A=(p||parseInt(S.style("height"))||400)-f.top-f.bottom-d,O=d-l.top-l.bottom;C.update=function(){S.transition().call(C)},C.container=this;if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var M=S.selectAll(".nv-noData").data([x]);return M.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),M.attr("x",f.left+L/2).attr("y",f.top+A/2).text(function(e){return e}),C}S.selectAll(".nv-noData").remove(),v=t.xScale(),m=t.yScale(),g=n.xScale(),y=n.yScale( );var _=S.selectAll("g.nv-wrap.nv-lineWithFocusChart").data([e]),D=_.enter().append("g").attr("class","nvd3 nv-wrap nv-lineWithFocusChart").append("g"),P=_.select("g");D.append("g").attr("class","nv-legendWrap");var H=D.append("g").attr("class","nv-focus");H.append("g").attr("class","nv-x nv-axis"),H.append("g").attr("class","nv-y nv-axis"),H.append("g").attr("class","nv-linesWrap");var B=D.append("g").attr("class","nv-context");B.append("g").attr("class","nv-x nv-axis"),B.append("g").attr("class","nv-y nv-axis"),B.append("g").attr("class","nv-linesWrap"),B.append("g").attr("class","nv-brushBackground"),B.append("g").attr("class","nv-x nv-brush"),b&&(u.width(L),P.select(".nv-legendWrap").datum(e).call(u),f.top!=u.height()&&(f.top=u.height(),A=(p||parseInt(S.style("height"))||400)-f.top-f.bottom-d),P.select(".nv-legendWrap").attr("transform","translate(0,"+ -f.top+")")),_.attr("transform","translate("+f.left+","+f.top+")"),t.width(L).height(A).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),n.defined(t.defined()).width(L).height(O).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),P.select(".nv-context").attr("transform","translate(0,"+(A+f.bottom+l.top)+")");var j=P.select(".nv-context .nv-linesWrap").datum(e.filter(function(e){return!e.disabled}));d3.transition(j).call(n),r.scale(v).ticks(L/100).tickSize(-A,0),i.scale(m).ticks(A/36).tickSize(-L,0),P.select(".nv-focus .nv-x.nv-axis").attr("transform","translate(0,"+A+")"),a.x(g).on("brush",U),w&&a.extent(w);var F=P.select(".nv-brushBackground").selectAll("g").data([w||a.extent()]),I=F.enter().append("g");I.append("rect").attr("class","left").attr("x",0).attr("y",0).attr("height",O),I.append("rect").attr("class","right").attr("x",0).attr("y",0).attr("height",O),gBrush=P.select(".nv-x.nv-brush").call(a),gBrush.selectAll("rect").attr("height",O),gBrush.selectAll(".resize").append("path").attr("d",q),U(),s .scale(g).ticks(L/100).tickSize(-O,0),P.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+y.range()[0]+")"),d3.transition(P.select(".nv-context .nv-x.nv-axis")).call(s),o.scale(y).ticks(O/36).tickSize(-L,0),d3.transition(P.select(".nv-context .nv-y.nv-axis")).call(o),P.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+y.range()[0]+")"),u.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,_.selectAll(".nv-series").classed("disabled",!1),e}),S.transition().call(C)}),T.on("tooltipShow",function(e){E&&N(e,k.parentNode)})}),C}var t=e.models.line(),n=e.models.line(),r=e.models.axis(),i=e.models.axis(),s=e.models.axis(),o=e.models.axis(),u=e.models.legend(),a=d3.svg.brush(),f={top:30,right:30,bottom:30,left:60},l={top:0,right:30,bottom:20,left:60},c=e.utils.defaultColor(),h=null,p=null,d=100,v,m,g,y,b=!0,w=null,E=!0,S=function(e,t,n,r,i){return"<h3 >"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},x="No Data Available.",T=d3.dispatch("tooltipShow","tooltipHide","brush");t.clipEdge(!0),n.interactive(!1),r.orient("bottom").tickPadding(5),i.orient("left"),s.orient("bottom").tickPadding(5),o.orient("left");var N=function(n,s){var o=n.pos[0]+(s.offsetLeft||0),u=n.pos[1]+(s.offsetTop||0),a=r.tickFormat()(t.x()(n.point,n.pointIndex)),f=i.tickFormat()(t.y()(n.point,n.pointIndex)),l=S(n.series.key,a,f,n,C);e.tooltip.show([o,u],l,null,null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+f.left,e.pos[1]+f.top],T.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){T.tooltipHide(e)}),T.on("tooltipHide",function(){E&&e.tooltip.cleanup()}),C.dispatch=T,C.legend=u,C.lines=t,C.lines2=n,C.xAxis=r,C.yAxis=i,C.x2Axis=s,C.y2Axis=o,d3.rebind(C,t,"defined","isArea","size","xDomain","yDomain","forceX","forceY","interactive","clipEdge","clipVoronoi","id"),C.x=function(e){return arguments.length?(t.x(e),n.x( e),C):t.x},C.y=function(e){return arguments.length?(t.y(e),n.y(e),C):t.y},C.margin=function(e){return arguments.length?(f.top=typeof e.top!="undefined"?e.top:f.top,f.right=typeof e.right!="undefined"?e.right:f.right,f.bottom=typeof e.bottom!="undefined"?e.bottom:f.bottom,f.left=typeof e.left!="undefined"?e.left:f.left,C):f},C.margin2=function(e){return arguments.length?(l=e,C):l},C.width=function(e){return arguments.length?(h=e,C):h},C.height=function(e){return arguments.length?(p=e,C):p},C.height2=function(e){return arguments.length?(d=e,C):d},C.color=function(t){return arguments.length?(c=e.utils.getColor(t),u.color(c),C):c},C.showLegend=function(e){return arguments.length?(b=e,C):b},C.tooltips=function(e){return arguments.length?(E=e,C):E},C.tooltipContent=function(e){return arguments.length?(S=e,C):S},C.interpolate=function(e){return arguments.length?(t.interpolate(e),n.interpolate(e),C):t.interpolate()},C.noData=function(e){return arguments.length?(x=e,C):x},C.xTickForm at=function(e){return arguments.length?(r.tickFormat(e),s.tickFormat(e),C):r.tickFormat()},C.yTickFormat=function(e){return arguments.length?(i.tickFormat(e),o.tickFormat(e),C):i.tickFormat()},C},e.models.linePlusBarWithFocusChart=function(){function H(e){return e.each(function(e){function tt(e){var t=+(e=="e"),n=t?1:-1,r=I/3;return"M"+.5*n+","+r+"A6,6 0 0 "+t+" "+6.5*n+","+(r+6)+"V"+(2*r-6)+"A6,6 0 0 "+t+" "+.5*n+","+2*r+"Z"+"M"+2.5*n+","+(r+8)+"V"+(2*r-8)+"M"+4.5*n+","+(r+8)+"V"+(2*r-8)}function nt(){h.empty()||h.extent(x),Y.data([h.empty()?k.domain():x]).each(function(e,t){var n=k(e[0])-k.range()[0],r=k.range()[1]-k(e[1]);d3.select(this).select(".left").attr("width",n<0?0:n),d3.select(this).select(".right").attr("x",k(e[1])).attr("width",r<0?0:r)})}function rt(){x=h.empty()?null:h.extent(),S=h.empty()?k.domain():h.extent(),D.brush({extent:S,brush:h}),nt(),r.width(j).height(F).color(e.map(function(e,t){return e.color||w(e,t)}).filter(function(t,n){return!e[n].disabled&&e[n ].bar})),t.width(j).height(F).color(e.map(function(e,t){return e.color||w(e,t)}).filter(function(t,n){return!e[n].disabled&&!e[n].bar}));var n=$.select(".nv-focus .nv-barsWrap").datum(R.length?R.map(function(e,t){return{key:e.key,values:e.values.filter(function(e,t){return r.x()(e,t)>=S[0]&&r.x()(e,t)<=S[1]})}}):[{values:[]}]),i=$.select(".nv-focus .nv-linesWrap").datum(U[0].disabled?[{values:[]}]:U.map(function(e,n){return{key:e.key,values:e.values.filter(function(e,n){return t.x()(e,n)>=S[0]&&t.x()(e,n)<=S[1]})}}));R.length?C=r.xScale():C=t.xScale(),s.scale(C).ticks(j/100).tickSize(-F,0),s.domain([Math.ceil(S[0]),Math.floor(S[1])]),d3.transition($.select(".nv-x.nv-axis")).call(s),d3.transition(n).call(r),d3.transition(i).call(t),$.select(".nv-focus .nv-x.nv-axis").attr("transform","translate(0,"+L.range()[0]+")"),u.scale(L).ticks(F/36).tickSize(-j,0),$.select(".nv-focus .nv-y1.nv-axis").style("opacity",R.length?1:0),a.scale(A).ticks(F/36).tickSize(R.length?0:-j,0),$.select (".nv-focus .nv-y2.nv-axis").style("opacity",U.length?1:0).attr("transform","translate("+C.range()[1]+",0)"),d3.transition($.select(".nv-focus .nv-y1.nv-axis")).call(u),d3.transition($.select(".nv-focus .nv-y2.nv-axis")).call(a)}var N=d3.select(this),B=this,j=(v||parseInt(N.style("width"))||960)-p.left-p.right,F=(m||parseInt(N.style("height"))||400)-p.top-p.bottom-g,I=g-d.top-d.bottom;H.update=function(){N.transition().call(H)},H.container=this;if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var q=N.selectAll(".nv-noData").data([_]);return q.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),q.attr("x",p.left+j/2).attr("y",p.top+F/2).text(function(e){return e}),H}N.selectAll(".nv-noData").remove();var R=e.filter(function(e){return!e.disabled&&e.bar}),U=e.filter(function(e){return!e.bar});C=r.xScale(),k=o.scale(),L=r.yScale(),A=t.yScale(),O=i.yScale(),M=n.yScale();var z=e.filter(function(e){return!e. disabled&&e.bar}).map(function(e){return e.values.map(function(e,t){return{x:y(e,t),y:b(e,t)}})}),W=e.filter(function(e){return!e.disabled&&!e.bar}).map(function(e){return e.values.map(function(e,t){return{x:y(e,t),y:b(e,t)}})});C.range([0,j]),k.domain(d3.extent(d3.merge(z.concat(W)),function(e){return e.x})).range([0,j]);var X=N.selectAll("g.nv-wrap.nv-linePlusBar").data([e]),V=X.enter().append("g").attr("class","nvd3 nv-wrap nv-linePlusBar").append("g"),$=X.select("g");V.append("g").attr("class","nv-legendWrap");var J=V.append("g").attr("class","nv-focus");J.append("g").attr("class","nv-x nv-axis"),J.append("g").attr("class","nv-y1 nv-axis"),J.append("g").attr("class","nv-y2 nv-axis"),J.append("g").attr("class","nv-barsWrap"),J.append("g").attr("class","nv-linesWrap");var K=V.append("g").attr("class","nv-context");K.append("g").attr("class","nv-x nv-axis"),K.append("g").attr("class","nv-y1 nv-axis"),K.append("g").attr("class","nv-y2 nv-axis"),K.append("g").attr("class","nv -barsWrap"),K.append("g").attr("class","nv-linesWrap"),K.append("g").attr("class","nv-brushBackground"),K.append("g").attr("class","nv-x nv-brush"),E&&(c.width(j/2),$.select(".nv-legendWrap").datum(e.map(function(e){return e.originalKey=e.originalKey===undefined?e.key:e.originalKey,e.key=e.originalKey+(e.bar?" (left axis)":" (right axis)"),e})).call(c),p.top!=c.height()&&(p.top=c.height(),F=(m||parseInt(N.style("height"))||400)-p.top-p.bottom-g),$.select(".nv-legendWrap").attr("transform","translate("+j/2+","+ -p.top+")")),X.attr("transform","translate("+p.left+","+p.top+")"),i.width(j).height(I).color(e.map(function(e,t){return e.color||w(e,t)}).filter(function(t,n){return!e[n].disabled&&e[n].bar})),n.width(j).height(I).color(e.map(function(e,t){return e.color||w(e,t)}).filter(function(t,n){return!e[n].disabled&&!e[n].bar}));var Q=$.select(".nv-context .nv-barsWrap").datum(R.length?R:[{values:[]}]),G=$.select(".nv-context .nv-linesWrap").datum(U[0].disabled?[{values:[]}]:U) ;$.select(".nv-context").attr("transform","translate(0,"+(F+p.bottom+d.top)+")"),d3.transition(Q).call(i),d3.transition(G).call(n),h.x(k).on("brush",rt),x&&h.extent(x);var Y=$.select(".nv-brushBackground").selectAll("g").data([x||h.extent()]),Z=Y.enter().append("g");Z.append("rect").attr("class","left").attr("x",0).attr("y",0).attr("height",I),Z.append("rect").attr("class","right").attr("x",0).attr("y",0).attr("height",I);var et=$.select(".nv-x.nv-brush").call(h);et.selectAll("rect").attr("height",I),et.selectAll(".resize").append("path").attr("d",tt),o.ticks(j/100).tickSize(-I,0),$.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+O.range()[0]+")"),d3.transition($.select(".nv-context .nv-x.nv-axis")).call(o),f.scale(O).ticks(I/36).tickSize(-j,0),$.select(".nv-context .nv-y1.nv-axis").style("opacity",R.length?1:0).attr("transform","translate(0,"+k.range()[0]+")"),d3.transition($.select(".nv-context .nv-y1.nv-axis")).call(f),l.scale(M).ticks(I/36).tickSize(R .length?0:-j,0),$.select(".nv-context .nv-y2.nv-axis").style("opacity",U.length?1:0).attr("transform","translate("+k.range()[1]+",0)"),d3.transition($.select(".nv-context .nv-y2.nv-axis")).call(l),c.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,X.selectAll(".nv-series").classed("disabled",!1),e}),H.update()}),D.on("tooltipShow",function(e){T&&P(e,B.parentNode)}),rt()}),H}var t=e.models.line(),n=e.models.line(),r=e.models.historicalBar(),i=e.models.historicalBar(),s=e.models.axis(),o=e.models.axis(),u=e.models.axis(),a=e.models.axis(),f=e.models.axis(),l=e.models.axis(),c=e.models.legend(),h=d3.svg.brush(),p={top:30,right:30,bottom:30,left:60},d={top:0,right:30,bottom:20,left:60},v=null,m=null,g=100,y=function(e){return e.x},b=function(e){return e.y},w=e.utils.defaultColor(),E=!0,S,x=null,T=!0,N=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},C,k,L,A,O, M,_="No Data Available.",D=d3.dispatch("tooltipShow","tooltipHide","brush");t.clipEdge(!0),n.interactive(!1),s.orient("bottom").tickPadding(5),u.orient("left"),a.orient("right"),o.orient("bottom").tickPadding(5),f.orient("left"),l.orient("right");var P=function(n,r){S&&(n.pointIndex+=Math.ceil(S[0]));var i=n.pos[0]+(r.offsetLeft||0),o=n.pos[1]+(r.offsetTop||0),f=s.tickFormat()(t.x()(n.point,n.pointIndex)),l=(n.series.bar?u:a).tickFormat()(t.y()(n.point,n.pointIndex)),c=N(n.series.key,f,l,n,H);e.tooltip.show([i,o],c,n.value<0?"n":"s",null,r)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+p.left,e.pos[1]+p.top],D.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){D.tooltipHide(e)}),r.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+p.left,e.pos[1]+p.top],D.tooltipShow(e)}),r.dispatch.on("elementMouseout.tooltip",function(e){D.tooltipHide(e)}),D.on("tooltipHide",function(){T&&e.tooltip.cleanup()}),H.dispatch=D,H. legend=c,H.lines=t,H.lines2=n,H.bars=r,H.bars2=i,H.xAxis=s,H.x2Axis=o,H.y1Axis=u,H.y2Axis=a,H.y3Axis=f,H.y4Axis=l,d3.rebind(H,t,"defined","size","clipVoronoi","interpolate"),H.x=function(e){return arguments.length?(y=e,t.x(e),r.x(e),H):y},H.y=function(e){return arguments.length?(b=e,t.y(e),r.y(e),H):b},H.margin=function(e){return arguments.length?(p.top=typeof e.top!="undefined"?e.top:p.top,p.right=typeof e.right!="undefined"?e.right:p.right,p.bottom=typeof e.bottom!="undefined"?e.bottom:p.bottom,p.left=typeof e.left!="undefined"?e.left:p.left,H):p},H.width=function(e){return arguments.length?(v=e,H):v},H.height=function(e){return arguments.length?(m=e,H):m},H.color=function(t){return arguments.length?(w=e.utils.getColor(t),c.color(w),H):w},H.showLegend=function(e){return arguments.length?(E=e,H):E},H.tooltips=function(e){return arguments.length?(T=e,H):T},H.tooltipContent=function(e){return arguments.length?(N=e,H):N},H.noData=function(e){return arguments.length?(_=e,H):_}, H.brushExtent=function(e){return arguments.length?(x=e,H):x},H},e.models.multiBar=function(){function x(e){return e.each(function(e){var x=n-t.left-t.right,T=r-t.top-t.bottom,N=d3.select(this);p&&e.length&&(p=[{values:e[0].values.map(function(e){return{x:e.x,y:0,series:e.series,size:.01}})}]),c&&(e=d3.layout.stack().offset("zero").values(function(e){return e.values}).y(a)(!e.length&&p?p:e)),e=e.map(function(e,t){return e.values=e.values.map(function(e){return e.series=t,e}),e}),c&&e[0].values.map(function(t,n){var r=0,i=0;e.map(function(e){var t=e.values[n];t.size=Math.abs(t.y),t.y<0?(t.y1=i,i-=t.size):(t.y1=t.size+r,r+=t.size)})});var C=y&&b?[]:e.map(function(e){return e.values.map(function(e,t){return{x:u(e,t),y:a(e,t),y0:e.y0,y1:e.y1}})});i.domain(d3.merge(C).map(function(e){return e.x})).rangeBands([0,x],.1),s.domain(b||d3.extent(d3.merge(C).map(function(e){return c?e.y>0?e.y1:e.y1+e.y:e.y}).concat(f))).range([T,0]);if(i.domain()[0]===i.domain()[1]||s.domain()[0]===s.dom ain()[1])singlePoint=!0;i.domain()[0]===i.domain()[1]&&(i.domain()[0]?i.domain([i.domain()[0]-i.domain()[0]*.01,i.domain()[1]+i.domain()[1]*.01]):i.domain([-1,1])),s.domain()[0]===s.domain()[1]&&(s.domain()[0]?s.domain([s.domain()[0]+s.domain()[0]*.01,s.domain()[1]-s.domain()[1]*.01]):s.domain([-1,1])),E=E||i,S=S||s;var k=N.selectAll("g.nv-wrap.nv-multibar").data([e]),L=k.enter().append("g").attr("class","nvd3 nv-wrap nv-multibar"),A=L.append("defs"),O=L.append("g"),M=k.select("g");O.append("g").attr("class","nv-groups"),k.attr("transform","translate("+t.left+","+t.top+")"),A.append("clipPath").attr("id","nv-edge-clip-"+o).append("rect"),k.select("#nv-edge-clip-"+o+" rect").attr("width",x).attr("height",T),M.attr("clip-path",l?"url(#nv-edge-clip-"+o+")":"");var _=k.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e){return e.key});_.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),_.exit().selectAll("rect.nv-bar").tra nsition().delay(function(t,n){return n*m/e[0].values.length}).attr("y",function(e){return c?S(e.y0):S(0)}).attr("height",0).remove(),_.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}).style("fill",function(e,t){return h(e,t)}).style("stroke",function(e,t){return h(e,t)}),d3.transition(_).style("stroke-opacity",1).style("fill-opacity",.75);var D=_.selectAll("rect.nv-bar").data(function(t){return p&&!e.length?p.values:t.values});D.exit().remove();var P=D.enter().append("rect").attr("class",function(e,t){return a(e,t)<0?"nv-bar negative":"nv-bar positive"}).attr("x",function(t,n,r){return c?0:r*i.rangeBand()/e.length}).attr("y",function(e){return S(c?e.y0:0)}).attr("height",0).attr("width",i.rangeBand()/(c?1:e.length));D.style("fill",function(e,t,n){return h(e,n,t)}).style("stroke",function(e,t,n){return h(e,n,t)}).on("mouseover",function(t,n){d3.select(this).classed("hover",!0),w.elementMouseover({value:a(t,n),point:t,seri es:e[t.series],pos:[i(u(t,n))+i.rangeBand()*(c?e.length/2:t.series+.5)/e.length,s(a(t,n)+(c?t.y0:0))],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),w.elementMouseout({value:a(t,n),point:t,series:e[t.series],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("click",function(t,n){w.elementClick({value:a(t,n),point:t,series:e[t.series],pos:[i(u(t,n))+i.rangeBand()*(c?e.length/2:t.series+.5)/e.length,s(a(t,n)+(c?t.y0:0))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}).on("dblclick",function(t,n){w.elementDblClick({value:a(t,n),point:t,series:e[t.series],pos:[i(u(t,n))+i.rangeBand()*(c?e.length/2:t.series+.5)/e.length,s(a(t,n)+(c?t.y0:0))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}),D.attr("class",function(e,t){return a(e,t)<0?"nv-bar negative":"nv-bar positive"}).attr("transform",function(e,t){return"translate("+i(u(e,t))+",0)"}),d&&(v||(v=e.map(funct ion(){return!0})),D.style("fill",function(e,t,n){return d3.rgb(d(e,t)).darker(v.map(function(e,t){return t}).filter(function(e,t){return!v[t]})[n]).toString()}).style("stroke",function(e,t,n){return d3.rgb(d(e,t)).darker(v.map(function(e,t){return t}).filter(function(e,t){return!v[t]})[n]).toString()})),c?D.transition().delay(function(t,n){return n*m/e[0].values.length}).attr("y",function(e,t){return s(c?e.y1:0)}).attr("height",function(e,t){return Math.max(Math.abs(s(e.y+(c?e.y0:0))-s(c?e.y0:0)),1)}).each("end",function(){d3.select(this).transition().duration(g).attr("x",function(t,n){return c?0:t.series*i.rangeBand()/e.length}).attr("width",i.rangeBand()/(c?1:e.length))}):d3.transition(D).duration(g).delay(function(t,n){return n*m/e[0].values.length}).attr("x",function(t,n){return t.series*i.rangeBand()/e.length}).attr("width",i.rangeBand()/e.length).each("end",function(){d3.select(this).transition().duration(g).attr("y",function(e,t){return a(e,t)<0?s(0):s(0)-s(a(e,t))<1? s(0)-1:s(a(e,t))||0}).attr("height",function(e,t){return Math.max(Math.abs(s(a(e,t))-s(0)),1)||0})}),E=i.copy(),S=s.copy()}),x}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=d3.scale.ordinal(),s=d3.scale.linear(),o=Math.floor(Math.random()*1e4),u=function(e){return e.x},a=function(e){return e.y},f=[0],l=!0,c=!1,h=e.utils.defaultColor(),p=!1,d=null,v,m=1200,g=500,y,b,w=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout"),E,S;return x.dispatch=w,x.x=function(e){return arguments.length?(u=e,x):u},x.y=function(e){return arguments.length?(a=e,x):a},x.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,x):t},x.width=function(e){return arguments.length?(n=e,x):n},x.height=function(e){return arguments.length?(r=e,x):r},x.xScale=function(e){return arguments.length?(i=e,x):i},x.yScale=function(e){return arguments.length?(s=e,x):s},x.xDomain=function(e){return arguments.length?(y=e,x):y},x.yDomain=function(e){return arguments.length?(b=e,x):b},x.forceY=function(e){return arguments.length?(f=e,x):f},x.stacked=function(e){return arguments.length?(c=e,x):c},x.clipEdge=function(e){return arguments.length?(l=e,x):l},x.color=function(t){return arguments.length?(h=e.utils.getColor(t),x):h},x.barColor=function(t){return arguments.length?(d=e.utils.getColor(t),x):d},x.disabled=function(e){return arguments.length?(v=e,x):v},x.id=function(e){return arguments.length?(o=e,x):o},x.hideable=function(e){return arguments.length?(p=e,x):p},x.delay=function(e){return arguments.length?(m=e,x):m},x.drawTime=function(e){return arguments.length?(g=e,x):g},x},e.models.multiBarChart=function(){function N(e){return e.each(function(e){var m=d3.select(this),C=this,k=(u||parseInt(m.style("width"))||960)-o.left-o.right,L=(a||parseInt(m.style("height "))||400)-o.top-o.bottom;N.update=function(){m.transition().call(N)},N.container=this,b.disabled=e.map(function(e){return!!e.disabled});if(!w){var A;w={};for(A in b)b[A]instanceof Array?w[A]=b[A].slice(0):w[A]=b[A]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var O=m.selectAll(".nv-noData").data([E]);return O.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),O.attr("x",o.left+k/2).attr("y",o.top+L/2).text(function(e){return e}),N}m.selectAll(".nv-noData").remove(),g=t.xScale(),y=t.yScale();var M=m.selectAll("g.nv-wrap.nv-multiBarWithLegend").data([e]),_=M.enter().append("g").attr("class","nvd3 nv-wrap nv-multiBarWithLegend").append("g"),D=M.select("g");_.append("g").attr("class","nv-x nv-axis"),_.append("g").attr("class","nv-y nv-axis"),_.append("g").attr("class","nv-barsWrap"),_.append("g").attr("class","nv-legendWrap"),_.append("g").attr("class","nv-controlsWrap"),c&&(i.width(k-x()),t.barColor ()&&e.forEach(function(e,t){e.color=d3.rgb("#ccc").darker(t*1.5).toString()}),D.select(".nv-legendWrap").datum(e).call(i),o.top!=i.height()&&(o.top=i.height(),L=(a||parseInt(m.style("height"))||400)-o.top-o.bottom),D.select(".nv-legendWrap").attr("transform","translate("+x()+","+ -o.top+")"));if(l){var P=[{key:"Grouped",disabled:t.stacked()},{key:"Stacked",disabled:!t.stacked()}];s.width(x()).color(["#444","#444","#444"]),D.select(".nv-controlsWrap").datum(P).attr("transform","translate(0,"+ -o.top+")").call(s)}M.attr("transform","translate("+o.left+","+o.top+")"),t.disabled(e.map(function(e){return e.disabled})).width(k).height(L).color(e.map(function(e,t){return e.color||f(e,t)}).filter(function(t,n){return!e[n].disabled}));var H=D.select(".nv-barsWrap").datum(e.filter(function(e){return!e.disabled}));d3.transition(H).call(t),n.scale(g).ticks(k/100).tickSize(-L,0),D.select(".nv-x.nv-axis").attr("transform","translate(0,"+y.range()[0]+")"),d3.transition(D.select(".nv-x.nv-a xis")).call(n);var B=D.select(".nv-x.nv-axis > g").selectAll("g");B.selectAll("line, text").style("opacity",1);if(p){var j=function(e,t){return"translate("+e+","+t+")"},F=5,I=17;B.selectAll("text").attr("transform",function(e,t,n){return j(0,n%2==0?F:I)});var q=d3.selectAll(".nv-x.nv-axis .nv-wrap g g text")[0].length;D.selectAll(".nv-x.nv-axis .nv-axisMaxMin text").attr("transform",function(e,t){return j(0,t===0||q%2!==0?I:F)})}h&&B.filter(function(t,n){return n%Math.ceil(e[0].values.length/(k/100))!==0}).selectAll("text, line").style("opacity",0),d&&B.selectAll("text").attr("transform","rotate("+d+" 0,0)").attr("text-anchor",d>0?"start":"end"),D.select(".nv-x.nv-axis").selectAll("g.nv-axisMaxMin text").style("opacity",1),r.scale(y).ticks(L/36).tickSize(-k,0),d3.transition(D.select(".nv-y.nv-axis")).call(r),i.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,M.selectAll(".nv -series").classed("disabled",!1),e}),b.disabled=e.map(function(e){return!!e.disabled}),S.stateChange(b),N.update()}),i.dispatch.on("legendDblclick",function(t){e.forEach(function(e){e.disabled=!0}),t.disabled=!1,b.disabled=e.map(function(e){return!!e.disabled}),S.stateChange(b),N.update()}),s.dispatch.on("legendClick",function(e,n){if(!e.disabled)return;P=P.map(function(e){return e.disabled=!0,e}),e.disabled=!1;switch(e.key){case"Grouped":t.stacked(!1);break;case"Stacked":t.stacked(!0)}b.stacked=t.stacked(),S.stateChange(b),N.update()}),S.on("tooltipShow",function(e){v&&T(e,C.parentNode)}),S.on("changeState",function(n){typeof n.disabled!="undefined"&&(e.forEach(function(e,t){e.disabled=n.disabled[t]}),b.disabled=n.disabled),typeof n.stacked!="undefined"&&(t.stacked(n.stacked),b.stacked=n.stacked),N.update()})}),N}var t=e.models.multiBar(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o={top:30,right:20,bottom:50,left:60},u=null,a=null,f=e.utils .defaultColor(),l=!0,c=!0,h=!0,p=!1,d=0,v=!0,m=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" on "+t+"</p>"},g,y,b={stacked:!1},w=null,E="No Data Available.",S=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),x=function(){return l?180:0};t.stacked(!1),n.orient("bottom").tickPadding(7).highlightZero(!0).showMaxMin(!1).tickFormat(function(e){return e}),r.orient("left").tickFormat(d3.format(",.1f"));var T=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=m(i.series.key,a,f,i,N);e.tooltip.show([o,u],l,i.value<0?"n":"s",null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+o.left,e.pos[1]+o.top],S.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),S.on("tooltipHide",function(){v&&e.tooltip.cleanup()}),N.dispatch=S,N.multibar=t,N.legend=i,N.xAxis=n,N.yAxis=r,d3.rebind(N,t ,"x","y","xDomain","yDomain","forceX","forceY","clipEdge","id","stacked","delay","barColor"),N.margin=function(e){return arguments.length?(o.top=typeof e.top!="undefined"?e.top:o.top,o.right=typeof e.right!="undefined"?e.right:o.right,o.bottom=typeof e.bottom!="undefined"?e.bottom:o.bottom,o.left=typeof e.left!="undefined"?e.left:o.left,N):o},N.width=function(e){return arguments.length?(u=e,N):u},N.height=function(e){return arguments.length?(a=e,N):a},N.color=function(t){return arguments.length?(f=e.utils.getColor(t),i.color(f),N):f},N.showControls=function(e){return arguments.length?(l=e,N):l},N.showLegend=function(e){return arguments.length?(c=e,N):c},N.reduceXTicks=function(e){return arguments.length?(h=e,N):h},N.rotateLabels=function(e){return arguments.length?(d=e,N):d},N.staggerLabels=function(e){return arguments.length?(p=e,N):p},N.tooltip=function(e){return arguments.length?(m=e,N):m},N.tooltips=function(e){return arguments.length?(v=e,N):v},N.tooltipContent=function (e){return arguments.length?(m=e,N):m},N.state=function(e){return arguments.length?(b=e,N):b},N.defaultState=function(e){return arguments.length?(w=e,N):w},N.noData=function(e){return arguments.length?(E=e,N):E},N},e.models.multiBarHorizontal=function(){function x(e){return e.each(function(e){var i=n-t.left-t.right,g=r-t.top-t.bottom,x=d3.select(this);p&&(e=d3.layout.stack().offset("zero").values(function(e){return e.values}).y(a)(e)),e=e.map(function(e,t){return e.values=e.values.map(function(e){return e.series=t,e}),e}),p&&e[0].values.map(function(t,n){var r=0,i=0;e.map(function(e){var t=e.values[n];t.size=Math.abs(t.y),t.y<0?(t.y1=i-t.size,i-=t.size):(t.y1=r,r+=t.size)})});var T=y&&b?[]:e.map(function(e){return e.values.map(function(e,t){return{x:u(e,t),y:a(e,t),y0:e.y0,y1:e.y1}})});s.domain(y||d3.merge(T).map(function(e){return e.x})).rangeBands([0,g],.1),o.domain(b||d3.extent(d3.merge(T).map(function(e){return p?e.y>0?e.y1+e.y:e.y1:e.y}).concat(f))),d&&!p?o.range([o.dom ain()[0]<0?v:0,i-(o.domain()[1]>0?v:0)]):o.range([0,i]),E=E||s,S=S||d3.scale.linear().domain(o.domain()).range([o(0),o(0)]);var N=d3.select(this).selectAll("g.nv-wrap.nv-multibarHorizontal").data([e]),C=N.enter().append("g").attr("class","nvd3 nv-wrap nv-multibarHorizontal"),k=C.append("defs"),L=C.append("g"),A=N.select("g");L.append("g").attr("class","nv-groups"),N.attr("transform","translate("+t.left+","+t.top+")");var O=N.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e){return e.key});O.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(O.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),O.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}).style("fill",function(e,t){return l(e,t)}).style("stroke",function(e,t){return l(e,t)}),d3.transition(O).style("stroke-opacity",1).style("fill-opacity",.75);var M=O.selectAll("g.nv-bar").da ta(function(e){return e.values});M.exit().remove();var _=M.enter().append("g").attr("transform",function(t,n,r){return"translate("+S(p?t.y0:0)+","+(p?0:r*s.rangeBand()/e.length+s(u(t,n)))+")"});_.append("rect").attr("width",0).attr("height",s.rangeBand()/(p?1:e.length)),M.on("mouseover",function(t,n){d3.select(this).classed("hover",!0),w.elementMouseover({value:a(t,n),point:t,series:e[t.series],pos:[o(a(t,n)+(p?t.y0:0)),s(u(t,n))+s.rangeBand()*(p?e.length/2:t.series+.5)/e.length],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),w.elementMouseout({value:a(t,n),point:t,series:e[t.series],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("click",function(t,n){w.elementClick({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t,n))+s.rangeBand()*(p?e.length/2:t.series+.5)/e.length,o(a(t,n)+(p?t.y0:0))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}).on("dblclick",function(t,n){w.elementDb lClick({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t,n))+s.rangeBand()*(p?e.length/2:t.series+.5)/e.length,o(a(t,n)+(p?t.y0:0) -)],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}),_.append("text"),d&&!p?(M.select("text").attr("text-anchor",function(e,t){return a(e,t)<0?"end":"start"}).attr("y",s.rangeBand()/(e.length*2)).attr("dy",".32em").text(function(e,t){return m(a(e,t))}),d3.transition(M).select("text").attr("x",function(e,t){return a(e,t)<0?-4:o(a(e,t))-o(0)+4})):M.selectAll("text").text(""),M.attr("class",function(e,t){return a(e,t)<0?"nv-bar negative":"nv-bar positive"}),c&&(h||(h=e.map(function(){return!0})),M.style("fill",function(e,t,n){return d3.rgb(c(e,t)).darker(h.map(function(e,t){return t}).filter(function(e,t){return!h[t]})[n]).toString()}).style("stroke",function(e,t,n){return d3.rgb(c(e,t)).darker(h.map(function(e,t){return t}).filter(function(e,t){return!h[t]})[n]).toString()})),p?d3.transition(M).attr("transform",function(e,t){return"translate("+o(e.y1)+","+s(u(e,t))+")"}).select("rect").attr("width",function(e,t){return Math.abs(o(a(e,t)+e.y0)-o(e.y0)) }).attr("height",s.rangeBand()):d3.transition(M).attr("transform",function(t,n){return"translate("+(a(t,n)<0?o(a(t,n)):o(0))+","+(t.series*s.rangeBand()/e.length+s(u(t,n)))+")"}).select("rect").attr("height",s.rangeBand()/e.length).attr("width",function(e,t){return Math.max(Math.abs(o(a(e,t))-o(0)),1)}),E=s.copy(),S=o.copy()}),x}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=Math.floor(Math.random()*1e4),s=d3.scale.ordinal(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=[0],l=e.utils.defaultColor(),c=null,h,p=!1,d=!1,v=60,m=d3.format(",.2f"),g=1200,y,b,w=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout"),E,S;return x.dispatch=w,x.x=function(e){return arguments.length?(u=e,x):u},x.y=function(e){return arguments.length?(a=e,x):a},x.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="unde fined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,x):t},x.width=function(e){return arguments.length?(n=e,x):n},x.height=function(e){return arguments.length?(r=e,x):r},x.xScale=function(e){return arguments.length?(s=e,x):s},x.yScale=function(e){return arguments.length?(o=e,x):o},x.xDomain=function(e){return arguments.length?(y=e,x):y},x.yDomain=function(e){return arguments.length?(b=e,x):b},x.forceY=function(e){return arguments.length?(f=e,x):f},x.stacked=function(e){return arguments.length?(p=e,x):p},x.color=function(t){return arguments.length?(l=e.utils.getColor(t),x):l},x.barColor=function(t){return arguments.length?(c=e.utils.getColor(t),x):c},x.disabled=function(e){return arguments.length?(h=e,x):h},x.id=function(e){return arguments.length?(i=e,x):i},x.delay=function(e){return arguments.length?(g=e,x):g},x.showValues=function(e){return arguments.length?(d=e,x):d},x.valueFormat=function(e){return arguments.length?(m=e,x):m},x.valuePadding=function(e ){return arguments.length?(v=e,x):v},x},e.models.multiBarHorizontalChart=function(){function x(e){return e.each(function(h){var d=d3.select(this),T=this,N=(u||parseInt(d.style("width"))||960)-o.left-o.right,C=(a||parseInt(d.style("height"))||400)-o.top-o.bottom;x.update=function(){d.transition().call(x)},x.container=this,g.disabled=h.map(function(e){return!!e.disabled});if(!y){var k;y={};for(k in g)g[k]instanceof Array?y[k]=g[k].slice(0):y[k]=g[k]}if(!h||!h.length||!h.filter(function(e){return e.values.length}).length){var L=d.selectAll(".nv-noData").data([b]);return L.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),L.attr("x",o.left+N/2).attr("y",o.top+C/2).text(function(e){return e}),x}d.selectAll(".nv-noData").remove(),v=t.xScale(),m=t.yScale();var A=d.selectAll("g.nv-wrap.nv-multiBarHorizontalChart").data([h]),O=A.enter().append("g").attr("class","nvd3 nv-wrap nv-multiBarHorizontalChart").append("g"),M=A.select("g"); O.append("g").attr("class","nv-x nv-axis"),O.append("g").attr("class","nv-y nv-axis"),O.append("g").attr("class","nv-barsWrap"),O.append("g").attr("class","nv-legendWrap"),O.append("g").attr("class","nv-controlsWrap"),c&&(i.width(N-E()),t.barColor()&&h.forEach(function(e,t){e.color=d3.rgb("#ccc").darker(t*1.5).toString()}),M.select(".nv-legendWrap").datum(h).call(i),o.top!=i.height()&&(o.top=i.height(),C=(a||parseInt(d.style("height"))||400)-o.top-o.bottom),M.select(".nv-legendWrap").attr("transform","translate("+E()+","+ -o.top+")"));if(l){var _=[{key:"Grouped",disabled:t.stacked()},{key:"Stacked",disabled:!t.stacked()}];s.width(E()).color(["#444","#444","#444"]),M.select(".nv-controlsWrap").datum(_).attr("transform","translate(0,"+ -o.top+")").call(s)}A.attr("transform","translate("+o.left+","+o.top+")"),t.disabled(h.map(function(e){return e.disabled})).width(N).height(C).color(h.map(function(e,t){return e.color||f(e,t)}).filter(function(e,t){return!h[t].disabled}));var D= M.select(".nv-barsWrap").datum(h.filter(function(e){return!e.disabled}));d3.transition(D).call(t),n.scale(v).ticks(C/24).tickSize(-N,0),d3.transition(M.select(".nv-x.nv-axis")).call(n);var P=M.select(".nv-x.nv-axis").selectAll("g");P.selectAll("line, text").style("opacity",1),r.scale(m).ticks(N/100).tickSize(-C,0),M.select(".nv-y.nv-axis").attr("transform","translate(0,"+C+")"),d3.transition(M.select(".nv-y.nv-axis")).call(r),i.dispatch.on("legendClick",function(e,t){e.disabled=!e.disabled,h.filter(function(e){return!e.disabled}).length||h.map(function(e){return e.disabled=!1,A.selectAll(".nv-series").classed("disabled",!1),e}),g.disabled=h.map(function(e){return!!e.disabled}),w.stateChange(g),x.update()}),i.dispatch.on("legendDblclick",function(e){h.forEach(function(e){e.disabled=!0}),e.disabled=!1,g.disabled=h.map(function(e){return!!e.disabled}),w.stateChange(g),x.update()}),s.dispatch.on("legendClick",function(e,n){if(!e.disabled)return;_=_.map(function(e){return e.disab led=!0,e}),e.disabled=!1;switch(e.key){case"Grouped":t.stacked(!1);break;case"Stacked":t.stacked(!0)}g.stacked=t.stacked(),w.stateChange(g),x.update()}),w.on("tooltipShow",function(e){p&&S(e,T.parentNode)}),w.on("changeState",function(n){typeof n.disabled!="undefined"&&(h.forEach(function(e,t){e.disabled=n.disabled[t]}),g.disabled=n.disabled),typeof n.stacked!="undefined"&&(t.stacked(n.stacked),g.stacked=n.stacked),e.call(x)})}),x}var t=e.models.multiBarHorizontal(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend().height(30),s=e.models.legend().height(30),o={top:30,right:20,bottom:50,left:60},u=null,a=null,f=e.utils.defaultColor(),l=!0,c=!0,h=!1,p=!0,d=function(e,t,n,r,i){return"<h3>"+e+" - "+t+"</h3>"+"<p>"+n+"</p>"},v,m,g={stacked:h},y=null,b="No Data Available.",w=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),E=function(){return l?180:0};t.stacked(h),n.orient("left").tickPadding(5).highlightZero(!1).showMaxMin(!1).tickFormat(function(e){retur n e}),r.orient("bottom").tickFormat(d3.format(",.1f"));var S=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=d(i.series.key,a,f,i,x);e.tooltip.show([o,u],l,i.value<0?"e":"w",null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+o.left,e.pos[1]+o.top],w.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){w.tooltipHide(e)}),w.on("tooltipHide",function(){p&&e.tooltip.cleanup()}),x.dispatch=w,x.multibar=t,x.legend=i,x.xAxis=n,x.yAxis=r,d3.rebind(x,t,"x","y","xDomain","yDomain","forceX","forceY","clipEdge","id","delay","showValues","valueFormat","stacked","barColor"),x.margin=function(e){return arguments.length?(o.top=typeof e.top!="undefined"?e.top:o.top,o.right=typeof e.right!="undefined"?e.right:o.right,o.bottom=typeof e.bottom!="undefined"?e.bottom:o.bottom,o.left=typeof e.left!="undefined"?e.left:o.left,x):o} ,x.width=function(e){return arguments.length?(u=e,x):u},x.height=function(e){return arguments.length?(a=e,x):a},x.color=function(t){return arguments.length?(f=e.utils.getColor(t),i.color(f),x):f},x.showControls=function(e){return arguments.length?(l=e,x):l},x.showLegend=function(e){return arguments.length?(c=e,x):c},x.tooltip=function(e){return arguments.length?(d=e,x):d},x.tooltips=function(e){return arguments.length?(p=e,x):p},x.tooltipContent=function(e){return arguments.length?(d=e,x):d},x.state=function(e){return arguments.length?(g=e,x):g},x.defaultState=function(e){return arguments.length?(y=e,x):y},x.noData=function(e){return arguments.length?(b=e,x):b},x},e.models.multiChart=function(){function T(e){return e.each(function(e){var u=d3.select(this),f=this;T.update=function(){u.transition().call(T)},T.container=this;var N=(r||parseInt(u.style("width"))||960)-t.left-t.right,C=(i||parseInt(u.style("height"))||400)-t.top-t.bottom,k=e.filter(function(e){return!e.disabled&& e.type=="line"&&e.yAxis==1}),L=e.filter(function(e){return!e.disabled&&e.type=="line"&&e.yAxis==2}),A=e.filter(function(e){return!e.disabled&&e.type=="bar"&&e.yAxis==1}),O=e.filter(function(e){return!e.disabled&&e.type=="bar"&&e.yAxis==2}),M=e.filter(function(e){return!e.disabled&&e.type=="area"&&e.yAxis==1}),_=e.filter(function(e){return!e.disabled&&e.type=="area"&&e.yAxis==2}),D=e.filter(function(e){return!e.disabled&&e.yAxis==1}).map(function(e){return e.values.map(function(e,t){return{x:e.x,y:e.y}})}),P=e.filter(function(e){return!e.disabled&&e.yAxis==2}).map(function(e){return e.values.map(function(e,t){return{x:e.x,y:e.y}})});a.domain(d3.extent(d3.merge(D.concat(P)),function(e){return e.x})).range([0,N]);var H=u.selectAll("g.wrap.multiChart").data([e]),B=H.enter().append("g").attr("class","wrap nvd3 multiChart").append("g");B.append("g").attr("class","x axis"),B.append("g").attr("class","y1 axis"),B.append("g").attr("class","y2 axis"),B.append("g").attr("class","lines1 Wrap"),B.append("g").attr("class","lines2Wrap"),B.append("g").attr("class","bars1Wrap"),B.append("g").attr("class","bars2Wrap"),B.append("g").attr("class","stack1Wrap"),B.append("g").attr("class","stack2Wrap"),B.append("g").attr("class","legendWrap");var j=H.select("g");s&&(E.width(N/2),j.select(".legendWrap").datum(e.map(function(e){return e.originalKey=e.originalKey===undefined?e.key:e.originalKey,e.key=e.originalKey+(e.yAxis==1?"":" (right axis)"),e})).call(E),t.top!=E.height()&&(t.top=E.height(),C=(i||parseInt(u.style("height"))||400)-t.top-t.bottom),j.select(".legendWrap").attr("transform","translate("+N/2+","+ -t.top+")")),h.width(N).height(C).interpolate("monotone").color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==1&&e[n].type=="line"})),p.width(N).height(C).interpolate("monotone").color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==2&&e[n].type =="line"})),d.width(N).height(C).color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==1&&e[n].type=="bar"})),v.width(N).height(C).color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==2&&e[n].type=="bar"})),m.width(N).height(C).color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==1&&e[n].type=="area"})),g.width(N).height(C).color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==2&&e[n].type=="area"})),j.attr("transform","translate("+t.left+","+t.top+")");var F=j.select(".lines1Wrap").datum(k),I=j.select(".bars1Wrap").datum(A),q=j.select(".stack1Wrap").datum(M),R=j.select(".lines2Wrap").datum(L),U=j.select(".bars2Wrap").datum(O),z=j.select(".stack2Wrap").datum(_),W=M.length?M.map(function(e){return e.values}).reduce(function(e,t){return e.map( function(e,n){return{x:e.x,y:e.y+t[n].y}})}).concat([{x:0,y:0}]):[],X=_.length?_.map(function(e){return e.values}).reduce(function(e,t){return e.map(function(e,n){return{x:e.x,y:e.y+t[n].y}})}).concat([{x:0,y:0}]):[];l.domain(d3.extent(d3.merge(D).concat(W),function(e){return e.y})).range([0,C]),c.domain(d3.extent(d3.merge(P).concat(X),function(e){return e.y})).range([0,C]),h.yDomain(l.domain()),d.yDomain(l.domain()),m.yDomain(l.domain()),p.yDomain(c.domain()),v.yDomain(c.domain()),g.yDomain(c.domain()),M.length&&d3.transition(q).call(m),_.length&&d3.transition(z).call(g),A.length&&d3.transition(I).call(d),O.length&&d3.transition(U).call(v),k.length&&d3.transition(F).call(h),L.length&&d3.transition(R).call(p),y.ticks(N/100).tickSize(-C,0),j.select(".x.axis").attr("transform","translate(0,"+C+")"),d3.transition(j.select(".x.axis")).call(y),b.ticks(C/36).tickSize(-N,0),d3.transition(j.select(".y1.axis")).call(b),w.ticks(C/36).tickSize(-N,0),d3.transition(j.select(".y2.axis")). call(w),j.select(".y2.axis").style("opacity",P.length?1:0).attr("transform","translate("+a.range()[1]+",0)"),E.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,H.selectAll(".series").classed("disabled",!1),e}),T.update()}),S.on("tooltipShow",function(e){o&&x(e,f.parentNode)})}),T}var t={top:30,right:20,bottom:50,left:60},n=d3.scale.category20().range(),r=null,i=null,s=!0,o=!0,u=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},a,f,a=d3.scale.linear(),l=d3.scale.linear(),c=d3.scale.linear(),h=e.models.line().yScale(l),p=e.models.line().yScale(c),d=e.models.multiBar().stacked(!1).yScale(l),v=e.models.multiBar().stacked(!1).yScale(c),m=e.models.stackedArea().yScale(l),g=e.models.stackedArea().yScale(c),y=e.models.axis().scale(a).orient("bottom").tickPadding(5),b=e.models.axis().scale(l).orient("left"),w=e.models.axis().scale(c).orient("right"),E=e.models.legen d().height(30),S=d3.dispatch("tooltipShow","tooltipHide"),x=function(t,n){var r=t.pos[0]+(n.offsetLeft||0),i=t.pos[1]+(n.offsetTop||0),s=y.tickFormat()(h.x()(t.point,t.pointIndex)),o=(t.series.yAxis==2?w:b).tickFormat()(h.y()(t.point,t.pointIndex)),a=u(t.series.key,s,o,t,T);e.tooltip.show([r,i],a,undefined,undefined,n.offsetParent)};return h.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),h.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),p.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),p.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),d.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),d.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),v.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltip Show(e)}),v.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),m.dispatch.on("tooltipShow",function(e){if(!Math.round(m.y()(e.point)*100))return setTimeout(function(){d3.selectAll(".point.hover").classed("hover",!1)},0),!1;e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),m.dispatch.on("tooltipHide",function(e){S.tooltipHide(e)}),g.dispatch.on("tooltipShow",function(e){if(!Math.round(g.y()(e.point)*100))return setTimeout(function(){d3.selectAll(".point.hover").classed("hover",!1)},0),!1;e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),g.dispatch.on("tooltipHide",function(e){S.tooltipHide(e)}),h.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),h.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),p.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],S.tooltipShow(e)}),p.dispatch.on("elementMouseout.tooltip",function(e){S.tooltip Hide(e)}),S.on("tooltipHide",function(){o&&e.tooltip.cleanup()}),T.dispatch=S,T.lines1=h,T.lines2=p,T.bars1=d,T.bars2=v,T.stack1=m,T.stack2=g,T.xAxis=y,T.yAxis1=b,T.yAxis2=w,T.x=function(e){return arguments.length?(getX=e,h.x(e),d.x(e),T):getX},T.y=function(e){return arguments.length?(getY=e,h.y(e),d.y(e),T):getY},T.margin=function(e){return arguments.length?(t=e,T):t},T.width=function(e){return arguments.length?(r=e,T):r},T.height=function(e){return arguments.length?(i=e,T):i},T.color=function(e){return arguments.length?(n=e,E.color(e),T):n},T.showLegend=function(e){return arguments.length?(s=e,T):s},T.tooltips=function(e){return arguments.length?(o=e,T):o},T.tooltipContent=function(e){return arguments.length?(u=e,T):u},T},e.models.ohlcBar=function(){function E(e){return e.each(function(e){var g=n-t.left-t.right,E=r-t.top-t.bottom,S=d3.select(this);s.domain(y||d3.extent(e[0].values.map(u).concat(p))),v?s.range([g*.5/e[0].values.length,g*(e[0].values.length-.5)/e[0].values.l ength]):s.range([0,g]),o.domain(b||[d3.min(e[0].values.map(h).concat(d)),d3.max(e[0].values.map(c).concat(d))]).range([E,0]);if(s.domain()[0]===s.domain()[1]||o.domain()[0]===o.domain()[1])singlePoint=!0;s.domain()[0]===s.domain()[1]&&(s.domain()[0]?s.domain([s.domain()[0]-s.domain()[0]*.01,s.domain()[1]+s.domain()[1]*.01]):s.domain([-1,1])),o.domain()[0]===o.domain()[1]&&(o.domain()[0]?o.domain([o.domain()[0]+o.domain()[0]*.01,o.domain()[1]-o.domain()[1]*.01]):o.domain([-1,1]));var T=d3.select(this).selectAll("g.nv-wrap.nv-ohlcBar").data([e[0].values]),N=T.enter().append("g").attr("class","nvd3 nv-wrap nv-ohlcBar"),C=N.append("defs"),k=N.append("g"),L=T.select("g");k.append("g").attr("class","nv-ticks"),T.attr("transform","translate("+t.left+","+t.top+")"),S.on("click",function(e,t){w.chartClick({data:e,index:t,pos:d3.event,id:i})}),C.append("clipPath").attr("id","nv-chart-clip-path-"+i).append("rect"),T.select("#nv-chart-clip-path-"+i+" rect").attr("width",g).attr("height" ,E),L.attr("clip-path",m?"url(#nv-chart-clip-path-"+i+")":"");var A=T.select(".nv-ticks").selectAll(".nv-tick").data(function(e){return e});A.exit().remove();var O=A.enter().append("path").attr("class",function(e,t,n){return(f(e,t)>l(e,t)?"nv-tick negative":"nv-tick positive")+" nv-tick-"+n+"-"+t}).attr("d",function(t,n){var r=g/e[0].values.length*.9;return"m0,0l0,"+(o(f(t,n))-o(c(t,n)))+"l"+ -r/2+",0l"+r/2+",0l0,"+(o(h(t,n))-o(f(t,n)))+"l0,"+(o(l(t,n))-o(h(t,n)))+"l"+r/2+",0l"+ -r/2+",0z"}).attr("transform",function(e,t){return"translate("+s(u(e,t))+","+o(c(e,t))+")"}).on("mouseover",function(t,n){d3.select(this).classed("hover",!0),w.elementMouseover({point:t,series:e[0],pos:[s(u(t,n)),o(a(t,n))],pointIndex:n,seriesIndex:0,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),w.elementMouseout({point:t,series:e[0],pointIndex:n,seriesIndex:0,e:d3.event})}).on("click",function(e,t){w.elementClick({value:a(e,t),data:e,index:t,pos:[s(u(e,t)),o(a(e,t))] ,e:d3.event,id:i}),d3.event.stopPropagation()}).on("dblclick",function(e,t){w.elementDblClick({value:a(e,t),data:e,index:t,pos:[s(u(e,t)),o(a(e,t))],e:d3.event,id:i}),d3.event.stopPropagation()});A.attr("class",function(e,t,n){return(f(e,t)>l(e,t)?"nv-tick negative":"nv-tick positive")+" nv-tick-"+n+"-"+t}),d3.transition(A).attr("transform",function(e,t){return"translate("+s(u(e,t))+","+o(c(e,t))+")"}).attr("d",function(t,n){var r=g/e[0].values.length*.9;return"m0,0l0,"+(o(f(t,n))-o(c(t,n)))+"l"+ -r/2+",0l"+r/2+",0l0,"+(o(h(t,n))-o(f(t,n)))+"l0,"+(o(l(t,n))-o(h(t,n)))+"l"+r/2+",0l"+ -r/2+",0z"})}),E}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=Math.floor(Math.random()*1e4),s=d3.scale.linear(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=function(e){return e.open},l=function(e){return e.close},c=function(e){return e.high},h=function(e){return e.low},p=[],d=[],v=!1,m=!0,g=e.utils.defaultColor(),y,b,w=d3.dispatch("chartClick","elementClick"," elementDblClick","elementMouseover","elementMouseout");return E.dispatch=w,E.x=function(e){return arguments.length?(u=e,E):u},E.y=function(e){return arguments.length?(a=e,E):a},E.open=function(e){return arguments.length?(f=e,E):f},E.close=function(e){return arguments.length?(l=e,E):l},E.high=function(e){return arguments.length?(c=e,E):c},E.low=function(e){return arguments.length?(h=e,E):h},E.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,E):t},E.width=function(e){return arguments.length?(n=e,E):n},E.height=function(e){return arguments.length?(r=e,E):r},E.xScale=function(e){return arguments.length?(s=e,E):s},E.yScale=function(e){return arguments.length?(o=e,E):o},E.xDomain=function(e){return arguments.length?(y=e,E):y},E.yDomain=function(e){return arguments.length?(b=e,E):b},E.force X=function(e){return arguments.length?(p=e,E):p},E.forceY=function(e){return arguments.length?(d=e,E):d},E.padData=function(e){return arguments.length?(v=e,E):v},E.clipEdge=function(e){return arguments.length?(m=e,E):m},E.color=function(t){return arguments.length?(g=e.utils.getColor(t),E):g},E.id=function(e){return arguments.length?(i=e,E):i},E},e.models.pie=function(){function E(e){return e.each(function(e){function P(e){var t=(e.startAngle+e.endAngle)*90/Math.PI-90;return t>90?t-180:t}function H(e){e.endAngle=isNaN(e.endAngle)?0:e.endAngle,e.startAngle=isNaN(e.startAngle)?0:e.startAngle,v||(e.innerRadius=0);var t=d3.interpolate(this._current,e);return this._current=t(0),function(e){return L(t(e))}}function B(e){e.innerRadius=0;var t=d3.interpolate({startAngle:0,endAngle:0},e);return function(e){return L(t(e))}}var u=n-t.left-t.right,l=r-t.top-t.bottom,E=Math.min(u,l)/2,S=E-E/5,x=d3.select(this),T=x.selectAll(".nv-wrap.nv-pie").data([i(e[0])]),N=T.enter().append("g").attr(" class","nvd3 nv-wrap nv-pie nv-chart-"+a),C=N.append("g"),k=T.select("g");C.append("g").attr("class","nv-pie"),T.attr("transform","translate("+t.left+","+t.top+")"),k.select(".nv-pie").attr("transform","translate("+u/2+","+l/2+")"),x.on("click",function(e,t){w.chartClick({data:e,index:t,pos:d3.event,id:a})});var L=d3.svg.arc().outerRadius(S);g&&L.startAngle(g),y&&L.endAngle(y),v&&L.innerRadius(E*b);var A=d3.layout.pie().sort(null).value(function(e){return e.disabled?0:o(e)}),O=T.select(".nv-pie").selectAll(".nv-slice").data(A);O.exit().remove();var M=O.enter().append("g").attr("class","nv-slice").on("mouseover",function(e,t){d3.select(this).classed("hover",!0),w.elementMouseover({label:s(e.data),value:o(e.data),point:e.data,pointIndex:t,pos:[d3.event.pageX,d3.event.pageY],id:a})}).on("mouseout",function(e,t){d3.select(this).classed("hover",!1),w.elementMouseout({label:s(e.data),value:o(e.data),point:e.data,index:t,id:a})}).on("click",function(e,t){w.elementClick({label:s(e.d ata),value:o(e.data),point:e.data,index:t,pos:d3.event,id:a}),d3.event.stopPropagation()}).on("dblclick",function(e,t){w.elementDblClick({label:s(e.data),value:o(e.data),point:e.data,index:t,pos:d3.event,id:a}),d3.event.stopPropagation()});O.attr("fill",function(e,t){return f(e,t)}).attr("stroke",function(e,t){return f(e,t)});var _=M.append("path").each(function(e){this._current=e});d3.transition(O.select("path")).attr("d",L).attrTween("d",H);if(c){var D=d3.svg.arc().innerRadius(0);h&&(D=L),p&&(D=d3.svg.arc().outerRadius(L.outerRadius())),M.append("g").classed("nv-label",!0).each(function(e,t){var n=d3.select(this);n.attr("transform",function(e){if(m){e.outerRadius=S+10,e.innerRadius=S+15;var t=(e.startAngle+e.endAngle)/2*(180/Math.PI);return(e.startAngle+e.endAngle)/2<Math.PI?t-=90:t+=90,"translate("+D.centroid(e)+") rotate("+t+")"}return e.outerRadius=E+10,e.innerRadius=E+15,"translate("+D.centroid(e)+")"}),n.append("rect").style("stroke","#fff").style("fill","#fff").attr( "rx",3).attr("ry",3),n.append("text").style("text-anchor",m?(e.startAngle+e.endAngle)/2<Math.PI?"start":"end":"middle").style("fill","#000")}),O.select(".nv-label").transition().attr("transform",function(e){if(m){e.outerRadius=S+10,e.innerRadius=S+15;var t=(e.startAngle+e.endAngle)/2*(180/Math.PI);return(e.startAngle+e.endAngle)/2<Math.PI?t-=90:t+=90,"translate("+D.centroid(e)+") rotate("+t+")"}return e.outerRadius=E+10,e.innerRadius=E+15,"translate("+D.centroid(e)+")"}),O.each(function(e,t){var n=d3.select(this);n.select(".nv-label text").style("text-anchor",m?(e.startAngle+e.endAngle)/2<Math.PI?"start":"end":"middle").text(function(e,t){var n=(e.endAngle-e.startAngle)/(2*Math.PI);return e.value&&n>d?s(e.data):""});var r=n.select("text").node().getBBox();n.select(".nv-label rect").attr("width",r.width+10).attr("height",r.height+10).attr("transform",function(){return"translate("+[r.x-5,r.y-5]+")"})})}}),E}var t={top:0,right:0,bottom:0,left:0},n=500,r=500,i=function(e){return e.values},s=function(e){return e.x},o=function(e){return e.y},u=function(e){return e.description},a=Math.floor(Math.random()*1e4),f=e.utils.defaultColor(),l=d3.format(",.2f"),c=!0,h=!0,p=!1,d=.02,v=!1,m=!1,g=!1,y=!1,b=.5,w=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout");return E.dispatch=w,E.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,E):t},E.width=function(e){return arguments.length?(n=e,E):n},E.height=function(e){return arguments.length?(r=e,E):r},E.values=function(e){return arguments.length?(i=e,E):i},E.x=function(e){return arguments.length?(s=e,E):s},E.y=function(e){return arguments.length?(o=d3.functor(e),E):o},E.description=function(e){return arguments.length?(u=e,E):u},E.showLabels=function(e){return arguments.length?(c=e,E ):c},E.labelSunbeamLayout=function(e){return arguments.length?(m=e,E):m},E.donutLabelsOutside=function(e){return arguments.length?(p=e,E):p},E.pieLabelsOutside=function(e){return arguments.length?(h=e,E):h},E.donut=function(e){return arguments.length?(v=e,E):v},E.donutRatio=function(e){return arguments.length?(b=e,E):b},E.startAngle=function(e){return arguments.length?(g=e,E):g},E.endAngle=function(e){return arguments.length?(y=e,E):y},E.id=function(e){return arguments.length?(a=e,E):a},E.color=function(t){return arguments.length?(f=e.utils.getColor(t),E):f},E.valueFormat=function(e){return arguments.length?(l=e,E):l},E.labelThreshold=function(e){return arguments.length?(d=e,E):d},E},e.models.pieChart=function(){function v(e){return e.each(function(e){var u=d3.select(this),a=this,f=(i||parseInt(u.style("width"))||960)-r.left-r.right,d=(s||parseInt(u.style("height"))||400)-r.top-r.bottom;v.update=function(){u.transition().call(v)},v.container=this,l.disabled=e[0].map(function (e){return!!e.disabled});if(!c){var m;c={};for(m in l)l[m]instanceof Array?c[m]=l[m].slice(0):c[m]=l[m]}if(!e[0]||!e[0].length){var g=u.selectAll(".nv-noData").data([h]);return g.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),g.attr("x",r.left+f/2).attr("y",r.top+d/2).text(function(e){return e}),v}u.selectAll(".nv-noData").remove();var y=u.selectAll("g.nv-wrap.nv-pieChart").data([e]),b=y.enter().append("g").attr("class","nvd3 nv-wrap nv-pieChart").append("g"),w=y.select("g");b.append("g").attr("class","nv-pieWrap"),b.append("g").attr("class","nv-legendWrap"),o&&(n.width(f).key(t.x()),y.select(".nv-legendWrap").datum(t.values()(e[0])).call(n),r.top!=n.height()&&(r.top=n.height(),d=(s||parseInt(u.style("height"))||400)-r.top-r.bottom),y.select(".nv-legendWrap").attr("transform","translate(0,"+ -r.top+")")),y.attr("transform","translate("+r.left+","+r.top+")"),t.width(f).height(d);var E=w.select(".nv-pieWrap").datum(e);d3. transition(E).call(t),n.dispatch.on("legendClick",function(n,r,i){n.disabled=!n.disabled,t.values()(e[0]).filter(function(e){return!e.disabled}).length||t.values()(e[0]).map(function(e){return e.disabled=!1,y.selectAll(".nv-series").classed("disabled",!1),e}),l.disabled=e[0].map(function(e){return!!e.disabled}),p.stateChange(l),v.update()}),t.dispatch.on("elementMouseout.tooltip",function(e){p.tooltipHide(e)}),p.on("changeState",function(t){typeof t.disabled!="undefined"&&(e[0].forEach(function(e,n){e.disabled=t.disabled[n]}),l.disabled=t.disabled),v.update()})}),v}var t=e.models.pie(),n=e.models.legend(),r={top:30,right:20,bottom:20,left:20},i=null,s=null,o=!0,u=e.utils.defaultColor(),a=!0,f=function(e,t,n,r){return"<h3>"+e+"</h3>"+"<p>"+t+"</p>"},l={},c=null,h="No Data Available.",p=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),d=function(n,r){var i=t.description()(n.point)||t.x()(n.point),s=n.pos[0]+(r&&r.offsetLeft||0),o=n.pos[1]+(r&&r.offsetTop||0 ),u=t.valueFormat()(t.y()(n.point)),a=f(i,u,n,v);e.tooltip.show([s,o],a,n.value<0?"n":"s",null,r)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+r.left,e.pos[1]+r.top],p.tooltipShow(e)}),p.on("tooltipShow",function(e){a&&d(e)}),p.on("tooltipHide",function(){a&&e.tooltip.cleanup()}),v.legend=n,v.dispatch=p,v.pie=t,d3.rebind(v,t,"valueFormat","values","x","y","description","id","showLabels","donutLabelsOutside","pieLabelsOutside","donut","donutRatio","labelThreshold"),v.margin=function(e){return arguments.length?(r.top=typeof e.top!="undefined"?e.top:r.top,r.right=typeof e.right!="undefined"?e.right:r.right,r.bottom=typeof e.bottom!="undefined"?e.bottom:r.bottom,r.left=typeof e.left!="undefined"?e.left:r.left,v):r},v.width=function(e){return arguments.length?(i=e,v):i},v.height=function(e){return arguments.length?(s=e,v):s},v.color=function(r){return arguments.length?(u=e.utils.getColor(r),n.color(u),t.color(u),v):u},v.showLegend=function(e){retur n arguments.length?(o=e,v):o},v.tooltips=function(e){return arguments.length?(a=e,v):a},v.tooltipContent=function(e){return arguments.length?(f=e,v):f},v.state=function(e){return arguments.length?(l=e,v):l},v.defaultState=function(e){return arguments.length?(c=e,v):c},v.noData=function(e){return arguments.length?(h=e,v):h},v},e.models.scatter=function(){function j(e){return e.each(function(e){function $(){if(!g)return!1;var i,a=d3.merge(e.map(function(e,t){return e.values.map(function(e,n){var r=f(e,n)+Math.random()*1e-7,i=l(e,n)+Math.random()*1e-7;return[o(r),u(i),t,n,e]}).filter(function(e,t){return b(e[4],t)})}));if(M===!0){if(x){var c=R.select("defs").selectAll(".nv-point-clips").data([s]).enter();c.append("clipPath").attr("class","nv-point-clips").attr("id","nv-points-clip-"+s);var h=R.select("#nv-points-clip-"+s).selectAll("circle").data(a);h.enter().append("circle").attr("r",T),h.exit().remove(),h.attr("cx",function(e){return e[0]}).attr("cy",function(e){return e[1]}) ,R.select(".nv-point-paths").attr("clip-path","url(#nv-points-clip-"+s+")")}a.length&&(a.push([o.range()[0]-20,u.range()[0]-20,null,null]),a.push([o.range()[1]+20,u.range()[1]+20,null,null]),a.push([o.range()[0]-20,u.range()[0]+20,null,null]),a.push([o.range()[1]+20,u.range()[1]-20,null,null]));var p=d3.geom.polygon([[-10,-10],[-10,r+10],[n+10,r+10],[n+10,-10]]),d=d3.geom.voronoi(a).map(function(e,t){return{data:p.clip(e),series:a[t][2],point:a[t][3]}}),v=R.select(".nv-point-paths").selectAll("path").data(d);v.enter().append("path").attr("class",function(e,t){return"nv-path-"+t}),v.exit().remove(),v.attr("d",function(e){return e.data.length===0?"M 0 0":"M"+e.data.join("L")+"Z"}),v.on("click",function(n){if(B)return 0;var r=e[n.series],i=r.values[n.point];O.elementClick({point:i,series:r,pos:[o(f(i,n.point))+t.left,u(l(i,n.point))+t.top],seriesIndex:n.series,pointIndex:n.point})}).on("mouseover",function(n){if(B)return 0;var r=e[n.series],i=r.values[n.point];O.elementMouseove r({point:i,series:r,pos:[o(f(i,n.point))+t.left,u(l(i,n.point))+t.top],seriesIndex:n.series,pointIndex:n.point})}).on("mouseout",function(t,n){if(B)return 0;var r=e[t.series],i=r.values[t.point];O.elementMouseout({point:i,series:r,seriesIndex:t.series,pointIndex:t.point})})}else R.select(".nv-groups").selectAll(".nv-group").selectAll(".nv-point").on("click",function(n,r){if(B||!e[n.series])return 0;var i=e[n.series],s=i.values[r];O.elementClick({point:s,series:i,pos:[o(f(s,r))+t.left,u(l(s,r))+t.top],seriesIndex:n.series,pointIndex:r})}).on("mouseover",function(n,r){if(B||!e[n.series])return 0;var i=e[n.series],s=i.values[r];O.elementMouseover({point:s,series:i,pos:[o(f(s,r))+t.left,u(l(s,r))+t.top],seriesIndex:n.series,pointIndex:r})}).on("mouseout",function(t,n){if(B||!e[t.series])return 0;var r=e[t.series],i=r.values[n];O.elementMouseout({point:i,series:r,seriesIndex:t.series,pointIndex:n})});B=!1}var j=n-t.left-t.right,F=r-t.top-t.bottom,I=d3.select(this);e=e.map(functio n(e,t){return e.values=e.values.map(function(e){return e.series=t,e}),e});var q=N&&C&&k?[]:d3.merge(e.map(function(e){return e.values -.map(function(e,t){return{x:f(e,t),y:l(e,t),size:c(e,t)}})}));o.domain(N||d3.extent(q.map(function(e){return e.x}).concat(d))),w&&e[0]?o.range([(j*E+j)/(2*e[0].values.length),j-j*(1+E)/(2*e[0].values.length)]):o.range([0,j]),u.domain(C||d3.extent(q.map(function(e){return e.y}).concat(v))).range([F,0]),a.domain(k||d3.extent(q.map(function(e){return e.size}).concat(m))).range(L||[16,256]);if(o.domain()[0]===o.domain()[1]||u.domain()[0]===u.domain()[1])A=!0;o.domain()[0]===o.domain()[1]&&(o.domain()[0]?o.domain([o.domain()[0]-o.domain()[0]*.01,o.domain()[1]+o.domain()[1]*.01]):o.domain([-1,1])),u.domain()[0]===u.domain()[1]&&(u.domain()[0]?u.domain([u.domain()[0]+u.domain()[0]*.01,u.domain()[1]-u.domain()[1]*.01]):u.domain([-1,1])),isNaN(o.domain()[0])&&o.domain([-1,1]),isNaN(u.domain()[0])&&u.domain([-1,1]),_=_||o,D=D||u,P=P||a;var R=I.selectAll("g.nv-wrap.nv-scatter").data([e]),U=R.enter().append("g").attr("class","nvd3 nv-wrap nv-scatter nv-chart-"+s+(A?" nv-single-point":"" )),W=U.append("defs"),X=U.append("g"),V=R.select("g");X.append("g").attr("class","nv-groups"),X.append("g").attr("class","nv-point-paths"),R.attr("transform","translate("+t.left+","+t.top+")"),W.append("clipPath").attr("id","nv-edge-clip-"+s).append("rect"),R.select("#nv-edge-clip-"+s+" rect").attr("width",j).attr("height",F),V.attr("clip-path",S?"url(#nv-edge-clip-"+s+")":""),B=!0;var J=R.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e){return e.key});J.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(J.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),J.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}),d3.transition(J).style("fill",function(e,t){return i(e,t)}).style("stroke",function(e,t){return i(e,t)}).style("stroke-opacity",1).style("fill-opacity",.5);if(p){var K=J.selectAll("circle.nv-point").data(function(e){return e. values},y);K.enter().append("circle").attr("cx",function(e,t){return _(f(e,t))}).attr("cy",function(e,t){return D(l(e,t))}).attr("r",function(e,t){return Math.sqrt(a(c(e,t))/Math.PI)}),K.exit().remove(),J.exit().selectAll("path.nv-point").transition().attr("cx",function(e,t){return o(f(e,t))}).attr("cy",function(e,t){return u(l(e,t))}).remove(),K.each(function(e,t){d3.select(this).classed("nv-point",!0).classed("nv-point-"+t,!0)}),K.transition().attr("cx",function(e,t){return o(f(e,t))}).attr("cy",function(e,t){return u(l(e,t))}).attr("r",function(e,t){return Math.sqrt(a(c(e,t))/Math.PI)})}else{var K=J.selectAll("path.nv-point").data(function(e){return e.values});K.enter().append("path").attr("transform",function(e,t){return"translate("+_(f(e,t))+","+D(l(e,t))+")"}).attr("d",d3.svg.symbol().type(h).size(function(e,t){return a(c(e,t))})),K.exit().remove(),d3.transition(J.exit().selectAll("path.nv-point")).attr("transform",function(e,t){return"translate("+o(f(e,t))+","+u(l(e,t ))+")"}).remove(),K.each(function(e,t){d3.select(this).classed("nv-point",!0).classed("nv-point-"+t,!0)}),K.transition().attr("transform",function(e,t){return"translate("+o(f(e,t))+","+u(l(e,t))+")"}).attr("d",d3.svg.symbol().type(h).size(function(e,t){return a(c(e,t))}))}clearTimeout(H),H=setTimeout($,300),_=o.copy(),D=u.copy(),P=a.copy()}),j}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=e.utils.defaultColor(),s=Math.floor(Math.random()*1e5),o=d3.scale.linear(),u=d3.scale.linear(),a=d3.scale.linear(),f=function(e){return e.x},l=function(e){return e.y},c=function(e){return e.size||1},h=function(e){return e.shape||"circle"},p=!0,d=[],v=[],m=[],g=!0,y=null,b=function(e){return!e.notActive},w=!1,E=.1,S=!1,x=!0,T=function(){return 25},N=null,C=null,k=null,L=null,A=!1,O=d3.dispatch("elementClick","elementMouseover","elementMouseout"),M=!0,_,D,P,H,B=!1;return O.on("elementMouseover.point",function(e){g&&d3.select(".nv-chart-"+s+" .nv-series-"+e.seriesIndex+" .nv-point-"+e.po intIndex).classed("hover",!0)}),O.on("elementMouseout.point",function(e){g&&d3.select(".nv-chart-"+s+" .nv-series-"+e.seriesIndex+" .nv-point-"+e.pointIndex).classed("hover",!1)}),j.dispatch=O,j.x=function(e){return arguments.length?(f=d3.functor(e),j):f},j.y=function(e){return arguments.length?(l=d3.functor(e),j):l},j.size=function(e){return arguments.length?(c=d3.functor(e),j):c},j.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,j):t},j.width=function(e){return arguments.length?(n=e,j):n},j.height=function(e){return arguments.length?(r=e,j):r},j.xScale=function(e){return arguments.length?(o=e,j):o},j.yScale=function(e){return arguments.length?(u=e,j):u},j.zScale=function(e){return arguments.length?(a=e,j):a},j.xDomain=function(e){return arguments.length?(N=e,j):N},j.yDomain=functi on(e){return arguments.length?(C=e,j):C},j.sizeDomain=function(e){return arguments.length?(k=e,j):k},j.sizeRange=function(e){return arguments.length?(L=e,j):L},j.forceX=function(e){return arguments.length?(d=e,j):d},j.forceY=function(e){return arguments.length?(v=e,j):v},j.forceSize=function(e){return arguments.length?(m=e,j):m},j.interactive=function(e){return arguments.length?(g=e,j):g},j.pointKey=function(e){return arguments.length?(y=e,j):y},j.pointActive=function(e){return arguments.length?(b=e,j):b},j.padData=function(e){return arguments.length?(w=e,j):w},j.padDataOuter=function(e){return arguments.length?(E=e,j):E},j.clipEdge=function(e){return arguments.length?(S=e,j):S},j.clipVoronoi=function(e){return arguments.length?(x=e,j):x},j.useVoronoi=function(e){return arguments.length?(M=e,M===!1&&(x=!1),j):M},j.clipRadius=function(e){return arguments.length?(T=e,j):T},j.color=function(t){return arguments.length?(i=e.utils.getColor(t),j):i},j.shape=function(e){return argum ents.length?(h=e,j):h},j.onlyCircles=function(e){return arguments.length?(p=e,j):p},j.id=function(e){return arguments.length?(s=e,j):s},j.singlePoint=function(e){return arguments.length?(A=e,j):A},j},e.models.scatterChart=function(){function P(e){return e.each(function(e){function W(){if(E)return R.select(".nv-point-paths").style("pointer-events","all"),!1;R.select(".nv-point-paths").style("pointer-events","none");var i=d3.mouse(this);h.distortion(w).focus(i[0]),p.distortion(w).focus(i[1]),R.select(".nv-scatterWrap").call(t),R.select(".nv-x.nv-axis").call(n),R.select(".nv-y.nv-axis").call(r),R.select(".nv-distributionX").datum(e.filter(function(e){return!e.disabled})).call(o),R.select(".nv-distributionY").datum(e.filter(function(e){return!e.disabled})).call(u)}var x=d3.select(this),T=this,N=(f||parseInt(x.style("width"))||960)-a.left-a.right,H=(l||parseInt(x.style("height"))||400)-a.top-a.bottom;P.update=function(){x.transition().call(P)},C.disabled=e.map(function(e){return! !e.disabled});if(!k){var B;k={};for(B in C)C[B]instanceof Array?k[B]=C[B].slice(0):k[B]=C[B]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var j=x.selectAll(".nv-noData").data([A]);return j.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),j.attr("x",a.left+N/2).attr("y",a.top+H/2).text(function(e){return e}),P}x.selectAll(".nv-noData").remove(),O=O||h,M=M||p;var F=x.selectAll("g.nv-wrap.nv-scatterChart").data([e]),I=F.enter().append("g").attr("class","nvd3 nv-wrap nv-scatterChart nv-chart-"+t.id()),q=I.append("g"),R=F.select("g");q.append("rect").attr("class","nvd3 nv-background"),q.append("g").attr("class","nv-x nv-axis"),q.append("g").attr("class","nv-y nv-axis"),q.append("g").attr("class","nv-scatterWrap"),q.append("g").attr("class","nv-distWrap"),q.append("g").attr("class","nv-legendWrap"),q.append("g").attr("class","nv-controlsWrap"),y&&(i.width(N/2),F.select(".nv-legendWrap").datum(e).call (i),a.top!=i.height()&&(a.top=i.height(),H=(l||parseInt(x.style("height"))||400)-a.top-a.bottom),F.select(".nv-legendWrap").attr("transform","translate("+N/2+","+ -a.top+")")),b&&(s.width(180).color(["#444"]),R.select(".nv-controlsWrap").datum(D).attr("transform","translate(0,"+ -a.top+")").call(s)),F.attr("transform","translate("+a.left+","+a.top+")"),t.width(N).height(H).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})).xDomain(null).yDomain(null),F.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled})).call(t);if(d){var U=h.domain()[1]-h.domain()[0];t.xDomain([h.domain()[0]-d*U,h.domain()[1]+d*U])}if(v){var z=p.domain()[1]-p.domain()[0];t.yDomain([p.domain()[0]-v*z,p.domain()[1]+v*z])}F.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled})).call(t),n.scale(h).ticks(n.ticks()&&n.ticks().length?n.ticks():N/100).tickSize(-H,0),R.select(".nv-x.nv-axis").attr("transform","translate(0,"+p.range( )[0]+")").call(n),r.scale(p).ticks(r.ticks()&&r.ticks().length?r.ticks():H/36).tickSize(-N,0),R.select(".nv-y.nv-axis").call(r),m&&(o.getData(t.x()).scale(h).width(N).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),q.select(".nv-distWrap").append("g").attr("class","nv-distributionX"),R.select(".nv-distributionX").attr("transform","translate(0,"+p.range()[0]+")").datum(e.filter(function(e){return!e.disabled})).call(o)),g&&(u.getData(t.y()).scale(p).width(H).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),q.select(".nv-distWrap").append("g").attr("class","nv-distributionY"),R.select(".nv-distributionY").attr("transform","translate(-"+u.size()+",0)").datum(e.filter(function(e){return!e.disabled})).call(u)),d3.fisheye&&(R.select(".nv-background").attr("width",N).attr("height",H),R.select(".nv-background").on("mousemove",W),R.select(".nv-background").on("click",function(){E=!E}),t.disp atch.on("elementClick.freezeFisheye",function(){E=!E})),s.dispatch.on("legendClick",function(e,i){e.disabled=!e.disabled,w=e.disabled?0:2.5,R.select(".nv-background").style("pointer-events",e.disabled?"none":"all"),R.select(".nv-point-paths").style("pointer-events",e.disabled?"all":"none"),e.disabled?(h.distortion(w).focus(0),p.distortion(w).focus(0),R.select(".nv-scatterWrap").call(t),R.select(".nv-x.nv-axis").call(n),R.select(".nv-y.nv-axis").call(r)):E=!1,P.update()}),i.dispatch.on("legendClick",function(t,n,r){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,F.selectAll(".nv-series").classed("disabled",!1),e}),C.disabled=e.map(function(e){return!!e.disabled}),L.stateChange(C),P.update()}),i.dispatch.on("legendDblclick",function(t){e.forEach(function(e){e.disabled=!0}),t.disabled=!1,C.disabled=e.map(function(e){return!!e.disabled}),L.stateChange(C),P.update()}),t.dispatch.on("elementMouseover.tooltip",function( e){d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-distx-"+e.pointIndex).attr("y1",function(t,n){return e.pos[1]-H}),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-disty-"+e.pointIndex).attr("x2",e.pos[0]+o.size()),e.pos=[e.pos[0]+a.left,e.pos[1]+a.top],L.tooltipShow(e)}),L.on("tooltipShow",function(e){S&&_(e,T.parentNode)}),L.on("changeState",function(t){typeof t.disabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),C.disabled=t.disabled),P.update()}),O=h.copy(),M=p.copy()}),P}var t=e.models.scatter(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o=e.models.distribution(),u=e.models.distribution(),a={top:30,right:20,bottom:50,left:75},f=null,l=null,c=e.utils.defaultColor(),h=d3.fisheye?d3.fisheye.scale(d3.scale.linear).distortion(0):t.xScale(),p=d3.fisheye?d3.fisheye.scale(d3.scale.linear).distortion(0):t.yScale(),d=0,v=0,m=!1,g=!1,y=!0,b=!!d3.fisheye,w=0,E=!1,S=!0,x=function(e,t,n){return "<strong>"+t+"</strong>"},T=function(e,t,n){return"<strong>"+n+"</strong>"},N=null,C={},k=null,L=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),A="No Data Available.";t.xScale(h).yScale(p),n.orient("bottom").tickPadding(10),r.orient("left").tickPadding(10),o.axis("x"),u.axis("y");var O,M,_=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),f=i.pos[0]+(s.offsetLeft||0),l=p.range()[0]+a.top+(s.offsetTop||0),c=h.range()[0]+a.left+(s.offsetLeft||0),d=i.pos[1]+(s.offsetTop||0),v=n.tickFormat()(t.x()(i.point,i.pointIndex)),m=r.tickFormat()(t.y()(i.point,i.pointIndex));x!=null&&e.tooltip.show([f,l],x(i.series.key,v,m,i,P),"n",1,s,"x-nvtooltip"),T!=null&&e.tooltip.show([c,d],T(i.series.key,v,m,i,P),"e",1,s,"y-nvtooltip"),N!=null&&e.tooltip.show([o,u],N(i.series.key,v,m,i,P),i.value<0?"n":"s",null,s)},D=[{key:"Magnify",disabled:!0}];return t.dispatch.on("elementMouseout.tooltip",function(e){L.tooltipHide(e),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-distx-"+e.pointIndex).attr("y1",0),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-disty-"+e.pointIndex).attr("x2",u.size())}),L.on("tooltipHide",function(){S&&e.tooltip.cleanup()}),P.dispatch=L,P.scatter=t,P.legend=i,P.controls=s,P.xAxis=n,P.yAxis=r,P.distX=o,P.distY=u,d3.rebind(P,t,"id","interactive","pointActive","x","y","shape","size","xScale","yScale","zScale","xDomain","yDomain","sizeDomain","sizeRange","forceX","forceY","forceSize","clipVoronoi","clipRadius","useVoronoi"),P.margin=function(e){return arguments.length?(a.top=typeof e.top!="undefined"?e.top:a.top,a.right=typeof e.right!="undefined"?e.right:a.right,a.bottom=typeof e.bottom!="undefined"?e.bottom:a.bottom,a.left=typeof e.left!="undefined"?e.left:a.left,P):a},P.width=function(e){return arguments.length?(f=e,P):f},P.height=function(e){return arguments.length?(l=e,P):l},P.color=function(t){return arguments.length?(c=e.utils.getColor(t),i.color(c),o.color(c),u. color(c),P):c},P.showDistX=function(e){return arguments.length?(m=e,P):m},P.showDistY=function(e){return arguments.length?(g=e,P):g},P.showControls=function(e){return arguments.length?(b=e,P):b},P.showLegend=function(e){return arguments.length?(y=e,P):y},P.fisheye=function(e){return arguments.length?(w=e,P):w},P.xPadding=function(e){return arguments.length?(d=e,P):d},P.yPadding=function(e){return arguments.length?(v=e,P):v},P.tooltips=function(e){return arguments.length?(S=e,P):S},P.tooltipContent=function(e){return arguments.length?(N=e,P):N},P.tooltipXContent=function(e){return arguments.length?(x=e,P):x},P.tooltipYContent=function(e){return arguments.length?(T=e,P):T},P.state=function(e){return arguments.length?(C=e,P):C},P.defaultState=function(e){return arguments.length?(k=e,P):k},P.noData=function(e){return arguments.length?(A=e,P):A},P},e.models.scatterPlusLineChart=function(){function _(e){return e.each(function(e){function U(){if(b)return I.select(".nv-point-paths") .style("pointer-events","all"),!1;I.select(".nv-point-paths").style("pointer-events","none");var i=d3.mouse(this);h.distortion(y).focus(i[0]),p.distortion(y).focus(i[1]),I.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled})).call(t),I.select(".nv-x.nv-axis").call(n),I.select(".nv-y.nv-axis").call(r),I.select(".nv-distributionX").datum(e.filter(function(e){return!e.disabled})).call(o),I.select(".nv-distributionY").datum(e.filter(function(e){return!e.disabled})).call(u)}var E=d3.select(this),S=this,x=(f||parseInt(E.style("width"))||960)-a.left-a.right,D=(l||parseInt(E.style("height"))||400)-a.top-a.bottom;_.update=function(){E.transition().call(_)},_.container=this,T.disabled=e.map(function(e){return!!e.disabled});if(!N){var P;N={};for(P in T)T[P]instanceof Array?N[P]=T[P].slice(0):N[P]=T[P]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var H=E.selectAll(".nv-noData").data([k]);return H.enter().append("text").attr("class","nvd3 n v-noData").attr("dy","-.7em").style("text-anchor","middle"),H.attr("x",a.left+x/2).attr("y",a.top+D/2).text(function(e){return e}),_}E.selectAll(".nv-noData").remove(),h=t.xScale(),p=t.yScale(),L=L||h,A=A||p;var B=E.selectAll("g.nv-wrap.nv-scatterChart").data([e]),j=B.enter().append("g").attr("class","nvd3 nv-wrap nv-scatterChart nv-chart-"+t.id()),F=j.append("g"),I=B.select("g");F.append("rect").attr("class","nvd3 nv-background"),F.append("g").attr("class","nv-x nv-axis"),F.append("g").attr("class","nv-y nv-axis"),F.append("g").attr("class","nv-scatterWrap"),F.append("g").attr("class","nv-regressionLinesWrap"),F.append("g").attr("class","nv-distWrap"),F.append("g").attr("class","nv-legendWrap"),F.append("g").attr("class","nv-controlsWrap"),B.attr("transform","translate("+a.left+","+a.top+")"),m&&(i.width(x/2),B.select(".nv-legendWrap").datum(e).call(i),a.top!=i.height()&&(a.top=i.height(),D=(l||parseInt(E.style("height"))||400)-a.top-a.bottom),B.select(".nv-legendWrap").att r("transform","translate("+x/2+","+ -a.top+")")),g&&(s.width(180).color(["#444"]),I.select(".nv-controlsWrap").datum(M).attr("transform","translate(0,"+ -a.top+")").call(s)),t.width(x).height(D).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),B.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled})).call(t),B.select(".nv-regressionLinesWrap").attr("clip-path","url(#nv-edge-clip-"+t.id()+")");var q=B.select(".nv-regressionLinesWrap").selectAll(".nv-regLines").data(function(e){return e}),R=q.enter().append("g").attr("class","nv-regLines").append("line").attr("class","nv-regLine").style("stroke-opacity",0);q.selectAll(".nv-regLines line").attr("x1",h.range()[0]).attr("x2",h.range()[1]).attr("y1",function(e,t){return p(h.domain()[0]*e.slope+e.intercept)}).attr("y2",function(e,t){return p(h.domain()[1]*e.slope+e.intercept)}).style("stroke",function(e,t,n){return c(e,n)}).style("stroke-opacity",function(e,t){return e.disabled||typeof e.slope=="undefined"||typeof e.intercept=="undefined"?0:1}),n.scale(h).ticks(n.ticks()?n.ticks():x/100).tickSize(-D,0),I.select(".nv-x.nv-axis").attr("transform","translate(0,"+p.range()[0]+")").call(n),r.scale(p).ticks(r.ticks()?r.ticks():D/36).tickSize(-x,0),I.select(".nv-y.nv-axis").call(r),d&&(o.getData(t.x()).scale(h).width(x).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),F.select(".nv-distWrap").append("g").attr("class","nv-distributionX"),I.select(".nv-distributionX").attr("transform","translate(0,"+p.range()[0]+")").datum(e.filter(function(e){return!e.disabled})).call(o)),v&&(u.getData(t.y()).scale(p).width(D).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),F.select(".nv-distWrap").append("g").attr("class","nv-distributionY"),I.select(".nv-distributionY").attr("transform","translate(-"+u.size()+",0)").datum(e.filter(function(e){return!e.disabled})).cal l(u)),d3.fisheye&&(I.select(".nv-background").attr("width",x).attr("height",D),I.select(".nv-background").on("mousemove",U),I.select(".nv-background").on("click",function(){b=!b}),t.dispatch.on("elementClick.freezeFisheye",function(){b=!b})),s.dispatch.on("legendClick",function(e,i){e.disabled=!e.disabled,y=e.disabled?0:2.5,I.select(".nv-background").style("pointer-events",e.disabled?"none":"all"),I.select(".nv-point-paths").style("pointer-events",e.disabled?"all":"none"),e.disabled?(h.distortion(y).focus(0),p.distortion(y).focus(0),I.select(".nv-scatterWrap").call(t),I.select(".nv-x.nv-axis").call(n),I.select(".nv-y.nv-axis").call(r)):b=!1,_.update()}),i.dispatch.on("legendClick",function(t,n,r){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,B.selectAll(".nv-series").classed("disabled",!1),e}),T.disabled=e.map(function(e){return!!e.disabled}),C.stateChange(T),_.update()}),i.dispatch.on("legendDblclick",function (t){e.forEach(function(e){e.disabled=!0}),t.disabled=!1,T.disabled=e.map(function(e){return!!e.disabled}),C.stateChange(T),_.update()}),t.dispatch.on("elementMouseover.tooltip",function(e){d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-distx-"+e.pointIndex).attr("y1",e.pos[1]-D),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-disty-"+e.pointIndex).attr("x2",e.pos[0]+o.size()),e.pos=[e.pos[0]+a.left,e.pos[1]+a.top],C.tooltipShow(e)}),C.on("tooltipShow",function(e){w&&O(e,S.parentNode)}),C.on("changeState",function(t){typeof t.disabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),T.disabled=t.disabled),_.update()}),L=h.copy(),A=p.copy()}),_}var t=e.models.scatter(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o=e.models.distribution(),u=e.models.distribution(),a={top:30,right:20,bottom:50,left:75},f=null,l=null,c=e.utils.defaultColor(),h=d3.fisheye?d3.fisheye.scale(d3.scale.linear).distortio n(0):t.xScale(),p=d3.fisheye?d3.fisheye.scale(d3.scale.linear).distortion(0):t.yScale(),d=!1,v=!1,m=!0,g=!!d3.fisheye,y=0,b=!1,w=!0,E=function(e,t,n){return"<strong>"+t+"</strong>"},S=function(e,t,n){return"<strong>"+n+"</strong>"},x=function(e,t,n,r){return"<h3>"+e+"</h3>"+"<p>"+r+"</p>"},T={},N=null,C=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),k="No Data Available.";t.xScale(h).yScale(p),n.orient("bottom").tickPadding(10),r.orient("left").tickPadding(10),o.axis("x"),u.axis("y");var L,A,O=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),f=i.pos[0]+(s.offsetLeft||0),l=p.range()[0]+a.top+(s.offsetTop||0),c=h.range()[0]+a.left+(s.offsetLeft||0),d=i.pos[1]+(s.offsetTop||0),v=n.tickFormat()(t.x()(i.point,i.pointIndex)),m=r.tickFormat()(t.y()(i.point,i.pointIndex));E!=null&&e.tooltip.show([f,l],E(i.series.key,v,m,i,_),"n",1,s,"x-nvtooltip"),S!=null&&e.tooltip.show([c,d],S(i.series.key,v,m,i,_),"e",1,s,"y-nvtooltip"),x!=null&&e.t ooltip.show([o,u],x(i.series.key,v,m,i.point.tooltip,i,_),i.value<0?"n":"s",null,s)},M=[{key:"Magnify",disabled:!0}];return t.dispatch.on("elementMouseout.tooltip",function(e){C.tooltipHide(e),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-distx-"+e.pointIndex).attr("y1",0),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-disty-"+e.pointIndex).attr("x2",u.size())}),C.on("tooltipHide",function(){w&&e.tooltip.cleanup()}),_.dispatch=C,_.scatter=t,_.legend=i,_.controls=s,_.xAxis=n,_.yAxis=r,_.distX=o,_.distY=u,d3.rebind(_,t,"id","interactive","pointActive","x","y","shape","size","xScale","yScale","zScale","xDomain","yDomain","sizeDomain","sizeRange","forceX","forceY","forceSize","clipVoronoi","clipRadius","useVoronoi"),_.margin=function(e){return arguments.length?(a.top=typeof e.top!="undefined"?e.top:a.top,a.right=typeof e.right!="undefined"?e.right:a.right,a.bottom=typeof e.bottom!="undefined"?e.bottom:a.bottom,a.left=typeof e.left!="undefined "?e.left:a.left,_):a},_.width=function(e){return arguments.length?(f=e,_):f},_.height=function(e){return arguments.length?(l=e,_):l},_.color=function(t){return arguments.length?(c=e.utils.getColor(t),i.color(c),o.color(c),u.color(c),_):c},_.showDistX=function(e){return arguments.length?(d=e,_):d},_.showDistY=function(e){return arguments.length?(v=e,_):v},_.showControls=function(e){return arguments.length?(g=e,_):g},_.showLegend=function(e){return arguments.length?(m=e,_):m},_.fisheye=function(e){return arguments.length?(y=e,_):y},_.tooltips=function(e){return arguments.length?(w=e,_):w},_.tooltipContent=function(e){return arguments.length?(x=e,_):x},_.tooltipXContent=function(e){return arguments.length?(E=e,_):E},_.tooltipYContent=function(e){return arguments.length?(S=e,_):S},_.state=function(e){return arguments.length?(T=e,_):T},_.defaultState=function(e){return arguments.length?(N=e,_):N},_.noData=function(e){return arguments.length?(k=e,_):k},_},e.models.sparkline=functi on(){function h(e){return e.each(function(e){var i=n-t.left-t.right,h=r-t.top-t.bottom,p=d3.select(this);s.domain(l||d3.extent(e,u)).range([0,i]),o.domain(c||d3.extent(e,a)).range([h,0]);var d=p.selectAll("g.nv-wrap.nv-sparkline").data([e]),v=d.enter().append("g").attr("class","nvd3 nv-wrap nv-sparkline"),m=v.append("g"),g=d.select("g");d.attr("transform","translate("+t.left+","+t.top+")");var b=d.selectAll("path").data(function(e){return[e]});b.enter().append("path"),b.exit().remove(),b.style("stroke",function(e,t){return e.color||f(e,t)}).attr("d",d3.svg.line().x(function(e,t){return s(u(e,t))}).y(function(e,t){return o(a(e,t))}));var w=d.selectAll("circle.nv-point").data(function(e){function n(t){if(t!=-1){var n=e[t];return n.pointIndex=t,n}return null}var t=e.map(function(e,t){return a(e,t)}),r=n(t.lastIndexOf(o.domain()[1])),i=n(t.indexOf(o.domain()[0])),s=n(t.length-1);return[i,r,s].filter(function(e){return e!=null})});w.enter().append("circle"),w.exit().remove(),w.at tr("cx",function(e,t){return s(u(e,e.pointIndex))}).attr("cy",function(e,t){return o(a(e,e.pointIndex))}).attr("r",2).attr("class",function(e,t){return u(e,e.pointIndex)==s.domain()[1]?"nv-point nv-currentValue":a(e,e.pointIndex)==o.domain()[0]?"nv-point nv-minValue":"nv-point nv-maxValue"})}),h}var t={top:2,right:0,bottom:2,left:0},n=400,r=32,i=!0,s=d3.scale.linear(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=e.utils.getColor(["#000"]),l,c;return h.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,h):t},h.width=function(e){return arguments.length?(n=e,h):n},h.height=function(e){return arguments.length?(r=e,h):r},h.x=function(e){return arguments.length?(u=d3.functor(e),h):u},h.y=function(e){return arguments.length?(a=d3.functor(e),h):a},h.xScale=function (e){return arguments.length?(s=e,h):s},h.yScale=function(e){return arguments.length?(o=e,h):o},h.xDomain=function(e){return arguments.length?(l=e,h):l},h.yDomain=function(e){return arguments.length?(c=e,h):c},h.animate=function(e){return arguments.length?(i=e,h):i},h.color=function(t){return arguments.length?(f=e.utils.getColor(t),h):f},h},e.models.sparklinePlus=function(){function v(e){return e.each(function(c){function O(){if(a)return;var e=C.selectAll(".nv-hoverValue").data(u),r=e.enter().append("g").attr("class","nv-hoverValue").style("stroke-opacity",0).style("fill-opacity",0);e.exit().transition().duration(250).style("stroke-opacity",0).style("fill-opacity",0).remove(),e.attr("transform",function(e){return"translate("+s(t.x()(c[e],e))+",0)"}).transition().duration(250).style("stroke-opacity",1).style("fill-opacity",1);if(!u.length)return;r.append("line").attr("x1",0).attr("y1",-n.top).attr("x2",0).attr("y2",b),r.append("text").attr("class","nv-xValue").attr("x",-6).att r("y",-n.top).attr("text-anchor","end").attr("dy",".9em"),C.select(".nv-hoverValue .nv-xValue").text(f(t.x()(c[u[0]],u[0]))),r.append("text").attr("class","nv-yValue").attr("x",6).attr("y",-n.top).attr("text-anchor","start").attr("dy",".9em"),C.select(".nv-hoverValue .nv-yValue").text(l(t.y()(c[u[0]],u[0])))}function M(){function r(e,n){var r=Math.abs(t.x()(e[0],0)-n),i=0;for(var s=0;s<e.length;s++)Math.abs(t.x()(e[s],s)-n)<r&&(r=Math.abs(t.x()(e[s],s)-n),i=s);return i}if(a)return;var e=d3.mouse(this)[0]-n.left;u=[r(c,Math.round(s.invert(e)))],O()}var m=d3.select(this),g=(r||parseInt(m.style("width"))||960)-n.left-n.right,b=(i||parseInt(m.style("height"))||400)-n.top-n.bottom;v.update=function(){v(e)},v.container=this;if(!c||!c.length){var w=m.selectAll(".nv-noData").data([d]);return w.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),w.attr("x",n.left+g/2).attr("y",n.top+b/2).text(function(e){return e}),v}m.selectAll(".nv -noData").remove();var E=t.y()(c[c.length-1],c.length-1);s=t.xScale(),o=t.yScale();var S=m.selectAll("g.nv-wrap.nv-sparklineplus").data([c]),T=S.enter().append("g").attr("class","nvd3 nv-wrap nv-sparklineplus"),N=T.append("g"),C=S.select("g");N.append("g").attr("class","nv-sparklineWrap"),N.append("g").attr("class","nv-valueWrap"),N.append("g").attr("class","nv-hoverArea"),S.attr("transform","translate("+n.left+","+n.top+")");var k=C.select(".nv-sparklineWrap");t.width(g).height(b),k.call(t);var L=C.select(".nv-valueWrap"),A=L.selectAll(".nv-currentValue").data([E]);A.enter().append("text").attr("class","nv-currentValue").attr("dx",p?-8:8).attr("dy",".9em").style("text-anchor",p?"end":"start"),A.attr("x",g+(p?n.right:0)).attr("y",h?function(e){return o(e)}:0).style("fill",t.color()(c[c.length-1],c.length-1)).text(l(E)),N.select(".nv-hoverArea").append("rect").on("mousemove",M).on("click",function(){a=!a}).on("mouseout",function(){u=[],O()}),C.select(".nv-hoverArea rect").att r("transform",function(e){return"translate("+ -n.left+","+ -n.top+")"}).attr("width",g+n.left+n.right).attr("height",b+n.top)}),v}var t=e.models.sparkline(),n={top:15,right:100,bottom:10,left:50},r=null,i=null,s,o,u=[],a=!1,f=d3.format(",r"),l=d3.format(",.2f"),c=!0,h=!0,p=!1,d="No Data Available.";return v.sparkline=t,d3.rebind(v,t,"x","y","xScale","yScale","color"),v.margin=function(e){return arguments.length?(n.top=typeof e.top!="undefined"?e.top:n.top,n.right=typeof e.right!="undefined"?e.right:n.right,n.bottom=typeof e.bottom!="undefined"?e.bottom:n.bottom,n.left=typeof e.left!="undefined"?e.left:n.left,v):n},v.width=function(e){return arguments.length?(r=e,v):r},v.height=function(e){return arguments.length?(i=e,v):i},v.xTickFormat=function(e){return arguments.length?(f=e,v):f},v.yTickFormat=function(e){return arguments.length?(l=e,v):l},v.showValue=function(e){return arguments.length?(c=e,v):c},v.alignValue=function(e){return arguments.length?(h=e,v):h},v.rightAlignVal ue=function(e){return arguments.length?(p=e,v):p},v.noData=function(e){return arguments.length?(d=e,v):d},v},e.models.stackedArea=function(){function g(e){return e.each(function(e){var a=n-t.left-t.right,g=r-t.top-t.bottom,b=d3.select(this);p=v.xScale(),d=v.yScale(),e=e.map(function(e,t){return e.values=e.values.map(function(t,n){return t.index=n,t.stackedY=e.disabled?0:u(t,n),t}),e}),e=d3.layout.stack().order(l).offset(f).values(function(e){return e.values}).x(o).y(function(e){return e.stackedY}).out(function(e,t,n){e.display={y:n,y0:t}})(e);var w=b.selectAll("g.nv-wrap.nv-stackedarea").data([e]),E=w.enter().append("g").attr("class","nvd3 nv-wrap nv-stackedarea"),S=E.append("defs"),T=E.append("g"),N=w.select("g");T.append("g").attr("class","nv-areaWrap"),T.append("g").attr("class","nv-scatterWrap"),w.attr("transform","translate("+t.left+","+t.top+")"),v.width(a).height(g).x(o).y(function(e){return e.display.y+e.display.y0}).forceY([0]).color(e.map(function(e,t){return e.col or||i(e,t)}).filter(function(t,n){return!e[n].disabled}));var C=N.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled}));C.call(v),S.append("clipPath").attr("id","nv-edge-clip-"+s).append("rect"),w.select("#nv-edge-clip-"+s+" rect").attr("width",a).attr("height",g),N.attr("clip-path",h?"url(#nv-edge-clip-"+s+")":"");var k=d3.svg.area().x(function(e,t){return p(o(e,t))}).y0(function(e){return d(e.display.y0)}).y1(function(e){return d(e.display.y+e.display.y0)}).interpolate(c),L=d3.svg.area().x(function(e,t){return p(o(e,t))}).y0(function(e){return d(e.display.y0)}).y1(function(e){return d(e.display.y0)}),A=N.select(".nv-areaWrap").selectAll("path.nv-area").data(function(e){return e});A.enter().append("path").attr("class",function(e,t){return"nv-area nv-area-"+t}).on("mouseover",function(e,t){d3.select(this).classed("hover",!0),m.areaMouseover({point:e,series:e.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:t})}).on("mouseout",function(e,t){d3.select(th is).classed("hover",!1),m.areaMouseout({point:e,series:e.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:t})}).on("click",function(e,t){d3.select(this).classed("hover",!1),m.areaClick({point:e,series:e.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:t})}),A.exit().attr("d",function(e,t){return L(e.values,t)}).remove(),A.style("fill",function(e,t){return e.color||i(e,t)}).style("stroke",function(e,t){return e.color||i(e,t)}),A.attr("d",function(e,t){return k(e.values,t)}),v.dispatch.on("elementMouseover.area",function(e){N.select(".nv-chart-"+s+" .nv-area-"+e.seriesIndex).classed("hover",!0)}),v.dispatch.on("elementMouseout.area",function(e){N.select(".nv-chart-"+s+" .nv-area-"+e.seriesIndex).classed("hover",!1)})}),g}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=e.utils.defaultColor(),s=Math.floor(Math.random()*1e5),o=function(e){return e.x},u=function(e){return e.y},a="stack",f="zero",l="default",c="linear",h=!1,p,d,v=e.models.scatter(),m=d3.dispatch("tooltipS how","tooltipHide","areaClick","areaMouseover","areaMouseout");return v.size(2.2).sizeDomain([2.2,2.2]),v.dispatch.on("elementClick.area" -,function(e){m.areaClick(e)}),v.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],m.tooltipShow(e)}),v.dispatch.on("elementMouseout.tooltip",function(e){m.tooltipHide(e)}),g.dispatch=m,g.scatter=v,d3.rebind(g,v,"interactive","size","xScale","yScale","zScale","xDomain","yDomain","sizeDomain","forceX","forceY","forceSize","clipVoronoi","clipRadius"),g.x=function(e){return arguments.length?(o=d3.functor(e),g):o},g.y=function(e){return arguments.length?(u=d3.functor(e),g):u},g.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,g):t},g.width=function(e){return arguments.length?(n=e,g):n},g.height=function(e){return arguments.length?(r=e,g):r},g.clipEdge=function(e){return arguments.length?(h=e,g):h},g.color=function(t){return arguments.length?(i=e.uti ls.getColor(t),g):i},g.offset=function(e){return arguments.length?(f=e,g):f},g.order=function(e){return arguments.length?(l=e,g):l},g.style=function(e){if(!arguments.length)return a;a=e;switch(a){case"stack":g.offset("zero"),g.order("default");break;case"stream":g.offset("wiggle"),g.order("inside-out");break;case"stream-center":g.offset("silhouette"),g.order("inside-out");break;case"expand":g.offset("expand"),g.order("default")}return g},g.interpolate=function(e){return arguments.length?(c=e,c):c},g},e.models.stackedAreaChart=function(){function x(e){return e.each(function(e){var f=d3.select(this),p=this,T=(u||parseInt(f.style("width"))||960)-o.left-o.right,N=(a||parseInt(f.style("height"))||400)-o.top-o.bottom;x.update=function(){f.transition().call(x)},x.container=this,g.disabled=e.map(function(e){return!!e.disabled});if(!y){var C;y={};for(C in g)g[C]instanceof Array?y[C]=g[C].slice(0):y[C]=g[C]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var k =f.selectAll(".nv-noData").data([b]);return k.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),k.attr("x",o.left+T/2).attr("y",o.top+N/2).text(function(e){return e}),x}f.selectAll(".nv-noData").remove(),d=t.xScale(),v=t.yScale();var L=f.selectAll("g.nv-wrap.nv-stackedAreaChart").data([e]),A=L.enter().append("g").attr("class","nvd3 nv-wrap nv-stackedAreaChart").append("g"),O=L.select("g");A.append("g").attr("class","nv-x nv-axis"),A.append("g").attr("class","nv-y nv-axis"),A.append("g").attr("class","nv-stackedWrap"),A.append("g").attr("class","nv-legendWrap"),A.append("g").attr("class","nv-controlsWrap"),c&&(i.width(T-E),O.select(".nv-legendWrap").datum(e).call(i),o.top!=i.height()&&(o.top=i.height(),N=(a||parseInt(f.style("height"))||400)-o.top-o.bottom),O.select(".nv-legendWrap").attr("transform","translate("+E+","+ -o.top+")"));if(l){var M=[{key:"Stacked",disabled:t.offset()!="zero"},{key:"Stream",disabled:t.offset()!= "wiggle"},{key:"Expanded",disabled:t.offset()!="expand"}];s.width(E).color(["#444","#444","#444"]),O.select(".nv-controlsWrap").datum(M).call(s),o.top!=Math.max(s.height(),i.height())&&(o.top=Math.max(s.height(),i.height()),N=(a||parseInt(f.style("height"))||400)-o.top-o.bottom),O.select(".nv-controlsWrap").attr("transform","translate(0,"+ -o.top+")")}L.attr("transform","translate("+o.left+","+o.top+")"),t.width(T).height(N);var _=O.select(".nv-stackedWrap").datum(e);_.call(t),n.scale(d).ticks(T/100).tickSize(-N,0),O.select(".nv-x.nv-axis").attr("transform","translate(0,"+N+")"),O.select(".nv-x.nv-axis").transition().duration(0).call(n),r.scale(v).ticks(t.offset()=="wiggle"?0:N/36).tickSize(-T,0).setTickFormat(t.offset()=="expand"?d3.format("%"):m),O.select(".nv-y.nv-axis").transition().duration(0).call(r),t.dispatch.on("areaClick.toggle",function(t){e.filter(function(e){return!e.disabled}).length===1?e=e.map(function(e){return e.disabled=!1,e}):e=e.map(function(e,n){return e.disabled=n!=t.seriesIndex,e}),g.disabled=e.map(function(e){return!!e.disabled}),w.stateChange(g),x.update()}),i.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,e.filter(function(e){return!e.disabled}).length||e.map(function(e){return e.disabled=!1,e}),g.disabled=e.map(function(e){return!!e.disabled}),w.stateChange(g),x.update()}),i.dispatch.on("legendDblclick",function(t){e.forEach(function(e){e.disabled=!0}),t.disabled=!1,g.disabled=e.map(function(e){return!!e.disabled}),w.stateChange(g),x.update()}),s.dispatch.on("legendClick",function(e,n){if(!e.disabled)return;M=M.map(function(e){return e.disabled=!0,e}),e.disabled=!1;switch(e.key){case"Stacked":t.style("stack");break;case"Stream":t.style("stream");break;case"Expanded":t.style("expand")}g.style=t.style(),w.stateChange(g),x.update()}),w.on("tooltipShow",function(e){h&&S(e,p.parentNode)}),w.on("changeState",function(n){typeof n.disabled!="undefined"&&(e.forEach(function(e,t){e.disabled=n.disabled[t]}),g.di sabled=n.disabled),typeof n.style!="undefined"&&t.style(n.style),x.update()})}),x}var t=e.models.stackedArea(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o={top:30,right:25,bottom:50,left:60},u=null,a=null,f=e.utils.defaultColor(),l=!0,c=!0,h=!0,p=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" on "+t+"</p>"},d,v,m=d3.format(",.2f"),g={style:t.style()},y=null,b="No Data Available.",w=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),E=250;n.orient("bottom").tickPadding(7),r.orient("left"),t.scatter.pointActive(function(e){return!!Math.round(t.y()(e)*100)});var S=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=p(i.series.key,a,f,i,x);e.tooltip.show([o,u],l,i.value<0?"n":"s",null,s)};return t.dispatch.on("tooltipShow",function(e){e.pos=[e.pos[0]+o.left,e.pos[1]+o.top],w.tooltipShow(e)}),t.dispatch.on(" tooltipHide",function(e){w.tooltipHide(e)}),w.on("tooltipHide",function(){h&&e.tooltip.cleanup()}),x.dispatch=w,x.stacked=t,x.legend=i,x.controls=s,x.xAxis=n,x.yAxis=r,d3.rebind(x,t,"x","y","size","xScale","yScale","xDomain","yDomain","sizeDomain","interactive","offset","order","style","clipEdge","forceX","forceY","forceSize","interpolate"),x.margin=function(e){return arguments.length?(o.top=typeof e.top!="undefined"?e.top:o.top,o.right=typeof e.right!="undefined"?e.right:o.right,o.bottom=typeof e.bottom!="undefined"?e.bottom:o.bottom,o.left=typeof e.left!="undefined"?e.left:o.left,x):o},x.width=function(e){return arguments.length?(u=e,x):getWidth},x.height=function(e){return arguments.length?(a=e,x):getHeight},x.color=function(n){return arguments.length?(f=e.utils.getColor(n),i.color(f),t.color(f),x):f},x.showControls=function(e){return arguments.length?(l=e,x):l},x.showLegend=function(e){return arguments.length?(c=e,x):c},x.tooltip=function(e){return arguments.length?(p=e, x):p},x.tooltips=function(e){return arguments.length?(h=e,x):h},x.tooltipContent=function(e){return arguments.length?(p=e,x):p},x.state=function(e){return arguments.length?(g=e,x):g},x.defaultState=function(e){return arguments.length?(y=e,x):y},x.noData=function(e){return arguments.length?(b=e,x):b},r.setTickFormat=r.tickFormat,r.tickFormat=function(e){return arguments.length?(m=e,r):m},x}})(); \ No newline at end of file commit 2232cce0891d9181de672532aae3f0456c0fc0a4 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 12:36:39 2013 -0700 On multi-resource chart add sort to legend to show alphabetically. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java index a62cb5c..b89cc71 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java @@ -40,7 +40,9 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } this.chartId = chartId; this.chartHeight = chartHeight; - this.data = $wnd.jQuery.parseJSON(metricsData); // make into json + if(typeof metricsData !== 'undefined' && metricsData.length > 0){ + this.data = $wnd.jQuery.parseJSON(metricsData); + } this.xAxisLabel = xAxisLabel; this.chartTitle = chartTitle; this.yAxisUnits = yAxisUnits; @@ -57,14 +59,13 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; - }; - - var global = this, + }, + global = this; // create a chartContext object (from rhq.js) with the data required to render to a chart // this same data could be passed to different chart types // This way, we are decoupled from the dependency on globals and JSNI and kept all the java interaction right here. - chartContext = new MultiLineChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), + chartContext = new MultiLineChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartHeight()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getJsonMetrics()(), global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTitle()(), @@ -102,14 +103,13 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie function determineScale() { - var xTicks, xTickSubDivide, minY, maxY; + var xTicks, xTickSubDivide; console.log("DetermineScale for # resources: "+ chartContext.data.length); if (chartContext.data.length > 0) { xTicks = 8; xTickSubDivide = 5; var myExtent = getExtentFromNestedValues(chartContext.data); - console.info("minY, maxY: "+myExtent[0] + ", "+myExtent[1] ); yScale = $wnd.d3.scale.linear() .clamp(true) @@ -210,13 +210,14 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie // add legend var legend = svg.append("g") .attr("class", "legend") - .attr("x", width + 30) + .attr("x", width + 100) .attr("y", 70) .attr("height", 240) .attr("width", 150); legend.selectAll('g').data(chartContext.data) .enter() + .append('g') .each(function (d, i) { var g = $wnd.d3.select(this); @@ -277,6 +278,8 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie return yScale(d.y); }); + chartContext.data.sort(function(a,b){return ((a.key < b.key) ? -1 : ((a.key > b.key) ? 1 : 0));}); + svg.selectAll(".multiLine") .data(chartContext.data) .enter() commit 90e16ae8d70c3c44d3e2b34cfd98c74bf832f692 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 12:36:25 2013 -0700 Keep Global exception from occuring in multi resource graph when metrics return empty data. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index 3ac3758..a5a0c9d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -363,17 +363,20 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl @Override public String getJsonMetrics() { - StringBuilder sb = new StringBuilder("["); - for (MultiLineGraphData multiLineGraphData : measurementForEachResource) { - sb.append("{ \"key\": \""); - sb.append(multiLineGraphData.getResourceName()); - sb.append("\",\"value\" : "); - sb.append(produceInnerValuesArray(multiLineGraphData.getMeasurementData())); - sb.append("},"); + StringBuilder sb = new StringBuilder(); + if (null != measurementForEachResource && !measurementForEachResource.isEmpty()) { + sb = new StringBuilder("["); + for (MultiLineGraphData multiLineGraphData : measurementForEachResource) { + sb.append("{ \"key\": \""); + sb.append(multiLineGraphData.getResourceName()); + sb.append("\",\"value\" : "); + sb.append(produceInnerValuesArray(multiLineGraphData.getMeasurementData())); + sb.append("},"); + } + sb.setLength(sb.length() - 1); // delete the last ',' + sb.append("]"); } - sb.setLength(sb.length() - 1); // delete the last ',' - sb.append("]"); - Log.debug("Multi-resource Graph json: "+ sb.toString()); + Log.debug("Multi-resource Graph json: " + sb.toString()); return sb.toString(); } commit 5942579d55637862952fbb09cc748717d1f73ae2 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 9 08:16:49 2013 -0700 Add legend to new multi-line graph. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java index 31f5b8b..a62cb5c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java @@ -205,6 +205,44 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } + function createLegend() { + + // add legend + var legend = svg.append("g") + .attr("class", "legend") + .attr("x", width + 30) + .attr("y", 70) + .attr("height", 240) + .attr("width", 150); + + legend.selectAll('g').data(chartContext.data) + .enter() + .append('g') + .each(function (d, i) { + var g = $wnd.d3.select(this); + g.append("rect") + .attr("x", width + 10) + .attr("y", (i * 15) - 8) + .attr("width", 10) + .attr("height", 10) + .style("fill", function(){return colorScale(i);}); + + g.append("text") + .attr("x", width + 30) + .attr("y", i * 15) + .attr("height", 10) + .attr("width", 135) + .style("font-size", "10px") + .style("font-family", "Arial, Helvetica, sans-serif") + .style("fill", "#50505A") + .text(function (d) { + return d.key; + }); + + + }); + } + function createHeader(titleName) { var title = chart.append("g").append("rect") @@ -266,6 +304,7 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie createYAxisGridLines(); createMultiLines(chartContext); createXandYAxes(); + createLegend(); console.log("finished drawing multi-line graph"); } }

1 0

[rhq] modules/enterprise
by John Sanda 09 Jul '13

09 Jul '13

modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java | 20 --- modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 7 + modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBean.java | 58 +++------- modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java | 43 +++++++ 4 files changed, 71 insertions(+), 57 deletions(-) New commits: commit 9f02dd2fa407518ba64ecad2409f368364d017f4 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 9 15:26:04 2013 -0400 fixing broken tests caused from change to persist seed nodes during install Previously seed storage nodes were persisted at start up. That has been changed so that seed nodes are now persisted by the installer. This caused the storage client subsystem to fail to properly initialize. Seed nodes are now persisted at deployment time (for tests) by StrippedDownStartupBeanPreparation. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java index 4e04447..78c0cff 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java @@ -148,26 +148,6 @@ public class StorageNodeManagerBeanTest extends AbstractEJB3Test { // this method is still needed, because tests calls SLSB methods that are executed in their own transaction // and the rollback performed once the TransactionCallback is finished just wont clean everything - // We can only filter on the group name because the resource type info might not exist in the test - // database. - ResourceGroupCriteria criteria = new ResourceGroupCriteria(); - criteria.addFilterName(STORAGE_NODE_GROUP_NAME); - - List<ResourceGroup> groups = resourceGroupManager.findResourceGroupsByCriteria(subjectManager.getOverlord(), - criteria); - - if (!groups.isEmpty()) { - resourceGroupManager.deleteResourceGroup(subjectManager.getOverlord(), groups.get(0).getId()); - } - -// for (ResourceGroup group : groups) { -// if (group.getName().equals(STORAGE_NODE_GROUP_NAME)) { -// resourceGroupManager.deleteResourceGroup(subjectManager.getOverlord(), group.getId()); -// break; -// } -// } - - // pause the currently running TX Transaction runningTransaction = getTransactionManager().suspend(); getTransactionManager().begin(); diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java index ea7ac6b..9ddba97 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java @@ -37,6 +37,7 @@ import java.util.List; import java.util.Properties; import java.util.regex.Pattern; +import javax.ejb.EJB; import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; @@ -87,6 +88,7 @@ import org.rhq.enterprise.server.plugin.pc.ServerPluginService; import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceMBean; import org.rhq.enterprise.server.scheduler.SchedulerService; import org.rhq.enterprise.server.scheduler.SchedulerServiceMBean; +import org.rhq.enterprise.server.storage.StorageClientManagerBean; import org.rhq.enterprise.server.util.LookupUtil; import org.rhq.test.AssertUtils; import org.rhq.test.MatchResult; @@ -114,6 +116,9 @@ public abstract class AbstractEJB3Test extends Arquillian { @ArquillianResource protected InitialContext initialContext; + @EJB + private StorageClientManagerBean storageClientManager; + // We originally (in 4.2.3 days) ran these tests as "unit" tests in the server/jar module using // the embedded container. With Arquillian it makes sense to actually deploy an EAR because // we need a way to deploy dependent ears needed to support the server/jar classes. But @@ -518,7 +523,7 @@ public abstract class AbstractEJB3Test extends Arquillian { } } } - + storageClientManager.init(); beforeMethod(); beforeMethod(method); diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBean.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBean.java index 2e654ab..58273d8 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBean.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBean.java @@ -20,21 +20,26 @@ package org.rhq.enterprise.server.test; -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; +import static org.rhq.enterprise.server.cloud.StorageNodeManagerLocal.STORAGE_NODE_GROUP_NAME; + +import java.util.List; import javax.ejb.EJB; import javax.ejb.Singleton; +import javax.ejb.TransactionAttribute; +import javax.ejb.TransactionAttributeType; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import org.rhq.core.domain.cloud.Server; import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.core.domain.criteria.ResourceGroupCriteria; +import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.enterprise.server.RHQConstants; -import org.rhq.enterprise.server.storage.StorageClientManagerBean; +import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.core.StartupBean; import org.rhq.enterprise.server.naming.NamingHack; +import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; /** * This is a replacement for the fullblown {@link StartupBean} of the actual RHQ server. @@ -45,9 +50,6 @@ public class StrippedDownStartupBean { public static final String RHQ_SERVER_NAME_PROPERTY = "rhq.server.high-availability.name"; - @EJB - StorageClientManagerBean storageClientManager; - @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) private EntityManager entityManager; @@ -55,46 +57,30 @@ public class StrippedDownStartupBean { NamingHack.bruteForceInitialContextFactoryBuilder(); } + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public void init() { secureNaming(); - // TODO Find a better way to load system properties - // Cassandra connection info is currently obtained from system properties. I have - // yet to find a good way to set system properties for the deployment under test. - // https://github.com/arquillian/arquillian-showcase/tree/master/extensions/sy… - // might be worth looking at. - // - // jsanda - loadCassandraConnectionProps(); - storageClientManager.init(); } /** - * Purges the test server and any storage nodes created during server initialization + * <p> + * Purges the storage node resource group, test server, and any storage nodes created during server initialization * from a prior test run. + * </p> + * <p> + * Note that the storage node group deletion simply removes the entity from the rhq_resource_group table. At this + * point in the deployment, {@link ResourceGroupManagerLocal#deleteResourceGroup(org.rhq.core.domain.auth.Subject, int)} + * cannot be used; therefore, any test that added storage node resources to the group should take care of removing + * them as well. + * </p> */ public void purgeTestServerAndStorageNodes() { + entityManager.createQuery("DELETE FROM " + ResourceGroup.class.getName() + " WHERE name = :storageNodeGroup") + .setParameter("storageNodeGroup", STORAGE_NODE_GROUP_NAME) + .executeUpdate(); entityManager.createQuery("DELETE FROM " + StorageNode.class.getName()).executeUpdate(); entityManager.createQuery("DELETE FROM " + Server.class.getName() + " WHERE name = :serverName") .setParameter("serverName", TestConstants.RHQ_TEST_SERVER_NAME) .executeUpdate(); } - - public void loadCassandraConnectionProps() { - InputStream stream = null; - try { - stream = getClass().getResourceAsStream("/cassandra-test.properties"); - Properties props = new Properties(); - props.load(stream); - - // DO NOT use System.setProperties(Properties). I previously tried that and it - // caused some arquillian deployment exception. - // - // jsanda - System.setProperty("rhq.cassandra.username", props.getProperty("rhq.cassandra.username")); - System.setProperty("rhq.cassandra.password", props.getProperty("rhq.cassandra.password")); - System.setProperty("rhq.cassandra.seeds", props.getProperty("rhq.cassandra.seeds")); - } catch (IOException e) { - throw new RuntimeException(("Failed to load cassandra-test.properties")); - } - } } diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java index c272afe..5f67888 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java @@ -20,6 +20,10 @@ package org.rhq.enterprise.server.test; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + import javax.annotation.PostConstruct; import javax.annotation.Resource; import javax.ejb.EJB; @@ -28,11 +32,15 @@ import javax.ejb.Startup; import javax.ejb.Timeout; import javax.ejb.TimerConfig; import javax.ejb.TimerService; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.cloud.Server; +import org.rhq.core.domain.cloud.StorageNode; +import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal; /** @@ -56,6 +64,9 @@ public class StrippedDownStartupBeanPreparation { @EJB private ServerManagerLocal serverManager; + @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) + private EntityManager entityManager; + @Resource private TimerService timerService; // needed to schedule our startup bean init call @@ -66,6 +77,8 @@ public class StrippedDownStartupBeanPreparation { startupBean.purgeTestServerAndStorageNodes(); createTestServer(); + loadCassandraConnectionProps(); + createStorageNodes(); } /** @@ -86,11 +99,41 @@ public class StrippedDownStartupBeanPreparation { System.setProperty(TestConstants.RHQ_SERVER_NAME_PROPERTY, TestConstants.RHQ_TEST_SERVER_NAME); } + private void createStorageNodes() { + String[] seedsInfo = System.getProperty("rhq.cassandra.seeds").split(","); + for (String seedInfo : seedsInfo) { + StorageNode storageNode = new StorageNode(); + storageNode.parseNodeInformation(seedInfo); + storageNode.setOperationMode(StorageNode.OperationMode.INSTALLED); + entityManager.persist(storageNode); + } + } + + public void loadCassandraConnectionProps() { + InputStream stream = null; + try { + stream = getClass().getResourceAsStream("/cassandra-test.properties"); + Properties props = new Properties(); + props.load(stream); + + // DO NOT use System.setProperties(Properties). I previously tried that and it + // caused some arquillian deployment exception. + // + // jsanda + System.setProperty("rhq.cassandra.username", props.getProperty("rhq.cassandra.username")); + System.setProperty("rhq.cassandra.password", props.getProperty("rhq.cassandra.password")); + System.setProperty("rhq.cassandra.seeds", props.getProperty("rhq.cassandra.seeds")); + } catch (IOException e) { + throw new RuntimeException(("Failed to load cassandra-test.properties")); + } + } + @Timeout public void initializeServer() throws RuntimeException { try { log.info("Initializing the testing RHQ deployment"); this.startupBean.init(); + log.info("Initialization complete"); } catch (Throwable t) { // do NOT allow exceptions to bubble out of our method because then // the EJB container would simply re-trigger the timer and call us again

1 0

[rhq] 2 commits - modules/core
by Jiri Kremser 09 Jul '13

09 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java | 5 modules/core/domain/src/test/java/org/rhq/core/domain/cloud/StorageNodeTest.java | 111 ++++++++++ 2 files changed, 111 insertions(+), 5 deletions(-) New commits: commit 4dc0ec58446ea00d82a13e3fd797f4ff05580cb6 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Tue Jul 9 19:03:57 2013 +0200 Unit test for StorageNode entity. diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/cloud/StorageNodeTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/cloud/StorageNodeTest.java new file mode 100644 index 0000000..ce4dbbd --- /dev/null +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/cloud/StorageNodeTest.java @@ -0,0 +1,111 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.domain.cloud; + +import org.testng.Assert; +import org.testng.annotations.Test; + +import org.rhq.core.domain.cloud.StorageNode.OperationMode; + +@Test +public class StorageNodeTest { + public void testEquals() { + StorageNode localhost1 = new StorageNode(); + assert localhost1 != null; + assert !localhost1.equals(null); + + StorageNode localhost2 = new StorageNode(); + assert localhost2 != null; + assert localhost1.equals(localhost2); + assert localhost2.equals(localhost1); + + localhost1.setAddress("127.0.0.1"); + assert !localhost1.equals(localhost2); + assert !localhost2.equals(localhost1); + + localhost2.setAddress("127.0.0.1"); + assert localhost1.equals(localhost2); + assert localhost2.equals(localhost1); + + StorageNode localhost3 = new StorageNode(42); + localhost3.setAddress("sn.com"); + assert !localhost3.equals(null); + assert !localhost3.equals(localhost1); + assert localhost3.hashCode() != localhost1.hashCode(); + assert localhost2.hashCode() == localhost1.hashCode(); + + localhost3.setAddress("127.0.0.1"); + assert localhost3.equals(localhost1); + assert localhost3.hashCode() == localhost1.hashCode(); + } + + public void testParseNodeInformation1() { + StorageNode localhost1 = new StorageNode(); + localhost1.parseNodeInformation("127.0.0.1|1234|4321"); + assert "127.0.0.1".equals(localhost1.getAddress()); + assert localhost1.getJmxPort() == 1234; + assert localhost1.getCqlPort() == 4321; + assert "service:jmx:rmi:///jndi/rmi://127.0.0.1:1234/jmxrmi".equals(localhost1.getJMXConnectionURL()); + + localhost1.setOperationMode(OperationMode.INSTALLED); + assert localhost1.getOperationMode() == OperationMode.INSTALLED; + assert localhost1.getOperationMode().getMessage() != null; + assert localhost1.getOperationMode().getMessage() != null; + localhost1.setMtime(42); + assert localhost1.getMtime() == 42; + + StorageNode localhost2 = new StorageNode(); + localhost2.parseNodeInformation("127.0.0.1|1235|5321"); + assert localhost1.equals(localhost2); + assert !localhost1.getJMXConnectionURL().equals(localhost2.getJMXConnectionURL()); + } + + public void testParseNodeInformation2() { + StorageNode localhost1 = new StorageNode(); + try { + localhost1.parseNodeInformation("127.0.0.1|1234|4321|foo"); + Assert.fail("The exception (IllegalArgumentException) should be thrown!"); + } catch (IllegalArgumentException e) { + } + try { + localhost1.parseNodeInformation("127.0.0.1|1234"); + Assert.fail("The exception (IllegalArgumentException) should be thrown!"); + } catch (IllegalArgumentException e) { + } + try { + localhost1.parseNodeInformation("127.0.0.1|aaaa|4321"); + Assert.fail("The exception (NumberFormatException) should be thrown!"); + } catch (NumberFormatException e) { + } + try { + localhost1.parseNodeInformation("127.0.0.1|1234|bbbb"); + Assert.fail("The exception (NumberFormatException) should be thrown!"); + } catch (NumberFormatException e) { + } + try { + localhost1.parseNodeInformation(null); + Assert.fail("The exception (NullPointerException) should be thrown!"); + } catch (NullPointerException e) { + } + } +} commit a10a8a6c63cf8f980cf0e657d5349ed42547c2c2 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Tue Jul 9 18:55:45 2013 +0200 StorageNode: hashCode() should be consistent with equals(). diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java index 1d39bcd..14043db 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java @@ -238,7 +238,6 @@ public class StorageNode implements Serializable { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + (int) (ctime ^ (ctime >>> 32)); result = prime * result + ((address == null) ? 0 : address.hashCode()); return result; } @@ -255,10 +254,6 @@ public class StorageNode implements Serializable { final StorageNode other = (StorageNode) obj; - //if (ctime != other.ctime) { - // return false; - //} - if (address == null) { if (other.address != null) { return false;

1 0

[rhq] modules/core
by Jiri Kremser 09 Jul '13

09 Jul '13

modules/core/domain/intentional-api-changes-since-4.8.0.xml | 3 + modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java | 18 ++++++++++ 2 files changed, 21 insertions(+) New commits: commit 19facfd1591445b491f155303e083d731dd06f61 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Tue Jul 9 18:25:09 2013 +0200 Fixing the api-checks jenkins build. Adding the setDiskSpacePercentageUsed() and getDiskSpacePercentageUsed() methods back to StorageNodeLoadComposite, and marking them as deprecated. diff --git a/modules/core/domain/intentional-api-changes-since-4.8.0.xml b/modules/core/domain/intentional-api-changes-since-4.8.0.xml new file mode 100644 index 0000000..f21a45f --- /dev/null +++ b/modules/core/domain/intentional-api-changes-since-4.8.0.xml @@ -0,0 +1,3 @@ +<?xml version="1.0"?> +<differences> +</differences> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java index 0913f1d..80bfdd6 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java @@ -113,6 +113,24 @@ public class StorageNodeLoadComposite implements Serializable { public void setHeapPercentageUsed(MeasurementAggregateWithUnits heapPercentageUsed) { this.heapPercentageUsed = heapPercentageUsed; } + + /** + * @deprecated use {@link #getPartitionDiskUsedPercentage() getPartitionDiskUsedPercentage()} instead + * + * @return partitionDiskUsedPercentage + */ + public MeasurementAggregateWithUnits getDiskSpacePercentageUsed() { + return getPartitionDiskUsedPercentage(); + } + + /** + * @deprecated use {@link #setPartitionDiskUsedPercentage() setPartitionDiskUsedPercentage()} instead + * + * @param partitionDiskUsedPercentage + */ + public void setDiskSpacePercentageUsed(MeasurementAggregateWithUnits partitionDiskUsedPercentage) { + setPartitionDiskUsedPercentage(partitionDiskUsedPercentage); + } /** * @return A computed metric for the percentage of disk space used on the partition that contains the SSTables.

1 0

[rhq] 2 commits - modules/enterprise modules/integration-tests
by Heiko W. Rupp 09 Jul '13

09 Jul '13

modules/enterprise/server/appserver/src/main/resources/etc/RHQ-mib.txt | 94 ++++++---- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java | 13 - modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java | 12 + modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java | 10 - modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java | 42 +++- modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml | 42 +++- modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java | 24 ++ modules/integration-tests/rest-api/pom.xml | 2 8 files changed, 173 insertions(+), 66 deletions(-) New commits: commit 4381d307b87bb8ca5e7cba265633aa585adcf27f Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Jul 9 17:13:00 2013 +0200 BZ 966294 Fix mib file and related code. Also fix some other smaller issues. diff --git a/modules/enterprise/server/appserver/src/main/resources/etc/RHQ-mib.txt b/modules/enterprise/server/appserver/src/main/resources/etc/RHQ-mib.txt index ced6071..5586ac0 100644 --- a/modules/enterprise/server/appserver/src/main/resources/etc/RHQ-mib.txt +++ b/modules/enterprise/server/appserver/src/main/resources/etc/RHQ-mib.txt @@ -3,39 +3,51 @@ RHQ-MIB DEFINITIONS ::= BEGIN IMPORTS MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE, snmpModules, enterprises FROM SNMPv2-SMI - coldStart - FROM SNMPv2-MIB OBJECT-GROUP, NOTIFICATION-GROUP, MODULE-COMPLIANCE FROM SNMPv2-CONF DisplayString FROM SNMPv2-TC; rhqMIB MODULE-IDENTITY - LAST-UPDATED "201112200000Z" + LAST-UPDATED "201307020000Z" ORGANIZATION "RHQ-Project" CONTACT-INFO "http://www.jboss.org/rhq" DESCRIPTION "The MIB module for RHQ alerts. This file is part of the RHQ management platform - Copyright (C) 2005-2012 Red Hat, Inc. + Copyright (C) 2005-2013 Red Hat, Inc. All rights reserved. " - REVISION "200807110000Z" - DESCRIPTION "Initial version" - REVISION "201010180000Z" - DESCRIPTION "Better trap support" + REVISION "201307020000Z" + DESCRIPTION "Bug fixes" REVISION "201112200000Z" DESCRIPTION "Also emit resource lineage" + REVISION "201010180000Z" + DESCRIPTION "Better trap support" + REVISION "200807110000Z" + DESCRIPTION "Initial version" ::= { snmpModules 1 } +-- 1.3.6.1.4.1.18016 jboss OBJECT IDENTIFIER ::= {enterprises 18016 } +-- 1.3.6.1.4.1.18016.2 rhq OBJECT IDENTIFIER ::= {jboss 2 } +-- 1.3.6.1.4.1.18016.2.1 alert OBJECT IDENTIFIER ::= {rhq 1 } +-- 1.3.6.1.4.1.18016.2.1.2 +alertNotifications OBJECT IDENTIFIER ::= {rhq 2} + +-- 1.3.6.1.4.1.18016.2.3 +rhqServer OBJECT IDENTIFIER ::= {rhq 3} + + +-- 1.3.6.1.4.1.18016.2.1.2.0 +alertNotifPrefix OBJECT IDENTIFIER ::= {alertNotifications 0 } alertName OBJECT-TYPE SYNTAX DisplayString (SIZE (0..255)) @@ -93,28 +105,10 @@ alertHierarchy OBJECT-TYPE STATUS current DESCRIPTION "The hierarchy of the resource that triggered the alert" - ::= { alert 6 } - --- conformance information - -snmpMIBConformance - OBJECT IDENTIFIER ::= { rhqMIB 2 } - -snmpMIBCompliances - OBJECT IDENTIFIER ::= { snmpMIBConformance 1 } -snmpMIBGroups OBJECT IDENTIFIER ::= { snmpMIBConformance 2 } - --- compliance statements - -snmpBasicCompliance MODULE-COMPLIANCE - STATUS current - DESCRIPTION "TODO" - MODULE - MANDATORY-GROUPS { alertGroup, trapGroup } - - ::= { snmpMIBCompliances 2 } + ::= { alert 7 } -alertGroup OBJECT-GROUP +-- 1.3.6.1.4.1.18016.2.1.2.0.1 +alertNotification NOTIFICATION-TYPE OBJECTS { alertName, alertResourceName, alertPlatformName, @@ -124,12 +118,46 @@ alertGroup OBJECT-GROUP alertHierarchy } STATUS current DESCRIPTION "A collection of objects providing information about an alert" - ::= { snmpMIBGroups 1 } + ::= { alertNotifPrefix 1 } + + +-- conformance information + +rhqMIBConformance OBJECT IDENTIFIER ::= { rhqMIB 2 } +rhqTraps OBJECT IDENTIFIER ::= { rhqMIB 3 } +rhqTrapPrefix OBJECT IDENTIFIER ::= { rhqTraps 0 } -trapGroup NOTIFICATION-GROUP - NOTIFICATIONS { coldStart } +rhqMIBCompliances OBJECT IDENTIFIER ::= { rhqMIBConformance 1 } +rhqMIBGroups OBJECT IDENTIFIER ::= { rhqMIBConformance 2 } + +-- compliance statements + +rhqMibBasicCompliance MODULE-COMPLIANCE + STATUS current + DESCRIPTION "Module compliance definition for the RHQ-MIB extension module" + MODULE + MANDATORY-GROUPS { rhqAlertGroup, rhqNotificationGroup } + + ::= { rhqMIBCompliances 2 } + +rhqAlertGroup OBJECT-GROUP + OBJECTS { alertName, + alertResourceName, + alertPlatformName, + alertCondition, + alertSeverity, + alertUrl, + alertHierarchy + } + STATUS current + DESCRIPTION "A collection of entries for a notifications for alerts" + ::= { rhqMIBGroups 2 } + +rhqNotificationGroup NOTIFICATION-GROUP + NOTIFICATIONS { alertNotification } STATUS current DESCRIPTION "A collection of notifications for alerts" - ::= { snmpMIBGroups 2 } + ::= { rhqMIBGroups 3 } + END diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java index 88c140f..bda7f99 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.server.plugin.pc.alert; @@ -30,7 +30,6 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.enterprise.server.plugin.pc.ControlResults; import org.rhq.enterprise.server.plugin.pc.ServerPluginComponent; import org.rhq.enterprise.server.plugin.pc.ServerPluginEnvironment; @@ -103,7 +102,7 @@ public abstract class AlertSender<T extends ServerPluginComponent> { /** * Validates the alert and extra parameters. The results should be initialized with the current - * parameters of this alert sender and the erroneous properties should have their + * parameters of this alert sender and the erroneous properties should have their * {@link Property#getErrorMessage() error messages} set. * <p> * The implementation is free to change (add/update/delete) properties in either of the configurations @@ -111,14 +110,14 @@ public abstract class AlertSender<T extends ServerPluginComponent> { * further processed in an alert sender specific way before they get stored into the database. * <p> * The default implementation makes no changes to the configurations. - * + * * @param subject the subject requesting the changes in the configuration * @return the validation results */ public AlertSenderValidationResults validateAndFinalizeConfiguration(Subject subject) { return new AlertSenderValidationResults(alertParameters, extraParameters); } - + private String printProperty(Property property) { if (property instanceof PropertySimple) { return ((PropertySimple) property).getStringValue(); diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java index c92daae..7b174cc 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java +++ b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java @@ -79,6 +79,18 @@ public class SnmpInfo { return new SnmpInfo(host, port, oid, trapOid); } + protected static SnmpInfo load(Configuration configuration, Configuration preferences) { + String host = configuration.getSimpleValue(PARAM_HOST, null); // optional + if (host==null || host.isEmpty()) { + host = preferences.getSimpleValue("defaultTargetHost",null); + } + String port = configuration.getSimpleValue(PARAM_PORT, DEFAULT_PORT); + String oid = configuration.getSimpleValue(PARAM_VARIABLE_BINDING_PREFIX, null); // required + String trapOid = configuration.getSimpleValue(PARAM_TRAP_OID, null); + return new SnmpInfo(host, port, oid, trapOid); + + } + @Override public String toString() { String hostString = (host == null ? "UnknownHost" : host); diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java index 5c6d1e7..521589d 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java +++ b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java @@ -45,7 +45,7 @@ public class SnmpSender extends AlertSender { private AlertManagerLocal alertManager; /** - * Default constructor needed for instanciation by server plugin container + * Default constructor needed for instantiation by server plugin container */ public SnmpSender() { this(LookupUtil.getResourceManager(), LookupUtil.getAlertManager()); @@ -59,7 +59,7 @@ public class SnmpSender extends AlertSender { @Override public SenderResult send(Alert alert) { - SnmpInfo info = SnmpInfo.load(alertParameters); + SnmpInfo info = SnmpInfo.load(alertParameters, preferences); if (info.error != null) { return SenderResult.getSimpleFailure(info.error); } @@ -75,8 +75,8 @@ public class SnmpSender extends AlertSender { String platformName = lineage.get(0).getName(); String conditions = alertManager.prettyPrintAlertConditions(alert, false); String alertUrl = alertManager.prettyPrintAlertURL(alert); - - + + String hierarchy = getResourceHierarchyAsString(lineage); Date bootTime = new Date(); // TODO: want to use LookupUtil.getCoreServer().getBootTime() but ServiceMBean is not visible @@ -102,7 +102,7 @@ public class SnmpSender extends AlertSender { @Override public String previewConfiguration() { - SnmpInfo info = SnmpInfo.load(alertParameters); + SnmpInfo info = SnmpInfo.load(alertParameters, preferences); return info.toString(); } } diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java index 2556b38..ea3d985 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java +++ b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java @@ -76,7 +76,9 @@ import org.rhq.core.util.StringUtil; /** * @author Ian Springer + * @author Heiko W. Rupp */ +@SuppressWarnings("unused") public class SnmpTrapSender implements PDUFactory { public static final int DEFAULT = 0; private static final String UDP_TRANSPORT = "udp"; @@ -104,7 +106,10 @@ public class SnmpTrapSender implements PDUFactory { private TimeTicks sysUpTime = new TimeTicks(0); - private OID trapOID = SnmpConstants.coldStart; + public static final OID enterpriseSpecificTrap = + new OID(new int[] { 1,3,6,1,6,3,1,1,5,6 }); + + private OID trapOID = enterpriseSpecificTrap; private PDUv1 v1TrapPDU = new PDUv1(); @@ -338,14 +343,33 @@ public class SnmpTrapSender implements PDUFactory { return octetString; } - private static Address createAddress(Configuration properties) { - // TODO: Make transport configurable (ips, 09/12/07). + private Address createAddress(Configuration properties) { String host = properties.getSimpleValue("host",null); - String portS = properties.getSimpleValue("port","162"); + String portS = properties.getSimpleValue("port",null); + + + if (host==null) { + String tmp = systemConfig.getSimpleValue("defaultTargetHost",null); + if ((tmp != null) && (tmp.length() > 0)) { + host=tmp; + } + } + + if (portS==null) { + String tmp = systemConfig.getSimpleValue("defaultPort","162"); + if ((tmp != null) && (tmp.length() > 0)) { + portS = tmp; + } + } Integer port = Integer.valueOf(portS); + if (port==0) { + port = 162; // just to make sure + } + + String transport = systemConfig.getSimpleValue("transport","UDP"); + - final String transport = UDP_TRANSPORT; String address = host + "/" + port; if (transport.equalsIgnoreCase(UDP_TRANSPORT)) { return new UdpAddress(address); @@ -357,7 +381,7 @@ public class SnmpTrapSender implements PDUFactory { } protected String getVariableBindings(PDU response) { - StringBuffer strBuf = new StringBuffer(); + StringBuilder strBuf = new StringBuilder(); for (int i = 0; i < response.size(); i++) { VariableBinding vb = response.get(i); strBuf.append(vb.toString()); @@ -473,7 +497,7 @@ public class SnmpTrapSender implements PDUFactory { String variableBindingPrefix = alertParameters.getSimpleValue(SnmpInfo.PARAM_VARIABLE_BINDING_PREFIX, null); - // TODO add a request id and a timestamp + // request id and a timestamp are added below in setSysUpTime.. this.address = createAddress(alertParameters); // bind the alert definitions name on the oid set in the alert @@ -532,7 +556,7 @@ public class SnmpTrapSender implements PDUFactory { delta = now - bootTime.getTime(); } else delta = 0; - setSysUpTime(new TimeTicks(delta / 1000)); // TT is 100th of a second TODO : fix this !!! + setSysUpTime(new TimeTicks(delta / 100)); // TT is 100th of a second } @@ -571,6 +595,8 @@ public class SnmpTrapSender implements PDUFactory { this.authProtocol = AuthMD5.ID; } else if (tmp.equals("SHA")) { this.authProtocol = AuthSHA.ID; + } else if (tmp.equals("none")) { + this.authProtocol=null; } else { throw new IllegalStateException("SNMP authentication protocol unsupported: " + tmp); } diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml b/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml index 83a55e9..3f7a35c 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml +++ b/modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml @@ -25,15 +25,29 @@ </c:property-options> </c:simple-property> - <c:simple-property name="trapOid" displayName="Trap OID" description="OID for the trap sent" type="string" /> + <c:simple-property name="defaultTargetHost" displayName="Default trap target host" required="false"/> + <c:simple-property name="defaultPort" displayName="Default trap target port" required="false" type="integer" + default="162" defaultValue="162"/> + <c:simple-property name="transport" defaultValue="UDP"> + <c:property-options allowCustomValue="false"> + <c:option value="UDP" name="UDP"/> + <c:option value="TCP" name="TCP"/> + </c:property-options> + </c:simple-property> + + <c:simple-property name="trapOid" displayName="Trap OID" description="OID for the trap sent" type="string" + default="1.3.6.1.4.1.18016.2.1.2.0.1"/> <c:simple-property name="community" type="string" default="public" description="Community - v1 and v2c only" required="false"/> <c:group name="1" displayName="SNMP version 1 properties" hiddenByDefault="true" > - <c:simple-property name="engineId" required="false"/> - <c:simple-property name="genericId" required="false"/> - <c:simple-property name="enterpriseOid" required="false"/> - <c:simple-property name="specificId" required="false"/> - <c:simple-property name="agentAddress" description="Address of our SNMP agent" required="false"/> + + <c:simple-property name="genericId" required="false" default="6" type="integer" + description="Set the generic trap type. Default is 6 (=Enterprise specific)."/> + <c:simple-property name="enterpriseOid" required="false" default="1.3.6.1.4.1.18016.2.3" + description="OID of the sender, identifies the type of managed object generating the trap. Default is enterprise.jboss.rhq.rhqServer"/> + <c:simple-property name="specificId" required="false" default="0" type="integer" + description="Enterprise-specific ID of the trap. If this is set, the generic ID must be set to 6."/> + <c:simple-property name="agentAddress" description="Address of our SNMP agent (=the RHQ server)" required="false"/> </c:group>  <c:group name="3" displayName="SNMP version 3 properties" hiddenByDefault="true"> - <c:simple-property name="authProtocol" type="string" default="MD5"> + <c:simple-property name="authProtocol" type="string" default="MD5" + description="Authorization protocol to use. If no Auth Passphrase is given, this must be set to 'none'."> <c:property-options> <c:option value="none"/> <c:option value="MD5"/> <c:option value="SHA"/> </c:property-options> </c:simple-property> - <c:simple-property name="privacyProtocol" default="AES"> + <c:simple-property name="privacyProtocol" default="AES" description="The privacy protocol to use in conjunction when the auth protocol is set"> <c:property-options> <c:option value="DES"/> <c:option value="AES"/> @@ -56,8 +71,9 @@ <c:option value="AES256"/> </c:property-options> </c:simple-property> + <c:simple-property name="engineId" required="false"/>  <c:simple-property name="targetContext" displayName="Target Context Name" type="string" required="false"/> - <c:simple-property name="authPassphrase" description="Auto Passphrase is required with autorization enabled" type="password" required="false"/> + <c:simple-property name="authPassphrase" description="Auto Passphrase is required with authorization enabled. If this is not set, authProtocol must be not set as well. Length must be > 8." type="password" required="false"/> <c:simple-property name="privacyPassphrase" description="Privacy Passphrase is required with privacy enabled" type="password" required="false"/> <c:simple-property name="securityName" type="string" required="false"/> @@ -71,13 +87,15 @@ <a:plugin-class>SnmpSender</a:plugin-class> <a:alert-configuration> - <c:simple-property name="host" type="string" required="true" description="Trap target host"/> + <c:simple-property name="host" type="string" required="false" description="Trap target host. Required if not yet set in the + sender-wide preferences"/> <c:simple-property name="port" type="integer" required="false" default="162" description="Trap target port"/> - <c:simple-property name="oid" displayName="Variable bindings prefix" type="string" required="true"> + <c:simple-property name="oid" displayName="Variable bindings prefix" type="string" required="true" + defaultValue="1.3.6.1.4.1.18016.2.1"> <c:description> <![CDATA[ <p>RHQ will send alert notification details as a list of variable bindings in the - SNMP trap PDU.</p> + SNMP trap PDU. This OID is the common prefix of those bindings.</p> <p><strong>Do not confuse this paramater with 'Trap Oid'.</strong></p> ]]> </c:description> diff --git a/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java b/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java index c46c8b6..97b9a05 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java +++ b/modules/enterprise/server/plugins/alert-snmp/src/test/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfoTest.java @@ -29,6 +29,7 @@ import static org.testng.Assert.*; import org.testng.annotations.Test; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; /** * @author Thomas Segismont @@ -69,6 +70,29 @@ public class SnmpInfoTest { } @Test + public void fallBackToGlobalValues() throws Exception { + Configuration configuration = new Configuration(); + configuration.setSimpleValue(PARAM_VARIABLE_BINDING_PREFIX, "molo"); + + Configuration preferences = new Configuration(); + preferences.put(new PropertySimple("defaultTargetHost","hugo")); + SnmpInfo snmpInfo = SnmpInfo.load(configuration,preferences); + assertNull(snmpInfo.error, "SnmpInfo#load should not have detected an error"); + assertEquals(snmpInfo.host, "hugo"); + assertEquals(snmpInfo.oid, "molo"); + assertEquals(snmpInfo.port, SnmpInfo.DEFAULT_PORT); + + + configuration.setSimpleValue(PARAM_HOST, "pipo"); + + snmpInfo = SnmpInfo.load(configuration,preferences); + assertNull(snmpInfo.error, "SnmpInfo#load should not have detected an error"); + assertEquals(snmpInfo.host, "pipo"); + assertEquals(snmpInfo.oid, "molo"); + assertEquals(snmpInfo.port, SnmpInfo.DEFAULT_PORT); + } + + @Test public void shouldExposeAllParams() throws Exception { Configuration configuration = new Configuration(); configuration.setSimpleValue(PARAM_HOST, "pipo"); commit 44e927da01ac1d6fb0252c71615c675815787408 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 8 10:01:47 2013 +0200 Bump rest-assured version. diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index 7b42b45..47bfe18 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -19,7 +19,7 @@ <properties> <surefire-plugin.version>2.10</surefire-plugin.version> <jackson.version>1.9.5</jackson.version> - <rest-assured.version>1.7.2</rest-assured.version> + <rest-assured.version>1.8.1</rest-assured.version> </properties> <build>

1 0

[rhq] Branch 'mtho11/d3-multiline-graph' - modules/enterprise
by mike thompson 09 Jul '13

09 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java | 8 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java | 6 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java | 48 ++++++---- 4 files changed, 38 insertions(+), 26 deletions(-) New commits: commit 5b4eafbed316217c2355e4d2a564917df12aef13 Author: Mike Thompson <mithomps(a)redhat.com> Date: Mon Jul 8 13:48:42 2013 -0700 Fix new d3 multi-line graph scaling issues. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java index 31b1667..b22907e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java @@ -634,7 +634,7 @@ public abstract class AbstractActivityView extends EnhancedVLayout implements Re setIsModal(true); setShowModalMask(true); setWidth(950); - setHeight(390); + setHeight(420); setShowResizer(true); setCanDragResize(true); centerInPage(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java index b8c63f4..9058ea5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java @@ -251,7 +251,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { .attr("y", yBase) .text(highLabel + " - "); - if(highValue !== undefined){ + if(typeof highValue !== 'undefined'){ chart.append("text") .attr("class", "highText") .attr("x", xValue) @@ -267,7 +267,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { .attr("y", yBase + yInc) .text(avgLabel + " - "); - if(avgValue !== undefined){ + if(typeof avgValue !== 'undefined'){ chart.append("text") .attr("class", "avgText") .attr("x", xValue) @@ -282,7 +282,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { .attr("y", yBase + 2 * yInc) .text(minLabel + " - "); - if(minValue !== undefined){ + if(typeof minValue !== 'undefined'){ chart.append("text") .attr("class", "minText") .attr("x", xValue) @@ -606,7 +606,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { function formatHovers(chartContext, d) { var hoverString, - xValue = (d.x == undefined) ? 0 : +d.x, + xValue = (typeof d.x === 'undefined') ? 0 : +d.x, date = new Date(+xValue), barDuration = d.barDuration, timeFormatter = $wnd.d3.time.format(chartContext.chartHoverTimeFormat), diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index 7ade3f7..3ac3758 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -249,9 +249,8 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl @Override public void redrawGraphs() { - drawGraph(); populateData(); - markForRedraw(); + drawGraph(); } private void drawGraph() { @@ -281,7 +280,6 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl @Override public void run() { - //markForRedraw(); drawJsniChart(); } }.schedule(200); @@ -375,7 +373,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl } sb.setLength(sb.length() - 1); // delete the last ',' sb.append("]"); - Log.debug("*** Multi-resource Graph json: "+ sb.toString()); + Log.debug("Multi-resource Graph json: "+ sb.toString()); return sb.toString(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java index 42e5f0c..31f5b8b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java @@ -96,26 +96,25 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie yAxis, timeScale, xAxis, + colorScale = $wnd.d3.scale.category20(), chart, svg; function determineScale() { - var xTicks, xTickSubDivide; + var xTicks, xTickSubDivide, minY, maxY; console.log("DetermineScale for # resources: "+ chartContext.data.length); if (chartContext.data.length > 0) { xTicks = 8; xTickSubDivide = 5; + var myExtent = getExtentFromNestedValues(chartContext.data); + console.info("minY, maxY: "+myExtent[0] + ", "+myExtent[1] ); yScale = $wnd.d3.scale.linear() .clamp(true) .rangeRound([height, 0]) - .domain([$wnd.d3.min(chartContext.data[0], function (d) { - return d.y; - }), $wnd.d3.max(chartContext.data[0], function (d) { - return d.y; - })]); + .domain([myExtent[0],myExtent[1]]); yAxis = $wnd.d3.svg.axis() .scale(yScale) @@ -124,10 +123,10 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie .tickSize(4, 4, 0) .orient("left"); - + var firstDataset = chartContext.data[0].value; timeScale = $wnd.d3.time.scale() .range([0, width]) - .domain($wnd.d3.extent(chartContext.data[0], function (d) { + .domain($wnd.d3.extent(firstDataset, function(d){ return d.x; })); @@ -150,6 +149,24 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } + function getExtentFromNestedValues(data){ + var tempArray = [], + mergedArray = [], + resultArray = [], + max = 0, + min = 0; + + for(var i=0; i< data.length;i++){ + tempArray.push(data[i].value); + } + mergedArray = $wnd.d3.merge(tempArray, function(d){ return d.y;}); + max = $wnd.d3.max(mergedArray, function(d){ return d.y}); + min = $wnd.d3.min(mergedArray, function(d){ return d.y}); + resultArray.push(min); + resultArray.push(max); + return resultArray; + } + function createYAxisGridLines() { // create the y axis grid lines svg.append("g").classed("grid y_grid", true) @@ -164,7 +181,7 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie function createXandYAxes() { - xAxis.tickFormat($wnd.rhqCommon.getD3CustomTimeFormat(chartContext.chartXaxisTimeFormatHours, chartContext.chartXaxisTimeFormatHoursMinutes)); + //xAxis.tickFormat($wnd.rhqCommon.getD3CustomTimeFormat(chartContext.chartXaxisTimeFormatHours, chartContext.chartXaxisTimeFormatHoursMinutes)); // create x-axis svg.append("g") @@ -189,8 +206,6 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } - - function createHeader(titleName) { var title = chart.append("g").append("rect") .attr("class", "title") @@ -224,14 +239,14 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie return yScale(d.y); }); - chart.selectAll(".multiLine") + svg.selectAll(".multiLine") .data(chartContext.data) .enter() .append('path') .attr("class", "multiLine") .attr("fill", "none") - .attr("stroke", "#2e376a") - .attr("stroke-width", "1.5") + .attr("stroke", function(d,i){ return colorScale(i);}) + .attr("stroke-width", "2") .attr("stroke-opacity", ".9") .attr("d", function(d) { return graphLine(d.value);}); @@ -244,21 +259,20 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie "use strict"; // Guard condition that can occur when a portlet has not been configured yet console.log("multi-resource chart handle:" + chartContext.chartHandle); - //console.dir(chartContext.data); if (chartContext.data.length > 0) { console.log("Creating MultiLine Chart: " + chartContext.chartSelection + " --> " + chartContext.chartTitle); determineScale(); createHeader(chartContext.chartTitle); - console.log("created multi-header"); createYAxisGridLines(); createMultiLines(chartContext); createXandYAxes(); + console.log("finished drawing multi-line graph"); } } }; // end public closure }(); - if (chartContext.data !== undefined && chartContext.data.length > 0) { + if (typeof chartContext.data !== 'undefined' && chartContext.data.length > 0) { multiLineGraph.draw(chartContext); }

1 0

[rhq] Branch 'nightly/rhq.jon' - modules/enterprise
by Simeon Pinder 08 Jul '13

08 Jul '13

modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java | 55 +++++++--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 7 - 2 files changed, 46 insertions(+), 16 deletions(-) New commits: commit 5e6b4892e9306392505f61a8900319198da1bd70 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Jul 4 07:29:32 2013 -0400 fix failing test Now that StorageNodeManagerBean creates the storage node resource group, the group has to be deleted during test runs. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java index d45ae90..d44d637 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java @@ -25,6 +25,10 @@ package org.rhq.enterprise.server.cloud; +import static org.rhq.enterprise.server.cloud.StorageNodeManagerBean.STORAGE_NODE_GROUP_NAME; +import static org.rhq.enterprise.server.cloud.StorageNodeManagerBean.STORAGE_NODE_PLUGIN_NAME; +import static org.rhq.enterprise.server.cloud.StorageNodeManagerBean.STORAGE_NODE_RESOURCE_TYPE_NAME; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -32,27 +36,30 @@ import java.util.List; import java.util.Set; import java.util.UUID; +import javax.ejb.EJB; import javax.persistence.Query; import javax.transaction.Transaction; import org.testng.Assert; import org.testng.annotations.Test; -import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple; import org.rhq.core.domain.configuration.definition.PropertySimpleType; +import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; +import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; +import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; import org.rhq.enterprise.server.test.AbstractEJB3Test; import org.rhq.enterprise.server.test.TransactionCallback; -import org.rhq.enterprise.server.util.LookupUtil; /** * @author Jirka Kremser @@ -60,17 +67,19 @@ import org.rhq.enterprise.server.util.LookupUtil; @Test public class StorageNodeManagerBeanTest extends AbstractEJB3Test { + @EJB private StorageNodeManagerLocal nodeManager; + + @EJB private ResourceTypeManagerLocal typeManager; - private Subject overlord; - private static final String TEST_PREFIX = "test-"; - @Override - protected void beforeMethod() throws Exception { - nodeManager = LookupUtil.getStorageNodeManager(); - typeManager = LookupUtil.getResourceTypeManager(); - overlord = LookupUtil.getSubjectManager().getOverlord(); - } + @EJB + private ResourceGroupManagerLocal resourceGroupManager; + + @EJB + private SubjectManagerLocal subjectManager; + + private static final String TEST_PREFIX = "test-"; @Test public void testInit() throws Exception { @@ -79,6 +88,7 @@ public class StorageNodeManagerBeanTest extends AbstractEJB3Test { try { prepareScheduler(); + cleanDatabase(); executeInTransaction(new TransactionCallback() { @Override @@ -89,8 +99,6 @@ public class StorageNodeManagerBeanTest extends AbstractEJB3Test { System.setProperty(cassandraSeedsProperty, addresses.get(0) + "|123|123," + addresses.get(1) + "|987|987," + addresses.get(2) + "|123|123"); - cleanDatabase(); - // create the resource type if it doesn't exist ResourceType testResourceType = typeManager.getResourceTypeByNameAndPlugin("RHQ Storage Node", "RHQStorage"); @@ -175,7 +183,8 @@ public class StorageNodeManagerBeanTest extends AbstractEJB3Test { criteria.addFilterAddress(prefix); // use DESC just to make sure sorting on name is different than insert order criteria.addSortAddress(PageOrdering.DESC); - PageList<StorageNode> list = nodeManager.findStorageNodesByCriteria(overlord, criteria); + PageList<StorageNode> list = nodeManager.findStorageNodesByCriteria(subjectManager.getOverlord(), + criteria); assertTrue("The number of found storage nodes should be " + storageNodeCount + ". Was: " + list.size(), storageNodeCount == list.size()); @@ -205,6 +214,26 @@ public class StorageNodeManagerBeanTest extends AbstractEJB3Test { // this method is still needed, because tests calls SLSB methods that are executed in their own transaction // and the rollback performed once the TransactionCallback is finished just wont clean everything + // We can only filter on the group name because the resource type info might not exist in the test + // database. + ResourceGroupCriteria criteria = new ResourceGroupCriteria(); + criteria.addFilterName(STORAGE_NODE_GROUP_NAME); + + List<ResourceGroup> groups = resourceGroupManager.findResourceGroupsByCriteria(subjectManager.getOverlord(), + criteria); + + if (!groups.isEmpty()) { + resourceGroupManager.deleteResourceGroup(subjectManager.getOverlord(), groups.get(0).getId()); + } + +// for (ResourceGroup group : groups) { +// if (group.getName().equals(STORAGE_NODE_GROUP_NAME)) { +// resourceGroupManager.deleteResourceGroup(subjectManager.getOverlord(), group.getId()); +// break; +// } +// } + + // pause the currently running TX Transaction runningTransaction = getTransactionManager().suspend(); getTransactionManager().begin(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 90d9497..07640ab 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -96,11 +96,12 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private static final String SEEDS_PROP = "rhq.cassandra.seeds"; - private static final String STORAGE_NODE_GROUP_NAME = "RHQ Storage Nodes"; + // The following have package visibility to make accessible to StorageNodeManagerBeanTest + static final String STORAGE_NODE_GROUP_NAME = "RHQ Storage Nodes"; - private static final String STORAGE_NODE_RESOURCE_TYPE_NAME = "RHQ Storage Node"; + static final String STORAGE_NODE_RESOURCE_TYPE_NAME = "RHQ Storage Node"; - private static final String STORAGE_NODE_PLUGIN_NAME = "RHQStorage"; + static final String STORAGE_NODE_PLUGIN_NAME = "RHQStorage"; @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) private EntityManager entityManager;

1 0

[rhq] 2 commits - modules/common modules/enterprise modules/plugins
by John Sanda 08 Jul '13

08 Jul '13

modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java | 4 modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 2 modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 3 modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java | 85 ++++ modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java | 66 --- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 172 ---------- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java | 20 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java | 8 modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 30 + 9 files changed, 145 insertions(+), 245 deletions(-) New commits: commit 686716224eeaeed7179e1edc9a4532702b7bd494 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 8 09:52:51 2013 -0400 revert snashot call in avail check also log the execution time for avail checks diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 93d758c..5e7692b 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -128,18 +128,28 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent @Override public AvailabilityType getAvailability() { - ResourceContext<?> context = getResourceContext(); - ProcessInfo processInfo = context.getNativeProcess(); + long start = System.currentTimeMillis(); + try { + ResourceContext<?> context = getResourceContext(); + ProcessInfo processInfo = context.getNativeProcess(); - if (processInfo == null) { - return UNKNOWN; - } else { - // It is safe to read prior snapshot as getNativeProcess always return a fresh instance - ProcessInfoSnapshot processInfoSnaphot = processInfo.freshSnapshot(); - if (processInfoSnaphot.isRunning()) { - return UP; + if (processInfo == null) { + return UNKNOWN; } else { - return DOWN; + // It is safe to read prior snapshot as getNativeProcess always return a fresh instance + // ProcessInfoSnapshot processInfoSnaphot = processInfo.freshSnapshot(); + if (processInfo.priorSnaphot().isRunning()) { + return UP; + } else { + return DOWN; + } + } + } finally { + long end = System.currentTimeMillis(); + long totalTime = end - start; + log.debug("Finished availability check in " + totalTime + " ms"); + if (totalTime > (1000 * 5)) { + log.warn("Availability check exceeded five seconds. Total time was " + totalTime + " ms"); } } } commit 2d36e94937dd694ebfb6bab50e57db3717687363 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 8 09:46:20 2013 -0400 Create storage nodes from rhq.cassandra.seeds prop during installation Previously we were reading rhq.cassandra.seeds at server start up and had logic in place to see if there were any changes in the property. If changes were detected (i.e., new node added), cluster maintenance would be scheduled. We really only want to create/persist seeds nodes at installation time though. Once the server has been installed, rhqctl install should be used to install new storage nodes. This simplifies server start up logic and also reduces the chances for screwing up the deployment. diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java index 8f67ab3..2836964 100644 --- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java @@ -98,6 +98,10 @@ public class SchemaManager { return topology.updateTopology(isNewSchema); } + public List<StorageNode> getStorageNodes() { + return nodes; + } + private static List<StorageNode> parseNodeInformation(String... nodes) { List<StorageNode> parsedNodes = new ArrayList<StorageNode>(); for (String node : nodes) { diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 32824e2..cfe13be 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -675,6 +675,8 @@ rhq.cassandra.password=${rhq.cassandra.password} # # hostname|jmxPort|nativeTransportPort| # +# Note that this is actually an installer setting. Changing the value after +# installation will have no effect. rhq.cassandra.seeds= # If enabled data sent to and from storage nodes will be compressed using diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java index 4c87f70..284ddbd 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java @@ -499,6 +499,9 @@ public class InstallerServiceImpl implements InstallerService { // ensure the server info is up to date and stored in the DB ServerInstallUtil.storeServerDetails(serverProperties, clearTextDbPassword, serverDetails); + + ServerInstallUtil.persistStorageNodesIfNecessary(serverProperties, clearTextDbPassword, + storageNodeSchemaManager.getStorageNodes()); } @Override diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java index 0318e0e..d0f6f3f 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java @@ -68,6 +68,7 @@ import org.rhq.core.db.DbUtil; import org.rhq.core.db.OracleDatabaseType; import org.rhq.core.db.PostgresqlDatabaseType; import org.rhq.core.db.setup.DBSetup; +import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.util.PropertiesFileUpdate; import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.core.util.file.FileUtil; @@ -950,6 +951,89 @@ public class ServerInstallUtil { } /** + * Persists the storage nodes to the database only if no storage node entities already exist. This method is used + * to persist storage nodes created from the rhq.cassandra.seeds server configuration property. The only time those + * seed nodes should be created is during an initial server installation. After the initial installation storage + * nodes should be created using <code>rhqctl install</code>. This ensures that any necessary cluster maintenance + * tasks will be performed. + * + * @param serverProperties the server properties + * @param password clear text password to connect to the database + * @param storageNodes the {@link StorageNode storage nodes} to persist + * @throws Exception + */ + public static void persistStorageNodesIfNecessary(HashMap<String, String> serverProperties, String password, + List<StorageNode> storageNodes) throws Exception { + DatabaseType db = null; + Connection connection = null; + Statement queryStatement = null; + ResultSet resultSet = null; + PreparedStatement insertStatement = null; + + try { + String dbUrl = serverProperties.get(ServerProperties.PROP_DATABASE_CONNECTION_URL); + String userName = serverProperties.get(ServerProperties.PROP_DATABASE_USERNAME); + connection = getDatabaseConnection(dbUrl, userName, password); + db = DatabaseTypeFactory.getDatabaseType(connection); + + if (!(db instanceof PostgresqlDatabaseType || db instanceof OracleDatabaseType)) { + throw new IllegalArgumentException("Unknown database type, can't continue: " + db); + } + + connection = getDatabaseConnection(dbUrl, userName, password); + queryStatement = connection.createStatement(); + resultSet = queryStatement.executeQuery("SELECT count(id) FROM rhq_storage_node"); + resultSet.next(); + + if (resultSet.getInt(1) == 0) { + connection.setAutoCommit(false); + + try { + LOG.info("Persisting to database new storage nodes for values specified in server configuration " + + "property [rhq.cassandra.seeds]"); + + insertStatement = connection.prepareStatement( + "INSERT INTO rhq_storage_node (id, address, jmx_port, cql_port, operation_mode, ctime, mtime) " + + "VALUES (?, ?, ?, ?, ?, ?, ?)" + ); + + int id = 1001; + for (StorageNode storageNode : storageNodes) { + insertStatement.setInt(1, id); + insertStatement.setString(2, storageNode.getAddress()); + insertStatement.setInt(3, storageNode.getJmxPort()); + insertStatement.setInt(4, storageNode.getCqlPort()); + insertStatement.setString(5, StorageNode.OperationMode.INSTALLED.toString()); + insertStatement.setLong(6, System.currentTimeMillis()); + insertStatement.setLong(7, System.currentTimeMillis()); + + insertStatement.executeUpdate(); + id += 1; + } + + connection.commit(); + } catch (SQLException e) { + LOG.error("Failed to persist to database the storage nodes specified by server configuration " + + "property [rhq.cassandra.seeds]. Transaction will be rolled back.", e); + connection.rollback(); + throw e; + } + } else { + LOG.info("Storage nodes already exist in database. Server configuration property " + + "[rhq.cassandra.seeds] will be ignored."); + } + + } finally { + if (db != null) { + db.closeResultSet(resultSet); + db.closeStatement(queryStatement); + db.closeStatement(insertStatement); + db.closeConnection(connection); + } + } + } + + /** * Stores the server details (such as the public endpoint) in the database. If the server definition already * exists, it will be updated; otherwise, a new server will be added to the HA cloud. * @@ -982,6 +1066,7 @@ public class ServerInstallUtil { } } + private static void updateOrInsertServer(DatabaseType db, Connection conn, ServerDetails serverDetails) { PreparedStatement stm = null; ResultSet rs = null; diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java index d44d637..4e04447 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java @@ -26,8 +26,6 @@ package org.rhq.enterprise.server.cloud; import static org.rhq.enterprise.server.cloud.StorageNodeManagerBean.STORAGE_NODE_GROUP_NAME; -import static org.rhq.enterprise.server.cloud.StorageNodeManagerBean.STORAGE_NODE_PLUGIN_NAME; -import static org.rhq.enterprise.server.cloud.StorageNodeManagerBean.STORAGE_NODE_RESOURCE_TYPE_NAME; import java.util.ArrayList; import java.util.Arrays; @@ -81,70 +79,6 @@ public class StorageNodeManagerBeanTest extends AbstractEJB3Test { private static final String TEST_PREFIX = "test-"; - @Test - public void testInit() throws Exception { - final String cassandraSeedsProperty = "rhq.cassandra.seeds"; - final String originalSeedValue = System.getProperty(cassandraSeedsProperty); - - try { - prepareScheduler(); - cleanDatabase(); - executeInTransaction(new TransactionCallback() { - - @Override - public void execute() throws Exception { - String testHostName = TEST_PREFIX + "hostname"; - List<String> addresses = Arrays.asList(testHostName, TEST_PREFIX + "hostWithNoFoundResource", - TEST_PREFIX + "secondHostWithNoFoundResource"); - System.setProperty(cassandraSeedsProperty, addresses.get(0) + "|123|123," + addresses.get(1) - + "|987|987," + addresses.get(2) + "|123|123"); - - // create the resource type if it doesn't exist - ResourceType testResourceType = typeManager.getResourceTypeByNameAndPlugin("RHQ Storage Node", - "RHQStorage"); - if (testResourceType == null) { - testResourceType = createResourceType(); - } - Resource testResource = createResource(testResourceType, testHostName); - - // finds the storage nodes and pairs them w/ the associated resources - nodeManager.scanForStorageNodes(); - - // get the storage nodes and checks some properties on them - List<StorageNode> storageNodes = nodeManager.getStorageNodes(); - Assert.assertNotNull(storageNodes, "The list of storage nodes shouldn't be null."); - Assert.assertFalse(storageNodes.isEmpty(), "The list of storage nodes shouldn't be empty."); - Assert.assertTrue(storageNodes.size() >= addresses.size(), - "The size of the list of storage nodes should be at least " + addresses.size()); - - List<String> obtainedAddresses = new ArrayList<String>(storageNodes.size()); - for (StorageNode storageNode : storageNodes) { - Assert.assertNotNull(storageNode.getAddress(), "Address of storage node cannot be null."); - obtainedAddresses.add(storageNode.getAddress()); - if (storageNode.getAddress().equals(testHostName)) { - Assert.assertEquals(storageNode.getResource().getId(), testResource.getId()); - Assert.assertNotNull(storageNode.getResource(), "Associated resource cannot be null."); - } else { - Assert.assertNull(storageNode.getResource(), - "The resource field should be null at this point."); - } - } - - Assert.assertTrue(obtainedAddresses.containsAll(addresses), - "There are some storage nodes that should be created but were not discovered and returned." - + " The storage nodes that should be returned: " + addresses - + " The storage nodes that were returned: " + obtainedAddresses - + " (the second should be a super-set (not necessarily strict) of the first.)"); - - } - }); - } finally { - unprepareScheduler(); - cleanDatabase(); - System.setProperty(cassandraSeedsProperty, originalSeedValue); - } - } - @Test(groups = "integration.ejb3") public void testStorageNodeCriteriaFinder() throws Exception { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index b76d054..9d073ee 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -53,16 +53,13 @@ import org.rhq.core.domain.common.JobTrigger; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.criteria.StorageNodeCriteria; -import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.measurement.MeasurementAggregate; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.operation.bean.GroupOperationSchedule; -import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageList; -import org.rhq.core.util.StringUtil; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.authz.RequiredPermission; @@ -88,22 +85,10 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private final Log log = LogFactory.getLog(StorageNodeManagerBean.class); - private static final String RHQ_STORAGE_RESOURCE_TYPE = "RHQ Storage Node"; - private static final String RHQ_STORAGE_PLUGIN = "RHQStorage"; - private static final String RHQ_STORAGE_CQL_PORT_PROPERTY = "nativeTransportPort"; private static final String RHQ_STORAGE_JMX_PORT_PROPERTY = "jmxPort"; private static final String RHQ_STORAGE_ADDRESS_PROPERTY = "host"; - private static final String SEEDS_PROP = "rhq.cassandra.seeds"; - - // The following have package visibility to make accessible to StorageNodeManagerBeanTest - static final String STORAGE_NODE_GROUP_NAME = "RHQ Storage Nodes"; - - static final String STORAGE_NODE_RESOURCE_TYPE_NAME = "RHQ Storage Node"; - - static final String STORAGE_NODE_PLUGIN_NAME = "RHQStorage"; - @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) private EntityManager entityManager; @@ -126,89 +111,6 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private OperationManagerLocal operationManager; @Override - public synchronized List<StorageNode> scanForStorageNodes() { - List<StorageNode> existingStorageNodes = getStorageNodes(); - if (log.isDebugEnabled()) { - log.debug("Found existing storage nodes [" + StringUtil.listToString(existingStorageNodes) - + "] in the database"); - } - - String seeds = System.getProperty(SEEDS_PROP); - - if (StringUtil.isEmpty(seeds) && existingStorageNodes.isEmpty()) { - // We need to find storage node connection info from one or the other but not - // necessarily both. If this is a single server deployment where the storage - // node(s) is running on a separate machine, then SEEDS_PROP will have to be set - // manually. And in this scenario during the initial deployment, there will not - // be any storage nodes in the db. In a HA deployment, where there are already - // storage nodes in the db, an RHQ server does not have to have SEEDS_PROP set - // since it can obtain connection info from the storage node table. - throw new IllegalStateException("There are no existing storage nodes defined in the RHQ database and " - + "the system property [" + SEEDS_PROP + "] is not set. The RHQ server will not be able to connect " - + "to the RHQ storage node(s). The [" + SEEDS_PROP + "] property should be defined in " - + "rhq-server.properties."); - } - - List<StorageNode> seedNodes = parseSeedsProperty(seeds); - boolean clusterMaintenanceNeeded = false; - List<StorageNode> newNodes = null; - - if (existingStorageNodes.isEmpty()) { - // This should only happen on the very first server start upon installation. - if (log.isDebugEnabled()) { - log.debug("No storage node entities exist in the database"); - log.debug("Persisting seed nodes [" + StringUtil.listToString(seedNodes) + "]"); - } - createStorageNodeGroup(); - } else { - // There are existing storage nodes but we need to check if the storage node - // group exists. In the case of an upgrade, the group would not yet exist so it - // has to be created now. - if (!storageNodeGroupExists()) { - createStorageNodeGroup(); - addExistingStorageNodesToGroup(); - } - - newNodes = findNewStorageNodes(existingStorageNodes, seedNodes); - if (!newNodes.isEmpty()) { - log.info("Detected topology change. New seed nodes will be persisted."); - if (log.isDebugEnabled()) { - log.debug("Persisting new seed nodes [" + StringUtil.listToString(newNodes)); - } - - clusterMaintenanceNeeded = true; - } - } - - Map<String, StorageNode> storageNodeMap = new HashMap<String, StorageNode>(existingStorageNodes.size() - + seedNodes.size()); - for (StorageNode existingStorageNode : existingStorageNodes) { - storageNodeMap.put(existingStorageNode.getAddress(), existingStorageNode); - } - // possibly overide the existing storage nodes with up to date data - for (StorageNode seedNode : seedNodes) { - StorageNode existing = storageNodeMap.get(seedNode.getAddress()); - if (existing != null) { - if (existing.getJmxPort() != seedNode.getJmxPort() || existing.getCqlPort() != seedNode.getCqlPort() - || existing.getResource() != seedNode.getResource()) { - existing.setMtime(new Date().getTime()); - } - seedNode.setResource(existing.getResource()); - } - storageNodeMap.put(seedNode.getAddress(), seedNode); - } - - this.discoverResourceInformation(storageNodeMap); - this.updateStorageNodes(storageNodeMap); - - if (clusterMaintenanceNeeded) { - this.scheduleQuartzJob(existingStorageNodes.size()); - } - - return new ArrayList<StorageNode>(storageNodeMap.values()); - } - - @Override public void linkResource(Resource resource) { List<StorageNode> storageNodes = this.getStorageNodes(); @@ -250,7 +152,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN } } - private void createStorageNodeGroup() { + @Override + public void createStorageNodeGroup() { log.info("Creating resource group [" + STORAGE_NODE_GROUP_NAME + "]"); ResourceGroup group = new ResourceGroup(STORAGE_NODE_GROUP_NAME); @@ -261,6 +164,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN group.setRecursive(false); resourceGroupManager.createResourceGroup(subjectManager.getOverlord(), group); + + addExistingStorageNodesToGroup(); } private void addExistingStorageNodesToGroup() { @@ -283,13 +188,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN new int[] {resource.getId()}); } - /** - * This method is very similar to {@link #getStorageNodeGroup()} but may be called - * prior to the group being created. - * - * @return true if the storage node resource group exists, false otherwise. - */ - private boolean storageNodeGroupExists() { + @Override + public boolean storageNodeGroupExists() { Subject overlord = subjectManager.getOverlord(); ResourceGroupCriteria criteria = new ResourceGroupCriteria(); @@ -302,14 +202,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return !groups.isEmpty(); } - /** - * Note that this method assumes the storage node resource group already exists; as - * such, it should only be called from places in the code that are after the point(s) - * where the group has been created. - * - * @return The storage node resource group. - * @throws IllegalStateException if the group is not found or does not exist. - */ + @Override public ResourceGroup getStorageNodeGroup() { Subject overlord = subjectManager.getOverlord(); @@ -499,24 +392,6 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return storageNodes; } - private List<StorageNode> findNewStorageNodes(List<StorageNode> nodes, List<StorageNode> seedNodes) { - if (log.isDebugEnabled()) { - log.debug("Checking system property [" + SEEDS_PROP + "] for any new nodes to be persisted"); - } - List<StorageNode> newNodes = new ArrayList<StorageNode>(); - for (StorageNode seedNode : seedNodes) { - // The contains call should be ok even though it is an O(N) operation because - // the number of storage nodes will be small and this is only done at start up. - if (!nodes.contains(seedNode)) { - if (log.isDebugEnabled()) { - log.debug("Detected new storage node [" + seedNode + "]"); - } - newNodes.add(seedNode); - } - } - return newNodes; - } - private void scheduleQuartzJob(int clusterSize) { String jobName = StorageNodeMaintenanceJob.class.getName(); String jobGroupName = StorageNodeMaintenanceJob.class.getName(); @@ -552,38 +427,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN } entityManager.flush(); } - - private void discoverResourceInformation(Map<String, StorageNode> storageNodeMap) { - TypedQuery<ResourceType> query = entityManager.<ResourceType>createNamedQuery(ResourceType.QUERY_FIND_BY_NAME_AND_PLUGIN, ResourceType.class) - .setParameter("name", RHQ_STORAGE_RESOURCE_TYPE).setParameter("plugin", RHQ_STORAGE_PLUGIN); - List<ResourceType> resourceTypes = query.getResultList(); - - if (resourceTypes.isEmpty()) { - return; - } - - TypedQuery<Resource> resourceQuery = entityManager.<Resource>createNamedQuery(Resource.QUERY_FIND_BY_TYPE_ADMIN, Resource.class).setParameter("type", - resourceTypes.get(0)); - List<Resource> cassandraResources = resourceQuery.getResultList(); - - for (Resource resource : cassandraResources) { - Configuration resourceConfiguration = resource.getPluginConfiguration(); - String host = resourceConfiguration.getSimpleValue(RHQ_STORAGE_ADDRESS_PROPERTY); - - if (host != null && storageNodeMap.containsKey(host)) { - StorageNode storageNode = storageNodeMap.get(host); - - storageNode.setResource(resource); - if (resource.getInventoryStatus() == InventoryStatus.NEW) { - storageNode.setOperationMode(OperationMode.INSTALLED); - } else if (resource.getInventoryStatus() == InventoryStatus.COMMITTED - && resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP) { - storageNode.setOperationMode(OperationMode.NORMAL); - } - } - } - } - + private StorageNodeLoadComposite.MeasurementAggregateWithUnits getMeasurementAggregateWithUnits(Subject subject, int schedId, MeasurementUnits units, long beginTime, long endTime) { MeasurementAggregate measurementAggregate = measurementManager.getAggregate(subject, schedId, beginTime, diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index 52e2424..5c3f092 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -33,7 +33,10 @@ import org.rhq.core.domain.util.PageList; @Local public interface StorageNodeManagerLocal { - List<StorageNode> scanForStorageNodes(); + // The following have package visibility to make accessible to StorageNodeManagerBeanTest + String STORAGE_NODE_GROUP_NAME = "RHQ Storage Nodes"; + String STORAGE_NODE_RESOURCE_TYPE_NAME = "RHQ Storage Node"; + String STORAGE_NODE_PLUGIN_NAME = "RHQStorage"; List<StorageNode> getStorageNodes(); @@ -88,6 +91,21 @@ public interface StorageNodeManagerLocal { void runReadRepair(); /** + * Creates the storage node resource group which will be named {@link #STORAGE_NODE_GROUP_NAME}. This method should + * only be called at start up by {@link org.rhq.enterprise.server.storage.StorageClientManagerBean StorageClientManagerBean}. + * Storage node entities created during installation will be added to the group. + */ + void createStorageNodeGroup(); + + /** + * Checks whether or not the storage node resource group exists. This method is very similar to + * {@link #getStorageNodeGroup()} but may be called prior to the group being created. + * + * @return true if the storage node resource group exists, false otherwise. + */ + boolean storageNodeGroupExists(); + + /** * This method assumes the storage node resource group already exists; as such, it should only be called from places * in the code that are after the point(s) where the group has been created. * diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java index 0c76dee..2d48092 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java @@ -86,10 +86,10 @@ public class StorageClientManagerBean { log.info("Initializing storage client subsystem"); - //decide if there are no storage nodes persisted before doing anything - boolean isNewServerInstall = storageNodeManager.getStorageNodes().isEmpty(); - - storageNodeManager.scanForStorageNodes(); + boolean isNewServerInstall = !storageNodeManager.storageNodeGroupExists(); + if (isNewServerInstall) { + storageNodeManager.createStorageNodeGroup(); + } String username = getRequiredStorageProperty(USERNAME_PROP); String password = getRequiredStorageProperty(PASSWORD_PROP);

1 0

[rhq] Branch 'mtho11/d3-multiline-graph' - modules/enterprise
by mike thompson 07 Jul '13

07 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java | 22 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java | 37 - modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js | 234 +++++----- 6 files changed, 153 insertions(+), 164 deletions(-) New commits: commit 644b57605e5bcb79c2137ed8ad3902e600c9a9a0 Author: Mike Thompson <mithomps(a)redhat.com> Date: Sun Jul 7 14:15:08 2013 -0700 Consolidate the d3 time format stuff into rhq.js so all graphs have access. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java index 60b5e26..34ca60b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityLineGraphType.java @@ -32,9 +32,12 @@ import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; /** + * This is now old and for demonstration purposes only. * Contains the javascript chart definition for an implementation of the d3 availability chart. This implementation is * just a line that changes color based on availability type: up=green, down=red, orange=disabled, unknown=grey, * empty=grey, warn=yellow. This version of the availability graph shows continuous intervals. + * @deprecated + * @see AvailabilityOverUnderGraphType * * @author Mike Thompson */ diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index 3822b59..7c5f80a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -171,7 +171,6 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { .tickSize(13, 0, 0) .orient("bottom"), - customTimeFormat, calcBarY = function (d) { var ABOVE = -6, @@ -253,17 +252,7 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { return calcBarFill(d); }); - customTimeFormat = timeFormat([ - [$wnd.d3.time.format("%Y"), function() { return true; }], - [$wnd.d3.time.format("%B"), function(d) { return d.getMonth(); }], - [$wnd.d3.time.format("%b %d"), function(d) { return d.getDate() != 1; }], - [$wnd.d3.time.format("%a %d"), function(d) { return d.getDay() && d.getDate() != 1; }], - [$wnd.d3.time.format(availChartContext.chartXaxisTimeFormatHours), function(d) { return d.getHours(); }], - [$wnd.d3.time.format(availChartContext.chartXaxisTimeFormatHoursMinutes), function(d) { return d.getMinutes(); }], - [$wnd.d3.time.format(":%S"), function(d) { return d.getSeconds(); }], - [$wnd.d3.time.format(".%L"), function(d) { return d.getMilliseconds(); }] - ]); - xAxis.tickFormat(customTimeFormat); + xAxis.tickFormat($wnd.rhqCommon.getD3CustomTimeFormat(availChartContext.chartXaxisTimeFormatHours, availChartContext.chartXaxisTimeFormatHoursMinutes)); // create x-axis svg.append("g") diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java index 0178f93..b8c63f4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java @@ -461,17 +461,8 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { } function createXandYAxes() { - var customTimeFormat = timeFormat([ - [$wnd.d3.time.format("%Y"), function() { return true; }], - [$wnd.d3.time.format("%B"), function(d) { return d.getMonth(); }], - [$wnd.d3.time.format("%b %d"), function(d) { return d.getDate() != 1; }], - [$wnd.d3.time.format("%a %d"), function(d) { return d.getDay() && d.getDate() != 1; }], - [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHours), function(d) { return d.getHours(); }], - [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHoursMinutes), function(d) { return d.getMinutes(); }], - [$wnd.d3.time.format(":%S"), function(d) { return d.getSeconds(); }], - [$wnd.d3.time.format(".%L"), function(d) { return d.getMilliseconds(); }] - ]); - xAxis.tickFormat(customTimeFormat); + + xAxis.tickFormat($wnd.rhqCommon.getD3CustomTimeFormat(chartContext.chartXaxisTimeFormatHours, chartContext.chartXaxisTimeFormatHoursMinutes)); // create x-axis svg.append("g") @@ -495,15 +486,6 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { } - function timeFormat(formats) { - return function(date) { - var i = formats.length - 1, f = formats[i]; - while (!f[1](date)) f = formats[--i]; - return f[0](date); - } - } - - function createAvgLines() { var showBarAvgTrendline = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AbstractMetricGraph::showBarAvgTrendLine()(), diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index 7a4232a..7ade3f7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -73,7 +73,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl private final String chartHoverDateFormat = MSG.chart_hover_date_format(); private int groupId; private int definitionId; - private boolean isAutogroup; + private boolean isAutoGroup; private MeasurementDefinition definition; private MeasurementUserPreferences measurementUserPreferences; private ButtonBarDateTimeRangeEditor buttonBarDateTimeRangeEditor; @@ -86,10 +86,10 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl private String chartTitle; private Integer chartHeight; - public CompositeGroupD3GraphListView(int groupId, int defId, boolean isAutogroup) { + public CompositeGroupD3GraphListView(int groupId, int defId, boolean isAutoGroup) { super(); this.groupId = groupId; - this.isAutogroup = isAutogroup; + this.isAutoGroup = isAutoGroup; setDefinitionId(defId); measurementForEachResource = new ArrayList<MultiLineGraphData>(); measurementUserPreferences = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); @@ -105,7 +105,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl ResourceGroupCriteria criteria = new ResourceGroupCriteria(); criteria.addFilterId(groupId); criteria.fetchResourceType(true); - criteria.addFilterVisible(!isAutogroup); + criteria.addFilterVisible(!isAutoGroup); criteria.fetchExplicitResources(true); measurementForEachResource.clear(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java index be6d110..42e5f0c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java @@ -163,33 +163,8 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } function createXandYAxes() { - var customTimeFormat = timeFormat([ - [$wnd.d3.time.format("%Y"), function () { - return true; - }], - [$wnd.d3.time.format("%B"), function (d) { - return d.getMonth(); - }], - [$wnd.d3.time.format("%b %d"), function (d) { - return d.getDate() != 1; - }], - [$wnd.d3.time.format("%a %d"), function (d) { - return d.getDay() && d.getDate() != 1; - }], - [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHours), function (d) { - return d.getHours(); - }], - [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHoursMinutes), function (d) { - return d.getMinutes(); - }], - [$wnd.d3.time.format(":%S"), function (d) { - return d.getSeconds(); - }], - [$wnd.d3.time.format(".%L"), function (d) { - return d.getMilliseconds(); - }] - ]); - xAxis.tickFormat(customTimeFormat); + + xAxis.tickFormat($wnd.rhqCommon.getD3CustomTimeFormat(chartContext.chartXaxisTimeFormatHours, chartContext.chartXaxisTimeFormatHoursMinutes)); // create x-axis svg.append("g") @@ -213,13 +188,7 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } - function timeFormat(formats) { - return function (date) { - var i = formats.length - 1, f = formats[i]; - while (!f[1](date)) f = formats[--i]; - return f[0](date); - } - } + function createHeader(titleName) { diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js index 435fd67..40c7ca8 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js +++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js @@ -4,7 +4,8 @@ // Handle browsers not supporting console object if (!window.console) window.console = {}; -if (!window.console.log) window.console.log = function () { }; +if (!window.console.log) window.console.log = function () { +}; /** * ChartContext Constructor Object @@ -39,101 +40,146 @@ if (!window.console.log) window.console.log = function () { }; * @param chartXaxisTimeFormatHoursMinutes * @constructor */ -var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel,hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes ) -{ - "use strict"; - if(!(this instanceof ChartContext)){ - throw new Error("ChartContext function cannot be called as a function.") - } - this.chartId = chartId; - this.chartHeight = chartHeight; - this.data = jQuery.parseJSON(metricsData); // make into json - this.xAxisLabel = xAxisLabel; - this.chartTitle = chartTitle; - this.yAxisUnits = yAxisUnits; - this.minChartTitle = minChartTitle; - this.avgChartTitle = avgChartTitle; - this.peakChartTitle = peakChartTitle; - this.dateLabel = dateLabel; - this.timeLabel = timeLabel; - this.downLabel = downLabel; - this.unknownLabel = unknownLabel; - this.singleValueLabel = singleValueLabel; - this.noDataLabel = noDataLabel; - this.hoverStartLabel = hoverStartLabel; - this.hoverEndLabel = hoverEndLabel; - this.hoverPeriodLabel = hoverPeriodLabel; - this.hoverBarLabel = hoverBarLabel; - this.chartHoverTimeFormat = chartHoverTimeFormat; - this.chartHoverDateFormat = chartHoverDateFormat; - this.isPortalGraph = isPortalGraph; - this.portalId = portalId; - if(isPortalGraph){ - this.chartHandle = "rChart-"+chartId+"-"+portalId; - }else { - this.chartHandle = "rChart-"+chartId; - } - this.chartSelection = this.chartHandle + " svg"; - this.buttonBarDateTimeFormat = buttonBarDateTimeFormat; - this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; - this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; +var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel, hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { + "use strict"; + if (!(this instanceof ChartContext)) { + throw new Error("ChartContext function cannot be called as a function.") + } + this.chartId = chartId; + this.chartHeight = chartHeight; + this.data = jQuery.parseJSON(metricsData); // make into json + this.xAxisLabel = xAxisLabel; + this.chartTitle = chartTitle; + this.yAxisUnits = yAxisUnits; + this.minChartTitle = minChartTitle; + this.avgChartTitle = avgChartTitle; + this.peakChartTitle = peakChartTitle; + this.dateLabel = dateLabel; + this.timeLabel = timeLabel; + this.downLabel = downLabel; + this.unknownLabel = unknownLabel; + this.singleValueLabel = singleValueLabel; + this.noDataLabel = noDataLabel; + this.hoverStartLabel = hoverStartLabel; + this.hoverEndLabel = hoverEndLabel; + this.hoverPeriodLabel = hoverPeriodLabel; + this.hoverBarLabel = hoverBarLabel; + this.chartHoverTimeFormat = chartHoverTimeFormat; + this.chartHoverDateFormat = chartHoverDateFormat; + this.isPortalGraph = isPortalGraph; + this.portalId = portalId; + if (isPortalGraph) { + this.chartHandle = "rChart-" + chartId + "-" + portalId; + } + else { + this.chartHandle = "rChart-" + chartId; + } + this.chartSelection = this.chartHandle + " svg"; + this.buttonBarDateTimeFormat = buttonBarDateTimeFormat; + this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; + this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; -}, -/** - * Availability Context object constructor - * @param chartId - * @param availData - * @param dateLabel - * @param timeLabel - * @param hoverStartLabel - * @param hoverBarLabel - * @param availabilityLabel - * @param chartHoverTimeFormat - * @param chartHoverDateFormat - * @param chartTitle - * @param chartUpLabel - * @param chartDownLabel - * @param chartXaxisTimeFormatHours - * @param chartXaxisTimeFormatHoursMinutes - * @constructor - */ -AvailChartContext = function (chartId, availData, dateLabel, timeLabel, hoverStartLabel, hoverBarLabel, availabilityLabel, chartHoverTimeFormat, chartHoverDateFormat, chartTitle, chartUpLabel, chartDownLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { - "use strict"; - if (!(this instanceof AvailChartContext)) { - throw new Error("AvailChartContext function cannot be called as a function.") - } - this.chartId = chartId; - this.chartHandle = "#availChart-" + this.chartId; - this.chartSelection = this.chartHandle + " svg"; - this.data = jQuery.parseJSON(availData); // make into json - this.dateLabel = dateLabel; - this.timeLabel = timeLabel; - this.hoverStartLabel = hoverStartLabel; - this.hoverBarLabel = hoverBarLabel; - this.hoverBarAvailabilityLabel = availabilityLabel; - this.chartHoverTimeFormat = chartHoverTimeFormat; - this.chartHoverDateFormat = chartHoverDateFormat; - this.chartTitle = chartTitle; - this.chartDownLabel = chartDownLabel; - this.chartUpLabel = chartUpLabel; - this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; - this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; + }, + /** + * Availability Context object constructor + * @param chartId + * @param availData + * @param dateLabel + * @param timeLabel + * @param hoverStartLabel + * @param hoverBarLabel + * @param availabilityLabel + * @param chartHoverTimeFormat + * @param chartHoverDateFormat + * @param chartTitle + * @param chartUpLabel + * @param chartDownLabel + * @param chartXaxisTimeFormatHours + * @param chartXaxisTimeFormatHoursMinutes + * @constructor + */ + AvailChartContext = function (chartId, availData, dateLabel, timeLabel, hoverStartLabel, hoverBarLabel, availabilityLabel, chartHoverTimeFormat, chartHoverDateFormat, chartTitle, chartUpLabel, chartDownLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { + "use strict"; + if (!(this instanceof AvailChartContext)) { + throw new Error("AvailChartContext function cannot be called as a function.") + } + this.chartId = chartId; + this.chartHandle = "#availChart-" + this.chartId; + this.chartSelection = this.chartHandle + " svg"; + this.data = jQuery.parseJSON(availData); // make into json + this.dateLabel = dateLabel; + this.timeLabel = timeLabel; + this.hoverStartLabel = hoverStartLabel; + this.hoverBarLabel = hoverBarLabel; + this.hoverBarAvailabilityLabel = availabilityLabel; + this.chartHoverTimeFormat = chartHoverTimeFormat; + this.chartHoverDateFormat = chartHoverDateFormat; + this.chartTitle = chartTitle; + this.chartDownLabel = chartDownLabel; + this.chartUpLabel = chartUpLabel; + this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; + this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; + + }, + + /** + * GraphDateContext object constructor. + * @param startDate moment object representing startDate range + * @param endDate moment object representing endDate range + * @constructor + */ + GraphDateContext = function (startDate, endDate) { + "use strict"; + if (!(this instanceof GraphDateContext)) { + throw new Error("GraphDateContext function cannot be called as a function.") + } + this.startDate = startDate; + this.endDate = endDate; + }, + rhqCommon = (function () { + + + var timeFormat = function (formats) { + return function(date) { + var i = formats.length - 1, f = formats[i]; + while (!f[1](date)) f = formats[--i]; + return f[0](date); + } + }; + + return { + getD3CustomTimeFormat: function (xAxisTimeFormatHours, xAxisTimeFormatHoursMinutes) { + return timeFormat([ + [d3.time.format("%Y"), function () { + return true; + }], + [d3.time.format("%B"), function (d) { + return d.getMonth(); + }], + [d3.time.format("%b %d"), function (d) { + return d.getDate() != 1; + }], + [d3.time.format("%a %d"), function (d) { + return d.getDay() && d.getDate() != 1; + }], + [d3.time.format(xAxisTimeFormatHours), function (d) { + return d.getHours(); + }], + [d3.time.format(xAxisTimeFormatHoursMinutes), function (d) { + return d.getMinutes(); + }], + [d3.time.format(":%S"), function (d) { + return d.getSeconds(); + }], + [d3.time.format(".%L"), function (d) { + return d.getMilliseconds(); + }] + ]); + } + + } + })(); -}, -/** - * GraphDateContext object constructor. - * @param startDate moment object representing startDate range - * @param endDate moment object representing endDate range - * @constructor - */ -GraphDateContext = function (startDate, endDate){ - "use strict"; - if (!(this instanceof GraphDateContext)) { - throw new Error("GraphDateContext function cannot be called as a function.") - } - this.startDate = startDate; - this.endDate = endDate; -};

1 0

[rhq] modules/enterprise
by Thomas Segismont 05 Jul '13

05 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java | 9 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java | 67 ++++++++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java | 8 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 19 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 54 +++++++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java | 20 +- 6 files changed, 140 insertions(+), 37 deletions(-) New commits: commit d5b6714edf6eacbed95fbf2253de9f4ab5c1b08b Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Fri Jul 5 15:09:44 2013 +0200 Bug 910646 - Unable to add more than 100 resources to a Compatible Group diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java index bd6209a..3248186 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.gui.coregui.client.gwt; @@ -113,4 +113,7 @@ public interface ResourceGWTService extends RemoteService { List<Integer> uninventoryResources(int[] resourceIds) throws RuntimeException; + PageList<Resource> findGroupMemberCandidateResources(ResourceCriteria criteria, int[] alreadySelectedResourceIds) + throws RuntimeException; + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java index 0882ce2..2bf0883 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupResourceSelector.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.inventory; @@ -26,24 +22,33 @@ import java.util.Collection; import java.util.HashSet; import java.util.Map; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; import com.smartgwt.client.data.Record; +import com.smartgwt.client.rpc.RPCResponse; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.widgets.grid.ListGridRecord; +import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource; import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.ResourceSelector; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; /** * @author Jay Shaughnessy */ public class ResourceGroupResourceSelector extends ResourceSelector { + private static final int MAX_AVAILABLE_RECORDS = 300; - Collection<Resource> resources; + private Collection<Resource> resources; public ResourceGroupResourceSelector(Collection<Resource> resources, ResourceType resourceTypeFilter, boolean forceResourceTypeFilter) { @@ -96,4 +101,44 @@ public class ResourceGroupResourceSelector extends ResourceSelector { } } + @Override + protected int getMaxAvailableRecords() { + return MAX_AVAILABLE_RECORDS; + } + + @Override + protected RPCDataSource<Resource, ResourceCriteria> getDataSource() { + return new SelectedResourcesAwareDataSource(); + } + + private class SelectedResourcesAwareDataSource extends SelectedResourceDataSource { + + @Override + public void executeFetch(final DSRequest request, final DSResponse response, final ResourceCriteria criteria) { + getResourceService().findGroupMemberCandidateResources(criteria, getSelectedResourceIds(), + new AsyncCallback<PageList<Resource>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_loadFailed(), caught); + response.setStatus(RPCResponse.STATUS_FAILURE); + processResponse(request.getRequestId(), response); + } + + @Override + public void onSuccess(PageList<Resource> result) { + dataRetrieved(result, response, request); + } + }); + } + + private int[] getSelectedResourceIds() { + ListGridRecord[] assignedRecords = assignedGrid.getRecords(); + int[] selectedResourceIds = new int[assignedRecords.length]; + for (int i = 0; i < assignedRecords.length; i++) { + ListGridRecord assignedRecord = assignedRecords[i]; + selectedResourceIds[i] = assignedRecord.getAttributeAsInt(getSelectorKey()); + } + return selectedResourceIds; + } + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java index 90511d7..03b70b3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.gui.coregui.client.inventory.resource.selection; @@ -185,7 +185,7 @@ public class ResourceSelector extends AbstractSelector<Resource, ResourceCriteri return true; } - private class SelectedResourceDataSource extends ResourceDatasource { + protected class SelectedResourceDataSource extends ResourceDatasource { @Override protected ResourceCriteria getFetchCriteria(final DSRequest request) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java index 456a69a..dfa1b9f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.gui.coregui.server.gwt; @@ -463,4 +463,17 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements Re throw getExceptionToThrowToClient(t); } } + + @Override + public PageList<Resource> findGroupMemberCandidateResources(ResourceCriteria criteria, + int[] alreadySelectedResourceIds) throws RuntimeException { + try { + PageList<Resource> result = resourceManager.findGroupMemberCandidateResources(getSessionSubject(), + criteria, alreadySelectedResourceIds); + ObjectFilter.filterFieldsInCollection(result, importantFieldsSet); + return SerialUtility.prepare(result, "ResourceService.findResourcesByCriteria"); + } catch (Throwable t) { + throw getExceptionToThrowToClient(t); + } + } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java index e3a89a4..0c8594d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,11 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.server.resource; +import static org.rhq.core.domain.criteria.Criteria.Restriction.COLLECTION_ONLY; +import static org.rhq.core.domain.criteria.Criteria.Restriction.COUNT_ONLY; +import static org.rhq.enterprise.server.util.CriteriaQueryGenerator.getPageControl; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -30,6 +34,7 @@ import java.util.LinkedList; import java.util.List; import java.util.ListIterator; import java.util.Map; +import java.util.Set; import javax.ejb.EJB; import javax.ejb.Stateless; @@ -2921,4 +2926,47 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage return reports; } + @Override + public PageList<Resource> findGroupMemberCandidateResources(Subject subject, ResourceCriteria criteria, + int[] alreadySelectedResourceIds) { + + Set<Integer> alreadySelectedResourceIdSet = new HashSet<Integer>( + ArrayUtils.wrapInList(alreadySelectedResourceIds)); + + PageControl originalPageControl = getPageControl(criteria); + PageControl pageControl = (PageControl) originalPageControl.clone(); + criteria.setPageControl(pageControl); + + int requiredPageSize = pageControl.getPageSize(); + criteria.setRestriction(COUNT_ONLY); + int totalSize = findResourcesByCriteria(subject, criteria).getTotalSize(); + int totalPages = (totalSize / requiredPageSize) + (((totalSize % requiredPageSize) > 0) ? 1 : 0); + + criteria.setRestriction(COLLECTION_ONLY); + List<Resource> candidates = new LinkedList<Resource>(); + for (int pageNumber = 0; candidates.size() < requiredPageSize && pageNumber < totalPages; pageNumber++) { + pageControl.setPageNumber(pageNumber); + PageList<Resource> foundResources = findResourcesByCriteria(subject, criteria); + Collection<Resource> filteredResources = filterOutAlreadySelectedResources(foundResources, + alreadySelectedResourceIdSet); + + candidates.addAll(filteredResources); + } + if (candidates.size() > requiredPageSize) { + candidates = candidates.subList(0, requiredPageSize); + } + + return new PageList<Resource>(candidates, totalSize, originalPageControl); + } + + private Collection<Resource> filterOutAlreadySelectedResources(Collection<Resource> foundResources, + Collection<Integer> alreadySelectedResourceIds) { + List<Resource> result = new LinkedList<Resource>(); + for (Resource foundResource : foundResources) { + if (!alreadySelectedResourceIds.contains(foundResource.getId())) { + result.add(foundResource); + } + } + return result; + } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java index 0d4dd15..b6db0fd 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.enterprise.server.resource; @@ -54,7 +54,6 @@ import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.util.IntExtractor; import org.rhq.enterprise.server.resource.disambiguation.DisambiguationUpdateStrategy; -import org.rhq.enterprise.server.resource.disambiguation.Disambiguator; import org.rhq.enterprise.server.resource.group.ResourceGroupNotFoundException; /** @@ -220,16 +219,9 @@ public interface ResourceManagerLocal { PageList<Resource> findChildResourcesByCategoryAndInventoryStatus(Subject user, Resource parent, ResourceCategory category, InventoryStatus status, PageControl pageControl); - /** - * - * @see ResourceManagerRemote#findResourcesByCategory(Subject, ResourceCategory, InventoryStatus, PageControl) - */ PageList<Resource> findResourcesByCategory(Subject user, ResourceCategory category, InventoryStatus inventoryStatus, PageControl pageControl); - /** - * @see ResourceManagerRemote#findResourceComposites(Subject, ResourceCategory, String, int, String, PageControl) - */ PageList<ResourceComposite> findResourceComposites(Subject user, ResourceCategory category, String typeName, String pluginName, Resource parentResource, String searchString, boolean attachParentResource, PageControl pageControl); @@ -542,7 +534,6 @@ public interface ResourceManagerLocal { Resource getParentResource(Subject subject, int resourceId); /** - * @see Disambiguator#disambiguate(List, boolean, IntExtractor, javax.persistence.EntityManager) * @return the disambiguation result or null on error */ <T> List<DisambiguationReport<T>> disambiguate(List<T> results, IntExtractor<? super T> resourceIdExtractor, @@ -557,4 +548,7 @@ public interface ResourceManagerLocal { List<Integer> disableResources(Subject subject, int[] resourceIds); List<Integer> enableResources(Subject subject, int[] resourceIds); -} \ No newline at end of file + + PageList<Resource> findGroupMemberCandidateResources(Subject subject, ResourceCriteria criteria, + int[] alreadySelectedResourceIds); +}

1 0

[rhq] modules/core modules/enterprise modules/plugins
by snegrea 05 Jul '13

05 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java | 56 ++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java | 37 +-- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 104 ++++++---- modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java | 66 ++++++ modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java | 65 +++--- modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml | 9 6 files changed, 232 insertions(+), 105 deletions(-) New commits: commit c19b6ea19c342474b0cc43733fc8eec5ae1c955f Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Jul 4 02:47:49 2013 -0500 Update the way the percentage disk space use is calculated. It is now based on the aggregate usage of all the partitions that have data files. Also, this is based on the total disk use, not just Cassandra. Added an alert based on this metric. Added a new metric to the storage node composite that aggregates all the metrics that refer to storage related to Cassandra: data files, commit logs, row cache, and key cache. This will be used for CLI an web only, it will not be a plugin metric. Updated the plugin descriptor to collect metrics related to disk space usage. Minor other code refactorings and updates. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java index 379eba6..0913f1d 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java @@ -36,19 +36,20 @@ public class StorageNodeLoadComposite implements Serializable { private StorageNode storageNode; private long beginTime; private long endTime; - + private MeasurementAggregateWithUnits heapCommitted; private MeasurementAggregateWithUnits heapUsed; private MeasurementAggregateWithUnits heapPercentageUsed; private MeasurementAggregateWithUnits load; - private MeasurementAggregateWithUnits diskSpacePercentageUsed; - private MeasurementAggregate tokens; + private MeasurementAggregateWithUnits partitionDiskUsedPercentage; + private MeasurementAggregateWithUnits dataDiskUsed; + private MeasurementAggregate tokens; private MeasurementAggregateWithUnits actuallyOwns; public StorageNodeLoadComposite() { // GWT needs this } - + public StorageNodeLoadComposite(StorageNode storageNode, long beginTime, long endTime) { this.storageNode = storageNode; this.beginTime = beginTime; @@ -114,15 +115,26 @@ public class StorageNodeLoadComposite implements Serializable { } /** - * @return A computed metric for the space used on disk by all SSTables of all column families expressed as a - * percentage. + * @return A computed metric for the percentage of disk space used on the partition that contains the SSTables. + * If multiple data locations are configured then the partition with the highest utilization will be reported. */ - public MeasurementAggregateWithUnits getDiskSpacePercentageUsed() { - return diskSpacePercentageUsed; + public MeasurementAggregateWithUnits getPartitionDiskUsedPercentage() { + return partitionDiskUsedPercentage; } - public void setDiskSpacePercentageUsed(MeasurementAggregateWithUnits diskSpacePercentageUsed) { - this.diskSpacePercentageUsed = diskSpacePercentageUsed; + public void setPartitionDiskUsedPercentage(MeasurementAggregateWithUnits partitionDiskUsedPercentage) { + this.partitionDiskUsedPercentage = partitionDiskUsedPercentage; + } + + /** + * @return A computed metric for the space used on disk by all data files, commit logs, and saved caches. + */ + public MeasurementAggregateWithUnits getDataDiskUsed() { + return dataDiskUsed; + } + + public void setDataDiskUsed(MeasurementAggregateWithUnits dataDiskUsed) { + this.dataDiskUsed = dataDiskUsed; } /** @@ -161,38 +173,32 @@ public class StorageNodeLoadComposite implements Serializable { this.actuallyOwns = actuallyOwns; } + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ public String toString() { StringBuilder builder = new StringBuilder(); - // gwt doesn't support String.format -// builder.append("average values for last "); -// builder.append((endtime - begintime) / (1000 * 60 * 60)); -// builder.append(" hours"); -// builder.append("\naddress load tokens owns (effective)\n"); -// builder.append(string.format("%15s", storagenode.getaddress())); -// builder.append(string.format("%11s", load.getaggregate().getavg())).append(" ").append(load.getunits().getname()); -// builder.append(string.format("%8s", tokens.getavg())); -// builder.append(string.format("%16s", actuallyowns.getavg())); - builder.append("storageNode.addresss=").append(storageNode.getAddress()).append(", "); builder.append("beginTime=").append(beginTime).append(", "); builder.append("heapCommitted=").append(heapCommitted).append(", "); builder.append("heapUsed=").append(heapUsed).append(", "); builder.append("heapPercentageUsed=").append(heapPercentageUsed).append(", "); builder.append("load=").append(load).append(", "); - builder.append("diskSpacePercentageUsed=").append(diskSpacePercentageUsed).append(", "); + builder.append("partitionDiskUsedPercentage=").append(partitionDiskUsedPercentage).append(", "); + builder.append("dataDiskUsed=").append(dataDiskUsed).append(", "); builder.append("tokens=").append(tokens).append(", "); builder.append("actuallyOwns=").append(actuallyOwns); return builder.toString(); } - + public static class MeasurementAggregateWithUnits implements Serializable { private static final long serialVersionUID = 1L; - + private MeasurementAggregate aggregate; private MeasurementUnits units; private String formattedValue; - + public MeasurementAggregateWithUnits() { // GWT needs this } @@ -209,7 +215,7 @@ public class StorageNodeLoadComposite implements Serializable { public MeasurementUnits getUnits() { return units; } - + public void setFormattedValue(String formattedValue) { this.formattedValue = formattedValue; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java index f267602..7d413fd 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java @@ -61,7 +61,7 @@ import org.rhq.enterprise.server.measurement.util.MeasurementUtils; /** * Datasource for @see StorageNode. - * + * * @author Jirka Kremser */ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNodeCriteria> { @@ -104,7 +104,7 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod ListGridField createdTimeField = FIELD_CTIME.getListGridField("120"); TimestampCellFormatter.prepareDateField(createdTimeField); fields.add(createdTimeField); - + ListGridField lastUpdateTimeField = FIELD_MTIME.getListGridField("120"); TimestampCellFormatter.prepareDateField(lastUpdateTimeField); fields.add(lastUpdateTimeField); @@ -142,7 +142,7 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod */ @Override protected PageControl getPageControl(DSRequest request) { - // Initialize paging. + // Initialize paging. PageControl pageControl = new PageControl(0, getDataPageSize()); // Initialize sorting. @@ -197,7 +197,7 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod return criteria; } - + public static class StorageNodeLoadCompositeDatasource extends RPCDataSource<StorageNodeLoadComposite, StorageNodeCriteria> { public static final String HEAP_PERCENTAGE_KEY = "heapPercentage"; public static final String DISK_SPACE_PERCENTAGE_KEY = "diskSpacePercentage"; @@ -205,12 +205,12 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod public static StorageNodeLoadCompositeDatasource getInstance(int id) { // if (instance == null) { -// instance = + // instance = return new StorageNodeLoadCompositeDatasource(id); // } // return instance; } - + public StorageNodeLoadCompositeDatasource(int id) { super(); this.id = id; @@ -235,7 +235,7 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod fields.add(idField); return fields; } - + public List<ListGridField> getListGridFields() { List<ListGridField> fields = new ArrayList<ListGridField>(); ListGridField idField = FIELD_ID.getListGridField(); @@ -259,8 +259,7 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod fields.add(hoverField); return fields; } - - + @Override protected void executeFetch(final DSRequest request, final DSResponse response, StorageNodeCriteria criteria) { // Integer id = getFilter(request, FIELD_ID.propertyName(), Integer.class); @@ -286,7 +285,6 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod private ListGridRecord[] makeListGridRecords(StorageNodeLoadComposite loadComposite) { List<ListGridRecord> recordsList = new ArrayList<ListGridRecord>(6); - @SuppressWarnings("unchecked") List<List<Object>> loadFields = Arrays .<List<Object>> asList( Arrays.<Object> asList(loadComposite.getHeapCommitted(), "Heap Maximum", @@ -298,10 +296,16 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod "This value is calculated by dividing Heap Used by Heap Maximum.", HEAP_PERCENTAGE_KEY), Arrays.<Object> asList(loadComposite.getLoad(), "Load", "Data stored on the node", "load"), Arrays.<Object> asList( - loadComposite.getDiskSpacePercentageUsed(), + loadComposite.getPartitionDiskUsedPercentage(), "Disk Space Percent Used", - "How much of diskspace is already used. This takes into account the installation path, where Cassandra was installed.", - DISK_SPACE_PERCENTAGE_KEY), Arrays.<Object> asList(loadComposite.getActuallyOwns(), + "Percentage of total disk space used for the partition that contains the data files.If multiple data locations are specified then this will report the average utilization accross all the partitions.", + DISK_SPACE_PERCENTAGE_KEY), + Arrays.<Object> asList( + loadComposite.getDataDiskUsed(), + "Total Disk Space Used", + "Total space used on disk by all data files, commit logs, and saved caches.", + "totaldisk"), + Arrays.<Object> asList(loadComposite.getActuallyOwns(), "Ownership", "Refers to the percentage of keys that a node owns.", "ownership")); for (List<Object> aggregateWithUnitsList : loadFields) { if (aggregateWithUnitsList.get(0) != null) { @@ -346,14 +350,13 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod record.setAttribute("hover", hover); return record; } - - + @Override protected StorageNodeCriteria getFetchCriteria(DSRequest request) { return new StorageNodeCriteria(); // throw new UnsupportedOperationException("StorageNodeDatasource.StorageNodeLoadCompositeDatasource.getFetchCriteria()"); } - + @Override public StorageNodeLoadComposite copyValues(Record from) { throw new UnsupportedOperationException("StorageNodeDatasource.StorageNodeLoadCompositeDatasource.copyValues(Record from)"); @@ -363,6 +366,6 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNode, StorageNod public ListGridRecord copyValues(StorageNodeLoadComposite from) { throw new UnsupportedOperationException("StorageNodeDatasource.StorageNodeLoadCompositeDatasource.copyValues(StorageNodeLoadComposite from)"); } - + } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index b21946a..b76d054 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -332,71 +332,96 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @Override @RequiredPermission(Permission.MANAGE_SETTINGS) public StorageNodeLoadComposite getLoad(Subject subject, StorageNode node, long beginTime, long endTime) { - StorageNodeLoadComposite result = new StorageNodeLoadComposite(node, beginTime, endTime); - final String tokensMetric = "Tokens", ownershipMetric = "Ownership", loadMetric = "Load", diskUsedPercentageMetric = "Calculated.DiskSpaceUsedPercentage"; - final String heapCommittedMetric = "{HeapMemoryUsage.committed}", heapUsedMetric = "{HeapMemoryUsage.used}", heapUsedPercentageMetric = "Calculated.HeapUsagePercentage"; - int resourceId = getResourceIdFromStorageNode(node); + Map<String, Integer> scheduleIdsMap = new HashMap<String, Integer>(); // get the schedule ids for Storage Service resource + final String tokensMetric = "Tokens", ownershipMetric = "Ownership", diskUsedPercentageMetric = "Calculated.PartitionDiskUsedPercentage"; + final String loadMetric = "Load", keyCacheSize = "KeyCacheSize", rowCacheSize = "RowCacheSize", totalCommitLogSize = "TotalCommitlogSize"; TypedQuery<Object[]> query = entityManager.<Object[]> createNamedQuery( StorageNode.QUERY_FIND_SCHEDULE_IDS_BY_PARENT_RESOURCE_ID_AND_MEASUREMENT_DEFINITION_NAMES, Object[].class); query.setParameter("parrentId", resourceId).setParameter("metricNames", - Arrays.asList(tokensMetric, ownershipMetric, loadMetric, diskUsedPercentageMetric)); - List<Object[]> scheduleIds = query.getResultList(); - Map<String, Integer> scheduleIdsMap = new HashMap<String, Integer>(4); - for (Object[] pair : scheduleIds) { + Arrays.asList(tokensMetric, ownershipMetric, diskUsedPercentageMetric, loadMetric, keyCacheSize, + rowCacheSize, totalCommitLogSize)); + for (Object[] pair : query.getResultList()) { scheduleIdsMap.put((String) pair[0], (Integer) pair[1]); } // get the schedule ids for Memory Subsystem resource + final String heapCommittedMetric = "{HeapMemoryUsage.committed}", heapUsedMetric = "{HeapMemoryUsage.used}", heapUsedPercentageMetric = "Calculated.HeapUsagePercentage"; query = entityManager.<Object[]> createNamedQuery( StorageNode.QUERY_FIND_SCHEDULE_IDS_BY_GRANDPARENT_RESOURCE_ID_AND_MEASUREMENT_DEFINITION_NAMES, Object[].class); query.setParameter("grandparrentId", resourceId).setParameter("metricNames", Arrays.asList(heapCommittedMetric, heapUsedMetric, heapUsedPercentageMetric)); - scheduleIds = query.getResultList(); - for (Object[] pair : scheduleIds) { + for (Object[] pair : query.getResultList()) { scheduleIdsMap.put((String) pair[0], (Integer) pair[1]); } + + StorageNodeLoadComposite result = new StorageNodeLoadComposite(node, beginTime, endTime); + MeasurementAggregate totalDiskUsedaggregate = new MeasurementAggregate(0d, 0d, 0d); + Integer scheduleId = null; + // find the aggregates and enrich the result instance if (!scheduleIdsMap.isEmpty()) { - if (scheduleIdsMap.get(tokensMetric) != null) { - MeasurementAggregate tokensAggregate = measurementManager.getAggregate(subject, - scheduleIdsMap.get(tokensMetric), beginTime, endTime); + if ((scheduleId = scheduleIdsMap.get(tokensMetric)) != null) { + MeasurementAggregate tokensAggregate = measurementManager.getAggregate(subject, scheduleId, beginTime, + endTime); result.setTokens(tokensAggregate); } - if (scheduleIdsMap.get(ownershipMetric) != null) { + if ((scheduleId = scheduleIdsMap.get(ownershipMetric)) != null) { StorageNodeLoadComposite.MeasurementAggregateWithUnits ownershipAggregateWithUnits = getMeasurementAggregateWithUnits( - subject, scheduleIdsMap.get(ownershipMetric), MeasurementUnits.PERCENTAGE, beginTime, endTime); + subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); result.setActuallyOwns(ownershipAggregateWithUnits); } - if (scheduleIdsMap.get(loadMetric) != null) { + if ((scheduleId = scheduleIdsMap.get(diskUsedPercentageMetric)) != null) { + StorageNodeLoadComposite.MeasurementAggregateWithUnits diskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( + subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); + result.setPartitionDiskUsedPercentage(diskUsedPercentageAggregateWithUnits); + } + + if ((scheduleId = scheduleIdsMap.get(loadMetric)) != null) { StorageNodeLoadComposite.MeasurementAggregateWithUnits loadAggregateWithUnits = getMeasurementAggregateWithUnits( - subject, scheduleIdsMap.get(loadMetric), MeasurementUnits.BYTES, beginTime, endTime); + subject, scheduleId, MeasurementUnits.BYTES, beginTime, endTime); result.setLoad(loadAggregateWithUnits); + + updateAggregateTotal(totalDiskUsedaggregate, loadAggregateWithUnits.getAggregate()); } - if (scheduleIdsMap.get(diskUsedPercentageMetric) != null) { - StorageNodeLoadComposite.MeasurementAggregateWithUnits diskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( - subject, scheduleIdsMap.get(diskUsedPercentageMetric), MeasurementUnits.PERCENTAGE, beginTime, - endTime); - result.setDiskSpacePercentageUsed(diskUsedPercentageAggregateWithUnits); + if ((scheduleId = scheduleIdsMap.get(keyCacheSize)) != null) { + updateAggregateTotal(totalDiskUsedaggregate, + measurementManager.getAggregate(subject, scheduleId, beginTime, endTime)); + } + if ((scheduleId = scheduleIdsMap.get(rowCacheSize)) != null) { + updateAggregateTotal(totalDiskUsedaggregate, + measurementManager.getAggregate(subject, scheduleId, beginTime, endTime)); + } + if ((scheduleId = scheduleIdsMap.get(totalCommitLogSize)) != null) { + updateAggregateTotal(totalDiskUsedaggregate, + measurementManager.getAggregate(subject, scheduleId, beginTime, endTime)); + } + + if (totalDiskUsedaggregate.getMax() > 0) { + StorageNodeLoadComposite.MeasurementAggregateWithUnits totalDiskUsedAggregateWithUnits = new StorageNodeLoadComposite.MeasurementAggregateWithUnits( + totalDiskUsedaggregate, MeasurementUnits.BYTES); + totalDiskUsedAggregateWithUnits.setFormattedValue(getSummaryString(totalDiskUsedaggregate, + MeasurementUnits.BYTES)); + result.setDataDiskUsed(totalDiskUsedAggregateWithUnits); } - if (scheduleIdsMap.get(heapCommittedMetric) != null) { + if ((scheduleId = scheduleIdsMap.get(heapCommittedMetric)) != null) { StorageNodeLoadComposite.MeasurementAggregateWithUnits heapCommittedAggregateWithUnits = getMeasurementAggregateWithUnits( - subject, scheduleIdsMap.get(heapCommittedMetric), MeasurementUnits.BYTES, beginTime, endTime); + subject, scheduleId, MeasurementUnits.BYTES, beginTime, endTime); result.setHeapCommitted(heapCommittedAggregateWithUnits); } - if (scheduleIdsMap.get(heapUsedMetric) != null) { + if ((scheduleId = scheduleIdsMap.get(heapUsedMetric)) != null) { StorageNodeLoadComposite.MeasurementAggregateWithUnits heapUsedAggregateWithUnits = getMeasurementAggregateWithUnits( - subject, scheduleIdsMap.get(heapUsedMetric), MeasurementUnits.BYTES, beginTime, endTime); + subject, scheduleId, MeasurementUnits.BYTES, beginTime, endTime); result.setHeapUsed(heapUsedAggregateWithUnits); } - if (scheduleIdsMap.get(heapUsedPercentageMetric) != null) { + if ((scheduleId = scheduleIdsMap.get(heapUsedPercentageMetric)) != null) { StorageNodeLoadComposite.MeasurementAggregateWithUnits heapUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits( - subject, scheduleIdsMap.get(heapUsedPercentageMetric), MeasurementUnits.PERCENTAGE, beginTime, + subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime, endTime); result.setHeapPercentageUsed(heapUsedPercentageAggregateWithUnits); } @@ -405,13 +430,28 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return result; } + /** + * @param accumulator + * @param input + */ + private void updateAggregateTotal(MeasurementAggregate accumulator, MeasurementAggregate input) { + if (accumulator != null && input != null + && input.getMax() != null && !Double.isNaN(input.getMax()) + && input.getMin() != null && !Double.isNaN(input.getMin()) + && input.getAvg() != null && !Double.isNaN(input.getAvg())) { + accumulator.setAvg(accumulator.getAvg() + input.getAvg()); + accumulator.setMax(accumulator.getMax() + input.getMax()); + accumulator.setMin(accumulator.getMin() + input.getMin()); + } + } + @Override public List<StorageNode> getStorageNodes() { TypedQuery<StorageNode> query = entityManager.<StorageNode> createNamedQuery(StorageNode.QUERY_FIND_ALL, StorageNode.class); return query.getResultList(); } - + @Override @RequiredPermission(Permission.MANAGE_SETTINGS) public PageList<StorageNode> findStorageNodesByCriteria(Subject subject, StorageNodeCriteria criteria) { @@ -432,7 +472,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN Server server = serverManager.getServer(); // setting the server mode to maintenance topologyManager.updateServerMode(subject, new Integer[] { server.getId() }, Server.OperationMode.MAINTENANCE); - + Configuration parameters = new Configuration(); parameters.setSimpleValue("snapshotName", String.valueOf(System.currentTimeMillis())); // scheduling the operation @@ -543,7 +583,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN } } } - + private StorageNodeLoadComposite.MeasurementAggregateWithUnits getMeasurementAggregateWithUnits(Subject subject, int schedId, MeasurementUnits units, long beginTime, long endTime) { MeasurementAggregate measurementAggregate = measurementManager.getAggregate(subject, schedId, beginTime, @@ -553,7 +593,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN measurementAggregateWithUnits.setFormattedValue(getSummaryString(measurementAggregate, units)); return measurementAggregateWithUnits; } - + private int getResourceIdFromStorageNode(StorageNode storageNode) { int resourceId; if (storageNode.getResource() == null) { diff --git a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java index 566dfe2..1cff654 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java +++ b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java @@ -54,15 +54,19 @@ import org.rhq.enterprise.server.util.LookupUtil; /** * An alert definition server-side plugin component that the server uses to inject "factory-installed" alert definitions. - * + * * @author Jay Shaughnessy */ public class AlertDefinitionServerPluginComponent implements ServerPluginComponent, ControlFacet { private final Log log = LogFactory.getLog(AlertDefinitionServerPluginComponent.class); + private static final String PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.PartitionDiskUsedPercentage"; + private static final String DATA_FILE_LOCATIONS_NAME = "AllDataFileLocations"; + static private final List<InjectedTemplate> injectedTemplates; static private final InjectedTemplate storageNodeHighHeapTemplate; + static private final InjectedTemplate storageNodeHighDiskUsageTemplate; static { storageNodeHighHeapTemplate = new InjectedTemplate( @@ -71,8 +75,15 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone "StorageNodeHighHeapTemplate", // "An alert template to notify users of excessive heap use by an RHQ Storage Node. When fired please see documentation for the proper corrective action."); + storageNodeHighDiskUsageTemplate = new InjectedTemplate( + "RHQStorage", // + "StorageService", // + "StorageNodeHighDiskUsageTemplate", // + "An alert template to notify users of excessive heap use by an RHQ Storage Node. When fired please see documentation for the proper corrective action."); + injectedTemplates = new ArrayList<InjectedTemplate>(); injectedTemplates.add(storageNodeHighHeapTemplate); + injectedTemplates.add(storageNodeHighDiskUsageTemplate); } private ServerPluginContext context; @@ -213,6 +224,8 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone if (storageNodeHighHeapTemplate.equals(injectedAlertDef)) { newAlertDefId = injectStorageNodeHighHeapTemplate(resourceType); + } else if (storageNodeHighDiskUsageTemplate.equals(injectedAlertDef)) { + newAlertDefId = injectStorageNodeHighDiskUsageTemplate(resourceType); } adc.addFilterId(newAlertDefId); @@ -273,6 +286,57 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone return newTemplateId; } + private int injectStorageNodeHighDiskUsageTemplate(ResourceType resourceType) { + AlertTemplateManagerLocal alertTemplateManager = LookupUtil.getAlertTemplateManager(); + SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager(); + + AlertDefinition newTemplate = new AlertDefinition(); + newTemplate.setName(storageNodeHighDiskUsageTemplate.getName()); + newTemplate.setResourceType(resourceType); + newTemplate.setPriority(AlertPriority.MEDIUM); + newTemplate.setConditionExpression(BooleanExpression.ANY); + newTemplate.setRecoveryId(0); + newTemplate.setEnabled(true); + + AlertCondition ac = new AlertCondition(); + ac.setCategory(AlertConditionCategory.THRESHOLD); + ac.setComparator(">"); + ac.setThreshold(0.75D); + + List<Integer> measurementDefinitionIds = new ArrayList<Integer>(1); + for (MeasurementDefinition d : resourceType.getMetricDefinitions()) { + if (PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME.equals(d.getName())) { + measurementDefinitionIds.add(d.getId()); + ac.setMeasurementDefinition(d); + ac.setName(d.getDisplayName()); + } else if (DATA_FILE_LOCATIONS_NAME.equals(d.getName())) { + measurementDefinitionIds.add(d.getId()); + } + } + assert null != ac.getMeasurementDefinition() : "Did not find expected measurement definition " + + PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME + " for " + + resourceType; + newTemplate.addCondition(ac); + + AlertDampening dampener = new AlertDampening(AlertDampening.Category.PARTIAL_COUNT); + dampener.setPeriod(15); + dampener.setPeriodUnits(TimeUnits.MINUTES); + dampener.setValue(10); + newTemplate.setAlertDampening(dampener); + + int newTemplateId = alertTemplateManager.createAlertTemplate(subjectManager.getOverlord(), newTemplate, + resourceType.getId()); + + // additionally, we want to ensure that the metric is enabled and collecting at a more frequent interval than + // is set by default. + MeasurementScheduleManagerLocal measurementManager = LookupUtil.getMeasurementScheduleManager(); + measurementManager.updateDefaultCollectionIntervalAndEnablementForMeasurementDefinitions( + subjectManager.getOverlord(), ArrayUtils.toPrimitive(measurementDefinitionIds.toArray(new Integer[2])), + 60000L, true, true); + + return newTemplateId; + } + private static class InjectedTemplate { static public final String FIELD_PLUGIN_NAME = "plugin"; static public final String FIELD_RESOURCE_TYPE_NAME = "type"; diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java index b2987be..7281f9b 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java @@ -29,9 +29,10 @@ import static org.rhq.core.domain.measurement.AvailabilityType.DOWN; import static org.rhq.core.domain.measurement.AvailabilityType.UNKNOWN; import static org.rhq.core.domain.measurement.AvailabilityType.UP; -import java.io.File; import java.net.InetAddress; import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.Set; @@ -48,19 +49,20 @@ import org.rhq.core.domain.measurement.MeasurementReport; import org.rhq.core.domain.measurement.MeasurementScheduleRequest; import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.system.FileSystemInfo; import org.rhq.plugins.jmx.JMXComponent; /** * @author John Sanda */ public class StorageServiceComponent extends ComplexConfigurationResourceComponent { - + private static final String OWNERSHIP_METRIC_NAME = "Ownership"; - private static final String DISK_USED_METRIC_NAME = "Calculated.DiskSpaceUsedPercentage"; + private static final String PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.PartitionDiskUsedPercentage"; private static final String DATA_FILE_LOCATIONS_NAME = "AllDataFileLocations"; private Log log = LogFactory.getLog(StorageServiceComponent.class); private InetAddress host; - + @Override public void start(ResourceContext<JMXComponent<?>> context) { super.start(context); @@ -73,7 +75,7 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone e); } } - + @Override public AvailabilityType getAvailability() { ResourceContext<?> context = getResourceContext(); @@ -148,7 +150,7 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone return new OperationResult(); } - + @Override protected void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests, EmsBean bean) { super.getValues(report, requests, bean); @@ -175,32 +177,43 @@ public class StorageServiceComponent extends ComplexConfigurationResourceCompone report.addData(new MeasurementDataNumeric(request, value.doubleValue())); } break; - } else if (DISK_USED_METRIC_NAME.equals(request.getName())) { + } else if (PARTITION_DISK_USED_PERCENTAGE_METRIC_NAME.equals(request.getName())) { EmsAttribute attribute = bean.getAttribute(DATA_FILE_LOCATIONS_NAME); Object valueObject = attribute.refresh(); if (valueObject instanceof String[]) { - String[] paths = (String[]) valueObject; - double max = 0; - for (String path : paths) { - double taken = getUsage(path); - if (taken > max) { - max = taken; - } - } - if (max > 0.0001d) { - report.addData(new MeasurementDataNumeric(request, max)); - } + //Please visit for details: https://issues.apache.org/jira/browse/CASSANDRA-2749 + //The average usage of all partitions with the data will be reported. + //Cassandra selects the partition with most free space for SStable flush and compaction. + report.addData(new MeasurementDataNumeric(request, + getPartitionDiskUsedPercentage((String[]) valueObject))); } } } } - - private double getUsage(String path) { - File f = new File(path); - return ((double)f.getTotalSpace() - f.getUsableSpace()) / f.getTotalSpace(); - } - - public static boolean kindOfIP(final String addr) { - return addr.matches("^\\d{1,3}\\.\\d{1,3\\.\\d{1,3\\.\\d{1,3$"); // || addr.indexOf(":") >= 0) or IPv6 + + private double getPartitionDiskUsedPercentage(String[] paths) { + List<String> visitedMountPoints = new ArrayList<String>(); + long totalDiskSpace = 0; + long totalUsedDiskSpace = 0; + + for (String path : paths) { + try { + FileSystemInfo fileSystemInfo = this.getResourceContext().getSystemInformation().getFileSystem(path); + if (!visitedMountPoints.contains(fileSystemInfo.getMountPoint())) { + visitedMountPoints.add(fileSystemInfo.getMountPoint()); + totalDiskSpace += fileSystemInfo.getFileSystemUsage().getTotal(); + totalUsedDiskSpace += fileSystemInfo.getFileSystemUsage().getUsed(); + } + } catch (Exception e) { + log.error("Unable to determine file system usage information for data file location " + path, e); + } + } + + if (totalDiskSpace != 0) { + double rawPercentage = ((double) totalUsedDiskSpace) / ((double) totalDiskSpace); + return Math.round(rawPercentage * 100.0) / 100.0; + } + + return 0; } } diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml index ebaef94..cac0a8d 100644 --- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml @@ -183,7 +183,8 @@ </operation> <metric property="CurrentGenerationNumber" dataType="trait" displayType="summary" description="Current generation number"/> - <metric property="Calculated.DiskSpaceUsedPercentage" dataType="measurement" units="percentage" displayType="summary" description="How much of diskspace is already used. This takes into account the installation path, where Cassandra was installed."/> + <metric property="Calculated.PartitionDiskUsedPercentage" dataType="measurement" units="percentage" displayType="summary" description="Percentage of total disk space used for the partition that contains the data files. + If multiple data locations are specified then this will report the average utilization accross all the partitions."/> <metric property="ExceptionCount" measurementType="trendsup" dataType="measurement" displayType="summary" description="Exception Count"/> <metric property="Initialized" dataType="trait" displayType="summary" description="Initialized"/> <metric property="Joined" dataType="trait" displayType="summary" description="Joined"/> @@ -272,7 +273,7 @@ <c:simple-property name="nameTemplate" readOnly="true" type="string" default="Commit Log" /> </plugin-configuration> - <metric property="TotalCommitlogSize" measurementType="trendsup" dataType="measurement" displayType="summary" description="Size of all commit log segments"/> + <metric property="TotalCommitlogSize" measurementType="dynamic" displayType="summary" description="Size of all commit log segments"/> <metric property="PendingTasks" measurementType="dynamic" displayType="summary" description="Number of tasks waiting to be executed"/> <metric property="CompletedTasks" measurementType="trendsup" displayType="summary" description="Number of completed tasks"/> </service> @@ -393,8 +394,8 @@ <metric property="KeyCacheCapacityInBytes" measurementType="dynamic" displayType="summary" description="Key cache capacity in bytes"/> <metric property="RowCacheCapacityInBytes" measurementType="dynamic" displayType="summary" description="Row cache capacity in bytes"/> - <metric property="KeyCacheSize" measurementType="dynamic" displayType="detail" description="Key cache size"/> - <metric property="RowCacheSize" measurementType="dynamic" displayType="detail" description="Row cache size"/> + <metric property="KeyCacheSize" measurementType="dynamic" displayType="summary" description="Key cache size"/> + <metric property="RowCacheSize" measurementType="dynamic" displayType="summary" description="Row cache size"/> <resource-configuration> <c:simple-property name="KeyCacheCapacityInMB" type="long" required="true" displayName="Key Cache Capacity In MB" description="Key cache capacity in MB"/>

1 0

[rhq] modules/enterprise
by John Sanda 04 Jul '13

04 Jul '13

modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java | 55 +++++++--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 7 - 2 files changed, 46 insertions(+), 16 deletions(-) New commits: commit dc028de9772aa70f64b7e817c38fd2f9a64d5135 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Jul 4 07:29:32 2013 -0400 fix failing test Now that StorageNodeManagerBean creates the storage node resource group, the group has to be deleted during test runs. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java index d45ae90..d44d637 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBeanTest.java @@ -25,6 +25,10 @@ package org.rhq.enterprise.server.cloud; +import static org.rhq.enterprise.server.cloud.StorageNodeManagerBean.STORAGE_NODE_GROUP_NAME; +import static org.rhq.enterprise.server.cloud.StorageNodeManagerBean.STORAGE_NODE_PLUGIN_NAME; +import static org.rhq.enterprise.server.cloud.StorageNodeManagerBean.STORAGE_NODE_RESOURCE_TYPE_NAME; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -32,27 +36,30 @@ import java.util.List; import java.util.Set; import java.util.UUID; +import javax.ejb.EJB; import javax.persistence.Query; import javax.transaction.Transaction; import org.testng.Assert; import org.testng.annotations.Test; -import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple; import org.rhq.core.domain.configuration.definition.PropertySimpleType; +import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; +import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; +import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; import org.rhq.enterprise.server.test.AbstractEJB3Test; import org.rhq.enterprise.server.test.TransactionCallback; -import org.rhq.enterprise.server.util.LookupUtil; /** * @author Jirka Kremser @@ -60,17 +67,19 @@ import org.rhq.enterprise.server.util.LookupUtil; @Test public class StorageNodeManagerBeanTest extends AbstractEJB3Test { + @EJB private StorageNodeManagerLocal nodeManager; + + @EJB private ResourceTypeManagerLocal typeManager; - private Subject overlord; - private static final String TEST_PREFIX = "test-"; - @Override - protected void beforeMethod() throws Exception { - nodeManager = LookupUtil.getStorageNodeManager(); - typeManager = LookupUtil.getResourceTypeManager(); - overlord = LookupUtil.getSubjectManager().getOverlord(); - } + @EJB + private ResourceGroupManagerLocal resourceGroupManager; + + @EJB + private SubjectManagerLocal subjectManager; + + private static final String TEST_PREFIX = "test-"; @Test public void testInit() throws Exception { @@ -79,6 +88,7 @@ public class StorageNodeManagerBeanTest extends AbstractEJB3Test { try { prepareScheduler(); + cleanDatabase(); executeInTransaction(new TransactionCallback() { @Override @@ -89,8 +99,6 @@ public class StorageNodeManagerBeanTest extends AbstractEJB3Test { System.setProperty(cassandraSeedsProperty, addresses.get(0) + "|123|123," + addresses.get(1) + "|987|987," + addresses.get(2) + "|123|123"); - cleanDatabase(); - // create the resource type if it doesn't exist ResourceType testResourceType = typeManager.getResourceTypeByNameAndPlugin("RHQ Storage Node", "RHQStorage"); @@ -175,7 +183,8 @@ public class StorageNodeManagerBeanTest extends AbstractEJB3Test { criteria.addFilterAddress(prefix); // use DESC just to make sure sorting on name is different than insert order criteria.addSortAddress(PageOrdering.DESC); - PageList<StorageNode> list = nodeManager.findStorageNodesByCriteria(overlord, criteria); + PageList<StorageNode> list = nodeManager.findStorageNodesByCriteria(subjectManager.getOverlord(), + criteria); assertTrue("The number of found storage nodes should be " + storageNodeCount + ". Was: " + list.size(), storageNodeCount == list.size()); @@ -205,6 +214,26 @@ public class StorageNodeManagerBeanTest extends AbstractEJB3Test { // this method is still needed, because tests calls SLSB methods that are executed in their own transaction // and the rollback performed once the TransactionCallback is finished just wont clean everything + // We can only filter on the group name because the resource type info might not exist in the test + // database. + ResourceGroupCriteria criteria = new ResourceGroupCriteria(); + criteria.addFilterName(STORAGE_NODE_GROUP_NAME); + + List<ResourceGroup> groups = resourceGroupManager.findResourceGroupsByCriteria(subjectManager.getOverlord(), + criteria); + + if (!groups.isEmpty()) { + resourceGroupManager.deleteResourceGroup(subjectManager.getOverlord(), groups.get(0).getId()); + } + +// for (ResourceGroup group : groups) { +// if (group.getName().equals(STORAGE_NODE_GROUP_NAME)) { +// resourceGroupManager.deleteResourceGroup(subjectManager.getOverlord(), group.getId()); +// break; +// } +// } + + // pause the currently running TX Transaction runningTransaction = getTransactionManager().suspend(); getTransactionManager().begin(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 874be1e..b21946a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -97,11 +97,12 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private static final String SEEDS_PROP = "rhq.cassandra.seeds"; - private static final String STORAGE_NODE_GROUP_NAME = "RHQ Storage Nodes"; + // The following have package visibility to make accessible to StorageNodeManagerBeanTest + static final String STORAGE_NODE_GROUP_NAME = "RHQ Storage Nodes"; - private static final String STORAGE_NODE_RESOURCE_TYPE_NAME = "RHQ Storage Node"; + static final String STORAGE_NODE_RESOURCE_TYPE_NAME = "RHQ Storage Node"; - private static final String STORAGE_NODE_PLUGIN_NAME = "RHQStorage"; + static final String STORAGE_NODE_PLUGIN_NAME = "RHQStorage"; @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) private EntityManager entityManager;

1 0

[rhq] Branch 'mtho11/d3-multiline-graph' - modules/enterprise
by mike thompson 03 Jul '13

03 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java | 105 +++------- 3 files changed, 46 insertions(+), 69 deletions(-) New commits: commit 114df45068fad339dc06508633e3aaee2e000e07 Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Jul 3 15:33:11 2013 -0700 Second iteration at new Multi-resource graph using d3 instead of nvd3. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java index f81fb4f..0178f93 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java @@ -171,7 +171,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { lowBound = determineLowBound(min, peak); highBound = peak + ((peak - min) * 0.1); oobMax = $wnd.d3.max(chartContext.data.map(function (d) { - if (d.baselineMax == undefined) { + if (typeof d.baselineMax === 'undefined') { return 0; } else { @@ -216,7 +216,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { .attr("height", height + margin.top - titleHeight - titleSpace + margin.bottom) .attr("transform", "translate(" + margin.left + "," + (+titleHeight + titleSpace + margin.top) + ")"); - legendUnDefined = (typeof min === undefined) || (typeof avg === undefined) || (typeof peak === undefined); + legendUnDefined = (typeof min === 'undefined') || (typeof avg === 'undefined') || (typeof peak === 'undefined'); if (!useSmallCharts() && !legendUnDefined) { createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits); } @@ -711,7 +711,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { }; // end public closure }(); - if(chartContext.data !== undefined && chartContext.data.length > 0){ + if(typeof chartContext.data !== 'undefined' && chartContext.data.length > 0){ metricStackedBarGraph.draw(chartContext); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index 1ca63ce..7a4232a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -339,7 +339,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl } public int getChartHeight() { - return chartHeight != null ? chartHeight : 210; + return chartHeight != null ? chartHeight : 300; } public void setChartHeight(Integer chartHeight) { @@ -369,7 +369,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl for (MultiLineGraphData multiLineGraphData : measurementForEachResource) { sb.append("{ \"key\": \""); sb.append(multiLineGraphData.getResourceName()); - sb.append("\",\"values\" : "); + sb.append("\",\"value\" : "); sb.append(produceInnerValuesArray(multiLineGraphData.getMeasurementData())); sb.append("},"); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java index 9d595a7..be6d110 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java @@ -92,11 +92,6 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie adjustedChartHeight = chartContext.chartHeight - 50, height = adjustedChartHeight - margin.top - margin.bottom, titleHeight = 30, titleSpace = 10, - chartData, - lowBound, - min, high, - newLow = 0, - highBound, yScale, yAxis, timeScale, @@ -104,40 +99,21 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie chart, svg; - // adjust the min scale so blue low line is not in axis - function determineLowBound(min, peak) { - //var newLow = min - ((peak - min) * 0.1); - newLow = min; - if (newLow < 0) { - return 0; - } - else { - return newLow; - } - } - function determineScale() { var xTicks, xTickSubDivide; - console.log("DetermineScale!"); + console.log("DetermineScale for # resources: "+ chartContext.data.length); if (chartContext.data.length > 0) { xTicks = 8; xTickSubDivide = 5; - chartData = chartContext.data; - min = $wnd.d3.min(function (d) { - return d.y; - }); - high = $wnd.d3.max(function (d) { - return d.y; - }); yScale = $wnd.d3.scale.linear() .clamp(true) .rangeRound([height, 0]) - .domain([$wnd.d3.min(chartContext.data, function (d) { + .domain([$wnd.d3.min(chartContext.data[0], function (d) { return d.y; - }), $wnd.d3.max(chartContext.data, function (d) { + }), $wnd.d3.max(chartContext.data[0], function (d) { return d.y; })]); @@ -151,7 +127,7 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie timeScale = $wnd.d3.time.scale() .range([0, width]) - .domain($wnd.d3.extent(chartData, function (d) { + .domain($wnd.d3.extent(chartContext.data[0], function (d) { return d.x; })); @@ -187,33 +163,33 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } function createXandYAxes() { -// var customTimeFormat = timeFormat([ -// [$wnd.d3.time.format("%Y"), function () { -// return true; -// }], -// [$wnd.d3.time.format("%B"), function (d) { -// return d.getMonth(); -// }], -// [$wnd.d3.time.format("%b %d"), function (d) { -// return d.getDate() != 1; -// }], -// [$wnd.d3.time.format("%a %d"), function (d) { -// return d.getDay() && d.getDate() != 1; -// }], -// [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHours), function (d) { -// return d.getHours(); -// }], -// [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHoursMinutes), function (d) { -// return d.getMinutes(); -// }], -// [$wnd.d3.time.format(":%S"), function (d) { -// return d.getSeconds(); -// }], -// [$wnd.d3.time.format(".%L"), function (d) { -// return d.getMilliseconds(); -// }] -// ]); -// xAxis.tickFormat(customTimeFormat); + var customTimeFormat = timeFormat([ + [$wnd.d3.time.format("%Y"), function () { + return true; + }], + [$wnd.d3.time.format("%B"), function (d) { + return d.getMonth(); + }], + [$wnd.d3.time.format("%b %d"), function (d) { + return d.getDate() != 1; + }], + [$wnd.d3.time.format("%a %d"), function (d) { + return d.getDay() && d.getDate() != 1; + }], + [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHours), function (d) { + return d.getHours(); + }], + [$wnd.d3.time.format(chartContext.chartXaxisTimeFormatHoursMinutes), function (d) { + return d.getMinutes(); + }], + [$wnd.d3.time.format(":%S"), function (d) { + return d.getSeconds(); + }], + [$wnd.d3.time.format(".%L"), function (d) { + return d.getMilliseconds(); + }] + ]); + xAxis.tickFormat(customTimeFormat); // create x-axis svg.append("g") @@ -269,8 +245,8 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie } - function createAvgLines() { - var barAvgLine = $wnd.d3.svg.line() + function createMultiLines(chartContext) { + var graphLine = $wnd.d3.svg.line() .interpolate("linear") .x(function (d) { return timeScale(d.x); @@ -279,15 +255,16 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie return yScale(d.y); }); - // Bar avg line - svg.append("path") - .datum(chartData) - .attr("class", "barAvgLine") + chart.selectAll(".multiLine") + .data(chartContext.data) + .enter() + .append('path') + .attr("class", "multiLine") .attr("fill", "none") .attr("stroke", "#2e376a") .attr("stroke-width", "1.5") - .attr("stroke-opacity", ".7") - .attr("d", barAvgLine); + .attr("stroke-opacity", ".9") + .attr("d", function(d) { return graphLine(d.value);}); } @@ -305,7 +282,7 @@ public class CompositeGroupD3MultiLineGraph extends CompositeGroupD3GraphListVie createHeader(chartContext.chartTitle); console.log("created multi-header"); createYAxisGridLines(); - createAvgLines(); + createMultiLines(chartContext); createXandYAxes(); } }

1 0

[rhq] 2 commits - modules/common modules/enterprise modules/plugins
by John Sanda 03 Jul '13

03 Jul '13

modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java | 2 modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/src/main/java/org/rhq/cassandra/ccm/maven/DeployMojo.java | 2 modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java | 2 modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java | 6 modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/TopologyManager.java | 34 +- modules/common/cassandra-schema/src/main/resources/topology/0001.xml | 5 modules/common/cassandra-schema/src/main/resources/topology/0002.xml | 26 - modules/common/cassandra-schema/src/main/resources/topology/create/0001.xml | 5 modules/common/cassandra-schema/src/main/resources/topology/create/0002.xml | 26 + modules/common/cassandra-schema/src/main/resources/topology/update/0001.xml | 9 modules/common/cassandra-schema/src/main/resources/topology/update/0002.xml | 26 + modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 20 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java | 164 +++++----- modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 2 16 files changed, 202 insertions(+), 139 deletions(-) New commits: commit 95a9f222e3d047fe335fee7c2d305c7ffe18518b Author: John Sanda <jsanda(a)redhat.com> Date: Wed Jul 3 14:54:03 2013 -0400 big refactoring of the work that is done when a new storage node is committed to inventory Here is a run down of the changes. * fix endpoint comparisons There was a bug in StorageModeMaintenanceJob.waitForClustering where it was comparing the string form of an ip address against a PropertySimple.toString. It should be comparing the value of the property. * schedule the addNodeMaintenance op as a group operation StorageNodeMaintenanceJob now schedules the operations for each storage node as a group operation instead of as individual operations. This allows us to remove a lot of code around waiting for operations to complete before scheduling the next one. More importantly, the previous implementation was not blocking until each operation completed which resulted in repair operations running across multiple nodes simultenously. We definitely want to run repair on the nodes serially. Scheduling the work as a group operation handles that for us. Scheduling the work as a group operation required a slight change to StorageNodeManagerBean.linkResource. The resource has to be added to the group before the quartz job is scheduled. Logic needs to be added to verify that the node has actually joined to cluster before adding it to the group. * add logic to detect when repair needs to run There is logic in place now to determine whether or not repair needs to run. Previously, we would run repair against each node whenever StorageNodeMaintenanceJob would run. We only want to run repair if and when we have to since it is a very resource intensive operation. * Add logic back to update replication_factor of system_auth keyspace I had previously changed the logic in TopologyManager to *not* update the RF of the system_auth keyspace. For an multi-node installation, we would increase the RF of system_auth because the change was made after the rhqadmin user was created. Without running repair this results in inconsistent reads which in turns leads to failed authentication. When StorageNodeMaintenanceJob runs we do want to update the RF of both the system_auth and rhq keysapces. I have refactored TopologyManager so that system_auth gets updated. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java index d307f0b..a86c49e 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/src/main/java/org/rhq/cassandra/ccm/arquillian/CCMSuiteDeploymentExtension.java @@ -159,7 +159,7 @@ public class CCMSuiteDeploymentExtension implements LoadableExtension { try { schemaManager.install(); clusterInitService.waitForSchemaAgreement(nodes); - schemaManager.updateTopology(); + schemaManager.updateTopology(true); } catch (Exception e) { if (null != ccm) { ccm.shutdownCluster(); diff --git a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/src/main/java/org/rhq/cassandra/ccm/maven/DeployMojo.java b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/src/main/java/org/rhq/cassandra/ccm/maven/DeployMojo.java index f50535c..b84018f 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/src/main/java/org/rhq/cassandra/ccm/maven/DeployMojo.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/src/main/java/org/rhq/cassandra/ccm/maven/DeployMojo.java @@ -74,7 +74,7 @@ public class DeployMojo extends AbstractMojo { try { schemaManager.install(); - schemaManager.updateTopology(); + schemaManager.updateTopology(true); } catch (Exception e) { throw new MojoExecutionException("Schema installation failed.", e); } diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java b/modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java index a9292f7..38d5337 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java @@ -129,7 +129,7 @@ public class CCMTestNGListener implements IInvokedMethodListener { if (annotation.waitForSchemaAgreement()) { clusterInitService.waitForSchemaAgreement(nodes); } - schemaManager.updateTopology(); + schemaManager.updateTopology(true); } private void shutdownCluster() throws Exception { diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java index 8f8c47e..8f67ab3 100644 --- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java @@ -93,9 +93,9 @@ public class SchemaManager { version.drop(); } - public boolean updateTopology() throws Exception { + public boolean updateTopology(boolean isNewSchema) throws Exception { TopologyManager topology = new TopologyManager(username, password, nodes); - return topology.updateTopology(); + return topology.updateTopology(isNewSchema); } private static List<StorageNode> parseNodeInformation(String... nodes) { @@ -139,7 +139,7 @@ public class SchemaManager { } else if ("drop".equalsIgnoreCase(command)) { schemaManager.drop(); } else if ("topology".equalsIgnoreCase(command)) { - schemaManager.updateTopology(); + schemaManager.updateTopology(true); } else { throw new IllegalArgumentException(command + " not available."); } diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/TopologyManager.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/TopologyManager.java index 850c383..fd987a1 100644 --- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/TopologyManager.java +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/TopologyManager.java @@ -55,8 +55,12 @@ public class TopologyManager extends AbstractManager { this.file = file; } - protected String getFile() { - return TOPOLOGY_BASE_FOLDER + "/" + this.file; + protected String getFile(boolean isNewSchema) { + if (isNewSchema) { + return TOPOLOGY_BASE_FOLDER + "/create/" + this.file; + } + + return TOPOLOGY_BASE_FOLDER + "/update/" + this.file; } } @@ -64,14 +68,14 @@ public class TopologyManager extends AbstractManager { super(username, password, nodes); } - public boolean updateTopology() throws Exception { + public boolean updateTopology(boolean isNewSchema) throws Exception { boolean result = false; initCluster(); if (schemaExists()) { log.info("Applying topology updates..."); - result = this.updateReplicationFactor(nodes.size()); - this.updateGCGrace(nodes.size()); + result = this.updateReplicationFactor(isNewSchema, nodes.size()); + this.updateGCGrace(isNewSchema, nodes.size()); } else { log.info("Topology updates cannot be applied because the schema is not installed."); } @@ -80,7 +84,7 @@ public class TopologyManager extends AbstractManager { return result; } - private boolean updateReplicationFactor(int numberOfNodes) throws Exception { + private boolean updateReplicationFactor(boolean isNewSchema, int numberOfNodes) throws Exception { log.info("Starting to execute " + Task.UpdateReplicationFactor + " task."); int replicationFactor = 1; @@ -97,19 +101,19 @@ public class TopologyManager extends AbstractManager { return false; } - log.info("Applying file " + Task.UpdateReplicationFactor.getFile() + " for " + Task.UpdateReplicationFactor - + " task."); - for (String query : this.getSteps(Task.UpdateReplicationFactor.getFile())) { + log.info("Applying file " + Task.UpdateReplicationFactor.getFile(isNewSchema) + " for " + + Task.UpdateReplicationFactor + " task."); + for (String query : this.getSteps(Task.UpdateReplicationFactor.getFile(isNewSchema))) { executedPreparedStatement(query, replicationFactor); } - log.info("File " + Task.UpdateReplicationFactor.getFile() + " applied for " + Task.UpdateReplicationFactor - + " task."); + log.info("File " + Task.UpdateReplicationFactor.getFile(isNewSchema) + " applied for " + + Task.UpdateReplicationFactor + " task."); log.info("Successfully executed " + Task.UpdateReplicationFactor + " task."); return true; } - private boolean updateGCGrace(int numberOfNodes) throws Exception { + private boolean updateGCGrace(boolean isNewSchema, int numberOfNodes) throws Exception { log.info("Starting to execute " + Task.UpdateGCGrace + " task."); int gcGraceSeconds = 864000; @@ -120,11 +124,11 @@ public class TopologyManager extends AbstractManager { } - log.info("Applying file " + Task.UpdateGCGrace.getFile() + " for " + Task.UpdateGCGrace + " task."); - for (String query : this.getSteps(Task.UpdateGCGrace.getFile())) { + log.info("Applying file " + Task.UpdateGCGrace.getFile(isNewSchema) + " for " + Task.UpdateGCGrace + " task."); + for (String query : this.getSteps(Task.UpdateGCGrace.getFile(isNewSchema))) { executedPreparedStatement(query, gcGraceSeconds); } - log.info("File " + Task.UpdateGCGrace.getFile() + " applied for " + Task.UpdateGCGrace + " task."); + log.info("File " + Task.UpdateGCGrace.getFile(isNewSchema) + " applied for " + Task.UpdateGCGrace + " task."); log.info("Successfully executed " + Task.UpdateGCGrace + " task."); return true; diff --git a/modules/common/cassandra-schema/src/main/resources/topology/0001.xml b/modules/common/cassandra-schema/src/main/resources/topology/0001.xml deleted file mode 100644 index 5cbd7eb..0000000 --- a/modules/common/cassandra-schema/src/main/resources/topology/0001.xml +++ /dev/null @@ -1,5 +0,0 @@ -<updatePlan> - <step> - ALTER KEYSPACE rhq WITH replication = {'class': 'SimpleStrategy', 'replication_factor': %s}; - </step> -</updatePlan> \ No newline at end of file diff --git a/modules/common/cassandra-schema/src/main/resources/topology/0002.xml b/modules/common/cassandra-schema/src/main/resources/topology/0002.xml deleted file mode 100644 index d631030..0000000 --- a/modules/common/cassandra-schema/src/main/resources/topology/0002.xml +++ /dev/null @@ -1,26 +0,0 @@ -<updatePlan> - <step> - ALTER COLUMNFAMILY rhq.metrics_index WITH gc_grace_seconds = %s; - </step> - - <step> - ALTER COLUMNFAMILY rhq.raw_metrics WITH gc_grace_seconds = %s; - </step> - - <step> - ALTER COLUMNFAMILY rhq.one_hour_metrics WITH gc_grace_seconds = %s; - </step> - - <step> - ALTER COLUMNFAMILY rhq.six_hour_metrics WITH gc_grace_seconds = %s; - </step> - - <step> - ALTER COLUMNFAMILY rhq.twenty_four_hour_metrics WITH gc_grace_seconds = %s; - </step> - - <step> - ALTER COLUMNFAMILY rhq.schema_version WITH gc_grace_seconds = %s; - </step> - -</updatePlan> \ No newline at end of file diff --git a/modules/common/cassandra-schema/src/main/resources/topology/create/0001.xml b/modules/common/cassandra-schema/src/main/resources/topology/create/0001.xml new file mode 100644 index 0000000..5cbd7eb --- /dev/null +++ b/modules/common/cassandra-schema/src/main/resources/topology/create/0001.xml @@ -0,0 +1,5 @@ +<updatePlan> + <step> + ALTER KEYSPACE rhq WITH replication = {'class': 'SimpleStrategy', 'replication_factor': %s}; + </step> +</updatePlan> \ No newline at end of file diff --git a/modules/common/cassandra-schema/src/main/resources/topology/create/0002.xml b/modules/common/cassandra-schema/src/main/resources/topology/create/0002.xml new file mode 100644 index 0000000..d631030 --- /dev/null +++ b/modules/common/cassandra-schema/src/main/resources/topology/create/0002.xml @@ -0,0 +1,26 @@ +<updatePlan> + <step> + ALTER COLUMNFAMILY rhq.metrics_index WITH gc_grace_seconds = %s; + </step> + + <step> + ALTER COLUMNFAMILY rhq.raw_metrics WITH gc_grace_seconds = %s; + </step> + + <step> + ALTER COLUMNFAMILY rhq.one_hour_metrics WITH gc_grace_seconds = %s; + </step> + + <step> + ALTER COLUMNFAMILY rhq.six_hour_metrics WITH gc_grace_seconds = %s; + </step> + + <step> + ALTER COLUMNFAMILY rhq.twenty_four_hour_metrics WITH gc_grace_seconds = %s; + </step> + + <step> + ALTER COLUMNFAMILY rhq.schema_version WITH gc_grace_seconds = %s; + </step> + +</updatePlan> \ No newline at end of file diff --git a/modules/common/cassandra-schema/src/main/resources/topology/update/0001.xml b/modules/common/cassandra-schema/src/main/resources/topology/update/0001.xml new file mode 100644 index 0000000..f2c0e57 --- /dev/null +++ b/modules/common/cassandra-schema/src/main/resources/topology/update/0001.xml @@ -0,0 +1,9 @@ +<updatePlan> + <step> + ALTER KEYSPACE system_auth WITH replication = {'class': 'SimpleStrategy', 'replication_factor': %s}; + </step> + + <step> + ALTER KEYSPACE rhq WITH replication = {'class': 'SimpleStrategy', 'replication_factor': %s}; + </step> +</updatePlan> \ No newline at end of file diff --git a/modules/common/cassandra-schema/src/main/resources/topology/update/0002.xml b/modules/common/cassandra-schema/src/main/resources/topology/update/0002.xml new file mode 100644 index 0000000..d631030 --- /dev/null +++ b/modules/common/cassandra-schema/src/main/resources/topology/update/0002.xml @@ -0,0 +1,26 @@ +<updatePlan> + <step> + ALTER COLUMNFAMILY rhq.metrics_index WITH gc_grace_seconds = %s; + </step> + + <step> + ALTER COLUMNFAMILY rhq.raw_metrics WITH gc_grace_seconds = %s; + </step> + + <step> + ALTER COLUMNFAMILY rhq.one_hour_metrics WITH gc_grace_seconds = %s; + </step> + + <step> + ALTER COLUMNFAMILY rhq.six_hour_metrics WITH gc_grace_seconds = %s; + </step> + + <step> + ALTER COLUMNFAMILY rhq.twenty_four_hour_metrics WITH gc_grace_seconds = %s; + </step> + + <step> + ALTER COLUMNFAMILY rhq.schema_version WITH gc_grace_seconds = %s; + </step> + +</updatePlan> \ No newline at end of file diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java index fbd869b..4c87f70 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java @@ -487,7 +487,7 @@ public class InstallerServiceImpl implements InstallerService { } log("Install RHQ schema along with updates to Cassandra."); storageNodeSchemaManager.install(); - storageNodeSchemaManager.updateTopology(); + storageNodeSchemaManager.updateTopology(true); } else { log("Ignoring Cassandra schema - installer will assume it exists and is already up-to-date."); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 90d9497..874be1e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -39,6 +39,7 @@ import javax.persistence.TypedQuery; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.quartz.JobDataMap; import org.quartz.SimpleTrigger; import org.quartz.Trigger; @@ -200,7 +201,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN this.updateStorageNodes(storageNodeMap); if (clusterMaintenanceNeeded) { - this.scheduleQuartzJob(); + this.scheduleQuartzJob(existingStorageNodes.size()); } return new ArrayList<StorageNode>(storageNodeMap.values()); @@ -214,6 +215,10 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN String configAddress = resourceConfig.getSimpleValue(RHQ_STORAGE_ADDRESS_PROPERTY); if (configAddress != null) { + // TODO Do not add the node to the group until we have verified it has joined the cluster + // StorageNodeMaintenanceJob currently determines if a new node has successfully joined the cluster. + addStorageNodeToGroup(resource); + boolean storageNodeFound = false; if (storageNodes != null) { for (StorageNode storageNode : storageNodes) { @@ -239,10 +244,8 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN entityManager.persist(storageNode); - scheduleQuartzJob(); + scheduleQuartzJob(storageNodes.size()); } - - addStorageNodeToGroup(resource); } } @@ -306,13 +309,14 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN * @return The storage node resource group. * @throws IllegalStateException if the group is not found or does not exist. */ - private ResourceGroup getStorageNodeGroup() { + public ResourceGroup getStorageNodeGroup() { Subject overlord = subjectManager.getOverlord(); ResourceGroupCriteria criteria = new ResourceGroupCriteria(); criteria.addFilterResourceTypeName(STORAGE_NODE_RESOURCE_TYPE_NAME); criteria.addFilterPluginName(STORAGE_NODE_PLUGIN_NAME); criteria.addFilterName(STORAGE_NODE_GROUP_NAME); + criteria.fetchExplicitResources(true); List<ResourceGroup> groups = resourceGroupManager.findResourceGroupsByCriteria(overlord, criteria); @@ -472,7 +476,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return newNodes; } - private void scheduleQuartzJob() { + private void scheduleQuartzJob(int clusterSize) { String jobName = StorageNodeMaintenanceJob.class.getName(); String jobGroupName = StorageNodeMaintenanceJob.class.getName(); String triggerName = StorageNodeMaintenanceJob.class.getName(); @@ -482,6 +486,10 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN trigger.setJobName(jobName); trigger.setJobGroup(jobGroupName); try { + JobDataMap jobDataMap = new JobDataMap(); + jobDataMap.put(StorageNodeMaintenanceJob.JOB_DATA_PROPERTY_CLUSTER_SIZE, Integer.toString(clusterSize)); + trigger.setJobDataMap(jobDataMap); + quartzScheduler.scheduleJob(trigger); } catch (Throwable t) { log.warn("Unable to schedule storage node maintenance job", t); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index 54646ec..52e2424 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -27,6 +27,7 @@ import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageList; @Local @@ -86,4 +87,13 @@ public interface StorageNodeManagerLocal { */ void runReadRepair(); + /** + * This method assumes the storage node resource group already exists; as such, it should only be called from places + * in the code that are after the point(s) where the group has been created. + * + * @return The storage node resource group. + * @throws IllegalStateException if the group is not found or does not exist. + */ + ResourceGroup getStorageNodeGroup(); + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java index f492fa0..6b1940d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageNodeMaintenanceJob.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -36,13 +37,11 @@ import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.criteria.ResourceCriteria; -import org.rhq.core.domain.operation.OperationRequestStatus; -import org.rhq.core.domain.operation.ResourceOperationHistory; -import org.rhq.core.domain.operation.bean.ResourceOperationSchedule; +import org.rhq.core.domain.operation.bean.GroupOperationSchedule; import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; +import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.util.StringUtil; +import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.cloud.StorageNodeManagerLocal; import org.rhq.enterprise.server.operation.OperationManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; @@ -58,6 +57,10 @@ public class StorageNodeMaintenanceJob extends AbstractStatefulJob { private final Log log = LogFactory.getLog(StorageNodeMaintenanceJob.class); + public static final String JOB_DATA_PROPERTY_CLUSTER_SIZE = "clusterSize"; + + public static final String JOB_DATA_PROPERTY_TOPOLOGY_CHANGED = "topologyChanged"; + private final static int MAX_ITERATIONS = 5; private final static int TIMEOUT = 10000; private final static String STORAGE_SERVICE = "Storage Service"; @@ -73,7 +76,10 @@ public class StorageNodeMaintenanceJob extends AbstractStatefulJob { private static final String PASSWORD_PROP = "rhq.cassandra.password"; @Override - public void executeJobCode(JobExecutionContext arg0) throws JobExecutionException { + public void executeJobCode(JobExecutionContext context) throws JobExecutionException { + JobDataMap jobDataMap = context.getMergedJobDataMap(); + int clusterSize = Integer.parseInt(jobDataMap.getString(JOB_DATA_PROPERTY_CLUSTER_SIZE)); + //1. Wait for resouces to be linked to node storage nodes waitForResouceLinks(); @@ -84,21 +90,50 @@ public class StorageNodeMaintenanceJob extends AbstractStatefulJob { //3. Wait for the all storage nodes to be part of the same cluster storageNodes = waitForClustering(storageNodes); - //4. Update topology - boolean topologyUpdated = updateTopology(storageNodes); - - //5. Run repair operation on all the storage nodes if topology(replication factor was updated) - if (topologyUpdated) { - List<String> seedList = new ArrayList<String>(); - for (StorageNode storageNode : storageNodes) { - seedList.add(storageNode.getAddress()); + boolean isReadRepairNeeded; + + if (clusterSize >= 4) { + // At 4 nodes we increase the RF to 3. We are not increasing the RF beyond + // that for additional nodes; so, there is no need to run repair if we are + // expanding from a 4 node cluster since the RF remains the same. + isReadRepairNeeded = false; + } else if (clusterSize == 1) { + // The RF will increase since we are going from a single to a multi-node + // cluster; therefore, we want to run repair. + isReadRepairNeeded = true; + } else if (clusterSize == 2) { + if (storageNodes.size() > 3) { + // If we go from 2 to > 3 nodes we will increase the RF to 3; therefore + // we want to run repair. + isReadRepairNeeded = true; + } else { + // If we go from 2 to 3 nodes, we keep the RF at 2 so there is no need + // to run repair. + isReadRepairNeeded = false; } + } else if (clusterSize == 3) { + // We are increasing the cluster size > 3 which means the RF will be + // updated to 3; therefore, we want to run repair. + isReadRepairNeeded = true; + } else { + // If we cluster size of zero, then something is really screwed up. It + // should always be > 0. + log.error("The job data property [" + JOB_DATA_PROPERTY_CLUSTER_SIZE + "] should always be greater " + + "than zero. This may be a bug in the code that scheduled this job."); + isReadRepairNeeded = storageNodes.size() > 1; + } - for (StorageNode storageNode : storageNodes) { - Resource resource = storageNode.getResource(); - runNodeMaintenance(resource, seedList); - } + if (isReadRepairNeeded) { + updateTopology(storageNodes); + } + + //5. run maintenance on each node + List<String> seedList = new ArrayList<String>(); + for (StorageNode storageNode : storageNodes) { + seedList.add(storageNode.getAddress()); } + + runNodeMaintenance(seedList, isReadRepairNeeded); } private boolean updateTopology(List<StorageNode> storageNodes) throws JobExecutionException { @@ -106,9 +141,9 @@ public class StorageNodeMaintenanceJob extends AbstractStatefulJob { String password = getRequiredStorageProperty(PASSWORD_PROP); SchemaManager schemaManager = new SchemaManager(username, password, storageNodes); try{ - return schemaManager.updateTopology(); + return schemaManager.updateTopology(false); } catch (Exception e) { - log.error(e); + log.error("An error occurred while applying schema topology changes", e); } return false; @@ -147,7 +182,7 @@ public class StorageNodeMaintenanceJob extends AbstractStatefulJob { List<Property> actualList = propertyList.getList(); for (Property property : actualList) { PropertyMap map = (PropertyMap) property; - endpoints.add(map.get(ENDPOINT_PROPERTY).toString()); + endpoints.add(map.getSimpleValue(ENDPOINT_PROPERTY, null)); } } catch (Exception e) { log.error("Error fetching live configuration for resource " + resource.getId()); @@ -157,7 +192,7 @@ public class StorageNodeMaintenanceJob extends AbstractStatefulJob { } } } catch (Exception e) { - log.error(e); + log.error("An exception occurred while waiting for nodes to cluster", e); } Collections.sort(endpoints); @@ -184,67 +219,38 @@ public class StorageNodeMaintenanceJob extends AbstractStatefulJob { return storageNodes; } - private void runNodeMaintenance(Resource resource, List<String> seedList) { + private void runNodeMaintenance(List<String> seedList, boolean runRepair) { OperationManagerLocal operationManager = LookupUtil.getOperationManager(); + StorageNodeManagerLocal storageNodeManager = LookupUtil.getStorageNodeManager(); + SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager(); + + ResourceGroup storageNodeGroup = storageNodeManager.getStorageNodeGroup(); + + GroupOperationSchedule schedule = new GroupOperationSchedule(); + schedule.setGroup(storageNodeGroup); + schedule.setHaltOnFailure(false); + schedule.setExecutionOrder(new ArrayList<Resource>(storageNodeGroup.getExplicitResources())); + schedule.setJobTrigger(JobTrigger.createNowTrigger()); + schedule.setSubject(subjectManager.getOverlord()); + schedule.setOperationName(MAINTENANCE_OPERATION); + schedule.setDescription(MAINTENANCE_OPERATION_NOTE); + + List<Property> properties = new ArrayList<Property>(); + properties.add(new PropertySimple(RUN_REPAIR_PROPERTY, runRepair)); + properties.add(new PropertySimple(UPDATE_SEEDS_LIST, Boolean.TRUE)); + + PropertyList seedListProperty = new PropertyList(SEEDS_LIST); + for (String seed : seedList) { + seedListProperty.add(new PropertySimple("seed", seed)); + } + properties.add(seedListProperty); - try { - ResourceOperationSchedule newSchedule = new ResourceOperationSchedule(); - newSchedule.setJobTrigger(JobTrigger.createNowTrigger()); - newSchedule.setResource(resource); - newSchedule.setOperationName(MAINTENANCE_OPERATION); - newSchedule.setDescription(MAINTENANCE_OPERATION_NOTE); - - List<Property> properties = new ArrayList<Property>(); - properties.add(new PropertySimple(RUN_REPAIR_PROPERTY, Boolean.TRUE)); - properties.add(new PropertySimple(UPDATE_SEEDS_LIST, Boolean.TRUE)); - - PropertyList seedListProperty = new PropertyList(SEEDS_LIST); - for (String seed : seedList) { - seedListProperty.add(new PropertySimple("seed", seed)); - } - properties.add(seedListProperty); - - Configuration config = new Configuration(); - config.setProperties(properties); - newSchedule.setParameters(config); - - long operationStartTime = System.currentTimeMillis(); - operationManager.scheduleResourceOperation(LookupUtil.getSubjectManager().getOverlord(), newSchedule); - - int iteration = 0; - boolean resultFound = false; - while (iteration < MAX_ITERATIONS && !resultFound) { - PageList<ResourceOperationHistory> results = operationManager.findCompletedResourceOperationHistories( - LookupUtil.getSubjectManager().getOverlord(), resource.getId(), operationStartTime, null, - PageControl.getUnlimitedInstance()); - - for (ResourceOperationHistory operationHistory : results) { - if (MAINTENANCE_OPERATION.equals(operationHistory.getOperationDefinition().getName())) { - if (OperationRequestStatus.SUCCESS.equals(operationHistory.getStatus())) { - Configuration operationResults = operationHistory.getResults(); - if ("true".equals(operationResults.getSimpleValue(SUCCEED_PROPERTY))) { - resultFound = true; - } - } - } - } - - if (resultFound) { - break; - } else { - try { - Thread.sleep(TIMEOUT); - } catch (Exception e) { - log.error(e); - } - } + Configuration config = new Configuration(); + config.setProperties(properties); - iteration++; - } + schedule.setParameters(config); - } catch (Exception e) { - log.error(e); - } + operationManager.scheduleGroupOperation(subjectManager.getOverlord(), schedule); } private List<StorageNode> getOnlyResourceLinkedStorageNodes() { commit a39e88e38e73d07f7ee7ac6374c78b566ea9c5b4 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Jul 2 17:01:15 2013 -0400 use ProcessInfo.freshSnapshot during avail checks to avoid stale data diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 7d06cb2..93d758c 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -135,7 +135,7 @@ public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent return UNKNOWN; } else { // It is safe to read prior snapshot as getNativeProcess always return a fresh instance - ProcessInfoSnapshot processInfoSnaphot = processInfo.priorSnaphot(); + ProcessInfoSnapshot processInfoSnaphot = processInfo.freshSnapshot(); if (processInfoSnaphot.isRunning()) { return UP; } else {

1 0

[rhq] modules/plugins
by Thomas Segismont 03 Jul '13

03 Jul '13

modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit ace32579675ccf0f02dce110d669b57261a70afb Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 3 17:05:01 2013 +0200 Revert "Bug 863502 - EMS ConnectionFactory.discoverServerClasses can throw OutOfMemoryError" This reverts commit faf0013f511894eb2c7b9ef14f87b5e87d657154. diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java index c289069..f1e2c51 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java @@ -195,11 +195,10 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM // to have a version compatible local install and set the install path to the local path, even though // the server url was remote. String catalinaHome = pluginConfig.getSimpleValue(PLUGIN_CONFIG_CATALINA_HOME_PATH, null); - boolean hasLocalJars = catalinaHome != null && new File(catalinaHome, "lib").isDirectory(); + boolean hasLocalJars = new File(catalinaHome).isDirectory(); if (hasLocalJars) { - String libDir = new File(catalinaHome, "lib").getAbsolutePath(); - connectionSettings.setLibraryURI(libDir); + connectionSettings.setLibraryURI(catalinaHome); connectionFactory.discoverServerClasses(connectionSettings); // Tell EMS to make copies of jar files so that the ems classloader doesn't lock

1 0

[rhq] modules/plugins
by Thomas Segismont 03 Jul '13

03 Jul '13

modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit faf0013f511894eb2c7b9ef14f87b5e87d657154 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 3 14:01:00 2013 +0200 Bug 863502 - EMS ConnectionFactory.discoverServerClasses can throw OutOfMemoryError Changed the libraryURI root: the plugin was looking for catalina jars from the CATALINA_HOME directory, instead of CATALINA_HOME/lib. Now users can put any number of files in CATALINA_HOME, provided they're outside the lib directory. diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java index f1e2c51..c289069 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java @@ -195,10 +195,11 @@ public class TomcatServerComponent<T extends ResourceComponent<?>> implements JM // to have a version compatible local install and set the install path to the local path, even though // the server url was remote. String catalinaHome = pluginConfig.getSimpleValue(PLUGIN_CONFIG_CATALINA_HOME_PATH, null); - boolean hasLocalJars = new File(catalinaHome).isDirectory(); + boolean hasLocalJars = catalinaHome != null && new File(catalinaHome, "lib").isDirectory(); if (hasLocalJars) { - connectionSettings.setLibraryURI(catalinaHome); + String libDir = new File(catalinaHome, "lib").getAbsolutePath(); + connectionSettings.setLibraryURI(libDir); connectionFactory.discoverServerClasses(connectionSettings); // Tell EMS to make copies of jar files so that the ems classloader doesn't lock

1 0

[rhq] Changes to 'bug/923400'
by Thomas Segismont 03 Jul '13

03 Jul '13

New branch 'bug/923400' available with the following commits: commit d9135011a516e746a287a2ca3d3cffc16c7a6c9d Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Jul 3 12:27:55 2013 +0200 Bug 923400 - Sigar creates high number of blocked threads (unbounded) if mount is gone

1 0

[rhq] Changes to 'mtho11/d3-multiline-graph'
by mike thompson 03 Jul '13

03 Jul '13

New branch 'mtho11/d3-multiline-graph' available with the following commits: commit 638b20247ed0727930e7f0ddebac07bef7e6cc79 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 2 14:33:21 2013 -0700 First pass at new Multi-resource graph using d3 instead of nvd3.

1 0

[rhq] modules/enterprise
by mike thompson 02 Jul '13

02 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java | 2 ++ 1 file changed, 2 insertions(+) New commits: commit 6b238ccea5445907414fc1c087a832df01b97673 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Jul 2 11:13:23 2013 -0700 Put back in Date Range control on MeasurementTableView until consolidated metrics tab is ready. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java index 1d456f4..7022648 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java @@ -42,6 +42,7 @@ import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.resource.composite.ResourceComposite; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.table.TableAction; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; @@ -69,6 +70,7 @@ public class MeasurementTableView extends Table<MetricsTableDataSource> { protected void configureTable() { ArrayList<ListGridField> fields = getDataSource().getListGridFields(); setListGridFields(fields.toArray(new ListGridField[0])); + addExtraWidget(new UserPreferencesMeasurementRangeEditor(), true); addTableAction(MSG.view_measureTable_getLive(), new TableAction() { @Override public boolean isEnabled(ListGridRecord[] selection) {

1 0

[rhq] modules/enterprise
by mazz 02 Jul '13

02 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHFileSend.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit 70db4e046ee011b5766d5bce6d1890f4f2d8391f Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Jul 2 13:48:30 2013 -0400 BZ 976227 - strip the file name from a Windows path diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHFileSend.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHFileSend.java index ece76af..7eb513a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHFileSend.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHFileSend.java @@ -22,16 +22,16 @@ */ package org.rhq.enterprise.server.install.remote; -import com.jcraft.jsch.Channel; -import com.jcraft.jsch.ChannelExec; -import com.jcraft.jsch.Session; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import com.jcraft.jsch.Channel; +import com.jcraft.jsch.ChannelExec; +import com.jcraft.jsch.Session; + /** * @author Greg Hinkle */ @@ -61,6 +61,8 @@ public class SSHFileSend { command = "C0644 " + filesize + " "; if (sourceFilename.lastIndexOf('/') > 0) { command += sourceFilename.substring(sourceFilename.lastIndexOf('/') + 1); + } else if (sourceFilename.lastIndexOf('\\') > 0) { + command += sourceFilename.substring(sourceFilename.lastIndexOf('\\') + 1); } else { command += sourceFilename; }

1 0

[rhq] modules/core
by Thomas Segismont 02 Jul '13

02 Jul '13

modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java | 33 ++++++---- 1 file changed, 20 insertions(+), 13 deletions(-) New commits: commit 2f9a152ab91427d6d99a5e1a0cbe05a52f9963d9 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Tue Jul 2 17:47:38 2013 +0200 Bug 966777 - EAP 6 plug-in is using a hard-coded operation timeout for start and stop instead of using the operation timeout or agent's default operation timeout of 10 minutes Fix ResourceContainerTest diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java index 75e2d51..d02447e 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java @@ -38,9 +38,9 @@ import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.Resource; import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.PluginContainerConfiguration; +import org.rhq.core.pc.component.ComponentInvocationContextImpl; import org.rhq.core.pc.util.FacetLockType; import org.rhq.core.pluginapi.availability.AvailabilityFacet; -import org.rhq.core.pluginapi.component.ComponentInvocationContext; import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationFacet; @@ -149,42 +149,49 @@ public class ResourceContainerTest { OperationFacet proxy = resourceContainer.createResourceComponentProxy(OperationFacet.class, FacetLockType.WRITE, 150, true, false, true); try { - proxy.invokeOperation("op", new Configuration()); - fail("Expected invokeOperation to throw a TimeoutException"); + OperationResult op = proxy.invokeOperation("op", new Configuration()); + assertTrue(op.getSimpleResult().equals(MockResourceComponent.OPERATION_RESULT)); } catch (Exception e) { - assertFalse(e instanceof TimeoutException, "Caught unexpected instance of TimeoutException: " - + e.getClass().getName()); + fail("Caught unexpected Exception: " + e.getClass().getName()); assertFalse(((MockResourceComponent) resourceContainer.getResourceComponent()) .caughtInterruptedComponentInvocation()); } } - private ResourceContainer getResourceContainer() { + private ResourceContainer getResourceContainer() throws Exception { Resource resource = new Resource("TestPlatformKey", "MyTestPlatform", PluginMetadataManager.TEST_PLATFORM_TYPE); ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); ResourceContainer resourceContainer = new ResourceContainer(resource, contextClassLoader); + ResourceContext resourceContext = new ResourceContext(resource, null, null, null, null, null, null, null, null, + null, null, null, null, null, new ComponentInvocationContextImpl()); + resourceContainer.setResourceContext(resourceContext); ResourceComponent resourceComponent = new MockResourceComponent(false); resourceContainer.setResourceComponent(resourceComponent); + resourceComponent.start(resourceContext); return resourceContainer; } - class MockResourceComponent implements ResourceComponent, OperationFacet { - private boolean naughty; - private boolean caughtInterruptedComponentInvocation; - private ResourceContext resourceContext; + private class MockResourceComponent implements ResourceComponent, OperationFacet { + static final String OPERATION_RESULT = "uninterrupted"; + boolean naughty; + boolean caughtInterruptedComponentInvocation; + ResourceContext resourceContext; MockResourceComponent(boolean naughty) { this.naughty = naughty; } + @Override public void start(ResourceContext resourceContext) throws Exception { this.resourceContext = resourceContext; } + @Override public void stop() { this.resourceContext = null; } + @Override public AvailabilityType getAvailability() { if (this.naughty) { throw new MockRuntimeException(); @@ -212,16 +219,16 @@ public class ResourceContainerTest { long start = System.nanoTime(); while (!resourceContext.getComponentInvocationContext().isInterrupted()) { if ((System.nanoTime() - start) > MILLISECONDS.toNanos(100)) { - // Make the operation fail after 100ms + // Return after 100ms caughtInterruptedComponentInvocation = false; - throw new Exception(); + return new OperationResult(OPERATION_RESULT); } } caughtInterruptedComponentInvocation = true; throw new InterruptedException(); } - public boolean caughtInterruptedComponentInvocation() { + boolean caughtInterruptedComponentInvocation() { return caughtInterruptedComponentInvocation; } }

1 0

[rhq] modules/core modules/plugins
by Thomas Segismont 02 Jul '13

02 Jul '13

modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/component/ComponentInvocationContext.java | 44 +++ modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java | 59 +++- modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/operation/OperationFacet.java | 22 - modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java | 18 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java | 21 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/component/ComponentInvocationContextImpl.java | 84 ++++++ modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationCheckExecutor.java | 8 modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationManager.java | 18 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java | 20 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java | 18 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 28 +- modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 60 ++-- modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceFactoryManager.java | 20 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/RuntimeDiscoveryExecutor.java | 18 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/TimeoutException.java | 21 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementCollectorRunner.java | 18 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java | 18 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/operation/OperationManager.java | 18 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/support/SupportManager.java | 18 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/ComponentServiceImpl.java | 21 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/ComponentUtil.java | 49 +-- modules/core/plugin-container/src/test/java/org/rhq/core/pc/component/ComponentInvocationContextImplTest.java | 92 ++++++ modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java | 139 +++++++--- modules/core/plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java | 16 - modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractDestinationTest.java | 20 - modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractResourceTest.java | 22 - modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/util/AppServerUtils.java | 22 - modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java | 50 +-- modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java | 8 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/WebConnectorComponentTest.java | 2 modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/AppServerUtils.java | 20 - modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/CacheComponentTest.java | 8 modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/OperationTest.java | 21 + modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/TestHelper.java | 21 + 34 files changed, 679 insertions(+), 363 deletions(-) New commits: commit ba84865a0e0172cda10c1350fef054248c43ceed Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jun 27 16:09:58 2013 +0200 Bug 966777 - EAP 6 plug-in is using a hard-coded operation timeout for start and stop instead of using the operation timeout or agent's default operation timeout of 10 minutes The component invocation handler now has a transferInterrupt parameter. If set to true, the component invocation thread will be interrupted when the caller thread is. Introduce ComponentInvocationContext class. An instance of this class is created by the plugin container and bound to facet-locked component invocation thread. Make BaseServerComponent use ComponentInvocationContext to deal with operation timeout or cancellation. diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/component/ComponentInvocationContext.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/component/ComponentInvocationContext.java new file mode 100644 index 0000000..4ccfc9d --- /dev/null +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/component/ComponentInvocationContext.java @@ -0,0 +1,44 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.core.pluginapi.component; + +/** + * An instance of this class is created by the plugin container and bound to facet-locked component invocation + * thread. + * + * It helps to detect interrupted component invocations (canceled or timed out). + * + * @author Thomas Segismont + */ +public interface ComponentInvocationContext { + + /** + * Whether the component invocation has been interrupted or not. + * + * @return true if component invocation has been interrupted, false otherwise. + */ + boolean isInterrupted(); + + + /** + * Mark this context as interrupted. + */ + void markInterrupted(); +} diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java index f466df7..8c708db 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pluginapi.inventory; @@ -40,6 +36,7 @@ import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pluginapi.availability.AvailabilityCollectorRunnable; import org.rhq.core.pluginapi.availability.AvailabilityContext; import org.rhq.core.pluginapi.availability.AvailabilityFacet; +import org.rhq.core.pluginapi.component.ComponentInvocationContext; import org.rhq.core.pluginapi.content.ContentContext; import org.rhq.core.pluginapi.event.EventContext; import org.rhq.core.pluginapi.operation.OperationContext; @@ -86,6 +83,7 @@ public class ResourceContext<T extends ResourceComponent<?>> { private final InventoryContext inventoryContext; private final PluginContainerDeployment pluginContainerDeployment; private final ResourceTypeProcesses trackedProcesses; + private final ComponentInvocationContext componentInvocationContext; private static class Children { public ResourceType resourceType; @@ -122,6 +120,32 @@ public class ResourceContext<T extends ResourceComponent<?>> { private static Map<Children, ResourceTypeProcesses> PROCESSES_PER_PARENT_PER_RESOURCE_TYPE = new HashMap<Children, ResourceTypeProcesses>(); /** + * Creates a new {@link ResourceContext} object with a default {@link ComponentInvocationContext}. + * + * @deprecated as of RHQ 4.9. + */ + @Deprecated + public ResourceContext(Resource resource, T parentResourceComponent, ResourceContext<?> parentResourceContext, + ResourceDiscoveryComponent<T> resourceDiscoveryComponent, SystemInfo systemInfo, File temporaryDirectory, + File dataDirectory, String pluginContainerName, EventContext eventContext, OperationContext operationContext, + ContentContext contentContext, AvailabilityContext availabilityContext, InventoryContext inventoryContext, + PluginContainerDeployment pluginContainerDeployment) { + this(resource, parentResourceComponent, parentResourceContext, resourceDiscoveryComponent, systemInfo, + temporaryDirectory, dataDirectory, pluginContainerName, eventContext, operationContext, contentContext, + availabilityContext, inventoryContext, pluginContainerDeployment, new ComponentInvocationContext() { + @Override + public boolean isInterrupted() { + throw new UnsupportedOperationException(); + } + + @Override + public void markInterrupted() { + throw new UnsupportedOperationException(); + } + }); + } + + /** * Creates a new {@link ResourceContext} object. * * <b>NOTE:</b> The plugin container is responsible for instantiating these objects; plugin writers should never @@ -154,7 +178,7 @@ public class ResourceContext<T extends ResourceComponent<?>> { ResourceDiscoveryComponent<T> resourceDiscoveryComponent, SystemInfo systemInfo, File temporaryDirectory, File dataDirectory, String pluginContainerName, EventContext eventContext, OperationContext operationContext, ContentContext contentContext, AvailabilityContext availabilityContext, InventoryContext inventoryContext, - PluginContainerDeployment pluginContainerDeployment) { + PluginContainerDeployment pluginContainerDeployment, ComponentInvocationContext componentInvocationContext) { this.resourceKey = resource.getResourceKey(); this.resourceType = resource.getResourceType(); @@ -187,6 +211,7 @@ public class ResourceContext<T extends ResourceComponent<?>> { this.trackedProcesses = getTrackedProcesses(parentResourceUuid, resourceType); this.resourceUuid = resource.getUuid(); + this.componentInvocationContext = componentInvocationContext; } /** @@ -562,4 +587,14 @@ public class ResourceContext<T extends ResourceComponent<?>> { return messageDigest.getDigestString(); } -} \ No newline at end of file + + /** + * Return the {@link ComponentInvocationContext} object which plugins can use to determine if the component + * invocation has been interrupted. + * + * @return a {@link ComponentInvocationContext} object + */ + public ComponentInvocationContext getComponentInvocationContext() { + return componentInvocationContext; + } +} diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/operation/OperationFacet.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/operation/OperationFacet.java index 11ae84a..5834d83 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/operation/OperationFacet.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/operation/OperationFacet.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pluginapi.operation; @@ -55,6 +51,10 @@ public interface OperationFacet { * {@link OperationResult#setErrorMessage(String) error message} set, in which case, the operation is also * assumed to have failed.</p> * + * <strong>From RHQ4.9 on, plugin developers should check {@link org.rhq.core.pluginapi.component.ComponentInvocationContext#isInterrupted()} + * instead of {@link Thread#isInterrupted()}.</strong> An instance of this class is created by the plugin container + * and can be returned by calling {@link org.rhq.core.pluginapi.inventory.ResourceContext#getComponentInvocationContext()}. + * * @param name the name of the operation * @param parameters the parameters passed to the operation; even for operations with no parameters, an empty * config will be passed in by the plugin container @@ -65,4 +65,4 @@ public interface OperationFacet { * @throws Exception if failed to invoke the operation on the resource */ OperationResult invokeOperation(String name, Configuration parameters) throws InterruptedException, Exception; -} \ No newline at end of file +} diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java index 471978c..90e9f5d 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pluginapi.upgrade; @@ -52,7 +48,7 @@ public class ResourceUpgradeContext<T extends ResourceComponent<?>> extends Reso private final String description; /** - * @see ResourceContext#ResourceContext(org.rhq.core.domain.resource.Resource, org.rhq.core.pluginapi.inventory.ResourceComponent, org.rhq.core.pluginapi.inventory.ResourceContext, org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent, org.rhq.core.system.SystemInfo, java.io.File, java.io.File, String, org.rhq.core.pluginapi.event.EventContext, org.rhq.core.pluginapi.operation.OperationContext, org.rhq.core.pluginapi.content.ContentContext, java.util.concurrent.Executor, org.rhq.core.pluginapi.inventory.PluginContainerDeployment) + * @see ResourceContext#ResourceContext(org.rhq.core.domain.resource.Resource, org.rhq.core.pluginapi.inventory.ResourceComponent, org.rhq.core.pluginapi.inventory.ResourceContext, org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent, org.rhq.core.system.SystemInfo, java.io.File, java.io.File, String, org.rhq.core.pluginapi.event.EventContext, org.rhq.core.pluginapi.operation.OperationContext, org.rhq.core.pluginapi.content.ContentContext, org.rhq.core.pluginapi.availability.AvailabilityContext, org.rhq.core.pluginapi.inventory.InventoryContext, org.rhq.core.pluginapi.inventory.PluginContainerDeployment) * * @since 4.0 */ diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java index ab79689..4cd148f 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java @@ -1,24 +1,20 @@ /* - * RHQ Management - * Copyright (C) 2005-2010 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pc.bundle; @@ -581,7 +577,8 @@ public class BundleManager extends AgentService implements BundleAgentService, B * @throws PluginContainerException on error */ protected BundleFacet getBundleFacet(int resourceId, long timeout) throws PluginContainerException { - return ComponentUtil.getComponent(resourceId, BundleFacet.class, FacetLockType.READ, timeout, false, true); + return ComponentUtil.getComponent(resourceId, BundleFacet.class, FacetLockType.READ, timeout, false, true, + false); } /** diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/component/ComponentInvocationContextImpl.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/component/ComponentInvocationContextImpl.java new file mode 100644 index 0000000..491bb38 --- /dev/null +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/component/ComponentInvocationContextImpl.java @@ -0,0 +1,84 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.core.pc.component; + +import org.rhq.core.pluginapi.component.ComponentInvocationContext; + +/** + * Plugin container implementation of {@link ComponentInvocationContext}. An instance of this class will be created + * by the plugin container and put in the {@link org.rhq.core.pluginapi.inventory.ResourceContext}. + * + * Component invocation threads MUST call + * {@link #setLocalContext(org.rhq.core.pc.component.ComponentInvocationContextImpl.LocalContext)} before executing + * component code. + * + * @author Thomas Segismont + */ +public final class ComponentInvocationContextImpl implements ComponentInvocationContext { + private static final ThreadLocal<LocalContext> localContext = new ThreadLocal<LocalContext>() { + @Override + protected LocalContext initialValue() { + return new LocalContext(); + } + }; + + @Override + public boolean isInterrupted() { + return localContext.get().isInterrupted(); + } + + @Override + public void markInterrupted() { + localContext.get().markInterrupted(); + } + + /** + * Binds the specified {@link LocalContext} instance to the current thread. + * + * @param localContext + * + * @throws IllegalArgumentException if <code>localContext</code> is null + */ + public void setLocalContext(LocalContext localContext) { + if (localContext == null) { + throw new IllegalArgumentException("localContext is null"); + } + ComponentInvocationContextImpl.localContext.set(localContext); + } + + /** + * Interrupted status holder. A single instance of this class should be bound to the invocation thread by calling + * {@link #setLocalContext(org.rhq.core.pc.component.ComponentInvocationContextImpl.LocalContext)}. + */ + public static final class LocalContext implements ComponentInvocationContext { + + private volatile boolean interrupted = false; + + @Override + public boolean isInterrupted() { + return interrupted; + } + + @Override + public void markInterrupted() { + interrupted = true; + } + } +} diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationCheckExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationCheckExecutor.java index 1af10d6..627070a 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationCheckExecutor.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationCheckExecutor.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pc.configuration; @@ -80,7 +80,7 @@ public class ConfigurationCheckExecutor implements Runnable, Callable { try { resourceComponent = resourceContainer.createResourceComponentProxy(ConfigurationFacet.class, - FacetLockType.NONE, CONFIGURATION_CHECK_TIMEOUT, true, false); + FacetLockType.NONE, CONFIGURATION_CHECK_TIMEOUT, true, false, true); } catch (PluginContainerException e) { // Expecting when the resource does not support configuration management } diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationManager.java index fa2bf09..8ec5d59 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationManager.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pc.configuration; @@ -301,7 +297,7 @@ public class ConfigurationManager extends AgentService implements ContainerServi throws PluginContainerException { boolean daemonThread = (lockType != FacetLockType.WRITE); return ComponentUtil.getComponent(resourceId, ConfigurationFacet.class, lockType, FACET_METHOD_TIMEOUT, - daemonThread, true); + daemonThread, true, daemonThread); } /** diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java index 50bb67a..0b9ef6d 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pc.content; @@ -418,7 +414,7 @@ public class ContentManager extends AgentService implements ContainerService, Co // Perform the discovery // Use only a read-locked component proxy ContentFacet contentFacet = ComponentUtil.getComponent(resourceId, ContentFacet.class, FacetLockType.READ, - FACET_METHOD_TIMEOUT, false, true); + FACET_METHOD_TIMEOUT, false, true, false); Set<ResourcePackageDetails> details = contentFacet.discoverDeployedPackages(type); @@ -655,7 +651,7 @@ public class ContentManager extends AgentService implements ContainerService, Co private ContentFacet findContentFacet(int resourceId) throws Exception { // in case some calls to here need only the read lock - for now, always lock down with the write lock return ComponentUtil.getComponent(resourceId, ContentFacet.class, FacetLockType.WRITE, FACET_METHOD_TIMEOUT, - false, true); + false, true, false); } /** diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java index b4d7106..f9740df 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pc.inventory; @@ -206,7 +202,7 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo AvailabilityFacet resourceComponent; try { resourceComponent = resourceContainer.createResourceComponentProxy(AvailabilityFacet.class, - FacetLockType.NONE, GET_AVAILABILITY_TIMEOUT, true, false); + FacetLockType.NONE, GET_AVAILABILITY_TIMEOUT, true, false, true); } catch (PluginContainerException e) { // TODO (ips): Why aren't we logging this as an error? diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java index 704a230..7319c97 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java @@ -1,25 +1,22 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + package org.rhq.core.pc.inventory; import java.io.File; @@ -91,6 +88,7 @@ import org.rhq.core.pc.agent.AgentRegistrar; import org.rhq.core.pc.agent.AgentService; import org.rhq.core.pc.availability.AvailabilityCollectorThreadPool; import org.rhq.core.pc.availability.AvailabilityContextImpl; +import org.rhq.core.pc.component.ComponentInvocationContextImpl; import org.rhq.core.pc.content.ContentContextImpl; import org.rhq.core.pc.drift.sync.DriftSyncManager; import org.rhq.core.pc.event.EventContextImpl; @@ -107,6 +105,7 @@ import org.rhq.core.pc.util.FacetLockType; import org.rhq.core.pc.util.LoggingThreadFactory; import org.rhq.core.pluginapi.availability.AvailabilityContext; import org.rhq.core.pluginapi.availability.AvailabilityFacet; +import org.rhq.core.pluginapi.component.ComponentInvocationContext; import org.rhq.core.pluginapi.content.ContentContext; import org.rhq.core.pluginapi.event.EventContext; import org.rhq.core.pluginapi.inventory.ClassLoaderFacet; @@ -680,7 +679,7 @@ public class InventoryManager extends AgentService implements ContainerService, long componentTimeout = (resourceCategory == ResourceCategory.SERVER) ? 10000 : 5000; // We already possess the lock, so tell the proxy not to do any locking of its own. resourceComponent = resourceContainer.createResourceComponentProxy(AvailabilityFacet.class, - FacetLockType.NONE, componentTimeout, true, true); + FacetLockType.NONE, componentTimeout, true, true, true); availType = resourceComponent.getAvailability(); } catch (PluginContainerException e) { log.error("Failed to retrieve ResourceComponent for " + resource + ".", e); @@ -1839,7 +1838,7 @@ public class InventoryManager extends AgentService implements ContainerService, // Wrap the component in a proxy that will provide locking and a timeout for the call to start(). component = container.createResourceComponentProxy(ResourceComponent.class, FacetLockType.READ, - COMPONENT_START_TIMEOUT, true, false); + COMPONENT_START_TIMEOUT, true, false, true); } catch (Throwable t) { container.setResourceComponentState(ResourceComponentState.STOPPED); throw new PluginContainerException("Failed getting proxy for resource " + resource + ".", t); @@ -1896,7 +1895,8 @@ public class InventoryManager extends AgentService implements ContainerService, getOperationContext(resource), // for operation manager access getContentContext(resource), // for content manager access getAvailabilityContext(resource, this.availabilityCollectors), // for components that want to perform async avail checking - getInventoryContext(resource), this.configuration.getPluginContainerDeployment()); // helps components make determinations of what to do + getInventoryContext(resource), this.configuration.getPluginContainerDeployment(), // helps components make determinations of what to do + new ComponentInvocationContextImpl()); } public <T extends ResourceComponent<?>> ResourceUpgradeContext<T> createResourceUpgradeContext(Resource resource, @@ -2121,7 +2121,7 @@ public class InventoryManager extends AgentService implements ContainerService, try { ResourceComponent<?> component = container.createResourceComponentProxy(ResourceComponent.class, - FacetLockType.WRITE, COMPONENT_STOP_TIMEOUT, true, true); + FacetLockType.WRITE, COMPONENT_STOP_TIMEOUT, true, true, true); component.stop(); if (log.isDebugEnabled()) { log.debug("Successfully deactivated resource with id [" + resource.getId() + "]."); diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java index 338676d..4cb2cff 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java @@ -1,27 +1,26 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + package org.rhq.core.pc.inventory; +import static org.rhq.core.pc.component.ComponentInvocationContextImpl.LocalContext; + import java.io.Serializable; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -56,6 +55,7 @@ import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.measurement.MeasurementScheduleRequest; import org.rhq.core.domain.resource.Resource; +import org.rhq.core.pc.component.ComponentInvocationContextImpl; import org.rhq.core.pc.util.FacetLockType; import org.rhq.core.pc.util.LoggingThreadFactory; import org.rhq.core.pluginapi.inventory.ResourceComponent; @@ -407,13 +407,15 @@ public class ResourceContainer implements Serializable { * it; value must be positive * @param daemonThread whether or not the thread used for the invocation should be a daemon thread * @param onlyIfStarted if <code>true</code>, and the component is not started, an exception is thrown + * @param transferInterrupt whether or not interruption of the calling thread should be transfered to the executor + * thread * * @return a proxy that wraps the given component and exposes the given facet interface; will never be null * * @throws PluginContainerException if the component does not exist or does not implement the interface */ public <T> T createResourceComponentProxy(Class<T> facetInterface, FacetLockType lockType, long timeout, - boolean daemonThread, boolean onlyIfStarted) throws PluginContainerException { + boolean daemonThread, boolean onlyIfStarted, boolean transferInterrupt) throws PluginContainerException { if (onlyIfStarted) { if (!ResourceComponentState.STARTED.equals(getResourceComponentState())) { throw new PluginContainerException("Resource component could not be retrieved for resource [" @@ -444,6 +446,7 @@ public class ResourceContainer implements Serializable { key = 31 * key + lockType.hashCode(); key = 31 * key + (int) (timeout ^ (timeout >>> 32)); key = 31 * key + (daemonThread ? 1 : 0); + key = 31 * key + (transferInterrupt ? 1 : 0); synchronized (this) { if (this.proxyCache == null) { @@ -456,7 +459,7 @@ public class ResourceContainer implements Serializable { // this is the handler that will actually acquire the lock and invoke the facet method call ResourceComponentInvocationHandler handler = new ResourceComponentInvocationHandler(this, lockType, - timeout, daemonThread, facetInterface); + timeout, daemonThread, facetInterface, transferInterrupt); // this is the proxy that will look like the facet interface that the caller will use proxy = (T) Proxy.newProxyInstance(classLoader, new Class<?>[] { facetInterface }, handler); @@ -501,6 +504,7 @@ public class ResourceContainer implements Serializable { private final long timeout; private final boolean daemonThread; private final Class facetInterface; + private final boolean transferInterrupt; /** * @@ -511,9 +515,11 @@ public class ResourceContainer implements Serializable { * value must be positive * @param daemonThread whether or not the thread used for the invocation should be a daemon thread * @param facetInterface the interface that the component implements that is being exposed by this proxy + * @param transferInterrupt whether or not interruption of the calling thread should be transfered to the + * executor thread */ public ResourceComponentInvocationHandler(ResourceContainer container, FacetLockType lockType, long timeout, - boolean daemonThread, Class facetInterface) { + boolean daemonThread, Class facetInterface, boolean transferInterrupt) { this.container = container; switch (lockType) { case WRITE: { @@ -535,6 +541,7 @@ public class ResourceContainer implements Serializable { this.timeout = timeout; this.daemonThread = daemonThread; this.facetInterface = facetInterface; + this.transferInterrupt = transferInterrupt; } public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { @@ -548,14 +555,15 @@ public class ResourceContainer implements Serializable { private Object invokeInNewThreadWithLock(Method method, Object[] args) throws Throwable { ExecutorService threadPool = this.daemonThread ? DAEMON_THREAD_POOL : NON_DAEMON_THREAD_POOL; - Callable invocationThread = new ComponentInvocationThread(this.container, method, args, this.lock); - Future<?> future = threadPool.submit(invocationThread); + ComponentInvocation componentInvocation = new ComponentInvocation(this.container, method, args, this.lock); + Future<?> future = threadPool.submit(componentInvocation); try { return future.get(this.timeout, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { LOG.error("Thread [" + Thread.currentThread().getName() + "] was interrupted."); - if (this.daemonThread) { + if (this.transferInterrupt) { future.cancel(true); + componentInvocation.markContextInterrupted(); } throw new RuntimeException(invokedMethodString(method, args, "was rudely interrupted."), e); } catch (ExecutionException e) { @@ -568,6 +576,7 @@ public class ResourceContainer implements Serializable { + " milliseconds - invocation thread will be interrupted."); LOG.debug(msg); future.cancel(true); + componentInvocation.markContextInterrupted(); if (LOG.isDebugEnabled()) { LOG.debug(this.container.getFacetLockStatus()); } @@ -599,17 +608,22 @@ public class ResourceContainer implements Serializable { } } - private static class ComponentInvocationThread implements Callable { + private static class ComponentInvocation implements Callable { private final ResourceContainer resourceContainer; private final Method method; private final Object[] args; private final Lock lock; + private final ComponentInvocationContextImpl componentInvocationContext; + private final LocalContext localContext; - ComponentInvocationThread(ResourceContainer resourceContainer, Method method, Object[] args, Lock lock) { + ComponentInvocation(ResourceContainer resourceContainer, Method method, Object[] args, Lock lock) { this.resourceContainer = resourceContainer; this.method = method; this.args = args; this.lock = lock; + this.componentInvocationContext = (ComponentInvocationContextImpl) resourceContainer.getResourceContext() + .getComponentInvocationContext(); + localContext = new LocalContext(); } public Object call() throws Exception { @@ -623,7 +637,11 @@ public class ResourceContainer implements Serializable { // If we made it here, we have acquired the lock. } + componentInvocationContext.setLocalContext(localContext); + ClassLoader originalContextClassLoader = Thread.currentThread().getContextClassLoader(); + + // The thread needs to run with a fresh invocation context try { ClassLoader pluginClassLoader = this.resourceContainer.getResourceClassLoader(); if (pluginClassLoader == null) { @@ -648,5 +666,9 @@ public class ResourceContainer implements Serializable { Thread.currentThread().setContextClassLoader(originalContextClassLoader); } } + + public void markContextInterrupted() { + localContext.markInterrupted(); + } } -} \ No newline at end of file +} diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceFactoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceFactoryManager.java index a506493..3dee763 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceFactoryManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceFactoryManager.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pc.inventory; @@ -271,7 +267,7 @@ public class ResourceFactoryManager extends AgentService implements ContainerSer */ private DeleteResourceFacet getDeleteResourceFacet(int resourceId) throws PluginContainerException { DeleteResourceFacet facet = ComponentUtil.getComponent(resourceId, DeleteResourceFacet.class, - FacetLockType.WRITE, FACET_DELETE_TIMEOUT, false, true); + FacetLockType.WRITE, FACET_DELETE_TIMEOUT, false, true, false); return facet; } @@ -291,7 +287,7 @@ public class ResourceFactoryManager extends AgentService implements ContainerSer int createTimeout = (null == timeout || timeout < 1) ? FACET_CREATE_TIMEOUT : timeout; CreateChildResourceFacet facet = ComponentUtil.getComponent(parentResourceId, CreateChildResourceFacet.class, - FacetLockType.WRITE, createTimeout, false, true); + FacetLockType.WRITE, createTimeout, false, true, false); return facet; } diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/RuntimeDiscoveryExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/RuntimeDiscoveryExecutor.java index 8c663b4..d6a9614 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/RuntimeDiscoveryExecutor.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/RuntimeDiscoveryExecutor.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pc.inventory; @@ -228,7 +224,7 @@ public class RuntimeDiscoveryExecutor implements Runnable, Callable<InventoryRep AvailabilityFacet parentComponent = null; try { parentComponent = parentContainer.createResourceComponentProxy(AvailabilityFacet.class, - FacetLockType.NONE, AvailabilityExecutor.GET_AVAILABILITY_TIMEOUT, true, false); + FacetLockType.NONE, AvailabilityExecutor.GET_AVAILABILITY_TIMEOUT, true, false, true); } catch (PluginContainerException e) { if (log.isDebugEnabled()) { diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/TimeoutException.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/TimeoutException.java index 64695d3..fc4ae17 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/TimeoutException.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/TimeoutException.java @@ -1,36 +1,31 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pc.inventory; import org.rhq.core.pc.util.ComponentUtil; -import org.rhq.core.pc.util.FacetLockType; /** * This exception is thrown when a method invoked on a proxied plugin component times out. If possible, its cause * will be set to an Exception containing the stack trace of the plugin component thread that timed out. * - * @see ResourceContainer#createResourceComponentProxy(Class, FacetLockType, long, boolean, boolean) - * @see ComponentUtil#getComponent(int, Class, FacetLockType, long, boolean, boolean) + * @see ResourceContainer#createResourceComponentProxy(Class, org.rhq.core.pc.util.FacetLockType, long, boolean, boolean, boolean) + * @see ComponentUtil#getComponent(int, Class, org.rhq.core.pc.util.FacetLockType, long, boolean, boolean, boolean) * * @author Ian Springer */ diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementCollectorRunner.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementCollectorRunner.java index 32df8be..7aaf12a 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementCollectorRunner.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementCollectorRunner.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pc.measurement; @@ -106,7 +102,7 @@ public class MeasurementCollectorRunner implements Callable<MeasurementReport>, } else { MeasurementFacet measurementComponent = ComponentUtil .getComponent(resourceId, MeasurementFacet.class, FacetLockType.READ, - MeasurementManager.FACET_METHOD_TIMEOUT, true, true); + MeasurementManager.FACET_METHOD_TIMEOUT, true, true, true); if (log.isDebugEnabled()) { scheduleHistory.addRequests(requests); diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java index 8e8c399..6ad3551 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pc.measurement; @@ -477,7 +473,7 @@ public class MeasurementManager extends AgentService implements MeasurementAgent try { measurementFacet = ComponentUtil.getComponent(resourceId, MeasurementFacet.class, FacetLockType.READ, - FACET_METHOD_TIMEOUT, true, true); + FACET_METHOD_TIMEOUT, true, true, true); } catch (Exception e) { LOG.warn("Cannot get measurement facet for Resource [" + resourceId + "]. Cause: " + e); return Collections.emptySet(); diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/operation/OperationManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/operation/OperationManager.java index a3f5f1d..b8a8376 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/operation/OperationManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/operation/OperationManager.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pc.operation; @@ -197,7 +193,7 @@ public class OperationManager extends AgentService implements OperationAgentServ */ protected OperationFacet getOperationFacet(int resourceId, long facetMethodTimeout) throws PluginContainerException { return ComponentUtil.getComponent(resourceId, OperationFacet.class, FacetLockType.WRITE, facetMethodTimeout, - false, false); + false, false, true); } /** diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/support/SupportManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/support/SupportManager.java index 6c0f81b..1c67c31 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/support/SupportManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/support/SupportManager.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pc.support; @@ -83,6 +79,6 @@ public class SupportManager extends AgentService implements SupportAgentService, protected SupportFacet getSupportFacet(int resourceId, long facetMethodTimeout) throws PluginContainerException { return ComponentUtil.getComponent(resourceId, SupportFacet.class, FacetLockType.READ, facetMethodTimeout, - false, true); + false, true, false); } } diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/ComponentServiceImpl.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/ComponentServiceImpl.java index e1453a6..bd98afd 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/ComponentServiceImpl.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/ComponentServiceImpl.java @@ -1,34 +1,28 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.pc.util; import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.plugin.Plugin; import org.rhq.core.clientapi.agent.PluginContainerException; import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.plugin.PluginManager; -import org.rhq.core.pluginapi.configuration.ResourceConfigurationFacet; import org.rhq.core.pluginapi.inventory.ResourceComponent; public class ComponentServiceImpl implements ComponentService { @@ -39,7 +33,8 @@ public class ComponentServiceImpl implements ComponentService { public <T> T getComponent(int resourceId, Class<T> facetInterface, FacetLockType lockType, long timeout, boolean daemonThread, boolean onlyIfStarted) throws PluginContainerException { - return ComponentUtil.getComponent(resourceId, facetInterface, lockType, timeout, daemonThread, onlyIfStarted); + return ComponentUtil.getComponent(resourceId, facetInterface, lockType, timeout, daemonThread, onlyIfStarted, + daemonThread); } public String getAmpsVersion(int resourceId) throws PluginContainerException { diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/ComponentUtil.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/ComponentUtil.java index 9eb6e71..1abe002 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/ComponentUtil.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/ComponentUtil.java @@ -1,25 +1,21 @@ /* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ package org.rhq.core.pc.util; import org.rhq.core.clientapi.agent.PluginContainerException; @@ -84,6 +80,8 @@ public class ComponentUtil { * it; value must be positive * @param daemonThread whether or not the thread used for the invocation should be a daemon thread * @param onlyIfStarted if <code>true</code>, and the component is not started, an exception is thrown + * @param transferInterrupt whether or not interruption of the calling thread should be transfered to the executor + * thread * * @return the resource's <code>T</code> component interface * @@ -91,18 +89,19 @@ public class ComponentUtil { * interface or it is not started and <code>onlyIfStarted</code> is <code> * true</code> * - * @see ResourceContainer#createResourceComponentProxy(Class, FacetLockType, long, boolean, boolean) + * @see ResourceContainer#createResourceComponentProxy(Class, FacetLockType, long, boolean, boolean, boolean) */ @SuppressWarnings("unchecked") - public static <T> T getComponent(int resourceId, Class<T> facetInterface, FacetLockType lockType, - long timeout, boolean daemonThread, boolean onlyIfStarted) throws PluginContainerException { + public static <T> T getComponent(int resourceId, Class<T> facetInterface, FacetLockType lockType, long timeout, + boolean daemonThread, boolean onlyIfStarted, boolean transferInterrupt) throws PluginContainerException { InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); ResourceContainer resourceContainer = inventoryManager.getResourceContainer(resourceId); if (resourceContainer == null) { throw new PluginContainerException("Resource component container could not be retrieved for resource: " + resourceId); } - return resourceContainer.createResourceComponentProxy(facetInterface, lockType, timeout, daemonThread, onlyIfStarted); + return resourceContainer.createResourceComponentProxy(facetInterface, lockType, timeout, daemonThread, + onlyIfStarted, transferInterrupt); } @SuppressWarnings("unchecked") diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/component/ComponentInvocationContextImplTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/component/ComponentInvocationContextImplTest.java new file mode 100644 index 0000000..00601fa --- /dev/null +++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/component/ComponentInvocationContextImplTest.java @@ -0,0 +1,92 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.core.pc.component; + +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.rhq.core.pc.component.ComponentInvocationContextImpl.LocalContext; +import static org.testng.Assert.assertEquals; + +import org.testng.annotations.Test; + +/** + * @author Thomas Segismont + */ +@Test +public class ComponentInvocationContextImplTest { + + private ComponentInvocationContextImpl componentInvocationContext = new ComponentInvocationContextImpl(); + + @Test(timeOut = 1000 * 30) + public void newThreadsShouldSeeComponentInvocationContextInitialValue() throws Exception { + InterruptedStatusRecorder recorder = new InterruptedStatusRecorder() { + @Override + public void run() { + value = componentInvocationContext.isInterrupted(); + } + }; + Thread thread = startRecorderThread(recorder); + thread.join(); + assertEquals(recorder.getRecordedValue(), false); + } + + @Test(timeOut = 1000 * 30) + public void threadShouldSeeLocalContextValue() throws Exception { + final LocalContext localContext = new LocalContext(); + InterruptedStatusRecorder recorder = new InterruptedStatusRecorder() { + @Override + public void run() { + componentInvocationContext.setLocalContext(localContext); + while (!componentInvocationContext.isInterrupted()) { + try { + Thread.sleep(SECONDS.toMillis(1)); + } catch (InterruptedException e) { + break; + } + } + value = componentInvocationContext.isInterrupted(); + } + }; + Thread thread = startRecorderThread(recorder); + localContext.markInterrupted(); + thread.join(); + assertEquals(recorder.getRecordedValue(), true); + } + + @Test(expectedExceptions = { IllegalArgumentException.class }) + public void localContextCannotBeNull() { + componentInvocationContext.setLocalContext(null); + } + + private Thread startRecorderThread(InterruptedStatusRecorder recorder) { + Thread thread = new Thread(recorder); + thread.setDaemon(true); + thread.start(); + return thread; + } + + private abstract class InterruptedStatusRecorder implements Runnable { + + boolean value; + + boolean getRecordedValue() { + return value; + } + } +} diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java index 5432eff..75e2d51 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java @@ -1,42 +1,50 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + package org.rhq.core.pc.inventory; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + import java.io.File; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.rhq.core.clientapi.agent.metadata.PluginMetadataManager; +import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.Resource; import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.PluginContainerConfiguration; import org.rhq.core.pc.util.FacetLockType; import org.rhq.core.pluginapi.availability.AvailabilityFacet; +import org.rhq.core.pluginapi.component.ComponentInvocationContext; import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.inventory.ResourceContext; +import org.rhq.core.pluginapi.operation.OperationFacet; +import org.rhq.core.pluginapi.operation.OperationResult; /** * Unit test for {@link ResourceContainer}. @@ -45,6 +53,7 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; */ @Test public class ResourceContainerTest { + private static final Log LOG = LogFactory.getLog(ResourceContainerTest.class); @BeforeClass public void beforeClass() { @@ -65,59 +74,115 @@ public class ResourceContainerTest { } public void testCreateResourceComponentProxy() throws Exception { - Resource resource = new Resource("TestPlatformKey", "MyTestPlatform", PluginMetadataManager.TEST_PLATFORM_TYPE); - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - ResourceContainer resourceContainer = new ResourceContainer(resource, contextClassLoader); - ResourceComponent resourceComponent = new MockResourceComponent(false); - resourceContainer.setResourceComponent(resourceComponent); - System.out.println("Testing proxy call that should timeout..."); + ResourceContainer resourceContainer = getResourceContainer(); + if (LOG.isDebugEnabled()) { + LOG.debug("Testing proxy call that should timeout..."); + } AvailabilityFacet resourceComponentProxy = resourceContainer.createResourceComponentProxy( - AvailabilityFacet.class, FacetLockType.NONE, 50, true, false); + AvailabilityFacet.class, FacetLockType.NONE, 50, true, false, true); try { resourceComponentProxy.getAvailability(); assert (false); } catch (RuntimeException e) { assert (e instanceof TimeoutException) : "[" + e + "] is not a org.rhq.core.pc.inventory.TimeoutException."; } - System.out.println("SUCCESS!"); - System.out.println("Testing proxy call that should complete successfully..."); + if (LOG.isDebugEnabled()) { + LOG.debug("SUCCESS!"); + } + if (LOG.isDebugEnabled()) { + LOG.debug("Testing proxy call that should complete successfully..."); + } resourceComponentProxy = resourceContainer.createResourceComponentProxy(AvailabilityFacet.class, - FacetLockType.NONE, 150, true, false); + FacetLockType.NONE, 150, true, false, true); AvailabilityType avail = resourceComponentProxy.getAvailability(); assert (avail == AvailabilityType.UP); - System.out.println("SUCCESS!"); - System.out.println("Testing proxy call that should fail..."); + if (LOG.isDebugEnabled()) { + LOG.debug("SUCCESS!"); + } + if (LOG.isDebugEnabled()) { + LOG.debug("Testing proxy call that should fail..."); + } ResourceComponent naughtyResourceComponent = new MockResourceComponent(true); resourceContainer.setResourceComponent(naughtyResourceComponent); resourceComponentProxy = resourceContainer.createResourceComponentProxy(AvailabilityFacet.class, - FacetLockType.NONE, Long.MAX_VALUE, true, false); + FacetLockType.NONE, Long.MAX_VALUE, true, false, true); try { resourceComponentProxy.getAvailability(); assert (false); } catch (RuntimeException e) { assert (e instanceof MockRuntimeException); } - System.out.println("SUCCESS!"); - System.out.println("Testing proxy call should not timeout; its not to a declared method in proxied interface"); + if (LOG.isDebugEnabled()) { + LOG.debug("SUCCESS!"); + } + if (LOG.isDebugEnabled()) { + LOG.debug("Testing proxy call should not timeout; its not to a declared method in proxied interface"); + } resourceComponentProxy = resourceContainer.createResourceComponentProxy(AvailabilityFacet.class, - FacetLockType.NONE, 50, true, false); + FacetLockType.NONE, 50, true, false, true); String string = resourceComponentProxy.toString(); assert (string.equals(MockResourceComponent.class.toString())); - System.out.println("SUCCESS!"); + if (LOG.isDebugEnabled()) { + LOG.debug("SUCCESS!"); + } // TODO: Test proxy locking. } - class MockResourceComponent implements ResourceComponent { + public void testInterruptedComponentInvocationContext() throws Exception { + ResourceContainer resourceContainer = getResourceContainer(); + OperationFacet proxy = resourceContainer.createResourceComponentProxy(OperationFacet.class, + FacetLockType.WRITE, 50, true, false, true); + try { + proxy.invokeOperation("op", new Configuration()); + fail("Expected invokeOperation to throw a TimeoutException"); + } catch (TimeoutException e) { + if (LOG.isDebugEnabled()) { + LOG.debug("Caught expected TimeoutException: " + e.getMessage()); + } + assertTrue(((MockResourceComponent) resourceContainer.getResourceComponent()) + .caughtInterruptedComponentInvocation()); + } + } + + public void testUninterruptedComponentInvocationContext() throws Exception { + ResourceContainer resourceContainer = getResourceContainer(); + OperationFacet proxy = resourceContainer.createResourceComponentProxy(OperationFacet.class, + FacetLockType.WRITE, 150, true, false, true); + try { + proxy.invokeOperation("op", new Configuration()); + fail("Expected invokeOperation to throw a TimeoutException"); + } catch (Exception e) { + assertFalse(e instanceof TimeoutException, "Caught unexpected instance of TimeoutException: " + + e.getClass().getName()); + assertFalse(((MockResourceComponent) resourceContainer.getResourceComponent()) + .caughtInterruptedComponentInvocation()); + } + } + + private ResourceContainer getResourceContainer() { + Resource resource = new Resource("TestPlatformKey", "MyTestPlatform", PluginMetadataManager.TEST_PLATFORM_TYPE); + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + ResourceContainer resourceContainer = new ResourceContainer(resource, contextClassLoader); + ResourceComponent resourceComponent = new MockResourceComponent(false); + resourceContainer.setResourceComponent(resourceComponent); + return resourceContainer; + } + + class MockResourceComponent implements ResourceComponent, OperationFacet { private boolean naughty; + private boolean caughtInterruptedComponentInvocation; + private ResourceContext resourceContext; MockResourceComponent(boolean naughty) { this.naughty = naughty; } public void start(ResourceContext resourceContext) throws Exception { + this.resourceContext = resourceContext; } public void stop() { + this.resourceContext = null; } public AvailabilityType getAvailability() { @@ -141,6 +206,24 @@ public class ResourceContainerTest { } return this.getClass().toString(); } + + @Override + public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { + long start = System.nanoTime(); + while (!resourceContext.getComponentInvocationContext().isInterrupted()) { + if ((System.nanoTime() - start) > MILLISECONDS.toNanos(100)) { + // Make the operation fail after 100ms + caughtInterruptedComponentInvocation = false; + throw new Exception(); + } + } + caughtInterruptedComponentInvocation = true; + throw new InterruptedException(); + } + + public boolean caughtInterruptedComponentInvocation() { + return caughtInterruptedComponentInvocation; + } } class MockRuntimeException extends RuntimeException { diff --git a/modules/core/plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java b/modules/core/plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java index 544c1ce..aef1fa8 100644 --- a/modules/core/plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java +++ b/modules/core/plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.plugin.testutil; @@ -204,7 +204,7 @@ public abstract class AbstractAgentPluginTest extends Arquillian { ResourceContainer resourceContainer = this.pluginContainer.getInventoryManager().getResourceContainer(resource); long timeoutMillis = 5000; AvailabilityFacet availFacet = resourceContainer.createResourceComponentProxy(AvailabilityFacet.class, - FacetLockType.READ, timeoutMillis, false, false); + FacetLockType.READ, timeoutMillis, false, false, false); AvailabilityType avail; try { avail = availFacet.getAvailability(); @@ -239,7 +239,7 @@ public abstract class AbstractAgentPluginTest extends Arquillian { ResourceContainer resourceContainer = this.pluginContainer.getInventoryManager().getResourceContainer(resource); long timeoutMillis = timeout * 1000; OperationFacet operationFacet = resourceContainer.createResourceComponentProxy(OperationFacet.class, - FacetLockType.WRITE, timeoutMillis, false, false); + FacetLockType.WRITE, timeoutMillis, false, false, false); OperationResult operationResult; try { operationResult = operationFacet.invokeOperation(operationName, params); @@ -263,7 +263,7 @@ public abstract class AbstractAgentPluginTest extends Arquillian { ResourceContainer resourceContainer = this.pluginContainer.getInventoryManager().getResourceContainer(resource); long timeoutMillis = 5000; ConfigurationFacet configurationFacet = resourceContainer.createResourceComponentProxy( - ConfigurationFacet.class, FacetLockType.READ, timeoutMillis, false, false); + ConfigurationFacet.class, FacetLockType.READ, timeoutMillis, false, false, false); return configurationFacet.loadResourceConfiguration(); } @@ -277,7 +277,7 @@ public abstract class AbstractAgentPluginTest extends Arquillian { ResourceContainer resourceContainer = this.pluginContainer.getInventoryManager().getResourceContainer(resource); long timeoutMillis = 5000; ConfigurationFacet configurationFacet = resourceContainer.createResourceComponentProxy( - ConfigurationFacet.class, FacetLockType.WRITE, timeoutMillis, false, false); + ConfigurationFacet.class, FacetLockType.WRITE, timeoutMillis, false, false, false); ConfigurationUpdateReport report = new ConfigurationUpdateReport(resourceConfig); configurationFacet.updateResourceConfiguration(report); return report; @@ -547,7 +547,7 @@ public abstract class AbstractAgentPluginTest extends Arquillian { throw new IllegalStateException("Resource component for " + resource + " has not yet been started."); } MeasurementFacet measurementFacet = resourceContainer.createResourceComponentProxy(MeasurementFacet.class, - FacetLockType.READ, timeoutMillis, false, false); + FacetLockType.READ, timeoutMillis, false, false, false); MeasurementReport report = new MeasurementReport(); MeasurementScheduleRequest request = new MeasurementScheduleRequest(-1, metricName, -1, true, measurementDefinition.getDataType(), measurementDefinition.getRawNumericType()); diff --git a/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractDestinationTest.java b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractDestinationTest.java index 2c23c8b..5dbdef3 100644 --- a/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractDestinationTest.java +++ b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractDestinationTest.java @@ -1,24 +1,20 @@ /* - * Jopr Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.plugins.jbossas5.test; @@ -159,7 +155,7 @@ public abstract class AbstractDestinationTest extends AbstractResourceTest { if (resource.getName().equals(getDestinationName())) { foundDestination = true; OperationFacet operationFacet = ComponentUtil.getComponent(resource.getId(), OperationFacet.class, - FacetLockType.WRITE, 3000, true, true); + FacetLockType.WRITE, 3000, true, true, true); String name = "removeAllMessages"; operationFacet.invokeOperation(name, getTestOperationParameters(name)); } diff --git a/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractResourceTest.java b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractResourceTest.java index b78b522..162254f 100644 --- a/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractResourceTest.java +++ b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractResourceTest.java @@ -1,24 +1,20 @@ /* - * Jopr Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.plugins.jbossas5.test; @@ -95,7 +91,7 @@ public abstract class AbstractResourceTest extends AbstractPluginTest { for (Resource resource : resources) { System.out.println("Validating metrics for " + resource + "..."); MeasurementFacet measurementFacet = ComponentUtil.getComponent(resource.getId(), - MeasurementFacet.class, FacetLockType.READ, MEASUREMENT_FACET_METHOD_TIMEOUT, true, true); + MeasurementFacet.class, FacetLockType.READ, MEASUREMENT_FACET_METHOD_TIMEOUT, true, true, true); for (MeasurementDefinition metricDefinition : metricDefinitions) { String name = metricDefinition.getName(); try { @@ -160,7 +156,7 @@ public abstract class AbstractResourceTest extends AbstractPluginTest { //the 3 seconds to finish. Otherwise all the operations would have to finish in 3 secs //which can be a bit harsh limit. OperationFacet operationFacet = ComponentUtil.getComponent(resource.getId(), OperationFacet.class, - FacetLockType.WRITE, OPERATION_FACET_METHOD_TIMEOUT, true, true); + FacetLockType.WRITE, OPERATION_FACET_METHOD_TIMEOUT, true, true, true); //String name = operationDefinition.getName(); OperationResult result = operationFacet.invokeOperation(name, getTestOperationParameters(name)); System.out.println("Validating operation '" + name + "' result (" + result + ")..."); diff --git a/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/util/AppServerUtils.java b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/util/AppServerUtils.java index 6b1af87..17e0b1d 100644 --- a/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/util/AppServerUtils.java +++ b/modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/util/AppServerUtils.java @@ -1,24 +1,20 @@ /* - * Jopr Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.plugins.jbossas5.test.util; @@ -38,7 +34,6 @@ import org.jboss.deployers.spi.management.deploy.DeploymentStatus; import org.rhq.core.clientapi.agent.metadata.PluginMetadataManager; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.measurement.AvailabilityType; -import org.rhq.core.domain.measurement.ResourceAvailability; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pc.PluginContainer; @@ -46,7 +41,6 @@ import org.rhq.core.pc.inventory.InventoryManager; import org.rhq.core.pc.inventory.ResourceContainer; import org.rhq.core.pc.util.ComponentUtil; import org.rhq.core.pc.util.FacetLockType; -import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.plugins.jbossas5.ProfileServiceComponent; @@ -182,7 +176,7 @@ public class AppServerUtils { Thread.currentThread().setContextClassLoader(cl); return ComponentUtil.getComponent(resource.getId(), resourceSpecificFacetInterface, FacetLockType.WRITE, - timeout, true, true); + timeout, true, true, true); } finally { Thread.currentThread().setContextClassLoader(currenContextClassLoader); } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java index 13e1b75..0b5dbf5 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java @@ -19,6 +19,8 @@ package org.rhq.modules.plugins.jbossas7; +import static java.util.concurrent.TimeUnit.SECONDS; + import java.io.File; import java.util.ArrayList; import java.util.Date; @@ -43,6 +45,7 @@ import org.rhq.core.domain.measurement.MeasurementReport; import org.rhq.core.domain.measurement.MeasurementScheduleRequest; import org.rhq.core.pluginapi.availability.AvailabilityCollectorRunnable; import org.rhq.core.pluginapi.availability.AvailabilityFacet; +import org.rhq.core.pluginapi.component.ComponentInvocationContext; import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper; import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; import org.rhq.core.pluginapi.inventory.ResourceComponent; @@ -279,8 +282,6 @@ public abstract class BaseServerComponent<T extends ResourceComponent<?>> extend protected boolean waitUntilDown() throws InterruptedException { boolean notAnswering = false; - int count = 0; - while (!notAnswering) { Operation op = new ReadAttribute(new Address(), "release-version"); @@ -288,21 +289,18 @@ public abstract class BaseServerComponent<T extends ResourceComponent<?>> extend Result res = getASConnection().execute(op); if (!res.isSuccess()) { // If op succeeds, server is not down notAnswering = true; - } else if (count > 20) { - break; } } catch (Exception e) { notAnswering = true; } if (!notAnswering) { - try { - Thread.sleep(1000); // Wait 1s - } catch (InterruptedException e) { - // ignore + if (context.getComponentInvocationContext().isInterrupted()) { + // Operation canceled or timed out + throw new InterruptedException(); } + Thread.sleep(SECONDS.toMillis(1)); } - count++; } // BZ 893802: wait until server (the process) is really down @@ -314,8 +312,7 @@ public abstract class BaseServerComponent<T extends ResourceComponent<?>> extend if (hostPort.isLocal) { // lets be paranoid here - for (; count <= 20; count++) { - ProcessInfo processInfo = context.getNativeProcess(); + for (ProcessInfo processInfo = context.getNativeProcess(); ; processInfo = context.getNativeProcess()) { if (processInfo == null) { // Process not found, so it died, that's fine break; @@ -324,16 +321,14 @@ public abstract class BaseServerComponent<T extends ResourceComponent<?>> extend // Process info says process is no longer running, that's fine break; } - // Process is still running, wait a second and check again - try { - Thread.sleep(1000); // Wait 1s - } catch (InterruptedException e) { - // ignore + if (context.getComponentInvocationContext().isInterrupted()) { + // Operation canceled or timed out + throw new InterruptedException(); } + // Process is still running, wait a second and check again + Thread.sleep(SECONDS.toMillis(1)); } } - - log.debug("waitUntilDown: Used " + count + " delay round(s) to shut down. Server down=" + notAnswering); return notAnswering; } @@ -342,7 +337,7 @@ public abstract class BaseServerComponent<T extends ResourceComponent<?>> extend * * @return the result of the operation */ - protected OperationResult startServer() { + protected OperationResult startServer() throws InterruptedException { OperationResult operationResult = new OperationResult(); if (isManuallyAddedServer(operationResult, "Starting")) { return operationResult; @@ -383,8 +378,7 @@ public abstract class BaseServerComponent<T extends ResourceComponent<?>> extend // standalone.bat.conf and domain.bat.conf respectively. processExecution.setWorkingDirectory(startScriptFile.getParent()); processExecution.setCaptureOutput(true); - processExecution.setWaitForCompletion(15000L); // 15 seconds // TODO: Should we wait longer than 15 seconds? - processExecution.setKillOnTimeout(false); + processExecution.setWaitForCompletion(0); if (log.isDebugEnabled()) { log.debug("About to execute the following process: [" + processExecution + "]"); @@ -484,17 +478,14 @@ public abstract class BaseServerComponent<T extends ResourceComponent<?>> extend return startScriptFile; } - private boolean waitForServerToStart() { + private boolean waitForServerToStart() throws InterruptedException { boolean up = false; - int count = 0; while (!up) { Operation op = new ReadAttribute(new Address(), "release-version"); try { Result res = getASConnection().execute(op); if (res.isSuccess()) { // If op succeeds, server is not down up = true; - } else if (count > 20) { - break; } } catch (Exception e) { //do absolutely nothing @@ -503,13 +494,12 @@ public abstract class BaseServerComponent<T extends ResourceComponent<?>> extend } if (!up) { - try { - Thread.sleep(1000); // Wait 1s - } catch (InterruptedException e) { - // ignore + if (context.getComponentInvocationContext().isInterrupted()) { + // Operation canceled or timed out + throw new InterruptedException(); } + Thread.sleep(SECONDS.toMillis(1)); } - count++; } return up; } diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java index 5b552bc..b872ad6 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2012 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.modules.plugins.jbossas7.itest.standalone; @@ -272,7 +272,7 @@ public class DeploymentTest extends AbstractJBossAS7PluginTest { ResourceContainer webRuntimeResourceContainer = pluginContainer.getInventoryManager().getResourceContainer( webRuntimeResource); MeasurementFacet measurementFacet = webRuntimeResourceContainer.createResourceComponentProxy( - MeasurementFacet.class, FacetLockType.READ, SECONDS.toMillis(5), false, false); + MeasurementFacet.class, FacetLockType.READ, SECONDS.toMillis(5), false, false, false); MeasurementReport report = new MeasurementReport(); Set<MeasurementScheduleRequest> measurementScheduleRequests = getMeasurementScheduleRequests(webRuntimeResource); measurementFacet.getValues(report, measurementScheduleRequests); diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/WebConnectorComponentTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/WebConnectorComponentTest.java index ca86d5e..31343f3 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/WebConnectorComponentTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/WebConnectorComponentTest.java @@ -88,7 +88,7 @@ public class WebConnectorComponentTest extends AbstractJBossAS7PluginTest { requests.add(newMeasurementRequest(MAX_CONNECTIONS_METRIC_NAME)); MeasurementReport report = new MeasurementReport(); ComponentUtil.getComponent(webConnectorResource.getId(), MeasurementFacet.class, FacetLockType.READ, - SECONDS.toMillis(30), true, false).getValues(report, requests); + SECONDS.toMillis(30), true, false, true).getValues(report, requests); Set<MeasurementDataNumeric> numericMetrics = report.getNumericData(); assertEquals(numericMetrics, 1); MeasurementData measurementData = numericMetrics.iterator().next(); diff --git a/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/AppServerUtils.java b/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/AppServerUtils.java index 653e86d..b07e10a 100644 --- a/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/AppServerUtils.java +++ b/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/AppServerUtils.java @@ -1,24 +1,20 @@ /* - * Jopr Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.plugins.jbosscache3.test; @@ -187,7 +183,7 @@ public class AppServerUtils { return ComponentUtil.getComponent(asResource.getId(), resourceSpecificFacetInterface, FacetLockType.WRITE, - DEPLOY_CONTENT_TIMEOUT, true, true); + DEPLOY_CONTENT_TIMEOUT, true, true, true); } finally { Thread.currentThread().setContextClassLoader( currenContextClassLoader); diff --git a/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/CacheComponentTest.java b/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/CacheComponentTest.java index 2189e6b..6d9a025 100644 --- a/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/CacheComponentTest.java +++ b/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/CacheComponentTest.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -13,8 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.plugins.jbosscache3.test; @@ -183,7 +183,7 @@ public class CacheComponentTest { MeasurementFacet measurementFacet = ComponentUtil.getComponent( resource.getId(), MeasurementFacet.class, FacetLockType.READ, MEASUREMENT_FACET_METHOD_TIMEOUT, true, - true); + true, true); EmsBean relatedBean = connection.getBean(resource.getResourceKey()); for (MeasurementDefinition metricDefinition : metricDefinitions) { diff --git a/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/OperationTest.java b/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/OperationTest.java index 1c69a88..cab153b 100644 --- a/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/OperationTest.java +++ b/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/OperationTest.java @@ -1,3 +1,22 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + package org.rhq.plugins.jbosscache3.test; import java.util.Set; @@ -51,7 +70,7 @@ public class OperationTest { resource.getId(), OperationFacet.class, FacetLockType.WRITE, CacheComponentTest.OPERATION_FACET_METHOD_TIMEOUT, - true, true); + true, true, true); for (OperationDefinition operationDefinition : operationDefinitions) { String name = operationDefinition.getName(); diff --git a/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/TestHelper.java b/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/TestHelper.java index 16c453e..5284f1d 100644 --- a/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/TestHelper.java +++ b/modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/TestHelper.java @@ -1,3 +1,22 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + package org.rhq.plugins.jbosscache3.test; import java.io.File; @@ -104,7 +123,7 @@ public class TestHelper { .getComponent(resource.getId(), MeasurementFacet.class, FacetLockType.READ, CacheComponentTest.MEASUREMENT_FACET_METHOD_TIMEOUT, - true, true); + true, true, true); ResourceType resourceType = resource.getResourceType(); Set<MeasurementDefinition> metricDefinitions = resourceType .getMetricDefinitions();

1 0

[rhq] Branch 'bug/966777' - 0 commits -
by Thomas Segismont 02 Jul '13

02 Jul '13

Rebased ref, commits from common ancestor:

1 0

[rhq] Changes to 'bug/966777'
by Thomas Segismont 02 Jul '13

02 Jul '13

New branch 'bug/966777' available with the following commits: commit 8d3cee90914164538471b723b1f344fbaffcfe8c Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Tue Jul 2 12:24:21 2013 +0200 Bug 966777 - EAP 6 plug-in is using a hard-coded operation timeout for start and stop instead of using the operation timeout or agent's default operation timeout of 10 minutes Make ComponentInvocationContext accessible from ResourceContext. Expose interface only in plugin api. commit cf043bcb4499155839dcf00818e6e12c22b90d05 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jun 27 17:05:03 2013 +0200 Bug 966777 - EAP 6 plug-in is using a hard-coded operation timeout for start and stop instead of using the operation timeout or agent's default operation timeout of 10 minutes Introduce ComponentInvocationContext class. An instance of this class is created by the plugin container and bound to facet-locked component invocation thread. Make BaseServerComponent use ComponentInvocationContext to deal with operation timeout or cancellation. commit fa52ed9d1a80905903a4294971c898c978cd11d5 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Thu Jun 27 16:09:58 2013 +0200 Bug 966777 - EAP 6 plug-in is using a hard-coded operation timeout for start and stop instead of using the operation timeout or agent's default operation timeout of 10 minutes The component invocation handler now has a transferInterrupt parameter. If set to true, the component invocation thread will be interrupted when the caller thread is.

1 0

[rhq] 2 commits - modules/enterprise
by mike thompson 02 Jul '13

02 Jul '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java | 18 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java | 14 ++++++- 3 files changed, 11 insertions(+), 22 deletions(-) New commits: commit 321fbfbe0a5865449ce5b1f5e9ff2ce2704151ef Author: Mike Thompson <mithomps(a)redhat.com> Date: Mon Jul 1 19:48:53 2013 -0700 Syntax error fix. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java index 101df60..2804af0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java @@ -41,7 +41,7 @@ public final class CompositeGroupMultiLineGraphListView extends CompositeGroupD3 @Override public native void drawJsniChart() /*-{ console.log("Draw nvd3 charts for composite multiline graph"); - var chartId = global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), + var chartId = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), chartHandle = "#mChart-"+chartId, chartSelection = chartHandle + " svg", yAxisUnits = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getYAxisUnits()(), commit 4d8fded37b908cf50768b5ef249395b9fba75deb Author: Mike Thompson <mithomps(a)redhat.com> Date: Fri Jun 28 09:45:20 2013 -0700 [BZ 958754] On Multi-resource graph, time units should have minutes when appropriate. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java index 8661136..e75b65a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java @@ -29,7 +29,6 @@ import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasurementRangeEditor; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index dfb53b3..faeb476 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -350,24 +350,6 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl return sb.toString(); } - /** - * If there is more than 2 days time window then return true so we can show day of week - * in axis labels. Function to switch the timescale to whichever is more appropriate hours - * or hours with days of week. - * @return true if difference between startTime and endTime is >= x days - */ - public boolean shouldDisplayDayOfWeekInXAxisLabel() { - // because of asyncrony this is possible so default it - if (null == measurementForEachResource || measurementForEachResource.isEmpty()) { - return true; - } - List<MeasurementDataNumericHighLowComposite> firstResourceMeasurementList = measurementForEachResource.get(0) - .getMeasurementData(); - Long startTime = firstResourceMeasurementList.get(0).getTimestamp(); - Long endTime = firstResourceMeasurementList.get(firstResourceMeasurementList.size() - 1).getTimestamp(); - long timeThreshold = 24 * 60 * 60 * 1000; // 1 days - return startTime + timeThreshold < endTime; - } /** * Client can choose which graph types to render. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java index 46e51c0..101df60 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java @@ -19,6 +19,9 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; + /** * A MultiLine version of the Composite group single metric multiple resource charts. * @@ -26,6 +29,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring */ public final class CompositeGroupMultiLineGraphListView extends CompositeGroupD3GraphListView { + private static final Messages MSG = CoreGUI.getMessages(); public CompositeGroupMultiLineGraphListView(int groupId, int defId, boolean isAutogroup) { @@ -37,16 +41,14 @@ public final class CompositeGroupMultiLineGraphListView extends CompositeGroupD3 @Override public native void drawJsniChart() /*-{ console.log("Draw nvd3 charts for composite multiline graph"); - var chartId = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), + var chartId = global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), chartHandle = "#mChart-"+chartId, chartSelection = chartHandle + " svg", yAxisUnits = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getYAxisUnits()(), xAxisLabel = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTitle()(), - displayDayOfWeek = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::shouldDisplayDayOfWeekInXAxisLabel()(), - xAxisTimeFormat = (displayDayOfWeek) ? "%a %I %p" : "%I %p", + xAxisTimeFormat = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupMultiLineGraphListView::getXAxisTimeFormatHoursMinutes()(); json = eval(this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getJsonMetrics()()); - $wnd.nv.addGraph(function() { var chart = $wnd.nv.models.lineChart(); @@ -68,4 +70,10 @@ public final class CompositeGroupMultiLineGraphListView extends CompositeGroupD3 }); }-*/; + + + + public String getXAxisTimeFormatHoursMinutes() { + return MSG.chart_xaxis_time_format_hours_minutes(); + } }

1 0

[rhq] 2 commits - modules/core
by John Sanda 01 Jul '13

01 Jul '13

modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java | 32 +++++++++- 1 file changed, 29 insertions(+), 3 deletions(-) New commits: commit 85153e8fc2de1b12eab75560146f20b095ac430c Merge: 0962d2c c8b2a83 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 1 17:22:12 2013 -0400 Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq commit 0962d2c35f1e515ba96c9c606384fd1e6bb8e31d Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 1 17:21:35 2013 -0400 adding some javadocs for reported metrics diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java index c6507c4..379eba6 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeLoadComposite.java @@ -79,6 +79,9 @@ public class StorageNodeLoadComposite implements Serializable { this.endTime = endTime; } + /** + * @return heapCommitted A computed metric for the amount of memory that is committed for the JVM to use. + */ public MeasurementAggregateWithUnits getHeapCommitted() { return heapCommitted; } @@ -86,7 +89,10 @@ public class StorageNodeLoadComposite implements Serializable { public void setHeapCommitted(MeasurementAggregateWithUnits heapCommitted) { this.heapCommitted = heapCommitted; } - + + /** + * @return A computed metric for the amount of JVM heap memory used + */ public MeasurementAggregateWithUnits getHeapUsed() { return heapUsed; } @@ -95,6 +101,10 @@ public class StorageNodeLoadComposite implements Serializable { this.heapUsed = heapUsed; } + /** + * @return A computed metric for the {@link #getHeapUsed() heapUsed} divided by the + * {@link #getHeapCommitted() heapCommitted} expressed as a percentage. + */ public MeasurementAggregateWithUnits getHeapPercentageUsed() { return heapPercentageUsed; } @@ -102,7 +112,11 @@ public class StorageNodeLoadComposite implements Serializable { public void setHeapPercentageUsed(MeasurementAggregateWithUnits heapPercentageUsed) { this.heapPercentageUsed = heapPercentageUsed; } - + + /** + * @return A computed metric for the space used on disk by all SSTables of all column families expressed as a + * percentage. + */ public MeasurementAggregateWithUnits getDiskSpacePercentageUsed() { return diskSpacePercentageUsed; } @@ -110,7 +124,10 @@ public class StorageNodeLoadComposite implements Serializable { public void setDiskSpacePercentageUsed(MeasurementAggregateWithUnits diskSpacePercentageUsed) { this.diskSpacePercentageUsed = diskSpacePercentageUsed; } - + + /** + * @return A computed metric for the the reported disk space used by all SSTables on disk for all column families. + */ public MeasurementAggregateWithUnits getLoad() { return load; } @@ -119,6 +136,10 @@ public class StorageNodeLoadComposite implements Serializable { this.load = load; } + /** + * @return A computed metric for the number of tokens owned by this node. The range of values between two tokens is + * the range of possible keys for that portion of the token ring. + */ public MeasurementAggregate getTokens() { return tokens; } @@ -127,6 +148,11 @@ public class StorageNodeLoadComposite implements Serializable { this.tokens = tokens; } + /** + * @return A computed metric for a percentage of keys owned by this node. This directly correlates to the + * number of {@link #getTokens() tokens}. For example, if you have a a two node cluster with each node having 256 + * tokens, then with an even distribution, this metric should be right around 50%. + */ public MeasurementAggregateWithUnits getActuallyOwns() { return actuallyOwns; }

1 0

[rhq] modules/enterprise
by mazz 01 Jul '13

01 Jul '13

modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java | 19 ++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) New commits: commit c8b2a83182eac7882e78095a43c554b1caf191e5 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Jul 1 16:24:33 2013 -0400 BZ 914781 - on error, log the remote client address to help figure out which agent is having the problem diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java index 994a924..d115187 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java @@ -34,6 +34,7 @@ import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.cloud.Server.OperationMode; import org.rhq.core.domain.common.composite.SystemSetting; import org.rhq.core.domain.common.composite.SystemSettings; +import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.core.util.stream.StreamUtil; import org.rhq.enterprise.server.core.AgentManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; @@ -160,7 +161,9 @@ public class AgentUpdateServlet extends HttpServlet { agentJarStream.close(); } } catch (Throwable t) { - log.error("Failed to stream agent jar.", t); + String clientAddr = getClientAddress(req); + log.error("Failed to stream agent jar to remote client [" + clientAddr + "]: " + + ThrowableUtil.getAllMessages(t)); disableBrowserCache(resp); resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Failed to stream agent jar"); } @@ -178,7 +181,9 @@ public class AgentUpdateServlet extends HttpServlet { byte[] versionData = StreamUtil.slurp(stream); resp.getOutputStream().write(versionData); } catch (Throwable t) { - log.error("Failed to stream version info.", t); + String clientAddr = getClientAddress(req); + log.error("Failed to stream version info to remote client [" + clientAddr + "]: " + + ThrowableUtil.getAllMessages(t)); disableBrowserCache(resp); resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Failed to stream version info"); } @@ -253,4 +258,14 @@ public class AgentUpdateServlet extends HttpServlet { } } + private String getClientAddress(HttpServletRequest request) { + String ip = request.getHeader("X-Forwarded-For"); + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_X_FORWARDED_FOR"); + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = String.format("%s (%s)", request.getRemoteHost(), request.getRemoteAddr()); + } + } + return ip; + } } \ No newline at end of file

1 0

[rhq] modules/plugins
by John Sanda 01 Jul '13

01 Jul '13

modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 870091c34662c19841f8ce40914498ab7cfe4258 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 1 15:18:21 2013 -0400 add some more detail in reporting repair results diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 5722e37..cc34fe3 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -157,15 +157,16 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper result.operation = "repair " + keyspace + " keyspace"; try { if (log.isDebugEnabled()) { - log.debug("Running repair on " + keyspace + " keyspace"); + log.debug("Running primary range repair on " + keyspace + " keyspace"); } long start = System.currentTimeMillis(); keyspaceService.repairPrimaryRange(keyspace); long end = System.currentTimeMillis(); if (log.isDebugEnabled()) { - log.debug("Finsihed repair on " + keyspace + " keyspace in " + (end - start) + " ms"); + log.debug("Finsihed primary range repair on " + keyspace + " keyspace in " + (end - start) + " ms"); } result.succeeded = true; + result.details = "Completed repair operation in " + (end - start) + " ms."; } catch (Exception e) { log.error("An error occurred while running repair on " + keyspace, e); Throwable rootCause = ThrowableUtil.getRootCause(e);

1 0

[rhq] modules/enterprise modules/plugins
by John Sanda 01 Jul '13

01 Jul '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 28 ++++++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java | 13 ++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java | 8 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageClusterReadRepairJob.java | 24 ++++++++ modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 19 ++++++ modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 12 ++++ 6 files changed, 103 insertions(+), 1 deletion(-) New commits: commit 53f1d430fcef238e9315071eb355bc1d79985d86 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 1 14:54:17 2013 -0400 initial support for regularly scheduled read repair (i.e., anti-entropy repair) Repair is set up to run weekly starting at 12:30 AM every sunday. The repair operation is run serially, one node at a time. StorageClusterReadRepairJob is the new quartz job that kicks off the repair. It simply delegates to StorageNodeManagerBean.runReadRepair which in turn schedules a group operation. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 4504d53..90d9497 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -48,12 +48,14 @@ import org.rhq.core.domain.cloud.Server; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.cloud.StorageNode.OperationMode; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; +import org.rhq.core.domain.common.JobTrigger; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.criteria.StorageNodeCriteria; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.measurement.MeasurementAggregate; import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.domain.operation.bean.GroupOperationSchedule; import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; @@ -118,6 +120,9 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @EJB private ResourceGroupManagerLocal resourceGroupManager; + @EJB + private OperationManagerLocal operationManager; + @Override public synchronized List<StorageNode> scanForStorageNodes() { List<StorageNode> existingStorageNodes = getStorageNodes(); @@ -551,4 +556,27 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN resourceId = storageNode.getResource().getId(); return resourceId; } + + @Override + public void runReadRepair() { + ResourceGroup storageNodeGroup = getStorageNodeGroup(); + + if (storageNodeGroup.getExplicitResources().size() < 2) { + log.info("Skipping read repair since this is a single-node cluster"); + return; + } + + log.info("Scheduling read repair maintenance for storage cluster"); + + GroupOperationSchedule schedule = new GroupOperationSchedule(); + schedule.setGroup(storageNodeGroup); + schedule.setHaltOnFailure(false); + schedule.setExecutionOrder(new ArrayList<Resource>(storageNodeGroup.getExplicitResources())); + schedule.setJobTrigger(JobTrigger.createNowTrigger()); + schedule.setSubject(subjectManager.getOverlord()); + schedule.setOperationName("readRepair"); + schedule.setDescription("Run scheduled read repair on storage node"); + + operationManager.scheduleGroupOperation(subjectManager.getOverlord(), schedule); + } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index 5b13428..54646ec 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -73,4 +73,17 @@ public interface StorageNodeManagerLocal { */ void prepareNodeForUpgrade(Subject subject, StorageNode storageNode); + /** + * <p> + * Schedules read repair to run on the storage cluster. The repair operation is executed one node at a time. This + * method is invoked from {@link org.rhq.enterprise.server.scheduler.jobs.StorageClusterReadRepairJob StorageClusterReadRepairJob} + * as part of regularly scheduled maintenance. + * </p> + * <p> + * <strong>NOTE:</strong> Repair is one of the most resource-intensive operations that a storage node performs. Make + * sure you know what you are doing if you invoke this method outside of the regularly scheduled maintenance window. + * </p> + */ + void runReadRepair(); + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java index 9d37b75..7ce77d8 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java @@ -88,6 +88,7 @@ import org.rhq.enterprise.server.scheduler.jobs.DynaGroupAutoRecalculationJob; import org.rhq.enterprise.server.scheduler.jobs.PurgePluginsJob; import org.rhq.enterprise.server.scheduler.jobs.PurgeResourceTypesJob; import org.rhq.enterprise.server.scheduler.jobs.SavedSearchResultCountRecalculationJob; +import org.rhq.enterprise.server.scheduler.jobs.StorageClusterReadRepairJob; import org.rhq.enterprise.server.scheduler.jobs.StorageNodeMaintenanceJob; import org.rhq.enterprise.server.storage.StorageClientManagerBean; import org.rhq.enterprise.server.storage.StorageClusterHeartBeatJob; @@ -665,7 +666,12 @@ public class StartupBean implements StartupLocal { log.error("Cannot create alert availability duration job.", e); } - return; + try { + String cronString = "0 30 0 ? * SUN *"; // every sunday starting at 00:30. + schedulerBean.scheduleSimpleCronJob(StorageClusterReadRepairJob.class, true, true, cronString); + } catch (Exception e) { + log.error("Cannot create storage cluster read repair job", e); + } } /** diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageClusterReadRepairJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageClusterReadRepairJob.java new file mode 100644 index 0000000..a6dd934 --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/StorageClusterReadRepairJob.java @@ -0,0 +1,24 @@ +package org.rhq.enterprise.server.scheduler.jobs; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + +import org.rhq.enterprise.server.cloud.StorageNodeManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; + +/** + * @author John Sanda + */ +public class StorageClusterReadRepairJob extends AbstractStatefulJob { + + private Log log = LogFactory.getLog(StorageClusterReadRepairJob.class); + + @Override + public void executeJobCode(JobExecutionContext context) throws JobExecutionException { + log.info("Preparing to run read repair on storage cluster"); + StorageNodeManagerLocal storageNodeManager = LookupUtil.getStorageNodeManager(); + storageNodeManager.runReadRepair(); + } +} diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 08b5205..5722e37 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -61,6 +61,8 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return nodeAdded(parameters); } else if (name.equals("prepareForUpgrade")) { return prepareForUpgrade(parameters); + } else if (name.equals("readRepair")) { + return readRepair(); } else { return super.invokeOperation(name, parameters); } @@ -133,6 +135,23 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper return result; } + private OperationResult readRepair() { + KeyspaceService keyspaceService = new KeyspaceService(getEmsConnection()); + OperationResult result = new OperationResult(); + Configuration resultConfig = result.getComplexResults(); + PropertyList resultsList = new PropertyList("results"); + + OpResult opResult = repairKeyspace(keyspaceService, RHQ_KEYSPACE); + resultsList.add(toPropertyMap(opResult)); + + opResult = repairKeyspace(keyspaceService, SYSTEM_AUTH_KEYSPACE); + resultsList.add(toPropertyMap(opResult)); + + resultConfig.put(resultsList); + + return result; + } + private OpResult repairKeyspace(KeyspaceService keyspaceService, String keyspace) { OpResult result = new OpResult(); result.operation = "repair " + keyspace + " keyspace"; diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 0029cd4..f02c8e6 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -61,6 +61,18 @@ <c:simple-property name="startResult" description="Restart the Cassandra daemon"/> </results> </operation> + + <operation name="readRepair" description="Runs read repair on primar range of rhq and system_auth keyspaces"> + <results> + <c:list-property name="results"> + <c:map-property name="resultsMap"> + <c:simple-property name="task" type="string"/> + <c:simple-property name="succeeded" type="boolean"/> + <c:simple-property name="details" type="string"/> + </c:map-property> + </c:list-property> + </results> + </operation> <operation name="addNodeMaintenance"> <parameters>

1 0

[rhq] modules/plugins
by mazz 01 Jul '13

01 Jul '13

modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptDiscoveryComponent.java | 10 ++++++++-- modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptServerComponent.java | 8 ++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) New commits: commit 49fe82e497cd3fb258fa29aca8bfebe7c480b14e Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Jul 1 13:38:52 2013 -0400 BZ 848258 - trim empty space/newlines from script output prior to applying any regex filters. diff --git a/modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptDiscoveryComponent.java b/modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptDiscoveryComponent.java index 8cbd84e..c685efe 100644 --- a/modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptDiscoveryComponent.java +++ b/modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptDiscoveryComponent.java @@ -31,11 +31,11 @@ import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; +import org.rhq.core.pluginapi.inventory.ManualAddFacet; import org.rhq.core.pluginapi.inventory.ProcessScanResult; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; -import org.rhq.core.pluginapi.inventory.ManualAddFacet; -import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.util.exception.ThrowableUtil; @@ -125,6 +125,9 @@ public class ScriptDiscoveryComponent implements ResourceDiscoveryComponent, Man } else if (results.getCapturedOutput() != null) { String regex = pluginConfig.getSimpleValue(ScriptServerComponent.PLUGINCONFIG_DESC_REGEX, null); String output = results.getCapturedOutput(); + if (output != null) { + output = output.trim(); + } if (regex == null) { description = output; } else { @@ -176,6 +179,9 @@ public class ScriptDiscoveryComponent implements ResourceDiscoveryComponent, Man String regex = pluginConfig.getSimpleValue(ScriptServerComponent.PLUGINCONFIG_VERSION_REGEX, null); String output = results.getCapturedOutput(); + if (output != null) { + output = output.trim(); + } if (regex == null) { version = output; } else { diff --git a/modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptServerComponent.java b/modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptServerComponent.java index 0ff12b0..c964c69 100644 --- a/modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptServerComponent.java +++ b/modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptServerComponent.java @@ -184,11 +184,13 @@ public class ScriptServerComponent implements ResourceComponent, MeasurementFace continue; } } else if (regex != null) { - final String output = exeResults.getCapturedOutput(); + String output = exeResults.getCapturedOutput(); if (output == null) { log.error("Could not get output for metric property [" + metricPropertyName + "] -- metric will not be collected"); continue; + } else { + output = output.trim(); } Pattern pattern = Pattern.compile(regex); @@ -336,7 +338,7 @@ public class ScriptServerComponent implements ResourceComponent, MeasurementFace resultsConfig.put(new PropertySimple(OPERATION_RESULT_EXITCODE, exitcode)); } if (output != null) { - resultsConfig.put(new PropertySimple(OPERATION_RESULT_OUTPUT, output)); + resultsConfig.put(new PropertySimple(OPERATION_RESULT_OUTPUT, output.trim())); } return result; @@ -498,6 +500,8 @@ public class ScriptServerComponent implements ResourceComponent, MeasurementFace String output = results.getCapturedOutput(); if (output == null) { output = ""; + } else { + output = output.trim(); } boolean outputMatches = output.matches(availOutputRegex);

1 0

[rhq] modules/core
by mazz 01 Jul '13

01 Jul '13

modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6ee04e067165819b7bcfbc9b8a3e4a7b168b8a7c Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Jul 1 12:10:14 2013 -0400 BZ 860815 - consider version strings of "" and null as equal diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java index 5b0e550..704a230 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java @@ -2760,7 +2760,8 @@ public class InventoryManager extends AgentService implements ContainerService, private void updateResourceVersion(Resource resource, String version) { String existingVersion = resource.getVersion(); - boolean versionChanged = (existingVersion != null) ? !existingVersion.equals(version) : version != null; + boolean versionChanged = (existingVersion != null) ? !existingVersion.equals(version) : version != null + && !version.isEmpty(); if (versionChanged) { if (log.isDebugEnabled()) { log.debug("Discovery reported that version of [" + resource + "] changed from [" + existingVersion

1 0

[rhq] Branch 'bug/966777' - 0 commits -
by Thomas Segismont 01 Jul '13

01 Jul '13

Rebased ref, commits from common ancestor:

1 0

[rhq] .classpath modules/enterprise
by Thomas Segismont 01 Jul '13

01 Jul '13

.classpath | 1 modules/enterprise/pom.xml | 2 modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 16 modules/enterprise/server/ear/pom.xml | 46 modules/enterprise/server/pom.xml | 1 modules/enterprise/server/sars/agent-sar/pom.xml | 200 - modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java | 795 ------- modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapServiceMBean.java | 230 -- modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentClassLoader.java | 87 modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent/log4j.xml | 65 modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-deployment-structure.xml | 12 modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-service.xml | 20 modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration-overrides.properties | 29 modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration.xml | 1062 ---------- modules/enterprise/server/sars/pom.xml | 50 15 files changed, 2616 deletions(-) New commits: commit aeb13c720a564a5b09fcb2ef6ae4c46ba39c37d2 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Mon Jul 1 16:51:48 2013 +0200 Agent SAR removed diff --git a/.classpath b/.classpath index d0646ed..f09f8ed 100644 --- a/.classpath +++ b/.classpath @@ -71,7 +71,6 @@ <classpathentry kind="src" path="modules/enterprise/remoting/client-api/src/main/java"/> <classpathentry kind="src" path="modules/enterprise/remoting/cli/src/main/java"/> <classpathentry kind="src" path="modules/enterprise/remoting/cli/src/test/java"/> - <classpathentry kind="src" path="modules/enterprise/server/sars/agent-sar/src/main/java"/> <classpathentry kind="src" path="modules/enterprise/server/safe-invoker/src/main/java"/> <classpathentry kind="src" path="modules/enterprise/server/safe-invoker/src/test/java"/> <classpathentry kind="src" path="modules/enterprise/server/startup-subsystem/src/main/java"/> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index ba70811..73352f5 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -33,7 +33,6 @@ <module>server/xml-schemas</module> <module>server/jar</module> <module>server/safe-invoker</module> - <module>server/sars</module> <module>remoting</module> <module>gui</module> <module>server/plugins</module> @@ -64,7 +63,6 @@ <module>server/xml-schemas</module> <module>server/jar</module> <module>server/safe-invoker</module> - <module>server/sars</module> <module>binding</module> <module>scripting</module> <module>remoting</module> diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index d11e27b..32824e2 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -316,22 +316,6 @@ </delete> <delete dir="${jboss.home}/bin/init.d" /> -  - <echo>Delete docs, README, et. al. files</echo> <delete dir="${jboss.home}/docs/examples" /> <delete> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 691d23c..0e4bc83 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -81,16 +81,6 @@ <type>war</type> </dependency> -  -  -  <dependency> <groupId>${project.groupId}</groupId> @@ -257,22 +247,6 @@ <excluded>true</excluded> </ejbClientModule> -  - -  -  -  -  -  -  -  <jarModule> <groupId>org.rhq.helpers</groupId> @@ -334,26 +308,6 @@ <artifactId>maven-dependency-plugin</artifactId> <executions> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - <execution> <id>copy-core-agent-plugins</id> <phase>process-resources</phase> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 725f18f..eb26cac 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -28,7 +28,6 @@ <module>server-metrics</module> <module>data-migration</module> <module>jar</module> -  <module>plugins</module> <module>ear</module> <module>startup-subsystem</module> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml deleted file mode 100644 index 44bc647..0000000 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ /dev/null @@ -1,200 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.rhq</groupId> - <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>4.7.0-SNAPSHOT</version> - </parent> - - <groupId>org.rhq</groupId> - <artifactId>rhq-enterprise-server-agent-sar</artifactId> - <packaging>jboss-sar</packaging> - - <name>RHQ Enterprise Server Embedded Agent SAR</name> - <description>The SAR that allows the server to embed the agent</description> - - <properties> - <sarDirectory>${project.build.directory}/${project.build.finalName}</sarDirectory> - </properties> - - <dependencies> - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-enterprise-agent</artifactId> - <version>${project.version}</version> - </dependency> - -  - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> -  - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - </dependencies> - - <build> - <finalName>rhq-agent</finalName> - <plugins> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-packaging-maven-plugin</artifactId> - <version>1.9.99</version> - <extensions>true</extensions>  - <configuration> - <libDirectory>${sarDirectory}/META-INF/embedded-agent/lib</libDirectory> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> -  - <execution> - <phase>package</phase> - <configuration> - <target> - <echo>sarDirectory="${sarDirectory}"</echo> - <echo>Putting some jars required by the embedded agent bootstrap service in the sar's classpath</echo> -  - <mkdir dir="${sarDirectory}/lib" /> - <copy file="${sarDirectory}/META-INF/embedded-agent/lib/rhq-enterprise-agent-${project.version}.jar" todir="${sarDirectory}/lib" /> - <copy file="${sarDirectory}/META-INF/embedded-agent/lib/rhq-enterprise-comm-${project.version}.jar" todir="${sarDirectory}/lib" /> - <copy file="${sarDirectory}/META-INF/embedded-agent/lib/rhq-core-comm-api-${project.version}.jar" todir="${sarDirectory}/lib" /> - <copy file="${sarDirectory}/META-INF/embedded-agent/lib/rhq-core-util-${project.version}.jar" todir="${sarDirectory}/lib" /> - <copy file="${sarDirectory}/META-INF/embedded-agent/lib/i18nlog-${i18nlog.version}.jar" todir="${sarDirectory}/lib" /> - - <echo>Populating the sar with the native libraries found at ${settings.localRepository}/org/hyperic/sigar-dist/${sigar.version}/sigar-dist-${sigar.version}.zip</echo> - <unzip dest="${sarDirectory}/META-INF/embedded-agent/lib"> - <fileset dir="${settings.localRepository}/org/hyperic/sigar-dist/${sigar.version}" includes="*.zip" /> - <patternset> -  - <include name="**/lib/bcel*.jar" /> - <include name="**/lib/*.so" /> - <include name="**/lib/*.sl" /> - <include name="**/lib/*.dll" /> - <include name="**/lib/*.dylib" /> - </patternset> - </unzip> - <move todir="${sarDirectory}/META-INF/embedded-agent/lib" flatten="true"> - <fileset dir="${sarDirectory}/META-INF/embedded-agent/lib"> - <include name="**/lib/*" /> - </fileset> - </move> - - <delete includeemptydirs="true"> - <fileset dir="${sarDirectory}/META-INF/embedded-agent/lib/" includes="hyperic-sigar*/**"/> - </delete> - - <echo>Removing libraries that are either unused or in the RHQ Server's JBossAS endorsed dir</echo> - <delete> - <fileset dir="${sarDirectory}/META-INF/embedded-agent/lib"> - <include name="jdom*.jar" />  - </fileset> - </delete> - -  -  - <echo>Repackaging the sar...</echo> - <delete file="${project.build.directory}/${project.build.finalName}.sar" /> - <jar destfile="${project.build.directory}/${project.build.finalName}.sar" basedir="${sarDirectory}" /> - - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> - </build> - - <profiles> - - <profile> - <id>dev</id> - - <properties> - <rhq.rootDir>../../../../..</rhq.rootDir> - <rhq.containerDir>${rhq.rootDir}/${rhq.devContainerServerPath}</rhq.containerDir> - <rhq.deploymentName>${project.build.finalName}.sar</rhq.deploymentName> - <rhq.deploymentDir>${rhq.containerDir}/jbossas/standalone/deployments/${rhq.deploymentName}</rhq.deploymentDir> - </properties> - - <build> - <plugins> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - - <execution> - <id>deploy</id> - <phase>package</phase> - <configuration> - <target> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> - <echo>*** Copying updated files from target${file.separator}classes${file.separator} to ${deployment.dir}${file.separator}...</echo> - <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> - <fileset dir="target/rhq-agent" /> - </copy> - <property name="deployment.descriptor.file" location="${deployment.dir}/META-INF/jboss-service.xml" /> - <echo>*** Touching ${deployment.descriptor.file} to force redeployment of ${rhq.deploymentName}...</echo> - <touch file="${deployment.descriptor.file}" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - <execution> - <id>undeploy</id> - <phase>clean</phase> - <configuration> - <target> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> - <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete dir="${deployment.dir}" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - </executions> - </plugin> - - </plugins> - </build> - </profile> - </profiles> - -</project> - diff --git a/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java b/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java deleted file mode 100644 index d39e05e..0000000 --- a/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java +++ /dev/null @@ -1,795 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.server.agent; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.net.InetAddress; -import java.net.URL; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Map; -import java.util.Properties; -import java.util.prefs.BackingStoreException; -import java.util.prefs.InvalidPreferencesFormatException; -import java.util.prefs.Preferences; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.rhq.core.util.StringPropertyReplacer; -import org.rhq.core.util.stream.StreamUtil; -import org.rhq.enterprise.agent.AgentConfiguration; -import org.rhq.enterprise.agent.AgentConfigurationConstants; -import org.rhq.enterprise.agent.AgentConfigurationUpgrade; - -/** - * This is an MBean service that can be used to bootstrap a RHQ Agent that is embedded in a RHQ Server. This will create - * a standalone classloader that will completely isolate the agent from any RHQ Server classloader (other than the - * top-level system classloader). Note that this service MBean interface does not expose any agent-specific classes to - * clients and it does not have direct access to any class outside of a select few classes found in the agent jar that - * is in this service's classpath. - * - * <p>Note that because this service is deployed with the agent jars in it, you must deploy it in exploded form.</p> - * - * @author John Mazzitelli - */ -public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServiceMBean { - private Log log = LogFactory.getLog(EmbeddedAgentBootstrapService.class); - - /** - * The agent itself. - */ - private Object agent = null; - - /** - * The location of the configuration file - can be a file path or path within classloader. - */ - private String configFile = "embedded-agent-configuration.xml"; - - /** - * The location of the configuration overrides properties file - can be a URL, file path or path within classloader. - */ - private String overridesFile = null; // the jboss-service.xml service descriptor must set this - - /** - * The preferences node name that identifies the configuration set used to configure the services. - */ - private String preferencesNodeName; - - /** - * Properties that will be used to override preferences found in the preferences node and the configuration - * preferences file. - */ - private Properties configurationOverrides = new Properties(); - - /** - * Arguments passed to the agent's main method. - */ - private String[] arguments = null; - - /** - * The location of the agent's resources, like jar files (jar files are located under the lib subdirectory). - */ - private File embeddedAgentDirectory = null; - - /** - * If <code>true</code>, this service will be told to start the agent immediately at startup by the RHQ Server. - */ - private Boolean enabled = Boolean.FALSE; - - /** - * If <code>true</code>, this bootstrap service will revert the agent's configuration back to the original - * configuration file. Otherwise, the configuration will be that which is currently persisted in the preferences - * store. - */ - private Boolean resetConfigurationAtStartup = Boolean.FALSE; - - /** - * This starts the agent in a completely isolated classloader in a completely isolated thread. - * - * @see EmbeddedAgentBootstrapServiceMBean#startAgent() - */ - @Override - public void startAgent() throws Exception { - //-- if this method signature changes, you must also change StartupBean.startEmbeddedAgent - - if (!enabled.booleanValue()) { - log.info("Will not start the embedded RHQ agent - it is disabled"); - return; - } - - if ((agent == null) && (embeddedAgentDirectory != null)) { - log.info("Starting the embedded RHQ Agent..."); - - // we need to store the preferences prior to starting the agent - if (resetConfigurationAtStartup.booleanValue()) { - log.debug("Resetting the embedded agent's configuration back to its original factory settings"); - reloadAgentConfiguration(); - cleanDataDirectory(); - } else { - log.debug("Loading the embedded agent's pre-existing configuration from preferences"); - prepareConfigurationPreferences(); - } - - // We need to build the agent's classloader so it is completely isolated. - final URL[] jars = getEmbeddedAgentClasspath(); - final URL[] nativeDirs = getEmbeddedAgentNativeLibraryDirectories(); - final ClassLoader agentClassLoader = new EmbeddedAgentClassLoader(jars, nativeDirs); - - // we need to instantiate and start the agent in its own thread so it can have - // a default context classloader that is our isolated classloader - final Exception[] error = new Exception[1]; - final Object[] agentObject = new Object[1]; - - Runnable agentRunnable = new Runnable() { - public void run() { - try { - Class<?> agentClass = agentClassLoader.loadClass("org.rhq.enterprise.agent.AgentMain"); - Constructor<?> agentConstructor = agentClass.getConstructor(new Class[] { String[].class }); - Object agentInstance = agentConstructor - .newInstance(new Object[] { getAgentArgumentsAsArray() }); - - agentClass.getMethod("start", new Class[0]).invoke(agentInstance, new Object[0]); - - agentObject[0] = agentInstance; - error[0] = null; - } catch (Throwable t) { - agentObject[0] = null; - error[0] = new Exception("Cannot start the embedded agent. Cause: " + t, t); - } - } - }; - - // create our thread that starts the agent with the isolated class loader as its context - Thread agentThread = new Thread(agentRunnable, "Embedded RHQ Agent Main"); - agentThread.setDaemon(true); - agentThread.setContextClassLoader(agentClassLoader); - agentThread.start(); - agentThread.join(); - - // at this point in time, the embedded agent bootstrap thread has finished and - // the agent should have been started - if (error[0] != null) { - log.error("Failed to start the embedded RHQ Agent. Cause: " + error[0]); - throw error[0]; - } - - log.info("Embedded RHQ Agent has been started!"); - this.agent = agentObject[0]; - } - - return; - } - - @Override - public void stopAgent() throws Exception { - if (agent != null) { - log.info("Stopping the embedded RHQ Agent..."); - - // all this funky threading/reflection is so we execute the command - // in the isoloated context of the embedded agent - final Exception[] error = new Exception[] { null }; - final Runnable agentRunnable = new Runnable() { - public void run() { - try { - agent.getClass().getMethod("shutdown", new Class[0]).invoke(agent, new Object[0]); - } catch (Throwable t) { - error[0] = new Exception("Failed to stop the embedded RHQ Agent. Cause: " + t); - } - } - }; - - // create our thread that executes the agent command with the isolated class loader as its context - Thread agentThread = new Thread(agentRunnable, "Embedded RHQ Agent Shutdown Request"); - agentThread.setDaemon(true); - agentThread.setContextClassLoader(agent.getClass().getClassLoader()); - agentThread.start(); - - try { - agentThread.join(); - } catch (InterruptedException ignore) { - } - - if (error[0] == null) { - agent = null; - log.info("Embedded RHQ Agent has been stopped!"); - } else { - log.warn(error[0].toString()); - throw error[0]; - } - - return; - } - } - - public void start() throws Exception { - return; // no-op - } - - // this method is needed so the JBossAS server will call it when shutting down the service - @Override - public void stop() throws Exception { - stopAgent(); - } - - @Override - public boolean isAgentStarted() { - return agent != null; - } - - @Override - public String getAgentEnabled() { - //-- if this method signature changes, you must also change StartupBean.startEmbeddedAgent - return enabled.toString(); - } - - @Override - public void setAgentEnabled(String flag) { - enabled = Boolean.valueOf(replaceProperties(flag)); - } - - @Override - public String getResetConfiguration() { - return resetConfigurationAtStartup.toString(); - } - - @Override - public void setResetConfiguration(String flag) { - resetConfigurationAtStartup = Boolean.valueOf(replaceProperties(flag)); - } - - @Override - public String getEmbeddedAgentDirectory() { - return embeddedAgentDirectory.getAbsolutePath(); - } - - @Override - public void setEmbeddedAgentDirectory(String directoryStr) { - File directory = null; - - if (directoryStr != null) { - directoryStr = replaceProperties(directoryStr); - directory = new File(directoryStr); - } - - if (directory == null || !directory.exists() || !directory.isDirectory()) { - enabled = Boolean.FALSE; - directory = null; - log.warn("Invalid embedded agent directory specified - embedded agent has been disabled: " + directory); - } - - embeddedAgentDirectory = directory; - } - - @Override - public String getConfigurationFile() { - return configFile; - } - - @Override - public void setConfigurationFile(String location) { - configFile = replaceProperties(replaceProperties(location)); - } - - @Override - public String getPreferencesNodeName() { - return preferencesNodeName; - } - - @Override - public void setPreferencesNodeName(String node) { - if (node != null) { - node = replaceProperties(node); - } - - if (node == null || node.trim().length() == 0) { - try { - node = InetAddress.getLocalHost().getCanonicalHostName(); - } catch (UnknownHostException e) { - node = "${jboss.bind.address}"; - } - node = node + "-embedded"; - } - preferencesNodeName = replaceProperties(node); - System.setProperty("rhq.server.embedded-agent.preferences-node", preferencesNodeName); - } - - @Override - public Properties getConfigurationOverrides() { - //-- if this method signature changes, you must also change StartupBean.startEmbeddedAgent - return configurationOverrides; - } - - @Override - public void setConfigurationOverrides(Properties overrides) { - //-- if this method signature changes, you must also change StartupBean.startEmbeddedAgent - - if (overrides == null) { - return; // do nothing - } - - for (String propName : overrides.stringPropertyNames()) { - String origValue = overrides.getProperty(propName); - String newValue = replaceProperties(origValue); - overrides.setProperty(propName, newValue); - } - - configurationOverrides.clear(); - configurationOverrides.putAll(overrides); - - // perform some checking to setup defaults if need be - - String agent_name = configurationOverrides.getProperty("rhq.agent.name", ""); - if (agent_name.trim().length() == 0 || "-".equals(agent_name)) { - // the rhq.server.embedded-agent.name was not specified or left blank, - // that is the system propery used to define the rhq.agent.name - so let's create our own name - try { - agent_name = InetAddress.getLocalHost().getCanonicalHostName(); - } catch (UnknownHostException e) { - agent_name = "${jboss.bind.address}"; - } - agent_name = agent_name + "-embedded"; - agent_name = replaceProperties(agent_name); - configurationOverrides.put("rhq.agent.name", agent_name); - } - - return; - } - - @Override - public String getAgentArguments() { - // this only returns a human readable string - to use the args, use getAgentArgumentsAsArray instead - String[] allArgs = getAgentArgumentsAsArray(); - return Arrays.toString(allArgs); - } - - // we want to use this because it adds some required args - private String[] getAgentArgumentsAsArray() { - ArrayList<String> args = new ArrayList<String>(); - - if (arguments != null) { - for (String argument : arguments) { - String realArg = replaceProperties(argument); - args.add(realArg); - } - } - - args.add("--pref=" + getPreferencesNodeName()); - - return args.toArray(new String[args.size()]); - } - - @Override - public void setAgentArguments(String args) { - if (args != null) { - arguments = args.split(","); - } else { - arguments = new String[0]; - } - } - - @Override - public void reloadAgentConfiguration() throws Exception { - getPreferencesNode().clear(); - - prepareConfigurationPreferences(); - } - - @Override - public void cleanDataDirectory() { - AgentConfiguration config = new AgentConfiguration(getPreferencesNode()); - File data_dir = config.getDataDirectory(); - - cleanDataFile(data_dir); - - // it is conceivable the comm services data directory was configured in a different - // place than where the agent's data directory is - make sure we clean out that other data dir - File comm_data_dir = config.getServiceContainerPreferences().getDataDirectory(); - if (!comm_data_dir.getAbsolutePath().equals(data_dir.getAbsolutePath())) { - cleanDataFile(comm_data_dir); - } - - return; - } - - @Override - public Properties getAgentConfiguration() { - try { - Properties properties = new Properties(); - Preferences prefs = getPreferencesNode(); - - for (String key : prefs.keys()) { - properties.setProperty(key, prefs.get(key, "?")); - } - - return properties; - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - @Override - public void executeAgentPromptCommand(final String command) { - // all this funky threading/reflection is so we execute the command - // in the isoloated context of the embedded agent - final Exception[] error = new Exception[] { null }; - final Runnable agentRunnable = new Runnable() { - public void run() { - try { - Class<?> agentClass = agent.getClass(); - Method agentMethod = agentClass.getMethod("executePromptCommand", new Class[] { String.class }); - - agentMethod.invoke(agent, new Object[] { command }); - } catch (Throwable t) { - error[0] = new Exception("Cannot execute embedded agent prompt command [" + command + "]. Cause: " - + t); - } - } - }; - - // create our thread that executes the agent command with the isolated class loader as its context - Thread agentThread = new Thread(agentRunnable, "Embedded RHQ Agent Prompt Command"); - agentThread.setDaemon(true); - agentThread.setContextClassLoader(agent.getClass().getClassLoader()); - agentThread.start(); - - try { - agentThread.join(); - if (error[0] == null) { - log.info("Embedded agent executed the command [" + command - + "] - see the embedded agent output file for the results"); - } else { - log.warn(error[0].toString()); - } - } catch (InterruptedException ignore) { - } - - return; - } - - @Override - public String getConfigurationOverridesFile() { - return overridesFile; - } - - @Override - public void setConfigurationOverridesFile(String location) { - if (location == null) { - overridesFile = null; - } else { - // substitute ${} replacement variables found in the location string - overridesFile = replaceProperties(location); - try { - loadConfigurationOverridesFromFile(); - } catch (Exception e) { - log.warn("Cannot load embedded agent config overrides file [" + overridesFile + "]", e); - } - } - } - - private void loadConfigurationOverridesFromFile() throws Exception { - if (overridesFile == null) { - return; // nothing to do - } - - InputStream is = getFileInputStream(overridesFile); - try { - Properties props = new Properties(); - props.load(is); - setConfigurationOverrides(props); - } finally { - is.close(); // if we got here, "is" will never be null - } - - return; - } - - /** - * Loads a file either from file system, from URL or from classloader. If file - * can't be found, exception is thrown. - * @param file_name the file whose input stream is to be returned - * @return input stream of the file - will never be null - * @throws IOException if the file input stream cannot be obtained - */ - private InputStream getFileInputStream(String file_name) throws IOException { - // first see if the file was specified as a path on the local file system - InputStream config_file_input_stream = null; - try { - File config_file = new File(file_name); - - if (config_file.exists()) { - config_file_input_stream = new FileInputStream(config_file); - } - } catch (Exception e) { - // isn't really an error - this just isn't a file on the local file system - } - - // see if the file was specified as a URL - if (config_file_input_stream == null) { - try { - URL config_file = new URL(file_name); - - config_file_input_stream = config_file.openStream(); - } catch (Exception e) { - // isn't really an error - this just isn't a URL - } - } - - // if neither a file path or URL, assume the config file can be found in the classloader - if (config_file_input_stream == null) { - config_file_input_stream = this.getClass().getClassLoader().getResourceAsStream(file_name); - } - - if (config_file_input_stream == null) { - throw new IOException("Cannot find config file for embedded agent: " + file_name); - } - return config_file_input_stream; - } - - /** - * This will return URLs to all of the jars and resources that the embedded agent will have access to in its - * isolated classloader. Only those classes within these jars will be accessible to the embedded agent. Even classes - * that are in this bootstrap service are not going to be available to it. - * - * @return URLs to embedded agent jars that will be in the embedded agent's classloader - * - * @throws Exception if failed to find the jars - */ - private URL[] getEmbeddedAgentClasspath() throws Exception { - File lib = new File(embeddedAgentDirectory, "lib"); - - if (!lib.exists() || !lib.isDirectory()) { - throw new Exception("There is no lib directory under [" + embeddedAgentDirectory - + "]; cannot get agent jars"); - } - - File[] jarFiles = lib.listFiles(); - ArrayList<URL> classpathUrls = new ArrayList<URL>(jarFiles.length + 1); - - classpathUrls.add(embeddedAgentDirectory.toURI().toURL()); // allows the agent to find resourcees in here, like log4j.xml - - for (File jarFile : jarFiles) { - classpathUrls.add(jarFile.toURI().toURL()); - } - - // we need jboss-modules.jar because in AS7 it is used to override JAXP impl classes and we can't not use it - URL jbossModules = null; - String cp = System.getProperty("java.class.path"); - if (cp != null && cp.contains("jboss-modules.jar")) { - for (String cpPath : cp.split(File.pathSeparator)) { - if (cpPath.contains("jboss-modules.jar")) { - jbossModules = new File(cpPath).toURI().toURL(); - classpathUrls.add(jbossModules); - break; - } - } - } - - if (jbossModules == null) { - File rootLocation = new File(System.getProperty("jboss.home.dir"), "jboss-modules.jar"); - if (rootLocation.exists()) { - jbossModules = rootLocation.toURI().toURL(); - classpathUrls.add(jbossModules); - } else { - throw new IllegalStateException( - "Cannot find jboss-modules.jar - it is necessary for embedded agent to run."); - } - } - return classpathUrls.toArray(new URL[classpathUrls.size()]); - } - - /** - * Returns URLs to all directories where the agent's native libraries can be found. - * - * @return URLs where native libraries can be found - * - * @throws Exception if failed to find the native library directories - */ - private URL[] getEmbeddedAgentNativeLibraryDirectories() throws Exception { - ArrayList<URL> nativeLibraryDirUrls = new ArrayList<URL>(); - - // we will assume our native libraries are under the same lib directory where the jars are - // we will also look for native libraries in subdirectories under lib - File lib = new File(embeddedAgentDirectory, "lib"); - - if (!lib.exists() || !lib.isDirectory()) { - throw new Exception("There is no lib directory under [" + embeddedAgentDirectory - + "]; cannot get native library directories"); - } - - addDirectories(lib, nativeLibraryDirUrls); - - return nativeLibraryDirUrls.toArray(new URL[nativeLibraryDirUrls.size()]); - } - - private void addDirectories(File dir, ArrayList<URL> list) throws Exception { - if (dir.isDirectory()) { - // add the given directory to the list and add all its subdirectories to the list - list.add(dir.toURI().toURL()); - - for (File dirEntry : dir.listFiles()) { - addDirectories(dirEntry, list); - } - } - - return; - } - - /** - * This will ensure the agent's configuration preferences are populated. If need be, the configuration file is - * loaded and all overrides are overlaid on top of the preferences. The preferences are also upgraded to ensure they - * conform to the latest configuration schema version. - * - * @return the agent configuration - * - * @throws Exception - */ - private AgentConfiguration prepareConfigurationPreferences() throws Exception { - Preferences preferences_node = getPreferencesNode(); - AgentConfiguration config = new AgentConfiguration(preferences_node); - - if (config.getAgentConfigurationVersion() == 0) { - config = loadConfigurationFile(); - } - - // now that the configuration preferences are loaded, we need to override them with any bootstrap override properties - Properties overrides = getConfigurationOverrides(); - if (overrides != null) { - for (Map.Entry<Object, Object> entry : overrides.entrySet()) { - String key = entry.getKey().toString(); - String value = entry.getValue().toString(); - - // allow ${var} notation in the values so we can provide variable replacements in the values - value = replaceProperties(value); - - preferences_node.put(key, value); - } - } - - // let's make sure our configuration is upgraded to the latest schema - AgentConfigurationUpgrade.upgradeToLatest(config.getPreferences()); - - return config; - } - - /** - * Loads the {@link #getConfigurationFile() configuration file}. The file location will first be checked for - * existence on the file system and then as a URL. If it cannot be found, it will be assumed the file location - * specifies the file as found in the current class loader and the file will be searched there. An exception is - * thrown if the file cannot be found anywhere. - * - * @return the configuration that was loaded - * - * @throws IOException if failed to load the configuration file - * @throws InvalidPreferencesFormatException if the configuration file had an invalid format - * @throws BackingStoreException if failed to access the preferences persistence store - * @throws Exception on other failures - */ - private AgentConfiguration loadConfigurationFile() throws Exception { - String file_name = getConfigurationFile(); - String preferences_node_name = getPreferencesNodeName(); - - InputStream config_file_input_stream = getFileInputStream(file_name); - - // We need to clear out any previous configuration in case the current config file doesn't specify a preference - // that already exists in the preferences node. In this case, the configuration file wants to fall back on the - // default value and if we don't clear the preferences, we aren't guaranteed the value stored in the backing - // store is the default value. - // But first we need to backup these original preferences in case the config file fails to load - - // we'll restore the original values in that case. - - try { - Preferences preferences_node = getPreferencesNode(); - ByteArrayOutputStream backup = new ByteArrayOutputStream(); - preferences_node.exportSubtree(backup); - preferences_node.clear(); - - // now load in the preferences - try { - ByteArrayOutputStream raw_config_file = new ByteArrayOutputStream(); - StreamUtil.copy(config_file_input_stream, raw_config_file, true); - String new_config = replaceProperties(raw_config_file.toString()); - ByteArrayInputStream new_config_input_stream = new ByteArrayInputStream(new_config.getBytes()); - Preferences.importPreferences(new_config_input_stream); - - if (new AgentConfiguration(preferences_node).getAgentConfigurationVersion() == 0) { - throw new IllegalArgumentException("Bad node name: " + preferences_node_name); - } - } catch (Exception e) { - // a problem occurred importing the config file; let's restore our original values - try { - Preferences.importPreferences(new ByteArrayInputStream(backup.toByteArray())); - } catch (Exception e1) { - // its conceivable the same problem occurred here as with the original exception (backing store problem?) - // let's throw the original exception, not this one - } - - throw e; - } - - AgentConfiguration agent_configuration = new AgentConfiguration(preferences_node); - - return agent_configuration; - } finally { - // we know this is not null; if it was, we would have thrown the IOException earlier. - config_file_input_stream.close(); - } - } - - /** - * Returns the preferences for this agent. The node returned is where all preferences are to be stored. - * - * @return the agent preferences - */ - private Preferences getPreferencesNode() { - Preferences top_node = Preferences.userRoot().node(AgentConfigurationConstants.PREFERENCE_NODE_PARENT); - Preferences preferences_node = top_node.node(getPreferencesNodeName()); - - return preferences_node; - } - - /** - * This will delete the given file and if its a directory, will recursively delete its contents and its - * subdirectories. - * - * @param file the file/directory to delete - */ - private void cleanDataFile(File file) { - boolean deleted; - - File[] doomed_files = file.listFiles(); - if (doomed_files != null) { - for (File doomed_file : doomed_files) { - cleanDataFile(doomed_file); // call this method recursively - } - } - - deleted = file.delete(); - - if (!deleted) { - log.warn("Cannot clean data file [" + file + "]"); - } - - return; - } - - private String replaceProperties(String str) { - if (str == null) { - return null; - } - - // keep replacing properties until no more ${} tokens are left that are replaceable - String newValue = ""; - String oldValue = str; - while (!newValue.equals(oldValue)) { - oldValue = str; - newValue = StringPropertyReplacer.replaceProperties(str); - str = newValue; - } - return newValue; - } -} \ No newline at end of file diff --git a/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapServiceMBean.java b/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapServiceMBean.java deleted file mode 100644 index 0adeb17..0000000 --- a/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapServiceMBean.java +++ /dev/null @@ -1,230 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.server.agent; - -import java.util.Properties; - -/** - * The interface to the MBean that embeds a JON Agent in the JON Server. - * - * @author John Mazzitelli - */ -public interface EmbeddedAgentBootstrapServiceMBean { - /** - * The object name that the MBean service will be registered under. - */ - String OBJECT_NAME = "rhq:service=EmbeddedAgentBootstrap"; - - /** - * If <code>true</code>, this indicates that the agent should be started when the JON Server is started. This - * service is will not start the agent at its own startup, regardless of the value of this attribute. Instead, this - * attribute is examined by the JON Server itself - if the JON Server sees that the embedded agent should be started - * at startup, the JON Server will call {@link #startAgent()}. - * - * @return enabled flag, boolean string - */ - String getAgentEnabled(); - - /** - * If <code>true</code>, this indicates that the agent should be started when the JON Server is started. This - * service is will not start the agent at its own startup, regardless of the value of this attribute. Instead, this - * attribute is examined by the JON Server itself - if the JON Server sees that the embedded agent should be started - * at startup, the JON Server will call {@link #startAgent()}. - * - * @param enabled (a boolean string) - */ - void setAgentEnabled(String enabled); - - /** - * Returns <code>true</code> if the embedded agent should reset its configuration at startup. Resetting the - * configuration means to clear out any configuration settings currently persisted in the preferences store and - * reload the configuration from its configuration file. If <code>false</code>, the embedded agent will retain the - * configuration it had when it last was running - which may be different from its original configuration if a user - * changed its configuration settings from the UI. - * - * @return reset configuration flag, as a String - */ - String getResetConfiguration(); - - /** - * Sets the flag to determine if the agent should reset its configuration to its original configuration as defined - * in the configuration file, or if it should retain its configuration from when it last ran. See - * {@link #getResetConfiguration()} for more information. - * - * @param reset - */ - void setResetConfiguration(String reset); - - /** - * Indicates the location where the embedded agent and all its resources will be found. There must be a <code> - * lib</code> subdirectory under this directory which will include all jar files that are to be included in the - * embedded agent's classloader. - * - * @return location of the embedded agent and its resources - */ - String getEmbeddedAgentDirectory(); - - /** - * Indicates the location where the embedded agent and all its resources will be found. There must be a <code> - * lib</code> subdirectory under this directory which will include all jar files that are to be included in the - * embedded agent's classloader. - * - * @param directory location of the embedded agent and its resources - */ - void setEmbeddedAgentDirectory(String directory); - - /** - * Returns the location of the configuration file where all agent preferences are defined. The file location can be - * either a URL, a local file system path or a path within this service's classloader. - * - * @return configuration file location - */ - String getConfigurationFile(); - - /** - * Defines the location of the configuration file where all agent preferences are defined. - * - * @param location - */ - void setConfigurationFile(String location); - - /** - * Returns the preferences node name used to identify the configuration set to use. See the Java Preferences API for - * the definition of a preference node name. - * - * @return the name of the Java Preferences node where the agent's configuration lives - */ - String getPreferencesNodeName(); - - /** - * Defines the preferences node name used to identify the configuration set to use. See the Java Preferences API for - * the definition of a preference node name. - * - * <p>If this isn't specified, a suitable default will be used.</p> - * - * @param node the name of the Java Preferences node where the agent's configuration will or already lives - */ - void setPreferencesNodeName(String node); - - /** - * Returns a set of properties that will override the configuration preferences. If this returns <code>null</code>, - * then the configuration preferences takes effect as-is. - * - * @return configuration setting overrides (may be <code>null</code>) - */ - Properties getConfigurationOverrides(); - - /** - * This allows you to explicitly override configuration preferences found in the configuration file. If this isn't - * set, then the settings specified by the configuration preferences file take effect as-is. These overrides can be - * set in the bootstrap deployment file (and thus allow you to be able to use any app-server specific settings, like - * <code>${jboss.server.data.dir}</code>, in the configuration preference values). - * - * @param overrides configuration settings that override the configuration preferences (may be<code>null</code>) - */ - void setConfigurationOverrides(Properties overrides); - - /** - * This allows you to explicitly override configuration preferences found in the configuration file. If this isn't - * set, then the settings specified by the configuration preferences file take effect as-is. If this is set, - * this file is a properties file whose values will override the config file prefs. - * - * @param overrides configuration settings file that override the configuration preferences (may be<code>null</code>) - */ - void setConfigurationOverridesFile(String overridesFile); - - String getConfigurationOverridesFile(); - - /** - * Returns the arguments that are passed to the agent's main startup method. - * - * @return agent arguments - */ - String getAgentArguments(); - - /** - * Sets the arguments that will be passed to the agent's main startup method. - * - * @param args - */ - void setAgentArguments(String args); - - /** - * This will clear any and all current configuration preferences and then reload the - * {@link #getConfigurationFile() configuration file}. The agent will need to be restarted for the configuration to - * take effect. - * - * @throws Exception if failed to clear and reload the configuration - */ - void reloadAgentConfiguration() throws Exception; - - /** - * This will clean out the embedded agent's data directory. You usually invoke if you want to start the agent in a - * clean state (i.e. use this in conjunction with {@link #reloadAgentConfiguration()}). - */ - void cleanDataDirectory(); - - /** - * Returns the configuration preferencese the agent is or will be using. - * - * @return the server configuration, as a set of properties - */ - Properties getAgentConfiguration(); - - /** - * Passes the given prompt command to the agent so it can be executed. Note that if the command requires additional - * input, the embedded agent must have a valid input stream (System.in) or the command will fail. This means the JON - * Server must be running in a console that can have keyboard input in order to execute those prompt commands that - * ask for additional input from the user. - * - * @param command the agent prompt command to execute - */ - void executeAgentPromptCommand(String command); - - /** - * <code>true</code> indicates that the agent has been {@link #startAgent() started}. <code>false</code> means the - * agent has not been started yet, or it was started but has since been {@link #stopAgent() stopped}. - * - * @return state of the agent - */ - boolean isAgentStarted(); - - /** - * Starts the agent. Note that this will not start the agent if {@link #getAgentEnabled() the agent is not enabled}. - * - * @throws Exception if failed to start the agent successfully - */ - void startAgent() throws Exception; - - /** - * Stops the agent. Note that this will do nothing if {@link #getAgentEnabled() the agent is not enabled} or was - * never {@link #startAgent() started}. - * - * @throws Exception if failed to stop the agent successfully - */ - void stopAgent() throws Exception; - - /** - * Stops this service - if the agent has been {@link #startAgent() started}, it will also be - * {@link #stopAgent() stopped}. - * - * @throws Exception if failed to stop the agent - */ - void stop() throws Exception; -} \ No newline at end of file diff --git a/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentClassLoader.java b/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentClassLoader.java deleted file mode 100644 index affbdee..0000000 --- a/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentClassLoader.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.server.agent; - -import java.io.File; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.URLClassLoader; - -/** - * This is the classloader used by the embedded JON Agent. This class loader is absolutely and completely isolated from - * any other classloader in the system except for the top-most system classloader. There is no application server - * classes or loaders accessible to this class loader. - * - * @author John Mazzitelli - */ -public class EmbeddedAgentClassLoader extends URLClassLoader { - private final URL[] nativeLibraryUrls; - - public EmbeddedAgentClassLoader(URL[] classUrls, URL[] nativeUrls) { - super(classUrls, getTopMostClassLoader()); - nativeLibraryUrls = (nativeUrls != null) ? nativeUrls : new URL[0]; - } - - @Override - public Class<?> loadClass(String name) throws ClassNotFoundException { - // attempt to workaround http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6434149 - if (name.indexOf('[') > -1) { - return Class.forName(name, false, this); - } - - // we are not being asked to load an array - so we can load it - return super.loadClass(name); - } - - @Override - protected String findLibrary(String libname) { - String platformLibraryName = System.mapLibraryName(libname); - - // see if we can find the platform-specific library filename anywhere in our native library directories - for (URL nativeLibraryUrl : nativeLibraryUrls) { - try { - // look at each file in the directory and see if it matches the platform-specific library filename - File nativeLibraryDir = new File(nativeLibraryUrl.toURI()); - File[] files = nativeLibraryDir.listFiles(); - if (files != null) { - for (File file : files) { - if (!file.isDirectory() && file.getName().equals(platformLibraryName)) { - return file.getAbsolutePath(); - } - } - } - } catch (URISyntaxException e) { - throw new IllegalArgumentException("Bad embedded native library URL: " + nativeLibraryUrl, e); - } - } - - // we couldn't find it - see if the default mechanism can (via java.library.path) - return super.findLibrary(libname); - } - - private static final ClassLoader getTopMostClassLoader() { - ClassLoader top = ClassLoader.getSystemClassLoader(); - - while (top.getParent() != null) { - top = top.getParent(); - } - - return top; - } -} \ No newline at end of file diff --git a/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent/log4j.xml b/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent/log4j.xml deleted file mode 100644 index fbcbdf6..0000000 --- a/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent/log4j.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - -  -  -  - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Threshold" value="INFO"/> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> -  - <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t] (%c{5}) - %m%n"/> - </layout> - </appender> - -  -  -  - <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> - - <param name="Threshold" value="DEBUG"/> - <param name="File" value="../../logs/embedded-agent.log"/> - <param name="MaxBackupIndex" value="2"/> - <param name="MaxFileSize" value="5000KB"/> - <param name="Append" value="true"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t] (%c{5})- %m%n"/> - </layout> - - </appender> - -  -  -  - -  -  - -  -  - -  -  -  - - <root> - <priority value="INFO"/> - <appender-ref ref="FILE"/> -  - </root> - -</log4j:configuration> diff --git a/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-deployment-structure.xml b/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-deployment-structure.xml deleted file mode 100644 index afbe075..0000000 --- a/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-deployment-structure.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.1"> - <deployment> - <resources> - <resource-root path="lib/rhq-enterprise-agent-${project.version}.jar" /> - <resource-root path="lib/rhq-enterprise-comm-${project.version}.jar" /> - <resource-root path="lib/rhq-core-comm-api-${project.version}.jar" /> - <resource-root path="lib/rhq-core-util-${project.version}.jar" /> - <resource-root path="lib/i18nlog-${i18nlog.version}.jar" /> - </resources> - </deployment> -</jboss-deployment-structure> \ No newline at end of file diff --git a/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-service.xml b/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-service.xml deleted file mode 100644 index b8f3359..0000000 --- a/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-service.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<server xmlns="urn:jboss:service:7.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd"> - - <mbean code="org.rhq.enterprise.server.agent.EmbeddedAgentBootstrapService" - name="rhq:service=EmbeddedAgentBootstrap"> - - <attribute name="AgentEnabled">${rhq.server.embedded-agent.enabled:false}</attribute> - <attribute name="ResetConfiguration">${rhq.server.embedded-agent.reset-configuration:false}</attribute> - <attribute name="PreferencesNodeName">${rhq.server.embedded-agent.name:}</attribute> - <attribute name="EmbeddedAgentDirectory">${jboss.server.base.dir}/deployments/rhq-agent.sar/META-INF/embedded-agent</attribute> - <attribute name="ConfigurationOverridesFile">embedded-agent-configuration-overrides.properties</attribute> - -  - <attribute name="AgentArguments">--daemon,--output=${jboss.server.log.dir}/embedded-agent.out</attribute> - </mbean> - -</server> diff --git a/modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration-overrides.properties b/modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration-overrides.properties deleted file mode 100644 index c14c614..0000000 --- a/modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration-overrides.properties +++ /dev/null @@ -1,29 +0,0 @@ -# name of the embedded agent -rhq.agent.name=${rhq.server.embedded-agent.name:} -# the agent's server will point to the location of the server where it is embedded -rhq.agent.server.transport=${rhq.communications.connector.transport:servlet} -rhq.agent.server.bind-address=${rhq.communications.connector.bind-address} -rhq.agent.server.bind-port=${rhq.communications.connector.bind-port} -rhq.agent.server.transport-params=${rhq.communications.connector.transport-params:/jboss-remoting-servlet-invoker/ServerInvokerServlet} -# the binding address/port for the agent's server socket -rhq.communications.connector.bind-address=${rhq.communications.connector.bind-address} -rhq.communications.connector.bind-port=${rhq.server.embedded-agent.bind-port:26163} -# location where data files can be stored -rhq.agent.data-directory=${jboss.server.data.dir}/embedded-agent -# location of the plugins -rhq.agent.plugins.directory=${rhq.server.home}/modules/org/rhq/rhq-enterprise-server-startup-subsystem/main/deployments/rhq.ear/rhq-downloads/rhq-plugins -# Client-side SSL Security Configuration (for sending messages to the server) -rhq.agent.client.security.secure-socket-protocol=${rhq.communications.connector.security.secure-socket-protocol:TLS} -rhq.agent.client.security.keystore.file=${rhq.communications.connector.security.keystore.file} -rhq.agent.client.security.keystore.algorithm=${rhq.communications.connector.security.keystore.algorithm:SunX509} -rhq.agent.client.security.keystore.type=${rhq.communications.connector.security.keystore.type:JKS} -rhq.agent.client.security.keystore.password=${rhq.communications.connector.security.keystore.password:rhqpwd} -rhq.agent.client.security.keystore.key-password=${rhq.communications.connector.security.keystore.key-password:rhqpwd} -rhq.agent.client.security.keystore.alias=${rhq.communications.connector.security.keystore.alias:rhq} -rhq.agent.client.security.truststore.file=${rhq.communications.connector.security.truststore.file} -rhq.agent.client.security.truststore.algorithm=${rhq.communications.connector.security.truststore.algorithm:SunX509} -rhq.agent.client.security.truststore.type=${rhq.communications.connector.security.truststore.type:JKS} -rhq.agent.client.security.truststore.password=${rhq.communications.connector.security.truststore.password} -rhq.agent.client.security.server-auth-mode-enabled=${rhq.server.client.security.server-auth-mode-enabled:false} -# indicate if you do not want the native system to be used by the embedded agent -rhq.agent.disable-native-system=${rhq.server.embedded-agent.disable-native-system:false} diff --git a/modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration.xml b/modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration.xml deleted file mode 100644 index a9a8b77..0000000 --- a/modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration.xml +++ /dev/null @@ -1,1062 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE preferences SYSTEM 'http://java.sun.com/dtd/preferences.dtd'> - - - -<preferences EXTERNAL_XML_VERSION="1.0"> - <root type="user"> - <map /> - <node name="rhq-agent"> - <map /> - <node name="${rhq.server.embedded-agent.preferences-node}"> - <map> -  - <entry key="rhq.agent.configuration-schema-version" value="6" /> - -  - <entry key="rhq.agent.configuration-setup-flag" value="true" /> - -  - <entry key="rhq.agent.name" value="127.0.0.1"/> - -  - <entry key="rhq.agent.server.transport" value="servlet" /> - <entry key="rhq.agent.server.bind-port" value="7080" /> - <entry key="rhq.agent.server.bind-address" value="127.0.0.1" /> - <entry key="rhq.agent.server.transport-params" value="/jboss-remoting-servlet-invoker/ServerInvokerServlet" /> - -  - <entry key="rhq.agent.server-auto-detection" value="false" /> - -  - <entry key="rhq.agent.register-with-server-at-startup" value="true" /> - -  - <entry key="rhq.agent.wait-for-server-at-startup-msecs" value="10000" /> - -  - <entry key="rhq.agent.update-plugins-at-startup" value="false" /> - -  -  - -  - <entry key="rhq.agent.agent-update.enabled" value="false" /> - -  -  - -  -  - -  - <entry key="rhq.agent.primary-server-switchover-check-interval-msecs" value="3600000" /> - -  - <entry key="rhq.agent.vm-health-check.interval-msecs" value="0" /> - -  - <entry key="rhq.agent.vm-health-check.low-heap-mem-threshold" value="0.90" /> - <entry key="rhq.agent.vm-health-check.low-nonheap-mem-threshold" value="0.90" /> - -  -  - -  - <entry key="rhq.agent.client.queue-size" value="50000" /> - -  - <entry key="rhq.agent.client.max-concurrent" value="5" /> - -  - <entry key="rhq.agent.client.command-timeout-msecs" value="600000" /> - -  - <entry key="rhq.agent.client.retry-interval-msecs" value="15000" /> - -  - <entry key="rhq.agent.client.max-retries" value="10" /> - -  - <entry key="rhq.agent.client.server-polling-interval-msecs" value="0" /> - -  - <entry key="rhq.agent.client.command-spool-file.name" value="embedded-agent-command-spool.dat" /> - -  - <entry key="rhq.agent.client.command-spool-file.params" value="10000000:75" /> - -  - <entry key="rhq.agent.client.command-spool-file.compressed" value="true" /> - -  - <entry key="rhq.agent.client.send-throttling" value="100:1000" /> - -  - <entry key="rhq.agent.client.queue-throttling" value="200:2000" /> - -  - <entry key="rhq.agent.client.command-preprocessors" value="org.rhq.enterprise.agent.SecurityTokenCommandPreprocessor:org.rhq.enterprise.agent.ExternalizableStrategyCommandPreprocessor" /> - -  - <entry key="rhq.agent.disable-native-system" value="false"/> - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  - -  - <entry key="rhq.communications.configuration-schema-version" value="1" /> - -  - <entry key="rhq.communications.service-container.mbean-server-name" value="embedded-agent" /> - -  -  - -  - <entry key="rhq.communications.global-concurrency-limit" value="-1" /> - -  - <entry key="rhq.communications.multicast-detector.enabled" value="false" /> - <entry key="rhq.communications.multicast-detector.multicast-address" value="224.16.16.16" /> - <entry key="rhq.communications.multicast-detector.bind-address" value="0.0.0.0" /> - <entry key="rhq.communications.multicast-detector.port" value="16162" /> - <entry key="rhq.communications.multicast-detector.default-time-delay" value="5000" /> - <entry key="rhq.communications.multicast-detector.heartbeat-time-delay" value="1000" /> - -  - <entry key="rhq.communications.connector.rhqtype" value="agent" /> - <entry key="rhq.communications.connector.transport" value="socket" /> -  -  - -  -  - -  - <entry key="rhq.communications.remote-stream-max-idle-time-msecs" value="300000" /> - -  - <entry key="rhq.communications.command-service-directory.allow-dynamic-discovery" value="true" /> - -  - <entry key="rhq.communications.command-services" value="org.rhq.enterprise.communications.command.impl.echo.server.EchoCommandService, org.rhq.enterprise.communications.command.impl.identify.server.IdentifyCommandService" /> - -  - <entry key="rhq.communications.remote-pojos" value="org.rhq.enterprise.communications.PingImpl:org.rhq.enterprise.communications.Ping" /> - -  - <entry key="rhq.agent.do-not-override-prefs-with-sysprops" value="true" /> - - </map> - </node> - </node> - </root> -</preferences> \ No newline at end of file diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml deleted file mode 100644 index 1f3081e..0000000 --- a/modules/enterprise/server/sars/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.rhq</groupId> - <artifactId>rhq-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> - <relativePath>../../../../pom.xml</relativePath> - </parent> - - <groupId>org.rhq</groupId> - <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <packaging>pom</packaging> - - <name>RHQ Enterprise Server JBoss AS SARs</name> - <description>parent POM for all JBoss AS SARs</description> - - <build> - <plugins> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-packaging-maven-plugin</artifactId> - <version>1.9.99</version> - <extensions>true</extensions>  - </plugin> - - </plugins> - </build> - - <modules> -  - </modules> - - <pluginRepositories> - <pluginRepository> - <id>jboss-deprecated-repository</id> - <name>JBoss Deprecated</name> - <url>https://repository.jboss.org/maven2/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - -</project> -

1 0

[rhq] modules/enterprise
by snegrea 01 Jul '13

01 Jul '13

modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java | 19 ++++------ 1 file changed, 9 insertions(+), 10 deletions(-) New commits: commit 82e21e6ae2e3a92dd6f36e7f67f2609dc785692f Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 1 09:14:06 2013 -0500 [BZ 976790] Updated the parsing of rqh server properties to be consistent with the rest of the code. diff --git a/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java b/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java index f18bea1..8a0f64c 100644 --- a/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java +++ b/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java @@ -367,22 +367,21 @@ public class DataMigratorRunner { if (serverProperties.getProperty("rhq.cassandra.seeds") != null && !serverProperties.getProperty("rhq.cassandra.seeds").trim().isEmpty()) { - StringBuffer seedHosts = new StringBuffer(); - String cassandraPort = null; - for (String seed : serverProperties.getProperty("rhq.cassandra.seeds").split(",")) { - String[] params = seed.split("\\|"); + String[] unparsedSeeds =serverProperties.getProperty("rhq.cassandra.seeds").split(","); + String[] seedHosts = new String[unparsedSeeds.length]; + Integer cassandraPort = null; + for (int index = 0; index < unparsedSeeds.length; index++) { + String[] params = unparsedSeeds[index].split("\\|"); if (params.length != 3) { throw new IllegalArgumentException( - "Expected string of the form, hostname|jmxPort|nativeTransportPort: [" + seed + "]"); + "Expected string of the form, hostname|jmxPort|nativeTransportPort: [" + unparsedSeeds[index] + "]"); } - seedHosts.append(params[0]).append(','); - cassandraPort = tryParseInteger(params[2], DEFAULT_CASSANDRA_PORT) + ""; + seedHosts[index] = params[0]; + cassandraPort = tryParseInteger(params[2], DEFAULT_CASSANDRA_PORT); } - seedHosts.deleteCharAt(seedHosts.length() - 1); - - configuration.put(cassandraHostsOption, seedHosts.toString()); + configuration.put(cassandraHostsOption, seedHosts); configuration.put(cassandraPortOption, cassandraPort); } }

1 0

[rhq] modules/enterprise
by Thomas Segismont 01 Jul '13

01 Jul '13

modules/enterprise/server/ear/pom.xml | 62 +----- modules/enterprise/server/pom.xml | 2 modules/enterprise/server/sars/pom.xml | 1 modules/enterprise/server/sars/services-sar/pom.xml | 97 ---------- modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml | 70 ------- 5 files changed, 20 insertions(+), 212 deletions(-) New commits: commit e05abe75da0424192f5d516f896eedf0a4ffca1e Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Mon Jul 1 11:15:13 2013 +0200 Services SAR removed diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 9a82877..691d23c 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -82,13 +82,6 @@ </dependency>  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>rhq-enterprise-server-services-sar</artifactId> - <version>${project.version}</version> - <type>sar</type> - </dependency> -    - <sarModule> - <groupId>${project.groupId}</groupId> - <artifactId>rhq-enterprise-server-services-sar</artifactId> - <bundleFileName>rhq-services.sar</bundleFileName> - <excluded>true</excluded> - </sarModule> -  - - </artifactItems> - <outputDirectory>${earDirectory}</outputDirectory> - <stripVersion>true</stripVersion> - </configuration> - </execution> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  <execution> <id>copy-core-agent-plugins</id> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 6ee3b70..725f18f 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -28,7 +28,7 @@ <module>server-metrics</module> <module>data-migration</module> <module>jar</module> - <module>sars</module> +  <module>plugins</module> <module>ear</module> <module>startup-subsystem</module> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index e9d63d5..1f3081e 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -33,7 +33,6 @@  - <module>services-sar</module> </modules> <pluginRepositories> diff --git a/modules/enterprise/server/sars/services-sar/pom.xml b/modules/enterprise/server/sars/services-sar/pom.xml deleted file mode 100644 index 0ffd88d..0000000 --- a/modules/enterprise/server/sars/services-sar/pom.xml +++ /dev/null @@ -1,97 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.rhq</groupId> - <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>4.9.0-SNAPSHOT</version> - </parent> - - <groupId>org.rhq</groupId> - <artifactId>rhq-enterprise-server-services-sar</artifactId> - <packaging>jboss-sar</packaging> - - <name>RHQ Enterprise Server Internal Services SAR</name> - <description>The SAR that provides the server with some necessary internal RHQ services.</description> - - <properties> - <sarDirectory>${project.build.directory}/${project.build.finalName}</sarDirectory> - </properties> - - <build> - <finalName>rhq-enterprise-server-services-sar</finalName> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> - </build> - - <profiles> - - <profile> - <id>dev</id> - - <properties> - <rhq.rootDir>../../../../..</rhq.rootDir> - <rhq.containerDir>${rhq.rootDir}/${rhq.devContainerServerPath}</rhq.containerDir> - <rhq.deploymentName>${project.build.finalName}.sar</rhq.deploymentName> - <rhq.deploymentDir>${rhq.containerDir}/${rhq.earDeployDir}/${rhq.deploymentName}</rhq.deploymentDir> - </properties> - - <build> - <plugins> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - - <execution> - <id>deploy</id> - <phase>package</phase> - <configuration> - <target> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> - <echo>*** Copying updated files - from - target${file.separator}classes${file.separator} - to - ${deployment.dir}${file.separator}...</echo> - <jar destfile="${deployment.dir}"> - <fileset dir="target/${project.build.finalName}" /> - </jar> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - <execution> - <id>undeploy</id> - <phase>clean</phase> - <configuration> - <target> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> - <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete file="${deployment.dir}" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - </executions> - </plugin> - - </plugins> - </build> - - </profile> - - </profiles> - -</project> diff --git a/modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml b/modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml deleted file mode 100644 index c427db8..0000000 --- a/modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<server xmlns="urn:jboss:service:7.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd"> - -  -  - -  -  - -  -  - -  -  - -  -  - -  -  -  -  - -  -  -  - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -  - -  -  - -  -  - -  -</server>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits July 2013