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: <no...@gi...> - 2010-02-18 18:13:46
|
Branch: refs/heads/master Home: http://github.com/hyperic/hqapi Commit: 0f54ac5395c005e77f74ade750b0dced6cffe588 http://github.com/hyperic/hqapi/commit/0f54ac5395c005e77f74ade750b0dced6cffe588 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-18 (Thu, 18 Feb 2010) Changed paths: M bin/hqapi.sh Log Message: ----------- [HHQ-3740] Allow hqapi.sh to be executed from a symlinked directory. Commit: 2649f86b86fa31a30d2f59cc32aca5965b79c268 http://github.com/hyperic/hqapi/commit/2649f86b86fa31a30d2f59cc32aca5965b79c268 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-18 (Thu, 18 Feb 2010) Changed paths: M bin/hqapi.sh Log Message: ----------- Merge branch 'hqapi-1.0' into hqapi-2.x Commit: 5966c0a9f32083c0e7107c3e957b143439422063 http://github.com/hyperic/hqapi/commit/5966c0a9f32083c0e7107c3e957b143439422063 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-18 (Thu, 18 Feb 2010) Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog for HHQ-3740. Commit: e67c0588d007474aea663e8918b039c94d04462d http://github.com/hyperic/hqapi/commit/e67c0588d007474aea663e8918b039c94d04462d Author: Ryan Morgan <rm...@hy...> Date: 2010-02-18 (Thu, 18 Feb 2010) Changed paths: M ChangeLog M bin/hqapi.sh Log Message: ----------- Merge branch 'hqapi-2.x' |
|
From: <no...@gi...> - 2010-02-18 18:13:46
|
Branch: refs/heads/hqapi-1.0 Home: http://github.com/hyperic/hqapi Commit: 0f54ac5395c005e77f74ade750b0dced6cffe588 http://github.com/hyperic/hqapi/commit/0f54ac5395c005e77f74ade750b0dced6cffe588 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-18 (Thu, 18 Feb 2010) Changed paths: M bin/hqapi.sh Log Message: ----------- [HHQ-3740] Allow hqapi.sh to be executed from a symlinked directory. |
|
From: <no...@gi...> - 2010-02-18 18:13:46
|
Branch: refs/heads/hqapi-2.x Home: http://github.com/hyperic/hqapi Commit: 0f54ac5395c005e77f74ade750b0dced6cffe588 http://github.com/hyperic/hqapi/commit/0f54ac5395c005e77f74ade750b0dced6cffe588 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-18 (Thu, 18 Feb 2010) Changed paths: M bin/hqapi.sh Log Message: ----------- [HHQ-3740] Allow hqapi.sh to be executed from a symlinked directory. Commit: 2649f86b86fa31a30d2f59cc32aca5965b79c268 http://github.com/hyperic/hqapi/commit/2649f86b86fa31a30d2f59cc32aca5965b79c268 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-18 (Thu, 18 Feb 2010) Changed paths: M bin/hqapi.sh Log Message: ----------- Merge branch 'hqapi-1.0' into hqapi-2.x Commit: 5966c0a9f32083c0e7107c3e957b143439422063 http://github.com/hyperic/hqapi/commit/5966c0a9f32083c0e7107c3e957b143439422063 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-18 (Thu, 18 Feb 2010) Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog for HHQ-3740. |
|
From: <kp...@hy...> - 2010-02-18 17:42:10
|
Author: kparikh Date: 2010-02-18 09:42:01 -0800 (Thu, 18 Feb 2010) New Revision: 14305 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14305 Modified: trunk/tools/agentpork/create_clone.sh trunk/tools/agentpork/etc/agent.properties trunk/tools/agentpork/etc/multiagent.properties trunk/tools/agentpork/start_multiagent.sh trunk/tools/agentpork/stop_clone.sh Log: Fix multiagent stop issue Add plugin.exclude props Modified: trunk/tools/agentpork/create_clone.sh =================================================================== --- trunk/tools/agentpork/create_clone.sh 2010-02-18 09:22:36 UTC (rev 14304) +++ trunk/tools/agentpork/create_clone.sh 2010-02-18 17:42:01 UTC (rev 14305) @@ -20,8 +20,10 @@ sed -e s/@CLONE_SERVERIP@/$CLONE_SERVERIP/ | \ sed -e s/@CLONE_SECURE@/$CLONE_SECURE/ | \ sed -e s/@CLONE_FQDN@/${CLONE_FQDN_PREFIX}$1/ | \ + sed -e s/@CLONE_SERVER_PORT@/$CLONE_SERVER_PORT/ | \ sed -e s/@CLONE_LISTENPORT@/${clone_port}/ \ > clones/clone_$1/agent.properties cd clones/clone_$1 nohup ./hq-agent-nowrapper.sh start 2>&1 > console.out & +echo $! > nowrapper.pid \ No newline at end of file Modified: trunk/tools/agentpork/etc/agent.properties =================================================================== --- trunk/tools/agentpork/etc/agent.properties 2010-02-18 09:22:36 UTC (rev 14304) +++ trunk/tools/agentpork/etc/agent.properties 2010-02-18 17:42:01 UTC (rev 14305) @@ -79,3 +79,9 @@ ## Options to pass to java agent.javaOpts=-Xmx128m -Djava.net.preferIPv4Stack=true agent.setup.unidirectional=no + +# Setting plugin.base allows us exclude netservices and sqlquery plugins +plugins.base=system + +# exclude all plugins except system and hq-agent +plugins.exclude=activemq,alfresco,apache,bind,coldfusion,db2,dotnet,exchange,geronimo,glassfish,hq-internal,hq-inventory,iis,informix,iplanet,jboss,jetty,jmx,jvm-jmx-metrics,memcached,mqseries,mssql,multi-process-metrics,mysql,mysql_stats,nagios,netdevice,netservices,ntds,ntp,oc4j,openldap,oracle,perlbal,postfix,postgresql,resin,samba,sendmail,servlet,spring,sqlquery,sun-jvm-service,sybase,tomcat,vim,vmware,weblogic,websphere,xen,zimbra,groovy-scripting Modified: trunk/tools/agentpork/etc/multiagent.properties =================================================================== --- trunk/tools/agentpork/etc/multiagent.properties 2010-02-18 09:22:36 UTC (rev 14304) +++ trunk/tools/agentpork/etc/multiagent.properties 2010-02-18 17:42:01 UTC (rev 14305) @@ -1,14 +1,37 @@ -# Adjust following variables based on your config -export AGENT_HOME=/x2/HQ/multiagent/trimmed-agent +# Update following variables based on your environment and needs + +# Full path to hq agent home +export AGENT_HOME=$HQ_AGENT_HOME + +# Agent build version export AGENT_BUILD_VERSION=4.2.0 + +# Agent build number export AGENT_BUILD_NUMBER=1261 -export CLONE_SERVERIP=10.16.17.38 -export CLONE_SERVER_PORT=8080 + +# HQ server IP +export CLONE_SERVERIP=127.0.0.1 + +# HQ server port +export CLONE_SERVER_PORT=7080 + +# First port the agent should listen on +# If you set NUM_CLONES to 10, agents will listen on following ports +# 4000, 4001, 4002,..., 4009 export CLONE_LISTEN_STARTPORT=4000 -export NUM_CLONES=100 -export CLONE_JAVA_FLAGS="-XX:MaxPermSize=128m -Xmx1024m -Xms1024m" +# Number of agents you want to start +export NUM_CLONES=10 +# Recommended settings are +# If NUM_CLONES=10 then -Xmx128m -Xms128m +# If NUM_CLONES=25 then -Xmx256m -Xms256m +# If NUM_CLONES=50 then -Xmx512m -Xms512m +# If NUM_CLONES=100 then -Xmx1024m -Xms1024m +# Leave MaxPermSize to 128m +export CLONE_JAVA_FLAGS="-XX:MaxPermSize=128m -Xmx128m -Xms128m" + + # Do not modify anything below export CLONE_SECURE=yes export AGENT_BUNDLE_HOME=$AGENT_HOME/bundles/agent-$AGENT_BUILD_VERSION-EE-$AGENT_BUILD_NUMBER @@ -29,4 +52,3 @@ CLONE_CP=$AGENT_HOME/wrapper/lib/wrapper.jar:$CLONE_CP export CLONE_CP=$CLONE_CP export CLONE_FQDN_PREFIX=$HOSTNAME-clone- - Modified: trunk/tools/agentpork/start_multiagent.sh =================================================================== --- trunk/tools/agentpork/start_multiagent.sh 2010-02-18 09:22:36 UTC (rev 14304) +++ trunk/tools/agentpork/start_multiagent.sh 2010-02-18 17:42:01 UTC (rev 14305) @@ -9,7 +9,7 @@ -Dagent.mode=thread \ -Djava.security.auth.login.config=jaas.config \ -Djava.net.preferIPv4Stack=true \ - -Dcom.sun.management.jmxremote \ + -Dcom.sun.management.jmxremote \ $CLONE_JAVA_FLAGS \ -cp $CLONE_CP org.hyperic.util.thread.MultiRunner $1" Modified: trunk/tools/agentpork/stop_clone.sh =================================================================== --- trunk/tools/agentpork/stop_clone.sh 2010-02-18 09:22:36 UTC (rev 14304) +++ trunk/tools/agentpork/stop_clone.sh 2010-02-18 17:42:01 UTC (rev 14305) @@ -3,4 +3,11 @@ . etc/multiagent.properties cd clones/clone_$1 +# Stop the agent ./hq-agent-nowrapper.sh stop + +# Cleanup in case agent nohup process is still running +# kill child process forked by hq-agent-nowrapper.sh +# This matches the java process and send it sighup, it also kills hq-agent-nowrapiper.sh +ps -o pid= --ppid `cat nowrapper.pid`| xargs kill +rm nowrapper.pid |
|
From: <bo...@hy...> - 2010-02-18 09:22:46
|
Author: bob Date: 2010-02-18 01:22:36 -0800 (Thu, 18 Feb 2010) New Revision: 14304 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14304 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1354 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-02-17 09:22:46 UTC (rev 14303) +++ trunk/etc/version.properties 2010-02-18 09:22:36 UTC (rev 14304) @@ -1,3 +1,3 @@ -#Wed Feb 17 00:29:57 PST 2010 +#Thu Feb 18 00:27:03 PST 2010 version=4.3.0 -build=1353 +build=1354 |
|
From: Doug M. <do...@hy...> - 2010-02-17 19:32:25
|
That looks fine. One more command that might shed some light on the problem: % strace -f -o strace.txt java -jar sigar.jar version And attach strace.txt Another option would be to try building Sigar from source: http://support.hyperic.com/display/SIGAR/Home#Home-building Can you give that try? |
|
From: Zsolt K. <sig...@hy...> - 2010-02-17 18:36:11
|
Hi Doug, Both sun jdk 1.6 and openjdk 1.6 give the same. $ java -jar sigar.jar test Cpu Sigar version.......java=1.6.3.0, native=1.6.3.0 Build date..........java=01/14/2010 01:37 DU, native=01/14/2010 01:37 DU SCM rev.............java=exported, native=exported Archlib.............libsigar-x86-freebsd-7.so Current fqdn........kuti-zsolt.intranet.prolan.hu Current user........kuti OS description......FreeBSD 7.2-RELEASE OS name.............FreeBSD OS arch.............i386 OS machine..........i386 OS version..........7.2-RELEASE OS patch level......unknown OS vendor...........FreeBSD OS vendor version...7.2 OS code name........RELEASE OS data model.......32 OS cpu endian.......little Java vm version.....14.0-b16 Java vm vendor......Sun Microsystems Inc. Java home.........../usr/local/openjdk6/jre TestCpu.testCreate...............getCpu: User...138600 Sys....33920 Idle...13279100 Wait...0 Irq...42750 SIrq..0 Stl...0 Total..13494370 last run cpu=-1 Cpu 0: User...51330 Sys....12170 Idle...6648830 Wait...0 Irq...34920 SIrq..0 Stl...0 Total..6747250 last run cpu=-1 Cpu 1: User...87270 Sys....21750 Idle...6630270 Wait...0 Irq...7830 SIrq..0 Stl...0 Total..6747120 last run cpu=-1 Cpu 2: User...0 Sys....0 Idle...0 Wait...0 Irq...0 SIrq..0 Stl...0 Total..0 FAILED Time: 0,003 There was 1 failure: 1) org.hyperic.sigar.test.TestCpu: junit.framework.AssertionFailedError: null at org.hyperic.sigar.test.TestCpu.checkCpu(TestCpu.java:56) at org.hyperic.sigar.test.TestCpu.testCreate(TestCpu.java:79) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at org.hyperic.sigar.test.SigarTestPrinter.runTests(SigarTestPrinter.java:183) at org.hyperic.sigar.test.SigarTestRunner.output(SigarTestRunner.java:140) at org.hyperic.sigar.cmd.SigarCommandBase.processCommand(SigarCommandBase.java:188) at org.hyperic.sigar.shell.ShellBase.processCommand(ShellBase.java:397) at org.hyperic.sigar.cmd.Shell.processCommand(Shell.java:122) at org.hyperic.sigar.shell.ShellBase.handleCommand(ShellBase.java:364) at org.hyperic.sigar.cmd.Shell.main(Shell.java:225) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at org.hyperic.sigar.cmd.Runner.main(Runner.java:214) FAILURES!!! Tests run: 1, Failures: 1, Errors: 0 $ sysctl kern.cp_times $ (That is has no output.) $ java -jar sigar.jar test Swap [...] TestSwap.testCreate...............Total=-131072 FAILED Time: 0,002 There was 1 failure: 1) org.hyperic.sigar.test.TestSwap: junit.framework.AssertionFailedError: Total at org.hyperic.sigar.test.SigarTestCase.assertGtEqZeroTrace(SigarTestCase.java:152) at org.hyperic.sigar.test.TestSwap.testCreate(TestSwap.java:35) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at org.hyperic.sigar.test.SigarTestPrinter.runTests(SigarTestPrinter.java:183) at org.hyperic.sigar.test.SigarTestRunner.output(SigarTestRunner.java:140) at org.hyperic.sigar.cmd.SigarCommandBase.processCommand(SigarCommandBase.java:188) at org.hyperic.sigar.shell.ShellBase.processCommand(ShellBase.java:397) at org.hyperic.sigar.cmd.Shell.processCommand(Shell.java:122) at org.hyperic.sigar.shell.ShellBase.handleCommand(ShellBase.java:364) at org.hyperic.sigar.cmd.Shell.main(Shell.java:225) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at org.hyperic.sigar.cmd.Runner.main(Runner.java:214) FAILURES!!! Tests run: 1, Failures: 1, Errors: 0 $ swapinfo Device 1K-blocks Used Avail Capacity /dev/ad0s2b 4194304 0 4194304 0% Thanks! Zsolt |
|
From: <bo...@hy...> - 2010-02-17 09:22:54
|
Author: bob Date: 2010-02-17 01:22:46 -0800 (Wed, 17 Feb 2010) New Revision: 14303 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14303 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1353 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-02-17 01:08:19 UTC (rev 14302) +++ trunk/etc/version.properties 2010-02-17 09:22:46 UTC (rev 14303) @@ -1,3 +1,3 @@ -#Tue Feb 16 00:30:34 PST 2010 +#Wed Feb 17 00:29:57 PST 2010 version=4.3.0 -build=1352 +build=1353 |
|
From: Chakresh <sig...@hy...> - 2010-02-17 05:02:43
|
etpgluz:# md5sum libsigar-s390x-linux.so
c1b835fbeed0ab9cfd5d0716dbf3942b libsigar-s390x-linux.so
etpgluz:# ldd libsigar-s390x-linux.so
libc.so.6 => /lib64/libc.so.6 (0x000002000005a000)
/lib/ld64.so.1 (0x000002aaaaaaa000)
etpgluz:# strings libsigar-s390x-linux.so | grep SIGAR-
SIGAR-1.6.3.1, SCM revision 80016c6, built 07/09/2009 07:16 AM as libsigar-s390x-linux.so
Thanks
|
|
From: Zsolt K. <sig...@hy...> - 2010-02-17 05:02:38
|
Hello Doug, So many options to solve the problem! :-) First, I am sorry for missing jira, then even more for not checking ports which is the most convenient and effective way to get any piece of software. Sigar is working now. Thanks for your quick help! Zsolt |
|
From: Chakresh <sig...@hy...> - 2010-02-17 05:02:38
|
Hi Doug, Thanks for reply. I tried running 1.6.3 sigar with IBM 1.6 jre but still it fails. Below is the output etpgluz:/opt/newfiles/hyperic-sigar-1.6.3/sigar-bin/lib # /opt/ibm/java-s390x-60/jre/bin/java -version java version "1.6.0" Java(TM) SE Runtime Environment (build pxz6460sr7-20091215_02(SR7)) IBM J9 VM (build 2.4, JRE 1.6.0 IBM J9 2.4 Linux s390x-64 jvmxz6460sr7-20091214_49398 (JIT enabled, AOT enabled) J9VM - 20091214_049398 JIT - r9_20091123_13891 GC - 20091111_AA) JCL - 20091202_01 etpgluz:/opt/newfiles/hyperic-sigar-1.6.3/sigar-bin/lib # /opt/ibm/java-s390x-60/jre/bin/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=0000020000ABC7D4 Handler2=0000020000B4DFA4 gpr0=0000000000000000 gpr1=0000000000000000 gpr2=0000000000000000 gpr3=000000000F4D007F gpr4=00000200223F0CB0 gpr5=000002000001DC90 gpr6=0000000080557290 gpr7=0000000000000003 gpr8=0000000080558830 gpr9=0000000000000001 gpr10=0000000080556FE0 gpr11=0000020000A76FA0 gpr12=000002000001E000 gpr13=0000020000017348 gpr14=0000020000009D84 gpr15=0000020000A76EB8 psw=0000020000009908 mask=0705C00180000000 fpc=0008000000000000 fpr0 42c0000000000000 (f: 0.000000, d: 3.518437e+13) fpr1 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr2 4040000000000000 (f: 0.000000, d: 3.200000e+01) fpr3 0000000000000000 (f: 0.000000, d: 0.000000e+00) fpr4 3ff3333333333333 (f: 858993472.000000, d: 1.200000e+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_40_20091214_049398 (Linux 2.6.16.60-0.54.5-default) CPU=s390x (1 logical CPUs) (0x3e43c000 RAM) ----------- Stack Backtrace ----------- (0x0000020000B4437A [libj9prt24.so+0x0]) --------------------------------------- JVMDUMP006I Processing dump event "gpf", detail "" - please wait. JVMDUMP032I JVM requested System dump using '/opt/newfiles/hyperic-sigar-1.6.3/sigar-bin/lib/core.20100216.140249.27930.0001.dmp' in response to an event JVMDUMP010I System dump written to /opt/newfiles/hyperic-sigar-1.6.3/sigar-bin/lib/core.20100216.140249.27930.0001.dmp JVMDUMP032I JVM requested Snap dump using '/opt/newfiles/hyperic-sigar-1.6.3/sigar-bin/lib/Snap.20100216.140249.27930.0002.trc' in response to an event JVMDUMP010I Snap dump written to /opt/newfiles/hyperic-sigar-1.6.3/sigar-bin/lib/Snap.20100216.140249.27930.0002.trc JVMDUMP032I JVM requested Java dump using '/opt/newfiles/hyperic-sigar-1.6.3/sigar-bin/lib/javacore.20100216.140249.27930.0003.txt' in response to an event JVMDUMP010I Java dump written to /opt/newfiles/hyperic-sigar-1.6.3/sigar-bin/lib/javacore.20100216.140249.27930.0003.txt JVMDUMP013I Processed dump event "gpf", detail "". Please let me know if you need more information. I have urgency to get sigar working with IBM java. Appreciate all your help. Thanks Chakresh |
|
From: Chakresh <sig...@hy...> - 2010-02-17 05:02:38
|
Doug, Attaching the requested file. Thanks |
|
From: Zsolt K. <sig...@hy...> - 2010-02-17 05:02:38
|
Hello,
A build on FreeBSD 8.0 fails as given below.
It seems the sought file /usr/include/nfs/rpcv2.h does missing in 8.0.
Any help appreciated!
Zsolt
jni-cc:
[mkdir] Created dir: /usr/home/kuti/tmp/hyperic-sigar-1.6.3-src/bindings/java/build/obj/x86-freebsd-8/lib
[echo] jni libname=sigar-x86-freebsd-8
[cc] 11 total files to be compiled.
[cc] /usr/home/kuti/tmp/hyperic-sigar-1.6.3-src/src/os/darwin/darwin_sigar.c:26:23: error: nfs/rpcv2.h: No such file or directory
[cc] In file included from /usr/include/sys/systm.h:42,
[cc] from /usr/include/sys/refcount.h:38,
[cc] from /usr/include/sys/file.h:42,
[cc] from /usr/home/kuti/tmp/hyperic-sigar-1.6.3-src/src/os/darwin/darwin_sigar.c:3152:
[cc] /usr/include/machine/cpufunc.h:161: error: static declaration of 'ffs' follows non-static declaration
[cc] /usr/include/machine/cpufunc.h:175: error: static declaration of 'fls' follows non-static declaration
[cc] /usr/include/strings.h:52: error: previous declaration of 'fls' was here
[cc] In file included from /usr/include/sys/refcount.h:38,
[cc] from /usr/include/sys/file.h:42,
[cc] from /usr/home/kuti/tmp/hyperic-sigar-1.6.3-src/src/os/darwin/darwin_sigar.c:3152:
[cc] /usr/include/sys/systm.h:229: error: expected declaration specifiers or '...' before 'uintfptr_t'
[cc] /usr/include/sys/systm.h:233: error: expected declaration specifiers or '...' before 'uintfptr_t'
[cc] /usr/include/sys/systm.h:252: error: conflicting types for 'setenv'
[cc] /usr/include/stdlib.h:162: error: previous declaration of 'setenv' was here
[cc] In file included from /usr/include/sys/systm.h:267,
[cc] from /usr/include/sys/refcount.h:38,
[cc] from /usr/include/sys/file.h:42,
[cc] from /usr/home/kuti/tmp/hyperic-sigar-1.6.3-src/src/os/darwin/darwin_sigar.c:3152:
[cc] /usr/include/sys/libkern.h:69: error: static declaration of 'abs' follows non-static declaration
[cc] /usr/include/sys/libkern.h:70: error: static declaration of 'labs' follows non-static declaration
[cc] /usr/include/sys/libkern.h:93: error: conflicting types for 'gets'
[cc] /usr/include/stdio.h:253: error: previous declaration of 'gets' was here
[cc] /usr/include/sys/libkern.h:100: error: conflicting types for 'random'
[cc] /usr/include/stdlib.h:207: error: previous declaration of 'random' was here
[cc] /usr/include/sys/libkern.h:111: error: conflicting types for 'strdup'
[cc] /usr/include/sys/libkern.h:149: error: static declaration of 'memset' follows non-static declaration
[cc] /usr/include/sys/libkern.h:167: error: static declaration of 'strchr' follows non-static declaration
[cc] /usr/include/sys/libkern.h:173: error: static declaration of 'strrchr' follows non-static declaration
[cc] In file included from /usr/include/sys/refcount.h:38,
[cc] from /usr/include/sys/file.h:42,
[cc] from /usr/home/kuti/tmp/hyperic-sigar-1.6.3-src/src/os/darwin/darwin_sigar.c:3152:
[cc] /usr/include/sys/systm.h:290: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'splbio'
[cc] /usr/include/sys/systm.h:291: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'splcam'
[cc] /usr/include/sys/systm.h:292: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'splclock'
[cc] /usr/include/sys/systm.h:293: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'splhigh'
[cc] /usr/include/sys/systm.h:294: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'splimp'
[cc] /usr/include/sys/systm.h:295: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'splnet'
[cc] /usr/include/sys/systm.h:296: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'splsoftcam'
[cc] /usr/include/sys/systm.h:297: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'splsoftclock'
[cc] /usr/include/sys/systm.h:298: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'splsofttty'
[cc] /usr/include/sys/systm.h:299: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'splsoftvm'
[cc] /usr/include/sys/systm.h:300: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'splsofttq'
[cc] /usr/include/sys/systm.h:301: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'splstatclock'
[cc] /usr/include/sys/systm.h:302: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'spltty'
[cc] /usr/include/sys/systm.h:303: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'splvm'
[cc] /usr/include/sys/systm.h:304: error: expected ')' before 'ipl'
[cc] /usr/include/sys/systm.h:316: error: conflicting types for 'pause'
[cc] /usr/include/unistd.h:357: error: previous declaration of 'pause' was here
BUILD FAILED
/usr/home/kuti/tmp/hyperic-sigar-1.6.3-src/bindings/java/hyperic_jni/jni-build.xml:234: The following error occurred while executing this line:
/usr/home/kuti/tmp/hyperic-sigar-1.6.3-src/bindings/java/hyperic_jni/jni-build.xml:280: gcc failed with return code 1
|
|
From: Zsolt K. <sig...@hy...> - 2010-02-17 05:02:36
|
Hi Doug, I am sorry missing your answer for so long (improper forum settings on my part). I will send info tomorrow when I am sitting at that 7.2 box. (In the meantime, see an other thread for a case with FreeBSD 8.0.) |
|
From: Doug M. <do...@hy...> - 2010-02-17 02:35:09
|
Looks like the JVM is crashing trying to load libsigar-s390x-linux.so. What is the output of the following commands: % md5sum libsigar-s390x-linux.so % ldd libsigar-s390x-linux.so % strings libsigar-s390x-linux.so | grep SIGAR- |
|
From: <dcr...@hy...> - 2010-02-17 01:08:27
|
Author: dcrutchf Date: 2010-02-16 17:08:19 -0800 (Tue, 16 Feb 2010) New Revision: 14302 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14302 Modified: trunk/web/resource/common/monitor/alerts/ViewAlert.jsp trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp Log: Polished the UI a bit Modified: trunk/web/resource/common/monitor/alerts/ViewAlert.jsp =================================================================== --- trunk/web/resource/common/monitor/alerts/ViewAlert.jsp 2010-02-17 00:55:38 UTC (rev 14301) +++ trunk/web/resource/common/monitor/alerts/ViewAlert.jsp 2010-02-17 01:08:19 UTC (rev 14302) @@ -60,72 +60,66 @@ <tiles:insert beanName="action"/> </c:forEach> -<tiles:insert definition=".header.tab"> - <tiles:put name="tabKey" value="resource.common.alert.action.fix.header"/> -</tiles:insert> -<table cellpadding="10" cellspacing="0" border="0" width="100%" id="fixedSection"> -<tr> -<c:choose> - <c:when test="${not alert.fixed}"> - <c:if test="${not empty fixedNote}"> - <td class="BlockContent" align="right" valign="top" width="20%"> - <div class="BoldText"><fmt:message key="resource.common.alert.previousFix"/></div> - </td> - <td class="BlockContent" colspan="2" width="80%"> - <c:out value="${fixedNote}"/> - </td> - </tr> - <tr> - </c:if> - - <td class="BlockLabel" align="right" valign="top" width="20%"><fmt:message key="resource.common.alert.fixedNote"/></td> - <td class="BlockContent" colspan="2" width="80%"> - <c:choose> - <c:when test="${canTakeAction}"> - <html:textarea property="fixedNote" cols="70" rows="5" /> - </c:when> - <c:otherwise> - <html:textarea property="fixedNote" cols="70" rows="5" disabled="true" /> - </c:otherwise> - </c:choose> - </td> - </tr> +<c:if test="${canTakeAction}"> + <tiles:insert definition=".header.tab"> + <tiles:put name="tabKey" value="resource.common.alert.action.fix.header"/> + </tiles:insert> + <table cellpadding="10" cellspacing="0" border="0" width="100%" id="fixedSection"> <tr> - <td class="BlockContent" width="20%" align="right"> </td> - <td class="BlockContent"<c:if test="${canTakeAction}"> width="5%"</c:if> style="padding-top: 6px; padding-bottom: 6px;"> - </c:when> - <c:when test="${not empty fixedNote}"> - <td class="BlockContent" width="20%" align="right"> </td> - <td class="BlockContent"> - <div style="padding: 4px; 0"><c:out value="${fixedNote}"/></div> - </c:when> - <c:otherwise> - <td class="BlockContent" width="20%" align="right"> </td> - <td class="BlockContent"> - <div style="padding: 4px 0;"><fmt:message key="resource.common.alert.beenFixed"/></div> - </c:otherwise> -</c:choose> -<tiles:insert page="/common/components/ActionButton.jsp"> - <tiles:put name="labelKey" value="resource.common.alert.action.fixed.label"/> - <tiles:put name="buttonClick">dojo.byId('mode').setAttribute('value', '<fmt:message key="resource.common.alert.action.fixed.label"/>'); document.forms[0].submit();</tiles:put> - <tiles:put name="icon"><html:img page="/images/icon_fixed.gif" alt="Click to mark as Fixed" align="middle"/></tiles:put> - <c:choose> - <c:when test="${not alert.fixed && canTakeAction}"> - <tiles:put name="disabled" value="false"/> - </c:when> - <c:otherwise> - <tiles:put name="hidden" value="true"/> - </c:otherwise> - </c:choose> -</tiles:insert> - <c:if test="${not alert.fixed && canTakeAction}"> - <td class="BlockContent"> - <fmt:message key="resource.common.alert.clickToFix"/> - </td> - </c:if> - </td> -</tr> -</table> + <c:choose> + <c:when test="${not alert.fixed}"> + <c:if test="${not empty fixedNote}"> + <td class="BlockContent" align="right" valign="top" width="20%"> + <div class="BoldText"><fmt:message key="resource.common.alert.previousFix"/></div> + </td> + <td class="BlockContent" colspan="2" width="80%"> + <c:out value="${fixedNote}"/> + </td> + </tr> + <tr> + </c:if> + <td class="BlockLabel" align="right" valign="top" width="20%"><fmt:message key="resource.common.alert.fixedNote"/></td> + <td class="BlockContent" colspan="2" width="80%"> + <html:textarea property="fixedNote" cols="70" rows="5" /> + </td> + </tr> + <tr> + <td class="BlockContent" width="20%" align="right"> </td> + <td class="BlockContent" width="5%" style="padding-top: 6px; padding-bottom: 6px;"> + </c:when> + <c:when test="${not empty fixedNote}"> + <td class="BlockContent" width="20%" align="right"> </td> + <td class="BlockContent"> + <div style="padding: 4px; 0"><c:out value="${fixedNote}"/></div> + </c:when> + <c:otherwise> + <td class="BlockContent" width="20%" align="right"> </td> + <td class="BlockContent"> + <div style="padding: 4px 0;"><fmt:message key="resource.common.alert.beenFixed"/></div> + </c:otherwise> + </c:choose> + <tiles:insert page="/common/components/ActionButton.jsp"> + <tiles:put name="labelKey" value="resource.common.alert.action.fixed.label"/> + <tiles:put name="buttonClick">dojo.byId('mode').setAttribute('value', '<fmt:message key="resource.common.alert.action.fixed.label"/>'); document.forms[0].submit();</tiles:put> + <tiles:put name="icon"><html:img page="/images/icon_fixed.gif" alt="Click to mark as Fixed" align="middle"/></tiles:put> + <c:choose> + <c:when test="${not alert.fixed}"> + <tiles:put name="disabled" value="false"/> + </c:when> + <c:otherwise> + <tiles:put name="hidden" value="true"/> + </c:otherwise> + </c:choose> + </tiles:insert> + <c:if test="${not alert.fixed}"> + <td class="BlockContent"> + <fmt:message key="resource.common.alert.clickToFix"/> + </td> + </c:if> + </td> + </tr> + </table> +</c:if> <tiles:insert definition=".events.alert.view.nav" flush="true"/> Modified: trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp =================================================================== --- trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp 2010-02-17 00:55:38 UTC (rev 14301) +++ trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp 2010-02-17 01:08:19 UTC (rev 14302) @@ -75,31 +75,23 @@ <html:textarea property="ackNote" cols="70" rows="4"/> </td> </tr> - </c:if> - <tr> - <td width="20%" class="BlockLabel"> </td> - <td width="80%" class="BlockContent"> - <c:if test="${escalation.pauseAllowed && alert.ackable && canTakeAction}"> - <div id="AlertEscalationOption" syle="text-align:left;"> - <input type="checkbox" name="pause" value="true" checked="checked" onclick="dojo11.byId('pauseTimeSel').disabled = !this.checked;" /> <fmt:message key="alert.escalation.pause"/> - </div> - </c:if> - <div style="text-align:left;"> - <tiles:insert page="/common/components/ActionButton.jsp"> - <tiles:put name="labelKey" value="resource.common.alert.action.acknowledge.label"/> - <tiles:put name="buttonClick">dojo.byId('mode').setAttribute('value', '<fmt:message key="resource.common.alert.action.acknowledge.label"/>'); document.forms[0].submit();</tiles:put> - <c:choose> - <c:when test="${alert.ackable}"> - <tiles:put name="disabled" value="false"/> - </c:when> - <c:otherwise> - <tiles:put name="hidden" value="true"/> - </c:otherwise> - </c:choose> - </tiles:insert> - </div> - </td> - </tr> + <tr> + <td width="20%" class="BlockLabel"> </td> + <td width="80%" class="BlockContent"> + <c:if test="${escalation.pauseAllowed}"> + <div id="AlertEscalationOption" syle="text-align:left;"> + <input type="checkbox" name="pause" value="true" checked="checked" onclick="dojo11.byId('pauseTimeSel').disabled = !this.checked;" /> <fmt:message key="alert.escalation.pause"/> + </div> + </c:if> + <div style="text-align:left;"> + <tiles:insert page="/common/components/ActionButton.jsp"> + <tiles:put name="labelKey" value="resource.common.alert.action.acknowledge.label"/> + <tiles:put name="buttonClick">dojo.byId('mode').setAttribute('value', '<fmt:message key="resource.common.alert.action.acknowledge.label"/>'); document.forms[0].submit();</tiles:put> + </tiles:insert> + </div> + </td> + </tr> + </c:if> </table> <script type="text/javascript"> |
|
From: <sc...@hy...> - 2010-02-17 00:56:03
|
Author: scottmf Date: 2010-02-16 16:55:38 -0800 (Tue, 16 Feb 2010) New Revision: 14301 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14301 Modified: trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java Log: [HHQ-3505] fix intermittent error by explicitly checking the db to see if the object exists and if so delete it Modified: trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java 2010-02-17 00:34:08 UTC (rev 14300) +++ trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityDataDAO.java 2010-02-17 00:55:38 UTC (rev 14301) @@ -459,4 +459,8 @@ save(availObj); return availObj; } + + public AvailabilityDataRLE getById(AvailabilityDataId id) { + return (AvailabilityDataRLE) get(id); + } } Modified: trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java 2010-02-17 00:34:08 UTC (rev 14300) +++ trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java 2010-02-17 00:55:38 UTC (rev 14301) @@ -793,10 +793,12 @@ AvailabilityDataRLE rle = (AvailabilityDataRLE)entry.getValue(); // if we call remove() on an object which is already in the session // hibernate will throw NonUniqueObjectExceptions - if (_dao.getSession().contains(rle)) { - _dao.getSession().evict(rle); + AvailabilityDataRLE tmp = _dao.getById(rle.getAvailabilityDataId()); + if (tmp != null) { + _dao.remove(tmp); + } else { + _dao.remove(rle); } - _dao.remove(rle); } // addData() could be overwriting RLE data points (i.e. from 0.0 to 1.0) // with the same ID. If this is the scenario, then we must run |
|
From: <dcr...@hy...> - 2010-02-17 00:39:15
|
Author: dcrutchf Date: 2010-02-16 16:34:08 -0800 (Tue, 16 Feb 2010) New Revision: 14300 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14300 Modified: trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/ViewGroupAction.java trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp Log: Added fix for group alerts and acknowledge inputs Modified: trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/ViewGroupAction.java =================================================================== --- trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/ViewGroupAction.java 2010-02-16 22:28:55 UTC (rev 14299) +++ trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/ViewGroupAction.java 2010-02-17 00:34:08 UTC (rev 14300) @@ -25,7 +25,6 @@ package org.hyperic.hq.ui.action.resource.group.inventory; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Locale; Modified: trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp =================================================================== --- trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp 2010-02-16 22:28:55 UTC (rev 14299) +++ trunk/web/resource/common/monitor/alerts/ViewAlertEscalation.jsp 2010-02-17 00:34:08 UTC (rev 14300) @@ -32,88 +32,90 @@ --%> <c:if test="${not empty escalation}"> -<!-- Content Block Title: Notification --> -<tiles:insert definition=".header.tab"> - <tiles:put name="tabKey" value="monitoring.events.MiniTabs.Escalation"/> -</tiles:insert> + <!-- Content Block Title: Notification --> + <tiles:insert definition=".header.tab"> + <tiles:put name="tabKey" value="monitoring.events.MiniTabs.Escalation"/> + </tiles:insert> -<table cellpadding="0" cellspacing="0" border="0" width="100%" class="TableBottomLine" style="margin-bottom: 10px;"> - <tr> - <td width="20%" class="BlockLabel"><fmt:message key="common.header.EscalationName"/></td> - <td class="BlockContent" colspan="2"><c:out value="${escalation.name}"/></td> - </tr> - <tr> - <td colspan="3" class="BlockContent"> - <tiles:insert page="/resource/common/monitor/alerts/config/ViewEscalation.jsp"> - <tiles:put name="chooseScheme" value="false"/> - </tiles:insert> - </td> - </tr> - <tr> - <td width="20%" class="BlockLabel" style="padding-left: 4px;"><fmt:message key="common.label.EscalationActionLogs"/></td> - <td class="BlockContent" colspan="2"> </td> - </tr> - <c:forEach var="log" varStatus="status" items="${alert.actionLog}"> - <%-- No action or alert definition means escalation log --%> - <c:if test="${empty log.action || empty log.action.alertDefinition}"> - <tr> - <td width="20%" class="BlockLabel" style="padding-bottom:3px;"> - <span style="color:#333333;"><hq:dateFormatter value="${log.timeStamp}"/> - </span> - </td> - <td colspan="2" class="BlockContent" style="padding-left: 4px;padding-bottom:3px;"> - <c:out value="${log.detail}"/> - </td> - </tr> - </c:if> - </c:forEach> - <c:if test="${alert.ackable}"> - <tr> - <td width="20%" class="BlockLabel" style="border-top: solid #D5D8DE 1px;" valign="top" align="right"><span class="BoldText"><fmt:message key="resource.common.alert.ackNote"/></span></td> - <td colspan="2" class="BlockContent" style="border-top: solid #D5D8DE 1px;"> - <html:textarea property="ackNote" cols="70" rows="4"/> - </td> - </tr> - </c:if> - <tr> - <td width="20%" class="BlockLabel"> </td> - <td width="80%" class="BlockContent"> - <c:if test="${escalation.pauseAllowed && alert.ackable}"> - <div id="AlertEscalationOption" syle="text-align:left;"> - <input type="checkbox" name="pause" value="true" checked="checked" onclick="dojo11.byId('pauseTimeSel').disabled = !this.checked;" /> <fmt:message key="alert.escalation.pause"/> - </div> - </c:if> - <div style="text-align:left;"> - <tiles:insert page="/common/components/ActionButton.jsp"> - <tiles:put name="labelKey" value="resource.common.alert.action.acknowledge.label"/> - <tiles:put name="buttonClick">dojo.byId('mode').setAttribute('value', '<fmt:message key="resource.common.alert.action.acknowledge.label"/>'); document.forms[0].submit();</tiles:put> - <c:choose> - <c:when test="${alert.ackable}"> - <tiles:put name="disabled" value="false"/> - </c:when> - <c:otherwise> - <tiles:put name="hidden" value="true"/> - </c:otherwise> - </c:choose> - </tiles:insert> - </div> - </td> - </tr> -</table> + <table cellpadding="0" cellspacing="0" border="0" width="100%" class="TableBottomLine" style="margin-bottom: 10px;"> + <tr> + <td width="20%" class="BlockLabel"><fmt:message key="common.header.EscalationName"/></td> + <td class="BlockContent" colspan="2"><c:out value="${escalation.name}"/></td> + </tr> + <tr> + <td colspan="3" class="BlockContent"> + <tiles:insert page="/resource/common/monitor/alerts/config/ViewEscalation.jsp"> + <tiles:put name="chooseScheme" value="false"/> + </tiles:insert> + </td> + </tr> + <tr> + <td width="20%" class="BlockLabel" style="padding-left: 4px;"><fmt:message key="common.label.EscalationActionLogs"/></td> + <td class="BlockContent" colspan="2"> </td> + </tr> + <c:forEach var="log" varStatus="status" items="${alert.actionLog}"> + <%-- No action or alert definition means escalation log --%> + <c:if test="${empty log.action || empty log.action.alertDefinition}"> + <tr> + <td width="20%" class="BlockLabel" style="padding-bottom:3px;"> + <span style="color:#333333;"><hq:dateFormatter value="${log.timeStamp}"/> - </span> + </td> + <td colspan="2" class="BlockContent" style="padding-left: 4px;padding-bottom:3px;"> + <c:out value="${log.detail}"/> + </td> + </tr> + </c:if> + </c:forEach> + <c:if test="${alert.ackable && canTakeAction}"> + <tr> + <td width="20%" class="BlockLabel" style="border-top: solid #D5D8DE 1px;" valign="top" align="right"> + <span class="BoldText"><fmt:message key="resource.common.alert.ackNote"/></span> + </td> + <td colspan="2" class="BlockContent" style="border-top: solid #D5D8DE 1px;"> + <html:textarea property="ackNote" cols="70" rows="4"/> + </td> + </tr> + </c:if> + <tr> + <td width="20%" class="BlockLabel"> </td> + <td width="80%" class="BlockContent"> + <c:if test="${escalation.pauseAllowed && alert.ackable && canTakeAction}"> + <div id="AlertEscalationOption" syle="text-align:left;"> + <input type="checkbox" name="pause" value="true" checked="checked" onclick="dojo11.byId('pauseTimeSel').disabled = !this.checked;" /> <fmt:message key="alert.escalation.pause"/> + </div> + </c:if> + <div style="text-align:left;"> + <tiles:insert page="/common/components/ActionButton.jsp"> + <tiles:put name="labelKey" value="resource.common.alert.action.acknowledge.label"/> + <tiles:put name="buttonClick">dojo.byId('mode').setAttribute('value', '<fmt:message key="resource.common.alert.action.acknowledge.label"/>'); document.forms[0].submit();</tiles:put> + <c:choose> + <c:when test="${alert.ackable}"> + <tiles:put name="disabled" value="false"/> + </c:when> + <c:otherwise> + <tiles:put name="hidden" value="true"/> + </c:otherwise> + </c:choose> + </tiles:insert> + </div> + </td> + </tr> + </table> -<script type="text/javascript"> - var isButtonClicked = false; + <script type="text/javascript"> + var isButtonClicked = false; - function checkSubmit() { - if (isButtonClicked) { - alert('<fmt:message key="error.PreviousRequestEtc"/>'); - return false; - } - } + function checkSubmit() { + if (isButtonClicked) { + alert('<fmt:message key="error.PreviousRequestEtc"/>'); + return false; + } + } - var escalationSpan = dojo11.byId("AlertEscalationOption"); - if (escalationSpan != null) { - escalationSpan.appendChild(hyperic.form.createEscalationPauseOptions({id: "pauseTimeSel", name: "pauseTime"}, <c:out value="${escalation.maxPauseTime}"/>)); - } -</script> + var escalationSpan = dojo11.byId("AlertEscalationOption"); -</c:if> + if (escalationSpan != null) { + escalationSpan.appendChild(hyperic.form.createEscalationPauseOptions({id: "pauseTimeSel", name: "pauseTime"}, <c:out value="${escalation.maxPauseTime}"/>)); + } + </script> +</c:if> \ No newline at end of file |
|
From: Doug M. <do...@hy...> - 2010-02-16 23:32:35
|
If you could tell us what you need exactly, we could come up with a simpler example of how to use the FileSystem classes. For example, the following lists the bytes available for all file systems:
import org.hyperic.sigar.*;
public class df {
public static void main(String[] args) throws Exception {
Sigar sigar = new Sigar();
for (FileSystem fs : sigar.getFileSystemList()) {
FileSystemUsage usage;
try {
usage = sigar.getFileSystemUsage(fs.getDirName());
} catch (SigarException e) {
continue;
}
System.out.println(fs.getDirName() + " bytes available: " + usage.getAvail());
}
}
}
|
|
From: Doug M. <do...@hy...> - 2010-02-16 23:28:51
|
If you could: gzip javacore.20100216.140249.27930.0003.txt And attach javacore.20100216.140249.27930.0003.txt.gz I'll take a look. |
|
From: <dcr...@hy...> - 2010-02-16 22:29:02
|
Author: dcrutchf Date: 2010-02-16 14:28:55 -0800 (Tue, 16 Feb 2010) New Revision: 14299 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14299 Modified: trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java Log: Missed a null check, added it Modified: trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java =================================================================== --- trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java 2010-02-16 22:19:32 UTC (rev 14298) +++ trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java 2010-02-16 22:28:55 UTC (rev 14299) @@ -148,7 +148,7 @@ request.setAttribute(Constants.CAN_VIEW_RESOURCE_TYPE_ALERT_TEMPLATE_ATTR, false); // ...is this alert definition spawned from a resource alert template?.. - if (adv.getParentId() > 0) { + if (adv.getParentId() != null && adv.getParentId() > 0) { // ...if so, check to see if we have permission to view it... SessionBase.canViewResourceTypeAlertDefinitionTemplate(subject); |
|
From: <dcr...@hy...> - 2010-02-16 22:19:43
|
Author: dcrutchf Date: 2010-02-16 14:19:32 -0800 (Tue, 16 Feb 2010) New Revision: 14298 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14298 Modified: trunk/web/css/HQ_40.css Log: style tweak Modified: trunk/web/css/HQ_40.css =================================================================== --- trunk/web/css/HQ_40.css 2010-02-16 21:49:06 UTC (rev 14297) +++ trunk/web/css/HQ_40.css 2010-02-16 22:19:32 UTC (rev 14298) @@ -2609,8 +2609,7 @@ } .resourceTypeColumn { - padding: 8px 3px; - text-align: right; + padding: 8px 3px 8px 15px; width: 20%; } @@ -2624,11 +2623,11 @@ } .alertCapability { - width: 10%; + width: 15%; } .controlCapability { - width: 50%; + width: 45%; } .bottomBorder { border-bottom: 1px solid #eee; |
|
From: <dcr...@hy...> - 2010-02-16 21:49:14
|
Author: dcrutchf Date: 2010-02-16 13:49:06 -0800 (Tue, 16 Feb 2010) New Revision: 14297 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14297 Modified: trunk/installer/data/db-upgrade.xml Log: Updated upgrade script to bring all operation assignments up to date, so that it all works with the new permission changes. For example, if you have create but delete permissions, it'll update the db so you have both. If you have modify but not read permission, it'll correct that so you have both, etc. Modified: trunk/installer/data/db-upgrade.xml =================================================================== --- trunk/installer/data/db-upgrade.xml 2010-02-16 18:25:31 UTC (rev 14296) +++ trunk/installer/data/db-upgrade.xml 2010-02-16 21:49:06 UTC (rev 14297) @@ -10882,23 +10882,273 @@ <!-- Increase autoinventoryidentifier to limit of 500 (per name in EAM_RESOURCE) --> <schemaSpec version="3.194"> <schema-alterColumn table="EAM_SERVICE" column="autoinventoryidentifier" - precision="500" columnType="VARCHAR2" /> + precision="500" columnType="VARCHAR2" /> </schemaSpec> <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 all existing roles (for backwards-compatibility)..."> - INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) SELECT ID,29 FROM EAM_ROLE; + <statement desc="Adding create group permission to any role that has delete group permission..."> + INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) + SELECT m.role_id, 29 FROM EAM_ROLE r + 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; </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 desc="Adding delete group permission to any role that has create group permission..."> + INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) + SELECT m.role_id, 31 FROM EAM_ROLE r + 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; </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) + SELECT distinct m.role_id, 24 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 28 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 320 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 302 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 301 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 305 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 306 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 304 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 307 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 311 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 312 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 314 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 313 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 315 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 316 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 318 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 317 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 319 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 10 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 7 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 6 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 8 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 12 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 30 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 11 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 16 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 412 FROM EAM_ROLE r + 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; + </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) + SELECT m.role_id, 414 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 413 FROM EAM_ROLE r + 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; + </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) + SELECT distinct m.role_id, 415 FROM EAM_ROLE r + 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; + </statement> </schema-directSQL> </schemaSpec> </dbupgrade> |
|
From: <dcr...@hy...> - 2010-02-16 18:25:41
|
Author: dcrutchf Date: 2010-02-16 10:25:31 -0800 (Tue, 16 Feb 2010) New Revision: 14296 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14296 Modified: trunk/installer/data/db-upgrade.xml Log: updated schema version number Modified: trunk/installer/data/db-upgrade.xml =================================================================== --- trunk/installer/data/db-upgrade.xml 2010-02-16 18:13:57 UTC (rev 14295) +++ trunk/installer/data/db-upgrade.xml 2010-02-16 18:25:31 UTC (rev 14296) @@ -10885,7 +10885,7 @@ precision="500" columnType="VARCHAR2" /> </schemaSpec> - <schemaSpec version="3.194"> + <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); |
|
From: <dcr...@hy...> - 2010-02-16 18:14:05
|
Author: dcrutchf Date: 2010-02-16 10:13:57 -0800 (Tue, 16 Feb 2010) New Revision: 14295 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14295 Modified: trunk/src/org/hyperic/hq/authz/shared/PermissionManager.java trunk/src/org/hyperic/hq/authz/shared/PermissionManagerImpl.java Log: Removed unused imports Modified: trunk/src/org/hyperic/hq/authz/shared/PermissionManager.java =================================================================== --- trunk/src/org/hyperic/hq/authz/shared/PermissionManager.java 2010-02-16 18:00:47 UTC (rev 14294) +++ trunk/src/org/hyperic/hq/authz/shared/PermissionManager.java 2010-02-16 18:13:57 UTC (rev 14295) @@ -25,12 +25,8 @@ 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; @@ -38,7 +34,6 @@ 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; Modified: trunk/src/org/hyperic/hq/authz/shared/PermissionManagerImpl.java =================================================================== --- trunk/src/org/hyperic/hq/authz/shared/PermissionManagerImpl.java 2010-02-16 18:00:47 UTC (rev 14294) +++ trunk/src/org/hyperic/hq/authz/shared/PermissionManagerImpl.java 2010-02-16 18:13:57 UTC (rev 14295) @@ -31,11 +31,8 @@ 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; |
14 messages has been excluded from this view by a project administrator.
