06 Apr '13
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java | 19 +++++++++-
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java | 18 +++++----
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlan.java | 10 +++++
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java | 5 ++
4 files changed, 43 insertions(+), 9 deletions(-)
New commits:
commit ef39e51b4f9e44f73ac78bb45b59de16d9633542
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Apr 6 10:43:16 2013 -0400
make compression configurable in simulator
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 07672c8..e7673b2 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
@@ -31,6 +31,7 @@ import java.util.ArrayList;
import java.util.List;
import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.ProtocolOptions;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.SimpleAuthInfoProvider;
@@ -56,6 +57,8 @@ public class SchemaManager {
private List<CassandraNode> nodes = new ArrayList<CassandraNode>();
+ private ProtocolOptions.Compression compression = SNAPPY;
+
public SchemaManager(String username, String password, String... nodes) {
try {
this.username = username;
@@ -84,6 +87,20 @@ public class SchemaManager {
}
}
+ public SchemaManager(String username, String password, List<CassandraNode> nodes,
+ ProtocolOptions.Compression compression) {
+ try {
+ this.username = username;
+ this.password = password;
+ this.nodes = nodes;
+ this.compression = compression;
+
+ initCluster();
+ } catch (NoHostAvailableException e) {
+ throw new RuntimeException("Unable create session.", e);
+ }
+ }
+
private void initCluster() throws NoHostAvailableException {
String[] hostNames = new String[nodes.size()];
for (int i = 0; i < hostNames.length; ++i) {
@@ -96,7 +113,7 @@ public class SchemaManager {
Cluster cluster = Cluster.builder()
.addContactPoints(hostNames)
.withAuthInfoProvider(authInfoProvider)
- .withCompression(SNAPPY)
+ .withCompression(compression)
.withPort(nodes.get(0).getNativeTransportPort())
.build();
session = cluster.connect("system");
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 03b89d7..276f73f 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
@@ -25,8 +25,6 @@
package org.rhq.metrics.simulator;
-import static com.datastax.driver.core.ProtocolOptions.Compression.SNAPPY;
-
import java.io.File;
import java.io.IOException;
import java.util.HashSet;
@@ -40,6 +38,7 @@ import java.util.concurrent.locks.ReentrantLock;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.Host;
+import com.datastax.driver.core.ProtocolOptions;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.SimpleAuthInfoProvider;
import com.datastax.driver.core.exceptions.NoHostAvailableException;
@@ -73,8 +72,10 @@ public class Simulator implements ShutdownManager {
public void run(SimulationPlan plan) {
List<CassandraNode> nodes = initCluster(plan);
- createSchema(nodes);
- Session session = createSession(nodes);
+ ProtocolOptions.Compression compression = Enum.valueOf(ProtocolOptions.Compression.class,
+ plan.getClientCompression().toUpperCase());
+ createSchema(nodes, compression);
+ Session session = createSession(nodes, compression);
MetricsServer metricsServer = new MetricsServer();
metricsServer.setSession(session);
@@ -198,10 +199,10 @@ public class Simulator implements ShutdownManager {
clusterInitService.waitForClusterToStart(nodes);
}
- private void createSchema(List<CassandraNode> nodes) {
+ private void createSchema(List<CassandraNode> nodes, ProtocolOptions.Compression compression) {
try {
log.info("Creating schema");
- SchemaManager schemaManager = new SchemaManager("rhqadmin", "rhqadmin", nodes);
+ SchemaManager schemaManager = new SchemaManager("rhqadmin", "rhqadmin", nodes, compression);
schemaManager.createSchema();
schemaManager.updateSchema();
} catch (Exception e) {
@@ -209,7 +210,8 @@ public class Simulator implements ShutdownManager {
}
}
- private Session createSession(List<CassandraNode> nodes) throws NoHostAvailableException {
+ private Session createSession(List<CassandraNode> nodes, ProtocolOptions.Compression compression)
+ throws NoHostAvailableException {
try {
SimpleAuthInfoProvider authInfoProvider = new SimpleAuthInfoProvider();
authInfoProvider.add("username", "rhqadmin").add("password", "rhqadmin");
@@ -217,7 +219,7 @@ public class Simulator implements ShutdownManager {
Cluster cluster = Cluster.builder()
.addContactPoints(getHostNames(nodes))
.withAuthInfoProvider(authInfoProvider)
- .withCompression(SNAPPY)
+ .withCompression(compression)
.build();
NodeFailureListener listener = new NodeFailureListener();
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlan.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlan.java
index 608c789..48f66ee 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlan.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlan.java
@@ -51,6 +51,8 @@ public class SimulationPlan {
private ClusterConfig clusterConfig;
+ private String clientCompression = "none";
+
public List<ScheduleGroup> getScheduleSets() {
return scheduleSets;
}
@@ -118,4 +120,12 @@ public class SimulationPlan {
public void setClusterConfig(ClusterConfig clusterConfig) {
this.clusterConfig = clusterConfig;
}
+
+ public String getClientCompression() {
+ return clientCompression;
+ }
+
+ public void setClientCompression(String clientCompression) {
+ this.clientCompression = clientCompression;
+ }
}
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java
index bff8413..f0e41ed 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java
@@ -55,6 +55,11 @@ public class SimulationPlanner {
simulation.setNumMeasurementCollectors(getInt(root.get("numMeasurementCollectors"), 5));
simulation.setSimulationTime(getInt(root.get("simulationTime"), 10));
+ JsonNode clientCompressionNode = root.get("clientCompression");
+ if (clientCompressionNode != null) {
+ simulation.setClientCompression(clientCompressionNode.asText());
+ }
+
JsonNode schedules = root.get("schedules");
if (schedules == null) {
simulation.addScheduleSet(new ScheduleGroup(2500, 500L));
1
0
modules/common/cassandra-auth/pom.xml | 47 ---
modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthenticator.java | 140 ---------
modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthorizer.java | 146 ----------
modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 2
modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/access.properties | 46 ---
modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh | 3
modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.passwd.properties | 23 -
modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/Deployer.java | 1
modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptions.java | 40 --
modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties | 8
modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java | 2
modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-env.sh | 3
modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml | 4
modules/common/pom.xml | 1
14 files changed, 2 insertions(+), 464 deletions(-)
New commits:
commit d0558b6244b7f9889c15cd9ef229293cbd2eff46
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Apr 6 07:46:04 2013 -0400
removing stuff to support SimpleAuthenticator and SimpleAuthorizer
We were using SimpleAuthenticator and SimpleAuthorizer prior to upgrading to
Cassandra 1.2.2. We no longer need all of this stuff since we are not using
Cassandra's PasswordAuthenticator and CassandraAuthorizer classes.
diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml
deleted file mode 100644
index f4ed340..0000000
--- a/modules/common/cassandra-auth/pom.xml
+++ /dev/null
@@ -1,47 +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-common-parent</artifactId>
- <version>4.7.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>rhq-cassandra-auth</artifactId>
- <name>RHQ Cassandra Authentication</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra-all</artifactId>
- <version>${cassandra.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra-thrift</artifactId>
- <version>${cassandra.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthenticator.java b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthenticator.java
deleted file mode 100644
index c3a1c86..0000000
--- a/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthenticator.java
+++ /dev/null
@@ -1,140 +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.
- *
- */
-
-package org.rhq.cassandra.auth;
-
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.MessageDigest;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.cassandra.auth.AuthenticatedUser;
-import org.apache.cassandra.auth.LegacyAuthenticator;
-import org.apache.cassandra.exceptions.AuthenticationException;
-import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.io.util.FileUtils;
-import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.Hex;
-
-/**
- * @author John Sanda
- */
-public class SimpleAuthenticator extends LegacyAuthenticator {
- public final static String PASSWD_FILENAME_PROPERTY = "passwd.properties";
- public final static String PMODE_PROPERTY = "passwd.mode";
-
- public enum PasswordMode {
- PLAIN, MD5,
- }
-
- public AuthenticatedUser defaultUser() {
- // users must log in
- return null;
- }
-
- public AuthenticatedUser authenticate(Map<String, String> credentials) throws AuthenticationException {
- String pmode_plain = System.getProperty(PMODE_PROPERTY);
- PasswordMode mode = PasswordMode.PLAIN;
-
- if (pmode_plain != null) {
- try {
- mode = PasswordMode.valueOf(pmode_plain);
- } catch (Exception e) {
- // this is not worth a StringBuffer
- String mode_values = "";
- for (PasswordMode pm : PasswordMode.values())
- mode_values += "'" + pm + "', ";
-
- mode_values += "or leave it unspecified.";
- throw new AuthenticationException("The requested password check mode '" + pmode_plain +
- "' is not a valid mode. Possible values are " + mode_values);
- }
- }
-
- String pfilename = System.getProperty(PASSWD_FILENAME_PROPERTY);
-
- String username = credentials.get(USERNAME_KEY);
- if (username == null)
- throw new AuthenticationException(
- "Authentication request was missing the required key '" + USERNAME_KEY + "'");
-
- String password = credentials.get(PASSWORD_KEY);
- if (password == null)
- throw new AuthenticationException(
- "Authentication request was missing the required key '" + PASSWORD_KEY + "'");
-
- boolean authenticated = false;
-
- InputStream in = null;
- try {
- in = new BufferedInputStream(new FileInputStream(pfilename));
- Properties props = new Properties();
- props.load(in);
-
- // note we keep the message here and for the wrong password exactly the same to prevent attackers from guessing what users are valid
- if (props.getProperty(username) == null)
- throw new AuthenticationException(authenticationErrorMessage(mode, username));
- switch (mode) {
- case PLAIN:
- authenticated = password.equals(props.getProperty(username));
- break;
- case MD5:
- authenticated = MessageDigest.isEqual(FBUtilities.threadLocalMD5Digest().digest(password.getBytes()),
- Hex.hexToBytes(props.getProperty(username)));
- break;
- default:
- throw new RuntimeException("Unknown PasswordMode " + mode);
- }
- } catch (IOException e) {
- throw new RuntimeException(
- "Authentication table file given by property " + PASSWD_FILENAME_PROPERTY + " could not be opened: " +
- e.getMessage());
- } catch (Exception e) {
- throw new RuntimeException("Unexpected authentication problem", e);
- } finally {
- FileUtils.closeQuietly(in);
- }
-
- if (!authenticated) throw new AuthenticationException(authenticationErrorMessage(mode, username));
-
- return new AuthenticatedUser(username);
- }
-
- public void validateConfiguration() throws ConfigurationException {
- String pfilename = System.getProperty(SimpleAuthenticator.PASSWD_FILENAME_PROPERTY);
- if (pfilename == null) {
- throw new ConfigurationException("When using " + this.getClass().getCanonicalName() + " " +
- SimpleAuthenticator.PASSWD_FILENAME_PROPERTY + " properties must be defined.");
- }
- }
-
- static String authenticationErrorMessage(PasswordMode mode, String username) {
- return String.format("Given password in password mode %s could not be validated for user %s", mode, username);
- }
-
-}
diff --git a/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthorizer.java b/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthorizer.java
deleted file mode 100644
index 73a4092..0000000
--- a/modules/common/cassandra-auth/src/main/java/org/rhq/cassandra/auth/SimpleAuthorizer.java
+++ /dev/null
@@ -1,146 +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.
- *
- */
-
-package org.rhq.cassandra.auth;
-
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.cassandra.auth.AuthenticatedUser;
-import org.apache.cassandra.auth.LegacyAuthorizer;
-import org.apache.cassandra.auth.Permission;
-import org.apache.cassandra.auth.Resources;
-import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.io.util.FileUtils;
-
-/**
- * @author John Sanda
- */
-public class SimpleAuthorizer extends LegacyAuthorizer {
-
- public final static String ACCESS_FILENAME_PROPERTY = "access.properties";
- // magical property for WRITE permissions to the keyspaces list
- public final static String KEYSPACES_WRITE_PROPERTY = "<modify-keyspaces>";
-
- public EnumSet<Permission> authorize(AuthenticatedUser user, List<Object> resource) {
- if (resource.size() < 2 || !Resources.ROOT.equals(resource.get(0)) ||
- !Resources.KEYSPACES.equals(resource.get(1)))
- return EnumSet.noneOf(Permission.class);
-
- String keyspace, columnFamily = null;
- EnumSet<Permission> authorized = EnumSet.noneOf(Permission.class);
-
- // /cassandra/keyspaces
- if (resource.size() == 2) {
- keyspace = KEYSPACES_WRITE_PROPERTY;
- authorized = EnumSet.of(Permission.READ);
- }
- // /cassandra/keyspaces/<keyspace name>
- else if (resource.size() == 3) {
- keyspace = (String) resource.get(2);
- }
- // /cassandra/keyspaces/<keyspace name>/<cf name>
- else if (resource.size() == 4) {
- keyspace = (String) resource.get(2);
- columnFamily = (String) resource.get(3);
- } else {
- // We don't currently descend any lower in the hierarchy.
- throw new UnsupportedOperationException();
- }
-
- String accessFilename = System.getProperty(ACCESS_FILENAME_PROPERTY);
- InputStream in = null;
- try {
- in = new BufferedInputStream(new FileInputStream(accessFilename));
- Properties accessProperties = new Properties();
- accessProperties.load(in);
-
- // Special case access to the keyspace list
- if (keyspace == KEYSPACES_WRITE_PROPERTY) {
- String kspAdmins = accessProperties.getProperty(KEYSPACES_WRITE_PROPERTY);
- for (String admin : kspAdmins.split(","))
- if (admin.equals(user.getName()))
- return EnumSet.copyOf(Permission.ALL);
- }
-
- boolean canRead = false, canWrite = false;
- String readers = null, writers = null;
-
- if (columnFamily == null) {
- readers = accessProperties.getProperty(keyspace + ".<ro>");
- writers = accessProperties.getProperty(keyspace + ".<rw>");
- } else {
- readers = accessProperties.getProperty(keyspace + "." + columnFamily + ".<ro>");
- writers = accessProperties.getProperty(keyspace + "." + columnFamily + ".<rw>");
- }
-
- if (readers != null) {
- for (String reader : readers.split(",")) {
- if (reader.equals(user.getName())) {
- canRead = true;
- break;
- }
- }
- }
-
- if (writers != null) {
- for (String writer : writers.split(",")) {
- if (writer.equals(user.getName())) {
- canWrite = true;
- break;
- }
- }
- }
-
- if (canWrite)
- authorized = EnumSet.copyOf(Permission.ALL);
- else if (canRead)
- authorized = EnumSet.of(Permission.READ);
-
- } catch (IOException e) {
- throw new RuntimeException(String.format("Authorization table file '%s' could not be opened: %s",
- accessFilename,
- e.getMessage()));
- } finally {
- FileUtils.closeQuietly(in);
- }
-
- return authorized;
- }
-
- public void validateConfiguration() throws ConfigurationException {
- String afilename = System.getProperty(ACCESS_FILENAME_PROPERTY);
- if (afilename == null) {
- throw new ConfigurationException(String.format("When using %s, '%s' property must be defined.",
- this.getClass().getCanonicalName(),
- ACCESS_FILENAME_PROPERTY));
- }
- }
-}
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
index 7be11f4..07163cd 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
+++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
@@ -142,8 +142,6 @@
<property name="cassandra.distro.filename" value="cassandra.zip"/>
<property name="cassandra.distro.zip"
value="${project.build.outputDirectory}/${cassandra.distro.filename}"/>
- <copy file="${settings.localRepository}/org/rhq/rhq-cassandra-auth/${project.version}/rhq-cassandra-auth-${project.version}.jar"
- todir="${cassandra.dir}/lib"/>
<copy file="${settings.localRepository}/net/java/dev/jna/platform/${cassandra.jna.version}/platform-${cassandra.jna.version}.jar"
todir="${cassandra.dir}/lib"/>
<copy file="${settings.localRepository}/net/java/dev/jna/jna/${cassandra.jna.version}/jna-${cassandra.jna.version}.jar"
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/access.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/access.properties
deleted file mode 100644
index 4465450..0000000
--- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/access.properties
+++ /dev/null
@@ -1,46 +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.
-
-# This is a sample access file for SimpleAuthority. The format of this file
-# is KEYSPACE[.COLUMNFAMILY].PERMISSION=USERS, where:
-#
-# * KEYSPACE is the keyspace name.
-# * COLUMNFAMILY is the column family name.
-# * PERMISSION is one of <ro> or <rw> for read-only or read-write respectively.
-# * USERS is a comma delimited list of users from passwd.properties.
-#
-# See below for example entries.
-
-# NOTE: This file contains potentially sensitive information, please keep
-# this in mind when setting its mode and ownership.
-
-# The magical '<modify-keyspaces>' property lists users who can modify the
-# list of keyspaces: all users will be able to view the list of keyspaces.
-<modify-keyspaces>=cassandra
-
-# Access to Keyspace1 (add/remove column families, etc).
-Keyspace1.<ro>=jsmith,Elvis Presley
-Keyspace1.<rw>=dilbert
-
-# Access to Standard1 (keyspace Keyspace1)
-#Keyspace1.Standard1.<rw>=jsmith,Elvis Presley,dilbert
-
-system.local.<ro>=rhqadmin
-system.peers.<ro>=rhqadmin
-system.schema_keyspaces.<ro>=rhqadmin
-system.schema_columnfamilies.<ro>=rhqadmin
-system.schema_columns.<ro>=rhqadmin
-rhq.<rw>=rhqadmin
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
index d35cd1b..de0f174 100644
--- 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
@@ -149,9 +149,6 @@ JMX_PORT="${rhq.cassandra.jmx.port}"
# Here we create the arguments that will get passed to the jvm when
# starting cassandra.
-JVM_EXTRA_OPTS="$JVM_EXTRA_OPTS -Dpasswd.properties=${rhq.cassandra.password.properties.file}"
-JVM_EXTRA_OPTS="$JVM_EXTRA_OPTS -Daccess.properties=${rhq.cassandra.access.properties.file}"
-
# enable assertions. disabling this in production will give a modest
# performance benefit (around 5%).
JVM_OPTS="$JVM_OPTS -ea"
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.passwd.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.passwd.properties
deleted file mode 100644
index 6f1459c..0000000
--- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.passwd.properties
+++ /dev/null
@@ -1,23 +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.
-#
-# This is a sample password file for SimpleAuthenticator. The format of
-# this file is username=password. If -Dpasswd.mode=MD5 then the password
-# is represented as an md5 digest, otherwise it is cleartext (keep this
-# in mind when setting file mode and ownership).
-
-cassandra=cassandra
-${rhq.cassandra.username}=${rhq.cassandra.password}
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 cb58257..e85813d 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
@@ -84,7 +84,6 @@ public class Deployer {
applyConfigChanges(confDir, "cassandra.yaml", tokens);
applyConfigChanges(confDir, "log4j-server.properties", tokens);
applyConfigChanges(confDir, "cassandra-env.sh", tokens);
- applyConfigChanges(confDir, "passwd.properties", tokens);
}
private void applyConfigChanges(File confDir, String fileName, Map<String, String> tokens) throws DeploymentException {
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptions.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptions.java
index 13d07c2..a83b1d5 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptions.java
+++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptions.java
@@ -84,8 +84,6 @@ public class DeploymentOptions {
private String savedCachesDir;
private String listenAddress;
private String rpcAddress;
- private String passwordPropertiesFile;
- private String accessPropertiesFile;
private Integer jmxPort;
private Integer storagePort;
private Integer sslStoragePort;
@@ -155,8 +153,6 @@ public class DeploymentOptions {
setLogFileName(loadProperty("rhq.cassandra.log.file", properties));
setListenAddress(loadProperty("rhq.cassandra.listen.address", properties));
setRpcAddress(loadProperty("rhq.cassandra.rpc.address", properties));
- setPasswordPropertiesFile(loadProperty("rhq.cassandra.password.properties.file", properties));
- setAccessPropertiesFile(loadProperty("rhq.cassandra.access.properties.file", properties));
setJmxPort(Integer.valueOf(loadProperty("rhq.cassandra.jmx.port", properties)));
setStoragePort(Integer.valueOf(loadProperty("rhq.cassandra.storage.port", properties)));
setSslStoragePort(Integer.valueOf(loadProperty("rhq.cassandra.ssl.storage.port", properties)));
@@ -187,8 +183,6 @@ public class DeploymentOptions {
setPassword(other.password);
setAuthenticator(other.authenticator);
setAuthorizer(other.authorizer);
- setPasswordPropertiesFile(other.passwordPropertiesFile);
- setAccessPropertiesFile(other.accessPropertiesFile);
setDataDir(other.dataDir);
setCommitLogDir(other.commitLogDir);
setSavedCachesDir(other.savedCachesDir);
@@ -560,40 +554,6 @@ public class DeploymentOptions {
}
/**
- * @return The location of the password properties file used by SimpleAuthenticator
- */
- @DeploymentProperty(name = "rhq.cassandra.password.properties.file")
- public String getPasswordPropertiesFile() {
- return passwordPropertiesFile;
- }
-
- /**
- * @param file The location of the password properties file used
- */
- public void setPasswordPropertiesFile(String file) {
- if (passwordPropertiesFile == null) {
- passwordPropertiesFile = file;
- }
- }
-
- /**
- * @return The location of the authorization properties file used by SimpleAuthorizer
- */
- @DeploymentProperty(name = "rhq.cassandra.access.properties.file")
- public String getAccessPropertiesFile() {
- return accessPropertiesFile;
- }
-
- /**
- * @param file The location of the authorization properties file used by SimpleAuthorizer
- */
- public void setAccessPropertiesFile(String file) {
- if (accessPropertiesFile == null) {
- accessPropertiesFile = file;
- }
- }
-
- /**
* @return The port on which Cassandra listens for JMX connections
*/
@DeploymentProperty(name = "rhq.cassandra.jmx.port")
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties
index 7089a63..ce1df3a 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties
+++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties
@@ -34,14 +34,6 @@ rhq.cassandra.authenticator=org.apache.cassandra.auth.PasswordAuthenticator
# be a fully qualified class name and implement IAuthorizer.
rhq.cassandra.authorizer=org.apache.cassandra.auth.CassandraAuthorizer
-# 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.
-rhq.cassandra.password.properties.file=${rhq.cassandra.basedir}/conf/passwd.properties
-
-# The location of the authorization properties file used by SimpleAuthorizer. If a relative
-# path is specified, its location is resolved relative to Cassandra's bin directory.
-rhq.cassandra.access.properties.file=${rhq.cassandra.basedir}/conf/access.properties
-
# The IP address or hostname that other Cassandra nodes will use to connect to
# this node.
rhq.cassandra.listen.address=localhost
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 ef367cb..0e8f062 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
@@ -64,8 +64,6 @@ public class DeployerITest {
deploymentOptions.setDataDir("/var/lib/rhq/storage/data");
deploymentOptions.setSavedCachesDir("/var/lib/rhq/storage/saved_caches");
deploymentOptions.setLogFileName("/var/lib/rhq/storage/logs/rhq-storage.log");
- deploymentOptions.setPasswordPropertiesFile("conf/passwd.properties");
- deploymentOptions.setAccessPropertiesFile("conf/access.properties");
deploymentOptions.load();
deployer = new Deployer();
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
index 0af324a..d22d5a1 100644
--- 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
@@ -149,9 +149,6 @@ JMX_PORT="7200"
# Here we create the arguments that will get passed to the jvm when
# starting cassandra.
-JVM_EXTRA_OPTS="$JVM_EXTRA_OPTS -Dpasswd.properties=conf/passwd.properties"
-JVM_EXTRA_OPTS="$JVM_EXTRA_OPTS -Daccess.properties=conf/access.properties"
-
# enable assertions. disabling this in production will give a modest
# performance benefit (around 5%).
JVM_OPTS="$JVM_OPTS -ea"
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 40d19e6..d770d2a 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
@@ -62,7 +62,7 @@ max_hints_delivery_threads: 2
# - 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.rhq.cassandra.auth.SimpleAuthenticator
+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,
@@ -71,7 +71,7 @@ authenticator: org.rhq.cassandra.auth.SimpleAuthenticator
# - 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.rhq.cassandra.auth.SimpleAuthorizer
+authorizer: org.apache.cassandra.auth.CassandraAuthorizer
# Validity period for permissions cache (fetching permissions can be an
# expensive operation depending on the authorizer, CassandraAuthorizer is
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index f1c761b..b3210cb 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -30,7 +30,6 @@
<module>ant-bundle</module>
<module>drift</module>
<module>jboss-as-dmr-client</module>
- <module>cassandra-auth</module>
<module>cassandra-schema</module>
<module>cassandra-ccm</module>
<module>cassandra-installer</module>
1
0
[rhq] Branch 'feature/cassandra-backend' - modules/common modules/enterprise pom.xml
by John Sanda 05 Apr '13
by John Sanda 05 Apr '13
05 Apr '13
modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 4 -
modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra-env.sh | 4 +
modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml | 27 +++++++++-
modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/ClusterInitService.java | 13 ++++
modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties | 4 -
modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-env.sh | 4 +
modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml | 27 +++++++++-
modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java | 14 ++---
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java | 2
modules/enterprise/server/itests-2/pom.xml | 4 +
pom.xml | 6 +-
11 files changed, 90 insertions(+), 19 deletions(-)
New commits:
commit ab21237f618b25a6467f13c620bf44fc950ec017
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Apr 5 21:51:53 2013 -0400
upgrading Cassandra, Cassandra driver, and snappy-java
Upgrading Cassandra to 1.2.2 earlier than planned to work around
https://bugzilla.redhat.com/show_bug.cgi?id=907485#c8.
Upgrading the DataStax driver to pick up the latest changes/bugfixes and also
updating its deps to C* 1.2.2.
Upgrading snappy-java to work around https://github.com/xerial/snappy-java/issues/5
which prevented the RHQ installer from running. This upgrade gets us off of a
patched version of snappy-java. /me breathes sigh of relief.
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
index 1cba7be..7be11f4 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
+++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
@@ -281,7 +281,7 @@
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
- <version>1.0.5-M3</version>
+ <version>1.1.0-M3</version>
</dependency>
</dependencies>
<executions>
@@ -298,7 +298,7 @@
<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/1.0.5-M3/snappy-java-1.0.5-M3.jar"/>
+ 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>
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
index 6ab6f6b..d35cd1b 100644
--- 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
@@ -205,6 +205,10 @@ 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"
+# 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"
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 cf7be70..6ed76a5 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
@@ -54,12 +54,31 @@ max_hints_delivery_threads: 2
# Defaults to: false
# populate_io_cache_on_flush: false
-# authentication backend, implementing IAuthenticator; used to identify users
+# 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: ${rhq.cassandra.authenticator}
-# authorization backend, implementing IAUthorizer; used to limit access/provide permissions
+# 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: ${rhq.cassandra.authorizer}
+# 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
@@ -370,6 +389,10 @@ rpc_server_type: sync
# rpc_send_buff_size_in_bytes:
# rpc_recv_buff_size_in_bytes:
+# uncomment to set socket buffer size for internode communication
+# 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
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/ClusterInitService.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/ClusterInitService.java
index 85deb35..0e78326 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/ClusterInitService.java
+++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/ClusterInitService.java
@@ -97,6 +97,9 @@ public class ClusterInitService {
* This method attempts to establish a Thrift RPC connection to each host. If the
* connection fails, the host is retried after going through the other, remaining
* hosts. A runtime exception will be thrown after 10 failed retries.
+ * <br/><br/>
+ * After connecting to all nodes, this method will then sleep for a fixed delay.
+ * See {@link #waitForClusterToStart(java.util.List, int, int)} for details.
*
* @param hosts The cluster nodes to which a connection should be made
*/
@@ -110,6 +113,12 @@ public class ClusterInitService {
* is 2, this method will block only until it can connect to two of the hosts. If the
* connection fails, the host is retried after going through the other, remaining
* hosts.
+ * <br/><br/>
+ * After connecting to all cluster nodes, this method will sleep for 10 seconds
+ * before returning. This is to give the cluster a chance to create the system auth
+ * schema and to create the cassandra super user. Cassandra has a hard-coded delay of
+ * 10 sceonds before it creates the super user, which means the rhq schema cannot be
+ * created before that.
*
* @param hosts The cluster nodes to which a connection should be made
* @param numHosts The number of hosts to which a successful connection has to be made
@@ -139,6 +148,10 @@ public class ClusterInitService {
++connections;
socket.close();
if (connections == numHosts) {
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+ }
return;
}
} catch (TTransportException e) {
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties
index c2303bd..7089a63 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties
+++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties
@@ -28,11 +28,11 @@ rhq.cassandra.seeds=localhost
# A class that performs authentication. The value should be a fully qualified class name
# and implement IAuthenticator.
-rhq.cassandra.authenticator=org.rhq.cassandra.auth.SimpleAuthenticator
+rhq.cassandra.authenticator=org.apache.cassandra.auth.PasswordAuthenticator
# A class that performs authorization. Used to limit/provide permissions. The value should
# be a fully qualified class name and implement IAuthorizer.
-rhq.cassandra.authorizer=org.rhq.cassandra.auth.SimpleAuthorizer
+rhq.cassandra.authorizer=org.apache.cassandra.auth.CassandraAuthorizer
# 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.
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
index 1516305..0af324a 100644
--- 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
@@ -205,6 +205,10 @@ 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"
+# 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"
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 e12a29b..40d19e6 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
@@ -54,12 +54,31 @@ max_hints_delivery_threads: 2
# Defaults to: false
# populate_io_cache_on_flush: false
-# authentication backend, implementing IAuthenticator; used to identify users
+# 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.rhq.cassandra.auth.SimpleAuthenticator
-# authorization backend, implementing IAUthorizer; used to limit access/provide permissions
+# 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.rhq.cassandra.auth.SimpleAuthorizer
+# 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
@@ -370,6 +389,10 @@ rpc_server_type: sync
# rpc_send_buff_size_in_bytes:
# rpc_recv_buff_size_in_bytes:
+# uncomment to set socket buffer size for internode communication
+# 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
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 4aedfe3..97f30dd 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
@@ -111,6 +111,13 @@ public class CCMTestNGListener implements IInvokedMethodListener {
clusterInitService.waitForClusterToStart(nodes);
}
+ SchemaManager schemaManager = new SchemaManager(annotation.username(), annotation.password(), nodes);
+ if (!schemaManager.schemaExists()) {
+ schemaManager.createSchema();
+ schemaManager.updateSchema();
+ }
+ schemaManager.shutdown();
+
if (annotation.waitForSchemaAgreement()) {
// TODO do not hard code cluster name
// I am ok with hard coding the cluster name for now as it is only required
@@ -121,13 +128,6 @@ public class CCMTestNGListener implements IInvokedMethodListener {
// jsanda
clusterInitService.waitForSchemaAgreement("rhq", nodes);
}
-
- SchemaManager schemaManager = new SchemaManager(annotation.username(), annotation.password(), nodes);
- if (!schemaManager.schemaExists()) {
- schemaManager.createSchema();
- schemaManager.updateSchema();
- }
- schemaManager.shutdown();
}
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 3670304..07672c8 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
@@ -104,7 +104,7 @@ public class SchemaManager {
public void createSchema() {
try {
- session.execute("CREATE USER rhqadmin SUPERUSER");
+ session.execute("CREATE USER rhqadmin WITH PASSWORD 'rhqadmin' SUPERUSER");
session.execute(
"CREATE KEYSPACE rhq WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};");
} catch (NoHostAvailableException e) {
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
index b956f9d..c5a45f7 100644
--- a/modules/enterprise/server/itests-2/pom.xml
+++ b/modules/enterprise/server/itests-2/pom.xml
@@ -672,6 +672,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/pom.xml b/pom.xml
index 139d4ba..0af982b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,10 +166,10 @@
<el.version>1.0</el.version>
<!-- cassandra dependency versions -->
- <cassandra.version>1.2.1</cassandra.version>
+ <cassandra.version>1.2.2</cassandra.version>
<cassandra.thrift.version>0.7.0</cassandra.thrift.version>
- <cassandra.driver.version>1.0.0-beta1</cassandra.driver.version>
- <cassandra.driver.snappy.version>1.0.5-M3-p1</cassandra.driver.snappy.version>
+ <cassandra.driver.version>1.0.0-beta2-rhq-1_2_2-SNAPSHOT</cassandra.driver.version>
+ <cassandra.driver.snappy.version>1.1.0-M3</cassandra.driver.snappy.version>
<rhq.db.admin.username>rhqadmin</rhq.db.admin.username>
<rhq.db.admin.password>rhqadmin</rhq.db.admin.password>
1
0
05 Apr '13
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigratorRunner.java | 490 ++++++----
1 file changed, 312 insertions(+), 178 deletions(-)
New commits:
commit 44e5035d9dcfc4e4b9996cacf22891c47a602a8f
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Apr 5 17:28:07 2013 -0500
Add documentation and re-order methods to follow flow.
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigratorRunner.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigratorRunner.java
index 3ed9627..7da6efa 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigratorRunner.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigratorRunner.java
@@ -131,7 +131,6 @@ public class DataMigratorRunner {
"Command line arguments take precedence over default and configuration file options.")
.create();
-
private Map<Object, Object> configuration = new HashMap<Object, Object>();
private Options options;
@@ -155,6 +154,35 @@ public class DataMigratorRunner {
System.exit(0);
}
+ private static void initLogging() {
+ Logger root = Logger.getRootLogger();
+ if (!root.getAllAppenders().hasMoreElements()) {
+ root.addAppender(new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN)));
+ setLogLevel(Level.ERROR);
+ }
+ }
+
+ private static void setLogLevel(Level level) {
+ Logger root = Logger.getRootLogger();
+ root.setLevel(level);
+
+ Logger cassandraLogging = root.getLoggerRepository().getLogger("log4j.logger.org.apache.cassandra.cql.jdbc");
+ cassandraLogging.setLevel(level);
+
+ Logger cassandraDriverLogging = root.getLoggerRepository().getLogger("com.datastax.driver");
+ cassandraDriverLogging.setLevel(level);
+
+ Logger hibernateLogging = root.getLoggerRepository().getLogger("org.hibernate");
+ hibernateLogging.setLevel(level);
+
+ Logger migratorLogging = root.getLoggerRepository().getLogger("org.rhq");
+ if (Level.DEBUG.equals(level)) {
+ migratorLogging.setLevel(Level.INFO);
+ } else {
+ migratorLogging.setLevel(level);
+ }
+ }
+
private void configure(String args[]) throws Exception {
options = new Options();
@@ -215,117 +243,107 @@ public class DataMigratorRunner {
parseMigrationOptionsWithDefault(commandLine);
}
- private static void initLogging() {
- Logger root = Logger.getRootLogger();
- if (!root.getAllAppenders().hasMoreElements()) {
- root.addAppender(new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN)));
- setLogLevel(Level.ERROR);
- }
- }
-
- private static void setLogLevel(Level level) {
- Logger root = Logger.getRootLogger();
- root.setLevel(level);
-
- Logger cassandraLogging = root.getLoggerRepository().getLogger("log4j.logger.org.apache.cassandra.cql.jdbc");
- cassandraLogging.setLevel(level);
-
- Logger cassandraDriverLogging = root.getLoggerRepository().getLogger("com.datastax.driver");
- cassandraDriverLogging.setLevel(level);
+ /**
+ * Add default configuration options to the configuration store.
+ */
+ private void loadDefaultConfiguration() {
+ //default Cassandra configuration
+ configuration.put(cassandraUserOption, "rhqadmin");
+ configuration.put(cassandraPasswordOption, "rhqadmin");
+ configuration.put(cassandraHostsOption, new String[] { "127.0.0.1" });
+ configuration.put(cassandraCompressionOption, false);
- Logger hibernateLogging = root.getLoggerRepository().getLogger("org.hibernate");
- hibernateLogging.setLevel(level);
+ //default SQL configuration
+ configuration.put(sqlUserOption, "rhqadmin");
+ configuration.put(sqlPasswordOption, "rhqadmin");
+ configuration.put(sqlHostOption, "localhost");
+ configuration.put(sqlPortOption, "5432");
+ configuration.put(sqlDBOption, "rhq_db");
+ configuration.put(sqlServerType, "postgres");
- Logger migratorLogging = root.getLoggerRepository().getLogger("org.rhq");
- if (Level.DEBUG.equals(level)) {
- migratorLogging.setLevel(Level.INFO);
- } else {
- migratorLogging.setLevel(level);
- }
+ //default runner options
+ configuration.put(disableRawOption, false);
+ configuration.put(disable1HOption, false);
+ configuration.put(disable6HOption, false);
+ configuration.put(disable1DOption, false);
+ configuration.put(preserveDataOption, true);
+ configuration.put(estimateOnlyOption, false);
}
- private void run() throws Exception {
- log.debug("Creating Entity Manager");
- EntityManager entityManager = this.createEntityManager();
- log.debug("Done creating Entity Manager");
-
- log.debug("Creating Cassandra session");
- Session session = this.createCassandraSession();
- log.debug("Done creating Cassandra session");
-
- DataMigrator migrator = new DataMigrator(entityManager, session);
+ /**
+ * Load the configuration options from file and overlay them on top of the default
+ * options.
+ *
+ * @param file config file
+ */
+ private void loadConfigFile(String file) {
+ try {
+ File configFile = new File(file);
+ if (!configFile.exists()) {
+ throw new FileNotFoundException("Configuration file not found!");
+ }
- if ((Boolean) configuration.get(preserveDataOption)) {
- migrator.preserveData();
- } else {
- migrator.deleteAllDataAtEndOfMigration();
- }
+ Properties configProperties = new Properties();
+ FileInputStream stream = new FileInputStream(configFile);
+ configProperties.load(stream);
+ stream.close();
- migrator.runRawDataMigration(!(Boolean) configuration.get(disableRawOption));
- migrator.run1HAggregateDataMigration(!(Boolean) configuration.get(disable1HOption));
- migrator.run6HAggregateDataMigration(!(Boolean) configuration.get(disable6HOption));
- migrator.run1DAggregateDataMigration(!(Boolean) configuration.get(disable1DOption));
+ for (Object optionObject : options.getOptions()) {
+ Option option = (Option) optionObject;
+ Object optionValue;
- long estimate = migrator.estimate();
- System.out.println("The migration process will take approximately: "
- + TimeUnit.MILLISECONDS.toMinutes(estimate)
- + " minutes (or " + estimate + " milliseconds)");
- if (!(Boolean) configuration.get(estimateOnlyOption)) {
- migrator.migrateData();
- }
- }
+ if ((optionValue = configProperties.get(option.getLongOpt())) != null) {
+ log.debug("Configuration option loaded: " + option.getLongOpt() + " (" + option.getType() + ") -> "
+ + optionValue);
- private Session createCassandraSession() throws Exception {
- Compression selectedCompression = Compression.NONE;
- if ((Boolean) configuration.get(cassandraCompressionOption)) {
- selectedCompression = Compression.SNAPPY;
+ if (option.equals(cassandraHostsOption)) {
+ String[] cassandraHosts = parseCassandraHosts(optionValue.toString());
+ configuration.put(option, cassandraHosts);
+ } else if (option.equals(sqlServerType)) {
+ if ("oracle".equals(optionValue)) {
+ configuration.put(option, "oracle");
+ } else {
+ configuration.put(option, "postgres");
+ }
+ } else if (option.equals(sqlPostgresServer)) {
+ boolean value = parseBooleanOption(optionValue.toString(), true);
+ if (value == true) {
+ configuration.put(sqlServerType, "postgres");
+ }
+ } else if (option.equals(sqlOracleServer)) {
+ boolean value = parseBooleanOption(optionValue.toString(), true);
+ if (value == true) {
+ configuration.put(sqlServerType, "oracle");
+ }
+ } else if (option.getType().equals(Boolean.class)) {
+ configuration.put(option, parseBooleanOption(optionValue.toString(), true));
+ } else {
+ configuration.put(option, optionValue.toString());
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("Unable to load or process the configuration file.", e);
+ System.exit(1);
}
- Cluster cluster = Cluster
- .builder()
- .addContactPoints((String[]) configuration.get(cassandraHostsOption))
- .withCompression(selectedCompression)
- .withoutMetrics()
- .withAuthInfoProvider(
- new SimpleAuthInfoProvider().add("username", (String) configuration.get(cassandraUserOption)).add(
- "password", (String) configuration.get(cassandraPasswordOption))).build();
-
- return cluster.connect("rhq");
+ log.error(configuration.toString());
}
- private EntityManager createEntityManager() throws Exception {
- Properties properties = new Properties();
- properties.put("javax.persistence.provider", "org.hibernate.ejb.HibernatePersistence");
- properties.put("hibernate.connection.username", (String) configuration.get(sqlUserOption));
- properties.put("hibernate.connection.password", (String) configuration.get(sqlPasswordOption));
-
- if ("oracle".equals(configuration.get(sqlServerType))) {
- properties.put("hibernate.dialect", "org.hibernate.dialect.Oracle10gDialect");
- properties.put("hibernate.driver_class", "oracle.jdbc.driver.OracleDriver");
- properties.put("hibernate.connection.url", "jdbc:oracle:thin:@" + (String) configuration.get(sqlHostOption)
- + ":" + (String) configuration.get(sqlPortOption) + ":" + (String) configuration.get(sqlDBOption));
- properties.put("hibernate.default_schema", (String) configuration.get(sqlDBOption));
- }else{
- properties.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect");
- properties.put("hibernate.driver_class", "org.postgresql.Driver");
- properties.put("hibernate.connection.url", "jdbc:postgresql://" + (String) configuration.get(sqlHostOption)
- + ":" + (String) configuration.get(sqlPortOption) + "/" + (String) configuration.get(sqlDBOption));
- }
-
- Ejb3Configuration configuration = new Ejb3Configuration();
- configuration.setProperties(properties);
- EntityManagerFactory factory = configuration.buildEntityManagerFactory();
- return factory.createEntityManager();
- }
-
+ /**
+ * Parse command line options for Cassandra.
+ *
+ * @param commandLine command line
+ * @throws NoHostAvailableException
+ */
private void parseCassandraOptionsWithDefault(CommandLine commandLine) throws NoHostAvailableException {
if (commandLine.hasOption(cassandraUserOption.getLongOpt())) {
configuration.put(cassandraUserOption, commandLine.getOptionValue(cassandraUserOption.getLongOpt()));
}
if (commandLine.hasOption(cassandraPasswordOption.getLongOpt())) {
- configuration.put(cassandraPasswordOption,
- commandLine.getOptionValue(cassandraPasswordOption.getLongOpt()));
+ configuration
+ .put(cassandraPasswordOption, commandLine.getOptionValue(cassandraPasswordOption.getLongOpt()));
}
if (commandLine.hasOption(cassandraHostsOption.getLongOpt())) {
@@ -339,16 +357,12 @@ public class DataMigratorRunner {
}
}
- private String[] parseCassandraHosts(String stringValue) {
- String[] seeds = stringValue.split(",");
- String[] cassandraHosts = new String[seeds.length];
- for (int i = 0; i < seeds.length; ++i) {
- CassandraNode node = CassandraNode.parseNode(seeds[i]);
- cassandraHosts[i] = node.getHostName();
- }
- return cassandraHosts;
- }
-
+ /**
+ * Parse command line options for SQL.
+ *
+ * @param commandLine command line
+ * @throws NoHostAvailableException
+ */
private void parseSQLOptionsWithDefault(CommandLine commandLine) throws NoHostAvailableException {
if (commandLine.hasOption(sqlUserOption.getLongOpt())) {
configuration.put(sqlUserOption, commandLine.getOptionValue(sqlUserOption.getLongOpt()));
@@ -383,6 +397,11 @@ public class DataMigratorRunner {
}
}
+ /**
+ * Parse command line options for the actual migration progress.
+ *
+ * @param commandLine
+ */
private void parseMigrationOptionsWithDefault(CommandLine commandLine) {
boolean value;
@@ -420,93 +439,114 @@ public class DataMigratorRunner {
}
}
- /**
- * Add default configuration options to the configuration store.
- */
- private void loadDefaultConfiguration() {
- //default Cassandra configuration
- configuration.put(cassandraUserOption, "rhqadmin");
- configuration.put(cassandraPasswordOption, "rhqadmin");
- configuration.put(cassandraHostsOption, new String[] { "127.0.0.1" });
- configuration.put(cassandraCompressionOption, false);
+ private void run() throws Exception {
+ log.debug("Creating Entity Manager");
+ EntityManager entityManager = this.createEntityManager();
+ log.debug("Done creating Entity Manager");
- //default SQL configuration
- configuration.put(sqlUserOption, "rhqadmin");
- configuration.put(sqlPasswordOption, "rhqadmin");
- configuration.put(sqlHostOption, "localhost");
- configuration.put(sqlPortOption, "5432");
- configuration.put(sqlDBOption, "rhq_db");
- configuration.put(sqlServerType, "postgres");
+ log.debug("Creating Cassandra session");
+ Session session = this.createCassandraSession();
+ log.debug("Done creating Cassandra session");
- //default runner options
- configuration.put(disableRawOption, false);
- configuration.put(disable1HOption, false);
- configuration.put(disable6HOption, false);
- configuration.put(disable1DOption, false);
- configuration.put(preserveDataOption, true);
- configuration.put(estimateOnlyOption, false);
+ DataMigrator migrator = new DataMigrator(entityManager, session);
+
+ if ((Boolean) configuration.get(preserveDataOption)) {
+ migrator.preserveData();
+ } else {
+ migrator.deleteAllDataAtEndOfMigration();
+ }
+
+ migrator.runRawDataMigration(!(Boolean) configuration.get(disableRawOption));
+ migrator.run1HAggregateDataMigration(!(Boolean) configuration.get(disable1HOption));
+ migrator.run6HAggregateDataMigration(!(Boolean) configuration.get(disable6HOption));
+ migrator.run1DAggregateDataMigration(!(Boolean) configuration.get(disable1DOption));
+
+ long estimate = migrator.estimate();
+ System.out.println("The migration process will take approximately: "
+ + TimeUnit.MILLISECONDS.toMinutes(estimate)
+ + " minutes (or " + estimate + " milliseconds)");
+ if (!(Boolean) configuration.get(estimateOnlyOption)) {
+ migrator.migrateData();
+ }
}
/**
- * Load the configuration options from file and overlay them on top of the default
- * options.
+ * Create a Cassandra session based on configuration options.
*
- * @param file config file
+ * @return Cassandra session
+ * @throws Exception
*/
- private void loadConfigFile(String file) {
- try {
- File configFile = new File(file);
- if (!configFile.exists()){
- throw new FileNotFoundException("Configuration file not found!");
- }
+ private Session createCassandraSession() throws Exception {
+ Compression selectedCompression = Compression.NONE;
+ if ((Boolean) configuration.get(cassandraCompressionOption)) {
+ selectedCompression = Compression.SNAPPY;
+ }
- Properties configProperties = new Properties();
- FileInputStream stream = new FileInputStream(configFile);
- configProperties.load(stream);
- stream.close();
+ Cluster cluster = Cluster
+ .builder()
+ .addContactPoints((String[]) configuration.get(cassandraHostsOption))
+ .withCompression(selectedCompression)
+ .withoutMetrics()
+ .withAuthInfoProvider(
+ new SimpleAuthInfoProvider().add("username", (String) configuration.get(cassandraUserOption)).add(
+ "password", (String) configuration.get(cassandraPasswordOption))).build();
- for (Object optionObject : options.getOptions()) {
- Option option = (Option) optionObject;
- Object optionValue;
+ return cluster.connect("rhq");
+ }
- if ((optionValue = configProperties.get(option.getLongOpt())) != null) {
- log.debug("Configuration option loaded: " + option.getLongOpt() + " (" + option.getType() + ") -> "
- + optionValue);
+ /**
+ * Create a hibernate session to the SQL server.
+ *
+ * @return
+ * @throws Exception
+ */
+ private EntityManager createEntityManager() throws Exception {
+ Properties properties = new Properties();
+ properties.put("javax.persistence.provider", "org.hibernate.ejb.HibernatePersistence");
+ properties.put("hibernate.connection.username", (String) configuration.get(sqlUserOption));
+ properties.put("hibernate.connection.password", (String) configuration.get(sqlPasswordOption));
- if (option.equals(cassandraHostsOption)) {
- String[] cassandraHosts = parseCassandraHosts(optionValue.toString());
- configuration.put(option, cassandraHosts);
- } else if (option.equals(sqlServerType)) {
- if ("oracle".equals(optionValue)) {
- configuration.put(option, "oracle");
- } else {
- configuration.put(option, "postgres");
- }
- } else if (option.equals(sqlPostgresServer)) {
- boolean value = parseBooleanOption(optionValue.toString(), true);
- if (value == true) {
- configuration.put(sqlServerType, "postgres");
- }
- } else if (option.equals(sqlOracleServer)) {
- boolean value = parseBooleanOption(optionValue.toString(), true);
- if (value == true) {
- configuration.put(sqlServerType, "oracle");
- }
- } else if (option.getType().equals(Boolean.class)) {
- configuration.put(option, parseBooleanOption(optionValue.toString(), true));
- } else {
- configuration.put(option, optionValue.toString());
- }
- }
- }
- } catch (Exception e) {
- log.error("Unable to load or process the configuration file.", e);
- System.exit(1);
+ if ("oracle".equals(configuration.get(sqlServerType))) {
+ properties.put("hibernate.dialect", "org.hibernate.dialect.Oracle10gDialect");
+ properties.put("hibernate.driver_class", "oracle.jdbc.driver.OracleDriver");
+ properties.put("hibernate.connection.url", "jdbc:oracle:thin:@" + (String) configuration.get(sqlHostOption)
+ + ":" + (String) configuration.get(sqlPortOption) + ":" + (String) configuration.get(sqlDBOption));
+ properties.put("hibernate.default_schema", (String) configuration.get(sqlDBOption));
+ } else {
+ properties.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect");
+ properties.put("hibernate.driver_class", "org.postgresql.Driver");
+ properties.put("hibernate.connection.url", "jdbc:postgresql://" + (String) configuration.get(sqlHostOption)
+ + ":" + (String) configuration.get(sqlPortOption) + "/" + (String) configuration.get(sqlDBOption));
}
- log.error(configuration.toString());
+ Ejb3Configuration configuration = new Ejb3Configuration();
+ configuration.setProperties(properties);
+ EntityManagerFactory factory = configuration.buildEntityManagerFactory();
+ return factory.createEntityManager();
+ }
+
+ /**
+ * Parse Cassandra host information submitted in the form:
+ * host_addres,thrift_port,native_port|host_address_2,thrift_port,native_port
+ *
+ * @param stringValue
+ * @return
+ */
+ private String[] parseCassandraHosts(String stringValue) {
+ String[] seeds = stringValue.split(",");
+ String[] cassandraHosts = new String[seeds.length];
+ for (int i = 0; i < seeds.length; ++i) {
+ CassandraNode node = CassandraNode.parseNode(seeds[i]);
+ cassandraHosts[i] = node.getHostName();
+ }
+ return cassandraHosts;
}
+ /**
+ * @param value object value to parse
+ * @param defaultValue default value
+ * @return
+ */
private boolean parseBooleanOption(Object value, boolean defaultValue) {
try {
return Boolean.parseBoolean(value.toString());
@@ -521,5 +561,4 @@ public class DataMigratorRunner {
super("Help Requested");
}
}
-}
-
+}
\ No newline at end of file
commit edafd0aff7a19f5414adc2faea13e3fd9b3d6770
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Apr 5 17:17:13 2013 -0500
Enable partial Oracle support. Add command line option documentation. And add better parsing for boolean options.
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigratorRunner.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigratorRunner.java
index d73d5aa..3ed9627 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigratorRunner.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigratorRunner.java
@@ -74,47 +74,62 @@ public class DataMigratorRunner {
private final Log log = LogFactory.getLog(DataMigratorRunner.class);
//Cassandra
- private Option cassandraUserOption = OptionBuilder.withLongOpt("cassandra-user").hasArg()
- .withType(String.class).create();
+ private Option cassandraUserOption = OptionBuilder.withLongOpt("cassandra-user").hasArg().withType(String.class)
+ .withDescription("Cassandra user (default: rhqadmin)").create();
private Option cassandraPasswordOption = OptionBuilder.withLongOpt("cassandra-password").hasArg()
- .withType(String.class).create();
- private Option cassandraHostsOption = OptionBuilder.withLongOpt("cassandra-hosts").hasArg()
- .withType(String.class).create();
- private Option cassandraCompressionOption = OptionBuilder.withLongOpt("cassandra-compression")
- .withType(String.class).create();
+ .withDescription("Cassandra password (default: rhqadmin)").withType(String.class).create();
+ private Option cassandraHostsOption = OptionBuilder.withLongOpt("cassandra-hosts").hasArg().withType(String.class)
+ .withDescription("Cassandra hosts, format host_ip,thrift_port,native_port|host_ip,... (default: 127.0.0.1|123|123)")
+ .create();
+ private Option cassandraCompressionOption = OptionBuilder.withLongOpt("cassandra-compression").hasOptionalArg()
+ .withType(String.class).withDescription("Enable compression for communication with Cassandra (default: true)")
+ .create();
//SQL
- private Option sqlUserOption = OptionBuilder.withLongOpt("sql-user").hasArg()
- .withType(String.class).create();
- private Option sqlPasswordOption = OptionBuilder.withLongOpt("sql-password").hasArg()
- .withType(String.class).create();
- private Option sqlHostOption = OptionBuilder.withLongOpt("sql-host").hasArg()
- .withType(String.class).create();
- private Option sqlPortOption = OptionBuilder.withLongOpt("sql-port").hasArg()
- .withType(String.class).create();
- private Option sqlDBOption = OptionBuilder.withLongOpt("sql-db").hasArg()
- .withType(String.class).create();
+ private Option sqlUserOption = OptionBuilder.withLongOpt("sql-user").hasArg().withType(String.class)
+ .withDescription("SQL server user (default: rhqadmin)").create();
+ private Option sqlPasswordOption = OptionBuilder.withLongOpt("sql-password").hasArg().withType(String.class)
+ .withDescription("SQL server password (default: rhqadmin)").create();
+ private Option sqlHostOption = OptionBuilder.withLongOpt("sql-host").hasArg().withType(String.class)
+ .withDescription("SQL server host address (default: localhost)").create();
+ private Option sqlPortOption = OptionBuilder.withLongOpt("sql-port").hasArg().withType(String.class)
+ .withDescription("SQL server port (default: 5432)").create();
+ private Option sqlDBOption = OptionBuilder.withLongOpt("sql-db").hasArg().withType(String.class)
+ .withDescription("SQL database (default: rhq_db)").create();
+
+ private Option sqlServerType = OptionBuilder.withLongOpt("sql-server-type").hasArg().withType(String.class)
+ .withDescription("SQL server type, only postgres and oracle are supported (default: postgres)").create();
+ private Option sqlPostgresServer = OptionBuilder.withLongOpt("sql-server-postgres").hasOptionalArg()
+ .withType(Boolean.class).withDescription("Postgres SQL server.").create();
+ private Option sqlOracleServer = OptionBuilder.withLongOpt("sql-server-oracle").hasOptionalArg()
+ .withType(Boolean.class)
+ .withDescription("Oracle SQL server.").create();
//Migration
- private Option disableRawOption = OptionBuilder.withLongOpt("disable-raw-migration")
- .withType(Boolean.class).create();
- private Option disable1HOption = OptionBuilder.withLongOpt("disable-1h-migration")
- .withType(Boolean.class).create();
- private Option disable6HOption = OptionBuilder.withLongOpt("disable-6h-migration")
- .withType(Boolean.class).create();
- private Option disable1DOption = OptionBuilder.withLongOpt("disable-1d-migration")
- .withType(Boolean.class).create();
- private Option preserveDataOption = OptionBuilder.withLongOpt("preserve-data")
- .withType(Boolean.class).create();
- private Option deleteDataOption = OptionBuilder.withLongOpt("delete-data")
- .withType(Boolean.class).create();
- private Option estimateOnlyOption = OptionBuilder.withLongOpt("estimate-only")
- .withType(Boolean.class).create();
-
- //Misc
+ private Option disableRawOption = OptionBuilder.withLongOpt("disable-raw-migration").hasOptionalArg().withType(Boolean.class)
+ .withDescription("Disable raw table migration (default: false)").create();
+ private Option disable1HOption = OptionBuilder.withLongOpt("disable-1h-migration").hasOptionalArg().withType(Boolean.class)
+ .withDescription("Disable 1 hour aggregates table migration (default: false)").create();
+ private Option disable6HOption = OptionBuilder.withLongOpt("disable-6h-migration").hasOptionalArg().withType(Boolean.class)
+ .withDescription("Disable 6 hours aggregates table migration (default: false)").create();
+ private Option disable1DOption = OptionBuilder.withLongOpt("disable-1d-migration").hasOptionalArg().withType(Boolean.class)
+ .withDescription("Disable 24 hours aggregates table migration (default: false)").create();
+ private Option preserveDataOption = OptionBuilder.withLongOpt("preserve-data").hasOptionalArg().withType(Boolean.class)
+ .withDescription("Preserve SQL data post migration (default: true)").create();
+ private Option deleteDataOption = OptionBuilder.withLongOpt("delete-data").hasOptionalArg().withType(Boolean.class)
+ .withDescription("Delete SQL data at the end of migration (default: false)").create();
+ private Option estimateOnlyOption = OptionBuilder.withLongOpt("estimate-only").hasOptionalArg().withType(Boolean.class)
+ .withDescription("Only estimate how long the migration will take (default: false)").create();
+
+ //Runner
private Option helpOption = OptionBuilder.withLongOpt("help").create("h");
- private Option debugLogOption = OptionBuilder.withLongOpt("debugLog").create("X");
- private Option configFileOption = OptionBuilder.withLongOpt("config-file").hasArg().create();
+ private Option debugLogOption = OptionBuilder.withLongOpt("debugLog")
+ .withDescription("Enable debug level logs for the communication with Cassandra and SQL Server (default: false)")
+ .create("X");
+ private Option configFileOption = OptionBuilder.withLongOpt("config-file").hasArg()
+ .withDescription("Configuration file. All the command line options can be set in a typical properties file. " +
+ "Command line arguments take precedence over default and configuration file options.")
+ .create();
private Map<Object, Object> configuration = new HashMap<Object, Object>();
@@ -133,8 +148,8 @@ public class DataMigratorRunner {
} catch (HelpRequestedException h) {
//do nothing
} catch (Exception e) {
- System.out.println(e);
e.printStackTrace();
+ System.exit(1);
}
System.exit(0);
@@ -153,6 +168,9 @@ public class DataMigratorRunner {
options.addOption(sqlHostOption);
options.addOption(sqlPortOption);
options.addOption(sqlDBOption);
+ options.addOption(sqlServerType);
+ options.addOption(sqlPostgresServer);
+ options.addOption(sqlOracleServer);
options.addOption(disableRawOption);
options.addOption(disable1HOption);
@@ -172,6 +190,7 @@ public class DataMigratorRunner {
commandLine = parser.parse(options, args);
} catch (Exception e) {
HelpFormatter formatter = new HelpFormatter();
+ formatter.setWidth(120);
formatter.printHelp("DataMigrationRunner", options);
throw new Exception("Error parsing command line arguments");
}
@@ -206,22 +225,33 @@ public class DataMigratorRunner {
private static void setLogLevel(Level level) {
Logger root = Logger.getRootLogger();
+ root.setLevel(level);
Logger cassandraLogging = root.getLoggerRepository().getLogger("log4j.logger.org.apache.cassandra.cql.jdbc");
cassandraLogging.setLevel(level);
+ Logger cassandraDriverLogging = root.getLoggerRepository().getLogger("com.datastax.driver");
+ cassandraDriverLogging.setLevel(level);
+
Logger hibernateLogging = root.getLoggerRepository().getLogger("org.hibernate");
hibernateLogging.setLevel(level);
+
+ Logger migratorLogging = root.getLoggerRepository().getLogger("org.rhq");
+ if (Level.DEBUG.equals(level)) {
+ migratorLogging.setLevel(Level.INFO);
+ } else {
+ migratorLogging.setLevel(level);
+ }
}
private void run() throws Exception {
- log.info("Creating Entity Manager");
+ log.debug("Creating Entity Manager");
EntityManager entityManager = this.createEntityManager();
- log.info("Done creating Entity Manager");
+ log.debug("Done creating Entity Manager");
- log.info("Creating Cassandra session");
+ log.debug("Creating Cassandra session");
Session session = this.createCassandraSession();
- log.info("Done creating Cassandra session");
+ log.debug("Done creating Cassandra session");
DataMigrator migrator = new DataMigrator(entityManager, session);
@@ -237,7 +267,8 @@ public class DataMigratorRunner {
migrator.run1DAggregateDataMigration(!(Boolean) configuration.get(disable1DOption));
long estimate = migrator.estimate();
- log.info("The migration process will take approximately: " + TimeUnit.MILLISECONDS.toMinutes(estimate)
+ System.out.println("The migration process will take approximately: "
+ + TimeUnit.MILLISECONDS.toMinutes(estimate)
+ " minutes (or " + estimate + " milliseconds)");
if (!(Boolean) configuration.get(estimateOnlyOption)) {
migrator.migrateData();
@@ -268,10 +299,18 @@ public class DataMigratorRunner {
properties.put("hibernate.connection.username", (String) configuration.get(sqlUserOption));
properties.put("hibernate.connection.password", (String) configuration.get(sqlPasswordOption));
- properties.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect");
- properties.put("hibernate.driver_class", "org.postgresql.Driver");
- properties.put("hibernate.connection.url", "jdbc:postgresql://" + (String) configuration.get(sqlHostOption)
- + ":" + (String) configuration.get(sqlPortOption) + "/" + (String) configuration.get(sqlDBOption));
+ if ("oracle".equals(configuration.get(sqlServerType))) {
+ properties.put("hibernate.dialect", "org.hibernate.dialect.Oracle10gDialect");
+ properties.put("hibernate.driver_class", "oracle.jdbc.driver.OracleDriver");
+ properties.put("hibernate.connection.url", "jdbc:oracle:thin:@" + (String) configuration.get(sqlHostOption)
+ + ":" + (String) configuration.get(sqlPortOption) + ":" + (String) configuration.get(sqlDBOption));
+ properties.put("hibernate.default_schema", (String) configuration.get(sqlDBOption));
+ }else{
+ properties.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect");
+ properties.put("hibernate.driver_class", "org.postgresql.Driver");
+ properties.put("hibernate.connection.url", "jdbc:postgresql://" + (String) configuration.get(sqlHostOption)
+ + ":" + (String) configuration.get(sqlPortOption) + "/" + (String) configuration.get(sqlDBOption));
+ }
Ejb3Configuration configuration = new Ejb3Configuration();
configuration.setProperties(properties);
@@ -295,7 +334,8 @@ public class DataMigratorRunner {
}
if (commandLine.hasOption(cassandraCompressionOption.getLongOpt())) {
- configuration.put(cassandraCompressionOption, true);
+ boolean value = parseBooleanOption(commandLine.getOptionValue(disableRawOption.getLongOpt()), true);
+ configuration.put(cassandraCompressionOption, value);
}
}
@@ -329,41 +369,65 @@ public class DataMigratorRunner {
if (commandLine.hasOption(sqlDBOption.getLongOpt())) {
configuration.put(sqlDBOption, commandLine.getOptionValue(sqlDBOption.getLongOpt()));
}
+
+ if (commandLine.hasOption(sqlServerType.getLongOpt())) {
+ if ("oracle".equals(commandLine.getOptionValue(sqlServerType.getLongOpt()))) {
+ configuration.put(sqlServerType, "oracle");
+ } else {
+ configuration.put(sqlServerType, "postgres");
+ }
+ } else if (commandLine.hasOption(sqlPostgresServer.getLongOpt())) {
+ configuration.put(sqlServerType, "postgres");
+ } else if (commandLine.hasOption(sqlOracleServer.getLongOpt())) {
+ configuration.put(sqlServerType, "oracle");
+ }
}
private void parseMigrationOptionsWithDefault(CommandLine commandLine) {
+ boolean value;
+
if (commandLine.hasOption(disableRawOption.getLongOpt())) {
- configuration.put(disableRawOption, true);
+ value = parseBooleanOption(commandLine.getOptionValue(disableRawOption.getLongOpt()), true);
+ configuration.put(disableRawOption, value);
}
if (commandLine.hasOption(disable1HOption.getLongOpt())) {
- configuration.put(disable1HOption, true);
+ value = parseBooleanOption(commandLine.getOptionValue(disable1HOption.getLongOpt()), true);
+ configuration.put(disable1HOption, value);
}
if (commandLine.hasOption(disable6HOption.getLongOpt())) {
- configuration.put(disable6HOption, true);
+ value = parseBooleanOption(commandLine.getOptionValue(disable6HOption.getLongOpt()), true);
+ configuration.put(disable6HOption, value);
}
if (commandLine.hasOption(disable1DOption.getLongOpt())) {
- configuration.put(disable1DOption, true);
+ value = parseBooleanOption(commandLine.getOptionValue(disable1DOption.getLongOpt()), true);
+ configuration.put(disable1DOption, value);
}
if (commandLine.hasOption(preserveDataOption.getLongOpt())) {
- configuration.put(preserveDataOption, true);
+ value = parseBooleanOption(commandLine.getOptionValue(preserveDataOption.getLongOpt()), true);
+ configuration.put(preserveDataOption, value);
} else if (commandLine.hasOption(deleteDataOption.getLongOpt())) {
- configuration.put(preserveDataOption, false);
+ value = parseBooleanOption(commandLine.getOptionValue(deleteDataOption.getLongOpt()), true);
+ configuration.put(preserveDataOption, value);
}
if (commandLine.hasOption(estimateOnlyOption.getLongOpt())) {
+ value = parseBooleanOption(commandLine.getOptionValue(estimateOnlyOption.getLongOpt()), true);
configuration.put(estimateOnlyOption, true);
}
}
+ /**
+ * Add default configuration options to the configuration store.
+ */
private void loadDefaultConfiguration() {
//default Cassandra configuration
configuration.put(cassandraUserOption, "rhqadmin");
configuration.put(cassandraPasswordOption, "rhqadmin");
- configuration.put(cassandraHostsOption, new String[] { "127.0.0.1", "127.0.0.2" });
+ configuration.put(cassandraHostsOption, new String[] { "127.0.0.1" });
configuration.put(cassandraCompressionOption, false);
//default SQL configuration
@@ -372,6 +436,7 @@ public class DataMigratorRunner {
configuration.put(sqlHostOption, "localhost");
configuration.put(sqlPortOption, "5432");
configuration.put(sqlDBOption, "rhq_db");
+ configuration.put(sqlServerType, "postgres");
//default runner options
configuration.put(disableRawOption, false);
@@ -382,6 +447,12 @@ public class DataMigratorRunner {
configuration.put(estimateOnlyOption, false);
}
+ /**
+ * Load the configuration options from file and overlay them on top of the default
+ * options.
+ *
+ * @param file config file
+ */
private void loadConfigFile(String file) {
try {
File configFile = new File(file);
@@ -399,14 +470,30 @@ public class DataMigratorRunner {
Object optionValue;
if ((optionValue = configProperties.get(option.getLongOpt())) != null) {
- log.info("Configuration option loaded: " + option.getLongOpt() + " (" + option.getType() + ") -> "
+ log.debug("Configuration option loaded: " + option.getLongOpt() + " (" + option.getType() + ") -> "
+ optionValue);
if (option.equals(cassandraHostsOption)) {
String[] cassandraHosts = parseCassandraHosts(optionValue.toString());
configuration.put(option, cassandraHosts);
+ } else if (option.equals(sqlServerType)) {
+ if ("oracle".equals(optionValue)) {
+ configuration.put(option, "oracle");
+ } else {
+ configuration.put(option, "postgres");
+ }
+ } else if (option.equals(sqlPostgresServer)) {
+ boolean value = parseBooleanOption(optionValue.toString(), true);
+ if (value == true) {
+ configuration.put(sqlServerType, "postgres");
+ }
+ } else if (option.equals(sqlOracleServer)) {
+ boolean value = parseBooleanOption(optionValue.toString(), true);
+ if (value == true) {
+ configuration.put(sqlServerType, "oracle");
+ }
} else if (option.getType().equals(Boolean.class)) {
- configuration.put(option, Boolean.parseBoolean(optionValue.toString()));
+ configuration.put(option, parseBooleanOption(optionValue.toString(), true));
} else {
configuration.put(option, optionValue.toString());
}
@@ -420,6 +507,14 @@ public class DataMigratorRunner {
log.error(configuration.toString());
}
+ private boolean parseBooleanOption(Object value, boolean defaultValue) {
+ try {
+ return Boolean.parseBoolean(value.toString());
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
@SuppressWarnings("serial")
private class HelpRequestedException extends Exception {
public HelpRequestedException() {
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a746f75cfc0e0dcd19932c7eb3f2bb2cb9d60458
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Fri Apr 5 15:14:08 2013 -0700
[BZ 949103] - On inventory detail summary metrics charts N+2 clicks of Set button stops firing.
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 7d6cfdd..0dfaf8e 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
@@ -78,6 +78,9 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
private int resourceId = -1;
+ private ChartViewWindow window;
+ private D3GraphListView graphView;
+
public ResourceMetricsPortlet(int resourceId) {
super(EntityContext.forResource(-1));
this.resourceId = resourceId;
@@ -273,9 +276,9 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
link.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
- ChartViewWindow window = new ChartViewWindow(title);
+ window = new ChartViewWindow(title);
- final D3GraphListView graphView = D3GraphListView
+ graphView = D3GraphListView
.createSingleGraph(resourceComposite.getResource(),
md.getId(), true);
graphView.addSetButtonClickHandler(new ClickHandler() {
1
0
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 31 +-
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinitionContext.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 17 -
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java | 37 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ResourceAuthorizedTableAction.java | 19 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java | 142 ++++++++--
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java | 8
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java | 10
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 29 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java | 127 ++++++--
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java | 16 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java | 4
26 files changed, 363 insertions(+), 132 deletions(-)
New commits:
commit 88d0b566188d558842943f3ce7bd49a749054df9
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Apr 5 16:43:20 2013 -0400
Bug 949082
RFE: Allow alert ack/delete from recent alerts portlet and reporting view
Based on contribution from mark Addy (thanks!)
Change the "Delete" and "Acknowledge" alert buttons in the AlertHistoryView
to use "ResourceAuthorizedTableAction" rather than "AbstractTableAction".
This generates additional calls to the backend to check permissions on
row selections (for non-admins). But, it should likely not be noticeable.
I made one small optimization in ResourceAuthorizedTableAction. If
constructed with a requiredPermission=null it will ignore the authz check.
Using that we can make it perform like a standard table action. So, if in
fact the user is an admin or otherwise has write access then it should
act as before. I took away the isEnabled() overrides in the original
patch in favor of this approach. The overrides had a small issue because
they did not consider "enablement". Meaning the buttons would be active
(for admins) even if nothing was selected.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
index 9f28987..4c4c41f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
@@ -21,10 +21,13 @@ package org.rhq.enterprise.gui.coregui.client.alert;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.LinkedHashMap;
+import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.data.Record;
import com.smartgwt.client.data.ResultSet;
import com.smartgwt.client.data.SortSpecifier;
import com.smartgwt.client.types.SortDirection;
@@ -36,6 +39,7 @@ import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.alert.AlertPriority;
+import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
@@ -43,7 +47,8 @@ import org.rhq.enterprise.gui.coregui.client.IconEnum;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.components.form.DateFilterItem;
import org.rhq.enterprise.gui.coregui.client.components.form.EnumSelectItem;
-import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
+import org.rhq.enterprise.gui.coregui.client.components.table.RecordExtractor;
+import org.rhq.enterprise.gui.coregui.client.components.table.ResourceAuthorizedTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
@@ -162,17 +167,35 @@ public class AlertHistoryView extends TableSection<AlertDataSource> implements H
}
protected void setupTableInteractions(final boolean hasWriteAccess) {
- TableActionEnablement singleTargetEnablement = hasWriteAccess ? TableActionEnablement.ANY
- : TableActionEnablement.NEVER;
- addTableAction(MSG.common_button_delete(), MSG.view_alerts_delete_confirm(), new AbstractTableAction(
- singleTargetEnablement) {
+ addTableAction(MSG.common_button_delete(), MSG.view_alerts_delete_confirm(), new ResourceAuthorizedTableAction(
+ AlertHistoryView.this, TableActionEnablement.ANY, (hasWriteAccess ? null : Permission.MANAGE_ALERTS),
+ new RecordExtractor<Integer>() {
+ public Collection<Integer> extract(Record[] records) {
+ List<Integer> result = new ArrayList<Integer>(records.length);
+ for (Record record : records) {
+ result.add(record.getAttributeAsInt("resourceId"));
+ }
+ return result;
+ }
+ }) {
+
public void executeAction(ListGridRecord[] selection, Object actionValue) {
delete(selection);
}
});
- addTableAction(MSG.common_button_ack(), MSG.view_alerts_ack_confirm(), new AbstractTableAction(
- singleTargetEnablement) {
+ addTableAction(MSG.common_button_ack(), MSG.view_alerts_ack_confirm(), new ResourceAuthorizedTableAction(
+ AlertHistoryView.this, TableActionEnablement.ANY, (hasWriteAccess ? null : Permission.MANAGE_ALERTS),
+ new RecordExtractor<Integer>() {
+ public Collection<Integer> extract(Record[] records) {
+ List<Integer> result = new ArrayList<Integer>(records.length);
+ for (Record record : records) {
+ result.add(record.getAttributeAsInt("resourceId"));
+ }
+ return result;
+ }
+ }) {
+
public void executeAction(ListGridRecord[] selection, Object actionValue) {
acknowledge(selection);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ResourceAuthorizedTableAction.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ResourceAuthorizedTableAction.java
index 3050ecb..28df326 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ResourceAuthorizedTableAction.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ResourceAuthorizedTableAction.java
@@ -48,11 +48,23 @@ public abstract class ResourceAuthorizedTableAction extends AbstractTableAction
private Boolean isAuthorized;
+ /**
+ * @param table
+ * @param enablement
+ * @param requiredPermission if null no check is performed and authorization always passes
+ * @param extractor
+ */
protected ResourceAuthorizedTableAction(Table<?> table, Permission requiredPermission,
RecordExtractor<Integer> extractor) {
this(table, TableActionEnablement.ALWAYS, requiredPermission, extractor);
}
+ /**
+ * @param table
+ * @param enablement
+ * @param requiredPermission if null no check is performed and authorization always passes
+ * @param extractor
+ */
protected ResourceAuthorizedTableAction(Table<?> table, TableActionEnablement enablement,
Permission requiredPermission, RecordExtractor<Integer> extractor) {
super(enablement);
@@ -61,7 +73,7 @@ public abstract class ResourceAuthorizedTableAction extends AbstractTableAction
this.requiredPermission = requiredPermission;
this.extractor = extractor;
- if (Target.RESOURCE != this.requiredPermission.getTarget()) {
+ if (null != this.requiredPermission && Target.RESOURCE != this.requiredPermission.getTarget()) {
throw new IllegalArgumentException("Does not support Global permission");
}
}
@@ -73,6 +85,11 @@ public abstract class ResourceAuthorizedTableAction extends AbstractTableAction
return false;
}
+ // if there is no required permission then no check is performed
+ if (null == requiredPermission) {
+ return true;
+ }
+
final Collection<Integer> selectedResourceIds = extractor.extract(selection);
boolean isNewSelection = !selectedResourceIds.equals(this.authorizedResourceIds);
commit dc97319555c5760bfc97662c2d2108c58e03269f
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Apr 5 16:14:33 2013 -0400
Bug 846451, 949048, 949062
* Users with just Resource Group access cannot access alerts on their Groups
* Failure adding member to group with alert definition
* Removing member from group with group alert definition removes all instances of the alert definition
Bug 846451
Change AlertDefinition.resourceGroup to AlertDefinition.group. This brings
the name into the convention we use everywhere else, and that the GriteriaGenerator
expects for group FK relations.
- Update all relevant queries and AlertDefinitionCriteria
- For back compat, keep existing setter/getter and deprecate. Refactor all
internal code to use the new setter/getter.
Bugs 949048, 949062
The handling of group member add/remove was berry berry broken. Various changes:
- Prevent the passing of Hibernate proxies across sessions when adding group
alert defs to new members.
- Fix logic around removing group alert defs when removing group members.
- Add new filterGroupAlertDefinitionGroupId and filterReadOnly to AlertDefinitionCriteria
- Rename alertDefManager.createAlertDefinition to alertDefManager.createAlertDefinitionInNewTransaction to
make it very clear what happens when you make this SLSB call. This is the
convention.
- Add some more integration tests and fix up some stuff in AlertDefinitionManagerBeanTest
- We had two SLSB methods named removeGroupAlertDefinitions. Rename the proper one
to removeGroupMemberAlertDefinitions and completely fix it as it did the
wrong thing (likely due to the wrong name).
- Deprecate a portal-war only Local SLSB method.
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 deeab01..b7d01cd 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
@@ -103,7 +103,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
@NamedQuery(name = AlertDefinition.QUERY_FIND_OPTION_ITEMS_BY_GROUP, query = "" //
+ " SELECT new org.rhq.core.domain.common.composite.IntegerOptionItem(ad.id, ad.name) " //
+ " FROM AlertDefinition ad " //
- + " WHERE ad.resourceGroup.id = :groupId " //
+ + " WHERE ad.group.id = :groupId " //
+ " AND ad.deleted = false"), //
@NamedQuery(name = AlertDefinition.QUERY_FIND_BY_RESOURCE, query = "" //
+ "SELECT a " //
@@ -118,7 +118,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
@NamedQuery(name = AlertDefinition.QUERY_FIND_BY_RESOURCE_GROUP, query = "" //
+ "SELECT a " //
+ " FROM AlertDefinition a " //
- + " WHERE a.resourceGroup.id = :groupId " //
+ + " WHERE a.group.id = :groupId " //
+ " AND a.deleted = false"),
@NamedQuery(name = AlertDefinition.QUERY_DELETE_BY_RESOURCES, query = "" //
+ "DELETE FROM AlertDefinition ad " //
@@ -195,7 +195,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
+ "SELECT ad.id " //
+ " FROM AlertDefinition ad " //
+ " WHERE ad.id = :alertDefinitionId " //
- + " AND ad.resourceGroup IS NOT NULL "), //
+ + " AND ad.group IS NOT NULL "), //
@NamedQuery(name = AlertDefinition.QUERY_IS_RESOURCE_ALERT_DEFINITION, query = "" //
+ "SELECT ad.id " //
+ " FROM AlertDefinition ad " //
@@ -317,7 +317,7 @@ public class AlertDefinition implements Serializable {
@JoinColumn(name = "RESOURCE_GROUP_ID", nullable = true)
@ManyToOne
@XmlTransient
- private ResourceGroup resourceGroup;
+ private ResourceGroup group;
@Column(name = "ENABLED", nullable = false)
private boolean enabled;
@@ -533,17 +533,26 @@ public class AlertDefinition implements Serializable {
}
}
+ /**
+ * @deprecated use getGroup()
+ */
public ResourceGroup getResourceGroup() {
- return resourceGroup;
+ return group;
}
+ /**
+ * @deprecated use setGroup(ResourceGroup)
+ */
public void setResourceGroup(ResourceGroup resourceGroup) {
- this.resourceGroup = resourceGroup;
- /*
- if (this.resourceGroup != null) {
- this.resourceGroup.getAlertDefinitions().add(this);
- }
- */
+ this.group = resourceGroup;
+ }
+
+ public ResourceGroup getGroup() {
+ return group;
+ }
+
+ public void setGroup(ResourceGroup group) {
+ this.group = group;
}
public ResourceType getResourceType() {
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinitionContext.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinitionContext.java
index 05e688b..a18f831 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinitionContext.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinitionContext.java
@@ -33,7 +33,7 @@ public enum AlertDefinitionContext {
return Type;
} else if (definition.getResource() != null) {
return Resource;
- } else if (definition.getResourceGroup() != null) {
+ } else if (definition.getGroup() != null) {
return Group;
} else {
throw new IllegalArgumentException("Unknown AlertDefinitionContext: " + definition);
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 6ddb395..20d1efa 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
@@ -54,7 +54,9 @@ public class AlertDefinitionCriteria extends Criteria {
private String filterAlertTemplateResourceTypeName; // requires overrides
private List<Integer> filterResourceIds; // requires overrides
private List<Integer> filterResourceGroupIds; // requires overrides
- private Integer filterGroupAlertDefinitionId;
+ private Integer filterGroupAlertDefinitionId; // requires overrides
+ private Integer filterGroupAlertDefinitionGroupId; // requires overrides
+ private Boolean filterReadOnly;
private Boolean filterEnabled;
private Boolean filterDeleted = false; // find enabled definitions by default
private NonBindingOverrideFilter filterResourceOnly; // requires overrides - finds only those associated with a resource
@@ -78,8 +80,9 @@ public class AlertDefinitionCriteria extends Criteria {
filterOverrides.put("alertTemplateResourceTypeId", "resourceType.id = ?");
filterOverrides.put("alertTemplateResourceTypeName", "resourceType.name like ?");
filterOverrides.put("resourceIds", "resource.id IN ( ? )");
- filterOverrides.put("resourceGroupIds", "resourceGroup.id IN ( ? )");
+ filterOverrides.put("resourceGroupIds", "group.id IN ( ? )");
filterOverrides.put("groupAlertDefinitionId", "groupAlertDefinition.id = ?");
+ filterOverrides.put("groupAlertDefinitionGroupId", "groupAlertDefinition.group.id = ?");
filterOverrides.put("resourceOnly", "resource IS NOT NULL");
filterOverrides.put("notificationSenderNames", "id IN ("
+ "SELECT notif.alertDefinition.id FROM AlertNotification notif " + "WHERE notif.senderName IN ( ? ))");
@@ -152,7 +155,15 @@ public class AlertDefinitionCriteria extends Criteria {
public void addFilterGroupAlertDefinitionId(Integer groupAlertDefinitionId) {
this.filterGroupAlertDefinitionId = groupAlertDefinitionId;
}
-
+
+ public void addFilterGroupAlertDefinitionGroupId(Integer groupAlertDefinitionGroupId) {
+ this.filterGroupAlertDefinitionGroupId = groupAlertDefinitionGroupId;
+ }
+
+ public void addFilterReadOnly(Boolean readOnly) {
+ this.filterReadOnly = readOnly;
+ }
+
public void fetchAlerts(boolean fetchAlerts) {
this.fetchAlerts = fetchAlerts;
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java
index eda9d9f..951975e 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java
@@ -522,7 +522,7 @@ public class ResourceGroup extends Group {
private boolean visible = true;
// bulk delete @OneToMany(mappedBy = "resource", cascade = { CascadeType.ALL })
- @OneToMany(mappedBy = "resourceGroup", cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+ @OneToMany(mappedBy = "group", cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
private Set<AlertDefinition> alertDefinitions = new LinkedHashSet<AlertDefinition>();
@ManyToMany(mappedBy = "resourceGroups", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
index 5fc0ea8..534fc74 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
@@ -97,7 +97,7 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView {
SingleAlertDefinitionView view = super.getDetailsView(id);
if (id == 0) {
// when creating a new alert def, make sure to set this in the new alert def
- view.getAlertDefinition().setResourceGroup(group);
+ view.getAlertDefinition().setGroup(group);
}
return view;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java
index ef67483..a6d23ec 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java
@@ -252,8 +252,8 @@ public class NewNotificationEditor extends DynamicForm {
Resource res = null;
if (alertDefinition.getResourceType() != null) {
rt = alertDefinition.getResourceType();
- } else if (alertDefinition.getResourceGroup() != null) {
- rt = alertDefinition.getResourceGroup().getResourceType();
+ } else if (alertDefinition.getGroup() != null) {
+ rt = alertDefinition.getGroup().getResourceType();
} else {
res = alertDefinition.getResource();
rt = res.getResourceType();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java
index c6a4d3e..b322d5c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java
@@ -99,7 +99,7 @@ public class ResourceAlertDefinitionsDataSource extends AbstractAlertDefinitions
this.resource.getResourceType().getId()) + "/" + parentId);
record.setLinkText(MSG.view_alert_definition_for_type());
} else {
- record.setAttribute(FIELD_PARENT, "#ResourceGroup/" + groupAlertDefinition.getResourceGroup().getId()
+ record.setAttribute(FIELD_PARENT, "#ResourceGroup/" + groupAlertDefinition.getGroup().getId()
+ "/Alerts/Definitions/" + groupAlertDefinition.getId());
record.setLinkText(MSG.view_alert_definition_for_group());
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
index a812334..84f37ba 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
@@ -247,9 +247,8 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D
CoreGUI.goToView(LinkManager.getSubsystemAlertDefinitionLink(resourceId, alertDefId));
} else if (alertDef.getGroupAlertDefinition() != null) {
AlertDefinition groupAlertDef = alertDef.getGroupAlertDefinition();
- CoreGUI.goToView(LinkManager.getEntityTabLink(
- EntityContext.forGroup(groupAlertDef.getResourceGroup()), "Alert", "Definitions")
- + "/" + groupAlertDef.getId());
+ CoreGUI.goToView(LinkManager.getEntityTabLink(EntityContext.forGroup(groupAlertDef.getGroup()),
+ "Alert", "Definitions") + "/" + groupAlertDef.getId());
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java
index 74c4d60..181eef5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java
@@ -66,7 +66,7 @@ public class AlertDefinitionGWTServiceImpl extends AbstractGWTServiceImpl implem
@Override
public int createAlertDefinition(AlertDefinition alertDefinition, Integer resourceId) throws RuntimeException {
try {
- int results = alertDefManager.createAlertDefinition(getSessionSubject(), alertDefinition, resourceId, true);
+ int results = alertDefManager.createAlertDefinitionInNewTransaction(getSessionSubject(), alertDefinition, resourceId, true);
return results;
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java
index 727577e..944aab3 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java
@@ -98,7 +98,7 @@ public final class AlertDefUtil {
if (alertDefinitionManager.isTemplate(alertDefinitionId)) {
resourceTypeId = cond.getAlertDefinition().getResourceType().getId();
} else if (alertDefinitionManager.isGroupAlertDefinition(alertDefinitionId)) {
- resourceTypeId = cond.getAlertDefinition().getResourceGroup().getResourceType().getId();
+ resourceTypeId = cond.getAlertDefinition().getGroup().getResourceType().getId();
} else {
resourceTypeId = cond.getAlertDefinition().getResource().getResourceType().getId();
}
@@ -265,7 +265,7 @@ public final class AlertDefUtil {
if (context == AlertDefinitionContext.Type) {
RequestUtils.setResourceType(request, alertDefinition.getResourceType());
} else if (context == AlertDefinitionContext.Group) {
- RequestUtils.setResourceGroup(request, alertDefinition.getResourceGroup());
+ RequestUtils.setResourceGroup(request, alertDefinition.getGroup());
} else {
RequestUtils.setResource(request, alertDefinition.getResource());
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java
index 1db7d05..4ade28d 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java
@@ -92,7 +92,7 @@ public class NewDefinitionAction extends BaseAction {
alertDefinitionId = alertTemplateManager.createAlertTemplate(subject, alertDef, defForm.getType());
} else if (context == FormContext.Resource) {
AlertDefinitionManagerLocal alertDefinitionManager = LookupUtil.getAlertDefinitionManager();
- alertDefinitionId = alertDefinitionManager.createAlertDefinition(subject, alertDef, defForm.getId(), true);
+ alertDefinitionId = alertDefinitionManager.createAlertDefinitionInNewTransaction(subject, alertDef, defForm.getId(), true);
} else if (context == FormContext.Group) {
GroupAlertDefinitionManagerLocal groupAlertDefinitionManager = LookupUtil
.getGroupAlertDefinitionManager();
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java
index 588f04b..5e9620a 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBeanTest.java
@@ -22,6 +22,7 @@ package org.rhq.enterprise.server.alert;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,6 +35,7 @@ import org.rhq.core.domain.alert.BooleanExpression;
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.criteria.AlertDefinitionCriteria;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.ResourceGroup;
@@ -55,6 +57,12 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
private static final Log LOG = LogFactory.getLog(AlertDefinitionManagerBeanTest.class);
+ final private String prefix = this.getClass().getSimpleName() + "_";
+ final private String subjectName = prefix + "subject";
+ final private String roleName = prefix + "role";
+ final private String groupName = prefix + "group";
+ final private String resourceName = prefix + "resource";
+
private AlertDefinitionManagerLocal alertDefinitionManager;
private ResourceGroupManagerLocal resourceGroupManager;
@@ -79,20 +87,20 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
testData = executeInTransaction(false, new TransactionCallbackReturnable<TestData>() {
@Override
public TestData execute() throws Exception {
+
TestData newTestData = new TestData();
- Subject subject = SessionTestHelper.createNewSubject(em, "fake subject");
+ Subject subject = SessionTestHelper.createNewSubject(em, subjectName);
newTestData.setSubject(subject);
- Role role = SessionTestHelper.createNewRoleForSubject(em, subject, "fake role",
- Permission.MANAGE_ALERTS);
+ Role role = SessionTestHelper.createNewRoleForSubject(em, subject, roleName, Permission.MANAGE_ALERTS);
newTestData.setRole(role);
ResourceType resourceType = SessionTestHelper.createNewResourceType(em);
newTestData.setResourceType(resourceType);
- ResourceGroup resourceGroup = new ResourceGroup("fake group", resourceType);
+ ResourceGroup resourceGroup = new ResourceGroup(groupName, resourceType);
resourceGroup = resourceGroupManager.createPrivateResourceGroup(subject, resourceGroup);
newTestData.setResourceGroup(resourceGroup);
roleManager.setAssignedResourceGroups(subjectManager.getOverlord(), role.getId(),
new int[] { resourceGroup.getId() });
- Resource resource = SessionTestHelper.createNewResourceForGroup(em, resourceGroup, "fake resource");
+ Resource resource = SessionTestHelper.createNewResourceForGroup(em, resourceGroup, resourceName);
newTestData.setResource(resource);
return newTestData;
}
@@ -110,14 +118,19 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
private void deleteTestData() throws Exception {
if (testData != null) {
+ // use the SLSB here, not just EM
+ resourceGroupManager.deleteResourceGroup(subjectManager.getOverlord(), testData.getResourceGroup().getId());
+
for (Integer alertDefinitionId : testData.getAlertDefinitionIds()) {
removeEntity(AlertDefinition.class, alertDefinitionId);
}
- removeEntity(ResourceGroup.class, testData.getResourceGroup().getId());
+
removeEntity(Resource.class, testData.getResource().getId());
removeEntity(ResourceType.class, testData.getResourceType().getId());
- removeEntity(Subject.class, testData.getSubject().getId());
- removeEntity(Role.class, testData.getRole().getId());
+
+ subjectManager.deleteSubjects(subjectManager.getOverlord(), new int[] { testData.getSubject().getId() });
+ roleManager.deleteRoles(subjectManager.getOverlord(), new int[] { testData.getRole().getId() });
+
testData = null;
}
}
@@ -132,6 +145,7 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
ResourceTreeHelper.deleteResource(em, (Resource) object);
} else {
em.remove(object);
+ em.flush();
}
}
});
@@ -147,7 +161,8 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
public void execute() throws Exception {
List<Integer> alertDefinitionIds = new LinkedList<Integer>();
for (int i = 0; i < 50; i++) {
- alertDefinitionIds.add(createAlertDefinitionAndGetId("fake alertdef-" + String.valueOf(i), false));
+ alertDefinitionIds.add(createAlertDefinitionAndGetId(prefix + "alertdef_" + String.valueOf(i),
+ false));
}
List<Integer> alertDefinitionToEnableIds = alertDefinitionIds.subList(12, 37);
int enabledCount = alertDefinitionManager.enableAlertDefinitions(testData.getSubject(),
@@ -164,7 +179,8 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
public void execute() throws Exception {
List<Integer> alertDefinitionIds = new LinkedList<Integer>();
for (int i = 0; i < 50; i++) {
- alertDefinitionIds.add(createAlertDefinitionAndGetId("fake alertdef-" + String.valueOf(i), true));
+ alertDefinitionIds
+ .add(createAlertDefinitionAndGetId(prefix + "alertdef_" + String.valueOf(i), true));
}
List<Integer> alertDefinitionToDisableIds = alertDefinitionIds.subList(17, 48);
int disabledCount = alertDefinitionManager.disableAlertDefinitions(testData.getSubject(),
@@ -179,8 +195,8 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
executeInTransaction(new TransactionCallback() {
@Override
public void execute() throws Exception {
- int resourceAlertDefinitionId = createAlertDefinitionAndGetId("fake resource alertdef", true);
- int groupAlertDefinitionId = createGroupAlertDefinitionAndGetId("fake group alertdef");
+ int resourceAlertDefinitionId = createAlertDefinitionAndGetId(prefix + "resource_Alertdef", true);
+ int groupAlertDefinitionId = createGroupAlertDefinitionAndGetId(prefix + "group_Alertdef");
assertTrue("Failed to detect a group alert definition",
alertDefinitionManager.isGroupAlertDefinition(groupAlertDefinitionId));
assertFalse("Should not have detected a group alert definition",
@@ -193,6 +209,98 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
});
}
+ @Test
+ void testBug846451() {
+ executeInTransaction(new TransactionCallback() {
+ @Override
+ public void execute() throws Exception {
+ String name = prefix + "group_Alertdef";
+ int groupAlertDefinitionId = createGroupAlertDefinitionAndGetId(name);
+
+ AlertDefinitionCriteria criteria = new AlertDefinitionCriteria();
+ criteria.addFilterResourceGroupIds(testData.getResourceGroup().getId());
+
+ // tests the reported bug
+ List<AlertDefinition> result = alertDefinitionManager.findAlertDefinitionsByCriteria(
+ testData.getSubject(), criteria);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(name, result.get(0).getName());
+ }
+ });
+ }
+
+ @Test
+ void testAddRemoveGroupMembers() throws Exception {
+
+ Resource resource2 = null;
+ Resource resource3 = null;
+
+ try {
+
+ // creating alert definitions is performed in a new transaction. So, any involved entities must already be
+ // committed. Commit the additional test entities here. This stuff will get cleaned up in afterMethod
+ startTransaction();
+
+ String name = prefix + "group_Alertdef";
+ int groupAlertDefinitionId = createGroupAlertDefinitionAndGetId(name);
+
+ String resource2Name = resourceName + "_2";
+ String resource3Name = resourceName + "_3";
+ resource2 = SessionTestHelper.createNewResource(em, resource2Name, testData.getResourceType());
+ resource3 = SessionTestHelper.createNewResource(em, resource3Name, testData.getResourceType());
+
+ commitTransaction();
+
+ // add new members and ensure the resource-level alert defs gets applied. Make sure to use the SLSB to add it
+ LookupUtil.getResourceGroupManager().addResourcesToGroup(subjectManager.getOverlord(),
+ testData.getResourceGroup().getId(), new int[] { resource2.getId() });
+ LookupUtil.getResourceGroupManager().addResourcesToGroup(subjectManager.getOverlord(),
+ testData.getResourceGroup().getId(), new int[] { resource3.getId() });
+
+ int[] ids = new int[] { resource2.getId(), resource3.getId() };
+ AlertDefinitionCriteria criteria = new AlertDefinitionCriteria();
+ criteria.addFilterResourceIds(ids[0], ids[1]);
+
+ List<AlertDefinition> result = alertDefinitionManager.findAlertDefinitionsByCriteria(testData.getSubject(),
+ criteria);
+ assertNotNull(result);
+ assertEquals(2, result.size());
+ assertEquals(name, result.get(0).getName());
+ assertEquals(name, result.get(1).getName());
+ assertTrue(result.get(0).getId() != result.get(1).getId());
+
+ // remove member and ensure the alert def gets removed
+ LookupUtil.getResourceGroupManager().removeResourcesFromGroup(subjectManager.getOverlord(),
+ testData.getResourceGroup().getId(), ids);
+
+ result = alertDefinitionManager.findAlertDefinitionsByCriteria(testData.getSubject(), criteria);
+ assertNotNull(result);
+ assertEquals(0, result.size());
+
+ } finally {
+ Resource[] resources = new Resource[] { resource2, resource3 };
+ try {
+ startTransaction();
+ for (Resource r : resources) {
+ if (null != r) {
+
+ r = em.find(Resource.class, r.getId());
+ Set<AlertDefinition> ads = r.getAlertDefinitions();
+ for (AlertDefinition ad : ads) {
+ em.remove(ad);
+ }
+ ResourceTreeHelper.deleteResource(em, r);
+ }
+ }
+ commitTransaction();
+
+ } catch (Exception e) {
+ rollbackTransaction();
+ }
+ }
+ }
+
private int createAlertDefinitionAndGetId(String name, boolean enabled) {
AlertDefinition alertDefinition = new AlertDefinition();
alertDefinition.setName(name);
@@ -201,8 +309,8 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
alertDefinition.setConditionExpression(BooleanExpression.ANY);
alertDefinition.setRecoveryId(0);
alertDefinition.setEnabled(enabled);
- int alertDefinitionId = alertDefinitionManager.createAlertDefinition(testData.getSubject(), alertDefinition,
- testData.getResource().getId(), true);
+ int alertDefinitionId = alertDefinitionManager.createAlertDefinitionInNewTransaction(testData.getSubject(),
+ alertDefinition, testData.getResource().getId(), true);
testData.getAlertDefinitionIds().add(alertDefinitionId);
return alertDefinitionId;
}
@@ -214,10 +322,10 @@ public class AlertDefinitionManagerBeanTest extends AbstractEJB3Test {
alertDefinition.setAlertDampening(new AlertDampening(AlertDampening.Category.NONE));
alertDefinition.setConditionExpression(BooleanExpression.ANY);
alertDefinition.setRecoveryId(0);
- alertDefinition.setResourceGroup(testData.getResourceGroup());
+ alertDefinition.setGroup(testData.getResourceGroup());
alertDefinition.setEnabled(true);
- int alertDefinitionId = alertDefinitionManager.createAlertDefinition(testData.getSubject(), alertDefinition,
- null, true);
+ int alertDefinitionId = alertDefinitionManager.createAlertDefinitionInNewTransaction(testData.getSubject(),
+ alertDefinition, null, true);
testData.getAlertDefinitionIds().add(alertDefinitionId);
return alertDefinitionId;
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java
index 69ffc44..fbbc86a 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java
@@ -205,7 +205,7 @@ public class AlertDefinitionWithComplexNotificationsTest extends AbstractEJB3Tes
templateAlertDefinition.setResourceType(resourceType);
groupAlertDefinition = createDefinitionForTest(universalName + " group", true);
- groupAlertDefinition.setResourceGroup(resourceGroup);
+ groupAlertDefinition.setGroup(resourceGroup);
resourceAlertDefinition = createDefinitionForTest(universalName + " resource", true);
resourceAlertDefinition.setResource(resources.iterator().next());
@@ -413,7 +413,7 @@ public class AlertDefinitionWithComplexNotificationsTest extends AbstractEJB3Tes
false);
def.setResource(resources.iterator().next());
- int id = adm.createAlertDefinition(subject, def, res.getId(), true);
+ int id = adm.createAlertDefinitionInNewTransaction(subject, def, res.getId(), true);
def.setId(id);
resourceLevelAlertDefinitionId = id;
@@ -432,7 +432,7 @@ public class AlertDefinitionWithComplexNotificationsTest extends AbstractEJB3Tes
AlertDefinition def = createDefinitionForTest("testCorrectSubjectPassedOnGroupLevelAlertDefinitionCreation",
false);
- def.setResourceGroup(resourceGroup);
+ def.setGroup(resourceGroup);
int id = gadm.createGroupAlertDefinitions(subject, def, resourceGroup.getId());
def.setId(id);
@@ -456,7 +456,7 @@ public class AlertDefinitionWithComplexNotificationsTest extends AbstractEJB3Tes
AlertDefinition def = createDefinitionForTest("testCorrectSubjectPassedOnTemplateLevelAlertDefinitionCreation",
false);
- def.setResourceGroup(resourceGroup);
+ def.setGroup(resourceGroup);
int id = atm.createAlertTemplate(subject, def, resourceType.getId());
def.setId(id);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
index 1eaea93..232171e 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
@@ -470,7 +470,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
+ int defId = alertDefManager.createAlertDefinitionInNewTransaction(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
@@ -504,7 +504,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
+ int defId = alertDefManager.createAlertDefinitionInNewTransaction(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
@@ -537,7 +537,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
+ int defId = alertDefManager.createAlertDefinitionInNewTransaction(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
@@ -570,7 +570,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
+ int defId = alertDefManager.createAlertDefinitionInNewTransaction(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
@@ -604,7 +604,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
+ int defId = alertDefManager.createAlertDefinitionInNewTransaction(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java
index 34f93f9..ebda2ef 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java
@@ -342,7 +342,7 @@ public class AvailabilityInsertPurgeTest extends AbstractEJB3PerformanceTest {
def.setPriority(AlertPriority.MEDIUM);
def.setAlertDampening(new AlertDampening(AlertDampening.Category.NONE));
def.setRecoveryId(0);
- alertDefinitionManager.createAlertDefinition(overlord, def, res.getId(), true);
+ alertDefinitionManager.createAlertDefinitionInNewTransaction(overlord, def, res.getId(), true);
for (int MULTI : ROUNDS) {
String round = String.format(ROUND__FORMAT, MULTI);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java
index 4b51224..10b5dbc 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java
@@ -192,16 +192,19 @@ public class SessionTestHelper {
return newGroup;
}
+ /** This uses only EM, it does not call the SLSB for adding resources to a group! */
public static Resource createNewResourceForGroup(EntityManager em, ResourceGroup group, String resourceName) {
ResourceType type = group.getResourceType();
return createNewResourceForGroup(em, group, resourceName, type, true);
}
+ /** This uses only EM, it does not call the SLSB for adding resources to a group! */
public static Resource createNewResourceForGroup(EntityManager em, ResourceGroup group, String resourceName,
ResourceType type, boolean doFlush) {
return createNewResourceForGroup(em, group, resourceName, type, AvailabilityType.UP, doFlush);
}
+ /** This uses only EM, it does not call the SLSB for adding resources to a group! */
public static Resource createNewResourceForGroup(EntityManager em, ResourceGroup group, String resourceName,
ResourceType type, AvailabilityType avail, boolean doFlush) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
index 7105d7f..d00a969 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
@@ -94,8 +94,8 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
private boolean checkViewPermission(Subject subject, AlertDefinition alertDefinition) {
if (alertDefinition.getResourceType() != null) { // an alert template
return authorizationManager.hasGlobalPermission(subject, Permission.MANAGE_SETTINGS);
- } else if (alertDefinition.getResourceGroup() != null) { // a groupAlertDefinition
- return authorizationManager.canViewGroup(subject, alertDefinition.getResourceGroup().getId());
+ } else if (alertDefinition.getGroup() != null) { // a groupAlertDefinition
+ return authorizationManager.canViewGroup(subject, alertDefinition.getGroup().getId());
} else { // an alert definition
return authorizationManager.canViewResource(subject, alertDefinition.getResource().getId());
}
@@ -112,9 +112,9 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
if (alertDefinition.getResourceType() != null) { // an alert template
return authorizationManager.hasGlobalPermission(subject, Permission.MANAGE_SETTINGS);
- } else if (alertDefinition.getResourceGroup() != null) { // a groupAlertDefinition
+ } else if (alertDefinition.getGroup() != null) { // a groupAlertDefinition
return authorizationManager.hasGroupPermission(subject, Permission.MANAGE_ALERTS, alertDefinition
- .getResourceGroup().getId());
+ .getGroup().getId());
} else { // an alert definition
return authorizationManager.hasResourcePermission(subject, Permission.MANAGE_ALERTS, alertDefinition
.getResource().getId());
@@ -207,7 +207,7 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
@Override
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
- public int createAlertDefinition(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean validateNotificationConfiguration)
+ public int createAlertDefinitionInNewTransaction(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean validateNotificationConfiguration)
throws InvalidAlertDefinitionException {
return createAlertDefinitionInternal(subject, alertDefinition, resourceId, true, validateNotificationConfiguration);
@@ -216,13 +216,13 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
private int createAlertDefinitionInternal(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean checkPerms, boolean validateNotificationConfiguration) throws InvalidAlertDefinitionException {
checkAlertDefinition(subject, null, alertDefinition, resourceId, validateNotificationConfiguration);
- // if this is an alert definition, set up the link to a resource
+ // if this is an resource alert definition, set up the link to a resource
if (resourceId != null) {
// don't attach an alertTemplate or groupAlertDefinition to any particular resource
// they should have already been attached to the resourceType or resourceGroup by the caller
- //Resource resource = LookupUtil.getResourceManager().getResourceById(user, resourceId);
// use proxy trick to subvert having to load the entire resource into memory
+ // Resource resource = LookupUtil.getResourceManager().getResourceById(user, resourceId);
alertDefinition.setResource(new Resource(resourceId));
}
@@ -232,10 +232,11 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to create alert templates for type ["
+ alertDefinition.getResourceType() + "]");
- } else if (alertDefinition.getResourceGroup() != null) {
+ } else if (alertDefinition.getGroup() != null) {
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to create alert definitions for group ["
- + alertDefinition.getResourceGroup() + "]");
+ + alertDefinition.getGroup()
+ + "]");
} else {
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to create alert definitions for resource ["
@@ -333,8 +334,8 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
notifyAlertConditionCacheManager(subject, "removeAlertDefinitions", alertDefinition,
AlertDefinitionEvent.DELETED);
}
- if (alertDefinition.getResourceGroup() != null) {
- alertDefinition.setResourceGroup(null); // break bonds so corresponding ResourceGroup can be purged
+ if (alertDefinition.getGroup() != null) {
+ alertDefinition.setGroup(null); // break bonds so corresponding ResourceGroup can be purged
}
}
}
@@ -439,7 +440,7 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
newAlertDefinition.setParentId(alertDefinition.getParentId());
newAlertDefinition.setResource(alertDefinition.getResource());
newAlertDefinition.setResourceType(alertDefinition.getResourceType());
- newAlertDefinition.setResourceGroup(alertDefinition.getResourceGroup());
+ newAlertDefinition.setGroup(alertDefinition.getGroup());
newAlertDefinition.setGroupAlertDefinition(alertDefinition.getGroupAlertDefinition());
entityManager.persist(newAlertDefinition);
@@ -498,10 +499,10 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to modify alert templates for type ["
+ oldAlertDefinition.getResourceType() + "]");
- } else if (oldAlertDefinition.getResourceGroup() != null) {
+ } else if (oldAlertDefinition.getGroup() != null) {
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to modify alert definitions for group ["
- + oldAlertDefinition.getResourceGroup() + "]");
+ + oldAlertDefinition.getGroup() + "]");
} else {
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to modify alert definitions for resource ["
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java
index 94b877c..5afa1f9 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java
@@ -63,11 +63,11 @@ public interface AlertDefinitionManagerLocal {
* @return the id of the newly persisted alert definition
* @throws InvalidAlertDefinitionException
*/
- int createAlertDefinition(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean finalizeNotificationConfiguration)
+ int createAlertDefinitionInNewTransaction(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean finalizeNotificationConfiguration)
throws InvalidAlertDefinitionException;
/**
- * This is exactly the same as {@link #createAlertDefinition(Subject, AlertDefinition, Integer, boolean)} but
+ * This is exactly the same as {@link #createAlertDefinitionInNewTransaction(Subject, AlertDefinition, Integer, boolean)} but
* assumes the resource is part of a group (or has given resource type for templates) for which
* a group or template alert definition is being created.
* <p>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
index 5b5c2ef..ee7bbf0 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
@@ -123,7 +123,7 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
int alertTemplateId = 0;
try {
- alertTemplateId = alertDefinitionManager.createAlertDefinition(user, alertTemplate, null, true);
+ alertTemplateId = alertDefinitionManager.createAlertDefinitionInNewTransaction(user, alertTemplate, null, true);
} catch (Throwable t) {
throw new AlertDefinitionCreationException("Could not create alertTemplate for " + type + " with data "
+ alertTemplate.toSimpleString(), t);
@@ -191,7 +191,7 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
// persist the child, user is known to be overlord at this point for this system side-effect
try {
- alertDefinitionManager.createAlertDefinition(user, childAlertDefinition, resourceId, false);
+ alertDefinitionManager.createAlertDefinitionInNewTransaction(user, childAlertDefinition, resourceId, false);
} catch (Throwable t) {
throw new AlertDefinitionCreationException("Failed to create child AlertDefinition for Resource[id="
+ resourceId + "] with template " + template.toSimpleString());
@@ -287,7 +287,7 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
childAlertDefinition.setParentId(alertTemplate.getId());
// persist the child
- alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId, false);
+ alertDefinitionManager.createAlertDefinitionInNewTransaction(overlord, childAlertDefinition, resourceId, false);
} catch (Throwable t) {
// continue on error, update as many as possible
if (firstThrowable == null) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
index fb079f8..ef6770e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
@@ -45,7 +45,10 @@ import org.rhq.core.util.collection.ArrayUtils;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal;
+import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility;
+import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility.SerializationType;
import org.rhq.enterprise.server.util.CriteriaQueryGenerator;
+import org.rhq.enterprise.server.util.CriteriaQueryRunner;
/**
* @author Joseph Marques
@@ -67,6 +70,8 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
private SubjectManagerLocal subjectManager;
@SuppressWarnings("unchecked")
+ @Deprecated
+ // remove along with portal war
public PageList<AlertDefinition> findGroupAlertDefinitions(Subject subject, int resourceGroupId,
PageControl pageControl) {
pageControl.initDefaultOrderingField("ctime", PageOrdering.DESC);
@@ -139,19 +144,21 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
public int createGroupAlertDefinitions(Subject subject, AlertDefinition groupAlertDefinition,
Integer resourceGroupId) throws InvalidAlertDefinitionException, AlertDefinitionCreationException {
ResourceGroup group = resourceGroupManager.getResourceGroupById(subject, resourceGroupId, null);
- groupAlertDefinition.setResourceGroup(group);
+ groupAlertDefinition.setGroup(group);
int groupAlertDefinitionId = 0;
try {
- groupAlertDefinitionId = alertDefinitionManager.createAlertDefinition(subject, groupAlertDefinition, null, true);
+ groupAlertDefinitionId = alertDefinitionManager.createAlertDefinitionInNewTransaction(subject,
+ groupAlertDefinition, null, true);
} catch (Throwable t) {
throw new AlertDefinitionCreationException("Could not create groupAlertDefinitions for " + group
+ " with data " + groupAlertDefinition.toSimpleString(), t);
}
//get the alert definition we just created.. this is so that we can create copies of it
- AlertDefinition persistedDefinition = alertDefinitionManager.getAlertDefinition(subject, groupAlertDefinitionId);
-
+ AlertDefinition persistedDefinition = alertDefinitionManager
+ .getAlertDefinition(subject, groupAlertDefinitionId);
+
Throwable firstThrowable = null;
List<Integer> resourceIdsForGroup = getCommittedResourceIdsNeedingGroupAlertDefinitionApplication(subject,
@@ -241,7 +248,7 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
LOG.debug("Need to update the following children alert definition ids: " + alertDefinitions);
}
List<Integer> alertDefinitionIdsInError = new ArrayList<Integer>();
-
+
for (Integer alertDefinitionId : alertDefinitions) {
try {
alertDefinitionManager.updateDependentAlertDefinition(subject, alertDefinitionId, updated,
@@ -266,7 +273,8 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
childAlertDefinition.setGroupAlertDefinition(groupAlertDefinition);
// persist the child
- alertDefinitionManager.createAlertDefinition(subject, childAlertDefinition, resourceId, false);
+ alertDefinitionManager.createAlertDefinitionInNewTransaction(subject, childAlertDefinition, resourceId,
+ false);
} catch (Throwable t) {
// continue on error, update as many as possible
if (firstThrowable == null) {
@@ -289,27 +297,50 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
return updated;
}
- public void addGroupAlertDefinitions(Subject subject, int resourceGroupId, int[] resourcesIdsToAdd)
+ public void addGroupMemberAlertDefinitions(Subject subject, int resourceGroupId, int[] addedResourceIds)
throws AlertDefinitionCreationException {
- if (resourcesIdsToAdd == null || resourcesIdsToAdd.length == 0) {
+ if (addedResourceIds == null || addedResourceIds.length == 0) {
return;
}
- Subject overlord = subjectManager.getOverlord();
+ List<Integer> resourceIdsInError = new ArrayList<Integer>();
Throwable firstThrowable = null;
- List<AlertDefinition> groupAlertDefinitions = findGroupAlertDefinitions(subject, resourceGroupId,
- PageControl.getUnlimitedInstance());
- List<Integer> resourceIdsInError = new ArrayList<Integer>();
+ // We want to copy the group level AlertDefinitions, so fetch them with the relevant lazy fields, so we
+ // have everything we need when calling the copy constructor, minimizing
+ AlertDefinitionCriteria criteria = new AlertDefinitionCriteria();
+ criteria.addFilterResourceGroupIds(resourceGroupId);
+ criteria.fetchGroupAlertDefinition(false);
+ criteria.fetchConditions(true);
+ criteria.fetchAlertNotifications(true);
+ // Apply paging when optionally fetching collections, to avoid duplicates. Hibernate seems to apply DISTINCT,
+ // which is what we want. Use a huge # because we want them all.
+ criteria.setPaging(0, Integer.MAX_VALUE);
+
+ List<AlertDefinition> groupAlertDefinitions = alertDefinitionManager.findAlertDefinitionsByCriteria(subject,
+ criteria);
+
for (AlertDefinition groupAlertDefinition : groupAlertDefinitions) {
- for (Integer resourceId : resourcesIdsToAdd) {
+ for (Integer resourceId : addedResourceIds) {
try {
- // construct the child
+ // Construct the resource-level AlertDefinition by using the copy constructor.
AlertDefinition childAlertDefinition = new AlertDefinition(groupAlertDefinition);
- childAlertDefinition.setGroupAlertDefinition(groupAlertDefinition);
- // persist the child
- alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId, false);
+ // groupAlertDefinition is an attached entity. It is dangerous to pass attached entities (with
+ // Hibernate proxies for the current session) across sessions. Since the call to create the new
+ // AlertDefinition is performed in a new transaction, make sure not to pass the attached entity.
+ // Just use a simple stand-in to create the link to the group alert definition.
+ AlertDefinition groupAlertDefinitionPojo = new AlertDefinition();
+ groupAlertDefinitionPojo.setId(groupAlertDefinition.getId());
+ childAlertDefinition.setGroupAlertDefinition(groupAlertDefinitionPojo);
+
+ // Persist the resource-level (child) alert definition, cleanse any further proxies left
+ // over from the copy constructor.
+ HibernateDetachUtility.nullOutUninitializedFields(childAlertDefinition,
+ SerializationType.SERIALIZATION);
+
+ alertDefinitionManager.createAlertDefinitionInNewTransaction(subjectManager.getOverlord(),
+ childAlertDefinition, resourceId, false);
} catch (Throwable t) {
// continue on error, create as many as possible
if (firstThrowable == null) {
@@ -347,35 +378,61 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
return results;
}
- public void removeGroupAlertDefinitions(Subject subject, int resourceGroupId, int[] resourceIdsToRemove) {
- if (resourceIdsToRemove == null || resourceIdsToRemove.length == 0) {
+ public void removeGroupMemberAlertDefinitions(Subject subject, int resourceGroupId, Integer[] removedResourceIds) {
+ if (removedResourceIds == null || removedResourceIds.length == 0) {
return;
}
- Integer[] groupAlertDefinitionIdsForResourceGroup = findGroupAlertDefinitionIds(resourceGroupId);
+ // fetch the resource-level AlertDefs tied to the Group from which resources are being removed
+ AlertDefinitionCriteria criteria = new AlertDefinitionCriteria();
+ criteria.addFilterResourceIds(removedResourceIds);
+ criteria.addFilterGroupAlertDefinitionGroupId(resourceGroupId);
+ criteria.addFilterDeleted(false);
+ criteria.clearPaging();
+
+ CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
+ CriteriaQueryRunner<AlertDefinition> queryRunner = new CriteriaQueryRunner<AlertDefinition>(criteria,
+ generator, entityManager);
+ List<AlertDefinition> alertDefinitions = queryRunner.execute();
+
+ // No group alert defs, just return
+ if (alertDefinitions.isEmpty()) {
+ return;
+ }
- List<Integer> allChildrenDefinitionIds = new ArrayList<Integer>();
- Subject overlord = subjectManager.getOverlord();
- for (Integer nextGroupAlertDefinitionId : groupAlertDefinitionIdsForResourceGroup) {
- List<Integer> childDefinitions = getChildrenAlertDefinitionIds(subject, nextGroupAlertDefinitionId);
- allChildrenDefinitionIds.addAll(childDefinitions);
- alertDefinitionManager.removeAlertDefinitions(overlord, ArrayUtils.unwrapCollection(childDefinitions));
+ // 1) remove only the attached (i.e. non-protected) alert defs.
+ // 2) break all of the FK references to the group
+ List<Integer> allMemberAlertDefinitionIds = new ArrayList<Integer>(alertDefinitions.size());
+ List<Integer> attachedMemberAlertDefinitionIds = new ArrayList<Integer>(alertDefinitions.size());
+ for (AlertDefinition ad : alertDefinitions) {
+ Integer id = ad.getId();
+ allMemberAlertDefinitionIds.add(id);
+ if (!ad.isReadOnly()) {
+ attachedMemberAlertDefinitionIds.add(id);
+ }
}
- /*
- * break the Hibernate relationships used for navigating between the groupAlertDefinition and the
- * children alertDefinitions so that the async deletion mechanism can delete without FK violations
- */
- if (allChildrenDefinitionIds.size() > 0) {
- Query breakLinksQuery = entityManager.createNamedQuery(AlertDefinition.QUERY_UPDATE_SET_PARENTS_NULL);
- breakLinksQuery.setParameter("childrenDefinitionIds", allChildrenDefinitionIds);
- breakLinksQuery.executeUpdate();
+ // 1) remove only the attached (i.e. non-protected) alert defs.
+ if (!attachedMemberAlertDefinitionIds.isEmpty()) {
+ int[] groupMemberAlertDefinitionIdsArray = ArrayUtils.unwrapCollection(attachedMemberAlertDefinitionIds);
+
+ alertDefinitionManager.removeAlertDefinitions(subjectManager.getOverlord(),
+ groupMemberAlertDefinitionIdsArray);
}
+
+ // 2) break all of the references to the group
+ Query breakLinksQuery = entityManager.createNamedQuery(AlertDefinition.QUERY_UPDATE_SET_PARENTS_NULL);
+ breakLinksQuery.setParameter("childrenDefinitionIds", allMemberAlertDefinitionIds);
+ breakLinksQuery.executeUpdate();
+
+ alertDefinitions.clear();
+ allMemberAlertDefinitionIds.clear();
+ attachedMemberAlertDefinitionIds.clear();
}
private int getResourceGroupIdForAlertDefinitionId(int groupAlertDefinitionId) {
Query query = entityManager.createQuery("" //
- + "SELECT groupAlertDefinition.resourceGroup.id " //
+ + "SELECT groupAlertDefinition.group.id " //
+ " FROM AlertDefinition groupAlertDefinition " //
+ " WHERE groupAlertDefinition.id = :groupAlertDefinitionId");
query.setParameter("groupAlertDefinitionId", groupAlertDefinitionId);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java
index 13faf1d..1834c78 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java
@@ -30,6 +30,8 @@ import org.rhq.core.domain.util.PageList;
*/
@Local
public interface GroupAlertDefinitionManagerLocal {
+ @Deprecated
+ // remove along with portal war
PageList<AlertDefinition> findGroupAlertDefinitions(Subject subject, int resourceGroupId, PageControl pageControl);
int createGroupAlertDefinitions(Subject subject, AlertDefinition alertDefinition, Integer resourceGroupId)
@@ -55,10 +57,10 @@ public interface GroupAlertDefinitionManagerLocal {
boolean resetMatching) throws InvalidAlertDefinitionException, AlertDefinitionUpdateException;
// required to implement system side-effects as a result of modifying group membership or deleting groups
- void addGroupAlertDefinitions(Subject subject, int groupId, int[] resourcesIdsToAdd)
+ void addGroupMemberAlertDefinitions(Subject subject, int groupId, int[] resourcesIdsToAdd)
throws AlertDefinitionCreationException;
- void removeGroupAlertDefinitions(Subject subject, int groupId, int[] resourceIdsToRemove);
+ void removeGroupMemberAlertDefinitions(Subject subject, int groupId, Integer[] resourceIdsToRemove);
void purgeAllGroupAlertDefinitions(Subject subject, int groupId);
}
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
index 7fdff89..1dc0f03 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
@@ -482,7 +482,7 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso
return;
}
int[] resourceIdsToAdd = ArrayUtils.unwrapCollection(nonMemberResources);
- groupAlertDefinitionManager.addGroupAlertDefinitions(subject, groupId, resourceIdsToAdd);
+ groupAlertDefinitionManager.addGroupMemberAlertDefinitions(subject, groupId, resourceIdsToAdd);
Connection conn = null;
PreparedStatement insertExplicitStatement = null;
@@ -627,14 +627,14 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso
+ "] which are not part of the group[id=" + groupId + "]");
}
- int[] resourceIdsToRemove = ArrayUtils.unwrapArray(resourceIds);
- groupAlertDefinitionManager.removeGroupAlertDefinitions(subject, groupId, resourceIdsToRemove);
+ groupAlertDefinitionManager.removeGroupMemberAlertDefinitions(subject, groupId, resourceIds);
Connection conn = null;
PreparedStatement deleteExplicitStatement = null;
PreparedStatement deleteImplicitStatement = null;
try {
conn = rhqDs.getConnection();
+ int[] resourceIdsArray = ArrayUtils.unwrapArray(resourceIds);
// insert implicit resources, must occur before deleting explicit
if (isRecursive) {
@@ -642,7 +642,7 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso
.prepareStatement(ResourceGroup.QUERY_NATIVE_REMOVE_RESOURCES_FROM_GROUP_IMPLICIT_RECURSIVE);
deleteImplicitStatement.setInt(1, groupId);
deleteImplicitStatement.setInt(9, groupId);
- for (int resourceId : resourceIdsToRemove) {
+ for (Integer resourceId : resourceIds) {
// no-op if this resource's ancestor is also in the explicit list
List<Integer> lineage = resourceManager.getResourceIdLineage(resourceId);
List<Integer> nonMembers = getNonMemberExplicitResources(groupId, lineage);
@@ -663,20 +663,20 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso
} else {
String deleteImplicitQueryString = JDBCUtil.transformQueryForMultipleInParameters(
ResourceGroup.QUERY_NATIVE_REMOVE_RESOURCES_FROM_GROUP_IMPLICIT, "@@RESOURCE_IDS@@",
- resourceIdsToRemove.length);
+ resourceIds.length);
deleteImplicitStatement = conn.prepareStatement(deleteImplicitQueryString);
deleteImplicitStatement.setInt(1, groupId);
- JDBCUtil.bindNTimes(deleteImplicitStatement, resourceIdsToRemove, 2);
+ JDBCUtil.bindNTimes(deleteImplicitStatement, resourceIdsArray, 2);
deleteImplicitStatement.executeUpdate();
}
// delete explicit resources
String deleteExplicitQueryString = JDBCUtil.transformQueryForMultipleInParameters(
ResourceGroup.QUERY_NATIVE_REMOVE_RESOURCES_FROM_GROUP_EXPLICIT, "@@RESOURCE_IDS@@",
- resourceIdsToRemove.length);
+ resourceIds.length);
deleteExplicitStatement = conn.prepareStatement(deleteExplicitQueryString);
deleteExplicitStatement.setInt(1, groupId);
- JDBCUtil.bindNTimes(deleteExplicitStatement, resourceIdsToRemove, 2);
+ JDBCUtil.bindNTimes(deleteExplicitStatement, resourceIdsArray, 2);
deleteExplicitStatement.executeUpdate();
} catch (SQLException sqle) {
log.error("Error removing resources from group[id=" + groupId + "]: ", sqle);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java
index 23c43e5..06bc8ae 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java
@@ -218,7 +218,7 @@ public class AlertDefinitionHandlerBean extends AbstractRestBean {
if (groupId!=null) {
ResourceGroup group = resourceGroupMgr.getResourceGroup(caller,groupId);
- alertDefinition.setResourceGroup(group);
+ alertDefinition.setGroup(group);
}
if (resourceTypeId!=null) {
ResourceType type = resourceTypeMgr.getResourceTypeById(caller,resourceTypeId);
@@ -258,7 +258,7 @@ public class AlertDefinitionHandlerBean extends AbstractRestBean {
throw new StuffNotFoundException("Recovery alert with id " + adr.getRecoveryId());
}
- int definitionId = alertDefinitionManager.createAlertDefinition(caller, alertDefinition, resourceId, false);
+ int definitionId = alertDefinitionManager.createAlertDefinitionInNewTransaction(caller, alertDefinition, resourceId, false);
AlertDefinition updatedDefinition = alertDefinitionManager.getAlertDefinition(caller,definitionId);
AlertDefinitionRest uadr = definitionToDomain(updatedDefinition,true, uriInfo) ; // TODO param 'full' ?
@@ -823,8 +823,9 @@ public class AlertDefinitionHandlerBean extends AbstractRestBean {
if (def.getResource()!=null) {
adr.getLinks().add(createUILink(uriInfo,UILinkTemplate.RESOURCE_ALERT_DEF,def.getResource().getId(),adr.getId()));
- } else if (def.getResourceGroup()!=null) {
- adr.getLinks().add(createUILink(uriInfo,UILinkTemplate.GROUP_ALERT_DEF,def.getResourceGroup().getId(),adr.getId()));
+ } else if (def.getGroup() != null) {
+ adr.getLinks().add(
+ createUILink(uriInfo, UILinkTemplate.GROUP_ALERT_DEF, def.getGroup().getId(), adr.getId()));
} else {
adr.getLinks().add(createUILink(uriInfo,UILinkTemplate.TEMPLATE_ALERT_DEF,def.getResourceType().getId(),adr.getId()));
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java
index 1fadcc6..7c6ec8f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java
@@ -112,8 +112,8 @@ public class AlertDefinitionHandler extends AbstractRestBean implements AlertDef
return getBaseURL() + "/#Administration/Configuration/AlertDefTemplates/" +
alertDef.getResource().getResourceType().getId() + "/" + templateId;
} else if (alertDef.getGroupAlertDefinition() != null) {
- return getBaseURL() + "/#ResourceGroup/" +
- alertDef.getGroupAlertDefinition().getResourceGroup().getId() + "/Alerts/Definitions/" +
+ return getBaseURL() + "/#ResourceGroup/" + alertDef.getGroupAlertDefinition().getGroup().getId()
+ + "/Alerts/Definitions/" +
alertDef.getGroupAlertDefinition().getId();
} else {
return "";
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java | 107 +++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java | 185 ----------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java | 133 -------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java | 165 ++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java | 59 ---
modules/enterprise/gui/coregui/src/main/webapp/css/charts.css | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java | 27 -
14 files changed, 298 insertions(+), 414 deletions(-)
New commits:
commit 64526c2a821396043f43617f63768d18d1650a4e
Merge: ae98ad8 b224fcc
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Apr 5 16:51:04 2013 -0400
Merge remote-tracking branch 'origin/master' into bug/rhq-1
commit ae98ad8761a246170643290f7eb29f514f680d65
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Apr 5 16:50:42 2013 -0400
BZ 535289 - test filtering out resources when parent is a particular inventory status
fix the child resources view
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java
index ee0ed12..7cfe5b6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java
@@ -33,6 +33,7 @@ import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceD
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.MODIFIER;
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.MTIME;
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.NAME;
+import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.PARENT_INVENTORY_STATUS;
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.PLUGIN;
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.TYPE;
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.VERSION;
@@ -185,13 +186,27 @@ public class ResourceCompositeDataSource extends RPCDataSource<ResourceComposite
criteria.addFilterName(getFilter(request, NAME.propertyName(), String.class));
criteria.addFilterResourceTypeId(getFilter(request, TYPE.propertyName(), Integer.class));
criteria.addFilterPluginName(getFilter(request, PLUGIN.propertyName(), String.class));
- criteria.addFilterInventoryStatus(getFilter(request, INVENTORY_STATUS.propertyName(), InventoryStatus.class));
criteria.addFilterTagNamespace(getFilter(request, "tagNamespace", String.class));
criteria.addFilterTagSemantic(getFilter(request, "tagSemantic", String.class));
criteria.addFilterTagName(getFilter(request, "tagName", String.class));
criteria.addFilterVersion(getFilter(request, "version", String.class));
criteria.setSearchExpression(getFilter(request, "search", String.class));
+ // we never want to filter on null status - that would return resources for every status (committed, new, deleted, etc).
+ // we want to rely on whatever the default setting is for the criteria and only override that if we explicitly have a status to filter.
+ InventoryStatus invStatusFilter = getFilter(request, INVENTORY_STATUS.propertyName(), InventoryStatus.class);
+ if (invStatusFilter != null) {
+ criteria.addFilterInventoryStatus(invStatusFilter);
+ }
+
+ InventoryStatus parentInvStatusFilter = getFilter(request, PARENT_INVENTORY_STATUS.propertyName(),
+ InventoryStatus.class);
+ if (parentInvStatusFilter != null) {
+ List<InventoryStatus> statuses = new ArrayList<InventoryStatus>(1);
+ statuses.add(parentInvStatusFilter);
+ criteria.addFilterParentInventoryStatuses(statuses);
+ }
+
return criteria;
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
index 49e1924..b9eebd1 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
@@ -291,6 +291,19 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
// Now test ignore, unignore and import behavior
discoveryBoss.importResources(subjectManager.getOverlord(), new int[] { platformId });
+ discoveryBoss.ignoreResources(subjectManager.getOverlord(), arrayOfServerIds);
+
+ try {
+ discoveryBoss.importResources(subjectManager.getOverlord(), arrayOfServerIds);
+ fail("Import resources should fail for ignored resources");
+ } catch (EJBException e) {
+ assertEquals(String.valueOf(e.getCause()), IllegalArgumentException.class, e.getCause().getClass());
+ assertTrue(String.valueOf(e.getCause()),
+ e.getCause().getMessage().startsWith("Can only set inventory status to"));
+ }
+
+ discoveryBoss.unignoreResources(subjectManager.getOverlord(), arrayOfServerIds);
+ discoveryBoss.importResources(subjectManager.getOverlord(), arrayOfServerIds);
// excursus: take this time to do a side test of the resource criteria filtering on parent inv status
List<InventoryStatus> committedStatus = new ArrayList<InventoryStatus>(1);
@@ -310,20 +323,6 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
criteria.addFilterParentInventoryStatuses(ignoredStatus);
lookup = resourceManager.findResourcesByCriteria(subjectManager.getOverlord(), criteria);
assert lookup.isEmpty() : lookup;
-
- // ok, back to the main test - now ignore the resources
- discoveryBoss.ignoreResources(subjectManager.getOverlord(), arrayOfServerIds);
-
- try {
- discoveryBoss.importResources(subjectManager.getOverlord(), arrayOfServerIds);
- fail("Import resources should fail for ignored resources");
- } catch (EJBException e) {
- assertEquals(String.valueOf(e.getCause()), IllegalArgumentException.class, e.getCause().getClass());
- assertTrue(String.valueOf(e.getCause()),
- e.getCause().getMessage().startsWith("Can only set inventory status to"));
- }
- discoveryBoss.unignoreResources(subjectManager.getOverlord(), arrayOfServerIds);
- discoveryBoss.importResources(subjectManager.getOverlord(), arrayOfServerIds);
}
@Test(groups = "integration.ejb3")
commit b224fcc809c3023a5207797f4fa44a5be9d97712
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Fri Apr 5 11:55:31 2013 -0700
Rename ResourceMetricD3Graph to MetricD3Graph to better reflect its new, more general, responsibilities.
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 64643cb..1267dcd 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
@@ -39,12 +39,10 @@ import com.smartgwt.client.widgets.form.fields.SpacerItem;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.dashboard.DashboardPortlet;
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.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
@@ -63,7 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
@@ -75,7 +73,7 @@ import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
* @author Jay Shaughnessy
* @author Mike Thompson
*/
-public class ResourceGroupD3GraphPortlet extends ResourceMetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
+public class ResourceGroupD3GraphPortlet extends MetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "ResourceGroupMetricD3";
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 b99c200..1f305b5 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
@@ -57,7 +57,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.Log;
@@ -68,7 +68,7 @@ import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
* @author Jay Shaughnessy
* @author Mike Thompson
*/
-public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
+public class ResourceD3GraphPortlet extends MetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "ResourceMetricD3";
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
index f6b191a..c9ce8b7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
@@ -102,7 +102,6 @@ public final class MetricStackedBarGraph extends AbstractGraph {
}
function useSmallCharts() {
- console.info("Chart Width for : " + chartContext.chartHandle + " is " + getChartWidth());
return getChartWidth() <= smallChartThresholdInPixels;
}
@@ -112,7 +111,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// if window is too small server up small chart
if (useSmallCharts()) {
- console.log("Using Small Charts Profile");
+ console.log("Using Small Charts Profile for width: "+getChartWidth());
width = 250;
xTicks = 3;
xTickSubDivide = 2;
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 54466cf..4729c99 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
@@ -43,7 +43,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphLis
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.Log;
@@ -195,7 +195,7 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen
MetricGraphData metricGraphData = MetricGraphData.createForResourceGroup(resourceGroup.getId(),
resourceGroup.getName(), measurementDefinition, data );
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
- ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
+ MetricD3Graph graphView = new MetricD3Graph(graph);
graphView.setWidth("95%");
graphView.setHeight(MULTI_CHART_HEIGHT);
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 f66ea33..0c071c4 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
@@ -371,7 +371,7 @@ public class D3GraphListView extends AbstractD3GraphListView {
measurementDefinition, data, measurementOOBCompositeList );
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
- ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
+ MetricD3Graph graphView = new MetricD3Graph(graph);
graphView.setWidth("95%");
graphView.setHeight(height);
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
new file mode 100644
index 0000000..e0fcd87
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java
@@ -0,0 +1,165 @@
+/*
+ * 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.resource.detail.monitoring;
+
+import com.google.gwt.user.client.Timer;
+import com.smartgwt.client.widgets.HTMLFlow;
+
+import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
+import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
+
+/**
+ * A D3 graph implementation for graphing Resource metrics.
+ */
+public class MetricD3Graph extends EnhancedVLayout {
+
+ protected AbstractGraph graph;
+ private HTMLFlow graphDiv = null;
+ protected Timer refreshTimer;
+
+ /**
+ * This constructor is for the use case in the Dashboard where we dont actually
+ * have a entity or measurement yet.
+ */
+ public MetricD3Graph() {
+ super();
+ }
+
+ public MetricD3Graph(AbstractGraph graph) {
+ super();
+ this.graph = graph;
+ setHeight100();
+ setWidth100();
+ }
+
+ /**
+ * Svg definitions for patterns and gradients to use on SVG shapes.
+ * @return xml String
+ */
+ 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>"
+ + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
+ + " width=\"6\" height=\"3\">"
+ + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>"
+ + " </pattern>" + "</defs>";
+ }
+
+ @Override
+ protected void onDraw() {
+ super.onDraw();
+ if (graph.getDefinition() != null) {
+ drawGraph();
+ }
+ }
+
+ @Override
+ public void parentResized() {
+ super.parentResized();
+ removeMembers(getMembers());
+ drawGraph();
+ }
+
+ /**
+ * Setup the page elements especially the div and svg elements that serve as
+ * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
+ * Later the drawJsniGraph() is called to actually fill in the div/svg element
+ * created here with the actual svg element.
+ *
+ */
+ protected void drawGraph() {
+ Log.debug("drawGraph marker in MetricD3Graph for: " + getFullChartId() + " " + graph.getChartTitle());
+
+ StringBuilder divAndSvgDefs = new StringBuilder();
+ divAndSvgDefs
+ .append("<div id=\""
+ + getFullChartId()
+ + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
+ + getChartHeight() + "px;\">");
+ divAndSvgDefs.append(getSvgDefs());
+ divAndSvgDefs.append("</svg></div>");
+
+ if (null != graphDiv) {
+ removeMember(graphDiv);
+ }
+
+ graphDiv = new HTMLFlow(divAndSvgDefs.toString());
+ graphDiv.setWidth100();
+ graphDiv.setHeight100();
+ addMember(graphDiv);
+
+ new Timer() {
+ @Override
+ public void run() {
+ //@todo: this is a hack around timing issue of jsni not seeing the DOM
+ drawJsniChart();
+ }
+ }.schedule(200);
+ }
+
+ /**
+ * Delegate the call to rendering the JSNI chart.
+ * This way the chart type can be swapped out at any time.
+ */
+ public void drawJsniChart() {
+ graph.drawJsniChart();
+ }
+
+ public HasD3MetricJsniChart getJsniChart() {
+ return graph;
+ }
+
+ public String getFullChartId() {
+ return "rChart-" + graph.getMetricGraphData().getChartId();
+
+ }
+
+ public void setGraph(AbstractGraph graph) {
+ this.graph = graph;
+ }
+
+
+ public Integer getChartHeight() {
+ return graph.getMetricGraphData().getChartHeight();
+ }
+
+ @Override
+ public void destroy() {
+ super.destroy();
+ }
+
+ @Override
+ public void hide() {
+ super.hide();
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
deleted file mode 100644
index 055e6b6..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
+++ /dev/null
@@ -1,165 +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.resource.detail.monitoring;
-
-import com.google.gwt.user.client.Timer;
-import com.smartgwt.client.widgets.HTMLFlow;
-
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
-import org.rhq.enterprise.gui.coregui.client.util.Log;
-import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
-
-/**
- * A D3 graph implementation for graphing Resource metrics.
- */
-public class ResourceMetricD3Graph extends EnhancedVLayout {
-
- protected AbstractGraph graph;
- private HTMLFlow graphDiv = null;
- protected Timer refreshTimer;
-
- /**
- * This constructor is for the use case in the Dashboard where we dont actually
- * have a entity or measurement yet.
- */
- public ResourceMetricD3Graph() {
- super();
- }
-
- public ResourceMetricD3Graph(AbstractGraph graph) {
- super();
- this.graph = graph;
- setHeight100();
- setWidth100();
- }
-
- /**
- * Svg definitions for patterns and gradients to use on SVG shapes.
- * @return xml String
- */
- 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>"
- + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
- + " width=\"6\" height=\"3\">"
- + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>"
- + " </pattern>" + "</defs>";
- }
-
- @Override
- protected void onDraw() {
- super.onDraw();
- if (graph.getDefinition() != null) {
- drawGraph();
- }
- }
-
- @Override
- public void parentResized() {
- super.parentResized();
- removeMembers(getMembers());
- drawGraph();
- }
-
- /**
- * Setup the page elements especially the div and svg elements that serve as
- * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
- * Later the drawJsniGraph() is called to actually fill in the div/svg element
- * created here with the actual svg element.
- *
- */
- protected void drawGraph() {
- Log.debug("drawGraph marker in MetricD3Graph for: " + getFullChartId() + " " + graph.getChartTitle());
-
- StringBuilder divAndSvgDefs = new StringBuilder();
- divAndSvgDefs
- .append("<div id=\""
- + getFullChartId()
- + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
- + getChartHeight() + "px;\">");
- divAndSvgDefs.append(getSvgDefs());
- divAndSvgDefs.append("</svg></div>");
-
- if (null != graphDiv) {
- removeMember(graphDiv);
- }
-
- graphDiv = new HTMLFlow(divAndSvgDefs.toString());
- graphDiv.setWidth100();
- graphDiv.setHeight100();
- addMember(graphDiv);
-
- new Timer() {
- @Override
- public void run() {
- //@todo: this is a hack around timing issue of jsni not seeing the DOM
- drawJsniChart();
- }
- }.schedule(200);
- }
-
- /**
- * Delegate the call to rendering the JSNI chart.
- * This way the chart type can be swapped out at any time.
- */
- public void drawJsniChart() {
- graph.drawJsniChart();
- }
-
- public HasD3MetricJsniChart getJsniChart() {
- return graph;
- }
-
- public String getFullChartId() {
- return "rChart-" + graph.getMetricGraphData().getChartId();
-
- }
-
- public void setGraph(AbstractGraph graph) {
- this.graph = graph;
- }
-
-
- public Integer getChartHeight() {
- return graph.getMetricGraphData().getChartHeight();
- }
-
- @Override
- public void destroy() {
- super.destroy();
- }
-
- @Override
- public void hide() {
- super.hide();
- }
-
-}
commit 24f7106b1d0ef0ea29be73eb95382c92c3829eff
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Fri Apr 5 11:31:44 2013 -0700
Fix issue with Resource Group Charts and refactor class hierarchy to make it flatter by eliminating AbstractMetricD3GraphView and ResourceGroupMetricD3GraphView.
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 75e398e..64643cb 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
@@ -18,6 +18,12 @@
*/
package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.groups.graph;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.TitleOrientation;
@@ -33,8 +39,17 @@ import com.smartgwt.client.widgets.form.fields.SpacerItem;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.dashboard.DashboardPortlet;
+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.core.domain.resource.group.GroupCategory;
+import org.rhq.core.domain.resource.group.ResourceGroup;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem;
import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedEvent;
import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedHandler;
@@ -44,19 +59,23 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.ResourceGroupMetricD3GraphView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.Log;
+import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
/**
* @author Greg Hinkle
* @author Jay Shaughnessy
* @author Mike Thompson
*/
-public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView implements AutoRefreshPortlet, CustomSettingsPortlet {
+public class ResourceGroupD3GraphPortlet extends ResourceMetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "ResourceGroupMetricD3";
@@ -71,7 +90,6 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
public static final String CFG_DEFINITION_ID = "definitionId";
public ResourceGroupD3GraphPortlet() {
- super(new MetricStackedBarGraph(MetricGraphData.createForDashboard(0)));
setOverflow(Overflow.HIDDEN);
}
@@ -90,7 +108,6 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
}
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
- Log.debug("ResourceGroupPortlet.configure");
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
@@ -104,15 +121,83 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
}
if (storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_GROUP_ID) != null) {
- Integer integerValue = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_GROUP_ID).getIntegerValue();
- if (integerValue != null)
- setEntityId(integerValue);
+ PropertySimple resourceIdProperty = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_GROUP_ID);
+ PropertySimple measurementDefIdProperty = storedPortlet.getConfiguration().getSimple(CFG_DEFINITION_ID);
+ if (resourceIdProperty != null && measurementDefIdProperty != null) {
+ final Integer entityId = resourceIdProperty.getIntegerValue();
+ final Integer measurementDefId = measurementDefIdProperty.getIntegerValue();
+ if (entityId != null && measurementDefId != null) {
+ queryResourceGroup(entityId, measurementDefId);
+ }
- PropertySimple propertySimple = storedPortlet.getConfiguration().getSimple(CFG_DEFINITION_ID);
- if (propertySimple != null && propertySimple.getIntegerValue() != null)
- setDefinitionId(propertySimple.getIntegerValue());
+ }
}
- Log.debug("ResourceGroupPortlet.configure.done");
+ }
+
+
+ private void queryResourceGroup(Integer entityId, final Integer measurementDefId) {
+ ResourceGroupGWTServiceAsync resourceService = GWTServiceLookup.getResourceGroupService();
+
+ ResourceGroupCriteria resourceCriteria = new ResourceGroupCriteria();
+ resourceCriteria.addFilterId(entityId);
+ resourceService.findResourceGroupsByCriteria(resourceCriteria, new AsyncCallback<PageList<ResourceGroup>>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_lookupFailed(), caught);
+ }
+
+ @Override
+ public void onSuccess(PageList<ResourceGroup> result) {
+ if (result.isEmpty()) {
+ return;
+ }
+ // only concerned with first resource since this is a query by id
+ final ResourceGroup resource = result.get(0);
+ HashSet<Integer> typesSet = new HashSet<Integer>();
+ typesSet.add(resource.getResourceType().getId());
+
+ ResourceTypeRepository.Cache.getInstance().getResourceTypes(
+ typesSet.toArray(new Integer[typesSet.size()]),
+ EnumSet.of(ResourceTypeRepository.MetadataType.measurements),
+ new ResourceTypeRepository.TypesLoadedCallback() {
+
+ @Override
+ public void onTypesLoaded(Map<Integer, ResourceType> types) {
+ ResourceType type = types.get(resource.getResourceType().getId());
+ for (final MeasurementDefinition def : type.getMetricDefinitions()) {
+ if (def.getId() == measurementDefId) {
+ Log.debug("Found portlet measurement definition !" + def);
+
+ getJsniChart().setEntityId(resource.getId());
+ getJsniChart().setEntityName(resource.getName());
+ getJsniChart().setDefinition(def);
+ final long startTime = System.currentTimeMillis();
+
+ GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroupForLast(
+ resource.getId(), new int[]{def.getId()}, 8, MeasurementUtils.UNIT_HOURS,
+ 60, new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_resource_monitor_graphs_loadFailed(), caught);
+ }
+
+ @Override
+ public void onSuccess(
+ final List<List<MeasurementDataNumericHighLowComposite>> measurementData) {
+ Log.debug("Dashboard Metric data in: "
+ + (System.currentTimeMillis() - startTime) + " ms.");
+ graph.getMetricGraphData().setMetricData(measurementData.get(0));
+ drawGraph();
+ }
+ });
+ break;
+ }
+ }
+ }
+ });
+ }
+ });
}
public Canvas getHelpCanvas() {
@@ -215,7 +300,7 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
DashboardPortlet storedPortlet = portletWindow.getStoredPortlet();
PropertySimple simple = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_GROUP_ID);
- if (simple == null | simple.getIntegerValue() == null) {
+ if (simple == null || simple.getIntegerValue() == null) {
addMember(new Label("<i>" + MSG.view_portlet_configure_needed() + "</i>"));
} else {
drawGraph();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
deleted file mode 100644
index 0a1155e..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 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;
-
-import com.google.gwt.user.client.Timer;
-import com.smartgwt.client.widgets.HTMLFlow;
-
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
-import org.rhq.enterprise.gui.coregui.client.util.Log;
-import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
-
-/**
- * Provide common functionality for graph views. Such as setting up the divs with
- * specific ids that the jsni svn graphs can bind to and place their svg definitions
- * of the charts directly under this chart div. Essentially, it creates the placeholder
- * for the graphs to later render themselves.
- *
- * @author Mike Thompson
- */
-public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
-
- protected AbstractGraph graph;
- private int entityId;
- private int definitionId;
- private HTMLFlow graphDiv = null;
- protected Timer refreshTimer;
-
- public AbstractMetricD3GraphView() {
- super();
- }
-
- public AbstractMetricD3GraphView(AbstractGraph graph) {
- this();
- this.graph = graph;
- setHeight100();
- setWidth100();
- }
-
- /**
- * Svg definitions for patterns and gradients to use on SVG shapes.
- * @return xml String
- */
- 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>"
- + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
- + " width=\"6\" height=\"3\">"
- + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>"
- + " </pattern>"
- + "</defs>";
- }
-
- @Override
- protected void onDraw() {
- super.onDraw();
- if (graph.getDefinition() != null) {
- drawGraph();
- }
- }
-
- @Override
- public void parentResized() {
- super.parentResized();
- removeMembers(getMembers());
- drawGraph();
- }
-
- public void setEntityId(int entityId) {
- this.entityId = entityId;
- }
-
- public void setDefinitionId(int definitionId) {
- this.definitionId = definitionId;
- }
-
- public int getEntityId() {
- return entityId;
- }
-
- public int getDefinitionId() {
- return definitionId;
- }
-
- /**
- * Setup the page elements especially the div and svg elements that serve as
- * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
- * Later the drawJsniGraph() is called to actually fill in the div/svg element
- * created here with the actual svg element.
- *
- */
- protected void drawGraph() {
- Log.debug("drawGraph marker in AbstractMetricD3GraphView for: " + getFullChartId() + " "
- + graph.getChartTitle());
-
- StringBuilder divAndSvgDefs = new StringBuilder();
- divAndSvgDefs
- .append("<div id=\""
- + getFullChartId()
- + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
- + getChartHeight() + "px;\">");
- divAndSvgDefs.append(getSvgDefs());
- divAndSvgDefs.append("</svg></div>");
-
- if (null != graphDiv) {
- removeMember(graphDiv);
- }
-
- graphDiv = new HTMLFlow(divAndSvgDefs.toString());
- graphDiv.setWidth100();
- graphDiv.setHeight100();
- addMember(graphDiv);
-
- new Timer() {
- @Override
- public void run() {
- //@todo: this is a hack around timing issue of jsni not seeing the DOM
- drawJsniChart();
- }
- }.schedule(200);
- }
-
- public String getFullChartId(){
- return "rChart-"+ graph.getMetricGraphData().getChartId();
-
- }
- public void setGraph(AbstractGraph graph) {
- this.graph = graph;
- }
-
- public abstract void drawJsniChart();
-
-
- public Integer getChartHeight() {
- return graph.getMetricGraphData().getChartHeight();
- }
-
-
- /**
- * This is only necessary to set this for the ResourceGraphPortlet case where
- * configuration is deferred.
- * @param metricGraphData
- */
- public void setMetricGraphData(MetricGraphData metricGraphData) {
- graph.setMetricGraphData(metricGraphData);
- }
-
- @Override
- public void destroy() {
- super.destroy();
- }
-
- @Override
- public void hide() {
- super.hide();
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
index 0b8cf7a..c921acf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
@@ -61,7 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
/**
* @author Greg Hinkle
* @author Jay Shaughnessy
- * @deprecated see AbstractMetricD3GraphView
+ * @deprecated this code will go away once D3 graphs have been validated.
*/
@Deprecated
public abstract class AbstractMetricGraphView extends EnhancedVLayout {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
index 4ec734b..cfd904d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
@@ -267,7 +267,7 @@ public class MetricGraphData implements JsonMetricProducer {
*/
public String getYAxisUnits() {
if (adjustedMeasurementUnits == null) {
- Log.warn("AbstractMetricD3GraphView.adjustedMeasurementUnits is populated by getJsonMetrics. Make sure it is called first.");
+ Log.warn("ResourceMetricD3GraphView.adjustedMeasurementUnits is populated by getJsonMetrics. Make sure it is called first.");
return "";
} else {
return adjustedMeasurementUnits.toString();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java
deleted file mode 100644
index a436aa0..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java
+++ /dev/null
@@ -1,133 +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;
-
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-import org.rhq.core.domain.criteria.ResourceCriteria;
-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.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.gwt.ResourceGWTServiceAsync;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricD3GraphView;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
-import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
-
-public class ResourceGroupMetricD3GraphView extends AbstractMetricD3GraphView {
-
-
-
- public ResourceGroupMetricD3GraphView(AbstractGraph graph) {
- super(graph);
- }
-
- protected void drawGraph() {
- if (null == graph.getMetricGraphData().getDefinition()) {
-
- ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService();
-
- ResourceCriteria resourceCriteria = new ResourceCriteria();
- resourceCriteria.addFilterId(graph.getMetricGraphData().getEntityId());
- resourceService.findResourcesByCriteria(resourceCriteria, new AsyncCallback<PageList<Resource>>() {
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_lookupFailed(), caught);
- }
-
- @Override
- public void onSuccess(PageList<Resource> result) {
- if (result.isEmpty()) {
- return;
- }
-
- final Resource resource = result.get(0);
- HashSet<Integer> typesSet = new HashSet<Integer>();
- typesSet.add(resource.getResourceType().getId());
- HashSet<String> ancestries = new HashSet<String>();
- ancestries.add(resource.getAncestry());
- // In addition to the types of the result resources, get the types of their ancestry
- typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries));
-
- ResourceTypeRepository.Cache.getInstance().getResourceTypes(
- typesSet.toArray(new Integer[typesSet.size()]),
- EnumSet.of(ResourceTypeRepository.MetadataType.measurements),
- new ResourceTypeRepository.TypesLoadedCallback() {
-
- @Override
- public void onTypesLoaded(Map<Integer, ResourceType> types) {
-
- ResourceType type = types.get(resource.getResourceType().getId());
- for (MeasurementDefinition def : type.getMetricDefinitions()) {
- if (def.getId() == graph.getMetricGraphData().getDefinitionId()) {
- graph.getMetricGraphData().setDefinition(def);
-
- GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast(
- graph.getEntityId(),
- new int[] { graph.getMetricGraphData().getDefinitionId() }, 8,
- MeasurementUtils.UNIT_HOURS, 60,
- new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- MSG.view_resource_monitor_graphs_loadFailed(), caught);
- }
-
- @Override
- public void onSuccess(
- List<List<MeasurementDataNumericHighLowComposite>> result) {
- graph.getMetricGraphData().setMetricData(result.get(0));
-
- drawGraph();
- }
- });
- }
- }
- }
- });
- }
- });
-
- } else {
- drawGraph();
- }
- }
-
- @Override
- /**
- * Delegate the call to rendering the JSNI chart.
- * This way the chart type can be swapped out at any time.
- */
- public void drawJsniChart() {
- graph.drawJsniChart();
- }
-
-
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
index 962c341..055e6b6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
@@ -18,14 +18,22 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricD3GraphView;
+import com.google.gwt.user.client.Timer;
+import com.smartgwt.client.widgets.HTMLFlow;
+
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
+import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
/**
* A D3 graph implementation for graphing Resource metrics.
*/
-public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
+public class ResourceMetricD3Graph extends EnhancedVLayout {
+
+ protected AbstractGraph graph;
+ private HTMLFlow graphDiv = null;
+ protected Timer refreshTimer;
/**
* This constructor is for the use case in the Dashboard where we dont actually
@@ -36,13 +44,88 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
}
public ResourceMetricD3Graph(AbstractGraph graph) {
-
- super(graph);
+ super();
+ this.graph = graph;
+ setHeight100();
+ setWidth100();
}
+ /**
+ * Svg definitions for patterns and gradients to use on SVG shapes.
+ * @return xml String
+ */
+ 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>"
+ + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
+ + " width=\"6\" height=\"3\">"
+ + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>"
+ + " </pattern>" + "</defs>";
+ }
+ @Override
+ protected void onDraw() {
+ super.onDraw();
+ if (graph.getDefinition() != null) {
+ drawGraph();
+ }
+ }
@Override
+ public void parentResized() {
+ super.parentResized();
+ removeMembers(getMembers());
+ drawGraph();
+ }
+
+ /**
+ * Setup the page elements especially the div and svg elements that serve as
+ * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
+ * Later the drawJsniGraph() is called to actually fill in the div/svg element
+ * created here with the actual svg element.
+ *
+ */
+ protected void drawGraph() {
+ Log.debug("drawGraph marker in MetricD3Graph for: " + getFullChartId() + " " + graph.getChartTitle());
+
+ StringBuilder divAndSvgDefs = new StringBuilder();
+ divAndSvgDefs
+ .append("<div id=\""
+ + getFullChartId()
+ + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
+ + getChartHeight() + "px;\">");
+ divAndSvgDefs.append(getSvgDefs());
+ divAndSvgDefs.append("</svg></div>");
+
+ if (null != graphDiv) {
+ removeMember(graphDiv);
+ }
+
+ graphDiv = new HTMLFlow(divAndSvgDefs.toString());
+ graphDiv.setWidth100();
+ graphDiv.setHeight100();
+ addMember(graphDiv);
+
+ new Timer() {
+ @Override
+ public void run() {
+ //@todo: this is a hack around timing issue of jsni not seeing the DOM
+ drawJsniChart();
+ }
+ }.schedule(200);
+ }
+
/**
* Delegate the call to rendering the JSNI chart.
* This way the chart type can be swapped out at any time.
@@ -55,5 +138,28 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
return graph;
}
+ public String getFullChartId() {
+ return "rChart-" + graph.getMetricGraphData().getChartId();
+
+ }
+
+ public void setGraph(AbstractGraph graph) {
+ this.graph = graph;
+ }
+
+
+ public Integer getChartHeight() {
+ return graph.getMetricGraphData().getChartHeight();
+ }
+
+ @Override
+ public void destroy() {
+ super.destroy();
+ }
+
+ @Override
+ public void hide() {
+ super.hide();
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
index 9a3404d..099f23a 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
+++ b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
@@ -2,7 +2,7 @@
* CSS for the d3 SVG charts. This is SVG css not HTML css so some elements
* may look different from standard CSS.
* NOTE: the SVG <defs> section that contains gradients etc. is in the
- * java class : /org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
+ * java class : /org/rhq/enterprise/gui/coregui/client/inventory/common/ResourceMetricD3Graph.java
*
*/
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java | 107 +++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java | 185 ----------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java | 133 -------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java | 165 ++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java | 59 ---
modules/enterprise/gui/coregui/src/main/webapp/css/charts.css | 2
12 files changed, 269 insertions(+), 399 deletions(-)
New commits:
commit b224fcc809c3023a5207797f4fa44a5be9d97712
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Fri Apr 5 11:55:31 2013 -0700
Rename ResourceMetricD3Graph to MetricD3Graph to better reflect its new, more general, responsibilities.
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 64643cb..1267dcd 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
@@ -39,12 +39,10 @@ import com.smartgwt.client.widgets.form.fields.SpacerItem;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.dashboard.DashboardPortlet;
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.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
@@ -63,7 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
@@ -75,7 +73,7 @@ import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
* @author Jay Shaughnessy
* @author Mike Thompson
*/
-public class ResourceGroupD3GraphPortlet extends ResourceMetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
+public class ResourceGroupD3GraphPortlet extends MetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "ResourceGroupMetricD3";
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 b99c200..1f305b5 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
@@ -57,7 +57,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.Log;
@@ -68,7 +68,7 @@ import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
* @author Jay Shaughnessy
* @author Mike Thompson
*/
-public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
+public class ResourceD3GraphPortlet extends MetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "ResourceMetricD3";
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
index f6b191a..c9ce8b7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
@@ -102,7 +102,6 @@ public final class MetricStackedBarGraph extends AbstractGraph {
}
function useSmallCharts() {
- console.info("Chart Width for : " + chartContext.chartHandle + " is " + getChartWidth());
return getChartWidth() <= smallChartThresholdInPixels;
}
@@ -112,7 +111,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// if window is too small server up small chart
if (useSmallCharts()) {
- console.log("Using Small Charts Profile");
+ console.log("Using Small Charts Profile for width: "+getChartWidth());
width = 250;
xTicks = 3;
xTickSubDivide = 2;
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 54466cf..4729c99 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
@@ -43,7 +43,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphLis
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.MetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.Log;
@@ -195,7 +195,7 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen
MetricGraphData metricGraphData = MetricGraphData.createForResourceGroup(resourceGroup.getId(),
resourceGroup.getName(), measurementDefinition, data );
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
- ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
+ MetricD3Graph graphView = new MetricD3Graph(graph);
graphView.setWidth("95%");
graphView.setHeight(MULTI_CHART_HEIGHT);
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 f66ea33..0c071c4 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
@@ -371,7 +371,7 @@ public class D3GraphListView extends AbstractD3GraphListView {
measurementDefinition, data, measurementOOBCompositeList );
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
- ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
+ MetricD3Graph graphView = new MetricD3Graph(graph);
graphView.setWidth("95%");
graphView.setHeight(height);
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
new file mode 100644
index 0000000..e0fcd87
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java
@@ -0,0 +1,165 @@
+/*
+ * 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.resource.detail.monitoring;
+
+import com.google.gwt.user.client.Timer;
+import com.smartgwt.client.widgets.HTMLFlow;
+
+import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
+import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
+
+/**
+ * A D3 graph implementation for graphing Resource metrics.
+ */
+public class MetricD3Graph extends EnhancedVLayout {
+
+ protected AbstractGraph graph;
+ private HTMLFlow graphDiv = null;
+ protected Timer refreshTimer;
+
+ /**
+ * This constructor is for the use case in the Dashboard where we dont actually
+ * have a entity or measurement yet.
+ */
+ public MetricD3Graph() {
+ super();
+ }
+
+ public MetricD3Graph(AbstractGraph graph) {
+ super();
+ this.graph = graph;
+ setHeight100();
+ setWidth100();
+ }
+
+ /**
+ * Svg definitions for patterns and gradients to use on SVG shapes.
+ * @return xml String
+ */
+ 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>"
+ + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
+ + " width=\"6\" height=\"3\">"
+ + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>"
+ + " </pattern>" + "</defs>";
+ }
+
+ @Override
+ protected void onDraw() {
+ super.onDraw();
+ if (graph.getDefinition() != null) {
+ drawGraph();
+ }
+ }
+
+ @Override
+ public void parentResized() {
+ super.parentResized();
+ removeMembers(getMembers());
+ drawGraph();
+ }
+
+ /**
+ * Setup the page elements especially the div and svg elements that serve as
+ * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
+ * Later the drawJsniGraph() is called to actually fill in the div/svg element
+ * created here with the actual svg element.
+ *
+ */
+ protected void drawGraph() {
+ Log.debug("drawGraph marker in MetricD3Graph for: " + getFullChartId() + " " + graph.getChartTitle());
+
+ StringBuilder divAndSvgDefs = new StringBuilder();
+ divAndSvgDefs
+ .append("<div id=\""
+ + getFullChartId()
+ + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
+ + getChartHeight() + "px;\">");
+ divAndSvgDefs.append(getSvgDefs());
+ divAndSvgDefs.append("</svg></div>");
+
+ if (null != graphDiv) {
+ removeMember(graphDiv);
+ }
+
+ graphDiv = new HTMLFlow(divAndSvgDefs.toString());
+ graphDiv.setWidth100();
+ graphDiv.setHeight100();
+ addMember(graphDiv);
+
+ new Timer() {
+ @Override
+ public void run() {
+ //@todo: this is a hack around timing issue of jsni not seeing the DOM
+ drawJsniChart();
+ }
+ }.schedule(200);
+ }
+
+ /**
+ * Delegate the call to rendering the JSNI chart.
+ * This way the chart type can be swapped out at any time.
+ */
+ public void drawJsniChart() {
+ graph.drawJsniChart();
+ }
+
+ public HasD3MetricJsniChart getJsniChart() {
+ return graph;
+ }
+
+ public String getFullChartId() {
+ return "rChart-" + graph.getMetricGraphData().getChartId();
+
+ }
+
+ public void setGraph(AbstractGraph graph) {
+ this.graph = graph;
+ }
+
+
+ public Integer getChartHeight() {
+ return graph.getMetricGraphData().getChartHeight();
+ }
+
+ @Override
+ public void destroy() {
+ super.destroy();
+ }
+
+ @Override
+ public void hide() {
+ super.hide();
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
deleted file mode 100644
index 055e6b6..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
+++ /dev/null
@@ -1,165 +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.resource.detail.monitoring;
-
-import com.google.gwt.user.client.Timer;
-import com.smartgwt.client.widgets.HTMLFlow;
-
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
-import org.rhq.enterprise.gui.coregui.client.util.Log;
-import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
-
-/**
- * A D3 graph implementation for graphing Resource metrics.
- */
-public class ResourceMetricD3Graph extends EnhancedVLayout {
-
- protected AbstractGraph graph;
- private HTMLFlow graphDiv = null;
- protected Timer refreshTimer;
-
- /**
- * This constructor is for the use case in the Dashboard where we dont actually
- * have a entity or measurement yet.
- */
- public ResourceMetricD3Graph() {
- super();
- }
-
- public ResourceMetricD3Graph(AbstractGraph graph) {
- super();
- this.graph = graph;
- setHeight100();
- setWidth100();
- }
-
- /**
- * Svg definitions for patterns and gradients to use on SVG shapes.
- * @return xml String
- */
- 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>"
- + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
- + " width=\"6\" height=\"3\">"
- + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>"
- + " </pattern>" + "</defs>";
- }
-
- @Override
- protected void onDraw() {
- super.onDraw();
- if (graph.getDefinition() != null) {
- drawGraph();
- }
- }
-
- @Override
- public void parentResized() {
- super.parentResized();
- removeMembers(getMembers());
- drawGraph();
- }
-
- /**
- * Setup the page elements especially the div and svg elements that serve as
- * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
- * Later the drawJsniGraph() is called to actually fill in the div/svg element
- * created here with the actual svg element.
- *
- */
- protected void drawGraph() {
- Log.debug("drawGraph marker in MetricD3Graph for: " + getFullChartId() + " " + graph.getChartTitle());
-
- StringBuilder divAndSvgDefs = new StringBuilder();
- divAndSvgDefs
- .append("<div id=\""
- + getFullChartId()
- + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
- + getChartHeight() + "px;\">");
- divAndSvgDefs.append(getSvgDefs());
- divAndSvgDefs.append("</svg></div>");
-
- if (null != graphDiv) {
- removeMember(graphDiv);
- }
-
- graphDiv = new HTMLFlow(divAndSvgDefs.toString());
- graphDiv.setWidth100();
- graphDiv.setHeight100();
- addMember(graphDiv);
-
- new Timer() {
- @Override
- public void run() {
- //@todo: this is a hack around timing issue of jsni not seeing the DOM
- drawJsniChart();
- }
- }.schedule(200);
- }
-
- /**
- * Delegate the call to rendering the JSNI chart.
- * This way the chart type can be swapped out at any time.
- */
- public void drawJsniChart() {
- graph.drawJsniChart();
- }
-
- public HasD3MetricJsniChart getJsniChart() {
- return graph;
- }
-
- public String getFullChartId() {
- return "rChart-" + graph.getMetricGraphData().getChartId();
-
- }
-
- public void setGraph(AbstractGraph graph) {
- this.graph = graph;
- }
-
-
- public Integer getChartHeight() {
- return graph.getMetricGraphData().getChartHeight();
- }
-
- @Override
- public void destroy() {
- super.destroy();
- }
-
- @Override
- public void hide() {
- super.hide();
- }
-
-}
commit 24f7106b1d0ef0ea29be73eb95382c92c3829eff
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Fri Apr 5 11:31:44 2013 -0700
Fix issue with Resource Group Charts and refactor class hierarchy to make it flatter by eliminating AbstractMetricD3GraphView and ResourceGroupMetricD3GraphView.
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 75e398e..64643cb 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
@@ -18,6 +18,12 @@
*/
package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.groups.graph;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.TitleOrientation;
@@ -33,8 +39,17 @@ import com.smartgwt.client.widgets.form.fields.SpacerItem;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.dashboard.DashboardPortlet;
+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.core.domain.resource.group.GroupCategory;
+import org.rhq.core.domain.resource.group.ResourceGroup;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem;
import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedEvent;
import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedHandler;
@@ -44,19 +59,23 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.ResourceGroupMetricD3GraphView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.Log;
+import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
/**
* @author Greg Hinkle
* @author Jay Shaughnessy
* @author Mike Thompson
*/
-public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView implements AutoRefreshPortlet, CustomSettingsPortlet {
+public class ResourceGroupD3GraphPortlet extends ResourceMetricD3Graph implements AutoRefreshPortlet, CustomSettingsPortlet {
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "ResourceGroupMetricD3";
@@ -71,7 +90,6 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
public static final String CFG_DEFINITION_ID = "definitionId";
public ResourceGroupD3GraphPortlet() {
- super(new MetricStackedBarGraph(MetricGraphData.createForDashboard(0)));
setOverflow(Overflow.HIDDEN);
}
@@ -90,7 +108,6 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
}
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
- Log.debug("ResourceGroupPortlet.configure");
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
@@ -104,15 +121,83 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
}
if (storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_GROUP_ID) != null) {
- Integer integerValue = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_GROUP_ID).getIntegerValue();
- if (integerValue != null)
- setEntityId(integerValue);
+ PropertySimple resourceIdProperty = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_GROUP_ID);
+ PropertySimple measurementDefIdProperty = storedPortlet.getConfiguration().getSimple(CFG_DEFINITION_ID);
+ if (resourceIdProperty != null && measurementDefIdProperty != null) {
+ final Integer entityId = resourceIdProperty.getIntegerValue();
+ final Integer measurementDefId = measurementDefIdProperty.getIntegerValue();
+ if (entityId != null && measurementDefId != null) {
+ queryResourceGroup(entityId, measurementDefId);
+ }
- PropertySimple propertySimple = storedPortlet.getConfiguration().getSimple(CFG_DEFINITION_ID);
- if (propertySimple != null && propertySimple.getIntegerValue() != null)
- setDefinitionId(propertySimple.getIntegerValue());
+ }
}
- Log.debug("ResourceGroupPortlet.configure.done");
+ }
+
+
+ private void queryResourceGroup(Integer entityId, final Integer measurementDefId) {
+ ResourceGroupGWTServiceAsync resourceService = GWTServiceLookup.getResourceGroupService();
+
+ ResourceGroupCriteria resourceCriteria = new ResourceGroupCriteria();
+ resourceCriteria.addFilterId(entityId);
+ resourceService.findResourceGroupsByCriteria(resourceCriteria, new AsyncCallback<PageList<ResourceGroup>>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_lookupFailed(), caught);
+ }
+
+ @Override
+ public void onSuccess(PageList<ResourceGroup> result) {
+ if (result.isEmpty()) {
+ return;
+ }
+ // only concerned with first resource since this is a query by id
+ final ResourceGroup resource = result.get(0);
+ HashSet<Integer> typesSet = new HashSet<Integer>();
+ typesSet.add(resource.getResourceType().getId());
+
+ ResourceTypeRepository.Cache.getInstance().getResourceTypes(
+ typesSet.toArray(new Integer[typesSet.size()]),
+ EnumSet.of(ResourceTypeRepository.MetadataType.measurements),
+ new ResourceTypeRepository.TypesLoadedCallback() {
+
+ @Override
+ public void onTypesLoaded(Map<Integer, ResourceType> types) {
+ ResourceType type = types.get(resource.getResourceType().getId());
+ for (final MeasurementDefinition def : type.getMetricDefinitions()) {
+ if (def.getId() == measurementDefId) {
+ Log.debug("Found portlet measurement definition !" + def);
+
+ getJsniChart().setEntityId(resource.getId());
+ getJsniChart().setEntityName(resource.getName());
+ getJsniChart().setDefinition(def);
+ final long startTime = System.currentTimeMillis();
+
+ GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroupForLast(
+ resource.getId(), new int[]{def.getId()}, 8, MeasurementUtils.UNIT_HOURS,
+ 60, new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_resource_monitor_graphs_loadFailed(), caught);
+ }
+
+ @Override
+ public void onSuccess(
+ final List<List<MeasurementDataNumericHighLowComposite>> measurementData) {
+ Log.debug("Dashboard Metric data in: "
+ + (System.currentTimeMillis() - startTime) + " ms.");
+ graph.getMetricGraphData().setMetricData(measurementData.get(0));
+ drawGraph();
+ }
+ });
+ break;
+ }
+ }
+ }
+ });
+ }
+ });
}
public Canvas getHelpCanvas() {
@@ -215,7 +300,7 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
DashboardPortlet storedPortlet = portletWindow.getStoredPortlet();
PropertySimple simple = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_GROUP_ID);
- if (simple == null | simple.getIntegerValue() == null) {
+ if (simple == null || simple.getIntegerValue() == null) {
addMember(new Label("<i>" + MSG.view_portlet_configure_needed() + "</i>"));
} else {
drawGraph();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
deleted file mode 100644
index 0a1155e..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 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;
-
-import com.google.gwt.user.client.Timer;
-import com.smartgwt.client.widgets.HTMLFlow;
-
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
-import org.rhq.enterprise.gui.coregui.client.util.Log;
-import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
-
-/**
- * Provide common functionality for graph views. Such as setting up the divs with
- * specific ids that the jsni svn graphs can bind to and place their svg definitions
- * of the charts directly under this chart div. Essentially, it creates the placeholder
- * for the graphs to later render themselves.
- *
- * @author Mike Thompson
- */
-public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
-
- protected AbstractGraph graph;
- private int entityId;
- private int definitionId;
- private HTMLFlow graphDiv = null;
- protected Timer refreshTimer;
-
- public AbstractMetricD3GraphView() {
- super();
- }
-
- public AbstractMetricD3GraphView(AbstractGraph graph) {
- this();
- this.graph = graph;
- setHeight100();
- setWidth100();
- }
-
- /**
- * Svg definitions for patterns and gradients to use on SVG shapes.
- * @return xml String
- */
- 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>"
- + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
- + " width=\"6\" height=\"3\">"
- + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>"
- + " </pattern>"
- + "</defs>";
- }
-
- @Override
- protected void onDraw() {
- super.onDraw();
- if (graph.getDefinition() != null) {
- drawGraph();
- }
- }
-
- @Override
- public void parentResized() {
- super.parentResized();
- removeMembers(getMembers());
- drawGraph();
- }
-
- public void setEntityId(int entityId) {
- this.entityId = entityId;
- }
-
- public void setDefinitionId(int definitionId) {
- this.definitionId = definitionId;
- }
-
- public int getEntityId() {
- return entityId;
- }
-
- public int getDefinitionId() {
- return definitionId;
- }
-
- /**
- * Setup the page elements especially the div and svg elements that serve as
- * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
- * Later the drawJsniGraph() is called to actually fill in the div/svg element
- * created here with the actual svg element.
- *
- */
- protected void drawGraph() {
- Log.debug("drawGraph marker in AbstractMetricD3GraphView for: " + getFullChartId() + " "
- + graph.getChartTitle());
-
- StringBuilder divAndSvgDefs = new StringBuilder();
- divAndSvgDefs
- .append("<div id=\""
- + getFullChartId()
- + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
- + getChartHeight() + "px;\">");
- divAndSvgDefs.append(getSvgDefs());
- divAndSvgDefs.append("</svg></div>");
-
- if (null != graphDiv) {
- removeMember(graphDiv);
- }
-
- graphDiv = new HTMLFlow(divAndSvgDefs.toString());
- graphDiv.setWidth100();
- graphDiv.setHeight100();
- addMember(graphDiv);
-
- new Timer() {
- @Override
- public void run() {
- //@todo: this is a hack around timing issue of jsni not seeing the DOM
- drawJsniChart();
- }
- }.schedule(200);
- }
-
- public String getFullChartId(){
- return "rChart-"+ graph.getMetricGraphData().getChartId();
-
- }
- public void setGraph(AbstractGraph graph) {
- this.graph = graph;
- }
-
- public abstract void drawJsniChart();
-
-
- public Integer getChartHeight() {
- return graph.getMetricGraphData().getChartHeight();
- }
-
-
- /**
- * This is only necessary to set this for the ResourceGraphPortlet case where
- * configuration is deferred.
- * @param metricGraphData
- */
- public void setMetricGraphData(MetricGraphData metricGraphData) {
- graph.setMetricGraphData(metricGraphData);
- }
-
- @Override
- public void destroy() {
- super.destroy();
- }
-
- @Override
- public void hide() {
- super.hide();
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
index 0b8cf7a..c921acf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
@@ -61,7 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
/**
* @author Greg Hinkle
* @author Jay Shaughnessy
- * @deprecated see AbstractMetricD3GraphView
+ * @deprecated this code will go away once D3 graphs have been validated.
*/
@Deprecated
public abstract class AbstractMetricGraphView extends EnhancedVLayout {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
index 4ec734b..cfd904d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
@@ -267,7 +267,7 @@ public class MetricGraphData implements JsonMetricProducer {
*/
public String getYAxisUnits() {
if (adjustedMeasurementUnits == null) {
- Log.warn("AbstractMetricD3GraphView.adjustedMeasurementUnits is populated by getJsonMetrics. Make sure it is called first.");
+ Log.warn("ResourceMetricD3GraphView.adjustedMeasurementUnits is populated by getJsonMetrics. Make sure it is called first.");
return "";
} else {
return adjustedMeasurementUnits.toString();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java
deleted file mode 100644
index a436aa0..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java
+++ /dev/null
@@ -1,133 +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;
-
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-import org.rhq.core.domain.criteria.ResourceCriteria;
-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.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.gwt.ResourceGWTServiceAsync;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricD3GraphView;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
-import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
-
-public class ResourceGroupMetricD3GraphView extends AbstractMetricD3GraphView {
-
-
-
- public ResourceGroupMetricD3GraphView(AbstractGraph graph) {
- super(graph);
- }
-
- protected void drawGraph() {
- if (null == graph.getMetricGraphData().getDefinition()) {
-
- ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService();
-
- ResourceCriteria resourceCriteria = new ResourceCriteria();
- resourceCriteria.addFilterId(graph.getMetricGraphData().getEntityId());
- resourceService.findResourcesByCriteria(resourceCriteria, new AsyncCallback<PageList<Resource>>() {
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_lookupFailed(), caught);
- }
-
- @Override
- public void onSuccess(PageList<Resource> result) {
- if (result.isEmpty()) {
- return;
- }
-
- final Resource resource = result.get(0);
- HashSet<Integer> typesSet = new HashSet<Integer>();
- typesSet.add(resource.getResourceType().getId());
- HashSet<String> ancestries = new HashSet<String>();
- ancestries.add(resource.getAncestry());
- // In addition to the types of the result resources, get the types of their ancestry
- typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries));
-
- ResourceTypeRepository.Cache.getInstance().getResourceTypes(
- typesSet.toArray(new Integer[typesSet.size()]),
- EnumSet.of(ResourceTypeRepository.MetadataType.measurements),
- new ResourceTypeRepository.TypesLoadedCallback() {
-
- @Override
- public void onTypesLoaded(Map<Integer, ResourceType> types) {
-
- ResourceType type = types.get(resource.getResourceType().getId());
- for (MeasurementDefinition def : type.getMetricDefinitions()) {
- if (def.getId() == graph.getMetricGraphData().getDefinitionId()) {
- graph.getMetricGraphData().setDefinition(def);
-
- GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast(
- graph.getEntityId(),
- new int[] { graph.getMetricGraphData().getDefinitionId() }, 8,
- MeasurementUtils.UNIT_HOURS, 60,
- new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- MSG.view_resource_monitor_graphs_loadFailed(), caught);
- }
-
- @Override
- public void onSuccess(
- List<List<MeasurementDataNumericHighLowComposite>> result) {
- graph.getMetricGraphData().setMetricData(result.get(0));
-
- drawGraph();
- }
- });
- }
- }
- }
- });
- }
- });
-
- } else {
- drawGraph();
- }
- }
-
- @Override
- /**
- * Delegate the call to rendering the JSNI chart.
- * This way the chart type can be swapped out at any time.
- */
- public void drawJsniChart() {
- graph.drawJsniChart();
- }
-
-
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
index 962c341..055e6b6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
@@ -18,14 +18,22 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricD3GraphView;
+import com.google.gwt.user.client.Timer;
+import com.smartgwt.client.widgets.HTMLFlow;
+
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
+import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
/**
* A D3 graph implementation for graphing Resource metrics.
*/
-public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
+public class ResourceMetricD3Graph extends EnhancedVLayout {
+
+ protected AbstractGraph graph;
+ private HTMLFlow graphDiv = null;
+ protected Timer refreshTimer;
/**
* This constructor is for the use case in the Dashboard where we dont actually
@@ -36,13 +44,88 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
}
public ResourceMetricD3Graph(AbstractGraph graph) {
-
- super(graph);
+ super();
+ this.graph = graph;
+ setHeight100();
+ setWidth100();
}
+ /**
+ * Svg definitions for patterns and gradients to use on SVG shapes.
+ * @return xml String
+ */
+ 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>"
+ + " <pattern id=\"downStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\""
+ + " width=\"6\" height=\"3\">"
+ + " <path d=\"M 0 0 6 0\" style=\"stroke:#ff8a9a; fill:none;\"/>"
+ + " </pattern>" + "</defs>";
+ }
+ @Override
+ protected void onDraw() {
+ super.onDraw();
+ if (graph.getDefinition() != null) {
+ drawGraph();
+ }
+ }
@Override
+ public void parentResized() {
+ super.parentResized();
+ removeMembers(getMembers());
+ drawGraph();
+ }
+
+ /**
+ * Setup the page elements especially the div and svg elements that serve as
+ * placeholders for the d3 stuff to grab onto and add svg tags to render the chart.
+ * Later the drawJsniGraph() is called to actually fill in the div/svg element
+ * created here with the actual svg element.
+ *
+ */
+ protected void drawGraph() {
+ Log.debug("drawGraph marker in MetricD3Graph for: " + getFullChartId() + " " + graph.getChartTitle());
+
+ StringBuilder divAndSvgDefs = new StringBuilder();
+ divAndSvgDefs
+ .append("<div id=\""
+ + getFullChartId()
+ + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
+ + getChartHeight() + "px;\">");
+ divAndSvgDefs.append(getSvgDefs());
+ divAndSvgDefs.append("</svg></div>");
+
+ if (null != graphDiv) {
+ removeMember(graphDiv);
+ }
+
+ graphDiv = new HTMLFlow(divAndSvgDefs.toString());
+ graphDiv.setWidth100();
+ graphDiv.setHeight100();
+ addMember(graphDiv);
+
+ new Timer() {
+ @Override
+ public void run() {
+ //@todo: this is a hack around timing issue of jsni not seeing the DOM
+ drawJsniChart();
+ }
+ }.schedule(200);
+ }
+
/**
* Delegate the call to rendering the JSNI chart.
* This way the chart type can be swapped out at any time.
@@ -55,5 +138,28 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
return graph;
}
+ public String getFullChartId() {
+ return "rChart-" + graph.getMetricGraphData().getChartId();
+
+ }
+
+ public void setGraph(AbstractGraph graph) {
+ this.graph = graph;
+ }
+
+
+ public Integer getChartHeight() {
+ return graph.getMetricGraphData().getChartHeight();
+ }
+
+ @Override
+ public void destroy() {
+ super.destroy();
+ }
+
+ @Override
+ public void hide() {
+ super.hide();
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
index 9a3404d..099f23a 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
+++ b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
@@ -2,7 +2,7 @@
* CSS for the d3 SVG charts. This is SVG css not HTML css so some elements
* may look different from standard CSS.
* NOTE: the SVG <defs> section that contains gradients etc. is in the
- * java class : /org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
+ * java class : /org/rhq/enterprise/gui/coregui/client/inventory/common/ResourceMetricD3Graph.java
*
*/
1
0
05 Apr '13
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java | 23 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java | 24 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 30 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java | 65 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java | 227 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 120 ++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java | 28 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 8
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 | 4
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/gui/coregui/src/main/webapp/js/rhq.js | 12
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java | 22
pom.xml | 1
25 files changed, 416 insertions(+), 212 deletions(-)
New commits:
commit b9956dbed235bfd22b5e4d835f4d07f7fcd92bc4
Merge: 8d8502a bc49781
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Apr 5 12:31:07 2013 -0400
Merge remote-tracking branch 'origin/master' into bug/rhq-1
commit 8d8502a8c2f31a4287b208d45bfcd7f9c86fdb9d
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Apr 5 12:29:45 2013 -0400
BZ 535289 - add "view ignored resources" page with unignore button
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java
index e8a5e0f..d6ee165 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java
@@ -60,6 +60,7 @@ public class ResourceCriteria extends TaggedCriteria {
private String filterParentResourceName; // needs overrides
private Integer filterParentResourceTypeId; // needs overrides
private ResourceCategory filterParentResourceCategory; // needs overrides
+ private List<InventoryStatus> filterParentInventoryStatuses; // needs overrides
private String filterAgentName; // needs overrides
private Integer filterAgentId; // needs overrides
private AvailabilityType filterCurrentAvailability; // needs overrides
@@ -140,6 +141,7 @@ public class ResourceCriteria extends TaggedCriteria {
filterOverrides.put("rootResourceId", "agent.id = (SELECT r2.agent.id FROM Resource r2 where r2.id = ?)");
filterOverrides.put("resourceTypeIds", "resourceType.id IN (?)");
filterOverrides.put("inventoryStatuses", "inventoryStatus IN ( ? )");
+ filterOverrides.put("parentInventoryStatuses", "parentResource.inventoryStatus IN ( ? )");
sortOverrides.put("resourceTypeName", "resourceType.name");
sortOverrides.put("resourceCategory", "resourceType.category");
@@ -227,6 +229,10 @@ public class ResourceCriteria extends TaggedCriteria {
this.filterParentResourceCategory = filterParentResourceCategory;
}
+ public void addFilterParentInventoryStatuses(List<InventoryStatus> filterParentInventoryStatuses) {
+ this.filterParentInventoryStatuses = filterParentInventoryStatuses;
+ }
+
public void addFilterAgentName(String filterAgentName) {
this.filterAgentName = filterAgentName;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
index dea213e..81fef22 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
@@ -141,6 +141,11 @@ public class InventoryView extends AbstractSectionedLeftNavigationView {
return new ResourceSearchViewWrapper(viewName, initialCriteria, viewName.getIcon().getIcon24x24Path());
}
+ private ResourceSearchView createIgnoredResourceSearchView(ViewName viewName, Criteria initialCriteria) {
+ return new ResourceSearchViewWrapper(false, true, viewName, initialCriteria, viewName.getIcon()
+ .getIcon24x24Path());
+ }
+
private NavigationSection buildResourcesSection() {
NavigationItem autodiscoveryQueueItem = new NavigationItem(ResourceAutodiscoveryView.VIEW_ID,
new ViewFactory() {
@@ -197,8 +202,10 @@ public class InventoryView extends AbstractSectionedLeftNavigationView {
public Canvas createView() {
Criteria initialCriteria = new Criteria(ResourceDataSourceField.INVENTORY_STATUS.propertyName(),
InventoryStatus.IGNORED.name());
+ initialCriteria.addCriteria(ResourceDataSourceField.PARENT_INVENTORY_STATUS.propertyName(),
+ InventoryStatus.COMMITTED.name());
- return createResourceSearchView(PAGE_IGNORED_RESOURCES, initialCriteria);
+ return createIgnoredResourceSearchView(PAGE_IGNORED_RESOURCES, initialCriteria);
}
});
@@ -262,15 +269,34 @@ public class InventoryView extends AbstractSectionedLeftNavigationView {
private ViewName viewName;
+ private final boolean showIgnoreButton;
+ private final boolean showUnignoreButton;
+
public ResourceSearchViewWrapper(ViewName viewName, Criteria criteria, String... headerIcons) {
+ this(true, false, viewName, criteria, headerIcons);
+ }
+
+ public ResourceSearchViewWrapper(boolean showIgnoredButton, boolean showUnignoreButton, ViewName viewName,
+ Criteria criteria, String... headerIcons) {
super(criteria, viewName.getTitle(), headerIcons);
this.viewName = viewName;
+ this.showIgnoreButton = showIgnoredButton;
+ this.showUnignoreButton = showUnignoreButton;
}
@Override
public ViewName getViewName() {
return viewName;
}
- }
+ @Override
+ protected boolean shouldShowIgnoreButton() {
+ return this.showIgnoreButton;
+ }
+
+ @Override
+ protected boolean shouldShowUnignoreButton() {
+ return this.showUnignoreButton;
+ }
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java
index d54b857..3ae39d9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java
@@ -56,7 +56,9 @@ public enum ResourceDataSourceField {
MODIFIER("modifiedBy", CoreGUI.getMessages().dataSource_resources_field_lastModifier()),
- INVENTORY_STATUS("inventoryStatus", CoreGUI.getMessages().common_title_inventoryStatus());
+ INVENTORY_STATUS("inventoryStatus", CoreGUI.getMessages().common_title_inventoryStatus()),
+
+ PARENT_INVENTORY_STATUS("parentResource.inventoryStatus", "parent resource inventory status"); // this is not for display
/**
* Corresponds to a property name of Resource (e.g. resourceType.name).
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
index 61e6e6f..715cd5f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
@@ -29,11 +29,13 @@ import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceD
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.MODIFIER;
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.MTIME;
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.NAME;
+import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.PARENT_INVENTORY_STATUS;
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.PLUGIN;
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.TYPE;
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.TYPE_ID;
import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.VERSION;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -270,6 +272,14 @@ public class ResourceDatasource extends RPCDataSource<Resource, ResourceCriteria
criteria.addFilterInventoryStatus(invStatusFilter);
}
+ InventoryStatus parentInvStatusFilter = getFilter(request, PARENT_INVENTORY_STATUS.propertyName(),
+ InventoryStatus.class);
+ if (parentInvStatusFilter != null) {
+ List<InventoryStatus> statuses = new ArrayList<InventoryStatus>(1);
+ statuses.add(parentInvStatusFilter);
+ criteria.addFilterParentInventoryStatuses(statuses);
+ }
+
//@todo: Remove me when finished debugging search expression
Log.debug(" *** ResourceCriteria Search String: " + getFilter(request, "search", String.class));
criteria.setSearchExpression(getFilter(request, "search", String.class));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index 719bbb7..80f5c31 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -197,7 +197,7 @@ public class ResourceSearchView extends Table {
public void onSuccess(List<Integer> result) {
CoreGUI.getMessageCenter().notify(
new Message(MSG.view_inventory_resources_uninventorySuccessful(), Severity.Info));
- onUninventorySuccess();
+ onActionSuccess();
}
});
}
@@ -262,7 +262,7 @@ public class ResourceSearchView extends Table {
new Message(
MSG.view_inventory_resources_disableSuccessful(String.valueOf(result.size())),
Severity.Info));
- onUninventorySuccess();
+ onActionSuccess();
}
});
}
@@ -327,12 +327,66 @@ public class ResourceSearchView extends Table {
new Message(
MSG.view_inventory_resources_enableSuccessful(String.valueOf(result.size())),
Severity.Info));
- onUninventorySuccess();
+ onActionSuccess();
}
});
}
});
+ if (shouldShowIgnoreButton()) {
+ addIgnoreButton();
+ }
+
+ if (shouldShowUnignoreButton()) {
+ addUnignoreButton();
+ }
+
+ if (exportable) {
+ addExportAction();
+ }
+
+ setListGridDoubleClickHandler(new DoubleClickHandler() {
+ public void onDoubleClick(DoubleClickEvent event) {
+ ListGrid listGrid = (ListGrid) event.getSource();
+ ListGridRecord[] selectedRows = listGrid.getSelectedRecords();
+ if (selectedRows != null && selectedRows.length == 1) {
+ String invStatus = selectedRows[0].getAttribute(INVENTORY_STATUS.propertyName());
+ if (InventoryStatus.COMMITTED == InventoryStatus.valueOf(invStatus)) {
+ String selectedId = selectedRows[0].getAttribute("id");
+ CoreGUI.goToView(LinkManager.getResourceLink(Integer.valueOf(selectedId)));
+ }
+ }
+ }
+ });
+ }
+
+ /**
+ * If returns true, the ignore button will be added to the list of table buttons.
+ * Subclasses can remove the ignore button by overriding this and returning false.
+ * The only time you normally do not want an ignore button is if you know your
+ * criteria will only ever show ignored resources (in which case, its useless
+ * showing an ignore button since everything will already have been ignored).
+ */
+ protected boolean shouldShowIgnoreButton() {
+ return true; // by default, show the ignore button
+ }
+
+ /**
+ * If returns true, the unignore button will be added to the list of table buttons.
+ * Subclasses can add the unignore button by overriding this and returning true.
+ * The only time you normally want an unignore button is if you know your
+ * criteria will only ever show ignored resources (so it makes sense to allow someone
+ * to unignore those resources).
+ */
+ protected boolean shouldShowUnignoreButton() {
+ return false; // by default, do not show the unignore button
+ }
+
+ /**
+ * Adds an ignore button to the list of table buttons. Subclasses normally do not have to override
+ * this - instead, look at {@link #shouldShowIgnoreButton()}.
+ */
+ protected void addIgnoreButton() {
addTableAction(MSG.common_button_ignore(), MSG.view_inventory_resources_ignoreConfirm(),
new ResourceAuthorizedTableAction(ResourceSearchView.this, TableActionEnablement.ANY,
Permission.DELETE_RESOURCE, new RecordExtractor<Integer>() {
@@ -424,31 +478,59 @@ public class ResourceSearchView extends Table {
msg = MSG.view_inventory_resources_ignoreSuccessful();
}
CoreGUI.getMessageCenter().notify(new Message(msg, Severity.Info));
- onUninventorySuccess(); // do the same thing as if we uninventoried the resource
+ onActionSuccess(); // do the same thing as if we uninventoried the resource
}
});
return;
}
});
+ }
- if (exportable) {
- addExportAction();
- }
+ /**
+ * Adds an unignore button to the list of table buttons. Subclasses normally do not have to override
+ * this - instead, look at {@link #shouldShowUnignoreButton()}.
+ */
+ protected void addUnignoreButton() {
+ addTableAction(MSG.common_button_unignore(), MSG.view_inventory_resources_unignoreConfirm(),
+ new ResourceAuthorizedTableAction(ResourceSearchView.this, TableActionEnablement.ANY,
+ Permission.DELETE_RESOURCE, new RecordExtractor<Integer>() {
+ public Collection<Integer> extract(Record[] records) {
+ List<Integer> result = new ArrayList<Integer>(records.length);
+ for (Record record : records) {
+ result.add(record.getAttributeAsInt("id"));
+ }
- setListGridDoubleClickHandler(new DoubleClickHandler() {
- public void onDoubleClick(DoubleClickEvent event) {
- ListGrid listGrid = (ListGrid) event.getSource();
- ListGridRecord[] selectedRows = listGrid.getSelectedRecords();
- if (selectedRows != null && selectedRows.length == 1) {
- String invStatus = selectedRows[0].getAttribute(INVENTORY_STATUS.propertyName());
- if (InventoryStatus.COMMITTED == InventoryStatus.valueOf(invStatus)) {
- String selectedId = selectedRows[0].getAttribute("id");
- CoreGUI.goToView(LinkManager.getResourceLink(Integer.valueOf(selectedId)));
+ return result;
}
+ }) {
+
+ public void executeAction(final ListGridRecord[] selection, Object actionValue) {
+ if (selection == null || selection.length == 0) {
+ return; // should never happen, but ignore it if it does
+ }
+
+ int[] resourceIds = TableUtility.getIds(selection);
+
+ // ask the server to unignore the selected resources
+ ResourceGWTServiceAsync resourceManager = GWTServiceLookup.getResourceService();
+ resourceManager.unignoreResources(resourceIds, new AsyncCallback<Void>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler()
+ .handleError(MSG.view_inventory_resources_unignoreFailed(), caught);
+ refreshTableInfo();
+ }
+
+ public void onSuccess(Void result) {
+ String msg = MSG.view_inventory_resources_unignoreSuccessful();
+ CoreGUI.getMessageCenter().notify(new Message(msg, Severity.Info));
+ onActionSuccess();
+ }
+ });
+
+ return;
}
- }
- });
+ });
}
private void addExportAction() {
@@ -479,7 +561,7 @@ public class ResourceSearchView extends Table {
});
}
- protected void onUninventorySuccess() {
+ protected void onActionSuccess() {
refresh(true);
// the group type may have changed
CoreGUI.refresh();
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 d8edf33..84522ad 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
@@ -61,6 +61,7 @@ common_button_schedule = Schedule
common_button_search = Search
common_button_set = Set
common_button_showDetails = Show Details...
+common_button_unignore = Unignore
common_button_uninventory = Uninventory
common_calendar_april_short = apr
common_calendar_august_short = aug
@@ -1691,13 +1692,16 @@ view_inventory_resources_enableConfirm = Are you sure you want to enable the sel
view_inventory_resources_enableFailed = Failed to enable the selected resources.
view_inventory_resources_enableSuccessful = You have successfully enabled the selected resources and their children, [{0}] resources.
view_inventory_resources_ignoreConfirm = Are you sure you want the selected resources to be ignored? They will no longer show up in inventory.
-view_inventory_resources_ignoreFailed = Failed to ignore Resources
+view_inventory_resources_ignoreFailed = Failed to ignore resources
view_inventory_resources_ignoreSkipAllPlatforms = You cannot ignore platforms. All of your selections are platforms so nothing will be done. If you no longer want to manage a platform, shutdown its associated agent and uninventory the platform.
view_inventory_resources_ignoreSkipSomePlatforms = You cannot ignore platforms. The [{0}] platforms you selected will be skipped. If you no longer want to manage a platform, shutdown its associated agent and uninventory the platform.
-view_inventory_resources_ignoreSuccessful = You have successfully ignored the selected Resources.
+view_inventory_resources_ignoreSuccessful = You have successfully ignored the selected resources.
view_inventory_resources_ignoreSuccessfulSkipPlatforms = You have successfully ignored some of the selected resources, however, the [{0}] platforms you selected were skipped. Platforms cannot be ignored. If you no longer want to manage a platform, shutdown its associated agent and uninventory the platform.
view_inventory_resources_loadFailed = Failed to load resource composite data
view_inventory_resources_members = Member Resources
+view_inventory_resources_unignoreConfirm = Are you sure you want the selected resources to be unignored? This will bring them back into inventory and you will see them again.
+view_inventory_resources_unignoreFailed = Failed to unignore resources
+view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources.
view_inventory_resources_uninventoryConfirm = Are you sure you want to uninventory the selected resources? Note that if a selected resource still exists, then it will get rediscovered during its agent''s next discovery scan.
view_inventory_resources_uninventoryFailed = Failed to uninventory the selected resources
view_inventory_resources_uninventorySuccessful = You have successfully uninventoried the selected resources
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 f95f57f..049c9fb 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
@@ -84,6 +84,7 @@ common_button_schedule = Naplánovat
common_button_search = Prohledat
common_button_set = Nastavit
common_button_showDetails = Zobrazi detaily...
+##common_button_unignore = Unignore
common_button_uninventory = Odstranit z inventáře
common_calendar_april_short = dub
common_calendar_august_short = srp
@@ -1711,6 +1712,9 @@ view_inventory_resources_ignoreSuccessful = Vybrané zdroje byly úspěšně ign
##view_inventory_resources_ignoreSuccessfulSkipPlatforms = You have successfully ignored some of the selected resources, however, the [{0}] platforms you selected were skipped. Platforms cannot be ignored. If you no longer want to manage a platform, shutdown its associated agent and uninventory the platform.
view_inventory_resources_loadFailed = Nepodařilo se načíst složená data zdroje
view_inventory_resources_members = Členské zdroje
+##view_inventory_resources_unignoreConfirm = Are you sure you want the selected resources to be unignored? This will bring them back into inventory and you will see them again.
+##view_inventory_resources_unignoreFailed = Failed to unignore resources
+##view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources.
view_inventory_resources_uninventoryConfirm = Chcete opravdu odstranit vybrané zdroje z inventáře? Pozn. pokud odstraněný zdroj stále existuje, bude znovuobjeven v příští fázi skenování agentem.
view_inventory_resources_uninventoryFailed = Nepodařilo se odstranit vybraný zdroj z inventáře
view_inventory_resources_uninventorySuccessful = Úspěšně jste odstranili z inventáře vybraný zdroj
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 f1f3889..1195584 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
@@ -64,6 +64,7 @@ common_button_schedule = Planen
common_button_search = Suchen
common_button_set = Setzen
common_button_showDetails = Details anzeigen...
+##common_button_unignore = Unignore
common_button_uninventory = Aus dem Inventar löschen
common_calendar_april_short = Apr
common_calendar_august_short = Aug
@@ -1489,6 +1490,9 @@ view_inventory_resources_ignoreSuccessful = Sie haben die ausgewählten Ressourc
##view_inventory_resources_ignoreSuccessfulSkipPlatforms = You have successfully ignored some of the selected resources, however, the [{0}] platforms you selected were skipped. Platforms cannot be ignored. If you no longer want to manage a platform, shutdown its associated agent and uninventory the platform.
##view_inventory_resources_loadFailed = Failed to load resource composite data
##view_inventory_resources_members = Member Resources
+##view_inventory_resources_unignoreConfirm = Are you sure you want the selected resources to be unignored? This will bring them back into inventory and you will see them again.
+##view_inventory_resources_unignoreFailed = Failed to unignore resources
+##view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources.
view_inventory_sectionHelp = In diesem Abschnitt können neu gefundene Ressourcen, sowie Ressourcen und Gruppen im Inventar angesehen und verwaltet werden.
view_inventory_servers = Server
view_inventory_serversTop = Server auf Plattform-Ebene
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 ba91233..e17e3ad 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
@@ -64,6 +64,7 @@ common_button_schedule = スケジュール
common_button_search = 検索
common_button_set = 設定
common_button_showDetails = 詳細表示...
+##common_button_unignore = Unignore
common_button_uninventory = アンインベントリ
common_calendar_april_short = 4月
common_calendar_august_short = 8月
@@ -1683,6 +1684,9 @@ view_inventory_resources_ignoreSuccessful = 選択したリソースを無視す
##view_inventory_resources_ignoreSuccessfulSkipPlatforms = You have successfully ignored some of the selected resources, however, the [{0}] platforms you selected were skipped. Platforms cannot be ignored. If you no longer want to manage a platform, shutdown its associated agent and uninventory the platform.
view_inventory_resources_loadFailed = リソース合成データのロードに失敗しました
view_inventory_resources_members = メンバーリソース
+##view_inventory_resources_unignoreConfirm = Are you sure you want the selected resources to be unignored? This will bring them back into inventory and you will see them again.
+##view_inventory_resources_unignoreFailed = Failed to unignore resources
+##view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources.
view_inventory_resources_uninventoryConfirm = 選択したリソースをアンインベントリしてもよろしいですか? もし選択したリソースがまだ存在しているなら、そのエージェントの次回のディスカバリスキャンの間にそれは再発見されます。
view_inventory_resources_uninventoryFailed = 選択されたリソースのアンインベントリに失敗しました
view_inventory_resources_uninventorySuccessful = 選択されたリソースのアンインベントリに成功しました
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 638ff8b..258b90e 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
@@ -61,6 +61,7 @@ common_button_schedule = 일정
common_button_search = 검색
common_button_set = 설정
common_button_showDetails = 자세히보기...
+##common_button_unignore = Unignore
common_button_uninventory = 인벤토리 제거
common_calendar_april_short = 4월
common_calendar_august_short = 8월
@@ -1408,6 +1409,9 @@ view_inventory_resources_ignoreSuccessful = 선택한 리소스를 무시하는
##view_inventory_resources_ignoreSuccessfulSkipPlatforms = You have successfully ignored some of the selected resources, however, the [{0}] platforms you selected were skipped. Platforms cannot be ignored. If you no longer want to manage a platform, shutdown its associated agent and uninventory the platform.
view_inventory_resources_loadFailed = 리소스 합성 데이터 로드에 실패했습니다
view_inventory_resources_members = 멤버 리소스
+##view_inventory_resources_unignoreConfirm = Are you sure you want the selected resources to be unignored? This will bring them back into inventory and you will see them again.
+##view_inventory_resources_unignoreFailed = Failed to unignore resources
+##view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources.
view_inventory_resources_uninventoryConfirm = 선택한 리소스를 인벤토리에서 제거하시겠습니까? 만약 선택한 리소스가 존재하고 있다면, 그 에이전트의 다음 디스커버리 스캔 사이에 그것은 재발견됩니다.
view_inventory_resources_uninventoryFailed = 선택된 리소스 인벤토리 제거에 실패했습니다
view_inventory_resources_uninventorySuccessful = 선택된 리소스의 인벤토리 제거에 성공했습니다
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 3c9c070..35499a6 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
@@ -61,6 +61,7 @@ common_button_schedule = Agendar
common_button_search = Procurar
common_button_set = Definir
common_button_showDetails = Mostrar Detalhes...
+##common_button_unignore = Unignore
common_button_uninventory = Remover do Invent\u00E1rio
common_calendar_april_short = abr
common_calendar_august_short = ago
@@ -1708,6 +1709,9 @@ view_inventory_resources_ignoreSuccessful = Os recursos selecionados foram ignor
##view_inventory_resources_ignoreSuccessfulSkipPlatforms = You have successfully ignored some of the selected resources, however, the [{0}] platforms you selected were skipped. Platforms cannot be ignored. If you no longer want to manage a platform, shutdown its associated agent and uninventory the platform.
##view_inventory_resources_loadFailed = Failed to load resource composite data
##view_inventory_resources_members = Member Resources
+##view_inventory_resources_unignoreConfirm = Are you sure you want the selected resources to be unignored? This will bring them back into inventory and you will see them again.
+##view_inventory_resources_unignoreFailed = Failed to unignore resources
+##view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources.
##view_inventory_resources_uninventoryConfirm = Are you sure you want to uninventory the selected resources? Note that if a selected resource still exists, then it will get rediscovered during its agent''s next discovery scan.
##view_inventory_resources_uninventoryFailed = Failed to uninventory the selected resources
##view_inventory_resources_uninventorySuccessful = You have successfully uninventoried the selected resources
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 ba7015a..05b1859 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
@@ -2167,6 +2167,7 @@ common_button_schedule = Планировщик
common_button_search = Поиск
common_button_set = Установить
common_button_showDetails = Показать детали...
+##common_button_unignore = Unignore
common_button_uninventory = Убрать из инвентария
common_calendar_april_short = апр
common_calendar_august_short = авг
@@ -2687,6 +2688,9 @@ view_group_detail_implicitAvail = Group availability for all members (includes r
##view_inventory_resources_ignoreSkipSomePlatforms = You cannot ignore platforms. The [{0}] platforms you selected will be skipped. If you no longer want to manage a platform, shutdown its associated agent and uninventory the platform.
##view_inventory_resources_ignoreSuccessful = You have successfully ignored the selected Resources.
##view_inventory_resources_ignoreSuccessfulSkipPlatforms = You have successfully ignored some of the selected resources, however, the [{0}] platforms you selected were skipped. Platforms cannot be ignored. If you no longer want to manage a platform, shutdown its associated agent and uninventory the platform.
+##view_inventory_resources_unignoreConfirm = Are you sure you want the selected resources to be unignored? This will bring them back into inventory and you will see them again.
+##view_inventory_resources_unignoreFailed = Failed to unignore resources
+##view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources.
##view_messageCenter_messageRootCause = Root Cause
##view_operationHistoryList_cancelConfirm = Are you sure you want to cancel the selected operations? NOTE: Only those selected operations that are currently "in progress" will be attempted to be canceled.
##view_operationHistoryList_cancelFailure = The cancel request failed for the operation with the history ID of [{0}].
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 e3e92a1..4b2c27e 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
@@ -61,6 +61,7 @@ common_button_schedule = \u8ba1\u5212
common_button_search = \u68c0\u7d22
common_button_set = Set
common_button_showDetails = \u67e5\u770b\u8be6\u60c5...
+##common_button_unignore = Unignore
common_button_uninventory = Uninventory
common_calendar_april_short = \u56db\u6708
common_calendar_august_short = \u516b\u6708
@@ -1684,6 +1685,9 @@ view_inventory_resources_ignoreSuccessful = \u6210\u529f\u5ffd\u7565\u9009\u5b9a
##view_inventory_resources_ignoreSuccessfulSkipPlatforms = You have successfully ignored some of the selected resources, however, the [{0}] platforms you selected were skipped. Platforms cannot be ignored. If you no longer want to manage a platform, shutdown its associated agent and uninventory the platform.
view_inventory_resources_loadFailed = \u52a0\u8f7d\u8d44\u6e90\u7ec4\u5408\u6570\u636e\u5931\u8d25
view_inventory_resources_members = \u6210\u5458\u8d44\u6e90
+##view_inventory_resources_unignoreConfirm = Are you sure you want the selected resources to be unignored? This will bring them back into inventory and you will see them again.
+##view_inventory_resources_unignoreFailed = Failed to unignore resources
+##view_inventory_resources_unignoreSuccessful = You have successfully unignored the selected resources.
view_inventory_resources_uninventoryConfirm = \u786e\u5b9a\u628a\u9009\u4e2d\u7684\u8d44\u6e90\u4ece\u6e05\u5355\u4e2d\u5220\u9664? \u6ce8\u610f\uff1a\u5982\u679c\u67d0\u4e2a\u9009\u4e2d\u7684\u8d44\u6e90\u4f9d\u7136\u5b58\u5728, \u5219\u7cfb\u7edf\u4f1a\u5728\u6b64\u8d44\u6e90\u7684\u5ba2\u6237\u7aef\u7a0b\u5e8f\u4e0b\u6b21\u63a2\u7d22\u626b\u63cf\u65f6\u91cd\u65b0\u52a0\u8f7d\u6b64\u8d44\u6e90.
view_inventory_resources_uninventoryFailed = \u4ece\u6e05\u5355\u4e2d\u5220\u9664\u9009\u4e2d\u7684\u8d44\u6e90\u5931\u8d25
view_inventory_resources_uninventorySuccessful = \u6210\u529f\u4ece\u6e05\u5355\u4e2d\u5220\u9664\u9009\u4e2d\u7684\u8d44\u6e90
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
index 9c3e007..49e1924 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java
@@ -57,6 +57,7 @@ import org.xml.sax.InputSource;
import org.rhq.core.clientapi.agent.discovery.DiscoveryAgentService;
import org.rhq.core.clientapi.server.discovery.InventoryReport;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.discovery.MergeInventoryReportResults;
import org.rhq.core.domain.discovery.MergeInventoryReportResults.ResourceTypeFlyweight;
import org.rhq.core.domain.discovery.MergeResourceResponse;
@@ -290,6 +291,27 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test {
// Now test ignore, unignore and import behavior
discoveryBoss.importResources(subjectManager.getOverlord(), new int[] { platformId });
+
+ // excursus: take this time to do a side test of the resource criteria filtering on parent inv status
+ List<InventoryStatus> committedStatus = new ArrayList<InventoryStatus>(1);
+ List<InventoryStatus> ignoredStatus = new ArrayList<InventoryStatus>(1);
+ committedStatus.add(InventoryStatus.COMMITTED);
+ ignoredStatus.add(InventoryStatus.IGNORED);
+ ResourceCriteria criteria = new ResourceCriteria();
+ criteria.addFilterParentInventoryStatuses(committedStatus);
+ criteria.addFilterId(serverIds.get(0));
+
+ // excursus: look for the server with the given ID but only if the parent is committed (this should return the resource)
+ List<Resource> lookup = resourceManager.findResourcesByCriteria(subjectManager.getOverlord(), criteria);
+ assert 1 == lookup.size() : lookup;
+ assert lookup.get(0).getId() == serverIds.get(0) : lookup;
+
+ // excursus: look for the server with the given ID but only if the parent is ignored (this should return nothing)
+ criteria.addFilterParentInventoryStatuses(ignoredStatus);
+ lookup = resourceManager.findResourcesByCriteria(subjectManager.getOverlord(), criteria);
+ assert lookup.isEmpty() : lookup;
+
+ // ok, back to the main test - now ignore the resources
discoveryBoss.ignoreResources(subjectManager.getOverlord(), arrayOfServerIds);
try {
commit bc4978114babc93feb13fe9f0c41c68de6e9fb41
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Fri Apr 5 08:01:20 2013 -0700
Fix NPE condition when autorefreshing a dashboard portlet graph before it has been configured (it has been added but not configured).
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 84177c0..75e398e 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
@@ -49,6 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricSt
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.ResourceGroupMetricD3GraphView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
* @author Greg Hinkle
@@ -80,15 +81,23 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
* combination to be valid in multiple dashboards.
*/
public String getFullChartId(){
- return "rChart-"+ graph.getMetricGraphData().getChartId() +"-"+portletWindow.getStoredPortlet().getId();
+ if(portletWindow != null && graph != null && graph.getMetricGraphData() != null){
+ return "rChart-"+ graph.getMetricGraphData().getChartId() +"-"+portletWindow.getStoredPortlet().getId();
+ } else {
+ // handle the case where the portlet has not been configured yet
+ return "";
+ }
}
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
+ Log.debug("ResourceGroupPortlet.configure");
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
}
- setMetricGraphData(MetricGraphData.createForDashboard(portletWindow.getStoredPortlet().getId()));
+ destroyMembers();
+
+ setGraph(new MetricStackedBarGraph(MetricGraphData.createForDashboard(portletWindow.getStoredPortlet().getId())));
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
@@ -103,6 +112,7 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
if (propertySimple != null && propertySimple.getIntegerValue() != null)
setDefinitionId(propertySimple.getIntegerValue());
}
+ Log.debug("ResourceGroupPortlet.configure.done");
}
public Canvas getHelpCanvas() {
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 d39f35a..b99c200 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
@@ -91,6 +91,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
}
+ destroyMembers();
setGraph(new MetricStackedBarGraph(MetricGraphData.createForDashboard(portletWindow.getStoredPortlet().getId())));
@@ -170,7 +171,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
Log.debug("Dashboard Metric data in: "
+ (System.currentTimeMillis() - startTime) + " ms.");
graph.getMetricGraphData().setMetricData(measurementData.get(0));
- drawGraph();
+ drawGraph();
}
});
break;
@@ -285,6 +286,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
graph.getMetricGraphData().setDefinitionId(simpleDefId.getIntegerValue());
Log.debug("Redraw Portlet for entityId: " + simple.getIntegerValue() + "-"
+ simpleDefId.getIntegerValue());
+
drawGraph();
}
@@ -297,7 +299,12 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
* combination to be valid in multiple dashboards.
*/
public String getFullChartId(){
- return "rChart-"+ graph.getMetricGraphData().getChartId() +"-"+portletWindow.getStoredPortlet().getId();
+ if(portletWindow != null && graph != null && graph.getMetricGraphData() != null){
+ return "rChart-"+ graph.getMetricGraphData().getChartId() +"-"+portletWindow.getStoredPortlet().getId();
+ } else {
+ // handle the case where the portlet has not been configured yet
+ return "";
+ }
}
public static final class Factory implements PortletViewFactory {
@@ -328,7 +335,8 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
//Custom refresh operation as we are not directly extending Table
@Override
public void refresh() {
- if (isVisible() && !isRefreshing()) {
+ if (isVisible() && !isRefreshing() ){
+ //if (isVisible() && !isRefreshing() && (null != graph.getMetricGraphData().getJsonMetrics()) ) {
drawGraph();
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
index d3a00e6..4ec734b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
@@ -153,7 +153,12 @@ public class MetricGraphData implements JsonMetricProducer {
public String getChartId() {
if(isPortalGraph){
- return entityId + "-" + definition.getId();
+ if(definition != null){
+ return entityId + "-" + definition.getId();
+ }else {
+ // case when portlet has not been configured yet
+ return "";
+ }
}else {
return entityId + "-" + definitionId;
}
@@ -244,7 +249,13 @@ public class MetricGraphData implements JsonMetricProducer {
public String getChartTitle() {
- return (entityName == null) ? definition.getDisplayName() : entityName + " - "+definition.getDisplayName();
+ if(definition != null){
+ return (entityName == null) ? definition.getDisplayName() : entityName + " - "+definition.getDisplayName();
+ }else {
+ // handle case when dashboard portlet has not been configured yet.
+ return "";
+
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
index 763bfaa..f6b191a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
@@ -75,7 +75,6 @@ public final class MetricStackedBarGraph extends AbstractGraph {
var metricStackedBarGraph = function () {
"use strict";
// privates
-
var margin = {top: 10, right: 5, bottom: 5, left: 40},
width = 750 - margin.left - margin.right,
adjustedChartHeight = chartContext.chartHeight - 50,
@@ -99,111 +98,113 @@ public final class MetricStackedBarGraph extends AbstractGraph {
svg;
function getChartWidth() {
- return $wnd.jQuery("#"+chartContext.chartHandle).width();
+ return $wnd.jQuery("#" + chartContext.chartHandle).width();
}
function useSmallCharts() {
- console.info("Chart Width for : "+chartContext.chartHandle+" is "+getChartWidth());
+ console.info("Chart Width for : " + chartContext.chartHandle + " is " + getChartWidth());
return getChartWidth() <= smallChartThresholdInPixels;
}
function determineScale() {
var xTicks, xTickSubDivide, numberOfBarsForSmallGraph = 20;
-
- // if window is too small server up small chart
- if (useSmallCharts()) {
- console.log("Using Small Charts Profile");
- width = 250;
- xTicks = 3;
- xTickSubDivide = 2;
- chartData = chartContext.data.slice(chartContext.data.length - numberOfBarsForSmallGraph, chartContext.data.length - 1);
- }
- else {
- console.log("Using Large Charts Profile");
- // we use the width already defined above
- xTicks = 12;
- xTickSubDivide = 5;
- chartData = chartContext.data;
- }
-
- avg = $wnd.d3.mean(chartContext.data.map(function (d) {
- return d.y;
- }));
- peak = $wnd.d3.max(chartContext.data.map(function (d) {
- if (d.high != undefined) {
- return d.high;
- }
- else {
- return 0;
- }
- }));
- min = $wnd.d3.min(chartContext.data.map(function (d) {
- if (d.low != undefined) {
- return d.low;
- }
- else {
- return Number.MAX_VALUE;
- }
- }));
- // adjust the min scale so blue low line is not in axis
- determineLowBound = function (min, peak) {
- var newLow = min - ((peak - min) * 0.1);
- if (newLow < 0) {
- return 0;
+ if (chartContext.data.length > 0) {
+
+ // if window is too small server up small chart
+ if (useSmallCharts()) {
+ console.log("Using Small Charts Profile");
+ width = 250;
+ xTicks = 3;
+ xTickSubDivide = 2;
+ chartData = chartContext.data.slice(chartContext.data.length - numberOfBarsForSmallGraph, chartContext.data.length - 1);
}
else {
- return newLow;
+ console.log("Using Large Charts Profile");
+ // we use the width already defined above
+ xTicks = 12;
+ xTickSubDivide = 5;
+ chartData = chartContext.data;
}
- };
- lowBound = determineLowBound(min, peak);
- highBound = peak + ((peak - min) * 0.1);
- oobMax = $wnd.d3.max(chartContext.data.map(function (d) {
- if (d.baselineMax == undefined) {
- return 0;
- }
- else {
- return +d.baselineMax;
+
+ avg = $wnd.d3.mean(chartContext.data.map(function (d) {
+ return d.y;
+ }));
+ peak = $wnd.d3.max(chartContext.data.map(function (d) {
+ if (d.high != undefined) {
+ return d.high;
+ }
+ else {
+ return 0;
+ }
+ }));
+ min = $wnd.d3.min(chartContext.data.map(function (d) {
+ if (d.low != undefined) {
+ return d.low;
+ }
+ else {
+ return Number.MAX_VALUE;
+ }
+ }));
+ // adjust the min scale so blue low line is not in axis
+ determineLowBound = function (min, peak) {
+ var newLow = min - ((peak - min) * 0.1);
+ if (newLow < 0) {
+ return 0;
+ }
+ else {
+ return newLow;
+ }
+ };
+ lowBound = determineLowBound(min, peak);
+ highBound = peak + ((peak - min) * 0.1);
+ oobMax = $wnd.d3.max(chartContext.data.map(function (d) {
+ if (d.baselineMax == undefined) {
+ return 0;
+ }
+ else {
+ return +d.baselineMax;
+ }
+ }));
+ calcBarWidth = function () {
+ return (width / chartData.length - barOffset )
+ };
+
+ yScale = $wnd.d3.scale.linear()
+ .clamp(true)
+ .rangeRound([height, 0])
+ .domain([lowBound, highBound]);
+ 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) + ")");
+
+ if (!useSmallCharts()) {
+ createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits);
}
- }));
- calcBarWidth = function () {
- return (width / chartData.length - barOffset )
- };
-
- yScale = $wnd.d3.scale.linear()
- .clamp(true)
- .rangeRound([height, 0])
- .domain([lowBound, highBound]);
- 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) + ")");
-
- if (!useSmallCharts()) {
- createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits);
}
}
@@ -253,7 +254,6 @@ public final class MetricStackedBarGraph extends AbstractGraph {
.attr("y", yBase + yInc)
.text(avgValue.toFixed(decimalPlaces) + " " + uom);
-
// min
chart.append("text")
.attr("class", "minLabel")
@@ -600,23 +600,27 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// Public API
draw: function (chartContext) {
"use strict";
- console.group("Creating Chart: %s --> %s", chartContext.chartSelection, chartContext.chartTitle);
- console.time("chart");
-
- determineScale();
- createHeader(chartContext.chartTitle);
-
- createYAxisGridLines();
- createStackedBars();
- createXandYAxes();
- createAvgLines();
- if (oobMax > 0) {
- console.info("OOB Data Exists!");
- createOOBLines();
+ // Guard condition that can occur when a portlet has not been configured yet
+ if (chartContext.data.length > 0) {
+ console.group("Creating Chart: %s --> %s", chartContext.chartSelection, chartContext.chartTitle);
+ console.time("chart");
+
+
+ determineScale();
+ createHeader(chartContext.chartTitle);
+
+ createYAxisGridLines();
+ createStackedBars();
+ createXandYAxes();
+ createAvgLines();
+ if (oobMax > 0) {
+ console.info("OOB Data Exists!");
+ createOOBLines();
+ }
+ createHovers(chartContext);
+ console.timeEnd("chart");
+ console.groupEnd();
}
- createHovers(chartContext);
- console.timeEnd("chart");
- console.groupEnd();
}
}; // end public closure
}();
commit 18af7ec9cd119251572dd50f578320352d0d3822
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Fri Apr 5 16:37:41 2013 +0200
Stop compiling projects in verbose mode
diff --git a/pom.xml b/pom.xml
index 32dd41a..60bb14d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1192,7 +1192,6 @@
<configuration>
<source>1.6</source>
<target>1.6</target>
- <verbose>true</verbose>
<proc>none</proc> <!-- disable annotation processing -->
<showWarnings>true</showWarnings>
</configuration>
commit 6c46519865100f090124e0146d78c4dbe2097291
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Apr 4 14:34:11 2013 -0700
[BZ 924942] - Add portlet key to New charts on dashboard so the same resource, metric can be displayed on multiple dashboards.
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 279dfea..84177c0 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
@@ -70,16 +70,25 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
public static final String CFG_DEFINITION_ID = "definitionId";
public ResourceGroupD3GraphPortlet() {
- super(new MetricStackedBarGraph(MetricGraphData.createForDashboard()));
+ super(new MetricStackedBarGraph(MetricGraphData.createForDashboard(0)));
setOverflow(Overflow.HIDDEN);
}
+ @Override
+ /**
+ * Portlet Charts are defined by an additional portletId to enable a particular groupId/measurementId
+ * combination to be valid in multiple dashboards.
+ */
+ public String getFullChartId(){
+ return "rChart-"+ graph.getMetricGraphData().getChartId() +"-"+portletWindow.getStoredPortlet().getId();
+ }
+
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
}
- setMetricGraphData(MetricGraphData.createForDashboard());
+ setMetricGraphData(MetricGraphData.createForDashboard(portletWindow.getStoredPortlet().getId()));
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
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 f461f25..d39f35a 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
@@ -93,7 +93,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
}
- setGraph(new MetricStackedBarGraph(MetricGraphData.createForDashboard()));
+ setGraph(new MetricStackedBarGraph(MetricGraphData.createForDashboard(portletWindow.getStoredPortlet().getId())));
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
@@ -272,7 +272,6 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
@Override
public void redraw() {
- Log.debug("Redraw Portlet Graph and set data, width: "+portletWindow.getWidth());
DashboardPortlet storedPortlet = portletWindow.getStoredPortlet();
PropertySimple simple = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_ID);
@@ -292,6 +291,15 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
super.redraw();
}
+ @Override
+ /**
+ * Portlet Charts are defined by an additional portletId to enable a particular resourceId/measurementId
+ * combination to be valid in multiple dashboards.
+ */
+ public String getFullChartId(){
+ return "rChart-"+ graph.getMetricGraphData().getChartId() +"-"+portletWindow.getStoredPortlet().getId();
+ }
+
public static final class Factory implements PortletViewFactory {
public static PortletViewFactory INSTANCE = new Factory();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
index 2818b86..0a1155e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
@@ -117,13 +117,13 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
*
*/
protected void drawGraph() {
- Log.debug("drawGraph marker in AbstractMetricD3GraphView for: " + graph.getMetricGraphData().getChartId() + " "
+ Log.debug("drawGraph marker in AbstractMetricD3GraphView for: " + getFullChartId() + " "
+ graph.getChartTitle());
StringBuilder divAndSvgDefs = new StringBuilder();
divAndSvgDefs
- .append("<div id=\"rChart-"
- + graph.getMetricGraphData().getChartId()
+ .append("<div id=\""
+ + getFullChartId()
+ "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
+ getChartHeight() + "px;\">");
divAndSvgDefs.append(getSvgDefs());
@@ -147,6 +147,10 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
}.schedule(200);
}
+ public String getFullChartId(){
+ return "rChart-"+ graph.getMetricGraphData().getChartId();
+
+ }
public void setGraph(AbstractGraph graph) {
this.graph = graph;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
index 125a740..27a6c02 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
@@ -138,7 +138,7 @@ public abstract class AbstractGraph extends VLayout implements HasD3MetricJsniCh
}
- public Integer getChartHeight() {
+ public int getChartHeight() {
return metricGraphData.getChartHeight();
}
@@ -166,8 +166,8 @@ public abstract class AbstractGraph extends VLayout implements HasD3MetricJsniCh
return metricGraphData.getJsonMetrics();
}
- public Integer getWindowWidth() {
- return metricGraphData.getWindowWidth();
+ public int getPortalId() {
+ return metricGraphData.getPortalId();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
index b9222d0..d3a00e6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
@@ -63,73 +63,60 @@ public class MetricGraphData implements JsonMetricProducer {
private int entityId = 0;
private String entityName;
private int definitionId;
+ private int portalId;
private MeasurementUnits adjustedMeasurementUnits;
private MeasurementDefinition definition;
private List<MeasurementDataNumericHighLowComposite> metricData;
private PageList<MeasurementOOBComposite> measurementOOBCompositeList;
private MeasurementOOBComposite lastOOB;
private Integer chartHeight;
- private Boolean isPortalGraph;
+ private boolean isPortalGraph;
/**
* WindowWidth is used in determining what size graph to display in the dashboard portlets.
*/
- private Integer windowWidth;
+ //private Integer windowWidth;
- private MetricGraphData() {
+ private MetricGraphData(int portalId) {
isPortalGraph = true;
-
+ this.portalId = portalId;
}
- public static MetricGraphData createForDashboard(){
- return new MetricGraphData();
+ public static MetricGraphData createForDashboard(int portalId){
+ return new MetricGraphData(portalId);
}
- /**
- *
- * @param entityId
- * @param entityName
- * @param def
- * @param metricData
- */
+
private MetricGraphData(int entityId, String entityName, MeasurementDefinition def,
- List<MeasurementDataNumericHighLowComposite> metricData, Integer windowWidth) {
+ List<MeasurementDataNumericHighLowComposite> metricData ) {
this.entityName = entityName;
setEntityId(entityId);
setDefinitionId(def.getId());
this.definition = def;
this.metricData = metricData;
- this.windowWidth = windowWidth;
this.isPortalGraph = false;
}
public static MetricGraphData createForResourceGroup(int groupId, String groupName, MeasurementDefinition def,
- List<MeasurementDataNumericHighLowComposite> metricData,
- Integer windowWidth){
- return new MetricGraphData(groupId,groupName,def, metricData, windowWidth);
+ List<MeasurementDataNumericHighLowComposite> metricData ){
+ return new MetricGraphData(groupId,groupName,def, metricData );
}
private MetricGraphData(int entityId, String entityName, MeasurementDefinition measurementDef,
List<MeasurementDataNumericHighLowComposite> metrics,
- PageList<MeasurementOOBComposite> measurementOOBCompositeList, Integer windowWidth) {
+ PageList<MeasurementOOBComposite> measurementOOBCompositeList ) {
this.entityName = entityName;
setEntityId(entityId);
setDefinitionId(measurementDef.getId());
this.definition = measurementDef;
this.metricData = metrics;
this.measurementOOBCompositeList = measurementOOBCompositeList;
- this.windowWidth = windowWidth;
this.isPortalGraph = false;
}
public static MetricGraphData createForResource(int resourceId, String resourceName, MeasurementDefinition measurementDef,
List<MeasurementDataNumericHighLowComposite> metrics,
- PageList<MeasurementOOBComposite> measurementOOBCompositeList,
- Integer windowWidth){
- return new MetricGraphData(resourceId, resourceName,measurementDef, metrics, measurementOOBCompositeList, windowWidth);
- }
-
- public Integer getWindowWidth() {
- return windowWidth;
+ PageList<MeasurementOOBComposite> measurementOOBCompositeList ){
+ return new MetricGraphData(resourceId, resourceName,measurementDef, metrics, measurementOOBCompositeList);
}
public int getEntityId() {
@@ -165,7 +152,11 @@ public class MetricGraphData implements JsonMetricProducer {
}
public String getChartId() {
+ if(isPortalGraph){
+ return entityId + "-" + definition.getId();
+ }else {
return entityId + "-" + definitionId;
+ }
}
@@ -230,6 +221,10 @@ public class MetricGraphData implements JsonMetricProducer {
return chartHoverDateFormat;
}
+ public int getPortalId() {
+ return portalId;
+ }
+
public Integer getChartHeight() {
if (null != chartHeight) {
return chartHeight;
@@ -243,7 +238,7 @@ public class MetricGraphData implements JsonMetricProducer {
this.chartHeight = chartHeight;
}
- public Boolean isPortalGraph() {
+ public boolean isPortalGraph() {
return isPortalGraph;
}
@@ -444,7 +439,6 @@ public class MetricGraphData implements JsonMetricProducer {
sb.append(", entityName='").append(entityName).append('\'');
sb.append(", definitionId=").append(definitionId);
sb.append(", isPortalGraph=").append(isPortalGraph);
- sb.append(", windowWidth=").append(windowWidth);
sb.append('}');
return sb.toString();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
index 33e1279..763bfaa 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
@@ -67,7 +67,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverTimeFormat()(),
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverDateFormat()(),
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::isPortalGraph()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getWindowWidth()()
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getPortalId()()
);
@@ -99,10 +99,11 @@ public final class MetricStackedBarGraph extends AbstractGraph {
svg;
function getChartWidth() {
- return $wnd.jQuery(chartContext.chartSelection).width();
+ return $wnd.jQuery("#"+chartContext.chartHandle).width();
}
function useSmallCharts() {
+ console.info("Chart Width for : "+chartContext.chartHandle+" is "+getChartWidth());
return getChartWidth() <= smallChartThresholdInPixels;
}
@@ -111,14 +112,14 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// if window is too small server up small chart
if (useSmallCharts()) {
- console.info("Using Small Charts Profile");
+ console.log("Using Small Charts Profile");
width = 250;
xTicks = 3;
xTickSubDivide = 2;
chartData = chartContext.data.slice(chartContext.data.length - numberOfBarsForSmallGraph, chartContext.data.length - 1);
}
else {
- console.info("Using Large Charts Profile");
+ console.log("Using Large Charts Profile");
// we use the width already defined above
xTicks = 12;
xTickSubDivide = 5;
@@ -194,7 +195,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
.orient("bottom");
// create the actual chart group
- chart = $wnd.d3.select(chartContext.chartSelection);
+ chart = $wnd.d3.select("#"+chartContext.chartSelection);
svg = chart.append("g")
.attr("width", width + margin.left + margin.right)
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 1d88a64..54466cf 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
@@ -193,7 +193,7 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen
List<MeasurementDataNumericHighLowComposite> data) {
MetricGraphData metricGraphData = MetricGraphData.createForResourceGroup(resourceGroup.getId(),
- resourceGroup.getName(), measurementDefinition, data, getWidth());
+ resourceGroup.getName(), measurementDefinition, data );
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
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 4a64509..f66ea33 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
@@ -368,7 +368,7 @@ public class D3GraphListView extends AbstractD3GraphListView {
MeasurementDefinition measurementDefinition, List<MeasurementDataNumericHighLowComposite> data, int height) {
MetricGraphData metricGraphData = MetricGraphData.createForResource(resource.getId(), resource.getName(),
- measurementDefinition, data, measurementOOBCompositeList, getWidth());
+ measurementDefinition, data, measurementOOBCompositeList );
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
index 93c99d3..962c341 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
@@ -18,8 +18,6 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring;
-import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil;
-import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh;
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricD3GraphView;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
@@ -40,7 +38,6 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
public ResourceMetricD3Graph(AbstractGraph graph) {
super(graph);
- //startRefreshCycle();
}
@@ -59,29 +56,4 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
}
-// @Override
-// public void startRefreshCycle() {
-// refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer);
-// }
-//
-// @Override
-// protected void onDestroy() {
-// AutoRefreshUtil.onDestroy( refreshTimer);
-//
-// super.onDestroy();
-// }
-//
-// @Override
-// public boolean isRefreshing() {
-// return false;
-// }
-//
-// //Custom refresh operation as we are not directly extending Table
-// @Override
-// public void refresh() {
-// if (isVisible() && !isRefreshing()) {
-// drawGraph();
-// }
-// }
-
}
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 f863ab0..c455c60 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
+++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
@@ -9,15 +9,13 @@
* A ChartContext can be passed to multiple chart renders to display different chart types
* of that data.
*/
-var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel,hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, windowWidth )
+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 )
{
"use strict";
if(!(this instanceof ChartContext)){
throw new Error("ChartContext function cannot be called as a function.")
}
this.chartId = chartId;
- this.chartHandle = "#rChart-" + this.chartId;
- this.chartSelection = this.chartHandle + " svg";
this.chartHeight = chartHeight;
this.data = jQuery.parseJSON(metricsData); // make into json
this.xAxisLabel = xAxisLabel;
@@ -38,7 +36,13 @@ var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, char
this.chartHoverTimeFormat = chartHoverTimeFormat;
this.chartHoverDateFormat = chartHoverDateFormat;
this.isPortalGraph = isPortalGraph;
- this.windowWidth = windowWidth;
+ this.portalId = portalId;
+ if(isPortalGraph){
+ this.chartHandle = "rChart-"+chartId+"-"+portalId;
+ }else {
+ this.chartHandle = "rChart-"+chartId;
+ }
+ this.chartSelection = this.chartHandle + " svg";
},
AvailChartContext = function (chartId, availData, dateLabel, timeLabel, hoverStartLabel, hoverEndLabel, hoverBarLabel, availabilityLabel, chartHoverTimeFormat, chartHoverDateFormat) {
1
0
05 Apr '13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java | 13 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java | 12 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java | 10 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java | 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java | 52 ++++------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java | 11 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java | 28 -----
modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js | 12 +-
pom.xml | 1
11 files changed, 70 insertions(+), 79 deletions(-)
New commits:
commit 26813c7054464c237fe934161c3c650dc2684da0
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Fri Apr 5 16:37:41 2013 +0200
Stop compiling projects in verbose mode
diff --git a/pom.xml b/pom.xml
index 809eb69..764af14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1198,7 +1198,6 @@
<configuration>
<source>1.6</source>
<target>1.6</target>
- <verbose>true</verbose>
<proc>none</proc> <!-- disable annotation processing -->
<showWarnings>true</showWarnings>
</configuration>
commit e1c89068eb958ef533763fdc9781e3000ff4d127
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Apr 4 14:34:11 2013 -0700
[BZ 924942] - Add portlet key to New charts on dashboard so the same resource, metric can be displayed on multiple dashboards.
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 279dfea..84177c0 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
@@ -70,16 +70,25 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
public static final String CFG_DEFINITION_ID = "definitionId";
public ResourceGroupD3GraphPortlet() {
- super(new MetricStackedBarGraph(MetricGraphData.createForDashboard()));
+ super(new MetricStackedBarGraph(MetricGraphData.createForDashboard(0)));
setOverflow(Overflow.HIDDEN);
}
+ @Override
+ /**
+ * Portlet Charts are defined by an additional portletId to enable a particular groupId/measurementId
+ * combination to be valid in multiple dashboards.
+ */
+ public String getFullChartId(){
+ return "rChart-"+ graph.getMetricGraphData().getChartId() +"-"+portletWindow.getStoredPortlet().getId();
+ }
+
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
}
- setMetricGraphData(MetricGraphData.createForDashboard());
+ setMetricGraphData(MetricGraphData.createForDashboard(portletWindow.getStoredPortlet().getId()));
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
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 f461f25..d39f35a 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
@@ -93,7 +93,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
}
- setGraph(new MetricStackedBarGraph(MetricGraphData.createForDashboard()));
+ setGraph(new MetricStackedBarGraph(MetricGraphData.createForDashboard(portletWindow.getStoredPortlet().getId())));
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
@@ -272,7 +272,6 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
@Override
public void redraw() {
- Log.debug("Redraw Portlet Graph and set data, width: "+portletWindow.getWidth());
DashboardPortlet storedPortlet = portletWindow.getStoredPortlet();
PropertySimple simple = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_ID);
@@ -292,6 +291,15 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
super.redraw();
}
+ @Override
+ /**
+ * Portlet Charts are defined by an additional portletId to enable a particular resourceId/measurementId
+ * combination to be valid in multiple dashboards.
+ */
+ public String getFullChartId(){
+ return "rChart-"+ graph.getMetricGraphData().getChartId() +"-"+portletWindow.getStoredPortlet().getId();
+ }
+
public static final class Factory implements PortletViewFactory {
public static PortletViewFactory INSTANCE = new Factory();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
index 2818b86..0a1155e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
@@ -117,13 +117,13 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
*
*/
protected void drawGraph() {
- Log.debug("drawGraph marker in AbstractMetricD3GraphView for: " + graph.getMetricGraphData().getChartId() + " "
+ Log.debug("drawGraph marker in AbstractMetricD3GraphView for: " + getFullChartId() + " "
+ graph.getChartTitle());
StringBuilder divAndSvgDefs = new StringBuilder();
divAndSvgDefs
- .append("<div id=\"rChart-"
- + graph.getMetricGraphData().getChartId()
+ .append("<div id=\""
+ + getFullChartId()
+ "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"height:"
+ getChartHeight() + "px;\">");
divAndSvgDefs.append(getSvgDefs());
@@ -147,6 +147,10 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
}.schedule(200);
}
+ public String getFullChartId(){
+ return "rChart-"+ graph.getMetricGraphData().getChartId();
+
+ }
public void setGraph(AbstractGraph graph) {
this.graph = graph;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
index 125a740..27a6c02 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
@@ -138,7 +138,7 @@ public abstract class AbstractGraph extends VLayout implements HasD3MetricJsniCh
}
- public Integer getChartHeight() {
+ public int getChartHeight() {
return metricGraphData.getChartHeight();
}
@@ -166,8 +166,8 @@ public abstract class AbstractGraph extends VLayout implements HasD3MetricJsniCh
return metricGraphData.getJsonMetrics();
}
- public Integer getWindowWidth() {
- return metricGraphData.getWindowWidth();
+ public int getPortalId() {
+ return metricGraphData.getPortalId();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
index b9222d0..d3a00e6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
@@ -63,73 +63,60 @@ public class MetricGraphData implements JsonMetricProducer {
private int entityId = 0;
private String entityName;
private int definitionId;
+ private int portalId;
private MeasurementUnits adjustedMeasurementUnits;
private MeasurementDefinition definition;
private List<MeasurementDataNumericHighLowComposite> metricData;
private PageList<MeasurementOOBComposite> measurementOOBCompositeList;
private MeasurementOOBComposite lastOOB;
private Integer chartHeight;
- private Boolean isPortalGraph;
+ private boolean isPortalGraph;
/**
* WindowWidth is used in determining what size graph to display in the dashboard portlets.
*/
- private Integer windowWidth;
+ //private Integer windowWidth;
- private MetricGraphData() {
+ private MetricGraphData(int portalId) {
isPortalGraph = true;
-
+ this.portalId = portalId;
}
- public static MetricGraphData createForDashboard(){
- return new MetricGraphData();
+ public static MetricGraphData createForDashboard(int portalId){
+ return new MetricGraphData(portalId);
}
- /**
- *
- * @param entityId
- * @param entityName
- * @param def
- * @param metricData
- */
+
private MetricGraphData(int entityId, String entityName, MeasurementDefinition def,
- List<MeasurementDataNumericHighLowComposite> metricData, Integer windowWidth) {
+ List<MeasurementDataNumericHighLowComposite> metricData ) {
this.entityName = entityName;
setEntityId(entityId);
setDefinitionId(def.getId());
this.definition = def;
this.metricData = metricData;
- this.windowWidth = windowWidth;
this.isPortalGraph = false;
}
public static MetricGraphData createForResourceGroup(int groupId, String groupName, MeasurementDefinition def,
- List<MeasurementDataNumericHighLowComposite> metricData,
- Integer windowWidth){
- return new MetricGraphData(groupId,groupName,def, metricData, windowWidth);
+ List<MeasurementDataNumericHighLowComposite> metricData ){
+ return new MetricGraphData(groupId,groupName,def, metricData );
}
private MetricGraphData(int entityId, String entityName, MeasurementDefinition measurementDef,
List<MeasurementDataNumericHighLowComposite> metrics,
- PageList<MeasurementOOBComposite> measurementOOBCompositeList, Integer windowWidth) {
+ PageList<MeasurementOOBComposite> measurementOOBCompositeList ) {
this.entityName = entityName;
setEntityId(entityId);
setDefinitionId(measurementDef.getId());
this.definition = measurementDef;
this.metricData = metrics;
this.measurementOOBCompositeList = measurementOOBCompositeList;
- this.windowWidth = windowWidth;
this.isPortalGraph = false;
}
public static MetricGraphData createForResource(int resourceId, String resourceName, MeasurementDefinition measurementDef,
List<MeasurementDataNumericHighLowComposite> metrics,
- PageList<MeasurementOOBComposite> measurementOOBCompositeList,
- Integer windowWidth){
- return new MetricGraphData(resourceId, resourceName,measurementDef, metrics, measurementOOBCompositeList, windowWidth);
- }
-
- public Integer getWindowWidth() {
- return windowWidth;
+ PageList<MeasurementOOBComposite> measurementOOBCompositeList ){
+ return new MetricGraphData(resourceId, resourceName,measurementDef, metrics, measurementOOBCompositeList);
}
public int getEntityId() {
@@ -165,7 +152,11 @@ public class MetricGraphData implements JsonMetricProducer {
}
public String getChartId() {
+ if(isPortalGraph){
+ return entityId + "-" + definition.getId();
+ }else {
return entityId + "-" + definitionId;
+ }
}
@@ -230,6 +221,10 @@ public class MetricGraphData implements JsonMetricProducer {
return chartHoverDateFormat;
}
+ public int getPortalId() {
+ return portalId;
+ }
+
public Integer getChartHeight() {
if (null != chartHeight) {
return chartHeight;
@@ -243,7 +238,7 @@ public class MetricGraphData implements JsonMetricProducer {
this.chartHeight = chartHeight;
}
- public Boolean isPortalGraph() {
+ public boolean isPortalGraph() {
return isPortalGraph;
}
@@ -444,7 +439,6 @@ public class MetricGraphData implements JsonMetricProducer {
sb.append(", entityName='").append(entityName).append('\'');
sb.append(", definitionId=").append(definitionId);
sb.append(", isPortalGraph=").append(isPortalGraph);
- sb.append(", windowWidth=").append(windowWidth);
sb.append('}');
return sb.toString();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
index 33e1279..763bfaa 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
@@ -67,7 +67,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverTimeFormat()(),
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverDateFormat()(),
global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::isPortalGraph()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getWindowWidth()()
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getPortalId()()
);
@@ -99,10 +99,11 @@ public final class MetricStackedBarGraph extends AbstractGraph {
svg;
function getChartWidth() {
- return $wnd.jQuery(chartContext.chartSelection).width();
+ return $wnd.jQuery("#"+chartContext.chartHandle).width();
}
function useSmallCharts() {
+ console.info("Chart Width for : "+chartContext.chartHandle+" is "+getChartWidth());
return getChartWidth() <= smallChartThresholdInPixels;
}
@@ -111,14 +112,14 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// if window is too small server up small chart
if (useSmallCharts()) {
- console.info("Using Small Charts Profile");
+ console.log("Using Small Charts Profile");
width = 250;
xTicks = 3;
xTickSubDivide = 2;
chartData = chartContext.data.slice(chartContext.data.length - numberOfBarsForSmallGraph, chartContext.data.length - 1);
}
else {
- console.info("Using Large Charts Profile");
+ console.log("Using Large Charts Profile");
// we use the width already defined above
xTicks = 12;
xTickSubDivide = 5;
@@ -194,7 +195,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
.orient("bottom");
// create the actual chart group
- chart = $wnd.d3.select(chartContext.chartSelection);
+ chart = $wnd.d3.select("#"+chartContext.chartSelection);
svg = chart.append("g")
.attr("width", width + margin.left + margin.right)
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 1d88a64..54466cf 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
@@ -193,7 +193,7 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen
List<MeasurementDataNumericHighLowComposite> data) {
MetricGraphData metricGraphData = MetricGraphData.createForResourceGroup(resourceGroup.getId(),
- resourceGroup.getName(), measurementDefinition, data, getWidth());
+ resourceGroup.getName(), measurementDefinition, data );
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
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 4a64509..f66ea33 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
@@ -368,7 +368,7 @@ public class D3GraphListView extends AbstractD3GraphListView {
MeasurementDefinition measurementDefinition, List<MeasurementDataNumericHighLowComposite> data, int height) {
MetricGraphData metricGraphData = MetricGraphData.createForResource(resource.getId(), resource.getName(),
- measurementDefinition, data, measurementOOBCompositeList, getWidth());
+ measurementDefinition, data, measurementOOBCompositeList );
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
index 93c99d3..962c341 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
@@ -18,8 +18,6 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring;
-import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil;
-import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh;
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricD3GraphView;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
@@ -40,7 +38,6 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
public ResourceMetricD3Graph(AbstractGraph graph) {
super(graph);
- //startRefreshCycle();
}
@@ -59,29 +56,4 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
}
-// @Override
-// public void startRefreshCycle() {
-// refreshTimer = AutoRefreshUtil.startRefreshCycle(this, this, refreshTimer);
-// }
-//
-// @Override
-// protected void onDestroy() {
-// AutoRefreshUtil.onDestroy( refreshTimer);
-//
-// super.onDestroy();
-// }
-//
-// @Override
-// public boolean isRefreshing() {
-// return false;
-// }
-//
-// //Custom refresh operation as we are not directly extending Table
-// @Override
-// public void refresh() {
-// if (isVisible() && !isRefreshing()) {
-// drawGraph();
-// }
-// }
-
}
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 f863ab0..c455c60 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
+++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
@@ -9,15 +9,13 @@
* A ChartContext can be passed to multiple chart renders to display different chart types
* of that data.
*/
-var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel,hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, windowWidth )
+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 )
{
"use strict";
if(!(this instanceof ChartContext)){
throw new Error("ChartContext function cannot be called as a function.")
}
this.chartId = chartId;
- this.chartHandle = "#rChart-" + this.chartId;
- this.chartSelection = this.chartHandle + " svg";
this.chartHeight = chartHeight;
this.data = jQuery.parseJSON(metricsData); // make into json
this.xAxisLabel = xAxisLabel;
@@ -38,7 +36,13 @@ var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, char
this.chartHoverTimeFormat = chartHoverTimeFormat;
this.chartHoverDateFormat = chartHoverDateFormat;
this.isPortalGraph = isPortalGraph;
- this.windowWidth = windowWidth;
+ this.portalId = portalId;
+ if(isPortalGraph){
+ this.chartHandle = "rChart-"+chartId+"-"+portalId;
+ }else {
+ this.chartHandle = "rChart-"+chartId;
+ }
+ this.chartSelection = this.chartHandle + " svg";
},
AvailChartContext = function (chartId, availData, dateLabel, timeLabel, hoverStartLabel, hoverEndLabel, hoverBarLabel, availabilityLabel, chartHoverTimeFormat, chartHoverDateFormat) {
1
0