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: Doug M. <do...@hy...> - 2010-02-16 18:10:16
|
Hi Zsolt, See: http://jira.hyperic.com/browse/SIGAR-161 You can build from the 1.6 branch, or apply the patch to 1.6.3: http://github.com/hyperic/sigar/commit/a355ba22c9a4469edb71911cb482bb11fe5853c5 Sigar was also recently added to the ports build, which includes a similar patch to build on 8.0: http://www.freebsd.org/cgi/cvsweb.cgi/ports/sysutils/hyperic-sigar/ |
|
From: Doug M. <do...@hy...> - 2010-02-16 18:07:13
|
Hi, We haven't seen any issues using the 1.6 jre on s390x: IBM J9 VM (build 2.4, J2RE 1.6.0 IBM J9 2.4 Linux s390x-64 jvmxz6460-20080416_18762 (JIT enabled, AOT enabled) Can you try with a 1.6 jre? |
|
From: <dcr...@hy...> - 2010-02-16 18:00:55
|
Author: dcrutchf Date: 2010-02-16 10:00:47 -0800 (Tue, 16 Feb 2010) New Revision: 14294 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14294 Modified: trunk/installer/data/db-upgrade.xml trunk/sql/authz-data.xml Log: Updated to include view permission for escalation and create permission for groups (however, they are still not being enforced, will tackle that in another sprint task) Modified: trunk/installer/data/db-upgrade.xml =================================================================== --- trunk/installer/data/db-upgrade.xml 2010-02-16 09:28:23 UTC (rev 14293) +++ trunk/installer/data/db-upgrade.xml 2010-02-16 18:00:47 UTC (rev 14294) @@ -10885,6 +10885,22 @@ precision="500" columnType="VARCHAR2" /> </schemaSpec> + <schemaSpec version="3.194"> + <schema-directSQL> + <statement desc="Adding create group permission..."> + 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); + </statement> + <statement desc="Adding create group permission to all existing roles (for backwards-compatibility)..."> + INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) SELECT ID,29 FROM EAM_ROLE; + </statement> + <statement desc="Adding view escalation permission to all existing roles (for backwards-compatibility)..."> + INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) SELECT ID,415 FROM EAM_ROLE; + </statement> + </schema-directSQL> + </schemaSpec> </dbupgrade> </target> </project> Modified: trunk/sql/authz-data.xml =================================================================== --- trunk/sql/authz-data.xml 2010-02-16 09:28:23 UTC (rev 14293) +++ trunk/sql/authz-data.xml 2010-02-16 18:00:47 UTC (rev 14294) @@ -193,7 +193,9 @@ NAME="addRole"/> <data ID="28" RESOURCE_TYPE_ID="%EAM_RESOURCE_TYPE.ID:3" NAME="viewResourceGroup"/> - + <data ID="29" RESOURCE_TYPE_ID="%EAM_RESOURCE_TYPE.ID:3" + NAME="createResourceGroup"/> + <!-- new operations that are added here because it sucks to have to move every single id stated before this line --> <!-- remove role --> @@ -337,6 +339,8 @@ NAME="modifyEscalation"/> <data ID="414" RESOURCE_TYPE_ID="%EAM_RESOURCE_TYPE.ID:0" NAME="removeEscalation"/> + <data ID="415" RESOURCE_TYPE_ID="%EAM_RESOURCE_TYPE.ID:0" + NAME="viewEscalation"/> </table> @@ -449,6 +453,7 @@ <data OPERATION_ID="%EAM_OPERATION.ID:24" ROLE_ID="%EAM_ROLE.ID:0"/> <data OPERATION_ID="%EAM_OPERATION.ID:25" ROLE_ID="%EAM_ROLE.ID:0"/> <data OPERATION_ID="%EAM_OPERATION.ID:28" ROLE_ID="%EAM_ROLE.ID:0"/> + <data OPERATION_ID="%EAM_OPERATION.ID:29" ROLE_ID="%EAM_ROLE.ID:0"/> <data OPERATION_ID="%EAM_OPERATION.ID:301" ROLE_ID="%EAM_ROLE.ID:0"/> <data OPERATION_ID="%EAM_OPERATION.ID:302" ROLE_ID="%EAM_ROLE.ID:0"/> <data OPERATION_ID="%EAM_OPERATION.ID:303" ROLE_ID="%EAM_ROLE.ID:0"/> @@ -486,6 +491,7 @@ <data OPERATION_ID="%EAM_OPERATION.ID:412" ROLE_ID="%EAM_ROLE.ID:0"/> <data OPERATION_ID="%EAM_OPERATION.ID:413" ROLE_ID="%EAM_ROLE.ID:0"/> <data OPERATION_ID="%EAM_OPERATION.ID:414" ROLE_ID="%EAM_ROLE.ID:0"/> + <data OPERATION_ID="%EAM_OPERATION.ID:415" ROLE_ID="%EAM_ROLE.ID:0"/> </table> <!-- RESOURCE CREATOR ROLE DEFINITION STUFF. The entries here |
|
From: <bo...@hy...> - 2010-02-16 09:28:32
|
Author: bob Date: 2010-02-16 01:28:23 -0800 (Tue, 16 Feb 2010) New Revision: 14293 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14293 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1352 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-02-15 09:26:52 UTC (rev 14292) +++ trunk/etc/version.properties 2010-02-16 09:28:23 UTC (rev 14293) @@ -1,3 +1,3 @@ -#Mon Feb 15 00:28:37 PST 2010 +#Tue Feb 16 00:30:34 PST 2010 version=4.3.0 -build=1351 +build=1352 |
|
From: <bo...@hy...> - 2010-02-15 09:27:02
|
Author: bob Date: 2010-02-15 01:26:52 -0800 (Mon, 15 Feb 2010) New Revision: 14292 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14292 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1351 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-02-15 07:17:06 UTC (rev 14291) +++ trunk/etc/version.properties 2010-02-15 09:26:52 UTC (rev 14292) @@ -1,3 +1,3 @@ -#Sun Feb 14 00:28:59 PST 2010 +#Mon Feb 15 00:28:37 PST 2010 version=4.3.0 -build=1350 +build=1351 |
|
From: <dcr...@hy...> - 2010-02-15 07:17:15
|
Author: dcrutchf Date: 2010-02-14 23:17:06 -0800 (Sun, 14 Feb 2010) New Revision: 14291 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14291 Modified: trunk/src/org/hyperic/hq/authz/server/session/RoleManagerEJBImpl.java trunk/src/org/hyperic/hq/authz/shared/PermissionManager.java trunk/src/org/hyperic/hq/authz/shared/PermissionManagerImpl.java trunk/src/org/hyperic/hq/authz/shared/ResourceOperationsHelper.java trunk/web/WEB-INF/classes/ApplicationResources.properties trunk/web/css/HQ_40.css Log: Changed the role permission view to make it simpler and hopefully more usable. Modified: trunk/src/org/hyperic/hq/authz/server/session/RoleManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/authz/server/session/RoleManagerEJBImpl.java 2010-02-14 09:26:41 UTC (rev 14290) +++ trunk/src/org/hyperic/hq/authz/server/session/RoleManagerEJBImpl.java 2010-02-15 07:17:06 UTC (rev 14291) @@ -593,41 +593,20 @@ } /** - * Get role permission Map + * Get operations * For a given role id, find the resource types and permissions * which are supported by it * @param subject * @param roleId - * @return map - keys are resource type names, values are lists of operation - * values which are supported on the resouce type. + * @return list - values are lists of operation * @ejb:interface-method */ - public Map getRoleOperationMap(AuthzSubject subject, Integer roleId) + public List getRoleOperations(AuthzSubject subject, Integer roleId) throws PermissionException { - Map theMap = new HashMap(); // find the role by id Role role = getRoleDAO().findById(roleId); // now get the operations - Collection operations = role.getOperations(); - // now for each operation, get the supported resource type - Iterator operationIt = operations.iterator(); - while (operationIt.hasNext()) { - Operation anOp = (Operation) operationIt.next(); - // now get the resource Type for the op - ResourceType resType = anOp.getResourceType(); - // check if there's a key for this entry - if (theMap.containsKey(resType.getName())) { - // looks like this res type is accounted for - // add the operation to the list - ((List) theMap.get(resType.getName())).add(anOp); - } else { - // key's not there, add it - List opList = new ArrayList(); - opList.add(anOp); - theMap.put(resType.getName(), opList); - } - } - return theMap; + return new ArrayList(role.getOperations()); } /** Modified: trunk/src/org/hyperic/hq/authz/shared/PermissionManager.java =================================================================== --- trunk/src/org/hyperic/hq/authz/shared/PermissionManager.java 2010-02-14 09:26:41 UTC (rev 14290) +++ trunk/src/org/hyperic/hq/authz/shared/PermissionManager.java 2010-02-15 07:17:06 UTC (rev 14291) @@ -25,8 +25,12 @@ package org.hyperic.hq.authz.shared; +import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.Map; import javax.ejb.FinderException; @@ -34,6 +38,7 @@ import org.hyperic.hq.appdef.shared.CloningBossInterface; import org.hyperic.hq.authz.server.session.AuthzSession; import org.hyperic.hq.authz.server.session.AuthzSubject; +import org.hyperic.hq.authz.server.session.Operation; import org.hyperic.hq.authz.server.session.PagerProcessor_operation; import org.hyperic.hq.authz.server.session.Resource; import org.hyperic.hq.authz.server.session.ResourceType; @@ -188,7 +193,7 @@ public abstract List getAllOperations(AuthzSubject subject, PageControl pc) throws PermissionException, FinderException; - + public abstract String getResourceTypeSQL(String instanceId, Integer subjectId, String resType, Modified: trunk/src/org/hyperic/hq/authz/shared/PermissionManagerImpl.java =================================================================== --- trunk/src/org/hyperic/hq/authz/shared/PermissionManagerImpl.java 2010-02-14 09:26:41 UTC (rev 14290) +++ trunk/src/org/hyperic/hq/authz/shared/PermissionManagerImpl.java 2010-02-15 07:17:06 UTC (rev 14291) @@ -31,8 +31,11 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; import javax.ejb.FinderException; @@ -357,7 +360,7 @@ } return operationPager.seek(ops, pc.getPagenum(), pc.getPagesize()); } - + public Collection getGroupResources(Integer subjectId, Integer groupId, Boolean fsystem) { return getResourceDAO().findInGroup_orderName(groupId, fsystem); Modified: trunk/src/org/hyperic/hq/authz/shared/ResourceOperationsHelper.java =================================================================== --- trunk/src/org/hyperic/hq/authz/shared/ResourceOperationsHelper.java 2010-02-14 09:26:41 UTC (rev 14290) +++ trunk/src/org/hyperic/hq/authz/shared/ResourceOperationsHelper.java 2010-02-15 07:17:06 UTC (rev 14291) @@ -1,47 +1,100 @@ package org.hyperic.hq.authz.shared; +import java.util.ArrayList; +import java.util.List; + import org.hyperic.hq.appdef.shared.AppdefEntityConstants; import org.hyperic.hq.authz.server.session.Resource; public class ResourceOperationsHelper { + // This number should be equal to the max number of operation codes per resource + private final static int MULTIPLIER = 6; + // Resource type codes... - private final static int PLATFORM = 0; - private final static int SERVER = 5; - private final static int SERVICE = 10; - private final static int GROUP = 15; + public final static int PLATFORM = 0; + public final static int SERVER = 1 * MULTIPLIER; + public final static int SERVICE = 2 * MULTIPLIER; + public final static int GROUP = 3 * MULTIPLIER; + public final static int APPLICATION = 4 * MULTIPLIER; + public final static int USER = 5 * MULTIPLIER; + public final static int ROLE = 6 * MULTIPLIER; + public final static int ESCALATION = 7 * MULTIPLIER; // Operation codes...these are added to the resource type code to get the actual operation - private final static int CREATE = 0; - private final static int READ = 1; - private final static int UPDATE = 2; - private final static int DELETE = 3; - private final static int MANAGE_ALERTS = 4; + public final static int CREATE = 0; + public final static int READ = 1; + public final static int UPDATE = 2; + public final static int DELETE = 3; + public final static int MANAGE_ALERTS = 4; + public final static int MANAGE_CONTROLS = 5; - // Array containing all the operations for each resource type... - // ORDER IS IMPORTANT! - private final static String[] operationsArray = { - AuthzConstants.platformOpCreatePlatform, - AuthzConstants.platformOpViewPlatform, - AuthzConstants.platformOpModifyPlatform, - AuthzConstants.platformOpRemovePlatform, - AuthzConstants.platformOpManageAlerts, - AuthzConstants.serverOpCreateServer, - AuthzConstants.serverOpViewServer, - AuthzConstants.serverOpModifyServer, - AuthzConstants.serverOpRemoveServer, - AuthzConstants.serverOpManageAlerts, - AuthzConstants.serviceOpCreateService, - AuthzConstants.serviceOpViewService, - AuthzConstants.serviceOpModifyService, - AuthzConstants.serviceOpRemoveService, - AuthzConstants.serviceOpManageAlerts, - AuthzConstants.groupOpCreateResourceGroup, - AuthzConstants.groupOpViewResourceGroup, - AuthzConstants.groupOpModifyResourceGroup, - AuthzConstants.groupOpRemoveResourceGroup, - AuthzConstants.groupOpManageAlerts - }; + // Permission Levels... + public final static int NO_PERMISSIONS = 0; + public final static int READ_ONLY_PERMISSION = 1; + public final static int READ_WRITE_PERMISSIONS = 2; + public final static int FULL_PERMISSIONS = 3; + + private static List operationsList; + + public ResourceOperationsHelper() { + // ArrayList containing all the operations for each resource type... + // ORDER IS IMPORTANT! + operationsList = new ArrayList(48); + + operationsList.add(AuthzConstants.platformOpCreatePlatform); + operationsList.add(AuthzConstants.platformOpViewPlatform); + operationsList.add(AuthzConstants.platformOpModifyPlatform); + operationsList.add(AuthzConstants.platformOpRemovePlatform); + operationsList.add(AuthzConstants.platformOpManageAlerts); + operationsList.add(AuthzConstants.platformOpControlPlatform); + operationsList.add(AuthzConstants.serverOpCreateServer); + operationsList.add(AuthzConstants.serverOpViewServer); + operationsList.add(AuthzConstants.serverOpModifyServer); + operationsList.add(AuthzConstants.serverOpRemoveServer); + operationsList.add(AuthzConstants.serverOpManageAlerts); + operationsList.add(AuthzConstants.serverOpControlServer); + operationsList.add(AuthzConstants.serviceOpCreateService); + operationsList.add(AuthzConstants.serviceOpViewService); + operationsList.add(AuthzConstants.serviceOpModifyService); + operationsList.add(AuthzConstants.serviceOpRemoveService); + operationsList.add(AuthzConstants.serviceOpManageAlerts); + operationsList.add(AuthzConstants.serviceOpControlService); + operationsList.add(AuthzConstants.groupOpCreateResourceGroup); + operationsList.add(AuthzConstants.groupOpViewResourceGroup); + operationsList.add(AuthzConstants.groupOpModifyResourceGroup); + operationsList.add(AuthzConstants.groupOpRemoveResourceGroup); + operationsList.add(AuthzConstants.groupOpManageAlerts); + operationsList.add(null); + operationsList.add(AuthzConstants.appOpCreateApplication); + operationsList.add(AuthzConstants.appOpViewApplication); + operationsList.add(AuthzConstants.appOpModifyApplication); + operationsList.add(AuthzConstants.appOpRemoveApplication); + operationsList.add(null); + operationsList.add(AuthzConstants.appOpControlApplication); + operationsList.add(AuthzConstants.subjectOpCreateSubject); + operationsList.add(AuthzConstants.subjectOpViewSubject); + operationsList.add(AuthzConstants.subjectOpModifySubject); + operationsList.add(AuthzConstants.subjectOpRemoveSubject); + operationsList.add(null); + operationsList.add(null); + operationsList.add(AuthzConstants.roleOpCreateRole); + operationsList.add(AuthzConstants.roleOpViewRole); + operationsList.add(AuthzConstants.roleOpModifyRole); + operationsList.add(AuthzConstants.roleOpRemoveRole); + operationsList.add(null); + operationsList.add(null); + operationsList.add(AuthzConstants.escOpCreateEscalation); + operationsList.add(AuthzConstants.escOpViewEscalation); + operationsList.add(AuthzConstants.escOpModifyEscalation); + operationsList.add(AuthzConstants.escOpRemoveEscalation); + operationsList.add(null); + operationsList.add(null); + } + public String getOperationName(int resourceTypeCode, int operationCode) { + return (String) operationsList.get(resourceTypeCode + operationCode); + } + public String getCreateOperation(Resource resource) throws IllegalArgumentException { return getOperation(resource, CREATE); @@ -66,6 +119,11 @@ throws IllegalArgumentException { return getOperation(resource, MANAGE_ALERTS); } + + public String getManageControlOperation(Resource resource) + throws IllegalArgumentException { + return getOperation(resource, MANAGE_CONTROLS); + } public String getCreateOperation(int resourceTypeId) throws IllegalArgumentException { @@ -91,7 +149,12 @@ throws IllegalArgumentException { return getOperation(resourceTypeId, MANAGE_ALERTS); } - + + public String getManageControlOperation(int resourceTypeId) + throws IllegalArgumentException { + return getOperation(resourceTypeId, MANAGE_CONTROLS); + } + public String getResourceType(Resource resource) throws IllegalArgumentException, UnsupportedOperationException { if (resource == null || resource.getResourceType() == null) { @@ -151,6 +214,40 @@ throw new IllegalArgumentException("resourceType must be a platform, server, service or group resource type."); } - return operationsArray[resourceTypeCode + operationCode]; + return getOperationName(resourceTypeCode, operationCode); } + + public CodePair getResourceTypeOperationCodePair(String operationName) { + int index = operationsList.indexOf(operationName); + int resourceTypeCode = ((index < MULTIPLIER) ? 0 : index/MULTIPLIER) * MULTIPLIER; + int operationCode = index - resourceTypeCode; + + return new CodePair(resourceTypeCode, operationCode); + } + + public class CodePair { + int resourceTypeCode; + int operationCode; + + public CodePair(int resourceTypeCode, int operationCode) { + this.resourceTypeCode = resourceTypeCode; + this.operationCode = operationCode; + } + + public int getResourceTypeCode() { + return resourceTypeCode; + } + + public void setResourceTypeCode(int resourceTypeCode) { + this.resourceTypeCode = resourceTypeCode; + } + + public int getOperationCode() { + return operationCode; + } + + public void setOperationCode(int operationCode) { + this.operationCode = operationCode; + } + } } Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties =================================================================== --- trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-02-14 09:26:41 UTC (rev 14290) +++ trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-02-15 07:17:06 UTC (rev 14291) @@ -315,7 +315,7 @@ # admin.role.view.ReturnToRoles=<< Return to Roles # -admin.role.props.PropertiesAndPermissionsTab=Properties & Permissions +admin.role.props.PropertiesTab=Properties admin.role.props.GeneralPropertiesTab=General Properties admin.role.props.AlertCalendarTab=Alert Calendar admin.role.props.OwnerLabel=Owner: @@ -324,26 +324,26 @@ admin.role.props.administer.yes=YES admin.role.props.administer.no=NO admin.role.props.100=Please limit the description to 100 characters -# + admin.role.perms.PermissionsTab=Permissions admin.role.perms.ResourceTypeTH=Resource Type -admin.role.perms.type.covalentAuthzSubject=Users -admin.role.perms.type.covalentAuthzRole=Roles -admin.role.perms.type.covalentAuthzResourceGroup=Groups -admin.role.perms.type.covalentEAMPlatform=Platforms -admin.role.perms.type.covalentEAMServer=Servers -admin.role.perms.type.covalentEAMService=Services -admin.role.perms.type.covalentEAMApplication=Applications -admin.role.perms.type.EscalationScheme=Escalations -admin.role.perms.perm.view=View -admin.role.perms.perm.create=Create -admin.role.perms.perm.modify=Modify -admin.role.perms.perm.delete=Delete -admin.role.perms.perm.monitor=Monitor -admin.role.perms.perm.control=Control -admin.role.perms.perm.alert=Alerting -admin.role.perms.perm.CheckAll=Check All -# +admin.role.perms.type.users=Users +admin.role.perms.type.roles=Roles +admin.role.perms.type.groups=Groups +admin.role.perms.type.platforms=Platforms +admin.role.perms.type.servers=Servers +admin.role.perms.type.services=Services +admin.role.perms.type.applications=Applications +admin.role.perms.type.escalations=Escalations +admin.role.permissions.header=Permissions +admin.role.permissions.readOnly=Read Only +admin.role.permissions.readWrite=Read / Write +admin.role.permissions.full=Full +admin.role.permissions.none=None +admin.role.capabilities.header=Capabilities +admin.role.capabilities.alert=Can Fix/Ack Alerts? +admin.role.capabilities.control=Can Control? + admin.role.alert.AlertNotificationTab=Alert Notification Time Range admin.role.alert.ActiveLabel=Active: admin.role.alert.always=Always Modified: trunk/web/css/HQ_40.css =================================================================== --- trunk/web/css/HQ_40.css 2010-02-14 09:26:41 UTC (rev 14290) +++ trunk/web/css/HQ_40.css 2010-02-15 07:17:06 UTC (rev 14291) @@ -2606,4 +2606,30 @@ margin-top:15px; text-align:center; width:100%; +} + +.resourceTypeColumn { + padding: 8px 3px; + text-align: right; + width: 20%; +} + +.permissionColumn { + padding-left: 15px; +} + +.capabilitiesColumn { + padding-left: 5px; + width: 60%; +} + +.alertCapability { + width: 10%; +} + +.controlCapability { + width: 50%; +} +.bottomBorder { + border-bottom: 1px solid #eee; } \ No newline at end of file |
|
From: <bo...@hy...> - 2010-02-14 09:26:50
|
Author: bob Date: 2010-02-14 01:26:41 -0800 (Sun, 14 Feb 2010) New Revision: 14290 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14290 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1350 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-02-13 09:23:27 UTC (rev 14289) +++ trunk/etc/version.properties 2010-02-14 09:26:41 UTC (rev 14290) @@ -1,3 +1,3 @@ -#Sat Feb 13 00:28:00 PST 2010 +#Sun Feb 14 00:28:59 PST 2010 version=4.3.0 -build=1349 +build=1350 |
|
From: <bo...@hy...> - 2010-02-13 09:23:35
|
Author: bob Date: 2010-02-13 01:23:27 -0800 (Sat, 13 Feb 2010) New Revision: 14289 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14289 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1349 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-02-12 22:51:52 UTC (rev 14288) +++ trunk/etc/version.properties 2010-02-13 09:23:27 UTC (rev 14289) @@ -1,3 +1,3 @@ -#Fri Feb 12 00:29:27 PST 2010 +#Sat Feb 13 00:28:00 PST 2010 version=4.3.0 -build=1348 +build=1349 |
|
From: <tr...@hy...> - 2010-02-12 23:02:04
|
Author: trader Date: 2010-02-12 13:36:23 -0800 (Fri, 12 Feb 2010) New Revision: 14286 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14286 Modified: trunk/installer/src/org/hyperic/HQMain.java Log: HPD-171, HHQ-3514: DB Connections don't do any validation Oracle fix: mistakenly assumed Oracle databases all had the same server.database property "Oracle" but in fact it could be any of { Oracle8, Oracle9i, ...} New fix: check to see if the property exists and starts with "Oracle" -- if so, change the validation sql. Modified: trunk/installer/src/org/hyperic/HQMain.java =================================================================== --- trunk/installer/src/org/hyperic/HQMain.java 2010-02-12 21:17:45 UTC (rev 14285) +++ trunk/installer/src/org/hyperic/HQMain.java 2010-02-12 21:36:23 UTC (rev 14286) @@ -119,7 +119,8 @@ // Database connection validation: "select 1" except in the case of Oracle, // where it's "select 1 from dual" String validationSQL = "select 1"; - if ("Oracle".equals(symbols.getProperty("server.database"))) { + String dbProp = symbols.getProperty("server.database"); + if (dbProp != null && dbProp.startsWith("Oracle")) { validationSQL += " from dual"; } symbols.setProperty("server.connection-validation-sql", validationSQL); |
|
From: <rm...@hy...> - 2010-02-12 22:52:01
|
Author: rmorgan Date: 2010-02-12 14:51:52 -0800 (Fri, 12 Feb 2010) New Revision: 14288 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14288 Added: trunk/plugins/netdevice/mibs/SNMP-FRAMEWORK-MIB.txt Modified: trunk/plugins/netdevice/etc/hq-plugin.xml Log: [HHQ-3733] Add metric "Engine Time" that tracks snmpEngineTime. Unlike systemUpTime, snmpEngineUptime does not roll over every 496 days. Modified: trunk/plugins/netdevice/etc/hq-plugin.xml =================================================================== --- trunk/plugins/netdevice/etc/hq-plugin.xml 2010-02-12 22:28:48 UTC (rev 14287) +++ trunk/plugins/netdevice/etc/hq-plugin.xml 2010-02-12 22:51:52 UTC (rev 14288) @@ -44,6 +44,12 @@ units="jiffys" collectionType="static"/> + <metric name="Engine Uptime" + template="${snmp.template}:snmpEngineTime" + category="AVAILABILITY" + units="sec" + collectionType="static"/> + <metric name="Availability" template="${snmp.template},Avail=true:ifNumber" indicator="true"/> Added: trunk/plugins/netdevice/mibs/SNMP-FRAMEWORK-MIB.txt =================================================================== --- trunk/plugins/netdevice/mibs/SNMP-FRAMEWORK-MIB.txt (rev 0) +++ trunk/plugins/netdevice/mibs/SNMP-FRAMEWORK-MIB.txt 2010-02-12 22:51:52 UTC (rev 14288) @@ -0,0 +1,526 @@ +SNMP-FRAMEWORK-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, + OBJECT-IDENTITY, + snmpModules FROM SNMPv2-SMI + TEXTUAL-CONVENTION FROM SNMPv2-TC + MODULE-COMPLIANCE, OBJECT-GROUP FROM SNMPv2-CONF; + +snmpFrameworkMIB MODULE-IDENTITY + LAST-UPDATED "200210140000Z" + ORGANIZATION "SNMPv3 Working Group" + CONTACT-INFO "WG-EMail: sn...@li... + Subscribe: snm...@li... + + Co-Chair: Russ Mundy + Network Associates Laboratories + postal: 15204 Omega Drive, Suite 300 + Rockville, MD 20850-4601 + USA + EMail: mu...@ti... + phone: +1 301-947-7107 + + Co-Chair & + Co-editor: David Harrington + Enterasys Networks + postal: 35 Industrial Way + P. O. Box 5005 + Rochester, New Hampshire 03866-5005 + USA + EMail: db...@en... + phone: +1 603-337-2614 + + Co-editor: Randy Presuhn + BMC Software, Inc. + postal: 2141 North First Street + San Jose, California 95131 + USA + EMail: ran...@bm... + phone: +1 408-546-1006 + + Co-editor: Bert Wijnen + Lucent Technologies + postal: Schagen 33 + 3461 GL Linschoten + Netherlands + + EMail: bw...@lu... + phone: +31 348-680-485 + " + DESCRIPTION "The SNMP Management Architecture MIB + + Copyright (C) The Internet Society (2002). This + version of this MIB module is part of RFC 3411; + see the RFC itself for full legal notices. + " + + REVISION "200210140000Z" -- 14 October 2002 + DESCRIPTION "Changes in this revision: + - Updated various administrative information. + - Corrected some typos. + - Corrected typo in description of SnmpEngineID + that led to range overlap for 127. + - Changed '255a' to '255t' in definition of + SnmpAdminString to align with current SMI. + - Reworded 'reserved' for value zero in + DESCRIPTION of SnmpSecurityModel. + - The algorithm for allocating security models + should give 256 per enterprise block, rather + than 255. + - The example engine ID of 'abcd' is not + legal. Replaced with '800002b804616263'H based + on example enterprise 696, string 'abc'. + - Added clarification that engineID should + persist across re-initializations. + This revision published as RFC 3411. + " + REVISION "199901190000Z" -- 19 January 1999 + DESCRIPTION "Updated editors' addresses, fixed typos. + Published as RFC 2571. + " + REVISION "199711200000Z" -- 20 November 1997 + DESCRIPTION "The initial version, published in RFC 2271. + " + ::= { snmpModules 10 } + + -- Textual Conventions used in the SNMP Management Architecture *** + +SnmpEngineID ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION "An SNMP engine's administratively-unique identifier. + Objects of this type are for identification, not for + addressing, even though it is possible that an + address may have been used in the generation of + a specific value. + + The value for this object may not be all zeros or + all 'ff'H or the empty (zero length) string. + + The initial value for this object may be configured + via an operator console entry or via an algorithmic + function. In the latter case, the following + example algorithm is recommended. + + In cases where there are multiple engines on the + same system, the use of this algorithm is NOT + appropriate, as it would result in all of those + engines ending up with the same ID value. + + 1) The very first bit is used to indicate how the + rest of the data is composed. + + 0 - as defined by enterprise using former methods + that existed before SNMPv3. See item 2 below. + + 1 - as defined by this architecture, see item 3 + below. + + Note that this allows existing uses of the + engineID (also known as AgentID [RFC1910]) to + co-exist with any new uses. + + 2) The snmpEngineID has a length of 12 octets. + + The first four octets are set to the binary + equivalent of the agent's SNMP management + private enterprise number as assigned by the + Internet Assigned Numbers Authority (IANA). + For example, if Acme Networks has been assigned + { enterprises 696 }, the first four octets would + be assigned '000002b8'H. + + The remaining eight octets are determined via + one or more enterprise-specific methods. Such + methods must be designed so as to maximize the + possibility that the value of this object will + be unique in the agent's administrative domain. + For example, it may be the IP address of the SNMP + entity, or the MAC address of one of the + interfaces, with each address suitably padded + with random octets. If multiple methods are + defined, then it is recommended that the first + octet indicate the method being used and the + remaining octets be a function of the method. + + 3) The length of the octet string varies. + + The first four octets are set to the binary + equivalent of the agent's SNMP management + private enterprise number as assigned by the + Internet Assigned Numbers Authority (IANA). + For example, if Acme Networks has been assigned + { enterprises 696 }, the first four octets would + be assigned '000002b8'H. + + The very first bit is set to 1. For example, the + above value for Acme Networks now changes to be + '800002b8'H. + + The fifth octet indicates how the rest (6th and + following octets) are formatted. The values for + the fifth octet are: + + 0 - reserved, unused. + + 1 - IPv4 address (4 octets) + lowest non-special IP address + + 2 - IPv6 address (16 octets) + lowest non-special IP address + + 3 - MAC address (6 octets) + lowest IEEE MAC address, canonical + order + + 4 - Text, administratively assigned + Maximum remaining length 27 + + 5 - Octets, administratively assigned + Maximum remaining length 27 + + 6-127 - reserved, unused + + 128-255 - as defined by the enterprise + Maximum remaining length 27 + " + SYNTAX OCTET STRING (SIZE(5..32)) + +SnmpSecurityModel ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION "An identifier that uniquely identifies a + Security Model of the Security Subsystem within + this SNMP Management Architecture. + + The values for securityModel are allocated as + follows: + + - The zero value does not identify any particular + security model. + + - Values between 1 and 255, inclusive, are reserved + for standards-track Security Models and are + managed by the Internet Assigned Numbers Authority + (IANA). + - Values greater than 255 are allocated to + enterprise-specific Security Models. An + enterprise-specific securityModel value is defined + to be: + + enterpriseID * 256 + security model within + enterprise + + For example, the fourth Security Model defined by + the enterprise whose enterpriseID is 1 would be + 259. + + This scheme for allocation of securityModel + values allows for a maximum of 255 standards- + based Security Models, and for a maximum of + 256 Security Models per enterprise. + + It is believed that the assignment of new + securityModel values will be rare in practice + because the larger the number of simultaneously + utilized Security Models, the larger the + chance that interoperability will suffer. + Consequently, it is believed that such a range + will be sufficient. In the unlikely event that + the standards committee finds this number to be + insufficient over time, an enterprise number + can be allocated to obtain an additional 256 + possible values. + + Note that the most significant bit must be zero; + hence, there are 23 bits allocated for various + organizations to design and define non-standard + + securityModels. This limits the ability to + define new proprietary implementations of Security + Models to the first 8,388,608 enterprises. + + It is worthwhile to note that, in its encoded + form, the securityModel value will normally + require only a single byte since, in practice, + the leftmost bits will be zero for most messages + and sign extension is suppressed by the encoding + rules. + + As of this writing, there are several values + of securityModel defined for use with SNMP or + reserved for use with supporting MIB objects. + They are as follows: + + 0 reserved for 'any' + 1 reserved for SNMPv1 + 2 reserved for SNMPv2c + 3 User-Based Security Model (USM) + " + SYNTAX INTEGER(0 .. 2147483647) + +SnmpMessageProcessingModel ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION "An identifier that uniquely identifies a Message + Processing Model of the Message Processing + Subsystem within this SNMP Management Architecture. + + The values for messageProcessingModel are + allocated as follows: + + - Values between 0 and 255, inclusive, are + reserved for standards-track Message Processing + Models and are managed by the Internet Assigned + Numbers Authority (IANA). + + - Values greater than 255 are allocated to + enterprise-specific Message Processing Models. + An enterprise messageProcessingModel value is + defined to be: + + enterpriseID * 256 + + messageProcessingModel within enterprise + + For example, the fourth Message Processing Model + defined by the enterprise whose enterpriseID + + is 1 would be 259. + + This scheme for allocating messageProcessingModel + values allows for a maximum of 255 standards- + based Message Processing Models, and for a + maximum of 256 Message Processing Models per + enterprise. + + It is believed that the assignment of new + messageProcessingModel values will be rare + in practice because the larger the number of + simultaneously utilized Message Processing Models, + the larger the chance that interoperability + will suffer. It is believed that such a range + will be sufficient. In the unlikely event that + the standards committee finds this number to be + insufficient over time, an enterprise number + can be allocated to obtain an additional 256 + possible values. + + Note that the most significant bit must be zero; + hence, there are 23 bits allocated for various + organizations to design and define non-standard + messageProcessingModels. This limits the ability + to define new proprietary implementations of + Message Processing Models to the first 8,388,608 + enterprises. + + It is worthwhile to note that, in its encoded + form, the messageProcessingModel value will + normally require only a single byte since, in + practice, the leftmost bits will be zero for + most messages and sign extension is suppressed + by the encoding rules. + + As of this writing, there are several values of + messageProcessingModel defined for use with SNMP. + They are as follows: + + 0 reserved for SNMPv1 + 1 reserved for SNMPv2c + 2 reserved for SNMPv2u and SNMPv2* + 3 reserved for SNMPv3 + " + SYNTAX INTEGER(0 .. 2147483647) + +SnmpSecurityLevel ::= TEXTUAL-CONVENTION + STATUS current + DESCRIPTION "A Level of Security at which SNMP messages can be + sent or with which operations are being processed; + in particular, one of: + + noAuthNoPriv - without authentication and + without privacy, + authNoPriv - with authentication but + without privacy, + authPriv - with authentication and + with privacy. + + These three values are ordered such that + noAuthNoPriv is less than authNoPriv and + authNoPriv is less than authPriv. + " + SYNTAX INTEGER { noAuthNoPriv(1), + authNoPriv(2), + authPriv(3) + } + +SnmpAdminString ::= TEXTUAL-CONVENTION + DISPLAY-HINT "255t" + STATUS current + DESCRIPTION "An octet string containing administrative + information, preferably in human-readable form. + + To facilitate internationalization, this + information is represented using the ISO/IEC + IS 10646-1 character set, encoded as an octet + string using the UTF-8 transformation format + described in [RFC2279]. + + Since additional code points are added by + amendments to the 10646 standard from time + to time, implementations must be prepared to + encounter any code point from 0x00000000 to + 0x7fffffff. Byte sequences that do not + correspond to the valid UTF-8 encoding of a + code point or are outside this range are + prohibited. + + The use of control codes should be avoided. + + When it is necessary to represent a newline, + the control code sequence CR LF should be used. + + The use of leading or trailing white space should + be avoided. + + For code points not directly supported by user + interface hardware or software, an alternative + means of entry and display, such as hexadecimal, + may be provided. + + For information encoded in 7-bit US-ASCII, + the UTF-8 encoding is identical to the + US-ASCII encoding. + + UTF-8 may require multiple bytes to represent a + single character / code point; thus the length + of this object in octets may be different from + the number of characters encoded. Similarly, + size constraints refer to the number of encoded + octets, not the number of characters represented + by an encoding. + + Note that when this TC is used for an object that + is used or envisioned to be used as an index, then + a SIZE restriction MUST be specified so that the + number of sub-identifiers for any object instance + does not exceed the limit of 128, as defined by + [RFC3416]. + + Note that the size of an SnmpAdminString object is + measured in octets, not characters. + " + SYNTAX OCTET STRING (SIZE (0..255)) + +-- Administrative assignments *************************************** + +snmpFrameworkAdmin + OBJECT IDENTIFIER ::= { snmpFrameworkMIB 1 } +snmpFrameworkMIBObjects + OBJECT IDENTIFIER ::= { snmpFrameworkMIB 2 } +snmpFrameworkMIBConformance + OBJECT IDENTIFIER ::= { snmpFrameworkMIB 3 } + +-- the snmpEngine Group ******************************************** + +snmpEngine OBJECT IDENTIFIER ::= { snmpFrameworkMIBObjects 1 } + +snmpEngineID OBJECT-TYPE + SYNTAX SnmpEngineID + MAX-ACCESS read-only + STATUS current + DESCRIPTION "An SNMP engine's administratively-unique identifier. + + This information SHOULD be stored in non-volatile + storage so that it remains constant across + re-initializations of the SNMP engine. + " + ::= { snmpEngine 1 } + +snmpEngineBoots OBJECT-TYPE + SYNTAX INTEGER (1..2147483647) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of times that the SNMP engine has + (re-)initialized itself since snmpEngineID + was last configured. + " + ::= { snmpEngine 2 } + +snmpEngineTime OBJECT-TYPE + SYNTAX INTEGER (0..2147483647) + UNITS "seconds" + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The number of seconds since the value of + the snmpEngineBoots object last changed. + When incrementing this object's value would + cause it to exceed its maximum, + snmpEngineBoots is incremented as if a + re-initialization had occurred, and this + object's value consequently reverts to zero. + " + ::= { snmpEngine 3 } + +snmpEngineMaxMessageSize OBJECT-TYPE + SYNTAX INTEGER (484..2147483647) + MAX-ACCESS read-only + STATUS current + DESCRIPTION "The maximum length in octets of an SNMP message + which this SNMP engine can send or receive and + process, determined as the minimum of the maximum + message size values supported among all of the + transports available to and supported by the engine. + " + ::= { snmpEngine 4 } + +-- Registration Points for Authentication and Privacy Protocols ** + +snmpAuthProtocols OBJECT-IDENTITY + STATUS current + DESCRIPTION "Registration point for standards-track + authentication protocols used in SNMP Management + Frameworks. + " + ::= { snmpFrameworkAdmin 1 } + +snmpPrivProtocols OBJECT-IDENTITY + STATUS current + DESCRIPTION "Registration point for standards-track privacy + protocols used in SNMP Management Frameworks. + " + ::= { snmpFrameworkAdmin 2 } + +-- Conformance information ****************************************** + +snmpFrameworkMIBCompliances + OBJECT IDENTIFIER ::= {snmpFrameworkMIBConformance 1} +snmpFrameworkMIBGroups + OBJECT IDENTIFIER ::= {snmpFrameworkMIBConformance 2} + +-- compliance statements + +snmpFrameworkMIBCompliance MODULE-COMPLIANCE + STATUS current + DESCRIPTION "The compliance statement for SNMP engines which + implement the SNMP Management Framework MIB. + " + MODULE -- this module + MANDATORY-GROUPS { snmpEngineGroup } + ::= { snmpFrameworkMIBCompliances 1 } + +-- units of conformance + +snmpEngineGroup OBJECT-GROUP + OBJECTS { + snmpEngineID, + snmpEngineBoots, + snmpEngineTime, + snmpEngineMaxMessageSize + } + STATUS current + DESCRIPTION "A collection of objects for identifying and + determining the configuration and current timeliness + + values of an SNMP engine. + " + ::= { snmpFrameworkMIBGroups 1 } + +END |
|
From: <rm...@hy...> - 2010-02-12 22:28:56
|
Author: rmorgan Date: 2010-02-12 14:28:48 -0800 (Fri, 12 Feb 2010) New Revision: 14287 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14287 Modified: trunk/src/org/hyperic/hq/hqu/rendit/metaclass/AppdefCategory.groovy Log: [HHQ-3736] If resource_id is null, throw PermissionException rather than fail with an NPE. This does not fix the root case of why an appdef resource would have a null resource_id, but it does fix HQU plugins that do permission checking. Modified: trunk/src/org/hyperic/hq/hqu/rendit/metaclass/AppdefCategory.groovy =================================================================== --- trunk/src/org/hyperic/hq/hqu/rendit/metaclass/AppdefCategory.groovy 2010-02-12 21:36:23 UTC (rev 14286) +++ trunk/src/org/hyperic/hq/hqu/rendit/metaclass/AppdefCategory.groovy 2010-02-12 22:28:48 UTC (rev 14287) @@ -6,6 +6,7 @@ import org.hyperic.hq.appdef.server.session.AppdefResourceType import org.hyperic.hq.authz.shared.PermissionManagerFactory as PermManFactory import org.hyperic.hq.authz.shared.PermissionManager +import org.hyperic.hq.authz.shared.PermissionException class AppdefCategory { static Resource getResource(AppdefResource r) { @@ -46,6 +47,12 @@ def operation = r.getAuthzOp(p.operation) def user = p.user def resource = r.resource + + // HHQ-3736 - null resource_id in EAM_PLATFORM,EAM_SERVER,EAM_SERVICE. + if (resource == null) { + throw new PermissionException() + } + def instanceId = resource.instanceId assert instanceId == r.id |
|
From: <tr...@hy...> - 2010-02-12 21:30:37
|
Author: trader Date: 2010-02-12 12:39:51 -0800 (Fri, 12 Feb 2010) New Revision: 14284 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14284 Modified: trunk/build_util/jboss-build.xml trunk/etc/build.properties Log: HPD-171, HHQ-3514: DB Connections don't do any validation The original checkin seems to work in the installer, but did not cover the dev/jboss deployment. Modified: trunk/build_util/jboss-build.xml =================================================================== --- trunk/build_util/jboss-build.xml 2010-02-12 09:26:12 UTC (rev 14283) +++ trunk/build_util/jboss-build.xml 2010-02-12 20:39:51 UTC (rev 14284) @@ -216,6 +216,7 @@ <replacefilter token="@@@server.database-driver@@@" value="${hq.jdbc.driver}"/> <replacefilter token="@@@server.database-user@@@" value="${hq.jdbc.user}"/> <replacefilter token="@@@server.database-password@@@" value="${hq.jdbc.password}"/> + <replacefilter token="@@@server.connection-validation-sql@@@" value="${hq.validation.sql}"/> <replacefilter token="@@@server.database-minpoolsize@@@" value="5"/> <replacefilter token="@@@server.database-maxpoolsize@@@" value="90"/> <replacefilter token="@@@server.database-blockingtimeout@@@" value="10000"/> Modified: trunk/etc/build.properties =================================================================== --- trunk/etc/build.properties 2010-02-12 09:26:12 UTC (rev 14283) +++ trunk/etc/build.properties 2010-02-12 20:39:51 UTC (rev 14284) @@ -20,6 +20,7 @@ hq.jdbc.driver=org.postgresql.Driver hq.jdbc.user=hqadmin hq.jdbc.password=hqadmin +hq.validation.sql=select 1 hq.jdbc.name=hqdb hq.jdbc.server=localhost hq.server.ds-mapping=PostgreSQL |
|
From: <do...@hy...> - 2010-02-12 21:17:59
|
Author: dougm Date: 2010-02-12 13:17:45 -0800 (Fri, 12 Feb 2010) New Revision: 14285 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14285 Modified: trunk/plugins/system/src/org/hyperic/hq/plugin/system/WhoLogTrackPlugin.java Log: [HHQ-3724] use LogTrackPlugin.reportEvent to apply severity filter Modified: trunk/plugins/system/src/org/hyperic/hq/plugin/system/WhoLogTrackPlugin.java =================================================================== --- trunk/plugins/system/src/org/hyperic/hq/plugin/system/WhoLogTrackPlugin.java 2010-02-12 20:39:51 UTC (rev 14284) +++ trunk/plugins/system/src/org/hyperic/hq/plugin/system/WhoLogTrackPlugin.java 2010-02-12 21:17:45 UTC (rev 14285) @@ -26,7 +26,6 @@ package org.hyperic.hq.plugin.system; import org.hyperic.hq.product.LogTrackPlugin; -import org.hyperic.hq.product.TrackEvent; import org.hyperic.sigar.Sigar; import org.hyperic.sigar.SigarException; import org.hyperic.sigar.Who; @@ -73,14 +72,10 @@ msg += " (" + host + ")"; } - TrackEvent event = - new TrackEvent(this.plugin.getName(), - time, - LogTrackPlugin.LOGLEVEL_INFO, - "system", - msg); - - this.plugin.getManager().reportEvent(event); + this.plugin.reportEvent(time, + LogTrackPlugin.LOGLEVEL_INFO, + "system", + msg); } this.lastTime = System.currentTimeMillis(); |
|
From: <no...@gi...> - 2010-02-12 19:03:12
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: e5f92e018467eab0b2008febdabef5c1f06e9154 http://github.com/hyperic/hqapi/commit/e5f92e018467eab0b2008febdabef5c1f06e9154 Author: Patrick Nguyen <pat...@sp...> Date: 2010-02-12 (Fri, 12 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncBaselineCondition_test.java M src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncConfigCondition_test.java M src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncControlCondition_test.java M src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncLogCondition_test.java M src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncMetricChangeCondition_test.java M src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncPropertyCondition_test.java M src/org/hyperic/hq/hqapi1/test/AlertDefinitionSyncThresholdCondition_test.java Log Message: ----------- Validate the alert definition from the response (backport from master 1d1e8faf5e5d67d882c2f234f88827f7ca685d55) |
|
From: <bo...@hy...> - 2010-02-12 09:26:22
|
Author: bob Date: 2010-02-12 01:26:12 -0800 (Fri, 12 Feb 2010) New Revision: 14283 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14283 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1348 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-02-12 00:33:29 UTC (rev 14282) +++ trunk/etc/version.properties 2010-02-12 09:26:12 UTC (rev 14283) @@ -1,3 +1,3 @@ -#Thu Feb 11 00:25:03 PST 2010 +#Fri Feb 12 00:29:27 PST 2010 version=4.3.0 -build=1347 +build=1348 |
|
From: <no...@gi...> - 2010-02-11 22:36:40
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: 000ef2b8cf45e6da6f154dbc6b06636d7e88cc4c http://github.com/hyperic/hqapi/commit/000ef2b8cf45e6da6f154dbc6b06636d7e88cc4c Author: Patrick Nguyen <pat...@sp...> Date: 2010-02-11 (Thu, 11 Feb 2010) Changed paths: M build.xml Log Message: ----------- Add back "single-test" target to run a single test from the command line Commit: 90fefde97207741382efec2cf234771fcdf4e50d http://github.com/hyperic/hqapi/commit/90fefde97207741382efec2cf234771fcdf4e50d Author: Patrick Nguyen <pat...@sp...> Date: 2010-02-11 (Thu, 11 Feb 2010) Changed paths: M hqu/hqapi1/app/AlertdefinitionController.groovy M src/org/hyperic/hq/hqapi1/test/AlertDefinitionTestBase.java M xsd/HQApi1.xsd Log Message: ----------- [HE-400] Add additional validation for the create and modify time |
|
From: <bo...@hy...> - 2010-02-11 21:22:27
|
Author: bob Date: 2010-02-11 13:22:18 -0800 (Thu, 11 Feb 2010) New Revision: 14281 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14281 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties Log: Release 4.2.0.5 build #1281 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties =================================================================== --- branches/HQ_4_2_0_PATCH/etc/version.properties 2010-02-11 19:53:13 UTC (rev 14280) +++ branches/HQ_4_2_0_PATCH/etc/version.properties 2010-02-11 21:22:18 UTC (rev 14281) @@ -1,3 +1,3 @@ -#Thu Feb 11 11:19:08 PST 2010 +#Thu Feb 11 12:51:23 PST 2010 version=4.2.0.5 -build=1280 +build=1281 |
|
From: <bo...@hy...> - 2010-02-11 19:54:17
|
Author: bob Date: 2010-02-11 11:53:13 -0800 (Thu, 11 Feb 2010) New Revision: 14280 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14280 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties Log: Release 4.2.0.5 build #1280 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties =================================================================== --- branches/HQ_4_2_0_PATCH/etc/version.properties 2010-02-11 18:12:20 UTC (rev 14279) +++ branches/HQ_4_2_0_PATCH/etc/version.properties 2010-02-11 19:53:13 UTC (rev 14280) @@ -1,3 +1,3 @@ -#Thu Feb 11 09:38:20 PST 2010 +#Thu Feb 11 11:19:08 PST 2010 version=4.2.0.5 -build=1279 +build=1280 |
|
From: Chakresh <sig...@hy...> - 2010-02-11 18:24:02
|
OS - Suse SLES 10 H/W - zSeries s390x Sigar - 1.6.4 JRE - IBM J9 VM (build 2.3, J2RE 1.5.0 IBM J9 2.3 Linux s390x-64 j9vmxz6423-20091104 (JIT enabled) I tried to run sigar from my java program and core dump files are created. Same program works fine with IBM jre on x86-64 hardware (OS - Fedora Linux, x86 linux sigar files). Also tried to run a test in sigar shell and it also fails. Below is the output java -jar sigar.jar test Unhandled exception Type=Floating point error vmState=0x00000000 J9Generic_Signal_Number=00080020 Signal_Number=00000008 Error_Value=00000000 Signal_Code=00000001 Handler1=0000020000306900 Handler2=00000200003702FC gpr0=0000000000000000 gpr1=0000000000000000 gpr2=0000000000000000 gpr3=000000000F4D007F gpr4=00000200218BDCB0 gpr5=000002000001DC90 gpr6=0000000080333140 gpr7=0000000000000003 gpr8=000000008032E1D0 gpr9=0000000000000001 gpr10=0000000080332E90 gpr11=000003FFFF940C80 gpr12=000002000001E000 gpr13=0000020000017348 gpr14=0000020000009D84 gpr15=000003FFFF940B98 psw=0000020000009908 mask=0705C00180000000 fpc=0008000000000000 fpr0 4240000000000000 (f: 0.000000, d: 1.374390e+11) fpr1 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr2 3f40000000000000 (f: 0.000000, d: 4.882812e-04) fpr3 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr4 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr5 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr6 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr7 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr8 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr9 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr10 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr11 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr12 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr13 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr14 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr15 0000000000000000 (f: 0.000000, d: 0.000000e+00) Module=/lib64/ld64.so.1 Module_base_address=0000020000000000 Target=2_30_20091103_45935_BHdSMr (Linux 2.6.16.60-0.54.5-default) CPU=s390x (1 logical CPUs) (0x3e43c000 RAM) JVMDUMP006I Processing dump event "gpf", detail "" - please wait. JVMDUMP032I JVM requested System dump using '/opt/nsAgent/lib/core.20100210.223924.8705.0001.dmp' in response to an event JVMDUMP010I System dump written to /opt/nsAgent/lib/core.20100210.223924.8705.0001.dmp JVMDUMP032I JVM requested Snap dump using '/opt/nsAgent/lib/Snap.20100210.223924.8705.0002.trc' in response to an event JVMDUMP010I Snap dump written to /opt/nsAgent/lib/Snap.20100210.223924.8705.0002.trc JVMDUMP032I JVM requested Java dump using '/opt/nsAgent/lib/javacore.20100210.223924.8705.0003.txt' in response to an event JVMDUMP010I Java dump written to /opt/nsAgent/lib/javacore.20100210.223924.8705.0003.txt JVMDUMP013I Processed dump event "gpf", detail "". I will be happy to provide core/snap files, if needed. Could anyone please help to find out what is the issue here ? Thanks |
|
From: saeid <sig...@hy...> - 2010-02-11 18:23:58
|
Hi dear friends please let me know is it possible to use SIGAR in Microsoft .Net projects ? i developed a network monitoring system in C#.Net, now i interested to use SIGAR engine to add network discovery feature to my application. how can i benefit from SIGAR in my Microsoft C#.Net project ? Regards |
|
From: <bo...@hy...> - 2010-02-11 18:12:37
|
Author: bob Date: 2010-02-11 10:12:20 -0800 (Thu, 11 Feb 2010) New Revision: 14279 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14279 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties Log: Release 4.2.0.5 build #1279 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties =================================================================== --- branches/HQ_4_2_0_PATCH/etc/version.properties 2010-02-11 09:29:32 UTC (rev 14278) +++ branches/HQ_4_2_0_PATCH/etc/version.properties 2010-02-11 18:12:20 UTC (rev 14279) @@ -1,3 +1,3 @@ -#Fri Jan 22 17:17:20 PST 2010 +#Thu Feb 11 09:38:20 PST 2010 version=4.2.0.5 -build=1278 +build=1279 |
|
From: <bo...@hy...> - 2010-02-11 09:29:42
|
Author: bob Date: 2010-02-11 01:29:32 -0800 (Thu, 11 Feb 2010) New Revision: 14278 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14278 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1347 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-02-11 01:18:06 UTC (rev 14277) +++ trunk/etc/version.properties 2010-02-11 09:29:32 UTC (rev 14278) @@ -1,3 +1,3 @@ -#Wed Feb 10 00:31:22 PST 2010 +#Thu Feb 11 00:25:03 PST 2010 version=4.3.0 -build=1346 +build=1347 |
|
From: <rm...@hy...> - 2010-02-11 01:20:27
|
Author: rmorgan Date: 2010-02-10 16:14:51 -0800 (Wed, 10 Feb 2010) New Revision: 14276 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14276 Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/common/shared/ProductProperties.java Log: (HHQ-3528) make sure ProductProperties.getProperties() finds the right files [merge from trunk] Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/common/shared/ProductProperties.java =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/common/shared/ProductProperties.java 2010-02-10 23:53:04 UTC (rev 14275) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/common/shared/ProductProperties.java 2010-02-11 00:14:51 UTC (rev 14276) @@ -27,7 +27,9 @@ import java.io.IOException; import java.io.InputStream; +import java.net.URL; +import java.util.Enumeration; import java.util.Properties; import org.apache.commons.logging.Log; @@ -74,11 +76,39 @@ } private static void load(String name, boolean required) { - InputStream in = - ProductProperties.class.getClassLoader(). - getResourceAsStream(name); + //XXX unhardcode these filenames here and elsewhere + final String[] jars = { //we should find one or the other + "hq-product.jar", //agent side (including command-line) + "hq.jar" //server side + }; + ClassLoader loader = ProductProperties.class.getClassLoader(); + InputStream in = null; + try { //XXX must be better way other than renaming these files w/ an hq- prefix? + //HHQ-3528 make sure we find {version,product}.properties in the right place(s) + //also note AgentCommandsService.upgrade has its own way but only works for the agent + for (Enumeration urls = loader.getResources(name); urls.hasMoreElements(); ) { + URL url = (URL)urls.nextElement(); + for (int i=0; i<jars.length; i++) { + //example: url == file:/.../pdk/lib/hq-product.jar!/version.properties + if (url.getFile().endsWith(jars[i] + "!/" + name)) { + in = url.openStream(); + _log.debug("Found " + name + " via " + url); + break; + } + } + } + } catch (IOException e) { + //fallthru + } if (in == null) { + //fallback to the old fashioned way + if ((in = loader.getResourceAsStream(name)) != null) { + _log.debug("Found " + name + " via getResourceAsStream"); + } + } + + if (in == null) { if (required) { throw new IllegalStateException("Package not packed " + "correctly, missing: " + name); |
|
From: <kp...@hy...> - 2010-02-11 01:18:16
|
Author: kparikh Date: 2010-02-10 17:18:06 -0800 (Wed, 10 Feb 2010) New Revision: 14277 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14277 Added: trunk/tools/agentpork/etc/clone.properties trunk/tools/agentpork/etc/multiagent.properties trunk/tools/agentpork/forkagents.sh trunk/tools/agentpork/hq-agent-nowrapper.sh trunk/tools/agentpork/start_clone.sh trunk/tools/agentpork/start_multiagent.sh trunk/tools/agentpork/stop_clone.sh trunk/tools/agentpork/wipe_clones.sh Removed: trunk/tools/agentpork/agentpork.cfg trunk/tools/agentpork/agentpork.sh trunk/tools/agentpork/clone.properties trunk/tools/agentpork/create_agents Modified: trunk/tools/agentpork/create_clone.sh trunk/tools/agentpork/etc/agent.properties trunk/tools/agentpork/init_framework.sh Log: Fixing multiagent to get it working with 4.3. Deleted: trunk/tools/agentpork/agentpork.cfg =================================================================== --- trunk/tools/agentpork/agentpork.cfg 2010-02-11 00:14:51 UTC (rev 14276) +++ trunk/tools/agentpork/agentpork.cfg 2010-02-11 01:18:06 UTC (rev 14277) @@ -1,6 +0,0 @@ -CLONE_SERVERIP=localhost -CLONE_SECURE=yes -CLONE_LISTEN_STARTPORT=3000 -CLONE_FQDN_PREFIX=clone- -CLONE_JAVA_FLAGS="-XX:MaxPermSize=256m -Xmx1024m" -#CLONE_JAVA_FLAGS="${CLONE_JAVA_FLAGS} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y" Deleted: trunk/tools/agentpork/agentpork.sh =================================================================== --- trunk/tools/agentpork/agentpork.sh 2010-02-11 00:14:51 UTC (rev 14276) +++ trunk/tools/agentpork/agentpork.sh 2010-02-11 01:18:06 UTC (rev 14277) @@ -1,16 +0,0 @@ -CLONE_JAVA_FLAGS="" -. agentpork.cfg - -${JAVA_HOME}/bin/java \ --client \ --Dagent.propFile=agent.properties \ --Dorg.hyperic.hq.bizapp.agent.CommandsAPIInfo.camUpPort=7080 \ --Djava.security.auth.login.config=jaas.config \ --Djava.net.preferIPv4Stack=true \ --XX:MaxPermSize=256m \ -$CLONE_JAVA_FLAGS \ --classpath clones/pdk/lib/hyperic-util.jar:clones/pdk/lib/log4j-1.2.14.jar:clones/pdk/lib/ant.jar:clones/pdk/lib/jdom_b8.jar:clones/pdk/lib/commons-logging-1.0.4.jar:clones/pdk/lib/commons-httpclient-3.1.jar:clones/pdk/lib/sigar.jar \ -org.hyperic.util.thread.MultiRunner $1 - -#-Xdebug \ -#-Xrunjdwp:transport=dt_socket,server=y,suspend=y \ Deleted: trunk/tools/agentpork/clone.properties =================================================================== --- trunk/tools/agentpork/clone.properties 2010-02-11 00:14:51 UTC (rev 14276) +++ trunk/tools/agentpork/clone.properties 2010-02-11 01:18:06 UTC (rev 14277) @@ -1,8 +0,0 @@ -# Time to sleep between spawning new agents -clone.spawn.sleep=20000 -clone.number=10 -clone.class=org.hyperic.hq.agent.server.AgentRunner -clone.classpath=clones/lib/AgentServer.jar:clones/lib/lather.jar:clones/pdk/lib/activation.jar:clones/pdk/lib/ant.jar:clones/pdk/lib/backport-util-concurrent.jar:clones/pdk/lib/bcel-5.1.jar:clones/pdk/lib/commons-beanutils.jar:clones/pdk/lib/commons-codec-1.3.jar:clones/pdk/lib/commons-collections.jar:clones/pdk/lib/commons-httpclient-2.0.jar:clones/pdk/lib/commons-logging.jar:clones/pdk/lib/dnsjava-2.0.3.jar:clones/pdk/lib/getopt.jar:clones/pdk/lib/hq-product.jar:clones/pdk/lib/hyperic-util.jar:clones/pdk/lib/jakarta-oro-2.0.7.jar:clones/pdk/lib/jdom_b8.jar:clones/pdk/lib/jsch-0.1.34.jar:clones/pdk/lib/json.jar:clones/pdk/lib/junit.jar:clones/pdk/lib/jxla.jar:clones/pdk/lib/log4j-1.2.14.jar:clones/pdk/lib/sigar.jar:clones/pdk/lib/snmp4j.jar:clones/pdk/lib/tomcat-jk.jar:clones/pdk/lib/ws-commons-util-1.0.2.jar:clones/pdk/lib/xalan.jar:clones/pdk/lib/xml-apis.jar:clones/pdk/lib/xmlrpc-client-3.1.jar:clones/pdk/lib/xmlrpc-common-3.1.jar:clones/pdk/lib/xpp3_min-1.1.3.4.O.jar:clones/pdk/lib/xstream-1.2.1.jar - -log4j.rootLogger=INFO - Deleted: trunk/tools/agentpork/create_agents =================================================================== --- trunk/tools/agentpork/create_agents 2010-02-11 00:14:51 UTC (rev 14276) +++ trunk/tools/agentpork/create_agents 2010-02-11 01:18:06 UTC (rev 14277) @@ -1,81 +0,0 @@ -#!/usr/bin/perl -w - -use strict; -use POSIX ":sys_wait_h"; - -my $debug = 1; - -my $NUM_AGENTS = 5; -my $BATCH_SIZE = 2; -my $AGENT_PORK_DIR = "${HOME}/workspace/hq_trunk/tools/agentpork"; -my $LOG_DIR = "${HOME}/workspace/hq_trunk/tools/agentpork"; - -my (@pids); - -sub main() -{ - my $i = 0; - my $clone = 0; - while ($clone < $NUM_AGENTS) - { - $clone = $i++*$BATCH_SIZE; - for (my $j=0; $j<$BATCH_SIZE; $j++) - { - my $pid; - if (0 == ($pid = fork())) { - createAgent($clone); - exit(0); - } else { - $clone++; - push (@pids, $pid); - } - } - waitForAgentCreate(); - } -} - -main(); - -sub createAgent -{ - my ($clone) = @_; - my $cmd = "$AGENT_PORK_DIR/create_clone.sh $clone 2>&1"; - execCmd($cmd); -} - -sub execCmd -{ - my ($cmd) = @_; - print "$cmd\n" if $debug; - my $output = join "", `$cmd`; - `echo "$output" >> $LOG_DIR/create.log`; -} - -sub waitForAgentCreate -{ - while (@pids > 0) - { - foreach my $pid (@pids) - { - if ( waitpid($pid, &WNOHANG()) > 0 ) - { - print "wait for $pid\n" if $debug; - spliceArray($pid); - } - } - sleep(1); - } -} - - -sub spliceArray -{ - my ($PID) = @_; - my ($i); - for ($i=0; $i<@pids; $i++) - { - if ($pids[$i] == $PID) { - splice (@pids, $i, 1); - } - } -} Modified: trunk/tools/agentpork/create_clone.sh =================================================================== --- trunk/tools/agentpork/create_clone.sh 2010-02-11 00:14:51 UTC (rev 14276) +++ trunk/tools/agentpork/create_clone.sh 2010-02-11 01:18:06 UTC (rev 14277) @@ -1,6 +1,6 @@ #!/bin/sh -. agentpork.cfg +. etc/multiagent.properties echo "Creating clone $1" @@ -11,7 +11,8 @@ ln -s ../master/$f clones/clone_$1/$f done -ln clones/master/hq-agent.sh clones/clone_$1/hq-agent.sh +ln -s ../wrapper clones/clone_$1/wrapper +cp hq-agent-nowrapper.sh clones/clone_$1/hq-agent-nowrapper.sh clone_port=$(($CLONE_LISTEN_STARTPORT + $1)) @@ -22,4 +23,5 @@ sed -e s/@CLONE_LISTENPORT@/${clone_port}/ \ > clones/clone_$1/agent.properties -(cd clones/clone_$1 && ./hq-agent.sh start && ./hq-agent.sh stop) +cd clones/clone_$1 +nohup ./hq-agent-nowrapper.sh start 2>&1 > console.out & Modified: trunk/tools/agentpork/etc/agent.properties =================================================================== --- trunk/tools/agentpork/etc/agent.properties 2010-02-11 00:14:51 UTC (rev 14276) +++ trunk/tools/agentpork/etc/agent.properties 2010-02-11 01:18:06 UTC (rev 14277) @@ -2,7 +2,7 @@ agent.setup.camIP=@CLONE_SERVERIP@ -agent.setup.camPort=7080 +agent.setup.camPort=@CLONE_SERVER_PORT@ agent.setup.camSSLPort=7443 agent.setup.camSecure=@CLONE_SECURE@ agent.setup.camLogin=hqadmin @@ -78,3 +78,4 @@ ## Options to pass to java agent.javaOpts=-Xmx128m -Djava.net.preferIPv4Stack=true +agent.setup.unidirectional=no Added: trunk/tools/agentpork/etc/clone.properties =================================================================== --- trunk/tools/agentpork/etc/clone.properties (rev 0) +++ trunk/tools/agentpork/etc/clone.properties 2010-02-11 01:18:06 UTC (rev 14277) @@ -0,0 +1,15 @@ +# Time to sleep between spawning new agents +clone.spawn.sleep=5000 +clone.number=@NUM_CLONES@ +log4j.rootLogger=INFO +netservices.netstat=false +clone.class=org.hyperic.hq.agent.server.AgentRunner +clone.classpath=@AGENT_BUNDLE_HOME@/lib/lather.jar:@AGENT_BUNDLE_HOME@/lib/AgentServer.jar:@AGENT_BUNDLE_HOME@/lib/AgentClient.jar:@AGENT_BUNDLE_HOME@/pdk/lib/commons-httpclient-3.1.jar:@AGENT_BUNDLE_HOME@/pdk/lib/hyperic-util.jar:@AGENT_BUNDLE_HOME@/pdk/lib/commons-logging.jar:@AGENT_BUNDLE_HOME@/pdk/lib/hq-product.jar:@AGENT_BUNDLE_HOME@/pdk/lib/jdom-1.1.jar:@AGENT_BUNDLE_HOME@/pdk/lib/ant.jar:@AGENT_BUNDLE_HOME@/pdk/lib/log4j-1.2.14.jar:@AGENT_BUNDLE_HOME@/pdk/lib/sigar.jar:@AGENT_BUNDLE_HOME@/pdk/lib/commons-codec-1.3.jar:@AGENT_BUNDLE_HOME@/pdk/lib/xstream-1.3.1.jar +agent.bundle.home=@AGENT_BUNDLE_HOME@ +agent.lib.handlers.lib=@AGENT_BUNDLE_HOME@/lib/handlers/lib/ +agent.lib.handlers=@AGENT_BUNDLE_HOME@/lib/handlers/ +agent.logDir=../agentpork/log +agent.pdkPluginDir=@AGENT_BUNDLE_HOME@/pdk/plugins +agent.pdkLibDir=@AGENT_BUNDLE_HOME@/pdk/lib +agent.pdkDir=@AGENT_BUNDLE_HOME@/pdk +agent.pdkWorkDir=@AGENT_BUNDLE_HOME@/pdk/work Added: trunk/tools/agentpork/etc/multiagent.properties =================================================================== --- trunk/tools/agentpork/etc/multiagent.properties (rev 0) +++ trunk/tools/agentpork/etc/multiagent.properties 2010-02-11 01:18:06 UTC (rev 14277) @@ -0,0 +1,32 @@ +# Adjust following variables based on your config +export AGENT_HOME=/x2/HQ/multiagent/trimmed-agent +export AGENT_BUILD_VERSION=4.2.0 +export AGENT_BUILD_NUMBER=1261 +export CLONE_SERVERIP=10.16.17.38 +export CLONE_SERVER_PORT=8080 +export CLONE_LISTEN_STARTPORT=4000 +export NUM_CLONES=100 +export CLONE_JAVA_FLAGS="-XX:MaxPermSize=128m -Xmx1024m -Xms1024m" + + +# Do not modify anything below +export CLONE_SECURE=yes +export AGENT_BUNDLE_HOME=$AGENT_HOME/bundles/agent-$AGENT_BUILD_VERSION-EE-$AGENT_BUILD_NUMBER +export PDK_LIB=$AGENT_BUNDLE_HOME/pdk/lib +CLONE_CP=$AGENT_BUNDLE_HOME/lib/AgentClient.jar +CLONE_CP=$AGENT_BUNDLE_HOME/lib/AgentServer.jar:$CLONE_CP +CLONE_CP=$AGENT_BUNDLE_HOME/lib/lather.jar:$CLONE_CP +CLONE_CP=$CLONE_CP:$PDK_LIB/ant.jar +CLONE_CP=$CLONE_CP:$PDK_LIB/commons-httpclient-3.1.jar +CLONE_CP=$CLONE_CP:$PDK_LIB/hq-product.jar +CLONE_CP=$CLONE_CP:$PDK_LIB/jdom-1.1.jar +CLONE_CP=$CLONE_CP:$PDK_LIB/sigar.jar +CLONE_CP=$CLONE_CP:$PDK_LIB/commons-codec-1.3.jar +CLONE_CP=$CLONE_CP:$PDK_LIB/commons-logging.jar +CLONE_CP=$CLONE_CP:$PDK_LIB/hyperic-util.jar +CLONE_CP=$CLONE_CP:$PDK_LIB/log4j-1.2.14.jar +CLONE_CP=$CLONE_CP:$PDK_LIB/xstream-1.3.1.jar +CLONE_CP=$AGENT_HOME/wrapper/lib/wrapper.jar:$CLONE_CP +export CLONE_CP=$CLONE_CP +export CLONE_FQDN_PREFIX=$HOSTNAME-clone- + Added: trunk/tools/agentpork/forkagents.sh =================================================================== --- trunk/tools/agentpork/forkagents.sh (rev 0) +++ trunk/tools/agentpork/forkagents.sh 2010-02-11 01:18:06 UTC (rev 14277) @@ -0,0 +1,23 @@ +#!/bin/bash + +. etc/multiagent.properties + +for ((i=0;i<$NUM_CLONES;)) +do + for ((j=0;j<5;j++)) + do + echo "cloning agent ------------> " $i + ./create_clone.sh $i + i=$(($i + 1)) + sleep 1 + done + sleep 30 + for ((j=5;j>0;j--)) + do + k=$(($i - $j)) + echo "stopping agent ------------> " $k + ./stop_clone.sh $k + sleep 1 + done + sleep 5 +done Added: trunk/tools/agentpork/hq-agent-nowrapper.sh =================================================================== --- trunk/tools/agentpork/hq-agent-nowrapper.sh (rev 0) +++ trunk/tools/agentpork/hq-agent-nowrapper.sh 2010-02-11 01:18:06 UTC (rev 14277) @@ -0,0 +1,122 @@ +#!/bin/sh +AGENTPROPFILE_PROP=agent.propFile +AGENT_PROPS=agent.properties +AGENTLOGDIR_PROP=agent.logDir +AGENTLOGDIR=log +AGENTDATADIR_PROP=agent.dataDir +AGENTDATADIR=./data +AGENT_LIB=./lib +PDK_LIB=./pdk/lib +WRAPPER_LIB=./wrapper/lib +# for /proc/net/tcp mirror +SIGAR_PROC_NET=./tmp + +# ------------- +# Shouldn't need to change anything below this +# ------------- + +FINDNAME=$0 +while [ -h $FINDNAME ] ; do FINDNAME=`ls -ld $FINDNAME | awk '{print $NF}'` ; done +RUNDIR=`echo $FINDNAME | sed -e 's@/[^/]*$@@'` +unset FINDNAME +#if test -d $RUNDIR; then +# cd $RUNDIR/.. +#else +# cd .. +#fi + +if [ "x${HQ_JAVA_HOME}" != "x" ] ; then + HQ_JAVA_HOME=${HQ_JAVA_HOME} +elif [ -d jre ]; then + HQ_JAVA_HOME=jre + # Just in case + chmod -R +x jre/bin/* > /dev/null 2>&1 +elif [ "x$JAVA_HOME" != "x" ] ; then + HQ_JAVA_HOME=${JAVA_HOME} +else + case "`uname`" in + Darwin) + HQ_JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home + ;; + *) + echo "HQ_JAVA_HOME or JAVA_HOME must be set when invoking the agent" + exit 1 + ;; + esac +fi + +chmod +x ./pdk/scripts/* > /dev/null 2>&1 + +HQ_JAVA="${HQ_JAVA_HOME}/bin/java" + +CLIENT_CLASSPATH= +for i in `ls ${AGENT_LIB}/*.jar` +do + CLIENT_CLASSPATH="${CLIENT_CLASSPATH}:${i}" +done + +for i in `ls ${PDK_LIB}/*.jar` +do + CLIENT_CLASSPATH="${CLIENT_CLASSPATH}:${i}" +done + +for i in `ls ${WRAPPER_LIB}/*.jar` +do + CLIENT_CLASSPATH="${CLIENT_CLASSPATH}:${i}" +done + +CLIENT_CLASS=org.hyperic.hq.bizapp.agent.client.AgentClient + +HQ_JAVA_OPTS="${HQ_JAVA_OPTS} \ + -Xmx128m + -Dsun.net.inetaddr.ttl=60 + -Djava.net.preferIPv4Stack=true \ + -Djava.security.auth.login.config=jaas.config + -Dagent.install.home=. \ + -Dagent.bundle.home=. \ + -Djava.library.path=${WRAPPER_LIB} + -D${AGENTPROPFILE_PROP}=${AGENT_PROPS} \ + -D${AGENTLOGDIR_PROP}=${AGENTLOGDIR} \ + -D${AGENTDATADIR_PROP}=${AGENTDATADIR}" + +CLIENT_CMD="${HQ_JAVA} \ + ${HQ_JAVA_OPTS} + -cp ${CLIENT_CLASSPATH} ${CLIENT_CLASS}" + +START_CMD="${CLIENT_CMD} start" +STATUS_CMD="${CLIENT_CMD} status" +PING_CMD="${CLIENT_CMD} ping" +SETUP_CMD="${CLIENT_CMD} setup" +DIE_CMD="${CLIENT_CMD} die" + +if [ "$1" = "start" ] ; then + echo "Starting agent" + if ${START_CMD} ; then + exit 0 + else + exit 1 + fi +elif [ "$1" = "run" ] ; then + echo "Running agent" + echo ${START_CMD} + ${START_CMD} +elif [ "$1" = "stop" ] ; then + ${DIE_CMD} 10 || exit 1 +elif [ "$1" = "status" ] ; then + ${STATUS_CMD} || exit 1 +elif [ "$1" = "ping" ] ; then + echo Pinging ... + VAL=`$PING_CMD 2>&1` + if [ "$?" = "0" ] ; then + echo 'Success!' + else + echo 'Failure!' + echo $VAL + exit 1 + fi +elif [ "$1" = "setup" ] ; then + ${SETUP_CMD} +else + echo "Syntax: $0 "'<start | stop | ping | setup>' + exit 1 +fi Modified: trunk/tools/agentpork/init_framework.sh =================================================================== --- trunk/tools/agentpork/init_framework.sh 2010-02-11 00:14:51 UTC (rev 14276) +++ trunk/tools/agentpork/init_framework.sh 2010-02-11 01:18:06 UTC (rev 14277) @@ -1,11 +1,19 @@ #!/bin/sh +. etc/multiagent.properties + mkdir clones cd clones -ln -s ../../../build/agent master +ln -s $AGENT_BUNDLE_HOME master +ln -s $AGENT_HOME/wrapper wrapper ln -s master/lib lib ln -s master/pdk pdk cd .. ln -s clones/pdk pdk ln -s clones/lib lib + +cat etc/clone.properties | \ + sed -e s:@AGENT_BUNDLE_HOME@:${AGENT_BUNDLE_HOME}:g | \ + sed -e s:@NUM_CLONES@:${NUM_CLONES}:g > clone.properties + Added: trunk/tools/agentpork/start_clone.sh =================================================================== --- trunk/tools/agentpork/start_clone.sh (rev 0) +++ trunk/tools/agentpork/start_clone.sh 2010-02-11 01:18:06 UTC (rev 14277) @@ -0,0 +1,8 @@ +#!/bin/sh + +. etc/multiagent.properties + +echo "starting clone $1" + +cd clones/clone_$1 +nohup ./hq-agent-nowrapper.sh start 2>&1 > console.out & Added: trunk/tools/agentpork/start_multiagent.sh =================================================================== --- trunk/tools/agentpork/start_multiagent.sh (rev 0) +++ trunk/tools/agentpork/start_multiagent.sh 2010-02-11 01:18:06 UTC (rev 14277) @@ -0,0 +1,25 @@ +#!/bin/bash +. etc/multiagent.properties + +CLIENT_CMD="${JAVA_HOME}/bin/java -client \ + -Dagent.propFile=agent.properties \ + -Dorg.hyperic.hq.bizapp.agent.CommandsAPIInfo.camUpPort=111 \ + -Dagent.install.home=$AGENT_HOME \ + -Dagent.bundle.home=$AGENT_BUNDLE_HOME \ + -Dagent.mode=thread \ + -Djava.security.auth.login.config=jaas.config \ + -Djava.net.preferIPv4Stack=true \ + -Dcom.sun.management.jmxremote \ + $CLONE_JAVA_FLAGS \ + -cp $CLONE_CP org.hyperic.util.thread.MultiRunner $1" + +echo $CLIENT_CMD + +echo "***** the start time is " +echo `date` + +$CLIENT_CMD + +echo "***** the end time is " +echo `date` + Added: trunk/tools/agentpork/stop_clone.sh =================================================================== --- trunk/tools/agentpork/stop_clone.sh (rev 0) +++ trunk/tools/agentpork/stop_clone.sh 2010-02-11 01:18:06 UTC (rev 14277) @@ -0,0 +1,6 @@ +#!/bin/sh + +. etc/multiagent.properties + +cd clones/clone_$1 +./hq-agent-nowrapper.sh stop Added: trunk/tools/agentpork/wipe_clones.sh =================================================================== --- trunk/tools/agentpork/wipe_clones.sh (rev 0) +++ trunk/tools/agentpork/wipe_clones.sh 2010-02-11 01:18:06 UTC (rev 14277) @@ -0,0 +1 @@ +rm -rf clones pdk lib tmp clone.properties |
|
From: <bo...@hy...> - 2010-02-10 23:53:14
|
Author: bob Date: 2010-02-10 15:53:04 -0800 (Wed, 10 Feb 2010) New Revision: 14275 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14275 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties Log: Update patch version to 4.2.0.5 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties =================================================================== --- branches/HQ_4_2_0_PATCH/etc/version.properties 2010-02-10 19:17:04 UTC (rev 14274) +++ branches/HQ_4_2_0_PATCH/etc/version.properties 2010-02-10 23:53:04 UTC (rev 14275) @@ -1,3 +1,3 @@ #Fri Jan 22 17:17:20 PST 2010 -version=4.2.0.4 +version=4.2.0.5 build=1278 |
14 messages has been excluded from this view by a project administrator.
