[rhq] Branch 'jshaughn/avail' - 2 commits - modules/core modules/enterprise
by Jay Shaughnessy
modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java | 5
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java | 192 +++++++++-
6 files changed, 201 insertions(+), 10 deletions(-)
New commits:
commit cc0002a38492c653e8943a592a58943ce1500080
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Feb 29 16:42:44 2012 -0500
Add tests for Avail Change and Avail Duration conditions. To support
faster tests change storage of durations from minutes to seconds. Note that
the gui will still treat user input in minutes, making the minimum
non-test duration 1 minute.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java
index 80d52d2..abcde0b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java
@@ -93,7 +93,8 @@ public class AlertFormatUtility {
}
str.append(" For ");
- String value = condition.getOption();
+ // value is stored in seconds but should be presented in minutes
+ String value = String.valueOf(Integer.valueOf(condition.getOption()) * 60);
String formatted = MeasurementConverterClient.format(value, MeasurementUnits.MINUTES);
str.append(formatted);
str.append("]");
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java
index 5f29d29..0e4b8c5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java
@@ -346,7 +346,9 @@ public class NewConditionEditor extends LocatableDynamicForm {
newCondition.setName(getValueAsString(AVAILABILITY_DURATION_ITEMNAME));
newCondition.setComparator(null);
newCondition.setThreshold(null);
- newCondition.setOption(getValueAsString(AVAILABILITY_DURATION_VAL_ITEMNAME));
+ // user enters value in minutes but the value is stored in seconds
+ int duration = 60 * Integer.valueOf(getValueAsString(AVAILABILITY_DURATION_VAL_ITEMNAME));
+ newCondition.setOption(String.valueOf(duration));
newCondition.setMeasurementDefinition(null);
break;
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
index 3717ee5..d50c736 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
@@ -871,7 +871,8 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote {
str.append(AlertI18NFactory.getMessage(msg));
str.append(" [");
- String value = condition.getOption();
+ // stored in seconds but present in minutes
+ String value = String.valueOf(Integer.valueOf(condition.getOption()) * 60);
String formatted = MeasurementConverter.format(value, MeasurementUnits.MINUTES);
str.append(formatted);
str.append("]");
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java
index beeafbd..ea608f5 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java
@@ -43,7 +43,7 @@ public final class AvailabilityDurationCacheElement extends AbstractEnumCacheEle
/**
* @param operator
- * @param operatorOption the duration, in minutes (as String)
+ * @param operatorOption the duration, in seconds (as String)
* @param value
* @param conditionTriggerId this is actually the alertConditionId, renamed here.
*/
@@ -106,7 +106,8 @@ public final class AvailabilityDurationCacheElement extends AbstractEnumCacheEle
String operator = cacheElement.getAlertConditionOperator().name();
String triggerName = operator + "-" + resource.getId();
String duration = (String) cacheElement.getAlertConditionOperatorOption();
- Date jobTime = new Date(System.currentTimeMillis() + (Long.valueOf(duration).longValue() * 60 * 1000));
+ // convert from seconds to milliseconds
+ Date jobTime = new Date(System.currentTimeMillis() + (Long.valueOf(duration).longValue() * 1000));
if (log.isDebugEnabled()) {
log.debug("Scheduling availability duration job for [" + DateFormat.getDateTimeInstance().format(jobTime)
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
index b6c7206..645d049 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
@@ -35,14 +35,18 @@ import org.rhq.core.domain.alert.Alert;
import org.rhq.core.domain.alert.AlertCondition;
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.AlertDampening;
+import org.rhq.core.domain.alert.AlertDampening.Category;
import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.core.domain.alert.BooleanExpression;
-import org.rhq.core.domain.alert.AlertDampening.Category;
import org.rhq.core.domain.cloud.Server;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.discovery.AvailabilityReport;
+import org.rhq.core.domain.discovery.AvailabilityReport.Datum;
+import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementReport;
@@ -55,14 +59,19 @@ import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.server.alert.AlertDefinitionManagerLocal;
import org.rhq.enterprise.server.alert.AlertManagerLocal;
+import org.rhq.enterprise.server.measurement.AvailabilityManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal;
import org.rhq.enterprise.server.resource.metadata.test.UpdatePluginMetadataTestBase;
+import org.rhq.enterprise.server.scheduler.SchedulerLocal;
+import org.rhq.enterprise.server.scheduler.jobs.AlertAvailabilityDurationJob;
import org.rhq.enterprise.server.util.LookupUtil;
import org.rhq.test.JPAUtils;
import org.rhq.test.TransactionCallbackWithContext;
@Test
public class AlertConditionTest extends UpdatePluginMetadataTestBase {
+ private static final boolean ENABLED = false;
+
// this must match the constant found in ServerManagerBean
private static final String RHQ_SERVER_NAME_PROPERTY = "rhq.server.high-availability.name";
private static final String RHQ_SERVER_NAME_PROPERTY_VALUE = "AlertConditionTestServer";
@@ -97,6 +106,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
System.setProperty(RHQ_SERVER_NAME_PROPERTY, "");
}
+ @Test(enabled = ENABLED)
public void testBZ735262_InsideRangeCondition() throws Exception {
// create our resource with alert definition
MeasurementDefinition metricDef = createResourceWithMetricSchedule();
@@ -136,6 +146,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
return;
}
+ @Test(enabled = ENABLED)
public void testBZ735262_OutsideRangeCondition() throws Exception {
// create our resource with alert definition
MeasurementDefinition metricDef = createResourceWithMetricSchedule();
@@ -174,6 +185,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
return;
}
+ @Test(enabled = ENABLED)
public void testBZ736685_DeleteConditionLogButNoAlert() throws Exception {
// create our resource with alert definition
MeasurementDefinition metricDef = createResourceWithMetricSchedule();
@@ -218,13 +230,119 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
resource = null;
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- PageList<AlertDefinition> defs = alertDefManager.findAlertDefinitions(getOverlord(), resourceId, PageControl
- .getUnlimitedInstance());
+ PageList<AlertDefinition> defs = alertDefManager.findAlertDefinitions(getOverlord(), resourceId,
+ PageControl.getUnlimitedInstance());
assert defs.isEmpty() : "failed to delete the alert definition - are condition logs still around?";
return;
}
+ @Test(enabled = ENABLED)
+ public void testAvailChangeAlert() throws Exception {
+ // create our resource with alert definition
+ MeasurementDefinition metricDef = createResourceWithMetricSchedule();
+ createAlertDefinitionWithAvailChangeCondition(resource.getId(), AlertConditionOperator.AVAIL_GOES_DOWN);
+ createAlertDefinitionWithAvailChangeCondition(resource.getId(), AlertConditionOperator.AVAIL_GOES_NOT_UP);
+
+ // resource has initial UNKNOWN ResourceAvailability and no Availability records. simulate an avail report
+ // coming from the agent and setting the initial avail to UP.
+ AvailabilityReport availReport = new AvailabilityReport(AGENT_NAME);
+ availReport.addAvailability(new Datum(resource.getId(), AvailabilityType.UP, System.currentTimeMillis()));
+ AvailabilityManagerLocal availManager = LookupUtil.getAvailabilityManager();
+ availManager.mergeAvailabilityReport(availReport);
+
+ // wait for our JMS messages to process and see if we get any alerts
+ Thread.sleep(3000);
+
+ PageList<Alert> alerts = getAlerts(resource.getId());
+ assert alerts.size() == 0 : "No alert should have fired on the initial avail reporting: " + alerts;
+
+ // Now simulate the down avail
+ availReport = new AvailabilityReport(AGENT_NAME);
+ availReport
+ .addAvailability(new Datum(resource.getId(), AvailabilityType.DOWN, System.currentTimeMillis() + 10));
+ availManager.mergeAvailabilityReport(availReport);
+
+ // wait for our JMS messages to process and see if we get any alerts
+ Thread.sleep(3000);
+
+ alerts = getAlerts(resource.getId());
+ assert alerts.size() == 2 : "Two alerts should have fired on the avail change: " + alerts;
+
+ assert !alerts.get(0).getAlertDefinition().getName().equals(alerts.get(1).getAlertDefinition().getName()) : "Alerts should have been from different definitions";
+
+ // purge the resource fully, which should remove all alert defs and alert conditions and condition logs
+ int resourceId = resource.getId();
+ deleteNewResource(resource);
+ resource = null;
+
+ AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
+ PageList<AlertDefinition> defs = alertDefManager.findAlertDefinitions(getOverlord(), resourceId,
+ PageControl.getUnlimitedInstance());
+ assert defs.isEmpty() : "failed to delete the alert definition - are condition logs still around?";
+
+ return;
+ }
+
+ @Test(enabled = ENABLED)
+ public void testAvailDurationAlert() throws Exception {
+ try {
+ prepareScheduler();
+ SchedulerLocal scheduler = LookupUtil.getSchedulerBean();
+ scheduler.scheduleTriggeredJob(AlertAvailabilityDurationJob.class, false, null);
+
+ // create our resource with alert definition
+ MeasurementDefinition metricDef = createResourceWithMetricSchedule();
+ // use a 10s duration, this is not allowed in general, the gui forces 1 minute minimum
+ createAlertDefinitionWithAvailDurationCondition(resource.getId(),
+ AlertConditionOperator.AVAIL_DURATION_DOWN, 10);
+
+ // resource has initial UNKNOWN ResourceAvailability and no Availability records. simulate an avail report
+ // coming from the agent and setting the initial avail to UP.
+ AvailabilityReport availReport = new AvailabilityReport(AGENT_NAME);
+ availReport.addAvailability(new Datum(resource.getId(), AvailabilityType.UP, System.currentTimeMillis()));
+ AvailabilityManagerLocal availManager = LookupUtil.getAvailabilityManager();
+ availManager.mergeAvailabilityReport(availReport);
+
+ // wait for our JMS messages to process and see if we get any alerts
+ Thread.sleep(3000);
+
+ PageList<Alert> alerts = getAlerts(resource.getId());
+ assert alerts.size() == 0 : "No alert should have fired on the initial avail reporting: " + alerts;
+
+ // Now simulate the down avail
+ availReport = new AvailabilityReport(AGENT_NAME);
+ availReport.addAvailability(new Datum(resource.getId(), AvailabilityType.DOWN,
+ System.currentTimeMillis() + 10));
+ availManager.mergeAvailabilityReport(availReport);
+
+ // wait for our JMS messages to process and see if we get any alerts
+ Thread.sleep(5000);
+
+ alerts = getAlerts(resource.getId());
+ assert alerts.size() == 0 : "No alert should have fired after 30s, will take at least a minute: " + alerts;
+
+ // wait for our JMS messages to process and see if we get any alerts
+ Thread.sleep(6000);
+
+ alerts = getAlerts(resource.getId());
+ assert alerts.size() == 1 : "One alert should have fired on the avail duration: " + alerts;
+
+ // purge the resource fully, which should remove all alert defs and alert conditions and condition logs
+ int resourceId = resource.getId();
+ deleteNewResource(resource);
+ resource = null;
+
+ AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
+ PageList<AlertDefinition> defs = alertDefManager.findAlertDefinitions(getOverlord(), resourceId,
+ PageControl.getUnlimitedInstance());
+ assert defs.isEmpty() : "failed to delete the alert definition - are condition logs still around?";
+
+ } finally {
+ unprepareScheduler();
+ }
+ }
+
private PageList<Alert> getAlerts(int resourceId) {
AlertManagerLocal alertManager = LookupUtil.getAlertManager();
AlertCriteria alertCriteria = new AlertCriteria();
@@ -330,6 +448,72 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
return alertDefinition;
}
+ private AlertDefinition createAlertDefinitionWithAvailChangeCondition(int resourceId,
+ AlertConditionOperator condition) {
+ HashSet<AlertCondition> conditions = new HashSet<AlertCondition>(1);
+ AlertCondition cond1 = new AlertCondition();
+ cond1.setCategory(AlertConditionCategory.AVAILABILITY);
+ cond1.setName(condition.name());
+ cond1.setThreshold(null);
+ cond1.setOption(null);
+ cond1.setComparator(null);
+ cond1.setMeasurementDefinition(null);
+ conditions.add(cond1);
+
+ AlertDefinition alertDefinition = new AlertDefinition();
+ alertDefinition.setName("avail change: " + condition.name());
+ alertDefinition.setEnabled(true);
+ alertDefinition.setPriority(AlertPriority.HIGH);
+ alertDefinition.setAlertDampening(new AlertDampening(Category.NONE));
+ alertDefinition.setRecoveryId(Integer.valueOf(0));
+ alertDefinition.setConditionExpression(BooleanExpression.ALL);
+ alertDefinition.setConditions(conditions);
+
+ AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
+ int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId);
+ alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
+ assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ + alertDefinition;
+
+ // now that we created an alert def, we have to reload the alert condition cache
+ reloadAllAlertConditionCaches();
+
+ return alertDefinition;
+ }
+
+ private AlertDefinition createAlertDefinitionWithAvailDurationCondition(int resourceId,
+ AlertConditionOperator condition, int duration) {
+ HashSet<AlertCondition> conditions = new HashSet<AlertCondition>(1);
+ AlertCondition cond1 = new AlertCondition();
+ cond1.setCategory(AlertConditionCategory.AVAIL_DURATION);
+ cond1.setName(condition.name());
+ cond1.setThreshold(null);
+ cond1.setOption(String.valueOf(duration));
+ cond1.setComparator(null);
+ cond1.setMeasurementDefinition(null);
+ conditions.add(cond1);
+
+ AlertDefinition alertDefinition = new AlertDefinition();
+ alertDefinition.setName("avail duration: " + condition.name());
+ alertDefinition.setEnabled(true);
+ alertDefinition.setPriority(AlertPriority.HIGH);
+ alertDefinition.setAlertDampening(new AlertDampening(Category.NONE));
+ alertDefinition.setRecoveryId(Integer.valueOf(0));
+ alertDefinition.setConditionExpression(BooleanExpression.ALL);
+ alertDefinition.setConditions(conditions);
+
+ AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
+ int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId);
+ alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
+ assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ + alertDefinition;
+
+ // now that we created an alert def, we have to reload the alert condition cache
+ reloadAllAlertConditionCaches();
+
+ return alertDefinition;
+ }
+
private AlertDefinition createAlertDefinitionWithOneOutsideRangeCondition(MeasurementDefinition metricDef,
int resourceId) {
// create alert definition with the range condition "metric value outside 40...60"
@@ -380,7 +564,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
final MeasurementDefinition metricDef = resourceType.getMetricDefinitions().iterator().next();
- resource = persistNewResource(resourceType.getName());
+ resource = persistNewResource(resourceType.getName()); // will have UNKNOWN avail
assert resource != null && resource.getId() > 0 : "failed to create test resource";
JPAUtils.executeInTransaction(new TransactionCallbackWithContext<Object>() {
commit 7c3bf70d0cb8f82fd296e2b5ec7cad8e8bc70d22
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Feb 29 16:38:57 2012 -0500
Fix a bug for alerting against new resources, that do not yet have
any Availability records.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java
index fd4ccb4..22ab463 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java
@@ -40,8 +40,10 @@ public class AlertConditionAvailabilityCategoryComposite extends AbstractAlertCo
AvailabilityType availabilityType) {
super(condition);
+
this.resourceId = resourceId;
- this.availabilityType = availabilityType;
+ // For a resource with no Availability records, ensure we initialize to UNKNOWN as opposed to null
+ this.availabilityType = (null != availabilityType) ? availabilityType : AvailabilityType.UNKNOWN;
}
public Integer getResourceId() {
12 years, 1 month
[rhq] Branch 'jshaughn/avail' - modules/core modules/enterprise
by mazz
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDefinition.java | 2 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java | 2 +-
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java | 6 +++---
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit f5ac3b7b2eef2b6866db11853263f47e2b614bb6
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Feb 29 15:06:09 2012 -0500
rename the auto-generated availability metric to Availability
rename the property name to rhq.availability
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDefinition.java
index cb00371..4e13245 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDefinition.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDefinition.java
@@ -111,7 +111,7 @@ public class MeasurementDefinition implements Serializable {
public static final String DISABLE_ALL = "MeasurementDefinition.disableAll";
public static final String FIND_RAW_OR_PER_MINUTE_BY_NAME_AND_RESOURCE_TYPE_NAME = "MeasurementDefinition.findRawOrPerMinuteByNameAndResourceTypeName";
- public static final String AVAILABILITY_TYPE_NAME = "_AvailabilityType_";
+ public static final String AVAILABILITY_TYPE_NAME = "rhq.availability";
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy = GenerationType.AUTO, generator = "id")
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java
index 0039aa2..7c7dae1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java
@@ -168,7 +168,7 @@ public class MeasurementMetadataManagerBean implements MeasurementMetadataManage
MeasurementDefinition availabilityScanPeriod = new MeasurementDefinition(newType,
MeasurementDefinition.AVAILABILITY_TYPE_NAME);
// TODO I18N for this?
- availabilityScanPeriod.setDisplayName("Availability Type");
+ availabilityScanPeriod.setDisplayName("Availability");
availabilityScanPeriod.setCategory(MeasurementCategory.AVAILABILITY);
availabilityScanPeriod
.setDescription("The number of seconds between availability checks. The agent honors this setting as best as possible but the actual period can be longer based on agent activity.");
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
index 0664545..aa8604b 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java
@@ -24,7 +24,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
@Test(groups = { "plugin.metadata", "Metrics.NewPlugin" }, dependsOnMethods = { "registerMetricsPlugin" })
public void persistNewMetrics() throws Exception {
assertResourceTypeAssociationEquals("MetricServer1", "MeasurementMetadataManagerBeanTestPlugin",
- "metricDefinitions", asList("metric1", "metric2", "metric3", "_AvailabilityType_"));
+ "metricDefinitions", asList("metric1", "metric2", "metric3", "rhq.availability"));
}
@Test(groups = { "plugin.metadata", "Metrics.NewPlugin" }, dependsOnMethods = { "persistNewMetrics" })
@@ -93,7 +93,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
@Test(groups = { "plugin.metadata", "Metrics.UpradePlugin" }, dependsOnMethods = { "upgradeMetricsPlugin" })
public void addNewMetricDef() throws Exception {
assertResourceTypeAssociationEquals("MetricServer2", "MeasurementMetadataManagerBeanTestPlugin",
- "metricDefinitions", asList("metric1", "_AvailabilityType_"));
+ "metricDefinitions", asList("metric1", "rhq.availability"));
}
@Test(groups = { "plugin.metadata", "Metrics.UpradePlugin" }, dependsOnMethods = { "upgradeMetricsPlugin" })
@@ -127,7 +127,7 @@ public class MeasurementMetadataManagerBeanTest extends MetadataBeanTest {
@Test(groups = { "plugin.metadata", "Metrics.UpradePlugin" }, dependsOnMethods = { "upgradeMetricsPlugin" })
public void deleteMetricDefThatHasBeenRemovedFromResourceType() throws Exception {
assertResourceTypeAssociationEquals("MetricServer4", "MeasurementMetadataManagerBeanTestPlugin",
- "metricDefinitions", asList("_AvailabilityType_"));
+ "metricDefinitions", asList("rhq.availability"));
}
@Test(groups = { "plugin.metadata", "Metrics.UpradePlugin" }, dependsOnMethods = { "upgradeMetricsPlugin" })
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
index 835e79e..34c247e 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
@@ -142,7 +142,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.metadata", "NewPlugin" })
public void persistMeasurementDefinitions() throws Exception {
assertResourceTypeAssociationEquals("ServerA", "TestPlugin", "metricDefinitions",
- asList("metric1", "metric2", "_AvailabilityType_"));
+ asList("metric1", "metric2", "rhq.availability"));
}
@Test(dependsOnMethods = { "persistNewTypes" }, groups = { "plugin.metadata", "NewPlugin" })
12 years, 1 month
[rhq] 2 commits - modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 33 ----------
1 file changed, 33 deletions(-)
New commits:
commit 44f5a85eb11fe78c86a97af330ebc854a217d4f9
Merge: 4706f33 772508e
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Wed Feb 29 08:44:39 2012 -0800
Merge branch 'BZ758893-2'
commit 772508e60b9e72bbbc09468ef784ac34c075e6e6
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Wed Feb 29 08:43:58 2012 -0800
Removal of Servlet Path entries from CoreGUI.gwt.xml -- no longer neccessary in *.gwt.xml only needed in web.xml
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index 1644277..e5ca8f1 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@ -106,37 +106,4 @@
<entry-point class='org.rhq.enterprise.gui.coregui.client.CoreGUI'/>
- <servlet path="/AgentGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AgentGWTServiceImpl"/>
- <servlet path="/AlertGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AlertGWTServiceImpl"/>
- <servlet path="/AlertDefinitionGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AlertDefinitionGWTServiceImpl"/>
- <servlet path="/AlertTemplateGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AlertTemplateGWTServiceImpl"/>
- <servlet path="/AuthorizationGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AuthorizationGWTServiceImpl"/>
- <servlet path="/AvailabilityGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AvailabilityGWTServiceImpl"/>
- <servlet path="/BundleGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.BundleGWTServiceImpl"/>
- <servlet path="/ClusterGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ClusterGWTServiceImpl"/>
- <servlet path="/ConfigurationGwtService" class="org.rhq.enterprise.gui.coregui.server.gwt.ConfigurationGWTServiceImpl"/>
- <servlet path="/ContentGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ContentGWTServiceImpl"/>
- <servlet path="/DashboardGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.DashboardGWTServiceImpl"/>
- <servlet path="/DriftGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.DriftGWTServiceImpl"/>
- <servlet path="/EventGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.EventGWTServiceImpl"/>
- <servlet path="/GroupAlertDefinitionGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.GroupAlertDefinitionGWTServiceImpl"/>
- <servlet path="/GroupDefinitionExpressionBuilderGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.GroupDefinitionExpressionBuilderGWTServiceImpl"/>
- <servlet path="/LdapGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.LdapGWTServiceImpl"/>
- <servlet path="/MeasurementDataGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.MeasurementDataGWTServiceImpl"/>
- <servlet path="/MeasurementChartsGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.MeasurementChartsGWTServiceImpl"/>
- <servlet path="/MeasurementScheduleGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.MeasurementScheduleGWTServiceImpl"/>
- <servlet path="/OperationGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.OperationGWTServiceImpl"/>
- <servlet path="/PluginGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.PluginGWTServiceImpl"/>
- <servlet path="/RemoteInstallGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.RemoteInstallGWTServiceImpl"/>
- <servlet path="/RepoGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.RepoGWTServiceImpl"/>
- <servlet path="/ResourceBossGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceBossGWTServiceImpl"/>
- <servlet path="/ResourceGroupGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceGroupGWTServiceImpl"/>
- <servlet path="/ResourceGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceGWTServiceImpl"/>
- <servlet path="/ResourceTypeGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceTypeGWTServiceImpl"/>
- <servlet path="/RoleGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.RoleGWTServiceImpl"/>
- <servlet path="/SearchGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.SearchGWTServiceImpl"/>
- <servlet path="/SubjectGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.SubjectGWTServiceImpl"/>
- <servlet path="/SystemGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.SystemGWTServiceImpl"/>
- <servlet path="/TagGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.TagGWTServiceImpl"/>
-
</module>
12 years, 1 month
[rhq] 2 commits - modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 4706f331f030af6052b35ad890537bdf75857f78
Merge: 37eea22 7ae440a
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Wed Feb 29 08:23:56 2012 -0800
Merge branch 'BZ758893-2'
commit 7ae440a76412a9a8b617d8fb4ee5eacd890ec643
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Wed Feb 29 08:19:51 2012 -0800
Removed SearchGUI second entry point from CoreGUI.gwt.xml
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index e5c9e1d..1644277 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@ -105,7 +105,6 @@
<set-property-fallback name="locale" value="${gwt.fallback.locale}"/>
<entry-point class='org.rhq.enterprise.gui.coregui.client.CoreGUI'/>
- <entry-point class='org.rhq.enterprise.gui.coregui.client.SearchGUI'/>
<servlet path="/AgentGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AgentGWTServiceImpl"/>
<servlet path="/AlertGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AlertGWTServiceImpl"/>
12 years, 1 month
[rhq] Branch 'jshaughn/avail' - .classpath
by Jay Shaughnessy
.classpath | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ec806a419f7d33df702407a86336b0160c1545b6
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Feb 29 10:59:07 2012 -0500
Add test code for snmptrapd plugin to eclipse source
diff --git a/.classpath b/.classpath
index 7ebc120..6a29be2 100644
--- a/.classpath
+++ b/.classpath
@@ -132,8 +132,9 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-api-support/1.4.11/powermock-api-support-1.4.11.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-module-testng-common/1.4.11/powermock-module-testng-common-1.4.11.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-module-testng/1.4.11/powermock-module-testng-1.4.11.jar"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/org/liquibase/liquibase-core/2.0.3/liquibase-core-2.0.3.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/liquibase/liquibase-core/2.0.3/liquibase-core-2.0.3.jar"/>
<classpathentry kind="src" path="modules/common/ant-bundle/src/main/java"/>
+ <classpathentry kind="src" path="modules/plugins/snmptrapd/src/test/java"/>
<classpathentry kind="src" path="modules/enterprise/server/itests/src/test/java"/>
<classpathentry kind="src" path="modules/enterprise/server/plugins/drift-mongodb/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/plugins/drift-mongodb/src/test/java"/>
12 years, 1 month
[rhq] Branch 'jshaughn/avail' - modules/plugins
by Jay Shaughnessy
modules/plugins/snmptrapd/src/test/java/org/rhq/plugins/snmptrapd/ComponentTest.java | 17 +++++-----
1 file changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 9ce4431a27e01bd628f3bdc5fb77f55ee8b4dde8
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Feb 29 10:57:05 2012 -0500
Fix compile problem in experimental snmptrapd plugin test code.
diff --git a/modules/plugins/snmptrapd/src/test/java/org/rhq/plugins/snmptrapd/ComponentTest.java b/modules/plugins/snmptrapd/src/test/java/org/rhq/plugins/snmptrapd/ComponentTest.java
index 2323ed3..4a540e3 100644
--- a/modules/plugins/snmptrapd/src/test/java/org/rhq/plugins/snmptrapd/ComponentTest.java
+++ b/modules/plugins/snmptrapd/src/test/java/org/rhq/plugins/snmptrapd/ComponentTest.java
@@ -3,11 +3,14 @@ package org.rhq.plugins.snmptrapd;
import java.io.File;
import java.io.InputStream;
import java.util.Set;
-import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+
import org.rhq.core.clientapi.agent.metadata.PluginMetadataManager;
import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil;
import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
@@ -16,11 +19,13 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pc.PluginContainer;
import org.rhq.core.pc.PluginContainerConfiguration;
+import org.rhq.core.pc.availability.AvailabilityContextImpl;
import org.rhq.core.pc.content.ContentContextImpl;
import org.rhq.core.pc.event.EventContextImpl;
import org.rhq.core.pc.event.EventManager;
import org.rhq.core.pc.operation.OperationContextImpl;
import org.rhq.core.pc.upgrade.plugins.multi.base.NothingDiscoveringDiscoveryComponent;
+import org.rhq.core.pluginapi.availability.AvailabilityContext;
import org.rhq.core.pluginapi.content.ContentContext;
import org.rhq.core.pluginapi.event.EventContext;
import org.rhq.core.pluginapi.inventory.PluginContainerDeployment;
@@ -30,9 +35,6 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.operation.OperationContext;
import org.rhq.core.system.SystemInfo;
import org.rhq.core.system.SystemInfoFactory;
-import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
/**
* Base class for RHQ Component Testing.
@@ -91,12 +93,11 @@ public abstract class ComponentTest {
EventContext eventContext = new EventContextImpl(resource);
OperationContext operationContext = new OperationContextImpl(0);
ContentContext contentContext = new ContentContextImpl(0);
- Executor availCollectorThreadPool = Executors.newCachedThreadPool();
PluginContainerDeployment pluginContainerDeployment = null;
+ AvailabilityContext availContext = new AvailabilityContextImpl(resource, Executors.newCachedThreadPool());
ResourceContext context = new ResourceContext(resource, parentResourceComponent, parentResourceContext,
- resourceDiscoveryComponent, systemInfo, temporaryDirectory, dataDirectory,
- pluginContainerName, eventContext, operationContext, contentContext,
- availCollectorThreadPool, pluginContainerDeployment);
+ resourceDiscoveryComponent, systemInfo, temporaryDirectory, dataDirectory, pluginContainerName,
+ eventContext, operationContext, contentContext, availContext, pluginContainerDeployment);
Assert.assertNotNull(context.getEventContext());
component.start(context);
}
12 years, 1 month
[rhq] Branch 'release-4.3.0.GA' - modules/plugins
by Heiko W. Rupp
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 8471ffb070e6adee11d3b3ad7d542c3bfd7bbe43
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 29 16:51:59 2012 +0100
BZ 708332 - don't fail when the AS sends us unknown properties.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
index 6a7523f..7c0e1fe 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
@@ -32,6 +32,7 @@ import java.net.URL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.DeserializationConfig;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
@@ -83,6 +84,7 @@ public class ASConnection {
verbose = Boolean.getBoolean("as7plugin.verbose");
mapper = new ObjectMapper();
+ mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
}
/**
12 years, 1 month
[rhq] Branch 'jshaughn/avail' - modules/plugins
by Jay Shaughnessy
modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/ComponentTest.java | 64 +++++-----
1 file changed, 32 insertions(+), 32 deletions(-)
New commits:
commit 6068a6dd845ebeb2cc9b6deb4d21bdb35b5ffe26
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Feb 29 10:51:06 2012 -0500
Fix compile issues in experimental oracle plugin test code.
diff --git a/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/ComponentTest.java b/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/ComponentTest.java
index bd293f5..dfee1b6 100644
--- a/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/ComponentTest.java
+++ b/modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/ComponentTest.java
@@ -10,11 +10,14 @@ import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+
import org.rhq.core.clientapi.agent.metadata.PluginMetadataManager;
import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil;
import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
@@ -29,17 +32,16 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pc.PluginContainer;
import org.rhq.core.pc.PluginContainerConfiguration;
+import org.rhq.core.pc.availability.AvailabilityContextImpl;
import org.rhq.core.pc.content.ContentContextImpl;
import org.rhq.core.pc.event.EventContextImpl;
import org.rhq.core.pc.event.EventManager;
-import org.rhq.core.pc.inventory.InventoryManager;
-import org.rhq.core.pc.inventory.ResourceContainer;
import org.rhq.core.pc.operation.OperationContextImpl;
import org.rhq.core.pc.upgrade.plugins.multi.base.NothingDiscoveringDiscoveryComponent;
+import org.rhq.core.pluginapi.availability.AvailabilityContext;
import org.rhq.core.pluginapi.content.ContentContext;
import org.rhq.core.pluginapi.event.EventContext;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.PluginContainerDeployment;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.inventory.ResourceContext;
@@ -49,9 +51,6 @@ import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.pluginapi.operation.OperationContext;
import org.rhq.core.system.SystemInfo;
import org.rhq.core.system.SystemInfoFactory;
-import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
/**
* Base class for RHQ Component Testing.
@@ -85,7 +84,6 @@ public abstract class ComponentTest {
String pluginContainerName = "rhq";
OperationContext operationContext = new OperationContextImpl(0);
ContentContext contentContext = new ContentContextImpl(0);
- Executor availCollectorThreadPool = Executors.newCachedThreadPool();
PluginContainerDeployment pluginContainerDeployment = null;
/**
@@ -115,7 +113,8 @@ public abstract class ComponentTest {
for (ResourceType resourceType : pmm.loadPlugin(pd)) {
String componentType = pmm.getComponentClass(resourceType);
ResourceComponent component = (ResourceComponent) Class.forName(componentType).newInstance();
- Configuration configuration = resourceType.getPluginConfigurationDefinition().getDefaultTemplate().createConfiguration();
+ Configuration configuration = resourceType.getPluginConfigurationDefinition().getDefaultTemplate()
+ .createConfiguration();
setConfiguration(configuration, resourceType);
@@ -133,14 +132,15 @@ public abstract class ComponentTest {
ResourceDiscoveryComponent resourceDiscoveryComponent = new NothingDiscoveringDiscoveryComponent();
EventContext eventContext = new EventContextImpl(resource);
+ AvailabilityContext availContext = new AvailabilityContextImpl(resource, Executors.newCachedThreadPool());
ResourceContext context = new ResourceContext(resource, parentResourceComponent, parentResourceContext,
- resourceDiscoveryComponent, systemInfo, temporaryDirectory, dataDirectory,
- pluginContainerName, eventContext, operationContext, contentContext,
- availCollectorThreadPool, pluginContainerDeployment);
+ resourceDiscoveryComponent, systemInfo, temporaryDirectory, dataDirectory, pluginContainerName,
+ eventContext, operationContext, contentContext, availContext, pluginContainerDeployment);
component.start(context);
- resourceDiscoveryContext = new ResourceDiscoveryContext(resourceType, parentResourceComponent, context, systemInfo,
- Collections.emptyList(), Collections.emptyList(), pluginContainerName, pluginContainerDeployment);
+ resourceDiscoveryContext = new ResourceDiscoveryContext(resourceType, parentResourceComponent, context,
+ systemInfo, Collections.emptyList(), Collections.emptyList(), pluginContainerName,
+ pluginContainerDeployment);
for (ResourceType rt : resourceType.getChildResourceTypes()) {
processChild(rt, component, context, resource);
@@ -156,8 +156,10 @@ public abstract class ComponentTest {
* @param resource parent resource
* @param resourceType child resource type
*/
- private void processChild(ResourceType resourceType, ResourceComponent component, ResourceContext<?> parentContext, Resource resource) throws Exception {
- Configuration configuration = resourceType.getPluginConfigurationDefinition().getDefaultTemplate().createConfiguration();
+ private void processChild(ResourceType resourceType, ResourceComponent component, ResourceContext<?> parentContext,
+ Resource resource) throws Exception {
+ Configuration configuration = resourceType.getPluginConfigurationDefinition().getDefaultTemplate()
+ .createConfiguration();
setConfiguration(configuration, resourceType);
log.info("childResource " + resourceType + " properties " + configuration.getProperties());
@@ -166,12 +168,13 @@ public abstract class ComponentTest {
log.debug("rdc=" + rdc);
EventContext eventContext = new EventContextImpl(resource);
- ResourceContext context = new ResourceContext(resource, component, parentContext,
- resourceDiscoveryComponent, systemInfo, temporaryDirectory, dataDirectory,
- pluginContainerName, eventContext, operationContext, contentContext,
- availCollectorThreadPool, pluginContainerDeployment);
- ResourceDiscoveryContext resourceDiscoveryContext = new ResourceDiscoveryContext(resourceType, component, context, systemInfo,
- Collections.emptyList(), Collections.emptyList(), pluginContainerName, pluginContainerDeployment);
+ AvailabilityContext availContext = new AvailabilityContextImpl(resource, Executors.newCachedThreadPool());
+ ResourceContext context = new ResourceContext(resource, component, parentContext, resourceDiscoveryComponent,
+ systemInfo, temporaryDirectory, dataDirectory, pluginContainerName, eventContext, operationContext,
+ contentContext, availContext, pluginContainerDeployment);
+ ResourceDiscoveryContext resourceDiscoveryContext = new ResourceDiscoveryContext(resourceType, component,
+ context, systemInfo, Collections.emptyList(), Collections.emptyList(), pluginContainerName,
+ pluginContainerDeployment);
Assert.assertNotNull(context.getEventContext());
Set<DiscoveredResourceDetails> d = rdc.discoverResources(resourceDiscoveryContext);
for (DiscoveredResourceDetails drd : d) {
@@ -181,11 +184,8 @@ public abstract class ComponentTest {
}
- private void createChild(DiscoveredResourceDetails drd,
- Resource resource,
- Configuration configuration,
- ResourceComponent parentComponent, ResourceContext<?> parentContext) throws Exception
- {
+ private void createChild(DiscoveredResourceDetails drd, Resource resource, Configuration configuration,
+ ResourceComponent parentComponent, ResourceContext<?> parentContext) throws Exception {
ResourceType type = pmm.getType(drd.getResourceType());
Resource cresource = new Resource();
@@ -199,10 +199,10 @@ public abstract class ComponentTest {
ResourceComponent component = (ResourceComponent) Class.forName(rclassname).newInstance();
EventContext eventContext = new EventContextImpl(resource);
+ AvailabilityContext availContext = new AvailabilityContextImpl(resource, Executors.newCachedThreadPool());
ResourceContext context = new ResourceContext(cresource, parentComponent, parentContext,
- resourceDiscoveryComponent, systemInfo, temporaryDirectory, dataDirectory,
- pluginContainerName, eventContext, operationContext, contentContext,
- availCollectorThreadPool, pluginContainerDeployment);
+ resourceDiscoveryComponent, systemInfo, temporaryDirectory, dataDirectory, pluginContainerName,
+ eventContext, operationContext, contentContext, availContext, pluginContainerDeployment);
component.start(context);
components.put(component, cresource);
@@ -235,7 +235,7 @@ public abstract class ComponentTest {
Set<MeasurementScheduleRequest> s = new HashSet<MeasurementScheduleRequest>();
for (MeasurementDefinition md : type.getMetricDefinitions())
s.add(new MeasurementScheduleRequest(new MeasurementSchedule(md, resource)));
- ((MeasurementFacet)component).getValues(report, s);
+ ((MeasurementFacet) component).getValues(report, s);
return report;
}
@@ -256,7 +256,7 @@ public abstract class ComponentTest {
* From a measurement report, returns a measurement value, or asserts failure if no such value exists.
*/
protected Double getValue(MeasurementReport report, String name) {
- for (MeasurementDataNumeric m: report.getNumericData()) {
+ for (MeasurementDataNumeric m : report.getNumericData()) {
if (m.getName().equals(name)) {
log.debug("measurement name " + name + " " + m.getValue());
return m.getValue();
12 years, 1 month
[rhq] 2 commits - modules/plugins
by Heiko W. Rupp
modules/plugins/jboss-as-7/d2d.sh | 7 ++--
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java | 17 +++++-----
2 files changed, 14 insertions(+), 10 deletions(-)
New commits:
commit 37eea22e7b71a82954c4f3081c01e0cf51e588ca
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Feb 29 16:42:44 2012 +0100
BZ 708332 - don't fail when the AS sends us unknown properties.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
index ef4506c..bbfff8d 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
@@ -33,6 +33,7 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.DeserializationConfig;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
@@ -93,6 +94,8 @@ public class ASConnection {
verbose = Boolean.getBoolean("as7plugin.verbose");
mapper = new ObjectMapper();
+ mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
}
/**
@@ -264,11 +267,11 @@ public class ASConnection {
}
/** This operation purges the Operation passed in of EAP/EDG prefixes in the
- * Address portion and in the AdditionalProperties section. The returned
- * operation should be identical in every other way and should be used
+ * Address portion and in the AdditionalProperties section. The returned
+ * operation should be identical in every other way and should be used
* instead of the unpurged operation which will cause unrecognized property
* errors.
- *
+ *
* @param operation to be purged.
* @return The same operation minus the prefixes.
*/
@@ -278,8 +281,8 @@ public class ASConnection {
boolean prefixLocated = false;
//Ex.
- //Operation{operation='remove', address=Address{path: host=master,server-config=EAP server-six},
- //additionalProperties={socket-binding-port-offset=0, name=EAP server-six, auto-start=false, group=,
+ //Operation{operation='remove', address=Address{path: host=master,server-config=EAP server-six},
+ //additionalProperties={socket-binding-port-offset=0, name=EAP server-six, auto-start=false, group=,
//socket-binding-group=}}
//ADDRESS parsing
@@ -382,8 +385,8 @@ public class ASConnection {
return failure;
}
//spinder 2/22/12: if unparsable JSON detected remove it. TODO: see if fixed with later version of jackson
- //This needs to be in place until i)Jackson version where this is fixed or
- // ii) fix for https://issues.jboss.org/browse/JBPAPP-8233
+ //This needs to be in place until i)Jackson version where this is fixed or
+ // ii) fix for https://issues.jboss.org/browse/JBPAPP-8233
if (as7ResultSerialization.indexOf(UNPARSABLE_JSON) > -1) {
if (verbose) {
log.warn("------ Detected unparsable JSON <" + as7ResultSerialization + ">.");
commit 493983c9468f5db4ebdeb1d206d2452bbd5e9f4c
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Feb 27 18:02:34 2012 +0100
Pull logging from the m2 repo, parametrize the RHQ version, add plugin-api to cp.
diff --git a/modules/plugins/jboss-as-7/d2d.sh b/modules/plugins/jboss-as-7/d2d.sh
index 7bf7b97..8591b48 100755
--- a/modules/plugins/jboss-as-7/d2d.sh
+++ b/modules/plugins/jboss-as-7/d2d.sh
@@ -1,6 +1,7 @@
-#!/bin/sh
+#!/bin/sh
-RHQ_DEV_HOME=${HOME}/dev/jboss/rhq
+RHQ_DEV_HOME=${HOME}/im/rhq
M2_REPO=${HOME}/.m2/repository
+RHQ_VERSION='4.3.0-SNAPSHOT'
-java -cp target/rhq-jboss-as-7-plugin-4.3.0-SNAPSHOT.jar:${RHQ_DEV_HOME}/modules/enterprise/agent/target/rhq-agent/lib/commons-logging-1.1.0.jboss.jar:${M2_REPO}/org/codehaus/jackson/jackson-core-asl/1.7.4/jackson-core-asl-1.7.4.jar:${M2_REPO}/org/codehaus/jackson/jackson-mapper-asl/1.7.4/jackson-mapper-asl-1.7.4.jar org.rhq.modules.plugins.jbossas7.Domain2Descriptor $*
+java -cp target/rhq-jboss-as-7-plugin-${RHQ_VERSION}.jar:${M2_REPO}/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar:${M2_REPO}/org/codehaus/jackson/jackson-core-asl/1.7.4/jackson-core-asl-1.7.4.jar:${M2_REPO}/org/codehaus/jackson/jackson-mapper-asl/1.7.4/jackson-mapper-asl-1.7.4.jar:${M2_REPO}/org/rhq/rhq-core-plugin-api/${RHQ_VERSION}/rhq-core-plugin-api-${RHQ_VERSION}.jar org.rhq.modules.plugins.jbossas7.Domain2Descriptor $*
12 years, 1 month
[rhq] Branch 'jshaughn/avail' - .classpath
by Jay Shaughnessy
.classpath | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit f2134ae0f5ece6d3ca0f81e355614ab4d25d2b47
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Feb 29 10:36:25 2012 -0500
add liquibase dep
diff --git a/.classpath b/.classpath
index 0c54f16..7ebc120 100644
--- a/.classpath
+++ b/.classpath
@@ -132,6 +132,7 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-api-support/1.4.11/powermock-api-support-1.4.11.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-module-testng-common/1.4.11/powermock-module-testng-common-1.4.11.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/powermock/powermock-module-testng/1.4.11/powermock-module-testng-1.4.11.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/liquibase/liquibase-core/2.0.3/liquibase-core-2.0.3.jar"/>
<classpathentry kind="src" path="modules/common/ant-bundle/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/itests/src/test/java"/>
<classpathentry kind="src" path="modules/enterprise/server/plugins/drift-mongodb/src/main/java"/>
@@ -294,5 +295,6 @@
<classpathentry kind="src" path="modules/integration-tests/jboss-as-7-plugin-test/src/test/java"/>
<classpathentry kind="src" path="modules/integration-tests/mod_cluster-plugin-test/src/test/java"/>
<classpathentry kind="src" path="modules/enterprise/server/plugins/disk/src/test/java"/>
+ <classpathentry kind="var" path="M2_REPO"/>
<classpathentry kind="output" path="eclipse-classes"/>
</classpath>
12 years, 1 month