Menu
▾
▴
hyperic-hq-discuss — Hyperic HQ SVN Commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
(927) |
Apr
(419) |
May
(352) |
Jun
(431) |
Jul
(463) |
Aug
(345) |
Sep
(304) |
Oct
(596) |
Nov
(466) |
Dec
(414) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(348) |
Feb
(313) |
Mar
(665) |
Apr
(688) |
May
(434) |
Jun
(311) |
Jul
(540) |
Aug
(554) |
Sep
(467) |
Oct
(341) |
Nov
(365) |
Dec
(272) |
| 2009 |
Jan
(386) |
Feb
(293) |
Mar
(279) |
Apr
(239) |
May
(229) |
Jun
(199) |
Jul
(186) |
Aug
(111) |
Sep
(196) |
Oct
(146) |
Nov
(116) |
Dec
(140) |
| 2010 |
Jan
(170) |
Feb
(159) |
Mar
(151) |
Apr
(161) |
May
(90) |
Jun
(56) |
Jul
(28) |
Aug
(22) |
Sep
(5) |
Oct
|
Nov
(23) |
Dec
(12) |
| 2011 |
Jan
(8) |
Feb
(8) |
Mar
(22) |
Apr
(24) |
May
(4) |
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2012 |
Jan
(5) |
Feb
(1) |
Mar
|
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sc...@hy...> - 2010-01-22 23:22:42
|
Author: scottmf Date: 2010-01-22 15:22:31 -0800 (Fri, 22 Jan 2010) New Revision: 14224 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14224 Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java Log: [HHQ-3689] fixed the 1000 limit in oracle Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java 2010-01-22 23:22:15 UTC (rev 14223) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java 2010-01-22 23:22:31 UTC (rev 14224) @@ -349,12 +349,23 @@ .append(" m.interval, m.dsn,m.resource,") .append(" rle.endtime") .append(" ORDER BY rle.endtime").toString(); - return getSession() - .createQuery(sql) - .setLong("startime", start) - .setLong("endtime", end) - .setParameterList("mids", mids, new IntegerType()) - .list(); + final List measIds = Arrays.asList(mids); + final int size = measIds.size(); + final HQDialect dialect = Util.getHQDialect(); + final int batchSize = dialect.getMaxExpressions() < 0 ? + Integer.MAX_VALUE : dialect.getMaxExpressions(); + final List rtn = new ArrayList(size); + for (int i=0; i<size; i+=batchSize) { + final int last = Math.min(i+batchSize, size); + final List sublist = measIds.subList(i, last); + rtn.addAll(getSession() + .createQuery(sql) + .setLong("startime", start) + .setLong("endtime", end) + .setParameterList("mids", sublist, new IntegerType()) + .list()); + } + return rtn; } /** |
|
From: <sc...@hy...> - 2010-01-22 23:22:24
|
Author: scottmf Date: 2010-01-22 15:22:15 -0800 (Fri, 22 Jan 2010) New Revision: 14223 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14223 Modified: trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java Log: [HHQ-3689] fixed the 1000 limit in oracle Modified: trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java 2010-01-22 20:56:31 UTC (rev 14222) +++ trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java 2010-01-22 23:22:15 UTC (rev 14223) @@ -349,12 +349,23 @@ .append(" m.interval, m.dsn,m.resource,") .append(" rle.endtime") .append(" ORDER BY rle.endtime").toString(); - return getSession() - .createQuery(sql) - .setLong("startime", start) - .setLong("endtime", end) - .setParameterList("mids", mids, new IntegerType()) - .list(); + final List measIds = Arrays.asList(mids); + final int size = measIds.size(); + final HQDialect dialect = Util.getHQDialect(); + final int batchSize = dialect.getMaxExpressions() < 0 ? + Integer.MAX_VALUE : dialect.getMaxExpressions(); + final List rtn = new ArrayList(size); + for (int i=0; i<size; i+=batchSize) { + final int last = Math.min(i+batchSize, size); + final List sublist = measIds.subList(i, last); + rtn.addAll(getSession() + .createQuery(sql) + .setLong("startime", start) + .setLong("endtime", end) + .setParameterList("mids", sublist, new IntegerType()) + .list()); + } + return rtn; } /** |
|
From: <dcr...@hy...> - 2010-01-22 20:56:42
|
Author: dcrutchf Date: 2010-01-22 12:56:31 -0800 (Fri, 22 Jan 2010) New Revision: 14222 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14222 Modified: branches/HQ_4_2_0_PATCH/web/resource/group/inventory/ListResources.jsp Log: [HHQ-3623] - Want "Monitor" tab as default view when navigating from Group views Modified: branches/HQ_4_2_0_PATCH/web/resource/group/inventory/ListResources.jsp =================================================================== --- branches/HQ_4_2_0_PATCH/web/resource/group/inventory/ListResources.jsp 2010-01-22 20:25:50 UTC (rev 14221) +++ branches/HQ_4_2_0_PATCH/web/resource/group/inventory/ListResources.jsp 2010-01-22 20:56:31 UTC (rev 14222) @@ -106,7 +106,7 @@ </display:column> <display:column width="18%" property="name" sort="true" sortAttr="5" defaultSort="true" title="common.header.Name" - href="/resource/${resourceItem.entityId.typeName}/monitor/Visibility.do?mode=currentHealth&eid=${resourceItem.entityId.type}:${resourceItem.id}"/> + href="/Resource.do?mode=currentHealth&eid=${resourceItem.entityId.type}:${resourceItem.id}" /> <display:column width="18%" property="appdefResourceTypeValue.name" title="resource.group.inventory.TypeTH" /> <display:column width="44%" property="description" title="common.header.Description" /> <display:column property="id" title="resource.common.monitor.visibility.AvailabilityTH" width="10%" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox" valign="middle"> |
|
From: <dcr...@hy...> - 2010-01-22 20:26:04
|
Author: dcrutchf Date: 2010-01-22 12:25:50 -0800 (Fri, 22 Jan 2010) New Revision: 14221 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14221 Modified: trunk/web/resource/group/inventory/ListResources.jsp Log: [HHQ-3623] - Want "Monitor" tab as default view when navigating from Group views Modified: trunk/web/resource/group/inventory/ListResources.jsp =================================================================== --- trunk/web/resource/group/inventory/ListResources.jsp 2010-01-22 10:25:18 UTC (rev 14220) +++ trunk/web/resource/group/inventory/ListResources.jsp 2010-01-22 20:25:50 UTC (rev 14221) @@ -107,7 +107,7 @@ </display:column> <display:column width="18%" property="name" sort="true" sortAttr="5" defaultSort="true" title="common.header.Name" - href="/resource/${resourceItem.entityId.typeName}/monitor/Visibility.do?mode=currentHealth&eid=${resourceItem.entityId.type}:${resourceItem.id}"/> + href="/Resource.do?mode=currentHealth&eid=${resourceItem.entityId.type}:${resourceItem.id}"/> <display:column width="18%" property="appdefResourceTypeValue.name" title="resource.group.inventory.TypeTH" /> <display:column width="44%" property="description" title="common.header.Description" /> <display:column property="id" title="resource.common.monitor.visibility.AvailabilityTH" width="10%" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox" valign="middle"> |
|
From: Átila V. F. M. de O. <av...@ho...> - 2010-01-22 14:42:08
|
is this "sigar.getNetInterfaceStat("eth0").getSpeed()" in bytes/sec?
sorry about my horrible english... =P
|
|
From: <bo...@hy...> - 2010-01-22 10:25:26
|
Author: bob Date: 2010-01-22 02:25:18 -0800 (Fri, 22 Jan 2010) New Revision: 14220 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14220 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1327 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-01-22 09:47:57 UTC (rev 14219) +++ trunk/etc/version.properties 2010-01-22 10:25:18 UTC (rev 14220) @@ -1,3 +1,3 @@ -#Thu Jan 21 00:25:16 PST 2010 +#Fri Jan 22 00:59:32 PST 2010 version=4.3.0 -build=1326 +build=1327 |
|
From: <bo...@hy...> - 2010-01-22 09:48:10
|
Author: bob Date: 2010-01-22 01:47:57 -0800 (Fri, 22 Jan 2010) New Revision: 14219 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14219 Modified: tags/HQ_4_2_0_GA/etc/version.properties Log: Release 4.2.0 build #1262 Modified: tags/HQ_4_2_0_GA/etc/version.properties =================================================================== --- tags/HQ_4_2_0_GA/etc/version.properties 2010-01-22 03:55:17 UTC (rev 14218) +++ tags/HQ_4_2_0_GA/etc/version.properties 2010-01-22 09:47:57 UTC (rev 14219) @@ -1,3 +1,3 @@ -#Mon Dec 14 14:58:51 PST 2009 +#Fri Jan 22 00:27:54 PST 2010 version=4.2.0 -build=1261 +build=1262 |
|
From: <bo...@hy...> - 2010-01-22 02:10:09
|
Author: bob Date: 2010-01-21 18:09:58 -0800 (Thu, 21 Jan 2010) New Revision: 14217 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14217 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties Log: Release 4.2.0.4 build #1277 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties =================================================================== --- branches/HQ_4_2_0_PATCH/etc/version.properties 2010-01-22 00:38:18 UTC (rev 14216) +++ branches/HQ_4_2_0_PATCH/etc/version.properties 2010-01-22 02:09:58 UTC (rev 14217) @@ -1,3 +1,3 @@ -#Thu Jan 21 12:45:41 PST 2010 +#Thu Jan 21 17:37:00 PST 2010 version=4.2.0.4 -build=1276 +build=1277 |
|
From: <dcr...@hy...> - 2010-01-22 01:03:47
|
Author: dcrutchf Date: 2010-01-21 16:38:18 -0800 (Thu, 21 Jan 2010) New Revision: 14216 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14216 Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/IndicatorChartsAction.java Log: Added checks for the zero case Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/IndicatorChartsAction.java =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/IndicatorChartsAction.java 2010-01-21 23:55:40 UTC (rev 14215) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/IndicatorChartsAction.java 2010-01-22 00:38:18 UTC (rev 14216) @@ -218,17 +218,23 @@ // ...if so, set low to zero if (low == Double.MAX_VALUE) { low = 0; - - // ..high should not have change either - assert(high == Double.MIN_VALUE); } + if (high == Double.MIN_VALUE) { + high = 0; + } + // ...low should never be greater than high... assert(low <= high); - double avg = (double)total/count; + double avg = 0.0d; - /* TODO Ensure this is true, have seen some odd cases where the data makes these assertion false + // calculate average if count is more than 0... + if (count > 0 && !(low == 0 && high == 0)) { + avg = (double)total/count; + } + + /* TODO Ensure this is true, have seen some odd cases where the data makes these assertion fail // ...low should never be greater than avg... assert(low <= avg); |
|
From: <sc...@hy...> - 2010-01-21 23:55:49
|
Author: scottmf Date: 2010-01-21 15:55:40 -0800 (Thu, 21 Jan 2010) New Revision: 14215 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14215 Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/appdef/server/session/ApplicationManagerEJBImpl.java Log: [HHQ-3676] fix potential NPE Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/appdef/server/session/ApplicationManagerEJBImpl.java =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/appdef/server/session/ApplicationManagerEJBImpl.java 2010-01-21 23:55:14 UTC (rev 14214) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/appdef/server/session/ApplicationManagerEJBImpl.java 2010-01-21 23:55:40 UTC (rev 14215) @@ -411,6 +411,11 @@ List rtn = new ArrayList(services.size()); for (Iterator it=services.iterator(); it.hasNext(); ) { AppServiceValue val = (AppServiceValue) it.next(); + if (val == null || val.getService() == null || + val.getService().getResource() == null || + val.getService().getResource().isInAsyncDeleteState()) { + continue; + } rtn.add(val.getService().getResource()); } return rtn; |
|
From: <sc...@hy...> - 2010-01-21 23:55:23
|
Author: scottmf Date: 2010-01-21 15:55:14 -0800 (Thu, 21 Jan 2010) New Revision: 14214 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14214 Modified: trunk/src/org/hyperic/hq/appdef/server/session/ApplicationManagerEJBImpl.java Log: [HHQ-3676] fix potential NPE Modified: trunk/src/org/hyperic/hq/appdef/server/session/ApplicationManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/appdef/server/session/ApplicationManagerEJBImpl.java 2010-01-21 23:50:47 UTC (rev 14213) +++ trunk/src/org/hyperic/hq/appdef/server/session/ApplicationManagerEJBImpl.java 2010-01-21 23:55:14 UTC (rev 14214) @@ -411,6 +411,11 @@ List rtn = new ArrayList(services.size()); for (Iterator it=services.iterator(); it.hasNext(); ) { AppServiceValue val = (AppServiceValue) it.next(); + if (val == null || val.getService() == null || + val.getService().getResource() == null || + val.getService().getResource().isInAsyncDeleteState()) { + continue; + } rtn.add(val.getService().getResource()); } return rtn; |
|
From: <dcr...@hy...> - 2010-01-21 23:50:55
|
Author: dcrutchf Date: 2010-01-21 15:50:47 -0800 (Thu, 21 Jan 2010) New Revision: 14213 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14213 Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/IndicatorChartsAction.java Log: Added a check for the case when everything is NaN/Infinity Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/IndicatorChartsAction.java =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/IndicatorChartsAction.java 2010-01-21 23:18:09 UTC (rev 14212) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/IndicatorChartsAction.java 2010-01-21 23:50:47 UTC (rev 14213) @@ -214,10 +214,32 @@ } } + // This should only happen if every value in the array is NaN/Infinity... + // ...if so, set low to zero + if (low == Double.MAX_VALUE) { + low = 0; + + // ..high should not have change either + assert(high == Double.MIN_VALUE); + } + + // ...low should never be greater than high... + assert(low <= high); + + double avg = (double)total/count; + + /* TODO Ensure this is true, have seen some odd cases where the data makes these assertion false + // ...low should never be greater than avg... + assert(low <= avg); + + // ...avg should never be greater than high... + assert(avg <= high); + */ + final double[] data = new double[MeasurementConstants.IND_LAST_TIME + 1]; data[MeasurementConstants.IND_MIN] = low; - data[MeasurementConstants.IND_AVG] = (double)total/count; + data[MeasurementConstants.IND_AVG] = avg; data[MeasurementConstants.IND_MAX] = high; data[MeasurementConstants.IND_CFG_COUNT] = count; |
|
From: <bo...@hy...> - 2010-01-21 23:18:19
|
Author: bob Date: 2010-01-21 15:18:09 -0800 (Thu, 21 Jan 2010) New Revision: 14212 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14212 Modified: branches/HQ_4_2/etc/version.properties Log: Release 4.2.1 build #1282 Modified: branches/HQ_4_2/etc/version.properties =================================================================== --- branches/HQ_4_2/etc/version.properties 2010-01-21 21:20:37 UTC (rev 14211) +++ branches/HQ_4_2/etc/version.properties 2010-01-21 23:18:09 UTC (rev 14212) @@ -1,3 +1,3 @@ -#Thu Dec 03 01:33:42 PST 2009 +#Thu Jan 21 14:47:22 PST 2010 version=4.2.1 -build=1281 +build=1282 |
|
From: <bo...@hy...> - 2010-01-21 21:20:47
|
Author: bob Date: 2010-01-21 13:20:37 -0800 (Thu, 21 Jan 2010) New Revision: 14211 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14211 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties Log: Release 4.2.0.4 build #1276 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties =================================================================== --- branches/HQ_4_2_0_PATCH/etc/version.properties 2010-01-21 20:16:41 UTC (rev 14210) +++ branches/HQ_4_2_0_PATCH/etc/version.properties 2010-01-21 21:20:37 UTC (rev 14211) @@ -1,3 +1,3 @@ -#Mon Jan 18 21:08:52 PST 2010 +#Thu Jan 21 12:45:41 PST 2010 version=4.2.0.4 -build=1275 +build=1276 |
|
From: Átila V. F. M. de O. <av...@ho...> - 2010-01-21 17:28:23
|
I understood. Thanks! |
|
From: Átila V. F. M. de O. <av...@ho...> - 2010-01-21 16:45:36
|
All right. But, what would be "sigar"? |
|
From: Doug M. <do...@hy...> - 2010-01-21 16:30:01
|
In Java for example, that'd be:
sigar.getNetInterfaceStat("eth0").getSpeed()
|
|
From: Doug M. <do...@hy...> - 2010-01-21 16:28:25
|
Hi Zsolt, Can you post the output of the following commands: java -jar sigar.jar test Cpu sysctl kern.cp_times java -jar sigar.jar test Swap swapinfo |
|
From: Doug M. <do...@hy...> - 2010-01-21 16:28:23
|
Hi Zsolt, Can you post the output of the following commands: java -jar sigar.jar test Cpu sysctl kern.cp_times java -jar sigar.jar test Swap swapinfo |
|
From: <bo...@hy...> - 2010-01-21 09:36:57
|
Author: bob Date: 2010-01-21 01:36:48 -0800 (Thu, 21 Jan 2010) New Revision: 14208 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14208 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1326 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-01-21 08:53:04 UTC (rev 14207) +++ trunk/etc/version.properties 2010-01-21 09:36:48 UTC (rev 14208) @@ -1,3 +1,3 @@ -#Wed Jan 20 00:30:05 PST 2010 +#Thu Jan 21 00:25:16 PST 2010 version=4.3.0 -build=1325 +build=1326 |
|
From: <pn...@hy...> - 2010-01-21 08:53:15
|
Author: pnguyen Date: 2010-01-21 00:53:04 -0800 (Thu, 21 Jan 2010) New Revision: 14207 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14207 Modified: trunk/plugins/netservices/etc/hq-plugin.xml trunk/src/org/hyperic/snmp/SNMPClient.java trunk/src/org/hyperic/snmp/SNMPSession_v3.java Log: [HHQ-3665] Add support for noAuthNoPriv, authNoPriv, and authPriv authentication/privacy schemes Modified: trunk/plugins/netservices/etc/hq-plugin.xml =================================================================== --- trunk/plugins/netservices/etc/hq-plugin.xml 2010-01-21 05:27:58 UTC (rev 14206) +++ trunk/plugins/netservices/etc/hq-plugin.xml 2010-01-21 08:53:04 UTC (rev 14207) @@ -254,29 +254,30 @@ optional="true"/> <option name="snmpUser" - description="SNMP username (v3 only)" + description="SNMP Security Name (v3 only)" default="username" optional="true"/> - <option name="snmpPassword" - description="SNMP password (v3 only)" - type="secret" - default="password" - optional="true"/> + <option name="snmpSecurityContext" + description="SNMP Security Context Name (v3 only)" + optional="true"/> <option name="snmpAuthType" - description="SNMP auth type (v3 only)" + description="SNMP Authentication Protocol (v3 only)" type="enum" optional="true"> <include name="none" /> <include name="MD5"/> <include name="SHA"/> </option> - <option name="snmpAuthPassPhrase" - description="SNMP auth passphrase (v3 only)" - optional="true"/> + + <option name="snmpPassword" + description="SNMP Authentication Passphrase (v3 only)" + type="secret" + optional="true"/> + <option name="snmpPrivacyType" - description="SNMP privacy type (v3 only)" + description="SNMP Privacy Protocol (v3 only)" type="enum" optional="true"> <include name="none" /> @@ -286,12 +287,11 @@ <include name="AES-192" /> <include name="AES-256" /> </option> + <option name="snmpPrivacyPassPhrase" - description="SNMP privacy passphrase (v3 only)" - optional="true"/> - <option name="snmpSecurityContext" - description="SNMP security context (v3 only)" - optional="true"/> + description="SNMP Privacy Passphrase (v3 only)" + type="secret" + optional="true"/> </config> <!-- disabled by default, change to true for testing --> Modified: trunk/src/org/hyperic/snmp/SNMPClient.java =================================================================== --- trunk/src/org/hyperic/snmp/SNMPClient.java 2010-01-21 05:27:58 UTC (rev 14206) +++ trunk/src/org/hyperic/snmp/SNMPClient.java 2010-01-21 08:53:04 UTC (rev 14207) @@ -60,6 +60,9 @@ public static final String PROP_USER = "snmpUser"; public static final String PROP_PASSWORD = "snmpPassword"; public static final String PROP_AUTHTYPE = "snmpAuthType"; + public static final String PROP_PRIV_TYPE = "snmpPrivacyType"; + public static final String PROP_PRIV_PASSPHRASE = "snmpPrivacyPassPhrase"; + public static final String PROP_SECURITY_CONTEXT = "snmpSecurityContext"; private static Log log = LogFactory.getLog(SNMPClient.class); @@ -87,20 +90,6 @@ throw new IllegalArgumentException("unknown version: " + version); } - private static int parseAuthMethod(String authMethod) { - if (authMethod == null) { - throw new IllegalArgumentException("authMethod is null"); - } - - if (authMethod.equalsIgnoreCase("md5")) { - return AUTH_MD5; - } else if (authMethod.equalsIgnoreCase("sha")) { - return AUTH_SHA; - } - - throw new IllegalArgumentException("unknown authMethod: " + authMethod); - } - public SNMPClient() { } @@ -241,13 +230,14 @@ case SNMPClient.VERSION_3: String user = props.getProperty(PROP_USER, DEFAULT_USERNAME); + String pass = props.getProperty(PROP_PASSWORD); + String authtype = props.getProperty(PROP_AUTHTYPE); + String privtype = props.getProperty(PROP_PRIV_TYPE); + String privpass = props.getProperty(PROP_PRIV_PASSPHRASE); - String pass = props.getProperty(PROP_PASSWORD, DEFAULT_PASSWORD); + ((SNMPSession_v3) session).init(address, port, transport, user, + authtype, pass, privtype, privpass); - int authtype = parseAuthMethod(props.getProperty(PROP_AUTHTYPE, VALID_AUTHTYPES[0])); - - ((SNMPSession_v3) session).init(address, port, transport, user, pass, authtype); - break; default: Modified: trunk/src/org/hyperic/snmp/SNMPSession_v3.java =================================================================== --- trunk/src/org/hyperic/snmp/SNMPSession_v3.java 2010-01-21 05:27:58 UTC (rev 14206) +++ trunk/src/org/hyperic/snmp/SNMPSession_v3.java 2010-01-21 08:53:04 UTC (rev 14207) @@ -42,7 +42,7 @@ import org.snmp4j.smi.OID; import org.snmp4j.smi.OctetString; -/* +/** * Implements the SNMPSession interface for SNMPv3 sessions by extending the * SNMPSession_v2c implementation. SNMPv3 is only different from v1 or v2c in * the way that a session is initialized. @@ -70,10 +70,18 @@ return pdu; } - private OctetString getPrivPassphrase(String defVal) throws SNMPException { + private OctetString getAuthPassphrase(String val) { + if (val == null || val.length() == 0) { + return null; + } + + return new OctetString(val); + } + + private OctetString getPrivPassphrase(String defVal) { String val = System.getProperty("snmpPrivacyPassPhrase", defVal); - if (val == null) { + if (val == null || val.length() == 0) { return null; } @@ -83,7 +91,9 @@ private OID getPrivProtocol(String defVal) throws SNMPException { String val = System.getProperty("snmpPrivacyType", defVal); - if (val == null) { + if (val == null + || val.equalsIgnoreCase("none") + || val.length() == 0) { return null; } @@ -104,16 +114,31 @@ } } - void init(String host, String port, String transport, String user, String password, int authmethod) throws SNMPException - { - OID authProtocol = authmethod == SNMPClient.AUTH_SHA ? AuthSHA.ID : AuthMD5.ID; + private OID getAuthProtocol(String authMethod) { + if (authMethod == null + || authMethod.equalsIgnoreCase("none") + || authMethod.length() == 0) { + return null; + } else if (authMethod.equalsIgnoreCase("md5")) { + return AuthMD5.ID; + } else if (authMethod.equalsIgnoreCase("sha")) { + return AuthSHA.ID; + } else { + throw new IllegalArgumentException("unknown authentication protocol: " + authMethod); + } + } + + void init(String host, String port, String transport, String user, + String authType, String authPassword, + String privType, String privPassword) + throws SNMPException + { + OID authProtocol = getAuthProtocol(authType); + OID privProtocol = getPrivProtocol(privType); - OID privProtocol = getPrivProtocol(null); // Template option... - OctetString securityName = new OctetString(user); - OctetString authPassphrase = password == null ? null : new OctetString(password); - OctetString privPassphrase = getPrivPassphrase(null); // Template - // option... + OctetString authPassphrase = getAuthPassphrase(authPassword); + OctetString privPassphrase = getPrivPassphrase(privPassword); UserTarget target = new UserTarget(); |
Author: scottmf Date: 2010-01-20 21:27:58 -0800 (Wed, 20 Jan 2010) New Revision: 14206 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14206 Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hibernate/dialect/Oracle9Dialect.java branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/application/HQApp.java branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/bizapp/server/session/AuthzBossEJBImpl.java branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/ResourceController.java branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/MetricsControlAction.java Log: [HHQ-3676] [HQ-1915] added a callback to start a new session when a user preferences are updated instead of upgrading a session to read-write when a user bounces from page to page. This increases page load times about 2-3x for very large groups / applications. Changed oracle to use a metric union for the indicator page charts instead of EAM_MEASUREMENT_DATA view. Benchmarks show that this performs better in with lots of measurements. Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hibernate/dialect/Oracle9Dialect.java =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/hibernate/dialect/Oracle9Dialect.java 2010-01-21 05:26:40 UTC (rev 14205) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/hibernate/dialect/Oracle9Dialect.java 2010-01-21 05:27:58 UTC (rev 14206) @@ -150,7 +150,7 @@ } public boolean useMetricUnion() { - return true; + return false; } public String getLimitBuf(String sql, int offset, int limit) { Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/application/HQApp.java =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/application/HQApp.java 2010-01-21 05:26:40 UTC (rev 14205) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/application/HQApp.java 2010-01-21 05:27:58 UTC (rev 14206) @@ -54,6 +54,9 @@ import org.hyperic.hibernate.HibernateInterceptorChain; import org.hyperic.hibernate.HypericInterceptor; import org.hyperic.hibernate.Util; +import org.hyperic.hq.authz.server.session.AuthzSubject; +import org.hyperic.hq.authz.server.session.AuthzSubjectManagerEJBImpl; +import org.hyperic.hq.authz.shared.AuthzSubjectManagerLocal; import org.hyperic.hq.common.SystemException; import org.hyperic.hq.common.shared.HQConstants; import org.hyperic.hq.hibernate.SessionManager; @@ -62,6 +65,7 @@ import org.hyperic.tools.ant.dbupgrade.DBUpgrader; import org.hyperic.txsnatch.TxSnatch; import org.hyperic.util.callback.CallbackDispatcher; +import org.hyperic.util.config.ConfigResponse; import org.hyperic.util.jdbc.DBUtil; import org.hyperic.util.thread.ThreadWatchdog; import org.hyperic.util.timer.StopWatch; @@ -80,6 +84,7 @@ private ThreadLocal _txListeners = new ThreadLocal(); private List _startupClasses = new ArrayList(); private CallbackDispatcher _callbacks; + private ThreadLocal _userPrefsCallbacks = new ThreadLocal(); private ShutdownCallback _shutdown; private File _restartStorage; private File _resourceDir; @@ -440,6 +445,45 @@ } } + public void setUserPrefsCallback(Integer sessionId, Integer subjId, ConfigResponse prefs) { + List list = (List) _userPrefsCallbacks.get(); + if (list == null) { + list = new ArrayList(); + _userPrefsCallbacks.set(list); + } + Object[] objs = new Object[3]; + objs[0] = sessionId; + objs[1] = subjId; + objs[2] = prefs; + list.add(objs); + } + + private void runSetUserPrefsCallback() { + List list = (List) _userPrefsCallbacks.get(); + if (list == null) { + return; + } + _userPrefsCallbacks.set(null); + final boolean debug = _log.isDebugEnabled(); + for (Iterator it=list.iterator(); it.hasNext(); ) { + Object[] objs = (Object[]) it.next(); + Integer sessionId = (Integer) objs[0]; + Integer subjId = (Integer) objs[1]; + ConfigResponse prefs = (ConfigResponse) objs[2]; + try { + if (debug) { + _log.debug("setting preferences for sessionid=" + sessionId + + ", subjId=" + subjId); + } + AuthzSubject who = + org.hyperic.hq.auth.shared.SessionManager.getInstance().getSubject(sessionId); + AuthzSubjectManagerEJBImpl.getOne().setUserPrefs(who, subjId, prefs); + } catch (Exception e) { + _log.error(e,e); + } + } + } + private static class Snatcher implements TxSnatch.Snatcher { private final Object SNATCH_LOCK = new Object(); private HQApp _app; @@ -485,7 +529,7 @@ Method meth = v.getMethod(); String methName = meth.getName(); Class c = meth.getDeclaringClass(); - String className = meth.getClass().getName(); + String className = c.getName(); boolean readWrite = false; boolean flush = true; boolean sessCreated = SessionManager.setupSession(methName); @@ -555,12 +599,14 @@ className + "]"); } SessionManager.cleanupSession(flush); + HQApp.getInstance().runSetUserPrefsCallback(); } } } - + private boolean methIsReadOnly(String methName) { return // 'create' is part of EJB session bean creation + methName.equals("setUserPrefsAfterCommit") || methName.equals("create") || methName.equals("disconnectAgent") || // recent alerts & indicators Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/bizapp/server/session/AuthzBossEJBImpl.java =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/bizapp/server/session/AuthzBossEJBImpl.java 2010-01-21 05:26:40 UTC (rev 14205) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/bizapp/server/session/AuthzBossEJBImpl.java 2010-01-21 05:27:58 UTC (rev 14206) @@ -42,6 +42,7 @@ import org.hyperic.hq.appdef.shared.AppdefEntityID; import org.hyperic.hq.appdef.shared.AppdefEntityNotFoundException; import org.hyperic.hq.appdef.shared.UpdateException; +import org.hyperic.hq.application.HQApp; import org.hyperic.hq.auth.shared.SessionException; import org.hyperic.hq.auth.shared.SessionManager; import org.hyperic.hq.auth.shared.SessionNotFoundException; @@ -471,6 +472,18 @@ * Set the UserPreferences * @ejb:interface-method */ + public void setUserPrefsAfterCommit(Integer sessionId, Integer subjectId, + ConfigResponse prefs) + throws ApplicationException, SessionTimeoutException, + SessionNotFoundException + { + HQApp.getInstance().setUserPrefsCallback(sessionId, subjectId, prefs); + } + + /** + * Set the UserPreferences + * @ejb:interface-method + */ public void setUserPrefs(Integer sessionId, Integer subjectId, ConfigResponse prefs) throws ApplicationException, SessionTimeoutException, @@ -478,7 +491,6 @@ { AuthzSubject who = manager.getSubject(sessionId); getAuthzSubjectManager().setUserPrefs(who, subjectId, prefs); - getUserPrefs(sessionId, subjectId); } /** Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/ResourceController.java =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/ResourceController.java 2010-01-21 05:26:40 UTC (rev 14205) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/ResourceController.java 2010-01-21 05:27:58 UTC (rev 14206) @@ -183,7 +183,7 @@ Constants.USERPREF_KEY_RECENT_RESOURCES, userPrefs, entityId, 10)) { AuthzBoss boss = ContextUtils.getAuthzBoss(ctx); - boss.setUserPrefs(user.getSessionId(), + boss.setUserPrefsAfterCommit(user.getSessionId(), user.getSubject().getId(), userPrefs); } } catch (AppdefEntityNotFoundException aenf) { Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/MetricsControlAction.java =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/MetricsControlAction.java 2010-01-21 05:26:40 UTC (rev 14205) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/MetricsControlAction.java 2010-01-21 05:27:58 UTC (rev 14206) @@ -183,7 +183,7 @@ } } } - boss.setUserPrefs(sessionId, user.getId(), user.getPreferences()); + boss.setUserPrefsAfterCommit(sessionId, user.getId(), user.getPreferences()); } |
Author: scottmf Date: 2010-01-20 21:26:40 -0800 (Wed, 20 Jan 2010) New Revision: 14205 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14205 Modified: trunk/src/org/hyperic/hibernate/dialect/Oracle9Dialect.java trunk/src/org/hyperic/hq/application/HQApp.java trunk/src/org/hyperic/hq/bizapp/server/session/AuthzBossEJBImpl.java trunk/src/org/hyperic/hq/ui/action/resource/ResourceController.java trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/MetricsControlAction.java Log: [HHQ-3676] [HQ-1915] added a callback to start a new session when a user preferences are updated instead of upgrading a session to read-write when a user bounces from page to page. This increases page load times about 2-3x for very large groups / applications. Changed oracle to use a metric union for the indicator page charts instead of EAM_MEASUREMENT_DATA view. Benchmarks show that this performs better in with lots of measurements. Modified: trunk/src/org/hyperic/hibernate/dialect/Oracle9Dialect.java =================================================================== --- trunk/src/org/hyperic/hibernate/dialect/Oracle9Dialect.java 2010-01-20 09:24:32 UTC (rev 14204) +++ trunk/src/org/hyperic/hibernate/dialect/Oracle9Dialect.java 2010-01-21 05:26:40 UTC (rev 14205) @@ -150,7 +150,7 @@ } public boolean useMetricUnion() { - return true; + return false; } public String getLimitBuf(String sql, int offset, int limit) { Modified: trunk/src/org/hyperic/hq/application/HQApp.java =================================================================== --- trunk/src/org/hyperic/hq/application/HQApp.java 2010-01-20 09:24:32 UTC (rev 14204) +++ trunk/src/org/hyperic/hq/application/HQApp.java 2010-01-21 05:26:40 UTC (rev 14205) @@ -54,6 +54,9 @@ import org.hyperic.hibernate.HibernateInterceptorChain; import org.hyperic.hibernate.HypericInterceptor; import org.hyperic.hibernate.Util; +import org.hyperic.hq.authz.server.session.AuthzSubject; +import org.hyperic.hq.authz.server.session.AuthzSubjectManagerEJBImpl; +import org.hyperic.hq.authz.shared.AuthzSubjectManagerLocal; import org.hyperic.hq.common.SystemException; import org.hyperic.hq.common.shared.HQConstants; import org.hyperic.hq.hibernate.SessionManager; @@ -62,6 +65,7 @@ import org.hyperic.tools.ant.dbupgrade.DBUpgrader; import org.hyperic.txsnatch.TxSnatch; import org.hyperic.util.callback.CallbackDispatcher; +import org.hyperic.util.config.ConfigResponse; import org.hyperic.util.jdbc.DBUtil; import org.hyperic.util.thread.ThreadWatchdog; import org.hyperic.util.timer.StopWatch; @@ -80,6 +84,7 @@ private ThreadLocal _txListeners = new ThreadLocal(); private List _startupClasses = new ArrayList(); private CallbackDispatcher _callbacks; + private ThreadLocal _userPrefsCallbacks = new ThreadLocal(); private ShutdownCallback _shutdown; private File _restartStorage; private File _resourceDir; @@ -440,6 +445,45 @@ } } + public void setUserPrefsCallback(Integer sessionId, Integer subjId, ConfigResponse prefs) { + List list = (List) _userPrefsCallbacks.get(); + if (list == null) { + list = new ArrayList(); + _userPrefsCallbacks.set(list); + } + Object[] objs = new Object[3]; + objs[0] = sessionId; + objs[1] = subjId; + objs[2] = prefs; + list.add(objs); + } + + private void runSetUserPrefsCallback() { + List list = (List) _userPrefsCallbacks.get(); + if (list == null) { + return; + } + _userPrefsCallbacks.set(null); + final boolean debug = _log.isDebugEnabled(); + for (Iterator it=list.iterator(); it.hasNext(); ) { + Object[] objs = (Object[]) it.next(); + Integer sessionId = (Integer) objs[0]; + Integer subjId = (Integer) objs[1]; + ConfigResponse prefs = (ConfigResponse) objs[2]; + try { + if (debug) { + _log.debug("setting preferences for sessionid=" + sessionId + + ", subjId=" + subjId); + } + AuthzSubject who = + org.hyperic.hq.auth.shared.SessionManager.getInstance().getSubject(sessionId); + AuthzSubjectManagerEJBImpl.getOne().setUserPrefs(who, subjId, prefs); + } catch (Exception e) { + _log.error(e,e); + } + } + } + private static class Snatcher implements TxSnatch.Snatcher { private final Object SNATCH_LOCK = new Object(); private HQApp _app; @@ -485,7 +529,7 @@ Method meth = v.getMethod(); String methName = meth.getName(); Class c = meth.getDeclaringClass(); - String className = meth.getClass().getName(); + String className = c.getName(); boolean readWrite = false; boolean flush = true; boolean sessCreated = SessionManager.setupSession(methName); @@ -555,12 +599,14 @@ className + "]"); } SessionManager.cleanupSession(flush); + HQApp.getInstance().runSetUserPrefsCallback(); } } } - + private boolean methIsReadOnly(String methName) { return // 'create' is part of EJB session bean creation + methName.equals("setUserPrefsAfterCommit") || methName.equals("create") || methName.equals("disconnectAgent") || // recent alerts & indicators Modified: trunk/src/org/hyperic/hq/bizapp/server/session/AuthzBossEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/session/AuthzBossEJBImpl.java 2010-01-20 09:24:32 UTC (rev 14204) +++ trunk/src/org/hyperic/hq/bizapp/server/session/AuthzBossEJBImpl.java 2010-01-21 05:26:40 UTC (rev 14205) @@ -42,6 +42,7 @@ import org.hyperic.hq.appdef.shared.AppdefEntityID; import org.hyperic.hq.appdef.shared.AppdefEntityNotFoundException; import org.hyperic.hq.appdef.shared.UpdateException; +import org.hyperic.hq.application.HQApp; import org.hyperic.hq.auth.shared.SessionException; import org.hyperic.hq.auth.shared.SessionManager; import org.hyperic.hq.auth.shared.SessionNotFoundException; @@ -471,6 +472,18 @@ * Set the UserPreferences * @ejb:interface-method */ + public void setUserPrefsAfterCommit(Integer sessionId, Integer subjectId, + ConfigResponse prefs) + throws ApplicationException, SessionTimeoutException, + SessionNotFoundException + { + HQApp.getInstance().setUserPrefsCallback(sessionId, subjectId, prefs); + } + + /** + * Set the UserPreferences + * @ejb:interface-method + */ public void setUserPrefs(Integer sessionId, Integer subjectId, ConfigResponse prefs) throws ApplicationException, SessionTimeoutException, @@ -478,7 +491,6 @@ { AuthzSubject who = manager.getSubject(sessionId); getAuthzSubjectManager().setUserPrefs(who, subjectId, prefs); - getUserPrefs(sessionId, subjectId); } /** Modified: trunk/src/org/hyperic/hq/ui/action/resource/ResourceController.java =================================================================== --- trunk/src/org/hyperic/hq/ui/action/resource/ResourceController.java 2010-01-20 09:24:32 UTC (rev 14204) +++ trunk/src/org/hyperic/hq/ui/action/resource/ResourceController.java 2010-01-21 05:26:40 UTC (rev 14205) @@ -183,7 +183,7 @@ Constants.USERPREF_KEY_RECENT_RESOURCES, userPrefs, entityId, 10)) { AuthzBoss boss = ContextUtils.getAuthzBoss(ctx); - boss.setUserPrefs(user.getSessionId(), + boss.setUserPrefsAfterCommit(user.getSessionId(), user.getSubject().getId(), userPrefs); } } catch (AppdefEntityNotFoundException aenf) { Modified: trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/MetricsControlAction.java =================================================================== --- trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/MetricsControlAction.java 2010-01-20 09:24:32 UTC (rev 14204) +++ trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/MetricsControlAction.java 2010-01-21 05:26:40 UTC (rev 14205) @@ -183,7 +183,7 @@ } } } - boss.setUserPrefs(sessionId, user.getId(), user.getPreferences()); + boss.setUserPrefsAfterCommit(sessionId, user.getId(), user.getPreferences()); } |
|
From: Átila V. F. M. de O. <av...@ho...> - 2010-01-20 18:38:07
|
How can I get the Link Speed? |
|
From: <bo...@hy...> - 2010-01-20 09:24:41
|
Author: bob Date: 2010-01-20 01:24:32 -0800 (Wed, 20 Jan 2010) New Revision: 14204 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14204 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1325 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-01-20 02:26:07 UTC (rev 14203) +++ trunk/etc/version.properties 2010-01-20 09:24:32 UTC (rev 14204) @@ -1,3 +1,3 @@ -#Tue Jan 19 00:30:41 PST 2010 +#Wed Jan 20 00:30:05 PST 2010 version=4.3.0 -build=1324 +build=1325 |
14 messages has been excluded from this view by a project administrator.
