rhq-commits February 2013

rhq-commits@lists.fedorahosted.org

12 participants
191 discussions

[rhq] Branch 'hotfix/jon3.1.2' - 4 commits - modules/core modules/enterprise modules/plugins
by Larry O'Leary 07 Feb '13

07 Feb '13

modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java | 112 ++++ modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerDisabledTypesTest.java | 233 ++++++++++ modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java | 4 modules/core/client-api/src/test/resources/metadata-manager-test-2.xml | 3 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceComponent.java | 48 ++ modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceDiscoveryComponent.java | 42 + modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java | 37 + modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 30 + modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java | 7 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java | 10 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java | 6 modules/enterprise/agent/src/main/resources/agent-configuration.xml | 18 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java | 24 - modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java | 10 modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml | 1 15 files changed, 554 insertions(+), 31 deletions(-) New commits: commit 1472d791542fe04918c86b02c46ae418c5677e9b Author: Larry O'Leary <loleary(a)redhat.com> Date: Mon Feb 4 16:15:57 2013 -0600 Bug 902406 - disable types on agent so avoid large number of services causing inventory report to not get processed This fix actually came from two separate commits to the upstream: Commit 1: provide an agent configuration setting to disable resource types on the agent (originally cherry-picked from master commit 13cb988bb4835289393c8e3f736918651d6e2bae) (cherry-picked from release/jon3.1.x commit 811fbb8970b3013fc0e6555c0db908f9112ff13a) Commit 2: don't do this - will NPE when nothign is disabled and we will rebuild this collection here anyway (originally cherry-picked from master commit 085acde34623280a7720ee866f0efd4fc005d435) (cherry-picked from release/jon3.1.x commit 40caae29a4dadc018a96ae4cbf687ff3f8b594b1) diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java index 5ed8a38..c091125 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java @@ -22,6 +22,7 @@ */ package org.rhq.core.clientapi.agent.metadata; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashSet; @@ -73,6 +74,11 @@ public class PluginMetadataManager { private Map<String, PluginDescriptor> descriptorsByPlugin = new HashMap<String, PluginDescriptor>(); + private List<String> disabledResourceTypesAsStrings = null; + private Map<ResourceType, String> disabledResourceTypes = null; + private String disabledDiscoveryComponentClassName = null; + private String disabledResourceComponentClassName = null; + public PluginMetadataManager() { } @@ -138,11 +144,17 @@ public class PluginMetadataManager { } public String getDiscoveryClass(ResourceType resourceType) { + if (isDisabledResourceType(resourceType)) { + return this.disabledDiscoveryComponentClassName; + } PluginMetadataParser parser = this.parsersByPlugin.get(resourceType.getPlugin()); return (parser != null) ? parser.getDiscoveryComponentClass(resourceType) : null; } public String getComponentClass(ResourceType resourceType) { + if (isDisabledResourceType(resourceType)) { + return this.disabledResourceComponentClassName; + } PluginMetadataParser parser = this.parsersByPlugin.get(resourceType.getPlugin()); return (parser != null) ? parser.getComponentClass(resourceType) : null; } @@ -182,7 +194,11 @@ public class PluginMetadataManager { } } - return parser.getRootResourceTypes(); + findDisabledResourceTypesInAllPlugins(); + + Set<ResourceType> rootTypes = parser.getRootResourceTypes(); + return rootTypes; + } catch (InvalidPluginDescriptorException e) { // TODO Should we throw back or log partial failures or store them against the definitions? log.error("Error transforming plugin descriptor [" + pluginDescriptor.getName() + "].", e); @@ -191,19 +207,6 @@ public class PluginMetadataManager { return null; } - // TODO Is this really appropriate? It's inconvenient to look up including the parent but - // that is currently the accurate limiter... need to consider type keys - // Otherwise we could use the business key which is the "plugin" name and the type name. - public ResourceType getType(String typeName, ResourceCategory category) { - for (ResourceType type : getTypesForCategory(category)) { - if (type.getName().equals(typeName)) { - return type; - } - } - - return null; - } - /** * Returns the Resource type with the specified name and plugin, or null if no such Resource type exists. * @@ -360,4 +363,85 @@ public class PluginMetadataManager { } return false; } + + /** + * This will define resource types that will be disabled - and by that it means + * the discovery and resource components will not do anything (it is assumed + * the classnames for the component classes will not do anything). + * + * Owners of this metadata manager need to set this during initialization prior to + * loading any plugins. + * + * @param disabledTypesAsStrings list of types, in the form "pluginName>parentType>childType" + * @param disabledDiscoveryComponentClassName the name of the discovery component class of all disable types + * @param disabledResourceComponentClassName the name of the resource component class of all disable types + */ + public void setDisabledResourceTypes(List<String> disabledTypesAsStrings, + String disabledDiscoveryComponentClassName, String disabledResourceComponentClassName) { + + if (disabledTypesAsStrings != null && !disabledTypesAsStrings.isEmpty()) { + this.disabledDiscoveryComponentClassName = disabledDiscoveryComponentClassName; + this.disabledResourceComponentClassName = disabledResourceComponentClassName; + this.disabledResourceTypesAsStrings = new ArrayList<String>(disabledTypesAsStrings); + log.info("Will disable the following resource types: " + this.disabledResourceTypesAsStrings); + } else { + this.disabledDiscoveryComponentClassName = null; + this.disabledResourceComponentClassName = null; + this.disabledResourceTypesAsStrings = null; + } + return; + } + + private boolean isDisabledResourceType(ResourceType resourceType) { + if (this.disabledResourceTypes == null) { + return false; + } + return this.disabledResourceTypes.containsKey(resourceType); + } + + // finds if type or its children are disabled and if so adds them to the map with their string representation + private void findDisabledResourceTypes(String parentHierarchy, ResourceType type, + HashMap<ResourceType, String> disabledTypes) { + // this is the current level we are at in the type hierarchy, as written in string form ("plugin>type>type...") + String typeHierarchy = parentHierarchy + '>' + type.getName(); + + // see if the given type is to be disabled - if so, add it to the map + if (this.disabledResourceTypesAsStrings.contains(typeHierarchy)) { + log.debug("Disabling resource type: " + type); + disabledTypes.put(type, typeHierarchy); + } + + // recursively call ourselves to see if any child types are to be disabled + Set<ResourceType> childTypes = type.getChildResourceTypes(); + if (childTypes != null) { + for (ResourceType childType : childTypes) { + findDisabledResourceTypes(typeHierarchy, childType, disabledTypes); + } + } + + return; + } + + private void findDisabledResourceTypesInAllPlugins() { + if (this.disabledResourceTypesAsStrings != null) { + int totalToBeDisabled = this.disabledResourceTypesAsStrings.size(); + // we have to do it all over again over all plugins because we need to support the injection extension model + // that is, <runs-inside> - new plugins coming online might have injected types in previously loaded plugins + HashMap<ResourceType, String> disabledTypes = new HashMap<ResourceType, String>(); + for (Map.Entry<String, PluginMetadataParser> entry : parsersByPlugin.entrySet()) { + PluginMetadataParser parser = entry.getValue(); + PluginDescriptor pluginDescriptor = parser.getDescriptor(); + Set<ResourceType> rootTypes = parser.getRootResourceTypes(); + String hierarchyStart = pluginDescriptor.getName(); + for (ResourceType rootType : rootTypes) { + findDisabledResourceTypes(hierarchyStart, rootType, disabledTypes); + } + if (disabledTypes.size() == totalToBeDisabled) { + break; // we found them all, no need to look at any more plugins + } + } + this.disabledResourceTypes = (!disabledTypes.isEmpty()) ? disabledTypes : null; + } + return; + } } diff --git a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerDisabledTypesTest.java b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerDisabledTypesTest.java new file mode 100644 index 0000000..d95f099 --- /dev/null +++ b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerDisabledTypesTest.java @@ -0,0 +1,233 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.clientapi.agent.metadata.test; + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.Unmarshaller; +import javax.xml.bind.util.ValidationEventCollector; + +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +import org.rhq.core.clientapi.agent.metadata.PluginMetadataManager; +import org.rhq.core.clientapi.descriptor.DescriptorPackages; +import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; +import org.rhq.core.domain.resource.ResourceCategory; +import org.rhq.core.domain.resource.ResourceType; + +/** + * Tests disabling resource types. + * + * @author John Mazzitelli + */ +public class MetadataManagerDisabledTypesTest { + private static final String DESCRIPTOR_FILENAME_TEST1 = "metadata-manager-test-1.xml"; + private static final String DESCRIPTOR_FILENAME_TEST2 = "metadata-manager-test-2.xml"; + private static final String DESCRIPTOR_FILENAME_TEST3 = "metadata-manager-test-3.xml"; + + private PluginMetadataManager metadataManager; + private final String disabledDiscoveryClazz = "org.rhq.test.DisabledDiscoveryClazzName"; + private final String disabledComponentClazz = "org.rhq.test.DisabledResourceClazzName"; + + @BeforeClass + public void beforeClass() { + try { + this.metadataManager = new PluginMetadataManager(); + + List<String> disabledTypes = new ArrayList<String>(); + disabledTypes.add("Test1>Server A>Service B"); // from DESCRIPTOR_FILENAME_TEST1 + disabledTypes.add("Test1>Server A>Service D>Dependent Service E"); // from DESCRIPTOR_FILENAME_TEST1 + disabledTypes.add("Test2>Extension Service C"); // from DESCRIPTOR_FILENAME_TEST2 + disabledTypes.add("Test2>Extension Server B>Service D"); // from DESCRIPTOR_FILENAME_TEST2 + disabledTypes.add("Test1>Server A>Injection D To Server A"); // from DESCRIPTOR_FILENAME_TEST3 + disabledTypes.add("Test2>Extension Server B>Injection C To Server A"); // from DESCRIPTOR_FILENAME_TEST3 + this.metadataManager + .setDisabledResourceTypes(disabledTypes, disabledDiscoveryClazz, disabledComponentClazz); + + } catch (Throwable t) { + // Catch RuntimeExceptions and Errors and dump their stack trace, because Surefire will completely swallow them + // and throw a cryptic NPE (see http://jira.codehaus.org/browse/SUREFIRE-157)! + t.printStackTrace(); + throw new RuntimeException(t); + } + } + + @Test + public void loadPluginDescriptorTest1() throws Exception { + PluginDescriptor pluginDescriptor; + + URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME_TEST1); + System.out.println("Loading plugin descriptor at: " + descriptorUrl); + + JAXBContext jaxbContext = JAXBContext.newInstance(DescriptorPackages.PC_PLUGIN); + + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + ValidationEventCollector vec = new ValidationEventCollector(); + unmarshaller.setEventHandler(vec); + pluginDescriptor = (PluginDescriptor) unmarshaller.unmarshal(descriptorUrl.openStream()); + + this.metadataManager.loadPlugin(pluginDescriptor); + + System.out.println("\n~~~~~~~~~~~~DISABLE TYPES DESCRIPTOR TEST 1"); + outputTypes(); + } + + @Test(dependsOnMethods = "loadPluginDescriptorTest1") + public void loadPluginDescriptorTest2() throws Exception { + PluginDescriptor pluginDescriptor; + + URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME_TEST2); + System.out.println("Loading plugin descriptor at: " + descriptorUrl); + + JAXBContext jaxbContext = JAXBContext.newInstance(DescriptorPackages.PC_PLUGIN); + + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + ValidationEventCollector vec = new ValidationEventCollector(); + unmarshaller.setEventHandler(vec); + pluginDescriptor = (PluginDescriptor) unmarshaller.unmarshal(descriptorUrl.openStream()); + + this.metadataManager.loadPlugin(pluginDescriptor); + + System.out.println("\n~~~~~~~~~~~~DISABLE TYPES DESCRIPTOR TEST 2"); + outputTypes(); + } + + @Test(dependsOnMethods = "loadPluginDescriptorTest2") + public void loadPluginDescriptorTest3() throws Exception { + PluginDescriptor pluginDescriptor; + + URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME_TEST3); + System.out.println("Loading plugin descriptor at: " + descriptorUrl); + + JAXBContext jaxbContext = JAXBContext.newInstance(DescriptorPackages.PC_PLUGIN); + + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + ValidationEventCollector vec = new ValidationEventCollector(); + unmarshaller.setEventHandler(vec); + pluginDescriptor = (PluginDescriptor) unmarshaller.unmarshal(descriptorUrl.openStream()); + + this.metadataManager.loadPlugin(pluginDescriptor); + + System.out.println("\n~~~~~~~~~~~~DISABLE TYPES DESCRIPTOR TEST 3"); + outputTypes(); + + // now see that we disabled the types + + ResourceType serverA = getResourceType(new ResourceType("Server A", "Test1", ResourceCategory.SERVER, null)); + assert serverA != null; + assertIsNOTDisabledType(serverA); + + ResourceType serviceB = getResourceType(new ResourceType("Service B", "Test1", ResourceCategory.SERVICE, null)); + assert serviceB != null; + assertIsDisabledType(serviceB); + + ResourceType serviceD = getResourceType(new ResourceType("Service D", "Test1", ResourceCategory.SERVICE, null)); + assert serviceD != null; + assertIsNOTDisabledType(serviceD); + + ResourceType serviceE = getResourceType(new ResourceType("Dependent Service E", "Test1", + ResourceCategory.SERVICE, null)); + assert serviceE != null; + assertIsDisabledType(serviceE); + + ResourceType serviceC = getResourceType(new ResourceType("Extension Service C", "Test2", + ResourceCategory.SERVICE, null)); + assert serviceC != null; + assertIsDisabledType(serviceC); + + ResourceType extB = getResourceType(new ResourceType("Extension Server B", "Test2", ResourceCategory.SERVER, + null)); + assert extB != null; + assertIsNOTDisabledType(extB); + + ResourceType serviceD2 = getResourceType(new ResourceType("Service D", "Test2", ResourceCategory.SERVICE, null)); + assert serviceD2 != null; + assertIsDisabledType(serviceD2); + + ResourceType extDtoA = getResourceType(new ResourceType("Injection D To Server A", "Test3", + ResourceCategory.SERVICE, null)); + assert extDtoA != null; + assertIsDisabledType(extDtoA); + + // Note this type has a <runs-inside> to more than one parent. Even though it is injected into + // multiple parent hierarchies, if you specify it in only one hierarchy, it will be disabled in all + // other hierarchies it is injected into. This could be considered a feature or not :-) + // For example, in this test, we have disabled the type: + // Test2>Extension Server B>Injection C To Server A + // but if we specified to disable this type (the second parent it was injected into), the same thing would result: + // Test1>Server A>Injection C To Server A + // Finally, if we specified the type as it was directly declared in its plugin, again, the same thing would result, + // this type is disabled for all of the hierarchies it was injected into. + // Test3>Injection C To Server A + ResourceType extCtoA = getResourceType(new ResourceType("Injection C To Server A", "Test3", + ResourceCategory.SERVICE, null)); + assert extCtoA != null; + assertIsDisabledType(extCtoA); + } + + private void assertIsDisabledType(ResourceType type) { + assert metadataManager.getDiscoveryClass(type).equals(this.disabledDiscoveryClazz); + assert metadataManager.getComponentClass(type).equals(this.disabledComponentClazz); + } + + private void assertIsNOTDisabledType(ResourceType type) { + assert !metadataManager.getDiscoveryClass(type).equals(this.disabledDiscoveryClazz); + assert !metadataManager.getComponentClass(type).equals(this.disabledComponentClazz); + } + + private ResourceType getResourceType(ResourceType typeToGet) { + for (ResourceType type : metadataManager.getAllTypes()) { + if (type.equals(typeToGet)) { + return type; + } + } + return null; + } + + private void outputTypes() { + Set<ResourceType> allTypes = metadataManager.getRootTypes(); + for (ResourceType type : allTypes) { + outputType(type, 0); + } + System.out.flush(); + } + + private void outputType(ResourceType type, int depth) { + StringBuilder line = new StringBuilder(); + for (int i = 0; i < depth; i++) { + line.append(" "); + } + + line.append("+ "); + line.append(type.toString()); + System.out.println(line.toString()); + for (ResourceType child : type.getChildResourceTypes()) { + outputType(child, depth + 1); + } + } +} \ No newline at end of file diff --git a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java index 6abeff3..fbb6b1b 100644 --- a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java +++ b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java @@ -94,7 +94,7 @@ public class MetadataManagerTest { @Test(dependsOnMethods = "loadPluginDescriptorTest1") public void testDefinitionParsing1() { - ResourceType serverAType = this.metadataManager.getType("Server A", ResourceCategory.SERVER); + ResourceType serverAType = this.metadataManager.getType("Server A", "Test1"); assert serverAType.getName().equals("Server A"); assert serverAType.getPlugin().equals("Test1"); assertServerTypeIsOK(serverAType); @@ -122,7 +122,7 @@ public class MetadataManagerTest { @Test(dependsOnMethods = "loadPluginDescriptorTest2") public void testDefinitionParsing2() { - ResourceType serverBType = this.metadataManager.getType("Extension Server B", ResourceCategory.SERVER); + ResourceType serverBType = this.metadataManager.getType("Extension Server B", "Test2"); assert serverBType.getName().equals("Extension Server B"); assert serverBType.getPlugin().equals("Test2"); assertServerTypeIsOK(serverBType); diff --git a/modules/core/client-api/src/test/resources/metadata-manager-test-2.xml b/modules/core/client-api/src/test/resources/metadata-manager-test-2.xml index 35bc20a..f19b2f4 100644 --- a/modules/core/client-api/src/test/resources/metadata-manager-test-2.xml +++ b/modules/core/client-api/src/test/resources/metadata-manager-test-2.xml @@ -6,9 +6,6 @@ <server name="Extension Server B" discovery="ServerBComponent" class="ServerBServerComponent" description="Extension Server B Test Server" sourcePlugin="Test1" sourceType="Server A"> - <service name="Service D" discovery="ServiceDComponent" class="ServiceDServerComponent" - description="Extension Service D Test Service" - sourcePlugin="Test1" sourceType="Service D"/> </server> diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceComponent.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceComponent.java new file mode 100644 index 0000000..ddb9094 --- /dev/null +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceComponent.java @@ -0,0 +1,48 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.pluginapi.inventory; + +import org.rhq.core.domain.measurement.AvailabilityType; + +/** + * This is used when a resource type is disabled. It simply will do no work + * and {@link #getAvailability()} will never show UP. + * + * @author John Mazzitelli + */ +@SuppressWarnings("rawtypes") +public class DisabledResourceComponent implements ResourceComponent { + + @Override + public AvailabilityType getAvailability() { + return AvailabilityType.DOWN; + } + + @Override + public void start(ResourceContext context) throws InvalidPluginConfigurationException, Exception { + } + + @Override + public void stop() { + } +} diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceDiscoveryComponent.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceDiscoveryComponent.java new file mode 100644 index 0000000..17ca66a --- /dev/null +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceDiscoveryComponent.java @@ -0,0 +1,42 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.pluginapi.inventory; + +import java.util.Collections; +import java.util.Set; + +/** + * This is used when a resource type is disabled. When this discovery component is used for a type, + * it will simply not return any discovered resources. + * + * @author John Mazzitelli + */ +@SuppressWarnings("rawtypes") +public class DisabledResourceDiscoveryComponent implements ResourceDiscoveryComponent { + + @Override + public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context) + throws InvalidPluginConfigurationException, Exception { + return Collections.emptySet(); + } +} diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java index e021d80..41dbda7 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java @@ -47,6 +47,7 @@ public class PluginContainerConfiguration { private static final String DATA_DIRECTORY_PROP = PROP_PREFIX + "data-directory"; private static final String TEMP_DIRECTORY_PROP = PROP_PREFIX + "temp-directory"; private static final String DISABLED_PLUGINS = PROP_PREFIX + "disabled-plugins"; + private static final String DISABLED_RESOURCE_TYPES = PROP_PREFIX + "disabled-resource-types"; private static final String ROOT_PLUGIN_CLASSLOADER_REGEX_PROP = PROP_PREFIX + "root-plugin-classloader-regex"; private static final String CREATE_RESOURCE_CLASSLOADERS = PROP_PREFIX + "create-resource-classloaders"; private static final String START_MANAGEMENT_BEAN_PROP = PROP_PREFIX + "start-management-bean"; @@ -238,6 +239,42 @@ public class PluginContainerConfiguration { } /** + * If any resource types are to be disabled, the resource types names will be returned + * in a list. + * Each type is listed as "plugin name>parent type>child type". + * If no types are to be disabled an empty list is returned. + * The returned list is a copy, not the actual list used internally. + * Note that the plugin name is the name found in the plugin .xml descriptor in the plugin root element. + * + * @return list of resource type names identifying types to be disabled + */ + @SuppressWarnings("unchecked") + public List<String> getDisabledResourceTypes() { + List<String> list = (List<String>) configuration.get(DISABLED_RESOURCE_TYPES); + if (list == null) { + return new ArrayList<String>(0); + } else { + return new ArrayList<String>(list); + } + } + + /** + * If one or more resource types are not to be loaded by the plugin container, the given + * list should be the names of the types to be disabled. + * Each type is listed as "plugin name>parent type>child type". + * Note that the plugin name is the name found in the plugin .xml descriptor in the plugin root element. + * + * @param disabledResourceTypes + */ + public void setDisabledResourceTypes(List<String> disabledResourceTypes) { + if (disabledResourceTypes != null) { + configuration.put(DISABLED_RESOURCE_TYPES, disabledResourceTypes); + } else { + configuration.remove(DISABLED_RESOURCE_TYPES); + } + } + + /** * Returns the regex that defines what classes the plugin container can provide to its * plugins from its own classloader and its parents. If not <code>null</code>, any classes * found in the plugin container's classloader (and its parent classloaders) that do diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java index a5d12a2..17d1565 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java @@ -45,6 +45,8 @@ import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; import org.rhq.core.domain.plugin.Plugin; import org.rhq.core.pc.ContainerService; import org.rhq.core.pc.PluginContainerConfiguration; +import org.rhq.core.pluginapi.inventory.DisabledResourceComponent; +import org.rhq.core.pluginapi.inventory.DisabledResourceDiscoveryComponent; import org.rhq.core.pluginapi.plugin.PluginContext; import org.rhq.core.pluginapi.plugin.PluginLifecycleListener; import org.rhq.core.system.SystemInfo; @@ -73,6 +75,8 @@ public class PluginManager implements ContainerService { } private static final Log log = LogFactory.getLog(PluginManager.class); + private static String DISABLED_DISCOVERY_COMPONENT_CLASS = DisabledResourceDiscoveryComponent.class.getName(); + private static String DISABLED_RESOURCE_COMPONENT_CLASS = DisabledResourceComponent.class.getName(); /** * The map of all plugins keyed on plugin name. @@ -103,6 +107,9 @@ public class PluginManager implements ContainerService { loadedPlugins = new ArrayList<Plugin>(); metadataManager = new PluginMetadataManager(); + metadataManager.setDisabledResourceTypes(configuration.getDisabledResourceTypes(), + DISABLED_DISCOVERY_COMPONENT_CLASS, DISABLED_RESOURCE_COMPONENT_CLASS); + initUpdateLoadedPluginsCallback(); PluginFinder finder = configuration.getPluginFinder(); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java index 6505648..939457a 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java @@ -1217,6 +1217,15 @@ public class AgentConfiguration { disabled_plugins = new ArrayList<String>(Arrays.asList(array)); } + // determine what, if any, resource types are to be disabled + String disabled_types_pref = m_preferences.get(AgentConfigurationConstants.PLUGINS_DISABLED_RESOURCE_TYPES, + null); + List<String> disabled_types = null; + if (disabled_types_pref != null) { + String[] array = disabled_types_pref.split("\\|"); + disabled_types = new ArrayList<String>(Arrays.asList(array)); + } + // Define what plugin container/agent classes are to be hidden from our plugins. String clRegex = m_preferences.get(AgentConfigurationConstants.PLUGINS_ROOT_PLUGIN_CLASSLOADER_REGEX, null); if (clRegex == null) { @@ -1232,6 +1241,7 @@ public class AgentConfiguration { config.setDataDirectory(data_directory); config.setTemporaryDirectory(tmp_directory); config.setDisabledPlugins(disabled_plugins); + config.setDisabledResourceTypes(disabled_types); config.setRootPluginClassLoaderRegex(clRegex); config.setServerDiscoveryInitialDelay(server_discovery_initial_delay); config.setServerDiscoveryPeriod(server_discovery_period); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java index 5f0b8ed..4fe7df9 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java @@ -549,6 +549,12 @@ public interface AgentConfigurationConstants { String PLUGINS_DISABLED = PROPERTY_NAME_PREFIX + "plugins.disabled"; /** + * The |-separated list of names of resource types that are to be disabled at startup. + * Values are things like "plugin name>parent>child>grandchild|plugin name2>type". + */ + String PLUGINS_DISABLED_RESOURCE_TYPES = PROPERTY_NAME_PREFIX + "plugins.disabled-resource-types"; + + /** * Defines, in seconds, the initial delay before the first server discovery scan is run. */ String PLUGINS_SERVER_DISCOVERY_INITIAL_DELAY = PROPERTY_NAME_PREFIX diff --git a/modules/enterprise/agent/src/main/resources/agent-configuration.xml b/modules/enterprise/agent/src/main/resources/agent-configuration.xml index 8ef78c9..61339fe 100644 --- a/modules/enterprise/agent/src/main/resources/agent-configuration.xml +++ b/modules/enterprise/agent/src/main/resources/agent-configuration.xml @@ -838,6 +838,24 @@ commands named "config", "setconfig" and "setup" and the command line options  +  + + <!-- + _______________________________________________________________ rhq.communications.configuration-schema-version Defines what version of the agent configuration schema this diff --git a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml index 01c0a41..a544775 100644 --- a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml @@ -331,6 +331,7 @@ <c:simple-property name="rhq.agent.plugins.event-report.max-per-source" type="integer" activationPolicy="restart" required="false" default="200" displayName="Event Report Max Per Source" description="Defines the maximum number of events for any given event source that can be placed in a single event report that is sent up to the server. If this number is larger than the max-total setting, then this setting is ignored" /> <c:simple-property name="rhq.agent.plugins.event-report.max-total" type="integer" activationPolicy="restart" required="false" default="400" displayName="Event Report Max Total" description="Defines the total maximum number of events that can be placed in a single event report that is sent up to the server" /> <c:simple-property name="rhq.agent.plugins.disabled" type="string" activationPolicy="restart" required="false" default="" displayName="Disabled Plugins" description="Defines the plugins that should be disabled and not loaded by the plugin container. This is a comma-separated list of plugin names." /> + <c:simple-property name="rhq.agent.plugins.disabled-resource-types" type="string" activationPolicy="restart" required="false" default="" displayName="Disabled Resource Types" description="Defines the resource types that should be disabled and not used by the plugin container. This is a |-separated list of type names in the form of 'plugin name>parent type>child type'." /> </c:group> <c:group name="comm-endpoints" displayName="Communication Endpoints" hiddenByDefault="false"> <c:description>Communication settings that define the endpoints of this RHQ Agent and its RHQ Server</c:description> commit d7b1d30aa9e00acca315c406db758518ed85abe8 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Oct 8 17:48:27 2012 -0400 [BZ 864213] fix the web resource's ability to collect response time data. (originally cherry picked from master commit b44ad1b934bbc80a52bfa1d4202294a63a94802c) (cherry picked from release/jon3.1.x commit 37bd3a21cfc97e7fe984da6fcddfe78abcd9be19) diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java index df9da3a..072f4d7 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java @@ -19,6 +19,7 @@ package org.rhq.modules.plugins.jbossas7; import java.io.File; +import java.util.HashSet; import java.util.Iterator; import java.util.Set; @@ -77,7 +78,14 @@ public class WebRuntimeComponent extends BaseComponent<BaseComponent<?>> { } @Override - public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception { + public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> origReqs) throws Exception { + // make our own copy so, as we iterate, we can remove the item that we can process, + // which will leave the rest for super.getValues() to process + HashSet<MeasurementScheduleRequest> requests; + requests = new HashSet<MeasurementScheduleRequest>(origReqs.size()); + requests.addAll(origReqs); + + // now process schedule requests for (Iterator<MeasurementScheduleRequest> iterator = requests.iterator(); iterator.hasNext(); ) { MeasurementScheduleRequest request = iterator.next(); if (request.getName().equals(RESPONSE_TIME_METRIC)) { commit 1f16c5eee454d153381ffa2b32556365d407dd3e Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Dec 19 12:39:24 2012 -0500 [BZ 887411] don't uninventory everything just because we commited some top level server (originally cherry picked from master commit d5564f3562ee960115cc533f029521000c870f45) (cherry picked from release/jon3.1.x commit 26501218b106736b8b3d0f1fd1285177a08f9ea3) diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java index d95a976..7857bb7 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java @@ -1087,7 +1087,24 @@ public class InventoryManager extends AgentService implements ContainerService, return true; } + /** + * Performs a sync so that resources passed in are reflected in the agent's inventory. + * This assumes the resource sync infos passed in represent the full inventory tree. + * + * @param syncInfo information on all resources in the entire inventory tree + */ private void synchInventory(ResourceSyncInfo syncInfo) { + synchInventory(syncInfo, false); + } + + /** + * Performs a sync so that resources passed in are reflected in the agent's inventory. + * + * @param syncInfo the resources' sync data + * @param partialInventory if true, syncInfo represents only a partial inventory. + * if false, syncInfo represents the full inventory tree of all resources + */ + private void synchInventory(ResourceSyncInfo syncInfo, boolean partialInventory) { log.info("Syncing local inventory with Server inventory..."); long startTime = System.currentTimeMillis(); Set<Resource> syncedResources = new LinkedHashSet<Resource>(); @@ -1099,7 +1116,12 @@ public class InventoryManager extends AgentService implements ContainerService, // rhq-980 Adding agent-side logging to report any unexpected synch failure. try { - getAllUuids(syncInfo, allServerSideUuids); + // don't bother doing this if we are processing a partial inventory. + // allServerSideUuids is only ever used to purge obsolete resources, but we don't + // do that for partial inventories, so we don't need to prepare that collection for partials. + if (!partialInventory) { + getAllUuids(syncInfo, allServerSideUuids); + } log.debug("Processing Server sync info..."); processSyncInfo(syncInfo, syncedResources, unknownResourceIds, modifiedResourceIds, deletedResourceIds, @@ -1113,7 +1135,9 @@ public class InventoryManager extends AgentService implements ContainerService, mergeUnknownResources(unknownResourceIds); mergeModifiedResources(modifiedResourceIds); - purgeObsoleteResources(allServerSideUuids); + if (!partialInventory) { + purgeObsoleteResources(allServerSideUuids); + } postProcessNewlyCommittedResources(newlyCommittedResources); if (log.isDebugEnabled()) { if (!deletedResourceIds.isEmpty()) { @@ -2164,7 +2188,7 @@ public class InventoryManager extends AgentService implements ContainerService, + "] and its descendants..."); // Get the latest resource data rooted at the given id. - synchInventory(syncInfo); + synchInventory(syncInfo, true); // this method assumes we only get a single resource and its children (BZ 887411) performServiceScan(syncInfo.getId()); // NOTE: This will block (the initial scan blocks). } commit f96ed461b42f3a58f5c3aae63f41dd2571224ee4 Author: Larry O'Leary <loleary(a)redhat.com> Date: Tue Jan 8 16:59:11 2013 -0600 Bug 905183 - [as5 plugin] Unable to collect metric from web application context due to WebApplicationContextComponent not initializing 'clustered' property value Added code to verify that clustered has been initialized and if it has not, an attempt is made to initialize it. Additionally, it will not be used if it is not initialized. (originally cherry picked from master commit 4403c93e9f56274644f397174582a0540c0195fc) (cherry picked from release/3.1.x commit d424355d2d79746a63cf326629777e004378b0ed) diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java index 07708b7..dd63305 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java @@ -142,16 +142,24 @@ public class WebApplicationContextComponent extends ManagedComponentComponent { report.addData(trait); } } else { - String metricNameToUse = metricName; - if (clustered && !"runState".equals(metricName)) { - metricNameToUse = toUpperCaseFirstLetter(metricName); + String value = null; + + /* + * Bug 737996 - Working around the property names inconsistency in the clustered web app contexts. + * If clustered we need to capitalize the first letter of the metric name to workaround JBPAPP-7172. + * If null is returned then we can assume that JBPAPP-7172 does not apply here and use the expected + * metric name. + */ + if (clustered == null) { + retrieveClusteredProperty(); } - String value = getMeasurement(component, metricNameToUse); + if (clustered != null && clustered && !"runState".equals(metricName)) { + value = getMeasurement(component, toUpperCaseFirstLetter(metricName)); + } - if (clustered && !"runState".equals(metricName) && value == null) { - //hmm... so it looks like https://issues.jboss.org/browse/JBPAPP-7172 has been fixed - //and we're getting the metric names in lower case even for clustered contexts + // value should be null unless app is clustered and JBPAPP-7172 applies + if (value == null) { value = getMeasurement(component, metricName); } @@ -265,4 +273,4 @@ public class WebApplicationContextComponent extends ManagedComponentComponent { return Character.toUpperCase(first) + name.substring(1); } -} \ No newline at end of file +}

1 0

[rhq] Branch 'mtho11/d3-charts2' - 3 commits - modules/enterprise
by mike thompson 06 Feb '13

06 Feb '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java | 22 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java | 134 ++++------ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java | 10 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/MetricLineGraph.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricNvd3BarChartGraph.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java | 26 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java | 1 8 files changed, 134 insertions(+), 117 deletions(-) New commits: commit ee5aa71773c6ba81000c5bdc2cc525f1b7033c94 Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Feb 6 15:45:24 2013 -0800 Charting - Fix initial NPE on dashboard charts. This was a timing issue where a super class tried to render the charts before the data retrieved. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java index 13c32c6..244ea3d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java @@ -108,9 +108,9 @@ public class ResourceGraphPortlet extends ResourceMetricD3Graph implements Custo if (resourceIdProperty != null && measurementDefIdProperty != null) { final Integer entityId = resourceIdProperty.getIntegerValue(); final Integer measurementDefId = measurementDefIdProperty.getIntegerValue(); - //this.metricGraphData = new MetricGraphData(); - graph.getMetricGraphData().setDefinitionId(measurementDefId); - graph.getMetricGraphData().setEntityId(entityId); + graph.setDefinitionId(measurementDefId); + graph.setEntityId(entityId); + Log.debug("Metric Graph Data: "+ graph.getMetricGraphData()); if (entityId != null && measurementDefId != null) { @@ -122,7 +122,7 @@ public class ResourceGraphPortlet extends ResourceMetricD3Graph implements Custo } private void queryResource(Integer entityId, final Integer measurementDefId) { - final long startTime = System.currentTimeMillis(); + //final long startTime = System.currentTimeMillis(); ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService(); @@ -156,7 +156,6 @@ public class ResourceGraphPortlet extends ResourceMetricD3Graph implements Custo @Override public void onTypesLoaded(Map<Integer, ResourceType> types) { ResourceType type = types.get(resource.getResourceType().getId()); - Log.debug("MeasurementDefs.size(): " + type.getMetricDefinitions().size()); for (final MeasurementDefinition def : type.getMetricDefinitions()) { if (def.getId() == measurementDefId) { Log.debug("Found portlet measurement definition !" + def); @@ -184,14 +183,13 @@ public class ResourceGraphPortlet extends ResourceMetricD3Graph implements Custo * Satisfied only after ALL of the metric queries AND availability have completed */ public void execute() { - Log.debug("Time for Dashboard async query: " + (System.currentTimeMillis() - startTime)); + Log.debug("Dashboard chart query total time for entity: "+entityId+", MeasurementDef: "+def.getId() +" in "+ (System.currentTimeMillis() - startTime)+" ms"); drawGraph(); - //redraw(); } }); + queryMeasurementsAndMetricData(entityId, def.getId(), countDownLatch); queryAvailability(entityId, countDownLatch); - queryMeasurementsAndMetricData(entityId, countDownLatch); // now the countDown latch will run sometime asynchronously after BOTH the previous 2 queries have executed } @@ -214,7 +212,7 @@ public class ResourceGraphPortlet extends ResourceMetricD3Graph implements Custo @Override public void onSuccess(PageList<Availability> availList) { - Log.debug("\nSuccessfully queried Dashboard availability in: " + Log.debug("Dashboard chart availability query for: "+entityId+", in: " + (System.currentTimeMillis() - startTime) + " ms."); PageList<Availability> availabilityList = new PageList<Availability>(); for (Availability availability : availList) { @@ -228,11 +226,11 @@ public class ResourceGraphPortlet extends ResourceMetricD3Graph implements Custo }); } - private void queryMeasurementsAndMetricData(final Integer entityId, final CountDownLatch countDownLatch) { + private void queryMeasurementsAndMetricData(final Integer entityId, final Integer definitionId, final CountDownLatch countDownLatch) { final long startTime = System.currentTimeMillis(); // GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast(entityId, - new int[] { graph.getMetricGraphData().getDefinitionId() }, 8, MeasurementUtils.UNIT_HOURS, 60, + new int[] { definitionId }, 8, MeasurementUtils.UNIT_HOURS, 60, new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { @Override public void onFailure(Throwable caught) { @@ -242,7 +240,7 @@ public class ResourceGraphPortlet extends ResourceMetricD3Graph implements Custo @Override public void onSuccess(final List<List<MeasurementDataNumericHighLowComposite>> measurementData) { - Log.debug("\nSuccessfully queried Dashboard Metric data in: " + Log.debug("Dashboard Metric data in: " + (System.currentTimeMillis() - startTime) + " ms."); graph.getMetricGraphData().setMetricData(measurementData.get(0)); countDownLatch.countDown(); 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 417abff..a45e11a 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 @@ -23,13 +23,11 @@ import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.Img; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; -import com.smartgwt.client.widgets.layout.HLayout; import org.rhq.enterprise.gui.coregui.client.IconEnum; 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.selenium.LocatableHLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableImg; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; @@ -47,31 +45,52 @@ public abstract class AbstractMetricD3GraphView extends LocatableVLayout { protected AbstractGraph graph; private Integer chartHeight; - public AbstractMetricD3GraphView(String locatorId) { super(locatorId); } - - public AbstractMetricD3GraphView(String locatorId, AbstractGraph graph){ + public AbstractMetricD3GraphView(String locatorId, AbstractGraph graph) { this(locatorId); this.graph = graph; setHeight100(); setWidth100(); } - - protected HTMLFlow getEntityTitle(){ + /** + * 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>"; + } + + protected HTMLFlow getEntityTitle() { return resourceTitle; } - - @Override protected void onDraw() { super.onDraw(); removeMembers(getMembers()); - drawGraph(); + if (graph.getDefinition() != null) { + drawGraph(); + } } @Override @@ -91,81 +110,36 @@ public abstract class AbstractMetricD3GraphView extends LocatableVLayout { protected void drawGraph() { Log.debug("drawGraph marker in AbstractMetricD3GraphView for: " + graph.getMetricGraphData().getChartId()); -// HLayout titleHLayout = new LocatableHLayout(extendLocatorId("HTitle")); -// -// //if (definition != null) { -// titleHLayout.setAutoHeight(); -// titleHLayout.setWidth100(); - -// HTMLFlow entityTitle = getEntityTitle(); -// if (null != entityTitle) { -// entityTitle.setWidth("*"); -// titleHLayout.addMember(entityTitle); -// } -// -// if (supportsLiveGraphViewDialog()) { -// Img liveGraph = createLiveGraphImage(); -// titleHLayout.addMember(liveGraph); -// } - -// addMember(titleHLayout); - - StringBuilder divAndSvgDefs = new StringBuilder(); - divAndSvgDefs.append("<div id=\"rChart-" + graph.getMetricGraphData().getChartId() + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:"+getChartHeight()+"px;\">"); - divAndSvgDefs.append(getSvgDefs()); - divAndSvgDefs.append("</svg></div>"); - HTMLFlow graph = new HTMLFlow(divAndSvgDefs.toString()); - graph.setWidth100(); - graph.setHeight100(); - addMember(graph); - - new Timer() { - @Override - public void run() { - //@todo: this is a hack around timing issue of jsni not seeing the DOM - drawJsniChart(); - } - }.schedule(100); - //} + StringBuilder divAndSvgDefs = new StringBuilder(); + divAndSvgDefs.append("<div id=\"rChart-" + graph.getMetricGraphData().getChartId() + + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:" + getChartHeight() + + "px;\">"); + divAndSvgDefs.append(getSvgDefs()); + divAndSvgDefs.append("</svg></div>"); + HTMLFlow graph = new HTMLFlow(divAndSvgDefs.toString()); + graph.setWidth100(); + graph.setHeight100(); + addMember(graph); + + new Timer() { + @Override + public void run() { + //@todo: this is a hack around timing issue of jsni not seeing the DOM + drawJsniChart(); + } + }.schedule(100); } - /** - * 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>"; - } - - public AbstractGraph getGraph() { - return graph; - } public void setGraph(AbstractGraph graph) { this.graph = graph; } - public abstract void drawJsniChart(); + public abstract void drawJsniChart(); private Img createLiveGraphImage() { - Img liveGraph = new LocatableImg(extendLocatorId("Live"), IconEnum.RECENT_MEASUREMENTS.getIcon16x16Path(), 16, 16); + Img liveGraph = new LocatableImg(extendLocatorId("Live"), IconEnum.RECENT_MEASUREMENTS.getIcon16x16Path(), 16, + 16); liveGraph.setTooltip(MSG.view_resource_monitor_graph_live_tooltip()); liveGraph.addClickHandler(new ClickHandler() { @@ -177,14 +151,14 @@ public abstract class AbstractMetricD3GraphView extends LocatableVLayout { return liveGraph; } - public void setChartHeight(Integer height) { - graph.getMetricGraphData().setChartHeight(height); - } - public Integer getChartHeight() { return graph.getMetricGraphData().getChartHeight(); } + public void setChartHeight(Integer height) { + graph.getMetricGraphData().setChartHeight(height); + } + /** * This is only necessary to set this for the ResourceGraphPortlet case where * configuration is deferred. 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 3cae5f3..687e161 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 @@ -256,7 +256,7 @@ public class MetricGraphData implements JsonMetricProducer { public String getJsonMetrics() { StringBuilder sb = new StringBuilder("["); boolean gotAdjustedMeasurementUnits = false; - Log.debug(" avail records loaded: " + availabilityList.size()); + //Log.debug(" avail records loaded: " + availabilityList.size()); if (null != metricData) { long firstBarTime = metricData.get(0).getTimestamp(); long secondBarTime = metricData.get(1).getTimestamp(); @@ -441,4 +441,29 @@ public class MetricGraphData implements JsonMetricProducer { return startTime + timeThreshold < endTime; } + @Override + public String toString() { + final StringBuilder sb = new StringBuilder(); + sb.append("MetricGraphData"); + sb.append("{chartTitleMinLabel='").append(chartTitleMinLabel).append('\''); + sb.append(", chartTitleAvgLabel='").append(chartTitleAvgLabel).append('\''); + sb.append(", chartTitlePeakLabel='").append(chartTitlePeakLabel).append('\''); + sb.append(", chartDateLabel='").append(chartDateLabel).append('\''); + sb.append(", chartTimeLabel='").append(chartTimeLabel).append('\''); + sb.append(", chartDownLabel='").append(chartDownLabel).append('\''); + sb.append(", chartUnknownLabel='").append(chartUnknownLabel).append('\''); + sb.append(", chartNoDataLabel='").append(chartNoDataLabel).append('\''); + sb.append(", chartHoverStartLabel='").append(chartHoverStartLabel).append('\''); + sb.append(", chartHoverEndLabel='").append(chartHoverEndLabel).append('\''); + sb.append(", chartHoverPeriodLabel='").append(chartHoverPeriodLabel).append('\''); + sb.append(", chartHoverBarLabel='").append(chartHoverBarLabel).append('\''); + sb.append(", entityId=").append(entityId); + sb.append(", entityName='").append(entityName).append('\''); + sb.append(", definitionId=").append(definitionId); + sb.append(", adjustedMeasurementUnits=").append(adjustedMeasurementUnits); + sb.append(", definition=").append(definition); + sb.append(", chartHeight=").append(chartHeight); + 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 c9aab1d..867d783 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,7 @@ public final class MetricStackedBarGraph extends AbstractGraph { console.log("Chart Height: "+chartContext.height); var margin = {top: 10, right: 5, bottom: 5, left: 40}, width = 750 - margin.left - margin.right, - adjustedChartHeight = chartContext.chartHeight - 40, + adjustedChartHeight = chartContext.chartHeight - 50, height = adjustedChartHeight - margin.top - margin.bottom, titleHeight = 30, titleSpace = 10, barOffset = 2, @@ -622,7 +622,6 @@ public final class MetricStackedBarGraph extends AbstractGraph { trigger: 'hover', title: function () { var d = this.__data__; - //console.log("y: " + d.y); return formatHovers(chartContext, d); }, show: function (e, el) 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 0fc84ad..42ec38e 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 @@ -21,7 +21,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitori 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.HasD3JsniChart; -import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData; import org.rhq.enterprise.gui.coregui.client.util.Log; public class ResourceMetricD3Graph extends AbstractMetricD3GraphView { commit 8a819f51ca7f751c28d98ceec77f3c1ddf1cdff8 Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Feb 6 08:51:20 2013 -0800 Charting - only show trendlines iff no aggregate data exists as we are connecting lines on a scatterplot. Removed basic bar avg trendline strategy that enabled trendlines once the scale reached 4 minute bars or less. 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 4eca060..07753d7 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 @@ -27,8 +27,12 @@ import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite; import org.rhq.core.domain.util.PageList; /** - * Common Graph capability. + * Common Graph capability used across multiple graphs. * The MetricGraphData delegate is wrapped for JSNI access via d3 charts. + * Also, by delegating and directly extending MetricGraphData we have more + * control over the visibility of what we want graphs to 'see'. + * + * @see MetricGraphData * * @author Mike Thompson */ @@ -95,6 +99,10 @@ public abstract class AbstractGraph implements HasD3JsniChart { metricGraphData.setMeasurementOOBCompositeList(measurementOOBCompositeList); } + public boolean showBarAvgTrendLine(){ + return metricGraphData.showBarAvgTrendLine(); + } + public String getChartTitleMinLabel() { return metricGraphData.getChartTitleMinLabel(); } 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 35a31b7..3cae5f3 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 @@ -40,6 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; * The data portion of the graphs making these methods accessible via JSNI to * classes extending this and implementing graphs. * Provide i18n labels and format the json data for the graph. + * @see AbstractGraph * * @author Mike Thompson */ @@ -336,7 +337,6 @@ public class MetricGraphData implements JsonMetricProducer { sb.append(" },"); } } - //} sb.setLength(sb.length() - 1); // delete the last ',' } sb.append("]"); @@ -344,6 +344,29 @@ public class MetricGraphData implements JsonMetricProducer { return sb.toString(); } + /** + * When the scale is adjusted down to a level where bars no longer have + * highs and lows different from the avg value then have probably hit a + * scale where aggregates no longer exist and we are looking the individual + * values. At the very least the data is less interesting and a trendline + * connecting the points has less meaning because we are essentially a scatterplot. + * A different algorithm could be used here but this will suffice. + * @return true if the graphs should show the bar avg line meaning there is aggregates in the data + * @see MetricStackedBarGraph + */ + public boolean showBarAvgTrendLine() { + for (MeasurementDataNumericHighLowComposite measurement : metricData) { + boolean noValuesInCurrentBarUndefined = (!Double.isNaN(measurement.getValue()) && !Double.isNaN(measurement.getHighValue()) && !Double.isNaN(measurement.getLowValue())); + boolean foundAggregateBar = (measurement.getValue() != measurement.getHighValue() || measurement.getHighValue() != measurement.getLowValue()); + // if there exists a even one aggregate bar then I can short circuit this and exit + if (noValuesInCurrentBarUndefined && foundAggregateBar){ + return true; + } + } + return false; + + } + private void calculateOOB() { if (measurementOOBCompositeList != null && !measurementOOBCompositeList.isEmpty()) { Log.debug("OOB List size: " + measurementOOBCompositeList.size()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricLineGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricLineGraph.java index 6057620..304cd0a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricLineGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricLineGraph.java @@ -42,7 +42,7 @@ public final class MetricLineGraph extends AbstractGraph { chartId = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getChartId()(), chartHandle = "#rChart-"+chartId, chartSelection = chartHandle + " svg", - json = eval(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getJsonMetrics()()), + json = $wnd.jQuery.parseJSON(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getJsonMetrics()()), yAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getYAxisTitle()(), yAxisUnits = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getYAxisUnits()(), xAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getXAxisTitle()(); @@ -50,8 +50,6 @@ public final class MetricLineGraph extends AbstractGraph { console.log("chart id: "+chartSelection ); console.log(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getJsonMetrics()()); - //var jsonData = eval([{ x:1352204720548, high:0.016642348035599646, low:0.016642348035599646, y:0.016642348035599646},{ x:1352211680548, high:12.000200003333388, low:0.0, y:3.500050000833347},{ x:1352211920548, high:2.000033333888898, low:1.999966667222213, y:2.000000000277778},{ x:1352212160548, high:5.0, low:1.999966667222213, y:2.750000000277778},{ x:1352212400548, high:4.0, low:2.0, y:2.5000083334722243},{ x:1352212640548, high:2.0, low:1.999966667222213, y:1.9999916668055533},{ x:1352212880548, high:3.0, low:2.0, y:2.2500083334722243},{ x:1352213120548, high:3.000050000833347, low:1.999966667222213, y:2.2500041672916677},{ x:1352213360548, high:4.0, low:1.999966667222213, y:2.7499916668055535},{ x:1352213600548, high:2.000033333888898, low:1.999966667222213, y:2.000008333750002},{ x:1352213840548, high:2.0, low:1.999966667222213, y:1.9999916668055533},{ x:1352214080548, high:3.0, low:1.999966667222213, y:2.250000000277778},{ x:1352214320548, high:4.0, low:2.0, y :2.5},{ x:1352214560548, high:3.0, low:1.999966667222213, y:2.250000000833347},{ x:1352214800548, high:2.000033333888898, low:1.999966667222213, y:2.000000000277778},{ x:1352215040548, high:4.0, low:2.0, y:2.5},{ x:1352215280548, high:3.0, low:2.0, y:2.2500083334722243},{ x:1352215520548, high:2.0, low:1.999966667222213, y:1.9999916668055533},{ x:1352215760548, high:3.0, low:1.999966667222213, y:2.250000000277778},{ x:1352216000548, high:4.0, low:2.0, y:2.5},{ x:1352216240548, high:2.000066668888963, low:1.999966667222213, y:2.000008334027794},{ x:1352216480548, high:3.0, low:1.999966667222213, y:2.2499916668055535}]); - function draw(data){ "use strict"; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricNvd3BarChartGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricNvd3BarChartGraph.java index d84bb92..a98005c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricNvd3BarChartGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricNvd3BarChartGraph.java @@ -43,7 +43,7 @@ public final class MetricNvd3BarChartGraph extends AbstractGraph chartId = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getChartId()(), chartHandle = "#rChart-"+chartId, chartSelection = chartHandle + " svg", - json = eval(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getJsonMetrics()()), + json = $wnd.jQuery.parseJSON(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getJsonMetrics()()), yAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getYAxisTitle()(), yAxisUnits = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getYAxisUnits()(), xAxisLabel = global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData::getXAxisTitle()(), 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 b2e9f61..c9aab1d 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 @@ -290,7 +290,7 @@ public final class MetricStackedBarGraph extends AbstractGraph { return isNaN(d.high) ? yScale(lowBound) : yScale(d.high); }) .attr("height", function (d) { - if (d.down || d.nodata) { + if (d.down || d.unknown || d.nodata) { return height - yScale(lowBound); } else { @@ -454,19 +454,16 @@ public final class MetricStackedBarGraph extends AbstractGraph { }) .y(function (d,i) { - var minuteBarThreshold = 4, - firstDate = this.__data__[0].x, - secondDate = this.__data__[1].x, - barDateDiffInMinutes = (secondDate - firstDate)/ (60000); + var showBarAvgTrendline = + global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::showBarAvgTrendLine()(); - if(barDateDiffInMinutes > minuteBarThreshold){ + if(showBarAvgTrendline){ // on a bar avg line if the value is undefined then use the last defined value if(d.y == undefined){ if(i >= 1){ // count backward until there is a defined value for(var j=i; j>=1;j--){ if(this.__data__[j].y != undefined){ - //console.log( "using: "+j +" for :"+i+", value"+this.__data__[j].y); return yScale(this.__data__[j].y); } } commit 3daf2f2268223df6b33524e3715587ae22d6719a Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Feb 5 14:34:24 2013 -0800 Charting - fixing second dashboard 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 a51910e..417abff 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 @@ -139,15 +139,15 @@ public abstract class AbstractMetricD3GraphView extends LocatableVLayout { " <stop offset=\"0%\" style=\"stop-color:#E6E6E6;stop-opacity:1\"/>" + " <stop offset=\"100%\" style=\"stop-color:#F0F0F0;stop-opacity:1\"/>" + " </linearGradient>" + - " <pattern id=\"grayStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" + + " <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=\"blueStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" + + " <pattern id=\"unknownStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" + " width=\"6\" height=\"3\">" + - " <path d=\"M 0 0 6 0\" style=\"stroke:#69BFDE; fill:none;\"/>" + + " <path d=\"M 0 0 6 0\" style=\"stroke:#2E9EC2; fill:none;\"/>" + " </pattern>" + - " <pattern id=\"redStripes\" patternUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\"" + + " <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>" + 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 b663630..b2e9f61 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 @@ -266,11 +266,11 @@ public final class MetricStackedBarGraph extends AbstractGraph { .attr("opacity", ".9") .attr("fill", function (d) { if (d.down) { - return "url(#redStripes)"; + return "url(#downStripes)"; } else if (d.unknown) { - return "url(#blueStripes)"; + return "url(#unknownStripes)"; }else if (d.nodata) { - return "url(#grayStripes)"; + return "url(#noDataStripes)"; } else { return "#d3d3d6"; @@ -492,10 +492,7 @@ public final class MetricStackedBarGraph extends AbstractGraph { .attr("stroke-width", "1") .attr("stroke-dasharray", "3,3") .attr("stroke-opacity", ".7") - .attr("d", peakLine) - .text("Peak") - .append("title") - .text(function(d ) { return "Peak"; }); + .attr("d", peakLine); // min Line svg.append("path") @@ -516,7 +513,6 @@ public final class MetricStackedBarGraph extends AbstractGraph { .attr("stroke", "#b0d9b0") .attr("stroke-width", "1.5") .attr("stroke-dasharray", "3,3") - .text("Avg") //.attr("stroke-opacity", ".9") .attr("d", avgLine);

1 0

[rhq] Branch 'release/jon3.1.x' - modules/enterprise
by Jay Shaughnessy 06 Feb '13

06 Feb '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 29 +++------- 1 file changed, 9 insertions(+), 20 deletions(-) New commits: commit 353299c6b2c982712c17861ef09f88293b0fa27e Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Feb 6 15:14:24 2013 -0500 Fix a bug in the ResourceType pojo to ResourceType entity conversion code. Criteria String matching is *fuzzy* (i.e. substring matching) by default. This needs to have the Criteria.setStrict(true) added to make it exact. In the end I got rid of the Criteria query in favor of an existing NamedQuery, for a possible perf boost as the query could be executed many times during a large inventory merge. CP master: 20381597861b30716daecd4db9ad6ce88de98a78 diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index d68b051..ff5f7e1 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -64,7 +64,6 @@ import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.criteria.ResourceCriteria; -import org.rhq.core.domain.criteria.ResourceTypeCriteria; import org.rhq.core.domain.discovery.MergeResourceResponse; import org.rhq.core.domain.discovery.ResourceSyncInfo; import org.rhq.core.domain.resource.Agent; @@ -1067,28 +1066,18 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot if (null == resourceType) { try { - ResourceTypeCriteria criteria = new ResourceTypeCriteria(); - criteria.addFilterPluginName(plugin); - criteria.addFilterName(name); - List<ResourceType> result = resourceTypeManager.findResourceTypesByCriteria( - subjectManager.getOverlord(), criteria); - - if (!result.isEmpty()) { - resourceType = result.get(0); - loadedTypeMap.put(key.toString(), resourceType); - } + resourceType = this.resourceTypeManager.getResourceTypeByNameAndPlugin(name, plugin); + } catch (RuntimeException e) { - log.error("Failed to lookup Resource type [" + resource.getResourceType() + "] for reported Resource [" - + resource + "] - this should not have happened."); - return false; + resourceType = null; } - } - if (null == resourceType) { - log.error("Reported resource [" + resource + "] has an unknown type [" + resource.getResourceType() - + "]. The Agent most likely has a plugin named '" + resource.getResourceType().getPlugin() - + "' installed that is not installed on the Server. Resource will be ignored..."); - return false; + if (null == resourceType) { + log.error("Reported resource [" + resource + "] has an unknown type [" + resource.getResourceType() + + "]. The Agent most likely has a plugin named '" + plugin + + "' installed that is not installed on the Server. Resource will be ignored..."); + return false; + } } resource.setResourceType(resourceType);

1 0

[rhq] 2 commits - modules/enterprise
by Jay Shaughnessy 06 Feb '13

06 Feb '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 29 +++------- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java | 7 +- 5 files changed, 17 insertions(+), 23 deletions(-) New commits: commit 73a33d50c1e1ce9f20e5023e0a4a31641d9c0754 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Feb 6 15:06:53 2013 -0500 Make sure Criteria.setStrict(true) is set when using a Criteria search where exact matches are expected and substrings could return unwanted results. I found these just looking for the 'addFilter.*Name' in server jar. In most cases a name filter will want to be exact. Keep an eye out for other similar cases. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java index b59ca8b..af4c81f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java @@ -140,6 +140,7 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { // Make sure there's not an existing role with the same name. RoleCriteria criteria = new RoleCriteria(); criteria.addFilterName(newRole.getName()); + criteria.setStrict(true); PageList<Role> roles = findRolesByCriteria(whoami, criteria); if (!roles.isEmpty()) { throw new EntityExistsException("A user role [" + newRole.getName() + "] already exists."); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java index a6302de..b2492cf 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java @@ -448,6 +448,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot // first see if the bundle exists or not; if not, create one BundleCriteria criteria = new BundleCriteria(); + criteria.setStrict(true); criteria.addFilterBundleTypeId(Integer.valueOf(bundleTypeId)); criteria.addFilterName(bundleName); PageList<Bundle> bundles = findBundlesByCriteria(subject, criteria); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java index 7abdd49..1495710 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java @@ -206,6 +206,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { Subject overlord = subjectManager.getOverlord(); DriftDefinitionCriteria driftDefCriteria = new DriftDefinitionCriteria(); + driftDefCriteria.setStrict(true); driftDefCriteria.addFilterResourceIds(resourceId); driftDefCriteria.addFilterName(driftDefName); @@ -500,6 +501,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { } DriftDefinitionCriteria criteria = new DriftDefinitionCriteria(); + criteria.setStrict(true); criteria.addFilterName(summary.getDriftDefinitionName()); criteria.addFilterResourceIds(resourceId); PageList<DriftDefinition> definitions = findDriftDefinitionsByCriteria(subject, criteria); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java index b206b54..35b77c2 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java @@ -115,10 +115,11 @@ public class DriftServerServiceImpl implements DriftServerService { } @Override - public void updateCompliance(int resourceId, String drfitDefName, DriftComplianceStatus complianceStatus) { + public void updateCompliance(int resourceId, String driftDefName, DriftComplianceStatus complianceStatus) { DriftDefinitionCriteria criteria = new DriftDefinitionCriteria(); + criteria.setStrict(true); criteria.addFilterResourceIds(resourceId); - criteria.addFilterName(drfitDefName); + criteria.addFilterName(driftDefName); DriftManagerLocal driftMgr = getDriftManager(); SubjectManagerLocal subjectMgr = getSubjectManager(); @@ -128,7 +129,7 @@ public class DriftServerServiceImpl implements DriftServerService { if (definitions.isEmpty()) { log.warn("Cannot update compliance for [resourceId: " + resourceId + ", driftDefinitionName: " + - drfitDefName + "]. Could not find drift definition."); + driftDefName + "]. Could not find drift definition."); return; } commit 20381597861b30716daecd4db9ad6ce88de98a78 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Feb 6 15:00:55 2013 -0500 Fix a bug in the ResourceType pojo to ResourceType entity conversion code. Criteria String matching is *fuzzy* (i.e. substring matching) by default. This needs to have the Criteria.setStrict(true) added to make it exact. In the end I got rid of the Criteria query in favor of an existing NamedQuery, for a possible perf boost as the query could be executed many times during a large inventory merge. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index d5d7128..005e519 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -64,7 +64,6 @@ import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.criteria.ResourceCriteria; -import org.rhq.core.domain.criteria.ResourceTypeCriteria; import org.rhq.core.domain.discovery.MergeResourceResponse; import org.rhq.core.domain.discovery.ResourceSyncInfo; import org.rhq.core.domain.resource.Agent; @@ -1077,28 +1076,18 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot if (null == resourceType) { try { - ResourceTypeCriteria criteria = new ResourceTypeCriteria(); - criteria.addFilterPluginName(plugin); - criteria.addFilterName(name); - List<ResourceType> result = resourceTypeManager.findResourceTypesByCriteria( - subjectManager.getOverlord(), criteria); - - if (!result.isEmpty()) { - resourceType = result.get(0); - loadedTypeMap.put(key.toString(), resourceType); - } + resourceType = this.resourceTypeManager.getResourceTypeByNameAndPlugin(name, plugin); + } catch (RuntimeException e) { - log.error("Failed to lookup Resource type [" + resource.getResourceType() + "] for reported Resource [" - + resource + "] - this should not have happened."); - return false; + resourceType = null; } - } - if (null == resourceType) { - log.error("Reported resource [" + resource + "] has an unknown type [" + resource.getResourceType() - + "]. The Agent most likely has a plugin named '" + resource.getResourceType().getPlugin() - + "' installed that is not installed on the Server. Resource will be ignored..."); - return false; + if (null == resourceType) { + log.error("Reported resource [" + resource + "] has an unknown type [" + resource.getResourceType() + + "]. The Agent most likely has a plugin named '" + plugin + + "' installed that is not installed on the Server. Resource will be ignored..."); + return false; + } } resource.setResourceType(resourceType);

1 0

[rhq] modules/enterprise
by Jiri Kremser 06 Feb '13

06 Feb '13

modules/enterprise/server/appserver/src/main/module-resources/ojdbc6-readme.jar |binary 1 file changed New commits: commit 520ffcbc8072c485be0ccf6011ff81928dbe22a5 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Feb 6 18:58:15 2013 +0100 [Bug 907407 - RHQ master build fails starting - Failed to load module: deployment.rhq.ear.rhq-enterprise-server-ejb3] The dummy oracle driver was created by 7zip, now it is plain old .zip renamed to .jar diff --git a/modules/enterprise/server/appserver/src/main/module-resources/ojdbc6-readme.jar b/modules/enterprise/server/appserver/src/main/module-resources/ojdbc6-readme.jar index 98e0f70..9f012f3 100644 Binary files a/modules/enterprise/server/appserver/src/main/module-resources/ojdbc6-readme.jar and b/modules/enterprise/server/appserver/src/main/module-resources/ojdbc6-readme.jar differ

1 0

[rhq] modules/enterprise
by Jay Shaughnessy 06 Feb '13

06 Feb '13

modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 885fdf4e857f1a97220b4636abf15dad0d3b1cfa Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Feb 6 11:08:14 2013 -0500 [Bug 907407 - RHQ master build fails starting - Failed to load module: deployment.rhq.ear.rhq-enterprise-server-ejb3] A fix to the original fix diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 8e9531b..f7f781e 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -174,7 +174,7 @@ <echo>Adding JDBC modules to ${jboss.modules.dir} ...</echo>  <copy file="src/main/module-resources/ojdbc6-readme.jar" - toFile="${jboss.modules.dir}/org/rhq/oracle/main/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar" + toFile="${jboss.modules.dir}/org/rhq/oracle/main/ojdbc6-${ojdbc6.version}.jar" failonerror="false" verbose="true" />  <copy file="${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar"

1 0

[rhq] modules/plugins
by Jiri Kremser 06 Feb '13

06 Feb '13

modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/JobJarComponent.java | 37 +++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) New commits: commit ca7c440f79d07a7648fdaf8a26a7abe9da144cc1 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Feb 6 15:24:25 2013 +0100 Fixing the build. It was failing because of message "Component class [org.rhq.plugins.hadoop.JobJarComponent] for resource type [Job Jar] from plugin [hadoop] does not support the content management facet but defines package types.". The skeleton implementation has been added. diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/JobJarComponent.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/JobJarComponent.java index 82a6d76..f5d5dd4 100644 --- a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/JobJarComponent.java +++ b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/JobJarComponent.java @@ -20,10 +20,20 @@ package org.rhq.plugins.hadoop; import java.io.File; +import java.io.InputStream; +import java.util.List; +import java.util.Set; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.content.PackageType; +import org.rhq.core.domain.content.transfer.DeployPackageStep; +import org.rhq.core.domain.content.transfer.DeployPackagesResponse; +import org.rhq.core.domain.content.transfer.RemovePackagesResponse; +import org.rhq.core.domain.content.transfer.ResourcePackageDetails; import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.pluginapi.content.ContentFacet; +import org.rhq.core.pluginapi.content.ContentServices; import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; import org.rhq.core.pluginapi.inventory.ResourceComponent; @@ -36,7 +46,7 @@ import org.rhq.core.pluginapi.operation.OperationResult; * * @author Lukas Krejci */ -public class JobJarComponent implements ResourceComponent<JobTrackerServerComponent>, OperationFacet, DeleteResourceFacet { +public class JobJarComponent implements ResourceComponent<JobTrackerServerComponent>, OperationFacet, DeleteResourceFacet, ContentFacet { public static final String RESOURCE_TYPE_NAME = "Job Jar"; public static final String CONTENT_TYPE_NAME = "jobJar"; @@ -84,4 +94,29 @@ public class JobJarComponent implements ResourceComponent<JobTrackerServerCompon public void deleteResource() throws Exception { jobJar.delete(); } + + @Override + public DeployPackagesResponse deployPackages(Set<ResourcePackageDetails> details, ContentServices services) { + return null; + } + + @Override + public Set<ResourcePackageDetails> discoverDeployedPackages(PackageType type) { + return null; + } + + @Override + public List<DeployPackageStep> generateInstallationSteps(ResourcePackageDetails details) { + return null; + } + + @Override + public RemovePackagesResponse removePackages(Set<ResourcePackageDetails> details) { + return null; + } + + @Override + public InputStream retrievePackageBits(ResourcePackageDetails details) { + return null; + } }

1 0

[rhq] 2 commits - modules/enterprise modules/plugins
by Jiri Kremser 06 Feb '13

06 Feb '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 12 ++++++++++ modules/plugins/validate-all-plugins/pom.xml | 1 2 files changed, 13 insertions(+) New commits: commit 79421169a3596b0460df40a0eabaa41148ab6a69 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Feb 6 14:42:39 2013 +0100 Adding the Hadoop plugin to the validate-all-plugins module. diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index d5bf6fc..fbc5f94 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -34,6 +34,7 @@ <pathelement location="../samba/target/rhq-samba-plugin-${project.version}.jar" /> <pathelement location="../database/target/rhq-database-plugin-${project.version}.jar" /> <pathelement location="../grub/target/rhq-grub-plugin-${project.version}.jar" /> + <pathelement location="../hadoop/target/hadoop-plugin-${project.version}.jar" />  <pathelement location="../hosts/target/rhq-hosts-plugin-${project.version}.jar" /> <pathelement location="../hudson/target/rhq-hudson-plugin-${project.version}.jar" /> commit 77d64e8302bfe3b1df0c5e209ab7a203b10dd589 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Feb 6 14:53:28 2013 +0100 [BZ 902823 - Nonsense data returned as backing content of non-content-backed resources] The UnsupportedOperationException is thrown when the resource is non-content-backed. I was checking also the usages of the method and it seems to be ok. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java index c75246f..e329d46 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java @@ -93,6 +93,7 @@ import org.rhq.core.domain.criteria.PackageCriteria; import org.rhq.core.domain.criteria.PackageVersionCriteria; import org.rhq.core.domain.resource.Agent; import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceCreationDataType; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageList; import org.rhq.core.util.MessageDigestGenerator; @@ -107,6 +108,7 @@ import org.rhq.enterprise.server.authz.RequiredPermission; import org.rhq.enterprise.server.core.AgentManagerLocal; import org.rhq.enterprise.server.plugin.pc.content.PackageDetailsValidationException; import org.rhq.enterprise.server.plugin.pc.content.PackageTypeBehavior; +import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeNotFoundException; import org.rhq.enterprise.server.util.CriteriaQueryGenerator; @@ -145,6 +147,9 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe private ContentManagerLocal contentManager; @EJB + private ResourceManagerLocal resourceManager; + + @EJB private ResourceTypeManagerLocal resourceTypeManager; @EJB @@ -1609,6 +1614,13 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe public InstalledPackage getBackingPackageForResource(Subject subject, int resourceId) { InstalledPackage result = null; + // check if the resource is content backed + Resource res = resourceManager.getResourceById(subject, resourceId); + ResourceType type = res.getResourceType(); + if (!ResourceCreationDataType.CONTENT.equals(type.getCreationDataType())) { + throw new UnsupportedOperationException("Resource [" + resourceId + "] is not content backed."); + } + InstalledPackageCriteria criteria = new InstalledPackageCriteria(); criteria.addFilterResourceId(resourceId); PageList<InstalledPackage> ips = findInstalledPackagesByCriteria(subject, criteria);

1 0

[rhq] modules/enterprise modules/helpers modules/integration-tests
by Heiko W. Rupp 06 Feb '13

06 Feb '13

modules/enterprise/server/jar/pom.xml | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsHandlerBean.java | 270 ++++++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsInterceptor.java | 51 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RootHandlerBean.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionLocal.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java | 7 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/DriftComplianceHandler.java | 13 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/DriftComplianceLocal.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryHandler.java | 13 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryLocal.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationHandler.java | 7 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationLocal.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertHandler.java | 12 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertLocal.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftHandler.java | 15 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftLocal.java | 12 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsHandler.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsLocal.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricHandler.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricLocal.java | 3 modules/enterprise/server/jar/src/main/resources/rest_templates/reportIndex.ftl | 34 + modules/enterprise/server/jar/src/main/xsl/apiout2docbook.xsl | 17 modules/helpers/rest-docs-generator/src/main/java/org/rhq/helpers/rest_docs_generator/ClassLevelProcessor.java | 97 ++- modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ReportsTest.java | 232 ++++++++ 28 files changed, 803 insertions(+), 58 deletions(-) New commits: commit e4493c7aaa382daac248095d0ebb676d1ea33cc0 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Feb 6 12:39:06 2013 +0100 BZ 907029 - Make the reports available at /rest/ as well. diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 7aef625..88a6e82 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -869,6 +869,7 @@ <compilerArguments> <AtargetDirectory>${project.build.directory}/docs/xml</AtargetDirectory> <AmodelPkg>org.rhq.enterprise.server.rest.domain</AmodelPkg> + <AskipPkg>org.rhq.enterprise.server.rest.reporting</AskipPkg>   </compilerArguments> 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 a508ccd..d2fa410e 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 @@ -129,6 +129,7 @@ public class AlertDefinitionHandlerBean extends AbstractRestBean { // Redirect from /definition to /definitions for GET requests @GET @Path("/definition") + @ApiOperation(value = "Redirects to /alert/definitions") public Response redirectDefinitionToDefinitions(@Context UriInfo uriInfo) { UriBuilder uriBuilder = uriInfo.getRequestUriBuilder(); uriBuilder.replacePath("/rest/alert/definitions"); // TODO there needs to be a better way diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java index 3003990..07b2a1c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java @@ -93,9 +93,12 @@ public class CustomExceptionMapper implements ExceptionMapper<Exception> { log.debug(e.getMessage()); mediaType = MediaType.TEXT_PLAIN_TYPE; } + if (mediaType.getType().equals("text") && mediaType.getSubtype().equals("csv")) + mediaType = MediaType.TEXT_PLAIN_TYPE; if (mediaType.equals(MediaType.TEXT_PLAIN_TYPE)) { + message = message + "\n"; builder.entity(message); } else if (mediaType.equals(MediaType.TEXT_HTML_TYPE)) { builder.entity("<html><body><h1>Error</h1><h2>" + message + "</h2></body></html>"); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsHandlerBean.java new file mode 100644 index 0000000..1377be4 --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsHandlerBean.java @@ -0,0 +1,270 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +package org.rhq.enterprise.server.rest; + +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + +import javax.ejb.EJB; +import javax.ejb.Stateless; +import javax.interceptor.Interceptors; +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.DefaultValue; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.CacheControl; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.GenericEntity; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.StreamingOutput; +import javax.ws.rs.core.UriBuilder; +import javax.ws.rs.core.UriInfo; + +import com.wordnik.swagger.annotations.Api; +import com.wordnik.swagger.annotations.ApiError; +import com.wordnik.swagger.annotations.ApiOperation; +import com.wordnik.swagger.annotations.ApiParam; + +import org.jboss.resteasy.annotations.GZIP; + +import org.rhq.core.domain.drift.DriftCategory; +import org.rhq.enterprise.server.rest.domain.Link; +import org.rhq.enterprise.server.rest.reporting.AlertDefinitionLocal; +import org.rhq.enterprise.server.rest.reporting.ConfigurationHistoryLocal; +import org.rhq.enterprise.server.rest.reporting.DriftComplianceLocal; +import org.rhq.enterprise.server.rest.reporting.InventorySummaryLocal; +import org.rhq.enterprise.server.rest.reporting.PlatformUtilizationLocal; +import org.rhq.enterprise.server.rest.reporting.RecentAlertLocal; +import org.rhq.enterprise.server.rest.reporting.RecentDriftLocal; +import org.rhq.enterprise.server.rest.reporting.RecentOperationsLocal; +import org.rhq.enterprise.server.rest.reporting.SuspectMetricLocal; + +/** + * The reports from the reports section of Coregui. + * This class basically wrap the reports in the org.rhq.enterprise.server.rest.reports package + * so that they are available outside Coregui as well. + * + * @author Heiko W. Rupp + */ +@Stateless +@Path("/reports") +@Produces({"text/csv"}) +@Api("Provide the reports that are also run from the Reports section of the UI. All reports are only available in CSV format") +(a)Interceptors(SetCallerInterceptor.class) +public class ReportsHandlerBean extends AbstractRestBean { + + @EJB + AlertDefinitionLocal alertDefinitionLocal; + @EJB + ConfigurationHistoryLocal configurationHistoryLocal; + @EJB + DriftComplianceLocal driftComplianceLocal; + @EJB + InventorySummaryLocal inventorySummaryLocal; + @EJB + PlatformUtilizationLocal platformUtilizationLocal; + @EJB + RecentAlertLocal recentAlertLocal; + @EJB + RecentDriftLocal recentDriftLocal; + @EJB + RecentOperationsLocal recentOperationsLocal; + @EJB + SuspectMetricLocal suspectMetricLocal; + + String[] reports = { + "alertDefinitions", + "configurationHistory", + "driftCompliance", + "inventorySummary", + "platformUtilization", + "recentAlerts", + "recentDrift", + "recentOperations", + "suspectMetrics" + }; + + @GET + @Path("/") + @ApiOperation(value = "List the available reports", responseClass = "String", multiValueResponse = true) + @Produces({MediaType.TEXT_HTML,MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML,"text/csv"}) + public Response listReports(@Context HttpHeaders headers, @Context UriInfo uriInfo) { + + List<Link> links = new ArrayList<Link>(reports.length); + for (String report: reports) { + UriBuilder uriBuilder = uriInfo.getBaseUriBuilder(); + uriBuilder.path("/reports/{report}"); + URI uri = uriBuilder.build(report); + Link link = new Link(report,uri.toString()); + links.add(link); + } + + MediaType mediaType = headers.getAcceptableMediaTypes().get(0); + Response.ResponseBuilder builder = Response.ok(); + if (mediaType.getType().equals("text") && mediaType.getSubtype().equals("csv")) { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append("Report,URL\n"); + for (Link link: links) { + stringBuilder.append(link.getRel()).append(",").append(link.getHref()); + stringBuilder.append('\n'); + } + builder.entity(stringBuilder.toString()); + } + else if (mediaType.equals(MediaType.TEXT_HTML_TYPE)) { + builder.entity(renderTemplate("reportIndex", links)); + } else { + GenericEntity<List<Link>> list = new GenericEntity<List<Link>>(links) { + }; + builder.entity(list); + } + CacheControl cacheControl = new CacheControl(); + cacheControl.setMaxAge(86400); // TODO 1 day or longer? What unit is this anyway? + builder.cacheControl(cacheControl); + return builder.build(); + } + + @GZIP + @GET + @Path("alertDefinitions") + @ApiOperation(value = "Export the AlertDefinitions as CSV", responseClass = "String", multiValueResponse = true) + public StreamingOutput alertDefinitions(@Context HttpServletRequest request) { + + return alertDefinitionLocal.alertDefinitionsInternal(request, caller); + } + + @GZIP + @GET + @Path("configurationHistory") + @ApiOperation(value = "Export the Configuration History data as CSV", responseClass = "String", multiValueResponse = true) + public StreamingOutput configurationHistory(@Context HttpServletRequest request) { + + return configurationHistoryLocal.configurationHistoryInternal(request,caller); + } + + @GZIP + @GET + @Path("driftCompliance") + @ApiOperation(value = "Export the drift compliance data", responseClass = "String", multiValueResponse = true) + public StreamingOutput generateDriftComplianceReport( + @Context HttpServletRequest request, + @QueryParam("resourceTypeId") String resourceTypeId, + @QueryParam("version") String version) { + + return driftComplianceLocal.generateReportInternal(request,resourceTypeId,version,caller); + } + + @GZIP + @GET + @Path("inventorySummary") + @ApiOperation(value = "Export the Inventory Summary data as CSV", responseClass = "String", multiValueResponse = true) + public StreamingOutput generateInventorySummaryReport( + @Context HttpServletRequest request, + @QueryParam("resourceTypeId") String resourceTypeId, + @QueryParam("version") String version) { + + return inventorySummaryLocal.generateReportInternal(request,resourceTypeId,version,caller); + } + + + @GZIP + @GET + @Path("platformUtilization") + @ApiOperation(value = "Export the Platform utilization data as CSV", responseClass = "String", multiValueResponse = true) + public StreamingOutput generateReport(@Context HttpServletRequest request) { + + return platformUtilizationLocal.generateReportInternal(request, caller); + } + + @GZIP + @GET + @Path("recentAlerts") + @ApiOperation(value = "Export the Recent Alert data as CSV", responseClass = "String", multiValueResponse = true) + public StreamingOutput recentAlerts( + @QueryParam("alertPriority") @DefaultValue("high,medium,low") String alertPriority, + @QueryParam("startTime") Long startTime, + @QueryParam("endTime") Long endTime, + @Context HttpServletRequest request) { + + return recentAlertLocal.recentAlertsInternal(alertPriority, startTime, endTime, request, caller); + } + + @GZIP + @GET + @Path("recentDrift") + @ApiOperation(value = "Export the Recent drift data as CSV", responseClass = "String", multiValueResponse = true) + @ApiError(code = 404, reason = "If no category is provided or the category is wrong") + public StreamingOutput recentDrift( + @ApiParam(value = "Drift categories to report on", allowableValues = "FILE_ADDED, FILE_CHANGED, FILE_REMOVED") @QueryParam("categories") String categories, + @QueryParam("snapshot") Integer snapshot, + @QueryParam("path") String path, + @QueryParam("definition") String definitionName, + @QueryParam("startTime") Long startTime, + @QueryParam("endTime") Long endTime, + @Context HttpServletRequest request) { + + if (categories==null) { + throw new BadArgumentException("categories","You need to provide at least one category"); + } + String [] cats = categories.split(","); + for (String cat : cats) { + try { + DriftCategory.valueOf(cat.toUpperCase()); + } + catch (IllegalArgumentException iae) { + throw new BadArgumentException("category",cat); + } + } + + return recentDriftLocal.recentDriftInternal(categories,snapshot,path,definitionName,startTime,endTime,request,caller); + } + + @GZIP + @GET + @Path("recentOperations") + @ApiOperation(value = "Export the Recent Operations Data as CSV", responseClass = "String", multiValueResponse = true) + public StreamingOutput recentOperations( + @ApiParam("Status to look for. If parameter is not given, all values are used") + @QueryParam("status") @DefaultValue("inprogress,success,failure,canceled") String operationRequestStatus, + @ApiParam("The start time in ms since epoch of the time range to export.") + @QueryParam("startTime") Long startTime, + @ApiParam("The end time in ms since epoch of the time range to export. Defaults to 'now' if only the start time is given") + @QueryParam("endTime") Long endTime, + @Context HttpServletRequest request) { + + return recentOperationsLocal.recentOperationsInternal(operationRequestStatus,startTime,endTime,request,caller); + } + + @GZIP + @GET + @Path("suspectMetrics") + @ApiOperation(value = "Export the Suspect Metrics data as CSV", responseClass = "String", multiValueResponse = true) + public StreamingOutput suspectMetrics(@Context HttpServletRequest request) { + + return suspectMetricLocal.suspectMetricsInternal(request,caller); + } + + +} + diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsInterceptor.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsInterceptor.java index d1be353..41d8a3d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsInterceptor.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsInterceptor.java @@ -58,31 +58,49 @@ public class ReportsInterceptor { @AroundInvoke public Object setCaller(final InvocationContext ctx) throws Exception { - HttpServletRequest request = getRequest(ctx.getParameters()); - if (request == null) { - // TODO should we throw a different exception? - String msg = "No " + HttpServletRequest.class.getName() + " parameter was found for " + getMethodName(ctx) + - ". An " + HttpServletRequest.class.getName() + - " parameter must be specified in order to support authentication"; - log.error(msg); - throw new OperationNotSupportedException(msg); - } + AbstractRestBean target = (AbstractRestBean) ctx.getTarget(); - Subject subject = getSubject(request); - if (subject == null) { - throw new IllegalAccessException("Failed to validate request: could not access subject for request URL " + - request.getRequestURL()); + boolean fromRest = false; + // If we are "forwarded" from the "normal" rest-api, we have a principal, that we can use + java.security.Principal p = ejbContext.getCallerPrincipal(); + if (p!=null) { + target.caller = subjectManager.getSubjectByName(p.getName()); + fromRest = true; } - AbstractRestBean target = (AbstractRestBean) ctx.getTarget(); - target.caller = subject; + // If no caller was set from the "normal" api, we need to check if it is + // available in cookies, as in this case we were invoked + // from the Coregui reports function + if (target.caller==null) { + HttpServletRequest request = getRequest(ctx.getParameters()); + if (request == null) { + // TODO should we throw a different exception? + String msg = "No " + HttpServletRequest.class.getName() + " parameter was found for " + getMethodName(ctx) + + ". An " + HttpServletRequest.class.getName() + + " parameter must be specified in order to support authentication"; + log.error(msg); + throw new OperationNotSupportedException(msg); + } + + Subject subject = getSubject(request); + if (subject == null) { + throw new IllegalAccessException("Failed to validate request: could not access subject for request URL " + + request.getRequestURL()); + } + + target.caller = subject; + } + + // Invoke the target method Object result = ctx.proceed(); if (result instanceof StreamingOutput) { return new LoggingStreamingOutput((StreamingOutput) result, getMethodName(ctx)); } + // TODO invalidate session? + return result; } @@ -123,6 +141,9 @@ public class ReportsInterceptor { } private Cookie getCookie(HttpServletRequest request, String name) { + if (request.getCookies()==null) + return null; + for (Cookie cookie : request.getCookies()) { if (cookie.getName().equals(name)) { return cookie; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RootHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RootHandlerBean.java index e2abffd..3aded78 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RootHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RootHandlerBean.java @@ -59,6 +59,7 @@ public class RootHandlerBean extends AbstractRestBean { "status","status", "favoriteResources","user/favorites/resource", "operationHistory","operation/history", + "reports","reports", "self","" }; 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 15a1abc..1fadcc6 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 @@ -14,6 +14,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.alert.AlertDefinition; +import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.AlertDefinitionCriteria; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.server.alert.AlertDefinitionManagerLocal; @@ -37,6 +38,11 @@ public class AlertDefinitionHandler extends AbstractRestBean implements AlertDef @Override public StreamingOutput alertDefinitions(final HttpServletRequest request) { + return alertDefinitionsInternal(request, caller); + } + + public StreamingOutput alertDefinitionsInternal(final HttpServletRequest request, Subject user) { + this.caller = user; if (log.isDebugEnabled()) { log.debug("Received request to generate report for " + caller); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionLocal.java index 373643b..e305172 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionLocal.java @@ -9,6 +9,8 @@ import com.wordnik.swagger.annotations.Api; import com.wordnik.swagger.annotations.ApiOperation; import org.jboss.resteasy.annotations.GZIP; +import org.rhq.core.domain.auth.Subject; + @Path("/alertDefinitions") @Local @Api(basePath="http://localhost:7080/coregui/reports", value = "The Alert definitions report") @@ -20,4 +22,5 @@ public interface AlertDefinitionLocal { @ApiOperation(value = "Export the AlertDefinitions as CSV") StreamingOutput alertDefinitions(@Context HttpServletRequest request); + public StreamingOutput alertDefinitionsInternal(final HttpServletRequest request, Subject user); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java index 5abc5f6..4df7bda 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java @@ -14,6 +14,7 @@ import javax.ws.rs.core.StreamingOutput; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria; import org.rhq.core.domain.util.PageList; @@ -38,6 +39,12 @@ public class ConfigurationHistoryHandler extends AbstractRestBean implements Con @Override public StreamingOutput configurationHistory(final HttpServletRequest request) { + return configurationHistoryInternal(request,caller); + } + + @Override + public StreamingOutput configurationHistoryInternal(final HttpServletRequest request, Subject user) { + this.caller = user; if (log.isDebugEnabled()) { log.debug("Received request to generate report for " + caller); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java index 31c3df8..fa36aad 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java @@ -12,6 +12,8 @@ import com.wordnik.swagger.annotations.Api; import com.wordnik.swagger.annotations.ApiOperation; import org.jboss.resteasy.annotations.GZIP; +import org.rhq.core.domain.auth.Subject; + @Path("/configurationHistory") @Local @Api(basePath="http://localhost:7080/coregui/reports", value = "The configuration history report") @@ -22,4 +24,6 @@ public interface ConfigurationHistoryLocal { @Produces({"text/csv"}) @ApiOperation(value = "Export the Configuration History data as CSV") StreamingOutput configurationHistory(@Context HttpServletRequest request); + + public StreamingOutput configurationHistoryInternal(final HttpServletRequest request, Subject user); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/DriftComplianceHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/DriftComplianceHandler.java index 0e9a6df..3f34586 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/DriftComplianceHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/DriftComplianceHandler.java @@ -26,6 +26,7 @@ import javax.interceptor.Interceptors; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.StreamingOutput; +import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.drift.DriftComplianceStatus; import org.rhq.core.domain.drift.DriftDefinition; @@ -43,6 +44,18 @@ public class DriftComplianceHandler extends InventorySummaryHandler implements D } @Override + public StreamingOutput generateReportInternal( + HttpServletRequest request, + String resourceTypeId, + String version, Subject user) { + + this.caller = user; + + return super.generateReport(request,resourceTypeId,version); + } + + + @Override protected List<ResourceInstallCount> getSummaryCounts() { return resourceMgr.findResourceComplianceCounts(caller); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/DriftComplianceLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/DriftComplianceLocal.java index fed7590..4c5fa49 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/DriftComplianceLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/DriftComplianceLocal.java @@ -31,6 +31,8 @@ import com.wordnik.swagger.annotations.Api; import com.wordnik.swagger.annotations.ApiOperation; import org.jboss.resteasy.annotations.GZIP; +import org.rhq.core.domain.auth.Subject; + @Path("/driftCompliance") @Local @Api(basePath="http://localhost:7080/coregui/reports", value = "The drift compliance report") @@ -38,11 +40,16 @@ public interface DriftComplianceLocal { @GZIP @GET - @Produces({"text/csv", "application/xml"}) + @Produces("text/csv") @ApiOperation(value = "Export the drift compliance data") StreamingOutput generateReport( @Context HttpServletRequest request, @QueryParam("resourceTypeId") String resourceTypeId, @QueryParam("version") String version); + public StreamingOutput generateReportInternal( + HttpServletRequest request, + String resourceTypeId, + String version, Subject user); + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryHandler.java index ea807a8..bd0a240 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryHandler.java @@ -36,6 +36,7 @@ import javax.ws.rs.core.StreamingOutput; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.composite.ResourceInstallCount; @@ -59,9 +60,21 @@ public class InventorySummaryHandler extends AbstractRestBean implements Invento @EJB protected ResourceManagerLocal resourceMgr; + public StreamingOutput generateReportInternal( + HttpServletRequest request, + String resourceTypeId, + String version, + Subject user) { + this.caller = user; + + return generateReport(request,resourceTypeId,version); + } + + @Override public StreamingOutput generateReport(final HttpServletRequest request, final String resourceTypeId, final String version) { + if (log.isDebugEnabled()) { log.debug("Received request to generate " + getDebugReportName() + " report for " + caller); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryLocal.java index 6b046dc..cc94bb6 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryLocal.java @@ -31,6 +31,8 @@ import com.wordnik.swagger.annotations.Api; import com.wordnik.swagger.annotations.ApiOperation; import org.jboss.resteasy.annotations.GZIP; +import org.rhq.core.domain.auth.Subject; + @Path("/inventorySummary") @Local @Api(basePath="http://localhost:7080/coregui/reports", value = "The inventory summary report") @@ -57,4 +59,10 @@ public interface InventorySummaryLocal { @QueryParam("resourceTypeId") String resourceTypeId, @QueryParam("version") String version); + StreamingOutput generateReportInternal( + HttpServletRequest request, + String resourceTypeId, + String version, + Subject user); + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationHandler.java index 9ee505b..7ee13dd 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationHandler.java @@ -35,6 +35,7 @@ import javax.ws.rs.core.StreamingOutput; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.resource.composite.PlatformMetricsSummary; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.server.resource.PlatformUtilizationManagerLocal; @@ -53,8 +54,14 @@ public class PlatformUtilizationHandler extends AbstractRestBean implements Plat @EJB private PlatformUtilizationManagerLocal platformUtilizationMgr; + public StreamingOutput generateReportInternal(HttpServletRequest request, Subject user) { + this.caller = user; + + return generateReport(request); + } @Override public StreamingOutput generateReport(HttpServletRequest request) { + if (log.isDebugEnabled()) { log.debug("Received request to generate report for " + caller); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationLocal.java index 1567fb5..2866300 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationLocal.java @@ -33,6 +33,8 @@ import com.wordnik.swagger.annotations.Api; import com.wordnik.swagger.annotations.ApiOperation; import org.jboss.resteasy.annotations.GZIP; +import org.rhq.core.domain.auth.Subject; + @Path("/platformUtilization") @Local @Api(basePath="http://localhost:7080/coregui/reports", value = "The platform utilization report") @@ -44,4 +46,5 @@ public interface PlatformUtilizationLocal { @ApiOperation(value = "Export the Platform utilization data as CSV") StreamingOutput generateReport(@Context HttpServletRequest request); + public StreamingOutput generateReportInternal(HttpServletRequest request, Subject user); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertHandler.java index 6aaecc8..a31926a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertHandler.java @@ -23,6 +23,7 @@ import org.rhq.core.domain.alert.AlertConditionCategory; import org.rhq.core.domain.alert.AlertConditionLog; import org.rhq.core.domain.alert.AlertConditionOperator; import org.rhq.core.domain.alert.AlertPriority; +import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.util.PageList; @@ -42,6 +43,17 @@ public class RecentAlertHandler extends AbstractRestBean implements RecentAlertL @EJB private AlertManagerLocal alertManager; + public StreamingOutput recentAlertsInternal( + String alertPriority, + Long startTime, + Long endTime, + HttpServletRequest request, + Subject user + ) { + this.caller = user; + return recentAlerts(alertPriority,startTime,endTime,request); + } + @Override public StreamingOutput recentAlerts(final String alertPriority, final Long startTime, final Long endTime, final HttpServletRequest request) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertLocal.java index 979cb29..d1f7c32 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertLocal.java @@ -14,6 +14,8 @@ import com.wordnik.swagger.annotations.Api; import com.wordnik.swagger.annotations.ApiOperation; import org.jboss.resteasy.annotations.GZIP; +import org.rhq.core.domain.auth.Subject; + @Path("/recentAlerts") @Local @Api(basePath="http://localhost:7080/coregui/reports", value = "The recent alerts report") @@ -29,4 +31,12 @@ public interface RecentAlertLocal { @QueryParam("endTime") Long endTime, @Context HttpServletRequest request); + StreamingOutput recentAlertsInternal( + String alertPriority, + Long startTime, + Long endTime, + HttpServletRequest request, + Subject user + ); + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftHandler.java index 8cb424b..d09f88a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftHandler.java @@ -16,6 +16,7 @@ import javax.ws.rs.core.StreamingOutput; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.DriftCriteria; import org.rhq.core.domain.criteria.GenericDriftCriteria; import org.rhq.core.domain.drift.DriftCategory; @@ -38,6 +39,20 @@ public class RecentDriftHandler extends AbstractRestBean implements RecentDriftL @EJB private DriftManagerLocal driftManager; + public StreamingOutput recentDriftInternal( + String categories, + Integer snapshot, + String path, + String definitionName, + Long startTime, + Long endTime, + HttpServletRequest request, + Subject user) { + this.caller = user; + + return recentDrift(categories,snapshot,path,definitionName,startTime,endTime,request); + } + @Override public StreamingOutput recentDrift(final String categories, final Integer snapshot, final String path, final String definitionName, final Long startTime, final Long endTime, final HttpServletRequest request) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftLocal.java index 8bea6c7..8feb66e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftLocal.java @@ -13,6 +13,8 @@ import com.wordnik.swagger.annotations.Api; import com.wordnik.swagger.annotations.ApiOperation; import org.jboss.resteasy.annotations.GZIP; +import org.rhq.core.domain.auth.Subject; + @Path("/recentDrift") @Local @Api(basePath="http://localhost:7080/coregui/reports", value = "The recent drift report") @@ -31,4 +33,14 @@ public interface RecentDriftLocal { @QueryParam("endTime") Long endTime, @Context HttpServletRequest request); + StreamingOutput recentDriftInternal( + String categories, + Integer snapshot, + String path, + String definitionName, + Long startTime, + Long endTime, + HttpServletRequest request, + Subject user); + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsHandler.java index a5e515d..dabab38 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsHandler.java @@ -16,6 +16,7 @@ import javax.ws.rs.core.StreamingOutput; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; import org.rhq.core.domain.operation.OperationRequestStatus; import org.rhq.core.domain.operation.ResourceOperationHistory; @@ -36,6 +37,17 @@ public class RecentOperationsHandler extends AbstractRestBean implements RecentO @EJB private OperationManagerLocal operationManager; + public StreamingOutput recentOperationsInternal( + String operationRequestStatus, + Long startTime, + Long endTime, + HttpServletRequest request, + Subject user) { + this.caller = user; + + return recentOperations(operationRequestStatus,startTime,endTime,request); + } + @Override public StreamingOutput recentOperations(final String operationRequestStatus, final Long startTime, final Long endTime, final HttpServletRequest request) { @@ -54,7 +66,7 @@ public class RecentOperationsHandler extends AbstractRestBean implements RecentO if(endTime != null){ criteria.addFilterEndTime(endTime); } - // lets default the end time for them to now if they didnt enter it + // lets default the end time for them to now if they didn't enter it if(startTime != null && endTime == null){ Date today = new Date(); criteria.addFilterEndTime(today.getTime()); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsLocal.java index 191623a..4f27cff 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsLocal.java @@ -14,6 +14,8 @@ import com.wordnik.swagger.annotations.Api; import com.wordnik.swagger.annotations.ApiOperation; import org.jboss.resteasy.annotations.GZIP; +import org.rhq.core.domain.auth.Subject; + @Path("/recentOperations") @Local @Api(basePath="http://localhost:7080/coregui/reports", value = "The recent operations report") @@ -29,4 +31,11 @@ public interface RecentOperationsLocal { @QueryParam("endTime") Long endTime, @Context HttpServletRequest request); + StreamingOutput recentOperationsInternal( + String operationRequestStatus, + Long startTime, + Long endTime, + HttpServletRequest request, + Subject user); + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricHandler.java index 3393f13..1f25535 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricHandler.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricHandler.java @@ -13,6 +13,7 @@ import javax.ws.rs.core.StreamingOutput; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.Criteria; import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite; import org.rhq.core.domain.util.PageControl; @@ -34,6 +35,11 @@ public class SuspectMetricHandler extends AbstractRestBean implements SuspectMet @EJB private MeasurementOOBManagerLocal measurementOOBMManager; + public StreamingOutput suspectMetricsInternal(HttpServletRequest request, Subject user) { + this.caller = user; + return suspectMetrics(request); + } + @Override public StreamingOutput suspectMetrics(HttpServletRequest request) { if (log.isDebugEnabled()) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricLocal.java index 019a715..d6b2dc5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricLocal.java @@ -12,6 +12,8 @@ import com.wordnik.swagger.annotations.Api; import com.wordnik.swagger.annotations.ApiOperation; import org.jboss.resteasy.annotations.GZIP; +import org.rhq.core.domain.auth.Subject; + @Path("/suspectMetrics") @Local @Api(basePath="http://localhost:7080/coregui/reports", value = "The suspect metrics report") @@ -23,4 +25,5 @@ public interface SuspectMetricLocal { @ApiOperation(value = "Export the Suspect Metrics data as CSV") StreamingOutput suspectMetrics(@Context HttpServletRequest request); + StreamingOutput suspectMetricsInternal(HttpServletRequest request, Subject user); } diff --git a/modules/enterprise/server/jar/src/main/resources/rest_templates/reportIndex.ftl b/modules/enterprise/server/jar/src/main/resources/rest_templates/reportIndex.ftl new file mode 100644 index 0000000..4ed802e --- /dev/null +++ b/modules/enterprise/server/jar/src/main/resources/rest_templates/reportIndex.ftl @@ -0,0 +1,34 @@ +<#ftl > +<#-- +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +--> +<#-- @ftlvariable name="var" type="java.util.List<org.rhq.enterprise.server.rest.domain.Link>" --> +<html> +<body> +<h2>RHQ Rest Reports</h2> +<ul> +<#list var as var> + <li> + <a href="/rest/${var.href}.csv">${var.rel}</a> + </li> +</#list> +</ul> +</body> +</html> diff --git a/modules/enterprise/server/jar/src/main/xsl/apiout2docbook.xsl b/modules/enterprise/server/jar/src/main/xsl/apiout2docbook.xsl index 512a8d4..d986dea 100644 --- a/modules/enterprise/server/jar/src/main/xsl/apiout2docbook.xsl +++ b/modules/enterprise/server/jar/src/main/xsl/apiout2docbook.xsl @@ -100,7 +100,7 @@ </emphasis> </simpara> <simpara><xsl:value-of select="@description"/></simpara> - <xsl:if test="not(@gzip = '')"> + <xsl:if test="@gzip = 'true'"> <simpara>Supports returning a gzip'ed Content-Encoding</simpara> </xsl:if> <xsl:choose> @@ -127,7 +127,19 @@ </xsl:choose> <simpara> Return type: - <xsl:value-of select="@returnType"/> + <xsl:choose> + <xsl:when test="starts-with(@returnTypeId,'...')"> + <link> + <xsl:attribute name="linkend"> + <xsl:value-of select="@returnTypeId"/> + </xsl:attribute> + <xsl:value-of select="@returnType"/> + </link> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@returnType"/> + </xsl:otherwise> + </xsl:choose> </simpara> <xsl:if test="error"> <table> @@ -168,7 +180,6 @@ </td> <td> <xsl:choose> - <xsl:when test="starts-with(@typeId,'...')"> <link> <xsl:attribute name="linkend"> diff --git a/modules/helpers/rest-docs-generator/src/main/java/org/rhq/helpers/rest_docs_generator/ClassLevelProcessor.java b/modules/helpers/rest-docs-generator/src/main/java/org/rhq/helpers/rest_docs_generator/ClassLevelProcessor.java index 72be1ed..8206a93 100644 --- a/modules/helpers/rest-docs-generator/src/main/java/org/rhq/helpers/rest_docs_generator/ClassLevelProcessor.java +++ b/modules/helpers/rest-docs-generator/src/main/java/org/rhq/helpers/rest_docs_generator/ClassLevelProcessor.java @@ -57,7 +57,7 @@ import org.jboss.resteasy.annotations.GZIP; * @author Heiko W. Rupp */ -(a)SupportedOptions({ClassLevelProcessor.TARGET_DIRECTORY,ClassLevelProcessor.VERBOSE,ClassLevelProcessor.MODEL_PACKAGE_KEY}) +(a)SupportedOptions({ClassLevelProcessor.TARGET_DIRECTORY,ClassLevelProcessor.VERBOSE,ClassLevelProcessor.MODEL_PACKAGE_KEY,ClassLevelProcessor.SKIP_PACKAGE_KEY}) @SupportedSourceVersion(SourceVersion.RELEASE_7) @SupportedAnnotationTypes(value = {"com.wordnik.swagger.annotations.*","javax.ws.rs.*","javax.xml.bind.annotation.XmlRootElement"}) public class ClassLevelProcessor extends AbstractProcessor { @@ -70,7 +70,9 @@ public class ClassLevelProcessor extends AbstractProcessor { public static final String VERBOSE = "verbose"; private static final String BODY_INDICATOR = "-body-"; public static final String MODEL_PACKAGE_KEY = "modelPkg"; + public static final String SKIP_PACKAGE_KEY = "skipPkg"; public String modelPackage = "org.rhq.enterprise.server.rest.domain"; + public String skipPackage = "org.rhq.enterprise.server.rest.reporting"; Log log = LogFactory.getLog(getClass().getName()); @@ -91,6 +93,10 @@ public class ClassLevelProcessor extends AbstractProcessor { modelPackage = options.get(MODEL_PACKAGE_KEY); System.out.println("== Found a model package of " + modelPackage); } + if (options.containsKey(SKIP_PACKAGE_KEY)) { + skipPackage = options.get(SKIP_PACKAGE_KEY); + System.out.println("== Found a skip package of " + skipPackage); + } } @Override @@ -137,8 +143,11 @@ public class ClassLevelProcessor extends AbstractProcessor { File f ; if (targetDirectory!=null) { File targetDir = new File(targetDirectory); - if (!targetDir.exists()) - targetDir.mkdirs(); + if (!targetDir.exists()) { + boolean success = targetDir.mkdirs(); + if (!success) + log.warn(("Creation of target directory " + targetDirectory + " failed")); + } f = new File(targetDir, API_OUT_XML); } @@ -170,6 +179,10 @@ public class ClassLevelProcessor extends AbstractProcessor { private void processClass(Document doc, Element xmlRoot, TypeElement classElementIn) { log.debug("Looking at " + classElementIn.getQualifiedName().toString()); + if (classElementIn.getQualifiedName().toString().startsWith(skipPackage)) { + log.debug(" .. skipping .."); + return; + } // Process the data classes if (classElementIn.getAnnotation(ApiClass.class)!=null) { processDataClass(doc, classElementIn, xmlRoot); @@ -232,25 +245,34 @@ public class ClassLevelProcessor extends AbstractProcessor { Element methodElement = doc.createElement("method"); methodElement.setAttribute("path",path); - GZIP gzip = td.getAnnotation(GZIP.class); - if (gzip!=null) { - methodElement.setAttribute("gzip","true"); - } classElement.appendChild(methodElement); Name elementName = td.getSimpleName(); methodElement.setAttribute("name", elementName.toString()); String httpMethod = getHttpMethod(td.getAnnotationMirrors()); methodElement.setAttribute("method",httpMethod); + GZIP gzip = td.getAnnotation(GZIP.class); + if (gzip!=null) { + methodElement.setAttribute("gzip","true"); + } ApiOperation apiOperation = td.getAnnotation(ApiOperation.class); + String responseClass = null; if (apiOperation!=null) { - String description = apiOperation.value(); - setOptionalAttribute(methodElement, "description", description); - - String responseClass = !apiOperation.responseClass().equals("ok")? apiOperation.responseClass() : null; + String description = apiOperation.value(); + setOptionalAttribute(methodElement, "description", description); + if (!apiOperation.responseClass().equals("void")) { + responseClass = apiOperation.responseClass(); + if (apiOperation.multiValueResponse()) + responseClass = responseClass + " (multi)"; + } + } - setOptionalAttribute(methodElement,"returnType",responseClass,td.getReturnType().toString()); + if (responseClass == null) { + responseClass = td.getReturnType().toString(); } + // TODO can we somehow make the responseClass fully qualified, so that the link generation works? + constructTypeNameAndAssign(methodElement,responseClass,"returnType"); + // Loop over the parameters processParams(doc, td, methodElement); @@ -319,26 +341,33 @@ public class ClassLevelProcessor extends AbstractProcessor { element.setAttribute("defaultValue",defaultValue); String typeString = t.toString(); - String typeId = typeString; - if (typeString.contains("java.lang.")) { - typeString = typeString.replaceAll("java\\.lang\\.",""); - } - else if (typeString.contains("java.util.")) { - typeString = typeString.replaceAll("java\\.util\\.",""); - } - if (typeString.contains(modelPackage)) { - String mps = modelPackage.endsWith(".") ? modelPackage : modelPackage + "."; - // For a generic collection we need to find the "inner type" and link to it - int offset = typeString.contains("<") ? typeString.indexOf('<') +1 : 0; - String restType = typeString.substring(offset + modelPackage.length()+1); - typeString = typeString.replace(mps,""); - typeId = "..." + restType; - } - element.setAttribute("type", typeString); - element.setAttribute("typeId", typeId); + constructTypeNameAndAssign(element, typeString, "type"); } } + private void constructTypeNameAndAssign(Element element, String typeString, String attributeName) { + String typeId = typeString; + if (typeString.contains("java.lang.")) { + typeString = typeString.replaceAll("java\\.lang\\.",""); + } + else if (typeString.contains("java.util.")) { + typeString = typeString.replaceAll("java\\.util\\.",""); + } + if (typeString.contains(modelPackage)) { + String mps = modelPackage.endsWith(".") ? modelPackage : modelPackage + "."; + // For a generic collection we need to find the "inner type" and link to it + int offset = typeString.contains("<") ? typeString.indexOf('<') +1 : 0; + String restType = typeString.substring(offset + modelPackage.length()+1); + if (restType.endsWith(">")) + restType = restType.substring(0,restType.length()-1); + System.out.println("REST TYPE " + restType); + typeString = typeString.replace(mps,""); + typeId = "..." + restType; + } + element.setAttribute(attributeName, typeString); + element.setAttribute(attributeName+"Id", typeId); + } + /** * Look at the ApiError(s) annotations and populate the output * @param doc XML Document to add @@ -376,7 +405,7 @@ public class ClassLevelProcessor extends AbstractProcessor { String pkg = classElementIn.toString(); log.debug("Looking at " + pkg); - if (!pkg.startsWith(modelPackage)) { + if (!pkg.startsWith(modelPackage) || pkg.startsWith(skipPackage)) { log.debug(" skipping as it does not meet the required package"); return; } @@ -497,16 +526,16 @@ public class ClassLevelProcessor extends AbstractProcessor { /** * Set the passed text as attribute name on the passed xmlElement if the text is not empty * @param xmlElement Element to set the attribute on - * @param name The name of the attribute + * @param attributeName The name of the attribute * @param text The text to set * @param defaultValue Value to set if text is null or empty */ - private void setOptionalAttribute(Element xmlElement, String name, String text,String defaultValue) { + private void setOptionalAttribute(Element xmlElement, String attributeName, String text,String defaultValue) { if (text!=null && !text.isEmpty()) { - xmlElement.setAttribute(name, text); + xmlElement.setAttribute(attributeName, text); } else { - xmlElement.setAttribute(name,defaultValue); + xmlElement.setAttribute(attributeName,defaultValue); } } diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ReportsTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ReportsTest.java index f0eb501..a76a640 100644 --- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ReportsTest.java +++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ReportsTest.java @@ -19,11 +19,15 @@ package org.rhq.modules.integrationTests.restApi; -import com.jayway.restassured.RestAssured; +import com.jayway.restassured.path.xml.XmlPath; +import com.jayway.restassured.response.Header; +import com.jayway.restassured.response.Response; import org.junit.Before; import org.junit.Test; +import static org.hamcrest.Matchers.*; + import static com.jayway.restassured.RestAssured.given; /** @@ -32,25 +36,245 @@ import static com.jayway.restassured.RestAssured.given; */ public class ReportsTest extends AbstractBase { + private static final int NUMBER_REPORTS = 9; + @Override @Before public void setUp() throws Exception { super.setUp(); - RestAssured.basePath = "/coregui/reports"; } -// @Test + @Test + public void testReportListJson() throws Exception { + given() + .header(acceptJson) + .expect() + .statusCode(200) + .log().ifError() + .body("", iterableWithSize(NUMBER_REPORTS)) + .when() + .get("/reports"); + + } + + @Test + public void testReportListCsv() throws Exception { + String line = + given() + .header(acceptCsv) + .expect() + .statusCode(200) + .log().ifError() + .when() + .get("/reports") + .asString(); + + String[] lines = line.split("\n"); + assert lines != null; + assert lines[0].equals("Report,URL"): lines[0]; + assert lines.length==1 + NUMBER_REPORTS; // header + 9 lines of links + } + + @Test + public void testReportListXml() throws Exception { + given() + .header(acceptXml) + .expect() + .statusCode(200) + .log().ifError() + .body("/collection",iterableWithSize(NUMBER_REPORTS)) + .when() + .get("/reports"); + + } + + @Test + public void testReportListHtml() throws Exception { + Response response = + given() + .header(new Header("Accept","text/html")) + .expect() + .statusCode(200) + .log().ifError() + .when() + .get("/reports"); + + XmlPath xmlPath = response.xmlPath(); + assert xmlPath!=null; + assert xmlPath.getNodeChildren("html.body.ul.li").size()== NUMBER_REPORTS; + + } + + @Test public void testGetAlertDefinitions() throws Exception { + Response response = + given() + .header(acceptCsv) + .expect() + .statusCode(200) + .log().ifError() + .when() + .get("/reports/alertDefinitions"); + + assert response != null; + assert response.asString().startsWith("Name,Description,Enabled,Priority,Parent,Ancestry,Details URL"); + + } + + @Test + public void testGetConfigurationHistory() throws Exception { + + Response response = + given() + .header(acceptCsv) + .expect() + .statusCode(200) + .log().ifError() + .when() + .get("/reports/configurationHistory"); + + assert response != null; + assert response.asString().startsWith("Version,Date Submitted,Date Completed,Status,Name,Ancestry,Details URL"); + } + + @Test + public void testGetDriftCompliance() throws Exception { + + Response response = + given() + .header(acceptCsv) + .expect() + .statusCode(200) + .log().ifError() + .when() + .get("/reports/driftCompliance"); + + assert response!=null; + assert response.asString().startsWith("Resource Type,Plugin,Category,Version,Count"); + } + + @Test + public void testGetInventorySummary() throws Exception { + + Response response = given() .header(acceptCsv) .expect() .statusCode(200) .log().ifError() .when() - .get("/alertDefinitions"); + .get("/reports/inventorySummary"); + + assert response!=null; + assert response.asString().startsWith("Resource Type,Plugin,Category,Version,Count"); + } + + @Test + public void testGetPlatformUtilization() throws Exception { + + Response response = + given() + .header(acceptCsv) + .expect() + .statusCode(200) + .log().ifError() + .when() + .get("/reports/platformUtilization"); + + assert response!=null; + assert response.asString().startsWith("Name,Version,CPU,Memory,Swap"); + } + + @Test + public void testGetRecentAlerts() throws Exception { + + Response response = + given() + .header(acceptCsv) + .expect() + .statusCode(200) + .log().ifError() + .when() + .get("/reports/recentAlerts"); + + assert response!=null; + assert response.asString().startsWith("Creation Time,Name,Condition Text,Priority"); + } + + @Test + public void testGetRecentDrift() throws Exception { + + Response response = + given() + .header(acceptCsv) + .queryParam("categories", "file_added") + .expect() + .statusCode(200) + .log().ifError() + .when() + .get("/reports/recentDrift"); + + assert response!=null; + assert response.asString().startsWith("Creation Time,Definition,Snapshot,Category,Path"); + } + + @Test + public void testGetRecentDriftNoCategory() throws Exception { + + given() + .header(acceptCsv) + .expect() + .statusCode(406) // Not acceptable + .log().ifError() + .when() + .get("/reports/recentDrift"); + } + + @Test + public void testGetRecentDriftBadCategory() throws Exception { + + given() + .header(acceptCsv) + .queryParam("categories","frobnitz") + .expect() + .statusCode(406) // Not acceptable + .log().ifError() + .when() + .get("/reports/recentDrift"); + } + + @Test + public void testGetRecentOperations() throws Exception { + Response response = + given() + .header(acceptCsv) + .expect() + .statusCode(200) + .log().everything() + .when() + .get("/reports/recentOperations"); + + assert response!=null; + assert response.asString().startsWith("Date Submitted,Operation,Requester"); + + } + + @Test + public void testGetSuspectMetrics() throws Exception { + + Response response = + given() + .header(acceptCsv) + .expect() + .statusCode(200) + .log().ifError() + .when() + .get("/reports/suspectMetrics"); + assert response!=null; + assert response.asString().startsWith("Resource,Ancestry"); } }

1 0

[rhq] Branch 'refs/tags/RHQ_4_6_0_JONCI' - modules/core pom.xml
by snegrea 05 Feb '13

05 Feb '13

modules/core/domain/pom.xml | 3 +-- pom.xml | 9 ++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) New commits: commit aea233cd079fdf9aea4e98c596c60a52054fe1a2 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Feb 5 17:23:42 2013 -0600 Arquillian container version should be independent from the container version due to artifact dependencies. (cherry picked from commit 66cc8368fb6606faea5905f5ac6aeb367336dbe4) diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 1cf9f25..f9c58f4 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -112,11 +112,10 @@ <scope>provided</scope> <type>pom</type> </dependency> - + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-arquillian-container-managed</artifactId> - <version>${jboss.version}</version> <scope>test</scope> </dependency> diff --git a/pom.xml b/pom.xml index 46db49d..a3b429a 100644 --- a/pom.xml +++ b/pom.xml @@ -145,6 +145,7 @@ <freemarker.version>2.3.18</freemarker.version> <powermock.version>1.4.12</powermock.version> <arquillian.version>1.0.3.Final</arquillian.version> + <arquillian.jboss.container.version>7.1.1.Final</arquillian.jboss.container.version> <shrinkwrap-resolver.version>2.0.0-alpha-7</shrinkwrap-resolver.version> <xercesImpl.version>2.9.1-jbossas-2</xercesImpl.version>  <opencsv.version>1.8</opencsv.version> @@ -630,7 +631,7 @@ <type>pom</type> <scope>import</scope> </dependency> - + <dependency> <groupId>org.jboss.arquillian.extension</groupId> <artifactId>arquillian-jacoco</artifactId> @@ -638,6 +639,12 @@ </dependency> <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-managed</artifactId> + <version>${arquillian.jboss.container.version}</version> + </dependency> + + <dependency> <groupId>org.jacoco</groupId> <artifactId>org.jacoco.core</artifactId> <version>${jacoco.version}</version>

1 0

← Newer
1
...
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits February 2013