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: <bo...@hy...> - 2010-03-06 09:21:49
|
Author: bob Date: 2010-03-06 01:21:40 -0800 (Sat, 06 Mar 2010) New Revision: 14351 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14351 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1369 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-03-05 23:33:23 UTC (rev 14350) +++ trunk/etc/version.properties 2010-03-06 09:21:40 UTC (rev 14351) @@ -1,3 +1,3 @@ -#Fri Mar 05 00:26:04 PST 2010 +#Sat Mar 06 00:27:08 PST 2010 version=4.3.0 -build=1368 +build=1369 |
|
From: <pn...@hy...> - 2010-03-05 23:33:31
|
Author: pnguyen Date: 2010-03-05 15:33:23 -0800 (Fri, 05 Mar 2010) New Revision: 14350 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14350 Modified: trunk/src/org/hyperic/snmp/SNMPClient.java trunk/src/org/hyperic/snmp/SNMPSession_v1.java trunk/src/org/hyperic/snmp/SNMPSession_v2c.java trunk/src/org/hyperic/snmp/SNMPSession_v3.java Log: [HHQ-3674] (a) For SNMPv3 responses, process the Report PDU if applicable. (b) Cache and store a SNMP session using a key that includes the ip address, port, SNMP version, community, transport, user name, password, authentication protocol, privacy password, and privacy protocol. (c) Store the SNMP user with the appropriate remote engine ID. (d) Update the SNMP user if user credentials change. Modified: trunk/src/org/hyperic/snmp/SNMPClient.java =================================================================== --- trunk/src/org/hyperic/snmp/SNMPClient.java 2010-03-05 09:17:50 UTC (rev 14349) +++ trunk/src/org/hyperic/snmp/SNMPClient.java 2010-03-05 23:33:23 UTC (rev 14350) @@ -1,18 +1,25 @@ /* - * 'SNMPClient.java' NOTE: This copyright does *not* cover user programs that - * use HQ program services by normal system calls through the application - * program interfaces provided as part of the Hyperic Plug-in Development Kit or - * the Hyperic Client Development Kit - this is merely considered normal use of - * the program, and does *not* fall under the heading of "derived work". - * Copyright (C) [2004, 2005, 2006, 2007, 2008, 2009], Hyperic, Inc. This file - * is part of HQ. HQ is free software; you can redistribute it and/or modify it - * under the terms version 2 of the GNU General Public License as published by - * the Free Software Foundation. This program is distributed in the hope that it - * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. You should have received a copy of the GNU - * General Public License along with this program; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * NOTE: This copyright does *not* cover user programs that use HQ + * program services by normal system calls through the application + * program interfaces provided as part of the Hyperic Plug-in Development + * Kit or the Hyperic Client Development Kit - this is merely considered + * normal use of the program, and does *not* fall under the heading of + * "derived work". + * + * Copyright (C) [2004-2010], Hyperic, Inc. + * This file is part of HQ. + * + * HQ is free software; you can redistribute it and/or modify + * it under the terms version 2 of the GNU General Public License as + * published by the Free Software Foundation. This program is distributed + * in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA. */ @@ -43,15 +50,15 @@ public static final String DEFAULT_TRANSPORT = "udp"; public static final String DEFAULT_USERNAME = "username"; - public static final String DEFAULT_PASSWORD = "password"; + public static final String DEFAULT_PASSWORD = ""; + public static final String DEFAULT_AUTHTYPE = "none"; + public static final String DEFAULT_PRIV_TYPE = "none"; public static final String DEFAULT_PORT_STRING = String.valueOf(DEFAULT_PORT); public static final String DEFAULT_COMMUNITY = System.getProperty("snmp.defaultCommunity", "public"); public static final String[] VALID_VERSIONS = { "v1", "v2c", "v3" }; - public static final String[] VALID_AUTHTYPES = { "md5", "sha" }; - public static final String PROP_IP = "snmpIp"; public static final String PROP_PORT = "snmpPort"; public static final String PROP_TRANSPORT = "snmpTransport"; @@ -199,11 +206,19 @@ String version = props.getProperty(PROP_VERSION, VALID_VERSIONS[1]); String community = props.getProperty(PROP_COMMUNITY, DEFAULT_COMMUNITY); String transport = props.getProperty(PROP_TRANSPORT, DEFAULT_TRANSPORT); + String user = props.getProperty(PROP_USER, DEFAULT_USERNAME); + String authtype = props.getProperty(PROP_AUTHTYPE, DEFAULT_AUTHTYPE); + String authpass = props.getProperty(PROP_PASSWORD, DEFAULT_PASSWORD); + String privtype = props.getProperty(PROP_PRIV_TYPE, DEFAULT_PRIV_TYPE); + String privpass = props.getProperty(PROP_PRIV_PASSPHRASE, DEFAULT_PASSWORD); SNMPSession session = null; - int id = address.hashCode() ^ port.hashCode() ^ version.hashCode() ^ community.hashCode() ^ - transport.hashCode(); + int id = address.hashCode() ^ port.hashCode() ^ + version.hashCode() ^ community.hashCode() ^ + transport.hashCode() ^ user.hashCode() ^ + authtype.hashCode() ^ authpass.hashCode() ^ + privtype.hashCode() ^ privpass.hashCode(); synchronized (sessionCache) { session = (SNMPSession) sessionCache.get(id); @@ -229,14 +244,8 @@ 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); - ((SNMPSession_v3) session).init(address, port, transport, user, - authtype, pass, privtype, privpass); + authtype, authpass, privtype, privpass); break; Modified: trunk/src/org/hyperic/snmp/SNMPSession_v1.java =================================================================== --- trunk/src/org/hyperic/snmp/SNMPSession_v1.java 2010-03-05 09:17:50 UTC (rev 14349) +++ trunk/src/org/hyperic/snmp/SNMPSession_v1.java 2010-03-05 23:33:23 UTC (rev 14350) @@ -1,18 +1,25 @@ /* - * 'SNMPSession_v1.java' NOTE: This copyright does *not* cover user programs - * that use HQ program services by normal system calls through the application - * program interfaces provided as part of the Hyperic Plug-in Development Kit or - * the Hyperic Client Development Kit - this is merely considered normal use of - * the program, and does *not* fall under the heading of "derived work". - * Copyright (C) [2004, 2005, 2006, 2007, 2008, 2009], Hyperic, Inc. This file - * is part of HQ. HQ is free software; you can redistribute it and/or modify it - * under the terms version 2 of the GNU General Public License as published by - * the Free Software Foundation. This program is distributed in the hope that it - * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. You should have received a copy of the GNU - * General Public License along with this program; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * NOTE: This copyright does *not* cover user programs that use HQ + * program services by normal system calls through the application + * program interfaces provided as part of the Hyperic Plug-in Development + * Kit or the Hyperic Client Development Kit - this is merely considered + * normal use of the program, and does *not* fall under the heading of + * "derived work". + * + * Copyright (C) [2004-2010], Hyperic, Inc. + * This file is part of HQ. + * + * HQ is free software; you can redistribute it and/or modify + * it under the terms version 2 of the GNU General Public License as + * published by the Free Software Foundation. This program is distributed + * in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA. */ @@ -214,9 +221,7 @@ response = event.getResponse(); - if (response == null) { - throw new SNMPException("No response for " + name); - } + validateResponsePDU(name, response); VariableBinding var = response.get(0); @@ -227,7 +232,15 @@ return new SNMPValue(var); } + + protected void validateResponsePDU(String name, PDU response) + throws SNMPException { + if (response == null) { + throw new SNMPException("No response PDU for " + name); + } + } + public SNMPValue getSingleValue(String name) throws SNMPException { return getValue(name, PDU.GET); } Modified: trunk/src/org/hyperic/snmp/SNMPSession_v2c.java =================================================================== --- trunk/src/org/hyperic/snmp/SNMPSession_v2c.java 2010-03-05 09:17:50 UTC (rev 14349) +++ trunk/src/org/hyperic/snmp/SNMPSession_v2c.java 2010-03-05 23:33:23 UTC (rev 14350) @@ -1,18 +1,25 @@ /* - * 'SNMPSession_v2c.java' NOTE: This copyright does *not* cover user programs - * that use HQ program services by normal system calls through the application - * program interfaces provided as part of the Hyperic Plug-in Development Kit or - * the Hyperic Client Development Kit - this is merely considered normal use of - * the program, and does *not* fall under the heading of "derived work". - * Copyright (C) [2004, 2005, 2006, 2007, 2008, 2009], Hyperic, Inc. This file - * is part of HQ. HQ is free software; you can redistribute it and/or modify it - * under the terms version 2 of the GNU General Public License as published by - * the Free Software Foundation. This program is distributed in the hope that it - * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. You should have received a copy of the GNU - * General Public License along with this program; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * NOTE: This copyright does *not* cover user programs that use HQ + * program services by normal system calls through the application + * program interfaces provided as part of the Hyperic Plug-in Development + * Kit or the Hyperic Client Development Kit - this is merely considered + * normal use of the program, and does *not* fall under the heading of + * "derived work". + * + * Copyright (C) [2004-2010], Hyperic, Inc. + * This file is part of HQ. + * + * HQ is free software; you can redistribute it and/or modify + * it under the terms version 2 of the GNU General Public License as + * published by the Free Software Foundation. This program is distributed + * in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA. */ @@ -21,6 +28,7 @@ import java.util.List; import java.util.Map; +import org.snmp4j.PDU; import org.snmp4j.mp.SnmpConstants; class SNMPSession_v2c @@ -39,4 +47,11 @@ // Optimize using snmp4j v2 specific stuff... return super.getTable(name, index); } + + protected void validateResponsePDU(String name, PDU response) + throws SNMPException { + + // No specific SNMPv2c logic currently + super.validateResponsePDU(name, response); + } } Modified: trunk/src/org/hyperic/snmp/SNMPSession_v3.java =================================================================== --- trunk/src/org/hyperic/snmp/SNMPSession_v3.java 2010-03-05 09:17:50 UTC (rev 14349) +++ trunk/src/org/hyperic/snmp/SNMPSession_v3.java 2010-03-05 23:33:23 UTC (rev 14350) @@ -1,18 +1,25 @@ /* - * 'SNMPSession_v3.java' NOTE: This copyright does *not* cover user programs - * that use HQ program services by normal system calls through the application - * program interfaces provided as part of the Hyperic Plug-in Development Kit or - * the Hyperic Client Development Kit - this is merely considered normal use of - * the program, and does *not* fall under the heading of "derived work". - * Copyright (C) [2004, 2005, 2006, 2007, 2008, 2009], Hyperic, Inc. This file - * is part of HQ. HQ is free software; you can redistribute it and/or modify it - * under the terms version 2 of the GNU General Public License as published by - * the Free Software Foundation. This program is distributed in the hope that it - * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. You should have received a copy of the GNU - * General Public License along with this program; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * NOTE: This copyright does *not* cover user programs that use HQ + * program services by normal system calls through the application + * program interfaces provided as part of the Hyperic Plug-in Development + * Kit or the Hyperic Client Development Kit - this is merely considered + * normal use of the program, and does *not* fall under the heading of + * "derived work". + * + * Copyright (C) [2004-2010], Hyperic, Inc. + * This file is part of HQ. + * + * HQ is free software; you can redistribute it and/or modify + * it under the terms version 2 of the GNU General Public License as + * published by the Free Software Foundation. This program is distributed + * in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA. */ @@ -41,6 +48,7 @@ import org.snmp4j.security.UsmUser; import org.snmp4j.smi.OID; import org.snmp4j.smi.OctetString; +import org.snmp4j.smi.VariableBinding; /** * Implements the SNMPSession interface for SNMPv3 sessions by extending the @@ -69,18 +77,8 @@ return pdu; } - - 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); - + private OctetString createOctetString(String val) { if (val == null || val.length() == 0) { return null; } @@ -134,9 +132,9 @@ OID authProtocol = getAuthProtocol(authType); OID privProtocol = getPrivProtocol(privType); - OctetString securityName = new OctetString(user); - OctetString authPassphrase = getAuthPassphrase(authPassword); - OctetString privPassphrase = getPrivPassphrase(privPassword); + OctetString securityName = createOctetString(user); + OctetString authPassphrase = createOctetString(authPassword); + OctetString privPassphrase = createOctetString(privPassword); UserTarget target = new UserTarget(); @@ -155,13 +153,73 @@ this.target = target; initSession(host, port, transport); + + UsmUser usmUser = new UsmUser(securityName, + authProtocol, authPassphrase, + privProtocol, privPassphrase); + // Need to add user by engineID. + byte[] engineID = this.session.discoverAuthoritativeEngineID( + this.target.getAddress(), + this.target.getTimeout()); + USM usm = this.session.getUSM(); - if (usm.getUserTable().getUser(securityName) != null) { - return; + // Need to call addUser each time, even if user name exists, + // in case the user credentials change. + usm.addUser(securityName, + (engineID == null) ? null : new OctetString(engineID), + usmUser); + } + + /** + * Remote SNMPv3 engines will send back a Report PDU + * if there is a problem with the request. + */ + protected void validateResponsePDU(String name, PDU response) + throws SNMPException { + + super.validateResponsePDU(name, response); + + if (response.getType() == PDU.REPORT) { + processReport(response); } + } + + private void processReport(PDU report) + throws SNMPException { + + if (report.size() < 1) { + throw new SNMPException("REPORT PDU does not contain a variable binding."); + } - usm.addUser(securityName, new UsmUser(securityName, authProtocol, authPassphrase, privProtocol, privPassphrase)); + VariableBinding vb = report.get(0); + OID oid = vb.getOid(); + + if (SnmpConstants.usmStatsUnsupportedSecLevels.equals(oid)) { + throw new SNMPException("Unsupported Security Level."); + } else if (SnmpConstants.usmStatsNotInTimeWindows.equals(oid)) { + throw new SNMPException("Message not within time window."); + } else if (SnmpConstants.usmStatsUnknownUserNames.equals(oid)) { + throw new SNMPException("Unknown user name."); + } else if (SnmpConstants.usmStatsUnknownEngineIDs.equals(oid)) { + throw new SNMPException("Unknown engine id."); + } else if (SnmpConstants.usmStatsWrongDigests.equals(oid)) { + throw new SNMPException("Invalid authentication digest."); + } else if (SnmpConstants.usmStatsDecryptionErrors.equals(oid)) { + throw new SNMPException("Decryption error."); + } else if (SnmpConstants.snmpUnknownSecurityModels.equals(oid)) { + throw new SNMPException("Unknown security model."); + } else if (SnmpConstants.snmpInvalidMsgs.equals(oid)) { + throw new SNMPException("Invalid message."); + } else if (SnmpConstants.snmpUnknownPDUHandlers.equals(oid)) { + throw new SNMPException("Unknown PDU handler."); + } else if (SnmpConstants.snmpUnavailableContexts.equals(oid)) { + throw new SNMPException("Unavailable context."); + } else if (SnmpConstants.snmpUnknownContexts.equals(oid)) { + throw new SNMPException("Unknown context."); + } else { + throw new SNMPException("REPORT PDU contains unknown OID (" + oid + ")."); + } } } |
|
From: <bo...@hy...> - 2010-03-05 09:18:00
|
Author: bob Date: 2010-03-05 01:17:50 -0800 (Fri, 05 Mar 2010) New Revision: 14349 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14349 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1368 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-03-05 00:47:47 UTC (rev 14348) +++ trunk/etc/version.properties 2010-03-05 09:17:50 UTC (rev 14349) @@ -1,3 +1,3 @@ -#Thu Mar 04 00:29:39 PST 2010 +#Fri Mar 05 00:26:04 PST 2010 version=4.3.0 -build=1367 +build=1368 |
|
From: Chakresh <sig...@hy...> - 2010-03-05 01:16:47
|
Hi Doug I did try that before and it did not help. Did you got a chance to look at the gdb output i sent you earlier? thanks Chakresh |
|
From: <rm...@hy...> - 2010-03-05 00:47:55
|
Author: rmorgan Date: 2010-03-04 16:47:47 -0800 (Thu, 04 Mar 2010) New Revision: 14348 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14348 Modified: trunk/ui_plugins/ Log: [HHQ-3753] Upgrade to HQApi 3.1 Property changes on: trunk/ui_plugins ___________________________________________________________________ Name: svn:externals - hqapi1 http://svn.hyperic.org/projects/hqapi/dist/HQAPI_3_0 + hqapi1 http://svn.hyperic.org/projects/hqapi/dist/HQAPI_3_1 |
|
From: <no...@gi...> - 2010-03-05 00:33:17
|
Branch: refs/heads/master Home: http://github.com/hyperic/hqapi Commit: afe6bf59542ff76f90a14e42a60cb9a3f39cddda http://github.com/hyperic/hqapi/commit/afe6bf59542ff76f90a14e42a60cb9a3f39cddda Author: Ryan Morgan <rm...@hy...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog for HHQ-3773 Commit: 3f5fa988cfe20c8657edcff97a5f11e6b939ec0f http://github.com/hyperic/hqapi/commit/3f5fa988cfe20c8657edcff97a5f11e6b939ec0f Author: Ryan Morgan <rm...@hy...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M build.xml Log Message: ----------- Change test suite to fail on error. Commit: ffef7b3f932753181d0515110d023b30d6be64cd http://github.com/hyperic/hqapi/commit/ffef7b3f932753181d0515110d023b30d6be64cd Author: Ryan Morgan <rm...@hy...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M .classpath M ChangeLog R lib/org.springframework.aop-3.0.0.M4.jar A lib/org.springframework.aop-3.0.1.RELEASE.jar R lib/org.springframework.asm-3.0.0.M4.jar A lib/org.springframework.asm-3.0.1.RELEASE.jar R lib/org.springframework.beans-3.0.0.M4.jar A lib/org.springframework.beans-3.0.1.RELEASE.jar R lib/org.springframework.context-3.0.0.M4.jar A lib/org.springframework.context-3.0.1.RELEASE.jar R lib/org.springframework.context.support-3.0.0.M4.jar A lib/org.springframework.context.support-3.0.1.RELEASE.jar R lib/org.springframework.core-3.0.0.M4.jar A lib/org.springframework.core-3.0.1.RELEASE.jar R lib/org.springframework.expression-3.0.0.M4.jar A lib/org.springframework.expression-3.0.1.RELEASE.jar Log Message: ----------- Update to Spring 3.0.1. |
|
From: Doug M. <do...@hy...> - 2010-03-04 22:28:34
|
Hi Chakresh,
Apologies for the delayed response. Not sure if adding -fPIC to the linker flags will help, but you can just add '<linkerarg value="-fPIC"/>' to the linux linker section in jni-build.xml:
--- a/bindings/java/hyperic_jni/jni-build.xml
+++ b/bindings/java/hyperic_jni/jni-build.xml
@@ -345,16 +345,17 @@ USA.
<linker name="gcc" if="linux">
<libset if="jni.libset.libs"
dir="${jni.libset.dir}"
libs="${jni.libset.libs}"/>
<libset if="jni.dmalloc"
dir="${jni.dmalloc}/lib"
libs="dmallocth"/>
<linkerarg value="${jni.gccm}" if="jni.gccm"/>
+ <linkerarg value="-fPIC"/>
</linker>
|
|
From: <dcr...@hy...> - 2010-03-04 21:07:57
|
Author: dcrutchf Date: 2010-03-04 13:07:48 -0800 (Thu, 04 Mar 2010) New Revision: 14347 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14347 Modified: trunk/installer/data/db-upgrade.xml Log: HHQ-3770 / Oracle Upgrade fails from 4.2.0 to 4.3.0 Modified: trunk/installer/data/db-upgrade.xml =================================================================== --- trunk/installer/data/db-upgrade.xml 2010-03-04 09:28:58 UTC (rev 14346) +++ trunk/installer/data/db-upgrade.xml 2010-03-04 21:07:48 UTC (rev 14347) @@ -10888,10 +10888,10 @@ <schemaSpec version="3.195"> <schema-directSQL> <statement desc="Adding create group permission..."> - INSERT INTO EAM_OPERATION(ID,VERSION_COL,NAME,RESOURCE_TYPE_ID) VALUES (29,0,'createResourceGroup',3); + INSERT INTO EAM_OPERATION(ID,VERSION_COL,NAME,RESOURCE_TYPE_ID) VALUES (29,0,'createResourceGroup',3) </statement> <statement desc="Adding view escalation permission..."> - INSERT INTO EAM_OPERATION(ID,VERSION_COL,NAME,RESOURCE_TYPE_ID) VALUES (415,0,'viewEscalation',0); + INSERT INTO EAM_OPERATION(ID,VERSION_COL,NAME,RESOURCE_TYPE_ID) VALUES (415,0,'viewEscalation',0) </statement> <statement desc="Adding create group permission to any role that has delete group permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -10899,7 +10899,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 31 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 29) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 29) = 0 </statement> <statement desc="Adding delete group permission to any role that has create group permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -10907,7 +10907,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 29 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 31) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 31) = 0 </statement> <statement desc="Adding update group permission to any role that has create or delete group permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -10915,7 +10915,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 29 or m.operation_id = 31) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 24) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 24) = 0 </statement> <statement desc="Adding read group permission to any role that has create, update or delete group permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -10923,7 +10923,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 29 or m.operation_id = 31 or m.operation_id = 24) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 28) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 28) = 0 </statement> <statement desc="Adding create platform permission to any role that has delete platform permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -10931,7 +10931,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 302 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 320) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 320) = 0 </statement> <statement desc="Adding delete platform permission to any role that has create platform permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -10939,7 +10939,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 320 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 302) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 302) = 0 </statement> <statement desc="Adding update platform permission to any role that has create or delete platform permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -10947,7 +10947,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 320 or m.operation_id = 302) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 301) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 301) = 0 </statement> <statement desc="Adding read platform permission to any role that has create, update or delete platform permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -10955,7 +10955,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 320 or m.operation_id = 302 or m.operation_id = 301) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 305) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 305) = 0 </statement> <statement desc="Adding create server permission to any role that has delete server permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -10963,7 +10963,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 304 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 306) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 306) = 0 </statement> <statement desc="Adding delete server permission to any role that has create server permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -10971,7 +10971,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 306 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 304) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 304) = 0 </statement> <statement desc="Adding update server permission to any role that has create or delete server permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -10979,7 +10979,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 304 or m.operation_id = 306) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 307) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 307) = 0 </statement> <statement desc="Adding read server permission to any role that has create, update or delete server permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -10987,7 +10987,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 304 or m.operation_id = 306 or m.operation_id = 307) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 311) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 311) = 0 </statement> <statement desc="Adding create service permission to any role that has delete service permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -10995,7 +10995,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 314 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 312) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 312) = 0 </statement> <statement desc="Adding delete service permission to any role that has create service permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11003,7 +11003,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 312 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 314) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 314) = 0 </statement> <statement desc="Adding update service permission to any role that has create or delete service permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11011,7 +11011,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 312 or m.operation_id = 314) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 313) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 313) = 0 </statement> <statement desc="Adding read service permission to any role that has create, update or delete service permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11019,7 +11019,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 312 or m.operation_id = 314 or m.operation_id = 313) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 315) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 315) = 0 </statement> <statement desc="Adding create application permission to any role that has delete application permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11027,7 +11027,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 318 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 316) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 316) = 0 </statement> <statement desc="Adding delete application permission to any role that has create application permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11035,7 +11035,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 316 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 318) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 318) = 0 </statement> <statement desc="Adding update application permission to any role that has create or delete application permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11043,7 +11043,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 316 or m.operation_id = 318) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 317) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 317) = 0 </statement> <statement desc="Adding read application permission to any role that has create, update or delete application permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11051,7 +11051,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 316 or m.operation_id = 318 or m.operation_id = 317) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 319) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 319) = 0 </statement> <statement desc="Adding create user permission to any role that has delete user permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11059,7 +11059,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 7 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 10) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 10) = 0 </statement> <statement desc="Adding delete user permission to any role that has create user permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11067,7 +11067,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 10 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 7) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 7) = 0 </statement> <statement desc="Adding update user permission to any role that has create or delete user permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11075,7 +11075,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 7 or m.operation_id = 10) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 6) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 6) = 0 </statement> <statement desc="Adding read user permission to any role that has create, update or delete user permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11083,7 +11083,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 7 or m.operation_id = 10 or m.operation_id = 6) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 8) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 8) = 0 </statement> <statement desc="Adding create role permission to any role that has delete role permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11091,7 +11091,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 30 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 12) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 12) = 0 </statement> <statement desc="Adding delete role permission to any role that has create role permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11099,7 +11099,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 12 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 30) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 30) = 0 </statement> <statement desc="Adding update role permission to any role that has create or delete role permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11107,7 +11107,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 12 or m.operation_id = 30) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 11) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 11) = 0 </statement> <statement desc="Adding read role permission to any role that has create, update or delete role permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11115,7 +11115,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 12 or m.operation_id = 30 or m.operation_id = 11) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 16) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 16) = 0 </statement> <statement desc="Adding create escalation permission to any role that has delete escalation permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11123,7 +11123,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 414 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 412) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 412) = 0 </statement> <statement desc="Adding delete escalation permission to any role that has create escalation permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11131,7 +11131,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE m.operation_id = 412 AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 414) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 414) = 0 </statement> <statement desc="Adding update escalation permission to any role that has create or delete escalation permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11139,7 +11139,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 412 or m.operation_id = 414) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 413) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 413) = 0 </statement> <statement desc="Adding read escalation permission to any role that has create, update or delete escalation permission..."> INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) @@ -11147,7 +11147,7 @@ INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id WHERE (m.operation_id = 412 or m.operation_id = 414 or m.operation_id = 413) AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm - WHERE rm.role_id = r.id AND rm.operation_id = 415) = 0; + WHERE rm.role_id = r.id AND rm.operation_id = 415) = 0 </statement> </schema-directSQL> </schemaSpec> |
|
From: <no...@gi...> - 2010-03-04 20:43:41
|
Branch: refs/heads/master Home: http://github.com/hyperic/hqapi Commit: 24d8bcf3133ee906b34609a010028f27d9ba5d80 http://github.com/hyperic/hqapi/commit/24d8bcf3133ee906b34609a010028f27d9ba5d80 Author: jencompgeek <jen...@sp...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M build.xml Log Message: ----------- Changed test halt on failure to no Commit: f55022381c75ceccfbf913d3d5093f246c84014d http://github.com/hyperic/hqapi/commit/f55022381c75ceccfbf913d3d5093f246c84014d Author: Jennifer Hickey <jen...@sp...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: A .classpath A .project A .settings/org.springframework.ide.eclipse.beans.core.prefs A .settings/org.springframework.ide.eclipse.core.prefs A .springBeans A lib/org.springframework.aop-3.0.0.M4.jar A lib/org.springframework.asm-3.0.0.M4.jar A lib/org.springframework.beans-3.0.0.M4.jar A lib/org.springframework.context-3.0.0.M4.jar A lib/org.springframework.context.support-3.0.0.M4.jar A lib/org.springframework.core-3.0.0.M4.jar A lib/org.springframework.expression-3.0.0.M4.jar A resources/META-INF/spring/hqapi-context.xml A src/org/hyperic/hq/hqapi1/Connection.java A src/org/hyperic/hq/hqapi1/FileResponseHandler.java M src/org/hyperic/hq/hqapi1/HQApi.java M src/org/hyperic/hq/hqapi1/HQConnection.java A src/org/hyperic/hq/hqapi1/ResponseHandler.java A src/org/hyperic/hq/hqapi1/XmlResponseHandler.java A src/org/hyperic/hq/hqapi1/tools/AbstractCommand.java M src/org/hyperic/hq/hqapi1/tools/AgentCommand.java M src/org/hyperic/hq/hqapi1/tools/AlertCommand.java M src/org/hyperic/hq/hqapi1/tools/AlertDefinitionCommand.java M src/org/hyperic/hq/hqapi1/tools/ApplicationCommand.java M src/org/hyperic/hq/hqapi1/tools/AutoDiscoveryCommand.java M src/org/hyperic/hq/hqapi1/tools/Command.java A src/org/hyperic/hq/hqapi1/tools/CommandsFactory.java M src/org/hyperic/hq/hqapi1/tools/ControlCommand.java M src/org/hyperic/hq/hqapi1/tools/EscalationCommand.java M src/org/hyperic/hq/hqapi1/tools/EventCommand.java M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java M src/org/hyperic/hq/hqapi1/tools/MaintenanceCommand.java M src/org/hyperic/hq/hqapi1/tools/MetricCommand.java M src/org/hyperic/hq/hqapi1/tools/MetricDataCommand.java M src/org/hyperic/hq/hqapi1/tools/MetricTemplateCommand.java A src/org/hyperic/hq/hqapi1/tools/OptionParserFactory.java M src/org/hyperic/hq/hqapi1/tools/ResourceCommand.java M src/org/hyperic/hq/hqapi1/tools/ResourceEdgeCommand.java M src/org/hyperic/hq/hqapi1/tools/RoleCommand.java M src/org/hyperic/hq/hqapi1/tools/ServerConfigCommand.java M src/org/hyperic/hq/hqapi1/tools/Shell.java M src/org/hyperic/hq/hqapi1/tools/UserCommand.java Log Message: ----------- Added Spring app context and classpath extension capabilities Commit: 46a88f6e5eb7c8339b76e2e0bc88c0afad2e2b5f http://github.com/hyperic/hqapi/commit/46a88f6e5eb7c8339b76e2e0bc88c0afad2e2b5f Author: Jennifer Hickey <jhickey@calculon.local> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M .classpath Log Message: ----------- Added Spring dependencies to classpath Commit: 9dfbdc880f6761ebbcecc36848852b39c0e1b60a http://github.com/hyperic/hqapi/commit/9dfbdc880f6761ebbcecc36848852b39c0e1b60a Author: Jennifer Hickey <jhickey@calculon.local> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M .classpath Log Message: ----------- Added export of transitive dependencies to Eclipse classpath Commit: 74f707cd43132a95eb9541e729a8d3887e25d244 http://github.com/hyperic/hqapi/commit/74f707cd43132a95eb9541e729a8d3887e25d244 Author: Jennifer Hickey <jhickey@calculon.local> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M src/org/hyperic/hq/hqapi1/Connection.java M src/org/hyperic/hq/hqapi1/HQConnection.java Log Message: ----------- Added get/post methods used for multipart file push and read Commit: 5ef71a8acb79364a8016baf87952c3eecd7273ed http://github.com/hyperic/hqapi/commit/5ef71a8acb79364a8016baf87952c3eecd7273ed Author: Jennifer Hickey <jhickey@calculon.local> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M src/org/hyperic/hq/hqapi1/XmlUtil.java Log Message: ----------- Modified parser to select JAXBContext based on package (for extension) Commit: fcacd697fb8282dd5333e8278a45a089ce208f94 http://github.com/hyperic/hqapi/commit/fcacd697fb8282dd5333e8278a45a089ce208f94 Author: Jennifer Hickey <jhickey@calculon.local> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/OptionParserFactory.java Log Message: ----------- Made Help option publicly accessible Commit: 6bc226b3f523684c0938280feb2b807bbdc30e6e http://github.com/hyperic/hqapi/commit/6bc226b3f523684c0938280feb2b807bbdc30e6e Author: Jennifer Hickey <jhickey@calculon.local> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: A resources/log4j.properties Log Message: ----------- Added log4j config Commit: c3951a94f433e20f6ba938320036e5ff01b1d6fc http://github.com/hyperic/hqapi/commit/c3951a94f433e20f6ba938320036e5ff01b1d6fc Author: Jennifer Hickey <jhickey@calculon.local> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M .gitignore Log Message: ----------- Added ignore of logs dir created by running hqapi Commit: c5d579cab20f05e02f8a2cba5791de4ab5d61407 http://github.com/hyperic/hqapi/commit/c5d579cab20f05e02f8a2cba5791de4ab5d61407 Author: Bruce Snyder <bru...@gm...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M bin/hqapi.sh Log Message: ----------- Changes to make the shell script run on AIX and Solaris Commit: c9dcd451bc043568deb0c76173bd7b75510b82d5 http://github.com/hyperic/hqapi/commit/c9dcd451bc043568deb0c76173bd7b75510b82d5 Author: Bruce Snyder <bru...@gm...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M build.xml Log Message: ----------- Added the hqapi-context.xml to the jar file; Added the HQApi1.xsd to the jar file; Created a conf dir to the runtime to hold the log4j.properties so that's easier to change (i.e., not packed in the jar file) Commit: fa7017d112e2a7075a876ddfb91408b972851180 http://github.com/hyperic/hqapi/commit/fa7017d112e2a7075a876ddfb91408b972851180 Author: Bruce Snyder <bru...@gm...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M .classpath Log Message: ----------- Updated the Spring version to 3.0.0 Commit: d45df23bae8d7b39beb87788163578a598e2716a http://github.com/hyperic/hqapi/commit/d45df23bae8d7b39beb87788163578a598e2716a Author: Bruce Snyder <bru...@gm...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/Shell.java Log Message: ----------- Added a META-INF dir to the location of the Spring app context Commit: 37917b4514497f718335e43ce4701c171a618675 http://github.com/hyperic/hqapi/commit/37917b4514497f718335e43ce4701c171a618675 Author: Bruce Snyder <bru...@gm...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M resources/META-INF/spring/hqapi-context.xml M src/org/hyperic/hq/hqapi1/AgentApi.java M src/org/hyperic/hq/hqapi1/AlertApi.java M src/org/hyperic/hq/hqapi1/AlertDefinitionApi.java M src/org/hyperic/hq/hqapi1/ApplicationApi.java M src/org/hyperic/hq/hqapi1/AutodiscoveryApi.java M src/org/hyperic/hq/hqapi1/BaseApi.java M src/org/hyperic/hq/hqapi1/Connection.java M src/org/hyperic/hq/hqapi1/ControlApi.java M src/org/hyperic/hq/hqapi1/EscalationApi.java M src/org/hyperic/hq/hqapi1/EventApi.java M src/org/hyperic/hq/hqapi1/FileResponseHandler.java M src/org/hyperic/hq/hqapi1/GroupApi.java M src/org/hyperic/hq/hqapi1/HQApi.java M src/org/hyperic/hq/hqapi1/HQConnection.java M src/org/hyperic/hq/hqapi1/MaintenanceApi.java M src/org/hyperic/hq/hqapi1/MetricApi.java M src/org/hyperic/hq/hqapi1/MetricDataApi.java M src/org/hyperic/hq/hqapi1/ResourceApi.java M src/org/hyperic/hq/hqapi1/ResourceEdgeApi.java M src/org/hyperic/hq/hqapi1/ResponseHandler.java M src/org/hyperic/hq/hqapi1/RoleApi.java M src/org/hyperic/hq/hqapi1/ServerConfigApi.java M src/org/hyperic/hq/hqapi1/UserApi.java M src/org/hyperic/hq/hqapi1/XmlResponseHandler.java Log Message: ----------- Changes to the HQApi and subclasses to appropriately add the ResponseHandler interface to the HQConnection and a couple of impls Commit: d2468c729fafdbeb3f1289488a883f29ed191052 http://github.com/hyperic/hqapi/commit/d2468c729fafdbeb3f1289488a883f29ed191052 Author: Ryan Morgan <rm...@hy...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M src/org/hyperic/hq/hqapi1/AlertApi.java M src/org/hyperic/hq/hqapi1/AlertDefinitionApi.java M src/org/hyperic/hq/hqapi1/GroupApi.java M src/org/hyperic/hq/hqapi1/MetricApi.java Log Message: ----------- Adjust to new doGet()/doPost() APIs Commit: 5f89f5a95d836586378c5cfa8cedc2f71987e489 http://github.com/hyperic/hqapi/commit/5f89f5a95d836586378c5cfa8cedc2f71987e489 Author: Ryan Morgan <rm...@hy...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M src/org/hyperic/hq/hqapi1/Connection.java M src/org/hyperic/hq/hqapi1/ResponseHandler.java M src/org/hyperic/hq/hqapi1/XmlResponseHandler.java Log Message: ----------- JavaDoc cleanups. Commit: 74c149aac6be5bc038fb5b8958a43fd1b65fb243 http://github.com/hyperic/hqapi/commit/74c149aac6be5bc038fb5b8958a43fd1b65fb243 Author: Ryan Morgan <rm...@hy...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M src/org/hyperic/hq/hqapi1/FileResponseHandler.java M src/org/hyperic/hq/hqapi1/XmlResponseHandler.java Log Message: ----------- Fix spelling. Commit: 2771a22a9232a4b9d32621084b237867d81692df http://github.com/hyperic/hqapi/commit/2771a22a9232a4b9d32621084b237867d81692df Author: Ryan Morgan <rm...@hy...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M src/org/hyperic/hq/hqapi1/AgentApi.java M src/org/hyperic/hq/hqapi1/AlertApi.java M src/org/hyperic/hq/hqapi1/AlertDefinitionApi.java M src/org/hyperic/hq/hqapi1/ApplicationApi.java M src/org/hyperic/hq/hqapi1/AutodiscoveryApi.java M src/org/hyperic/hq/hqapi1/BaseApi.java M src/org/hyperic/hq/hqapi1/Connection.java M src/org/hyperic/hq/hqapi1/ControlApi.java M src/org/hyperic/hq/hqapi1/EscalationApi.java M src/org/hyperic/hq/hqapi1/EventApi.java M src/org/hyperic/hq/hqapi1/FileResponseHandler.java M src/org/hyperic/hq/hqapi1/GroupApi.java M src/org/hyperic/hq/hqapi1/HQConnection.java M src/org/hyperic/hq/hqapi1/MaintenanceApi.java M src/org/hyperic/hq/hqapi1/MetricApi.java M src/org/hyperic/hq/hqapi1/MetricDataApi.java M src/org/hyperic/hq/hqapi1/ResourceApi.java M src/org/hyperic/hq/hqapi1/ResourceEdgeApi.java M src/org/hyperic/hq/hqapi1/ResponseHandler.java M src/org/hyperic/hq/hqapi1/RoleApi.java M src/org/hyperic/hq/hqapi1/ServerConfigApi.java M src/org/hyperic/hq/hqapi1/UserApi.java M src/org/hyperic/hq/hqapi1/tools/AlertCommand.java Log Message: ----------- Remove tabs, fix JavaDoc Commit: 1513e86b1049e92b84cd32749e78d51c8f4b331c http://github.com/hyperic/hqapi/commit/1513e86b1049e92b84cd32749e78d51c8f4b331c Author: Ryan Morgan <rm...@hy...> Date: 2010-03-04 (Thu, 04 Mar 2010) Changed paths: M src/org/hyperic/hq/hqapi1/XmlUtil.java Log Message: ----------- Restore cache for JAXBContext allowing for other packages to be registered. |
|
From: <bo...@hy...> - 2010-03-04 09:29:06
|
Author: bob Date: 2010-03-04 01:28:58 -0800 (Thu, 04 Mar 2010) New Revision: 14346 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14346 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1367 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-03-04 00:08:30 UTC (rev 14345) +++ trunk/etc/version.properties 2010-03-04 09:28:58 UTC (rev 14346) @@ -1,3 +1,3 @@ -#Wed Mar 03 00:28:07 PST 2010 +#Thu Mar 04 00:29:39 PST 2010 version=4.3.0 -build=1366 +build=1367 |
|
From: <dcr...@hy...> - 2010-03-04 00:08:39
|
Author: dcrutchf Date: 2010-03-03 16:08:30 -0800 (Wed, 03 Mar 2010) New Revision: 14345 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14345 Modified: trunk/src/org/hyperic/hq/authz/shared/AuthzConstants.java trunk/src/org/hyperic/hq/events/server/session/AlertDAO.java trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionDAO.java trunk/src/org/hyperic/hq/galerts/server/session/GalertLogDAO.java trunk/src/org/hyperic/hq/galerts/server/session/GalertManagerEJBImpl.java Log: [HQ-2072] - Group Alerts are not displayed in Recent Alert Portlet for View only user with Group Fixed/ACK permission Modified: trunk/src/org/hyperic/hq/authz/shared/AuthzConstants.java =================================================================== --- trunk/src/org/hyperic/hq/authz/shared/AuthzConstants.java 2010-03-03 09:22:47 UTC (rev 14344) +++ trunk/src/org/hyperic/hq/authz/shared/AuthzConstants.java 2010-03-04 00:08:30 UTC (rev 14345) @@ -194,7 +194,7 @@ public static final String ResourceEdgeNetworkRelation = "network"; // List of alert operations - public static final String[] MANAGE_ALERTS_OPS = + public static final String[] VIEW_ALERTS_OPS = new String[] { platformOpViewPlatform, serverOpViewServer, Modified: trunk/src/org/hyperic/hq/events/server/session/AlertDAO.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/AlertDAO.java 2010-03-03 09:22:47 UTC (rev 14344) +++ trunk/src/org/hyperic/hq/events/server/session/AlertDAO.java 2010-03-04 00:08:30 UTC (rev 14345) @@ -146,7 +146,7 @@ if (sql.indexOf("subj") > 0) { q.setInteger("subj", subj.intValue()) - .setParameterList("ops", AuthzConstants.MANAGE_ALERTS_OPS); + .setParameterList("ops", AuthzConstants.VIEW_ALERTS_OPS); } return pageInfo.pageResults(q).list(); @@ -167,7 +167,7 @@ if (sql.indexOf("subj") > 0) { q.setInteger("subj", subj.intValue()) - .setParameterList("ops", AuthzConstants.MANAGE_ALERTS_OPS); + .setParameterList("ops", AuthzConstants.VIEW_ALERTS_OPS); } return (Integer) q.uniqueResult(); @@ -315,7 +315,7 @@ List alerts = wherePermCheck .addQueryParameters(q, subject, r, 0, - Arrays.asList(AuthzConstants.MANAGE_ALERTS_OPS)) + Arrays.asList(AuthzConstants.VIEW_ALERTS_OPS)) .list(); Map lastAlerts = new HashMap(alerts.size()); Modified: trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionDAO.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionDAO.java 2010-03-03 09:22:47 UTC (rev 14344) +++ trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionDAO.java 2010-03-04 00:08:30 UTC (rev 14345) @@ -228,7 +228,7 @@ return wherePermCheck .addQueryParameters(q, subject, r, 0, - Arrays.asList(AuthzConstants.MANAGE_ALERTS_OPS)).list(); + Arrays.asList(AuthzConstants.VIEW_ALERTS_OPS)).list(); } void save(AlertDefinition def) { @@ -384,7 +384,7 @@ if (sql.indexOf("subj") > 0) { q.setInteger("subj", subj.getId().intValue()) - .setParameterList("ops", AuthzConstants.MANAGE_ALERTS_OPS); + .setParameterList("ops", AuthzConstants.VIEW_ALERTS_OPS); } return pInfo.pageResults(q).list(); Modified: trunk/src/org/hyperic/hq/galerts/server/session/GalertLogDAO.java =================================================================== --- trunk/src/org/hyperic/hq/galerts/server/session/GalertLogDAO.java 2010-03-03 09:22:47 UTC (rev 14344) +++ trunk/src/org/hyperic/hq/galerts/server/session/GalertLogDAO.java 2010-03-04 00:08:30 UTC (rev 14345) @@ -146,7 +146,7 @@ Integer galertDefId, PageInfo pageInfo) { GalertLogSortField sort = (GalertLogSortField)pageInfo.getSort(); - String op = AuthzConstants.groupOpManageAlerts; + String op = AuthzConstants.groupOpViewResourceGroup; String sql = PermissionManagerFactory.getInstance() .getGroupAlertsHQL(inEsc, notFixed, groupId, galertDefId) + " order by " + sort.getSortString("a", "d", "g") + Modified: trunk/src/org/hyperic/hq/galerts/server/session/GalertManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/galerts/server/session/GalertManagerEJBImpl.java 2010-03-03 09:22:47 UTC (rev 14344) +++ trunk/src/org/hyperic/hq/galerts/server/session/GalertManagerEJBImpl.java 2010-03-04 00:08:30 UTC (rev 14345) @@ -447,23 +447,22 @@ long timeRange, long endTime, List includes) throws PermissionException { - List alerts; - + PageInfo pInfo = PageInfo.create(0, count, GalertLogSortField.DATE, false); + if (priority == EventConstants.PRIORITY_ALL) { - alerts = _logDAO.findByCreateTime(endTime- timeRange, endTime, - count); - } else { - PageInfo pInfo = PageInfo.create(0, count, GalertLogSortField.DATE, - false); - AlertSeverity s = AlertSeverity.findByCode(priority); - alerts = _logDAO.findByCreateTimeAndPriority(subj.getId(), + // if priority is "all" set the severity code as low + // this is essentially "all" + priority = AlertSeverity.LOW.getCode(); + } + + AlertSeverity s = AlertSeverity.findByCode(priority); + List alerts = _logDAO.findByCreateTimeAndPriority(subj.getId(), endTime - timeRange, endTime, s, false, false, null, null, pInfo); - } - List result = new ArrayList(); + for (Iterator i=alerts.iterator(); i.hasNext(); ) { GalertLog l = (GalertLog)i.next(); GalertDef def = l.getAlertDef(); |
|
From: <bo...@hy...> - 2010-03-03 09:22:55
|
Author: bob Date: 2010-03-03 01:22:47 -0800 (Wed, 03 Mar 2010) New Revision: 14344 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14344 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1366 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-03-03 03:40:20 UTC (rev 14343) +++ trunk/etc/version.properties 2010-03-03 09:22:47 UTC (rev 14344) @@ -1,3 +1,3 @@ -#Tue Mar 02 00:28:39 PST 2010 +#Wed Mar 03 00:28:07 PST 2010 version=4.3.0 -build=1365 +build=1366 |
|
From: <dcr...@hy...> - 2010-03-03 03:40:31
|
Author: dcrutchf Date: 2010-03-02 19:40:20 -0800 (Tue, 02 Mar 2010) New Revision: 14343 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14343 Modified: trunk/web/common/HeaderTabs.jsp trunk/web/portal/MainLayout.jsp Log: [HHQ-3656] - No drop down menu is displayed for Resources and Analyze In IE 8 Modified: trunk/web/common/HeaderTabs.jsp =================================================================== --- trunk/web/common/HeaderTabs.jsp 2010-03-02 23:47:23 UTC (rev 14342) +++ trunk/web/common/HeaderTabs.jsp 2010-03-03 03:40:20 UTC (rev 14343) @@ -27,16 +27,21 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. --%> -<c:set var="location" scope="request"><tiles:getAsString name="location"/></c:set> - <c:choose> - <c:when test="${location eq 'resources'}"> - <c:forEach var="attachment" items="${mastheadResourceAttachments}"> - <li><a href="<html:rewrite page="/mastheadAttach.do?typeId=${attachment.attachment.id}"/>"><c:out value="${attachment.HTML}"/></a></li> - </c:forEach> - </c:when> - <c:when test="${location eq 'tracking'}"> - <c:forEach var="attachment" items="${mastheadTrackerAttachments}"> - <li><a href="<html:rewrite page="/mastheadAttach.do?typeId=${attachment.attachment.id}"/>"><c:out value="${attachment.HTML}"/></a></li> - </c:forEach> - </c:when> - </c:choose> \ No newline at end of file +<c:set var="location" scope="request"> + <tiles:getAsString name="location"/> +</c:set> +<c:choose> + <c:when test="${location eq 'resources'}"> + <c:set var="attachments" scope="request" value="${mastheadResourceAttachments}" /> + </c:when> + <c:when test="${location eq 'tracking'}"> + <c:set var="attachments" scope="request" value="${mastheadTrackerAttachments}" /> + </c:when> +</c:choose> +<c:forEach var="attachment" items="${attachments}"> + <li> + <a href="<html:rewrite page="/mastheadAttach.do?typeId=${attachment.attachment.id}"/>"> + <c:out value="${attachment.HTML}"/> + </a> + </li> +</c:forEach> \ No newline at end of file Modified: trunk/web/portal/MainLayout.jsp =================================================================== --- trunk/web/portal/MainLayout.jsp 2010-03-02 23:47:23 UTC (rev 14342) +++ trunk/web/portal/MainLayout.jsp 2010-03-03 03:40:20 UTC (rev 14343) @@ -25,6 +25,7 @@ <%@ page pageEncoding="UTF-8"%> <%@ page language="java" contentType="text/html; charset=UTF-8"%> <%@ page errorPage="/common/Error.jsp"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> <%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html"%> <%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <html> <head> + <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> <tiles:insert attribute="head" /> <title> <fmt:message key="${portal.name}"> |
|
From: rose j. <rsn...@gm...> - 2010-03-03 01:32:39
|
okay, if we didn't put the sigar.so file in the same folder with jdk library, then how to run my program? please someone help, need help as soon as possible. Thanks |
|
From: <no...@gi...> - 2010-03-03 00:55:34
|
Branch: refs/heads/springy Home: http://github.com/hyperic/hqapi Commit: 2e906303f0acd42e3b77096ff29ab0fc6537572f http://github.com/hyperic/hqapi/commit/2e906303f0acd42e3b77096ff29ab0fc6537572f Author: Bruce Snyder <bru...@gm...> Date: 2010-03-02 (Tue, 02 Mar 2010) Changed paths: M bin/hqapi.sh Log Message: ----------- Changes to make the shell script run on AIX and Solaris Commit: 8e92ea09799585089decb1afc90483a38e92edf6 http://github.com/hyperic/hqapi/commit/8e92ea09799585089decb1afc90483a38e92edf6 Author: Bruce Snyder <bru...@gm...> Date: 2010-03-02 (Tue, 02 Mar 2010) Changed paths: M build.xml Log Message: ----------- Added the hqapi-context.xml to the jar file; Added the HQApi1.xsd to the jar file; Created a conf dir to the runtime to hold the log4j.properties so that's easier to change (i.e., not packed in the jar file) Commit: 0903a67498deb5dec72f486b83b93acf58590990 http://github.com/hyperic/hqapi/commit/0903a67498deb5dec72f486b83b93acf58590990 Author: Bruce Snyder <bru...@gm...> Date: 2010-03-02 (Tue, 02 Mar 2010) Changed paths: M .classpath Log Message: ----------- Updated the Spring version to 3.0.0 Commit: 8fca3398e66b03c729ae5354c77ec773db10c491 http://github.com/hyperic/hqapi/commit/8fca3398e66b03c729ae5354c77ec773db10c491 Author: Bruce Snyder <bru...@gm...> Date: 2010-03-02 (Tue, 02 Mar 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/Shell.java Log Message: ----------- Added a META-INF dir to the location of the Spring app context Commit: 40a217c00899eaea2eddfcfa52264e913cf789f7 http://github.com/hyperic/hqapi/commit/40a217c00899eaea2eddfcfa52264e913cf789f7 Author: Bruce Snyder <bru...@gm...> Date: 2010-03-02 (Tue, 02 Mar 2010) Changed paths: M resources/META-INF/spring/hqapi-context.xml M src/org/hyperic/hq/hqapi1/AgentApi.java M src/org/hyperic/hq/hqapi1/AlertApi.java M src/org/hyperic/hq/hqapi1/AlertDefinitionApi.java M src/org/hyperic/hq/hqapi1/ApplicationApi.java M src/org/hyperic/hq/hqapi1/AutodiscoveryApi.java M src/org/hyperic/hq/hqapi1/BaseApi.java M src/org/hyperic/hq/hqapi1/Connection.java M src/org/hyperic/hq/hqapi1/ControlApi.java M src/org/hyperic/hq/hqapi1/EscalationApi.java M src/org/hyperic/hq/hqapi1/EventApi.java M src/org/hyperic/hq/hqapi1/FileResponseHandler.java M src/org/hyperic/hq/hqapi1/GroupApi.java M src/org/hyperic/hq/hqapi1/HQApi.java M src/org/hyperic/hq/hqapi1/HQConnection.java M src/org/hyperic/hq/hqapi1/MaintenanceApi.java M src/org/hyperic/hq/hqapi1/MetricApi.java M src/org/hyperic/hq/hqapi1/MetricDataApi.java M src/org/hyperic/hq/hqapi1/ResourceApi.java M src/org/hyperic/hq/hqapi1/ResourceEdgeApi.java M src/org/hyperic/hq/hqapi1/ResponseHandler.java M src/org/hyperic/hq/hqapi1/RoleApi.java M src/org/hyperic/hq/hqapi1/ServerConfigApi.java M src/org/hyperic/hq/hqapi1/UserApi.java M src/org/hyperic/hq/hqapi1/XmlResponseHandler.java Log Message: ----------- Changes to the HQApi and subclasses to appropriately add the ResponseHandler interface to the HQConnection and a couple of impls |
|
From: <pn...@hy...> - 2010-03-02 23:47:31
|
Author: pnguyen Date: 2010-03-02 15:47:23 -0800 (Tue, 02 Mar 2010) New Revision: 14342 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14342 Added: trunk/thirdparty/lib/snmp4j-1.11.jar Removed: trunk/thirdparty/lib/snmp4j-1.10.2.jar Modified: trunk/.classpath trunk/build.xml Log: Update snmp4j from version 1.10.2 to 1.11 Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2010-03-02 22:51:47 UTC (rev 14341) +++ trunk/.classpath 2010-03-02 23:47:23 UTC (rev 14342) @@ -234,7 +234,7 @@ <classpathentry kind="lib" path="thirdparty/lib/com.springsource.com.sun.xml.bind-2.1.7.jar"/> <classpathentry kind="lib" path="thirdparty/lib/com.springsource.javax.xml.bind-2.1.7.jar"/> <classpathentry kind="lib" path="thirdparty/lib/com.springsource.javax.xml.stream-1.0.1.jar"/> - <classpathentry kind="lib" path="thirdparty/lib/snmp4j-1.10.2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/snmp4j-1.11.jar"/> <classpathentry kind="lib" path="thirdparty/lib/commons-logging-1.0.4.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2010-03-02 22:51:47 UTC (rev 14341) +++ trunk/build.xml 2010-03-02 23:47:23 UTC (rev 14342) @@ -463,7 +463,7 @@ <include name="quartz-1.6.5.jar" /> <include name="quartz-oracle-1.6.5.jar" /> <include name="quartz-jboss-1.6.5.jar" /> - <include name="snmp4j-1.10.2.jar" /> + <include name="snmp4j-1.11.jar" /> <include name="dnsjava-2.0.3.jar" /> <include name="ehcache-1.5.0.jar" /> <include name="jsr107cache-1.0.jar" /> <!-- EHCache 1.5 dep --> @@ -985,7 +985,7 @@ <include name="commons-logging-1.0.4.jar" /> <include name="log4j-1.2.14.jar" /> <include name="oro-2.0.8.jar" /> <!-- RT --> - <include name="snmp4j-1.10.2.jar" /> <!-- All SNMP monitoring --> + <include name="snmp4j-1.11.jar" /> <!-- All SNMP monitoring --> <include name="ant.jar" /> <!-- AI scans + util.TokenReplacer --> <include name="junit-3.8.jar" /> <!-- test to help with support issues --> <include name="junit-4.4.jar" /> Deleted: trunk/thirdparty/lib/snmp4j-1.10.2.jar =================================================================== (Binary files differ) Added: trunk/thirdparty/lib/snmp4j-1.11.jar =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/lib/snmp4j-1.11.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <pn...@hy...> - 2010-03-02 23:23:47
|
Author: pnguyen Date: 2010-03-02 14:51:47 -0800 (Tue, 02 Mar 2010) New Revision: 14341 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14341 Modified: trunk/src/org/hyperic/snmp/SNMPSession_v3.java trunk/web/WEB-INF/classes/ApplicationResources.properties Log: Update SNMPv3 privacy protocol support Modified: trunk/src/org/hyperic/snmp/SNMPSession_v3.java =================================================================== --- trunk/src/org/hyperic/snmp/SNMPSession_v3.java 2010-03-02 09:33:27 UTC (rev 14340) +++ trunk/src/org/hyperic/snmp/SNMPSession_v3.java 2010-03-02 22:51:47 UTC (rev 14341) @@ -99,15 +99,13 @@ if (val.equals("DES")) { return PrivDES.ID; - } else if (val.equals("3DES")) // "Triple DES" privacy (encryption) mode - // has been added in HQ v4.3 - { + } else if (val.equals("3DES")) { return Priv3DES.ID; - } else if ((val.equals("AES128")) || (val.equals("AES"))) { + } else if (val.equals("AES128") || val.equals("AES-128") || val.equals("AES")) { return PrivAES128.ID; - } else if (val.equals("AES192")) { + } else if (val.equals("AES192") || val.equals("AES-192")) { return PrivAES192.ID; - } else if (val.equals("AES256")) { + } else if (val.equals("AES256") || val.equals("AES-256")) { return PrivAES256.ID; } else { throw new SNMPException("Privacy protocol " + val + " not supported"); Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties =================================================================== --- trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-03-02 09:33:27 UTC (rev 14340) +++ trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-03-02 22:51:47 UTC (rev 14341) @@ -667,6 +667,11 @@ admin.settings.SNMPAgentAddress=Agent Address: admin.settings.SNMPNotificationMechanism=Notification Mechanism: admin.settings.SNMPDefaultNotificationMechanism=Default Notification Mechanism: +admin.settings.snmp.privacy.DES=DES +admin.settings.snmp.privacy.3DES=3DES +admin.settings.snmp.privacy.AES128=AES-128 +admin.settings.snmp.privacy.AES192=AES-192 +admin.settings.snmp.privacy.AES256=AES-256 admin.settings.UseLDAPAuth=Use LDAP Authentication |
|
From: <bo...@hy...> - 2010-03-02 09:33:37
|
Author: bob Date: 2010-03-02 01:33:27 -0800 (Tue, 02 Mar 2010) New Revision: 14340 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14340 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1365 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-03-01 23:12:12 UTC (rev 14339) +++ trunk/etc/version.properties 2010-03-02 09:33:27 UTC (rev 14340) @@ -1,4 +1,3 @@ -#Mon, 01 Mar 2010 00:33:54 -0800 -#Fri Feb 26 00:34:19 PST 2010 +#Tue Mar 02 00:28:39 PST 2010 version=4.3.0 -build=1364 +build=1365 |
|
From: rose j. <rsn...@gm...> - 2010-03-02 06:38:25
|
HI all, I'm doing the memory usage and file system disk usage monitoring on Windows and Linux (Ubuntu). The program works in Windows(I put the sigar library in the jdk library) and now i'm having problem with the ubuntu. Where should i pun the sigar library in ubuntu? |
|
From: rose j. <rsn...@gm...> - 2010-03-02 06:35:26
|
Thanks dougm |
|
From: <gla...@hy...> - 2010-03-01 23:12:22
|
Author: glaullon Date: 2010-03-01 15:12:12 -0800 (Mon, 01 Mar 2010) New Revision: 14339 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14339 Modified: trunk/plugins/sybase/src/org/hyperic/hq/plugin/sybase/SybaseServerDetector.java Log: restore PluginException Modified: trunk/plugins/sybase/src/org/hyperic/hq/plugin/sybase/SybaseServerDetector.java =================================================================== --- trunk/plugins/sybase/src/org/hyperic/hq/plugin/sybase/SybaseServerDetector.java 2010-03-01 22:55:54 UTC (rev 14338) +++ trunk/plugins/sybase/src/org/hyperic/hq/plugin/sybase/SybaseServerDetector.java 2010-03-01 23:12:12 UTC (rev 14339) @@ -228,6 +228,7 @@ } catch (SQLException e) { String msg = "Error querying for services: "+e.getMessage(); + throw new PluginException(msg, e); } finally { DBUtil.closeJDBCObjects(log, conn, stmt, rs); |
|
From: <sc...@hy...> - 2010-03-01 22:56:03
|
Author: scottmf Date: 2010-03-01 14:55:54 -0800 (Mon, 01 Mar 2010) New Revision: 14338 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14338 Modified: trunk/src/org/hyperic/tools/ant/dbupgrade/SST_AlterColumn.java Log: change error msg to accurately reflect the db Modified: trunk/src/org/hyperic/tools/ant/dbupgrade/SST_AlterColumn.java =================================================================== --- trunk/src/org/hyperic/tools/ant/dbupgrade/SST_AlterColumn.java 2010-03-01 18:41:48 UTC (rev 14337) +++ trunk/src/org/hyperic/tools/ant/dbupgrade/SST_AlterColumn.java 2010-03-01 22:55:54 UTC (rev 14338) @@ -265,7 +265,7 @@ } throw new SQLException(); } catch (SQLException e) { - throw new BuildException("Error retrieving pg columntype from " + + throw new BuildException("Error retrieving mysql columntype from " + "table, " + _table + " column, " + _column); } finally { DBUtil.closeJDBCObjects(getClass().getName(), null, stmt, rs); |
|
From: <pn...@hy...> - 2010-03-01 18:42:01
|
Author: pnguyen Date: 2010-03-01 10:41:48 -0800 (Mon, 01 Mar 2010) New Revision: 14337 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14337 Modified: trunk/src/org/hyperic/hq/events/server/session/PagerProcessor_events.java Log: [HHQ-3594] Add async delete check Modified: trunk/src/org/hyperic/hq/events/server/session/PagerProcessor_events.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/PagerProcessor_events.java 2010-03-01 18:32:14 UTC (rev 14336) +++ trunk/src/org/hyperic/hq/events/server/session/PagerProcessor_events.java 2010-03-01 18:41:48 UTC (rev 14337) @@ -6,7 +6,7 @@ * normal use of the program, and does *not* fall under the heading of * "derived work". * - * Copyright (C) [2004, 2005, 2006], Hyperic, Inc. + * Copyright (C) [2004-2010], Hyperic, Inc. * This file is part of HQ. * * HQ is free software; you can redistribute it and/or modify @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hyperic.hq.authz.server.session.Resource; import org.hyperic.hq.common.SystemException; import org.hyperic.hq.escalation.server.session.EscalationManagerEJBImpl; import org.hyperic.hq.events.shared.AlertValue; @@ -53,7 +54,13 @@ alert.getId(), alert.getAlertDefinition())); return aval; } else if (o instanceof AlertDefinition) { - return ((AlertDefinition) o).getAlertDefinitionValue(); + AlertDefinition def = (AlertDefinition) o; + Resource r = def.getResource(); + if (r == null || r.isInAsyncDeleteState()) { + return null; + } else { + return def.getAlertDefinitionValue(); + } } } catch (Exception e) { throw new SystemException("Error converting " + o + |
Author: glaullon Date: 2010-03-01 10:32:14 -0800 (Mon, 01 Mar 2010) New Revision: 14336 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14336 Added: trunk/plugins/netapp/ trunk/plugins/netapp/etc/ trunk/plugins/netapp/etc/hq-plugin.xml trunk/plugins/netapp/src/ trunk/plugins/netapp/src/org/ trunk/plugins/netapp/src/org/hyperic/ trunk/plugins/netapp/src/org/hyperic/hq/ trunk/plugins/netapp/src/org/hyperic/hq/plugin/ trunk/plugins/netapp/src/org/hyperic/hq/plugin/netapp/ trunk/plugins/netapp/src/org/hyperic/hq/plugin/netapp/NetAppMeasurement.java trunk/plugins/netapp/src/org/hyperic/hq/plugin/netapp/NetAppPlatformDetector.java trunk/plugins/netapp/src/org/hyperic/hq/plugin/netapp/NetAppServicesDetector.java Log: [HPD-198] Netapp plugin Added: trunk/plugins/netapp/etc/hq-plugin.xml =================================================================== --- trunk/plugins/netapp/etc/hq-plugin.xml (rev 0) +++ trunk/plugins/netapp/etc/hq-plugin.xml 2010-03-01 18:32:14 UTC (rev 14336) @@ -0,0 +1,274 @@ + +<plugin> + <classpath> + <include name="pdk/plugins/netdevice-plugin.jar"/> + </classpath> + + <platform name="NetApp Filer"> + + <config include="snmp"> + </config> + <!--option name="snmpVersion" description="SNMP Version" type="enum"> + <include name="v1"/> + <include name="v2c"/> + <include name="v3"/> + </option> + </config--> + + <properties> + <!-- sysContact --> + <property name="1.3.6.1.2.1.1.4.0" description="Contact Name"/> + <!-- sysName --> + <property name="1.3.6.1.2.1.1.5.0" description="Name"/> + <!-- sysLocation --> + <property name="1.3.6.1.2.1.1.6.0" description="Location"/> + <!-- productGuiUrl --> + <property name="1.3.6.1.4.1.789.1.1.7.0" description="Admin URL"/> + <!-- productSerialNum --> + <property name="1.3.6.1.4.1.789.1.1.9.0" description="Serial number"/> + <!-- productMachineType --> + <property name="1.3.6.1.4.1.789.1.1.13.0" description="Machine Type"/> + <property name="1.3.6.1.4.1.789.1.2.3.6" description="Cluster Failover Partner Name"/> + <property name="1.3.6.1.4.1.789.1.2.3.7" description="Cluster Failover Partner System ID"/> + </properties> + + <plugin type="autoinventory" class="org.hyperic.hq.plugin.netapp.NetAppPlatformDetector"/> + <plugin type="measurement" class="org.hyperic.hq.plugin.netapp.NetAppMeasurement"/> + <plugin type="log_track" class="org.hyperic.hq.plugin.netdevice.SNMPTrapReceiverPlugin"/> + + <filter name="template" value="${snmp.template}:${alias}"/> + <!-- sysUpTime --> + <metric name="Availability" template="${snmp.template},Avail=true:1.3.6.1.2.1.1.3.0" indicator="true"/> + <!-- sysUpTime --> + <metric name="Uptime" alias="1.3.6.1.2.1.1.3.0" category="AVAILABILITY" units="jiffys" collectionType="static"/> + <!-- cpuBusyTimePerCent --> + <metric name="CPU Busy" alias="1.3.6.1.4.1.789.1.2.1.3.0" indicator="true" units="percent"/> + <!-- calc=misc[High,Low]NfsOps --> + <metric name="NFS Operations" alias="calc=1.3.6.1.4.1.789.1.2.2.[5,6].0" indicator="true" collectionType="trendsup" units="none"/> + <!-- calc=misc[High,Low]CifsOps --> + <metric name="CIFS Operations" alias="calc=1.3.6.1.4.1.789.1.2.2.[7,8].0" indicator="true" collectionType="trendsup" units="none"/> + <!-- calc=misc[High,Low]HttpOps --> + <metric name="HTTP Operations" alias="calc=1.3.6.1.4.1.789.1.2.2.[9,10].0" indicator="true" collectionType="trendsup" units="none"/> + <!-- calc=misc[High,Low]NetRcvdBytes --> + <metric name="Bytes Received" alias="calc=1.3.6.1.4.1.789.1.2.2.[11,12].0" indicator="true" collectionType="trendsup" units="B"/> + <!-- calc=misc[High,Low]NetSentBytes --> + <metric name="Bytes Sent" alias="calc=1.3.6.1.4.1.789.1.2.2.[13,14].0" indicator="true" collectionType="trendsup" units="B"/> + <!-- calc=misc[High,Low]DiskReadBytes --> + <metric name="Bytes Read From Disk" alias="calc=1.3.6.1.4.1.789.1.2.2.[15,16].0" indicator="true" collectionType="trendsup" units="B"/> + <!-- calc=misc[High,Low]DiskWriteBytes --> + <metric name="Bytes Write To Disk" alias="calc=1.3.6.1.4.1.789.1.2.2.[17,18].0" indicator="true" collectionType="trendsup" units="B"/> + <!-- calc=misc[High,Low]TapeReadBytes --> + <metric name="Bytes Read From Tape" alias="calc=1.3.6.1.4.1.789.1.2.2.[19,20].0" indicator="true" collectionType="trendsup" units="B"/> + <!-- calc=misc[High,Low]TapeWriteBytes --> + <metric name="Bytes Write To Tape" alias="calc=1.3.6.1.4.1.789.1.2.2.[21,22].0" indicator="true" collectionType="trendsup" units="B"/> + + + <server> + <plugin type="autoinventory" class="org.hyperic.hq.plugin.netapp.NetAppServicesDetector"/> + <plugin type="measurement" class="org.hyperic.hq.plugin.netapp.NetAppMeasurement"/> + + <service name="File System"> + <plugin type="measurement" class="org.hyperic.hq.plugin.netapp.NetAppMeasurement"/> + <plugin type="autoinventory"/> + <config> + <option name="snmpIndexValue" description="File System"/> + </config> + <!-- dfFileSys --> + <property name="snmpIndexName" value="1.3.6.1.4.1.789.1.5.4.1.2"/> + <properties> + <!-- dfMountedOn --> + <property name="1.3.6.1.4.1.789.1.5.4.1.10" description="Mount point"/> + </properties> + <filter name="index" value="snmpIndexName=${snmpIndexName},snmpIndexValue=%snmpIndexValue%"/> + <filter name="template" value="${snmp.template}:${alias}:${index}"/> + <!-- dfStatus --> + <metric name="Availability" template="${snmp.template},Avail=true:1.3.6.1.4.1.789.1.5.4.1.20:${index}" indicator="true"/> + <!-- dfPerCentKBytesCapacity --> + <metric name="Space Used percent" alias="1.3.6.1.4.1.789.1.5.4.1.6" units="percent" indicator="true"/> + <!-- dfPerCentInodeCapacity --> + <metric name="Inodes Used percent" alias="1.3.6.1.4.1.789.1.5.4.1.9" units="percent" indicator="true"/> + <!-- dfKBytesTotal --> + <metric name="Space Total" alias="1.3.6.1.4.1.789.1.5.4.1.3" units="KB"/> + <!-- dfKBytesUsed --> + <metric name="Space Used" alias="1.3.6.1.4.1.789.1.5.4.1.4" units="KB"/> + <!-- dfKBytesAvail --> + <metric name="Space Avail" alias="1.3.6.1.4.1.789.1.5.4.1.5" units="KB"/> + <!-- dfInodesUsed --> + <metric name="Inodes Used" alias="1.3.6.1.4.1.789.1.5.4.1.7" units="none"/> + <!-- dfInodesFree --> + <metric name="Inodes Avail" alias="1.3.6.1.4.1.789.1.5.4.1.8" units="none"/> + <!-- dfMaxFilesUsed --> + <metric name="Files Used" alias="1.3.6.1.4.1.789.1.5.4.1.12" units="none"/> + <!-- dfMaxFilesAvail --> + <metric name="Files Max" alias="1.3.6.1.4.1.789.1.5.4.1.11" units="none"/> + </service> + + <service name="Interface"> + <plugin type="measurement" class="org.hyperic.hq.plugin.netapp.NetAppMeasurement"/> + <plugin type="autoinventory"/> + <config> + <option name="snmpIndexValue" description="Interface name"/> + </config> + + <!-- ifDescr --> + <property name="snmpIndexName" value="1.3.6.1.2.1.2.2.1.2"/> + + + <properties> + <!-- ifType --> + <property name="1.3.6.1.2.1.2.2.1.3" description="Type"/> + <!-- ifSpeed --> + <property name="1.3.6.1.2.1.2.2.1.5" description="Speed"/> + <!-- ifMtu --> + <property name="1.3.6.1.2.1.2.2.1.4" description="MTU"/> + </properties> + + <filter name="index" value="snmpIndexName=${snmpIndexName},snmpIndexValue=%snmpIndexValue%"/> + <filter name="template" value="${snmp.template}:${alias}:${index}"/> + + <!-- ifOperStatus --> + <metric name="Availability" template="${snmp.template},Avail=true:1.3.6.1.2.1.2.2.1.8:${index}" indicator="true"/> + <!-- calc=if[High,Low]InOctets --> + <metric name="Bytes Received" alias="calc=1.3.6.1.4.1.789.1.22.1.2.1.[3,4]" category="THROUGHPUT" units="B" collectionType="trendsup" indicator="true"/> + <!-- calc=if[High,Low]OutOctets --> + <metric name="Bytes Sent" alias="calc=1.3.6.1.4.1.789.1.22.1.2.1.[15,16]" category="THROUGHPUT" units="B" collectionType="trendsup" indicator="true"/> + <!-- calc=if[High,Low]InUcastPkts --> + <metric name="Inbound Unicast Packets" alias="calc=1.3.6.1.4.1.789.1.22.1.2.1.[5,6]" category="THROUGHPUT" units="B" collectionType="trendsup"/> + <!-- calc=if[High,Low]OutUcastPkts --> + <metric name="OutBound Unicast Packets" alias="calc=1.3.6.1.4.1.789.1.22.1.2.1.[17,18]" category="THROUGHPUT" units="B" collectionType="trendsup"/> + <!-- calc=if[High,Low]InNUcastPkts --> + <metric name="Inbound Non-Unicast Packets" alias="calc=1.3.6.1.4.1.789.1.22.1.2.1.[7,8]" category="THROUGHPUT" units="B" collectionType="trendsup"/> + <!-- calc=if[High,Low]OutNUcastPkts --> + <metric name="OutBound Non-Unicast Packets" alias="calc=1.3.6.1.4.1.789.1.22.1.2.1.[19,20]" category="THROUGHPUT" units="B" collectionType="trendsup"/> + <!-- calc=if[High,Low]InDiscards --> + <metric name="Inbound Packets Discarded" alias="calc=1.3.6.1.4.1.789.1.22.1.2.1.[9,10]" category="THROUGHPUT" units="B" collectionType="trendsup"/> + <!-- calc=if[High,Low]OutDiscards --> + <metric name="OutBound Packets Discarded" alias="calc=1.3.6.1.4.1.789.1.22.1.2.1.[21,22]" category="THROUGHPUT" units="B" collectionType="trendsup"/> + <!-- calc=if[High,Low]InErrors --> + <metric name="Inbound Packets Errors" alias="calc=1.3.6.1.4.1.789.1.22.1.2.1.[11,12]" category="THROUGHPUT" units="B" collectionType="trendsup"/> + <!-- calc=if[High,Low]OutErrors --> + <metric name="OutBound Packets Errors" alias="calc=1.3.6.1.4.1.789.1.22.1.2.1.[23,24]" category="THROUGHPUT" units="B" collectionType="trendsup"/> + <!-- calc=if[High,Low]InUnknownProtos --> + <metric name="Inbound Packets Protocol Errors" alias="calc=1.3.6.1.4.1.789.1.22.1.2.1.[13,14]" category="THROUGHPUT" units="B" collectionType="trendsup"/> + </service> + + <service name="CIFS Server"> + <plugin type="measurement" class="org.hyperic.hq.plugin.netapp.NetAppMeasurement"/> + <filter name="template" value="${snmp.template}:${alias}"/> + <!-- cifsIsEnabled --> + <metric name="Availability" template="${snmp.template},AvailOK=2:1.3.6.1.4.1.789.1.7.1.1.0" indicator="true"/> + <!-- cifsNSessions --> + <metric name="Sessions" alias="1.3.6.1.4.1.789.1.7.2.12.0" indicator="true" units="none"/> + <!-- cifsNOpenFiles --> + <metric name="Open Files" alias="1.3.6.1.4.1.789.1.7.2.13.0" indicator="true" units="none"/> + <!-- cifsTotalOps --> + <metric name="Operations" alias="1.3.6.1.4.1.789.1.7.3.1.1.1.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- cifsTotalCalls --> + <metric name="Calls" alias="1.3.6.1.4.1.789.1.7.3.1.1.2.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- cifsBadCalls --> + <metric name="Bad Calls" alias="1.3.6.1.4.1.789.1.7.3.1.1.3.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- cifsGetAttrs --> + <metric name="GetAttr" alias="1.3.6.1.4.1.789.1.7.3.1.1.4.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- cifsReads --> + <metric name="Read" alias="1.3.6.1.4.1.789.1.7.3.1.1.5.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- cifsWrites --> + <metric name="Write" alias="1.3.6.1.4.1.789.1.7.3.1.1.6.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- cifsLocks --> + <metric name="Lock" alias="1.3.6.1.4.1.789.1.7.3.1.1.7.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- cifsOpens --> + <metric name="Open/Cl" alias="1.3.6.1.4.1.789.1.7.3.1.1.8.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- cifsDirOps --> + <metric name="Direct" alias="1.3.6.1.4.1.789.1.7.3.1.1.9.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- cifsOthers --> + <metric name="Other" alias="1.3.6.1.4.1.789.1.7.3.1.1.10.0" indicator="true" collectionType="trendsup" units="none"/> + </service> + + <service name="NFS server v2"> + <plugin type="measurement" class="org.hyperic.hq.plugin.netapp.NetAppMeasurement"/> + + <filter name="template" value="${snmp.template}:${alias}"/> + <!-- nfsIsLicensed --> + <metric name="Availability" template="${snmp.template},AvailOK=2:1.3.6.1.4.1.789.1.3.3.1.0" indicator="true"/> + <!-- tv2Read512Calls --> + <metric name="Read request 0-511" alias="1.3.6.1.4.1.789.1.3.2.2.6.1.1.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Write512Calls --> + <metric name="Write request 0-511" alias="1.3.6.1.4.1.789.1.3.2.2.6.2.1.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Read1KCalls --> + <metric name="Read request 512-1023" alias="1.3.6.1.4.1.789.1.3.2.2.6.1.2.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Write1KCalls --> + <metric name="Write request 512-1023" alias="1.3.6.1.4.1.789.1.3.2.2.6.2.2.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Read2KCalls --> + <metric name="Read request 1K-2047" alias="1.3.6.1.4.1.789.1.3.2.2.6.1.3.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Write2KCalls --> + <metric name="Write request 1K-2047" alias="1.3.6.1.4.1.789.1.3.2.2.6.2.3.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Read4KCalls --> + <metric name="Read request 2K-4095" alias="1.3.6.1.4.1.789.1.3.2.2.6.1.4.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Write4KCalls --> + <metric name="Write request 2K-4095" alias="1.3.6.1.4.1.789.1.3.2.2.6.2.4.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Read8KCalls --> + <metric name="Read request 4K-8191" alias="1.3.6.1.4.1.789.1.3.2.2.6.1.5.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Write8KCalls --> + <metric name="Write request 4K-8191" alias="1.3.6.1.4.1.789.1.3.2.2.6.2.5.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Read16KCalls --> + <metric name="Read request 8K-16383" alias="1.3.6.1.4.1.789.1.3.2.2.6.1.6.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Write16KCalls --> + <metric name="Write request 8K-16383" alias="1.3.6.1.4.1.789.1.3.2.2.6.2.6.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Read32KCalls --> + <metric name="Read request 16K-32767" alias="1.3.6.1.4.1.789.1.3.2.2.6.1.7.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Write32KCalls --> + <metric name="Write request 16K-32767" alias="1.3.6.1.4.1.789.1.3.2.2.6.2.7.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Read128KCalls --> + <metric name="Read request 64K-131071" alias="1.3.6.1.4.1.789.1.3.2.2.6.1.9.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Write64KCalls --> + <metric name="Write request 32K-65535" alias="1.3.6.1.4.1.789.1.3.2.2.6.2.8.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Read64KCalls --> + <metric name="Read request 32K-65535" alias="1.3.6.1.4.1.789.1.3.2.2.6.1.8.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv2Write128KCalls --> + <metric name="Write request 64K-131071" alias="1.3.6.1.4.1.789.1.3.2.2.6.2.9.0" indicator="true" collectionType="trendsup" units="none"/> + </service> + + <service name="NFS server v3"> + <plugin type="measurement" class="org.hyperic.hq.plugin.netapp.NetAppMeasurement"/> + <filter name="template" value="${snmp.template}:${alias}"/> + <!-- nfsIsLicensed --> + <metric name="Availability" template="${snmp.template},AvailOK=2:1.3.6.1.4.1.789.1.3.3.1.0" indicator="true"/> + <!-- tv3Read512Calls --> + <metric name="Read request 0-511" alias="1.3.6.1.4.1.789.1.3.2.2.6.3.1.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Write512Calls --> + <metric name="Write request 0-511" alias="1.3.6.1.4.1.789.1.3.2.2.6.4.1.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Read1KCalls --> + <metric name="Read request 512-1023" alias="1.3.6.1.4.1.789.1.3.2.2.6.3.2.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Write1KCalls --> + <metric name="Write request 512-1023" alias="1.3.6.1.4.1.789.1.3.2.2.6.4.2.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Read2KCalls --> + <metric name="Read request 1K-2047" alias="1.3.6.1.4.1.789.1.3.2.2.6.3.3.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Write2KCalls --> + <metric name="Write request 1K-2047" alias="1.3.6.1.4.1.789.1.3.2.2.6.4.3.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Read4KCalls --> + <metric name="Read request 2K-4095" alias="1.3.6.1.4.1.789.1.3.2.2.6.3.4.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Write4KCalls --> + <metric name="Write request 2K-4095" alias="1.3.6.1.4.1.789.1.3.2.2.6.4.4.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Read8KCalls --> + <metric name="Read request 4K-8191" alias="1.3.6.1.4.1.789.1.3.2.2.6.3.5.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Write8KCalls --> + <metric name="Write request 4K-8191" alias="1.3.6.1.4.1.789.1.3.2.2.6.4.5.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Read16KCalls --> + <metric name="Read request 8K-16383" alias="1.3.6.1.4.1.789.1.3.2.2.6.3.6.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Write16KCalls --> + <metric name="Write request 8K-16383" alias="1.3.6.1.4.1.789.1.3.2.2.6.4.6.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Read32KCalls --> + <metric name="Read request 16K-32767" alias="1.3.6.1.4.1.789.1.3.2.2.6.3.7.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Write32KCalls --> + <metric name="Write request 16K-32767" alias="1.3.6.1.4.1.789.1.3.2.2.6.4.7.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Read128KCalls --> + <metric name="Read request 64K-131071" alias="1.3.6.1.4.1.789.1.3.2.2.6.3.9.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Write64KCalls --> + <metric name="Write request 32K-65535" alias="1.3.6.1.4.1.789.1.3.2.2.6.4.8.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Read64KCalls --> + <metric name="Read request 32K-65535" alias="1.3.6.1.4.1.789.1.3.2.2.6.3.8.0" indicator="true" collectionType="trendsup" units="none"/> + <!-- tv3Write128KCalls --> + <metric name="Write request 64K-131071" alias="1.3.6.1.4.1.789.1.3.2.2.6.4.9.0" indicator="true" collectionType="trendsup" units="none"/> + </service> + </server> + </platform> +</plugin> \ No newline at end of file Added: trunk/plugins/netapp/src/org/hyperic/hq/plugin/netapp/NetAppMeasurement.java =================================================================== --- trunk/plugins/netapp/src/org/hyperic/hq/plugin/netapp/NetAppMeasurement.java (rev 0) +++ trunk/plugins/netapp/src/org/hyperic/hq/plugin/netapp/NetAppMeasurement.java 2010-03-01 18:32:14 UTC (rev 14336) @@ -0,0 +1,78 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.hyperic.hq.plugin.netapp; + +import org.apache.commons.logging.Log; +import org.hyperic.hq.product.Metric; +import org.hyperic.hq.product.MetricNotFoundException; +import org.hyperic.hq.product.MetricUnreachableException; +import org.hyperic.hq.product.MetricValue; +import org.hyperic.hq.product.PluginException; +import org.hyperic.hq.product.SNMPMeasurementPlugin; +import org.hyperic.util.config.ConfigResponse; + +/** + * + * @author laullon + */ +public class NetAppMeasurement extends SNMPMeasurementPlugin { + + Log log = getLog(); + private final static double HIGH = Math.pow(2, 32); + + public String translate(String template, ConfigResponse config) { + template = super.translate(template, config); + if ((template.contains("AvailOK=")) || (template.contains(":calc="))) { + log.debug("[translate] --> " + template); + template = template.replace(":" + SNMPMeasurementPlugin.DOMAIN + ":", ":calc_" + SNMPMeasurementPlugin.DOMAIN + ":"); + template = template.replaceAll("calc=([^\\[]*)\\[([^,]*),([^\\]]*)\\]([^_|:]*)", "calc=$1$2$4,$1$3$4"); + log.debug("[translate] <-- " + template); + } + + return template; + } + + public MetricValue getValue(Metric metric) throws MetricUnreachableException, MetricNotFoundException, PluginException { + MetricValue res = null; + + if (metric.getAttributeName().startsWith("calc=")) { + String template_a = metric.toString().replaceAll("calc=([^,]*),([^$|:]*)", "$1"); + String template_b = metric.toString().replaceAll("calc=([^,]*),([^$|:]*)", "$2"); + + Metric metric_a = Metric.parse(template_a); + Metric metric_b = Metric.parse(template_b); + if (log.isDebugEnabled()) { + log.debug("[getValue] " + metric_a + "'"); + log.debug("[getValue] " + metric_b + "'"); + } + + double res_a = super.getValue(metric_a).getValue(); + double res_b = super.getValue(metric_b).getValue(); + + res = new MetricValue((res_a * HIGH) + res_b); + if (log.isDebugEnabled()) { + log.debug("[getValue] " + metric_a.getAttributeName() + " = '" + res_a + "'"); + log.debug("[getValue] " + metric_b.getAttributeName() + " = '" + res_b + "'"); + log.debug("[getValue] res = '" + res + "'"); + } + } else if (metric.getObjectProperty("AvailOK") != null) { + double resOK = Double.parseDouble(metric.getObjectProperty("AvailOK")); + res = super.getValue(metric); + + if (log.isDebugEnabled()) { + log.debug("[getValue] " + metric.getAttributeName() + " = '" + res + "' (AvailOK=" + resOK + ")"); + } + + if (res.getValue() == resOK) { + res = new MetricValue(Metric.AVAIL_UP); + } else { + res = new MetricValue(Metric.AVAIL_DOWN); + } + } else { + res = super.getValue(metric); + } + return res; + } +} Added: trunk/plugins/netapp/src/org/hyperic/hq/plugin/netapp/NetAppPlatformDetector.java =================================================================== --- trunk/plugins/netapp/src/org/hyperic/hq/plugin/netapp/NetAppPlatformDetector.java (rev 0) +++ trunk/plugins/netapp/src/org/hyperic/hq/plugin/netapp/NetAppPlatformDetector.java 2010-03-01 18:32:14 UTC (rev 14336) @@ -0,0 +1,36 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.hyperic.hq.plugin.netapp; + +import org.apache.commons.logging.Log; +import org.hyperic.hq.plugin.netdevice.NetworkDevicePlatformDetector; +import org.hyperic.hq.product.PlatformDetector; +import org.hyperic.hq.product.PlatformResource; +import org.hyperic.hq.product.PluginException; +import org.hyperic.hq.product.ProductPlugin; +import org.hyperic.snmp.SNMPClient; +import org.hyperic.util.config.ConfigResponse; + +/** + * + * @author administrator + */ +public class NetAppPlatformDetector extends NetworkDevicePlatformDetector { + + private Log log = getLog(); + + public PlatformResource getPlatformResource(ConfigResponse config) throws PluginException { + log.debug("[getPlatformResource] config=" + config); + String platformIp = config.getValue(ProductPlugin.PROP_PLATFORM_IP); + + config.setValue(SNMPClient.PROP_IP, platformIp); + config.setValue(SNMPClient.PROP_VERSION, SNMPClient.VALID_VERSIONS[0]); + config.setValue(SNMPClient.PROP_COMMUNITY, SNMPClient.DEFAULT_COMMUNITY); + config.setValue(SNMPClient.PROP_PORT, SNMPClient.DEFAULT_PORT_STRING); + + PlatformResource res = super.getPlatformResource(config); + return res; + } +} Added: trunk/plugins/netapp/src/org/hyperic/hq/plugin/netapp/NetAppServicesDetector.java =================================================================== --- trunk/plugins/netapp/src/org/hyperic/hq/plugin/netapp/NetAppServicesDetector.java (rev 0) +++ trunk/plugins/netapp/src/org/hyperic/hq/plugin/netapp/NetAppServicesDetector.java 2010-03-01 18:32:14 UTC (rev 14336) @@ -0,0 +1,88 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.hyperic.hq.plugin.netapp; + +import java.util.ArrayList; +import java.util.List; +import org.apache.commons.logging.Log; +import org.hyperic.hq.product.PlatformServiceDetector; +import org.hyperic.hq.product.PluginException; +import org.hyperic.hq.product.SNMPDetector; +import org.hyperic.hq.product.ServerResource; +import org.hyperic.hq.product.ServiceResource; +import org.hyperic.snmp.SNMPClient; +import org.hyperic.snmp.SNMPException; +import org.hyperic.snmp.SNMPSession; +import org.hyperic.util.config.ConfigResponse; + +/** + * + * @author laullon + */ +public class NetAppServicesDetector extends PlatformServiceDetector { + + private Log log = getLog(); + + private SNMPSession getSession(ConfigResponse config) { + SNMPSession res = null; + try { + config.setValue(SNMPClient.PROP_VERSION, SNMPClient.VALID_VERSIONS[0]); + res = new SNMPClient().getSession(config); + } catch (SNMPException e) { + log.error("Error getting SNMP session: " + e.getMessage(), e); + } + return res; + } + + public List getServerResources(ConfigResponse config) { + List res = new ArrayList(); + log.debug("[getServerResources] netapp:'" + config.getValue(SNMPClient.PROP_IP) + "' config=" + config); + if (config.getValue(SNMPClient.PROP_IP) != null) { + ServerResource server = getServer(config); + server.setProductConfig(config); + res.add(server); + } + return res; + } + + protected List discoverServices(ConfigResponse config) throws PluginException { + log.debug("[discoverServices] netapp:'" + config.getValue("snmpIp") + "' config=" + config); + List extServices = new ArrayList(); + + try { + extServices.addAll(SNMPDetector.discoverServices(this, config, getSession(config))); + } catch (PluginException e) { + log.debug("Error discoverServices netapp:'" + config.getValue("snmpIp") + "'" + e.getMessage(), e); + } + + ServiceResource s_cifs = new ServiceResource(); + s_cifs.setType(config.getValue("platform.type") + " CIFS Server"); + s_cifs.setServiceName("CIFS Server"); + s_cifs.setProductConfig(); + s_cifs.setMeasurementConfig(); + s_cifs.setResponseTimeConfig(new ConfigResponse()); + extServices.add(s_cifs); + + ServiceResource s_nfs_v3 = new ServiceResource(); + s_nfs_v3.setType(config.getValue("platform.type") + " NFS server v3"); + s_nfs_v3.setServiceName("NFS server v3"); + s_nfs_v3.setProductConfig(); + s_nfs_v3.setMeasurementConfig(); + s_nfs_v3.setResponseTimeConfig(new ConfigResponse()); + extServices.add(s_nfs_v3); + + ServiceResource s_nfs_v2 = new ServiceResource(); + s_nfs_v2.setType(config.getValue("platform.type") + " NFS server v2"); + s_nfs_v2.setServiceName("NFS server v2"); + s_nfs_v2.setProductConfig(); + s_nfs_v2.setMeasurementConfig(); + s_nfs_v2.setResponseTimeConfig(new ConfigResponse()); + extServices.add(s_nfs_v2); + + log.debug("[discoverServices] netapp:'" + config.getValue("snmpIp") + "' -> " + extServices.size() + " services"); + + return extServices; + } +} |
|
From: <pn...@hy...> - 2010-03-01 18:00:08
|
Author: pnguyen Date: 2010-03-01 09:59:47 -0800 (Mon, 01 Mar 2010) New Revision: 14335 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14335 Modified: trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java Log: [HHQ-3594] Add additional async delete check Modified: trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java 2010-03-01 09:20:57 UTC (rev 14334) +++ trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java 2010-03-01 17:59:47 UTC (rev 14335) @@ -1255,19 +1255,23 @@ AvailabilityDownAlertDefinitionCache.getInstance(); synchronized (cache) { - cache.remove(def.getAppdefEntityId()); + if (isOkToRemove(def)) { + cache.remove(def.getAppdefEntityId()); + } - AlertDefinition childDef = null; for (Iterator it=def.getChildren().iterator(); it.hasNext(); ) { - childDef = (AlertDefinition) it.next(); - Resource r = childDef.getResource(); - if (r == null || r.isInAsyncDeleteState()) { - continue; + AlertDefinition childDef = (AlertDefinition) it.next(); + if (isOkToRemove(childDef)) { + cache.remove(childDef.getAppdefEntityId()); } - cache.remove(childDef.getAppdefEntityId()); } } } + + private boolean isOkToRemove(AlertDefinition def) { + Resource r = def.getResource(); + return (r != null && !r.isInAsyncDeleteState()); + } }); } |
14 messages has been excluded from this view by a project administrator.
