From: <jt...@hy...> - 2008-01-04 22:08:16
|
Author: jtravis Date: 2008-01-04 14:08:10 -0800 (Fri, 04 Jan 2008) New Revision: 7411 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7411 Modified: trunk/src/org/hyperic/hq/measurement/server/session/DerivedMeasurementDAO.java trunk/src/org/hyperic/hq/measurement/server/session/DerivedMeasurementManagerEJBImpl.java Log: HHQ-1461. Also return the server with the agent offset tuple Modified: trunk/src/org/hyperic/hq/measurement/server/session/DerivedMeasurementDAO.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/DerivedMeasurementDAO.java 2008-01-04 21:19:25 UTC (rev 7410) +++ trunk/src/org/hyperic/hq/measurement/server/session/DerivedMeasurementDAO.java 2008-01-04 22:08:10 UTC (rev 7411) @@ -481,7 +481,7 @@ * @see DerivedMeasurementManagerEJBImpl#findAgentOffsetTuples() */ List findAgentOffsetTuples() { - String sql = "select a, p, meas from Agent a " + + String sql = "select a, p, s, meas from Agent a " + "join a.platforms p " + "join p.platformType pt " + "join p.servers s " + @@ -490,7 +490,8 @@ "join meas.template as templ " + "join templ.monitorableType as mt " + "where " + - "templ.name = 'Server Offset' " + + "pt.plugin = 'system' " + + "and templ.name = 'Server Offset' " + "and templ.template = 'ARG1' " + "and meas.instanceId = s.id " + "and st.name = 'HQ Agent' "; Modified: trunk/src/org/hyperic/hq/measurement/server/session/DerivedMeasurementManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/DerivedMeasurementManagerEJBImpl.java 2008-01-04 21:19:25 UTC (rev 7410) +++ trunk/src/org/hyperic/hq/measurement/server/session/DerivedMeasurementManagerEJBImpl.java 2008-01-04 22:08:10 UTC (rev 7411) @@ -1363,9 +1363,10 @@ } /** - * Find a list of tuples (of size 3) consisting of + * Find a list of tuples (of size 4) consisting of * the {@link Agent} * the {@link Platform} it manages + * the {@link Server} representing the Agent * the {@link DerivedMeasurement} that contains the Server Offset value * * @ejb:interface-method |